From c049ec85893180a444a2d3638f07b4bc1104d4f8 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 6 Sep 2013 16:31:38 +0200 Subject: convert include/editeng/outliner.hxx from String to OUString Change-Id: I53a9f334845e163625ed245859bdeb030ae61baa --- svx/source/svdraw/svdotextdecomposition.cxx | 8 ++++---- svx/source/svdraw/svdotextpathdecomposition.cxx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'svx') diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 75238f69ac68..9384184cf041 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -174,7 +174,7 @@ namespace void impTextBreakupHandler::impCreateTextPortionPrimitive(const DrawPortionInfo& rInfo) { - if(rInfo.mrText.Len() && rInfo.mnTextLen) + if(!rInfo.maText.isEmpty() && rInfo.mnTextLen) { basegfx::B2DVector aFontScaling; drawinglayer::attribute::FontAttribute aFontAttribute( @@ -327,7 +327,7 @@ namespace // attributes for TextSimplePortionPrimitive2D aNewTransform, - rInfo.mrText, + rInfo.maText, rInfo.mnTextStart, rInfo.mnTextLen, aDXArray, @@ -354,7 +354,7 @@ namespace // TextSimplePortionPrimitive2D is enough pNewPrimitive = new drawinglayer::primitive2d::TextSimplePortionPrimitive2D( aNewTransform, - rInfo.mrText, + rInfo.maText, rInfo.mnTextStart, rInfo.mnTextLen, aDXArray, @@ -584,7 +584,7 @@ namespace const basegfx::B2DRange aTextBoundRect( aTextLayouterDevice.getTextBoundRect( - pInfo->mrText, pInfo->mnTextStart, pInfo->mnTextLen)); + pInfo->maText, pInfo->mnTextStart, pInfo->mnTextLen)); const basegfx::B2DPoint aTopLeft(aTextBoundRect.getMinimum() + aStartPosition); if(!maClipRange.isInside(aTopLeft)) diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 513345c81358..528a5aec696c 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -86,7 +86,7 @@ namespace public: impPathTextPortion(DrawPortionInfo& rInfo) : maOffset(rInfo.mrStartPos.X(), rInfo.mrStartPos.Y()), - maText(rInfo.mrText), + maText(rInfo.maText), mnTextStart(rInfo.mnTextStart), mnTextLength(rInfo.mnTextLen), mnParagraph(rInfo.mnPara), -- cgit