summaryrefslogtreecommitdiff
path: root/reportdesign
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-12-15 10:14:00 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-12-15 10:14:00 +0100
commitf35f7b4fbcd91c1f0b64ec8f261aec19328f7596 (patch)
tree58cd6627203b664923f795b22439009c895d1e08 /reportdesign
parentca8e26aefd43100e6f7efec795e67f21933e8cf6 (diff)
reportdesign: Use appropriate OUString functions on string constants
Change-Id: I4baeb6ed5a3f16c3c1f0a2715cb011ef2555fc90
Diffstat (limited to 'reportdesign')
-rw-r--r--reportdesign/source/filter/xml/xmlGroup.cxx2
-rw-r--r--reportdesign/source/ui/inspection/DataProviderHandler.cxx4
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx10
3 files changed, 8 insertions, 8 deletions
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index ab4980755375..4dac4ddc2e61 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -138,7 +138,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
nGroupOn = report::GroupOn::MONTH;
}
else if ( sCompleteFormula.matchIgnoreAsciiCase("rpt:INT((MONTH",0)
- && sCompleteFormula.endsWithIgnoreAsciiCaseAsciiL("-1)/3)+1",8) )
+ && sCompleteFormula.endsWithIgnoreAsciiCase("-1)/3)+1") )
{
nGroupOn = report::GroupOn::QUARTAL;
}
diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 5c7794ddf2d6..30c304771343 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -263,7 +263,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
switch(nId)
{
case PROPERTY_ID_CHARTTYPE:
- aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_CHARTTYPE_DLG);
+ aOut.PrimaryButtonId = UID_RPT_PROP_CHARTTYPE_DLG;
aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::TextField , sal_True);
aOut.HasPrimaryButton = sal_True;
break;
@@ -273,7 +273,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
case PROPERTY_ID_MASTERFIELDS:
case PROPERTY_ID_DETAILFIELDS:
aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::StringListField , sal_False);
- aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_DLG_LINKFIELDS);
+ aOut.PrimaryButtonId = UID_RPT_PROP_DLG_LINKFIELDS;
aOut.HasPrimaryButton = sal_True;
break;
default:
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 60982c678f55..decfeeb21fc8 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -773,12 +773,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
break;
case PROPERTY_ID_INITIALFORMULA:
case PROPERTY_ID_FORMULA:
- aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_FORMULA);
+ aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA;
aOut.HasPrimaryButton = sal_True;
aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False);
break;
case PROPERTY_ID_CONDITIONALPRINTEXPRESSION:
- aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_FORMULA);
+ aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA;
aOut.HasPrimaryButton = sal_True;
aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False);
break;
@@ -793,7 +793,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
if ( m_nDataFieldType == DATA_OR_FORMULA )
{
- aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_FORMULA);
+ aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA;
aOut.HasPrimaryButton = sal_True;
}
@@ -820,12 +820,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::ColorListBox, sal_False );
break;
case PROPERTY_ID_FONT:
- aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_FONT_TYPE);
+ aOut.PrimaryButtonId = UID_RPT_RPT_PROP_DLG_FONT_TYPE;
aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True );
aOut.HasPrimaryButton = sal_True;
break;
case PROPERTY_ID_AREA:
- aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_AREA);
+ aOut.PrimaryButtonId = UID_RPT_RPT_PROP_DLG_AREA;
aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True );
aOut.HasPrimaryButton = sal_True;
break;