summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2010-12-01 12:49:39 +0000
committerCaolán McNamara <caolanm@redhat.com>2010-12-01 12:57:29 +0000
commitfacf89d98e403d9a4657c5156d54670e07e9fb76 (patch)
treed290b2426c2f1d98911208b32a717e9fdc00d656
parent70a379fc3d0be4549891a3db693de4424b93453d (diff)
fdo#32007# Only register EvolutionLocal when evolution support is enabled
(cherry picked from commit fdd1df3de3e902df73e389d045054d86807df84a)
-rw-r--r--officecfg/registry/data/org/openoffice/Office/DataAccess.xcu2
-rw-r--r--officecfg/registry/data/org/openoffice/Office/makefile.mk3
2 files changed, 3 insertions, 2 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
index 4e70af0090..fdf497ca74 100644
--- a/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/DataAccess.xcu
@@ -153,7 +153,7 @@
</node>
</node>
<node oor:name="RegisteredNames">
- <node oor:name="EvolutionLocal" oor:op="replace">
+ <node oor:name="EvolutionLocal" oor:op="replace" install:module="evoab2">
<prop oor:name="Location" oor:type="xs:string">
<value>$(userurl)/database/evolocal.odb</value>
</prop>
diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index 2af1e8629b..31e228d567 100644
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -99,7 +99,8 @@ MODULEFILES= \
Embedding-base.xcu \
Embedding-writer.xcu \
UI-brand.xcu \
- Recovery-gconflockdown.xcu
+ Recovery-gconflockdown.xcu \
+ DataAccess-evoab2.xcu
LOCALIZEDFILES= \
Accelerators.xcu \