diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-16 12:15:55 +0100 |
---|---|---|
committer | Björn Michaelsen <bjoern.michaelsen@canonical.com> | 2015-10-16 13:50:28 +0000 |
commit | 3cf557c12d27f1b2250e69a543136da098112d80 (patch) | |
tree | a4b988a42e3cef7a019f118914572063c0f73d37 /officecfg/registry | |
parent | e00697d9738196f11f331335b256d7bacc17277d (diff) |
drop gconf integration as per ESC decision
Conflicts:
shell/source/backends/gconfbe/gconfbackend.cxx
Change-Id: I609ec83ec59f5ae8d3a8c9c09649695bfcb03b87
Reviewed-on: https://gerrit.libreoffice.org/19408
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Diffstat (limited to 'officecfg/registry')
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Common.xcu | 70 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/Office/Recovery.xcu | 11 | ||||
-rw-r--r-- | officecfg/registry/data/org/openoffice/VCL.xcu | 1 |
3 files changed, 0 insertions, 82 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu index 8940778d566e..29f81ae4809c 100644 --- a/officecfg/registry/data/org/openoffice/Office/Common.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu @@ -96,22 +96,6 @@ <value xml:lang="zh-TW">13</value> </prop> </node> - <node oor:name="FontAntiAliasing" install:module="gconflockdown"> - <prop oor:name="Enabled"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend FontAntiAliasingEnabled"/> - </prop> - <prop oor:name="MinPixelHeight"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend FontAntiAliasingMinPixelHeight"/> - </prop> - </node> - <node oor:name="Menu" install:module="gconflockdown"> - <prop oor:name="DontHideDisabledEntry"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend DontHideDisabledEntry"/> - </prop> - <prop oor:name="ShowIconsInMenues"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend ShowIconsInMenues"/> - </prop> - </node> </node> <node oor:name="Help"> <node oor:name="StartCenter"> @@ -548,14 +532,10 @@ </node> <node oor:name="Misc"> <prop oor:name="UseSystemFileDialog"> - <value install:module="gconflockdown" oor:external="com.sun.star.configuration.backend.GconfBackend UseSystemFileDialog"/> </prop> <prop oor:name="UseSystemPrintDialog" install:module="macosx"> <value>true</value> </prop> - <prop oor:name="SymbolSet" install:module="gconflockdown"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend SymbolSet"/> - </prop> <prop oor:name="TemplateRepositoryUrls"> <value/> </prop> @@ -615,12 +595,6 @@ <prop oor:name="SaveBackwardCompatibleODF" oor:type="xs:boolean"> <value>false</value> </prop> - <prop oor:name="CreateBackup" install:module="gconflockdown"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend CreateBackup"/> - </prop> - <prop oor:name="WarnAlienFormat" install:module="gconflockdown"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend WarnAlienFormat"/> - </prop> </node> <node oor:name="ODF"> <prop oor:name="DefaultVersion" oor:type="xs:short"> @@ -633,27 +607,6 @@ <prop oor:name="HyperlinksWithCtrlClick" oor:type="xs:boolean"> <value>true</value> </prop> - <prop oor:name="MacroSecurityLevel" install:module="gconflockdown"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend MacroSecurityLevel"/> - </prop> - <prop oor:name="RecommendPasswordProtection" install:module="gconflockdown"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend RecommendPasswordProtection"/> - </prop> - <prop oor:name="RemovePersonalInfoOnSaving" install:module="gconflockdown"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend RemovePersonalInfoOnSaving"/> - </prop> - <prop oor:name="WarnCreatePDF" install:module="gconflockdown"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend WarnCreatePDF"/> - </prop> - <prop oor:name="WarnPrintDoc" install:module="gconflockdown"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend WarnPrintDoc"/> - </prop> - <prop oor:name="WarnSaveOrSendDoc" install:module="gconflockdown"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend WarnSaveOrSendDoc"/> - </prop> - <prop oor:name="WarnSignDoc" install:module="gconflockdown"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend WarnSignDoc"/> - </prop> </node> </node> <node oor:name="Path"> @@ -679,28 +632,5 @@ <value oor:external="com.sun.star.configuration.backend.DesktopBackend SourceViewFontHeight"/> </prop> </node> - <node oor:name="View" install:module="gconflockdown"> - <prop oor:name="History"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend FontViewHistory"/> - </prop> - <prop oor:name="ShowFontBoxWYSIWYG"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend ShowFontBoxWYSIWYG"/> - </prop> - </node> - </node> - <node oor:name="Accessibility" install:module="gconflockdown"> - <prop oor:name="IsSystemFont"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend AccessibilityIsSystemFont"/> - </prop> - </node> - <node oor:name="Print" install:module="gconflockdown"> - <prop oor:name="PrintingModifiesDocument"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend PrintingModifiesDocument"/> - </prop> - </node> - <node oor:name="Undo" install:module="gconflockdown"> - <prop oor:name="Steps"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend UndoSteps"/> - </prop> </node> </oor:component-data> diff --git a/officecfg/registry/data/org/openoffice/Office/Recovery.xcu b/officecfg/registry/data/org/openoffice/Office/Recovery.xcu index cbb007780b8d..559a8e89073d 100644 --- a/officecfg/registry/data/org/openoffice/Office/Recovery.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Recovery.xcu @@ -17,15 +17,4 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> <oor:component-data xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" oor:package="org.openoffice.Office" oor:name="Recovery"> - <node oor:name="AutoSave" install:module="gconflockdown"> - <prop oor:name="Enabled"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend AutoSaveEnabled"/> - </prop> - <prop oor:name="UserAutoSaveEnabled"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend UserAutoSaveEnabled"/> - </prop> - <prop oor:name="TimeIntervall"> - <value oor:external="com.sun.star.configuration.backend.GconfBackend AutoSaveTimeIntervall"/> - </prop> - </node> </oor:component-data> diff --git a/officecfg/registry/data/org/openoffice/VCL.xcu b/officecfg/registry/data/org/openoffice/VCL.xcu index 28e24e796a6e..00609c534f53 100644 --- a/officecfg/registry/data/org/openoffice/VCL.xcu +++ b/officecfg/registry/data/org/openoffice/VCL.xcu @@ -28,7 +28,6 @@ <node oor:name="DesktopManagement" oor:op="replace"> <prop oor:name="DisablePrinting" oor:type="xs:string" oor:op="replace"> <value>false</value> - <value install:module="gconflockdown" oor:external="com.sun.star.configuration.backend.GconfBackend DisablePrinting"/> </prop> </node> <node oor:name="Transfer" oor:op="replace"> |