[Libreoffice-commits] core.git: sd/source
Caolán McNamara
caolanm at redhat.com
Fri May 8 07:52:28 PDT 2015
sd/source/ui/app/sdxfer.cxx | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
New commits:
commit 7b2367f868778739fba382a68a35248904cc9565
Author: Caolán McNamara <caolanm at 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
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index 044f680..587ead7 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 == SotClipboardFormatId::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( SotClipboardFormatId::BITMAP == nFormat || SotClipboardFormatId::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 == SotClipboardFormatId::STRING ) && mpBookmark )
{
More information about the Libreoffice-commits
mailing list