[Libreoffice-commits] core.git: 2 commits - chart2/qa svx/source

[Michael Stahl]

 chart2/qa/extras/charttest.hxx |   16 +++++++++-------
 svx/source/unodraw/unomod.cxx  |    2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 3dc108c8e3df0ec26ef33e83c481eff6d629e5b7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 1 18:27:03 2014 +0200

    svx: little more verbose exception message
    
    Change-Id: I93d5d899fa073cd7ed18e9176b50679b0be95f70

diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 80999d4..4559088 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -191,7 +191,7 @@ css::uno::Reference<css::uno::XInterface> create(
 
     uno::Reference< uno::XInterface > xRet( SvxUnoDrawMSFactory::createTextField( rServiceSpecifier ) );
     if( !xRet.is() )
-        throw lang::ServiceNotRegisteredException();
+        throw lang::ServiceNotRegisteredException("unknown service: " + rServiceSpecifier);
 
     return xRet;
 }
commit 610544eda1f1add0ba9b184fe7c2bed56f050fc1
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Oct 1 18:25:47 2014 +0200

    chart2: fix the testDataLabelBordersDOCX on Mac
    
    This test failed on Mac because it depends on the layout being finished,
    since for SwXTextEmbeddedObjects the corresponding SwVirtFlyDrawObj are
    inserted in the draw page not on import, but in layout.
    
    Change-Id: I731b9b92838252ff50135f97343357992bc1933f

diff --git a/chart2/qa/extras/charttest.hxx b/chart2/qa/extras/charttest.hxx
index a76a76c..ad2cd55 100644
--- a/chart2/qa/extras/charttest.hxx
+++ b/chart2/qa/extras/charttest.hxx
@@ -49,6 +49,7 @@
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/chart/XChartDocument.hpp>
+#include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
 
@@ -458,13 +459,14 @@ uno::Reference<chart::XChartDocument> ChartTest::getChartDocFromDrawImpress(
 
 uno::Reference<chart::XChartDocument> ChartTest::getChartDocFromWriter( sal_Int32 nShape )
 {
-    Reference<drawing::XDrawPageSupplier> xPageSupp(mxComponent, uno::UNO_QUERY);
-    CPPUNIT_ASSERT(xPageSupp.is());
-
-    Reference<drawing::XDrawPage> xPage = xPageSupp->getDrawPage();
-    CPPUNIT_ASSERT(xPage.is());
-
-    Reference<beans::XPropertySet> xShapeProps(xPage->getByIndex(nShape), uno::UNO_QUERY);
+    // DO NOT use XDrawPageSupplier since SwVirtFlyDrawObj are not created
+    // during import, only in layout!
+    Reference<text::XTextEmbeddedObjectsSupplier> xEOS(mxComponent, uno::UNO_QUERY);
+    CPPUNIT_ASSERT(xEOS.is());
+    Reference<container::XIndexAccess> xEmbeddeds(xEOS->getEmbeddedObjects(), uno::UNO_QUERY);
+    CPPUNIT_ASSERT(xEmbeddeds.is());
+
+    Reference<beans::XPropertySet> xShapeProps(xEmbeddeds->getByIndex(nShape), uno::UNO_QUERY);
     CPPUNIT_ASSERT(xShapeProps.is());
 
     Reference<frame::XModel> xDocModel;