summaryrefslogtreecommitdiff
path: root/sw/source/core/text/txtfly.cxx
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-01-21 11:16:20 +0100
committerCaolán McNamara <caolanm@redhat.com>2014-01-21 15:53:43 +0000
commit98176bc2078d4ce18d4eb41b54b4ad1c72a2774d (patch)
tree955fca7dda6ba916a3569b5e71b8cbd59e951b41 /sw/source/core/text/txtfly.cxx
parenteed45184ff542a713d28928b50c5a8ce8efd3a92 (diff)
fdo#68959: sw: fix painting of tab fill characters in small caps text
The member SwDrawTextInfo::pPos was changed from a pointer to some externally provided Point to a real object; unfortunately there were some functions which hold backups of the current pPos as a reference/pointer and then restore it, and the restore is a no-op now. So use real Points as backups. (regression from f22006dc6ac34a35a060e15466cf6b2d2058617d) Change-Id: I8470143ec494cb194a88ddcbd12d96867974278f (cherry picked from commit c445d40da8daa2f6ec0ae9930a06f50ab80cc85d) Reviewed-on: https://gerrit.libreoffice.org/7567 Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/source/core/text/txtfly.cxx')
-rw-r--r--sw/source/core/text/txtfly.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/core/text/txtfly.cxx b/sw/source/core/text/txtfly.cxx
index 1e6641275c59..9f7d970e1ff9 100644
--- a/sw/source/core/text/txtfly.cxx
+++ b/sw/source/core/text/txtfly.cxx
@@ -568,7 +568,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf )
}
Point aPos( rInf.GetPos().X(), rInf.GetPos().Y() + rInf.GetAscent() );
- const Point &rOld = rInf.GetPos();
+ const Point aOldPos(rInf.GetPos());
rInf.SetPos( aPos );
if( !bOpaque )
@@ -577,7 +577,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf )
rInf.GetFont()->_DrawStretchText( rInf );
else
rInf.GetFont()->_DrawText( rInf );
- rInf.SetPos( rOld );
+ rInf.SetPos(aOldPos);
return sal_False;
}
else if( !aRegion.empty() )
@@ -595,7 +595,7 @@ sal_Bool SwTxtFly::DrawTextOpaque( SwDrawTextInfo &rInf )
rInf.GetFont()->_DrawText( rInf );
}
}
- rInf.SetPos( rOld );
+ rInf.SetPos(aOldPos);
return sal_True;
}