summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorChr. Rossmanith <ChrRossmanith@gmx.de>2013-03-07 13:30:26 +0100
committerChr. Rossmanith <ChrRossmanith@gmx.de>2013-03-10 07:52:58 +0100
commit8669ad398a2971706ce22b6e5fe316991977452a (patch)
tree2302ab6baa4dd7c2737c6fc8e58c43ce3c22da4e /xmloff
parentc7937e2a38501266ed658553c19db5b4a2237864 (diff)
Removed RTL_CONSTASCII_USTRINGPARAM in xmloff(xforms)
Change-Id: I5a237b22e40c05e31990fc1cfdcfba16ef3db544
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/xforms/SchemaRestrictionContext.cxx32
-rw-r--r--xmloff/source/xforms/XFormsInstanceContext.cxx6
-rw-r--r--xmloff/source/xforms/xformsexport.cxx4
3 files changed, 21 insertions, 21 deletions
diff --git a/xmloff/source/xforms/SchemaRestrictionContext.cxx b/xmloff/source/xforms/SchemaRestrictionContext.cxx
index 141e5f8675dd..071a5afa05d1 100644
--- a/xmloff/source/xforms/SchemaRestrictionContext.cxx
+++ b/xmloff/source/xforms/SchemaRestrictionContext.cxx
@@ -244,31 +244,31 @@ SvXMLImportContext* SchemaRestrictionContext::HandleChild(
switch( nToken )
{
case XML_LENGTH:
- sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("Length"));
+ sPropertyName = "Length";
pConvert = &xforms_int32;
break;
case XML_MINLENGTH:
- sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("MinLength"));
+ sPropertyName = "MinLength";
pConvert = &xforms_int32;
break;
case XML_MAXLENGTH:
- sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("MaxLength"));
+ sPropertyName = "MaxLength";
pConvert = &xforms_int32;
break;
case XML_TOTALDIGITS:
- sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("TotalDigits"));
+ sPropertyName = "TotalDigits";
pConvert = &xforms_int32;
break;
case XML_FRACTIONDIGITS:
- sPropertyName =OUString(RTL_CONSTASCII_USTRINGPARAM("FractionDigits"));
+ sPropertyName = "FractionDigits";
pConvert = &xforms_int32;
break;
case XML_PATTERN:
- sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("Pattern"));
+ sPropertyName = "Pattern";
pConvert = &xforms_string;
break;
case XML_WHITESPACE:
- sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("WhiteSpace"));
+ sPropertyName = "WhiteSpace";
pConvert = &xforms_whitespace;
break;
case XML_MININCLUSIVE:
@@ -285,16 +285,16 @@ SvXMLImportContext* SchemaRestrictionContext::HandleChild(
switch( nToken )
{
case XML_MININCLUSIVE:
- sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("MinInclusive"));
+ sPropertyName = "MinInclusive";
break;
case XML_MINEXCLUSIVE:
- sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("MinExclusive"));
+ sPropertyName = "MinExclusive";
break;
case XML_MAXINCLUSIVE:
- sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("MaxInclusive"));
+ sPropertyName = "MaxInclusive";
break;
case XML_MAXEXCLUSIVE:
- sPropertyName = OUString(RTL_CONSTASCII_USTRINGPARAM("MaxExclusive"));
+ sPropertyName = "MaxExclusive";
break;
}
@@ -306,25 +306,25 @@ SvXMLImportContext* SchemaRestrictionContext::HandleChild(
case com::sun::star::xsd::DataTypeClass::DECIMAL:
case com::sun::star::xsd::DataTypeClass::DOUBLE:
case com::sun::star::xsd::DataTypeClass::FLOAT:
- sPropertyName += OUString(RTL_CONSTASCII_USTRINGPARAM("Double"));
+ sPropertyName += "Double";
pConvert = &xforms_double;
break;
case com::sun::star::xsd::DataTypeClass::DATETIME:
- sPropertyName += OUString(RTL_CONSTASCII_USTRINGPARAM("DateTime"));
+ sPropertyName += "DateTime";
pConvert = &xforms_dateTime;
break;
case com::sun::star::xsd::DataTypeClass::DATE:
- sPropertyName += OUString(RTL_CONSTASCII_USTRINGPARAM("Date"));
+ sPropertyName += "Date";
pConvert = &xforms_date;
break;
case com::sun::star::xsd::DataTypeClass::TIME:
- sPropertyName += OUString(RTL_CONSTASCII_USTRINGPARAM("Time"));
+ sPropertyName += "Time";
pConvert = &xforms_time;
break;
case com::sun::star::xsd::DataTypeClass::gYear:
case com::sun::star::xsd::DataTypeClass::gDay:
case com::sun::star::xsd::DataTypeClass::gMonth:
- sPropertyName += OUString(RTL_CONSTASCII_USTRINGPARAM("Int"));
+ sPropertyName += "Int";
pConvert = &xforms_int16;
break;
diff --git a/xmloff/source/xforms/XFormsInstanceContext.cxx b/xmloff/source/xforms/XFormsInstanceContext.cxx
index abfa9326cdc4..1e437fa4902e 100644
--- a/xmloff/source/xforms/XFormsInstanceContext.cxx
+++ b/xmloff/source/xforms/XFormsInstanceContext.cxx
@@ -108,11 +108,11 @@ void XFormsInstanceContext::EndElement()
{
Sequence<PropertyValue> aSequence( 3 );
PropertyValue* pSequence = aSequence.getArray();
- pSequence[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("Instance") );
+ pSequence[0].Name = OUString( "Instance" );
pSequence[0].Value <<= mxInstance;
- pSequence[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("ID") );
+ pSequence[1].Name = OUString( "ID" );
pSequence[1].Value <<= msId;
- pSequence[2].Name = OUString( RTL_CONSTASCII_USTRINGPARAM("URL") );
+ pSequence[2].Name = OUString( "URL" );
pSequence[2].Value <<= msURL;
mxModel->getInstances()->insert( makeAny( aSequence ) );
diff --git a/xmloff/source/xforms/xformsexport.cxx b/xmloff/source/xforms/xformsexport.cxx
index 036633a679a5..cda917f4c515 100644
--- a/xmloff/source/xforms/xformsexport.cxx
+++ b/xmloff/source/xforms/xformsexport.cxx
@@ -804,7 +804,7 @@ void getXFormsSettings( const Reference< XNameAccess >& _rXForms, Sequence< Prop
Reference< XPropertySet > xModelProps( _rXForms->getByName( *pModelName ), UNO_QUERY_THROW );
Sequence< PropertyValue > aModelSettings( 1 );
- aModelSettings[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ExternalData" ) );
+ aModelSettings[0].Name = OUString( "ExternalData" );
aModelSettings[0].Value = xModelProps->getPropertyValue( aModelSettings[0].Name );
xModelSettings->insertByName( *pModelName, makeAny( aModelSettings ) );
@@ -813,7 +813,7 @@ void getXFormsSettings( const Reference< XNameAccess >& _rXForms, Sequence< Prop
if ( xModelSettings->hasElements() )
{
_out_rSettings.realloc( 1 );
- _out_rSettings[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "XFormModels" ) );
+ _out_rSettings[0].Name = OUString( "XFormModels" );
_out_rSettings[0].Value <<= xModelSettings;
}
}