|
 |
ebc4bd |
From e884b98b248e155cda4c53a302cc821a3c2ddaf9 Mon Sep 17 00:00:00 2001
|
|
|
ebc4bd |
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
|
|
|
ebc4bd |
Date: Fri, 8 May 2015 15:49:08 +0100
|
|
|
ebc4bd |
Subject: [PATCH] misspell some words, copy and paste slide to gimp
|
|
|
ebc4bd |
|
|
|
ebc4bd |
and we don't want to see the mis-spelt underlines
|
|
|
ebc4bd |
|
|
|
ebc4bd |
Change-Id: Ib3ae29297a1697e0f7b0caa816504da7edf721d1
|
|
|
ebc4bd |
---
|
|
|
ebc4bd |
sd/source/ui/app/sdxfer.cxx | 18 ++++++++++++++++--
|
|
|
ebc4bd |
1 file changed, 16 insertions(+), 2 deletions(-)
|
|
|
ebc4bd |
|
|
|
ebc4bd |
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
|
|
|
ebc4bd |
index dda4f74..4ac1fac 100644
|
|
|
ebc4bd |
--- a/sd/source/ui/app/sdxfer.cxx
|
|
|
ebc4bd |
+++ b/sd/source/ui/app/sdxfer.cxx
|
|
|
ebc4bd |
@@ -518,13 +518,27 @@ bool SdTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
|
|
|
ebc4bd |
}
|
|
|
ebc4bd |
else if( nFormat == FORMAT_GDIMETAFILE )
|
|
|
ebc4bd |
{
|
|
|
ebc4bd |
- if( mpSdViewIntern )
|
|
|
ebc4bd |
+ if (mpSdViewIntern)
|
|
|
ebc4bd |
+ {
|
|
|
ebc4bd |
+ const bool bToggleOnlineSpell = mpSdDrawDocumentIntern && mpSdDrawDocumentIntern->GetOnlineSpell();
|
|
|
ebc4bd |
+ if (bToggleOnlineSpell)
|
|
|
ebc4bd |
+ mpSdDrawDocumentIntern->SetOnlineSpell(false);
|
|
|
ebc4bd |
bOK = SetGDIMetaFile( mpSdViewIntern->GetMarkedObjMetaFile( true ), rFlavor );
|
|
|
ebc4bd |
+ if (bToggleOnlineSpell)
|
|
|
ebc4bd |
+ mpSdDrawDocumentIntern->SetOnlineSpell(true);
|
|
|
ebc4bd |
+ }
|
|
|
ebc4bd |
}
|
|
|
ebc4bd |
else if( FORMAT_BITMAP == nFormat || SOT_FORMATSTR_ID_PNG == nFormat )
|
|
|
ebc4bd |
{
|
|
|
ebc4bd |
- if( mpSdViewIntern )
|
|
|
ebc4bd |
+ if (mpSdViewIntern)
|
|
|
ebc4bd |
+ {
|
|
|
ebc4bd |
+ const bool bToggleOnlineSpell = mpSdDrawDocumentIntern && mpSdDrawDocumentIntern->GetOnlineSpell();
|
|
|
ebc4bd |
+ if (bToggleOnlineSpell)
|
|
|
ebc4bd |
+ mpSdDrawDocumentIntern->SetOnlineSpell(false);
|
|
|
ebc4bd |
bOK = SetBitmapEx( mpSdViewIntern->GetMarkedObjBitmapEx(true), rFlavor );
|
|
|
ebc4bd |
+ if (bToggleOnlineSpell)
|
|
|
ebc4bd |
+ mpSdDrawDocumentIntern->SetOnlineSpell(true);
|
|
|
ebc4bd |
+ }
|
|
|
ebc4bd |
}
|
|
|
ebc4bd |
else if( ( nFormat == FORMAT_STRING ) && mpBookmark )
|
|
|
ebc4bd |
{
|
|
|
ebc4bd |
--
|
|
|
ebc4bd |
2.1.0
|
|
|
ebc4bd |
|