[Libreoffice-commits] core.git: 10 commits - afms/ExternalPackage_fontunxafm.mk basic/source comphelper/source config_host/config_folders.h.in config_host.mk.in configmgr/source configure.ac connectivity/source cppuhelper/source crashrep/source cui/source dbaccess/source desktop/Library_sofficeapp.mk desktop/Package_branding.mk desktop/source extensions/source extras/AllLangPackage_accessoriestemplateseducate.mk extras/AllLangPackage_accessoriestemplatesfinance.mk extras/AllLangPackage_accessoriestemplatesforms.mk extras/AllLangPackage_accessoriestemplateslabels.mk extras/AllLangPackage_accessoriestemplateslayout.mk extras/AllLangPackage_accessoriestemplatesmisc.mk extras/AllLangPackage_accessoriestemplates.mk extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk extras/AllLangPackage_accessoriestemplatesnonf reelayout.mk extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk extras/AllLangPackage_accessoriestemplatesnonfree.mk extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk extras/AllLangPackage_accessoriestemplatesofficorr.mk extras/AllLangPackage_accessoriestemplatesoffimisc.mk extras/AllLangPackage_accessoriestemplatespersonal.mk extras/AllLangPackage_accessoriestemplatespresent.mk extras/AllLangPackage_autotextshare.mk extras/ExternalPackage_accessoriesgallerydrawspeople.mk extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk extras/ExternalPackage_accessoriesgallery.mk extras/ExternalPackage_accessoriesgallerynonfree.mk extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk extras/ExternalPackage_accessorie sgalleryphotoscities.mk extras/ExternalPackage_accessoriesgalleryphotosfauna.mk extras/ExternalPackage_accessoriesgalleryphotosflowers.mk extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk extras/ExternalPackage_accessoriesgalleryphotoshumans.mk extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk extras/ExternalPackage_accessoriesgalleryphotosobjects.mk extras/ExternalPackage_accessoriesgalleryphotosplants.mk extras/ExternalPackage_accessoriesgalleryphotosspace.mk extras/ExternalPackage_accessoriesgalleryphotosstatues.mk extras/ExternalPackage_accessoriesgalleryphotostravel.mk extras/ExternalPackage_accessoriestemplatescommoneducate.mk extras/ExternalPackage_accessoriestemplatescommonfinance.mk extras/ExternalPackage_accessoriestemplatescommonforms.mk extras/ExternalPackage_accessoriestemplatescommonlabels.mk extras/ExternalPackage_accessoriestemplatescommonlayout.mk extras/ExternalPackage_accessoriestemplatescommonmisc.mk extras/ExternalPackage_access oriestemplatescommon.mk extras/ExternalPackage_accessoriestemplatescommonofficorr.mk extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk extras/ExternalPackage_accessoriestemplatescommonpersonal.mk extras/ExternalPackage_accessoriestemplatescommonpresent.mk extras/ExternalPackage_extra_fonts.mk extras/Gallery_arrows.mk extras/Gallery_computers.mk extras/Gallery_diagrams.mk extras/Gallery_education.mk extras/Gallery_environment.mk extras/Gallery_finance.mk extras/Gallery_people.mk extras/Gallery_sound.mk extras/Gallery_symbols.mk extras/Gallery_transportation.mk extras/Gallery_txtshapes.mk extras/Package_autocorr.mk extras/Package_autotextuser.mk extras/Package_cfgsrvbitmapunx.mk extras/Package_cfgsrvnolang.mk extras/Package_cfgusr.mk extras/Package_databasebiblio.mk extras/Package_database.mk extras/Package_fonts.mk extras/Package_gallbullets.mk extras/Package_gallhtmlexpo.mk extras/Package_gallmytheme.mk extras/Package_gallroot.mk extras/Package_gallsystem.mk extra s/Package_gallwwwback.mk extras/Package_gallwwwgraf.mk extras/Package_glade.mk extras/Package_labels.mk extras/Package_newfiles.mk extras/Package_palettes.mk extras/Package_tpllayoutimpr.mk extras/Package_tplwizagenda.mk extras/Package_tplwizbitmap.mk extras/Package_tplwizdesktop.mk extras/Package_tplwizfax.mk extras/Package_tplwizletter.mk extras/Package_tplwizreport.mk extras/Package_tplwizstyles.mk filter/Package_docbook.mk filter/Package_xhtml.mk filter/Package_xslt.mk filter/source framework/inc framework/Package_dtd.mk framework/source i18nlangtag/source jvmfwk/plugins jvmfwk/source libexttextcat/ExternalPackage_fingerprint.mk liblangtag/ExternalPackage_langtag_data.mk liblangtag/ExternalPackage_liblangtag_data.mk librelogo/Package_librelogo.mk librelogo/Package_librelogo_properties.mk Makefile.in more_fonts/ExternalPackage_dejavu.mk more_fonts/ExternalPackage_gentium.mk more_fonts/ExternalPackage_liberation.mk more_fonts/ExternalPackage_liberation_narrow.mk more_fonts /ExternalPackage_libertineg.mk more_fonts/ExternalPackage_opensans.mk more_fonts/ExternalPackage_ptserif.mk more_fonts/ExternalPackage_sourcecode.mk more_fonts/ExternalPackage_sourcesans.mk more_fonts/Package_conf.mk officecfg/Package_misc.mk officecfg/registry package/Package_dtd.mk postprocess/Package_images_install.mk postprocess/Package_registry_install.mk psprint_config/Package_fontunxppds.mk psprint_config/Package_fontunxpsprint.mk python3/GeneratedPackage_python3.mk pyuno/CustomTarget_python_shell.mk pyuno/Package_python_scripts_install.mk pyuno/source pyuno/zipcore reportbuilder/Package_reportbuilder-templates.mk RepositoryExternal.mk sal/osl sal/rtl scp2/inc scp2/InstallModule_base.mk scp2/InstallModule_calc.mk scp2/InstallModule_draw.mk scp2/InstallModule_graphicfilter.mk scp2/InstallModule_impress.mk scp2/InstallModule_math.mk scp2/InstallModule_ooo.mk scp2/InstallModule_python.mk scp2/InstallModule_ure.mk scp2/InstallModule_writer.mk scp2/source scripting/example s scripting/java scripting/Package_java_jars.mk scripting/Package_java.mk scripting/Package_scriptbindinglib.mk scripting/Package_scriptproviderforpython.mk scripting/Package_ScriptsBeanShell.mk scripting/Package_ScriptsJavaScript.mk scripting/Package_ScriptsPython.mk scripting/source sdext/source sd/Package_opengl.mk sd/Package_web.mk sd/Package_xml.mk sfx2/source shell/source smoketest/CppunitTest_smoketest.mk smoketest/Module_smoketest.mk solenv/bin solenv/gbuild svtools/source svx/source sw/source tools/source unotools/source ure/source uui/source vcl/aqua vcl/coretext vcl/generic vcl/source vcl/win wizards/Package_depot.mk wizards/Package_euro.mk wizards/Package_form.mk wizards/Package_gimmicks.mk wizards/Package_import.mk wizards/Package_share.mk wizards/Package_standard.mk wizards/Package_template.mk wizards/Package_tools.mk wizards/Package_tutorials.mk wizards/Package_usr.mk wizards/source xmlhelp/Package_helpxsl.mk xmlhelp/source xmloff/Package_dtd.mk xmlscript/Pack age_dtd.mk xmlscript/test
Tor Lillqvist
tml at iki.fi
Sun Aug 18 11:35:28 PDT 2013
Makefile.in | 4
RepositoryExternal.mk | 2
afms/ExternalPackage_fontunxafm.mk | 2
basic/source/uno/namecont.cxx | 3
comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 3
config_host.mk.in | 7
config_host/config_folders.h.in | 6
configmgr/source/components.cxx | 4
configure.ac | 49 +++
connectivity/source/drivers/hsqldb/HDriver.cxx | 8
cppuhelper/source/paths.cxx | 14
crashrep/source/win32/soreport.cxx | 4
cui/source/options/personalization.cxx | 4
dbaccess/source/ui/dlg/odbcconfig.cxx | 3
desktop/Library_sofficeapp.mk | 12
desktop/Package_branding.mk | 4
desktop/source/app/app.cxx | 5
desktop/source/app/check_ext_deps.cxx | 4
desktop/source/app/cmdlineargs.cxx | 13
desktop/source/app/userinstall.cxx | 3
desktop/source/deployment/misc/dp_dependencies.cxx | 4
desktop/source/deployment/misc/dp_misc.cxx | 4
desktop/source/deployment/misc/dp_update.cxx | 4
desktop/source/lib/init.cxx | 14
desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 3
extensions/source/nsplugin/source/so_env.cxx | 10
extensions/source/plugin/unx/sysplug.cxx | 3
extensions/source/update/check/updatecheck.cxx | 3
extensions/source/update/check/updateprotocol.cxx | 8
extensions/source/update/feed/updatefeed.cxx | 3
extras/AllLangPackage_accessoriestemplates.mk | 2
extras/AllLangPackage_accessoriestemplateseducate.mk | 2
extras/AllLangPackage_accessoriestemplatesfinance.mk | 2
extras/AllLangPackage_accessoriestemplatesforms.mk | 2
extras/AllLangPackage_accessoriestemplateslabels.mk | 2
extras/AllLangPackage_accessoriestemplateslayout.mk | 2
extras/AllLangPackage_accessoriestemplatesmisc.mk | 2
extras/AllLangPackage_accessoriestemplatesnonfree.mk | 2
extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk | 2
extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk | 2
extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk | 2
extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk | 2
extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk | 2
extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk | 2
extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk | 2
extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk | 2
extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk | 2
extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk | 2
extras/AllLangPackage_accessoriestemplatesofficorr.mk | 2
extras/AllLangPackage_accessoriestemplatesoffimisc.mk | 2
extras/AllLangPackage_accessoriestemplatespersonal.mk | 2
extras/AllLangPackage_accessoriestemplatespresent.mk | 2
extras/AllLangPackage_autotextshare.mk | 2
extras/ExternalPackage_accessoriesgallery.mk | 2
extras/ExternalPackage_accessoriesgallerydrawspeople.mk | 2
extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk | 2
extras/ExternalPackage_accessoriesgallerynonfree.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk | 2
extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk | 2
extras/ExternalPackage_accessoriesgalleryphotoscities.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosfauna.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosflowers.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk | 2
extras/ExternalPackage_accessoriesgalleryphotoshumans.mk | 2
extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosobjects.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosplants.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosspace.mk | 2
extras/ExternalPackage_accessoriesgalleryphotosstatues.mk | 2
extras/ExternalPackage_accessoriesgalleryphotostravel.mk | 2
extras/ExternalPackage_accessoriestemplatescommon.mk | 2
extras/ExternalPackage_accessoriestemplatescommoneducate.mk | 2
extras/ExternalPackage_accessoriestemplatescommonfinance.mk | 2
extras/ExternalPackage_accessoriestemplatescommonforms.mk | 2
extras/ExternalPackage_accessoriestemplatescommonlabels.mk | 2
extras/ExternalPackage_accessoriestemplatescommonlayout.mk | 2
extras/ExternalPackage_accessoriestemplatescommonmisc.mk | 2
extras/ExternalPackage_accessoriestemplatescommonofficorr.mk | 2
extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk | 2
extras/ExternalPackage_accessoriestemplatescommonpersonal.mk | 2
extras/ExternalPackage_accessoriestemplatescommonpresent.mk | 2
extras/ExternalPackage_extra_fonts.mk | 2
extras/Gallery_arrows.mk | 2
extras/Gallery_computers.mk | 2
extras/Gallery_diagrams.mk | 2
extras/Gallery_education.mk | 2
extras/Gallery_environment.mk | 2
extras/Gallery_finance.mk | 2
extras/Gallery_people.mk | 2
extras/Gallery_sound.mk | 2
extras/Gallery_symbols.mk | 2
extras/Gallery_transportation.mk | 2
extras/Gallery_txtshapes.mk | 2
extras/Package_autocorr.mk | 2
extras/Package_autotextuser.mk | 2
extras/Package_cfgsrvbitmapunx.mk | 2
extras/Package_cfgsrvnolang.mk | 2
extras/Package_cfgusr.mk | 2
extras/Package_database.mk | 2
extras/Package_databasebiblio.mk | 2
extras/Package_fonts.mk | 2
extras/Package_gallbullets.mk | 2
extras/Package_gallhtmlexpo.mk | 2
extras/Package_gallmytheme.mk | 2
extras/Package_gallroot.mk | 2
extras/Package_gallsystem.mk | 2
extras/Package_gallwwwback.mk | 2
extras/Package_gallwwwgraf.mk | 2
extras/Package_glade.mk | 2
extras/Package_labels.mk | 2
extras/Package_newfiles.mk | 2
extras/Package_palettes.mk | 2
extras/Package_tpllayoutimpr.mk | 2
extras/Package_tplwizagenda.mk | 2
extras/Package_tplwizbitmap.mk | 2
extras/Package_tplwizdesktop.mk | 2
extras/Package_tplwizfax.mk | 2
extras/Package_tplwizletter.mk | 2
extras/Package_tplwizreport.mk | 2
extras/Package_tplwizstyles.mk | 2
filter/Package_docbook.mk | 2
filter/Package_xhtml.mk | 8
filter/Package_xslt.mk | 94 +++---
filter/source/config/fragments/filters/DocBook_File.xcu | 4
filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu | 2
filter/source/config/fragments/filters/MS_Word_2003_XML.xcu | 2
filter/source/config/fragments/filters/UOF_presentation.xcu | 2
filter/source/config/fragments/filters/UOF_spreadsheet.xcu | 2
filter/source/config/fragments/filters/UOF_text.xcu | 2
filter/source/config/fragments/filters/XHTML_Calc_File.xcu | 2
filter/source/config/fragments/filters/XHTML_Draw_File.xcu | 2
filter/source/config/fragments/filters/XHTML_Impress_File.xcu | 2
filter/source/config/fragments/filters/XHTML_Writer_File.xcu | 2
framework/Package_dtd.mk | 2
framework/inc/services/substitutepathvars.hxx | 1
framework/source/services/license.cxx | 4
framework/source/services/substitutepathvars.cxx | 10
i18nlangtag/source/languagetag/languagetag.cxx | 4
jvmfwk/plugins/sunmajor/pluginlib/util.cxx | 5
jvmfwk/source/fwkutil.hxx | 6
libexttextcat/ExternalPackage_fingerprint.mk | 2
liblangtag/ExternalPackage_langtag_data.mk | 6
liblangtag/ExternalPackage_liblangtag_data.mk | 6
librelogo/Package_librelogo.mk | 4
librelogo/Package_librelogo_properties.mk | 2
more_fonts/ExternalPackage_dejavu.mk | 2
more_fonts/ExternalPackage_gentium.mk | 2
more_fonts/ExternalPackage_liberation.mk | 2
more_fonts/ExternalPackage_liberation_narrow.mk | 2
more_fonts/ExternalPackage_libertineg.mk | 2
more_fonts/ExternalPackage_opensans.mk | 2
more_fonts/ExternalPackage_ptserif.mk | 2
more_fonts/ExternalPackage_sourcecode.mk | 2
more_fonts/ExternalPackage_sourcesans.mk | 2
more_fonts/Package_conf.mk | 2
officecfg/Package_misc.mk | 4
officecfg/registry/data/org/openoffice/Office/Addons.xcu | 36 +-
officecfg/registry/data/org/openoffice/Office/Impress.xcu | 2
officecfg/registry/data/org/openoffice/Office/Paths.xcu | 24 -
officecfg/registry/data/org/openoffice/Office/WebWizard.xcu | 4
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 42 +-
officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 4
package/Package_dtd.mk | 2
postprocess/Package_images_install.mk | 2
postprocess/Package_registry_install.mk | 4
psprint_config/Package_fontunxppds.mk | 2
psprint_config/Package_fontunxpsprint.mk | 2
python3/GeneratedPackage_python3.mk | 2
pyuno/CustomTarget_python_shell.mk | 1
pyuno/Package_python_scripts_install.mk | 2
pyuno/source/loader/pyuno_loader.cxx | 4
pyuno/source/module/pyuno_module.cxx | 6
pyuno/source/module/pyuno_runtime.cxx | 6
pyuno/zipcore/mac.sh | 2
reportbuilder/Package_reportbuilder-templates.mk | 2
sal/osl/unx/file.cxx | 4
sal/rtl/bootstrap.cxx | 9
scp2/InstallModule_base.mk | 8
scp2/InstallModule_calc.mk | 2
scp2/InstallModule_draw.mk | 5
scp2/InstallModule_graphicfilter.mk | 5
scp2/InstallModule_impress.mk | 2
scp2/InstallModule_math.mk | 5
scp2/InstallModule_ooo.mk | 2
scp2/InstallModule_python.mk | 6
scp2/InstallModule_ure.mk | 2
scp2/InstallModule_writer.mk | 5
scp2/inc/macros.inc | 41 ++
scp2/source/ooo/common_brand.scp | 88 ++++-
scp2/source/ooo/directory_ooo.scp | 29 +
scp2/source/ooo/directory_ooo_macosx.scp | 5
scp2/source/ooo/file_library_ooo.scp | 149 ++--------
scp2/source/ooo/file_ooo.scp | 2
scp2/source/ooo/profile_ooo.scp | 8
scp2/source/ooo/profileitem_ooo.scp | 16 -
scp2/source/ooo/shortcut_ooo.scp | 8
scp2/source/ooo/ure.scp | 107 +++++--
scp2/source/ooo/ure_into_ooo.scp | 2
scp2/source/python/file_python.scp | 31 --
scp2/source/python/profileitem_python.scp | 8
scripting/Package_ScriptsBeanShell.mk | 2
scripting/Package_ScriptsJavaScript.mk | 2
scripting/Package_ScriptsPython.mk | 2
scripting/Package_java.mk | 2
scripting/Package_java_jars.mk | 6
scripting/Package_scriptbindinglib.mk | 2
scripting/Package_scriptproviderforpython.mk | 4
scripting/examples/beanshell/Highlight/ShowDialog.bsh | 2
scripting/examples/java/Highlight/HighlightText.java | 2
scripting/examples/javascript/Highlight/ShowDialog.js | 2
scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 4
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 12
scripting/source/provider/URIHelper.cxx | 3
scripting/source/pyprov/pythonscript.py | 4
sd/Package_opengl.mk | 2
sd/Package_web.mk | 4
sd/Package_xml.mk | 2
sdext/source/pdfimport/wrapper/wrapper.cxx | 5
sfx2/source/appl/appmisc.cxx | 4
sfx2/source/appl/shutdownicon.cxx | 4
sfx2/source/doc/objmisc.cxx | 5
shell/source/cmdmail/cmdmailsuppl.cxx | 4
shell/source/unix/exec/shellexec.cxx | 6
shell/source/win32/simplemail/smplmailclient.cxx | 4
smoketest/CppunitTest_smoketest.mk | 8
smoketest/Module_smoketest.mk | 2
solenv/bin/macosx-change-install-names.pl | 16 -
solenv/gbuild/Gallery.mk | 2
solenv/gbuild/InstallModuleTarget.mk | 2
solenv/gbuild/Package.mk | 3
solenv/gbuild/PythonTest.mk | 4
solenv/gbuild/Pyuno.mk | 2
solenv/gbuild/TargetLocations.mk | 4
solenv/gbuild/UIConfig.mk | 2
solenv/gbuild/gbuild.mk | 2
solenv/gbuild/platform/IOS_ARM_GCC.mk | 3
solenv/gbuild/platform/com_MSC_class.mk | 3
solenv/gbuild/platform/macosx.mk | 11
solenv/gbuild/platform/mingw.mk | 3
solenv/gbuild/platform/solaris.mk | 3
solenv/gbuild/platform/unxgcc.mk | 3
svtools/source/contnr/templwin.cxx | 4
svtools/source/control/ctrlbox.cxx | 4
svx/source/dialog/docrecovery.cxx | 3
svx/source/dialog/sendreportunx.cxx | 3
svx/source/unodraw/recoveryui.cxx | 4
sw/source/ui/envelp/labelcfg.cxx | 4
sw/source/ui/index/cnttab.cxx | 4
tools/source/misc/extendapplicationenvironment.cxx | 6
tools/source/rc/resmgr.cxx | 4
unotools/source/config/bootstrap.cxx | 5
ure/source/uno.ini | 2
ure/source/unorc | 5
uui/source/newerverwarn.cxx | 8
vcl/aqua/source/gdi/atsui/salgdi.cxx | 4
vcl/coretext/salgdi2.cxx | 4
vcl/generic/app/gensys.cxx | 4
vcl/generic/fontmanager/helper.cxx | 13
vcl/source/app/brand.cxx | 4
vcl/source/app/settings.cxx | 6
vcl/source/filter/graphicfilter.cxx | 4
vcl/source/gdi/embeddedfontshelper.cxx | 8
vcl/source/gdi/impimagetree.cxx | 3
vcl/win/source/gdi/salgdi3.cxx | 5
wizards/Package_depot.mk | 2
wizards/Package_euro.mk | 2
wizards/Package_form.mk | 2
wizards/Package_gimmicks.mk | 2
wizards/Package_import.mk | 2
wizards/Package_share.mk | 2
wizards/Package_standard.mk | 2
wizards/Package_template.mk | 2
wizards/Package_tools.mk | 2
wizards/Package_tutorials.mk | 2
wizards/Package_usr.mk | 2
wizards/source/configshare/dialog.xlc | 16 -
wizards/source/configshare/script.xlc | 16 -
xmlhelp/Package_helpxsl.mk | 2
xmlhelp/source/cxxhelp/provider/provider.cxx | 10
xmloff/Package_dtd.mk | 2
xmlscript/Package_dtd.mk | 2
xmlscript/test/imexp.cxx | 4
282 files changed, 993 insertions(+), 644 deletions(-)
New commits:
commit 058a3d1c46449dd5159bae30c83db4c2c5c335b4
Author: Tor Lillqvist <tml at iki.fi>
Date: Sun Aug 18 18:45:45 2013 +0200
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
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8c19c27..1015b6c 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3038,7 +3038,7 @@ $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_
else
-$(call gb_ExternalExecutable_set_internal,python,$(INSTDIR)/program/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin))
+$(call gb_ExternalExecutable_set_internal,python,$(INSTDIR)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin))
$(call gb_ExternalExecutable_set_precommand,python,$(gb_Python_PRECOMMAND))
$(call gb_ExternalExecutable_add_dependencies,python,$(call gb_Package_get_target_for_build,python3))
diff --git a/afms/ExternalPackage_fontunxafm.mk b/afms/ExternalPackage_fontunxafm.mk
index d2600a1..84e4c91 100644
--- a/afms/ExternalPackage_fontunxafm.mk
+++ b/afms/ExternalPackage_fontunxafm.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,afms_fontunxafm,afms))
$(eval $(call gb_ExternalPackage_set_outdir,afms_fontunxafm,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,afms_fontunxafm,share/psprint/fontmetric,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,afms_fontunxafm,$(LIBO_SHARE_FOLDER)/psprint/fontmetric,\
Courier-Bold.afm \
Courier-BoldOblique.afm \
Courier-Oblique.afm \
diff --git a/config_host.mk.in b/config_host.mk.in
index 2b94485..a5452ee 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -304,8 +304,14 @@ export LIBLANGTAG_LIBS=$(gb_SPACE)@LIBLANGTAG_LIBS@
export LIBLAYOUT_JAR=@LIBLAYOUT_JAR@
export LIBLOADER_JAR=@LIBLOADER_JAR@
export LIBO_BIN_FOLDER=@LIBO_BIN_FOLDER@
+export LIBO_ETC_FOLDER=@LIBO_ETC_FOLDER@
+export LIBO_LIB_FOLDER=@LIBO_LIB_FOLDER@
+export LIBO_LIB_PYUNO_FOLDER=@LIBO_LIB_PYUNO_FOLDER@
export LIBO_SHARE_FOLDER=@LIBO_SHARE_FOLDER@
+export LIBO_SHARE_HELP_FOLDER=@LIBO_SHARE_HELP_FOLDER@
+export LIBO_SHARE_PRESETS_FOLDER=@LIBO_SHARE_PRESETS_FOLDER@
export LIBO_SHARE_RESOURCE_FOLDER=@LIBO_SHARE_RESOURCE_FOLDER@
+export LIBO_URE_LIB_FOLDER=@LIBO_URE_LIB_FOLDER@
export LIBO_VERSION_MAJOR=@LIBO_VERSION_MAJOR@
export LIBO_VERSION_MICRO=@LIBO_VERSION_MICRO@
export LIBO_VERSION_MINOR=@LIBO_VERSION_MINOR@
diff --git a/config_host/config_folders.h.in b/config_host/config_folders.h.in
index f06abd6..7f6fe2d 100644
--- a/config_host/config_folders.h.in
+++ b/config_host/config_folders.h.in
@@ -23,9 +23,15 @@
/* where read-only resources are in general */
#undef LIBO_SHARE_FOLDER
+/* where help files are */
+#undef LIBO_SHARE_HELP_FOLDER
+
/* where java jars are */
#undef LIBO_SHARE_JAVA_FOLDER
+/* the presets folder */
+#undef LIBO_SHARE_PRESETS_FOLDER
+
/* LO's own "resources" */
#undef LIBO_SHARE_RESOURCE_FOLDER
diff --git a/configure.ac b/configure.ac
index f9394b7..0e3892c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2866,7 +2866,10 @@ if test $_os = Darwin -a "$enable_canonical_installation_tree_structure" = yes;
LIBO_LIBEXEC_FOLDER=MacOS
LIBO_LIB_FOLDER=Frameworks
LIBO_SHARE_FOLDER=Resources
+ LIBO_SHARE_HELP_FOLDER=Resources/help
LIBO_SHARE_JAVA_FOLDER=Resources/java
+ LIBO_SHARE_PRESETS_FOLDER=Resources/presets
+ LIBO_LIB_PYUNO_FOLDER=Resources
LIBO_SHARE_RESOURCE_FOLDER=Resources/resource
LIBO_SHARE_SHELL_FOLDER=Resources/shell
LIBO_URE_BIN_FOLDER=MacOS
@@ -2876,13 +2879,33 @@ if test $_os = Darwin -a "$enable_canonical_installation_tree_structure" = yes;
LIBO_URE_SHARE_JAVA_FOLDER=Resources/java
ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=YES
AC_DEFINE(HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE)
+elif test $_os = Darwin; then
+ LIBO_BIN_FOLDER=program
+ LIBO_ETC_FOLDER=program
+ LIBO_LIBEXEC_FOLDER=program
+ LIBO_LIB_FOLDER=program
+ LIBO_LIB_PYUNO_FOLDER=program
+ LIBO_SHARE_FOLDER=share
+ LIBO_SHARE_HELP_FOLDER=help
+ LIBO_SHARE_JAVA_FOLDER=program/classes
+ LIBO_SHARE_PRESETS_FOLDER=presets
+ LIBO_SHARE_RESOURCE_FOLDER=program/resource
+ LIBO_SHARE_SHELL_FOLDER=program/shell
+ LIBO_URE_BIN_FOLDER=ure-link/bin
+ LIBO_URE_ETC_FOLDER=ure-link/bin
+ LIBO_URE_LIB_FOLDER=ure-link/lib
+ LIBO_URE_SHARE_FOLDER=ure-link/share
+ LIBO_URE_SHARE_JAVA_FOLDER=ure-link/share/java
elif test $_os = WINNT; then
LIBO_BIN_FOLDER=program
LIBO_ETC_FOLDER=program
LIBO_LIBEXEC_FOLDER=program
LIBO_LIB_FOLDER=program
+ LIBO_LIB_PYUNO_FOLDER=program
LIBO_SHARE_FOLDER=share
+ LIBO_SHARE_HELP_FOLDER=help
LIBO_SHARE_JAVA_FOLDER=program/classes
+ LIBO_SHARE_PRESETS_FOLDER=presets
LIBO_SHARE_RESOURCE_FOLDER=program/resource
LIBO_SHARE_SHELL_FOLDER=program/shell
LIBO_URE_BIN_FOLDER=ure-link/bin
@@ -2895,8 +2918,11 @@ else
LIBO_ETC_FOLDER=program
LIBO_LIBEXEC_FOLDER=program
LIBO_LIB_FOLDER=program
+ LIBO_LIB_PYUNO_FOLDER=program
LIBO_SHARE_FOLDER=share
+ LIBO_SHARE_HELP_FOLDER=help
LIBO_SHARE_JAVA_FOLDER=program/classes
+ LIBO_SHARE_PRESETS_FOLDER=presets
LIBO_SHARE_RESOURCE_FOLDER=program/resource
LIBO_SHARE_SHELL_FOLDER=program/shell
LIBO_URE_BIN_FOLDER=ure/bin
@@ -2909,8 +2935,11 @@ AC_DEFINE_UNQUOTED(LIBO_BIN_FOLDER,"$LIBO_BIN_FOLDER")
AC_DEFINE_UNQUOTED(LIBO_ETC_FOLDER,"$LIBO_ETC_FOLDER")
AC_DEFINE_UNQUOTED(LIBO_LIBEXEC_FOLDER,"$LIBO_LIBEXEC_FOLDER")
AC_DEFINE_UNQUOTED(LIBO_LIB_FOLDER,"$LIBO_LIB_FOLDER")
+AC_DEFINE_UNQUOTED(LIBO_LIB_PYUNO_FOLDER,"$LIBO_LIB_PYUNO_FOLDER")
AC_DEFINE_UNQUOTED(LIBO_SHARE_FOLDER,"$LIBO_SHARE_FOLDER")
+AC_DEFINE_UNQUOTED(LIBO_SHARE_HELP_FOLDER,"$LIBO_SHARE_HELP_FOLDER")
AC_DEFINE_UNQUOTED(LIBO_SHARE_JAVA_FOLDER,"$LIBO_SHARE_JAVA_FOLDER")
+AC_DEFINE_UNQUOTED(LIBO_SHARE_PRESETS_FOLDER,"$LIBO_SHARE_PRESETS_FOLDER")
AC_DEFINE_UNQUOTED(LIBO_SHARE_RESOURCE_FOLDER,"$LIBO_SHARE_RESOURCE_FOLDER")
AC_DEFINE_UNQUOTED(LIBO_SHARE_SHELL_FOLDER,"$LIBO_SHARE_SHELL_FOLDER")
AC_DEFINE_UNQUOTED(LIBO_URE_BIN_FOLDER,"$LIBO_URE_BIN_FOLDER")
@@ -2921,8 +2950,14 @@ AC_DEFINE_UNQUOTED(LIBO_URE_SHARE_JAVA_FOLDER,"$LIBO_URE_SHARE_JAVA_FOLDER")
# Not all of them needed in config_host.mk, add more if need arises
AC_SUBST(LIBO_BIN_FOLDER)
+AC_SUBST(LIBO_ETC_FOLDER)
+AC_SUBST(LIBO_LIB_FOLDER)
+AC_SUBST(LIBO_LIB_PYUNO_FOLDER)
AC_SUBST(LIBO_SHARE_FOLDER)
+AC_SUBST(LIBO_SHARE_HELP_FOLDER)
+AC_SUBST(LIBO_SHARE_PRESETS_FOLDER)
AC_SUBST(LIBO_SHARE_RESOURCE_FOLDER)
+AC_SUBST(LIBO_URE_LIB_FOLDER)
AC_SUBST(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE)
dnl ===================================================================
diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk
index f981708..c8739fa 100644
--- a/desktop/Package_branding.mk
+++ b/desktop/Package_branding.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,desktop_branding,$(SRCDIR)/icon-themes/galaxy))
$(eval $(call gb_Package_set_outdir,desktop_branding,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,desktop_branding,$(gb_PROGRAMDIRNAME),\
+$(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER),\
$(foreach image,$(filter $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES)),\
$(if $(filter intro.png,$(image)),\
$(if $(filter TRUE,$(ENABLE_RELEASE_BUILD)),brand,brand_dev)/$(image),\
@@ -20,7 +20,7 @@ $(eval $(call gb_Package_add_files,desktop_branding,$(gb_PROGRAMDIRNAME),\
) \
))
-$(eval $(call gb_Package_add_files,desktop_branding,$(gb_PROGRAMDIRNAME)/shell,\
+$(eval $(call gb_Package_add_files,desktop_branding,$(LIBO_ETC_FOLDER)/shell,\
$(addprefix brand/shell/,$(filter-out $(BRAND_INTRO_IMAGES),$(DEFAULT_BRAND_IMAGES))) \
))
diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx
index a901a76..c181faa 100644
--- a/desktop/source/app/userinstall.cxx
+++ b/desktop/source/app/userinstall.cxx
@@ -18,6 +18,7 @@
*/
#include <config_features.h>
+#include <config_folders.h>
#include "sal/config.h"
@@ -191,7 +192,7 @@ namespace desktop {
// Copy data from shared data directory of base installation:
rc = copy_recursive(
- aBasePath + OUString("/presets"),
+ aBasePath + OUString("/" LIBO_SHARE_PRESETS_FOLDER),
aUserPath + OUString("/user"));
if ((rc != FileBase::E_None) && (rc != FileBase::E_EXIST))
{
diff --git a/extras/AllLangPackage_accessoriestemplates.mk b/extras/AllLangPackage_accessoriestemplates.mk
index b544838..8fa3e89 100644
--- a/extras/AllLangPackage_accessoriestemplates.mk
+++ b/extras/AllLangPackage_accessoriestemplates.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplates,$(call gb_Un
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplates,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files,accessoriestemplates,share/template,\
+$(eval $(call gb_AllLangPackage_add_files,accessoriestemplates,$(LIBO_SHARE_FOLDER)/template,\
cs/dummy_templates.txt \
de/dummy_templates.txt \
en-US/dummy_templates.txt \
diff --git a/extras/AllLangPackage_accessoriestemplateseducate.mk b/extras/AllLangPackage_accessoriestemplateseducate.mk
index ac6ed60..f95b2ef 100644
--- a/extras/AllLangPackage_accessoriestemplateseducate.mk
+++ b/extras/AllLangPackage_accessoriestemplateseducate.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateseducate,$(cal
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateseducate,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateseducate,share/template,educate,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateseducate,$(LIBO_SHARE_FOLDER)/template,educate,\
cs/dummy_templates.txt \
de/Jahres_Schulnoten.ots \
de/Klassen-Schulnoten-Verwaltung_Noten_1-6.ots \
diff --git a/extras/AllLangPackage_accessoriestemplatesfinance.mk b/extras/AllLangPackage_accessoriestemplatesfinance.mk
index 7a41b74..88a8e49 100644
--- a/extras/AllLangPackage_accessoriestemplatesfinance.mk
+++ b/extras/AllLangPackage_accessoriestemplatesfinance.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesfinance,$(cal
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesfinance,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesfinance,share/template,finance,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesfinance,$(LIBO_SHARE_FOLDER)/template,finance,\
cs/podaci_kniha.ots \
de/arbeitszeiterfassung.ots \
de/az.ots \
diff --git a/extras/AllLangPackage_accessoriestemplatesforms.mk b/extras/AllLangPackage_accessoriestemplatesforms.mk
index 0ca6da9..1f450bf 100644
--- a/extras/AllLangPackage_accessoriestemplatesforms.mk
+++ b/extras/AllLangPackage_accessoriestemplatesforms.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesforms,$(call
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesforms,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesforms,share/template,forms,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesforms,$(LIBO_SHARE_FOLDER)/template,forms,\
cs/seznam_pohledavek.ots \
de/Ausbildungsnachweis2.ott \
de/Ausbildungsnachweis.ott \
diff --git a/extras/AllLangPackage_accessoriestemplateslabels.mk b/extras/AllLangPackage_accessoriestemplateslabels.mk
index 5f761c3..10cc900 100644
--- a/extras/AllLangPackage_accessoriestemplateslabels.mk
+++ b/extras/AllLangPackage_accessoriestemplateslabels.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateslabels,$(call
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateslabels,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslabels,share/template,labels,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslabels,$(LIBO_SHARE_FOLDER)/template,labels,\
cs/dummy_templates.txt \
de/dummy_templates.txt \
en-US/address12-WL-OL875.ott \
diff --git a/extras/AllLangPackage_accessoriestemplateslayout.mk b/extras/AllLangPackage_accessoriestemplateslayout.mk
index c830138..366bbb0 100644
--- a/extras/AllLangPackage_accessoriestemplateslayout.mk
+++ b/extras/AllLangPackage_accessoriestemplateslayout.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplateslayout,$(call
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplateslayout,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslayout,share/template,layout,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplateslayout,$(LIBO_SHARE_FOLDER)/template,layout,\
cs/dummy_templates.txt \
de/A4-kariert.otp \
de/BlueBoxes.otp \
diff --git a/extras/AllLangPackage_accessoriestemplatesmisc.mk b/extras/AllLangPackage_accessoriestemplatesmisc.mk
index 905b5b3..09f6436 100644
--- a/extras/AllLangPackage_accessoriestemplatesmisc.mk
+++ b/extras/AllLangPackage_accessoriestemplatesmisc.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesmisc,$(call g
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesmisc,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesmisc,share/template,misc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesmisc,$(LIBO_SHARE_FOLDER)/template,misc,\
cs/dummy_templates.txt \
de/01_event_poster.otg \
de/02_event_poster.otg \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfree.mk b/extras/AllLangPackage_accessoriestemplatesnonfree.mk
index 23641eb..b723737 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfree.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfree.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfree,$(cal
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfree,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files,accessoriestemplatesnonfree,share/template,\
+$(eval $(call gb_AllLangPackage_add_files,accessoriestemplatesnonfree,$(LIBO_SHARE_FOLDER)/template,\
cs/dummy_templates-nonfree.txt \
de/dummy_templates-nonfree.txt \
en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk
index 1a7134f..6d38379 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreeeducate.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeeducat
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeeducate,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeeducate,share/template,educate,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeeducate,$(LIBO_SHARE_FOLDER)/template,educate,\
cs/dummy_templates-nonfree.txt \
de/dummy_templates-nonfree.txt \
en-US/attendance_sheet.ott \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk b/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk
index 7b848d4..30ecf49 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreefinance.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreefinanc
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreefinance,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreefinance,share/template,finance,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreefinance,$(LIBO_SHARE_FOLDER)/template,finance,\
cs/dummy_templates-nonfree.txt \
de/dummy_templates-nonfree.txt \
en-US/24_Month_Sales_Forecast.ots \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk
index 673b028..d1e3dac 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreeforms.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeforms,
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeforms,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeforms,share/template,forms,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeforms,$(LIBO_SHARE_FOLDER)/template,forms,\
cs/dummy_templates-nonfree.txt \
de/dummy_templates-nonfree.txt \
en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk b/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk
index 1242cc8..16539cf 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreelabels.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreelabels
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreelabels,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreelabels,share/template,labels,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreelabels,$(LIBO_SHARE_FOLDER)/template,labels,\
cs/dummy_templates-nonfree.txt \
de/dummy_templates-nonfree.txt \
en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk b/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk
index 2aaa504..e36931e 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreelayout.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreelayout
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreelayout,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreelayout,share/template,layout,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreelayout,$(LIBO_SHARE_FOLDER)/template,layout,\
cs/dummy_templates-nonfree.txt \
de/dummy_templates-nonfree.txt \
en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk b/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk
index e2dd51d..59f9375 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreemisc.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreemisc,$
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreemisc,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreemisc,share/template,misc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreemisc,$(LIBO_SHARE_FOLDER)/template,misc,\
cs/dummy_templates-nonfree.txt \
de/dummy_templates-nonfree.txt \
en-US/achievement_1.ott \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk
index 184d515..df87a49 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreeofficorr.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeoffico
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeofficorr,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeofficorr,share/template,officorr,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeofficorr,$(LIBO_SHARE_FOLDER)/template,officorr,\
cs/dummy_templates-nonfree.txt \
de/dummy_templates-nonfree.txt \
en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk b/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk
index 8a78d3c..4f1f070 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreeoffimisc.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeoffimi
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreeoffimisc,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeoffimisc,share/template,offimisc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreeoffimisc,$(LIBO_SHARE_FOLDER)/template,offimisc,\
cs/dummy_templates-nonfree.txt \
de/dummy_templates-nonfree.txt \
en-US/report_1.ott \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk b/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk
index 4b16caa..997dff0 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreepersonal.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreeperson
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreepersonal,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreepersonal,share/template,personal,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreepersonal,$(LIBO_SHARE_FOLDER)/template,personal,\
cs/dummy_templates-nonfree.txt \
de/dummy_templates-nonfree.txt \
en-US/resume_1.ott \
diff --git a/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk b/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk
index b7404ff..818c7c7 100644
--- a/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk
+++ b/extras/AllLangPackage_accessoriestemplatesnonfreepresent.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesnonfreepresen
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesnonfreepresent,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreepresent,share/template,presnt,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesnonfreepresent,$(LIBO_SHARE_FOLDER)/template,presnt,\
cs/dummy_templates-nonfree.txt \
de/dummy_templates-nonfree.txt \
en-US/dummy_templates-nonfree.txt \
diff --git a/extras/AllLangPackage_accessoriestemplatesofficorr.mk b/extras/AllLangPackage_accessoriestemplatesofficorr.mk
index 7dba355..27f7167 100644
--- a/extras/AllLangPackage_accessoriestemplatesofficorr.mk
+++ b/extras/AllLangPackage_accessoriestemplatesofficorr.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesofficorr,$(ca
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesofficorr,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesofficorr,share/template,officorr,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesofficorr,$(LIBO_SHARE_FOLDER)/template,officorr,\
cs/dummy_templates.txt \
de/01_business_fax.ott \
de/01_business_letter.ott \
diff --git a/extras/AllLangPackage_accessoriestemplatesoffimisc.mk b/extras/AllLangPackage_accessoriestemplatesoffimisc.mk
index ee36ecd..8525a8e 100644
--- a/extras/AllLangPackage_accessoriestemplatesoffimisc.mk
+++ b/extras/AllLangPackage_accessoriestemplatesoffimisc.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatesoffimisc,$(ca
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatesoffimisc,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesoffimisc,share/template,offimisc,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatesoffimisc,$(LIBO_SHARE_FOLDER)/template,offimisc,\
cs/dummy_templates.txt \
de/01_graph_paper.ott \
de/01_invoice.ott \
diff --git a/extras/AllLangPackage_accessoriestemplatespersonal.mk b/extras/AllLangPackage_accessoriestemplatespersonal.mk
index ce20cc8..251ad52 100644
--- a/extras/AllLangPackage_accessoriestemplatespersonal.mk
+++ b/extras/AllLangPackage_accessoriestemplatespersonal.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatespersonal,$(ca
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatespersonal,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatespersonal,share/template,personal,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatespersonal,$(LIBO_SHARE_FOLDER)/template,personal,\
cs/dummy_templates.txt \
de/faltkarte.otg \
de/formalletteraquarius.ott \
diff --git a/extras/AllLangPackage_accessoriestemplatespresent.mk b/extras/AllLangPackage_accessoriestemplatespresent.mk
index c4e2648..8cf486d 100644
--- a/extras/AllLangPackage_accessoriestemplatespresent.mk
+++ b/extras/AllLangPackage_accessoriestemplatespresent.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_AllLangPackage_AllLangPackage,accessoriestemplatespresent,$(cal
$(eval $(call gb_AllLangPackage_use_unpacked,accessoriestemplatespresent,templates-pack))
-$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatespresent,share/template,presnt,\
+$(eval $(call gb_AllLangPackage_add_files_with_subdir,accessoriestemplatespresent,$(LIBO_SHARE_FOLDER)/template,presnt,\
cs/dummy_templates.txt \
de/compladients.otp \
de/praktikumsbericht.otp \
diff --git a/extras/AllLangPackage_autotextshare.mk b/extras/AllLangPackage_autotextshare.mk
index 3c249fe..6453662 100644
--- a/extras/AllLangPackage_autotextshare.mk
+++ b/extras/AllLangPackage_autotextshare.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_AllLangPackage_AllLangPackage,autotextshare,$(SRCDIR)/extras/source/autotext/lang))
-$(eval $(call gb_AllLangPackage_add_files,autotextshare,share/autotext,\
+$(eval $(call gb_AllLangPackage_add_files,autotextshare,$(LIBO_SHARE_FOLDER)/autotext,\
bg/crdbus50.bau \
bg/standard.bau \
bg/template.bau \
diff --git a/extras/ExternalPackage_accessoriesgallery.mk b/extras/ExternalPackage_accessoriesgallery.mk
index 3e3bc88..0180f70 100644
--- a/extras/ExternalPackage_accessoriesgallery.mk
+++ b/extras/ExternalPackage_accessoriesgallery.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallery,galle
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallery,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallery,share/gallery,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallery,$(LIBO_SHARE_FOLDER)/gallery,\
accessories/sg1010.sdg \
accessories/sg1010.sdv \
accessories/sg1010.thm \
diff --git a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
index df6ffbe..6e61d5f 100644
--- a/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
+++ b/extras/ExternalPackage_accessoriesgallerydrawspeople.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerydrawsp
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerydrawspeople,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,share/gallery/Draws/People,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerydrawspeople,$(LIBO_SHARE_FOLDER)/gallery/Draws/People,\
accessories/Draws/People/Baboo1.png \
accessories/Draws/People/Jac1.png \
accessories/Draws/People/Jac2.png \
diff --git a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
index 9fcdea1..419e043 100644
--- a/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
+++ b/extras/ExternalPackage_accessoriesgalleryelementsbullets2.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryelemen
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryelementsbullets2,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryelementsbullets2,share/gallery/Elements/Bullets2,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryelementsbullets2,$(LIBO_SHARE_FOLDER)/gallery/Elements/Bullets2,\
accessories/Elements/Bullets2/amethyst.arrow.png \
accessories/Elements/Bullets2/amethyst.asterisk.png \
accessories/Elements/Bullets2/amethyst.circle-light.png \
diff --git a/extras/ExternalPackage_accessoriesgallerynonfree.mk b/extras/ExternalPackage_accessoriesgallerynonfree.mk
index ed8e692..984fba3 100644
--- a/extras/ExternalPackage_accessoriesgallerynonfree.mk
+++ b/extras/ExternalPackage_accessoriesgallerynonfree.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgallerynonfre
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgallerynonfree,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerynonfree,share/gallery,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgallerynonfree,$(LIBO_SHARE_FOLDER)/gallery,\
accessories-nonfree/sg600.sdg \
accessories-nonfree/sg600.sdv \
accessories-nonfree/sg600.thm \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk b/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
index 1ce4f6f..cb6b720 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosbuildings.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosbuildings,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosbuildings,share/gallery/Photos/Buildings,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosbuildings,$(LIBO_SHARE_FOLDER)/gallery/Photos/Buildings,\
accessories/Photos/Buildings/ArkSoft0408010009.jpg \
accessories/Photos/Buildings/ArkSoft0408010023.jpg \
accessories/Photos/Buildings/ArkSoft0408010026.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk b/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
index 10e457b..4890c8e 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoscelebration.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscelebration,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscelebration,share/gallery/Photos/Celebration,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscelebration,$(LIBO_SHARE_FOLDER)/gallery/Photos/Celebration,\
accessories/Photos/Celebration/JS_PDPhO_fireworks_burst.jpg \
accessories/Photos/Celebration/JS_PDPhO_new_years_fireworks_explosion.jpg \
))
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk b/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
index f07ed20..6b90457 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoscities.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoscities,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscities,share/gallery/Photos/Cities,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoscities,$(LIBO_SHARE_FOLDER)/gallery/Photos/Cities,\
accessories/Photos/Cities/ArkSoft0507170040.jpg \
accessories/Photos/Cities/ArkSoft0507170041.jpg \
accessories/Photos/Cities/ArkSoft0508100003.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
index a70cc76..900a87b 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosfauna.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfauna,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfauna,share/gallery/Photos/Fauna,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfauna,$(LIBO_SHARE_FOLDER)/gallery/Photos/Fauna,\
accessories/Photos/Fauna/ArkSoft0407030001.jpg \
accessories/Photos/Fauna/bee_on_citrus.jpg \
accessories/Photos/Fauna/dog01.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
index 50249fe..dfd5feb 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosflowers.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosflowers,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosflowers,share/gallery/Photos/Flowers,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosflowers,$(LIBO_SHARE_FOLDER)/gallery/Photos/Flowers,\
accessories/Photos/Flowers/1481157185_28ea113529_o.jpg \
accessories/Photos/Flowers/1482010374_31c0e4c1ed_o.jpg \
accessories/Photos/Flowers/ArkSoft0405010001.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
index 2513363..b7e5f02 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosfoodsanddrinks.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosfoodsanddrinks,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfoodsanddrinks,share/gallery/Photos/FoodsandDrinks,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosfoodsanddrinks,$(LIBO_SHARE_FOLDER)/gallery/Photos/FoodsandDrinks,\
accessories/Photos/FoodsandDrinks/JS_PDPhO_beer.jpg \
accessories/Photos/FoodsandDrinks/JS_PDPhO_fish_and_chips.jpg \
accessories/Photos/FoodsandDrinks/JS_PDPhO_lasagna.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
index a74f490..6d5d26a 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoshumans.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoshumans,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoshumans,share/gallery/Photos/Humans,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoshumans,$(LIBO_SHARE_FOLDER)/gallery/Photos/Humans,\
accessories/Photos/Humans/1471425079_b3b53bdf5f_b.jpg \
accessories/Photos/Humans/1472456323_62f1a7dad1_o.jpg \
accessories/Photos/Humans/1473308070_30ac88194b_o.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
index a6a5cff..de56f6d 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotoslandscapes.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotoslandscapes,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoslandscapes,share/gallery/Photos/Landscapes,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotoslandscapes,$(LIBO_SHARE_FOLDER)/gallery/Photos/Landscapes,\
accessories/Photos/Landscapes/ArkSoft0405010010.jpg \
accessories/Photos/Landscapes/ArkSoft0405010019.jpg \
accessories/Photos/Landscapes/ArkSoft0405010050.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
index a8f3990..4f23266 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosobjects.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosobjects,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosobjects,share/gallery/Photos/Objects,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosobjects,$(LIBO_SHARE_FOLDER)/gallery/Photos/Objects,\
accessories/Photos/Objects/JS_PDPhO_dragon_celebration.jpg \
accessories/Photos/Objects/morguefiles_com_pindiyath100_111064504847.jpg \
accessories/Photos/Objects/morguefiles_com_pindiyath100_122931551.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
index 76777af..e940d30 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosplants.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosplants,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosplants,share/gallery/Photos/Plants,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosplants,$(LIBO_SHARE_FOLDER)/gallery/Photos/Plants,\
accessories/Photos/Plants/ArkSoft0405020018.jpg \
accessories/Photos/Plants/ArkSoft0405020019.jpg \
accessories/Photos/Plants/ArkSoft0508100018.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
index a62dbe7..9d8ea9d 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosspace.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosspace,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosspace,share/gallery/Photos/Space,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosspace,$(LIBO_SHARE_FOLDER)/gallery/Photos/Space,\
accessories/Photos/Space/Wikimedia_Space_120px-Atlantis_taking_off_on_STS-27.jpg \
accessories/Photos/Space/Wikimedia_Space_1995-18-b-large_web.jpg \
accessories/Photos/Space/Wikimedia_Space_2005-06-b-large_web.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
index 0125159..7883f39 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotosstatues.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotosstatues,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosstatues,share/gallery/Photos/Statues,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotosstatues,$(LIBO_SHARE_FOLDER)/gallery/Photos/Statues,\
accessories/Photos/Statues/ArkSoft0507170027.jpg \
accessories/Photos/Statues/ArkSoft0507170032.jpg \
accessories/Photos/Statues/ArkSoft0507170033.jpg \
diff --git a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
index a405857..b331d14 100644
--- a/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
+++ b/extras/ExternalPackage_accessoriesgalleryphotostravel.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriesgalleryphotos
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriesgalleryphotostravel,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotostravel,share/gallery/Photos/Travel,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriesgalleryphotostravel,$(LIBO_SHARE_FOLDER)/gallery/Photos/Travel,\
accessories/Photos/Travel/JS_PDPhO_balloons_festival.jpg \
accessories/Photos/Travel/JS_PDPhO_cruise_ship.jpg \
accessories/Photos/Travel/JS_PDPhO_tall_ship.jpg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommon.mk b/extras/ExternalPackage_accessoriestemplatescommon.mk
index 0430ec4..2e439ea 100644
--- a/extras/ExternalPackage_accessoriestemplatescommon.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommon.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommon,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommon,share/template/common,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommon,$(LIBO_SHARE_FOLDER)/template/common,\
templates/common/dummy_common_templates.txt \
templates/common/svn-commit.2.tmp \
templates/common/svn-commit.tmp \
diff --git a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk b/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
index da972e0..2f79d55 100644
--- a/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommoneducate.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommoneducate,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommoneducate,share/template/common/educate,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommoneducate,$(LIBO_SHARE_FOLDER)/template/common/educate,\
templates/common/educate/A4-chequered.otg \
templates/common/educate/A4-lin_2mm.otg \
templates/common/educate/A4-lin_3mm.otg \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk b/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
index 55b97df..4499c78 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonfinance.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonfinance,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonfinance,share/template/common/finance,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonfinance,$(LIBO_SHARE_FOLDER)/template/common/finance,\
templates/common/finance/dummy_common_templates.txt \
))
diff --git a/extras/ExternalPackage_accessoriestemplatescommonforms.mk b/extras/ExternalPackage_accessoriestemplatescommonforms.mk
index 4ce2645..3e9063e 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonforms.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonforms.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonforms,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonforms,share/template/common/forms,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonforms,$(LIBO_SHARE_FOLDER)/template/common/forms,\
templates/common/forms/dummy_common_templates.txt \
))
diff --git a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk b/extras/ExternalPackage_accessoriestemplatescommonlabels.mk
index e28b2b1..9140267 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonlabels.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonlabels.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlabels,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlabels,share/template/common/labels,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlabels,$(LIBO_SHARE_FOLDER)/template/common/labels,\
templates/common/labels/24_port_patch_text.otg \
templates/common/labels/arrows-black-base.ott \
templates/common/labels/WL-OL1000.ott \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk b/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
index 5c3232b..c9914f0 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonlayout.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonlayout,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlayout,share/template/common/layout,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonlayout,$(LIBO_SHARE_FOLDER)/template/common/layout,\
templates/common/layout/31407-squares.otp \
templates/common/layout/abstract-015_1.jpg.otp \
templates/common/layout/abstract-015_2.jpg.otp \
diff --git a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk b/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
index f2cf1ca..f32195d 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonmisc.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonmisc,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonmisc,share/template/common/misc,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonmisc,$(LIBO_SHARE_FOLDER)/template/common/misc,\
templates/common/misc/White_Notebook_Paper_legal.ott \
templates/common/misc/Yellow_Pad_Legal.ott \
))
diff --git a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk b/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
index cc09376..8fc6f2b 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonofficorr.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonofficorr,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonofficorr,share/template/common/officorr,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
templates/common/officorr/dummy_common_templates.txt \
))
diff --git a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk b/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk
index cf3c5b5..8e4ee0f 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonoffimisc.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonoffimisc,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonoffimisc,share/template/common/offimisc,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonoffimisc,$(LIBO_SHARE_FOLDER)/template/common/offimisc,\
templates/common/offimisc/dummy_common_templates.txt \
))
diff --git a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk b/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk
index f3cdde0..3952f86 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonpersonal.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpersonal,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpersonal,share/template/common/personal,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpersonal,$(LIBO_SHARE_FOLDER)/template/common/personal,\
templates/common/personal/szivesoldal.otg \
))
diff --git a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk b/extras/ExternalPackage_accessoriestemplatescommonpresent.mk
index d2c8669..eb2aca2 100644
--- a/extras/ExternalPackage_accessoriestemplatescommonpresent.mk
+++ b/extras/ExternalPackage_accessoriestemplatescommonpresent.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,extras_accessoriestemplatescomm
$(eval $(call gb_ExternalPackage_set_outdir,extras_accessoriestemplatescommonpresent,$(INSTDIR)))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpresent,share/template/common/presnt,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_accessoriestemplatescommonpresent,$(LIBO_SHARE_FOLDER)/template/common/presnt,\
templates/common/presnt/dummy_common_templates.txt \
))
diff --git a/extras/ExternalPackage_extra_fonts.mk b/extras/ExternalPackage_extra_fonts.mk
index bf97717..0b48038 100644
--- a/extras/ExternalPackage_extra_fonts.mk
+++ b/extras/ExternalPackage_extra_fonts.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_ExternalPackage_set_outdir,extras_extra_fonts,$(INSTDIR)))
$(eval $(call gb_ExternalPackage_use_unpacked,extras_extra_fonts,fonts-pack))
-$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_extra_fonts,share/fonts/truetype,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,extras_extra_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype,\
decorative/BETSY2.ttf \
decorative/Berylibi.ttf \
decorative/Beryliub.ttf \
diff --git a/extras/Gallery_arrows.mk b/extras/Gallery_arrows.mk
index be1a4dc..39d293a 100644
--- a/extras/Gallery_arrows.mk
+++ b/extras/Gallery_arrows.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Gallery_Gallery,arrows,extras/source/gallery/arrows))
-$(eval $(call gb_Gallery_add_files,arrows,share/gallery/arrows,\
+$(eval $(call gb_Gallery_add_files,arrows,$(LIBO_SHARE_FOLDER)/gallery/arrows,\
extras/source/gallery/arrows/A01-Arrow-Gray-Left.svg \
extras/source/gallery/arrows/A02-Arrow-DarkBlue-Right.svg \
extras/source/gallery/arrows/A03-Arrow-Gray-Left.svg \
diff --git a/extras/Gallery_computers.mk b/extras/Gallery_computers.mk
index e59300f..eadbe8c 100644
--- a/extras/Gallery_computers.mk
+++ b/extras/Gallery_computers.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Gallery_Gallery,computers,extras/source/gallery/computers))
-$(eval $(call gb_Gallery_add_files,computers,share/gallery/computers,\
+$(eval $(call gb_Gallery_add_files,computers,$(LIBO_SHARE_FOLDER)/gallery/computers,\
extras/source/gallery/computers/Computer-Cloud.png \
extras/source/gallery/computers/Computer-Desktop.png \
extras/source/gallery/computers/Computer-Laptop-Black.png \
diff --git a/extras/Gallery_diagrams.mk b/extras/Gallery_diagrams.mk
index 4f732be..8c473fc 100644
--- a/extras/Gallery_diagrams.mk
+++ b/extras/Gallery_diagrams.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Gallery_Gallery,diagrams,extras/source/gallery/diagrams))
-$(eval $(call gb_Gallery_add_files,diagrams,share/gallery/diagrams,\
+$(eval $(call gb_Gallery_add_files,diagrams,$(LIBO_SHARE_FOLDER)/gallery/diagrams,\
extras/source/gallery/diagrams/Component-Circle01-Transparent-DarkBlue.svg \
extras/source/gallery/diagrams/Component-Circle02-Transparent-Bule.svg \
extras/source/gallery/diagrams/Component-Circle03-Transparent-Green.svg \
diff --git a/extras/Gallery_education.mk b/extras/Gallery_education.mk
index a069589..2697a1c 100644
--- a/extras/Gallery_education.mk
+++ b/extras/Gallery_education.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Gallery_Gallery,education,extras/source/gallery/education))
-$(eval $(call gb_Gallery_add_files,education,share/gallery/education,\
+$(eval $(call gb_Gallery_add_files,education,$(LIBO_SHARE_FOLDER)/gallery/education,\
extras/source/gallery/education/Blackboard.png \
extras/source/gallery/education/Books.png \
extras/source/gallery/education/Chalk.png \
diff --git a/extras/Gallery_environment.mk b/extras/Gallery_environment.mk
index 16b4be2..bf4916f 100644
--- a/extras/Gallery_environment.mk
+++ b/extras/Gallery_environment.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Gallery_Gallery,environment,extras/source/gallery/environment))
-$(eval $(call gb_Gallery_add_files,environment,share/gallery/environment,\
+$(eval $(call gb_Gallery_add_files,environment,$(LIBO_SHARE_FOLDER)/gallery/environment,\
extras/source/gallery/environment/DrippingFaucet.png \
extras/source/gallery/environment/Earth.png \
extras/source/gallery/environment/EndangeredAnimals1.png \
diff --git a/extras/Gallery_finance.mk b/extras/Gallery_finance.mk
index c53d0d7..5fe085a 100644
--- a/extras/Gallery_finance.mk
+++ b/extras/Gallery_finance.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Gallery_Gallery,finance,extras/source/gallery/finance))
-$(eval $(call gb_Gallery_add_files,finance,share/gallery/finance,\
+$(eval $(call gb_Gallery_add_files,finance,$(LIBO_SHARE_FOLDER)/gallery/finance,\
extras/source/gallery/finance/Agreement.png \
extras/source/gallery/finance/ATM01.png \
extras/source/gallery/finance/ATM02.png \
diff --git a/extras/Gallery_people.mk b/extras/Gallery_people.mk
index 41adf78..f9a9904 100644
--- a/extras/Gallery_people.mk
+++ b/extras/Gallery_people.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Gallery_Gallery,people,extras/source/gallery/people))
-$(eval $(call gb_Gallery_add_files,people,share/gallery/people,\
+$(eval $(call gb_Gallery_add_files,people,$(LIBO_SHARE_FOLDER)/gallery/people,\
extras/source/gallery/people/Artist-Female1.png \
extras/source/gallery/people/Artist-Female2.png \
extras/source/gallery/people/Artist-Male1.png \
diff --git a/extras/Gallery_sound.mk b/extras/Gallery_sound.mk
index 1243b0c..ace75ef 100644
--- a/extras/Gallery_sound.mk
+++ b/extras/Gallery_sound.mk
@@ -10,7 +10,7 @@
$(eval $(call gb_Gallery_Gallery,sounds,extras/source/gallery/sounds))
-$(eval $(call gb_Gallery_add_files,sounds,share/gallery/sounds,\
+$(eval $(call gb_Gallery_add_files,sounds,$(LIBO_SHARE_FOLDER)/gallery/sounds,\
extras/source/gallery/sounds/apert2.wav \
extras/source/gallery/sounds/apert.wav \
extras/source/gallery/sounds/applause.wav \
diff --git a/extras/Gallery_symbols.mk b/extras/Gallery_symbols.mk
index 77e513d..baaab63 100644
--- a/extras/Gallery_symbols.mk
+++ b/extras/Gallery_symbols.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Gallery_Gallery,symbols,extras/source/gallery/symbols))
-$(eval $(call gb_Gallery_add_files,symbols,share/gallery/symbols,\
+$(eval $(call gb_Gallery_add_files,symbols,$(LIBO_SHARE_FOLDER)/gallery/symbols,\
extras/source/gallery/symbols/Book.svg \
extras/source/gallery/symbols/Box01.svg \
extras/source/gallery/symbols/Box02.svg \
diff --git a/extras/Gallery_transportation.mk b/extras/Gallery_transportation.mk
index 605782f..a043f8a 100644
--- a/extras/Gallery_transportation.mk
+++ b/extras/Gallery_transportation.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Gallery_Gallery,transportation,extras/source/gallery/transportation))
-$(eval $(call gb_Gallery_add_files,transportation,share/gallery/transportation,\
+$(eval $(call gb_Gallery_add_files,transportation,$(LIBO_SHARE_FOLDER)/gallery/transportation,\
extras/source/gallery/transportation/Airplane-Blue.png \
extras/source/gallery/transportation/Bicycle-Blue.png \
extras/source/gallery/transportation/Boat.png \
diff --git a/extras/Gallery_txtshapes.mk b/extras/Gallery_txtshapes.mk
index fb3b488..49ee3af 100644
--- a/extras/Gallery_txtshapes.mk
+++ b/extras/Gallery_txtshapes.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Gallery_Gallery,txtshapes,extras/source/gallery/txtshapes))
-$(eval $(call gb_Gallery_add_files,txtshapes,share/gallery/txtshapes,\
+$(eval $(call gb_Gallery_add_files,txtshapes,$(LIBO_SHARE_FOLDER)/gallery/txtshapes,\
extras/source/gallery/txtshapes/Circle01-DarkBlue.svg \
extras/source/gallery/txtshapes/Circle02-LightBlue.svg \
extras/source/gallery/txtshapes/Circle03-Green.svg \
diff --git a/extras/Package_autocorr.mk b/extras/Package_autocorr.mk
index f24e75e..568762a 100644
--- a/extras/Package_autocorr.mk
+++ b/extras/Package_autocorr.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_autocorr,$(call gb_CustomTarget_get_work
$(eval $(call gb_Package_set_outdir,extras_autocorr,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_autocorr,share/autocorr,\
+$(eval $(call gb_Package_add_files,extras_autocorr,$(LIBO_SHARE_FOLDER)/autocorr,\
acor_af-ZA.dat \
acor_bg-BG.dat \
acor_cs-CZ.dat \
diff --git a/extras/Package_autotextuser.mk b/extras/Package_autotextuser.mk
index 7df6c3a..0d3847a 100644
--- a/extras/Package_autotextuser.mk
+++ b/extras/Package_autotextuser.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_autotextuser,$(SRCDIR)/extras/source/aut
$(eval $(call gb_Package_set_outdir,extras_autotextuser,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_autotextuser,presets/autotext,\
+$(eval $(call gb_Package_add_files,extras_autotextuser,$(LIBO_SHARE_PRESETS_FOLDER)/autotext,\
mytexts.bau \
))
diff --git a/extras/Package_cfgsrvbitmapunx.mk b/extras/Package_cfgsrvbitmapunx.mk
index 1d61796..f95e5be 100644
--- a/extras/Package_cfgsrvbitmapunx.mk
+++ b/extras/Package_cfgsrvbitmapunx.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_cfgsrvbitmapunx,$(SRCDIR)/extras/unx/sou
$(eval $(call gb_Package_set_outdir,extras_cfgsrvbitmapunx,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_cfgsrvbitmapunx,share/config,\
+$(eval $(call gb_Package_add_files,extras_cfgsrvbitmapunx,$(LIBO_SHARE_FOLDER)/config,\
psetupl.xpm \
psetup.xpm \
))
diff --git a/extras/Package_cfgsrvnolang.mk b/extras/Package_cfgsrvnolang.mk
index 603a444..9da56d4 100644
--- a/extras/Package_cfgsrvnolang.mk
+++ b/extras/Package_cfgsrvnolang.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_cfgsrvnolang,$(SRCDIR)/extras/source/mis
$(eval $(call gb_Package_set_outdir,extras_cfgsrvnolang,$(INSTDIR)))
-$(eval $(call gb_Package_add_files_with_dir,extras_cfgsrvnolang,share/config,\
+$(eval $(call gb_Package_add_files_with_dir,extras_cfgsrvnolang,$(LIBO_SHARE_FOLDER)/config,\
wizard/form/styles/beige.css \
wizard/form/styles/bgr.css \
wizard/form/styles/dark.css \
diff --git a/extras/Package_cfgusr.mk b/extras/Package_cfgusr.mk
index 45ec351..87920e8 100644
--- a/extras/Package_cfgusr.mk
+++ b/extras/Package_cfgusr.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_cfgusr,$(SRCDIR)/extras/source/misc_conf
$(eval $(call gb_Package_set_outdir,extras_cfgusr,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_cfgusr,presets/config,\
+$(eval $(call gb_Package_add_files,extras_cfgusr,$(LIBO_SHARE_PRESETS_FOLDER)/config,\
autotbl.fmt \
))
diff --git a/extras/Package_database.mk b/extras/Package_database.mk
index 03800f5..af794e5 100644
--- a/extras/Package_database.mk
+++ b/extras/Package_database.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_database,$(SRCDIR)/extras/source/databas
$(eval $(call gb_Package_set_outdir,extras_database,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_database,presets/database,\
+$(eval $(call gb_Package_add_files,extras_database,$(LIBO_SHARE_PRESETS_FOLDER)/database,\
biblio.odb \
evolocal.odb \
))
diff --git a/extras/Package_databasebiblio.mk b/extras/Package_databasebiblio.mk
index a85c193..2517b8a 100644
--- a/extras/Package_databasebiblio.mk
+++ b/extras/Package_databasebiblio.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_databasebiblio,$(SRCDIR)/extras/source/d
$(eval $(call gb_Package_set_outdir,extras_databasebiblio,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_databasebiblio,presets/database/biblio,\
+$(eval $(call gb_Package_add_files,extras_databasebiblio,$(LIBO_SHARE_PRESETS_FOLDER)/database/biblio,\
biblio.dbf \
biblio.dbt \
))
diff --git a/extras/Package_fonts.mk b/extras/Package_fonts.mk
index f751349..6a30804 100644
--- a/extras/Package_fonts.mk
+++ b/extras/Package_fonts.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,extras_fonts,$(SRCDIR)/extras))
$(eval $(call gb_Package_set_outdir,extras_fonts,$(INSTDIR)))
-$(eval $(call gb_Package_add_file,extras_fonts,share/fonts/truetype/opens___.ttf,source/truetype/symbol/opens___.ttf))
+$(eval $(call gb_Package_add_file,extras_fonts,$(LIBO_SHARE_FOLDER)/fonts/truetype/opens___.ttf,source/truetype/symbol/opens___.ttf))
# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_gallbullets.mk b/extras/Package_gallbullets.mk
index c5d903f..b1a6abd 100644
--- a/extras/Package_gallbullets.mk
+++ b/extras/Package_gallbullets.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallbullets,$(SRCDIR)/extras/source/gall
$(eval $(call gb_Package_set_outdir,extras_gallbullets,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_gallbullets,share/gallery/bullets,\
+$(eval $(call gb_Package_add_files,extras_gallbullets,$(LIBO_SHARE_FOLDER)/gallery/bullets,\
blkpearl.gif \
bluarrow.gif \
bluball.gif \
diff --git a/extras/Package_gallhtmlexpo.mk b/extras/Package_gallhtmlexpo.mk
index f0531c5..0f782fd 100644
--- a/extras/Package_gallhtmlexpo.mk
+++ b/extras/Package_gallhtmlexpo.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallhtmlexpo,$(SRCDIR)/extras/source/gal
$(eval $(call gb_Package_set_outdir,extras_gallhtmlexpo,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_gallhtmlexpo,share/gallery/htmlexpo,\
+$(eval $(call gb_Package_add_files,extras_gallhtmlexpo,$(LIBO_SHARE_FOLDER)/gallery/htmlexpo,\
bludown.gif \
blufirs_.gif \
blufirs.gif \
diff --git a/extras/Package_gallmytheme.mk b/extras/Package_gallmytheme.mk
index 4d46098..03bffeb 100644
--- a/extras/Package_gallmytheme.mk
+++ b/extras/Package_gallmytheme.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallmytheme,$(SRCDIR)/extras/source/gall
$(eval $(call gb_Package_set_outdir,extras_gallmytheme,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_gallmytheme,presets/gallery,\
+$(eval $(call gb_Package_add_files,extras_gallmytheme,$(LIBO_SHARE_PRESETS_FOLDER)/gallery,\
sg30.sdv \
sg30.thm \
))
diff --git a/extras/Package_gallroot.mk b/extras/Package_gallroot.mk
index cb1ae1b..d2076cb 100644
--- a/extras/Package_gallroot.mk
+++ b/extras/Package_gallroot.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallroot,$(SRCDIR)/extras/source/gallery
$(eval $(call gb_Package_set_outdir,extras_gallroot,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_gallroot,share/gallery,\
+$(eval $(call gb_Package_add_files,extras_gallroot,$(LIBO_SHARE_FOLDER)/gallery,\
apples.gif \
bigapple.gif \
flower.gif \
diff --git a/extras/Package_gallsystem.mk b/extras/Package_gallsystem.mk
index 9214ba2..bc027b0 100644
--- a/extras/Package_gallsystem.mk
+++ b/extras/Package_gallsystem.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallsystem,$(SRCDIR)/extras/source/galle
$(eval $(call gb_Package_set_outdir,extras_gallsystem,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_gallsystem,share/gallery,\
+$(eval $(call gb_Package_add_files,extras_gallsystem,$(LIBO_SHARE_FOLDER)/gallery,\
sg1.sdg \
sg1.sdv \
sg1.thm \
diff --git a/extras/Package_gallwwwback.mk b/extras/Package_gallwwwback.mk
index c842431..72e62f3 100644
--- a/extras/Package_gallwwwback.mk
+++ b/extras/Package_gallwwwback.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallwwwback,$(SRCDIR)/extras/source/gall
$(eval $(call gb_Package_set_outdir,extras_gallwwwback,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_gallwwwback,share/gallery/www-back,\
+$(eval $(call gb_Package_add_files,extras_gallwwwback,$(LIBO_SHARE_FOLDER)/gallery/www-back,\
aqua.jpg \
bathroom.jpg \
blocks.jpg \
diff --git a/extras/Package_gallwwwgraf.mk b/extras/Package_gallwwwgraf.mk
index 7285592..2041f15 100644
--- a/extras/Package_gallwwwgraf.mk
+++ b/extras/Package_gallwwwgraf.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_gallwwwgraf,$(SRCDIR)/extras/source/gall
$(eval $(call gb_Package_set_outdir,extras_gallwwwgraf,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_gallwwwgraf,share/gallery/www-graf,\
+$(eval $(call gb_Package_add_files,extras_gallwwwgraf,$(LIBO_SHARE_FOLDER)/gallery/www-graf,\
bluat.gif \
bluback.gif \
bludisk.gif \
diff --git a/extras/Package_glade.mk b/extras/Package_glade.mk
index 00b818f..f03cb42 100644
--- a/extras/Package_glade.mk
+++ b/extras/Package_glade.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,extras_glade,$(call gb_CustomTarget_get_workdir
$(eval $(call gb_Package_set_outdir,extras_glade,$(INSTDIR)))
-$(eval $(call gb_Package_add_file,extras_glade,share/glade/libreoffice-catalog.xml,libreoffice-catalog.xml))
+$(eval $(call gb_Package_add_file,extras_glade,$(LIBO_SHARE_FOLDER)/glade/libreoffice-catalog.xml,libreoffice-catalog.xml))
# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_labels.mk b/extras/Package_labels.mk
index 24ff865..ef64e5a 100644
--- a/extras/Package_labels.mk
+++ b/extras/Package_labels.mk
@@ -11,6 +11,6 @@ $(eval $(call gb_Package_Package,extras_labels,$(SRCDIR)/extras/source/labels))
$(eval $(call gb_Package_set_outdir,extras_labels,$(INSTDIR)))
-$(eval $(call gb_Package_add_file,extras_labels,share/labels/labels.xml,labels.xml))
+$(eval $(call gb_Package_add_file,extras_labels,$(LIBO_SHARE_FOLDER)/labels/labels.xml,labels.xml))
# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_newfiles.mk b/extras/Package_newfiles.mk
index aebad89..0f93a23 100644
--- a/extras/Package_newfiles.mk
+++ b/extras/Package_newfiles.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_newfiles,$(SRCDIR)/extras/source/shellne
$(eval $(call gb_Package_set_outdir,extras_newfiles,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_newfiles,share/template/shellnew,\
+$(eval $(call gb_Package_add_files,extras_newfiles,$(LIBO_SHARE_FOLDER)/template/shellnew,\
soffice.odg \
soffice.odp \
soffice.ods \
diff --git a/extras/Package_palettes.mk b/extras/Package_palettes.mk
index 767fb78..a67681b 100644
--- a/extras/Package_palettes.mk
+++ b/extras/Package_palettes.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_palettes,$(SRCDIR)/extras/source/palette
$(eval $(call gb_Package_set_outdir,extras_palettes,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_palettes,presets/config,\
+$(eval $(call gb_Package_add_files,extras_palettes,$(LIBO_SHARE_PRESETS_FOLDER)/config,\
arrowhd.soe \
classic.sog \
cmyk.soc \
diff --git a/extras/Package_tpllayoutimpr.mk b/extras/Package_tpllayoutimpr.mk
index b0664fd..a6c0354 100644
--- a/extras/Package_tpllayoutimpr.mk
+++ b/extras/Package_tpllayoutimpr.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tpllayoutimpr,$(SRCDIR)/extras/source/te
$(eval $(call gb_Package_set_outdir,extras_tpllayoutimpr,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_tpllayoutimpr,share/template/common/layout,\
+$(eval $(call gb_Package_add_files,extras_tpllayoutimpr,$(LIBO_SHARE_FOLDER)/template/common/layout,\
AbstractGreen.otp \
AbstractRed.otp \
AbstractYellow.otp \
diff --git a/extras/Package_tplwizagenda.mk b/extras/Package_tplwizagenda.mk
index d24a0da..f3b4bd3 100644
--- a/extras/Package_tplwizagenda.mk
+++ b/extras/Package_tplwizagenda.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizagenda,$(SRCDIR)/extras/source/tem
$(eval $(call gb_Package_set_outdir,extras_tplwizagenda,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_tplwizagenda,share/template/common/wizard/agenda,\
+$(eval $(call gb_Package_add_files,extras_tplwizagenda,$(LIBO_SHARE_FOLDER)/template/common/wizard/agenda,\
10grey.ott \
1simple.ott \
2elegant.ott \
diff --git a/extras/Package_tplwizbitmap.mk b/extras/Package_tplwizbitmap.mk
index 5213c87..9ea51d3 100644
--- a/extras/Package_tplwizbitmap.mk
+++ b/extras/Package_tplwizbitmap.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizbitmap,$(SRCDIR)/extras/source/tem
$(eval $(call gb_Package_set_outdir,extras_tplwizbitmap,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_tplwizbitmap,share/template/wizard/bitmap,\
+$(eval $(call gb_Package_add_files,extras_tplwizbitmap,$(LIBO_SHARE_FOLDER)/template/wizard/bitmap,\
cancel_down.bmp \
cancel_up.bmp \
down.bmp \
diff --git a/extras/Package_tplwizdesktop.mk b/extras/Package_tplwizdesktop.mk
index 9ab7839..d3cd0ff 100644
--- a/extras/Package_tplwizdesktop.mk
+++ b/extras/Package_tplwizdesktop.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizdesktop,$(SRCDIR)/extras/source/te
$(eval $(call gb_Package_set_outdir,extras_tplwizdesktop,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_tplwizdesktop,share/template/common/internal,\
+$(eval $(call gb_Package_add_files,extras_tplwizdesktop,$(LIBO_SHARE_FOLDER)/template/common/internal,\
html.stw \
idxexample.odt \
))
diff --git a/extras/Package_tplwizfax.mk b/extras/Package_tplwizfax.mk
index 5076ee9..a434d5f 100644
--- a/extras/Package_tplwizfax.mk
+++ b/extras/Package_tplwizfax.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizfax,$(SRCDIR)/extras/source/templa
$(eval $(call gb_Package_set_outdir,extras_tplwizfax,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_tplwizfax,share/template/common/wizard/fax,\
+$(eval $(call gb_Package_add_files,extras_tplwizfax,$(LIBO_SHARE_FOLDER)/template/common/wizard/fax,\
bus-classic_f.ott \
bus-classic-pri_f.ott \
bus-modern_f.ott \
diff --git a/extras/Package_tplwizletter.mk b/extras/Package_tplwizletter.mk
index 0705475..5e71abd 100644
--- a/extras/Package_tplwizletter.mk
+++ b/extras/Package_tplwizletter.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizletter,$(SRCDIR)/extras/source/tem
$(eval $(call gb_Package_set_outdir,extras_tplwizletter,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_tplwizletter,share/template/common/wizard/letter,\
+$(eval $(call gb_Package_add_files,extras_tplwizletter,$(LIBO_SHARE_FOLDER)/template/common/wizard/letter,\
bus-elegant_l.ott \
bus-modern_l.ott \
bus-office_l.ott \
diff --git a/extras/Package_tplwizreport.mk b/extras/Package_tplwizreport.mk
index 3ec042e..f352643 100644
--- a/extras/Package_tplwizreport.mk
+++ b/extras/Package_tplwizreport.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizreport,$(SRCDIR)/extras/source/tem
$(eval $(call gb_Package_set_outdir,extras_tplwizreport,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_tplwizreport,share/template/common/wizard/report,\
+$(eval $(call gb_Package_add_files,extras_tplwizreport,$(LIBO_SHARE_FOLDER)/template/common/wizard/report,\
cnt-011.ott \
cnt-012.ott \
cnt-01.ott \
diff --git a/extras/Package_tplwizstyles.mk b/extras/Package_tplwizstyles.mk
index 1c9a70e..a637778 100644
--- a/extras/Package_tplwizstyles.mk
+++ b/extras/Package_tplwizstyles.mk
@@ -11,7 +11,7 @@ $(eval $(call gb_Package_Package,extras_tplwizstyles,$(SRCDIR)/extras/source/tem
$(eval $(call gb_Package_set_outdir,extras_tplwizstyles,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,extras_tplwizstyles,share/template/common/wizard/styles,\
+$(eval $(call gb_Package_add_files,extras_tplwizstyles,$(LIBO_SHARE_FOLDER)/template/common/wizard/styles,\
blackberry.ots \
black_white.ots \
default.ots \
diff --git a/filter/Package_docbook.mk b/filter/Package_docbook.mk
index 070ebe1..5c14376 100644
--- a/filter/Package_docbook.mk
+++ b/filter/Package_docbook.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_Package_Package,filter_docbook,$(SRCDIR)/filter/source/docbook)
$(eval $(call gb_Package_set_outdir,filter_docbook,$(INSTDIR)))
-$(eval $(call gb_Package_add_files,filter_docbook,share/xslt/docbook,\
+$(eval $(call gb_Package_add_files,filter_docbook,$(LIBO_SHARE_FOLDER)/xslt/docbook,\
DocBookTemplate.stw \
docbooktosoffheadings.xsl \
sofftodocbookheadings.xsl \
diff --git a/filter/Package_xhtml.mk b/filter/Package_xhtml.mk
index 39da72b..b2e3071 100644
--- a/filter/Package_xhtml.mk
+++ b/filter/Package_xhtml.mk
@@ -20,9 +20,9 @@ $(eval $(call gb_Package_Package,filter_xhtml,$(SRCDIR)/filter/source/xslt))
$(eval $(call gb_Package_set_outdir,filter_xhtml,$(INSTDIR)))
-$(eval $(call gb_Package_add_file,filter_xhtml,share/xslt/export/xhtml/body.xsl,odf2xhtml/export/xhtml/body.xsl))
-$(eval $(call gb_Package_add_file,filter_xhtml,share/xslt/export/xhtml/header.xsl,odf2xhtml/export/xhtml/header.xsl))
-$(eval $(call gb_Package_add_file,filter_xhtml,share/xslt/export/xhtml/opendoc2xhtml.xsl,odf2xhtml/export/xhtml/opendoc2xhtml.xsl))
-$(eval $(call gb_Package_add_file,filter_xhtml,share/xslt/export/xhtml/table.xsl,odf2xhtml/export/xhtml/table.xsl))
+$(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/body.xsl,odf2xhtml/export/xhtml/body.xsl))
+$(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/header.xsl,odf2xhtml/export/xhtml/header.xsl))
+$(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/opendoc2xhtml.xsl,odf2xhtml/export/xhtml/opendoc2xhtml.xsl))
+$(eval $(call gb_Package_add_file,filter_xhtml,$(LIBO_SHARE_FOLDER)/xslt/export/xhtml/table.xsl,odf2xhtml/export/xhtml/table.xsl))
# vim: set noet sw=4 ts=4:
diff --git a/filter/Package_xslt.mk b/filter/Package_xslt.mk
index 7a6eff9..760edb8 100644
--- a/filter/Package_xslt.mk
+++ b/filter/Package_xslt.mk
@@ -20,52 +20,52 @@ $(eval $(call gb_Package_Package,filter_xslt,$(SRCDIR)/filter/source/xslt))
$(eval $(call gb_Package_set_outdir,filter_xslt,$(INSTDIR)))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/common/copy.xsl,common/copy.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/common/math.xsl,common/math.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/common/measure_conversion.xsl,common/measure_conversion.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/ooo2ms_docpr.xsl,export/common/ooo2ms_docpr.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/formular.xsl,export/spreadsheetml/formular.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl,export/spreadsheetml/ooo2spreadsheetml.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/style_mapping.xsl,export/spreadsheetml/style_mapping.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/styles.xsl,export/spreadsheetml/styles.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/spreadsheetml/table.xsl,export/spreadsheetml/table.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/uof/odf2uof_presentation.xsl,export/uof/odf2uof_presentation.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/uof/odf2uof_spreadsheet.xsl,export/uof/odf2uof_spreadsheet.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/uof/odf2uof_text.xsl,export/uof/odf2uof_text.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml.xsl,export/wordml/ooo2wordml.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_border.xsl,export/wordml/ooo2wordml_border.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_custom_draw.xsl,export/wordml/ooo2wordml_custom_draw.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_draw.xsl,export/wordml/ooo2wordml_draw.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_field.xsl,export/wordml/ooo2wordml_field.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_list.xsl,export/wordml/ooo2wordml_list.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_page.xsl,export/wordml/ooo2wordml_page.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_path.xsl,export/wordml/ooo2wordml_path.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_settings.xsl,export/wordml/ooo2wordml_settings.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_table.xsl,export/wordml/ooo2wordml_table.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/wordml/ooo2wordml_text.xsl,export/wordml/ooo2wordml_text.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/common/ms2ooo_docpr.xsl,import/common/ms2ooo_docpr.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,import/spreadsheetml/spreadsheetml2ooo.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/uof/uof2odf_presentation.xsl,import/uof/uof2odf_presentation.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/uof/uof2odf_spreadsheet.xsl,import/uof/uof2odf_spreadsheet.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/uof/uof2odf_text.xsl,import/uof/uof2odf_text.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo.xsl,import/wordml/wordml2ooo.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_custom_draw.xsl,import/wordml/wordml2ooo_custom_draw.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_draw.xsl,import/wordml/wordml2ooo_draw.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_field.xsl,import/wordml/wordml2ooo_field.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_list.xsl,import/wordml/wordml2ooo_list.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_page.xsl,import/wordml/wordml2ooo_page.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_path.xsl,import/wordml/wordml2ooo_path.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_props.xsl,import/wordml/wordml2ooo_props.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_settings.xsl,import/wordml/wordml2ooo_settings.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_table.xsl,import/wordml/wordml2ooo_table.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/import/wordml/wordml2ooo_text.xsl,import/wordml/wordml2ooo_text.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/body.xsl,odf2xhtml/export/common/body.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/styles/style_collector.xsl,odf2xhtml/export/common/styles/style_collector.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/styles/style_mapping_css.xsl,odf2xhtml/export/common/styles/style_mapping_css.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table/table.xsl,odf2xhtml/export/common/table/table.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table/table_cells.xsl,odf2xhtml/export/common/table/table_cells.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table/table_columns.xsl,odf2xhtml/export/common/table/table_columns.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table/table_rows.xsl,odf2xhtml/export/common/table/table_rows.xsl))
-$(eval $(call gb_Package_add_file,filter_xslt,share/xslt/export/common/table_of_content.xsl,odf2xhtml/export/common/table_of_content.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/copy.xsl,common/copy.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/math.xsl,common/math.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/common/measure_conversion.xsl,common/measure_conversion.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/ooo2ms_docpr.xsl,export/common/ooo2ms_docpr.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/spreadsheetml/formular.xsl,export/spreadsheetml/formular.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl,export/spreadsheetml/ooo2spreadsheetml.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/spreadsheetml/style_mapping.xsl,export/spreadsheetml/style_mapping.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/spreadsheetml/styles.xsl,export/spreadsheetml/styles.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/spreadsheetml/table.xsl,export/spreadsheetml/table.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/uof/odf2uof_presentation.xsl,export/uof/odf2uof_presentation.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/uof/odf2uof_spreadsheet.xsl,export/uof/odf2uof_spreadsheet.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/uof/odf2uof_text.xsl,export/uof/odf2uof_text.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml.xsl,export/wordml/ooo2wordml.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_border.xsl,export/wordml/ooo2wordml_border.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_custom_draw.xsl,export/wordml/ooo2wordml_custom_draw.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_draw.xsl,export/wordml/ooo2wordml_draw.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_field.xsl,export/wordml/ooo2wordml_field.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_list.xsl,export/wordml/ooo2wordml_list.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_page.xsl,export/wordml/ooo2wordml_page.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_path.xsl,export/wordml/ooo2wordml_path.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_settings.xsl,export/wordml/ooo2wordml_settings.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_table.xsl,export/wordml/ooo2wordml_table.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/wordml/ooo2wordml_text.xsl,export/wordml/ooo2wordml_text.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/common/ms2ooo_docpr.xsl,import/common/ms2ooo_docpr.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,import/spreadsheetml/spreadsheetml2ooo.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/uof/uof2odf_presentation.xsl,import/uof/uof2odf_presentation.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/uof/uof2odf_spreadsheet.xsl,import/uof/uof2odf_spreadsheet.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/uof/uof2odf_text.xsl,import/uof/uof2odf_text.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo.xsl,import/wordml/wordml2ooo.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_custom_draw.xsl,import/wordml/wordml2ooo_custom_draw.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_draw.xsl,import/wordml/wordml2ooo_draw.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_field.xsl,import/wordml/wordml2ooo_field.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_list.xsl,import/wordml/wordml2ooo_list.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_page.xsl,import/wordml/wordml2ooo_page.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_path.xsl,import/wordml/wordml2ooo_path.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_props.xsl,import/wordml/wordml2ooo_props.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_settings.xsl,import/wordml/wordml2ooo_settings.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_table.xsl,import/wordml/wordml2ooo_table.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/import/wordml/wordml2ooo_text.xsl,import/wordml/wordml2ooo_text.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/body.xsl,odf2xhtml/export/common/body.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/styles/style_collector.xsl,odf2xhtml/export/common/styles/style_collector.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/styles/style_mapping_css.xsl,odf2xhtml/export/common/styles/style_mapping_css.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/table/table.xsl,odf2xhtml/export/common/table/table.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/table/table_cells.xsl,odf2xhtml/export/common/table/table_cells.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/table/table_columns.xsl,odf2xhtml/export/common/table/table_columns.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/table/table_rows.xsl,odf2xhtml/export/common/table/table_rows.xsl))
+$(eval $(call gb_Package_add_file,filter_xslt,$(LIBO_SHARE_FOLDER)/xslt/export/common/table_of_content.xsl,odf2xhtml/export/common/table_of_content.xsl))
# vim: set noet sw=4 ts=4:
diff --git a/filter/source/config/fragments/filters/DocBook_File.xcu b/filter/source/config/fragments/filters/DocBook_File.xcu
index c76b5ca..724e6eb 100644
--- a/filter/source/config/fragments/filters/DocBook_File.xcu
+++ b/filter/source/config/fragments/filters/DocBook_File.xcu
@@ -20,9 +20,9 @@
<prop oor:name="Type"><value>writer_DocBook_File</value></prop>
<prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLImporter,com.sun.star.comp.Writer.XMLExporter,../share/xslt/docbook/docbooktosoffheadings.xsl,../share/xslt/docbook/sofftodocbookheadings.xsl</value></prop>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLImporter,com.sun.star.comp.Writer.XMLExporter,../$(share_subdir_name)/xslt/docbook/docbooktosoffheadings.xsl,../$(share_subdir_name)/xslt/docbook/sofftodocbookheadings.xsl</value></prop>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="TemplateName"><value>../share/xslt/docbook/DocBookTemplate.stw</value></prop>
+ <prop oor:name="TemplateName"><value>../$(share_subdir_name)/xslt/docbook/DocBookTemplate.stw</value></prop>
<prop oor:name="UIName">
<value>DocBook</value>
</prop>
diff --git a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu
index 6e56d00..f283b57 100644
--- a/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu
+++ b/filter/source/config/fragments/filters/MS_Excel_2003_XML.xcu
@@ -19,7 +19,7 @@
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../share/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,../share/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl</value></prop>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../$(share_subdir_name)/xslt/import/spreadsheetml/spreadsheetml2ooo.xsl,../$(share_subdir_name)/xslt/export/spreadsheetml/ooo2spreadsheetml.xsl</value></prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>calc_MS_Excel_2003_XML</value></prop>
<prop oor:name="TemplateName"/>
diff --git a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
index 61cdad1..56efe87 100644
--- a/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
+++ b/filter/source/config/fragments/filters/MS_Word_2003_XML.xcu
@@ -19,7 +19,7 @@
<prop oor:name="Flags"><value>IMPORT EXPORT ALIEN 3RDPARTYFILTER</value></prop>
<prop oor:name="UIComponent"/>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../share/xslt/import/wordml/wordml2ooo.xsl,../share/xslt/export/wordml/ooo2wordml.xsl</value></prop>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../$(share_subdir_name)/xslt/import/wordml/wordml2ooo.xsl,../$(share_subdir_name)/xslt/export/wordml/ooo2wordml.xsl</value></prop>
<prop oor:name="FileFormatVersion"><value>0</value></prop>
<prop oor:name="Type"><value>writer_MS_Word_2003_XML</value></prop>
<prop oor:name="TemplateName"/>
diff --git a/filter/source/config/fragments/filters/UOF_presentation.xcu b/filter/source/config/fragments/filters/UOF_presentation.xcu
index c02f9b1..800e9e1 100644
--- a/filter/source/config/fragments/filters/UOF_presentation.xcu
+++ b/filter/source/config/fragments/filters/UOF_presentation.xcu
@@ -20,7 +20,7 @@
<prop oor:name="Type"><value>Unified_Office_Format_presentation</value></prop>
<prop oor:name="DocumentService"><value>com.sun.star.presentation.PresentationDocument</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,../share/xslt/import/uof/uof2odf_presentation.xsl,../share/xslt/export/uof/odf2uof_presentation.xsl</value></prop>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Impress.XMLOasisImporter,com.sun.star.comp.Impress.XMLOasisExporter,../$(share_subdir_name)/xslt/import/uof/uof2odf_presentation.xsl,../$(share_subdir_name)/xslt/export/uof/odf2uof_presentation.xsl</value></prop>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="UIName">
diff --git a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu
index fda148c..148131b 100644
--- a/filter/source/config/fragments/filters/UOF_spreadsheet.xcu
+++ b/filter/source/config/fragments/filters/UOF_spreadsheet.xcu
@@ -20,7 +20,7 @@
<prop oor:name="Type"><value>Unified_Office_Format_spreadsheet</value></prop>
<prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../share/xslt/import/uof/uof2odf_spreadsheet.xsl,../share/xslt/export/uof/odf2uof_spreadsheet.xsl</value></prop>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,../$(share_subdir_name)/xslt/import/uof/uof2odf_spreadsheet.xsl,../$(share_subdir_name)/xslt/export/uof/odf2uof_spreadsheet.xsl</value></prop>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="UIName">
diff --git a/filter/source/config/fragments/filters/UOF_text.xcu b/filter/source/config/fragments/filters/UOF_text.xcu
index 5f674c7..0f7d622 100644
--- a/filter/source/config/fragments/filters/UOF_text.xcu
+++ b/filter/source/config/fragments/filters/UOF_text.xcu
@@ -20,7 +20,7 @@
<prop oor:name="Type"><value>Unified_Office_Format_text</value></prop>
<prop oor:name="DocumentService"><value>com.sun.star.text.TextDocument</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../share/xslt/import/uof/uof2odf_text.xsl,../share/xslt/export/uof/odf2uof_text.xsl</value></prop>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Writer.XMLOasisImporter,com.sun.star.comp.Writer.XMLOasisExporter,../$(share_subdir_name)/xslt/import/uof/uof2odf_text.xsl,../$(share_subdir_name)/xslt/export/uof/odf2uof_text.xsl</value></prop>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="UIName">
diff --git a/filter/source/config/fragments/filters/XHTML_Calc_File.xcu b/filter/source/config/fragments/filters/XHTML_Calc_File.xcu
index 86dc694..a13b05d 100644
--- a/filter/source/config/fragments/filters/XHTML_Calc_File.xcu
+++ b/filter/source/config/fragments/filters/XHTML_Calc_File.xcu
@@ -20,7 +20,7 @@
<prop oor:name="Type"><value>XHTML_File</value></prop>
<prop oor:name="DocumentService"><value>com.sun.star.sheet.SpreadsheetDocument</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,,../share/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Calc.XMLOasisImporter,com.sun.star.comp.Calc.XMLOasisExporter,,../$(share_subdir_name)/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="UIName">
diff --git a/filter/source/config/fragments/filters/XHTML_Draw_File.xcu b/filter/source/config/fragments/filters/XHTML_Draw_File.xcu
index dd6b55c..c63283a 100644
--- a/filter/source/config/fragments/filters/XHTML_Draw_File.xcu
+++ b/filter/source/config/fragments/filters/XHTML_Draw_File.xcu
@@ -20,7 +20,7 @@
<prop oor:name="Type"><value>XHTML_File</value></prop>
<prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
<prop oor:name="UIComponent"/>
- <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Draw.XMLOasisImporter,com.sun.star.comp.Draw.XMLOasisExporter,,../share/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop>
+ <prop oor:name="UserData"><value oor:separator=",">com.sun.star.documentconversion.XSLTFilter,,com.sun.star.comp.Draw.XMLOasisImporter,com.sun.star.comp.Draw.XMLOasisExporter,,../$(share_subdir_name)/xslt/export/xhtml/opendoc2xhtml.xsl</value></prop>
<prop oor:name="FilterService"><value>com.sun.star.comp.Writer.XmlFilterAdaptor</value></prop>
<prop oor:name="TemplateName"/>
<prop oor:name="UIName">
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list