[Libreoffice-commits] core.git: include/unotest unotest/source

Michael Stahl mstahl at redhat.com
Fri Jan 17 07:11:23 PST 2014


 include/unotest/bootstrapfixturebase.hxx    |    3 +++
 unotest/source/cpp/bootstrapfixturebase.cxx |    8 ++++++++
 2 files changed, 11 insertions(+)

New commits:
commit 769778e489722f454fa3d81ffcf73f1934a0a88b
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 17 16:07:36 2014 +0100

    test::BootstrapFixtureBase::getPathFromWorkdir not unused
    
    Change-Id: I4ddad27d1e5a4de9885956b80db37f1e2f80a96e

diff --git a/include/unotest/bootstrapfixturebase.hxx b/include/unotest/bootstrapfixturebase.hxx
index d69be43..c447f4f 100644
--- a/include/unotest/bootstrapfixturebase.hxx
+++ b/include/unotest/bootstrapfixturebase.hxx
@@ -62,9 +62,12 @@ public:
   // return a Path to a given c-str path from the source directory
   OUString getPathFromSrc( const char *pPath );
 
+
   // return a URL to a given c-str path from the workdir directory
   OUString getURLFromWorkdir( const char *pPath );
 
+  // return a Path to a given c-str path from the workdir directory
+  OUString getPathFromWorkdir( const char *pPath );
   virtual void setUp();
   virtual void tearDown();
 
diff --git a/unotest/source/cpp/bootstrapfixturebase.cxx b/unotest/source/cpp/bootstrapfixturebase.cxx
index cc8ae3f..87a72a7 100644
--- a/unotest/source/cpp/bootstrapfixturebase.cxx
+++ b/unotest/source/cpp/bootstrapfixturebase.cxx
@@ -83,6 +83,14 @@ OUString test::BootstrapFixtureBase::getURLFromWorkdir( const char *pPath )
     return m_aWorkdirRootURL + OUString::createFromAscii( pPath );
 }
 
+#ifdef _WIN32 // ifdef just to keep it out of unusedcode.easy
+OUString test::BootstrapFixtureBase::getPathFromWorkdir( const char *pPath )
+{
+    return m_aWorkdirRootPath + OUString::createFromAscii( pPath );
+
+}
+#endif
+
 void test::BootstrapFixtureBase::setUp()
 {
     // set UserInstallation to user profile dir in test/user-template


More information about the Libreoffice-commits mailing list