summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-06-16 16:45:21 +0200
committerAshod Nakashian <ashod.nakashian@collabora.co.uk>2016-07-20 01:26:09 -0400
commit82bb3b84594d4eadaa062cdb8381360dbc7cf3b6 (patch)
tree9f9096183c2f6b54371305721168db637d8766ff /sc
parent2e6fd3dca0d1ab7dd03f6dca2574c926462daaf0 (diff)
comphelper: enable LibreOfficeKit::isViewCallback() by default
This requires porting the sw/sd/sc_tiledrendering test code to the new internal API, as only the public LOK API is unchanged. Reviewed-on: https://gerrit.libreoffice.org/26379 Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Tested-by: Jenkins <ci@libreoffice.org> (cherry picked from commit 5bf3ae663a2189e37959235cda8c6a4051e10a1a) Change-Id: Ic6a2f96421da4a16bdee7d0cbb3f6e35bc6ddff9
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/tiledrendering/tiledrendering.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index e4d829a82592..ea042d8bf438 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -308,19 +308,19 @@ void ScTiledRenderingTest::testDocumentSize()
{
comphelper::LibreOfficeKit::setActive();
ScModelObj* pModelObj = createDoc("sort-range.ods");
- pModelObj->registerCallback(&ScTiledRenderingTest::callback, this);
-
- // check initial document size
- Size aDocSize = pModelObj->getDocumentSize();
- CPPUNIT_ASSERT(aDocSize.Width() > 0);
- CPPUNIT_ASSERT(aDocSize.Height() > 0);
-
ScDocShell* pDocSh = dynamic_cast< ScDocShell* >( pModelObj->GetEmbeddedObject() );
CPPUNIT_ASSERT(pDocSh);
ScTabViewShell* pViewShell = pDocSh->GetBestViewShell(false);
CPPUNIT_ASSERT(pViewShell);
+ pViewShell->registerLibreOfficeKitViewCallback(&ScTiledRenderingTest::callback, this);
+
+ // check initial document size
+ Size aDocSize = pModelObj->getDocumentSize();
+ CPPUNIT_ASSERT(aDocSize.Width() > 0);
+ CPPUNIT_ASSERT(aDocSize.Height() > 0);
+
// Set cursor column
pViewShell->SetCursor(100, 0);
// 2 seconds