diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-10-07 21:12:30 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-10-07 22:06:28 +0200 |
| commit | 2ff63bcdeac45ca10a6c6ac72ac8c9faf9301aa2 (patch) | |
| tree | 1119c8730bd6628f10923dc3357ecae7d71bad28 /officecfg | |
| parent | 29e11dd13efc2d1325b0f424788484bc8ecf0ce1 (diff) | |
Undo basis/brand split: merge basis share/ into brand share/.
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Impress.xcu | 2 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Impress.xcs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu index 353cecfd51c2..6101ceffada5 100644 --- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu @@ -160,7 +160,7 @@ </node> <node oor:name="Misc"> <prop oor:name="TransitionFiles" install:module="ogltrans"> - <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value> + <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> </prop> </node> </oor:component-data> diff --git a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs index 123dffc84b87..874aae736ef8 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Impress.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Impress.xcs @@ -475,7 +475,7 @@ </desc> <label>List of files containing transition effects</label> </info> - <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value> + <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> </prop> <prop oor:name="EffectFiles" oor:type="oor:string-list"> <!-- OldPath: --> @@ -491,7 +491,7 @@ </desc> <label>List of files containing object effects</label> </info> - <value oor:separator=";">vnd.sun.star.expand:$OOO_BASE_DIR/share/config/soffice.cfg/simpress/effects.xml</value> + <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/effects.xml</value> </prop> <prop oor:name="PreviewNewEffects" oor:type="xs:boolean"> <!-- OldPath: --> |