[Libreoffice-commits] .: 3 commits - lotuswordpro/qa writerfilter/inc writerfilter/Library_writerfilter.mk

[Tor Lillqvist]

 lotuswordpro/qa/cppunit/test_lotuswordpro.cxx      |    8 ++++++--
 writerfilter/Library_writerfilter.mk               |    1 +
 writerfilter/inc/resourcemodel/LoggedResources.hxx |    4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 84889f9ff59640f371f73cbaf34fa4ea07413110
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun May 15 13:40:35 2011 +0300

    Export the LoggedResourcesHelper class

diff --git a/writerfilter/inc/resourcemodel/LoggedResources.hxx b/writerfilter/inc/resourcemodel/LoggedResources.hxx
index 32e7a25..97ca843 100644
--- a/writerfilter/inc/resourcemodel/LoggedResources.hxx
+++ b/writerfilter/inc/resourcemodel/LoggedResources.hxx
@@ -31,10 +31,12 @@
 #include "WW8ResourceModel.hxx"
 #include "TagLogger.hxx"
 
+#include <WriterFilterDllApi.hxx>
+
 namespace writerfilter
 {
 
-class LoggedResourcesHelper
+class WRITERFILTER_DLLPUBLIC LoggedResourcesHelper
 {
 public:
     explicit LoggedResourcesHelper(TagLogger::Pointer_t pLogger, const string & sPrefix);
commit 60d94543cc5196bb1fb7396b5007838a0370a9a3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun May 15 13:39:23 2011 +0300

    The writerfilter library needs the resourcemodel library, it seems

diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 2bb7529..6e42441 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -47,6 +47,7 @@ $(eval $(call gb_Library_set_defs,writerfilter,\
 ))
 
 $(eval $(call gb_Library_add_linked_libs,writerfilter,\
+    resourcemodel \
     comphelper \
     cppu \
     cppuhelper \
commit aeb8b74ef6c6249020dfab9c012e57e11b00c886
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Sun May 15 12:51:40 2011 +0300

    Fix lotuswordpro unit test on Windows
    
    file: URLs on Windows are of the form file:///c:/path/to/file , and
    the SRC_ROOT environment variable is of the form C:/lo/git/master, so
    we can't just concatenate "file://" and SRC_ROOT, but have to insert a
    "/".
    
    Windows programs don't understand Cygwin symlinks, so we have to
    specify the path from SRC_ROOT to lotuswordpro through an explicit
    clone/filters path.

diff --git a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
index 5591655..2766253 100644
--- a/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
+++ b/lotuswordpro/qa/cppunit/test_lotuswordpro.cxx
@@ -82,6 +82,10 @@ namespace
         const char* pSrcRoot = getenv( "SRC_ROOT" );
         CPPUNIT_ASSERT_MESSAGE("SRC_ROOT env variable not set", pSrcRoot != NULL && pSrcRoot[0] != 0);
 
+#ifdef WNT
+        if (pSrcRoot[1] == ':')
+            m_aSrcRoot += rtl::OUString::createFromAscii( "/" );
+#endif
         m_aSrcRoot += rtl::OUString::createFromAscii( pSrcRoot );
 
         //Without this we're crashing because callees are using
@@ -143,8 +147,8 @@ namespace
 
     void LotusWordProTest::test()
     {
-        recursiveScan(m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/lotuswordpro/qa/cppunit/data/pass")), true);
-        recursiveScan(m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/lotuswordpro/qa/cppunit/data/fail/")), false);
+        recursiveScan(m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/clone/filters/lotuswordpro/qa/cppunit/data/pass")), true);
+        recursiveScan(m_aSrcRoot + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/clone/filters/lotuswordpro/qa/cppunit/data/fail/")), false);
 
         printf("LotusWordPro: tested %d files\n", m_nLoadedDocs);
     }