From 8f6321b77528b70f170a8f0e74ce003e8bd9219d Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 20 Feb 2012 20:42:19 +0000
Subject: use different OUString ctor for RTL_TEXTENCODING_UCS4

---
 scp2/source/ooo/file_library_ooo.scp  | 13 +++++++++++++
 scp2/source/ooo/makefile.mk           |  4 ++++
 scp2/source/ooo/module_hidden_ooo.scp |  3 +++
 3 files changed, 20 insertions(+)

(limited to 'scp2')

diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 76f65c59afdf..4ca915cf6b07 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -76,6 +76,19 @@ File gid_File_Lib_Cached1
   #endif
 End
 
+#ifndef SYSTEM_CLUCENE
+File gid_File_Lib_CLucene
+    LIB_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+    Name = STRING(CONCAT2(libclucene,UNXSUFFIX));
+  #else
+    Name = "clucene.dll";
+  #endif
+End
+#endif
+
 SPECIAL_COMPONENT_LIB_FILE(gid_File_Lib_Configmgr, configmgr.uno)
 
 #ifdef WITH_LDAP
diff --git a/scp2/source/ooo/makefile.mk b/scp2/source/ooo/makefile.mk
index bd1036b38cdc..e7e57dbce791 100644
--- a/scp2/source/ooo/makefile.mk
+++ b/scp2/source/ooo/makefile.mk
@@ -101,6 +101,10 @@ SCPDEFS+=-DENABLE_CAIROCANVAS
 .ENDIF
 .ENDIF
 
+.IF "$(SYSTEM_LUCENE)" == "YES"
+SCPDEFS+=-DSYSTEM_LUCENE
+.ENDIF
+
 .IF "$(SYSTEM_EXPAT)" == "YES"
 SCPDEFS+=-DSYSTEM_EXPAT
 .ENDIF
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 5f6684aa8ef3..f3a301b1f463 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -337,6 +337,9 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Stringresource,
 	gid_File_Lib_Ldapbe2,
 	gid_File_Lib_Cached1,
+#if ! defined SYSTEM_CLUCENE
+        gid_File_Lib_CLucene,
+#endif
         gid_File_Lib_CLuceneHelpWrapper,
 	gid_File_Lib_Comphelper2,
 	gid_File_Lib_Curl,
-- 
cgit v1.2.3