[Libreoffice-commits] core.git: libreofficekit/qa libreofficekit/source

[Matúš Kukan]

 libreofficekit/qa/unit/tiledrendering.cxx |    3 ++-
 libreofficekit/source/shim.c              |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit a95934d8dbd91e3c6250578171483859cb11f3c2
Author: Matúš Kukan <matus.kukan at collabora.com>
Date:   Thu Jul 17 10:35:49 2014 +0200

    Fix some CppunitTest_libreofficekit_tiledrendering related problems
    
    Change-Id: Icdcde0af1b3d5744ef2842e4b4d2b85a094ac686

diff --git a/libreofficekit/qa/unit/tiledrendering.cxx b/libreofficekit/qa/unit/tiledrendering.cxx
index d48e304..67fa62e 100644
--- a/libreofficekit/qa/unit/tiledrendering.cxx
+++ b/libreofficekit/qa/unit/tiledrendering.cxx
@@ -42,7 +42,8 @@ public:
 void TiledRenderingTest::testOverlay()
 {
     const string sSrcRoot = getenv( "SRC_ROOT" );
-    const string sLOPath = sSrcRoot + "/instdir/program";
+    const string sInstDir = getenv( "INSTDIR" );
+    const string sLOPath = sInstDir + "/program";
     const string sDocPath = sSrcRoot + "/odk/examples/java/DocumentHandling/test/test1.odt";
 
     scoped_ptr< Office > pOffice( lok_cpp_init(
diff --git a/libreofficekit/source/shim.c b/libreofficekit/source/shim.c
index ac272e8..b533a61 100644
--- a/libreofficekit/source/shim.c
+++ b/libreofficekit/source/shim.c
@@ -22,7 +22,7 @@
 #endif
 
 #define TARGET_LIB        "lib" "sofficeapp" ".so"
-#define TARGET_MERGED_LIB "lib" "libmergedlo" ".so"
+#define TARGET_MERGED_LIB "lib" "mergedlo" ".so"
 
 typedef LibreOfficeKit *(HookFunction)( const char *install_path);