[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sw/qa

Christian Lohmaier lohmaier+LibreOffice at googlemail.com
Tue May 27 05:04:10 PDT 2014


 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit a9b339b7486398fae4463427d39c3b229b8e1f10
Author: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
Date:   Tue May 27 14:02:24 2014 +0200

    fix build-break on windows
    
    ae95cdd2a1708a8e9e114dd9bcf577f57f1f5af3 introduced a check, and did put
    it outside of a #if !defined(WNT) block...
    
    Change-Id: Id200c6f3161d0c6c611e0b1c293adbd060579cd7

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index f6c3591..ef0fa56 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -2055,7 +2055,6 @@ DECLARE_OOXMLEXPORT_TEST(testFDO78384,"fdo78384.docx")
         return;
     assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/w:rPr/w:rFonts","ascii","Wingdings");
 }
-#endif
 
 DECLARE_OOXMLEXPORT_TEST(testfdo79008, "fdo79008.docx")
 {
@@ -2067,6 +2066,8 @@ DECLARE_OOXMLEXPORT_TEST(testfdo79008, "fdo79008.docx")
         return;
 }
 
+#endif
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list