summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--connectivity/source/drivers/postgresql/pq_tools.cxx2
-rw-r--r--dbaccess/source/ui/dlg/dbfindex.cxx4
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx22
-rw-r--r--extensions/source/update/check/download.cxx10
-rw-r--r--filter/source/placeware/exporter.cxx2
-rw-r--r--idl/source/cmptools/lex.cxx4
-rw-r--r--l10ntools/source/cfgmerge.cxx2
-rw-r--r--rsc/source/res/rscall.cxx12
-rw-r--r--sal/qa/osl/file/osl_File.cxx2
-rw-r--r--sc/source/filter/lotus/lotform.cxx4
-rw-r--r--slideshow/source/engine/shapes/drawshapesubsetting.cxx4
-rw-r--r--slideshow/source/engine/shapes/gdimtftools.cxx4
-rw-r--r--svtools/source/contnr/fileview.cxx2
13 files changed, 33 insertions, 41 deletions
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 2b979b0240ae..f6f929549985 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -532,7 +532,7 @@ void tokenizeSQL( const OString & sql, OStringVector &vec )
{
if( i - start )
vec.push_back( OString( &sql.getStr()[start], i - start ) );
- vec.push_back( OString( RTL_CONSTASCII_STRINGPARAM( "." ) ) );
+ vec.push_back( OString( "." ) );
start = i + 1;
}
}
diff --git a/dbaccess/source/ui/dlg/dbfindex.cxx b/dbaccess/source/ui/dlg/dbfindex.cxx
index 37b4e95bf6b5..644df9427785 100644
--- a/dbaccess/source/ui/dlg/dbfindex.cxx
+++ b/dbaccess/source/ui/dlg/dbfindex.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::ucb;
using namespace ::svt;
-const OString aGroupIdent(RTL_CONSTASCII_STRINGPARAM("dBase III"));
+const OString aGroupIdent("dBase III");
DBG_NAME(ODbaseIndexDialog)
@@ -472,7 +472,7 @@ void OTableInfo::WriteInfFile( const OUString& rDSN ) const
++aIndex, ++nPos
)
{
- OStringBuffer aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX"));
+ OStringBuffer aKeyName("NDX");
if( nPos > 0 ) // first index contains no number
aKeyName.append(static_cast<sal_Int32>(nPos));
aInfFile.WriteKey(
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 6858066f7753..f6aad734bbbf 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -992,9 +992,9 @@ namespace drawinglayer
// support for FIELD_SEQ_BEGIN, FIELD_SEQ_END and URL. It wraps text primitives (but is not limited to)
// thus do the MetafileAction embedding stuff but just handle recursively.
const primitive2d::TextHierarchyFieldPrimitive2D& rFieldPrimitive = static_cast< const primitive2d::TextHierarchyFieldPrimitive2D& >(rCandidate);
- const OString aCommentStringCommon(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN"));
- const OString aCommentStringPage(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN;PageField"));
- const OString aCommentStringEnd(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END"));
+ const OString aCommentStringCommon("FIELD_SEQ_BEGIN");
+ const OString aCommentStringPage("FIELD_SEQ_BEGIN;PageField");
+ const OString aCommentStringEnd("FIELD_SEQ_END");
switch(rFieldPrimitive.getType())
{
@@ -1043,7 +1043,7 @@ namespace drawinglayer
case PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D :
{
const primitive2d::TextHierarchyLinePrimitive2D& rLinePrimitive = static_cast< const primitive2d::TextHierarchyLinePrimitive2D& >(rCandidate);
- const OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL"));
+ const OString aCommentString("XTEXT_EOL");
// process recursively and add MetaFile comment
process(rLinePrimitive.get2DDecomposition(getViewInformation2D()));
@@ -1056,7 +1056,7 @@ namespace drawinglayer
// in Outliner::PaintBullet(), a MetafileComment for bullets is added, too. The
// "XTEXT_EOC" is used, use here, too.
const primitive2d::TextHierarchyBulletPrimitive2D& rBulletPrimitive = static_cast< const primitive2d::TextHierarchyBulletPrimitive2D& >(rCandidate);
- const OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC"));
+ const OString aCommentString("XTEXT_EOC");
// process recursively and add MetaFile comment
process(rBulletPrimitive.get2DDecomposition(getViewInformation2D()));
@@ -1067,7 +1067,7 @@ namespace drawinglayer
case PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D :
{
const primitive2d::TextHierarchyParagraphPrimitive2D& rParagraphPrimitive = static_cast< const primitive2d::TextHierarchyParagraphPrimitive2D& >(rCandidate);
- const OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP"));
+ const OString aCommentString("XTEXT_EOP");
if(mpPDFExtOutDevData)
{
@@ -1090,8 +1090,8 @@ namespace drawinglayer
case PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D :
{
const primitive2d::TextHierarchyBlockPrimitive2D& rBlockPrimitive = static_cast< const primitive2d::TextHierarchyBlockPrimitive2D& >(rCandidate);
- const OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN"));
- const OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END"));
+ const OString aCommentStringA("XTEXT_PAINTSHAPE_BEGIN");
+ const OString aCommentStringB("XTEXT_PAINTSHAPE_END");
// add MetaFile comment, process recursively and add MetaFile comment
mpMetaFile->AddAction(new MetaCommentAction(aCommentStringA));
@@ -1138,9 +1138,9 @@ namespace drawinglayer
sal_Int32 nNextCellBreak(mxBreakIterator->nextCharacters(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::CharacterIteratorMode::SKIPCELL, 0, nDone));
::com::sun::star::i18n::Boundary nNextWordBoundary(mxBreakIterator->getWordBoundary(rTxt, nTextPosition, rLocale, ::com::sun::star::i18n::WordType::ANY_WORD, sal_True));
sal_Int32 nNextSentenceBreak(mxBreakIterator->endOfSentence(rTxt, nTextPosition, rLocale));
- const OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC"));
- const OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW"));
- const OString aCommentStringC(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOS"));
+ const OString aCommentStringA("XTEXT_EOC");
+ const OString aCommentStringB("XTEXT_EOW");
+ const OString aCommentStringC("XTEXT_EOS");
for(sal_Int32 i(nTextPosition); i < nTextPosition + nTextLength; i++)
{
diff --git a/extensions/source/update/check/download.cxx b/extensions/source/update/check/download.cxx
index 4809cf41b818..94beb83856d9 100644
--- a/extensions/source/update/check/download.cxx
+++ b/extensions/source/update/check/download.cxx
@@ -299,7 +299,7 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal
// Only report errors when not stopped
else
{
- OString aMessage(RTL_CONSTASCII_STRINGPARAM("Unknown error"));
+ OString aMessage("Unknown error");
const char * error_message = curl_easy_strerror(cc);
if( NULL != error_message )
@@ -311,9 +311,9 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal
curl_easy_getinfo( pCURL, CURLINFO_RESPONSE_CODE, &nError );
if ( 403 == nError )
- aMessage += OString( RTL_CONSTASCII_STRINGPARAM( " 403: Access denied!" ) );
+ aMessage += OString( " 403: Access denied!" );
else if ( 404 == nError )
- aMessage += OString( RTL_CONSTASCII_STRINGPARAM( " 404: File not found!" ) );
+ aMessage += OString( " 404: File not found!" );
else if ( 416 == nError )
{
// we got this error probably, because we already downloaded the file
@@ -322,9 +322,9 @@ bool curl_run(const OUString& rURL, OutData& out, const OString& aProxyHost, sal
}
else
{
- aMessage += OString( RTL_CONSTASCII_STRINGPARAM( ":error code = " ) );
+ aMessage += OString( ":error code = " );
aMessage += OString::number( nError );
- aMessage += OString( RTL_CONSTASCII_STRINGPARAM( " !" ) );
+ aMessage += OString( " !" );
}
}
if ( !ret )
diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx
index c927bf5213d9..fdb2e5655cb6 100644
--- a/filter/source/placeware/exporter.cxx
+++ b/filter/source/placeware/exporter.cxx
@@ -278,7 +278,7 @@ static void createSlideFile( Reference< XComponent > xDoc, PlacewareZipFile& rZi
}
}
- if( (osl::File::E_None != nRC) || !rZipFile.addFile( aInfoFile, OString( RTL_CONSTASCII_STRINGPARAM("slides.txt") ) ))
+ if( (osl::File::E_None != nRC) || !rZipFile.addFile( aInfoFile, OString( "slides.txt" ) ))
throw IOException();
}
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 3e131ee7bf43..23793a661882 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -85,8 +85,8 @@ SvToken & SvToken::operator = ( const SvToken & rObj )
void SvTokenStream::InitCtor()
{
- aStrTrue = OString(RTL_CONSTASCII_STRINGPARAM("TRUE"));
- aStrFalse = OString(RTL_CONSTASCII_STRINGPARAM("FALSE"));
+ aStrTrue = OString("TRUE");
+ aStrFalse = OString("FALSE");
nLine = nColumn = 0;
nBufPos = 0;
nTabSize = 4;
diff --git a/l10ntools/source/cfgmerge.cxx b/l10ntools/source/cfgmerge.cxx
index 63f4a8f01acf..fc3e594f76e6 100644
--- a/l10ntools/source/cfgmerge.cxx
+++ b/l10ntools/source/cfgmerge.cxx
@@ -358,7 +358,7 @@ void CfgExport::WorkOnResourceEnd()
if ( bLocalize ) {
if ( !pStackData->sText["en-US"].isEmpty() )
{
- OString sXComment = pStackData->sText[OString(RTL_CONSTASCII_STRINGPARAM("x-comment"))];
+ OString sXComment = pStackData->sText[OString("x-comment")];
OString sLocalId = pStackData->sIdentifier;
OString sGroupId;
if ( aStack.size() == 1 ) {
diff --git a/rsc/source/res/rscall.cxx b/rsc/source/res/rscall.cxx
index a3d0df50d651..d2dbfb04d0ca 100644
--- a/rsc/source/res/rscall.cxx
+++ b/rsc/source/res/rscall.cxx
@@ -36,17 +36,13 @@ Atom nRsc_EXTRADATA = InvalidAtom;
void InitRscCompiler()
{
- pStdParType = new OString(RTL_CONSTASCII_STRINGPARAM(
- "( const ResId & rResId, sal_Bool"));
+ pStdParType = new OString("( const ResId & rResId, sal_Bool");
pStdPar1 = new OString('(');
pStdPar2 = new OString('(');
- pWinParType = new OString(RTL_CONSTASCII_STRINGPARAM(
- "( Window * pParent, const ResId & rResId, sal_Bool"));
- pWinPar1 = new OString(RTL_CONSTASCII_STRINGPARAM(
- "( pParent,"));
- pWinPar2 = new OString(RTL_CONSTASCII_STRINGPARAM(
- "( this,"));
+ pWinParType = new OString("( Window * pParent, const ResId & rResId, sal_Bool");
+ pWinPar1 = new OString("( pParent,");
+ pWinPar2 = new OString("( this,");
nRefDeep = 10;
nRsc_XYMAPMODEId = InvalidAtom;
nRsc_WHMAPMODEId = InvalidAtom;
diff --git a/sal/qa/osl/file/osl_File.cxx b/sal/qa/osl/file/osl_File.cxx
index 50268ff49a57..43f255cdf90a 100644
--- a/sal/qa/osl/file/osl_File.cxx
+++ b/sal/qa/osl/file/osl_File.cxx
@@ -444,7 +444,7 @@ inline void deleteTestDirectory( const ::rtl::OUString dirname )
nError = ::osl::Directory::remove( aPathURL );
- rtl::OString strError (RTL_CONSTASCII_STRINGPARAM("In deleteTestDirectory function: remove Directory "));
+ rtl::OString strError ("In deleteTestDirectory function: remove Directory ");
strError += ::rtl::OUStringToOString( aPathURL, RTL_TEXTENCODING_ASCII_US );
CPPUNIT_ASSERT_MESSAGE( strError.getStr(), ( ::osl::FileBase::E_None == nError ) || ( nError == ::osl::FileBase::E_NOENT ) );
}
diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx
index f09c11436d26..c230710dffef 100644
--- a/sc/source/filter/lotus/lotform.cxx
+++ b/sc/source/filter/lotus/lotform.cxx
@@ -54,7 +54,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
OString t;
if( pExtString )
{
- const OString s(RTL_CONSTASCII_STRINGPARAM("@<<@123>>"));
+ const OString s("@<<@123>>");
t = pExtString;
@@ -67,7 +67,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri
eOc = lcl_KnownAddIn( t );
if( eOc == ocNoName )
- t = OString(RTL_CONSTASCII_STRINGPARAM("L123_")) + t;
+ t = OString("L123_") + t;
}
else
t = "#UNKNOWN FUNC NAME#";
diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
index a05305575606..0cb1b075f5c1 100644
--- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx
+++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx
@@ -79,9 +79,7 @@ namespace slideshow
MetaCommentAction* pAct = static_cast<MetaCommentAction*>(pCurrAct);
// skip comment if not a special XTEXT... comment
- if( pAct->GetComment().matchIgnoreAsciiCase(
- OString(RTL_CONSTASCII_STRINGPARAM("XTEXT")),
- 0) )
+ if( pAct->GetComment().matchIgnoreAsciiCase( OString("XTEXT"), 0 ) )
{
// fill classification vector with NOOPs,
// then insert corresponding classes at
diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx
index 9850f3e3a546..484548999dac 100644
--- a/slideshow/source/engine/shapes/gdimtftools.cxx
+++ b/slideshow/source/engine/shapes/gdimtftools.cxx
@@ -450,9 +450,7 @@ bool getRectanglesFromScrollMtf( ::basegfx::B2DRectangle& o_rScrollRect,
MetaCommentAction * pAct =
static_cast<MetaCommentAction *>(pCurrAct);
// skip comment if not a special XTEXT... comment
- if( pAct->GetComment().matchIgnoreAsciiCase(
- OString(RTL_CONSTASCII_STRINGPARAM("XTEXT")),
- 0) )
+ if( pAct->GetComment().matchIgnoreAsciiCase( OString("XTEXT"), 0 ) )
{
if (pAct->GetComment().equalsIgnoreAsciiCaseL(
RTL_CONSTASCII_STRINGPARAM("XTEXT_SCROLLRECT") ))
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 1b5df886088a..8757ca0b9178 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -364,7 +364,7 @@ void NameTranslationList::Init()
OUString aFsysName( maTransFile.getFSysPath( INetURLObject::FSYS_DETECT ) );
Config aConfig( aFsysName );
- aConfig.SetGroup( OString(RTL_CONSTASCII_STRINGPARAM("TRANSLATIONNAMES")) );
+ aConfig.SetGroup( OString("TRANSLATIONNAMES") );
sal_uInt16 nKeyCnt = aConfig.GetKeyCount();
generated by cgit (git 2.34.1) at 2025-01-13 03:39:31 +0000