[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sd/source

[Justin Luth]

 sd/source/ui/docshell/docshel4.cxx |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

New commits:
commit 1245bead3a68c9495a870f194f3c523b3b78cf87
Author: Justin Luth <justin_luth at sil.org>
Date:   Tue May 31 22:11:21 2016 +0300

    tdf#66469 impress: update outline text before saving
    
    When custom annimations are present, any changes to the
    Outline text were not updated unless EndTextEdit was called.
    Ending Text Editing would cancel the cursor location, so
    simply sync the changes and then save.
    
    Change-Id: Iaf3b29e64d08c9d2fb6c18d7b0e3b3cc89c16d7f
    Reviewed-on: https://gerrit.libreoffice.org/25739
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit c36b560c8d7acf5259d2a8f97317f303667140a3)
    Reviewed-on: https://gerrit.libreoffice.org/25761
    Reviewed-by: Justin Luth <justin_luth at sil.org>
    (cherry picked from commit 940880a6822bc688193a5a667f5d2104ed477906)
    Reviewed-on: https://gerrit.libreoffice.org/25780

diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 0ab60d2..badc20b 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -62,6 +62,7 @@
 #include "ViewShell.hxx"
 #include "sdmod.hxx"
 #include "View.hxx"
+#include "CustomAnimationEffect.hxx"
 #include "sdpage.hxx"
 #include "sdresid.hxx"
 #include "DrawViewShell.hxx"
@@ -547,6 +548,23 @@ bool DrawDocShell::SaveAs( SfxMedium& rMedium )
     }
     mpDoc->StopWorkStartupDelay();
 
+    //With custom animation, if Outliner is modified, update text before saving
+    if( mpViewShell )
+    {
+        SdPage* pPage = mpViewShell->getCurrentPage();
+        if( pPage && pPage->getMainSequence()->getCount() )
+        {
+            SdrObject* pObj = mpViewShell->GetView()->GetTextEditObject();
+            SdrOutliner* pOutl = mpViewShell->GetView()->GetTextEditOutliner();
+            if( pObj && pOutl && pOutl->IsModified() )
+            {
+                OutlinerParaObject* pNewText = pOutl->CreateParaObject( 0, pOutl->GetParagraphCount() );
+                pObj->SetOutlinerParaObject( pNewText );
+                pOutl->ClearModifyFlag();
+            }
+        }
+    }
+
     //TODO/LATER: why this?!
     if( GetCreateMode() == SfxObjectCreateMode::STANDARD )
         SfxObjectShell::SetVisArea( Rectangle() );