[Libreoffice-commits] core.git: chart2/source compilerplugins/clang connectivity/source cui/source oox/source reportdesign/source sax/qa sc/source sd/source svl/source svx/source writerperfect/source xmloff/source xmlsecurity/qa xmlsecurity/source
Stephan Bergmann
sbergman at redhat.com
Sat Dec 17 16:12:51 UTC 2016
chart2/source/controller/dialogs/res_DataLabel.cxx | 6
compilerplugins/clang/stringstatic.cxx | 4
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 3
connectivity/source/drivers/jdbc/DatabaseMetaData.cxx | 14 -
connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 4
cui/source/options/personalization.cxx | 5
oox/source/export/shapes.cxx | 122 +++++------
reportdesign/source/core/api/ReportDefinition.cxx | 38 +--
reportdesign/source/ui/inspection/DataProviderHandler.cxx | 8
reportdesign/source/ui/inspection/metadata.cxx | 106 +++++-----
reportdesign/source/ui/report/ReportController.cxx | 16 -
sax/qa/cppunit/xmlimport.cxx | 6
sc/source/ui/vba/vbadialog.cxx | 50 ++--
sd/source/ui/table/TableDesignPane.cxx | 12 -
svl/source/numbers/zforscan.cxx | 20 -
svx/source/fmcomp/fmgridif.cxx | 8
svx/source/form/fmdmod.cxx | 38 +--
svx/source/form/fmundo.cxx | 8
writerperfect/source/common/WPFTEncodingDialog.cxx | 143 ++++----------
xmloff/source/forms/elementexport.cxx | 2
xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx | 12 -
xmlsecurity/source/helper/ooxmlsecexporter.cxx | 14 -
22 files changed, 289 insertions(+), 350 deletions(-)
New commits:
commit 83d2c5180d255532b7cdf5d2922fee1cf056eef3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Dec 16 17:14:07 2016 +0100
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 at redhat.com>
Tested-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index fc3cf04..d1fda13 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -40,11 +40,7 @@ namespace chart
namespace
{
-const OUStringLiteral our_aLBEntryMap[] = {
- OUStringLiteral(" "),
- OUStringLiteral(", "),
- OUStringLiteral("; "),
- OUStringLiteral("\n")};
+const OUStringLiteral our_aLBEntryMap[] = {" ", ", ", "; ", "\n"};
bool lcl_ReadNumberFormatFromItemSet( const SfxItemSet& rSet, sal_uInt16 nValueWhich, sal_uInt16 nSourceFormatWhich, sal_uLong& rnFormatKeyOut, bool& rbSourceFormatOut, bool& rbSourceFormatMixedStateOut )
{
diff --git a/compilerplugins/clang/stringstatic.cxx b/compilerplugins/clang/stringstatic.cxx
index 9bcb372..d251ed8 100644
--- a/compilerplugins/clang/stringstatic.cxx
+++ b/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[] = {
- OUStringLiteral(" "),
- OUStringLiteral(", ")};
+ static const OUStringLiteral our_aLBEntryMap[] = {" ", ", "};
static const OUStringLiteral sName("name");
which is more efficient at startup time.
diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index c77cf8e..11fa505 100644
--- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/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"),
- // Currently we only support a 'TABLE' nothing more complex
+ "TABLE" // Currently we only support a 'TABLE' nothing more complex
};
::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes);
Reference< XResultSet > xRef = pResult;
diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index e76c237..741e4db 100644
--- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/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"),
- OUStringLiteral("TABLE_SCHEM"),
- OUStringLiteral("TABLE_NAME"),
- OUStringLiteral("GRANTOR"),
- OUStringLiteral("GRANTEE"),
- OUStringLiteral("PRIVILEGE"),
- OUStringLiteral("IS_GRANTABLE")
+ "TABLE_CAT",
+ "TABLE_SCHEM",
+ "TABLE_NAME",
+ "GRANTOR",
+ "GRANTEE",
+ "PRIVILEGE",
+ "IS_GRANTABLE"
};
OUString sColumnName;
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index 44a4c0c..debc927 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/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"),
- OUStringLiteral("VIEW")
+ "TABLE",
+ "VIEW"
// Currently we only support a 'TABLE' and 'VIEW' nothing more complex
// OUString("SYSTEM TABLE"),
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 956e7c1..7fa466f 100644
--- a/cui/source/options/personalization.cxx
+++ b/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[] =
- {
- OUStringLiteral("LibreOffice"), OUStringLiteral("Abstract"), OUStringLiteral("Color"),
- OUStringLiteral("Music"), OUStringLiteral("Nature"), OUStringLiteral("Solid")
- };
+ {"LibreOffice", "Abstract", "Color", "Music", "Nature", "Solid"};
OUString searchTerm;
if( m_pSearchThread.is() )
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index cd139b8..c28efd8 100644
--- a/oox/source/export/shapes.cxx
+++ b/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"),
- OUStringLiteral("rectangle"),
- OUStringLiteral("ellipse"),
- OUStringLiteral("ring"),
- OUStringLiteral("can"),
- OUStringLiteral("cube"),
- OUStringLiteral("paper"),
- OUStringLiteral("frame"),
- OUStringLiteral("smiley"),
- OUStringLiteral("sun"),
- OUStringLiteral("flower"),
- OUStringLiteral("bracket-pair"),
- OUStringLiteral("brace-pair"),
- OUStringLiteral("col-60da8460"),
- OUStringLiteral("col-502ad400"),
- OUStringLiteral("quad-bevel"),
- OUStringLiteral("round-rectangular-callout"),
- OUStringLiteral("rectangular-callout"),
- OUStringLiteral("round-callout"),
- OUStringLiteral("cloud-callout"),
- OUStringLiteral("line-callout-1"),
- OUStringLiteral("line-callout-2"),
- OUStringLiteral("line-callout-3"),
- OUStringLiteral("paper"),
- OUStringLiteral("vertical-scroll"),
- OUStringLiteral("horizontal-scroll"),
- OUStringLiteral("mso-spt34"),
- OUStringLiteral("mso-spt75"),
- OUStringLiteral("mso-spt164"),
- OUStringLiteral("mso-spt180"),
- OUStringLiteral("flowchart-process"),
- OUStringLiteral("flowchart-alternate-process"),
- OUStringLiteral("flowchart-decision"),
- OUStringLiteral("flowchart-data"),
- OUStringLiteral("flowchart-predefined-process"),
- OUStringLiteral("flowchart-internal-storage"),
- OUStringLiteral("flowchart-document"),
- OUStringLiteral("flowchart-multidocument"),
- OUStringLiteral("flowchart-terminator"),
- OUStringLiteral("flowchart-preparation"),
- OUStringLiteral("flowchart-manual-input"),
- OUStringLiteral("flowchart-manual-operation"),
- OUStringLiteral("flowchart-connector"),
- OUStringLiteral("flowchart-off-page-connector"),
- OUStringLiteral("flowchart-card"),
- OUStringLiteral("flowchart-punched-tape"),
- OUStringLiteral("flowchart-summing-junction"),
- OUStringLiteral("flowchart-or"),
- OUStringLiteral("flowchart-collate"),
- OUStringLiteral("flowchart-sort"),
- OUStringLiteral("flowchart-extract"),
- OUStringLiteral("flowchart-merge"),
- OUStringLiteral("flowchart-stored-data"),
- OUStringLiteral("flowchart-delay"),
- OUStringLiteral("flowchart-sequential-access"),
- OUStringLiteral("flowchart-magnetic-disk"),
- OUStringLiteral("flowchart-direct-access-storage"),
- OUStringLiteral("flowchart-display")
+ "block-arc",
+ "rectangle",
+ "ellipse",
+ "ring",
+ "can",
+ "cube",
+ "paper",
+ "frame",
+ "smiley",
+ "sun",
+ "flower",
+ "bracket-pair",
+ "brace-pair",
+ "col-60da8460",
+ "col-502ad400",
+ "quad-bevel",
+ "round-rectangular-callout",
+ "rectangular-callout",
+ "round-callout",
+ "cloud-callout",
+ "line-callout-1",
+ "line-callout-2",
+ "line-callout-3",
+ "paper",
+ "vertical-scroll",
+ "horizontal-scroll",
+ "mso-spt34",
+ "mso-spt75",
+ "mso-spt164",
+ "mso-spt180",
+ "flowchart-process",
+ "flowchart-alternate-process",
+ "flowchart-decision",
+ "flowchart-data",
+ "flowchart-predefined-process",
+ "flowchart-internal-storage",
+ "flowchart-document",
+ "flowchart-multidocument",
+ "flowchart-terminator",
+ "flowchart-preparation",
+ "flowchart-manual-input",
+ "flowchart-manual-operation",
+ "flowchart-connector",
+ "flowchart-off-page-connector",
+ "flowchart-card",
+ "flowchart-punched-tape",
+ "flowchart-summing-junction",
+ "flowchart-or",
+ "flowchart-collate",
+ "flowchart-sort",
+ "flowchart-extract",
+ "flowchart-merge",
+ "flowchart-stored-data",
+ "flowchart-delay",
+ "flowchart-sequential-access",
+ "flowchart-magnetic-disk",
+ "flowchart-direct-access-storage",
+ "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"),
- OUStringLiteral("heart"),
- OUStringLiteral("puzzle")
+ "forbidden",
+ "heart",
+ "puzzle"
};
return std::find(vWhitelist.begin(), vWhitelist.end(), rShapeType) != vWhitelist.end();
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 5457070..d096e77 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/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"),
- OUStringLiteral("com.sun.star.form.component.DatabaseImageControl"),
- OUStringLiteral("com.sun.star.style.PageStyle"),
- OUStringLiteral("com.sun.star.style.GraphicStyle"),
- OUStringLiteral("com.sun.star.style.FrameStyle"),
- OUStringLiteral("com.sun.star.drawing.Defaults"),
- OUStringLiteral("com.sun.star.document.ImportEmbeddedObjectResolver"),
- OUStringLiteral("com.sun.star.document.ExportEmbeddedObjectResolver"),
- OUStringLiteral("com.sun.star.document.ImportGraphicObjectResolver"),
- OUStringLiteral("com.sun.star.document.ExportGraphicObjectResolver"),
- OUStringLiteral("com.sun.star.chart2.data.DataProvider"),
- OUStringLiteral("com.sun.star.xml.NamespaceMap"),
- OUStringLiteral("com.sun.star.document.Settings"),
- OUStringLiteral("com.sun.star.drawing.GradientTable"),
- OUStringLiteral("com.sun.star.drawing.HatchTable"),
- OUStringLiteral("com.sun.star.drawing.BitmapTable"),
- OUStringLiteral("com.sun.star.drawing.TransparencyGradientTable"),
- OUStringLiteral("com.sun.star.drawing.DashTable"),
- OUStringLiteral("com.sun.star.drawing.MarkerTable")
+ "com.sun.star.form.component.FixedText",
+ "com.sun.star.form.component.DatabaseImageControl",
+ "com.sun.star.style.PageStyle",
+ "com.sun.star.style.GraphicStyle",
+ "com.sun.star.style.FrameStyle",
+ "com.sun.star.drawing.Defaults",
+ "com.sun.star.document.ImportEmbeddedObjectResolver",
+ "com.sun.star.document.ExportEmbeddedObjectResolver",
+ "com.sun.star.document.ImportGraphicObjectResolver",
+ "com.sun.star.document.ExportGraphicObjectResolver",
+ "com.sun.star.chart2.data.DataProvider",
+ "com.sun.star.xml.NamespaceMap",
+ "com.sun.star.document.Settings",
+ "com.sun.star.drawing.GradientTable",
+ "com.sun.star.drawing.HatchTable",
+ "com.sun.star.drawing.BitmapTable",
+ "com.sun.star.drawing.TransparencyGradientTable",
+ "com.sun.star.drawing.DashTable",
+ "com.sun.star.drawing.MarkerTable"
};
static const sal_uInt16 nSvxComponentServiceNameListCount = SAL_N_ELEMENTS(aSvxComponentServiceNameList);
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index d804d94..f92899c 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/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)
- ,OUStringLiteral(PROPERTY_MASTERFIELDS)
- ,OUStringLiteral(PROPERTY_DETAILFIELDS)
- ,OUStringLiteral(PROPERTY_PREVIEW_COUNT)
+ PROPERTY_CHARTTYPE
+ ,PROPERTY_MASTERFIELDS
+ ,PROPERTY_DETAILFIELDS
+ ,PROPERTY_PREVIEW_COUNT
};
for (const auto & rName : s_pProperties)
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index 896dfcf..950f8a3 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/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"),
- OUStringLiteral("Printable"),
- OUStringLiteral("WordBreak"),
- OUStringLiteral("MultiLine"),
- OUStringLiteral("Tag"),
- OUStringLiteral("HelpText"),
- OUStringLiteral("HelpURL"),
- OUStringLiteral("MaxTextLen"),
- OUStringLiteral("ReadOnly"),
- OUStringLiteral("Tabstop"),
- OUStringLiteral("TabIndex"),
- OUStringLiteral("ValueMin"),
- OUStringLiteral("ValueMax"),
- OUStringLiteral("Spin"),
- OUStringLiteral("SpinValue"),
- OUStringLiteral("SpinValueMin"),
- OUStringLiteral("SpinValueMax"),
- OUStringLiteral("DefaultSpinValue"),
- OUStringLiteral("SpinIncrement"),
- OUStringLiteral("Repeat"),
- OUStringLiteral("RepeatDelay"),
- OUStringLiteral("ControlLabel"), /// TODO: has to be checked
- OUStringLiteral("LabelControl"),
- OUStringLiteral("Title"), // comment this out if you want to have title feature for charts
- OUStringLiteral(PROPERTY_MAXTEXTLEN),
- OUStringLiteral(PROPERTY_EFFECTIVEDEFAULT),
- OUStringLiteral(PROPERTY_EFFECTIVEMAX),
- OUStringLiteral(PROPERTY_EFFECTIVEMIN),
- OUStringLiteral("HideInactiveSelection"),
- OUStringLiteral("SubmitAction"),
- OUStringLiteral("InputRequired"),
- OUStringLiteral("VerticalAlign"),
- OUStringLiteral(PROPERTY_ALIGN),
- OUStringLiteral(PROPERTY_EMPTY_IS_NULL),
- OUStringLiteral(PROPERTY_FILTERPROPOSAL)
- ,OUStringLiteral(PROPERTY_POSITIONX)
- ,OUStringLiteral(PROPERTY_POSITIONY)
- ,OUStringLiteral(PROPERTY_WIDTH)
- ,OUStringLiteral(PROPERTY_HEIGHT)
- ,OUStringLiteral(PROPERTY_FONT)
- ,OUStringLiteral(PROPERTY_LABEL)
- ,OUStringLiteral(PROPERTY_LINECOLOR)
- ,OUStringLiteral(PROPERTY_BORDER)
- ,OUStringLiteral(PROPERTY_BORDERCOLOR)
- ,OUStringLiteral(PROPERTY_BACKTRANSPARENT)
- ,OUStringLiteral(PROPERTY_CONTROLBACKGROUND)
- ,OUStringLiteral(PROPERTY_BACKGROUNDCOLOR)
- ,OUStringLiteral(PROPERTY_CONTROLBACKGROUNDTRANSPARENT)
- ,OUStringLiteral(PROPERTY_FORMULALIST)
- ,OUStringLiteral(PROPERTY_SCOPE)
- ,OUStringLiteral(PROPERTY_TYPE)
- ,OUStringLiteral(PROPERTY_DATASOURCENAME)
- ,OUStringLiteral(PROPERTY_VERTICALALIGN)
+ "Enabled",
+ "Printable",
+ "WordBreak",
+ "MultiLine",
+ "Tag",
+ "HelpText",
+ "HelpURL",
+ "MaxTextLen",
+ "ReadOnly",
+ "Tabstop",
+ "TabIndex",
+ "ValueMin",
+ "ValueMax",
+ "Spin",
+ "SpinValue",
+ "SpinValueMin",
+ "SpinValueMax",
+ "DefaultSpinValue",
+ "SpinIncrement",
+ "Repeat",
+ "RepeatDelay",
+ "ControlLabel", /// TODO: has to be checked
+ "LabelControl",
+ "Title", // comment this out if you want to have title feature for charts
+ PROPERTY_MAXTEXTLEN,
+ PROPERTY_EFFECTIVEDEFAULT,
+ PROPERTY_EFFECTIVEMAX,
+ PROPERTY_EFFECTIVEMIN,
+ "HideInactiveSelection",
+ "SubmitAction",
+ "InputRequired",
+ "VerticalAlign",
+ PROPERTY_ALIGN,
+ PROPERTY_EMPTY_IS_NULL,
+ PROPERTY_FILTERPROPOSAL
+ ,PROPERTY_POSITIONX
+ ,PROPERTY_POSITIONY
+ ,PROPERTY_WIDTH
+ ,PROPERTY_HEIGHT
+ ,PROPERTY_FONT
+ ,PROPERTY_LABEL
+ ,PROPERTY_LINECOLOR
+ ,PROPERTY_BORDER
+ ,PROPERTY_BORDERCOLOR
+ ,PROPERTY_BACKTRANSPARENT
+ ,PROPERTY_CONTROLBACKGROUND
+ ,PROPERTY_BACKGROUNDCOLOR
+ ,PROPERTY_CONTROLBACKGROUNDTRANSPARENT
+ ,PROPERTY_FORMULALIST
+ ,PROPERTY_SCOPE
+ ,PROPERTY_TYPE
+ ,PROPERTY_DATASOURCENAME
+ ,PROPERTY_VERTICALALIGN
};
beans::Property* pPropsIter = aProps.getArray();
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 9fdb931..9eed05e 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/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")
- ,OUStringLiteral("private:resource/toolbar/reportcontrols")
- ,OUStringLiteral("private:resource/toolbar/drawbar")
- ,OUStringLiteral("private:resource/toolbar/Formatting")
- ,OUStringLiteral("private:resource/toolbar/alignmentbar")
- ,OUStringLiteral("private:resource/toolbar/sectionalignmentbar")
- ,OUStringLiteral("private:resource/toolbar/resizebar")
- ,OUStringLiteral("private:resource/toolbar/sectionshrinkbar")
+ "private:resource/statusbar/statusbar"
+ ,"private:resource/toolbar/reportcontrols"
+ ,"private:resource/toolbar/drawbar"
+ ,"private:resource/toolbar/Formatting"
+ ,"private:resource/toolbar/alignmentbar"
+ ,"private:resource/toolbar/sectionalignmentbar"
+ ,"private:resource/toolbar/resizebar"
+ ,"private:resource/toolbar/sectionshrinkbar"
};
for (const auto & i : s_sMenu)
{
diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index f824e51..a5c66eb 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/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#"),
- OUStringLiteral("http://schemas.openxmlformats.org/wordprocessingml/2006/main/"),
- OUStringLiteral("xyzsports.com/players/football/") };
+const OUStringLiteral DummyTokenHandler::namespaceURIs[] = { "http://www.w3.org/2000/09/xmldsig#",
+ "http://schemas.openxmlformats.org/wordprocessingml/2006/main/",
+ "xyzsports.com/players/football/" };
const OString DummyTokenHandler::namespacePrefixes[] = { "", "w", "Player" };
diff --git a/sc/source/ui/vba/vbadialog.cxx b/sc/source/ui/vba/vbadialog.cxx
index 3cf6fdd..e7f2b31 100644
--- a/sc/source/ui/vba/vbadialog.cxx
+++ b/sc/source/ui/vba/vbadialog.cxx
@@ -25,31 +25,31 @@ using namespace ::com::sun::star;
static const OUStringLiteral aStringList[]=
{
- OUStringLiteral( ".uno:Open" ),
- OUStringLiteral( ".uno:FormatCellDialog" ),
- OUStringLiteral( ".uno:InsertCell" ),
- OUStringLiteral( ".uno:Print" ),
- OUStringLiteral( ".uno:PasteSpecial" ),
- OUStringLiteral( ".uno:ToolProtectionDocument" ),
- OUStringLiteral( ".uno:ColumnWidth" ),
- OUStringLiteral( ".uno:DefineName" ),
- OUStringLiteral( ".uno:ConfigureDialog" ),
- OUStringLiteral( ".uno:HyperlinkDialog" ),
- OUStringLiteral( ".uno:InsertGraphic" ),
- OUStringLiteral( ".uno:InsertObject" ),
- OUStringLiteral( ".uno:PageFormatDialog" ),
- OUStringLiteral( ".uno:DataSort" ),
- OUStringLiteral( ".uno:RowHeight" ),
- OUStringLiteral( ".uno:AutoCorrectDlg" ),
- OUStringLiteral( ".uno:ConditionalFormatDialog" ),
- OUStringLiteral( ".uno:DataConsolidate" ),
- OUStringLiteral( ".uno:CreateNames" ),
- OUStringLiteral( ".uno:FillSeries" ),
- OUStringLiteral( ".uno:Validation"),
- OUStringLiteral( ".uno:DefineLabelRange" ),
- OUStringLiteral( ".uno:DataFilterAutoFilter" ),
- OUStringLiteral( ".uno:DataFilterSpecialFilter" ),
- OUStringLiteral( ".uno:AutoFormat" )
+ ".uno:Open",
+ ".uno:FormatCellDialog",
+ ".uno:InsertCell",
+ ".uno:Print",
+ ".uno:PasteSpecial",
+ ".uno:ToolProtectionDocument",
+ ".uno:ColumnWidth",
+ ".uno:DefineName",
+ ".uno:ConfigureDialog",
+ ".uno:HyperlinkDialog",
+ ".uno:InsertGraphic",
+ ".uno:InsertObject",
+ ".uno:PageFormatDialog",
+ ".uno:DataSort",
+ ".uno:RowHeight",
+ ".uno:AutoCorrectDlg",
+ ".uno:ConditionalFormatDialog",
+ ".uno:DataConsolidate",
+ ".uno:CreateNames",
+ ".uno:FillSeries",
+ ".uno:Validation",
+ ".uno:DefineLabelRange",
+ ".uno:DataFilterAutoFilter",
+ ".uno:DataFilterSpecialFilter",
+ ".uno:AutoFormat"
};
const sal_Int32 nDialogSize = SAL_N_ELEMENTS(aStringList);
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index fbb9cc2..0536822 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/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") ,
- OUStringLiteral("UseLastRowStyle") ,
- OUStringLiteral("UseBandingRowStyle") ,
- OUStringLiteral("UseFirstColumnStyle") ,
- OUStringLiteral("UseLastColumnStyle") ,
- OUStringLiteral("UseBandingColumnStyle")
+ "UseFirstRowStyle",
+ "UseLastRowStyle",
+ "UseBandingRowStyle",
+ "UseFirstColumnStyle",
+ "UseLastColumnStyle",
+ "UseBandingColumnStyle"
};
TableDesignWidget::TableDesignWidget( VclBuilderContainer* pParent, ViewShellBase& rBase, bool bModal )
diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx
index 0542cf3..6b20938 100644
--- a/svl/source/numbers/zforscan.cxx
+++ b/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" ),
- OUStringLiteral( "BLUE" ),
- OUStringLiteral( "GREEN" ),
- OUStringLiteral( "CYAN" ),
- OUStringLiteral( "RED" ),
- OUStringLiteral( "MAGENTA" ),
- OUStringLiteral( "BROWN" ),
- OUStringLiteral( "GREY" ),
- OUStringLiteral( "YELLOW" ),
- OUStringLiteral( "WHITE" )
+ "BLACK",
+ "BLUE",
+ "GREEN",
+ "CYAN",
+ "RED",
+ "MAGENTA",
+ "BROWN",
+ "GREY",
+ "YELLOW",
+ "WHITE"
};
size_t j = 0;
while ( j < NF_MAX_DEFAULT_COLORS && sString != pEnglishColors[j] )
diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx
index 57f359e..eb80bba 100644
--- a/svx/source/fmcomp/fmgridif.cxx
+++ b/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),
- OUStringLiteral(FM_PROP_ALIGN), OUStringLiteral(FM_PROP_FORMATKEY)
+ FM_PROP_LABEL, FM_PROP_WIDTH, FM_PROP_HIDDEN, FM_PROP_ALIGN,
+ 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),
- OUStringLiteral(FM_PROP_ALIGN), OUStringLiteral(FM_PROP_FORMATKEY)
+ FM_PROP_LABEL, FM_PROP_WIDTH, FM_PROP_HIDDEN, FM_PROP_ALIGN,
+ FM_PROP_FORMATKEY
};
Reference< XPropertySetInfo > xInfo = xCol->getPropertySetInfo();
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 0578d9f..a3c96f8 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -51,25 +51,25 @@ using namespace ::svxform;
{
static const OUStringLiteral aSvxComponentServiceNameList[] =
{
- OUStringLiteral(FM_SUN_COMPONENT_TEXTFIELD),
- OUStringLiteral(FM_SUN_COMPONENT_FORM),
- OUStringLiteral(FM_SUN_COMPONENT_LISTBOX),
- OUStringLiteral(FM_SUN_COMPONENT_COMBOBOX),
- OUStringLiteral(FM_SUN_COMPONENT_RADIOBUTTON),
- OUStringLiteral(FM_SUN_COMPONENT_GROUPBOX),
- OUStringLiteral(FM_SUN_COMPONENT_FIXEDTEXT),
- OUStringLiteral(FM_SUN_COMPONENT_COMMANDBUTTON),
- OUStringLiteral(FM_SUN_COMPONENT_CHECKBOX),
- OUStringLiteral(FM_SUN_COMPONENT_GRIDCONTROL),
- OUStringLiteral(FM_SUN_COMPONENT_IMAGEBUTTON),
- OUStringLiteral(FM_SUN_COMPONENT_FILECONTROL),
- OUStringLiteral(FM_SUN_COMPONENT_TIMEFIELD),
- OUStringLiteral(FM_SUN_COMPONENT_DATEFIELD),
- OUStringLiteral(FM_SUN_COMPONENT_NUMERICFIELD),
- OUStringLiteral(FM_SUN_COMPONENT_CURRENCYFIELD),
- OUStringLiteral(FM_SUN_COMPONENT_PATTERNFIELD),
- OUStringLiteral(FM_SUN_COMPONENT_HIDDENCONTROL),
- OUStringLiteral(FM_SUN_COMPONENT_IMAGECONTROL)
+ FM_SUN_COMPONENT_TEXTFIELD,
+ FM_SUN_COMPONENT_FORM,
+ FM_SUN_COMPONENT_LISTBOX,
+ FM_SUN_COMPONENT_COMBOBOX,
+ FM_SUN_COMPONENT_RADIOBUTTON,
+ FM_SUN_COMPONENT_GROUPBOX,
+ FM_SUN_COMPONENT_FIXEDTEXT,
+ FM_SUN_COMPONENT_COMMANDBUTTON,
+ FM_SUN_COMPONENT_CHECKBOX,
+ FM_SUN_COMPONENT_GRIDCONTROL,
+ FM_SUN_COMPONENT_IMAGEBUTTON,
+ FM_SUN_COMPONENT_FILECONTROL,
+ FM_SUN_COMPONENT_TIMEFIELD,
+ FM_SUN_COMPONENT_DATEFIELD,
+ FM_SUN_COMPONENT_NUMERICFIELD,
+ FM_SUN_COMPONENT_CURRENCYFIELD,
+ FM_SUN_COMPONENT_PATTERNFIELD,
+ FM_SUN_COMPONENT_HIDDENCONTROL,
+ FM_SUN_COMPONENT_IMAGECONTROL
};
static const sal_uInt16 nSvxComponentServiceNameListCount = SAL_N_ELEMENTS(aSvxComponentServiceNameList);
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index da616c8..6aecd03 100644
--- a/svx/source/form/fmundo.cxx
+++ b/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),
- OUStringLiteral(FM_PROP_DEFAULT_VALUE), OUStringLiteral(FM_PROP_DEFAULT_SELECT_SEQ), OUStringLiteral(FM_PROP_EFFECTIVE_DEFAULT)
+ FM_PROP_DEFAULT_TEXT, FM_PROP_DEFAULTCHECKED, FM_PROP_DEFAULT_DATE, FM_PROP_DEFAULT_TIME,
+ 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),
- OUStringLiteral(FM_PROP_VALUE), OUStringLiteral(FM_PROP_SELECT_SEQ), OUStringLiteral(FM_PROP_EFFECTIVE_VALUE)
+ FM_PROP_TEXT, FM_PROP_STATE, FM_PROP_DATE, FM_PROP_TIME,
+ 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,
diff --git a/writerperfect/source/common/WPFTEncodingDialog.cxx b/writerperfect/source/common/WPFTEncodingDialog.cxx
index d4c3c77..448d7b8 100644
--- a/writerperfect/source/common/WPFTEncodingDialog.cxx
+++ b/writerperfect/source/common/WPFTEncodingDialog.cxx
@@ -32,103 +32,52 @@ namespace
std::pair<OUStringLiteral, OUStringLiteral> const s_encodings[] =
{
- {OUStringLiteral("MacArabic"), OUStringLiteral("Arabic (Apple Macintosh)")},
- {OUStringLiteral("CP864"), OUStringLiteral("Arabic (DOS/OS2-864)")},
- {OUStringLiteral("CP1006"), OUStringLiteral("Arabic (IBM-1006)")},
- {OUStringLiteral("CP1256"), OUStringLiteral("Arabic (Windows-1256)")},
- {OUStringLiteral("CP775"), OUStringLiteral("Baltic (DOS/OS2-775)")},
- {OUStringLiteral("CP1257"), OUStringLiteral("Baltic (Windows-1257)")},
- {OUStringLiteral("MacCeltic"), OUStringLiteral("Celtic (Apple Macintosh)")},
- {
- OUStringLiteral("MacCyrillic"),
- OUStringLiteral("Cyrillic (Apple Macintosh)")
- },
- {OUStringLiteral("CP855"), OUStringLiteral("Cyrillic (DOS/OS2-855)")},
- {
- OUStringLiteral("CP866"),
- OUStringLiteral("Cyrillic (DOS/OS2-866/Russian)")
- },
- {OUStringLiteral("CP1251"), OUStringLiteral("Cyrillic (Windows-1251)")},
- {
- OUStringLiteral("MacCEurope"),
- OUStringLiteral("Eastern Europe (Apple Macintosh)")
- },
- {
- OUStringLiteral("MacCroatian"),
- OUStringLiteral("Eastern Europe (Apple Macintosh/Croatian)")
- },
- {
- OUStringLiteral("MacRomanian"),
- OUStringLiteral("Eastern Europe (Apple Macintosh/Romanian)")
- },
- {OUStringLiteral("CP852"), OUStringLiteral("Eastern Europe (DOS/OS2-852)")},
- {
- OUStringLiteral("CP1250"),
- OUStringLiteral("Eastern Europe (Windows-1250/WinLatin 2)")
- },
- {OUStringLiteral("MacGreek"), OUStringLiteral("Greek (Apple Macintosh)")},
- {OUStringLiteral("CP737"), OUStringLiteral("Greek (DOS/OS2-737)")},
- {OUStringLiteral("CP869"), OUStringLiteral("Greek (DOS/OS2-869/Greek-2)")},
- {OUStringLiteral("CP875"), OUStringLiteral("Greek (DOS/OS2-875)")},
- {OUStringLiteral("CP1253"), OUStringLiteral("Greek (Windows-1253)")},
- {OUStringLiteral("MacHebrew"), OUStringLiteral("Hebrew (Apple Macintosh)")},
- {OUStringLiteral("CP424"), OUStringLiteral("Hebrew (DOS/OS2-424)")},
- {OUStringLiteral("CP856"), OUStringLiteral("Hebrew (DOS/OS2-856)")},
- {OUStringLiteral("CP862"), OUStringLiteral("Hebrew (DOS/OS2-862)")},
- {OUStringLiteral("CP1255"), OUStringLiteral("Hebrew (Windows-1255)")},
- {OUStringLiteral("CP500"), OUStringLiteral("International (DOS/OS2-500)")},
- {OUStringLiteral("CP932"), OUStringLiteral("Japanese (Windows-932)")},
- {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)")
- }
+ {"MacArabic", "Arabic (Apple Macintosh)"},
+ {"CP864", "Arabic (DOS/OS2-864)"},
+ {"CP1006", "Arabic (IBM-1006)"},
+ {"CP1256", "Arabic (Windows-1256)"},
+ {"CP775", "Baltic (DOS/OS2-775)"},
+ {"CP1257", "Baltic (Windows-1257)"},
+ {"MacCeltic", "Celtic (Apple Macintosh)"},
+ {"MacCyrillic", "Cyrillic (Apple Macintosh)"},
+ {"CP855", "Cyrillic (DOS/OS2-855)"},
+ {"CP866", "Cyrillic (DOS/OS2-866/Russian)"},
+ {"CP1251", "Cyrillic (Windows-1251)"},
+ {"MacCEurope", "Eastern Europe (Apple Macintosh)"},
+ {"MacCroatian", "Eastern Europe (Apple Macintosh/Croatian)"},
+ {"MacRomanian", "Eastern Europe (Apple Macintosh/Romanian)"},
+ {"CP852", "Eastern Europe (DOS/OS2-852)"},
+ {"CP1250", "Eastern Europe (Windows-1250/WinLatin 2)"},
+ {"MacGreek", "Greek (Apple Macintosh)"},
+ {"CP737", "Greek (DOS/OS2-737)"},
+ {"CP869", "Greek (DOS/OS2-869/Greek-2)"},
+ {"CP875", "Greek (DOS/OS2-875)"},
+ {"CP1253", "Greek (Windows-1253)"},
+ {"MacHebrew", "Hebrew (Apple Macintosh)"},
+ {"CP424", "Hebrew (DOS/OS2-424)"},
+ {"CP856", "Hebrew (DOS/OS2-856)"},
+ {"CP862", "Hebrew (DOS/OS2-862)"},
+ {"CP1255", "Hebrew (Windows-1255)"},
+ {"CP500", "International (DOS/OS2-500)"},
+ {"CP932", "Japanese (Windows-932)"},
+ {"MacThai", "Thai (Apple Macintosh)"},
+ {"CP874", "Thai (DOS/OS2-874)"},
+ {"CP950", "Traditional Chinese (Windows-950)"},
+ {"MacTurkish", "Turkish (Apple Macintosh)"},
+ {"CP857", "Turkish (DOS/OS2-857)"},
+ {"CP1026", "Turkish (DOS/OS2-1026)"},
+ {"CP1254", "Turkish (Windows-1254)"},
+ {"CP1258", "Vietnamese (Windows-1258)"},
+ {"MacRoman", "Western Europe (Apple Macintosh)"},
+ {"MacIceland", "Western Europe (Apple Macintosh/Icelandic)"},
+ {"CP037", "Western Europe (DOS/OS2-037/US-Canada)"},
+ {"CP437", "Western Europe (DOS/OS2-437/US)"},
+ {"CP850", "Western Europe (DOS/OS2-850)"},
+ {"CP860", "Western Europe (DOS/OS2-860/Portuguese)"},
+ {"CP861", "Western Europe (DOS/OS2-861/Icelandic)"},
+ {"CP863", "Western Europe (DOS/OS2-863/French)"},
+ {"CP865", "Western Europe (DOS/OS2-865/Nordic)"},
+ {"CP1252", "Western Europe (Windows-1252/WinLatin 1)"}
};
std::size_t const numEncodings = SAL_N_ELEMENTS(s_encodings);
diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx
index f1d1a98..d5a406e 100644
--- a/xmloff/source/forms/elementexport.cxx
+++ b/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 );
diff --git a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx b/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
index 51fc15e..507b3e5 100644
--- a/xmlsecurity/qa/unit/pdfsigning/pdfsigning.cxx
+++ b/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)
diff --git a/xmlsecurity/source/helper/ooxmlsecexporter.cxx b/xmlsecurity/source/helper/ooxmlsecexporter.cxx
index df35dee..9a9b987 100644
--- a/xmlsecurity/source/helper/ooxmlsecexporter.cxx
+++ b/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"),
- OUStringLiteral("/docProps/app.xml"),
- OUStringLiteral("/docProps/core.xml"),
+ "/%5BContent_Types%5D.xml",
+ "/docProps/app.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"),
- OUStringLiteral("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/officeDocument/2006/relationships/extended-properties",
+ "http://schemas.openxmlformats.org/package/2006/relationships/metadata/core-properties",
+ "http://schemas.openxmlformats.org/package/2006/relationships/digital-signature/origin"
};
return std::find(vBlacklist.begin(), vBlacklist.end(), rRelationName) != vBlacklist.end();
}
More information about the Libreoffice-commits
mailing list