diff options
Diffstat (limited to 'dbaccess/source/ext/macromigration')
5 files changed, 4 insertions, 24 deletions
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc b/dbaccess/source/ext/macromigration/dbmm_global.hrc index 7bc71199c..ba5a0d351 100644 --- a/dbaccess/source/ext/macromigration/dbmm_global.hrc +++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc @@ -31,7 +31,7 @@ #ifndef DBACCESS_DBMM_GLOBAL_HRC #define DBACCESS_DBMM_GLOBAL_HRC -#include <svtools/solar.hrc> +#include <svl/solar.hrc> //===================================================================== //= bases diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index 19d1f682f..4805a1fc5 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.cxx +++ b/dbaccess/source/ext/macromigration/docinteraction.cxx @@ -89,18 +89,6 @@ namespace dbmm //= InteractionHandler //==================================================================== //-------------------------------------------------------------------- - InteractionHandler::InteractionHandler( const ::comphelper::ComponentContext& _rContext ) - :m_pData( new InteractionHandler_Data( _rContext ) ) - { - } - - //-------------------------------------------------------------------- - InteractionHandler::InteractionHandler( const Reference< XInteractionHandler >& _rxHandler ) - :m_pData( new InteractionHandler_Data( _rxHandler ) ) - { - } - - //-------------------------------------------------------------------- InteractionHandler::InteractionHandler( const ::comphelper::ComponentContext& _rContext, const Reference< XModel >& _rxDocument ) :m_pData( new InteractionHandler_Data( _rContext ) ) { diff --git a/dbaccess/source/ext/macromigration/docinteraction.hxx b/dbaccess/source/ext/macromigration/docinteraction.hxx index 298e06c71..68f0b28ac 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.hxx +++ b/dbaccess/source/ext/macromigration/docinteraction.hxx @@ -57,15 +57,6 @@ namespace dbmm { public: /** creates an interaction handler by instantiating a css.task.InteractionHandler - component at the given component context. - */ - InteractionHandler( const ::comphelper::ComponentContext& _rContext ); - - /** creates an InteractionHandler instance, using the given existing UNO handler. - */ - InteractionHandler( const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxHandler ); - - /** creates an interaction handler by instantiating a css.task.InteractionHandler component at the given component context, or using the given document's interaction handler, if one is specified in the document's media descriptor. */ diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index a7432cb71..28a714cb5 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -56,7 +56,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase1.hxx> #include <rtl/ref.hxx> -#include <svtools/filenotation.hxx> +#include <svl/filenotation.hxx> #include <tools/diagnose_ex.h> #include <ucbhelper/content.hxx> #include <ucbhelper/contentbroker.hxx> diff --git a/dbaccess/source/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx index 0dfdee019..771fe129e 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.cxx +++ b/dbaccess/source/ext/macromigration/progressmixer.cxx @@ -108,12 +108,13 @@ namespace dbmm //-------------------------------------------------------------------- namespace { +#if OSL_DEBUG_LEVEL > 0 //---------------------------------------------------------------- bool lcl_isRunning( const ProgressMixer_Data& _rData ) { return _rData.pCurrentPhase != _rData.aPhases.end(); } - +#endif //---------------------------------------------------------------- void lcl_ensureInitialized( ProgressMixer_Data& _rData ) { |