diff options
author | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2012-11-11 18:24:14 +0100 |
commit | 06ec1c089519ef3249464aa09eadf03a8db93a39 (patch) | |
tree | 85b2eb6d8ba6ca95e18e1ff82151224cb14106f6 /forms | |
parent | 8e0d67bed54633d555a4601a5d79e2d5ba7ab2bb (diff) | |
parent | 3f899eae02eaad0b967de749fe09b869ba93ad6d (diff) |
Merge branch 'master' into feature/killsdf
Conflicts:
Repository.mk
RepositoryFixes.mk
connectivity/prj/build.lst
extensions/prj/build.lst
filter/prj/build.lst
fpicker/prj/build.lst
l10ntools/StaticLibrary_transex.mk
saxon/build.xml
shell/prj/build.lst
solenv/gbuild/AllLangResTarget.mk
solenv/gbuild/Configuration.mk
solenv/gbuild/UI.mk
ucb/source/ucp/webdav/webdavcontent.cxx
Diffstat (limited to 'forms')
-rw-r--r-- | forms/source/component/Filter.cxx | 7 | ||||
-rw-r--r-- | forms/source/inc/services.hxx | 1 | ||||
-rw-r--r-- | forms/source/misc/InterfaceContainer.cxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 298bf90cae4c..ba3f208f99a2 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -57,6 +57,7 @@ #include <com/sun/star/awt/XItemList.hpp> #include <comphelper/numbers.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> #include <connectivity/dbconversion.hxx> #include <connectivity/dbtools.hxx> @@ -102,7 +103,7 @@ namespace frm OFilterControl::OFilterControl( const Reference< XMultiServiceFactory >& _rxORB ) :UnoControl( _rxORB ) ,m_aTextListeners( *this ) - ,m_aParser( _rxORB ) + ,m_aParser( comphelper::getComponentContext(_rxORB) ) ,m_nControlClass( FormComponentType::TEXTFIELD ) ,m_bFilterList( sal_False ) ,m_bMultiLine( sal_False ) @@ -348,7 +349,7 @@ namespace frm sItemText = itemPos->second; if ( !sItemText.isEmpty() ) { - ::dbtools::OPredicateInputController aPredicateInput( maContext.getLegacyServiceFactory(), m_xConnection, getParseContext() ); + ::dbtools::OPredicateInputController aPredicateInput( maContext.getUNOContext(), m_xConnection, getParseContext() ); ::rtl::OUString sErrorMessage; OSL_VERIFY( aPredicateInput.normalizePredicateString( sItemText, m_xField, &sErrorMessage ) ); } @@ -533,7 +534,7 @@ namespace frm aNewText.trim(); if ( !aNewText.isEmpty() ) { - ::dbtools::OPredicateInputController aPredicateInput( maContext.getLegacyServiceFactory(), m_xConnection, getParseContext() ); + ::dbtools::OPredicateInputController aPredicateInput( maContext.getUNOContext(), m_xConnection, getParseContext() ); ::rtl::OUString sErrorMessage; if ( !aPredicateInput.normalizePredicateString( aNewText, m_xField, &sErrorMessage ) ) { diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx index 3024b0609684..4c2ae6bc4413 100644 --- a/forms/source/inc/services.hxx +++ b/forms/source/inc/services.hxx @@ -210,7 +210,6 @@ namespace frm // ----------------------- FORMS_CONSTASCII_STRING( SRV_AWT_POINTER, "com.sun.star.awt.Pointer" ); FORMS_CONSTASCII_STRING( SRV_AWT_IMAGEPRODUCER, "com.sun.star.awt.ImageProducer" ); - FORMS_CONSTASCII_STRING( FRM_NUMBER_FORMATTER, "com.sun.star.util.NumberFormatter" ); FORMS_CONSTASCII_STRING( FRM_NUMBER_FORMATS_SUPPLIER, "com.sun.star.util.NumberFormatsSupplier" ); FORMS_CONSTASCII_STRING( SRV_SDB_ROWSET, "com.sun.star.sdb.RowSet" ); diff --git a/forms/source/misc/InterfaceContainer.cxx b/forms/source/misc/InterfaceContainer.cxx index 0965b2b16571..f10a32db1dcb 100644 --- a/forms/source/misc/InterfaceContainer.cxx +++ b/forms/source/misc/InterfaceContainer.cxx @@ -244,7 +244,7 @@ void OInterfaceContainer::impl_createEventAttacher_nothrow() { try { - m_xEventAttacher.set( ::comphelper::createEventAttacherManager( m_xServiceFactory ), UNO_SET_THROW ); + m_xEventAttacher.set( ::comphelper::createEventAttacherManager( comphelper::getComponentContext(m_xServiceFactory) ), UNO_SET_THROW ); } catch( const Exception& ) { @@ -621,7 +621,7 @@ void SAL_CALL OInterfaceContainer::read( const Reference< XObjectInputStream >& { try { - m_xEventAttacher = ::comphelper::createEventAttacherManager( m_xServiceFactory ); + m_xEventAttacher = ::comphelper::createEventAttacherManager( comphelper::getComponentContext(m_xServiceFactory) ); OSL_ENSURE( m_xEventAttacher.is(), "OInterfaceContainer::read: could not create an event attacher manager!" ); } catch( const Exception& ) |