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

[Caolán McNamara]

 sd/source/ui/app/sdxfer.cxx |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit a863a619a19ac70a2a66e115d7a3883e8398c0c6
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri May 8 15:49:08 2015 +0100

    misspell some words, copy and paste slide to gimp
    
    and we don't want to see the mis-spelt underlines
    
    Change-Id: Ib3ae29297a1697e0f7b0caa816504da7edf721d1
    Reviewed-on: https://gerrit.libreoffice.org/15679
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
    Tested-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index dda4f74..4ac1fac 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -518,13 +518,27 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, 
const OUString& rDestDo
         }
         else if( nFormat == FORMAT_GDIMETAFILE )
         {
-            if( mpSdViewIntern )
+            if (mpSdViewIntern)
+            {
+                const bool bToggleOnlineSpell = mpSdDrawDocumentIntern && 
mpSdDrawDocumentIntern->GetOnlineSpell();
+                if (bToggleOnlineSpell)
+                    mpSdDrawDocumentIntern->SetOnlineSpell(false);
                 bOK = SetGDIMetaFile( mpSdViewIntern->GetMarkedObjMetaFile( 
true ), rFlavor );
+                if (bToggleOnlineSpell)
+                    mpSdDrawDocumentIntern->SetOnlineSpell(true);
+            }
         }
         else if( FORMAT_BITMAP == nFormat || SOT_FORMATSTR_ID_PNG == nFormat )
         {
-            if( mpSdViewIntern )
+            if (mpSdViewIntern)
+            {
+                const bool bToggleOnlineSpell = mpSdDrawDocumentIntern && 
mpSdDrawDocumentIntern->GetOnlineSpell();
+                if (bToggleOnlineSpell)
+                    mpSdDrawDocumentIntern->SetOnlineSpell(false);
                 bOK = SetBitmapEx( mpSdViewIntern->GetMarkedObjBitmapEx(true), 
rFlavor );
+                if (bToggleOnlineSpell)
+                    mpSdDrawDocumentIntern->SetOnlineSpell(true);
+            }
         }
         else if( ( nFormat == FORMAT_STRING ) && mpBookmark )
         {

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits