[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Michael Stahl]

 sw/source/uibase/app/docstyle.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit d83fc62ada63ea784faeee72a29b414e3efa61b3
Author: Michael Stahl <mst...@redhat.com>
Date:   Mon Sep 7 20:41:11 2015 +0200

    tdf#91383: sw: actually reset the modified status too
    
    ... when deleting the temporarily inserted styles in
    SwDocStyleSheet::FillStyleSheet().
    
    Change-Id: Id4abc067ce10b41486f659350267c7e3933db472
    (cherry picked from commit 66133fd8882a070674bbb3803634c5e75e8ae772)
    Reviewed-on: https://gerrit.libreoffice.org/18387
    Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
    Tested-by: Miklos Vajna <vmik...@collabora.co.uk>

diff --git a/sw/source/uibase/app/docstyle.cxx 
b/sw/source/uibase/app/docstyle.cxx
index 6727cb8..08da17c 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -1779,6 +1779,7 @@ bool SwDocStyleSheet::FillStyleSheet(
     bool bDeleteInfo = false;
     bool bFillOnlyInfo = FillAllInfo == eFType || FillPreview == eFType;
     std::vector<void*> aDelArr;
+    bool const isModified(rDoc.getIDocumentState().IsModified());
 
     switch(nFamily)
     {
@@ -1966,6 +1967,10 @@ bool SwDocStyleSheet::FillStyleSheet(
     {
         ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
         ::lcl_DeleteInfoStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, 
rDoc );
+        if (!isModified)
+        {
+            rDoc.getIDocumentState().ResetModified();
+        }
     }
     return bRet;
 }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits