diff options
Diffstat (limited to 'drawinglayer/inc')
| -rw-r--r-- | drawinglayer/inc/drawinglayer/primitive2d/textbreakuphelper.hxx | 12 | ||||
| -rw-r--r-- | drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx | 11 |
2 files changed, 8 insertions, 15 deletions
diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textbreakuphelper.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textbreakuphelper.hxx index 66560938221c..86ae3f7784c8 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textbreakuphelper.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textbreakuphelper.hxx @@ -43,9 +43,8 @@ namespace drawinglayer class DRAWINGLAYER_DLLPUBLIC TextBreakupHelper { private: - const Primitive2DReference mxSource; + const TextSimplePortionPrimitive2D& mrSource; Primitive2DSequence mxResult; - const TextSimplePortionPrimitive2D* mpSource; TextLayouterDevice maTextLayouter; basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose maDecTrans; @@ -53,7 +52,7 @@ namespace drawinglayer bool mbNoDXArray : 1; /// create a portion from nIndex to nLength and append to rTempResult - void breakupPortion(Primitive2DVector& rTempResult, sal_uInt32 nIndex, sal_uInt32 nLength); + void breakupPortion(Primitive2DVector& rTempResult, sal_uInt32 nIndex, sal_uInt32 nLength, bool bWordLineMode); /// breakup complete primitive void breakup(BreakupUnit aBreakupUnit); @@ -65,19 +64,16 @@ namespace drawinglayer virtual bool allowChange(sal_uInt32 nCount, basegfx::B2DHomMatrix& rNewTransform, sal_uInt32 nIndex, sal_uInt32 nLength); /// allow read access to evtl. useful local parts - const TextSimplePortionPrimitive2D* getCastedSource() const { return mpSource; } const TextLayouterDevice& getTextLayouter() const { return maTextLayouter; } const basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose& getDecTrans() const { return maDecTrans; } + const TextSimplePortionPrimitive2D& getSource() const { return mrSource; } public: - TextBreakupHelper(const Primitive2DReference& rxSource); + TextBreakupHelper(const TextSimplePortionPrimitive2D& rSource); virtual ~TextBreakupHelper(); /// get result const Primitive2DSequence& getResult(BreakupUnit aBreakupUnit = BreakupUnit_character) const; - - /// data read access - const Primitive2DReference& getSource() const { return mxSource; } }; } // end of namespace primitive2d diff --git a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index 6e0807b85ab8..b0b08928d9e4 100644 --- a/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/drawinglayer/inc/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -81,13 +81,6 @@ namespace drawinglayer const ::std::vector< double >& rDXArray, const attribute::FontAttribute& rFontAttribute) const; - void impCorrectTextBoundary( - ::com::sun::star::i18n::Boundary& rNextWordBoundary) const; - - void impSplitSingleWords( - std::vector< Primitive2DReference >& rTarget, - basegfx::tools::B2DHomMatrixBufferedOnDemandDecompose& rDecTrans) const; - protected: /// local decomposition. virtual Primitive2DSequence create2DDecomposition(const geometry::ViewInformation2D& rViewInformation) const; @@ -134,6 +127,10 @@ namespace drawinglayer bool getEmphasisMarkBelow() const { return mbEmphasisMarkBelow; } bool getShadow() const { return mbShadow; } + /// check if this needs to be a TextDecoratedPortionPrimitive2D or + /// if a TextSimplePortionPrimitive2D would be suficcient + bool decoratedIsNeeded() const; + /// compare operator virtual bool operator==( const BasePrimitive2D& rPrimitive ) const; |