[Libreoffice-commits] core.git: sw/inc sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Feb 5 06:51:48 UTC 2016
sw/inc/viewsh.hxx | 2 --
sw/source/core/view/viewsh.cxx | 8 --------
sw/source/uibase/uno/unotxdoc.cxx | 1 -
3 files changed, 11 deletions(-)
New commits:
commit 7e9b2294930da159989659c21ce4c4e5f5d0a016
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Feb 5 07:50:50 2016 +0100
sw: remove no longer used SwViewShell::setTiledRendering()
It only set a flag that was used by the already removed
isTiledRendering() equivalent.
Change-Id: Idc908c4b6bc432e4478fb1db6a8883faf2f864fd
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index afdd060..141c5c4 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -572,8 +572,6 @@ public:
void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData);
/// Invokes the registered callback, if there are any.
void libreOfficeKitCallback(int nType, const char* pPayload) const;
- /// Set if we are doing tiled rendering.
- void setTiledRendering(bool bTiledRendering);
void setOutputToWindow(bool bOutputToWindow);
bool isOutputToWindow() const;
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index a543016..6483c02 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -130,11 +130,6 @@ void SwViewShell::libreOfficeKitCallback(int nType, const char* pPayload) const
getIDocumentDrawModelAccess().GetDrawModel()->libreOfficeKitCallback(nType, pPayload);
}
-void SwViewShell::setTiledRendering(bool bTiledRendering)
-{
- getIDocumentDrawModelAccess().GetDrawModel()->setTiledRendering(bTiledRendering);
-}
-
void SwViewShell::setOutputToWindow(bool bOutputToWindow)
{
mbOutputToWindow = bOutputToWindow;
@@ -1856,8 +1851,6 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
// TODO clean up SwViewShell's approach to output devices (the many of
// them - mpBufferedOut, mpOut, mpWin, ...)
OutputDevice *pSaveOut = mpOut;
- bool bTiledRendering = comphelper::LibreOfficeKit::isActive();
- setTiledRendering(true);
mbInLibreOfficeKitCallback = true;
mpOut = &rDevice;
@@ -1912,7 +1905,6 @@ void SwViewShell::PaintTile(VirtualDevice &rDevice, int contextWidth, int contex
// SwViewShell's output device tear down
mpOut = pSaveOut;
mbInLibreOfficeKitCallback = false;
- setTiledRendering(bTiledRendering);
}
void SwViewShell::SetBrowseBorder( const Size& rNew )
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 55b9b21..a6e4719 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3236,7 +3236,6 @@ void SwXTextDocument::initializeForTiledRendering(const css::uno::Sequence<css::
// we already don't center the pages.
SwDoc* pDoc = pDocShell->GetDoc();
SwViewShell* pViewShell = pDoc->getIDocumentLayoutAccess().GetCurrentViewShell();
- pViewShell->setTiledRendering(true);
bool bBookMode = false;
sal_Int16 nColumns = 1;
More information about the Libreoffice-commits
mailing list