summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorJens Carl <j.carl43@gmx.de>2018-06-29 02:47:08 +0000
committerJens Carl <j.carl43@gmx.de>2018-06-29 06:15:16 +0200
commit81260b12666853bb9c21da487657e169cac6d4d9 (patch)
treec4dbee06f73d7400d6c9d4293f328dc4ed6bf63a /sc
parent6af8aa411189993942d4a8a13199b0a5e026c003 (diff)
tdf#45904 Move _XDocumentAuditing Java test to C++
Change-Id: Ic03e42c9c2ff27579b442dc8d1408deaea839ec4 Reviewed-on: https://gerrit.libreoffice.org/56644 Tested-by: Jenkins Reviewed-by: Jens Carl <j.carl43@gmx.de>
Diffstat (limited to 'sc')
-rw-r--r--sc/CppunitTest_sc_modelobj.mk47
-rw-r--r--sc/qa/extras/scmodelobj.cxx12
2 files changed, 22 insertions, 37 deletions
diff --git a/sc/CppunitTest_sc_modelobj.mk b/sc/CppunitTest_sc_modelobj.mk
index 77bef309eaf1..6ad683c0a793 100644
--- a/sc/CppunitTest_sc_modelobj.mk
+++ b/sc/CppunitTest_sc_modelobj.mk
@@ -14,48 +14,21 @@ $(eval $(call gb_CppunitTest_CppunitTest,sc_modelobj))
$(eval $(call gb_CppunitTest_use_external,sc_modelobj,boost_headers))
$(eval $(call gb_CppunitTest_add_exception_objects,sc_modelobj, \
- sc/qa/extras/scmodelobj \
+ sc/qa/extras/scmodelobj \
))
$(eval $(call gb_CppunitTest_use_libraries,sc_modelobj, \
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- drawinglayer \
- editeng \
- for \
- forui \
- i18nlangtag \
- msfilter \
- oox \
- sal \
- salhelper \
- sax \
- sb \
- sc \
- sfx \
- sot \
- subsequenttest \
- svl \
- svt \
- svx \
- svxcore \
+ comphelper \
+ cppu \
+ cppuhelper \
+ sal \
+ subsequenttest \
test \
- tk \
- tl \
- ucbhelper \
unotest \
- utl \
- vbahelper \
- vcl \
- xo \
))
$(eval $(call gb_CppunitTest_set_include,sc_modelobj,\
- -I$(SRCDIR)/sc/source/ui/inc \
- -I$(SRCDIR)/sc/inc \
- $$(INCLUDE) \
+ $$(INCLUDE) \
))
$(eval $(call gb_CppunitTest_use_sdk_api,sc_modelobj))
@@ -63,9 +36,9 @@ $(eval $(call gb_CppunitTest_use_sdk_api,sc_modelobj))
$(eval $(call gb_CppunitTest_use_ure,sc_modelobj))
$(eval $(call gb_CppunitTest_use_vcl,sc_modelobj))
-$(eval $(call gb_CppunitTest_use_components,sc_modelobj,\
- $(sc_unoapi_common_components) \
-))
+$(eval $(call gb_CppunitTest_use_rdb,sc_modelobj,services))
+
+$(eval $(call gb_CppunitTest_use_components,sc_modelobj))
$(eval $(call gb_CppunitTest_use_configuration,sc_modelobj))
diff --git a/sc/qa/extras/scmodelobj.cxx b/sc/qa/extras/scmodelobj.cxx
index 79f44080f7a7..78bc8f7b34d5 100644
--- a/sc/qa/extras/scmodelobj.cxx
+++ b/sc/qa/extras/scmodelobj.cxx
@@ -11,11 +11,13 @@
#include <test/sheet/spreadsheetdocumentsettings.hxx>
#include <test/sheet/xcalculatable.hxx>
#include <test/sheet/xconsolidatable.hxx>
+#include <test/sheet/xdocumentauditing.hxx>
#include <test/sheet/xgoalseek.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
#include <com/sun/star/sheet/XSpreadsheet.hpp>
#include <com/sun/star/sheet/XSpreadsheets.hpp>
@@ -32,6 +34,7 @@ class ScModelObj : public UnoApiTest,
public apitest::SpreadsheetDocumentSettings,
public apitest::XCalculatable,
public apitest::XConsolidatable,
+ public apitest::XDocumentAuditing,
public apitest::XGoalSeek
{
public:
@@ -39,6 +42,7 @@ public:
virtual void tearDown() override;
virtual uno::Reference< uno::XInterface > init() override;
+ virtual uno::Reference< uno::XInterface > getXMSF() override;
virtual uno::Sequence<uno::Reference<table::XCell>> getXCells() override;
ScModelObj();
@@ -57,6 +61,9 @@ public:
CPPUNIT_TEST(testCreateConsolidationDescriptor);
CPPUNIT_TEST(testConsolidate);
+ // XDocumentAuditing
+ CPPUNIT_TEST(testRefreshArrows);
+
// XGoalSeek
CPPUNIT_TEST(testSeekGoal);
@@ -93,6 +100,11 @@ uno::Reference< uno::XInterface > ScModelObj::init()
return xModel;
}
+uno::Reference<uno::XInterface> ScModelObj::getXMSF()
+{
+ return getMultiServiceFactory();
+}
+
uno::Sequence<uno::Reference<table::XCell>> ScModelObj::getXCells()
{
return m_xCells;