diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-02-20 20:42:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-02-23 10:31:19 +0000 |
| commit | 8f6321b77528b70f170a8f0e74ce003e8bd9219d (patch) | |
| tree | 9cbb1955542c862b7343d6b93bb06a4245d6d07f /scp2 | |
| parent | c4e3596820d0d71a86bd2f88a428b34d2c587074 (diff) | |
use different OUString ctor for RTL_TEXTENCODING_UCS4
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/file_library_ooo.scp | 13 | ||||
| -rw-r--r-- | scp2/source/ooo/makefile.mk | 4 | ||||
| -rw-r--r-- | scp2/source/ooo/module_hidden_ooo.scp | 3 |
3 files changed, 20 insertions, 0 deletions
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, |