[Libreoffice-commits] core.git: 4 commits - include/test svtools/qa svtools/source svx/source sw/qa sw/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 31 10:54:59 UTC 2019
include/test/testinteractionhandler.hxx | 2
svtools/qa/unit/testHtmlWriter.cxx | 2
svtools/source/control/accessibleruler.cxx | 2
svtools/source/control/toolbarmenuacc.cxx | 2
svtools/source/control/valueacc.cxx | 2
svtools/source/filter/SvFilterOptionsDialog.cxx | 2
svtools/source/graphic/renderer.cxx | 2
svtools/source/hatchwindow/documentcloser.cxx | 2
svtools/source/hatchwindow/hatchwindowfactory.cxx | 2
svtools/source/misc/acceleratorexecute.cxx | 58 +--
svtools/source/misc/imagemgr.cxx | 184 +++++-----
svtools/source/table/tablecontrol.cxx | 4
svtools/source/uitest/uiobject.cxx | 2
svtools/source/uno/addrtempuno.cxx | 2
svtools/source/uno/fpicker.cxx | 12
svtools/source/uno/unoevent.cxx | 2
svtools/source/uno/unoimap.cxx | 8
svtools/source/uno/wizard/unowizard.cxx | 2
svx/source/accessibility/AccessibleControlShape.cxx | 10
svx/source/accessibility/AccessibleGraphicShape.cxx | 2
svx/source/accessibility/AccessibleOLEShape.cxx | 2
svx/source/accessibility/AccessibleShape.cxx | 4
svx/source/accessibility/GraphCtlAccessibleContext.cxx | 4
svx/source/accessibility/charmapacc.cxx | 2
svx/source/accessibility/svxrectctaccessiblecontext.cxx | 2
svx/source/customshapes/EnhancedCustomShapeEngine.cxx | 2
svx/source/dialog/ClassificationDialog.cxx | 10
svx/source/dialog/SafeModeUI.cxx | 2
svx/source/dialog/crashreportui.cxx | 2
svx/source/fmcomp/fmgridif.cxx | 6
svx/source/form/fmscriptingenv.cxx | 2
svx/source/form/fmshimp.cxx | 44 +-
svx/source/form/fmsrcimp.cxx | 4
svx/source/form/formcontroller.cxx | 4
svx/source/form/legacyformcontroller.cxx | 2
svx/source/form/xfm_addcondition.cxx | 2
svx/source/mnuctrls/smarttagmenu.cxx | 2
svx/source/sdr/primitive2d/primitivefactory2d.cxx | 2
svx/source/sidebar/PanelFactory.cxx | 2
svx/source/svdraw/svdhdl.cxx | 50 +-
svx/source/svdraw/svdibrow.cxx | 38 +-
svx/source/table/accessiblecell.cxx | 2
svx/source/table/accessibletableshape.cxx | 4
svx/source/table/tabledesign.cxx | 6
svx/source/tbxctrls/bulletsnumbering.cxx | 2
svx/source/tbxctrls/extrusioncontrols.cxx | 8
svx/source/tbxctrls/fontworkgallery.cxx | 4
svx/source/tbxctrls/linectrl.cxx | 2
svx/source/tbxctrls/tbcontrl.cxx | 8
svx/source/tbxctrls/tbunocontroller.cxx | 2
svx/source/tbxctrls/tbunosearchcontrollers.cxx | 14
svx/source/uitest/sdrobject.cxx | 2
svx/source/uitest/uiobject.cxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx | 2
svx/source/unodraw/UnoGraphicExporter.cxx | 2
svx/source/unodraw/UnoNamespaceMap.cxx | 2
svx/source/unodraw/XPropertyTable.cxx | 12
svx/source/unodraw/recoveryui.cxx | 2
svx/source/unodraw/unobtabl.cxx | 2
svx/source/unodraw/unoctabl.cxx | 2
svx/source/unodraw/unodtabl.cxx | 2
svx/source/unodraw/unogtabl.cxx | 2
svx/source/unodraw/unohtabl.cxx | 2
svx/source/unodraw/unomod.cxx | 4
svx/source/unodraw/unomtabl.cxx | 2
svx/source/unodraw/unopage.cxx | 2
svx/source/unodraw/unopool.cxx | 2
svx/source/unodraw/unoshape.cxx | 4
svx/source/unodraw/unoshcol.cxx | 2
svx/source/unodraw/unottabl.cxx | 2
svx/source/unogallery/unogalitem.cxx | 2
svx/source/unogallery/unogaltheme.cxx | 2
svx/source/unogallery/unogalthemeprovider.cxx | 2
svx/source/xml/xmlgrhlp.cxx | 4
sw/qa/extras/inc/swmodeltestbase.hxx | 8
sw/qa/extras/mailmerge/mailmerge.cxx | 2
sw/qa/extras/ooxmlexport/ooxmllinks.cxx | 4
sw/qa/extras/rtfimport/rtfimport.cxx | 5
sw/source/core/access/acccell.cxx | 2
sw/source/core/access/accdoc.cxx | 2
sw/source/core/access/accembedded.cxx | 2
sw/source/core/access/accfootnote.cxx | 4
sw/source/core/access/accgraphic.cxx | 2
sw/source/core/access/accheaderfooter.cxx | 4
sw/source/core/access/accpage.cxx | 2
sw/source/core/access/accpara.cxx | 2
sw/source/core/access/accpreview.cxx | 2
sw/source/core/access/acctable.cxx | 4
sw/source/core/access/acctextframe.cxx | 2
sw/source/core/doc/dbgoutsw.cxx | 24 -
sw/source/core/doc/doc.cxx | 2
sw/source/core/doc/docbm.cxx | 2
sw/source/core/doc/number.cxx | 2
sw/source/core/docnode/finalthreadmanager.cxx | 2
sw/source/core/layout/dumpfilter.cxx | 2
sw/source/core/tox/tox.cxx | 20 -
sw/source/core/txtnode/ndtxt.cxx | 6
sw/source/core/undo/SwRewriter.cxx | 8
sw/source/core/undo/undobj.cxx | 2
sw/source/core/unocore/SwXTextDefaults.cxx | 2
sw/source/core/unocore/unobkm.cxx | 2
sw/source/core/unocore/unochart.cxx | 8
sw/source/core/unocore/unocoll.cxx | 20 -
sw/source/core/unocore/unodraw.cxx | 6
sw/source/core/unocore/unoevent.cxx | 4
sw/source/core/unocore/unofield.cxx | 10
sw/source/core/unocore/unoframe.cxx | 10
sw/source/core/unocore/unoftn.cxx | 2
sw/source/core/unocore/unoidx.cxx | 10
sw/source/core/unocore/unoobj.cxx | 2
sw/source/core/unocore/unoobj2.cxx | 8
sw/source/core/unocore/unoparagraph.cxx | 2
sw/source/core/unocore/unoportenum.cxx | 2
sw/source/core/unocore/unoredlines.cxx | 4
sw/source/core/unocore/unorefmk.cxx | 6
sw/source/core/unocore/unosect.cxx | 2
sw/source/core/unocore/unosett.cxx | 12
sw/source/core/unocore/unosrch.cxx | 2
sw/source/core/unocore/unotbl.cxx | 14
sw/source/core/unocore/unotext.cxx | 2
sw/source/filter/basflt/iodetect.cxx | 4
sw/source/filter/ww8/docxattributeoutput.cxx | 64 +--
sw/source/filter/ww8/docxexportfilter.cxx | 2
sw/source/filter/ww8/writerwordglue.cxx | 2
sw/source/filter/ww8/wrtw8nds.cxx | 14
sw/source/filter/ww8/ww8atr.cxx | 2
sw/source/filter/xml/xmlfmt.cxx | 4
sw/source/ui/uno/swdetect.cxx | 2
sw/source/ui/vba/vbaaddin.cxx | 2
sw/source/ui/vba/vbaaddins.cxx | 2
sw/source/ui/vba/vbaapplication.cxx | 10
sw/source/ui/vba/vbaautotextentry.cxx | 4
sw/source/ui/vba/vbabookmark.cxx | 2
sw/source/ui/vba/vbabookmarks.cxx | 2
sw/source/ui/vba/vbaborders.cxx | 4
sw/source/ui/vba/vbacell.cxx | 2
sw/source/ui/vba/vbacells.cxx | 2
sw/source/ui/vba/vbacolumn.cxx | 2
sw/source/ui/vba/vbacolumns.cxx | 2
sw/source/ui/vba/vbadialog.cxx | 2
sw/source/ui/vba/vbadialogs.cxx | 2
sw/source/ui/vba/vbadocument.cxx | 6
sw/source/ui/vba/vbadocumentproperties.cxx | 8
sw/source/ui/vba/vbadocuments.cxx | 2
sw/source/ui/vba/vbaeventshelper.cxx | 2
sw/source/ui/vba/vbafield.cxx | 4
sw/source/ui/vba/vbafind.cxx | 2
sw/source/ui/vba/vbafont.cxx | 4
sw/source/ui/vba/vbaframe.cxx | 2
sw/source/ui/vba/vbaframes.cxx | 2
sw/source/ui/vba/vbaglobals.cxx | 2
sw/source/ui/vba/vbaheaderfooter.cxx | 2
sw/source/ui/vba/vbaheadersfooters.cxx | 2
sw/source/ui/vba/vbalistformat.cxx | 2
sw/source/ui/vba/vbalistgalleries.cxx | 2
sw/source/ui/vba/vbalistgallery.cxx | 2
sw/source/ui/vba/vbalistlevel.cxx | 2
sw/source/ui/vba/vbalistlevels.cxx | 2
sw/source/ui/vba/vbalisttemplate.cxx | 2
sw/source/ui/vba/vbalisttemplates.cxx | 2
sw/source/ui/vba/vbamailmerge.cxx | 2
sw/source/ui/vba/vbaoptions.cxx | 2
sw/source/ui/vba/vbapagesetup.cxx | 2
sw/source/ui/vba/vbapane.cxx | 2
sw/source/ui/vba/vbapanes.cxx | 2
sw/source/ui/vba/vbaparagraph.cxx | 4
sw/source/ui/vba/vbaparagraphformat.cxx | 2
sw/source/ui/vba/vbarange.cxx | 2
sw/source/ui/vba/vbareplacement.cxx | 2
sw/source/ui/vba/vbarevision.cxx | 2
sw/source/ui/vba/vbarevisions.cxx | 2
sw/source/ui/vba/vbarow.cxx | 2
sw/source/ui/vba/vbarows.cxx | 2
sw/source/ui/vba/vbasection.cxx | 2
sw/source/ui/vba/vbasections.cxx | 2
sw/source/ui/vba/vbaselection.cxx | 2
sw/source/ui/vba/vbastyle.cxx | 2
sw/source/ui/vba/vbastyle.hxx | 2
sw/source/ui/vba/vbastyles.cxx | 2
sw/source/ui/vba/vbasystem.cxx | 2
sw/source/ui/vba/vbatable.cxx | 2
sw/source/ui/vba/vbatableofcontents.cxx | 2
sw/source/ui/vba/vbatables.cxx | 2
sw/source/ui/vba/vbatablesofcontents.cxx | 2
sw/source/ui/vba/vbatabstop.cxx | 2
sw/source/ui/vba/vbatabstops.cxx | 2
sw/source/ui/vba/vbatemplate.cxx | 2
sw/source/ui/vba/vbavariable.cxx | 2
sw/source/ui/vba/vbavariables.cxx | 2
sw/source/ui/vba/vbaview.cxx | 2
sw/source/ui/vba/vbawindow.cxx | 6
sw/source/ui/vba/vbawrapformat.cxx | 2
sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx | 4
sw/source/uibase/misc/glosdoc.cxx | 4
sw/source/uibase/ribbar/workctrl.cxx | 2
sw/source/uibase/sidebar/SwPanelFactory.cxx | 2
sw/source/uibase/uitest/uiobject.cxx | 4
sw/source/uibase/uno/SwXDocumentSettings.cxx | 2
sw/source/uibase/uno/SwXFilterOptions.cxx | 2
sw/source/uibase/uno/unoatxt.cxx | 8
sw/source/uibase/uno/unodoc.cxx | 2
sw/source/uibase/uno/unomailmerge.cxx | 2
sw/source/uibase/uno/unomod.cxx | 6
sw/source/uibase/uno/unomodule.cxx | 2
sw/source/uibase/uno/unotxdoc.cxx | 10
sw/source/uibase/uno/unotxvw.cxx | 4
206 files changed, 579 insertions(+), 582 deletions(-)
New commits:
commit 086ce5c2bb036ca8268f8bcb19099866f8561047
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:48:09 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:54:17 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): svtools
Change-Id: I4d42441adf5408e0281577078b0d5537acb02513
Reviewed-on: https://gerrit.libreoffice.org/76641
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/svtools/qa/unit/testHtmlWriter.cxx b/svtools/qa/unit/testHtmlWriter.cxx
index 86da936b8ce8..70ba5a50a6f2 100644
--- a/svtools/qa/unit/testHtmlWriter.cxx
+++ b/svtools/qa/unit/testHtmlWriter.cxx
@@ -26,7 +26,7 @@ OString extractFromStream(SvMemoryStream& rStream)
rStream.WriteChar('\0');
rStream.Flush();
rStream.Seek(STREAM_SEEK_TO_BEGIN);
- return OString(static_cast<const sal_Char*>(rStream.GetData()));
+ return static_cast<const sal_Char*>(rStream.GetData());
}
}
diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx
index 80502f069b25..822f93a356e5 100644
--- a/svtools/source/control/accessibleruler.cxx
+++ b/svtools/source/control/accessibleruler.cxx
@@ -303,7 +303,7 @@ sal_Int32 SvtRulerAccessible::getBackground( )
// XServiceInfo
OUString SAL_CALL SvtRulerAccessible::getImplementationName()
{
- return OUString( "com.sun.star.comp.ui.SvtRulerAccessible" );
+ return "com.sun.star.comp.ui.SvtRulerAccessible";
}
sal_Bool SAL_CALL SvtRulerAccessible::supportsService( const OUString& sServiceName )
diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx
index df425a888250..86d952662e93 100644
--- a/svtools/source/control/toolbarmenuacc.cxx
+++ b/svtools/source/control/toolbarmenuacc.cxx
@@ -200,7 +200,7 @@ sal_Int16 SAL_CALL ToolbarMenuAcc::getAccessibleRole()
OUString SAL_CALL ToolbarMenuAcc::getAccessibleDescription()
{
ThrowIfDisposed();
- return OUString( "ToolbarMenu" );
+ return "ToolbarMenu";
}
diff --git a/svtools/source/control/valueacc.cxx b/svtools/source/control/valueacc.cxx
index c4f333f9b9c4..12a965280ece 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -262,7 +262,7 @@ sal_Int16 SAL_CALL ValueSetAcc::getAccessibleRole()
OUString SAL_CALL ValueSetAcc::getAccessibleDescription()
{
ThrowIfDisposed();
- return OUString( "ValueSet" );
+ return "ValueSet";
}
diff --git a/svtools/source/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter/SvFilterOptionsDialog.cxx
index 2879600544f7..7651eeecbede 100644
--- a/svtools/source/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter/SvFilterOptionsDialog.cxx
@@ -143,7 +143,7 @@ void SAL_CALL SvFilterOptionsDialog::initialize(const uno::Sequence<uno::Any>& r
// XServiceInfo
OUString SAL_CALL SvFilterOptionsDialog::getImplementationName()
{
- return OUString( "com.sun.star.svtools.SvFilterOptionsDialog" );
+ return "com.sun.star.svtools.SvFilterOptionsDialog";
}
sal_Bool SAL_CALL SvFilterOptionsDialog::supportsService( const OUString& rServiceName )
{
diff --git a/svtools/source/graphic/renderer.cxx b/svtools/source/graphic/renderer.cxx
index 602fbc16e1f8..bae898873953 100644
--- a/svtools/source/graphic/renderer.cxx
+++ b/svtools/source/graphic/renderer.cxx
@@ -140,7 +140,7 @@ void SAL_CALL GraphicRendererVCL::release()
OUString SAL_CALL GraphicRendererVCL::getImplementationName()
{
- return OUString( "com.sun.star.comp.graphic.GraphicRendererVCL" );
+ return "com.sun.star.comp.graphic.GraphicRendererVCL";
}
sal_Bool SAL_CALL GraphicRendererVCL::supportsService( const OUString& ServiceName )
diff --git a/svtools/source/hatchwindow/documentcloser.cxx b/svtools/source/hatchwindow/documentcloser.cxx
index 3316efd32a42..e94403073477 100644
--- a/svtools/source/hatchwindow/documentcloser.cxx
+++ b/svtools/source/hatchwindow/documentcloser.cxx
@@ -210,7 +210,7 @@ void SAL_CALL ODocumentCloser::removeEventListener( const uno::Reference< lang::
// XServiceInfo
OUString SAL_CALL ODocumentCloser::getImplementationName( )
{
- return OUString( "com.sun.star.comp.embed.DocumentCloser" );
+ return "com.sun.star.comp.embed.DocumentCloser";
}
sal_Bool SAL_CALL ODocumentCloser::supportsService( const OUString& ServiceName )
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index d602b681d123..63004c951004 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx
@@ -64,7 +64,7 @@ uno::Reference< embed::XHatchWindow > SAL_CALL OHatchWindowFactory::createHatchW
OUString SAL_CALL OHatchWindowFactory::getImplementationName()
{
- return OUString( "com.sun.star.comp.embed.HatchWindowFactory" );
+ return "com.sun.star.comp.embed.HatchWindowFactory";
}
sal_Bool SAL_CALL OHatchWindowFactory::supportsService( const OUString& ServiceName )
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 65632e04cb07..6ad98b2c6fb0 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -294,65 +294,65 @@ OUString AcceleratorExecute::impl_ts_findCommand(const css::awt::KeyEvent& aKey)
switch( aKey.KeyCode )
{
case css::awt::Key::DELETE_TO_BEGIN_OF_LINE:
- return OUString( ".uno:DelToStartOfLine" );
+ return ".uno:DelToStartOfLine";
case css::awt::Key::DELETE_TO_END_OF_LINE:
- return OUString( ".uno:DelToEndOfLine" );
+ return ".uno:DelToEndOfLine";
case css::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH:
- return OUString( ".uno:DelToStartOfPara" );
+ return ".uno:DelToStartOfPara";
case css::awt::Key::DELETE_TO_END_OF_PARAGRAPH:
- return OUString( ".uno:DelToEndOfPara" );
+ return ".uno:DelToEndOfPara";
case css::awt::Key::DELETE_WORD_BACKWARD:
- return OUString( ".uno:DelToStartOfWord" );
+ return ".uno:DelToStartOfWord";
case css::awt::Key::DELETE_WORD_FORWARD:
- return OUString( ".uno:DelToEndOfWord" );
+ return ".uno:DelToEndOfWord";
case css::awt::Key::INSERT_LINEBREAK:
- return OUString( ".uno:InsertLinebreak" );
+ return ".uno:InsertLinebreak";
case css::awt::Key::INSERT_PARAGRAPH:
- return OUString( ".uno:InsertPara" );
+ return ".uno:InsertPara";
case css::awt::Key::MOVE_WORD_BACKWARD:
- return OUString( ".uno:GoToPrevWord" );
+ return ".uno:GoToPrevWord";
case css::awt::Key::MOVE_WORD_FORWARD:
- return OUString( ".uno:GoToNextWord" );
+ return ".uno:GoToNextWord";
case css::awt::Key::MOVE_TO_BEGIN_OF_LINE:
- return OUString( ".uno:GoToStartOfLine" );
+ return ".uno:GoToStartOfLine";
case css::awt::Key::MOVE_TO_END_OF_LINE:
- return OUString( ".uno:GoToEndOfLine" );
+ return ".uno:GoToEndOfLine";
case css::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH:
- return OUString( ".uno:GoToStartOfPara" );
+ return ".uno:GoToStartOfPara";
case css::awt::Key::MOVE_TO_END_OF_PARAGRAPH:
- return OUString( ".uno:GoToEndOfPara" );
+ return ".uno:GoToEndOfPara";
case css::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT:
- return OUString( ".uno:GoToStartOfDoc" );
+ return ".uno:GoToStartOfDoc";
case css::awt::Key::MOVE_TO_END_OF_DOCUMENT:
- return OUString( ".uno:GoToEndOfDoc" );
+ return ".uno:GoToEndOfDoc";
case css::awt::Key::SELECT_BACKWARD:
- return OUString( ".uno:CharLeftSel" );
+ return ".uno:CharLeftSel";
case css::awt::Key::SELECT_FORWARD:
- return OUString( ".uno:CharRightSel" );
+ return ".uno:CharRightSel";
case css::awt::Key::SELECT_WORD_BACKWARD:
- return OUString( ".uno:WordLeftSel" );
+ return ".uno:WordLeftSel";
case css::awt::Key::SELECT_WORD_FORWARD:
- return OUString( ".uno:WordRightSel" );
+ return ".uno:WordRightSel";
case css::awt::Key::SELECT_WORD:
- return OUString( ".uno:SelectWord" );
+ return ".uno:SelectWord";
case css::awt::Key::SELECT_LINE:
return OUString();
case css::awt::Key::SELECT_PARAGRAPH:
- return OUString( ".uno:SelectText" );
+ return ".uno:SelectText";
case css::awt::Key::SELECT_TO_BEGIN_OF_LINE:
- return OUString( ".uno:StartOfLineSel" );
+ return ".uno:StartOfLineSel";
case css::awt::Key::SELECT_TO_END_OF_LINE:
- return OUString( ".uno:EndOfLineSel" );
+ return ".uno:EndOfLineSel";
case css::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH:
- return OUString( ".uno:StartOfParaSel" );
+ return ".uno:StartOfParaSel";
case css::awt::Key::SELECT_TO_END_OF_PARAGRAPH:
- return OUString( ".uno:EndOfParaSel" );
+ return ".uno:EndOfParaSel";
case css::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT:
- return OUString( ".uno:StartOfDocumentSel" );
+ return ".uno:StartOfDocumentSel";
case css::awt::Key::SELECT_TO_END_OF_DOCUMENT:
- return OUString( ".uno:EndOfDocumentSel" );
+ return ".uno:EndOfDocumentSel";
case css::awt::Key::SELECT_ALL:
- return OUString( ".uno:SelectAll" );
+ return ".uno:SelectAll";
default:
break;
}
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index c459198daa3f..9026b65e62d8 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -487,97 +487,97 @@ static OUString GetImageNameFromList_Impl( SvImageId nImageId, bool bBig )
switch (nImageId)
{
case SvImageId::Impress:
- return OUString(BMP_IMPRESS_LC);
+ return BMP_IMPRESS_LC;
case SvImageId::Bitmap:
- return OUString(BMP_BITMAP_LC);
+ return BMP_BITMAP_LC;
case SvImageId::Calc:
- return OUString(BMP_CALC_LC);
+ return BMP_CALC_LC;
case SvImageId::CalcTemplate:
- return OUString(BMP_CALCTEMPLATE_LC);
+ return BMP_CALCTEMPLATE_LC;
case SvImageId::Database:
- return OUString(BMP_DATABASE_LC);
+ return BMP_DATABASE_LC;
case SvImageId::ImpressTemplate:
- return OUString(BMP_IMPRESSTEMPLATE_LC);
+ return BMP_IMPRESSTEMPLATE_LC;
case SvImageId::GIF:
- return OUString(BMP_GIF_LC);
+ return BMP_GIF_LC;
case SvImageId::HTML:
- return OUString(BMP_HTML_LC);
+ return BMP_HTML_LC;
case SvImageId::JPG:
- return OUString(BMP_JPG_LC);
+ return BMP_JPG_LC;
case SvImageId::Math:
- return OUString(BMP_MATH_LC);
+ return BMP_MATH_LC;
case SvImageId::MathTemplate:
- return OUString(BMP_MATHTEMPLATE_LC);
+ return BMP_MATHTEMPLATE_LC;
case SvImageId::File:
- return OUString(BMP_FILE_LC);
+ return BMP_FILE_LC;
case SvImageId::PCD:
- return OUString(BMP_PCD_LC);
+ return BMP_PCD_LC;
case SvImageId::PCT:
- return OUString(BMP_PCT_LC);
+ return BMP_PCT_LC;
case SvImageId::PCX:
- return OUString(BMP_PCX_LC);
+ return BMP_PCX_LC;
case SvImageId::SIM:
- return OUString(BMP_SIM_LC);
+ return BMP_SIM_LC;
case SvImageId::TextFile:
- return OUString(BMP_TEXTFILE_LC);
+ return BMP_TEXTFILE_LC;
case SvImageId::TIFF:
- return OUString(BMP_TIFF_LC);
+ return BMP_TIFF_LC;
case SvImageId::WMF:
- return OUString(BMP_WMF_LC);
+ return BMP_WMF_LC;
case SvImageId::Writer:
- return OUString(BMP_WRITER_LC);
+ return BMP_WRITER_LC;
case SvImageId::WriterTemplate:
- return OUString(BMP_WRITERTEMPLATE_LC);
+ return BMP_WRITERTEMPLATE_LC;
case SvImageId::FixedDevice:
- return OUString(BMP_FIXEDDEV_LC);
+ return BMP_FIXEDDEV_LC;
case SvImageId::RemoveableDevice:
- return OUString(BMP_REMOVABLEDEV_LC);
+ return BMP_REMOVABLEDEV_LC;
case SvImageId::CDRomDevice:
- return OUString(BMP_CDROMDEV_LC);
+ return BMP_CDROMDEV_LC;
case SvImageId::NetworkDevice:
- return OUString(BMP_NETWORKDEV_LC);
+ return BMP_NETWORKDEV_LC;
case SvImageId::Table:
- return OUString(BMP_TABLE_LC);
+ return BMP_TABLE_LC;
case SvImageId::Folder:
- return OUString(BMP_FOLDER_LC);
+ return BMP_FOLDER_LC;
case SvImageId::DXF:
- return OUString(BMP_DXF_LC);
+ return BMP_DXF_LC;
case SvImageId::MET:
- return OUString(BMP_MET_LC);
+ return BMP_MET_LC;
case SvImageId::PNG:
- return OUString(BMP_PNG_LC);
+ return BMP_PNG_LC;
case SvImageId::SVM:
- return OUString(BMP_SVM_LC);
+ return BMP_SVM_LC;
case SvImageId::GlobalDoc:
- return OUString(BMP_GLOBAL_DOC_LC);
+ return BMP_GLOBAL_DOC_LC;
case SvImageId::Draw:
- return OUString(BMP_DRAW_LC);
+ return BMP_DRAW_LC;
case SvImageId::DrawTemplate:
- return OUString(BMP_DRAWTEMPLATE_LC);
+ return BMP_DRAWTEMPLATE_LC;
case SvImageId::OO_DatabaseDoc:
- return OUString(BMP_OO_DATABASE_DOC_LC);
+ return BMP_OO_DATABASE_DOC_LC;
case SvImageId::OO_DrawDoc:
- return OUString(BMP_OO_DRAW_DOC_LC);
+ return BMP_OO_DRAW_DOC_LC;
case SvImageId::OO_MathDoc:
- return OUString(BMP_OO_MATH_DOC_LC);
+ return BMP_OO_MATH_DOC_LC;
case SvImageId::OO_GlobalDoc:
- return OUString(BMP_OO_GLOBAL_DOC_LC);
+ return BMP_OO_GLOBAL_DOC_LC;
case SvImageId::OO_ImpressDoc:
- return OUString(BMP_OO_IMPRESS_DOC_LC);
+ return BMP_OO_IMPRESS_DOC_LC;
case SvImageId::OO_CalcDoc:
- return OUString(BMP_OO_CALC_DOC_LC);
+ return BMP_OO_CALC_DOC_LC;
case SvImageId::OO_WriterDoc:
- return OUString(BMP_OO_WRITER_DOC_LC);
+ return BMP_OO_WRITER_DOC_LC;
case SvImageId::OO_DrawTemplate:
- return OUString(BMP_OO_DRAW_TEMPLATE_LC);
+ return BMP_OO_DRAW_TEMPLATE_LC;
case SvImageId::OO_ImpressTemplate:
- return OUString(BMP_OO_IMPRESS_TEMPLATE_LC);
+ return BMP_OO_IMPRESS_TEMPLATE_LC;
case SvImageId::OO_CalcTemplate:
- return OUString(BMP_OO_CALC_TEMPLATE_LC);
+ return BMP_OO_CALC_TEMPLATE_LC;
case SvImageId::OO_WriterTemplate:
- return OUString(BMP_OO_WRITER_TEMPLATE_LC);
+ return BMP_OO_WRITER_TEMPLATE_LC;
case SvImageId::Extension:
- return OUString(BMP_EXTENSION_LC);
+ return BMP_EXTENSION_LC;
default: break;
}
}
@@ -586,98 +586,98 @@ static OUString GetImageNameFromList_Impl( SvImageId nImageId, bool bBig )
switch (nImageId)
{
case SvImageId::Impress:
- return OUString(BMP_IMPRESS_SC);
+ return BMP_IMPRESS_SC;
case SvImageId::Bitmap:
- return OUString(BMP_BITMAP_SC);
+ return BMP_BITMAP_SC;
case SvImageId::Calc:
- return OUString(BMP_CALC_SC);
+ return BMP_CALC_SC;
case SvImageId::CalcTemplate:
- return OUString(BMP_CALCTEMPLATE_SC);
+ return BMP_CALCTEMPLATE_SC;
case SvImageId::Database:
- return OUString(BMP_DATABASE_SC);
+ return BMP_DATABASE_SC;
case SvImageId::ImpressTemplate:
- return OUString(BMP_IMPRESSTEMPLATE_SC);
+ return BMP_IMPRESSTEMPLATE_SC;
case SvImageId::GIF:
- return OUString(BMP_GIF_SC);
+ return BMP_GIF_SC;
case SvImageId::HTML:
- return OUString(BMP_HTML_SC);
+ return BMP_HTML_SC;
case SvImageId::JPG:
- return OUString(BMP_JPG_SC);
+ return BMP_JPG_SC;
case SvImageId::Math:
- return OUString(BMP_MATH_SC);
+ return BMP_MATH_SC;
case SvImageId::MathTemplate:
- return OUString(BMP_MATHTEMPLATE_SC);
+ return BMP_MATHTEMPLATE_SC;
case SvImageId::File:
- return OUString(BMP_FILE_SC);
+ return BMP_FILE_SC;
case SvImageId::PCD:
- return OUString(BMP_PCD_SC);
+ return BMP_PCD_SC;
case SvImageId::PCT:
- return OUString(BMP_PCT_SC);
+ return BMP_PCT_SC;
case SvImageId::PCX:
- return OUString(BMP_PCX_SC);
+ return BMP_PCX_SC;
case SvImageId::SIM:
- return OUString(BMP_SIM_SC);
+ return BMP_SIM_SC;
case SvImageId::TextFile:
- return OUString(BMP_TEXTFILE_SC);
+ return BMP_TEXTFILE_SC;
case SvImageId::TIFF:
- return OUString(BMP_TIFF_SC);
+ return BMP_TIFF_SC;
case SvImageId::WMF:
- return OUString(BMP_WMF_SC);
+ return BMP_WMF_SC;
case SvImageId::Writer:
- return OUString(BMP_WRITER_SC);
+ return BMP_WRITER_SC;
case SvImageId::WriterTemplate:
- return OUString(BMP_WRITERTEMPLATE_SC);
+ return BMP_WRITERTEMPLATE_SC;
case SvImageId::FixedDevice:
- return OUString(BMP_FIXEDDEV_SC);
+ return BMP_FIXEDDEV_SC;
case SvImageId::RemoveableDevice:
- return OUString(BMP_REMOVABLEDEV_SC);
+ return BMP_REMOVABLEDEV_SC;
case SvImageId::CDRomDevice:
- return OUString(BMP_CDROMDEV_SC);
+ return BMP_CDROMDEV_SC;
case SvImageId::NetworkDevice:
- return OUString(BMP_NETWORKDEV_SC);
+ return BMP_NETWORKDEV_SC;
case SvImageId::Table:
- return OUString(BMP_TABLE_SC);
+ return BMP_TABLE_SC;
case SvImageId::Folder:
// if not bBig, then return our new small folder image (256 colors)
- return OUString(RID_BMP_FOLDER);
+ return RID_BMP_FOLDER;
case SvImageId::DXF:
- return OUString(BMP_DXF_SC);
+ return BMP_DXF_SC;
case SvImageId::MET:
- return OUString(BMP_MET_SC);
+ return BMP_MET_SC;
case SvImageId::PNG:
- return OUString(BMP_PNG_SC);
+ return BMP_PNG_SC;
case SvImageId::SVM:
- return OUString(BMP_SVM_SC);
+ return BMP_SVM_SC;
case SvImageId::GlobalDoc:
- return OUString(BMP_GLOBAL_DOC_SC);
+ return BMP_GLOBAL_DOC_SC;
case SvImageId::Draw:
- return OUString(BMP_DRAW_SC);
+ return BMP_DRAW_SC;
case SvImageId::DrawTemplate:
- return OUString(BMP_DRAWTEMPLATE_SC);
+ return BMP_DRAWTEMPLATE_SC;
case SvImageId::OO_DatabaseDoc:
- return OUString(BMP_OO_DATABASE_DOC_SC);
+ return BMP_OO_DATABASE_DOC_SC;
case SvImageId::OO_DrawDoc:
- return OUString(BMP_OO_DRAW_DOC_SC);
+ return BMP_OO_DRAW_DOC_SC;
case SvImageId::OO_MathDoc:
- return OUString(BMP_OO_MATH_DOC_SC);
+ return BMP_OO_MATH_DOC_SC;
case SvImageId::OO_GlobalDoc:
- return OUString(BMP_OO_GLOBAL_DOC_SC);
+ return BMP_OO_GLOBAL_DOC_SC;
case SvImageId::OO_ImpressDoc:
- return OUString(BMP_OO_IMPRESS_DOC_SC);
+ return BMP_OO_IMPRESS_DOC_SC;
case SvImageId::OO_CalcDoc:
- return OUString(BMP_OO_CALC_DOC_SC);
+ return BMP_OO_CALC_DOC_SC;
case SvImageId::OO_WriterDoc:
- return OUString(BMP_OO_WRITER_DOC_SC);
+ return BMP_OO_WRITER_DOC_SC;
case SvImageId::OO_DrawTemplate:
- return OUString(BMP_OO_DRAW_TEMPLATE_SC);
+ return BMP_OO_DRAW_TEMPLATE_SC;
case SvImageId::OO_ImpressTemplate:
- return OUString(BMP_OO_IMPRESS_TEMPLATE_SC);
+ return BMP_OO_IMPRESS_TEMPLATE_SC;
case SvImageId::OO_CalcTemplate:
- return OUString(BMP_OO_CALC_TEMPLATE_SC);
+ return BMP_OO_CALC_TEMPLATE_SC;
case SvImageId::OO_WriterTemplate:
- return OUString(BMP_OO_WRITER_TEMPLATE_SC);
+ return BMP_OO_WRITER_TEMPLATE_SC;
case SvImageId::Extension:
- return OUString(BMP_EXTENSION_SC);
+ return BMP_EXTENSION_SC;
default: break;
}
}
diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx
index 2a9a25c067d8..1a72110773fd 100644
--- a/svtools/source/table/tablecontrol.cxx
+++ b/svtools/source/table/tablecontrol.cxx
@@ -383,7 +383,7 @@ namespace svt { namespace table
OUString TableControl::GetRowDescription( sal_Int32) const
{
- return OUString( "row description" );
+ return "row description";
}
@@ -397,7 +397,7 @@ namespace svt { namespace table
OUString TableControl::GetColumnDescription( sal_uInt16) const
{
- return OUString( "col description" );
+ return "col description";
}
diff --git a/svtools/source/uitest/uiobject.cxx b/svtools/source/uitest/uiobject.cxx
index 3c0a34b26a8d..a636f1c36d8a 100644
--- a/svtools/source/uitest/uiobject.cxx
+++ b/svtools/source/uitest/uiobject.cxx
@@ -38,7 +38,7 @@ StringMap SimpleTableUIObject::get_state()
OUString SimpleTableUIObject::get_type() const
{
- return OUString("SimpleTable");
+ return "SimpleTable";
}
std::unique_ptr<UIObject> SimpleTableUIObject::createFromContainer(vcl::Window* pWindow)
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index c6086c141954..eadefa255584 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -97,7 +97,7 @@ namespace {
OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName()
{
- return OUString( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" );
+ return "com.sun.star.comp.svtools.OAddressBookSourceDialogUno";
}
diff --git a/svtools/source/uno/fpicker.cxx b/svtools/source/uno/fpicker.cxx
index 8ca591e1f692..1628d21f1d1c 100644
--- a/svtools/source/uno/fpicker.cxx
+++ b/svtools/source/uno/fpicker.cxx
@@ -40,9 +40,9 @@ static OUString FilePicker_getSystemPickerServiceName()
#ifdef UNX
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx"))
- return OUString ("com.sun.star.ui.dialogs.AquaFilePicker");
+ return "com.sun.star.ui.dialogs.AquaFilePicker";
else
- return OUString ("com.sun.star.ui.dialogs.SystemFilePicker");
+ return "com.sun.star.ui.dialogs.SystemFilePicker";
#endif
#ifdef _WIN32
return OUString ("com.sun.star.ui.dialogs.Win32FilePicker");
@@ -95,7 +95,7 @@ Reference< css::uno::XInterface > FilePicker_CreateInstance (
OUString FilePicker_getImplementationName()
{
- return OUString("com.sun.star.comp.svt.FilePicker");
+ return "com.sun.star.comp.svt.FilePicker";
}
Sequence< OUString > FilePicker_getSupportedServiceNames()
@@ -112,9 +112,9 @@ static OUString FolderPicker_getSystemPickerServiceName()
#ifdef UNX
OUString aDesktopEnvironment (Application::GetDesktopEnvironment());
if (aDesktopEnvironment.equalsIgnoreAsciiCase("macosx"))
- return OUString("com.sun.star.ui.dialogs.AquaFolderPicker");
+ return "com.sun.star.ui.dialogs.AquaFolderPicker";
#endif
- return OUString("com.sun.star.ui.dialogs.SystemFolderPicker");
+ return "com.sun.star.ui.dialogs.SystemFolderPicker";
}
Reference< css::uno::XInterface > FolderPicker_CreateInstance (
@@ -160,7 +160,7 @@ Reference< css::uno::XInterface > FolderPicker_CreateInstance (
OUString FolderPicker_getImplementationName()
{
- return OUString("com.sun.star.comp.svt.FolderPicker");
+ return "com.sun.star.comp.svt.FolderPicker";
}
Sequence< OUString > FolderPicker_getSupportedServiceNames()
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index dfd43f93d46a..91e1a880f613 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -406,7 +406,7 @@ sal_Int16 SvDetachedEventDescriptor::getIndex(const SvMacroItemId nID) const
OUString SvDetachedEventDescriptor::getImplementationName()
{
- return OUString("SvDetachedEventDescriptor");
+ return "SvDetachedEventDescriptor";
}
diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx
index cba13aef070d..5bc83c726e49 100644
--- a/svtools/source/uno/unoimap.cxx
+++ b/svtools/source/uno/unoimap.cxx
@@ -386,11 +386,11 @@ OUString SAL_CALL SvUnoImageMapObject::getImplementationName()
{
case IMAP_OBJ_POLYGON:
default:
- return OUString("org.openoffice.comp.svt.ImageMapPolygonObject");
+ return "org.openoffice.comp.svt.ImageMapPolygonObject";
case IMAP_OBJ_CIRCLE:
- return OUString("org.openoffice.comp.svt.ImageMapCircleObject");
+ return "org.openoffice.comp.svt.ImageMapCircleObject";
case IMAP_OBJ_RECTANGLE:
- return OUString("org.openoffice.comp.svt.ImageMapRectangleObject");
+ return "org.openoffice.comp.svt.ImageMapRectangleObject";
}
}
@@ -650,7 +650,7 @@ sal_Bool SAL_CALL SvUnoImageMap::hasElements( )
// XSerivceInfo
OUString SAL_CALL SvUnoImageMap::getImplementationName( )
{
- return OUString( "org.openoffice.comp.svt.SvUnoImageMap" );
+ return "org.openoffice.comp.svt.SvUnoImageMap";
}
sal_Bool SAL_CALL SvUnoImageMap::supportsService( const OUString& ServiceName )
diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx
index 650ba4965c45..f3f9f28cd890 100644
--- a/svtools/source/uno/wizard/unowizard.cxx
+++ b/svtools/source/uno/wizard/unowizard.cxx
@@ -257,7 +257,7 @@ namespace {
OUString SAL_CALL Wizard::getImplementationName()
{
- return OUString("com.sun.star.comp.svtools.uno.Wizard");
+ return "com.sun.star.comp.svtools.uno.Wizard";
}
commit 06daea730e65b70f1a2c6adaeeeaa8fc2927a311
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:48:02 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:54:10 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): svx
Change-Id: Idbdee862f96a3d9e6baaa7203528a423c017eb80
Reviewed-on: https://gerrit.libreoffice.org/76640
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 4c4c87601a3b..47f4c41aff01 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -67,19 +67,19 @@ namespace
{
OUString lcl_getNamePropertyName( )
{
- return OUString( "Name" );
+ return "Name";
}
OUString lcl_getDescPropertyName( )
{
- return OUString( "HelpText" );
+ return "HelpText";
}
OUString lcl_getLabelPropertyName( )
{
- return OUString( "Label" );
+ return "Label";
}
OUString lcl_getLabelControlPropertyName( )
{
- return OUString("LabelControl");
+ return "LabelControl";
}
// return the property which should be used as AccessibleName
const OUString lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI )
@@ -298,7 +298,7 @@ void SAL_CALL AccessibleControlShape::grabFocus()
OUString SAL_CALL AccessibleControlShape::getImplementationName()
{
- return OUString( "com.sun.star.comp.accessibility.AccessibleControlShape" );
+ return "com.sun.star.comp.accessibility.AccessibleControlShape";
}
OUString AccessibleControlShape::CreateAccessibleBaseName()
diff --git a/svx/source/accessibility/AccessibleGraphicShape.cxx b/svx/source/accessibility/AccessibleGraphicShape.cxx
index 2b8034ca55a2..04a7a9644ee1 100644
--- a/svx/source/accessibility/AccessibleGraphicShape.cxx
+++ b/svx/source/accessibility/AccessibleGraphicShape.cxx
@@ -97,7 +97,7 @@ void SAL_CALL
OUString SAL_CALL
AccessibleGraphicShape::getImplementationName()
{
- return OUString("AccessibleGraphicShape");
+ return "AccessibleGraphicShape";
}
diff --git a/svx/source/accessibility/AccessibleOLEShape.cxx b/svx/source/accessibility/AccessibleOLEShape.cxx
index b2e76fd70074..5f4b03995665 100644
--- a/svx/source/accessibility/AccessibleOLEShape.cxx
+++ b/svx/source/accessibility/AccessibleOLEShape.cxx
@@ -102,7 +102,7 @@ void SAL_CALL
OUString SAL_CALL
AccessibleOLEShape::getImplementationName()
{
- return OUString("AccessibleOLEShape");
+ return "AccessibleOLEShape";
}
diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx
index bac37417d92a..fd6b7af7c028 100644
--- a/svx/source/accessibility/AccessibleShape.cxx
+++ b/svx/source/accessibility/AccessibleShape.cxx
@@ -315,7 +315,7 @@ OUString SAL_CALL AccessibleShape::getAccessibleDescription()
if( m_pShape && !m_pShape->GetDescription().isEmpty())
return m_pShape->GetDescription() ;
else
- return OUString(" ");
+ return " ";
}
// XAccessibleContext
@@ -877,7 +877,7 @@ uno::Any SAL_CALL AccessibleShape::getExtendedAttributes()
OUString SAL_CALL
AccessibleShape::getImplementationName()
{
- return OUString("AccessibleShape");
+ return "AccessibleShape";
}
diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
index db79abc3f03b..cd90f449c9bb 100644
--- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx
+++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx
@@ -491,7 +491,7 @@ sal_Int32 SAL_CALL SvxGraphCtrlAccessibleContext::getBackground()
// XServiceInfo
OUString SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationName()
{
- return OUString( "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext" );
+ return "com.sun.star.comp.ui.SvxGraphCtrlAccessibleContext";
}
sal_Bool SAL_CALL SvxGraphCtrlAccessibleContext::supportsService( const OUString& sServiceName )
@@ -519,7 +519,7 @@ Sequence<sal_Int8> SAL_CALL SvxGraphCtrlAccessibleContext::getImplementationId()
// XServiceName
OUString SvxGraphCtrlAccessibleContext::getServiceName()
{
- return OUString( "com.sun.star.accessibility.AccessibleContext" );
+ return "com.sun.star.accessibility.AccessibleContext";
}
// XAccessibleSelection
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 1f89a39fb0b6..c90e60359610 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -524,7 +524,7 @@ sal_Bool SvxShowCharSetItemAcc::doAccessibleAction ( sal_Int32 nIndex )
OUString SvxShowCharSetItemAcc::getAccessibleActionDescription ( sal_Int32 nIndex )
{
if( nIndex == 0 )
- return OUString( "press" );
+ return "press";
throw IndexOutOfBoundsException();
}
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 55e1f2410d2e..2557ae3cf05f 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -587,7 +587,7 @@ OUString SvxRectCtlChildAccessibleContext::getAccessibleActionDescription ( sal_
if ( nIndex < 0 || nIndex >= getAccessibleActionCount() )
throw IndexOutOfBoundsException();
- return OUString("select");
+ return "select";
}
diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
index 31cda0abcabd..7e7bcca224a8 100644
--- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
+++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx
@@ -135,7 +135,7 @@ void SAL_CALL EnhancedCustomShapeEngine::initialize( const Sequence< Any >& aArg
// XServiceInfo
OUString SAL_CALL EnhancedCustomShapeEngine::getImplementationName()
{
- return OUString( "com.sun.star.drawing.EnhancedCustomShapeEngine" );
+ return "com.sun.star.drawing.EnhancedCustomShapeEngine";
}
sal_Bool SAL_CALL EnhancedCustomShapeEngine::supportsService( const OUString& rServiceName )
{
diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx
index 6dbe5dc41a54..895688d07b51 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -119,15 +119,15 @@ OUString classificationTypeToString(svx::ClassificationType const & reType)
switch(reType)
{
case svx::ClassificationType::CATEGORY:
- return OUString("CATEGORY"); break;
+ return "CATEGORY"; break;
case svx::ClassificationType::MARKING:
- return OUString("MARKING"); break;
+ return "MARKING"; break;
case svx::ClassificationType::TEXT:
- return OUString("TEXT"); break;
+ return "TEXT"; break;
case svx::ClassificationType::INTELLECTUAL_PROPERTY_PART:
- return OUString("INTELLECTUAL_PROPERTY_PART"); break;
+ return "INTELLECTUAL_PROPERTY_PART"; break;
case svx::ClassificationType::PARAGRAPH:
- return OUString("PARAGRAPH"); break;
+ return "PARAGRAPH"; break;
}
return OUString();
}
diff --git a/svx/source/dialog/SafeModeUI.cxx b/svx/source/dialog/SafeModeUI.cxx
index d8e8ad9aad0c..970bef37ce47 100644
--- a/svx/source/dialog/SafeModeUI.cxx
+++ b/svx/source/dialog/SafeModeUI.cxx
@@ -43,7 +43,7 @@ SafeModeUI::SafeModeUI()
OUString SAL_CALL SafeModeUI::getImplementationName()
{
- return OUString("com.sun.star.comp.svx.SafeModeUI");
+ return "com.sun.star.comp.svx.SafeModeUI";
}
sal_Bool SAL_CALL SafeModeUI::supportsService(const OUString& sServiceName)
diff --git a/svx/source/dialog/crashreportui.cxx b/svx/source/dialog/crashreportui.cxx
index 535124d96c50..5384e3c18c9a 100644
--- a/svx/source/dialog/crashreportui.cxx
+++ b/svx/source/dialog/crashreportui.cxx
@@ -45,7 +45,7 @@ CrashReportUI::CrashReportUI()
OUString SAL_CALL CrashReportUI::getImplementationName()
{
- return OUString("com.sun.star.comp.svx.CrashReportUI");
+ return "com.sun.star.comp.svx.CrashReportUI";
}
sal_Bool SAL_CALL CrashReportUI::supportsService(const OUString& sServiceName)
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 007d1d8de543..5a18461de6a2 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/svx/source/fmcomp/fmgridif.cxx
@@ -376,7 +376,7 @@ sal_Bool SAL_CALL FmXGridControl::supportsService(const OUString& ServiceName)
OUString SAL_CALL FmXGridControl::getImplementationName()
{
- return OUString("com.sun.star.form.FmXGridControl");
+ return "com.sun.star.form.FmXGridControl";
}
css::uno::Sequence<OUString> SAL_CALL FmXGridControl::getSupportedServiceNames()
@@ -404,7 +404,7 @@ void SAL_CALL FmXGridControl::dispose()
OUString FmXGridControl::GetComponentServiceName()
{
- return OUString("DBGrid");
+ return "DBGrid";
}
@@ -1024,7 +1024,7 @@ namespace fmgridif
{
static const OUString getDataModeIdentifier()
{
- return OUString("DataMode");
+ return "DataMode";
}
}
using namespace fmgridif;
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 2f123a881f18..bddfc8827b6f 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -817,7 +817,7 @@ namespace svxform
// XServiceInfo
virtual OUString SAL_CALL getImplementationName() override
{
- return OUString("com.sun.star.comp.svx.StarBasicQuitGuard");
+ return "com.sun.star.comp.svx.StarBasicQuitGuard";
}
virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 5f796a94e9ab..0c896ef0436b 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -439,28 +439,28 @@ namespace
{
switch (nType)
{
- case OBJ_FM_EDIT : return OUString(FM_COMPONENT_TEXTFIELD);
- case OBJ_FM_BUTTON : return OUString(FM_COMPONENT_COMMANDBUTTON);
- case OBJ_FM_FIXEDTEXT : return OUString(FM_COMPONENT_FIXEDTEXT);
- case OBJ_FM_LISTBOX : return OUString(FM_COMPONENT_LISTBOX);
- case OBJ_FM_CHECKBOX : return OUString(FM_COMPONENT_CHECKBOX);
- case OBJ_FM_RADIOBUTTON : return OUString(FM_COMPONENT_RADIOBUTTON);
- case OBJ_FM_GROUPBOX : return OUString(FM_COMPONENT_GROUPBOX);
- case OBJ_FM_COMBOBOX : return OUString(FM_COMPONENT_COMBOBOX);
- case OBJ_FM_GRID : return OUString(FM_COMPONENT_GRIDCONTROL);
- case OBJ_FM_IMAGEBUTTON : return OUString(FM_COMPONENT_IMAGEBUTTON);
- case OBJ_FM_FILECONTROL : return OUString(FM_COMPONENT_FILECONTROL);
- case OBJ_FM_DATEFIELD : return OUString(FM_COMPONENT_DATEFIELD);
- case OBJ_FM_TIMEFIELD : return OUString(FM_COMPONENT_TIMEFIELD);
- case OBJ_FM_NUMERICFIELD : return OUString(FM_COMPONENT_NUMERICFIELD);
- case OBJ_FM_CURRENCYFIELD : return OUString(FM_COMPONENT_CURRENCYFIELD);
- case OBJ_FM_PATTERNFIELD : return OUString(FM_COMPONENT_PATTERNFIELD);
- case OBJ_FM_HIDDEN : return OUString(FM_COMPONENT_HIDDENCONTROL);
- case OBJ_FM_IMAGECONTROL : return OUString(FM_COMPONENT_IMAGECONTROL);
- case OBJ_FM_FORMATTEDFIELD : return OUString(FM_COMPONENT_FORMATTEDFIELD);
- case OBJ_FM_SCROLLBAR : return OUString(FM_SUN_COMPONENT_SCROLLBAR);
- case OBJ_FM_SPINBUTTON : return OUString(FM_SUN_COMPONENT_SPINBUTTON);
- case OBJ_FM_NAVIGATIONBAR : return OUString(FM_SUN_COMPONENT_NAVIGATIONBAR);
+ case OBJ_FM_EDIT : return FM_COMPONENT_TEXTFIELD;
+ case OBJ_FM_BUTTON : return FM_COMPONENT_COMMANDBUTTON;
+ case OBJ_FM_FIXEDTEXT : return FM_COMPONENT_FIXEDTEXT;
+ case OBJ_FM_LISTBOX : return FM_COMPONENT_LISTBOX;
+ case OBJ_FM_CHECKBOX : return FM_COMPONENT_CHECKBOX;
+ case OBJ_FM_RADIOBUTTON : return FM_COMPONENT_RADIOBUTTON;
+ case OBJ_FM_GROUPBOX : return FM_COMPONENT_GROUPBOX;
+ case OBJ_FM_COMBOBOX : return FM_COMPONENT_COMBOBOX;
+ case OBJ_FM_GRID : return FM_COMPONENT_GRIDCONTROL;
+ case OBJ_FM_IMAGEBUTTON : return FM_COMPONENT_IMAGEBUTTON;
+ case OBJ_FM_FILECONTROL : return FM_COMPONENT_FILECONTROL;
+ case OBJ_FM_DATEFIELD : return FM_COMPONENT_DATEFIELD;
+ case OBJ_FM_TIMEFIELD : return FM_COMPONENT_TIMEFIELD;
+ case OBJ_FM_NUMERICFIELD : return FM_COMPONENT_NUMERICFIELD;
+ case OBJ_FM_CURRENCYFIELD : return FM_COMPONENT_CURRENCYFIELD;
+ case OBJ_FM_PATTERNFIELD : return FM_COMPONENT_PATTERNFIELD;
+ case OBJ_FM_HIDDEN : return FM_COMPONENT_HIDDENCONTROL;
+ case OBJ_FM_IMAGECONTROL : return FM_COMPONENT_IMAGECONTROL;
+ case OBJ_FM_FORMATTEDFIELD : return FM_COMPONENT_FORMATTEDFIELD;
+ case OBJ_FM_SCROLLBAR : return FM_SUN_COMPONENT_SCROLLBAR;
+ case OBJ_FM_SPINBUTTON : return FM_SUN_COMPONENT_SPINBUTTON;
+ case OBJ_FM_NAVIGATIONBAR : return FM_SUN_COMPONENT_NAVIGATIONBAR;
}
return OUString();
}
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 96e993b6527c..6634c981616a 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -181,8 +181,8 @@ OUString CheckBoxWrapper::getCurrentText() const
{
switch (static_cast<TriState>(m_xBox->getState()))
{
- case TRISTATE_FALSE: return OUString("0");
- case TRISTATE_TRUE: return OUString("1");
+ case TRISTATE_FALSE: return "0";
+ case TRISTATE_TRUE: return "1";
default: break;
}
return OUString();
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 1dc951452899..9af97e6789dd 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -457,7 +457,7 @@ public:
{
}
- virtual OUString GetComponentServiceName() override {return OUString("Edit");}
+ virtual OUString GetComponentServiceName() override {return "Edit";}
virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) override;
protected:
@@ -647,7 +647,7 @@ sal_Bool SAL_CALL FormController::supportsService(const OUString& ServiceName)
OUString SAL_CALL FormController::getImplementationName()
{
- return OUString("org.openoffice.comp.svx.FormController");
+ return "org.openoffice.comp.svx.FormController";
}
Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames()
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index e234ef955de6..a310423da8d0 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -175,7 +175,7 @@ namespace svxform
OUString SAL_CALL LegacyFormController::getImplementationName( )
{
- return OUString( "org.openoffice.comp.svx.LegacyFormController" );
+ return "org.openoffice.comp.svx.LegacyFormController";
}
sal_Bool SAL_CALL LegacyFormController::supportsService( const OUString& _serviceName )
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index a99ae039a363..fecbc2d99c27 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -58,7 +58,7 @@ namespace svxform
OUString OAddConditionDialog_GetImplementationName()
{
- return OUString("org.openoffice.comp.svx.OAddConditionDialog");
+ return "org.openoffice.comp.svx.OAddConditionDialog";
}
OAddConditionDialog::OAddConditionDialog( const Reference< XComponentContext >& _rxORB )
diff --git a/svx/source/mnuctrls/smarttagmenu.cxx b/svx/source/mnuctrls/smarttagmenu.cxx
index 2780cf383f95..106234bde46c 100644
--- a/svx/source/mnuctrls/smarttagmenu.cxx
+++ b/svx/source/mnuctrls/smarttagmenu.cxx
@@ -218,7 +218,7 @@ IMPL_LINK( SmartTagMenuController, MenuSelect, Menu*, pMenu, bool )
OUString SmartTagMenuController::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.SmartTagMenuController" );
+ return "com.sun.star.comp.svx.SmartTagMenuController";
}
css::uno::Sequence< OUString > SmartTagMenuController::getSupportedServiceNames()
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 8520b0ae0f16..0c094a2a19b7 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -49,7 +49,7 @@ public:
virtual css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > SAL_CALL createPrimitivesFromXDrawPage( const css::uno::Reference< css::drawing::XDrawPage >& xDrawPage, const css::uno::Sequence< css::beans::PropertyValue >& aParms ) override;
OUString SAL_CALL getImplementationName() override
- { return OUString("com.sun.star.comp.graphic.PrimitiveFactory2D"); }
+ { return "com.sun.star.comp.graphic.PrimitiveFactory2D"; }
sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index 304ec88328dd..78d0113001a2 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -79,7 +79,7 @@ public:
const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
OUString SAL_CALL getImplementationName() override
- { return OUString("org.apache.openoffice.comp.svx.sidebar.PanelFactory"); }
+ { return "org.apache.openoffice.comp.svx.sidebar.PanelFactory"; }
sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 9dbab10e315b..cb0b545dc45b 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -672,48 +672,48 @@ OUString appendMarkerName(BitmapMarkerKind eKindOfMarker)
switch(eKindOfMarker)
{
case BitmapMarkerKind::Rect_7x7:
- return OUString("rect7");
+ return "rect7";
case BitmapMarkerKind::Rect_9x9:
- return OUString("rect9");
+ return "rect9";
case BitmapMarkerKind::Rect_11x11:
- return OUString("rect11");
+ return "rect11";
case BitmapMarkerKind::Rect_13x13:
- return OUString("rect13");
+ return "rect13";
case BitmapMarkerKind::Circ_7x7:
case BitmapMarkerKind::Customshape_7x7:
- return OUString("circ7");
+ return "circ7";
case BitmapMarkerKind::Circ_9x9:
case BitmapMarkerKind::Customshape_9x9:
- return OUString("circ9");
+ return "circ9";
case BitmapMarkerKind::Circ_11x11:
case BitmapMarkerKind::Customshape_11x11:
- return OUString("circ11");
+ return "circ11";
case BitmapMarkerKind::Elli_7x9:
- return OUString("elli7x9");
+ return "elli7x9";
case BitmapMarkerKind::Elli_9x11:
- return OUString("elli9x11");
+ return "elli9x11";
case BitmapMarkerKind::Elli_9x7:
- return OUString("elli9x7");
+ return "elli9x7";
case BitmapMarkerKind::Elli_11x9:
- return OUString("elli11x9");
+ return "elli11x9";
case BitmapMarkerKind::RectPlus_7x7:
- return OUString("rectplus7");
+ return "rectplus7";
case BitmapMarkerKind::RectPlus_9x9:
- return OUString("rectplus9");
+ return "rectplus9";
case BitmapMarkerKind::RectPlus_11x11:
- return OUString("rectplus11");
+ return "rectplus11";
case BitmapMarkerKind::Crosshair:
- return OUString("cross");
+ return "cross";
case BitmapMarkerKind::Anchor:
case BitmapMarkerKind::AnchorTR:
- return OUString("anchor");
+ return "anchor";
case BitmapMarkerKind::AnchorPressed:
case BitmapMarkerKind::AnchorPressedTR:
- return OUString("anchor-pressed");
+ return "anchor-pressed";
case BitmapMarkerKind::Glue:
- return OUString("glue-selected");
+ return "glue-selected";
case BitmapMarkerKind::Glue_Deselected:
- return OUString("glue-unselected");
+ return "glue-unselected";
default:
break;
}
@@ -725,17 +725,17 @@ OUString appendMarkerColor(BitmapColorIndex eIndex)
switch(eIndex)
{
case BitmapColorIndex::LightGreen:
- return OUString("1");
+ return "1";
case BitmapColorIndex::Cyan:
- return OUString("2");
+ return "2";
case BitmapColorIndex::LightCyan:
- return OUString("3");
+ return "3";
case BitmapColorIndex::Red:
- return OUString("4");
+ return "4";
case BitmapColorIndex::LightRed:
- return OUString("5");
+ return "5";
case BitmapColorIndex::Yellow:
- return OUString("6");
+ return "6";
default:
break;
}
diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx
index 40a9bbdc4429..300ebe3677ce 100644
--- a/svx/source/svdraw/svdibrow.cxx
+++ b/svx/source/svdraw/svdibrow.cxx
@@ -126,25 +126,25 @@ OUString ImpItemListRow::GetItemTypeStr() const
{
switch(eItemType)
{
- case ItemType::BYTE : return OUString("Byte"); break;
- case ItemType::INT16 : return OUString("Int16"); break;
- case ItemType::UINT16 : return OUString("UInt16"); break;
- case ItemType::INT32 : return OUString("Int32"); break;
- case ItemType::UINT32 : return OUString("UInt32"); break;
- case ItemType::ENUM : return OUString("Enum"); break;
- case ItemType::BOOL : return OUString("Bool"); break;
- case ItemType::FLAG : return OUString("Flag"); break;
- case ItemType::STRING : return OUString("String"); break;
- case ItemType::POINT : return OUString("Point"); break;
- case ItemType::RECT : return OUString("Rectangle");break;
- case ItemType::RANGE : return OUString("Range"); break;
- case ItemType::FRACTION : return OUString("Fraction"); break;
- case ItemType::XCOLOR : return OUString("XColor"); break;
- case ItemType::COLOR : return OUString("Color"); break;
- case ItemType::FONT : return OUString("Font"); break;
- case ItemType::FONTHEIGHT: return OUString("FontHeight");break;
- case ItemType::FONTWIDTH : return OUString("FontWidth"); break;
- case ItemType::FIELD : return OUString("Field"); break;
+ case ItemType::BYTE : return "Byte"; break;
+ case ItemType::INT16 : return "Int16"; break;
+ case ItemType::UINT16 : return "UInt16"; break;
+ case ItemType::INT32 : return "Int32"; break;
+ case ItemType::UINT32 : return "UInt32"; break;
+ case ItemType::ENUM : return "Enum"; break;
+ case ItemType::BOOL : return "Bool"; break;
+ case ItemType::FLAG : return "Flag"; break;
+ case ItemType::STRING : return "String"; break;
+ case ItemType::POINT : return "Point"; break;
+ case ItemType::RECT : return "Rectangle";break;
+ case ItemType::RANGE : return "Range"; break;
+ case ItemType::FRACTION : return "Fraction"; break;
+ case ItemType::XCOLOR : return "XColor"; break;
+ case ItemType::COLOR : return "Color"; break;
+ case ItemType::FONT : return "Font"; break;
+ case ItemType::FONTHEIGHT: return "FontHeight";break;
+ case ItemType::FONTWIDTH : return "FontWidth"; break;
+ case ItemType::FIELD : return "Field"; break;
default: break;
}
diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx
index 9762801c5224..4f87f9ca8b47 100644
--- a/svx/source/table/accessiblecell.cxx
+++ b/svx/source/table/accessiblecell.cxx
@@ -466,7 +466,7 @@ void SAL_CALL AccessibleCell::removeAccessibleEventListener( const Reference<XAc
OUString SAL_CALL AccessibleCell::getImplementationName()
{
- return OUString("AccessibleCell");
+ return "AccessibleCell";
}
diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx
index 96488136caaf..bab37ae9ffc5 100644
--- a/svx/source/table/accessibletableshape.cxx
+++ b/svx/source/table/accessibletableshape.cxx
@@ -391,13 +391,13 @@ void SAL_CALL AccessibleTableShape::release( ) throw ()
OUString SAL_CALL AccessibleTableShape::getImplementationName()
{
- return OUString( "com.sun.star.comp.accessibility.AccessibleTableShape" );
+ return "com.sun.star.comp.accessibility.AccessibleTableShape";
}
OUString AccessibleTableShape::CreateAccessibleBaseName()
{
- return OUString("TableShape");
+ return "TableShape";
}
diff --git a/svx/source/table/tabledesign.cxx b/svx/source/table/tabledesign.cxx
index ea8e82f8b22f..a27a8d810fc0 100644
--- a/svx/source/table/tabledesign.cxx
+++ b/svx/source/table/tabledesign.cxx
@@ -204,7 +204,7 @@ const CellStyleNameMap& TableDesignStyle::getCellStyleNameMap()
// XServiceInfo
OUString SAL_CALL TableDesignStyle::getImplementationName()
{
- return OUString("TableDesignStyle");
+ return "TableDesignStyle";
}
sal_Bool SAL_CALL TableDesignStyle::supportsService( const OUString& ServiceName )
@@ -454,7 +454,7 @@ void SAL_CALL TableDesignStyle::disposing( const css::lang::EventObject& )
// XServiceInfo
OUString SAL_CALL TableDesignFamily::getImplementationName()
{
- return OUString("TableDesignFamily");
+ return "TableDesignFamily";
}
sal_Bool SAL_CALL TableDesignFamily::supportsService( const OUString& ServiceName )
@@ -472,7 +472,7 @@ Sequence< OUString > SAL_CALL TableDesignFamily::getSupportedServiceNames()
// XNamed
OUString SAL_CALL TableDesignFamily::getName()
{
- return OUString( "table" );
+ return "table";
}
void SAL_CALL TableDesignFamily::setName( const OUString& )
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx
index 7c4f9f670097..443b29ebdc20 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -217,7 +217,7 @@ void SAL_CALL NumberingToolBoxControl::initialize( const css::uno::Sequence< css
OUString SAL_CALL NumberingToolBoxControl::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.NumberingToolBoxControl" );
+ return "com.sun.star.comp.svx.NumberingToolBoxControl";
}
css::uno::Sequence< OUString > SAL_CALL NumberingToolBoxControl::getSupportedServiceNames()
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index af83529bc620..db308b2e5caa 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -322,7 +322,7 @@ void SAL_CALL ExtrusionDirectionControl::initialize( const css::uno::Sequence< c
OUString ExtrusionDirectionControl::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.ExtrusionDirectionController" );
+ return "com.sun.star.comp.svx.ExtrusionDirectionController";
}
@@ -559,7 +559,7 @@ void SAL_CALL ExtrusionDepthController::initialize( const css::uno::Sequence< cs
OUString ExtrusionDepthController::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.ExtrusionDepthController" );
+ return "com.sun.star.comp.svx.ExtrusionDepthController";
}
@@ -810,7 +810,7 @@ void SAL_CALL ExtrusionLightingControl::initialize( const css::uno::Sequence< cs
OUString ExtrusionLightingControl::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.ExtrusionLightingController" );
+ return "com.sun.star.comp.svx.ExtrusionLightingController";
}
@@ -936,7 +936,7 @@ void SAL_CALL ExtrusionSurfaceControl::initialize( const css::uno::Sequence< css
OUString ExtrusionSurfaceControl::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.ExtrusionSurfaceController" );
+ return "com.sun.star.comp.svx.ExtrusionSurfaceController";
}
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 7d9c5b974438..37e1eb8c8461 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -395,7 +395,7 @@ void SAL_CALL FontworkAlignmentControl::initialize( const css::uno::Sequence< cs
OUString FontworkAlignmentControl::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.FontworkAlignmentController" );
+ return "com.sun.star.comp.svx.FontworkAlignmentController";
}
@@ -608,7 +608,7 @@ void SAL_CALL FontworkCharacterSpacingControl::initialize( const css::uno::Seque
OUString FontworkCharacterSpacingControl::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.FontworkCharacterSpacingController" );
+ return "com.sun.star.comp.svx.FontworkCharacterSpacingController";
}
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index e09e812ee249..0704b88006dc 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -496,7 +496,7 @@ VclPtr<vcl::Window> SvxLineEndToolBoxControl::createPopupWindow( vcl::Window* pP
OUString SvxLineEndToolBoxControl::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.LineEndToolBoxControl" );
+ return "com.sun.star.comp.svx.LineEndToolBoxControl";
}
css::uno::Sequence<OUString> SvxLineEndToolBoxControl::getSupportedServiceNames()
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 185fae3746d1..fcae1fb8342b 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3309,7 +3309,7 @@ void SvxFontNameToolBoxControl::dispose()
OUString SvxFontNameToolBoxControl::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.FontNameToolBoxControl" );
+ return "com.sun.star.comp.svx.FontNameToolBoxControl";
}
sal_Bool SvxFontNameToolBoxControl::supportsService( const OUString& rServiceName )
@@ -3550,7 +3550,7 @@ void SvxColorToolBoxControl::functionSelected( const OUString& /*rCommand*/ )
OUString SvxColorToolBoxControl::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.ColorToolBoxControl" );
+ return "com.sun.star.comp.svx.ColorToolBoxControl";
}
css::uno::Sequence<OUString> SvxColorToolBoxControl::getSupportedServiceNames()
@@ -3609,7 +3609,7 @@ VclPtr<vcl::Window> SvxFrameToolBoxControl::createPopupWindow( vcl::Window* pPar
OUString SvxFrameToolBoxControl::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.FrameToolBoxControl" );
+ return "com.sun.star.comp.svx.FrameToolBoxControl";
}
css::uno::Sequence< OUString > SvxFrameToolBoxControl::getSupportedServiceNames()
@@ -3714,7 +3714,7 @@ void SvxCurrencyToolBoxControl::execute( sal_Int16 nSelectModifier )
OUString SvxCurrencyToolBoxControl::getImplementationName()
{
- return OUString( "com.sun.star.comp.svx.CurrencyToolBoxControl" );
+ return "com.sun.star.comp.svx.CurrencyToolBoxControl";
}
css::uno::Sequence<OUString> SvxCurrencyToolBoxControl::getSupportedServiceNames()
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 628a9585e922..b806251dd805 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -303,7 +303,7 @@ sal_Bool SAL_CALL FontHeightToolBoxControl::supportsService( const OUString& Ser
OUString SAL_CALL FontHeightToolBoxControl::getImplementationName()
{
- return OUString("com.sun.star.svx.FontHeightToolBoxController");
+ return "com.sun.star.svx.FontHeightToolBoxController";
}
uno::Sequence< OUString > SAL_CALL FontHeightToolBoxControl::getSupportedServiceNames( )
diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
index 0d948d66fdf9..1beda67e61d6 100644
--- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx
+++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx
@@ -489,7 +489,7 @@ void SAL_CALL FindTextToolbarController::release() throw ()
// XServiceInfo
OUString SAL_CALL FindTextToolbarController::getImplementationName()
{
- return OUString("com.sun.star.svx.FindTextToolboxController");
+ return "com.sun.star.svx.FindTextToolboxController";
}
sal_Bool SAL_CALL FindTextToolbarController::supportsService( const OUString& ServiceName )
@@ -771,7 +771,7 @@ void SAL_CALL MatchCaseToolboxController::release() throw ()
// XServiceInfo
OUString SAL_CALL MatchCaseToolboxController::getImplementationName()
{
- return OUString( "com.sun.star.svx.MatchCaseToolboxController" );
+ return "com.sun.star.svx.MatchCaseToolboxController";
}
sal_Bool SAL_CALL MatchCaseToolboxController::supportsService( const OUString& ServiceName )
@@ -890,7 +890,7 @@ void SAL_CALL SearchFormattedToolboxController::release() throw ()
// XServiceInfo
OUString SAL_CALL SearchFormattedToolboxController::getImplementationName()
{
- return OUString( "com.sun.star.svx.SearchFormattedToolboxController" );
+ return "com.sun.star.svx.SearchFormattedToolboxController";
}
sal_Bool SAL_CALL SearchFormattedToolboxController::supportsService( const OUString& ServiceName )
@@ -1005,7 +1005,7 @@ void SAL_CALL FindAllToolboxController::release() throw ()
// XServiceInfo
OUString SAL_CALL FindAllToolboxController::getImplementationName()
{
- return OUString( "com.sun.star.svx.FindAllToolboxController" );
+ return "com.sun.star.svx.FindAllToolboxController";
}
@@ -1112,7 +1112,7 @@ void SAL_CALL ExitSearchToolboxController::release() throw ()
// XServiceInfo
OUString SAL_CALL ExitSearchToolboxController::getImplementationName()
{
- return OUString( "com.sun.star.svx.ExitFindbarToolboxController" );
+ return "com.sun.star.svx.ExitFindbarToolboxController";
}
@@ -1233,7 +1233,7 @@ void SAL_CALL SearchLabelToolboxController::release() throw ()
// XServiceInfo
OUString SAL_CALL SearchLabelToolboxController::getImplementationName()
{
- return OUString( "com.sun.star.svx.SearchLabelToolboxController" );
+ return "com.sun.star.svx.SearchLabelToolboxController";
}
@@ -1362,7 +1362,7 @@ void SAL_CALL FindbarDispatcher::release() throw()
// XServiceInfo
OUString SAL_CALL FindbarDispatcher::getImplementationName()
{
- return OUString("com.sun.star.comp.svx.Impl.FindbarDispatcher");
+ return "com.sun.star.comp.svx.Impl.FindbarDispatcher";
}
sal_Bool SAL_CALL FindbarDispatcher::supportsService( const OUString& ServiceName )
diff --git a/svx/source/uitest/sdrobject.cxx b/svx/source/uitest/sdrobject.cxx
index 2f0b05096a04..3ceb01591e8e 100644
--- a/svx/source/uitest/sdrobject.cxx
+++ b/svx/source/uitest/sdrobject.cxx
@@ -158,7 +158,7 @@ void SdrUIObject::execute(const OUString& rAction,
OUString SdrUIObject::get_type() const
{
- return OUString("SdrUIObject");
+ return "SdrUIObject";
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/uitest/uiobject.cxx b/svx/source/uitest/uiobject.cxx
index 9568f4cc75ef..c791dc068395 100644
--- a/svx/source/uitest/uiobject.cxx
+++ b/svx/source/uitest/uiobject.cxx
@@ -56,7 +56,7 @@ std::unique_ptr<UIObject> SvxShowCharSetUIObject::create(vcl::Window* pWindow)
OUString SvxShowCharSetUIObject::get_name() const
{
- return OUString("SvxShowCharSetUIObject");
+ return "SvxShowCharSetUIObject";
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
index d4231e33174e..27ae4e6002e5 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.cxx
@@ -62,7 +62,7 @@ OUString SAL_CALL ChineseTranslation_UnoDialog::getImplementationName()
OUString ChineseTranslation_UnoDialog::getImplementationName_Static()
{
- return OUString("com.sun.star.comp.linguistic2.ChineseTranslationDialog");
+ return "com.sun.star.comp.linguistic2.ChineseTranslationDialog";
}
sal_Bool SAL_CALL ChineseTranslation_UnoDialog::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx
index 455fc4fadf40..da22962311df 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -1223,7 +1223,7 @@ void SAL_CALL GraphicExporter::setSourceDocument( const Reference< lang::XCompon
// XServiceInfo
OUString SAL_CALL GraphicExporter::getImplementationName( )
{
- return OUString( "com.sun.star.comp.Draw.GraphicExporter" );
+ return "com.sun.star.comp.Draw.GraphicExporter";
}
sal_Bool SAL_CALL GraphicExporter::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 05dabe2052ee..3bf56c17707f 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -83,7 +83,7 @@ namespace svx
static OUString NamespaceMap_getImplementationName()
throw()
{
- return OUString( "com.sun.star.comp.Svx.NamespaceMap" );
+ return "com.sun.star.comp.Svx.NamespaceMap";
}
diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx
index 31b000dd92aa..02bcc3f23378 100644
--- a/svx/source/unodraw/XPropertyTable.cxx
+++ b/svx/source/unodraw/XPropertyTable.cxx
@@ -277,7 +277,7 @@ uno::Type SAL_CALL SvxUnoXColorTable::getElementType()
// XServiceInfo
OUString SAL_CALL SvxUnoXColorTable::getImplementationName( )
{
- return OUString( "SvxUnoXColorTable" );
+ return "SvxUnoXColorTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoXColorTable::getSupportedServiceNames( )
@@ -344,7 +344,7 @@ uno::Type SAL_CALL SvxUnoXLineEndTable::getElementType()
// XServiceInfo
OUString SAL_CALL SvxUnoXLineEndTable::getImplementationName( )
{
- return OUString( "SvxUnoXLineEndTable" );
+ return "SvxUnoXLineEndTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoXLineEndTable::getSupportedServiceNames( )
@@ -421,7 +421,7 @@ uno::Type SAL_CALL SvxUnoXDashTable::getElementType()
// XServiceInfo
OUString SAL_CALL SvxUnoXDashTable::getImplementationName( )
{
- return OUString( "SvxUnoXDashTable" );
+ return "SvxUnoXDashTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoXDashTable::getSupportedServiceNames( )
@@ -493,7 +493,7 @@ uno::Type SAL_CALL SvxUnoXHatchTable::getElementType()
// XServiceInfo
OUString SAL_CALL SvxUnoXHatchTable::getImplementationName( )
{
- return OUString( "SvxUnoXHatchTable" );
+ return "SvxUnoXHatchTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoXHatchTable::getSupportedServiceNames( )
@@ -577,7 +577,7 @@ uno::Type SAL_CALL SvxUnoXGradientTable::getElementType()
// XServiceInfo
OUString SAL_CALL SvxUnoXGradientTable::getImplementationName( )
{
- return OUString( "SvxUnoXGradientTable" );
+ return "SvxUnoXGradientTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoXGradientTable::getSupportedServiceNames( )
@@ -648,7 +648,7 @@ uno::Type SAL_CALL SvxUnoXBitmapTable::getElementType()
// XServiceInfo
OUString SAL_CALL SvxUnoXBitmapTable::getImplementationName( )
{
- return OUString( "SvxUnoXBitmapTable" );
+ return "SvxUnoXBitmapTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoXBitmapTable::getSupportedServiceNames( )
diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx
index 54f0047e50df..883cfa77cf1d 100644
--- a/svx/source/unodraw/recoveryui.cxx
+++ b/svx/source/unodraw/recoveryui.cxx
@@ -121,7 +121,7 @@ RecoveryUI::RecoveryUI(const css::uno::Reference< css::uno::XComponentContext >&
OUString SAL_CALL RecoveryUI::getImplementationName()
{
- return OUString("com.sun.star.comp.svx.RecoveryUI");
+ return "com.sun.star.comp.svx.RecoveryUI";
}
sal_Bool SAL_CALL RecoveryUI::supportsService(const OUString& sServiceName)
diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx
index ab1d48660d58..c80ffcb69f10 100644
--- a/svx/source/unodraw/unobtabl.cxx
+++ b/svx/source/unodraw/unobtabl.cxx
@@ -75,7 +75,7 @@ bool SvxUnoBitmapTable::isValid( const NameOrIndex* pItem ) const
OUString SAL_CALL SvxUnoBitmapTable::getImplementationName()
{
- return OUString("SvxUnoBitmapTable");
+ return "SvxUnoBitmapTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoBitmapTable::getSupportedServiceNames( )
diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx
index c5051395d546..a6fa3f74f316 100644
--- a/svx/source/unodraw/unoctabl.cxx
+++ b/svx/source/unodraw/unoctabl.cxx
@@ -76,7 +76,7 @@ sal_Bool SAL_CALL SvxUnoColorTable::supportsService( const OUString& ServiceNam
OUString SAL_CALL SvxUnoColorTable::getImplementationName()
{
- return OUString("com.sun.star.drawing.SvxUnoColorTable");
+ return "com.sun.star.drawing.SvxUnoColorTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoColorTable::getSupportedServiceNames()
diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx
index 0a7b66c217ef..c827a288fafe 100644
--- a/svx/source/unodraw/unodtabl.cxx
+++ b/svx/source/unodraw/unodtabl.cxx
@@ -55,7 +55,7 @@ SvxUnoDashTable::SvxUnoDashTable( SdrModel* pModel ) throw()
OUString SAL_CALL SvxUnoDashTable::getImplementationName()
{
- return OUString("SvxUnoDashTable");
+ return "SvxUnoDashTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoDashTable::getSupportedServiceNames( )
diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx
index 25f845fc18c9..f33d947fcd08 100644
--- a/svx/source/unodraw/unogtabl.cxx
+++ b/svx/source/unodraw/unogtabl.cxx
@@ -54,7 +54,7 @@ SvxUnoGradientTable::SvxUnoGradientTable( SdrModel* pModel ) throw()
OUString SAL_CALL SvxUnoGradientTable::getImplementationName()
{
- return OUString("SvxUnoGradientTable");
+ return "SvxUnoGradientTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoGradientTable::getSupportedServiceNames( )
diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx
index 1e272b371d41..8e21de8229bd 100644
--- a/svx/source/unodraw/unohtabl.cxx
+++ b/svx/source/unodraw/unohtabl.cxx
@@ -54,7 +54,7 @@ SvxUnoHatchTable::SvxUnoHatchTable( SdrModel* pModel ) throw()
OUString SAL_CALL SvxUnoHatchTable::getImplementationName()
{
- return OUString("SvxUnoHatchTable");
+ return "SvxUnoHatchTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoHatchTable::getSupportedServiceNames( )
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 530d3983d5e2..92472f094fbb 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -523,7 +523,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawingModel::getAvailableServiceNames(
// lang::XServiceInfo
OUString SAL_CALL SvxUnoDrawingModel::getImplementationName()
{
- return OUString("SvxUnoDrawingModel");
+ return "SvxUnoDrawingModel";
}
sal_Bool SAL_CALL SvxUnoDrawingModel::supportsService( const OUString& ServiceName )
@@ -656,7 +656,7 @@ void SAL_CALL SvxUnoDrawPagesAccess::remove( const uno::Reference< drawing::XDra
OUString SAL_CALL SvxUnoDrawPagesAccess::getImplementationName( )
{
- return OUString( "SvxUnoDrawPagesAccess" );
+ return "SvxUnoDrawPagesAccess";
}
sal_Bool SAL_CALL SvxUnoDrawPagesAccess::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index e9f821dc5a2e..227433a792ed 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -131,7 +131,7 @@ sal_Bool SAL_CALL SvxUnoMarkerTable::supportsService( const OUString& ServiceNa
OUString SAL_CALL SvxUnoMarkerTable::getImplementationName()
{
- return OUString("SvxUnoMarkerTable");
+ return "SvxUnoMarkerTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getSupportedServiceNames( )
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index fd718b69098c..44bb5c142d51 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -854,7 +854,7 @@ SdrObject *SvxDrawPage::CreateSdrObject( const Reference< drawing::XShape > & xS
// css::lang::XServiceInfo
OUString SAL_CALL SvxDrawPage::getImplementationName()
{
- return OUString("SvxDrawPage");
+ return "SvxDrawPage";
}
sal_Bool SAL_CALL SvxDrawPage::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx
index d09758602172..4f0742bdce41 100644
--- a/svx/source/unodraw/unopool.cxx
+++ b/svx/source/unodraw/unopool.cxx
@@ -381,7 +381,7 @@ sal_Bool SAL_CALL SvxUnoDrawPool::supportsService( const OUString& ServiceName
OUString SAL_CALL SvxUnoDrawPool::getImplementationName()
{
- return OUString("SvxUnoDrawPool");
+ return "SvxUnoDrawPool";
}
uno::Sequence< OUString > SAL_CALL SvxUnoDrawPool::getSupportedServiceNames( )
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 586e0df35e9d..da9881ac3a64 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -3065,7 +3065,7 @@ uno::Sequence<uno::Any> SvxShape::getPropertyDefaults(
OUString SAL_CALL SvxShape::getImplementationName()
{
- return OUString("SvxShape");
+ return "SvxShape";
}
const char sUNO_service_style_ParagraphProperties[] = "com.sun.star.style.ParagraphProperties";
@@ -3897,7 +3897,7 @@ void SAL_CALL SvxShapeText::release() throw()
OUString SAL_CALL SvxShapeText::getImplementationName()
{
- return OUString("SvxShapeText");
+ return "SvxShapeText";
}
diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx
index d59704051e5b..8f0c98ef9a6a 100644
--- a/svx/source/unodraw/unoshcol.cxx
+++ b/svx/source/unodraw/unoshcol.cxx
@@ -236,7 +236,7 @@ sal_Bool SAL_CALL SvxShapeCollection::hasElements()
// XServiceInfo
OUString SAL_CALL SvxShapeCollection::getImplementationName()
{
- return OUString("com.sun.star.drawing.SvxShapeCollection");
+ return "com.sun.star.drawing.SvxShapeCollection";
}
sal_Bool SAL_CALL SvxShapeCollection::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx
index f1270f0da64e..2ad927a35716 100644
--- a/svx/source/unodraw/unottabl.cxx
+++ b/svx/source/unodraw/unottabl.cxx
@@ -54,7 +54,7 @@ SvxUnoTransGradientTable::SvxUnoTransGradientTable( SdrModel* pModel ) throw()
OUString SAL_CALL SvxUnoTransGradientTable::getImplementationName()
{
- return OUString("SvxUnoTransGradientTable");
+ return "SvxUnoTransGradientTable";
}
uno::Sequence< OUString > SAL_CALL SvxUnoTransGradientTable::getSupportedServiceNames( )
diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx
index da2f64c9ae87..74023011d380 100644
--- a/svx/source/unogallery/unogalitem.cxx
+++ b/svx/source/unogallery/unogalitem.cxx
@@ -116,7 +116,7 @@ void SAL_CALL GalleryItem::release()
OUString SAL_CALL GalleryItem::getImplementationName()
{
- return OUString( "com.sun.star.comp.gallery.GalleryItem" );
+ return "com.sun.star.comp.gallery.GalleryItem";
}
sal_Bool SAL_CALL GalleryItem::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx
index 88a8bff8cae8..ef6d7c83c409 100644
--- a/svx/source/unogallery/unogaltheme.cxx
+++ b/svx/source/unogallery/unogaltheme.cxx
@@ -68,7 +68,7 @@ GalleryTheme::~GalleryTheme()
OUString SAL_CALL GalleryTheme::getImplementationName()
{
- return OUString( "com.sun.star.comp.gallery.GalleryTheme" );
+ return "com.sun.star.comp.gallery.GalleryTheme";
}
sal_Bool SAL_CALL GalleryTheme::supportsService( const OUString& ServiceName )
diff --git a/svx/source/unogallery/unogalthemeprovider.cxx b/svx/source/unogallery/unogalthemeprovider.cxx
index c55adb55b356..a0b72e997435 100644
--- a/svx/source/unogallery/unogalthemeprovider.cxx
+++ b/svx/source/unogallery/unogalthemeprovider.cxx
@@ -87,7 +87,7 @@ GalleryThemeProvider::GalleryThemeProvider() :
OUString SAL_CALL GalleryThemeProvider::getImplementationName()
{
- return OUString( "com.sun.star.comp.gallery.GalleryThemeProvider" );
+ return "com.sun.star.comp.gallery.GalleryThemeProvider";
}
sal_Bool SAL_CALL GalleryThemeProvider::supportsService( const OUString& ServiceName )
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index 49272f3a404e..edbfb16c41f8 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -1091,8 +1091,8 @@ OUString SAL_CALL SvXMLGraphicImportExportHelper::resolveOutputStream( const Ref
OUString SAL_CALL SvXMLGraphicImportExportHelper::getImplementationName()
{
if( m_eGraphicHelperMode == SvXMLGraphicHelperMode::Read )
- return OUString("com.sun.star.comp.Svx.GraphicImportHelper");
- return OUString("com.sun.star.comp.Svx.GraphicExportHelper");
+ return "com.sun.star.comp.Svx.GraphicImportHelper";
+ return "com.sun.star.comp.Svx.GraphicExportHelper";
}
sal_Bool SAL_CALL SvXMLGraphicImportExportHelper::supportsService( const OUString& ServiceName )
commit 39642d415cd70165574f91500801d3b49c65d646
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:47:50 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:54:02 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): sw
Change-Id: I135d01abc52ab5e97b4b360763c8a7e3ddaf0d2d
Reviewed-on: https://gerrit.libreoffice.org/76639
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index fd42a91936ba..a9542ae116fb 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -65,7 +65,7 @@ using namespace css;
#define DECLARE_SW_ROUNDTRIP_TEST(TestName, filename, password, BaseClass) \
class TestName : public BaseClass { \
protected:\
- virtual OUString getTestName() override { return OUString(#TestName); } \
+ virtual OUString getTestName() override { return #TestName; } \
public:\
CPPUNIT_TEST_SUITE(TestName); \
CPPUNIT_TEST(Import); \
@@ -86,7 +86,7 @@ using namespace css;
#define DECLARE_SW_EXPORTONLY_TEST(TestName, filename, password, BaseClass) \
class TestName : public BaseClass { \
protected:\
- virtual OUString getTestName() override { return OUString(#TestName); } \
+ virtual OUString getTestName() override { return #TestName; } \
public:\
CPPUNIT_TEST_SUITE(TestName); \
CPPUNIT_TEST(Import_Export_Import); \
@@ -113,7 +113,7 @@ using namespace css;
#define DECLARE_SW_IMPORT_TEST(TestName, filename, password, BaseClass) \
class TestName : public BaseClass { \
protected:\
- virtual OUString getTestName() override { return OUString(#TestName); } \
+ virtual OUString getTestName() override { return #TestName; } \
public:\
CPPUNIT_TEST_SUITE(TestName); \
CPPUNIT_TEST(Import); \
@@ -130,7 +130,7 @@ using namespace css;
#define DECLARE_SW_EXPORT_TEST(TestName, filename, password, BaseClass) \
class TestName : public BaseClass { \
protected:\
- virtual OUString getTestName() override { return OUString(#TestName); } \
+ virtual OUString getTestName() override { return #TestName; } \
public:\
CPPUNIT_TEST_SUITE(TestName); \
CPPUNIT_TEST(Import_Export); \
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx b/sw/qa/extras/mailmerge/mailmerge.cxx
index 139a13a24dd7..51d80cea19ca 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -297,7 +297,7 @@ protected:
#define DECLARE_MAILMERGE_TEST(TestName, filename, datasource, tablename, file, BaseClass, selection, column) \
class TestName : public BaseClass { \
protected: \
- virtual OUString getTestName() override { return OUString(#TestName); } \
+ virtual OUString getTestName() override { return #TestName; } \
public: \
CPPUNIT_TEST_SUITE(TestName); \
CPPUNIT_TEST(MailMerge); \
diff --git a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
index c08b6f194feb..dc5deaf30df4 100644
--- a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
@@ -26,7 +26,7 @@
class TestName : public Test \
{ \
protected: \
- virtual OUString getTestName() override { return OUString(#TestName); } \
+ virtual OUString getTestName() override { return #TestName; } \
virtual void postLoad(const char*) override \
{ \
if (!bUseTempDir) \
@@ -90,7 +90,7 @@
class TestName : public Test \
{ \
protected: \
- virtual OUString getTestName() override { return OUString(#TestName); } \
+ virtual OUString getTestName() override { return #TestName; } \
\
public: \
CPPUNIT_TEST_SUITE(TestName); \
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 316cfc06f7d5..3155cf9f0a73 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -757,10 +757,7 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf105511)
{
struct DefaultLocale : public comphelper::ConfigurationProperty<DefaultLocale, OUString>
{
- static OUString path()
- {
- return OUString("/org.openoffice.Office.Linguistic/General/DefaultLocale");
- }
+ static OUString path() { return "/org.openoffice.Office.Linguistic/General/DefaultLocale"; }
~DefaultLocale() = delete;
};
auto batch = comphelper::ConfigurationChanges::create();
diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx
index b229b466ff78..d979723a4894 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -240,7 +240,7 @@ OUString SAL_CALL SwAccessibleCell::getAccessibleDescription()
OUString SAL_CALL SwAccessibleCell::getImplementationName()
{
- return OUString(sImplementationName);
+ return sImplementationName;
}
sal_Bool SAL_CALL SwAccessibleCell::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index bd180490d608..78b5c2757141 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -425,7 +425,7 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve
OUString SAL_CALL SwAccessibleDocument::getImplementationName()
{
- return OUString(sImplementationName);
+ return sImplementationName;
}
sal_Bool SAL_CALL SwAccessibleDocument::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx
index a9ee92d26531..dccad7083e86 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -74,7 +74,7 @@ void SAL_CALL
OUString SAL_CALL SwAccessibleEmbeddedObject::getImplementationName()
{
- return OUString(sImplementationName);
+ return sImplementationName;
}
sal_Bool SAL_CALL SwAccessibleEmbeddedObject::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/access/accfootnote.cxx b/sw/source/core/access/accfootnote.cxx
index 14ff4d43f889..14fb78525736 100644
--- a/sw/source/core/access/accfootnote.cxx
+++ b/sw/source/core/access/accfootnote.cxx
@@ -89,9 +89,9 @@ OUString SAL_CALL SwAccessibleFootnote::getAccessibleDescription()
OUString SAL_CALL SwAccessibleFootnote::getImplementationName()
{
if( AccessibleRole::END_NOTE == GetRole() )
- return OUString(sImplementationNameEndnote);
+ return sImplementationNameEndnote;
else
- return OUString(sImplementationNameFootnote);
+ return sImplementationNameFootnote;
}
sal_Bool SAL_CALL SwAccessibleFootnote::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/access/accgraphic.cxx b/sw/source/core/access/accgraphic.cxx
index f7a87f3423de..01a6c1ca2338 100644
--- a/sw/source/core/access/accgraphic.cxx
+++ b/sw/source/core/access/accgraphic.cxx
@@ -43,7 +43,7 @@ SwAccessibleGraphic::~SwAccessibleGraphic()
OUString SAL_CALL SwAccessibleGraphic::getImplementationName()
{
- return OUString("com.sun.star.comp.Writer.SwAccessibleGraphic");
+ return "com.sun.star.comp.Writer.SwAccessibleGraphic";
}
sal_Bool SAL_CALL SwAccessibleGraphic::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/access/accheaderfooter.cxx b/sw/source/core/access/accheaderfooter.cxx
index 46508ef60eb6..b20027d2e5a0 100644
--- a/sw/source/core/access/accheaderfooter.cxx
+++ b/sw/source/core/access/accheaderfooter.cxx
@@ -73,9 +73,9 @@ OUString SAL_CALL SwAccessibleHeaderFooter::getAccessibleDescription()
OUString SAL_CALL SwAccessibleHeaderFooter::getImplementationName()
{
if( AccessibleRole::HEADER == GetRole() )
- return OUString(sImplementationNameHeader);
+ return sImplementationNameHeader;
else
- return OUString(sImplementationNameFooter);
+ return sImplementationNameFooter;
}
sal_Bool SAL_CALL SwAccessibleHeaderFooter::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/access/accpage.cxx b/sw/source/core/access/accpage.cxx
index 03810cc3bba1..a3022f9e5d5c 100644
--- a/sw/source/core/access/accpage.cxx
+++ b/sw/source/core/access/accpage.cxx
@@ -133,7 +133,7 @@ bool SwAccessiblePage::HasCursor()
OUString SwAccessiblePage::getImplementationName( )
{
- return OUString(sImplementationName);
+ return sImplementationName;
}
sal_Bool SwAccessiblePage::supportsService( const OUString& rServiceName)
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 9574855492e8..e6c038924705 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -879,7 +879,7 @@ sal_Int32 SAL_CALL SwAccessibleParagraph::getBackground()
OUString SAL_CALL SwAccessibleParagraph::getImplementationName()
{
- return OUString(sImplementationName);
+ return sImplementationName;
}
sal_Bool SAL_CALL SwAccessibleParagraph::supportsService(
diff --git a/sw/source/core/access/accpreview.cxx b/sw/source/core/access/accpreview.cxx
index aca49e10284e..0bb2131e15d4 100644
--- a/sw/source/core/access/accpreview.cxx
+++ b/sw/source/core/access/accpreview.cxx
@@ -40,7 +40,7 @@ SwAccessiblePreview::~SwAccessiblePreview()
OUString SwAccessiblePreview::getImplementationName( )
{
- return OUString( sImplementationName );
+ return sImplementationName;
}
sal_Bool SwAccessiblePreview::supportsService( const OUString& rServiceName )
diff --git a/sw/source/core/access/acctable.cxx b/sw/source/core/access/acctable.cxx
index b9c80cbe5aa7..63e0c406765b 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -1230,7 +1230,7 @@ sal_Int32 SAL_CALL SwAccessibleTable::getAccessibleColumn(
OUString SAL_CALL SwAccessibleTable::getImplementationName()
{
- return OUString("com.sun.star.comp.Writer.SwAccessibleTableView");
+ return "com.sun.star.comp.Writer.SwAccessibleTableView";
}
sal_Bool SAL_CALL SwAccessibleTable::supportsService(
@@ -1807,7 +1807,7 @@ uno::Reference< XAccessibleTable >
OUString SAL_CALL SwAccessibleTableColHeaders::getImplementationName()
{
static const sal_Char sImplName[] = "com.sun.star.comp.Writer.SwAccessibleTableColumnHeadersView";
- return OUString(sImplName);
+ return sImplName;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx
index 024a8861c114..b5732d1d2b72 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -264,7 +264,7 @@ OUString SAL_CALL SwAccessibleTextFrame::getAccessibleDescription()
OUString SAL_CALL SwAccessibleTextFrame::getImplementationName()
{
- return OUString("com.sun.star.comp.Writer.SwAccessibleTextFrameView");
+ return "com.sun.star.comp.Writer.SwAccessibleTextFrameView";
}
sal_Bool SAL_CALL SwAccessibleTextFrame::supportsService(const OUString& sTestServiceName)
diff --git a/sw/source/core/doc/dbgoutsw.cxx b/sw/source/core/doc/dbgoutsw.cxx
index 7f5339a7206d..2d8ea2516fa7 100644
--- a/sw/source/core/doc/dbgoutsw.cxx
+++ b/sw/source/core/doc/dbgoutsw.cxx
@@ -806,30 +806,30 @@ static OUString lcl_TokenType2Str(FormTokenType nType)
switch(nType)
{
case TOKEN_ENTRY_NO:
- return OUString("NO");
+ return "NO";
case TOKEN_ENTRY_TEXT:
- return OUString("ENTRY_TEXT");
+ return "ENTRY_TEXT";
case TOKEN_ENTRY:
- return OUString("ENTRY");
+ return "ENTRY";
case TOKEN_TAB_STOP:
- return OUString("TAB_STOP");
+ return "TAB_STOP";
case TOKEN_TEXT:
- return OUString("TOKEN_TEXT");
+ return "TOKEN_TEXT";
case TOKEN_PAGE_NUMS:
- return OUString("NUMS");
+ return "NUMS";
case TOKEN_CHAPTER_INFO:
- return OUString("CHAPTER_INFO");
+ return "CHAPTER_INFO";
case TOKEN_LINK_START:
- return OUString("LINK_START");
+ return "LINK_START";
case TOKEN_LINK_END:
- return OUString("LINK_END");
+ return "LINK_END";
case TOKEN_AUTHORITY:
- return OUString("AUTHORITY");
+ return "AUTHORITY";
case TOKEN_END:
- return OUString("END");
+ return "END";
default:
OSL_FAIL("should not be reached");
- return OUString("??");
+ return "??";
}
}
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 7828fba9e62c..6bd6ee148427 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1789,7 +1789,7 @@ OUString SwDoc::GetPaMDescr(const SwPaM & rPam)
return SwResId(STR_PARAGRAPHS);
}
- return OUString("??");
+ return "??";
}
bool SwDoc::ContainsHiddenChars() const
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index ecd9b2774937..571c219faec9 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -516,7 +516,7 @@ IDocumentMarkAccess::MarkType IDocumentMarkAccess::GetType(const IMark& rBkmk)
OUString IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()
{
- return OUString("__RefHeading__");
+ return "__RefHeading__";
}
bool IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM )
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index ac882f6f2a9e..dc438629e487 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -77,7 +77,7 @@ const sal_uInt16 SwNumRule::maDefNumIndents[ MAXLEVEL ] = {
OUString SwNumRule::GetOutlineRuleName()
{
- return OUString("Outline");
+ return "Outline";
}
const SwNumFormat& SwNumRule::Get( sal_uInt16 i ) const
diff --git a/sw/source/core/docnode/finalthreadmanager.cxx b/sw/source/core/docnode/finalthreadmanager.cxx
index 495c1b1041a3..3d9eb3859acd 100644
--- a/sw/source/core/docnode/finalthreadmanager.cxx
+++ b/sw/source/core/docnode/finalthreadmanager.cxx
@@ -274,7 +274,7 @@ FinalThreadManager::~FinalThreadManager()
// com.sun.star.uno.XServiceInfo:
OUString SAL_CALL FinalThreadManager::getImplementationName()
{
- return OUString("com.sun.star.util.comp.FinalThreadManager");
+ return "com.sun.star.util.comp.FinalThreadManager";
}
sal_Bool SAL_CALL FinalThreadManager::supportsService(OUString const & serviceName)
diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx
index 37fcded5e262..4078784fef11 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -139,7 +139,7 @@ namespace sw
// XServiceInfo
OUString LayoutDumpFilter::getImplementationName( )
{
- return OUString( "com.sun.star.comp.Writer.LayoutDump" );
+ return "com.sun.star.comp.Writer.LayoutDump";
}
sal_Bool LayoutDumpFilter::supportsService( const OUString& rServiceName )
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index f72bcc964567..8591b3fb7a89 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -499,16 +499,16 @@ void SwForm::AdjustTabStops( SwDoc const & rDoc ) // #i21237#
}
}
-OUString SwForm::GetFormEntry() {return OUString("<E>");}
-OUString SwForm::GetFormTab() {return OUString("<T>");}
-OUString SwForm::GetFormPageNums() {return OUString("<#>");}
-OUString SwForm::GetFormLinkStt() {return OUString("<LS>");}
-OUString SwForm::GetFormLinkEnd() {return OUString("<LE>");}
-OUString SwForm::GetFormEntryNum() {return OUString("<E#>");}
-OUString SwForm::GetFormEntryText() {return OUString("<ET>");}
-OUString SwForm::GetFormChapterMark() {return OUString("<C>");}
-OUString SwForm::GetFormText() {return OUString("<X>");}
-OUString SwForm::GetFormAuth() {return OUString("<A>");}
+OUString SwForm::GetFormEntry() {return "<E>";}
+OUString SwForm::GetFormTab() {return "<T>";}
+OUString SwForm::GetFormPageNums() {return "<#>";}
+OUString SwForm::GetFormLinkStt() {return "<LS>";}
+OUString SwForm::GetFormLinkEnd() {return "<LE>";}
+OUString SwForm::GetFormEntryNum() {return "<E#>";}
+OUString SwForm::GetFormEntryText() {return "<ET>";}
+OUString SwForm::GetFormChapterMark() {return "<C>";}
+OUString SwForm::GetFormText() {return "<X>";}
+OUString SwForm::GetFormAuth() {return "<A>";}
SwTOXBase::SwTOXBase(const SwTOXType* pTyp, const SwForm& rForm,
SwTOXElement nCreaType, const OUString& rTitle )
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index cced7186d49e..d7a80654ff11 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -4517,17 +4517,17 @@ OUString SwTextNode::GetLabelFollowedBy() const
{
case SvxNumberFormat::LISTTAB:
{
- return OUString("\t");
+ return "\t";
}
break;
case SvxNumberFormat::SPACE:
{
- return OUString(" ");
+ return " ";
}
break;
case SvxNumberFormat::NEWLINE:
{
- return OUString("\n");
+ return "\n";
}
break;
case SvxNumberFormat::NOTHING:
diff --git a/sw/source/core/undo/SwRewriter.cxx b/sw/source/core/undo/SwRewriter.cxx
index da3df123c41f..05566a1bd2f3 100644
--- a/sw/source/core/undo/SwRewriter.cxx
+++ b/sw/source/core/undo/SwRewriter.cxx
@@ -57,15 +57,15 @@ OUString SwRewriter::GetPlaceHolder(SwUndoArg eId)
switch (eId)
{
case UndoArg1:
- return OUString("$1");
+ return "$1";
case UndoArg2:
- return OUString("$2");
+ return "$2";
case UndoArg3:
- return OUString("$3");
+ return "$3";
default:
break;
}
- return OUString("$1");
+ return "$1";
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/undo/undobj.cxx b/sw/source/core/undo/undobj.cxx
index 612ca3500bc3..fccab47e8f27 100644
--- a/sw/source/core/undo/undobj.cxx
+++ b/sw/source/core/undo/undobj.cxx
@@ -362,7 +362,7 @@ OUString GetUndoComment(SwUndoId eId)
break;
case SwUndoId::REDLINE:
SAL_INFO("sw.core", "Should NEVER be used/translated");
- return OUString("$1");
+ return "$1";
case SwUndoId::ACCEPT_REDLINE:
pId = STR_ACCEPT_REDLINE;
break;
diff --git a/sw/source/core/unocore/SwXTextDefaults.cxx b/sw/source/core/unocore/SwXTextDefaults.cxx
index 41c094d6fb96..0403a2b9cb58 100644
--- a/sw/source/core/unocore/SwXTextDefaults.cxx
+++ b/sw/source/core/unocore/SwXTextDefaults.cxx
@@ -214,7 +214,7 @@ Any SAL_CALL SwXTextDefaults::getPropertyDefault( const OUString& rPropertyName
OUString SAL_CALL SwXTextDefaults::getImplementationName( )
{
- return OUString("SwXTextDefaults");
+ return "SwXTextDefaults";
}
sal_Bool SAL_CALL SwXTextDefaults::supportsService( const OUString& rServiceName )
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index 85596ca25611..51d303b43102 100644
--- a/sw/source/core/unocore/unobkm.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list