|
 |
f325b2 |
From 1acbb9bcb348f8dd0c6fb38a435945888b703837 Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Miklos Vajna <vmiklos@collabora.co.uk>
|
|
|
f325b2 |
Date: Wed, 18 Nov 2015 15:20:30 +0100
|
|
|
f325b2 |
Subject: [PATCH 344/398] vcl::ITiledRenderable::initializeForTiledRendering:
|
|
|
f325b2 |
support init. arguments
|
|
|
f325b2 |
|
|
|
f325b2 |
(cherry picked from commit 479325dec83ea2747f3ce27ca7e817695b15e1bb)
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: I9a6a75457078dc6383673f4c1a2012b69b5cefdd
|
|
|
f325b2 |
---
|
|
|
f325b2 |
desktop/source/lib/init.cxx | 2 +-
|
|
|
f325b2 |
include/vcl/ITiledRenderable.hxx | 2 +-
|
|
|
f325b2 |
sc/inc/docuno.hxx | 2 +-
|
|
|
f325b2 |
sc/source/ui/unoobj/docuno.cxx | 2 +-
|
|
|
f325b2 |
sd/qa/unit/tiledrendering/tiledrendering.cxx | 2 +-
|
|
|
f325b2 |
sd/source/ui/inc/unomodel.hxx | 2 +-
|
|
|
f325b2 |
sd/source/ui/unoidl/unomodel.cxx | 2 +-
|
|
|
f325b2 |
sw/inc/unotxdoc.hxx | 2 +-
|
|
|
f325b2 |
sw/qa/extras/tiledrendering/tiledrendering.cxx | 3 +--
|
|
|
f325b2 |
sw/source/uibase/uno/unotxdoc.cxx | 2 +-
|
|
|
f325b2 |
10 files changed, 10 insertions(+), 11 deletions(-)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
index 2ff0a9d02853..3c6be03a7132 100644
|
|
|
f325b2 |
--- a/desktop/source/lib/init.cxx
|
|
|
f325b2 |
+++ b/desktop/source/lib/init.cxx
|
|
|
f325b2 |
@@ -982,7 +982,7 @@ static void doc_initializeForRendering(LibreOfficeKitDocument* pThis,
|
|
|
f325b2 |
doc_iniUnoCommands();
|
|
|
f325b2 |
uno::Sequence<beans::PropertyValue> aPropertyValues;
|
|
|
f325b2 |
jsonToPropertyValues(pArguments, aPropertyValues);
|
|
|
f325b2 |
- pDoc->initializeForTiledRendering();
|
|
|
f325b2 |
+ pDoc->initializeForTiledRendering(aPropertyValues);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
|
|
|
f325b2 |
index fa85b39399b3..786adb76f8e6 100644
|
|
|
f325b2 |
--- a/include/vcl/ITiledRenderable.hxx
|
|
|
f325b2 |
+++ b/include/vcl/ITiledRenderable.hxx
|
|
|
f325b2 |
@@ -93,7 +93,7 @@ public:
|
|
|
f325b2 |
* Setup various document properties that are needed for the document to
|
|
|
f325b2 |
* be renderable via tiled rendering.
|
|
|
f325b2 |
*/
|
|
|
f325b2 |
- virtual void initializeForTiledRendering() = 0;
|
|
|
f325b2 |
+ virtual void initializeForTiledRendering(const css::uno::Sequence<css::beans::PropertyValue>& rArguments) = 0;
|
|
|
f325b2 |
|
|
|
f325b2 |
/**
|
|
|
f325b2 |
* Registers a callback that will be invoked whenever the tiled renderer
|
|
|
f325b2 |
diff --git a/sc/inc/docuno.hxx b/sc/inc/docuno.hxx
|
|
|
f325b2 |
index 7e00b7549733..803d7afd334d 100644
|
|
|
f325b2 |
--- a/sc/inc/docuno.hxx
|
|
|
f325b2 |
+++ b/sc/inc/docuno.hxx
|
|
|
f325b2 |
@@ -393,7 +393,7 @@ public:
|
|
|
f325b2 |
virtual OUString getPartName(int nPart) SAL_OVERRIDE;
|
|
|
f325b2 |
|
|
|
f325b2 |
/// @see vcl::ITiledRenderable::initializeForTiledRendering().
|
|
|
f325b2 |
- virtual void initializeForTiledRendering() SAL_OVERRIDE;
|
|
|
f325b2 |
+ virtual void initializeForTiledRendering(const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
|
|
|
f325b2 |
|
|
|
f325b2 |
/// @see vcl::ITiledRenderable::registerCallback().
|
|
|
f325b2 |
virtual void registerCallback(LibreOfficeKitCallback pCallback, void* pData) SAL_OVERRIDE;
|
|
|
f325b2 |
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
|
|
|
f325b2 |
index c0f504d770c6..b0de3197dab4 100644
|
|
|
f325b2 |
--- a/sc/source/ui/unoobj/docuno.cxx
|
|
|
f325b2 |
+++ b/sc/source/ui/unoobj/docuno.cxx
|
|
|
f325b2 |
@@ -932,7 +932,7 @@ Pointer ScModelObj::getPointer()
|
|
|
f325b2 |
return pGridWindow->GetPointer();
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-void ScModelObj::initializeForTiledRendering()
|
|
|
f325b2 |
+void ScModelObj::initializeForTiledRendering(const css::uno::Sequence<css::beans::PropertyValue>& /*rArguments*/)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
SolarMutexGuard aGuard;
|
|
|
f325b2 |
pDocShell->GetDocument().GetDrawLayer()->setTiledRendering(true);
|
|
|
f325b2 |
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
|
|
|
f325b2 |
index 306a76217ca0..8c9f8aa46dfa 100644
|
|
|
f325b2 |
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
|
|
|
f325b2 |
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
|
|
|
f325b2 |
@@ -120,7 +120,7 @@ SdXImpressDocument* SdTiledRenderingTest::createDoc(const char* pName)
|
|
|
f325b2 |
mxComponent = loadFromDesktop(getURLFromSrc(DATA_DIRECTORY) + OUString::createFromAscii(pName), "com.sun.star.presentation.PresentationDocument");
|
|
|
f325b2 |
SdXImpressDocument* pImpressDocument = dynamic_cast<SdXImpressDocument*>(mxComponent.get());
|
|
|
f325b2 |
CPPUNIT_ASSERT(pImpressDocument);
|
|
|
f325b2 |
- pImpressDocument->initializeForTiledRendering();
|
|
|
f325b2 |
+ pImpressDocument->initializeForTiledRendering(uno::Sequence<beans::PropertyValue>());
|
|
|
f325b2 |
return pImpressDocument;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx
|
|
|
f325b2 |
index 1c444dd478bf..70478b450571 100644
|
|
|
f325b2 |
--- a/sd/source/ui/inc/unomodel.hxx
|
|
|
f325b2 |
+++ b/sd/source/ui/inc/unomodel.hxx
|
|
|
f325b2 |
@@ -243,7 +243,7 @@ public:
|
|
|
f325b2 |
virtual void setPartMode( int nPartMode ) SAL_OVERRIDE;
|
|
|
f325b2 |
|
|
|
f325b2 |
/// @see vcl::ITiledRenderable::initializeForTiledRendering().
|
|
|
f325b2 |
- virtual void initializeForTiledRendering() SAL_OVERRIDE;
|
|
|
f325b2 |
+ virtual void initializeForTiledRendering(const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
|
|
|
f325b2 |
/// @see vcl::ITiledRenderable::registerCallback().
|
|
|
f325b2 |
virtual void registerCallback(LibreOfficeKitCallback pCallback, void* pData) SAL_OVERRIDE;
|
|
|
f325b2 |
/// @see vcl::ITiledRenderable::postKeyEvent().
|
|
|
f325b2 |
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
|
|
|
f325b2 |
index 28ca11878044..d5e9490f6936 100644
|
|
|
f325b2 |
--- a/sd/source/ui/unoidl/unomodel.cxx
|
|
|
f325b2 |
+++ b/sd/source/ui/unoidl/unomodel.cxx
|
|
|
f325b2 |
@@ -2370,7 +2370,7 @@ Size SdXImpressDocument::getDocumentSize()
|
|
|
f325b2 |
return Size(convertMm100ToTwip(aSize.getWidth()), convertMm100ToTwip(aSize.getHeight()));
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-void SdXImpressDocument::initializeForTiledRendering()
|
|
|
f325b2 |
+void SdXImpressDocument::initializeForTiledRendering(const css::uno::Sequence<css::beans::PropertyValue>& /*rArguments*/)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
SolarMutexGuard aGuard;
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
|
|
|
f325b2 |
index e8cb116bb671..842d6299e801 100644
|
|
|
f325b2 |
--- a/sw/inc/unotxdoc.hxx
|
|
|
f325b2 |
+++ b/sw/inc/unotxdoc.hxx
|
|
|
f325b2 |
@@ -417,7 +417,7 @@ public:
|
|
|
f325b2 |
/// @see vcl::ITiledRenderable::getPartName().
|
|
|
f325b2 |
virtual OUString getPartName(int nPart) SAL_OVERRIDE;
|
|
|
f325b2 |
/// @see vcl::ITiledRenderable::initializeForTiledRendering().
|
|
|
f325b2 |
- virtual void initializeForTiledRendering() SAL_OVERRIDE;
|
|
|
f325b2 |
+ virtual void initializeForTiledRendering(const css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
|
|
|
f325b2 |
/// @see vcl::ITiledRenderable::registerCallback().
|
|
|
f325b2 |
virtual void registerCallback(LibreOfficeKitCallback pCallback, void* pData) SAL_OVERRIDE;
|
|
|
f325b2 |
/// @see vcl::ITiledRenderable::postKeyEvent().
|
|
|
f325b2 |
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
|
|
|
f325b2 |
index 9f85fe8e1290..045f0d2676b0 100644
|
|
|
f325b2 |
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
|
|
|
f325b2 |
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
|
|
|
f325b2 |
@@ -86,7 +86,7 @@ SwXTextDocument* SwTiledRenderingTest::createDoc(const char* pName)
|
|
|
f325b2 |
|
|
|
f325b2 |
SwXTextDocument* pTextDocument = dynamic_cast<SwXTextDocument*>(mxComponent.get());
|
|
|
f325b2 |
CPPUNIT_ASSERT(pTextDocument);
|
|
|
f325b2 |
- pTextDocument->initializeForTiledRendering();
|
|
|
f325b2 |
+ pTextDocument->initializeForTiledRendering(uno::Sequence<beans::PropertyValue>());
|
|
|
f325b2 |
return pTextDocument;
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
@@ -422,7 +422,6 @@ void SwTiledRenderingTest::testDocumentSizeChanged()
|
|
|
f325b2 |
SwXTextDocument* pXTextDocument = createDoc("2-pages.odt");
|
|
|
f325b2 |
pXTextDocument->registerCallback(&SwTiledRenderingTest::callback, this);
|
|
|
f325b2 |
SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
|
|
|
f325b2 |
- pXTextDocument->initializeForTiledRendering();
|
|
|
f325b2 |
Size aSize = pXTextDocument->getDocumentSize();
|
|
|
f325b2 |
|
|
|
f325b2 |
// Delete the second page and see how the size changes.
|
|
|
f325b2 |
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
|
|
|
f325b2 |
index 7f94eb037861..e8508efd18f1 100644
|
|
|
f325b2 |
--- a/sw/source/uibase/uno/unotxdoc.cxx
|
|
|
f325b2 |
+++ b/sw/source/uibase/uno/unotxdoc.cxx
|
|
|
f325b2 |
@@ -3249,7 +3249,7 @@ OUString SwXTextDocument::getPartName(int nPart)
|
|
|
f325b2 |
return OUString(SW_RES(STR_PAGE)) + OUString::number(nPart + 1);
|
|
|
f325b2 |
}
|
|
|
f325b2 |
|
|
|
f325b2 |
-void SwXTextDocument::initializeForTiledRendering()
|
|
|
f325b2 |
+void SwXTextDocument::initializeForTiledRendering(const css::uno::Sequence<css::beans::PropertyValue>& /*rArguments*/)
|
|
|
f325b2 |
{
|
|
|
f325b2 |
SolarMutexGuard aGuard;
|
|
|
f325b2 |
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|