summaryrefslogtreecommitdiff
path: root/idl
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@suse.cz>2012-03-07 15:07:58 +0100
committerLuboš Luňák <l.lunak@suse.cz>2012-03-12 13:35:56 +0100
commita9435ab4d784879a299028e2ca5346510d5e616d (patch)
tree5698d2e04bbebdf53bd911f52c77582b382bbe6e /idl
parent53fb5f774e262e6dbe364c9da06ae5e0db11b5d7 (diff)
remove usage of RTL_CONSTASCII_STRINGPARAM
Diffstat (limited to 'idl')
-rw-r--r--idl/source/objects/slot.cxx30
-rw-r--r--idl/source/objects/types.cxx6
2 files changed, 18 insertions, 18 deletions
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index cedd9be220f5..f180719786a5 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -702,7 +702,7 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
rOutStm << ';' << endl;
}
- rtl::OString aDel(RTL_CONSTASCII_STRINGPARAM(", "));
+ rtl::OString aDel(", ");
rtl::OStringBuffer aOut;
if( aVolatile )
aOut.append(aVolatile.GetSvIdlString( SvHash_Volatile() ));
@@ -715,15 +715,15 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
if( aToggle )
{
aOut.append(aDel).append(aToggle.GetSvIdlString( SvHash_Toggle() ));
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
}
if( aAutoUpdate )
{
aOut.append(aDel).append(aAutoUpdate.GetSvIdlString( SvHash_AutoUpdate() ));
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
}
- rtl::OString aDel1(RTL_CONSTASCII_STRINGPARAM(", "));
+ rtl::OString aDel1(", ");
if( aAsynchron )
aOut.append(aDel).append(aAsynchron.GetSvIdlString( SvHash_Asynchron() ));
else if( !aSynchron )
@@ -734,7 +734,7 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
else
aDel1 = aDel;
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
if( aRecordManual )
aOut.append(aDel1).append(aRecordManual.GetSvIdlString( SvHash_RecordManual() ));
else if( aNoRecord )
@@ -750,53 +750,53 @@ void SvMetaSlot::WriteAttributesSvIdl( SvIdlDataBase & rBase,
if( aRecordAbsolute )
{
aOut.append(aDel).append(aRecordAbsolute.GetSvIdlString( SvHash_RecordAbsolute() ));
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
}
if( aHasDialog )
{
aOut.append(aDel).append(aHasDialog.GetSvIdlString( SvHash_HasDialog() ));
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
}
if( aMenuConfig )
{
aOut.append(aDel).append(aMenuConfig.GetSvIdlString( SvHash_MenuConfig() ));
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
}
if( aToolBoxConfig )
{
aOut.append(aDel).append(aToolBoxConfig.GetSvIdlString( SvHash_ToolBoxConfig() ));
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
}
if( aStatusBarConfig )
{
aOut.append(aDel).append(aStatusBarConfig.GetSvIdlString( SvHash_StatusBarConfig() ));
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
}
if( aAccelConfig )
{
aOut.append(aDel).append(aAccelConfig.GetSvIdlString( SvHash_AccelConfig() ));
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
}
if( aFastCall )
{
aOut.append(aDel).append(aFastCall.GetSvIdlString( SvHash_FastCall() ));
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
}
if( aContainer )
{
aOut.append(aDel).append(aContainer.GetSvIdlString( SvHash_Container() ));
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
}
if( aImageRotation )
{
aOut.append(aDel).append(aImageRotation.GetSvIdlString( SvHash_ImageRotation() ));
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
}
if( aImageReflection )
{
aOut.append(aDel).append(aImageReflection.GetSvIdlString( SvHash_ImageReflection() ));
- aDel = rtl::OString(RTL_CONSTASCII_STRINGPARAM(", "));
+ aDel = ", ";
}
if( aOut.getLength() )
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 5b53d96009b8..9eaf1973854f 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -869,7 +869,7 @@ void SvMetaType::SetType( int nT )
nType = nT;
if( nType == TYPE_ENUM )
{
- aOdlName.setString(rtl::OString(RTL_CONSTASCII_STRINGPARAM("short")));
+ aOdlName.setString("short");
}
else if( nType == TYPE_CLASS )
{
@@ -1090,7 +1090,7 @@ sal_Bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
}
else
{
- rtl::OString aStr(RTL_CONSTASCII_STRINGPARAM("wrong typedef: "));
+ rtl::OString aStr("wrong typedef: ");
rBase.SetError( aStr, rInStm.GetToken() );
rBase.WriteError( rInStm );
}
@@ -1806,7 +1806,7 @@ void SvMetaEnumValue::Write( SvIdlDataBase &, SvStream & rOutStm, sal_uInt16,
SV_IMPL_META_FACTORY1( SvMetaTypeEnum, SvMetaType );
SvMetaTypeEnum::SvMetaTypeEnum()
{
- SetBasicName(rtl::OString(RTL_CONSTASCII_STRINGPARAM("Integer")));
+ SetBasicName("Integer");
}
void SvMetaTypeEnum::Load( SvPersistStream & rStm )