diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-17 19:06:24 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-02-17 18:41:19 +0000 |
| commit | b57d51e32fb85e9cde64f85719725253162c42e4 (patch) | |
| tree | afe75470b9fc3c12a3d240577b07042985882675 /desktop/source/deployment/misc | |
| parent | Related: rhbz#1422353 make writer behave like calc and impress (diff) | |
| download | core-b57d51e32fb85e9cde64f85719725253162c42e4.tar.gz core-b57d51e32fb85e9cde64f85719725253162c42e4.zip | |
Drop :: prefix from std in [de]*/
Change-Id: I3247894fe022dce7f0aa351bd85fefcd7c545dd4
Reviewed-on: https://gerrit.libreoffice.org/34377
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'desktop/source/deployment/misc')
| -rw-r--r-- | desktop/source/deployment/misc/dp_descriptioninfoset.cxx | 10 | ||||
| -rw-r--r-- | desktop/source/deployment/misc/dp_ucb.cxx | 4 |
2 files changed, 7 insertions, 7 deletions
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) |