|
 |
135360 |
From d82649ea6f8232d52e1fe4e48ad6ccf1668418a8 Mon Sep 17 00:00:00 2001
|
|
|
135360 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
135360 |
Date: Sat, 14 Nov 2015 11:06:08 +0100
|
|
|
135360 |
Subject: [PATCH 329/398] sw lok comments: fix callback of newly created
|
|
|
135360 |
outliner views
|
|
|
135360 |
|
|
|
135360 |
SwPostItMgr::registerLibreOfficeKitCallback() already took care of
|
|
|
135360 |
informing existing outliners, this commit gives a callback to newly
|
|
|
135360 |
registered ones as well.
|
|
|
135360 |
|
|
|
135360 |
(cherry picked from commit dacc616f7020d045a1cfdb3806436e06046dae10)
|
|
|
135360 |
|
|
|
135360 |
Change-Id: I660dcb54231a9d404bf80b4284003d119dae6a5c
|
|
|
135360 |
---
|
|
|
135360 |
sw/inc/drawdoc.hxx | 2 ++
|
|
|
135360 |
sw/source/core/draw/drawdoc.cxx | 6 ++++++
|
|
|
135360 |
sw/source/uibase/docvw/SidebarWin.cxx | 13 +++++++++++++
|
|
|
135360 |
3 files changed, 21 insertions(+)
|
|
|
135360 |
|
|
|
135360 |
diff --git a/sw/inc/drawdoc.hxx b/sw/inc/drawdoc.hxx
|
|
|
135360 |
index bad9c0ca41a1..bbf079911656 100644
|
|
|
135360 |
--- a/sw/inc/drawdoc.hxx
|
|
|
135360 |
+++ b/sw/inc/drawdoc.hxx
|
|
|
135360 |
@@ -42,6 +42,8 @@ public:
|
|
|
135360 |
|
|
|
135360 |
virtual ::com::sun::star::uno::Reference<
|
|
|
135360 |
::com::sun::star::embed::XStorage> GetDocumentStorage() const SAL_OVERRIDE;
|
|
|
135360 |
+ /// Get the callback and callback data, previously given to registerLibreOfficeKitCallback().
|
|
|
135360 |
+ void getLibreOfficeKitCallback(LibreOfficeKitCallback& rCallback, void*& rLibreOfficeKitData);
|
|
|
135360 |
|
|
|
135360 |
/// For saving of rectangles as control-replacement for versions < 5.0.
|
|
|
135360 |
virtual SdrLayerID GetControlExportLayerId( const SdrObject & ) const SAL_OVERRIDE;
|
|
|
135360 |
diff --git a/sw/source/core/draw/drawdoc.cxx b/sw/source/core/draw/drawdoc.cxx
|
|
|
135360 |
index efd0bb1f163d..7f352c981890 100644
|
|
|
135360 |
--- a/sw/source/core/draw/drawdoc.cxx
|
|
|
135360 |
+++ b/sw/source/core/draw/drawdoc.cxx
|
|
|
135360 |
@@ -126,6 +126,12 @@ uno::Reference<embed::XStorage> SwDrawModel::GetDocumentStorage() const
|
|
|
135360 |
return m_pDoc->GetDocStorage();
|
|
|
135360 |
}
|
|
|
135360 |
|
|
|
135360 |
+void SwDrawModel::getLibreOfficeKitCallback(LibreOfficeKitCallback& rCallback, void*& rLibreOfficeKitData)
|
|
|
135360 |
+{
|
|
|
135360 |
+ rCallback = mpLibreOfficeKitCallback;
|
|
|
135360 |
+ rLibreOfficeKitData = mpLibreOfficeKitData;
|
|
|
135360 |
+}
|
|
|
135360 |
+
|
|
|
135360 |
SdrLayerID SwDrawModel::GetControlExportLayerId( const SdrObject & ) const
|
|
|
135360 |
{
|
|
|
135360 |
//for versions < 5.0, there was only Hell and Heaven
|
|
|
135360 |
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
135360 |
index 721ef95e4acf..32d8b78815ae 100644
|
|
|
135360 |
--- a/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
135360 |
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
|
|
|
135360 |
@@ -82,6 +82,8 @@
|
|
|
135360 |
#include <boost/scoped_ptr.hpp>
|
|
|
135360 |
#include <memory>
|
|
|
135360 |
#include <comphelper/lok.hxx>
|
|
|
135360 |
+#include <IDocumentDrawModelAccess.hxx>
|
|
|
135360 |
+#include <drawdoc.hxx>
|
|
|
135360 |
|
|
|
135360 |
namespace
|
|
|
135360 |
{
|
|
|
135360 |
@@ -532,6 +534,17 @@ void SwSidebarWin::InitControls()
|
|
|
135360 |
|
|
|
135360 |
mpOutlinerView->SetAttribs(DefaultItem());
|
|
|
135360 |
|
|
|
135360 |
+ if (comphelper::LibreOfficeKit::isActive())
|
|
|
135360 |
+ {
|
|
|
135360 |
+ // If there is a callback already registered, inform the new outliner view about it.
|
|
|
135360 |
+ SwDrawModel* pDrawModel = mrView.GetWrtShellPtr()->getIDocumentDrawModelAccess()->GetDrawModel();
|
|
|
135360 |
+ LibreOfficeKitCallback pCallback = 0;
|
|
|
135360 |
+ void* pData = 0;
|
|
|
135360 |
+ pDrawModel->getLibreOfficeKitCallback(pCallback, pData);
|
|
|
135360 |
+ mpOutlinerView->setTiledRendering(mrView.GetWrtShellPtr()->isTiledRendering());
|
|
|
135360 |
+ mpOutlinerView->registerLibreOfficeKitCallback(pCallback, pData);
|
|
|
135360 |
+ }
|
|
|
135360 |
+
|
|
|
135360 |
//create Scrollbars
|
|
|
135360 |
mpVScrollbar = VclPtr<ScrollBar>::Create(this, WB_3DLOOK |WB_VSCROLL|WB_DRAG);
|
|
|
135360 |
mpVScrollbar->EnableNativeWidget(false);
|
|
|
135360 |
--
|
|
|
135360 |
2.12.0
|
|
|
135360 |
|