diff options
Diffstat (limited to 'extensions/source/propctrlr/eformspropertyhandler.cxx')
| -rw-r--r-- | extensions/source/propctrlr/eformspropertyhandler.cxx | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/extensions/source/propctrlr/eformspropertyhandler.cxx b/extensions/source/propctrlr/eformspropertyhandler.cxx index 23d468a7d909..68e8ebb4f423 100644 --- a/extensions/source/propctrlr/eformspropertyhandler.cxx +++ b/extensions/source/propctrlr/eformspropertyhandler.cxx @@ -29,7 +29,7 @@ #include <com/sun/star/inspection/PropertyControlType.hpp> #include <com/sun/star/inspection/XObjectInspectorUI.hpp> #include <tools/debug.hxx> -#include <tools/diagnose_ex.h> +#include <comphelper/diagnose_ex.hxx> #include <sal/log.hxx> @@ -42,7 +42,6 @@ namespace pcr using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::xforms; - using namespace ::com::sun::star::script; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::form::binding; using namespace ::com::sun::star::inspection; @@ -178,7 +177,7 @@ namespace pcr OUString sOldBindingName = m_pHelper->getCurrentBindingName(); m_pHelper->setBinding( nullptr ); firePropertyChange( PROPERTY_BINDING_NAME, PROPERTY_ID_BINDING_NAME, - makeAny( sOldBindingName ), makeAny( OUString() ) ); + Any( sOldBindingName ), Any( OUString() ) ); } } break; @@ -211,7 +210,7 @@ namespace pcr // However, there's no such mechanism in place currently. m_bSimulatingModelChange = true; firePropertyChange( PROPERTY_XML_DATA_MODEL, PROPERTY_ID_XML_DATA_MODEL, - makeAny( OUString() ), makeAny( getModelNamePropertyValue() ) ); + Any( OUString() ), Any( getModelNamePropertyValue() ) ); m_bSimulatingModelChange = false; } } @@ -281,7 +280,7 @@ namespace pcr { if ( m_pHelper->canBindToAnyDataType() ) { - aProperties.reserve( 7 ); + aProperties.reserve(9); addStringPropertyDescription( aProperties, PROPERTY_XML_DATA_MODEL ); addStringPropertyDescription( aProperties, PROPERTY_BINDING_NAME ); addStringPropertyDescription( aProperties, PROPERTY_BIND_EXPRESSION ); @@ -499,9 +498,9 @@ namespace pcr if ( !xModel.is() || !xBinding.is() || sFacetName.isEmpty() ) return InteractiveSelectionResult_Cancelled; - xDialogProps->setPropertyValue("FormModel", makeAny( xModel ) ); - xDialogProps->setPropertyValue("Binding", makeAny( xBinding ) ); - xDialogProps->setPropertyValue("FacetName", makeAny( sFacetName ) ); + xDialogProps->setPropertyValue("FormModel", Any( xModel ) ); + xDialogProps->setPropertyValue("Binding", Any( xBinding ) ); + xDialogProps->setPropertyValue("FacetName", Any( sFacetName ) ); if ( !xDialog->execute() ) // cancelled |