summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-09-07 20:41:11 +0200
committerMichael Stahl <mstahl@redhat.com>2015-09-07 21:04:24 +0200
commit66133fd8882a070674bbb3803634c5e75e8ae772 (patch)
tree47241512545c2d9f6fb37b738420279cac5e1d2d
parent94b16ec225b9e369654902a0698359baafc1f519 (diff)
tdf#91383: sw: actually reset the modified status too
... when deleting the temporarily inserted styles in SwDocStyleSheet::FillStyleSheet(). Change-Id: Id4abc067ce10b41486f659350267c7e3933db472
-rw-r--r--sw/source/uibase/app/docstyle.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 0efcd53a2d53..37c1948cae3a 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;
}