diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-15 15:21:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-05-16 09:04:55 +0200 |
| commit | 196f46db1b5dfddda6972a6b738d8b77b6c3601e (patch) | |
| tree | 3264b328e2479c38f08e7db7e2f1e93df7c3539a /sfx2 | |
| parent | 19b4520fbfa8080821021586d8fe3428a2a893af (diff) | |
loplugin:constantparam
Change-Id: I0110e0c662004456e4bc8f8082e2e2fea59e0148
Reviewed-on: https://gerrit.libreoffice.org/54385
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/newhelp.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/sfxhelp.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/doc/DocumentMetadataAccess.cxx | 8 |
3 files changed, 6 insertions, 10 deletions
diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 4c6d4818910a..48213720b426 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -577,7 +577,7 @@ public: }; /// Appends ?Language=xy&System=abc to the help URL in rURL -void AppendConfigToken(OUStringBuffer& rURL, bool bQuestionMark, const OUString &rLang = OUString()); +void AppendConfigToken(OUStringBuffer& rURL, bool bQuestionMark); #endif // INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HXX diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 0ebb845b1dcc..9133afe6b8d9 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -272,11 +272,9 @@ static OUString HelpLocaleString() -void AppendConfigToken( OUStringBuffer& rURL, bool bQuestionMark, const OUString &rLang ) +void AppendConfigToken( OUStringBuffer& rURL, bool bQuestionMark ) { - OUString aLocaleStr( rLang ); - if ( aLocaleStr.isEmpty() ) - aLocaleStr = HelpLocaleString(); + OUString aLocaleStr = HelpLocaleString(); // query part exists? if ( bQuestionMark ) diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index bf765366e27f..ff6ad06ea6a7 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -478,7 +478,6 @@ handleError( ucb::InteractiveAugmentedIOException const & i_rException, e.g. ODB files seem to only have content.xml */ static void collectFilesFromStorage(uno::Reference<embed::XStorage> const& i_xStorage, - const OUString& i_Path, std::set< OUString > & o_rFiles) { static OUString content(s_content); @@ -487,12 +486,12 @@ collectFilesFromStorage(uno::Reference<embed::XStorage> const& i_xStorage, if (i_xStorage->hasByName(content) && i_xStorage->isStreamElement(content)) { - o_rFiles.insert(i_Path + content); + o_rFiles.insert(content); } if (i_xStorage->hasByName(styles) && i_xStorage->isStreamElement(styles)) { - o_rFiles.insert(i_Path + styles); + o_rFiles.insert(styles); } } catch (const uno::Exception &) { SAL_WARN("sfx", "collectFilesFromStorage: exception?"); @@ -1055,8 +1054,7 @@ void SAL_CALL DocumentMetadataAccess::loadMetadataFromStorage( initLoading(*m_pImpl, i_xStorage, i_xBaseURI, i_xHandler); std::set< OUString > StgFiles; - collectFilesFromStorage(i_xStorage, - "", StgFiles); + collectFilesFromStorage(i_xStorage, StgFiles); std::vector< OUString > MfstMetadataFiles; |