summaryrefslogtreecommitdiff
path: root/drawinglayer
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-01-22 08:04:44 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-01-23 11:37:05 +0000
commit210d239b87326a942dd73f507e642f0dde3da16b (patch)
tree206d8d7ee8f046da6353a3ff37200a925e2a6253 /drawinglayer
parent8ab3795596da25fbb18de8cfb8632d4956a256ec (diff)
make drawinglayer ByteString free
Diffstat (limited to 'drawinglayer')
-rw-r--r--drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx22
1 files changed, 11 insertions, 11 deletions
diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 994257469a04..9fc679eef152 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -967,9 +967,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);
- static const ByteString aCommentStringCommon("FIELD_SEQ_BEGIN");
- static const ByteString aCommentStringPage("FIELD_SEQ_BEGIN;PageField");
- static const ByteString aCommentStringEnd("FIELD_SEQ_END");
+ const rtl::OString aCommentStringCommon(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN"));
+ const rtl::OString aCommentStringPage(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_BEGIN;PageField"));
+ const rtl::OString aCommentStringEnd(RTL_CONSTASCII_STRINGPARAM("FIELD_SEQ_END"));
switch(rFieldPrimitive.getType())
{
@@ -1018,7 +1018,7 @@ namespace drawinglayer
case PRIMITIVE2D_ID_TEXTHIERARCHYLINEPRIMITIVE2D :
{
const primitive2d::TextHierarchyLinePrimitive2D& rLinePrimitive = static_cast< const primitive2d::TextHierarchyLinePrimitive2D& >(rCandidate);
- static const ByteString aCommentString("XTEXT_EOL");
+ const rtl::OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOL"));
// process recursively and add MetaFile comment
process(rLinePrimitive.get2DDecomposition(getViewInformation2D()));
@@ -1031,7 +1031,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);
- static const ByteString aCommentString("XTEXT_EOC");
+ const rtl::OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC"));
// process recursively and add MetaFile comment
process(rBulletPrimitive.get2DDecomposition(getViewInformation2D()));
@@ -1042,7 +1042,7 @@ namespace drawinglayer
case PRIMITIVE2D_ID_TEXTHIERARCHYPARAGRAPHPRIMITIVE2D :
{
const primitive2d::TextHierarchyParagraphPrimitive2D& rParagraphPrimitive = static_cast< const primitive2d::TextHierarchyParagraphPrimitive2D& >(rCandidate);
- static const ByteString aCommentString("XTEXT_EOP");
+ const rtl::OString aCommentString(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOP"));
if(mpPDFExtOutDevData)
{
@@ -1065,8 +1065,8 @@ namespace drawinglayer
case PRIMITIVE2D_ID_TEXTHIERARCHYBLOCKPRIMITIVE2D :
{
const primitive2d::TextHierarchyBlockPrimitive2D& rBlockPrimitive = static_cast< const primitive2d::TextHierarchyBlockPrimitive2D& >(rCandidate);
- static const ByteString aCommentStringA("XTEXT_PAINTSHAPE_BEGIN");
- static const ByteString aCommentStringB("XTEXT_PAINTSHAPE_END");
+ const rtl::OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_BEGIN"));
+ const rtl::OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_PAINTSHAPE_END"));
// add MetaFile comment, process recursively and add MetaFile comment
mpMetaFile->AddAction(new MetaCommentAction(aCommentStringA));
@@ -1115,9 +1115,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));
- static const ByteString aCommentStringA("XTEXT_EOC");
- static const ByteString aCommentStringB("XTEXT_EOW");
- static const ByteString aCommentStringC("XTEXT_EOS");
+ const rtl::OString aCommentStringA(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOC"));
+ const rtl::OString aCommentStringB(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOW"));
+ const rtl::OString aCommentStringC(RTL_CONSTASCII_STRINGPARAM("XTEXT_EOS"));
for(sal_Int32 i(nTextPosition); i < nTextPosition + nTextLength; i++)
{