[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa

[Jens Carl (via logerrit)]

 qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv |    4 ----
 sc/qa/extras/scannotationshapeobj.cxx                                |    8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit b3e98730b324c6343a024e18075817241fe25437
Author:     Jens Carl <j.carl43 at gmx.de>
AuthorDate: Sat Sep 14 23:09:32 2019 -0700
Commit:     Jens Carl <j.carl43 at gmx.de>
CommitDate: Sun Sep 15 19:42:39 2019 +0200

    tdf#45904 Move XSimpleText Java tests to C++
    
    Move XSimpleText Java tests to C++ for ScAnnotationShapeObj.
    
    Change-Id: Ib8d071dce2ee5906b85537b3fca7bcf7b238e735
    Reviewed-on: https://gerrit.libreoffice.org/78926
    Tested-by: Jenkins
    Reviewed-by: Jens Carl <j.carl43 at gmx.de>

diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
index 3a76ca37b9f5..76fb02c79042 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
@@ -101,10 +101,6 @@
 "ScAnnotationShapeObj";"com::sun::star::drawing::LineProperties";"LineStartWidth#optional"
 "ScAnnotationShapeObj";"com::sun::star::drawing::LineProperties";"LineEndCenter#optional"
 "ScAnnotationShapeObj";"com::sun::star::drawing::LineProperties";"LineEndWidth#optional"
-"ScAnnotationShapeObj";"com::sun::star::text::XSimpleText";"createTextCursor()"
-"ScAnnotationShapeObj";"com::sun::star::text::XSimpleText";"createTextCursorByRange()"
-"ScAnnotationShapeObj";"com::sun::star::text::XSimpleText";"insertString()"
-"ScAnnotationShapeObj";"com::sun::star::text::XSimpleText";"insertControlCharacter()"
 "ScAnnotationShapeObj";"com::sun::star::drawing::TextProperties";"IsNumbering#optional"
 "ScAnnotationShapeObj";"com::sun::star::drawing::TextProperties";"NumberingRules#optional"
 "ScAnnotationShapeObj";"com::sun::star::drawing::TextProperties";"TextAutoGrowHeight"
diff --git a/sc/qa/extras/scannotationshapeobj.cxx b/sc/qa/extras/scannotationshapeobj.cxx
index 48f97b1be887..f8e0fa0d93d9 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -11,6 +11,7 @@
 #include <test/drawing/captionshape.hxx>
 #include <test/drawing/xshape.hxx>
 #include <test/drawing/xshapedescriptor.hxx>
+#include <test/text/xsimpletext.hxx>
 #include <test/text/xtext.hxx>
 
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -38,6 +39,7 @@ class ScAnnotationShapeObj : public CalcUnoApiTest,
                              public apitest::CaptionShape,
                              public apitest::XShape,
                              public apitest::XShapeDescriptor,
+                             public apitest::XSimpleText,
                              public apitest::XText
 {
 public:
@@ -60,6 +62,12 @@ public:
     // XShapeDescriptor
     CPPUNIT_TEST(testGetShapeType);
 
+    // XSimpleText
+    CPPUNIT_TEST(testCreateTextCursor);
+    CPPUNIT_TEST(testCreateTextCursorByRange);
+    CPPUNIT_TEST(testInsertControlCharacter);
+    CPPUNIT_TEST(testInsertString);
+
     // XText
     CPPUNIT_TEST(testInsertRemoveTextContent);