diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-04-27 12:55:32 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-04-27 17:35:02 +0000 |
| commit | ff33ba96929cc4591f04e0963aa8c630d989e8bd (patch) | |
| tree | b0131beac8f65318011457247b1e1c3c05c7e7e2 /sd/source | |
| parent | da739f729223908516deb1c2564d0713231abb5b (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
(cherry picked from commit dffcd67a9a9865c9eca9756eea4e85445b50a15e)
Reviewed-on: https://gerrit.libreoffice.org/9178
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'sd/source')
| -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 f0f21cf2e0f1..0aecf6ad2afa 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -360,6 +360,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, if( pOwnData->GetDocShell() && pOwnData->IsPageTransferable() && ISA( View ) ) { mpClipboard->HandlePageDrop (*pOwnData); + bReturn = true; } else if( pSourceView ) { @@ -1346,6 +1347,7 @@ sal_Bool View::InsertData( const TransferableDataHelper& rDataHelper, // add text color pPickObj->SetMergedItemSetAndBroadcast( aSet ); } + bReturn = true; } } |