diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-25 18:56:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-04-27 10:10:52 +0200 |
| commit | f3049f68584811bb897873f35e0c302898af2d31 (patch) | |
| tree | b77f8bee3f733b8f2565a64276e33387576a26ac /sw/source/uibase | |
| parent | 28fc0962b10519ab84654d189d2ad0cca8f84f95 (diff) | |
loplugin:constantparam
Change-Id: I966dcf87be021520e7cc394338b9c0574bb8afee
Reviewed-on: https://gerrit.libreoffice.org/53541
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 8 | ||||
| -rw-r--r-- | sw/source/uibase/inc/numpara.hxx | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 76b2a4adfa04..b8ad0a08c8c5 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -2775,7 +2775,7 @@ In case of success it returns the registered name, otherwise an empty string. Optionally add a prefix to the registered DB name. */ OUString LoadAndRegisterDataSource_Impl(DBConnURIType type, const uno::Reference< beans::XPropertySet > *pSettings, - const INetURLObject &rURL, const OUString *pPrefix, const OUString *pDestDir, SfxObjectShell* pDocShell) + const INetURLObject &rURL, const OUString *pDestDir, SfxObjectShell* pDocShell) { OUString sExt(rURL.GetExtension()); uno::Any aTableFilterAny; @@ -2815,8 +2815,6 @@ OUString LoadAndRegisterDataSource_Impl(DBConnURIType type, const uno::Reference INetURLObject::DecodeMechanism::Unambiguous); sal_Int32 nExtLen = sExt.getLength(); sNewName = sNewName.replaceAt(sNewName.getLength() - nExtLen - 1, nExtLen + 1, ""); - if (pPrefix) - sNewName = *pPrefix + sNewName; //find a unique name if sNewName already exists sFind = sNewName; @@ -2965,7 +2963,7 @@ OUString SwDBManager::LoadAndRegisterDataSource(weld::Window* pParent, SwDocShel if( xSettingsDlg->execute() ) aSettings.set( uno::Reference < beans::XPropertySet >( xSettingsDlg, uno::UNO_QUERY_THROW ) ); } - sFind = LoadAndRegisterDataSource_Impl( type, DBConnURIType::FLAT == type ? &aSettings : nullptr, aURL, nullptr, nullptr, pDocShell ); + sFind = LoadAndRegisterDataSource_Impl( type, DBConnURIType::FLAT == type ? &aSettings : nullptr, aURL, nullptr, pDocShell ); m_aUncommitedRegistrations.push_back(std::pair<SwDocShell*, OUString>(pDocShell, sFind)); } @@ -2991,7 +2989,7 @@ void SwDBManager::StoreEmbeddedDataSource(const uno::Reference<frame::XStorable> OUString SwDBManager::LoadAndRegisterDataSource(const OUString &rURI, const OUString *pDestDir) { - return LoadAndRegisterDataSource_Impl( DBConnURIType::UNKNOWN, nullptr, INetURLObject(rURI), nullptr, pDestDir, nullptr ); + return LoadAndRegisterDataSource_Impl( DBConnURIType::UNKNOWN, nullptr, INetURLObject(rURI), pDestDir, nullptr ); } void SwDBManager::RevokeDataSource(const OUString& rName) diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 8f3fc77f1815..f0f78a271361 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -61,7 +61,7 @@ class SwParagraphNumTabPage final : public SfxTabPage static const sal_uInt16 aPageRg[]; - static bool ExecuteEditNumStyle_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr, + static bool ExecuteEditNumStyle_Impl( sal_uInt16 nId, const OUString& rStr, SfxStyleFamily nFamily ); public: |