diff options
Diffstat (limited to 'xmlhelp/source')
| -rw-r--r-- | xmlhelp/source/com/sun/star/help/makefile.mk | 32 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 45 | ||||
| -rw-r--r-- | xmlhelp/source/treeview/makefile.mk | 2 | ||||
| -rw-r--r-- | xmlhelp/source/treeview/tvhlp.map | 9 |
4 files changed, 47 insertions, 41 deletions
diff --git a/xmlhelp/source/com/sun/star/help/makefile.mk b/xmlhelp/source/com/sun/star/help/makefile.mk index f802ad2467630..ffa08b30cfeda 100644 --- a/xmlhelp/source/com/sun/star/help/makefile.mk +++ b/xmlhelp/source/com/sun/star/help/makefile.mk @@ -28,42 +28,18 @@ PRJ = ..$/..$/..$/..$/.. PRJNAME = xmlhelp TARGET = HelpLinker -LIBBASENAME = helplinker PACKAGE = com$/sun$/star$/help -TARGETTYPE=CUI .IF "$(SOLAR_JAVA)"!="" # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : helplinker.pmk -.IF "$(SYSTEM_LIBXSLT)" == "YES" -CFLAGS+= $(LIBXSLT_CFLAGS) -.ELSE -LIBXSLTINCDIR=external$/libxslt -CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXSLTINCDIR) -.ENDIF - -.IF "$(SYSTEM_DB)" == "YES" -CFLAGS+=-DSYSTEM_DB -I$(DB_INCLUDES) -.ENDIF - -.IF "$(SYSTEM_EXPAT)" == "YES" -CFLAGS+=-DSYSTEM_EXPAT -.ENDIF - - JAVACLASSFILES = \ $(CLASSDIR)$/$(PACKAGE)$/HelpSearch.class \ $(CLASSDIR)$/$(PACKAGE)$/HelpComponent.class \ $(CLASSDIR)$/$(PACKAGE)$/HelpIndexer.class -JAVAFILES = \ - HelpSearch.java \ - HelpComponent.java \ - HelpIndexer.java - TRANSEX3FILES = \ $(SOLARBINDIR)$/help$/$(PACKAGE)$/HelpIndexerTool.class \ $(SOLARBINDIR)$/help$/$(PACKAGE)$/HelpFileDocument.class @@ -72,8 +48,8 @@ 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) -JARCLASSPATH = file://$(LUCENE_CORE_JAR) file://$(LUCENE_ANALYZERS_JAR) +EXTRAJARFILES = $(LUCENE_CORE_JAR) $(LUCENE_ANALYZERS_JAR) +JARCLASSPATH = $(EXTRAJARFILES) .ELSE JARFILES += lucene-core-2.3.jar lucene-analyzers-2.3.jar JARCLASSPATH = lucene-core-2.3.jar lucene-analyzers-2.3.jar @@ -87,14 +63,12 @@ CUSTOMMANIFESTFILE = MANIFEST.MF .INCLUDE : target.mk -ALLTAR : $(ADDFILES) - .IF "$(JARTARGETN)"!="" $(JAVATARGET) : $(ADDFILES) $(JARTARGETN) : $(ADDFILES) .ENDIF -$(CLASSDIR)$/$(PACKAGE)$/%.class : $(SOLARBINDIR)$/help$/$(PACKAGE)$/%.class +$(ADDFILES) : $(SOLARBINDIR)$/help$/$(PACKAGE)$/$$(@:f) $(MKDIRHIER) $(@:d) $(COPY) $< $@ diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index a2c70ca45b711..c5e2582b39056 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -57,6 +57,12 @@ #include <com/sun/star/script/XInvocation.hpp> #include <comphelper/locale.hxx> +#include <com/sun/star/awt/XToolkit.hpp> +#include <com/sun/star/awt/XExtendedToolkit.hpp> +#include <com/sun/star/awt/XWindowPeer.hpp> +#include <com/sun/star/awt/XVclWindowPeer.hpp> +#include <com/sun/star/awt/XTopWindow.hpp> + #include <l10ntools/compilehelp.hxx> #include <comphelper/storagehelper.hxx> @@ -1271,19 +1277,47 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, bool error = true; rtl::OUString fileURL; + sal_Bool bHighContrastMode = sal_False; + rtl::OUString aCSS( m_aCSS ); + if ( aCSS.compareToAscii( "default" ) == 0 ) + { + // #i50760: "default" needs to adapt HC mode + uno::Reference< awt::XToolkit > xToolkit = uno::Reference< awt::XToolkit >( + ::comphelper::getProcessServiceFactory()->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" ) ) ), uno::UNO_QUERY ); + if ( xToolkit.is() ) + { + uno::Reference< awt::XExtendedToolkit > xExtToolkit( xToolkit, uno::UNO_QUERY ); + if ( xExtToolkit.is() ) + { + uno::Reference< awt::XTopWindow > xTopWindow = xExtToolkit->getActiveTopWindow(); + if ( xTopWindow.is() ) + { + uno::Reference< awt::XVclWindowPeer > xVclWindowPeer( xTopWindow, uno::UNO_QUERY ); + if ( xVclWindowPeer.is() ) + { + uno::Any aHCMode = xVclWindowPeer->getProperty( rtl::OUString::createFromAscii( "HighContrastMode" ) ); + if ( ( aHCMode >>= bHighContrastMode ) && bHighContrastMode ) + aCSS = rtl::OUString::createFromAscii( "highcontrastblack" ); + } + } + } + } + } + while( error && retry ) { + if( retry == 2 ) fileURL = getInstallPathAsURL() + processLang( Language ) + rtl::OUString::createFromAscii( "/" ) + - m_aCSS + + aCSS + rtl::OUString::createFromAscii( ".css" ); else if( retry == 1 ) fileURL = getInstallPathAsURL() + - m_aCSS + + aCSS + rtl::OUString::createFromAscii( ".css" ); osl::DirectoryItem aDirItem; @@ -1304,6 +1338,13 @@ void Databases::cascadingStylesheet( const rtl::OUString& Language, } --retry; + if ( !retry && error && bHighContrastMode ) + { + // fall back to default css + aCSS = rtl::OUString::createFromAscii( "default" ); + retry = 2; + bHighContrastMode = sal_False; + } } if( error ) diff --git a/xmlhelp/source/treeview/makefile.mk b/xmlhelp/source/treeview/makefile.mk index df01c8a55ec71..0c385862d7728 100644 --- a/xmlhelp/source/treeview/makefile.mk +++ b/xmlhelp/source/treeview/makefile.mk @@ -58,7 +58,7 @@ SHL1STDLIBS=\ $(COMPHELPERLIB) \ $(EXPATASCII3RDLIB) \ $(SALLIB) -SHL1VERSIONMAP= $(TARGET).map +SHL1VERSIONMAP=$(SOLARENV)/src/component.map DEF1NAME=$(SHL1TARGET) DEF1DES=UCB : Treeview help diff --git a/xmlhelp/source/treeview/tvhlp.map b/xmlhelp/source/treeview/tvhlp.map deleted file mode 100644 index d432afe36358f..0000000000000 --- a/xmlhelp/source/treeview/tvhlp.map +++ /dev/null @@ -1,9 +0,0 @@ -TVHLP_1_0 { - global: - GetVersionInfo; - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -};
\ No newline at end of file |