diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-29 09:16:03 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-29 11:20:32 +0100 |
| commit | 9e0cbe5eb3f4785d8db26f87ce0208823c87c5ad (patch) | |
| tree | 139e2a2af31e5ba6a1549cf93c12e951b8ad570b /editeng | |
| parent | 6c759da0442f5123a4a4355e8dc9c926a49d25d7 (diff) | |
some pesky XubStrings
Change-Id: Ib4095dee416cab6d954e1612d2e3f6e2d4464f48
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/inc/editeng/outliner.hxx | 10 | ||||
| -rw-r--r-- | editeng/source/outliner/outliner.cxx | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index da3b9c28d94a..800794536337 100644 --- a/editeng/inc/editeng/outliner.hxx +++ b/editeng/inc/editeng/outliner.hxx @@ -136,16 +136,16 @@ private: Paragraph& operator=(const Paragraph& rPara ); - sal_uInt16 nFlags; - XubString aBulText; + sal_uInt16 nFlags; + rtl::OUString aBulText; Size aBulSize; - sal_Bool bVisible; + sal_Bool bVisible; sal_Bool IsVisible() const { return bVisible; } - void SetText( const XubString& rText ) { aBulText = rText; aBulSize.Width() = -1; } + void SetText( const rtl::OUString& rText ) { aBulText = rText; aBulSize.Width() = -1; } void Invalidate() { aBulSize.Width() = -1; } void SetDepth( sal_Int16 nNewDepth ) { nDepth = nNewDepth; aBulSize.Width() = -1; } - const XubString& GetText() const { return aBulText; } + const rtl::OUString& GetText() const { return aBulText; } Paragraph( sal_Int16 nDepth ); Paragraph( const Paragraph& ); diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index cb2393f6b4ae..d124a4a489e6 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -1001,7 +1001,7 @@ void Outliner::PaintBullet( sal_uInt16 nPara, const Point& rStartPos, if(bStrippingPortions) { const Font aSvxFont(pOutDev->GetFont()); - sal_Int32* pBuf = new sal_Int32[ pPara->GetText().Len() ]; + sal_Int32* pBuf = new sal_Int32[ pPara->GetText().getLength() ]; pOutDev->GetTextArray( pPara->GetText(), pBuf ); if(bSymbol) @@ -1011,7 +1011,7 @@ void Outliner::PaintBullet( sal_uInt16 nPara, const Point& rStartPos, aTextPos.Y() -= aMetric.GetDescent(); } - DrawingText(aTextPos, pPara->GetText(), 0, pPara->GetText().Len(), pBuf, + DrawingText(aTextPos, pPara->GetText(), 0, pPara->GetText().getLength(), pBuf, aSvxFont, nPara, 0xFFFF, 0xFF, 0, 0, false, false, true, 0, Color(), Color()); delete[] pBuf; @@ -1952,7 +1952,7 @@ void Outliner::ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_ aBulletText += pFmt->GetSuffix(); } - if( aBulletText != pPara->GetText() ) + if (!pPara->GetText().equals(aBulletText)) pPara->SetText( aBulletText ); pPara->nFlags &= (~PARAFLAG_SETBULLETTEXT); |