diff options
| author | Vladimir Glazunov <vg@openoffice.org> | 2009-12-10 18:37:36 +0100 |
|---|---|---|
| committer | Vladimir Glazunov <vg@openoffice.org> | 2009-12-10 18:37:36 +0100 |
| commit | 800d0c7ef6a59e2bd00f1de536fe3c8b5fea04b0 (patch) | |
| tree | d501ab88757ecf568d35aaf9cd849b9b11d0d23d | |
| parent | 1ec7f66ed8f162bdbcc320af4f20bf79a558d87f (diff) | |
| parent | e0838f570d254a525926ba79d8930df333119416 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes67
| -rw-r--r-- | ucb/source/ucp/gio/gio_mount.cxx | 2 | ||||
| -rw-r--r-- | xmlhelp/source/com/sun/star/help/MANIFEST.MF | 1 | ||||
| -rw-r--r-- | xmlhelp/source/com/sun/star/help/makefile.mk | 12 |
3 files changed, 4 insertions, 11 deletions
diff --git a/ucb/source/ucp/gio/gio_mount.cxx b/ucb/source/ucp/gio/gio_mount.cxx index 2756262ce91d..7360304e8328 100644 --- a/ucb/source/ucp/gio/gio_mount.cxx +++ b/ucb/source/ucp/gio/gio_mount.cxx @@ -68,7 +68,7 @@ static void ooo_mount_operation_class_init (OOoMountOperationClass *klass) using namespace com::sun::star; static void ooo_mount_operation_ask_password (GMountOperation *op, - const char *message, const char *default_user, + const char * /*message*/, const char *default_user, const char *default_domain, GAskPasswordFlags flags) { uno::Reference< task::XInteractionHandler > xIH; diff --git a/xmlhelp/source/com/sun/star/help/MANIFEST.MF b/xmlhelp/source/com/sun/star/help/MANIFEST.MF index bf0e4ab46cb2..a4c5d50fde5c 100644 --- a/xmlhelp/source/com/sun/star/help/MANIFEST.MF +++ b/xmlhelp/source/com/sun/star/help/MANIFEST.MF @@ -1,2 +1 @@ RegistrationClassName: com.sun.star.help.HelpComponent -Class-Path: lucene-core-2.3.jar lucene-analyzers-2.3.jar diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk index db6e619b31e3..8ba5d9a3a9a0 100644 --- a/xmlhelp/source/com/sun/star/help/makefile.mk +++ b/xmlhelp/source/com/sun/star/help/makefile.mk @@ -76,14 +76,15 @@ ADDFILES = $(subst,$(SOLARBINDIR)$/help,$(CLASSDIR) $(TRANSEX3FILES)) JARFILES = ridl.jar jurt.jar unoil.jar juh.jar .IF "$(SYSTEM_LUCENE)" == "YES" XCLASSPATH!:=$(XCLASSPATH)$(PATH_SEPERATOR)$(LUCENE_CORE_JAR)$(PATH_SEPERATOR)$(LUCENE_ANALYZERS_JAR) -COMP=fix_system_lucene +JARCLASSPATH = file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR) .ELSE JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar +JARCLASSPATH = lucene-core-2.3.jar lucene-analyzers-2.3.jar .ENDIF JARTARGET = LuceneHelpWrapper.jar JARCOMPRESS = TRUE -CUSTOMMANIFESTFILE = MANIFEST.MF +CUSTOMMANIFESTFILE = MANIFEST.MF # --- Targets ------------------------------------------------------ @@ -94,15 +95,8 @@ ALLTAR : $(ADDFILES) .IF "$(JARTARGETN)"!="" $(JAVATARGET) : $(ADDFILES) $(JARTARGETN) : $(ADDFILES) -$(JARTARGETN) : $(COMP) .ENDIF $(CLASSDIR)$/$(PACKAGE)$/%.class : $(SOLARBINDIR)$/help$/$(PACKAGE)$/%.class $(MKDIRHIER) $(@:d) $(COPY) $< $@ - - -fix_system_lucene: - @echo "Fix Java Class-Path entry for Lucene libraries from system." - @$(SED) -r -e "s#^(Class-Path:).*#\1 file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR)#" \ - -i ../../../../../$(INPATH)/class/HelpLinker/META-INF/MANIFEST.MF |