[Libreoffice-commits] core.git: 4 commits - lotuswordpro/source oox/source opencl/inc package/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Wed Jul 31 10:57:33 UTC 2019
lotuswordpro/source/filter/LotusWordProImportFilter.cxx | 2
lotuswordpro/source/filter/lwpfootnote.cxx | 4
lotuswordpro/source/filter/xfilter/xfutil.cxx | 158 ++++----
oox/source/core/fasttokenhandler.cxx | 2
oox/source/core/filterdetect.cxx | 24 -
oox/source/docprop/ooxmldocpropimport.cxx | 2
oox/source/drawingml/color.cxx | 56 +--
oox/source/drawingml/fillproperties.cxx | 90 ++---
oox/source/drawingml/shape3dproperties.cxx | 250 +++++++-------
oox/source/export/chartexport.cxx | 8
oox/source/export/drawingml.cxx | 2
oox/source/ole/axcontrol.cxx | 58 +--
oox/source/ppt/comments.cxx | 2
oox/source/ppt/pptimport.cxx | 2
oox/source/shape/ShapeContextHandler.cxx | 2
opencl/inc/opencl_device_selection.h | 4
package/source/manifest/ManifestReader.cxx | 2
package/source/manifest/ManifestWriter.cxx | 2
package/source/xstor/xfactory.cxx | 2
package/source/zippackage/ZipPackage.cxx | 2
package/source/zippackage/ZipPackageFolder.cxx | 2
package/source/zippackage/ZipPackageFolderEnumeration.cxx | 2
package/source/zippackage/ZipPackageStream.cxx | 2
package/source/zippackage/zipfileaccess.cxx | 2
24 files changed, 341 insertions(+), 341 deletions(-)
New commits:
commit 4011bd28935cbedd59766fd8e355a88a1ca6cbf6
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:53:10 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:56:55 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): lotuswordpro
Change-Id: I598987faeedcb6df673f828c80eb03b04abc86c8
Reviewed-on: https://gerrit.libreoffice.org/76663
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
index fc22f46df8df..051dced016e1 100644
--- a/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
+++ b/lotuswordpro/source/filter/LotusWordProImportFilter.cxx
@@ -148,7 +148,7 @@ void SAL_CALL LotusWordProImportFilter::initialize( const Sequence< Any >& /*aAr
// XServiceInfo
OUString SAL_CALL LotusWordProImportFilter::getImplementationName()
{
- return OUString("com.sun.star.comp.Writer.LotusWordProImportFilter");
+ return "com.sun.star.comp.Writer.LotusWordProImportFilter";
}
sal_Bool SAL_CALL LotusWordProImportFilter::supportsService(const OUString& rServiceName)
diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx
index d4a49916a128..725d6e6809af 100644
--- a/lotuswordpro/source/filter/lwpfootnote.cxx
+++ b/lotuswordpro/source/filter/lwpfootnote.cxx
@@ -535,7 +535,7 @@ OUString LwpFootnoteOptions::GetContinuedOnMessage()
return m_ContinuedOnMessage.str();
}
// else return default message
- return OUString(STRID_FOOTCONTINUEDON);
+ return STRID_FOOTCONTINUEDON;
}
/**
@@ -548,7 +548,7 @@ OUString LwpFootnoteOptions::GetContinuedFromMessage()
return m_ContinuedFromMessage.str();
}
// else return default message
- return OUString(STRID_FOOTCONTINUEDFROM);
+ return STRID_FOOTCONTINUEDFROM;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx b/lotuswordpro/source/filter/xfilter/xfutil.cxx
index 612b1e3ba04e..bb21be1f04d6 100644
--- a/lotuswordpro/source/filter/xfilter/xfutil.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx
@@ -95,58 +95,58 @@ OUString GetUnderlineName(enumXFUnderline type)
switch(type)
{
case enumXFUnderlineNone:
- return OUString("none");
+ return "none";
break;
case enumXFUnderlineSingle:
- return OUString("single");
+ return "single";
break;
case enumXFUnderlineDouble:
- return OUString("double");
+ return "double";
break;
case enumXFUnderlineDotted:
- return OUString("dotted");
+ return "dotted";
break;
case enumXFUnderlineDash:
- return OUString("dash");
+ return "dash";
break;
case enumXFUnderlineLongDash:
- return OUString("long-dash");
+ return "long-dash";
break;
case enumXFUnderlineDotDash:
- return OUString("dot-dash");
+ return "dot-dash";
break;
case enumXFUnderlineDotDotDash:
- return OUString("dot-dot-dash");
+ return "dot-dot-dash";
break;
case enumXFUnderlineWave:
- return OUString("wave");
+ return "wave";
break;
case enumXFUnderlineBold:
- return OUString("bold");
+ return "bold";
break;
case enumXFUnderlineBoldDotted:
- return OUString("bold-dotted");
+ return "bold-dotted";
break;
case enumXFUnderlineBoldDash:
- return OUString("bold-dash");
+ return "bold-dash";
break;
case enumXFUnderlineBoldLongDash:
- return OUString("bold-long-dash");
+ return "bold-long-dash";
break;
case enumXFUnderlineBoldDotDash:
- return OUString("bold-dot-dash");
+ return "bold-dot-dash";
break;
case enumXFUnderlineBoldDotDotDash:
- return OUString("bold-dot-dot-dash");
+ return "bold-dot-dot-dash";
break;
case enumXFUnderlineBoldWave:
- return OUString("bold-wave");
+ return "bold-wave";
break;
case enumXFUnderlineDoubleWave:
- return OUString("double-wave");
+ return "double-wave";
break;
case enumXFUnderlineSmallWave:
- return OUString("small-wave");
+ return "small-wave";
break;
}
return OUString();
@@ -157,19 +157,19 @@ OUString GetCrossoutName(enumXFCrossout type)
switch(type)
{
case enumXFCrossoutSignel:
- return OUString("single-line");
+ return "single-line";
break;
case enumXFCrossoutDouble:
- return OUString("double-line");
+ return "double-line";
break;
case enumXFCrossoutThick:
- return OUString("thick-line");
+ return "thick-line";
break;
case enumXFCrossoutSlash:
- return OUString("slash");
+ return "slash";
break;
case enumXFCrossoutX:
- return OUString("X");
+ return "X";
break;
default:
break;
@@ -181,16 +181,16 @@ OUString GetTransformName(enumXFTransform type)
{
switch(type) {
case enumXFTransformUpper:
- return OUString("uppercase");
+ return "uppercase";
break;
case enumXFTransformLower:
- return OUString("lowercase");
+ return "lowercase";
break;
case enumXFTransformCapitalize:
- return OUString("capitalize");
+ return "capitalize";
break;
case enumXFTransformSmallCaps:
- return OUString("small-caps");
+ return "small-caps";
break;
default:
break;
@@ -203,28 +203,28 @@ OUString GetTextDirName(enumXFTextDir dir)
switch(dir)
{
case enumXFTextDirLR:
- return OUString("lr");
+ return "lr";
break;
case enumXFTextDirLR_TB:
- return OUString("lr-tb");
+ return "lr-tb";
break;
case enumXFTextDirPage:
- return OUString("page");
+ return "page";
break;
case enumXFTextDirRL:
- return OUString("rl");
+ return "rl";
break;
case enumXFTextDirRL_TB:
- return OUString("rl-tb");
+ return "rl-tb";
break;
case enumXFTextDirTB:
- return OUString("tb");
+ return "tb";
break;
case enumXFTextDirTB_LR:
- return OUString("tb-lr");
+ return "tb-lr";
break;
case enumXFTextDirTB_RL:
- return OUString("tb-rl");
+ return "tb-rl";
break;
default:
break;
@@ -237,16 +237,16 @@ OUString GetFrameXPos(enumXFFrameXPos pos)
switch(pos)
{
case enumXFFrameXPosLeft:
- return OUString("left");
+ return "left";
break;
case enumXFFrameXPosRight:
- return OUString("right");
+ return "right";
break;
case enumXFFrameXPosCenter:
- return OUString("center");
+ return "center";
break;
case enumXFFrameXPosFromLeft:
- return OUString("from-left");
+ return "from-left";
break;
default:
break;
@@ -259,43 +259,43 @@ OUString GetFrameXRel(enumXFFrameXRel rel)
switch(rel)
{
case enumXFFrameXRelPage:
- return OUString("page");
+ return "page";
break;
case enumXFFrameXRelPageContent:
- return OUString("page-content");
+ return "page-content";
break;
case enumXFFrameXRelPageEndMargin:
- return OUString("page-end-margin");
+ return "page-end-margin";
break;
case enumXFFrameXRelPageStartMargin:
- return OUString("page-start-margin");
+ return "page-start-margin";
break;
case enumXFFrameXRelPara:
- return OUString("paragraph");
+ return "paragraph";
break;
case enumXFFrameXRelParaContent:
- return OUString("paragraph-content");
+ return "paragraph-content";
break;
case enumXFFrameXRelParaEndMargin:
- return OUString("paragraph-end-margin");
+ return "paragraph-end-margin";
break;
case enumXFFrameXRelParaStartMargin:
- return OUString("paragraph-start-margin");
+ return "paragraph-start-margin";
break;
case enumXFFrameXRelChar:
- return OUString("char");
+ return "char";
break;
case enumXFFrameXRelFrame:
- return OUString("frame");
+ return "frame";
break;
case enumXFFrameXRelFrameContent:
- return OUString("frame-content");
+ return "frame-content";
break;
case enumXFFrameXRelFrameEndMargin:
- return OUString("frame-end-margin");
+ return "frame-end-margin";
break;
case enumXFFrameXRelFrameStartMargin:
- return OUString("frame-start-margin");
+ return "frame-start-margin";
break;
default:
break;
@@ -308,15 +308,15 @@ OUString GetFrameYPos(enumXFFrameYPos pos)
switch(pos)
{
case enumXFFrameYPosTop:
- return OUString("top");
+ return "top";
case enumXFFrameYPosMiddle:
- return OUString("middle");
+ return "middle";
case enumXFFrameYPosBottom:
- return OUString("bottom");
+ return "bottom";
case enumXFFrameYPosFromTop:
- return OUString("from-top");
+ return "from-top";
case enumXFFrameYPosBelow:
- return OUString("below");
+ return "below";
}
return OUString();
}
@@ -326,25 +326,25 @@ OUString GetFrameYRel(enumXFFrameYRel rel)
switch(rel)
{
case enumXFFrameYRelBaseLine:
- return OUString("baseline");
+ return "baseline";
case enumXFFrameYRelChar:
- return OUString("char");
+ return "char";
case enumXFFrameYRelFrame:
- return OUString("frame");
+ return "frame";
case enumXFFrameYRelFrameContent:
- return OUString("frame-content");
+ return "frame-content";
case enumXFFrameYRelLine:
- return OUString("line");
+ return "line";
case enumXFFrameYRelPage:
- return OUString("page");
+ return "page";
case enumXFFrameYRelPageContent:
- return OUString("page-content");
+ return "page-content";
case enumXFFrameYRelPara:
- return OUString("paragraph");
+ return "paragraph";
case enumXFFrameYRelParaContent:
- return OUString("paragraph-content");
+ return "paragraph-content";
case enumXFFrameYRelText:
- return OUString("text");
+ return "text";
}
return OUString();
}
@@ -352,21 +352,21 @@ OUString GetFrameYRel(enumXFFrameYRel rel)
OUString GetAlignName(enumXFAlignType align)
{
if( align == enumXFAlignStart )
- return OUString("start");
+ return "start";
else if( align == enumXFAlignCenter )
- return OUString("center");
+ return "center";
else if( align == enumXFAlignEnd )
- return OUString("end");
+ return "end";
else if( align == enumXFAlignJustify )
- return OUString("justify");
+ return "justify";
else if( align == enumXFAlignBottom )
- return OUString("bottom");
+ return "bottom";
else if( align == enumXFAlignTop )
- return OUString("top");
+ return "top";
else if( align == enumXFAlignMiddle )
- return OUString("middle");
+ return "middle";
else if( align == enumXFALignMargins )
- return OUString("margins");
+ return "margins";
return OUString();
}
@@ -433,13 +433,13 @@ OUString GetColorMode(enumXFColorMode mode)
switch(mode)
{
case enumXFColorStandard:
- return OUString("standard");
+ return "standard";
case enumXFColorGreyscale:
- return OUString("greyscale");
+ return "greyscale";
case enumXFColorWatermark:
- return OUString("watermark");
+ return "watermark";
case enumXFColorMono:
- return OUString("mono");
+ return "mono";
}
return OUString();
}
commit 5c19af489998ba8e8ab22a1afaf54776e72e084e
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:52:58 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:56:48 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): oox
Change-Id: I177f9dd57fb3195db87a6b5ce3a231ab602b61f9
Reviewed-on: https://gerrit.libreoffice.org/76662
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/oox/source/core/fasttokenhandler.cxx b/oox/source/core/fasttokenhandler.cxx
index 489044bbbd97..7486b8505b60 100644
--- a/oox/source/core/fasttokenhandler.cxx
+++ b/oox/source/core/fasttokenhandler.cxx
@@ -43,7 +43,7 @@ FastTokenHandler::~FastTokenHandler()
// XServiceInfo
OUString SAL_CALL FastTokenHandler::getImplementationName()
{
- return OUString( "com.sun.star.comp.oox.core.FastTokenHandler" );
+ return "com.sun.star.comp.oox.core.FastTokenHandler";
}
sal_Bool SAL_CALL FastTokenHandler::supportsService( const OUString& rServiceName )
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index c5ea4b385849..a12e21d1503a 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -171,41 +171,41 @@ OUString FilterDetectDocHandler::getFilterNameFromContentType( const OUString& r
bool bDocm = rFileName.endsWithIgnoreAsciiCase(".docm");
if( rContentType == "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml" && !bDocm )
- return OUString( "writer_MS_Word_2007" );
+ return "writer_MS_Word_2007";
if( rContentType == "application/vnd.ms-word.document.macroEnabled.main+xml" || bDocm )
- return OUString( "writer_MS_Word_2007_VBA" );
+ return "writer_MS_Word_2007_VBA";
if( rContentType == "application/vnd.openxmlformats-officedocument.wordprocessingml.template.main+xml" ||
rContentType == "application/vnd.ms-word.template.macroEnabledTemplate.main+xml" )
- return OUString( "writer_MS_Word_2007_Template" );
+ return "writer_MS_Word_2007_Template";
if( rContentType == "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml")
- return OUString( "MS Excel 2007 XML" );
+ return "MS Excel 2007 XML";
if (rContentType == "application/vnd.ms-excel.sheet.macroEnabled.main+xml")
- return OUString( "MS Excel 2007 VBA XML" );
+ return "MS Excel 2007 VBA XML";
if( rContentType == "application/vnd.openxmlformats-officedocument.spreadsheetml.template.main+xml" ||
rContentType == "application/vnd.ms-excel.template.macroEnabled.main+xml" )
- return OUString( "MS Excel 2007 XML Template" );
+ return "MS Excel 2007 XML Template";
if ( rContentType == "application/vnd.ms-excel.sheet.binary.macroEnabled.main" )
- return OUString( "MS Excel 2007 Binary" );
+ return "MS Excel 2007 Binary";
if (rContentType == "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml")
- return OUString( "MS PowerPoint 2007 XML" );
+ return "MS PowerPoint 2007 XML";
if (rContentType == "application/vnd.ms-powerpoint.presentation.macroEnabled.main+xml")
- return OUString( "MS PowerPoint 2007 XML VBA" );
+ return "MS PowerPoint 2007 XML VBA";
if( rContentType == "application/vnd.openxmlformats-officedocument.presentationml.slideshow.main+xml" ||
rContentType == "application/vnd.ms-powerpoint.slideshow.macroEnabled.main+xml" )
- return OUString( "MS PowerPoint 2007 XML AutoPlay" );
+ return "MS PowerPoint 2007 XML AutoPlay";
if( rContentType == "application/vnd.openxmlformats-officedocument.presentationml.template.main+xml" ||
rContentType == "application/vnd.ms-powerpoint.template.macroEnabled.main+xml" )
- return OUString( "MS PowerPoint 2007 XML Template" );
+ return "MS PowerPoint 2007 XML Template";
return OUString();
}
@@ -358,7 +358,7 @@ Reference< XInputStream > FilterDetect::extractUnencryptedPackage( MediaDescript
OUString SAL_CALL FilterDetect::getImplementationName()
{
- return OUString( "com.sun.star.comp.oox.FormatDetector" );
+ return "com.sun.star.comp.oox.FormatDetector";
}
sal_Bool SAL_CALL FilterDetect::supportsService( const OUString& rServiceName )
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx
index 455262156727..1a257792dfbd 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -100,7 +100,7 @@ DocumentPropertiesImport::DocumentPropertiesImport( const Reference< XComponentC
// XServiceInfo
OUString SAL_CALL DocumentPropertiesImport::getImplementationName()
{
- return OUString( "com.sun.star.comp.oox.docprop.DocumentPropertiesImporter" );
+ return "com.sun.star.comp.oox.docprop.DocumentPropertiesImporter";
}
sal_Bool SAL_CALL DocumentPropertiesImport::supportsService( const OUString& rServiceName )
diff --git a/oox/source/drawingml/color.cxx b/oox/source/drawingml/color.cxx
index b258e7c037de..325b68227fe9 100644
--- a/oox/source/drawingml/color.cxx
+++ b/oox/source/drawingml/color.cxx
@@ -335,34 +335,34 @@ OUString Color::getColorTransformationName( sal_Int32 nElement )
{
switch( nElement )
{
- case XML_red: return OUString( "red" );
- case XML_redMod: return OUString( "redMod" );
- case XML_redOff: return OUString( "redOff" );
- case XML_green: return OUString( "green" );
- case XML_greenMod: return OUString( "greenMod" );
- case XML_greenOff: return OUString( "greenOff" );
- case XML_blue: return OUString( "blue" );
- case XML_blueMod: return OUString( "blueMod" );
- case XML_blueOff: return OUString( "blueOff" );
- case XML_alpha: return OUString( "alpha" );
- case XML_alphaMod: return OUString( "alphaMod" );
- case XML_alphaOff: return OUString( "alphaOff" );
- case XML_hue: return OUString( "hue" );
- case XML_hueMod: return OUString( "hueMod" );
- case XML_hueOff: return OUString( "hueOff" );
- case XML_sat: return OUString( "sat" );
- case XML_satMod: return OUString( "satMod" );
- case XML_satOff: return OUString( "satOff" );
- case XML_lum: return OUString( "lum" );
- case XML_lumMod: return OUString( "lumMod" );
- case XML_lumOff: return OUString( "lumOff" );
- case XML_shade: return OUString( "shade" );
- case XML_tint: return OUString( "tint" );
- case XML_gray: return OUString( "gray" );
- case XML_comp: return OUString( "comp" );
- case XML_inv: return OUString( "inv" );
- case XML_gamma: return OUString( "gamma" );
- case XML_invGamma: return OUString( "invGamma" );
+ case XML_red: return "red";
+ case XML_redMod: return "redMod";
+ case XML_redOff: return "redOff";
+ case XML_green: return "green";
+ case XML_greenMod: return "greenMod";
+ case XML_greenOff: return "greenOff";
+ case XML_blue: return "blue";
+ case XML_blueMod: return "blueMod";
+ case XML_blueOff: return "blueOff";
+ case XML_alpha: return "alpha";
+ case XML_alphaMod: return "alphaMod";
+ case XML_alphaOff: return "alphaOff";
+ case XML_hue: return "hue";
+ case XML_hueMod: return "hueMod";
+ case XML_hueOff: return "hueOff";
+ case XML_sat: return "sat";
+ case XML_satMod: return "satMod";
+ case XML_satOff: return "satOff";
+ case XML_lum: return "lum";
+ case XML_lumMod: return "lumMod";
+ case XML_lumOff: return "lumOff";
+ case XML_shade: return "shade";
+ case XML_tint: return "tint";
+ case XML_gray: return "gray";
+ case XML_comp: return "comp";
+ case XML_inv: return "inv";
+ case XML_gamma: return "gamma";
+ case XML_invGamma: return "invGamma";
}
SAL_WARN( "oox.drawingml", "Color::getColorTransformationName - unexpected transformation type" );
return OUString();
diff --git a/oox/source/drawingml/fillproperties.cxx b/oox/source/drawingml/fillproperties.cxx
index 9c5338ce8975..81d46dae8a23 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -874,53 +874,53 @@ OUString ArtisticEffectProperties::getEffectString( sal_Int32 nToken )
switch( nToken )
{
// effects
- case OOX_TOKEN( a14, artisticBlur ): return OUString( "artisticBlur" );
- case OOX_TOKEN( a14, artisticCement ): return OUString( "artisticCement" );
- case OOX_TOKEN( a14, artisticChalkSketch ): return OUString( "artisticChalkSketch" );
- case OOX_TOKEN( a14, artisticCrisscrossEtching ): return OUString( "artisticCrisscrossEtching" );
- case OOX_TOKEN( a14, artisticCutout ): return OUString( "artisticCutout" );
- case OOX_TOKEN( a14, artisticFilmGrain ): return OUString( "artisticFilmGrain" );
- case OOX_TOKEN( a14, artisticGlass ): return OUString( "artisticGlass" );
- case OOX_TOKEN( a14, artisticGlowDiffused ): return OUString( "artisticGlowDiffused" );
- case OOX_TOKEN( a14, artisticGlowEdges ): return OUString( "artisticGlowEdges" );
- case OOX_TOKEN( a14, artisticLightScreen ): return OUString( "artisticLightScreen" );
- case OOX_TOKEN( a14, artisticLineDrawing ): return OUString( "artisticLineDrawing" );
- case OOX_TOKEN( a14, artisticMarker ): return OUString( "artisticMarker" );
- case OOX_TOKEN( a14, artisticMosiaicBubbles ): return OUString( "artisticMosiaicBubbles" );
- case OOX_TOKEN( a14, artisticPaintStrokes ): return OUString( "artisticPaintStrokes" );
- case OOX_TOKEN( a14, artisticPaintBrush ): return OUString( "artisticPaintBrush" );
- case OOX_TOKEN( a14, artisticPastelsSmooth ): return OUString( "artisticPastelsSmooth" );
- case OOX_TOKEN( a14, artisticPencilGrayscale ): return OUString( "artisticPencilGrayscale" );
- case OOX_TOKEN( a14, artisticPencilSketch ): return OUString( "artisticPencilSketch" );
- case OOX_TOKEN( a14, artisticPhotocopy ): return OUString( "artisticPhotocopy" );
- case OOX_TOKEN( a14, artisticPlasticWrap ): return OUString( "artisticPlasticWrap" );
- case OOX_TOKEN( a14, artisticTexturizer ): return OUString( "artisticTexturizer" );
- case OOX_TOKEN( a14, artisticWatercolorSponge ): return OUString( "artisticWatercolorSponge" );
- case OOX_TOKEN( a14, brightnessContrast ): return OUString( "brightnessContrast" );
- case OOX_TOKEN( a14, colorTemperature ): return OUString( "colorTemperature" );
- case OOX_TOKEN( a14, saturation ): return OUString( "saturation" );
- case OOX_TOKEN( a14, sharpenSoften ): return OUString( "sharpenSoften" );
+ case OOX_TOKEN( a14, artisticBlur ): return "artisticBlur";
+ case OOX_TOKEN( a14, artisticCement ): return "artisticCement";
+ case OOX_TOKEN( a14, artisticChalkSketch ): return "artisticChalkSketch";
+ case OOX_TOKEN( a14, artisticCrisscrossEtching ): return "artisticCrisscrossEtching";
+ case OOX_TOKEN( a14, artisticCutout ): return "artisticCutout";
+ case OOX_TOKEN( a14, artisticFilmGrain ): return "artisticFilmGrain";
+ case OOX_TOKEN( a14, artisticGlass ): return "artisticGlass";
+ case OOX_TOKEN( a14, artisticGlowDiffused ): return "artisticGlowDiffused";
+ case OOX_TOKEN( a14, artisticGlowEdges ): return "artisticGlowEdges";
+ case OOX_TOKEN( a14, artisticLightScreen ): return "artisticLightScreen";
+ case OOX_TOKEN( a14, artisticLineDrawing ): return "artisticLineDrawing";
+ case OOX_TOKEN( a14, artisticMarker ): return "artisticMarker";
+ case OOX_TOKEN( a14, artisticMosiaicBubbles ): return "artisticMosiaicBubbles";
+ case OOX_TOKEN( a14, artisticPaintStrokes ): return "artisticPaintStrokes";
+ case OOX_TOKEN( a14, artisticPaintBrush ): return "artisticPaintBrush";
+ case OOX_TOKEN( a14, artisticPastelsSmooth ): return "artisticPastelsSmooth";
+ case OOX_TOKEN( a14, artisticPencilGrayscale ): return "artisticPencilGrayscale";
+ case OOX_TOKEN( a14, artisticPencilSketch ): return "artisticPencilSketch";
+ case OOX_TOKEN( a14, artisticPhotocopy ): return "artisticPhotocopy";
+ case OOX_TOKEN( a14, artisticPlasticWrap ): return "artisticPlasticWrap";
+ case OOX_TOKEN( a14, artisticTexturizer ): return "artisticTexturizer";
+ case OOX_TOKEN( a14, artisticWatercolorSponge ): return "artisticWatercolorSponge";
+ case OOX_TOKEN( a14, brightnessContrast ): return "brightnessContrast";
+ case OOX_TOKEN( a14, colorTemperature ): return "colorTemperature";
+ case OOX_TOKEN( a14, saturation ): return "saturation";
+ case OOX_TOKEN( a14, sharpenSoften ): return "sharpenSoften";
// attributes
- case XML_visible: return OUString( "visible" );
- case XML_trans: return OUString( "trans" );
- case XML_crackSpacing: return OUString( "crackSpacing" );
- case XML_pressure: return OUString( "pressure" );
- case XML_numberOfShades: return OUString( "numberOfShades" );
- case XML_grainSize: return OUString( "grainSize" );
- case XML_intensity: return OUString( "intensity" );
- case XML_smoothness: return OUString( "smoothness" );
- case XML_gridSize: return OUString( "gridSize" );
- case XML_pencilSize: return OUString( "pencilSize" );
- case XML_size: return OUString( "size" );
- case XML_brushSize: return OUString( "brushSize" );
- case XML_scaling: return OUString( "scaling" );
- case XML_detail: return OUString( "detail" );
- case XML_bright: return OUString( "bright" );
- case XML_contrast: return OUString( "contrast" );
- case XML_colorTemp: return OUString( "colorTemp" );
- case XML_sat: return OUString( "sat" );
- case XML_amount: return OUString( "amount" );
+ case XML_visible: return "visible";
+ case XML_trans: return "trans";
+ case XML_crackSpacing: return "crackSpacing";
+ case XML_pressure: return "pressure";
+ case XML_numberOfShades: return "numberOfShades";
+ case XML_grainSize: return "grainSize";
+ case XML_intensity: return "intensity";
+ case XML_smoothness: return "smoothness";
+ case XML_gridSize: return "gridSize";
+ case XML_pencilSize: return "pencilSize";
+ case XML_size: return "size";
+ case XML_brushSize: return "brushSize";
+ case XML_scaling: return "scaling";
+ case XML_detail: return "detail";
+ case XML_bright: return "bright";
+ case XML_contrast: return "contrast";
+ case XML_colorTemp: return "colorTemp";
+ case XML_sat: return "sat";
+ case XML_amount: return "amount";
}
SAL_WARN( "oox.drawingml", "ArtisticEffectProperties::getEffectString: unexpected token " << nToken );
return OUString();
diff --git a/oox/source/drawingml/shape3dproperties.cxx b/oox/source/drawingml/shape3dproperties.cxx
index 3002e1462c53..ac94f882d539 100644
--- a/oox/source/drawingml/shape3dproperties.cxx
+++ b/oox/source/drawingml/shape3dproperties.cxx
@@ -45,68 +45,68 @@ OUString Shape3DProperties::getCameraPrstName( sal_Int32 nElement )
{
switch( nElement )
{
- case XML_legacyObliqueTopLeft: return OUString( "legacyObliqueTopLeft" );
- case XML_legacyObliqueTop: return OUString( "legacyObliqueTop" );
- case XML_legacyObliqueTopRight: return OUString( "legacyObliqueTopRight" );
- case XML_legacyObliqueLeft: return OUString( "legacyObliqueLeft" );
- case XML_legacyObliqueFront: return OUString( "legacyObliqueFront" );
- case XML_legacyObliqueRight: return OUString( "legacyObliqueRight" );
- case XML_legacyObliqueBottomLeft: return OUString( "legacyObliqueBottomLeft" );
- case XML_legacyObliqueBottom: return OUString( "legacyObliqueBottom" );
- case XML_legacyObliqueBottomRight: return OUString( "legacyObliqueBottomRight" );
- case XML_legacyPerspectiveTopLeft: return OUString( "legacyPerspectiveTopLeft" );
- case XML_legacyPerspectiveTop: return OUString( "legacyPerspectiveTop" );
- case XML_legacyPerspectiveTopRight: return OUString( "legacyPerspectiveTopRight" );
- case XML_legacyPerspectiveLeft: return OUString( "legacyPerspectiveLeft" );
- case XML_legacyPerspectiveFront: return OUString( "legacyPerspectiveFront" );
- case XML_legacyPerspectiveRight: return OUString( "legacyPerspectiveRight" );
- case XML_legacyPerspectiveBottomLeft: return OUString( "legacyPerspectiveBottomLeft" );
- case XML_legacyPerspectiveBottom: return OUString( "legacyPerspectiveBottom" );
- case XML_legacyPerspectiveBottomRight: return OUString( "legacyPerspectiveBottomRight" );
- case XML_orthographicFront: return OUString( "orthographicFront" );
- case XML_isometricTopUp: return OUString( "isometricTopUp" );
- case XML_isometricTopDown: return OUString( "isometricTopDown" );
- case XML_isometricBottomUp: return OUString( "isometricBottomUp" );
- case XML_isometricBottomDown: return OUString( "isometricBottomDown" );
- case XML_isometricLeftUp: return OUString( "isometricLeftUp" );
- case XML_isometricLeftDown: return OUString( "isometricLeftDown" );
- case XML_isometricRightUp: return OUString( "isometricRightUp" );
- case XML_isometricRightDown: return OUString( "isometricRightDown" );
- case XML_isometricOffAxis1Left: return OUString( "isometricOffAxis1Left" );
- case XML_isometricOffAxis1Right: return OUString( "isometricOffAxis1Right" );
- case XML_isometricOffAxis1Top: return OUString( "isometricOffAxis1Top" );
- case XML_isometricOffAxis2Left: return OUString( "isometricOffAxis2Left" );
- case XML_isometricOffAxis2Right: return OUString( "isometricOffAxis2Right" );
- case XML_isometricOffAxis2Top: return OUString( "isometricOffAxis2Top" );
- case XML_isometricOffAxis3Left: return OUString( "isometricOffAxis3Left" );
- case XML_isometricOffAxis3Right: return OUString( "isometricOffAxis3Right" );
- case XML_isometricOffAxis3Bottom: return OUString( "isometricOffAxis3Bottom" );
- case XML_isometricOffAxis4Left: return OUString( "isometricOffAxis4Left" );
- case XML_isometricOffAxis4Right: return OUString( "isometricOffAxis4Right" );
- case XML_isometricOffAxis4Bottom: return OUString( "isometricOffAxis4Bottom" );
- case XML_obliqueTopLeft: return OUString( "obliqueTopLeft" );
- case XML_obliqueTop: return OUString( "obliqueTop" );
- case XML_obliqueTopRight: return OUString( "obliqueTopRight" );
- case XML_obliqueLeft: return OUString( "obliqueLeft" );
- case XML_obliqueRight: return OUString( "obliqueRight" );
- case XML_obliqueBottomLeft: return OUString( "obliqueBottomLeft" );
- case XML_obliqueBottom: return OUString( "obliqueBottom" );
- case XML_obliqueBottomRight: return OUString( "obliqueBottomRight" );
- case XML_perspectiveFront: return OUString( "perspectiveFront" );
- case XML_perspectiveLeft: return OUString( "perspectiveLeft" );
- case XML_perspectiveRight: return OUString( "perspectiveRight" );
- case XML_perspectiveAbove: return OUString( "perspectiveAbove" );
- case XML_perspectiveBelow: return OUString( "perspectiveBelow" );
- case XML_perspectiveAboveLeftFacing: return OUString( "perspectiveAboveLeftFacing" );
- case XML_perspectiveAboveRightFacing: return OUString( "perspectiveAboveRightFacing" );
- case XML_perspectiveContrastingLeftFacing: return OUString( "perspectiveContrastingLeftFacing" );
- case XML_perspectiveContrastingRightFacing: return OUString( "perspectiveContrastingRightFacing" );
- case XML_perspectiveHeroicLeftFacing: return OUString( "perspectiveHeroicLeftFacing" );
- case XML_perspectiveHeroicRightFacing: return OUString( "perspectiveHeroicRightFacing" );
- case XML_perspectiveHeroicExtremeLeftFacing: return OUString( "perspectiveHeroicExtremeLeftFacing" );
- case XML_perspectiveHeroicExtremeRightFacing: return OUString( "perspectiveHeroicExtremeRightFacing" );
- case XML_perspectiveRelaxed: return OUString( "perspectiveRelaxed" );
- case XML_perspectiveRelaxedModerately: return OUString( "perspectiveRelaxedModerately" );
+ case XML_legacyObliqueTopLeft: return "legacyObliqueTopLeft";
+ case XML_legacyObliqueTop: return "legacyObliqueTop";
+ case XML_legacyObliqueTopRight: return "legacyObliqueTopRight";
+ case XML_legacyObliqueLeft: return "legacyObliqueLeft";
+ case XML_legacyObliqueFront: return "legacyObliqueFront";
+ case XML_legacyObliqueRight: return "legacyObliqueRight";
+ case XML_legacyObliqueBottomLeft: return "legacyObliqueBottomLeft";
+ case XML_legacyObliqueBottom: return "legacyObliqueBottom";
+ case XML_legacyObliqueBottomRight: return "legacyObliqueBottomRight";
+ case XML_legacyPerspectiveTopLeft: return "legacyPerspectiveTopLeft";
+ case XML_legacyPerspectiveTop: return "legacyPerspectiveTop";
+ case XML_legacyPerspectiveTopRight: return "legacyPerspectiveTopRight";
+ case XML_legacyPerspectiveLeft: return "legacyPerspectiveLeft";
+ case XML_legacyPerspectiveFront: return "legacyPerspectiveFront";
+ case XML_legacyPerspectiveRight: return "legacyPerspectiveRight";
+ case XML_legacyPerspectiveBottomLeft: return "legacyPerspectiveBottomLeft";
+ case XML_legacyPerspectiveBottom: return "legacyPerspectiveBottom";
+ case XML_legacyPerspectiveBottomRight: return "legacyPerspectiveBottomRight";
+ case XML_orthographicFront: return "orthographicFront";
+ case XML_isometricTopUp: return "isometricTopUp";
+ case XML_isometricTopDown: return "isometricTopDown";
+ case XML_isometricBottomUp: return "isometricBottomUp";
+ case XML_isometricBottomDown: return "isometricBottomDown";
+ case XML_isometricLeftUp: return "isometricLeftUp";
+ case XML_isometricLeftDown: return "isometricLeftDown";
+ case XML_isometricRightUp: return "isometricRightUp";
+ case XML_isometricRightDown: return "isometricRightDown";
+ case XML_isometricOffAxis1Left: return "isometricOffAxis1Left";
+ case XML_isometricOffAxis1Right: return "isometricOffAxis1Right";
+ case XML_isometricOffAxis1Top: return "isometricOffAxis1Top";
+ case XML_isometricOffAxis2Left: return "isometricOffAxis2Left";
+ case XML_isometricOffAxis2Right: return "isometricOffAxis2Right";
+ case XML_isometricOffAxis2Top: return "isometricOffAxis2Top";
+ case XML_isometricOffAxis3Left: return "isometricOffAxis3Left";
+ case XML_isometricOffAxis3Right: return "isometricOffAxis3Right";
+ case XML_isometricOffAxis3Bottom: return "isometricOffAxis3Bottom";
+ case XML_isometricOffAxis4Left: return "isometricOffAxis4Left";
+ case XML_isometricOffAxis4Right: return "isometricOffAxis4Right";
+ case XML_isometricOffAxis4Bottom: return "isometricOffAxis4Bottom";
+ case XML_obliqueTopLeft: return "obliqueTopLeft";
+ case XML_obliqueTop: return "obliqueTop";
+ case XML_obliqueTopRight: return "obliqueTopRight";
+ case XML_obliqueLeft: return "obliqueLeft";
+ case XML_obliqueRight: return "obliqueRight";
+ case XML_obliqueBottomLeft: return "obliqueBottomLeft";
+ case XML_obliqueBottom: return "obliqueBottom";
+ case XML_obliqueBottomRight: return "obliqueBottomRight";
+ case XML_perspectiveFront: return "perspectiveFront";
+ case XML_perspectiveLeft: return "perspectiveLeft";
+ case XML_perspectiveRight: return "perspectiveRight";
+ case XML_perspectiveAbove: return "perspectiveAbove";
+ case XML_perspectiveBelow: return "perspectiveBelow";
+ case XML_perspectiveAboveLeftFacing: return "perspectiveAboveLeftFacing";
+ case XML_perspectiveAboveRightFacing: return "perspectiveAboveRightFacing";
+ case XML_perspectiveContrastingLeftFacing: return "perspectiveContrastingLeftFacing";
+ case XML_perspectiveContrastingRightFacing: return "perspectiveContrastingRightFacing";
+ case XML_perspectiveHeroicLeftFacing: return "perspectiveHeroicLeftFacing";
+ case XML_perspectiveHeroicRightFacing: return "perspectiveHeroicRightFacing";
+ case XML_perspectiveHeroicExtremeLeftFacing: return "perspectiveHeroicExtremeLeftFacing";
+ case XML_perspectiveHeroicExtremeRightFacing: return "perspectiveHeroicExtremeRightFacing";
+ case XML_perspectiveRelaxed: return "perspectiveRelaxed";
+ case XML_perspectiveRelaxedModerately: return "perspectiveRelaxedModerately";
}
SAL_WARN( "oox.drawingml", "Shape3DProperties::getCameraPrstName - unexpected prst type" );
return OUString();
@@ -116,33 +116,33 @@ OUString Shape3DProperties::getLightRigName( sal_Int32 nElement )
{
switch( nElement )
{
- case XML_legacyFlat1: return OUString( "legacyFlat1" );
- case XML_legacyFlat2: return OUString( "legacyFlat2" );
- case XML_legacyFlat3: return OUString( "legacyFlat3" );
- case XML_legacyFlat4: return OUString( "legacyFlat4" );
- case XML_legacyNormal1: return OUString( "legacyNormal1" );
- case XML_legacyNormal2: return OUString( "legacyNormal2" );
- case XML_legacyNormal3: return OUString( "legacyNormal3" );
- case XML_legacyNormal4: return OUString( "legacyNormal4" );
- case XML_legacyHarsh1: return OUString( "legacyHarsh1" );
- case XML_legacyHarsh2: return OUString( "legacyHarsh2" );
- case XML_legacyHarsh3: return OUString( "legacyHarsh3" );
- case XML_legacyHarsh4: return OUString( "legacyHarsh4" );
- case XML_threePt: return OUString( "threePt" );
- case XML_balanced: return OUString( "balanced" );
- case XML_soft: return OUString( "soft" );
- case XML_harsh: return OUString( "harsh" );
- case XML_flood: return OUString( "flood" );
- case XML_contrasting: return OUString( "contrasting" );
- case XML_morning: return OUString( "morning" );
- case XML_sunrise: return OUString( "sunrise" );
- case XML_sunset: return OUString( "sunset" );
- case XML_chilly: return OUString( "chilly" );
- case XML_freezing: return OUString( "freezing" );
- case XML_flat: return OUString( "flat" );
- case XML_twoPt: return OUString( "twoPt" );
- case XML_glow: return OUString( "glow" );
- case XML_brightRoom: return OUString( "brightRoom" );
+ case XML_legacyFlat1: return "legacyFlat1";
+ case XML_legacyFlat2: return "legacyFlat2";
+ case XML_legacyFlat3: return "legacyFlat3";
+ case XML_legacyFlat4: return "legacyFlat4";
+ case XML_legacyNormal1: return "legacyNormal1";
+ case XML_legacyNormal2: return "legacyNormal2";
+ case XML_legacyNormal3: return "legacyNormal3";
+ case XML_legacyNormal4: return "legacyNormal4";
+ case XML_legacyHarsh1: return "legacyHarsh1";
+ case XML_legacyHarsh2: return "legacyHarsh2";
+ case XML_legacyHarsh3: return "legacyHarsh3";
+ case XML_legacyHarsh4: return "legacyHarsh4";
+ case XML_threePt: return "threePt";
+ case XML_balanced: return "balanced";
+ case XML_soft: return "soft";
+ case XML_harsh: return "harsh";
+ case XML_flood: return "flood";
+ case XML_contrasting: return "contrasting";
+ case XML_morning: return "morning";
+ case XML_sunrise: return "sunrise";
+ case XML_sunset: return "sunset";
+ case XML_chilly: return "chilly";
+ case XML_freezing: return "freezing";
+ case XML_flat: return "flat";
+ case XML_twoPt: return "twoPt";
+ case XML_glow: return "glow";
+ case XML_brightRoom: return "brightRoom";
}
SAL_WARN( "oox.drawingml", "Shape3DProperties::getLightRigName - unexpected token" );
return OUString();
@@ -152,14 +152,14 @@ OUString Shape3DProperties::getLightRigDirName( sal_Int32 nElement )
{
switch( nElement )
{
- case XML_tl: return OUString( "tl" );
- case XML_t: return OUString( "t" );
- case XML_tr: return OUString( "tr" );
- case XML_l: return OUString( "l" );
- case XML_r: return OUString( "r" );
- case XML_bl: return OUString( "bl" );
- case XML_b: return OUString( "b" );
- case XML_br: return OUString( "br" );
+ case XML_tl: return "tl";
+ case XML_t: return "t";
+ case XML_tr: return "tr";
+ case XML_l: return "l";
+ case XML_r: return "r";
+ case XML_bl: return "bl";
+ case XML_b: return "b";
+ case XML_br: return "br";
}
SAL_WARN( "oox.drawingml", "Shape3DProperties::getLightRigDirName - unexpected token" );
return OUString();
@@ -169,18 +169,18 @@ OUString Shape3DProperties::getBevelPresetTypeString( sal_Int32 nType )
{
switch (nType)
{
- case XML_relaxedInset: return OUString("relaxedInset");
- case XML_circle: return OUString("circle");
- case XML_slope: return OUString("slope");
- case XML_cross: return OUString("cross");
- case XML_angle: return OUString("angle");
- case XML_softRound: return OUString("softRound");
- case XML_convex: return OUString("convex");
- case XML_coolSlant: return OUString("coolSlant");
- case XML_divot: return OUString("divot");
- case XML_riblet: return OUString("riblet");
- case XML_hardEdge: return OUString("hardEdge");
- case XML_artDeco: return OUString("artDeco");
+ case XML_relaxedInset: return "relaxedInset";
+ case XML_circle: return "circle";
+ case XML_slope: return "slope";
+ case XML_cross: return "cross";
+ case XML_angle: return "angle";
+ case XML_softRound: return "softRound";
+ case XML_convex: return "convex";
+ case XML_coolSlant: return "coolSlant";
+ case XML_divot: return "divot";
+ case XML_riblet: return "riblet";
+ case XML_hardEdge: return "hardEdge";
+ case XML_artDeco: return "artDeco";
}
SAL_WARN( "oox.drawingml", "Shape3DProperties::getBevelPresetTypeString - unexpected token" );
return OUString();
@@ -190,22 +190,22 @@ OUString Shape3DProperties::getPresetMaterialTypeString( sal_Int32 nType )
{
switch (nType)
{
- case XML_legacyMatte: return OUString("legacyMatte");
- case XML_legacyPlastic: return OUString("legacyPlastic");
- case XML_legacyMetal: return OUString("legacyMetal");
- case XML_legacyWireframe: return OUString("legacyWireframe");
- case XML_matte: return OUString("matte");
- case XML_plastic: return OUString("plastic");
- case XML_metal: return OUString("metal");
- case XML_warmMatte: return OUString("warmMatte");
- case XML_translucentPowder: return OUString("translucentPowder");
- case XML_powder: return OUString("powder");
- case XML_dkEdge: return OUString("dkEdge");
- case XML_softEdge: return OUString("softEdge");
- case XML_clear: return OUString("clear");
- case XML_flat: return OUString("flat");
- case XML_softmetal: return OUString("softmetal");
- case XML_none: return OUString("none");
+ case XML_legacyMatte: return "legacyMatte";
+ case XML_legacyPlastic: return "legacyPlastic";
+ case XML_legacyMetal: return "legacyMetal";
+ case XML_legacyWireframe: return "legacyWireframe";
+ case XML_matte: return "matte";
+ case XML_plastic: return "plastic";
+ case XML_metal: return "metal";
+ case XML_warmMatte: return "warmMatte";
+ case XML_translucentPowder: return "translucentPowder";
+ case XML_powder: return "powder";
+ case XML_dkEdge: return "dkEdge";
+ case XML_softEdge: return "softEdge";
+ case XML_clear: return "clear";
+ case XML_flat: return "flat";
+ case XML_softmetal: return "softmetal";
+ case XML_none: return "none";
}
SAL_WARN( "oox.drawingml", "Shape3DProperties::getPresetMaterialTypeString - unexpected token" );
return OUString();
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx
index ec19bc4042ad..98d8724fe830 100644
--- a/oox/source/export/chartexport.cxx
+++ b/oox/source/export/chartexport.cxx
@@ -3023,16 +3023,16 @@ OUString getFieldTypeString( const chart2::DataPointCustomLabelFieldType aType )
switch (aType)
{
case chart2::DataPointCustomLabelFieldType_CATEGORYNAME:
- return OUString("CATEGORYNAME");
+ return "CATEGORYNAME";
case chart2::DataPointCustomLabelFieldType_SERIESNAME:
- return OUString("SERIESNAME");
+ return "SERIESNAME";
case chart2::DataPointCustomLabelFieldType_VALUE:
- return OUString("VALUE");
+ return "VALUE";
case chart2::DataPointCustomLabelFieldType_CELLREF:
- return OUString("CELLREF");
+ return "CELLREF";
default:
break;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 920e8c589e26..e8101882f4df 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -2124,7 +2124,7 @@ static OUString GetAutoNumType(SvxNumType nNumberingType, bool bSDot, bool bPBeh
case SVX_NUM_ARABIC :
{
if (sPrefixSuffix.isEmpty())
- return OUString("arabicPlain");
+ return "arabicPlain";
else
return "arabic" + sPrefixSuffix;
}
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 4532406af8e4..5adc2e69dba1 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -600,39 +600,39 @@ OUString ControlModelBase::getServiceName() const
ApiControlType eCtrlType = getControlType();
if( mbAwtModel ) switch( eCtrlType )
{
- case API_CONTROL_BUTTON: return OUString( "com.sun.star.awt.UnoControlButtonModel" );
- case API_CONTROL_FIXEDTEXT: return OUString( "com.sun.star.awt.UnoControlFixedTextModel" );
- case API_CONTROL_IMAGE: return OUString( "com.sun.star.awt.UnoControlImageControlModel" );
- case API_CONTROL_CHECKBOX: return OUString( "com.sun.star.awt.UnoControlCheckBoxModel" );
- case API_CONTROL_RADIOBUTTON: return OUString( "com.sun.star.form.component.RadioButton" );
- case API_CONTROL_EDIT: return OUString( "com.sun.star.awt.UnoControlEditModel" );
- case API_CONTROL_NUMERIC: return OUString( "com.sun.star.awt.UnoControlNumericFieldModel" );
- case API_CONTROL_LISTBOX: return OUString( "com.sun.star.form.component.ListBox" );
- case API_CONTROL_COMBOBOX: return OUString( "com.sun.star.form.component.ComboBox" );
- case API_CONTROL_SPINBUTTON: return OUString( "com.sun.star.form.component.SpinButton" );
- case API_CONTROL_SCROLLBAR: return OUString( "com.sun.star.form.component.ScrollBar" );
- case API_CONTROL_PROGRESSBAR: return OUString( "com.sun.star.awt.UnoControlProgressBarModel" );
- case API_CONTROL_GROUPBOX: return OUString( "com.sun.star.form.component.GroupBox" );
- case API_CONTROL_FRAME: return OUString( "com.sun.star.awt.UnoFrameModel" );
- case API_CONTROL_PAGE: return OUString( "com.sun.star.awt.UnoPageModel" );
- case API_CONTROL_MULTIPAGE: return OUString( "com.sun.star.awt.UnoMultiPageModel" );
- case API_CONTROL_DIALOG: return OUString( "com.sun.star.awt.UnoControlDialogModel" );
+ case API_CONTROL_BUTTON: return "com.sun.star.awt.UnoControlButtonModel";
+ case API_CONTROL_FIXEDTEXT: return "com.sun.star.awt.UnoControlFixedTextModel";
+ case API_CONTROL_IMAGE: return "com.sun.star.awt.UnoControlImageControlModel";
+ case API_CONTROL_CHECKBOX: return "com.sun.star.awt.UnoControlCheckBoxModel";
+ case API_CONTROL_RADIOBUTTON: return "com.sun.star.form.component.RadioButton";
+ case API_CONTROL_EDIT: return "com.sun.star.awt.UnoControlEditModel";
+ case API_CONTROL_NUMERIC: return "com.sun.star.awt.UnoControlNumericFieldModel";
+ case API_CONTROL_LISTBOX: return "com.sun.star.form.component.ListBox";
+ case API_CONTROL_COMBOBOX: return "com.sun.star.form.component.ComboBox";
+ case API_CONTROL_SPINBUTTON: return "com.sun.star.form.component.SpinButton";
+ case API_CONTROL_SCROLLBAR: return "com.sun.star.form.component.ScrollBar";
+ case API_CONTROL_PROGRESSBAR: return "com.sun.star.awt.UnoControlProgressBarModel";
+ case API_CONTROL_GROUPBOX: return "com.sun.star.form.component.GroupBox";
+ case API_CONTROL_FRAME: return "com.sun.star.awt.UnoFrameModel";
+ case API_CONTROL_PAGE: return "com.sun.star.awt.UnoPageModel";
+ case API_CONTROL_MULTIPAGE: return "com.sun.star.awt.UnoMultiPageModel";
+ case API_CONTROL_DIALOG: return "com.sun.star.awt.UnoControlDialogModel";
default: OSL_FAIL( "ControlModelBase::getServiceName - no AWT model service supported" );
}
else switch( eCtrlType )
{
- case API_CONTROL_BUTTON: return OUString( "com.sun.star.form.component.CommandButton" );
- case API_CONTROL_FIXEDTEXT: return OUString( "com.sun.star.form.component.FixedText" );
- case API_CONTROL_IMAGE: return OUString( "com.sun.star.form.component.DatabaseImageControl" );
- case API_CONTROL_CHECKBOX: return OUString( "com.sun.star.form.component.CheckBox" );
- case API_CONTROL_RADIOBUTTON: return OUString( "com.sun.star.form.component.RadioButton" );
- case API_CONTROL_EDIT: return OUString( "com.sun.star.form.component.TextField" );
- case API_CONTROL_NUMERIC: return OUString( "com.sun.star.form.component.NumericField" );
- case API_CONTROL_LISTBOX: return OUString( "com.sun.star.form.component.ListBox" );
- case API_CONTROL_COMBOBOX: return OUString( "com.sun.star.form.component.ComboBox" );
- case API_CONTROL_SPINBUTTON: return OUString( "com.sun.star.form.component.SpinButton" );
- case API_CONTROL_SCROLLBAR: return OUString( "com.sun.star.form.component.ScrollBar" );
- case API_CONTROL_GROUPBOX: return OUString( "com.sun.star.form.component.GroupBox" );
+ case API_CONTROL_BUTTON: return "com.sun.star.form.component.CommandButton";
+ case API_CONTROL_FIXEDTEXT: return "com.sun.star.form.component.FixedText";
+ case API_CONTROL_IMAGE: return "com.sun.star.form.component.DatabaseImageControl";
+ case API_CONTROL_CHECKBOX: return "com.sun.star.form.component.CheckBox";
+ case API_CONTROL_RADIOBUTTON: return "com.sun.star.form.component.RadioButton";
+ case API_CONTROL_EDIT: return "com.sun.star.form.component.TextField";
+ case API_CONTROL_NUMERIC: return "com.sun.star.form.component.NumericField";
+ case API_CONTROL_LISTBOX: return "com.sun.star.form.component.ListBox";
+ case API_CONTROL_COMBOBOX: return "com.sun.star.form.component.ComboBox";
+ case API_CONTROL_SPINBUTTON: return "com.sun.star.form.component.SpinButton";
+ case API_CONTROL_SCROLLBAR: return "com.sun.star.form.component.ScrollBar";
+ case API_CONTROL_GROUPBOX: return "com.sun.star.form.component.GroupBox";
default: OSL_FAIL( "ControlModelBase::getServiceName - no form component service supported" );
}
return OUString();
diff --git a/oox/source/ppt/comments.cxx b/oox/source/ppt/comments.cxx
index d803b97a7877..483a2a8f0d4d 100644
--- a/oox/source/ppt/comments.cxx
+++ b/oox/source/ppt/comments.cxx
@@ -69,7 +69,7 @@ OUString Comment::getAuthor ( const CommentAuthorList& list )
if(author.id.toInt32() == nId)
return author.name;
}
- return OUString("Anonymous");
+ return "Anonymous";
}
const Comment& CommentList::getCommentAtIndex (int index)
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index d65e408d3c13..a5ef6c54150d 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -312,7 +312,7 @@ GraphicHelper* PowerPointImport::implCreateGraphicHelper() const
OUString PowerPointImport::getImplementationName()
{
- return OUString( "com.sun.star.comp.oox.ppt.PowerPointImport" );
+ return "com.sun.star.comp.oox.ppt.PowerPointImport";
}
}}
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index e2eacd35b322..1062589c91b6 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -596,7 +596,7 @@ void SAL_CALL ShapeContextHandler::setMediaDescriptor(const uno::Sequence<beans:
OUString ShapeContextHandler::getImplementationName()
{
- return OUString( "com.sun.star.comp.oox.ShapeContextHandler" );
+ return "com.sun.star.comp.oox.ShapeContextHandler";
}
uno::Sequence< OUString > ShapeContextHandler::getSupportedServiceNames()
commit b2ea362361676ad13647880158803efc4dcbcf15
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:52:53 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:56:42 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): opencl
Change-Id: I8e06da641db39d529426064e6c3412bc75a67fb2
Reviewed-on: https://gerrit.libreoffice.org/76661
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/opencl/inc/opencl_device_selection.h b/opencl/inc/opencl_device_selection.h
index 2acb67047c4e..9388f5607fcb 100644
--- a/opencl/inc/opencl_device_selection.h
+++ b/opencl/inc/opencl_device_selection.h
@@ -97,14 +97,14 @@ inline OString getPlatformInfoString(cl_platform_id aPlatformId, cl_platform_inf
{
std::vector<char> temporary(2048, 0);
clGetPlatformInfo(aPlatformId, aPlatformInfo, temporary.size(), temporary.data(), nullptr);
- return OString(temporary.data());
+ return temporary.data();
}
inline OString getDeviceInfoString(cl_device_id aDeviceId, cl_device_info aDeviceInfo)
{
std::vector<char> temporary(2048, 0);
clGetDeviceInfo(aDeviceId, aDeviceInfo, temporary.size(), temporary.data(), nullptr);
- return OString(temporary.data());
+ return temporary.data();
}
inline OString getDeviceType(cl_device_id aDeviceId)
commit de1d80075ca88ad51bf4c99d1a4805162d73491a
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Jul 30 17:52:47 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Wed Jul 31 12:56:35 2019 +0200
Improved loplugin:stringconstant (now that GCC 7 supports it): package
Change-Id: I98b112820d4254dae92a6152dcec7506518c924b
Reviewed-on: https://gerrit.libreoffice.org/76660
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx
index af32ddb5ae97..50fd851b31b8 100644
--- a/package/source/manifest/ManifestReader.cxx
+++ b/package/source/manifest/ManifestReader.cxx
@@ -87,7 +87,7 @@ static Reference < XInterface > ManifestReader_createInstance( Reference< XMulti
}
OUString ManifestReader::static_getImplementationName()
{
- return OUString( "com.sun.star.packages.manifest.comp.ManifestReader" );
+ return "com.sun.star.packages.manifest.comp.ManifestReader";
}
Sequence < OUString > ManifestReader::static_getSupportedServiceNames()
diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx
index 871ed999951a..8fbb9bd6a177 100644
--- a/package/source/manifest/ManifestWriter.cxx
+++ b/package/source/manifest/ManifestWriter.cxx
@@ -80,7 +80,7 @@ static Reference < XInterface > ManifestWriter_createInstance( Reference< XMulti
OUString ManifestWriter::static_getImplementationName()
{
- return OUString ( "com.sun.star.packages.manifest.comp.ManifestWriter" );
+ return "com.sun.star.packages.manifest.comp.ManifestWriter";
}
Sequence < OUString > ManifestWriter::static_getSupportedServiceNames()
diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx
index 26116a0eae56..2b28fdc81cd6 100644
--- a/package/source/xstor/xfactory.cxx
+++ b/package/source/xstor/xfactory.cxx
@@ -76,7 +76,7 @@ uno::Sequence< OUString > OStorageFactory::impl_staticGetSupportedServiceNames()
OUString OStorageFactory::impl_staticGetImplementationName()
{
- return OUString("com.sun.star.comp.embed.StorageFactory");
+ return "com.sun.star.comp.embed.StorageFactory";
}
uno::Reference< uno::XInterface > OStorageFactory::impl_staticCreateSelfInstance(
diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx
index 5a715d3ccfda..f5d8ca351ba9 100644
--- a/package/source/zippackage/ZipPackage.cxx
+++ b/package/source/zippackage/ZipPackage.cxx
@@ -1679,7 +1679,7 @@ static uno::Reference < XInterface > ZipPackage_createInstance(
OUString ZipPackage::static_getImplementationName()
{
- return OUString("com.sun.star.packages.comp.ZipPackage");
+ return "com.sun.star.packages.comp.ZipPackage";
}
Sequence< OUString > ZipPackage::static_getSupportedServiceNames()
diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx
index bd7512a19fc8..0b5ae3623a62 100644
--- a/package/source/zippackage/ZipPackageFolder.cxx
+++ b/package/source/zippackage/ZipPackageFolder.cxx
@@ -409,7 +409,7 @@ void ZipPackageFolder::doInsertByName ( ZipPackageEntry *pEntry, bool bSetParent
OUString ZipPackageFolder::getImplementationName()
{
- return OUString("ZipPackageFolder");
+ return "ZipPackageFolder";
}
uno::Sequence< OUString > ZipPackageFolder::getSupportedServiceNames()
diff --git a/package/source/zippackage/ZipPackageFolderEnumeration.cxx b/package/source/zippackage/ZipPackageFolderEnumeration.cxx
index 229a659d4025..bcedad425f18 100644
--- a/package/source/zippackage/ZipPackageFolderEnumeration.cxx
+++ b/package/source/zippackage/ZipPackageFolderEnumeration.cxx
@@ -56,7 +56,7 @@ uno::Any SAL_CALL ZipPackageFolderEnumeration::nextElement( )
OUString ZipPackageFolderEnumeration::getImplementationName()
{
- return OUString ("ZipPackageFolderEnumeration");
+ return "ZipPackageFolderEnumeration";
}
uno::Sequence< OUString > ZipPackageFolderEnumeration::getSupportedServiceNames()
diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx
index cb0c1cd3dff9..7332cdc366b6 100644
--- a/package/source/zippackage/ZipPackageStream.cxx
+++ b/package/source/zippackage/ZipPackageStream.cxx
@@ -1316,7 +1316,7 @@ void ZipPackageStream::setSize ( const sal_Int64 nNewSize )
}
OUString ZipPackageStream::getImplementationName()
{
- return OUString ("ZipPackageStream");
+ return "ZipPackageStream";
}
Sequence< OUString > ZipPackageStream::getSupportedServiceNames()
diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx
index 45079fdbaec3..f5b0a4b434cf 100644
--- a/package/source/zippackage/zipfileaccess.cxx
+++ b/package/source/zippackage/zipfileaccess.cxx
@@ -461,7 +461,7 @@ uno::Sequence< OUString > OZipFileAccess::impl_staticGetSupportedServiceNames()
OUString OZipFileAccess::impl_staticGetImplementationName()
{
- return OUString("com.sun.star.comp.package.zip.ZipFileAccess");
+ return "com.sun.star.comp.package.zip.ZipFileAccess";
}
uno::Reference< uno::XInterface > OZipFileAccess::impl_staticCreateSelfInstance(
More information about the Libreoffice-commits
mailing list