sd/source/ui/unoidl/unomodel.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fae4f1506fc481b8dc2977d3bf9363dd8eaf4945
Author:     Jim Raykowski <rayk...@gmail..com>
AuthorDate: Mon Oct 7 23:29:12 2019 -0800
Commit:     Jim Raykowski <rayk...@gmail.com>
CommitDate: Sun Oct 13 08:52:22 2019 +0200

    tdf#127164 Don't add SdrUndoDelPage undos during pptx save
    
    Change-Id: I1a5e17dc056311caba3dbabfb70d21e87344eda0
    Reviewed-on: https://gerrit.libreoffice.org/80429
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <rayk...@gmail.com>

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index c7f8113a0513..5ce14c618a65 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2938,7 +2938,7 @@ void SAL_CALL SdDrawPagesAccess::remove( const 
uno::Reference< drawing::XDrawPag
 
                 SdPage* pNotesPage = static_cast< SdPage* >( rDoc.GetPage( 
nPage+1 ) );
 
-                bool bUndo = rDoc.IsUndoEnabled();
+                bool bUndo = rDoc.IsUndoEnabled() && !rDoc.isLocked();
                 if( bUndo )
                 {
                     // Add undo actions and delete the pages.  The order of 
adding
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to