summaryrefslogtreecommitdiff
path: root/svgio
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-06-30 14:35:23 +0200
committerNoel Grandin <noelgrandin@gmail.com>2015-07-06 06:14:15 +0000
commit89c77994d4638c86635c70535fab6508e2f3d900 (patch)
tree6a48a4f188e8f163c803d6af90cc4eb32ffdbf67 /svgio
parent64385c7555c6bbb089f3ab8b2a5b623cadd6ee7d (diff)
remove some unnecessary typedefs around uno::Reference
Not very useful these days, since we have the css:: prefix to reduce verbosity. Found with a search like: git grep -nP 'typedef .*uno::Reference.*<.*>\s+\w+;' | grep -v 'std::' Change-Id: I16f41c53837ec5c613545ae45df38b0daddcbadd Reviewed-on: https://gerrit.libreoffice.org/16730 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svgio')
-rw-r--r--svgio/qa/cppunit/SvgImportTest.cxx16
1 files changed, 8 insertions, 8 deletions
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx
index e97160fae71a..e756a1a89156 100644
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@@ -34,11 +34,11 @@ using drawinglayer::primitive2d::arePrimitive2DSequencesEqual;
class Test : public test::BootstrapFixture, public XmlTestTools
{
- void checkRectPrimitive(Primitive2DSequence& rPrimitive);
+ void checkRectPrimitive(css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > >& rPrimitive);
void testStyles();
- Primitive2DSequence parseSvg(const char* aSource);
+ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > parseSvg(const char* aSource);
public:
virtual void setUp() SAL_OVERRIDE;
@@ -49,7 +49,7 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-Primitive2DSequence Test::parseSvg(const char* aSource)
+css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > Test::parseSvg(const char* aSource)
{
const Reference<XSvgParser> xSvgParser = SvgTools::create(m_xContext);
@@ -78,7 +78,7 @@ void Test::tearDown()
BootstrapFixture::tearDown();
}
-void Test::checkRectPrimitive(Primitive2DSequence& rPrimitive)
+void Test::checkRectPrimitive(css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > >& rPrimitive)
{
Primitive2dXmlDump dumper;
xmlDocPtr pDocument = dumper.dumpAndParse(rPrimitive);
@@ -96,19 +96,19 @@ void Test::checkRectPrimitive(Primitive2DSequence& rPrimitive)
// however the end result should be the same.
void Test::testStyles()
{
- Primitive2DSequence aSequenceRect = parseSvg("/svgio/qa/cppunit/data/Rect.svg");
+ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aSequenceRect = parseSvg("/svgio/qa/cppunit/data/Rect.svg");
CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRect.getLength());
checkRectPrimitive(aSequenceRect);
- Primitive2DSequence aSequenceRectWithStyle = parseSvg("/svgio/qa/cppunit/data/RectWithStyles.svg");
+ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aSequenceRectWithStyle = parseSvg("/svgio/qa/cppunit/data/RectWithStyles.svg");
CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRectWithStyle.getLength());
checkRectPrimitive(aSequenceRectWithStyle);
- Primitive2DSequence aSequenceRectWithParentStyle = parseSvg("/svgio/qa/cppunit/data/RectWithParentStyles.svg");
+ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aSequenceRectWithParentStyle = parseSvg("/svgio/qa/cppunit/data/RectWithParentStyles.svg");
CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRectWithParentStyle.getLength());
checkRectPrimitive(aSequenceRectWithParentStyle);
- Primitive2DSequence aSequenceRectWithStylesByGroup = parseSvg("/svgio/qa/cppunit/data/RectWithStylesByGroup.svg");
+ css::uno::Sequence< css::uno::Reference< css::graphic::XPrimitive2D > > aSequenceRectWithStylesByGroup = parseSvg("/svgio/qa/cppunit/data/RectWithStylesByGroup.svg");
CPPUNIT_ASSERT_EQUAL(1, (int) aSequenceRectWithStylesByGroup.getLength());
checkRectPrimitive(aSequenceRectWithStylesByGroup);