[Libreoffice-commits] core.git: vcl/qa

[Luboš Luňák (via logerrit)]

 vcl/qa/cppunit/svm/svmtest.cxx |   27 ---------------------------
 1 file changed, 27 deletions(-)

New commits:
commit 81435598545d98fbc082df11810e766590bbc856
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Sun Apr 14 20:31:17 2019 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Tue Apr 16 13:41:51 2019 +0200

    remove pointless #ifdef
    
    The two blocks are identical.
    
    Change-Id: I58464160009d1276bd1ca92482cd677c00471251
    Reviewed-on: https://gerrit.libreoffice.org/70776
    Tested-by: Jenkins
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>

diff --git a/vcl/qa/cppunit/svm/svmtest.cxx b/vcl/qa/cppunit/svm/svmtest.cxx
index c8c6847b6ae0..d2762a53db34 100644
--- a/vcl/qa/cppunit/svm/svmtest.cxx
+++ b/vcl/qa/cppunit/svm/svmtest.cxx
@@ -762,7 +762,6 @@ void SvmTest::checkBitmaps(const GDIMetaFile& rMetaFile)
 {
     xmlDocPtr pDoc = dumpMeta(rMetaFile);
 
-#ifdef LINUX
     assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}});
     assertXPathAttrs(pDoc, "/metafile/bmpscale[1]", {
         {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc", "281fc589"}
@@ -772,17 +771,6 @@ void SvmTest::checkBitmaps(const GDIMetaFile& rMetaFile)
         {"srcx", "2"},  {"srcy", "1"},  {"srcwidth", "4"},  {"srcheight", "3"},
         {"crc", "5e01ddcc"}
     });
-#else
-    assertXPathAttrs(pDoc, "/metafile/bmp[1]", {{"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}});
-    assertXPathAttrs(pDoc, "/metafile/bmpscale[1]", {
-        {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"}, {"crc", "281fc589"}
-    });
-    assertXPathAttrs(pDoc, "/metafile/bmpscalepart[1]", {
-        {"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"},
-        {"srcx", "2"},  {"srcy", "1"},  {"srcwidth", "4"},  {"srcheight", "3"},
-        {"crc", "5e01ddcc"}
-    });
-#endif
 }
 
 void SvmTest::testBitmaps()
@@ -817,20 +805,6 @@ void SvmTest::checkBitmapExs(const GDIMetaFile& rMetaFile)
 {
     xmlDocPtr pDoc = dumpMeta(rMetaFile);
 
-#ifdef LINUX
-    assertXPathAttrs(pDoc, "/metafile/bmpex[1]", {
-        {"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}, {"transparenttype", "bitmap"}
-    });
-    assertXPathAttrs(pDoc, "/metafile/bmpexscale[1]", {
-        {"x", "1"}, {"y", "2"}, {"width", "3"}, {"height", "4"},
-        {"crc", "281fc589"}, {"transparenttype", "bitmap"}
-    });
-    assertXPathAttrs(pDoc, "/metafile/bmpexscalepart[1]", {
-        {"destx", "1"}, {"desty", "2"}, {"destwidth", "3"}, {"destheight", "4"},
-        {"srcx", "2"},  {"srcy", "1"},  {"srcwidth", "4"},  {"srcheight", "3"},
-        {"crc", "5e01ddcc"}, {"transparenttype", "bitmap"}
-    });
-#else
     assertXPathAttrs(pDoc, "/metafile/bmpex[1]", {
         {"x", "1"}, {"y", "2"}, {"crc", "b8dee5da"}, {"transparenttype", "bitmap"}
     });
@@ -843,7 +817,6 @@ void SvmTest::checkBitmapExs(const GDIMetaFile& rMetaFile)
         {"srcx", "2"},  {"srcy", "1"},  {"srcwidth", "4"},  {"srcheight", "3"},
         {"crc", "5e01ddcc"}, {"transparenttype", "bitmap"}
     });
-#endif
 }
 
 void SvmTest::testBitmapExs()