diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-18 18:45:45 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | 058a3d1c46449dd5159bae30c83db4c2c5c335b4 (patch) | |
| tree | 28fae22c49b9cecdda52aa148dde2aba2b568ff9 /officecfg | |
| parent | bd2f7ef662122d5c1202911cb2f3b0ab1e124695 (diff) | |
Further work on the "Mac-like app structure" option
Lots of stuff still either ended up in the wrong place, or was looked up from
the wrong place, or both. Fix most cases.
Change-Id: I06ebbce207c219f3cd82b4387dd9b3fdb83420d4
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/Package_misc.mk | 4 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/officecfg/Package_misc.mk b/officecfg/Package_misc.mk index b4e8bd55b89b..cc1e063dcabb 100644 --- a/officecfg/Package_misc.mk +++ b/officecfg/Package_misc.mk @@ -21,7 +21,7 @@ $(eval $(call gb_Package_Package,officecfg_misc,$(SRCDIR)/officecfg)) $(eval $(call gb_Package_set_outdir,officecfg_misc,$(INSTDIR))) -$(eval $(call gb_Package_add_file,officecfg_misc,share/registry/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample)) -$(eval $(call gb_Package_add_file,officecfg_misc,share/registry/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample)) +$(eval $(call gb_Package_add_file,officecfg_misc,$(LIBO_SHARE_FOLDER)/registry/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample)) +$(eval $(call gb_Package_add_file,officecfg_misc,$(LIBO_SHARE_FOLDER)/registry/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample)) # vim: set noet sw=4 ts=4: diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index 410a86995ece..77c23986ff78 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -452,7 +452,7 @@ </desc> <label>List of files containing transition effects</label> </info> - <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value> + <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions-ogl.xml</value> </prop> <prop oor:name="EffectFiles" oor:type="oor:string-list" oor:nillable="false"> <!-- OldPath: --> @@ -467,7 +467,7 @@ </desc> <label>List of files containing object effects</label> </info> - <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/effects.xml</value> + <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/effects.xml</value> </prop> <prop oor:name="PreviewNewEffects" oor:type="xs:boolean" oor:nillable="false"> <!-- OldPath: --> |