[Libreoffice-commits] core.git: sw/source
Michael Stahl
mstahl at redhat.com
Mon Sep 7 12:05:48 PDT 2015
sw/source/uibase/app/docstyle.cxx | 5 +++++
1 file changed, 5 insertions(+)
New commits:
commit 66133fd8882a070674bbb3803634c5e75e8ae772
Author: Michael Stahl <mstahl at 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
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 0efcd53..37c1948 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -1773,6 +1773,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)
{
@@ -1960,6 +1961,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;
}
More information about the Libreoffice-commits
mailing list