[Libreoffice-commits] core.git: sd/source

[Umang Jain]

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

New commits:
commit 29c066ee3c0bf307ca14851dd35e314ab1a3f20b
Author: Umang Jain <mailumangjain at gmail.com>
Date:   Tue Mar 14 02:54:33 2017 +0530

    Resolves tdf#106321: End text edit mode before exporting
    
    Change-Id: I5b6c4428d7ab2f230d57402edffa274aceac097f
    Reviewed-on: https://gerrit.libreoffice.org/35150
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 71a96c2705ab..00b7d463329b 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -644,6 +644,13 @@ bool DrawDocShell::ConvertTo( SfxMedium& rMedium )
 
             mpDoc->SetSwapGraphicsMode( SdrSwapGraphicsMode::TEMP );
 
+            if ( mpViewShell )
+            {
+                ::sd::View* pView = mpViewShell->GetView();
+                if ( pView->IsTextEdit() )
+                    pView->SdrEndTextEdit();
+            }
+
             bRet = xFilter->Export();
             if( !bRet )
                 mpDoc->SetSwapGraphicsMode( nOldSwapMode );