summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2013-11-20 10:05:20 +0200
committerNoel Grandin <noel@peralex.com>2013-11-20 10:07:32 +0200
commit1730df0127ff230cf6c89f4815f5b59c8603fa2b (patch)
tree4d5b32ea155c173fe3cfd905bb148e0998286d9a /svx
parent52bbd9cc00b5a1e15e4f96b5c5fa5e75855692c1 (diff)
remove unnecessary RTL_CONSTASCII_STRINGPARAM in OString::append
Convert code like: aOStringBuf.append( RTL_CONSTASCII_STRINGPARAM( " is missing )") ); to: aOStringBuf.append( " is missing )" ); which compiles down to the same code. Change-Id: I3d8ed0cbf96a881686524a167412d5f303c06b71
Diffstat (limited to 'svx')
-rw-r--r--svx/source/form/fmsrcimp.cxx10
-rw-r--r--svx/source/svdraw/svdedtv.cxx10
-rw-r--r--svx/source/svdraw/svdpage.cxx10
-rw-r--r--svx/source/svdraw/svdxcgv.cxx22
-rw-r--r--svx/source/xml/xmlgrhlp.cxx5
5 files changed, 22 insertions, 35 deletions
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 747eea486e6d..3d6a54cffab4 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -239,10 +239,9 @@ sal_Bool FmSearchEngine::MoveCursor()
catch(::com::sun::star::sdbc::SQLException const& e)
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM(
- "FmSearchEngine::MoveCursor : catched a DatabaseException ("));
+ OStringBuffer sDebugMessage("FmSearchEngine::MoveCursor : catched a DatabaseException (");
sDebugMessage.append(OUStringToOString(e.SQLState, RTL_TEXTENCODING_ASCII_US));
- sDebugMessage.append(RTL_CONSTASCII_STRINGPARAM(") !"));
+ sDebugMessage.append(") !");
OSL_FAIL(sDebugMessage.getStr());
#else
(void)e;
@@ -252,10 +251,9 @@ sal_Bool FmSearchEngine::MoveCursor()
catch(Exception const& e)
{
#if OSL_DEBUG_LEVEL > 0
- OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM(
- "FmSearchEngine::MoveCursor : catched an Exception ("));
+ OStringBuffer sDebugMessage("FmSearchEngine::MoveCursor : catched an Exception (");
sDebugMessage.append(OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US));
- sDebugMessage.append(RTL_CONSTASCII_STRINGPARAM(") !"));
+ sDebugMessage.append(") !");
OSL_FAIL(sDebugMessage.getStr());
#else
(void)e;
diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx
index 99db00d20a6d..a872d426bd8c 100644
--- a/svx/source/svdraw/svdedtv.cxx
+++ b/svx/source/svdraw/svdedtv.cxx
@@ -931,21 +931,19 @@ void SdrEditView::CopyMarkedObj()
if(0L != nCloneErrCnt)
{
#ifdef DBG_UTIL
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "SdrEditView::CopyMarkedObj(): Error when cloning "));
+ OStringBuffer aStr("SdrEditView::CopyMarkedObj(): Error when cloning ");
if(nCloneErrCnt == 1)
{
- aStr.append(RTL_CONSTASCII_STRINGPARAM("a drawing object."));
+ aStr.append("a drawing object.");
}
else
{
aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
- aStr.append(RTL_CONSTASCII_STRINGPARAM(" drawing objects."));
+ aStr.append(" drawing objects.");
}
- aStr.append(RTL_CONSTASCII_STRINGPARAM(
- " This object's/These objects's connections will not be copied."));
+ aStr.append(" This object's/These objects's connections will not be copied.");
OSL_FAIL(aStr.getStr());
#endif
}
diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx
index addf15824787..d1deac329cbc 100644
--- a/svx/source/svdraw/svdpage.cxx
+++ b/svx/source/svdraw/svdpage.cxx
@@ -195,21 +195,19 @@ void SdrObjList::CopyObjects(const SdrObjList& rSrcList)
}
} else {
#ifdef DBG_UTIL
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "SdrObjList::operator=(): Error when cloning "));
+ OStringBuffer aStr("SdrObjList::operator=(): Error when cloning ");
if(nCloneErrCnt == 1)
{
- aStr.append(RTL_CONSTASCII_STRINGPARAM("a drawing object."));
+ aStr.append("a drawing object.");
}
else
{
aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
- aStr.append(RTL_CONSTASCII_STRINGPARAM(" drawing objects."));
+ aStr.append(" drawing objects.");
}
- aStr.append(RTL_CONSTASCII_STRINGPARAM(
- " Not copying connectors."));
+ aStr.append(" Not copying connectors.");
OSL_FAIL(aStr.getStr());
#endif
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 147637da393d..374f9a9f4e26 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -369,22 +369,19 @@ sal_Bool SdrExchangeView::Paste(const SdrModel& rMod, const Point& rPos, SdrObjL
if(0L != nCloneErrCnt)
{
#ifdef DBG_UTIL
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "SdrExchangeView::Paste(): Error when cloning "));
+ OStringBuffer aStr("SdrExchangeView::Paste(): Error when cloning ");
if(nCloneErrCnt == 1)
{
- aStr.append(RTL_CONSTASCII_STRINGPARAM(
- "a drawing object."));
+ aStr.append("a drawing object.");
}
else
{
aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
- aStr.append(RTL_CONSTASCII_STRINGPARAM(" drawing objects."));
+ aStr.append(" drawing objects.");
}
- aStr.append(RTL_CONSTASCII_STRINGPARAM(
- " Not copying object connectors."));
+ aStr.append(" Not copying object connectors.");
OSL_FAIL(aStr.getStr());
#endif
@@ -787,22 +784,19 @@ SdrModel* SdrExchangeView::GetMarkedObjModel() const
if(0L != nCloneErrCnt)
{
#ifdef DBG_UTIL
- OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM(
- "SdrExchangeView::GetMarkedObjModel(): Error when cloning "));
+ OStringBuffer aStr("SdrExchangeView::GetMarkedObjModel(): Error when cloning ");
if(nCloneErrCnt == 1)
{
- aStr.append(RTL_CONSTASCII_STRINGPARAM(
- "a drawing object."));
+ aStr.append("a drawing object.");
}
else
{
aStr.append(static_cast<sal_Int32>(nCloneErrCnt));
- aStr.append(RTL_CONSTASCII_STRINGPARAM(" drawing objects."));
+ aStr.append(" drawing objects.");
}
- aStr.append(RTL_CONSTASCII_STRINGPARAM(
- " Not copying object connectors."));
+ aStr.append(" Not copying object connectors.");
OSL_FAIL(aStr.getStr());
#endif
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index b325dc016d31..95f5639157dd 100644
--- a/svx/source/xml/xmlgrhlp.cxx
+++ b/svx/source/xml/xmlgrhlp.cxx
@@ -719,10 +719,9 @@ void SvXMLGraphicHelper::ImplInsertGraphicURL( const OUString& rURLStr, sal_uInt
#if OSL_DEBUG_LEVEL > 0
else
{
- OStringBuffer sMessage(
- RTL_CONSTASCII_STRINGPARAM("graphic object with ID '"));
+ OStringBuffer sMessage("graphic object with ID '");
sMessage.append(aAsciiObjectID).
- append(RTL_CONSTASCII_STRINGPARAM("' has an unknown type"));
+ append("' has an unknown type");
OSL_ENSURE( false, sMessage.getStr() );
}
#endif