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