diff options
| author | Noel Grandin <noel@peralex.com> | 2015-11-06 09:23:33 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-11-09 08:34:40 +0000 |
| commit | 6c80a8fe89fadf9a2c7260a09c037a09462f53d1 (patch) | |
| tree | d36da9ee2a5fdc579d2a57ff6ba02deaddfa785a /sw/source | |
| parent | cid#1326599, cid#1326598: added throw (status generation) (diff) | |
| download | core-6c80a8fe89fadf9a2c7260a09c037a09462f53d1.tar.gz core-6c80a8fe89fadf9a2c7260a09c037a09462f53d1.zip | |
new loplugin: oncevar
Change-Id: If57390510dde4d166be3141b9f658a7453755d3f
Reviewed-on: https://gerrit.libreoffice.org/19815
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/docxexportfilter.cxx | 4 | ||||
| -rw-r--r-- | sw/source/filter/ww8/rtfexportfilter.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/dbui/dbmgr.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/shells/langhelper.cxx | 6 |
4 files changed, 5 insertions, 11 deletions
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx index d3c221305e4e..0076ed07fe43 100644 --- a/sw/source/filter/ww8/docxexportfilter.cxx +++ b/sw/source/filter/ww8/docxexportfilter.cxx @@ -98,9 +98,7 @@ OUString DocxExportFilter::getImplementationName() throw (css::uno::RuntimeExcep uno::Sequence< OUString > SAL_CALL DocxExport_getSupportedServiceNames() throw() { - const OUString aServiceName( "com.sun.star.document.ExportFilter" ); - const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); - return aSeq; + return uno::Sequence< OUString > { "com.sun.star.document.ExportFilter" }; } uno::Reference< uno::XInterface > SAL_CALL DocxExport_createInstance(const uno::Reference< uno::XComponentContext > & xCtx ) throw( uno::Exception ) diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx index 466e539ff1e3..b7ea8f22f38e 100644 --- a/sw/source/filter/ww8/rtfexportfilter.cxx +++ b/sw/source/filter/ww8/rtfexportfilter.cxx @@ -107,9 +107,7 @@ OUString RtfExport_getImplementationName() uno::Sequence< OUString > SAL_CALL RtfExport_getSupportedServiceNames() throw() { - const OUString aServiceName("com.sun.star.document.ExportFilter"); - const uno::Sequence< OUString > aSeq(&aServiceName, 1); - return aSeq; + return uno::Sequence< OUString > { "com.sun.star.document.ExportFilter" }; } uno::Reference< uno::XInterface > SAL_CALL RtfExport_createInstance(const uno::Reference< uno::XComponentContext >& xCtx) throw(uno::Exception) diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 868bf061e7ba..02f296e3a3ee 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -862,7 +862,7 @@ static void lcl_RemoveSectionLinks( SwWrtShell& rWorkShell ) static void lcl_SaveDoc( SfxObjectShell *xTargetDocShell, const char *name, int no = 0 ) { - OUString sExt( ".odt" ); + const OUString sExt( ".odt" ); OUString basename = OUString::createFromAscii( name ); if (no > 0) basename += OUString::number(no) + "-"; diff --git a/sw/source/uibase/shells/langhelper.cxx b/sw/source/uibase/shells/langhelper.cxx index 27329776a93e..3f9ced7a89d7 100644 --- a/sw/source/uibase/shells/langhelper.cxx +++ b/sw/source/uibase/shells/langhelper.cxx @@ -138,8 +138,6 @@ namespace SwLangHelper const OUString aSelectionLangPrefix("Current_"); const OUString aParagraphLangPrefix("Paragraph_"); const OUString aDocumentLangPrefix("Default_"); - const OUString aStrNone("LANGUAGE_NONE"); - const OUString aStrResetLangs("RESET_LANGUAGES"); sal_Int32 nPos = 0; bool bForSelection = true; @@ -181,9 +179,9 @@ namespace SwLangHelper rSh.ExtendedSelectAll(); } - if (aNewLangText == aStrNone) + if (aNewLangText == "LANGUAGE_NONE") SwLangHelper::SetLanguage_None( rSh, pOLV, aSelection, bForSelection, aEditAttr ); - else if (aNewLangText == aStrResetLangs) + else if (aNewLangText == "RESET_LANGUAGES") SwLangHelper::ResetLanguages( rSh, pOLV, aSelection, bForSelection ); else SwLangHelper::SetLanguage( rSh, pOLV, aSelection, aNewLangText, bForSelection, aEditAttr ); |