Kaydet (Commit) 3e7431f5 authored tarafından Michael Stahl's avatar Michael Stahl

sw: SwDocShell::aFinishedTimer dead since 2006

becf02e5 removed the last use

Change-Id: Ib72a36961dbe4c6218125f48ed251be964016f9d
üst b9301e9d
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Sequence.h>
#include <vcl/timer.hxx>
#include <sfx2/docfac.hxx> #include <sfx2/docfac.hxx>
#include <sfx2/objsh.hxx> #include <sfx2/objsh.hxx>
#include "swdllapi.h" #include "swdllapi.h"
...@@ -49,7 +48,6 @@ class SwgReaderOption; ...@@ -49,7 +48,6 @@ class SwgReaderOption;
class SwOLEObj; class SwOLEObj;
class IDocumentDeviceAccess; class IDocumentDeviceAccess;
class IDocumentSettingAccess; class IDocumentSettingAccess;
class IDocumentTimerAccess;
class IDocumentChartDataProviderAccess; class IDocumentChartDataProviderAccess;
class SwDocShell; class SwDocShell;
class SwDrawModel; class SwDrawModel;
...@@ -75,9 +73,6 @@ class SW_DLLPUBLIC SwDocShell ...@@ -75,9 +73,6 @@ class SW_DLLPUBLIC SwDocShell
SwView* m_pView; SwView* m_pView;
SwWrtShell* m_pWrtShell; SwWrtShell* m_pWrtShell;
Timer m_FinishedTimer; /**< Timer for checking graphics-links.
If all are present, the doc is loaded completely. */
comphelper::EmbeddedObjectContainer* m_pOLEChildList; comphelper::EmbeddedObjectContainer* m_pOLEChildList;
sal_Int16 m_nUpdateDocMode; ///< contains the com::sun::star::document::UpdateDocMode sal_Int16 m_nUpdateDocMode; ///< contains the com::sun::star::document::UpdateDocMode
bool m_IsATemplate; ///< prevent nested calls of UpdateFontList bool m_IsATemplate; ///< prevent nested calls of UpdateFontList
......
...@@ -1108,7 +1108,6 @@ void SwDocShell::LoadingFinished() ...@@ -1108,7 +1108,6 @@ void SwDocShell::LoadingFinished()
void SwDocShell::CancelTransfers() void SwDocShell::CancelTransfers()
{ {
// Cancel all links from LinkManager // Cancel all links from LinkManager
m_FinishedTimer.Stop();
m_pDoc->getIDocumentLinksAdministration().GetLinkManager().CancelTransfers(); m_pDoc->getIDocumentLinksAdministration().GetLinkManager().CancelTransfers();
SfxObjectShell::CancelTransfers(); SfxObjectShell::CancelTransfers();
} }
......
...@@ -447,7 +447,6 @@ void SwDocShell::RemoveLink() ...@@ -447,7 +447,6 @@ void SwDocShell::RemoveLink()
// disconnect Uno-Object // disconnect Uno-Object
uno::Reference< text::XTextDocument > xDoc(GetBaseModel(), uno::UNO_QUERY); uno::Reference< text::XTextDocument > xDoc(GetBaseModel(), uno::UNO_QUERY);
static_cast<SwXTextDocument*>(xDoc.get())->Invalidate(); static_cast<SwXTextDocument*>(xDoc.get())->Invalidate();
m_FinishedTimer.Stop();
if (m_pDoc) if (m_pDoc)
{ {
if (m_xBasePool.is()) if (m_xBasePool.is())
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include <wrtsh.hxx> #include <wrtsh.hxx>
SwEditShell * SwDocShell::GetEditShell() { SwEditShell * SwDocShell::GetEditShell() {
return mpWrtShell; return m_pWrtShell;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
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