Skip to content

C
core
Kaydet (Commit) 74938c8f authored tarafından Rüdiger Timm's avatar Rüdiger Timm
Dosyalara gözat
Seçenekler

INTEGRATION: CWS dba204b (1.6.68); FILE MERGED 

2006/07/06 14:52:30 fs 1.6.68.1: #i65159# describePropertyLine now returning a LineDescriptor, instead of taking an out parameter / some less warnings
üst 4f5fe5e9
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 20 deletions
extensions/source/propctrlr/propertyhandler.cxx
Dosyayı görüntüle @ 74938c8f
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: propertyhandler.cxx,v $ * $RCSfile: propertyhandler.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: vg $ $Date: 2006-03-14 11:30:34 $ * last change: $Author: rt $ $Date: 2006-07-26 07:59:51 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -208,7 +208,7 @@ namespace pcr ...@@ -208,7 +208,7 @@ namespace pcr
} }
else else
aPropertyValue = PropertyHandlerHelper::convertToPropertyValue( aPropertyValue = PropertyHandlerHelper::convertToPropertyValue(
m_aContext.getUNOContext(), m_xTypeConverter, aProperty, _rControlValue ); m_xTypeConverter, aProperty, _rControlValue );
return aPropertyValue; return aPropertyValue;
} }
...@@ -229,18 +229,18 @@ namespace pcr ...@@ -229,18 +229,18 @@ namespace pcr
} }
return PropertyHandlerHelper::convertToControlValue( return PropertyHandlerHelper::convertToControlValue(
m_aContext.getUNOContext(), m_xTypeConverter, impl_getPropertyFromName_throw( _rPropertyName ), _rPropertyValue, _rControlValueType ); m_xTypeConverter, _rPropertyValue, _rControlValueType );
} }
//-------------------------------------------------------------------- //--------------------------------------------------------------------
PropertyState SAL_CALL PropertyHandler::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException) PropertyState SAL_CALL PropertyHandler::getPropertyState( const ::rtl::OUString& /*_rPropertyName*/ ) throw (UnknownPropertyException, RuntimeException)
{ {
return PropertyState_DIRECT_VALUE; return PropertyState_DIRECT_VALUE;
} }
//-------------------------------------------------------------------- //--------------------------------------------------------------------
void SAL_CALL PropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName, LineDescriptor SAL_CALL PropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName,
LineDescriptor& _out_rDescriptor, const Reference< XPropertyControlFactory >& _rxControlFactory ) const Reference< XPropertyControlFactory >& _rxControlFactory )
throw (UnknownPropertyException, NullPointerException, RuntimeException) throw (UnknownPropertyException, NullPointerException, RuntimeException)
{ {
if ( !_rxControlFactory.is() ) if ( !_rxControlFactory.is() )
...@@ -250,23 +250,24 @@ namespace pcr ...@@ -250,23 +250,24 @@ namespace pcr
PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) ); PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) );
const Property& rProperty( impl_getPropertyFromId_throw( nPropId ) ); const Property& rProperty( impl_getPropertyFromId_throw( nPropId ) );
LineDescriptor aDescriptor;
if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_ENUM ) != 0 ) if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_ENUM ) != 0 )
{ {
_out_rDescriptor.Control = PropertyHandlerHelper::createListBoxControl( aDescriptor.Control = PropertyHandlerHelper::createListBoxControl(
_rxControlFactory, m_pInfoService->getPropertyEnumRepresentations( nPropId ), _rxControlFactory, m_pInfoService->getPropertyEnumRepresentations( nPropId ),
PropertyHandlerHelper::requiresReadOnlyControl( rProperty.Attributes ) ); PropertyHandlerHelper::requiresReadOnlyControl( rProperty.Attributes ) );
} }
else else
PropertyHandlerHelper::describePropertyLine( m_aContext.getUNOContext(), PropertyHandlerHelper::describePropertyLine( rProperty, aDescriptor, _rxControlFactory );
rProperty, _out_rDescriptor, _rxControlFactory );
_out_rDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) ); aDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nPropId ) );
_out_rDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId ); aDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( nPropId );
if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_DATA_PROPERTY ) != 0 ) if ( ( m_pInfoService->getPropertyUIFlags( nPropId ) & PROP_FLAG_DATA_PROPERTY ) != 0 )
_out_rDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ) ); aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ) );
else else
_out_rDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "General" ) ); aDescriptor.Category = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "General" ) );
return aDescriptor;
} }
//-------------------------------------------------------------------- //--------------------------------------------------------------------
...@@ -277,14 +278,14 @@ namespace pcr ...@@ -277,14 +278,14 @@ namespace pcr
} }
//-------------------------------------------------------------------- //--------------------------------------------------------------------
InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException) InteractiveSelectionResult SAL_CALL PropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& /*_rPropertyName*/, sal_Bool /*_bPrimary*/, Any& /*_rData*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/ ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
{ {
DBG_ERROR( "PropertyHandler::onInteractivePropertySelection: not implemented!" ); DBG_ERROR( "PropertyHandler::onInteractivePropertySelection: not implemented!" );
return InteractiveSelectionResult_Cancelled; return InteractiveSelectionResult_Cancelled;
} }
//-------------------------------------------------------------------- //--------------------------------------------------------------------
void SAL_CALL PropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& _rOldValue, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException) void SAL_CALL PropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& /*_rActuatingPropertyName*/, const Any& /*_rNewValue*/, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& /*_rxInspectorUI*/, sal_Bool /*_bFirstTimeInit*/ ) throw (NullPointerException, RuntimeException)
{ {
DBG_ERROR( "PropertyHandler::actuatingPropertyChanged: not implemented!" ); DBG_ERROR( "PropertyHandler::actuatingPropertyChanged: not implemented!" );
} }
...@@ -306,7 +307,7 @@ namespace pcr ...@@ -306,7 +307,7 @@ namespace pcr
} }
//-------------------------------------------------------------------- //--------------------------------------------------------------------
sal_Bool SAL_CALL PropertyHandler::suspend( sal_Bool _bSuspend ) throw (RuntimeException) sal_Bool SAL_CALL PropertyHandler::suspend( sal_Bool /*_bSuspend*/ ) throw (RuntimeException)
{ {
return sal_True; return sal_True;
} }
......
extensions/source/propctrlr/propertyhandler.hxx
Dosyayı görüntüle @ 74938c8f
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: propertyhandler.hxx,v $ * $RCSfile: propertyhandler.hxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: vg $ $Date: 2006-03-17 09:47:03 $ * last change: $Author: rt $ $Date: 2006-07-26 08:00:10 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -175,7 +175,7 @@ namespace pcr ...@@ -175,7 +175,7 @@ namespace pcr
virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rControlValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Any SAL_CALL convertToControlValue( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Any& _rPropertyValue, const ::com::sun::star::uno::Type& _rControlValueType ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, ::com::sun::star::inspection::LineDescriptor& /* [out] */ _rDescriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::LineDescriptor SAL_CALL describePropertyLine( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyControlFactory >& _rxControlFactory ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isComposable( const ::rtl::OUString& _rPropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::inspection::InteractiveSelectionResult SAL_CALL onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool _bPrimary, ::com::sun::star::uno::Any& _rData, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const ::com::sun::star::uno::Any& _rNewValue, const ::com::sun::star::uno::Any& _rOldValue, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (::com::sun::star::lang::NullPointerException, ::com::sun::star::uno::RuntimeException);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment