svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx | 2 +- svx/source/svdraw/svdotextdecomposition.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 2d86d1734984090882e170097d313bc00144680d Author: matteocam <matteo.campane...@gmail.com> Date: Thu Jul 30 11:29:40 2015 +0200 Remove wordwrap method from SdrChainedTextPrimitive Change-Id: I2800aede1597eb0d94e9bdcb1634f2509503d1fb diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx index a3e0357..c6fbe5e 100644 --- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -353,7 +353,7 @@ namespace drawinglayer // get data const basegfx::B2DHomMatrix& getTextRangeTransform() const { return maTextRangeTransform; } - bool getWordWrap() const { return true; } // XXX: Hack! Should have a proper implementation + //bool getWordWrap() const { return true; } // XXX: Hack! Should have a proper implementation// // compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const SAL_OVERRIDE; diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 25feda4..5c2309f 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -1498,7 +1498,7 @@ void SdrTextObj::impDecomposeChainedTextPrimitive( const bool bVerticalWritintg(pOutlinerParaObject->IsVertical()); const Size aAnchorTextSize(Size(nAnchorTextWidth, nAnchorTextHeight)); - if((rSdrChainedTextPrimitive.getWordWrap() || IsTextFrame())) + if(IsTextFrame()) { rOutliner.SetMaxAutoPaperSize(aAnchorTextSize); } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits