diff options
| author | Andras Timar <atimar@suse.com> | 2012-12-12 00:02:36 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-12-12 00:10:26 +0100 |
| commit | 31f1a12ca545a0cafcf855346c77752ee17d0efe (patch) | |
| tree | 62c1210db547a0d9d891f9bf595578f066adf9b0 /officecfg | |
| parent | 70d0f2cc1607a112f76f4fca22bed3d61eef6122 (diff) | |
LibreLogo should be an optional module
On Windows it is installed by default, but can be disabled in
the installer easily.
Change-Id: Ic820f08b51edf71eb09fd3533dc42b82bd06bb38
Diffstat (limited to 'officecfg')
| -rw-r--r-- | officecfg/Configuration_officecfg.mk | 2 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Addons.xcu | 4 | ||||
| -rw-r--r-- | officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 8fbd8469e852..cbcaaff01e13 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/officecfg/Configuration_officecfg.mk @@ -70,6 +70,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/VCL-unixdesktop.xcu \ org/openoffice/Office/Accelerators-macosx.xcu \ org/openoffice/Office/Accelerators-unxwnt.xcu \ + org/openoffice/Office/Addons-librelogo.xcu \ org/openoffice/Office/Common-writer.xcu \ org/openoffice/Office/Common-calc.xcu \ org/openoffice/Office/Common-draw.xcu \ @@ -106,6 +107,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat org/openoffice/Office/Embedding-base.xcu \ org/openoffice/Office/Embedding-writer.xcu \ org/openoffice/Office/Recovery-gconflockdown.xcu \ + org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \ org/openoffice/TypeDetection/UISort-writer.xcu \ org/openoffice/TypeDetection/UISort-calc.xcu \ org/openoffice/TypeDetection/UISort-draw.xcu \ diff --git a/officecfg/registry/data/org/openoffice/Office/Addons.xcu b/officecfg/registry/data/org/openoffice/Office/Addons.xcu index bd1326362736..8c08f53ed6c8 100644 --- a/officecfg/registry/data/org/openoffice/Office/Addons.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Addons.xcu @@ -9,8 +9,8 @@ * --> -<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="Addons" oor:package="org.openoffice.Office"> - <node oor:name="AddonUI"> +<oor:component-data oor:name="Addons" oor:package="org.openoffice.Office" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <node oor:name="AddonUI" install:module="librelogo"> <node oor:name="OfficeToolBar"> <node oor:name="LibreLogo.OfficeToolBar" oor:op="replace"> <node oor:name="m01" oor:op="replace"> diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu index da2fe9e52e12..e3b16c61d99c 100644 --- a/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu +++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu @@ -720,7 +720,7 @@ <value>true</value> </prop> </node> - <node oor:name="private:resource/toolbar/addon_LibreLogo.OfficeToolBar" oor:op="replace"> + <node oor:name="private:resource/toolbar/addon_LibreLogo.OfficeToolBar" oor:op="replace" install:module="librelogo"> <prop oor:name="UIName" oor:type="xs:string"> <value xml:lang="en-US">Logo</value> </prop> |