summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editeng/source/editeng/editeng.cxx3
-rw-r--r--extensions/source/plugin/unx/unxmgr.cxx2
-rw-r--r--extensions/source/scanner/sanedlg.cxx7
-rw-r--r--idl/source/objects/module.cxx6
-rw-r--r--idl/source/objects/slot.cxx2
-rw-r--r--reportdesign/source/filter/xml/xmlfilter.cxx3
-rw-r--r--sc/source/core/data/dptabres.cxx3
-rw-r--r--sc/source/filter/qpro/qproform.cxx2
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx15
-rw-r--r--sc/source/ui/Accessibility/DrawModelBroadcaster.cxx3
-rw-r--r--sfx2/source/appl/appcfg.cxx4
-rw-r--r--sfx2/source/appl/appuno.cxx20
-rw-r--r--sfx2/source/appl/sfxhelp.cxx2
-rw-r--r--sfx2/source/control/request.cxx9
-rw-r--r--sfx2/source/control/unoctitm.cxx2
-rw-r--r--svx/source/svdraw/svdmodel.cxx3
-rw-r--r--sw/source/filter/html/htmltabw.cxx4
-rw-r--r--sw/source/filter/xml/swxml.cxx15
-rw-r--r--vcl/unx/generic/printer/printerinfomanager.cxx6
19 files changed, 44 insertions, 67 deletions
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index dfc9713403bd..c9b79703a0ef 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -1111,8 +1111,7 @@ sal_Bool EditEngine::PostKeyEvent( const KeyEvent& rKeyEvent, EditView* pEditVie
if ( rKeyEvent.GetKeyCode().IsMod1() && rKeyEvent.GetKeyCode().IsMod2() )
{
bDebugPaint = !bDebugPaint;
- OStringBuffer aInfo(RTL_CONSTASCII_STRINGPARAM(
- "DebugPaint: "));
+ OStringBuffer aInfo("DebugPaint: ");
aInfo.append(bDebugPaint ? "On" : "Off");
InfoBox(NULL, OStringToOUString(aInfo.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US)).Execute();
}
diff --git a/extensions/source/plugin/unx/unxmgr.cxx b/extensions/source/plugin/unx/unxmgr.cxx
index 6da7fe50778b..2ee2b4964b7d 100644
--- a/extensions/source/plugin/unx/unxmgr.cxx
+++ b/extensions/source/plugin/unx/unxmgr.cxx
@@ -251,7 +251,7 @@ Sequence<PluginDescription> XPluginManager_Impl::impl_getPluginDescriptions() th
static const char* pNPXPluginPath = getenv( "NPX_PLUGIN_PATH" );
// netscape!, quick, beam me back to the 90's when Motif roamed the earth
- OStringBuffer aSearchBuffer(RTL_CONSTASCII_STRINGPARAM("/usr/lib/netscape/plugins"));
+ OStringBuffer aSearchBuffer("/usr/lib/netscape/plugins");
if( pHome )
aSearchBuffer.append(':').append(pHome).append("/.netscape/plugins");
if( pNPXPluginPath )
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx
index a11a656923f1..fbc031894f94 100644
--- a/extensions/source/scanner/sanedlg.cxx
+++ b/extensions/source/scanner/sanedlg.cxx
@@ -1275,8 +1275,7 @@ void SaneDlg::SaveState()
sal_Bool bValue;
if( mrSane.GetOptionValue( nOption, bValue ) )
{
- OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM(
- "BOOL="));
+ OStringBuffer aString("BOOL=");
aString.append(static_cast<sal_Int32>(bValue));
aConfig.WriteKey(aOption, aString.makeStringAndClear());
}
@@ -1287,7 +1286,7 @@ void SaneDlg::SaveState()
OString aValue;
if( mrSane.GetOptionValue( nOption, aValue ) )
{
- OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("STRING="));
+ OStringBuffer aString("STRING=");
aString.append(aValue);
aConfig.WriteKey( aOption, aString.makeStringAndClear() );
}
@@ -1296,7 +1295,7 @@ void SaneDlg::SaveState()
case SANE_TYPE_FIXED:
case SANE_TYPE_INT:
{
- OStringBuffer aString(RTL_CONSTASCII_STRINGPARAM("NUMERIC="));
+ OStringBuffer aString("NUMERIC=");
double fValue;
char buf[256];
int n;
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index 03bb4aafc57a..b78de7443970 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -134,7 +134,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase,
sal_uInt32 nTokPos = rInStm.Tell();
if( !rBase.ReadIdFile( OStringToOUString(aSlotIdFile.getString(), RTL_TEXTENCODING_ASCII_US)) )
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot read file: "));
+ OStringBuffer aStr("cannot read file: ");
aStr.append(aSlotIdFile.getString());
rBase.SetError( aStr.makeStringAndClear(), rInStm.GetToken() );
rBase.WriteError( rInStm );
@@ -256,14 +256,14 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase,
}
else
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot open file: "));
+ OStringBuffer aStr("cannot open file: ");
aStr.append(OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
rBase.SetError(aStr.makeStringAndClear(), pTok);
}
}
else
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot find file:"));
+ OStringBuffer aStr("cannot find file:");
aStr.append(OUStringToOString(aFullName, RTL_TEXTENCODING_UTF8));
rBase.SetError(aStr.makeStringAndClear(), pTok);
}
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 9201b53d0dc1..4d78be88dbc8 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1076,7 +1076,7 @@ void SvMetaSlot::Insert( SvSlotElementList& rList, const OString& rPrefix,
static OString MakeSlotName( SvStringHashEntry * pEntry )
{
- OStringBuffer aName(RTL_CONSTASCII_STRINGPARAM("SFX_SLOT_"));
+ OStringBuffer aName("SFX_SLOT_");
aName.append(pEntry->GetName());
return aName.makeStringAndClear().toAsciiUpperCase();
};
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index db65a4f1eb80..a35b4d764871 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -160,8 +160,7 @@ sal_Int32 ReadThroughComponent(
catch (const SAXParseException& r)
{
#if OSL_DEBUG_LEVEL > 1
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX parse exception caught while importing:\n"));
+ OStringBuffer aError("SAX parse exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
aError.append(r.LineNumber);
diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx
index 3c17edcdc7db..4a660c04dfaa 100644
--- a/sc/source/core/data/dptabres.cxx
+++ b/sc/source/core/data/dptabres.cxx
@@ -3029,8 +3029,7 @@ bool ScDPResultDimension::IsValidEntry( const vector< SCROW >& aMembers ) const
if ( NULL != pMember )
return pMember->IsValidEntry( aMembers );
#if OSL_DEBUG_LEVEL > 1
- OStringBuffer strTemp(RTL_CONSTASCII_STRINGPARAM(
- "IsValidEntry: Member not found, DimName = "));
+ OStringBuffer strTemp("IsValidEntry: Member not found, DimName = ");
strTemp.append(OUStringToOString(GetName(), RTL_TEXTENCODING_UTF8));
OSL_TRACE("%s", strTemp.getStr());
#endif
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index e977643d7db8..91399bbe5a8e 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -86,7 +86,7 @@ void QProToSc::DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtStr
bAddIn = sal_True;
if( pExtString )
{
- OStringBuffer s(RTL_CONSTASCII_STRINGPARAM("QPRO_"));
+ OStringBuffer s("QPRO_");
s.append(pExtString);
nPush = aPool.Store(eOc, OStringToOUString(s.makeStringAndClear(), maIn.GetStreamCharSet()));
aPool << nPush;
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index fb3d4b13dd62..5b99a8cbbe25 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -208,8 +208,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX parse exception catched while importing:\n"));
+ OStringBuffer aError("SAX parse exception catched while importing:\n");
aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
#endif
@@ -245,8 +244,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX exception catched while importing:\n"));
+ OStringBuffer aError("SAX exception catched while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -259,8 +257,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo
catch( const packages::zip::ZipIOException& r )
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "Zip exception catched while importing:\n"));
+ OStringBuffer aError("Zip exception catched while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL( aError.getStr() );
@@ -272,8 +269,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo
catch( const io::IOException& r )
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "IO exception catched while importing:\n"));
+ OStringBuffer aError("IO exception catched while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -285,8 +281,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(const uno::Reference<uno::XCo
catch( const uno::Exception& r )
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "uno exception catched while importing:\n"));
+ OStringBuffer aError("uno exception catched while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
diff --git a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
index 58c219857c18..0d7bcf50f821 100644
--- a/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
+++ b/sc/source/ui/Accessibility/DrawModelBroadcaster.cxx
@@ -74,8 +74,7 @@ void ScDrawModelBroadcaster::Notify( SfxBroadcaster&,
{
(void) r;
#if OSL_DEBUG_LEVEL > 1
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "Runtime exception caught while notifying shape.:\n"));
+ OStringBuffer aError("Runtime exception caught while notifying shape.:\n");
aError.append(OUStringToOString(r.Message, RTL_TEXTENCODING_ASCII_US));
OSL_FAIL( aError.getStr() );
#endif
diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx
index 2ae3ec009704..acd9eebc1998 100644
--- a/sfx2/source/appl/appcfg.cxx
+++ b/sfx2/source/appl/appcfg.cxx
@@ -135,7 +135,7 @@ IMPL_LINK(SfxEventAsyncer_Impl, TimerHdl, Timer*, pAsyncTimer)
#ifdef DBG_UTIL
if (!xRef.Is())
{
- OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxEvent: "));
+ OStringBuffer aTmp("SfxEvent: ");
aTmp.append(OUStringToOString(aHint.GetEventName(), RTL_TEXTENCODING_UTF8));
OSL_TRACE( "%s", aTmp.getStr() );
}
@@ -884,7 +884,7 @@ void SfxApplication::NotifyEvent( const SfxEventHint& rEventHint, bool bSynchron
#ifdef DBG_UTIL
if (!pDoc)
{
- OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxEvent: "));
+ OStringBuffer aTmp("SfxEvent: ");
aTmp.append(OUStringToOString(rEventHint.GetEventName(), RTL_TEXTENCODING_UTF8));
OSL_TRACE( "%s", aTmp.getStr() );
}
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx
index 33ce8ed817ed..edc0bc536ef1 100644
--- a/sfx2/source/appl/appuno.cxx
+++ b/sfx2/source/appl/appuno.cxx
@@ -320,7 +320,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
#ifdef DBG_UTIL
else
{
- OStringBuffer aDbgStr(RTL_CONSTASCII_STRINGPARAM("Property not convertible: "));
+ OStringBuffer aDbgStr("Property not convertible: ");
aDbgStr.append(pSlot->pUnoName);
OSL_FAIL( aDbgStr.getStr() );
}
@@ -333,7 +333,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
if ( nSub >= nSubCount )
{
// there was a parameter with a name that didn't match to any of the members
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("Property name does not match: "));
+ OStringBuffer aStr("Property name does not match: ");
aStr.append(OUStringToOString(rPropValue.Name, RTL_TEXTENCODING_UTF8));
OSL_FAIL( aStr.getStr() );
}
@@ -364,7 +364,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
if ( !pItem )
{
#ifdef DBG_UTIL
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("No creator method for argument: "));
+ OStringBuffer aStr("No creator method for argument: ");
aStr.append(rArg.pName);
OSL_FAIL( aStr.getStr() );
#endif
@@ -460,7 +460,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert
// ... but it was not convertible
bRet = sal_False;
#ifdef DBG_UTIL
- OStringBuffer aDbgStr(RTL_CONSTASCII_STRINGPARAM("Property not convertible: "));
+ OStringBuffer aDbgStr("Property not convertible: ");
aDbgStr.append(rArg.pName);
OSL_FAIL( aDbgStr.getStr() );
#endif
@@ -1003,8 +1003,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
else
{
// we will not rely on the "toggle" ability of some property slots
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Processing property slot without argument: "));
+ OStringBuffer aStr("Processing property slot without argument: ");
aStr.append(static_cast<sal_Int32>(nSlotId));
OSL_FAIL(aStr.getStr());
}
@@ -1306,8 +1305,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
continue;
}
- OStringBuffer aDbg(RTL_CONSTASCII_STRINGPARAM(
- "Unknown item detected: "));
+ OStringBuffer aDbg("Unknown item detected: ");
aDbg.append(static_cast<sal_Int32>(nId));
DBG_ASSERT(nArg<nFormalArgs, aDbg.getStr());
}
@@ -1337,8 +1335,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
pValue[nActProp].Name = OUString::createFromAscii(pSlot->pUnoName) ;
if ( !pItem->QueryValue( pValue[nActProp].Value ) )
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Item not convertible: "));
+ OStringBuffer aStr("Item not convertible: ");
aStr.append(static_cast<sal_Int32>(nSlotId));
OSL_FAIL(aStr.getStr());
}
@@ -1390,8 +1387,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b
pValue[nActProp].Name = OUString::createFromAscii( rArg.pName ) ;
if ( !pItem->QueryValue( pValue[nActProp++].Value ) )
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Item not convertible: "));
+ OStringBuffer aStr("Item not convertible: ");
aStr.append(static_cast<sal_Int32>(rArg.nSlotId));
OSL_FAIL(aStr.getStr());
}
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 33224c51ee90..3640b4616a8c 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -636,7 +636,7 @@ sal_Bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const
return sal_False;
#ifdef DBG_UTIL
- OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM("SfxHelp: HelpId = "));
+ OStringBuffer aTmp("SfxHelp: HelpId = ");
aTmp.append(OUStringToOString(aHelpURL, RTL_TEXTENCODING_UTF8));
OSL_TRACE( aTmp.getStr() );
#endif
diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx
index 403150554844..c5ced2466e03 100644
--- a/sfx2/source/control/request.cxx
+++ b/sfx2/source/control/request.cxx
@@ -204,8 +204,7 @@ SfxRequest::SfxRequest
#ifdef DBG_UTIL
else
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Recording unsupported slot: "));
+ OStringBuffer aStr("Recording unsupported slot: ");
aStr.append(static_cast<sal_Int32>(pImp->pPool->GetSlotId(nSlotId)));
OSL_FAIL(aStr.getStr());
}
@@ -692,8 +691,7 @@ void SfxRequest::Done_Impl
// new Recording uses UnoName!
if ( !pImp->pSlot->pUnoName )
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Recording not exported slot: "));
+ OStringBuffer aStr("Recording not exported slot: ");
aStr.append(static_cast<sal_Int32>(pImp->pSlot->GetSlotId()));
OSL_FAIL(aStr.getStr());
}
@@ -714,8 +712,7 @@ void SfxRequest::Done_Impl
#ifdef DBG_UTIL
if ( SFX_ITEM_SET != eState )
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "Recording property not available: "));
+ OStringBuffer aStr("Recording property not available: ");
aStr.append(static_cast<sal_Int32>(pImp->pSlot->GetSlotId()));
OSL_FAIL(aStr.getStr());
}
diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx
index 7fdde8e0a71c..146245afcd12 100644
--- a/sfx2/source/control/unoctitm.cxx
+++ b/sfx2/source/control/unoctitm.cxx
@@ -444,7 +444,7 @@ SfxDispatchController_Impl::SfxDispatchController_Impl(
{
if ( aDispatchURL.Protocol == "slot:" && pUnoName )
{
- OStringBuffer aTmp(RTL_CONSTASCII_STRINGPARAM(".uno:"));
+ OStringBuffer aTmp(".uno:");
aTmp.append(pUnoName);
aDispatchURL.Complete = OStringToOUString(aTmp.makeStringAndClear(), RTL_TEXTENCODING_ASCII_US);
Reference< XURLTransformer > xTrans( URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index fe0a540e18d3..b0cf71e213e1 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -276,8 +276,7 @@ SdrModel::~SdrModel()
#ifdef DBG_UTIL
if(pAktUndoGroup)
{
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "In the Dtor of the SdrModel there is an open Undo left: \""));
+ OStringBuffer aStr("In the Dtor of the SdrModel there is an open Undo left: \"");
aStr.append(OUStringToOString(pAktUndoGroup->GetComment(), osl_getThreadTextEncoding()))
.append('\"');
OSL_FAIL(aStr.getStr());
diff --git a/sw/source/filter/html/htmltabw.cxx b/sw/source/filter/html/htmltabw.cxx
index 9a464ae41c83..43e8672586dc 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -734,7 +734,7 @@ void SwHTMLWrtTable::Write( SwHTMLWriter& rWrt, sal_Int16 eAlign,
if( pCaption && !pCaption->isEmpty() )
{
rWrt.OutNewLine(); // <CAPTION> in neue Zeile
- OStringBuffer sOutStr(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_caption));
+ OStringBuffer sOutStr(OOO_STRING_SVTOOLS_HTML_caption);
sOutStr.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append("=\"")
.append(bTopCaption ? OOO_STRING_SVTOOLS_HTML_VA_top : OOO_STRING_SVTOOLS_HTML_VA_bottom)
.append("\"");
@@ -1101,7 +1101,7 @@ Writer& OutHTML_SwTblNode( Writer& rWrt, SwTableNode & rNode,
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), OOO_STRING_SVTOOLS_HTML_center, sal_True );
else
{
- OStringBuffer sOut(RTL_CONSTASCII_STRINGPARAM(OOO_STRING_SVTOOLS_HTML_division));
+ OStringBuffer sOut(OOO_STRING_SVTOOLS_HTML_division);
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_align).append("=\"")
.append(OOO_STRING_SVTOOLS_HTML_AL_right).append("\"");
HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), sOut.getStr(),
diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 3a11d2c7865d..d9dbc4261d10 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -188,8 +188,7 @@ sal_Int32 ReadThroughComponent(
return ERRCODE_SFX_WRONGPASSWORD;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX parse exception caught while importing:\n"));
+ OStringBuffer aError("SAX parse exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -224,8 +223,7 @@ sal_Int32 ReadThroughComponent(
return ERRCODE_SFX_WRONGPASSWORD;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "SAX exception caught while importing:\n"));
+ OStringBuffer aError("SAX exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -237,8 +235,7 @@ sal_Int32 ReadThroughComponent(
{
(void)r;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "Zip exception caught while importing:\n"));
+ OStringBuffer aError("Zip exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -249,8 +246,7 @@ sal_Int32 ReadThroughComponent(
{
(void)r;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "IO exception caught while importing:\n"));
+ OStringBuffer aError("IO exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
@@ -261,8 +257,7 @@ sal_Int32 ReadThroughComponent(
{
(void)r;
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer aError(RTL_CONSTASCII_STRINGPARAM(
- "uno exception caught while importing:\n"));
+ OStringBuffer aError("uno exception caught while importing:\n");
aError.append(OUStringToOString(r.Message,
RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aError.getStr());
diff --git a/vcl/unx/generic/printer/printerinfomanager.cxx b/vcl/unx/generic/printer/printerinfomanager.cxx
index be3359836b3c..e9f7791c20ec 100644
--- a/vcl/unx/generic/printer/printerinfomanager.cxx
+++ b/vcl/unx/generic/printer/printerinfomanager.cxx
@@ -793,14 +793,14 @@ bool PrinterInfoManager::writePrinterConfig()
for( int i = 0; i < it->second.m_aInfo.m_aContext.countValuesModified(); i++ )
{
const PPDKey* pKey = it->second.m_aInfo.m_aContext.getModifiedKey( i );
- OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("PPD_"));
+ OStringBuffer aKey("PPD_");
aKey.append(OUStringToOString(pKey->getKey(), RTL_TEXTENCODING_ISO_8859_1));
const PPDValue* pValue = it->second.m_aInfo.m_aContext.getValue( pKey );
if (pValue)
aValue.append(OUStringToOString(pValue->m_aOption, RTL_TEXTENCODING_ISO_8859_1));
else
- aValue.append(RTL_CONSTASCII_STRINGPARAM("*nil"));
+ aValue.append("*nil");
pConfig->WriteKey(aKey.makeStringAndClear(), aValue.makeStringAndClear());
}
}
@@ -810,7 +810,7 @@ bool PrinterInfoManager::writePrinterConfig()
for( ::boost::unordered_map< OUString, OUString, OUStringHash >::const_iterator subst = it->second.m_aInfo.m_aFontSubstitutes.begin();
subst != it->second.m_aInfo.m_aFontSubstitutes.end(); ++subst )
{
- OStringBuffer aKey(RTL_CONSTASCII_STRINGPARAM("SubstFont_"));
+ OStringBuffer aKey("SubstFont_");
aKey.append(OUStringToOString(subst->first, RTL_TEXTENCODING_ISO_8859_1));
pConfig->WriteKey( aKey.makeStringAndClear(), OUStringToOString( subst->second, RTL_TEXTENCODING_ISO_8859_1 ) );
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 08:41:52 +0000