sw/source/ui/chrdlg/drpcps.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3629a6a3706febac5a444e77003f4959126fe6f5
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Apr 3 16:25:13 2015 +0100
Resolves: tdf#83977 Push/Pop before/after messing with the cursor
otherwise we lose our selection with multi-page tables
Change-Id: I4f52d3cfb7a6d3c2cc1dbb68bbd5ce5c0005b1c3
(cherry picked from commit 4c4a9767f7fb0c7891f1dd96cbe38a9c35e46083)
Reviewed-on: https://gerrit.libreoffice.org/15142
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 3449aab..f890276 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -270,8 +270,8 @@ void SwDropCapsPict::UpdatePaintSettings( void )
if (!mpPage->m_pTemplateBox->GetSelectEntryPos())
{
// query the Font at paragraph's beginning
- mpPage->rSh.SttCrsrMove();
mpPage->rSh.Push();
+ mpPage->rSh.SttCrsrMove();
mpPage->rSh.ClearMark();
SwWhichPara pSwuifnParaCurr = GetfnParaCurr();
SwPosPara pSwuifnParaStart = GetfnParaStart();
@@ -285,8 +285,8 @@ void SwDropCapsPict::UpdatePaintSettings( void )
// CTL
GetFontSettings( *mpPage, maCTLFont, RES_CHRATR_CTL_FONT );
- mpPage->rSh.Pop(false);
mpPage->rSh.EndCrsrMove();
+ mpPage->rSh.Pop(false);
}
else
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
