Kaydet (Commit) d83fc62a authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Miklos Vajna

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 66133fd8)
Reviewed-on: https://gerrit.libreoffice.org/18387Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
üst 3a0d2c51
...@@ -1779,6 +1779,7 @@ bool SwDocStyleSheet::FillStyleSheet( ...@@ -1779,6 +1779,7 @@ bool SwDocStyleSheet::FillStyleSheet(
bool bDeleteInfo = false; bool bDeleteInfo = false;
bool bFillOnlyInfo = FillAllInfo == eFType || FillPreview == eFType; bool bFillOnlyInfo = FillAllInfo == eFType || FillPreview == eFType;
std::vector<void*> aDelArr; std::vector<void*> aDelArr;
bool const isModified(rDoc.getIDocumentState().IsModified());
switch(nFamily) switch(nFamily)
{ {
...@@ -1966,6 +1967,10 @@ bool SwDocStyleSheet::FillStyleSheet( ...@@ -1966,6 +1967,10 @@ bool SwDocStyleSheet::FillStyleSheet(
{ {
::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo()); ::sw::UndoGuard const ug(rDoc.GetIDocumentUndoRedo());
::lcl_DeleteInfoStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc ); ::lcl_DeleteInfoStyles( static_cast< sal_uInt16 >(nFamily), aDelArr, rDoc );
if (!isModified)
{
rDoc.getIDocumentState().ResetModified();
}
} }
return bRet; return bRet;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment