diff options
Diffstat (limited to 'dbaccess/source/ext/macromigration')
11 files changed, 28 insertions, 28 deletions
diff --git a/dbaccess/source/ext/macromigration/docinteraction.hxx b/dbaccess/source/ext/macromigration/docinteraction.hxx index f72b10556a14..e9ecb04bb8cf 100644 --- a/dbaccess/source/ext/macromigration/docinteraction.hxx +++ b/dbaccess/source/ext/macromigration/docinteraction.hxx @@ -70,7 +70,7 @@ namespace dbmm ); private: - ::std::unique_ptr< InteractionHandler_Data > m_pData; + std::unique_ptr< InteractionHandler_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx index eb840335c061..6637bb32f49c 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.cxx @@ -85,7 +85,7 @@ namespace dbmm // helper static void lcl_getControllers_throw(const Reference< XModel2 >& _rxDocument, - ::std::list< Reference< XController2 > >& _out_rControllers ) + std::list< Reference< XController2 > >& _out_rControllers ) { _out_rControllers.clear(); Reference< XEnumeration > xControllerEnum( _rxDocument->getControllers(), UNO_SET_THROW ); @@ -308,11 +308,11 @@ namespace dbmm try { // collect all controllers of our document - ::std::list< Reference< XController2 > > aControllers; + std::list< Reference< XController2 > > aControllers; lcl_getControllers_throw( m_pData->xDocumentModel, aControllers ); // close all sub documents of all controllers - for ( ::std::list< Reference< XController2 > >::const_iterator pos = aControllers.begin(); + for ( std::list< Reference< XController2 > >::const_iterator pos = aControllers.begin(); pos != aControllers.end() && bSuccess; ++pos ) @@ -419,8 +419,8 @@ namespace dbmm void MacroMigrationDialog::impl_reloadDocument_nothrow( bool _bMigrationSuccess ) { - typedef ::std::pair< Reference< XFrame >, OUString > ViewDescriptor; - ::std::list< ViewDescriptor > aViews; + typedef std::pair< Reference< XFrame >, OUString > ViewDescriptor; + std::list< ViewDescriptor > aViews; try { @@ -446,7 +446,7 @@ namespace dbmm aDocumentArgs.remove( "URL" ); // collect all controllers of our document - ::std::list< Reference< XController2 > > aControllers; + std::list< Reference< XController2 > > aControllers; lcl_getControllers_throw( m_pData->xDocumentModel, aControllers ); // close all those controllers diff --git a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx index 3c21c0888a6e..742b152e6a0e 100644 --- a/dbaccess/source/ext/macromigration/macromigrationdialog.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationdialog.hxx @@ -65,7 +65,7 @@ namespace dbmm DECL_LINK( OnStartMigration, void*, void ); private: - ::std::unique_ptr< MacroMigrationDialog_Data > m_pData; + std::unique_ptr< MacroMigrationDialog_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 0a25424f0327..ab16c655765d 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -148,7 +148,7 @@ namespace dbmm } }; - typedef ::std::vector< SubDocument > SubDocuments; + typedef std::vector< SubDocument > SubDocuments; // helper typedef ::utl::SharedUNOComponent< XStorage > SharedStorage; @@ -564,7 +564,7 @@ namespace dbmm /** returns the names of the elements in the "Scripts" storage */ - ::std::set< OUString > + std::set< OUString > getElementNames() const; /** removes the sub storage for a given script type @@ -667,17 +667,17 @@ namespace dbmm return xStorage; } - ::std::set< OUString > ScriptsStorage::getElementNames() const + std::set< OUString > ScriptsStorage::getElementNames() const { Sequence< OUString > aElementNames; if ( isValid() ) aElementNames = m_xScriptsStorage->getElementNames(); - ::std::set< OUString > aNames; - ::std::copy( + std::set< OUString > aNames; + std::copy( aElementNames.getConstArray(), aElementNames.getConstArray() + aElementNames.getLength(), - ::std::insert_iterator< ::std::set< OUString > >( aNames, aNames.end() ) + std::insert_iterator< std::set< OUString > >( aNames, aNames.end() ) ); return aNames; } @@ -1180,7 +1180,7 @@ namespace dbmm { // no scripts at all, or no scripts of the given type return !m_rLogger.hadFailure(); } - ::std::set< OUString > aElementNames( aDocStorage.getElementNames() ); + std::set< OUString > aElementNames( aDocStorage.getElementNames() ); const ScriptType aKnownStorageBasedTypes[] = { eBeanShell, eJavaScript, ePython, eJava diff --git a/dbaccess/source/ext/macromigration/migrationengine.hxx b/dbaccess/source/ext/macromigration/migrationengine.hxx index 0ecf64e12a33..b5a2c023a369 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.hxx +++ b/dbaccess/source/ext/macromigration/migrationengine.hxx @@ -70,7 +70,7 @@ namespace dbmm bool migrateAll(); private: - ::std::unique_ptr< MigrationEngine_Impl > m_pImpl; + std::unique_ptr< MigrationEngine_Impl > m_pImpl; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/migrationerror.hxx b/dbaccess/source/ext/macromigration/migrationerror.hxx index 00be94df94be..0de6162d0cde 100644 --- a/dbaccess/source/ext/macromigration/migrationerror.hxx +++ b/dbaccess/source/ext/macromigration/migrationerror.hxx @@ -62,7 +62,7 @@ namespace dbmm struct MigrationError { const MigrationErrorType eType; - ::std::vector< OUString > aErrorDetails; + std::vector< OUString > aErrorDetails; const css::uno::Any aCaughtException; MigrationError( diff --git a/dbaccess/source/ext/macromigration/migrationlog.cxx b/dbaccess/source/ext/macromigration/migrationlog.cxx index e28ce2b78949..4941b4f82a66 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.cxx +++ b/dbaccess/source/ext/macromigration/migrationlog.cxx @@ -52,7 +52,7 @@ namespace dbmm { SubDocumentType eType; OUString sName; - ::std::vector< LibraryEntry > aMovedLibraries; + std::vector< LibraryEntry > aMovedLibraries; DocumentEntry() :eType( eForm ) @@ -69,10 +69,10 @@ namespace dbmm }; // DocumentLogs - typedef ::std::map< DocumentID, DocumentEntry > DocumentLogs; + typedef std::map< DocumentID, DocumentEntry > DocumentLogs; // ErrorLog - typedef ::std::list< MigrationError > ErrorLog; + typedef std::list< MigrationError > ErrorLog; // MigrationLog_Data struct MigrationLog_Data @@ -169,7 +169,7 @@ namespace dbmm } const DocumentEntry& rDocEntry( docPos->second ); - for ( ::std::vector< LibraryEntry >::const_iterator lib = rDocEntry.aMovedLibraries.begin(); + for ( std::vector< LibraryEntry >::const_iterator lib = rDocEntry.aMovedLibraries.begin(); lib != rDocEntry.aMovedLibraries.end(); ++lib ) @@ -189,7 +189,7 @@ namespace dbmm void lcl_appendErrorDescription( OUStringBuffer& _inout_rBuffer, const MigrationError& _rError ) { const sal_Char* pAsciiErrorDescription( nullptr ); - ::std::vector< OUString > aParameterNames; + std::vector< OUString > aParameterNames; switch ( _rError.eType ) { case ERR_OPENING_SUB_DOCUMENT_FAILED: @@ -334,7 +334,7 @@ namespace dbmm OSL_ENSURE( aParameterNames.size() == _rError.aErrorDetails.size(), "lcl_appendErrorDescription: unexpected number of error message parameters!" ); - for ( size_t i=0; i < ::std::min( aParameterNames.size(), _rError.aErrorDetails.size() ); ++i ) + for ( size_t i=0; i < std::min( aParameterNames.size(), _rError.aErrorDetails.size() ); ++i ) { sSubstituted = sSubstituted.replaceFirst( aParameterNames[i], _rError.aErrorDetails[i]); @@ -421,7 +421,7 @@ namespace dbmm aBuffer.append( "=== " + sDocTitle + " ===\n" ); - for ( ::std::vector< LibraryEntry >::const_iterator lib = rDoc.aMovedLibraries.begin(); + for ( std::vector< LibraryEntry >::const_iterator lib = rDoc.aMovedLibraries.begin(); lib != rDoc.aMovedLibraries.end(); ++lib ) diff --git a/dbaccess/source/ext/macromigration/migrationlog.hxx b/dbaccess/source/ext/macromigration/migrationlog.hxx index 1a854e6e89f6..85adba176097 100644 --- a/dbaccess/source/ext/macromigration/migrationlog.hxx +++ b/dbaccess/source/ext/macromigration/migrationlog.hxx @@ -101,7 +101,7 @@ namespace dbmm getCompleteLog() const; private: - ::std::unique_ptr< MigrationLog_Data > m_pData; + std::unique_ptr< MigrationLog_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/progresscapture.hxx b/dbaccess/source/ext/macromigration/progresscapture.hxx index 17cffd514eb0..8cbb2144802c 100644 --- a/dbaccess/source/ext/macromigration/progresscapture.hxx +++ b/dbaccess/source/ext/macromigration/progresscapture.hxx @@ -55,7 +55,7 @@ namespace dbmm virtual ~ProgressCapture() override; private: - ::std::unique_ptr< ProgressCapture_Data > m_pData; + std::unique_ptr< ProgressCapture_Data > m_pData; }; } // namespace dbmm diff --git a/dbaccess/source/ext/macromigration/progressmixer.cxx b/dbaccess/source/ext/macromigration/progressmixer.cxx index 40030feca0e6..4fd482c6cb1b 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.cxx +++ b/dbaccess/source/ext/macromigration/progressmixer.cxx @@ -58,7 +58,7 @@ namespace dbmm } }; - typedef ::std::map< PhaseID, PhaseData > Phases; + typedef std::map< PhaseID, PhaseData > Phases; // ProgressMixer_Data struct ProgressMixer_Data diff --git a/dbaccess/source/ext/macromigration/progressmixer.hxx b/dbaccess/source/ext/macromigration/progressmixer.hxx index 68db5655bc2e..171089380af1 100644 --- a/dbaccess/source/ext/macromigration/progressmixer.hxx +++ b/dbaccess/source/ext/macromigration/progressmixer.hxx @@ -77,7 +77,7 @@ namespace dbmm void endPhase(); private: - ::std::unique_ptr< ProgressMixer_Data > m_pData; + std::unique_ptr< ProgressMixer_Data > m_pData; }; } // namespace dbmm |