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/inc | |
| parent | c910d1dae1a9fcf0591098244debc863dd59618a (diff) | |
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/inc')
| -rw-r--r-- | desktop/source/deployment/inc/dp_descriptioninfoset.hxx | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/inc/dp_ucb.h | 2 | ||||
| -rw-r--r-- | desktop/source/deployment/inc/dp_update.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
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. |