diff options
| author | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2009-12-10 07:40:02 +0100 |
|---|---|---|
| committer | Ocke Janssen [oj] <Ocke.Janssen@sun.com> | 2009-12-10 07:40:02 +0100 |
| commit | c66201b66deeb77d630a583557c41f8b9b7381bd (patch) | |
| tree | f6d4ea37528b604ce61e312490fc1f3498cd0c1a /dbaccess/source/ext | |
| parent | dba33d: merge (diff) | |
| parent | masterfix: #i10000# fixed conflict resolutions (diff) | |
| download | core-c66201b66deeb77d630a583557c41f8b9b7381bd.tar.gz core-c66201b66deeb77d630a583557c41f8b9b7381bd.zip | |
dba33d: merge with DEV300_m67
Diffstat (limited to 'dbaccess/source/ext')
| -rw-r--r-- | dbaccess/source/ext/macromigration/docinteraction.cxx | 12 | ||||
| -rw-r--r-- | dbaccess/source/ext/macromigration/docinteraction.hxx | 9 | ||||
| -rw-r--r-- | dbaccess/source/ext/macromigration/progressmixer.cxx | 3 |
3 files changed, 2 insertions, 22 deletions
diff --git a/dbaccess/source/ext/macromigration/docinteraction.cxx b/dbaccess/source/ext/macromigration/docinteraction.cxx index 9f7ded185553..77fba3e97a04 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 f24bfea7842f..9e9dd73b4651 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/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx index a59e1a59b7fe..b738376fb051 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 ) { |