diff options
| author | Muthu Subramanian <muthu.subramanian.karunanidhi@ericsson.com> | 2014-10-23 20:30:26 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-18 08:47:26 +0000 |
| commit | 1e416e9b5b30f9a06114b24284994bc50715e1ba (patch) | |
| tree | 8950ed26038835de99efee7b53bea382d60a58f9 | |
| parent | 81a4a4b6b75d31eba079c57e47afd23e2e9cbecb (diff) | |
fdo#85247: copy and paste of a slide results in a blue slide in presentation mode.
Seems like "Default" is handled specially or probably
the copy-buffer is broken
This now checks for slide 'type' as well, before cosidering it a duplicate
Change-Id: If8c472bcefb54cee72e7411f92a76b4e2db2b6ce
(cherry picked from commit 0bab8aee77cfc2ffdbc6d3ef6a869284bc12dff4)
Reviewed-on: https://gerrit.libreoffice.org/12285
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sd/source/core/drawdoc3.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index 936a5d598c85..a3381fc33976 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -105,9 +105,11 @@ void InsertBookmarkAsPage_FindDuplicateLayouts::operator()( SdDrawDocument& rDoc OUString aTest(aFullTest); - if (aTest == aLayout) + if (aTest == aLayout && pBMMPage->GetPageKind() == pTestPage->GetPageKind()) { - if( bRenameDuplicates && pTestPage->getHash() != pBMMPage->getHash() ) + // Ignore Layouts with "Default" these seem to be special - in the sense that there are lot of assumption all over Impress + // about this + if( bRenameDuplicates && aTest != OUString( SdResId( STR_LAYOUT_DEFAULT_NAME ) ) && pTestPage->getHash() != pBMMPage->getHash() ) { pBookmarkDoc->RenameLayoutTemplate( pBMMPage->GetLayoutName(), OUString(pBMMPage->GetName())+=OUString("_") ); aLayout = pBMMPage->GetName(); |