diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-04-27 12:55:32 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-04-27 12:58:45 +0200 |
| commit | dffcd67a9a9865c9eca9756eea4e85445b50a15e (patch) | |
| tree | 0626bc771ec8e775f506e7a3ec74744a4df532ac /sd | |
| parent | 2b4f2541e7bcabc5cf61f2389f64de46eb084a3f (diff) | |
do not crash when pasting impress page into another impress page (cp#1000067)
Put an Impress page into clipboard, create new document, click 'Click to add
title', paste -> crash.
Introduced by 5aee0c13cc62a81a38d4132db7972dc301c21b3d.
Change-Id: Ibe61a780244ce98205e5ae3964971d7d75e30870
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index cd95616977a3..b54f8d185e61 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -361,6 +361,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData->GetDocShell() && pOwnData->IsPageTransferable() && ISA( View ) ) { mpClipboard->HandlePageDrop (*pOwnData); + bReturn = true; } else if( pSourceView ) { @@ -1347,6 +1348,7 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, // add text color pPickObj->SetMergedItemSetAndBroadcast( aSet ); } + bReturn = true; } } |