diff options
| author | Michael Stahl <mstahl@redhat.com> | 2015-03-30 23:14:24 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2015-03-31 20:08:38 +0200 |
| commit | 3e7431f535f1c05ff730b0e3a67c2affe035b509 (patch) | |
| tree | 5d6aa9935641d64e358735924a29cccbadea259f /sw | |
| parent | b9301e9dc93f5961bd83a76410f91174316c99b3 (diff) | |
sw: SwDocShell::aFinishedTimer dead since 2006
becf02e58637276ab80227ffb19aa01c86e4962d removed the last use
Change-Id: Ib72a36961dbe4c6218125f48ed251be964016f9d
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/inc/docsh.hxx | 5 | ||||
| -rw-r--r-- | sw/source/uibase/app/docsh.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/app/docshini.cxx | 1 | ||||
| -rw-r--r-- | sw/source/uibase/wrtsh/docsh.cxx | 2 |
4 files changed, 1 insertions, 8 deletions
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index d3da31f3864d..1193638f8a12 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -22,7 +22,6 @@ #include <rtl/ref.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/uno/Sequence.h> -#include <vcl/timer.hxx> #include <sfx2/docfac.hxx> #include <sfx2/objsh.hxx> #include "swdllapi.h" @@ -49,7 +48,6 @@ class SwgReaderOption; class SwOLEObj; class IDocumentDeviceAccess; class IDocumentSettingAccess; -class IDocumentTimerAccess; class IDocumentChartDataProviderAccess; class SwDocShell; class SwDrawModel; @@ -75,9 +73,6 @@ class SW_DLLPUBLIC SwDocShell SwView* m_pView; SwWrtShell* m_pWrtShell; - Timer m_FinishedTimer; /**< Timer for checking graphics-links. - If all are present, the doc is loaded completely. */ - comphelper::EmbeddedObjectContainer* m_pOLEChildList; sal_Int16 m_nUpdateDocMode; ///< contains the com::sun::star::document::UpdateDocMode bool m_IsATemplate; ///< prevent nested calls of UpdateFontList diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx index b354fad3975d..0150587ee5a6 100644 --- a/sw/source/uibase/app/docsh.cxx +++ b/sw/source/uibase/app/docsh.cxx @@ -1108,7 +1108,6 @@ void SwDocShell::LoadingFinished() void SwDocShell::CancelTransfers() { // Cancel all links from LinkManager - m_FinishedTimer.Stop(); m_pDoc->getIDocumentLinksAdministration().GetLinkManager().CancelTransfers(); SfxObjectShell::CancelTransfers(); } diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index ef140a6f5d3d..7d9020455da9 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -447,7 +447,6 @@ void SwDocShell::RemoveLink() // disconnect Uno-Object uno::Reference< text::XTextDocument > xDoc(GetBaseModel(), uno::UNO_QUERY); static_cast<SwXTextDocument*>(xDoc.get())->Invalidate(); - m_FinishedTimer.Stop(); if (m_pDoc) { if (m_xBasePool.is()) diff --git a/sw/source/uibase/wrtsh/docsh.cxx b/sw/source/uibase/wrtsh/docsh.cxx index 904efeba1169..f5e871ca5f70 100644 --- a/sw/source/uibase/wrtsh/docsh.cxx +++ b/sw/source/uibase/wrtsh/docsh.cxx @@ -13,7 +13,7 @@ #include <wrtsh.hxx> SwEditShell * SwDocShell::GetEditShell() { - return mpWrtShell; + return m_pWrtShell; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |