diff options
| author | David Tardon <dtardon@redhat.com> | 2012-12-04 13:48:00 +0100 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-12-04 11:37:02 -0500 |
| commit | 032d1d3cf5f69c28a39ba7e8a62eb580e545a0d5 (patch) | |
| tree | 7e561b6f35737d500184fd2b09a712d4a8a81a62 | |
| parent | 3d43dc3318a0692287e877b2e70e873372d2c248 (diff) | |
fdo#52640 fix right-aligned tabstops
It is no good to change temporary object...
Change-Id: Ib1178e154341dd0216fd965d3ed6c264de40d634
Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
| -rw-r--r-- | editeng/source/editeng/editdoc.hxx | 2 | ||||
| -rw-r--r-- | editeng/source/editeng/impedit3.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editeng/source/editeng/editdoc.hxx b/editeng/source/editeng/editdoc.hxx index d952e6a5f6d2..77f1d4993639 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -417,7 +417,7 @@ public: void SetLen( sal_uInt16 nL ) { nLen = nL; } Size& GetSize() { return aOutSz; } - Size GetSize() const { return aOutSz; } + const Size& GetSize() const { return aOutSz; } sal_uInt8& GetKind() { return nKind; } sal_uInt8 GetKind() const { return nKind; } diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx index 59c70bfc73b9..9f1a955e30a9 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -1157,7 +1157,7 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara, sal_uInt32 nStartPosY ) nW = nMaxW; aCurrentTab.bValid = sal_False; } - const TextPortion* pTabPortion = pParaPortion->GetTextPortions()[aCurrentTab.nTabPortion]; + TextPortion* const pTabPortion = pParaPortion->GetTextPortions()[aCurrentTab.nTabPortion]; pTabPortion->GetSize().Width() = aCurrentTab.nTabPos - aCurrentTab.nStartPosX - nW - nStartX; nTmpWidth = aCurrentTab.nStartPosX + pTabPortion->GetSize().Width() + nWidthAfterTab; } @@ -1400,7 +1400,7 @@ sal_Bool ImpEditEngine::CreateLines( sal_uInt16 nPara, sal_uInt32 nStartPosY ) // Width from HangingPunctuation was set to 0 in ImpBreakLine, // check for rel width now, maybe create compression... long n = nMaxLineWidth - aTextSize.Width(); - const TextPortion* pTP = pParaPortion->GetTextPortions()[pLine->GetEndPortion()]; + TextPortion* const pTP = pParaPortion->GetTextPortions()[pLine->GetEndPortion()]; sal_uInt16 nPosInArray = pLine->GetEnd()-1-pLine->GetStart(); long nNewValue = ( nPosInArray ? pLine->GetCharPosArray()[ nPosInArray-1 ] : 0 ) + n; pLine->GetCharPosArray()[ nPosInArray ] = nNewValue; @@ -1942,7 +1942,7 @@ void ImpEditEngine::ImpBreakLine( ParaPortion* pParaPortion, EditLine* pLine, Te if ( bCompressBlank || bHangingPunctuation ) { - const TextPortion* pTP = pParaPortion->GetTextPortions()[nEndPortion]; + TextPortion* const pTP = pParaPortion->GetTextPortions()[nEndPortion]; DBG_ASSERT( pTP->GetKind() == PORTIONKIND_TEXT, "BlankRubber: No TextPortion!" ); DBG_ASSERT( nBreakPos > pLine->GetStart(), "SplitTextPortion at the beginning of the line?" ); sal_uInt16 nPosInArray = nBreakPos - 1 - pLine->GetStart(); |