diff options
| author | David Tardon <dtardon@redhat.com> | 2012-12-04 13:48:00 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-12-04 14:26:30 +0100 |
| commit | 104a855ade9102d694293c1059f99946752f76d8 (patch) | |
| tree | 44d027055e0020c74748b4fbbde76393ef3951f1 | |
| parent | 54107c9b3c0e07d70b9afb7d367dea14bf98e4cd (diff) | |
fdo#52640 fix right-aligned tabstops
It is no good to change temporary object...
Change-Id: Ib1178e154341dd0216fd965d3ed6c264de40d634
| -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 bdaeb9d4587d..59e7ea11229d 100644 --- a/editeng/source/editeng/editdoc.hxx +++ b/editeng/source/editeng/editdoc.hxx @@ -407,7 +407,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 1fbddb23ccb2..964579cb05fb 100644 --- a/editeng/source/editeng/impedit3.cxx +++ b/editeng/source/editeng/impedit3.cxx @@ -1149,7 +1149,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; } @@ -1392,7 +1392,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; @@ -1934,7 +1934,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(); |