Adapt to no-longer explicit OUStringLiteral ctor

...from previous commit

Change-Id: I062b7cd212c17e7eb5274476e6859228d0477c7f
Reviewed-on: https://gerrit.libreoffice.org/32098
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>

chart2/source/controller/dialogs/res_DataLabel.cxx

@@ -40,11 +40,7 @@ namespace chart
 namespace
 {
 
-const OUStringLiteral our_aLBEntryMap[] = {
+const OUStringLiteral our_aLBEntryMap[] = {" ", ", ", "; ", "\n"};
-    OUStringLiteral(" "),
-    OUStringLiteral(", "),
-    OUStringLiteral("; "),
-    OUStringLiteral("\n")};
 
 bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uLong& rnFormatKeyOut, bool& rbSourceFormatOut, bool& rbSourceFormatMixedStateOut )
 {

compilerplugins/clang/stringstatic.cxx

@@ -14,9 +14,7 @@
 
 /** Look for static OUString and OUString[], they can be more effeciently declared as:
 
-        static const OUStringLiteral our_aLBEntryMap[] = {
+        static const OUStringLiteral our_aLBEntryMap[] = {" ", ", "};
-            OUStringLiteral(" "),
-            OUStringLiteral(", ")};
         static const OUStringLiteral sName("name");
 
     which is more efficient at startup time.

connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx

@@ -998,8 +998,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes(  ) throw
     // there exists no possibility to get table types so we have to check
     static const OUStringLiteral sTableTypes[] =
     {
-        OUStringLiteral("TABLE"),
+        "TABLE" // Currently we only support a 'TABLE' nothing more complex
-        // Currently we only support a 'TABLE' nothing more complex
     };
     ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
     Reference< XResultSet > xRef = pResult;

connectivity/source/drivers/jdbc/DatabaseMetaData.cxx

@@ -432,13 +432,13 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges(
                 // here we know that the count of column doesn't match
                 ::std::map<sal_Int32,sal_Int32> aColumnMatching;
                 static const OUStringLiteral sPrivs[] = {
-                                            OUStringLiteral("TABLE_CAT"),
+                                            "TABLE_CAT",
-                                            OUStringLiteral("TABLE_SCHEM"),
+                                            "TABLE_SCHEM",
-                                            OUStringLiteral("TABLE_NAME"),
+                                            "TABLE_NAME",
-                                            OUStringLiteral("GRANTOR"),
+                                            "GRANTOR",
-                                            OUStringLiteral("GRANTEE"),
+                                            "GRANTEE",
-                                            OUStringLiteral("PRIVILEGE"),
+                                            "PRIVILEGE",
-                                            OUStringLiteral("IS_GRANTABLE")
+                                            "IS_GRANTABLE"
                                         };
 
                 OUString sColumnName;

connectivity/source/drivers/mork/MDatabaseMetaData.cxx

@@ -839,8 +839,8 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes(  ) throw(SQLE
     // there exists no possibility to get table types so we have to check
     static const OUStringLiteral sTableTypes[] =
     {
-        OUStringLiteral("TABLE"),
+        "TABLE",
-        OUStringLiteral("VIEW")
+        "VIEW"
         // Currently we only support a 'TABLE' and 'VIEW' nothing more complex
 
         // OUString("SYSTEM TABLE"),

cui/source/options/personalization.cxx

@@ -130,10 +130,7 @@ IMPL_LINK( SelectPersonaDialog, SearchPersonas, Button*, pButton, void )
      * RID_SVXSTR_PERSONA_CATEGORIES in personalization.src
      */
     static const OUStringLiteral vSuggestionCategories[] =
-    {
+        {"LibreOffice", "Abstract", "Color", "Music", "Nature", "Solid"};
-        OUStringLiteral("LibreOffice"), OUStringLiteral("Abstract"), OUStringLiteral("Color"),
-        OUStringLiteral("Music"), OUStringLiteral("Nature"), OUStringLiteral("Solid")
-    };
 
     OUString searchTerm;
     if( m_pSearchThread.is() )

oox/source/export/shapes.cxx

@@ -533,64 +533,64 @@ ShapeExport& ShapeExport::WriteGroupShape(const uno::Reference<drawing::XShape>&
 static bool lcl_IsOnBlacklist(OUString& rShapeType)
 {
     static const std::initializer_list<OUStringLiteral> vBlacklist = {
-        OUStringLiteral("block-arc"),
+        "block-arc",
-        OUStringLiteral("rectangle"),
+        "rectangle",
-        OUStringLiteral("ellipse"),
+        "ellipse",
-        OUStringLiteral("ring"),
+        "ring",
-        OUStringLiteral("can"),
+        "can",
-        OUStringLiteral("cube"),
+        "cube",
-        OUStringLiteral("paper"),
+        "paper",
-        OUStringLiteral("frame"),
+        "frame",
-        OUStringLiteral("smiley"),
+        "smiley",
-        OUStringLiteral("sun"),
+        "sun",
-        OUStringLiteral("flower"),
+        "flower",
-        OUStringLiteral("bracket-pair"),
+        "bracket-pair",
-        OUStringLiteral("brace-pair"),
+        "brace-pair",
-        OUStringLiteral("col-60da8460"),
+        "col-60da8460",
-        OUStringLiteral("col-502ad400"),
+        "col-502ad400",
-        OUStringLiteral("quad-bevel"),
+        "quad-bevel",
-        OUStringLiteral("round-rectangular-callout"),
+        "round-rectangular-callout",
-        OUStringLiteral("rectangular-callout"),
+        "rectangular-callout",
-        OUStringLiteral("round-callout"),
+        "round-callout",
-        OUStringLiteral("cloud-callout"),
+        "cloud-callout",
-        OUStringLiteral("line-callout-1"),
+        "line-callout-1",
-        OUStringLiteral("line-callout-2"),
+        "line-callout-2",
-        OUStringLiteral("line-callout-3"),
+        "line-callout-3",
-        OUStringLiteral("paper"),
+        "paper",
-        OUStringLiteral("vertical-scroll"),
+        "vertical-scroll",
-        OUStringLiteral("horizontal-scroll"),
+        "horizontal-scroll",
-        OUStringLiteral("mso-spt34"),
+        "mso-spt34",
-        OUStringLiteral("mso-spt75"),
+        "mso-spt75",
-        OUStringLiteral("mso-spt164"),
+        "mso-spt164",
-        OUStringLiteral("mso-spt180"),
+        "mso-spt180",
-        OUStringLiteral("flowchart-process"),
+        "flowchart-process",
-        OUStringLiteral("flowchart-alternate-process"),
+        "flowchart-alternate-process",
-        OUStringLiteral("flowchart-decision"),
+        "flowchart-decision",
-        OUStringLiteral("flowchart-data"),
+        "flowchart-data",
-        OUStringLiteral("flowchart-predefined-process"),
+        "flowchart-predefined-process",
-        OUStringLiteral("flowchart-internal-storage"),
+        "flowchart-internal-storage",
-        OUStringLiteral("flowchart-document"),
+        "flowchart-document",
-        OUStringLiteral("flowchart-multidocument"),
+        "flowchart-multidocument",
-        OUStringLiteral("flowchart-terminator"),
+        "flowchart-terminator",
-        OUStringLiteral("flowchart-preparation"),
+        "flowchart-preparation",
-        OUStringLiteral("flowchart-manual-input"),
+        "flowchart-manual-input",
-        OUStringLiteral("flowchart-manual-operation"),
+        "flowchart-manual-operation",
-        OUStringLiteral("flowchart-connector"),
+        "flowchart-connector",
-        OUStringLiteral("flowchart-off-page-connector"),
+        "flowchart-off-page-connector",
-        OUStringLiteral("flowchart-card"),
+        "flowchart-card",
-        OUStringLiteral("flowchart-punched-tape"),
+        "flowchart-punched-tape",
-        OUStringLiteral("flowchart-summing-junction"),
+        "flowchart-summing-junction",
-        OUStringLiteral("flowchart-or"),
+        "flowchart-or",
-        OUStringLiteral("flowchart-collate"),
+        "flowchart-collate",
-        OUStringLiteral("flowchart-sort"),
+        "flowchart-sort",
-        OUStringLiteral("flowchart-extract"),
+        "flowchart-extract",
-        OUStringLiteral("flowchart-merge"),
+        "flowchart-merge",
-        OUStringLiteral("flowchart-stored-data"),
+        "flowchart-stored-data",
-        OUStringLiteral("flowchart-delay"),
+        "flowchart-delay",
-        OUStringLiteral("flowchart-sequential-access"),
+        "flowchart-sequential-access",
-        OUStringLiteral("flowchart-magnetic-disk"),
+        "flowchart-magnetic-disk",
-        OUStringLiteral("flowchart-direct-access-storage"),
+        "flowchart-direct-access-storage",
-        OUStringLiteral("flowchart-display")
+        "flowchart-display"
     };
 
     return std::find(vBlacklist.begin(), vBlacklist.end(), rShapeType) != vBlacklist.end();
@@ -599,9 +599,9 @@ static bool lcl_IsOnBlacklist(OUString& rShapeType)
 static bool lcl_IsOnWhitelist(OUString& rShapeType)
 {
     static const std::initializer_list<OUStringLiteral> vWhitelist = {
-        OUStringLiteral("forbidden"),
+        "forbidden",
-        OUStringLiteral("heart"),
+        "heart",
-        OUStringLiteral("puzzle")
+        "puzzle"
     };
 
     return std::find(vWhitelist.begin(), vWhitelist.end(), rShapeType) != vWhitelist.end();

reportdesign/source/core/api/ReportDefinition.cxx

@@ -2189,25 +2189,25 @@ uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames()
 {
     static const OUStringLiteral aSvxComponentServiceNameList[] =
     {
-        OUStringLiteral("com.sun.star.form.component.FixedText"),
+        "com.sun.star.form.component.FixedText",
-        OUStringLiteral("com.sun.star.form.component.DatabaseImageControl"),
+        "com.sun.star.form.component.DatabaseImageControl",
-        OUStringLiteral("com.sun.star.style.PageStyle"),
+        "com.sun.star.style.PageStyle",
-        OUStringLiteral("com.sun.star.style.GraphicStyle"),
+        "com.sun.star.style.GraphicStyle",
-        OUStringLiteral("com.sun.star.style.FrameStyle"),
+        "com.sun.star.style.FrameStyle",
-        OUStringLiteral("com.sun.star.drawing.Defaults"),
+        "com.sun.star.drawing.Defaults",
-        OUStringLiteral("com.sun.star.document.ImportEmbeddedObjectResolver"),
+        "com.sun.star.document.ImportEmbeddedObjectResolver",
-        OUStringLiteral("com.sun.star.document.ExportEmbeddedObjectResolver"),
+        "com.sun.star.document.ExportEmbeddedObjectResolver",
-        OUStringLiteral("com.sun.star.document.ImportGraphicObjectResolver"),
+        "com.sun.star.document.ImportGraphicObjectResolver",
-        OUStringLiteral("com.sun.star.document.ExportGraphicObjectResolver"),
+        "com.sun.star.document.ExportGraphicObjectResolver",
-        OUStringLiteral("com.sun.star.chart2.data.DataProvider"),
+        "com.sun.star.chart2.data.DataProvider",
-        OUStringLiteral("com.sun.star.xml.NamespaceMap"),
+        "com.sun.star.xml.NamespaceMap",
-        OUStringLiteral("com.sun.star.document.Settings"),
+        "com.sun.star.document.Settings",
-        OUStringLiteral("com.sun.star.drawing.GradientTable"),
+        "com.sun.star.drawing.GradientTable",
-        OUStringLiteral("com.sun.star.drawing.HatchTable"),
+        "com.sun.star.drawing.HatchTable",
-        OUStringLiteral("com.sun.star.drawing.BitmapTable"),
+        "com.sun.star.drawing.BitmapTable",
-        OUStringLiteral("com.sun.star.drawing.TransparencyGradientTable"),
+        "com.sun.star.drawing.TransparencyGradientTable",
-        OUStringLiteral("com.sun.star.drawing.DashTable"),
+        "com.sun.star.drawing.DashTable",
-        OUStringLiteral("com.sun.star.drawing.MarkerTable")
+        "com.sun.star.drawing.MarkerTable"
     };
 
     static const sal_uInt16 nSvxComponentServiceNameListCount = SAL_N_ELEMENTS(aSvxComponentServiceNameList);

reportdesign/source/ui/inspection/DataProviderHandler.cxx

@@ -368,10 +368,10 @@ uno::Sequence< beans::Property > SAL_CALL DataProviderHandler::getSupportedPrope
         beans::Property aValue;
         static const OUStringLiteral s_pProperties[] =
         {
-             OUStringLiteral(PROPERTY_CHARTTYPE)
+             PROPERTY_CHARTTYPE
-            ,OUStringLiteral(PROPERTY_MASTERFIELDS)
+            ,PROPERTY_MASTERFIELDS
-            ,OUStringLiteral(PROPERTY_DETAILFIELDS)
+            ,PROPERTY_DETAILFIELDS
-            ,OUStringLiteral(PROPERTY_PREVIEW_COUNT)
+            ,PROPERTY_PREVIEW_COUNT
         };
 
         for (const auto & rName : s_pProperties)

reportdesign/source/ui/inspection/metadata.cxx

@@ -233,59 +233,59 @@ namespace rptui
         uno::Sequence< beans::Property > aProps = _xFormComponentHandler->getSupportedProperties();
         static const OUStringLiteral pExcludeProperties[] =
         {
-                OUStringLiteral("Enabled"),
+                "Enabled",
-                OUStringLiteral("Printable"),
+                "Printable",
-                OUStringLiteral("WordBreak"),
+                "WordBreak",
-                OUStringLiteral("MultiLine"),
+                "MultiLine",
-                OUStringLiteral("Tag"),
+                "Tag",
-                OUStringLiteral("HelpText"),
+                "HelpText",
-                OUStringLiteral("HelpURL"),
+                "HelpURL",
-                OUStringLiteral("MaxTextLen"),
+                "MaxTextLen",
-                OUStringLiteral("ReadOnly"),
+                "ReadOnly",
-                OUStringLiteral("Tabstop"),
+                "Tabstop",
-                OUStringLiteral("TabIndex"),
+                "TabIndex",
-                OUStringLiteral("ValueMin"),
+                "ValueMin",
-                OUStringLiteral("ValueMax"),
+                "ValueMax",
-                OUStringLiteral("Spin"),
+                "Spin",
-                OUStringLiteral("SpinValue"),
+                "SpinValue",
-                OUStringLiteral("SpinValueMin"),
+                "SpinValueMin",
-                OUStringLiteral("SpinValueMax"),
+                "SpinValueMax",
-                OUStringLiteral("DefaultSpinValue"),
+                "DefaultSpinValue",
-                OUStringLiteral("SpinIncrement"),
+                "SpinIncrement",
-                OUStringLiteral("Repeat"),
+                "Repeat",
-                OUStringLiteral("RepeatDelay"),
+                "RepeatDelay",
-                OUStringLiteral("ControlLabel"), /// TODO: has to be checked
+                "ControlLabel", /// TODO: has to be checked
-                OUStringLiteral("LabelControl"),
+                "LabelControl",
-                OUStringLiteral("Title"), // comment this out if you want to have title feature for charts
+                "Title", // comment this out if you want to have title feature for charts
-                OUStringLiteral(PROPERTY_MAXTEXTLEN),
+                PROPERTY_MAXTEXTLEN,
-                OUStringLiteral(PROPERTY_EFFECTIVEDEFAULT),
+                PROPERTY_EFFECTIVEDEFAULT,
-                OUStringLiteral(PROPERTY_EFFECTIVEMAX),
+                PROPERTY_EFFECTIVEMAX,
-                OUStringLiteral(PROPERTY_EFFECTIVEMIN),
+                PROPERTY_EFFECTIVEMIN,
-                OUStringLiteral("HideInactiveSelection"),
+                "HideInactiveSelection",
-                OUStringLiteral("SubmitAction"),
+                "SubmitAction",
-                OUStringLiteral("InputRequired"),
+                "InputRequired",
-                OUStringLiteral("VerticalAlign"),
+                "VerticalAlign",
-                OUStringLiteral(PROPERTY_ALIGN),
+                PROPERTY_ALIGN,
-                OUStringLiteral(PROPERTY_EMPTY_IS_NULL),
+                PROPERTY_EMPTY_IS_NULL,
-                OUStringLiteral(PROPERTY_FILTERPROPOSAL)
+                PROPERTY_FILTERPROPOSAL
-                ,OUStringLiteral(PROPERTY_POSITIONX)
+                ,PROPERTY_POSITIONX
-                ,OUStringLiteral(PROPERTY_POSITIONY)
+                ,PROPERTY_POSITIONY
-                ,OUStringLiteral(PROPERTY_WIDTH)
+                ,PROPERTY_WIDTH
-                ,OUStringLiteral(PROPERTY_HEIGHT)
+                ,PROPERTY_HEIGHT
-                ,OUStringLiteral(PROPERTY_FONT)
+                ,PROPERTY_FONT
-                ,OUStringLiteral(PROPERTY_LABEL)
+                ,PROPERTY_LABEL
-                ,OUStringLiteral(PROPERTY_LINECOLOR)
+                ,PROPERTY_LINECOLOR
-                ,OUStringLiteral(PROPERTY_BORDER)
+                ,PROPERTY_BORDER
-                ,OUStringLiteral(PROPERTY_BORDERCOLOR)
+                ,PROPERTY_BORDERCOLOR
-                ,OUStringLiteral(PROPERTY_BACKTRANSPARENT)
+                ,PROPERTY_BACKTRANSPARENT
-                ,OUStringLiteral(PROPERTY_CONTROLBACKGROUND)
+                ,PROPERTY_CONTROLBACKGROUND
-                ,OUStringLiteral(PROPERTY_BACKGROUNDCOLOR)
+                ,PROPERTY_BACKGROUNDCOLOR
-                ,OUStringLiteral(PROPERTY_CONTROLBACKGROUNDTRANSPARENT)
+                ,PROPERTY_CONTROLBACKGROUNDTRANSPARENT
-                ,OUStringLiteral(PROPERTY_FORMULALIST)
+                ,PROPERTY_FORMULALIST
-                ,OUStringLiteral(PROPERTY_SCOPE)
+                ,PROPERTY_SCOPE
-                ,OUStringLiteral(PROPERTY_TYPE)
+                ,PROPERTY_TYPE
-                ,OUStringLiteral(PROPERTY_DATASOURCENAME)
+                ,PROPERTY_DATASOURCENAME
-                ,OUStringLiteral(PROPERTY_VERTICALALIGN)
+                ,PROPERTY_VERTICALALIGN
         };
 
         beans::Property* pPropsIter = aProps.getArray();

reportdesign/source/ui/report/ReportController.cxx

@@ -2067,14 +2067,14 @@ void OReportController::onLoadedMenu(const Reference< frame::XLayoutManager >& _
     if ( _xLayoutManager.is() )
     {
         static const OUStringLiteral s_sMenu[] = {
-             OUStringLiteral("private:resource/statusbar/statusbar")
+             "private:resource/statusbar/statusbar"
-            ,OUStringLiteral("private:resource/toolbar/reportcontrols")
+            ,"private:resource/toolbar/reportcontrols"
-            ,OUStringLiteral("private:resource/toolbar/drawbar")
+            ,"private:resource/toolbar/drawbar"
-            ,OUStringLiteral("private:resource/toolbar/Formatting")
+            ,"private:resource/toolbar/Formatting"
-            ,OUStringLiteral("private:resource/toolbar/alignmentbar")
+            ,"private:resource/toolbar/alignmentbar"
-            ,OUStringLiteral("private:resource/toolbar/sectionalignmentbar")
+            ,"private:resource/toolbar/sectionalignmentbar"
-            ,OUStringLiteral("private:resource/toolbar/resizebar")
+            ,"private:resource/toolbar/resizebar"
-            ,OUStringLiteral("private:resource/toolbar/sectionshrinkbar")
+            ,"private:resource/toolbar/sectionshrinkbar"
         };
         for (const auto & i : s_sMenu)
         {

sax/qa/cppunit/xmlimport.cxx

@@ -287,9 +287,9 @@ const OString DummyTokenHandler::tokens[] = { "Signature", "CanonicalizationMeth
                                               "DigestMethod", "Reference", "document",
                                               "spacing", "Player", "Height" };
 
-const OUStringLiteral DummyTokenHandler::namespaceURIs[] = { OUStringLiteral("http://www.w3.org/2000/09/xmldsig#"),
+const OUStringLiteral DummyTokenHandler::namespaceURIs[] = { "http://www.w3.org/2000/09/xmldsig#",
-                                                  OUStringLiteral("http://schemas.openxmlformats.org/wordprocessingml/2006/main/"),
+                                                  "http://schemas.openxmlformats.org/wordprocessingml/2006/main/",
-                                                  OUStringLiteral("xyzsports.com/players/football/") };
+                                                  "xyzsports.com/players/football/" };
 
 const OString DummyTokenHandler::namespacePrefixes[] = { "", "w", "Player" };
 

sc/source/ui/vba/vbadialog.cxx

@@ -25,31 +25,31 @@ using namespace ::com::sun::star;
 
 static const OUStringLiteral aStringList[]=
 {
-    OUStringLiteral( ".uno:Open" ),
+    ".uno:Open",
-    OUStringLiteral( ".uno:FormatCellDialog" ),
+    ".uno:FormatCellDialog",
-    OUStringLiteral( ".uno:InsertCell" ),
+    ".uno:InsertCell",
-    OUStringLiteral( ".uno:Print" ),
+    ".uno:Print",
-    OUStringLiteral( ".uno:PasteSpecial" ),
+    ".uno:PasteSpecial",
-    OUStringLiteral( ".uno:ToolProtectionDocument" ),
+    ".uno:ToolProtectionDocument",
-    OUStringLiteral( ".uno:ColumnWidth" ),
+    ".uno:ColumnWidth",
-    OUStringLiteral( ".uno:DefineName" ),
+    ".uno:DefineName",
-    OUStringLiteral( ".uno:ConfigureDialog" ),
+    ".uno:ConfigureDialog",
-    OUStringLiteral( ".uno:HyperlinkDialog" ),
+    ".uno:HyperlinkDialog",
-    OUStringLiteral( ".uno:InsertGraphic" ),
+    ".uno:InsertGraphic",
-    OUStringLiteral( ".uno:InsertObject" ),
+    ".uno:InsertObject",
-    OUStringLiteral( ".uno:PageFormatDialog" ),
+    ".uno:PageFormatDialog",
-    OUStringLiteral( ".uno:DataSort" ),
+    ".uno:DataSort",
-    OUStringLiteral( ".uno:RowHeight" ),
+    ".uno:RowHeight",
-    OUStringLiteral( ".uno:AutoCorrectDlg" ),
+    ".uno:AutoCorrectDlg",
-    OUStringLiteral( ".uno:ConditionalFormatDialog" ),
+    ".uno:ConditionalFormatDialog",
-    OUStringLiteral( ".uno:DataConsolidate" ),
+    ".uno:DataConsolidate",
-    OUStringLiteral( ".uno:CreateNames" ),
+    ".uno:CreateNames",
-    OUStringLiteral( ".uno:FillSeries" ),
+    ".uno:FillSeries",
-    OUStringLiteral( ".uno:Validation"),
+    ".uno:Validation",
-    OUStringLiteral( ".uno:DefineLabelRange" ),
+    ".uno:DefineLabelRange",
-    OUStringLiteral( ".uno:DataFilterAutoFilter" ),
+    ".uno:DataFilterAutoFilter",
-    OUStringLiteral( ".uno:DataFilterSpecialFilter" ),
+    ".uno:DataFilterSpecialFilter",
-    OUStringLiteral( ".uno:AutoFormat" )
+    ".uno:AutoFormat"
 };
 
 const sal_Int32 nDialogSize = SAL_N_ELEMENTS(aStringList);

sd/source/ui/table/TableDesignPane.cxx

@@ -79,12 +79,12 @@ static const sal_Int32 nBitmapHeight = (nCellHeight * nPreviewRows) - (nPreviewR
 
 static const OUStringLiteral gPropNames[ CB_COUNT ] =
 {
-    OUStringLiteral("UseFirstRowStyle") ,
+    "UseFirstRowStyle",
-    OUStringLiteral("UseLastRowStyle") ,
+    "UseLastRowStyle",
-    OUStringLiteral("UseBandingRowStyle") ,
+    "UseBandingRowStyle",
-    OUStringLiteral("UseFirstColumnStyle") ,
+    "UseFirstColumnStyle",
-    OUStringLiteral("UseLastColumnStyle") ,
+    "UseLastColumnStyle",
-    OUStringLiteral("UseBandingColumnStyle")
+    "UseBandingColumnStyle"
 };
 
 TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal )

svl/source/numbers/zforscan.cxx

@@ -441,16 +441,16 @@ Color* ImpSvNumberformatScan::GetColor(OUString& sStr)
     if ( i >= NF_MAX_DEFAULT_COLORS )
     {
         static OUStringLiteral const pEnglishColors[NF_MAX_DEFAULT_COLORS] = {
-            OUStringLiteral( "BLACK" ),
+            "BLACK",
-            OUStringLiteral( "BLUE" ),
+            "BLUE",
-            OUStringLiteral( "GREEN" ),
+            "GREEN",
-            OUStringLiteral( "CYAN" ),
+            "CYAN",
-            OUStringLiteral( "RED" ),
+            "RED",
-            OUStringLiteral( "MAGENTA" ),
+            "MAGENTA",
-            OUStringLiteral( "BROWN" ),
+            "BROWN",
-            OUStringLiteral( "GREY" ),
+            "GREY",
-            OUStringLiteral( "YELLOW" ),
+            "YELLOW",
-            OUStringLiteral( "WHITE" )
+            "WHITE"
         };
         size_t j = 0;
         while ( j < NF_MAX_DEFAULT_COLORS && sString != pEnglishColors[j] )

svx/source/fmcomp/fmgridif.cxx

@@ -1596,8 +1596,8 @@ void FmXGridPeer::addColumnListeners(const Reference< XPropertySet >& xCol)
 {
     static const OUStringLiteral aPropsListenedTo[] =
     {
-        OUStringLiteral(FM_PROP_LABEL), OUStringLiteral(FM_PROP_WIDTH), OUStringLiteral(FM_PROP_HIDDEN),
+        FM_PROP_LABEL, FM_PROP_WIDTH, FM_PROP_HIDDEN, FM_PROP_ALIGN,
-        OUStringLiteral(FM_PROP_ALIGN), OUStringLiteral(FM_PROP_FORMATKEY)
+        FM_PROP_FORMATKEY
     };
 
     // as not all properties have to be supported by all columns we have to check this
@@ -1621,8 +1621,8 @@ void FmXGridPeer::removeColumnListeners(const Reference< XPropertySet >& xCol)
     // we have to do it this way ....
     static const OUStringLiteral aPropsListenedTo[] =
     {
-        OUStringLiteral(FM_PROP_LABEL), OUStringLiteral(FM_PROP_WIDTH), OUStringLiteral(FM_PROP_HIDDEN),
+        FM_PROP_LABEL, FM_PROP_WIDTH, FM_PROP_HIDDEN, FM_PROP_ALIGN,
-        OUStringLiteral(FM_PROP_ALIGN), OUStringLiteral(FM_PROP_FORMATKEY)
+        FM_PROP_FORMATKEY
     };
 
     Reference< XPropertySetInfo >  xInfo = xCol->getPropertySetInfo();

svx/source/form/fmdmod.cxx

@@ -51,25 +51,25 @@ using namespace ::svxform;
 {
     static const OUStringLiteral aSvxComponentServiceNameList[] =
     {
-        OUStringLiteral(FM_SUN_COMPONENT_TEXTFIELD),
+        FM_SUN_COMPONENT_TEXTFIELD,
-        OUStringLiteral(FM_SUN_COMPONENT_FORM),
+        FM_SUN_COMPONENT_FORM,
-        OUStringLiteral(FM_SUN_COMPONENT_LISTBOX),
+        FM_SUN_COMPONENT_LISTBOX,
-        OUStringLiteral(FM_SUN_COMPONENT_COMBOBOX),
+        FM_SUN_COMPONENT_COMBOBOX,
-        OUStringLiteral(FM_SUN_COMPONENT_RADIOBUTTON),
+        FM_SUN_COMPONENT_RADIOBUTTON,
-        OUStringLiteral(FM_SUN_COMPONENT_GROUPBOX),
+        FM_SUN_COMPONENT_GROUPBOX,
-        OUStringLiteral(FM_SUN_COMPONENT_FIXEDTEXT),
+        FM_SUN_COMPONENT_FIXEDTEXT,
-        OUStringLiteral(FM_SUN_COMPONENT_COMMANDBUTTON),
+        FM_SUN_COMPONENT_COMMANDBUTTON,
-        OUStringLiteral(FM_SUN_COMPONENT_CHECKBOX),
+        FM_SUN_COMPONENT_CHECKBOX,
-        OUStringLiteral(FM_SUN_COMPONENT_GRIDCONTROL),
+        FM_SUN_COMPONENT_GRIDCONTROL,
-        OUStringLiteral(FM_SUN_COMPONENT_IMAGEBUTTON),
+        FM_SUN_COMPONENT_IMAGEBUTTON,
-        OUStringLiteral(FM_SUN_COMPONENT_FILECONTROL),
+        FM_SUN_COMPONENT_FILECONTROL,
-        OUStringLiteral(FM_SUN_COMPONENT_TIMEFIELD),
+        FM_SUN_COMPONENT_TIMEFIELD,
-        OUStringLiteral(FM_SUN_COMPONENT_DATEFIELD),
+        FM_SUN_COMPONENT_DATEFIELD,
-        OUStringLiteral(FM_SUN_COMPONENT_NUMERICFIELD),
+        FM_SUN_COMPONENT_NUMERICFIELD,
-        OUStringLiteral(FM_SUN_COMPONENT_CURRENCYFIELD),
+        FM_SUN_COMPONENT_CURRENCYFIELD,
-        OUStringLiteral(FM_SUN_COMPONENT_PATTERNFIELD),
+        FM_SUN_COMPONENT_PATTERNFIELD,
-        OUStringLiteral(FM_SUN_COMPONENT_HIDDENCONTROL),
+        FM_SUN_COMPONENT_HIDDENCONTROL,
-        OUStringLiteral(FM_SUN_COMPONENT_IMAGECONTROL)
+        FM_SUN_COMPONENT_IMAGECONTROL
     };
 
     static const sal_uInt16 nSvxComponentServiceNameListCount = SAL_N_ELEMENTS(aSvxComponentServiceNameList);

svx/source/form/fmundo.cxx

@@ -537,12 +537,12 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
 
         // if it's a "default value" property of a control model, set the according "value" property
         static const OUStringLiteral pDefaultValueProperties[] = {
-            OUStringLiteral(FM_PROP_DEFAULT_TEXT), OUStringLiteral(FM_PROP_DEFAULTCHECKED), OUStringLiteral(FM_PROP_DEFAULT_DATE), OUStringLiteral(FM_PROP_DEFAULT_TIME),
+            FM_PROP_DEFAULT_TEXT, FM_PROP_DEFAULTCHECKED, FM_PROP_DEFAULT_DATE, FM_PROP_DEFAULT_TIME,
-            OUStringLiteral(FM_PROP_DEFAULT_VALUE), OUStringLiteral(FM_PROP_DEFAULT_SELECT_SEQ), OUStringLiteral(FM_PROP_EFFECTIVE_DEFAULT)
+            FM_PROP_DEFAULT_VALUE, FM_PROP_DEFAULT_SELECT_SEQ, FM_PROP_EFFECTIVE_DEFAULT
         };
         static const OUStringLiteral aValueProperties[] = {
-            OUStringLiteral(FM_PROP_TEXT), OUStringLiteral(FM_PROP_STATE), OUStringLiteral(FM_PROP_DATE), OUStringLiteral(FM_PROP_TIME),
+            FM_PROP_TEXT, FM_PROP_STATE, FM_PROP_DATE, FM_PROP_TIME,
-            OUStringLiteral(FM_PROP_VALUE), OUStringLiteral(FM_PROP_SELECT_SEQ), OUStringLiteral(FM_PROP_EFFECTIVE_VALUE)
+            FM_PROP_VALUE, FM_PROP_SELECT_SEQ, FM_PROP_EFFECTIVE_VALUE
         };
         sal_Int32 nDefaultValueProps = SAL_N_ELEMENTS(pDefaultValueProperties);
         OSL_ENSURE(SAL_N_ELEMENTS(aValueProperties) == nDefaultValueProps,

writerperfect/source/common/WPFTEncodingDialog.cxx

@@ -32,103 +32,52 @@ namespace
 
 std::pair<OUStringLiteral, OUStringLiteral> const s_encodings[] =
 {
-    {OUStringLiteral("MacArabic"), OUStringLiteral("Arabic (Apple Macintosh)")},
+    {"MacArabic", "Arabic (Apple Macintosh)"},
-    {OUStringLiteral("CP864"), OUStringLiteral("Arabic (DOS/OS2-864)")},
+    {"CP864", "Arabic (DOS/OS2-864)"},
-    {OUStringLiteral("CP1006"), OUStringLiteral("Arabic (IBM-1006)")},
+    {"CP1006", "Arabic (IBM-1006)"},
-    {OUStringLiteral("CP1256"), OUStringLiteral("Arabic (Windows-1256)")},
+    {"CP1256", "Arabic (Windows-1256)"},
-    {OUStringLiteral("CP775"), OUStringLiteral("Baltic (DOS/OS2-775)")},
+    {"CP775", "Baltic (DOS/OS2-775)"},
-    {OUStringLiteral("CP1257"), OUStringLiteral("Baltic (Windows-1257)")},
+    {"CP1257", "Baltic (Windows-1257)"},
-    {OUStringLiteral("MacCeltic"), OUStringLiteral("Celtic (Apple Macintosh)")},
+    {"MacCeltic", "Celtic (Apple Macintosh)"},
-    {
+    {"MacCyrillic", "Cyrillic (Apple Macintosh)"},
-        OUStringLiteral("MacCyrillic"),
+    {"CP855", "Cyrillic (DOS/OS2-855)"},
-        OUStringLiteral("Cyrillic (Apple Macintosh)")
+    {"CP866", "Cyrillic (DOS/OS2-866/Russian)"},
-    },
+    {"CP1251", "Cyrillic (Windows-1251)"},
-    {OUStringLiteral("CP855"), OUStringLiteral("Cyrillic (DOS/OS2-855)")},
+    {"MacCEurope", "Eastern Europe (Apple Macintosh)"},
-    {
+    {"MacCroatian", "Eastern Europe (Apple Macintosh/Croatian)"},
-        OUStringLiteral("CP866"),
+    {"MacRomanian", "Eastern Europe (Apple Macintosh/Romanian)"},
-        OUStringLiteral("Cyrillic (DOS/OS2-866/Russian)")
+    {"CP852", "Eastern Europe (DOS/OS2-852)"},
-    },
+    {"CP1250", "Eastern Europe (Windows-1250/WinLatin 2)"},
-    {OUStringLiteral("CP1251"), OUStringLiteral("Cyrillic (Windows-1251)")},
+    {"MacGreek", "Greek (Apple Macintosh)"},
-    {
+    {"CP737", "Greek (DOS/OS2-737)"},
-        OUStringLiteral("MacCEurope"),
+    {"CP869", "Greek (DOS/OS2-869/Greek-2)"},
-        OUStringLiteral("Eastern Europe (Apple Macintosh)")
+    {"CP875", "Greek (DOS/OS2-875)"},
-    },
+    {"CP1253", "Greek (Windows-1253)"},
-    {
+    {"MacHebrew", "Hebrew (Apple Macintosh)"},
-        OUStringLiteral("MacCroatian"),
+    {"CP424", "Hebrew (DOS/OS2-424)"},
-        OUStringLiteral("Eastern Europe (Apple Macintosh/Croatian)")
+    {"CP856", "Hebrew (DOS/OS2-856)"},
-    },
+    {"CP862", "Hebrew (DOS/OS2-862)"},
-    {
+    {"CP1255", "Hebrew (Windows-1255)"},
-        OUStringLiteral("MacRomanian"),
+    {"CP500", "International (DOS/OS2-500)"},
-        OUStringLiteral("Eastern Europe (Apple Macintosh/Romanian)")
+    {"CP932", "Japanese (Windows-932)"},
-    },
+    {"MacThai", "Thai (Apple Macintosh)"},
-    {OUStringLiteral("CP852"), OUStringLiteral("Eastern Europe (DOS/OS2-852)")},
+    {"CP874", "Thai (DOS/OS2-874)"},
-    {
+    {"CP950", "Traditional Chinese (Windows-950)"},
-        OUStringLiteral("CP1250"),
+    {"MacTurkish", "Turkish (Apple Macintosh)"},
-        OUStringLiteral("Eastern Europe (Windows-1250/WinLatin 2)")
+    {"CP857", "Turkish (DOS/OS2-857)"},
-    },
+    {"CP1026", "Turkish (DOS/OS2-1026)"},
-    {OUStringLiteral("MacGreek"), OUStringLiteral("Greek (Apple Macintosh)")},
+    {"CP1254", "Turkish (Windows-1254)"},
-    {OUStringLiteral("CP737"), OUStringLiteral("Greek (DOS/OS2-737)")},
+    {"CP1258", "Vietnamese (Windows-1258)"},
-    {OUStringLiteral("CP869"), OUStringLiteral("Greek (DOS/OS2-869/Greek-2)")},
+    {"MacRoman", "Western Europe (Apple Macintosh)"},
-    {OUStringLiteral("CP875"), OUStringLiteral("Greek (DOS/OS2-875)")},
+    {"MacIceland", "Western Europe (Apple Macintosh/Icelandic)"},
-    {OUStringLiteral("CP1253"), OUStringLiteral("Greek (Windows-1253)")},
+    {"CP037", "Western Europe (DOS/OS2-037/US-Canada)"},
-    {OUStringLiteral("MacHebrew"), OUStringLiteral("Hebrew (Apple Macintosh)")},
+    {"CP437", "Western Europe (DOS/OS2-437/US)"},
-    {OUStringLiteral("CP424"), OUStringLiteral("Hebrew (DOS/OS2-424)")},
+    {"CP850", "Western Europe (DOS/OS2-850)"},
-    {OUStringLiteral("CP856"), OUStringLiteral("Hebrew (DOS/OS2-856)")},
+    {"CP860", "Western Europe (DOS/OS2-860/Portuguese)"},
-    {OUStringLiteral("CP862"), OUStringLiteral("Hebrew (DOS/OS2-862)")},
+    {"CP861", "Western Europe (DOS/OS2-861/Icelandic)"},
-    {OUStringLiteral("CP1255"), OUStringLiteral("Hebrew (Windows-1255)")},
+    {"CP863", "Western Europe (DOS/OS2-863/French)"},
-    {OUStringLiteral("CP500"), OUStringLiteral("International (DOS/OS2-500)")},
+    {"CP865", "Western Europe (DOS/OS2-865/Nordic)"},
-    {OUStringLiteral("CP932"), OUStringLiteral("Japanese (Windows-932)")},
+    {"CP1252", "Western Europe (Windows-1252/WinLatin 1)"}
-    {OUStringLiteral("MacThai"), OUStringLiteral("Thai (Apple Macintosh)")},
-    {OUStringLiteral("CP874"), OUStringLiteral("Thai (DOS/OS2-874)")},
-    {
-        OUStringLiteral("CP950"),
-        OUStringLiteral("Traditional Chinese (Windows-950)")
-    },
-    {
-        OUStringLiteral("MacTurkish"),
-        OUStringLiteral("Turkish (Apple Macintosh)")
-    },
-    {OUStringLiteral("CP857"), OUStringLiteral("Turkish (DOS/OS2-857)")},
-    {OUStringLiteral("CP1026"), OUStringLiteral("Turkish (DOS/OS2-1026)")},
-    {OUStringLiteral("CP1254"), OUStringLiteral("Turkish (Windows-1254)")},
-    {OUStringLiteral("CP1258"), OUStringLiteral("Vietnamese (Windows-1258)")},
-    {
-        OUStringLiteral("MacRoman"),
-        OUStringLiteral("Western Europe (Apple Macintosh)")
-    },
-    {
-        OUStringLiteral("MacIceland"),
-        OUStringLiteral("Western Europe (Apple Macintosh/Icelandic)")
-    },
-    {
-        OUStringLiteral("CP037"),
-        OUStringLiteral("Western Europe (DOS/OS2-037/US-Canada)")
-    },
-    {
-        OUStringLiteral("CP437"),
-        OUStringLiteral("Western Europe (DOS/OS2-437/US)")
-    },
-    {OUStringLiteral("CP850"), OUStringLiteral("Western Europe (DOS/OS2-850)")},
-    {
-        OUStringLiteral("CP860"),
-        OUStringLiteral("Western Europe (DOS/OS2-860/Portuguese)")
-    },
-    {
-        OUStringLiteral("CP861"),
-        OUStringLiteral("Western Europe (DOS/OS2-861/Icelandic)")
-    },
-    {
-        OUStringLiteral("CP863"),
-        OUStringLiteral("Western Europe (DOS/OS2-863/French)")
-    },
-    {
-        OUStringLiteral("CP865"),
-        OUStringLiteral("Western Europe (DOS/OS2-865/Nordic)")
-    },
-    {
-        OUStringLiteral("CP1252"),
-        OUStringLiteral("Western Europe (Windows-1252/WinLatin 1)")
-    }
 };
 
 std::size_t const numEncodings = SAL_N_ELEMENTS(s_encodings);

xmloff/source/forms/elementexport.cxx

@@ -1158,7 +1158,7 @@ namespace xmloff
             };
             static const OUStringLiteral pStringPropertyNames[] =
             {   // property names
-                OUStringLiteral(PROPERTY_GROUP_NAME)
+                PROPERTY_GROUP_NAME
             };
 
             static const sal_Int32 nIdCount = SAL_N_ELEMENTS( nStringPropertyAttributeIds );

xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx

@@ -369,9 +369,9 @@ void PDFSigningTest::testGood()
     const std::initializer_list<OUStringLiteral> aNames =
     {
         // We failed to determine if this is good or bad.
-        OUStringLiteral("good-non-detached.pdf"),
+        "good-non-detached.pdf",
         // Boolean value for dictionary key caused read error.
-        OUStringLiteral("dict-bool.pdf"),
+        "dict-bool.pdf",
     };
 
     for (const auto& rName : aNames)
@@ -388,13 +388,13 @@ void PDFSigningTest::testTokenize()
     const std::initializer_list<OUStringLiteral> aNames =
     {
         // We looped on this broken input.
-        OUStringLiteral("no-eof.pdf"),
+        "no-eof.pdf",
         // ']' in a name token was mishandled.
-        OUStringLiteral("name-bracket.pdf"),
+        "name-bracket.pdf",
         // %%EOF at the end wasn't followed by a newline.
-        OUStringLiteral("noeol.pdf"),
+        "noeol.pdf",
         // File that's intentionally smaller than 1024 bytes.
-        OUStringLiteral("small.pdf"),
+        "small.pdf",
     };
 
     for (const auto& rName : aNames)

xmlsecurity/source/helper/ooxmlsecexporter.cxx

@@ -75,11 +75,11 @@ bool OOXMLSecExporter::Impl::isOOXMLBlacklist(const OUString& rStreamName)
 {
     static const std::initializer_list<OUStringLiteral> vBlacklist =
     {
-        OUStringLiteral("/%5BContent_Types%5D.xml"),
+        "/%5BContent_Types%5D.xml",
-        OUStringLiteral("/docProps/app.xml"),
+        "/docProps/app.xml",
-        OUStringLiteral("/docProps/core.xml"),
+        "/docProps/core.xml",
         // Don't attempt to sign other signatures for now.
-        OUStringLiteral("/_xmlsignatures")
+        "/_xmlsignatures"
     };
     // Just check the prefix, as we don't care about the content type part of the stream name.
     return std::find_if(vBlacklist.begin(), vBlacklist.end(), [&](const OUStringLiteral& rLiteral)
@@ -92,9 +92,9 @@ bool OOXMLSecExporter::Impl::isOOXMLRelationBlacklist(const OUString& rRelationN
 {
     static const std::initializer_list<OUStringLiteral> vBlacklist =
     {
-        OUStringLiteral("http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties"),
+        "http://schemas.openxmlformats.org/officeDocument/2006/relationships/extended-properties",
-        OUStringLiteral("http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties"),
+        "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties",
-        OUStringLiteral("http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin")
+        "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin"
     };
     return std::find(vBlacklist.begin(), vBlacklist.end(), rRelationName) != vBlacklist.end();
 }