diff options
| author | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2020-07-07 23:09:57 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2020-07-13 19:31:18 +0200 |
| commit | 4b0daa9ce768aec2a891a129b10e71aead0ca369 (patch) | |
| tree | e85b05c43e761ccabc14bf45a87ab5287c0f73b7 /emfio | |
| parent | fa844c15233f108a0e9b0b2e8c9757c1aa088a4b (diff) | |
move Primitive2dXmlDump from drawinglayer::tools to drawinglayer NS
drawinglayer::tools causes conflicts with ::tools namespace, so
better to move Primitive2dXmlDump out from this namespace as for
inspecting purposes it ccan be injected into existing code which
could break make it conflict and break compilation.
Change-Id: I5f9e594b2b8b1dd24067fa5f5ca3cfc4eefb85cd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98627
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'emfio')
| -rw-r--r-- | emfio/qa/cppunit/emf/EmfImportTest.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx index ac435905d570..ca42b307211b 100644 --- a/emfio/qa/cppunit/emf/EmfImportTest.cxx +++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx @@ -76,7 +76,7 @@ Primitive2DSequence Test::parseEmf(const OUString& aSource) void Test::checkRectPrimitive(Primitive2DSequence const & rPrimitive) { - drawinglayer::tools::Primitive2dXmlDump dumper; + drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer<Primitive2DContainer>(rPrimitive)); CPPUNIT_ASSERT (pDocument); @@ -103,7 +103,7 @@ void Test::TestDrawString() // first, get the sequence of primitives and dump it Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestDrawString.emf"); CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequence.getLength())); - drawinglayer::tools::Primitive2dXmlDump dumper; + drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer<Primitive2DContainer>(aSequence)); CPPUNIT_ASSERT (pDocument); @@ -125,7 +125,7 @@ void Test::TestDrawStringTransparent() // first, get the sequence of primitives and dump it Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestDrawStringTransparent.emf"); CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequence.getLength())); - drawinglayer::tools::Primitive2dXmlDump dumper; + drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer<Primitive2DContainer>(aSequence)); CPPUNIT_ASSERT (pDocument); @@ -148,7 +148,7 @@ void Test::TestDrawLine() // first, get the sequence of primitives and dump it Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestDrawLine.emf"); CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequence.getLength())); - drawinglayer::tools::Primitive2dXmlDump dumper; + drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer<Primitive2DContainer>(aSequence)); CPPUNIT_ASSERT (pDocument); @@ -162,7 +162,7 @@ void Test::TestLinearGradient() // This unit checks for a correct import of an EMF+ file with LinearGradient brush Primitive2DSequence aSequence = parseEmf("/emfio/qa/cppunit/emf/data/TestLinearGradient.emf"); CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(aSequence.getLength())); - drawinglayer::tools::Primitive2dXmlDump dumper; + drawinglayer::Primitive2dXmlDump dumper; xmlDocUniquePtr pDocument = dumper.dumpAndParse(comphelper::sequenceToContainer<Primitive2DContainer>(aSequence)); CPPUNIT_ASSERT (pDocument); |