diff options
| author | Valentin Kettner <vakevk+libreoffice@gmail.com> | 2014-07-07 14:32:02 +0200 |
|---|---|---|
| committer | Valentin Kettner <vakevk+libreoffice@gmail.com> | 2014-07-15 15:44:04 +0200 |
| commit | f634ec520fa9e8c3e7b1f0660c7a6561bdff2aaa (patch) | |
| tree | b44c2d2d6f3d6ed4a48f5e98a737008950d82050 /sw/source/uibase/app/docsh.cxx | |
| parent | 3fed83524dc33453f3ec25baa4a170bac51ab1e0 (diff) | |
Refactored IDocumentContentOperations out of SwDoc.
Into the new class DocumentContentOperationsManager.
Made SwNodes in sw/inc/ndarr.hxx friend class to
DocumentContentOperationsManager so it can call DelNodes at end of
DocumentContentOperationsManager::DeleteSection .
Added DeleteAutoCorrExceptWord to SwDoc, its needed in the Manager.
Added a non const version of SwDoc::GetDfltGrfFmtColl() to SwDoc
because its needed in the Manager.
Made SwDoc a friend class to DocumentContentOperationsManager so it
can call SwDoc::checkRedlining and SwDocL::_MakeFlySection.
Moved SwDoc::CopyImpl_ , SwDoc::CopyWithFlyInFly and
SwDoc::CopyFlyInFlyImpl into the Manager.
Moved "struct ParaRstFmt" and "lcl_RstTxtAttr" from docfmt.cxx
in DocumentContentOperationsManager.hxx .
Change-Id: Icaab57f4a8c158a85e549ecb4aacc752bc95bbc9
Diffstat (limited to 'sw/source/uibase/app/docsh.cxx')
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index 145c78722a35..b091254441d3 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1104,11 +1104,7 @@ void SwDocShell::LoadingFinished() // enables the document modification again. // Thus, manuell modify the document, if its modified and its links are updated // before <FinishedLoading(..)> is called. -<<<<<<< HEAD - const bool bHasDocToStayModified( mpDoc->IsModified() && mpDoc->LinksUpdated() ); -======= - const bool bHasDocToStayModified( pDoc->IsModified() && pDoc->getIDocumentLinksAdministration().LinksUpdated() ); ->>>>>>> Refactored IDocumentLinksAdministration out of SwDoc. + const bool bHasDocToStayModified( mpDoc->IsModified() && mpDoc->getIDocumentLinksAdministration().LinksUpdated() ); FinishedLoading( SFX_LOADED_ALL ); SfxViewFrame* pVFrame = SfxViewFrame::GetFirst(this); @@ -1131,11 +1127,7 @@ void SwDocShell::CancelTransfers() { // Cancel all links from LinkManager aFinishedTimer.Stop(); -<<<<<<< HEAD - mpDoc->GetLinkManager().CancelTransfers(); -======= - pDoc->getIDocumentLinksAdministration().GetLinkManager().CancelTransfers(); ->>>>>>> Refactored IDocumentLinksAdministration out of SwDoc. + mpDoc->getIDocumentLinksAdministration().GetLinkManager().CancelTransfers(); SfxObjectShell::CancelTransfers(); } |