sc/CppunitTest_sc_annotationshapeobj.mk | 134 ++++++++++++++++++++++++++++++++ sc/Module_sc.mk | 1 sc/qa/extras/scannotationshapeobj.cxx | 128 ++++++++++++++++++++++++++++++ sc/qa/unoapi/sc.sce | 2 sc/source/ui/unoobj/notesuno.cxx | 46 ++++++++++ test/Library_subsequenttest.mk | 1 test/Package_inc.mk | 1 test/inc/test/text/xtext.hxx | 55 +++++++++++++ test/source/text/xtext.cxx | 48 +++++++++++ 9 files changed, 414 insertions(+), 2 deletions(-)
New commits: commit 19af8cc580445c1e163960d8cfbf793e4e6465bb Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Fri May 4 00:41:59 2012 -0400 Evil hack to fix the UNO API failure. We need a clean solution for this, but that will need a bit more effort & thinking. Change-Id: I I25d066fa0322cca9a15af1745a758b1aba981e13 diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk index 4727d74..3afcaf2 100644 --- a/sc/Module_sc.mk +++ b/sc/Module_sc.mk @@ -54,6 +54,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,sc,\ JunitTest_sc_complex \ JunitTest_sc_unoapi \ CppunitTest_sc_chart_regression_test \ + CppunitTest_sc_annotationshapeobj \ CppunitTest_sc_cellrangeobj \ $(if $(filter-out $(OS),IOS), \ CppunitTest_sc_databaserangeobj) \ diff --git a/sc/qa/unoapi/sc.sce b/sc/qa/unoapi/sc.sce index ab19f92..1ad6d8f 100644 --- a/sc/qa/unoapi/sc.sce +++ b/sc/qa/unoapi/sc.sce @@ -15,7 +15,7 @@ -o sc.ScAccessiblePreviewTable # fdo#45337 -o sc.ScAccessibleSpreadsheet -o sc.ScAnnotationObj -# FIXME -o sc.ScAnnotationShapeObj +-o sc.ScAnnotationShapeObj -o sc.ScAnnotationsObj -o sc.ScAreaLinkObj -o sc.ScAreaLinksObj diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index 8fcfc1d..0e77d85 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -42,6 +42,7 @@ #include "hints.hxx" #include "editsrc.hxx" #include "miscuno.hxx" +#include "fielduno.hxx" // setVisible: #include <svx/svdundo.hxx> @@ -50,6 +51,7 @@ #include "undocell.hxx" #include "userdat.hxx" #include <editeng/outlobj.hxx> +#include "editeng/unofield.hxx" #include <svx/unoshape.hxx> #include <svx/svdocapt.hxx> #include <svx/svditer.hxx> @@ -390,7 +392,49 @@ void SAL_CALL ScAnnotationShapeObj::insertTextContent( const uno::Reference< tex { SolarMutexGuard aGuard; - GetUnoText().insertTextContent( xRange, xContent, bAbsorb ); + // Evil hack to convert a ScEditFieldObj based text field into a + // SvxUnoTextField based one. See SvxUnoTextBase::insertTextContent() for + // the reason why. We need a clean solution for this. + + ScEditFieldObj* pField = ScEditFieldObj::getImplementation(xContent); + uno::Reference<text::XTextContent> xContent2 = xContent; + if (pField) + { + switch (pField->GetFieldType()) + { + case ScEditFieldObj::Date: + xContent2.set(new SvxUnoTextField(ID_DATEFIELD)); + break; + case ScEditFieldObj::File: + xContent2.set(new SvxUnoTextField(ID_EXT_FILEFIELD)); + break; + case ScEditFieldObj::Page: + xContent2.set(new SvxUnoTextField(ID_PAGEFIELD)); + break; + case ScEditFieldObj::Pages: + xContent2.set(new SvxUnoTextField(ID_PAGESFIELD)); + break; + case ScEditFieldObj::Sheet: + xContent2.set(new SvxUnoTextField(ID_TABLEFIELD)); + break; + case ScEditFieldObj::Time: + xContent2.set(new SvxUnoTextField(ID_TIMEFIELD)); + break; + case ScEditFieldObj::ExtTime: + xContent2.set(new SvxUnoTextField(ID_EXT_TIMEFIELD)); + break; + case ScEditFieldObj::Title: + xContent2.set(new SvxUnoTextField(ID_FILEFIELD)); + break; + case ScEditFieldObj::URL: + xContent2.set(new SvxUnoTextField(ID_URLFIELD)); + break; + default: + ; + } + } + + GetUnoText().insertTextContent(xRange, xContent2, bAbsorb); } void SAL_CALL ScAnnotationShapeObj::removeTextContent( const uno::Reference< text::XTextContent >& xContent ) commit 921dce61acd67ee8e5f93e7c5005cb42f8c062de Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Thu May 3 23:31:30 2012 -0400 Let's just combine the two tests, since one requires the other. Change-Id: I I4c02aa1d459f7d5c2a1d9c38255aae3c3043dda6 diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx index 67e70e6..98aa360 100644 --- a/sc/qa/extras/scannotationshapeobj.cxx +++ b/sc/qa/extras/scannotationshapeobj.cxx @@ -34,7 +34,7 @@ #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> -#define NUMBER_OF_TESTS 2 +#define NUMBER_OF_TESTS 1 namespace sc_apitest { @@ -52,8 +52,7 @@ public: CPPUNIT_TEST_SUITE(ScAnnotationShapeObj); // XText - CPPUNIT_TEST(testInsertTextContent); - CPPUNIT_TEST(testRemoveTextContent); + CPPUNIT_TEST(testInsertRemoveTextContent); CPPUNIT_TEST_SUITE_END(); diff --git a/test/inc/test/text/xtext.hxx b/test/inc/test/text/xtext.hxx index 29dbf34..57121e7 100644 --- a/test/inc/test/text/xtext.hxx +++ b/test/inc/test/text/xtext.hxx @@ -45,8 +45,7 @@ public: virtual uno::Reference<uno::XInterface> init() = 0; virtual uno::Reference<text::XTextContent> getTextContent() = 0; - void testInsertTextContent(); - void testRemoveTextContent(); + void testInsertRemoveTextContent(); }; } diff --git a/test/source/text/xtext.cxx b/test/source/text/xtext.cxx index a9fd2db..ea909a3 100644 --- a/test/source/text/xtext.cxx +++ b/test/source/text/xtext.cxx @@ -34,18 +34,12 @@ namespace apitest { XText::~XText() {} -void XText::testInsertTextContent() +void XText::testInsertRemoveTextContent() { uno::Reference<text::XText> xText(init(), UNO_QUERY_THROW); uno::Reference<text::XTextRange> xCursor(xText->createTextCursor(), UNO_QUERY_THROW); xText->insertTextContent(xCursor, getTextContent(), sal_False); -} - -void XText::testRemoveTextContent() -{ - testInsertTextContent(); - uno::Reference<text::XText> xText(init(), UNO_QUERY_THROW); xText->removeTextContent(getTextContent()); } commit 7b773d9c25fbda03f6fd97503a4af6361a2a5e87 Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Thu May 3 23:19:31 2012 -0400 New API test for ScAnnotationShapeObj. Change-Id: I4a169493622abf789bb0ef146e553205b2eaba5d diff --git a/sc/CppunitTest_sc_annotationshapeobj.mk b/sc/CppunitTest_sc_annotationshapeobj.mk new file mode 100644 index 0000000..b298628 --- /dev/null +++ b/sc/CppunitTest_sc_annotationshapeobj.mk @@ -0,0 +1,134 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Initial Developer of the Original Code is +# Kohei Yoshida <kohei.yosh...@suse.com> +# Portions created by the Initial Developer are Copyright (C) 2011 the +# Initial Developer. All Rights Reserved. +# +# Major Contributor(s): +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. +#************************************************************************* + +$(eval $(call gb_CppunitTest_CppunitTest,sc_annonationshapeobj)) + +$(eval $(call gb_CppunitTest_add_exception_objects,sc_annonationshapeobj, \ + sc/qa/extras/scannotationshapeobj \ +)) + +$(eval $(call gb_CppunitTest_use_libraries,sc_annonationshapeobj, \ + avmedia \ + basegfx \ + comphelper \ + cppu \ + cppuhelper \ + drawinglayer \ + editeng \ + fileacc \ + for \ + forui \ + i18nisolang1 \ + msfilter \ + oox \ + sal \ + salhelper \ + sax \ + sb \ + sc \ + sfx \ + sot \ + svl \ + svt \ + svx \ + svxcore \ + test \ + tl \ + tk \ + subsequenttest \ + ucbhelper \ + unotest \ + utl \ + vbahelper \ + vcl \ + xo \ + $(gb_STDLIBS) \ +)) + +$(eval $(call gb_CppunitTest_set_include,sc_annonationshapeobj,\ + -I$(SRCDIR)/sc/source/ui/inc \ + -I$(SRCDIR)/sc/inc \ + $$(INCLUDE) \ +)) + +$(eval $(call gb_CppunitTest_use_api,sc_annonationshapeobj,\ + offapi \ + udkapi \ +)) + +$(eval $(call gb_CppunitTest_use_ure,sc_annonationshapeobj)) + +$(eval $(call gb_CppunitTest_use_components,sc_annonationshapeobj,\ + basic/util/sb \ + comphelper/util/comphelp \ + configmgr/source/configmgr \ + dbaccess/util/dba \ + fileaccess/source/fileacc \ + filter/source/config/cache/filterconfig1 \ + forms/util/frm \ + framework/util/fwk \ + i18npool/util/i18npool \ + oox/util/oox \ + package/source/xstor/xstor \ + package/util/package2 \ + sax/source/expatwrap/expwrap \ + sax/source/fastparser/fastsax \ + sc/util/sc \ + sc/util/scd \ + sc/util/scfilt \ + sc/util/vbaobj \ + scripting/source/basprov/basprov \ + scripting/util/scriptframe \ + sfx2/util/sfx \ + sot/util/sot \ + svl/source/fsstor/fsstorage \ + toolkit/util/tk \ + ucb/source/core/ucb1 \ + ucb/source/ucp/file/ucpfile1 \ + ucb/source/ucp/tdoc/ucptdoc1 \ + unotools/util/utl \ + unoxml/source/rdf/unordf \ + unoxml/source/service/unoxml \ +)) + +$(eval $(call gb_CppunitTest_use_configuration,sc_annonationshapeobj)) + +$(eval $(call gb_CppunitTest_use_filter_configuration,sc_annonationshapeobj)) + +$(eval $(call gb_CppunitTest_use_extra_configuration,sc_annonationshapeobj,\ + $(OUTDIR)/unittest/registry \ +)) + +# we need to +# - explicitly depend on the sc resource files needed at unit-test runtime +$(call gb_CppunitTest_get_target,sc_annonationshapeobj) : \ + $(WORKDIR)/AllLangRes/sc \ + +# vim: set noet sw=4 ts=4: diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx new file mode 100644 index 0000000..67e70e6 --- /dev/null +++ b/sc/qa/extras/scannotationshapeobj.cxx @@ -0,0 +1,129 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2012 Kohei Yoshida <kohei.yosh...@suse.com> + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#include <test/unoapi_test.hxx> +#include <test/text/xtext.hxx> + +#include <com/sun/star/sheet/XSheetAnnotationAnchor.hpp> +#include <com/sun/star/sheet/XSheetAnnotationShapeSupplier.hpp> +#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#include <com/sun/star/sheet/XSpreadsheet.hpp> + +#define NUMBER_OF_TESTS 2 + +namespace sc_apitest { + +class ScAnnotationShapeObj : public UnoApiTest, apitest::XText +{ +public: + ScAnnotationShapeObj(); + + + virtual void setUp(); + virtual void tearDown(); + virtual uno::Reference<uno::XInterface> init(); + virtual uno::Reference<text::XTextContent> getTextContent(); + + CPPUNIT_TEST_SUITE(ScAnnotationShapeObj); + + // XText + CPPUNIT_TEST(testInsertTextContent); + CPPUNIT_TEST(testRemoveTextContent); + + CPPUNIT_TEST_SUITE_END(); + +private: + static sal_Int32 nTest; + static uno::Reference<lang::XComponent> mxComponent; + static uno::Reference<text::XTextContent> mxField; +}; + +sal_Int32 ScAnnotationShapeObj::nTest = 0; +uno::Reference<lang::XComponent> ScAnnotationShapeObj::mxComponent; +uno::Reference<text::XTextContent> ScAnnotationShapeObj::mxField; + +ScAnnotationShapeObj::ScAnnotationShapeObj() {} + +void ScAnnotationShapeObj::setUp() +{ + ++nTest; + UnoApiTest::setUp(); +} + +void ScAnnotationShapeObj::tearDown() +{ + if (nTest == NUMBER_OF_TESTS) + { + mxField.clear(); + closeDocument(mxComponent); + } + + UnoApiTest::tearDown(); +} + +uno::Reference<uno::XInterface> ScAnnotationShapeObj::init() +{ + if (!mxComponent.is()) + // Load an empty document. + mxComponent = loadFromDesktop("private:factory/scalc"); + + uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, UNO_QUERY_THROW); + uno::Reference<container::XIndexAccess> xIA(xDoc->getSheets(), UNO_QUERY_THROW); + uno::Reference<sheet::XSpreadsheet> xSheet(xIA->getByIndex(0), UNO_QUERY_THROW); + + // Use cell A1 for this. + uno::Reference<table::XCell> xCell = xSheet->getCellByPosition(0, 0); + uno::Reference<sheet::XSheetAnnotationAnchor> xAnchor(xCell, UNO_QUERY_THROW); + uno::Reference<sheet::XSheetAnnotation> xAnnotation = xAnchor->getAnnotation(); + uno::Reference<text::XSimpleText> xAnnoText(xAnnotation, UNO_QUERY_THROW); + xAnnoText->setString("ScAnnotationShapeObj"); + + uno::Reference<sheet::XSheetAnnotationShapeSupplier> xShapeSupp(xAnnotation, UNO_QUERY_THROW); + uno::Reference<drawing::XShape> xShape = xShapeSupp->getAnnotationShape(); + + return xShape; +} + +uno::Reference<text::XTextContent> ScAnnotationShapeObj::getTextContent() +{ + if (!mxField.is()) + { + uno::Reference<lang::XMultiServiceFactory> xSM(mxComponent, UNO_QUERY_THROW); + mxField.set(xSM->createInstance("com.sun.star.text.TextField.DateTime"), UNO_QUERY_THROW); + } + return mxField; +} + +CPPUNIT_TEST_SUITE_REGISTRATION(ScAnnotationShapeObj); + +CPPUNIT_PLUGIN_IMPLEMENT(); + +} + + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit a4ff462ccb97bb578ec981f25e5b21401dccff9d Author: Kohei Yoshida <kohei.yosh...@gmail.com> Date: Thu May 3 23:18:01 2012 -0400 Added interface test for text::XText. Change-Id: I041b29d6e6314560a0f7fb7c0392c9a0f44fc1eb diff --git a/test/Library_subsequenttest.mk b/test/Library_subsequenttest.mk index e10df28..90a6647 100644 --- a/test/Library_subsequenttest.mk +++ b/test/Library_subsequenttest.mk @@ -83,6 +83,7 @@ $(eval $(call gb_Library_add_exception_objects,subsequenttest,\ test/source/sheet/xprintareas \ test/source/sheet/xspreadsheetdocument \ test/source/sheet/xspreadsheets2 \ + test/source/text/xtext \ test/source/text/xtextfield \ test/source/text/xtextcontent \ test/source/util/xreplaceable \ diff --git a/test/Package_inc.mk b/test/Package_inc.mk index 474eb6d..f217e98 100644 --- a/test/Package_inc.mk +++ b/test/Package_inc.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/datapilotfield.hxx,tes $(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xprintareas.hxx,test/sheet/xprintareas.hxx)) $(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xspreadsheetdocument.hxx,test/sheet/xspreadsheetdocument.hxx)) $(eval $(call gb_Package_add_file,test_inc,inc/test/sheet/xspreadsheets2.hxx,test/sheet/xspreadsheets2.hxx)) +$(eval $(call gb_Package_add_file,test_inc,inc/test/text/xtext.hxx,test/text/xtext.hxx)) $(eval $(call gb_Package_add_file,test_inc,inc/test/text/xtextfield.hxx,test/text/xtextfield.hxx)) $(eval $(call gb_Package_add_file,test_inc,inc/test/text/xtextcontent.hxx,test/text/xtextcontent.hxx)) $(eval $(call gb_Package_add_file,test_inc,inc/test/util/xreplaceable.hxx,test/util/xreplaceable.hxx)) diff --git a/test/inc/test/text/xtext.hxx b/test/inc/test/text/xtext.hxx new file mode 100644 index 0000000..29dbf34 --- /dev/null +++ b/test/inc/test/text/xtext.hxx @@ -0,0 +1,56 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2012 Kohei Yoshida <kohei.yosh...@suse.com> + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#ifndef __TEST_TEXT_XTEXT_HXX__ +#define __TEST_TEXT_XTEXT_HXX__ + +#include "test/testdllapi.hxx" + +#include <com/sun/star/text/XText.hpp> + +using namespace com::sun::star; + +namespace apitest { + +class OOO_DLLPUBLIC_TEST XText +{ +public: + virtual ~XText(); + + virtual uno::Reference<uno::XInterface> init() = 0; + virtual uno::Reference<text::XTextContent> getTextContent() = 0; + + void testInsertTextContent(); + void testRemoveTextContent(); +}; + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/test/source/text/xtext.cxx b/test/source/text/xtext.cxx new file mode 100644 index 0000000..a9fd2db --- /dev/null +++ b/test/source/text/xtext.cxx @@ -0,0 +1,54 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * Version: MPL 1.1 / GPLv3+ / LGPLv3+ + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License or as specified alternatively below. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * Major Contributor(s): + * Copyright (C) 2012 Kohei Yoshida <kohei.yosh...@suse.com> + * + * All Rights Reserved. + * + * For minor contributions see the git repository. + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 3 or later (the "GPLv3+"), or + * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), + * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable + * instead of those above. + */ + +#include "test/text/xtext.hxx" + +using namespace com::sun::star::uno; + +namespace apitest { + +XText::~XText() {} + +void XText::testInsertTextContent() +{ + uno::Reference<text::XText> xText(init(), UNO_QUERY_THROW); + uno::Reference<text::XTextRange> xCursor(xText->createTextCursor(), UNO_QUERY_THROW); + + xText->insertTextContent(xCursor, getTextContent(), sal_False); +} + +void XText::testRemoveTextContent() +{ + testInsertTextContent(); + uno::Reference<text::XText> xText(init(), UNO_QUERY_THROW); + xText->removeTextContent(getTextContent()); +} + +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits