diff options
Diffstat (limited to 'desktop/source/deployment/gui')
6 files changed, 11 insertions, 11 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 14e39ce0e287..2f03578c9968 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -90,7 +90,7 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles > { const OUString operator () () { const SolarMutexGuard guard; - ::std::unique_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr( "fps_office" ) ); + std::unique_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr( "fps_office" ) ); OSL_ASSERT( resmgr.get() != nullptr ); return ResId(STR_FILTERNAME_ALL, *resmgr.get()).toString(); } @@ -687,7 +687,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() xFilePicker->setDisplayDirectory( m_sLastFolderURL ); // collect and set filter list: - typedef ::std::map< OUString, OUString > t_string2string; + typedef std::map< OUString, OUString > t_string2string; t_string2string title2filter; OUString sDefaultFilter( StrAllFiles::get() ); @@ -701,7 +701,7 @@ uno::Sequence< OUString > ExtMgrDialog::raiseAddPicker() if (!filter.isEmpty()) { const OUString title( xPackageType->getShortDescription() ); - const ::std::pair< t_string2string::iterator, bool > insertion( + const std::pair< t_string2string::iterator, bool > insertion( title2filter.insert( t_string2string::value_type( title, filter ) ) ); if ( ! insertion.second ) { // already existing, append extensions: diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index fbdd34bba1d2..155a28284520 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -905,7 +905,7 @@ void ExtensionCmdQueue::Thread::_checkForUpdates( { // If there is at least one directly downloadable extension then we // open the install dialog. - ::std::vector< UpdateData > dataDownload; + std::vector< UpdateData > dataDownload; int countWebsiteDownload = 0; typedef std::vector< dp_gui::UpdateData >::const_iterator cit; diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 5486a4ec69a6..e76a2932a313 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -890,7 +890,7 @@ bool ExtensionBox_Impl::FindEntryPos( const TEntry_Impl& rEntry, const long nSta void ExtensionBox_Impl::cleanVecListenerAdded() { - typedef ::std::vector<uno::WeakReference<deployment::XPackage> >::iterator IT; + typedef std::vector<uno::WeakReference<deployment::XPackage> >::iterator IT; IT i = m_vListenerAdded.begin(); while( i != m_vListenerAdded.end()) { @@ -907,7 +907,7 @@ void ExtensionBox_Impl::addEventListenerOnce( { //make sure to only add the listener once cleanVecListenerAdded(); - if ( ::std::none_of(m_vListenerAdded.begin(), m_vListenerAdded.end(), + if ( std::none_of(m_vListenerAdded.begin(), m_vListenerAdded.end(), FindWeakRef(extension)) ) { extension->addEventListener( m_xRemoveListener.get() ); diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 3deb997c43cf..d449f055cc1c 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -202,7 +202,7 @@ void ServiceImpl::startExecuteModal( Reference< ui::dialogs::XDialogClosedListener > const & xListener ) { bool bCloseDialog = true; // only used if m_bShowUpdateOnly is true - ::std::unique_ptr<Application> app; + std::unique_ptr<Application> app; //ToDo: synchronize access to s_dialog !!! if (! dp_gui::TheExtensionManager::s_ExtMgr.is()) { diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 3decee341847..fc3a079b48d5 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -1275,7 +1275,7 @@ IMPL_LINK_NOARG(UpdateDialog, okHandler, Button*, void) { //If users are going to update a shared extension then we need //to warn them - typedef ::std::vector<UpdateData>::const_iterator CIT; + typedef std::vector<UpdateData>::const_iterator CIT; for (CIT i = m_enabledUpdates.begin(); i < m_enabledUpdates.end(); ++i) { OSL_ASSERT(i->aInstalledPackage.is()); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 0254152a927a..8f18c13c8060 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -377,7 +377,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() } dp_misc::DescriptionInfoset info(m_xComponentContext, curData.aUpdateInfo); //remember occurring exceptions in case we need to print out error information - ::std::vector< ::std::pair<OUString, cssu::Exception> > vecExceptions; + std::vector< std::pair<OUString, cssu::Exception> > vecExceptions; cssu::Sequence<OUString> seqDownloadURLs = info.getUpdateDownloadUrls(); OSL_ENSURE(seqDownloadURLs.getLength() > 0, "No download URL provided!"); for (sal_Int32 j = 0; j < seqDownloadURLs.getLength(); j++) @@ -391,7 +391,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() } catch ( cssu::Exception & e ) { - vecExceptions.push_back( ::std::make_pair(seqDownloadURLs[j], e)); + vecExceptions.push_back( std::make_pair(seqDownloadURLs[j], e)); //There can be several different errors, for example, the URL is wrong, webserver cannot be reached, //name cannot be resolved. The UCB helper API does not specify different special exceptions for these //cases. Therefore ignore and continue. @@ -408,7 +408,7 @@ void UpdateInstallDialog::Thread::downloadExtensions() { //Construct a string of all messages contained in the exceptions plus the respective download URLs OUStringBuffer buf(256); - typedef ::std::vector< ::std::pair<OUString, cssu::Exception > >::const_iterator CIT; + typedef std::vector< std::pair<OUString, cssu::Exception > >::const_iterator CIT; for (CIT j = vecExceptions.begin(); j != vecExceptions.end(); ++j) { if (j != vecExceptions.begin()) |