summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/qa/deployment_misc/test_dp_version.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_dialog2.cxx6
-rw-r--r--desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_extlistbox.cxx4
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx6
-rw-r--r--desktop/source/deployment/inc/dp_descriptioninfoset.hxx2
-rw-r--r--desktop/source/deployment/inc/dp_ucb.h2
-rw-r--r--desktop/source/deployment/inc/dp_update.hxx2
-rw-r--r--desktop/source/deployment/manager/dp_activepackages.cxx4
-rw-r--r--desktop/source/deployment/manager/dp_activepackages.hxx2
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.cxx32
-rw-r--r--desktop/source/deployment/manager/dp_extensionmanager.hxx4
-rw-r--r--desktop/source/deployment/manager/dp_manager.cxx14
-rw-r--r--desktop/source/deployment/manager/dp_manager.h2
-rw-r--r--desktop/source/deployment/manager/dp_managerfac.cxx2
-rw-r--r--desktop/source/deployment/manager/dp_properties.cxx4
-rw-r--r--desktop/source/deployment/misc/dp_descriptioninfoset.cxx10
-rw-r--r--desktop/source/deployment/misc/dp_ucb.cxx4
-rw-r--r--desktop/source/deployment/registry/component/dp_compbackenddb.hxx4
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx18
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configuration.cxx10
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx4
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx2
-rw-r--r--desktop/source/deployment/registry/dp_backend.cxx8
-rw-r--r--desktop/source/deployment/registry/dp_backenddb.cxx22
-rw-r--r--desktop/source/deployment/registry/dp_registry.cxx8
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx2
-rw-r--r--desktop/source/deployment/registry/help/dp_helpbackenddb.cxx2
-rw-r--r--desktop/source/deployment/registry/help/dp_helpbackenddb.hxx2
-rw-r--r--desktop/source/deployment/registry/inc/dp_backend.h2
-rw-r--r--desktop/source/deployment/registry/inc/dp_backenddb.hxx10
-rw-r--r--desktop/source/deployment/registry/package/dp_extbackenddb.hxx6
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx22
-rw-r--r--desktop/source/migration/migration.cxx22
-rw-r--r--desktop/source/migration/migration_impl.hxx6
-rw-r--r--desktop/source/migration/services/jvmfwk.cxx4
-rw-r--r--desktop/source/migration/services/misc.hxx4
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_app.cxx26
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_misc.cxx10
-rw-r--r--desktop/source/pkgchk/unopkg/unopkg_shared.h4
42 files changed, 153 insertions, 153 deletions
diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx
index 836608d24167..5ec747b0014b 100644
--- a/desktop/qa/deployment_misc/test_dp_version.cxx
+++ b/desktop/qa/deployment_misc/test_dp_version.cxx
@@ -61,7 +61,7 @@ void Test::test() {
OUString("9223372036854775807"),
::dp_misc::GREATER }
};
- for (::std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
+ for (std::size_t i = 0; i < SAL_N_ELEMENTS(data); ++i) {
CPPUNIT_ASSERT_EQUAL(
data[i].order,
::dp_misc::compareVersions(data[i].version1, data[i].version2));
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())
diff --git a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
index f3d7281a3892..21b190856b10 100644
--- a/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
+++ b/desktop/source/deployment/inc/dp_descriptioninfoset.hxx
@@ -115,7 +115,7 @@ public:
In case there is no publisher element then a pair of two empty strings is returned.
*/
- ::std::pair< OUString, OUString > getLocalizedPublisherNameAndURL() const;
+ std::pair< OUString, OUString > getLocalizedPublisherNameAndURL() const;
/**
Returns the URL for the release notes corresponding to the office's locale.
diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h
index 174af57c87e9..3c97fc6a1e89 100644
--- a/desktop/source/deployment/inc/dp_ucb.h
+++ b/desktop/source/deployment/inc/dp_ucb.h
@@ -89,7 +89,7 @@ bool readLine( OUString * res, OUString const & startingWith,
::ucbhelper::Content & ucb_content, rtl_TextEncoding textenc );
DESKTOP_DEPLOYMENTMISC_DLLPUBLIC
-bool readProperties( ::std::list< ::std::pair< OUString, OUString> > & out_result,
+bool readProperties( std::list< std::pair< OUString, OUString> > & out_result,
::ucbhelper::Content & ucb_content);
diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx
index 0e07563b59c1..390fb0c6ee87 100644
--- a/desktop/source/deployment/inc/dp_update.hxx
+++ b/desktop/source/deployment/inc/dp_update.hxx
@@ -122,7 +122,7 @@ UpdateInfoMap getOnlineUpdateInfos(
css::uno::Reference< css::deployment::XExtensionManager> const & xExtMgr,
css::uno::Reference< css::deployment::XUpdateInformationProvider > const & updateInformation,
std::vector< css::uno::Reference< css::deployment::XPackage > > const * extensionList,
- ::std::vector< ::std::pair< css::uno::Reference<
+ std::vector< std::pair< css::uno::Reference<
css::deployment::XPackage>, css::uno::Any> > & out_errors);
/* retunrs the highest version from the provided arguments.
diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx
index c9234ae10735..410c0aab528a 100644
--- a/desktop/source/deployment/manager/dp_activepackages.cxx
+++ b/desktop/source/deployment/manager/dp_activepackages.cxx
@@ -169,7 +169,7 @@ ActivePackages::Entries ActivePackages::getEntries() const {
{
if (!i->first.isEmpty() && i->first[0] == separator) {
es.push_back(
- ::std::make_pair(
+ std::make_pair(
OUString(
i->first.getStr() + 1, i->first.getLength() - 1,
RTL_TEXTENCODING_UTF8),
@@ -178,7 +178,7 @@ ActivePackages::Entries ActivePackages::getEntries() const {
OUString fn(
OStringToOUString(i->first, RTL_TEXTENCODING_UTF8));
es.push_back(
- ::std::make_pair(
+ std::make_pair(
::dp_misc::generateLegacyIdentifier(fn),
decodeOldData(fn, i->second)));
}
diff --git a/desktop/source/deployment/manager/dp_activepackages.hxx b/desktop/source/deployment/manager/dp_activepackages.hxx
index 93b593041fbd..59533819cd0d 100644
--- a/desktop/source/deployment/manager/dp_activepackages.hxx
+++ b/desktop/source/deployment/manager/dp_activepackages.hxx
@@ -61,7 +61,7 @@ public:
OUString failedPrerequisites;
};
- typedef ::std::vector< ::std::pair< OUString, Data > > Entries;
+ typedef std::vector< std::pair< OUString, Data > > Entries;
ActivePackages();
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index 0426abbe4349..68305de971b1 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -75,23 +75,23 @@ namespace {
struct CompIdentifiers
{
- bool operator() (::std::vector<Reference<css::deployment::XPackage> > const & a,
- ::std::vector<Reference<css::deployment::XPackage> > const & b)
+ bool operator() (std::vector<Reference<css::deployment::XPackage> > const & a,
+ std::vector<Reference<css::deployment::XPackage> > const & b)
{
if (getName(a).compareTo(getName(b)) < 0)
return true;
return false;
}
- static OUString getName(::std::vector<Reference<css::deployment::XPackage> > const & a);
+ static OUString getName(std::vector<Reference<css::deployment::XPackage> > const & a);
};
-OUString CompIdentifiers::getName(::std::vector<Reference<css::deployment::XPackage> > const & a)
+OUString CompIdentifiers::getName(std::vector<Reference<css::deployment::XPackage> > const & a)
{
OSL_ASSERT(a.size() == 3);
//get the first non-null reference
Reference<css::deployment::XPackage> extension;
- ::std::vector<Reference<css::deployment::XPackage> >::const_iterator it = a.begin();
+ std::vector<Reference<css::deployment::XPackage> >::const_iterator it = a.begin();
for (; it != a.end(); ++it)
{
if (it->is())
@@ -241,7 +241,7 @@ void ExtensionManager::addExtensionsToMap(
{
//Determine the index in the vector where these extensions are to be
//added.
- ::std::list<OUString>::const_iterator citNames =
+ std::list<OUString>::const_iterator citNames =
m_repositoryNames.begin();
int index = 0;
for (;citNames != m_repositoryNames.end(); ++citNames, ++index)
@@ -257,7 +257,7 @@ void ExtensionManager::addExtensionsToMap(
id2extensions::iterator ivec = mapExt.find(id);
if (ivec == mapExt.end())
{
- ::std::vector<Reference<css::deployment::XPackage> > vec(3);
+ std::vector<Reference<css::deployment::XPackage> > vec(3);
vec[index] = xExtension;
mapExt[id] = vec;
}
@@ -280,13 +280,13 @@ void ExtensionManager::addExtensionsToMap(
The number of elements is always three, unless the number of repository
changes.
*/
-::std::list<Reference<css::deployment::XPackage> >
+std::list<Reference<css::deployment::XPackage> >
ExtensionManager::getExtensionsWithSameId(
OUString const & identifier, OUString const & fileName,
Reference< ucb::XCommandEnvironment> const & /*xCmdEnv*/)
{
- ::std::list<Reference<css::deployment::XPackage> > extensionList;
+ std::list<Reference<css::deployment::XPackage> > extensionList;
Reference<css::deployment::XPackageManager> lRepos[] = {
getUserRepository(), getSharedRepository(), getBundledRepository() };
for (int i(0); i != SAL_N_ELEMENTS(lRepos); ++i)
@@ -315,13 +315,13 @@ ExtensionManager::getExtensionsWithSameIdentifier(
{
try
{
- ::std::list<Reference<css::deployment::XPackage> > listExtensions =
+ std::list<Reference<css::deployment::XPackage> > listExtensions =
getExtensionsWithSameId(
identifier, fileName, xCmdEnv);
bool bHasExtension = false;
//throw an IllegalArgumentException if there is no extension at all.
- typedef ::std::list<Reference<css::deployment::XPackage> >::const_iterator CIT;
+ typedef std::list<Reference<css::deployment::XPackage> >::const_iterator CIT;
for (CIT i = listExtensions.begin(); i != listExtensions.end(); ++i)
bHasExtension |= i->is();
if (!bHasExtension)
@@ -355,7 +355,7 @@ ExtensionManager::getExtensionsWithSameIdentifier(
bool ExtensionManager::isUserDisabled(
OUString const & identifier, OUString const & fileName)
{
- ::std::list<Reference<css::deployment::XPackage> > listExtensions;
+ std::list<Reference<css::deployment::XPackage> > listExtensions;
try {
listExtensions = getExtensionsWithSameId(identifier, fileName);
@@ -408,7 +408,7 @@ void ExtensionManager::activateExtension(
Reference<task::XAbortChannel> const & xAbortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv )
{
- ::std::list<Reference<css::deployment::XPackage> > listExtensions;
+ std::list<Reference<css::deployment::XPackage> > listExtensions;
try {
listExtensions = getExtensionsWithSameId(identifier, fileName);
} catch (const lang::IllegalArgumentException &) {
@@ -1111,16 +1111,16 @@ uno::Sequence< uno::Sequence<Reference<css::deployment::XPackage> > >
getTmpRepository();
//copy the values of the map to a vector for sorting
- ::std::vector< ::std::vector<Reference<css::deployment::XPackage> > >
+ std::vector< std::vector<Reference<css::deployment::XPackage> > >
vecExtensions;
id2extensions::const_iterator mapIt = mapExt.begin();
for (;mapIt != mapExt.end(); ++mapIt)
vecExtensions.push_back(mapIt->second);
//sort the element according to the identifier
- ::std::sort(vecExtensions.begin(), vecExtensions.end(), CompIdentifiers());
+ std::sort(vecExtensions.begin(), vecExtensions.end(), CompIdentifiers());
- ::std::vector< ::std::vector<Reference<css::deployment::XPackage> > >::const_iterator
+ std::vector< std::vector<Reference<css::deployment::XPackage> > >::const_iterator
citVecVec = vecExtensions.begin();
sal_Int32 j = 0;
uno::Sequence< uno::Sequence<Reference<css::deployment::XPackage> > > seqSeq(vecExtensions.size());
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx
index 9b113ce105fe..fd060446a9a2 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.hxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx
@@ -149,7 +149,7 @@ private:
priority. That is, the first element is "user" followed by "shared" and
then "bundled"
*/
- ::std::list< OUString > m_repositoryNames;
+ std::list< OUString > m_repositoryNames;
css::uno::Reference<css::deployment::XPackageManager> getUserRepository();
css::uno::Reference<css::deployment::XPackageManager> getSharedRepository();
@@ -176,7 +176,7 @@ private:
css::uno::Reference<css::task::XAbortChannel> const & xAbortChannel,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv );
- ::std::list<css::uno::Reference<css::deployment::XPackage> >
+ std::list<css::uno::Reference<css::deployment::XPackage> >
getExtensionsWithSameId(OUString const & identifier,
OUString const & fileName,
css::uno::Reference< css::ucb::XCommandEnvironment> const & xCmdEnv =
diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx
index 8b9d18479847..55c42ad8c920 100644
--- a/desktop/source/deployment/manager/dp_manager.cxx
+++ b/desktop/source/deployment/manager/dp_manager.cxx
@@ -190,8 +190,8 @@ void PackageManagerImpl::initActivationLayer(
::ucbhelper::INCLUDE_DOCUMENTS_ONLY ) );
// get all temp directories:
- ::std::vector<OUString> tempEntries;
- ::std::vector<OUString> removedEntries;
+ std::vector<OUString> tempEntries;
+ std::vector<OUString> removedEntries;
while (xResultSet->next())
{
OUString title(
@@ -219,7 +219,7 @@ void PackageManagerImpl::initActivationLayer(
for (OUString & tempEntry : tempEntries)
{
const MatchTempDir match( tempEntry );
- if (::std::none_of( id2temp.begin(), id2temp.end(), match ))
+ if (std::none_of( id2temp.begin(), id2temp.end(), match ))
{
const OUString url(
makeURL(m_activePackages_expanded, tempEntry ) );
@@ -228,7 +228,7 @@ void PackageManagerImpl::initActivationLayer(
//added extensions if there is no xxx.tmpremoved file.
if (bShared)
{
- if (::std::find(removedEntries.begin(), removedEntries.end(), tempEntry) ==
+ if (std::find(removedEntries.begin(), removedEntries.end(), tempEntry) ==
removedEntries.end())
{
continue;
@@ -1010,7 +1010,7 @@ Sequence< Reference<deployment::XPackage> >
PackageManagerImpl::getDeployedPackages_(
Reference<XCommandEnvironment> const & xCmdEnv )
{
- ::std::vector< Reference<deployment::XPackage> > packages;
+ std::vector< Reference<deployment::XPackage> > packages;
ActivePackages::Entries id2temp( m_activePackagesDB->getEntries() );
ActivePackages::Entries::const_iterator iPos( id2temp.begin() );
ActivePackages::Entries::const_iterator const iEnd( id2temp.end() );
@@ -1332,7 +1332,7 @@ bool PackageManagerImpl::synchronizeAddedExtensions(
//installed the extension it was already checked if there is one with the
//same identifier.
const MatchTempDir match(titleEncoded);
- if (::std::none_of( id2temp.begin(), id2temp.end(), match ))
+ if (std::none_of( id2temp.begin(), id2temp.end(), match ))
{
// The folder was not found in the data base, so it must be
@@ -1432,7 +1432,7 @@ sal_Bool PackageManagerImpl::synchronize(
Sequence< Reference<deployment::XPackage> > PackageManagerImpl::getExtensionsWithUnacceptedLicenses(
Reference<ucb::XCommandEnvironment> const & xCmdEnv)
{
- ::std::vector<Reference<deployment::XPackage> > vec;
+ std::vector<Reference<deployment::XPackage> > vec;
try
{
diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h
index cafd630e12c3..dd12b59fc957 100644
--- a/desktop/source/deployment/manager/dp_manager.h
+++ b/desktop/source/deployment/manager/dp_manager.h
@@ -50,7 +50,7 @@ class PackageManagerImpl : private ::dp_misc::MutexHolder, public t_pm_helper
OUString m_activePackages;
OUString m_activePackages_expanded;
- ::std::unique_ptr< ActivePackages > m_activePackagesDB;
+ std::unique_ptr< ActivePackages > m_activePackagesDB;
//This mutex is only used for synchronization in addPackage
::osl::Mutex m_addMutex;
css::uno::Reference<css::ucb::XProgressHandler> m_xLogFile;
diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx
index ab1cc4466f66..b2e9fc418d8e 100644
--- a/desktop/source/deployment/manager/dp_managerfac.cxx
+++ b/desktop/source/deployment/manager/dp_managerfac.cxx
@@ -128,7 +128,7 @@ PackageManagerFactoryImpl::getPackageManager( OUString const & context )
guard.clear();
xRet.set( PackageManagerImpl::create( m_xComponentContext, context ) );
guard.reset();
- ::std::pair< t_string2weakref::iterator, bool > insertion(
+ std::pair< t_string2weakref::iterator, bool > insertion(
m_managers.insert( t_string2weakref::value_type( context, xRet ) ) );
if (insertion.second)
{
diff --git a/desktop/source/deployment/manager/dp_properties.cxx b/desktop/source/deployment/manager/dp_properties.cxx
index a3f5ac54ef33..3ecab8aa169a 100644
--- a/desktop/source/deployment/manager/dp_properties.cxx
+++ b/desktop/source/deployment/manager/dp_properties.cxx
@@ -49,14 +49,14 @@ ExtensionProperties::ExtensionProperties(
{
m_propFileUrl = urlExtension + "properties";
- ::std::list< ::std::pair< OUString, OUString> > props;
+ std::list< std::pair< OUString, OUString> > props;
if (! dp_misc::create_ucb_content(nullptr, m_propFileUrl, nullptr, false))
return;
::ucbhelper::Content contentProps(m_propFileUrl, m_xCmdEnv, m_xContext);
dp_misc::readProperties(props, contentProps);
- typedef ::std::list< ::std::pair< OUString, OUString> >::const_iterator CI;
+ typedef std::list< std::pair< OUString, OUString> >::const_iterator CI;
for (CI i = props.begin(); i != props.end(); ++i)
{
if (i->first == PROP_SUPPRESS_LICENSE)
diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
index f17e4c4471da..b1762ab7fd87 100644
--- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
+++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx
@@ -465,7 +465,7 @@ css::uno::Sequence< OUString > DescriptionInfoset::getSupportedPlatforms() const
//There is a platform element.
const OUString value = getNodeValueFromExpression("desc:platform/@value");
//parse the string, it can contained multiple strings separated by commas
- ::std::vector< OUString> vec;
+ std::vector< OUString> vec;
sal_Int32 nIndex = 0;
do
{
@@ -567,7 +567,7 @@ css::uno::Sequence< OUString > DescriptionInfoset::getUrls(
return urls;
}
-::std::pair< OUString, OUString > DescriptionInfoset::getLocalizedPublisherNameAndURL() const
+std::pair< OUString, OUString > DescriptionInfoset::getLocalizedPublisherNameAndURL() const
{
css::uno::Reference< css::xml::dom::XNode > node =
getLocalizedChild("desc:publisher");
@@ -598,7 +598,7 @@ css::uno::Sequence< OUString > DescriptionInfoset::getUrls(
if (xURL.is())
sURL = xURL->getNodeValue();
}
- return ::std::make_pair(sPublisherName, sURL);
+ return std::make_pair(sPublisherName, sURL);
}
OUString DescriptionInfoset::getLocalizedReleaseNotesURL() const
@@ -692,8 +692,8 @@ DescriptionInfoset::getLocalizedChild( const OUString & sParent) const
if (! nodeMatch.is())
{
// Already tried full tag, continue with first fallback.
- const ::std::vector< OUString > aFallbacks( getOfficeLanguageTag().getFallbackStrings( false));
- for (::std::vector< OUString >::const_iterator it( aFallbacks.begin()); it != aFallbacks.end(); ++it)
+ const std::vector< OUString > aFallbacks( getOfficeLanguageTag().getFallbackStrings( false));
+ for (std::vector< OUString >::const_iterator it( aFallbacks.begin()); it != aFallbacks.end(); ++it)
{
nodeMatch = matchLanguageTag(xParent, *it);
if (nodeMatch.is())
diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx
index eda1d50f74b3..062f76668307 100644
--- a/desktop/source/deployment/misc/dp_ucb.cxx
+++ b/desktop/source/deployment/misc/dp_ucb.cxx
@@ -253,7 +253,7 @@ bool readLine( OUString * res, OUString const & startingWith,
return false;
}
-bool readProperties( ::std::list< ::std::pair< OUString, OUString> > & out_result,
+bool readProperties( std::list< std::pair< OUString, OUString> > & out_result,
::ucbhelper::Content & ucb_content )
{
// read whole file:
@@ -290,7 +290,7 @@ bool readProperties( ::std::list< ::std::pair< OUString, OUString> > & out_resul
{
OUString name = aLine.copy(0, posEqual);
OUString value = aLine.copy(posEqual + 1);
- out_result.push_back(::std::make_pair(name, value));
+ out_result.push_back(std::make_pair(name, value));
}
if (bEOF)
diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
index 71b859866001..7ed32c3d1fe0 100644
--- a/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
+++ b/desktop/source/deployment/registry/component/dp_compbackenddb.hxx
@@ -75,8 +75,8 @@ public:
{
Data(): javaTypeLibrary(false) {};
- ::std::list< OUString> implementationNames;
- ::std::vector< ::std::pair< OUString, OUString> >singletons;
+ std::list< OUString> implementationNames;
+ std::vector< std::pair< OUString, OUString> >singletons;
// map from singleton names to implementation names
bool javaTypeLibrary;
};
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index f2c1708f9478..2b04a5c5c94e 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -62,17 +62,17 @@ namespace backend {
namespace component {
namespace {
-typedef ::std::list<OUString> t_stringlist;
-typedef ::std::vector< ::std::pair<OUString, OUString> > t_stringpairvec;
+typedef std::list<OUString> t_stringlist;
+typedef std::vector< std::pair<OUString, OUString> > t_stringpairvec;
#define IMPLEMENTATION_NAME "com.sun.star.comp.deployment.component.PackageRegistryBackend"
/** return a vector of bootstrap variables which have been provided
as command arguments.
*/
-::std::vector<OUString> getCmdBootstrapVariables()
+std::vector<OUString> getCmdBootstrapVariables()
{
- ::std::vector<OUString> ret;
+ std::vector<OUString> ret;
sal_uInt32 count = osl_getCommandArgCount();
for (sal_uInt32 i = 0; i < count; i++)
{
@@ -976,7 +976,7 @@ void BackendImpl::addToUnoRc( RcItem kind, OUString const & url_,
const ::osl::MutexGuard guard( getMutex() );
unorc_verify_init( xCmdEnv );
t_stringlist & rSet = getRcItemList(kind);
- if (::std::find( rSet.begin(), rSet.end(), rcterm ) == rSet.end()) {
+ if (std::find( rSet.begin(), rSet.end(), rcterm ) == rSet.end()) {
rSet.push_front( rcterm ); // prepend to list, thus overriding
// write immediately:
m_unorc_modified = true;
@@ -1005,7 +1005,7 @@ bool BackendImpl::hasInUnoRc(
const OUString rcterm( dp_misc::makeRcTerm(url_) );
const ::osl::MutexGuard guard( getMutex() );
t_stringlist const & rSet = getRcItemList(kind);
- return ::std::find( rSet.begin(), rSet.end(), rcterm ) != rSet.end();
+ return std::find( rSet.begin(), rSet.end(), rcterm ) != rSet.end();
}
css::uno::Reference< css::uno::XComponentContext > BackendImpl::getRootContext()
@@ -1040,7 +1040,7 @@ Reference<XInterface> BackendImpl::insertObject(
OUString const & id, Reference<XInterface> const & xObject )
{
const ::osl::MutexGuard guard( getMutex() );
- const ::std::pair<t_string2object::iterator, bool> insertion(
+ const std::pair<t_string2object::iterator, bool> insertion(
m_backendObjects.insert( t_string2object::value_type(
id, xObject ) ) );
return insertion.first->second;
@@ -1061,7 +1061,7 @@ Reference<XComponentContext> raise_uno_process(
// javavm service uses unorc next to executable to retrieve deployed
// jar typelibs
- ::std::vector<OUString> args{
+ std::vector<OUString> args{
#if OSL_DEBUG_LEVEL == 0
"--quiet",
#endif
@@ -1072,7 +1072,7 @@ Reference<XComponentContext> raise_uno_process(
"-env:INIFILENAME=" };
//now add the bootstrap variables which were supplied on the command line
- ::std::vector<OUString> bootvars = getCmdBootstrapVariables();
+ std::vector<OUString> bootvars = getCmdBootstrapVariables();
args.insert(args.end(), bootvars.begin(), bootvars.end());
oslProcess hProcess;
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index b1b0e08cdcc4..1dd47424491d 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -62,7 +62,7 @@ namespace backend {
namespace configuration {
namespace {
-typedef ::std::list<OUString> t_stringlist;
+typedef std::list<OUString> t_stringlist;
class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
@@ -116,7 +116,7 @@ class BackendImpl : public ::dp_registry::backend::PackageRegistryBackend
#if HAVE_FEATURE_EXTENSIONS
// for backwards compatibility - nil if no (compatible) back-compat db present
- ::std::unique_ptr<PersistentMap> m_registeredPackages;
+ std::unique_ptr<PersistentMap> m_registeredPackages;
#endif
virtual void SAL_CALL disposing() override;
@@ -214,13 +214,13 @@ BackendImpl::BackendImpl(
//are still registers. Only after revoking and restarting OOo the folders
//can be removed. This works now, because the extension manager is a singleton
//and the backends are only create once per process.
- ::std::list<OUString> folders = m_backendDb->getAllDataUrls();
+ std::list<OUString> folders = m_backendDb->getAllDataUrls();
deleteUnusedFolders(OUString(), folders);
configmgrini_verify_init( xCmdEnv );
#if HAVE_FEATURE_EXTENSIONS
- ::std::unique_ptr<PersistentMap> pMap;
+ std::unique_ptr<PersistentMap> pMap;
OUString aCompatURL( makeURL( getCachePath(), "registered_packages.pmap" ) );
// Don't create it if it doesn't exist already
@@ -474,7 +474,7 @@ void BackendImpl::addToConfigmgrIni( bool isSchema, bool isURL, OUString const &
const ::osl::MutexGuard guard( getMutex() );
configmgrini_verify_init( xCmdEnv );
t_stringlist & rSet = getFiles(isSchema);
- if (::std::find( rSet.begin(), rSet.end(), rcterm ) == rSet.end()) {
+ if (std::find( rSet.begin(), rSet.end(), rcterm ) == rSet.end()) {
rSet.push_front( rcterm ); // prepend to list, thus overriding
// write immediately:
m_configmgrini_modified = true;
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
index a77fef4fbb3a..54c6f150fba8 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx
@@ -127,11 +127,11 @@ ConfigurationBackendDb::getEntry(OUString const & url)
}
}
-::std::list<OUString> ConfigurationBackendDb::getAllDataUrls()
+std::list<OUString> ConfigurationBackendDb::getAllDataUrls()
{
try
{
- ::std::list<OUString> listRet;
+ std::list<OUString> listRet;
Reference<css::xml::dom::XDocument> doc = getDocument();
Reference<css::xml::dom::XNode> root = doc->getFirstChild();
diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
index 88dd77640d9d..c09bff58512c 100644
--- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
+++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.hxx
@@ -70,7 +70,7 @@ public:
void addEntry(OUString const & url, Data const & data);
::boost::optional<Data> getEntry(OUString const & url);
- ::std::list< OUString> getAllDataUrls();
+ std::list< OUString> getAllDataUrls();
};
diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx
index 0ce14491b972..645f7df694d4 100644
--- a/desktop/source/deployment/registry/dp_backend.cxx
+++ b/desktop/source/deployment/registry/dp_backend.cxx
@@ -190,7 +190,7 @@ Reference<deployment::XPackage> PackageRegistryBackend::bindPackage(
guard.reset();
- ::std::pair< t_string2ref::iterator, bool > insertion(
+ std::pair< t_string2ref::iterator, bool > insertion(
m_bound.insert( t_string2ref::value_type( url, xNewPackage ) ) );
if (insertion.second)
{ // first insertion
@@ -253,7 +253,7 @@ void PackageRegistryBackend::deleteTempFolder(
//If the folderURL has no '_' then there is no corresponding tmp file.
void PackageRegistryBackend::deleteUnusedFolders(
OUString const & relUrl,
- ::std::list< OUString> const & usedFolders)
+ std::list< OUString> const & usedFolders)
{
try
{
@@ -265,7 +265,7 @@ void PackageRegistryBackend::deleteUnusedFolders(
StrTitle::createCursor( tempFolder, ::ucbhelper::INCLUDE_FOLDERS_ONLY ) );
// get all temp directories:
- ::std::vector<OUString> tempEntries;
+ std::vector<OUString> tempEntries;
while (xResultSet->next())
{
@@ -281,7 +281,7 @@ void PackageRegistryBackend::deleteUnusedFolders(
for (OUString & tempEntrie : tempEntries)
{
- if (::std::find( usedFolders.begin(), usedFolders.end(), tempEntrie ) ==
+ if (std::find( usedFolders.begin(), usedFolders.end(), tempEntrie ) ==
usedFolders.end())
{
deleteTempFolder(tempEntrie);
diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx
index dcc54711736c..127b07751cf4 100644
--- a/desktop/source/deployment/registry/dp_backenddb.cxx
+++ b/desktop/source/deployment/registry/dp_backenddb.cxx
@@ -266,7 +266,7 @@ Reference<css::xml::dom::XNode> BackendDb::getKeyElement(
//Only writes the data if there is at least one entry
void BackendDb::writeVectorOfPair(
- ::std::vector< ::std::pair< OUString, OUString > > const & vecPairs,
+ std::vector< std::pair< OUString, OUString > > const & vecPairs,
OUString const & sVectorTagName,
OUString const & sPairTagName,
OUString const & sFirstTagName,
@@ -288,7 +288,7 @@ void BackendDb::writeVectorOfPair(
xParent->appendChild(
Reference<css::xml::dom::XNode>(
vectorNode, css::uno::UNO_QUERY_THROW));
- typedef ::std::vector< ::std::pair< OUString, OUString > >::const_iterator CIT;
+ typedef std::vector< std::pair< OUString, OUString > >::const_iterator CIT;
for (CIT i = vecPairs.begin(); i != vecPairs.end(); ++i)
{
const Reference<css::xml::dom::XElement> pairNode(
@@ -336,7 +336,7 @@ void BackendDb::writeVectorOfPair(
}
}
-::std::vector< ::std::pair< OUString, OUString > >
+std::vector< std::pair< OUString, OUString > >
BackendDb::readVectorOfPair(
Reference<css::xml::dom::XNode> const & parent,
OUString const & sListTagName,
@@ -354,7 +354,7 @@ BackendDb::readVectorOfPair(
const Reference<css::xml::dom::XNodeList> listPairs =
xpathApi->selectNodeList(parent, sExprPairs);
- ::std::vector< ::std::pair< OUString, OUString > > retVector;
+ std::vector< std::pair< OUString, OUString > > retVector;
sal_Int32 length = listPairs->getLength();
for (sal_Int32 i = 0; i < length; i++)
{
@@ -368,7 +368,7 @@ BackendDb::readVectorOfPair(
xpathApi->selectSingleNode(aPair, sExprSecond);
OSL_ASSERT(first.is() && second.is());
- retVector.push_back(::std::make_pair(
+ retVector.push_back(std::make_pair(
first->getNodeValue(), second->getNodeValue()));
}
return retVector;
@@ -384,7 +384,7 @@ BackendDb::readVectorOfPair(
//Only writes the data if there is at least one entry
void BackendDb::writeSimpleList(
- ::std::list< OUString> const & list,
+ std::list< OUString> const & list,
OUString const & sListTagName,
OUString const & sMemberTagName,
Reference<css::xml::dom::XNode> const & xParent)
@@ -404,7 +404,7 @@ void BackendDb::writeSimpleList(
Reference<css::xml::dom::XNode>(
listNode, css::uno::UNO_QUERY_THROW));
- typedef ::std::list<OUString>::const_iterator ITC_ITEMS;
+ typedef std::list<OUString>::const_iterator ITC_ITEMS;
for (ITC_ITEMS i = list.begin(); i != list.end(); ++i)
{
const Reference<css::xml::dom::XNode> memberNode(
@@ -534,7 +534,7 @@ OUString BackendDb::readSimpleElement(
}
-::std::list< OUString> BackendDb::readList(
+std::list< OUString> BackendDb::readList(
Reference<css::xml::dom::XNode> const & parent,
OUString const & sListTagName,
OUString const & sMemberTagName)
@@ -549,7 +549,7 @@ OUString BackendDb::readSimpleElement(
const Reference<css::xml::dom::XNodeList> list =
xpathApi->selectNodeList(parent, sExprList);
- ::std::list<OUString > retList;
+ std::list<OUString > retList;
sal_Int32 length = list->getLength();
for (sal_Int32 i = 0; i < length; i++)
{
@@ -567,12 +567,12 @@ OUString BackendDb::readSimpleElement(
}
}
-::std::list<OUString> BackendDb::getOneChildFromAllEntries(
+std::list<OUString> BackendDb::getOneChildFromAllEntries(
OUString const & name)
{
try
{
- ::std::list<OUString> listRet;
+ std::list<OUString> listRet;
Reference<css::xml::dom::XDocument> doc = getDocument();
Reference<css::xml::dom::XNode> root = doc->getFirstChild();
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx
index 3e9463d2636b..d0b4211691ee 100644
--- a/desktop/source/deployment/registry/dp_registry.cxx
+++ b/desktop/source/deployment/registry/dp_registry.cxx
@@ -64,7 +64,7 @@ typedef ::cppu::WeakComponentImplHelper<
class PackageRegistryImpl : private MutexHolder, public t_helper
{
struct ci_string_hash {
- ::std::size_t operator () ( OUString const & str ) const {
+ std::size_t operator () ( OUString const & str ) const {
return str.toAsciiLowerCase().hashCode();
}
};
@@ -86,7 +86,7 @@ class PackageRegistryImpl : private MutexHolder, public t_helper
t_string2string m_filter2mediaType;
t_registryset m_ambiguousBackends;
t_registryset m_allBackends;
- ::std::vector< Reference<deployment::XPackageTypeInfo> > m_typesInfos;
+ std::vector< Reference<deployment::XPackageTypeInfo> > m_typesInfos;
void insertBackend(
Reference<deployment::XPackageRegistry> const & xBackend );
@@ -194,7 +194,7 @@ void PackageRegistryImpl::insertBackend(
const OUString mediaType( normalizeMediaType(
xPackageType->getMediaType() ) );
- ::std::pair<t_string2registry::iterator, bool> a_insertion(
+ std::pair<t_string2registry::iterator, bool> a_insertion(
m_mediaType2backend.insert( t_string2registry::value_type(
mediaType, xBackend ) ) );
if (a_insertion.second)
@@ -227,7 +227,7 @@ void PackageRegistryImpl::insertBackend(
bool ambig = (token.indexOf('*') >= 0 ||
token.indexOf('?') >= 0);
if (! ambig) {
- ::std::pair<t_string2string::iterator, bool> ins(
+ std::pair<t_string2string::iterator, bool> ins(
m_filter2mediaType.insert(
t_string2string::value_type(
token, mediaType ) ) );
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index 5c265a46d16a..9ccb725c3567 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -146,7 +146,7 @@ BackendImpl::BackendImpl(
//are still registers. Only after revoking and restarting OOo the folders
//can be removed. This works now, because the extension manager is a singleton
//and the backends are only create once per process.
- ::std::list<OUString> folders = m_backendDb->getAllDataUrls();
+ std::list<OUString> folders = m_backendDb->getAllDataUrls();
deleteUnusedFolders(OUString(), folders);
}
}
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
index 14df597abbf7..31ac496a1775 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx
@@ -123,7 +123,7 @@ HelpBackendDb::getEntry(OUString const & url)
}
}
-::std::list<OUString> HelpBackendDb::getAllDataUrls()
+std::list<OUString> HelpBackendDb::getAllDataUrls()
{
return getOneChildFromAllEntries("data-url");
}
diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
index 2dd822a0c197..0addaebe5e82 100644
--- a/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
+++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.hxx
@@ -68,7 +68,7 @@ public:
::boost::optional<Data> getEntry(OUString const & url);
//must also return the data urls for entries with @activ="false". That is,
//those are currently revoked.
- ::std::list< OUString> getAllDataUrls();
+ std::list< OUString> getAllDataUrls();
};
diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h
index ad717500c181..5df23c86ab57 100644
--- a/desktop/source/deployment/registry/inc/dp_backend.h
+++ b/desktop/source/deployment/registry/inc/dp_backend.h
@@ -256,7 +256,7 @@ protected:
*/
void deleteUnusedFolders(
OUString const & relUrl,
- ::std::list< OUString> const & usedFolders);
+ std::list< OUString> const & usedFolders);
/* deletes one folder with a "temporary" name and the corresponding
tmp file, which was used to derive the folder name.
*/
diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
index dfd556a53566..a127658cd99a 100644
--- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx
+++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx
@@ -70,13 +70,13 @@ protected:
OUString const & url);
void writeSimpleList(
- ::std::list< OUString> const & list,
+ std::list< OUString> const & list,
OUString const & sListTagName,
OUString const & sMemberTagName,
css::uno::Reference<css::xml::dom::XNode> const & xParent);
void writeVectorOfPair(
- ::std::vector< ::std::pair< OUString, OUString > > const & vecPairs,
+ std::vector< std::pair< OUString, OUString > > const & vecPairs,
OUString const & sVectorTagName,
OUString const & sPairTagName,
OUString const & sFirstTagName,
@@ -94,7 +94,7 @@ protected:
OUString const & sElementName,
css::uno::Reference<css::xml::dom::XNode> const & xParent);
- ::std::vector< ::std::pair< OUString, OUString > >
+ std::vector< std::pair< OUString, OUString > >
readVectorOfPair(
css::uno::Reference<css::xml::dom::XNode> const & parent,
OUString const & sListTagName,
@@ -102,14 +102,14 @@ protected:
OUString const & sFirstTagName,
OUString const & sSecondTagName);
- ::std::list< OUString> readList(
+ std::list< OUString> readList(
css::uno::Reference<css::xml::dom::XNode> const & parent,
OUString const & sListTagName,
OUString const & sMemberTagName);
/* returns the values of one particularly child element of all key elements.
*/
- ::std::list< OUString> getOneChildFromAllEntries(
+ std::list< OUString> getOneChildFromAllEntries(
OUString const & sElementName);
diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
index a5f06976855c..4b5b5e4fb601 100644
--- a/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
+++ b/desktop/source/deployment/registry/package/dp_extbackenddb.hxx
@@ -54,9 +54,9 @@ public:
/* every element consists of a pair of the url to the item (jar,rdb, etc)
and the media type
*/
- ::std::vector< ::std::pair< OUString, OUString> > items;
- typedef ::std::vector<
- ::std::pair< OUString, OUString> >::const_iterator ITC_ITEMS;
+ std::vector< std::pair< OUString, OUString> > items;
+ typedef std::vector<
+ std::pair< OUString, OUString> >::const_iterator ITC_ITEMS;
};
public:
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index a487ec95e6b4..98f7d6b16a0d 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -109,7 +109,7 @@ class BackendImpl : public ImplBaseT
Reference<ucb::XCommandEnvironment> const & xCmdEnv,
bool notifyDetectionError = true );
- typedef ::std::vector< Reference<deployment::XPackage> > t_packagevec;
+ typedef std::vector< Reference<deployment::XPackage> > t_packagevec;
void scanBundle(
t_packagevec & bundle,
::rtl::Reference<AbortChannel> const & abortChannel,
@@ -120,7 +120,7 @@ class BackendImpl : public ImplBaseT
::rtl::Reference<AbortChannel> const & abortChannel,
Reference<ucb::XCommandEnvironment> const & xCmdEnv,
bool skip_registration = false );
- ::std::vector<Reference<deployment::XPackage> > getPackagesFromDb(
+ std::vector<Reference<deployment::XPackage> > getPackagesFromDb(
Reference<ucb::XCommandEnvironment> const & xCmdEnv);
bool checkPlatform(
Reference<ucb::XCommandEnvironment > const & environment);
@@ -754,7 +754,7 @@ beans::StringPair BackendImpl::PackageImpl::getPublisherInfo()
{
if (m_bRemoved)
throw deployment::ExtensionRemovedException();
- ::std::pair< OUString, OUString > aInfo = getDescriptionInfoset().getLocalizedPublisherNameAndURL();
+ std::pair< OUString, OUString > aInfo = getDescriptionInfoset().getLocalizedPublisherNameAndURL();
beans::StringPair aStrPair( aInfo.first, aInfo.second );
return aStrPair;
}
@@ -866,7 +866,7 @@ void BackendImpl::PackageImpl::processPackage_(
}
}
data.items.push_back(
- ::std::make_pair(xPackage->getURL(),
+ std::make_pair(xPackage->getURL(),
xPackage->getPackageType()->getMediaType()));
}
getMyBackend()->addDataToDb(getURL(), data);
@@ -1071,7 +1071,7 @@ void BackendImpl::PackageImpl::exportTo(
exc.Message, RTL_TEXTENCODING_UTF8 ).getStr() );
}
- ::std::vector< Sequence<beans::PropertyValue> > manifest;
+ std::vector< Sequence<beans::PropertyValue> > manifest;
manifest.reserve( bundle.getLength() );
sal_Int32 baseURLlen = m_url_expanded.getLength();
Reference<deployment::XPackage> const *pbundle = bundle.getConstArray();
@@ -1371,8 +1371,8 @@ void BackendImpl::PackageImpl::scanBundle(
const LanguageTag& officeLocale = getOfficeLanguageTag();
- const ::std::vector< OUString > officeFallbacks( officeLocale.getFallbackStrings( true));
- const size_t nPenaltyMax = ::std::numeric_limits<size_t>::max();
+ const std::vector< OUString > officeFallbacks( officeLocale.getFallbackStrings( true));
+ const size_t nPenaltyMax = std::numeric_limits<size_t>::max();
size_t descrPenalty = nPenaltyMax;
OUString descrFile;
@@ -1429,7 +1429,7 @@ void BackendImpl::PackageImpl::scanBundle(
if (officeLocale.getLanguage() == descrTag.getLanguage())
{
size_t nPenalty = nPenaltyMax;
- const ::std::vector< OUString > descrFallbacks( descrTag.getFallbackStrings( true));
+ const std::vector< OUString > descrFallbacks( descrTag.getFallbackStrings( true));
for (size_t o=0; o < officeFallbacks.size() && nPenalty == nPenaltyMax; ++o)
{
for (size_t d=0; d < descrFallbacks.size() && nPenalty == nPenaltyMax; ++d)
@@ -1579,13 +1579,13 @@ OUString BackendImpl::PackageImpl::getDisplayName()
return sName;
}
-::std::vector<Reference<deployment::XPackage> >
+std::vector<Reference<deployment::XPackage> >
BackendImpl::PackageImpl::getPackagesFromDb(
Reference<ucb::XCommandEnvironment> const & xCmdEnv)
{
- ::std::vector<Reference<deployment::XPackage> > retVector;
+ std::vector<Reference<deployment::XPackage> > retVector;
- typedef ::std::vector< ::std::pair<OUString, OUString> >::const_iterator ITC;
+ typedef std::vector< std::pair<OUString, OUString> >::const_iterator ITC;
for (ITC i = m_dbData.items.begin(); i != m_dbData.items.end(); ++i)
{
Reference<deployment::XPackage> xExtension =
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 2f93f8ae756f..9061aeab34c8 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -232,7 +232,7 @@ bool MigrationImpl::doMigration()
bool result = false;
try {
NewVersionUIInfo aNewVersionUIInfo;
- ::std::vector< MigrationModuleInfo > vModulesInfo = dectectUIChangesForAllModules();
+ std::vector< MigrationModuleInfo > vModulesInfo = dectectUIChangesForAllModules();
aNewVersionUIInfo.init(vModulesInfo);
copyFiles();
@@ -912,9 +912,9 @@ void MigrationImpl::runServices()
}
}
-::std::vector< MigrationModuleInfo > MigrationImpl::dectectUIChangesForAllModules() const
+std::vector< MigrationModuleInfo > MigrationImpl::dectectUIChangesForAllModules() const
{
- ::std::vector< MigrationModuleInfo > vModulesInfo;
+ std::vector< MigrationModuleInfo > vModulesInfo;
const OUString MENUBAR("menubar");
const OUString TOOLBAR("toolbar");
@@ -987,8 +987,8 @@ void MigrationImpl::compareOldAndNewConfig(const OUString& sParent,
{
const OUString MENU_SEPARATOR(" | ");
- ::std::vector< MigrationItem > vOldItems;
- ::std::vector< MigrationItem > vNewItems;
+ std::vector< MigrationItem > vOldItems;
+ std::vector< MigrationItem > vNewItems;
uno::Sequence< beans::PropertyValue > aProp;
sal_Int32 nOldCount = xIndexOld->getCount();
sal_Int32 nNewCount = xIndexNew->getCount();
@@ -1023,11 +1023,11 @@ void MigrationImpl::compareOldAndNewConfig(const OUString& sParent,
}
}
- ::std::vector< MigrationItem >::iterator it;
+ std::vector< MigrationItem >::iterator it;
OUString sSibling;
for (it = vOldItems.begin(); it!=vOldItems.end(); ++it) {
- ::std::vector< MigrationItem >::iterator pFound = ::std::find(vNewItems.begin(), vNewItems.end(), *it);
+ std::vector< MigrationItem >::iterator pFound = std::find(vNewItems.begin(), vNewItems.end(), *it);
if (pFound != vNewItems.end() && it->m_xPopupMenu.is()) {
OUString sName;
if (!sParent.isEmpty())
@@ -1038,11 +1038,11 @@ void MigrationImpl::compareOldAndNewConfig(const OUString& sParent,
} else if (pFound == vNewItems.end()) {
MigrationItem aMigrationItem(sParent, sSibling, it->m_sCommandURL, it->m_xPopupMenu);
if (m_aOldVersionItemsHashMap.find(sResourceURL)==m_aOldVersionItemsHashMap.end()) {
- ::std::vector< MigrationItem > vMigrationItems;
+ std::vector< MigrationItem > vMigrationItems;
m_aOldVersionItemsHashMap.insert(MigrationHashMap::value_type(sResourceURL, vMigrationItems));
m_aOldVersionItemsHashMap[sResourceURL].push_back(aMigrationItem);
} else {
- if (::std::find(m_aOldVersionItemsHashMap[sResourceURL].begin(), m_aOldVersionItemsHashMap[sResourceURL].end(), aMigrationItem)==m_aOldVersionItemsHashMap[sResourceURL].end())
+ if (std::find(m_aOldVersionItemsHashMap[sResourceURL].begin(), m_aOldVersionItemsHashMap[sResourceURL].end(), aMigrationItem)==m_aOldVersionItemsHashMap[sResourceURL].end())
m_aOldVersionItemsHashMap[sResourceURL].push_back(aMigrationItem);
}
}
@@ -1060,7 +1060,7 @@ void MigrationImpl::mergeOldToNewVersion(const uno::Reference< ui::XUIConfigurat
if (pFound==m_aOldVersionItemsHashMap.end())
return;
- ::std::vector< MigrationItem >::iterator it;
+ std::vector< MigrationItem >::iterator it;
for (it=pFound->second.begin(); it!=pFound->second.end(); ++it) {
uno::Reference< container::XIndexContainer > xTemp = xIndexContainer;
@@ -1191,7 +1191,7 @@ uno::Reference< container::XIndexContainer > NewVersionUIInfo::getNewToolbarSett
return xNewToolbarSettings;
}
-void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModulesInfo)
+void NewVersionUIInfo::init(const std::vector< MigrationModuleInfo >& vModulesInfo)
{
m_lCfgManagerSeq.resize(vModulesInfo.size());
m_lNewVersionMenubarSettingsSeq.realloc(vModulesInfo.size());
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index cc16eef9f2a5..03a99349283f 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -140,7 +140,7 @@ struct MigrationModuleInfo
{
OUString sModuleShortName;
bool bHasMenubar;
- ::std::vector< OUString > m_vToolbars;
+ std::vector< OUString > m_vToolbars;
MigrationModuleInfo() : bHasMenubar(false) {};
};
@@ -156,7 +156,7 @@ public:
css::uno::Reference< css::ui::XUIConfigurationManager > getConfigManager(const OUString& sModuleShortName) const;
css::uno::Reference< css::container::XIndexContainer > getNewMenubarSettings(const OUString& sModuleShortName) const;
css::uno::Reference< css::container::XIndexContainer > getNewToolbarSettings(const OUString& sModuleShortName, const OUString& sToolbarName) const;
- void init(const ::std::vector< MigrationModuleInfo >& vModulesInfo);
+ void init(const std::vector< MigrationModuleInfo >& vModulesInfo);
private:
@@ -192,7 +192,7 @@ private:
static strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns);
static css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, bool rw=false);
- ::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const;
+ std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const;
void compareOldAndNewConfig(const OUString& sParentNodeName,
const css::uno::Reference< css::container::XIndexContainer >& xOldIndexContainer,
const css::uno::Reference< css::container::XIndexContainer >& xNewIndexContainer,
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index 907651433414..f766011d4821 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -154,8 +154,8 @@ private:
css::uno::Reference< css::configuration::backend::XLayer> m_xLayer;
void migrateJavarc();
- typedef ::std::pair< OUString, sal_Int16> TElementType;
- typedef ::std::stack< TElementType > TElementStack;
+ typedef std::pair< OUString, sal_Int16> TElementType;
+ typedef std::stack< TElementType > TElementStack;
TElementStack m_aStack;
};
diff --git a/desktop/source/migration/services/misc.hxx b/desktop/source/migration/services/misc.hxx
index f6018ed022f1..ca1320a2ac5d 100644
--- a/desktop/source/migration/services/misc.hxx
+++ b/desktop/source/migration/services/misc.hxx
@@ -30,8 +30,8 @@ namespace migration
{
- typedef ::std::vector< OUString > TStringVector;
- typedef ::std::unique_ptr< TStringVector > TStringVectorPtr;
+ typedef std::vector< OUString > TStringVector;
+ typedef std::unique_ptr< TStringVector > TStringVectorPtr;
} // namespace migration
diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
index 922f05caecd5..b3a5b72e5d5e 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx
@@ -194,7 +194,7 @@ extern "C" int unopkg_main()
OUString logFile;
OUString repository;
OUString cmdArg;
- ::std::vector<OUString> cmdPackages;
+ std::vector<OUString> cmdPackages;
OptionInfo const * info_shared = getOptionInfo(
s_option_infos, "shared" );
@@ -406,7 +406,7 @@ extern "C" int unopkg_main()
}
else if ( subCommand == "list" )
{
- ::std::vector<Reference<deployment::XPackage> > vecExtUnaccepted;
+ std::vector<Reference<deployment::XPackage> > vecExtUnaccepted;
::comphelper::sequenceToContainer(vecExtUnaccepted,
xExtensionManager->getExtensionsWithUnacceptedLicenses(
repository, xCmdEnv));
@@ -421,24 +421,24 @@ extern "C" int unopkg_main()
packages = xExtensionManager->getDeployedExtensions(
repository, Reference<task::XAbortChannel>(), xCmdEnv );
- ::std::vector<Reference<deployment::XPackage> > vec_packages;
+ std::vector<Reference<deployment::XPackage> > vec_packages;
::comphelper::sequenceToContainer(vec_packages, packages);
//First copy the extensions with the unaccepted license
//to vector allExtensions.
allExtensions.resize(vecExtUnaccepted.size() + vec_packages.size());
- ::std::vector<Reference<deployment::XPackage> >::iterator i_all_ext =
- ::std::copy(vecExtUnaccepted.begin(), vecExtUnaccepted.end(),
+ std::vector<Reference<deployment::XPackage> >::iterator i_all_ext =
+ std::copy(vecExtUnaccepted.begin(), vecExtUnaccepted.end(),
allExtensions.begin());
//Now copy those we got from getDeployedExtensions
- ::std::copy(vec_packages.begin(), vec_packages.end(), i_all_ext);
+ std::copy(vec_packages.begin(), vec_packages.end(), i_all_ext);
//Now prepare the vector which tells what extension has an
//unaccepted license
vecUnaccepted.resize(vecExtUnaccepted.size() + vec_packages.size());
- ::std::fill_n(vecUnaccepted.begin(), vecExtUnaccepted.size(), true);
- ::std::fill_n(vecUnaccepted.begin() + vecExtUnaccepted.size(),
+ std::fill_n(vecUnaccepted.begin(), vecExtUnaccepted.size(), true);
+ std::fill_n(vecUnaccepted.begin() + vecExtUnaccepted.size(),
vec_packages.size(), false);
dp_misc::writeConsole(
@@ -466,8 +466,8 @@ extern "C" int unopkg_main()
bool bUnacceptedLic = false;
if (!extension.is())
{
- ::std::vector<Reference<deployment::XPackage> >::const_iterator
- i = ::std::find_if(
+ std::vector<Reference<deployment::XPackage> >::const_iterator
+ i = std::find_if(
vecExtUnaccepted.begin(),
vecExtUnaccepted.end(), ExtensionName(cmdPackage));
if (i != vecExtUnaccepted.end())
@@ -495,7 +495,7 @@ extern "C" int unopkg_main()
}
else if ( subCommand == "validate" )
{
- ::std::vector<Reference<deployment::XPackage> > vecExtUnaccepted;
+ std::vector<Reference<deployment::XPackage> > vecExtUnaccepted;
::comphelper::sequenceToContainer(
vecExtUnaccepted, xExtensionManager->getExtensionsWithUnacceptedLicenses(
repository, xCmdEnv));
@@ -516,8 +516,8 @@ extern "C" int unopkg_main()
if (!extension.is())
{
- ::std::vector<Reference<deployment::XPackage> >::const_iterator
- i = ::std::find_if(
+ std::vector<Reference<deployment::XPackage> >::const_iterator
+ i = std::find_if(
vecExtUnaccepted.begin(),
vecExtUnaccepted.end(), ExtensionName(cmdPackage));
if (i != vecExtUnaccepted.end())
diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
index 031c6dda6e09..bf40197682d7 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
+++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx
@@ -280,9 +280,9 @@ void printf_package(
xPackage->getBundle( Reference<task::XAbortChannel>(), xCmdEnv ) );
printf_space( level + 1 );
dp_misc::writeConsole("bundled Packages: {\n");
- ::std::vector<Reference<deployment::XPackage> >vec_bundle;
+ std::vector<Reference<deployment::XPackage> >vec_bundle;
::comphelper::sequenceToContainer(vec_bundle, seq);
- printf_packages( vec_bundle, ::std::vector<bool>(vec_bundle.size()),
+ printf_packages( vec_bundle, std::vector<bool>(vec_bundle.size()),
xCmdEnv, level + 2 );
printf_space( level + 1 );
dp_misc::writeConsole("}\n");
@@ -303,8 +303,8 @@ void printf_unaccepted_licenses(
void printf_packages(
- ::std::vector< Reference<deployment::XPackage> > const & allExtensions,
- ::std::vector<bool> const & vecUnaccepted,
+ std::vector< Reference<deployment::XPackage> > const & allExtensions,
+ std::vector<bool> const & vecUnaccepted,
Reference<XCommandEnvironment> const & xCmdEnv, sal_Int32 level )
{
OSL_ASSERT(allExtensions.size() == vecUnaccepted.size());
@@ -316,7 +316,7 @@ void printf_packages(
}
else
{
- typedef ::std::vector< Reference<deployment::XPackage> >::const_iterator I_EXT;
+ typedef std::vector< Reference<deployment::XPackage> >::const_iterator I_EXT;
int index = 0;
for (I_EXT i = allExtensions.begin(); i != allExtensions.end(); ++i, ++index)
{
diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h
index aba49127b30f..1bd6a04b46bd 100644
--- a/desktop/source/pkgchk/unopkg/unopkg_shared.h
+++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h
@@ -107,9 +107,9 @@ css::uno::Reference<css::ucb::XCommandEnvironment> createCmdEnv(
bool option_suppressLicense);
void printf_packages(
- ::std::vector<
+ std::vector<
css::uno::Reference<css::deployment::XPackage> > const & allExtensions,
- ::std::vector<bool> const & vecUnaccepted,
+ std::vector<bool> const & vecUnaccepted,
css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv,
sal_Int32 level = 0 );