mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reportdesign: Use appropriate OUString functions on string constants

Browse Source 
Change-Id: I4baeb6ed5a3f16c3c1f0a2715cb011ef2555fc90
This commit is contained in:
Stephan Bergmann
2014-12-15 10:14:00 +01:00
parent ca8e26aefd
commit f35f7b4fbc
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
reportdesign/source/filter/xml/xmlGroup.cxx
View File

@@ -138,7 +138,7 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
nGroupOn = report::GroupOn::MONTH; nGroupOn = report::GroupOn::MONTH;
} }
else if ( sCompleteFormula.matchIgnoreAsciiCase("rpt:INT((MONTH",0) else if ( sCompleteFormula.matchIgnoreAsciiCase("rpt:INT((MONTH",0)
&& sCompleteFormula.endsWithIgnoreAsciiCaseAsciiL("-1)/3)+1",8) ) && sCompleteFormula.endsWithIgnoreAsciiCase("-1)/3)+1") )
{ {
nGroupOn = report::GroupOn::QUARTAL; nGroupOn = report::GroupOn::QUARTAL;
} }

4
reportdesign/source/ui/inspection/DataProviderHandler.cxx
View File

@@ -263,7 +263,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
switch(nId) switch(nId)
{ {
case PROPERTY_ID_CHARTTYPE: 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.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::TextField , sal_True);
aOut.HasPrimaryButton = sal_True; aOut.HasPrimaryButton = sal_True;
break; break;
@@ -273,7 +273,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co
case PROPERTY_ID_MASTERFIELDS: case PROPERTY_ID_MASTERFIELDS:
case PROPERTY_ID_DETAILFIELDS: case PROPERTY_ID_DETAILFIELDS:
aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::StringListField , sal_False); 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; aOut.HasPrimaryButton = sal_True;
break; break;
default: default:

10
reportdesign/source/ui/inspection/GeometryHandler.cxx
View File

@@ -773,12 +773,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
break; break;
case PROPERTY_ID_INITIALFORMULA: case PROPERTY_ID_INITIALFORMULA:
case PROPERTY_ID_FORMULA: case PROPERTY_ID_FORMULA:
aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA;
aOut.HasPrimaryButton = sal_True; aOut.HasPrimaryButton = sal_True;
aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False); aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False);
break; break;
case PROPERTY_ID_CONDITIONALPRINTEXPRESSION: case PROPERTY_ID_CONDITIONALPRINTEXPRESSION:
aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA;
aOut.HasPrimaryButton = sal_True; aOut.HasPrimaryButton = sal_True;
aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False); aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False);
break; break;
@@ -793,7 +793,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
if ( m_nDataFieldType == DATA_OR_FORMULA ) if ( m_nDataFieldType == DATA_OR_FORMULA )
{ {
aOut.PrimaryButtonId = OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA;
aOut.HasPrimaryButton = sal_True; aOut.HasPrimaryButton = sal_True;
} }
@@ -820,12 +820,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::ColorListBox, sal_False ); aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::ColorListBox, sal_False );
break; break;
case PROPERTY_ID_FONT: 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.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True );
aOut.HasPrimaryButton = sal_True; aOut.HasPrimaryButton = sal_True;
break; break;
case PROPERTY_ID_AREA: 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.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True );
aOut.HasPrimaryButton = sal_True; aOut.HasPrimaryButton = sal_True;
break; break;