diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 10:53:32 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-03-31 12:33:02 +0200 |
| commit | bc1e32d6b8f5df9cf55a110bfcf3331a6756673e (patch) | |
| tree | 5c35e22e4ed9dd4eee1f42662d99b63e6b1da73c /sw/source/uibase/app | |
| parent | 735616a6ddfe34c2ba4694c659c71a834f6935a1 (diff) | |
Better only call RestoreInvisibleContent if previously removed
Change-Id: I229db9567771a4967065d81fa99fee2c23dbcb3e
Diffstat (limited to 'sw/source/uibase/app')
| -rw-r--r-- | sw/source/uibase/app/docsh2.cxx | 9 | ||||
| -rw-r--r-- | sw/source/uibase/app/docshini.cxx | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx index c97402734f00..75baf6cb5782 100644 --- a/sw/source/uibase/app/docsh2.cxx +++ b/sw/source/uibase/app/docsh2.cxx @@ -837,7 +837,9 @@ void SwDocShell::Execute(SfxRequest& rReq) mpDoc->getIDocumentFieldsAccess().UpdateFlds( NULL, false ); mpDoc->getIDocumentLinksAdministration().EmbedAllLinks(); - if(officecfg::Office::Common::ExternalMailer::Hidden::get()) + mbRemovedInvisibleContent + = officecfg::Office::Common::ExternalMailer::Hidden::get(); + if(mbRemovedInvisibleContent) mpDoc->RemoveInvisibleContent(); if(mpWrtShell) mpWrtShell->EndAllAction(); @@ -848,8 +850,9 @@ void SwDocShell::Execute(SfxRequest& rReq) { if(mpWrtShell) mpWrtShell->StartAllAction(); - //try to undo the removal of invisible content - mpDoc->RestoreInvisibleContent(); + //try to undo any removal of invisible content + if(mbRemovedInvisibleContent) + mpDoc->RestoreInvisibleContent(); if(mpWrtShell) mpWrtShell->EndAllAction(); } diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index ac75cce580ad..cd5c68213488 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -328,7 +328,8 @@ SwDocShell::SwDocShell( SfxObjectCreateMode eMode ) : mpWrtShell( 0 ), mpOLEChildList( 0 ), mnUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG), - bIsATemplate(false) + bIsATemplate(false), + mbRemovedInvisibleContent(false) { Init_Impl(); } @@ -343,7 +344,8 @@ SwDocShell::SwDocShell( const sal_uInt64 i_nSfxCreationFlags ) : mpWrtShell( 0 ), mpOLEChildList( 0 ), mnUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG), - bIsATemplate(false) + bIsATemplate(false), + mbRemovedInvisibleContent(false) { Init_Impl(); } @@ -358,7 +360,8 @@ SwDocShell::SwDocShell( SwDoc *pD, SfxObjectCreateMode eMode ): mpWrtShell( 0 ), mpOLEChildList( 0 ), mnUpdateDocMode(document::UpdateDocMode::ACCORDING_TO_CONFIG), - bIsATemplate(false) + bIsATemplate(false), + mbRemovedInvisibleContent(false) { Init_Impl(); } |