summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-12-16 17:14:07 +0100
committerStephan Bergmann <sbergman@redhat.com>2016-12-17 16:12:02 +0000
commit83d2c5180d255532b7cdf5d2922fee1cf056eef3 (patch)
tree7a58db4a6723008afe96e17185a69aa17a864e1f /reportdesign
parent87707670c993794ab12b0fad0f048f11429269c2 (diff)
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>
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/core/api/ReportDefinition.cxx38
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx8
-rw-r--r--reportdesign/source/ui/inspection/metadata.cxx106
-rw-r--r--reportdesign/source/ui/report/ReportController.cxx16
4 files changed, 84 insertions, 84 deletions
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 545707073ce0..d096e776cda3 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 d804d94b2e59..f92899c5b60f 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 896dfcfbb3d3..950f8a35e6a6 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 9fdb931becf2..9eed05e7d07d 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)
{