diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2016-06-06 10:29:42 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-06-06 10:56:55 +0200 |
| commit | 47d0e1be83810ccdb2d5350167c3713ea5d923ba (patch) | |
| tree | 79eee074264a8c075822b8926287b349ea75344d | |
| parent | 770493f3cf4c724e115b51a4280b00fe00b7f42e (diff) | |
tdf#84411 unit test: Trivial follow-up updates.
Change-Id: Ia19fec237d3301297e4e1caa2338519264c4b724
| -rw-r--r-- | sc/qa/unit/copy_paste_test.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx index 7db0bf9493cc..0e9addf56a7c 100644 --- a/sc/qa/unit/copy_paste_test.cxx +++ b/sc/qa/unit/copy_paste_test.cxx @@ -123,6 +123,8 @@ void ScCopyPasteTest::testCopyPasteXLS() xComponent->dispose(); } +namespace { + void lcl_copy( const OUString& rSrcRange, const OUString& rDstRange, ScDocument& rDoc, ScTabViewShell* pViewShell ) { ScDocument aClipDoc(SCDOCMODE_CLIP); @@ -142,6 +144,8 @@ void lcl_copy( const OUString& rSrcRange, const OUString& rDstRange, ScDocument& pViewShell->GetViewData().GetView()->PasteFromClip(InsertDeleteFlags::ALL, &aClipDoc); } +} // anonymous namespace + void ScCopyPasteTest::testTdf84411() { uno::Reference< frame::XDesktop2 > xDesktop = frame::Desktop::create(::comphelper::getProcessComponentContext()); @@ -202,6 +206,7 @@ void ScCopyPasteTest::testTdf84411() // 3. Disable OpenCL ScModelObj* pModel = ScModelObj::getImplementation(pFoundShell->GetModel()); CPPUNIT_ASSERT(pModel != nullptr); + bool bOpenCLState = ScCalcConfig::isOpenCLEnabled(); pModel->enableOpenCL(false); CPPUNIT_ASSERT(ScCalcConfig::isOpenCLEnabled() == false); pModel->enableAutomaticCalculation(true); @@ -217,6 +222,7 @@ void ScCopyPasteTest::testTdf84411() // 5. Close the document (Ctrl-W) + pModel->enableOpenCL(bOpenCLState); xComponent->dispose(); } @@ -246,5 +252,4 @@ CPPUNIT_TEST_SUITE_REGISTRATION(ScCopyPasteTest); CPPUNIT_PLUGIN_IMPLEMENT(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |