diff options
author | Noel Grandin <noel@peralex.com> | 2013-11-20 11:10:15 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-11-20 13:56:07 +0200 |
commit | 5112f6a6c6e4cd76045f31e269a679b50dc83fb2 (patch) | |
tree | ed7af465f490d743b06831216243fddbd2e13940 /drawinglayer | |
parent | 0b4b02d9b6cf5b939dc1522d8348e3f4d6f955d4 (diff) |
remove RTL_CONSTASCII_STRINGPARAM in OString constructor
Convert code like:
OString aKeyName(RTL_CONSTASCII_STRINGPARAM("NDX"));
to:
OString aKeyName("NDX");
which compiles down to the same code
Change-Id: I1780264cae4484fc78f0586b0750c09f2dce135f
Diffstat (limited to 'drawinglayer')
-rw-r--r-- | drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx | 22 |
1 files changed, 11 insertions, 11 deletions
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++) { |