diff options
| author | offtkp <parisoplop@gmail.com> | 2022-08-09 23:24:58 +0300 |
|---|---|---|
| committer | Tomaž Vajngerl <quikee@gmail.com> | 2022-08-19 10:24:43 +0200 |
| commit | d5472c797df5831bb95650ad8f3c0cf94512b819 (patch) | |
| tree | 8f5362278a11d87071eed147bdc7701fdb247bbc /vcl/qa/cppunit/GraphicFormatDetectorTest.cxx | |
| parent | 45705461d4597b736c44e006360f9072eed3fe85 (diff) | |
Remove code duplication in GraphicDescriptor for WMF/EMF
GraphicFormatDetector and GraphicDescriptor have duplicate format
detection code so now GraphicDescriptor uses GraphicFormatDetector
functions instead to detect the format for WMF/EMF files and their Z
compressed counterparts WMZ/EMZ
Change-Id: Ia054c782320923aaa0c2c8bda2f33c27c3b123d1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138067
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'vcl/qa/cppunit/GraphicFormatDetectorTest.cxx')
| -rw-r--r-- | vcl/qa/cppunit/GraphicFormatDetectorTest.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx index df7f552b15af..30cd8f9ebe1e 100644 --- a/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx +++ b/vcl/qa/cppunit/GraphicFormatDetectorTest.cxx @@ -117,7 +117,7 @@ void GraphicFormatDetectorTest::testDetectWMF() vcl::GraphicFormatDetector aDetector(aFileStream, "WMF"); CPPUNIT_ASSERT(aDetector.detect()); - CPPUNIT_ASSERT(aDetector.checkWMForEMF()); + CPPUNIT_ASSERT(aDetector.checkWMF()); aFileStream.Seek(aDetector.mnStreamPosition); @@ -129,10 +129,10 @@ void GraphicFormatDetectorTest::testDetectWMF() void GraphicFormatDetectorTest::testDetectWMZ() { SvFileStream aFileStream(getFullUrl(u"TypeDetectionExample.wmz"), StreamMode::READ); - vcl::GraphicFormatDetector aDetector(aFileStream, "WMF"); + vcl::GraphicFormatDetector aDetector(aFileStream, "WMZ"); CPPUNIT_ASSERT(aDetector.detect()); - CPPUNIT_ASSERT(aDetector.checkWMForEMF()); + CPPUNIT_ASSERT(aDetector.checkWMF()); aFileStream.Seek(aDetector.mnStreamPosition); @@ -357,7 +357,7 @@ void GraphicFormatDetectorTest::testDetectEMF() vcl::GraphicFormatDetector aDetector(aFileStream, "EMF"); CPPUNIT_ASSERT(aDetector.detect()); - CPPUNIT_ASSERT(aDetector.checkWMForEMF()); + CPPUNIT_ASSERT(aDetector.checkEMF()); aFileStream.Seek(aDetector.mnStreamPosition); @@ -369,10 +369,10 @@ void GraphicFormatDetectorTest::testDetectEMF() void GraphicFormatDetectorTest::testDetectEMZ() { SvFileStream aFileStream(getFullUrl(u"TypeDetectionExample.emz"), StreamMode::READ); - vcl::GraphicFormatDetector aDetector(aFileStream, "EMF"); + vcl::GraphicFormatDetector aDetector(aFileStream, "EMZ"); CPPUNIT_ASSERT(aDetector.detect()); - CPPUNIT_ASSERT(aDetector.checkWMForEMF()); + CPPUNIT_ASSERT(aDetector.checkEMF()); aFileStream.Seek(aDetector.mnStreamPosition); |