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 /xmlhelp | |
| parent | c4e3596820d0d71a86bd2f88a428b34d2c587074 (diff) | |
use different OUString ctor for RTL_TEXTENCODING_UCS4
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/makefile.mk | 3 | ||||
| -rw-r--r-- | xmlhelp/source/helpcomponent/CLuceneHelpWrapper.cxx | 5 | ||||
| -rwxr-xr-x | xmlhelp/source/helpcomponent/makefile.mk | 5 |
3 files changed, 4 insertions, 9 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/makefile.mk b/xmlhelp/source/cxxhelp/provider/makefile.mk index 4c9a09948755..b70979741fef 100644 --- a/xmlhelp/source/cxxhelp/provider/makefile.mk +++ b/xmlhelp/source/cxxhelp/provider/makefile.mk @@ -67,9 +67,6 @@ LIBXSLTINCDIR=external$/libxslt CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR) .ENDIF -PKGCONFIG_MODULES=libclucene-core libclucene-contribs-lib -.INCLUDE : pkg_config.mk - .IF "$(GUI)"=="WNT" .IF "$(COM)"=="MSC" CFLAGS+=-GR diff --git a/xmlhelp/source/helpcomponent/CLuceneHelpWrapper.cxx b/xmlhelp/source/helpcomponent/CLuceneHelpWrapper.cxx index fb53fabd1010..40ee9be82bbd 100644 --- a/xmlhelp/source/helpcomponent/CLuceneHelpWrapper.cxx +++ b/xmlhelp/source/helpcomponent/CLuceneHelpWrapper.cxx @@ -61,7 +61,7 @@ public: } virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException ); - virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) + virtual void SAL_CALL setValue(const OUString&, const Any&) throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException ) { throw UnknownPropertyException(); @@ -83,7 +83,7 @@ public: #include <stdio.h> // FIXME: remove once the fprintf() calls below are gone -Any CLuceneHelpWrapper::invoke(const OUString& rFunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) +Any CLuceneHelpWrapper::invoke(const OUString& rFunctionName, const Sequence< Any >&, Sequence< sal_Int16 >&, Sequence< Any >& ) throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException ) { fprintf(stderr, "invoke something or other, %s\n", rtl::OUStringToOString(rFunctionName, RTL_TEXTENCODING_UTF8).getStr()); @@ -93,6 +93,7 @@ Any CLuceneHelpWrapper::invoke(const OUString& rFunctionName, const Sequence< An fprintf(stderr, "implement me, do indexing thing for extensions with help, but without pre-created index, make need to split l10ntools HelpIndexer tool into a lib and header that we can link to here"); else throw IllegalArgumentException(); + return Any(); } namespace diff --git a/xmlhelp/source/helpcomponent/makefile.mk b/xmlhelp/source/helpcomponent/makefile.mk index 50b635e62824..18cf4dc16eb0 100755 --- a/xmlhelp/source/helpcomponent/makefile.mk +++ b/xmlhelp/source/helpcomponent/makefile.mk @@ -37,9 +37,6 @@ ENABLE_EXCEPTIONS=TRUE SLOFILES=\ $(SLO)$/CLuceneHelpWrapper.obj -PKGCONFIG_MODULES=libclucene-core -.INCLUDE : pkg_config.mk - LIB1TARGET=$(SLB)$/_$(TARGET).lib LIB1OBJFILES=$(SLOFILES) @@ -52,7 +49,7 @@ SHL1STDLIBS=\ $(COMPHELPERLIB) \ $(UNOTOOLSLIB) \ $(SALLIB) \ - $(PKGCONFIG_LIBS) + $(LIBCLUCENE_LIBS) SHL1VERSIONMAP=$(SOLARENV)/src/component.map .INCLUDE : target.mk |