[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/source

[Caolán McNamara]

 sw/source/ui/chrdlg/drpcps.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b2f68b5bf53bbcd95a88b8372214546897ac4e64
Author: Caolán McNamara <caolanm at 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/15143
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index ff3b11f..134482a 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
         {