diff options
| author | Muthu Subramanian <muthu.subramanian.karunanidhi@ericsson.com> | 2014-10-23 20:30:26 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-11-23 14:32:29 +0100 |
| commit | 9bc7d0def39a79aa91a14e1a6c5ca3c628e22234 (patch) | |
| tree | ed6d7b5000e417ac8224fed7e233c07a1678e0a6 /sd | |
| parent | b2796b9c8a43084cc1cb4997b7aa4b0e32edecb4 (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>
Diffstat (limited to 'sd')
| -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(); |