editeng/inc/editeng/editeng.hxx | 2 +- editeng/inc/editeng/outliner.hxx | 2 +- editeng/source/editeng/editeng.cxx | 2 +- editeng/source/editeng/impedit.hxx | 4 ++-- editeng/source/outliner/outlin2.cxx | 2 +- editeng/source/outliner/outliner.cxx | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit c487fa125ed9fb59ba2507d5f0f947d5e425bc61 Author: Ivan Timofeev <[email protected]> Date: Sat Mar 9 22:02:47 2013 +0400 const-correctness Change-Id: I15033051cfa4baafde4736abf366ca8c03778b88 diff --git a/editeng/inc/editeng/editeng.hxx b/editeng/inc/editeng/editeng.hxx index 48e236c..6161671 100644 --- a/editeng/inc/editeng/editeng.hxx +++ b/editeng/inc/editeng/editeng.hxx @@ -372,7 +372,7 @@ public: void QuickMarkToBeRepainted( sal_uInt16 nPara ); void SetGlobalCharStretching( sal_uInt16 nX = 100, sal_uInt16 nY = 100 ); - void GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ); + void GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const; void SetEditTextObjectPool( SfxItemPool* pPool ); SfxItemPool* GetEditTextObjectPool() const; diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index 61e6a41..70531b0 100644 --- a/editeng/inc/editeng/outliner.hxx +++ b/editeng/inc/editeng/outliner.hxx @@ -955,7 +955,7 @@ public: sal_Bool IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, sal_Bool* pbBuuletPos ); void SetGlobalCharStretching( sal_uInt16 nX = 100, sal_uInt16 nY = 100 ); - void GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ); + void GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const; void EraseVirtualDevice(); sal_Bool ShouldCreateBigTextObject() const; diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index 1c8eda1..6655737 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -2359,7 +2359,7 @@ void EditEngine::SetGlobalCharStretching( sal_uInt16 nX, sal_uInt16 nY ) pImpEditEngine->SetCharStretching( nX, nY ); } -void EditEngine::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) +void EditEngine::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const { DBG_CHKTHIS( EditEngine, 0 ); pImpEditEngine->GetCharStretching( rX, rY ); diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index dcb7ad0..2cd8a6d 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -952,7 +952,7 @@ public: SvxCellVerJustify GetVerJustification( sal_uInt16 nPara ) const; void SetCharStretching( sal_uInt16 nX, sal_uInt16 nY ); - inline void GetCharStretching( sal_uInt16& rX, sal_uInt16& rY ); + inline void GetCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const; void SetBigTextObjectStart( sal_uInt16 nStartAtPortionCount ) { nBigTextObjectStart = nStartAtPortionCount; } sal_uInt16 GetBigTextObjectStart() const { return nBigTextObjectStart; } @@ -1083,7 +1083,7 @@ inline ParaPortion* ImpEditEngine::FindParaPortion( ContentNode* pNode ) return GetParaPortions()[ nPos ]; } -inline void ImpEditEngine::GetCharStretching( sal_uInt16& rX, sal_uInt16& rY ) +inline void ImpEditEngine::GetCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const { rX = nStretchX; rY = nStretchY; diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index 0d3a2da..8fea84b 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -591,7 +591,7 @@ void Outliner::SetGlobalCharStretching( sal_uInt16 nX, sal_uInt16 nY ) pEditEngine->SetGlobalCharStretching( nX, nY ); } -void Outliner::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) +void Outliner::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY ) const { DBG_CHKTHIS(Outliner,0); pEditEngine->GetGlobalCharStretching( rX, rY ); diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx index e81286c..259e5d4 100644 --- a/editeng/source/outliner/outliner.cxx +++ b/editeng/source/outliner/outliner.cxx @@ -872,7 +872,7 @@ Font Outliner::ImpCalcBulletFont( sal_uInt16 nPara ) const // Use original scale... sal_uInt16 nStretchX, nStretchY; - const_cast<Outliner*>(this)->GetGlobalCharStretching(nStretchX, nStretchY); + GetGlobalCharStretching(nStretchX, nStretchY); sal_uInt16 nScale = pFmt->GetBulletRelSize() * nStretchY / 100; sal_uLong nScaledLineHeight = aStdFont.GetSize().Height(); _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
