diff options
| author | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
| commit | e5ce011c3f32f53ef073aec5485450b2588b656a (patch) | |
| tree | 8a838a53bcdd70cc3d4cdbca0ebe07504790952e /dbaccess/source/ui/dlg/dbwizsetup.cxx | |
| parent | Use isFuzzy() instead of getFuzzy() (diff) | |
| parent | tubes: use new .ui format for contacts dialog (diff) | |
| download | core-e5ce011c3f32f53ef073aec5485450b2588b656a.tar.gz core-e5ce011c3f32f53ef073aec5485450b2588b656a.zip | |
Merge branch 'master' into feature/killsdf
Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk
Diffstat (limited to 'dbaccess/source/ui/dlg/dbwizsetup.cxx')
| -rw-r--r-- | dbaccess/source/ui/dlg/dbwizsetup.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 9f05b4e298d9..1f34d54c47df 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -70,6 +70,7 @@ #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/document/MacroExecMode.hpp> #include <com/sun/star/ucb/IOErrorCode.hpp> +#include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/task/XInteractionHandler2.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> @@ -734,7 +735,7 @@ namespace //------------------------------------------------------------------------- sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { - Reference< XInteractionHandler2 > xHandler( getORB()->createInstance( SERVICE_TASK_INTERACTION_HANDLER ), UNO_QUERY ); + Reference< XInteractionHandler2 > xHandler( InteractionHandler::createWithParent(comphelper::getComponentContext(getORB()), 0) ); try { if (callSaveAsDialog() == sal_True) @@ -964,7 +965,7 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() private: Reference< XComponentLoader > m_xFrameLoader; Reference< XDesktop > m_xDesktop; - Reference< XInteractionHandler > m_xInteractionHandler; + Reference< XInteractionHandler2 > m_xInteractionHandler; ::rtl::OUString m_sURL; OAsyncronousLink m_aAsyncCaller; @@ -992,11 +993,8 @@ sal_Bool ODbTypeWizDialogSetup::SaveDatabaseDocument() { m_xDesktop.set( _rxORB->createInstance( SERVICE_FRAME_DESKTOP ), UNO_QUERY_THROW ); m_xFrameLoader.set( m_xDesktop, UNO_QUERY_THROW ); - m_xInteractionHandler.set( - _rxORB->createInstance( - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.task.InteractionHandler" ) ) - ), - UNO_QUERY_THROW ); + m_xInteractionHandler = + InteractionHandler::createWithParent(comphelper::getComponentContext(_rxORB), 0); } catch( const Exception& ) { |