diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-18 18:45:45 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | 058a3d1c46449dd5159bae30c83db4c2c5c335b4 (patch) | |
| tree | 28fae22c49b9cecdda52aa148dde2aba2b568ff9 /xmlhelp | |
| parent | bd2f7ef662122d5c1202911cb2f3b0ab1e124695 (diff) | |
Further work on the "Mac-like app structure" option
Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.
Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
Diffstat (limited to 'xmlhelp')
| -rw-r--r-- | xmlhelp/Package_helpxsl.mk | 2 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/provider/provider.cxx | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/xmlhelp/Package_helpxsl.mk b/xmlhelp/Package_helpxsl.mk index ca862769e5e2..79bd3abd3ad7 100644 --- a/xmlhelp/Package_helpxsl.mk +++ b/xmlhelp/Package_helpxsl.mk @@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,xmlhelp_helpxsl,$(SRCDIR)/xmlhelp/util)) $(eval $(call gb_Package_set_outdir,xmlhelp_helpxsl,$(INSTDIR))) -$(eval $(call gb_Package_add_files,xmlhelp_helpxsl,help,\ +$(eval $(call gb_Package_add_files,xmlhelp_helpxsl,$(LIBO_SHARE_HELP_FOLDER),\ idxcaption.xsl \ idxcontent.xsl \ main_transform.xsl \ diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index 40206dba33f7..3c2235e88acf 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -17,11 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -/************************************************************************** - TODO - ************************************************************************** - - *************************************************************************/ +#include <config_folders.h> #include <stdio.h> #include <osl/file.hxx> @@ -235,7 +231,7 @@ void ContentProvider::init() OUString instPath( getKey( xHierAccess,"Path/Current/Help" ) ); if( instPath.isEmpty() ) // try to determine path from default - instPath = OUString( "$(instpath)/help" ); + instPath = OUString( "$(instpath)/" LIBO_SHARE_HELP_FOLDER ); // replace anything like $(instpath); subst( instPath ); |