summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-10-30 01:40:53 +0100
committerMarkus Mohrhard <markus.mohrhard@collabora.co.uk>2014-11-10 07:58:34 +0100
commit89c47e4a3d967873e3f495e4e8dfe0016af8014a (patch)
tree8a5a4b25d08acb05ed4eee8188059e8cd7dc2ac8
parentaf43f453b8aa28e861fad8e24bdeebffba5f92dc (diff)
that stuff seems to be totally unused
Change-Id: Ice7bc99fc5f3d26ced1b7cd5a1dbf29b0e635471
-rw-r--r--officecfg/registry/data/org/openoffice/Office/Common.xcu8
-rw-r--r--officecfg/registry/data/org/openoffice/Setup.xcu2
-rw-r--r--officecfg/registry/schema/org/openoffice/Office/Common.xcs57
-rw-r--r--shell/source/backends/gconfbe/gconfaccess.cxx16
-rw-r--r--shell/source/backends/gconfbe/gconfaccess.hxx2
5 files changed, 0 insertions, 85 deletions
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 407be356e0a1..6cd4e22da7a8 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -690,12 +690,4 @@
<value oor:external="com.sun.star.configuration.backend.GconfBackend UndoSteps"/>
</prop>
</node>
- <node oor:name="_3D_Engine" install:module="gconflockdown">
- <prop oor:name="OpenGL">
- <value oor:external="com.sun.star.configuration.backend.GconfBackend OpenGL"/>
- </prop>
- <prop oor:name="OpenGL_Faster">
- <value oor:external="com.sun.star.configuration.backend.GconfBackend OpenGL_Faster"/>
- </prop>
- </node>
</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Setup.xcu b/officecfg/registry/data/org/openoffice/Setup.xcu
index 51ff7c01be99..9b17125b66f1 100644
--- a/officecfg/registry/data/org/openoffice/Setup.xcu
+++ b/officecfg/registry/data/org/openoffice/Setup.xcu
@@ -912,12 +912,10 @@
<it>/org.openoffice.Office.Common/View/FontAntiAliasing</it>
<it>/org.openoffice.Office.Common/View/Localization</it>
<it>/org.openoffice.Office.Common/View/Menu</it>
- <it>/org.openoffice.Office.Common/_3D_Engine</it>
</value>
</prop>
<prop oor:name="ExcludedNodes">
<value>
- <it>/org.openoffice.Office.Common/_3D_Engine/OpenGL</it>
<it>/org.openoffice.Office.Common/Help/Registration</it>
</value>
</prop>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 9e72795692eb..166a1068dc11 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -897,63 +897,6 @@
</info>
</prop>
</group>
- <group oor:name="_3D_Engine">
- <info>
- <desc>Specifies settings for the 3D engine.</desc>
- </info>
- <prop oor:name="Dithering" oor:type="xs:boolean" oor:nillable="false">
- <!-- OldPath: 3D-Engine/Dithering -->
- <!-- OldLocation: soffice.ini -->
- <!-- UIHints: Tools - Options - General - Other - [Section] 3D-View -->
- <info>
- <desc>Specifies if dithering is used to display more colors with few
- colors available.</desc>
- <label>Use Dithering</label>
- </info>
- <value>true</value>
- </prop>
- <prop oor:name="OpenGL" oor:type="xs:boolean" oor:nillable="false">
- <!-- OldPath: 3D-Engine/OpenGL -->
- <!-- OldLocation: soffice.ini -->
- <!-- UIHints: Tools - Options - General - Other - [Section] 3D-View -->
- <info>
- <desc>Specifies if 3D graphics from Draw and Impress will be displayed
- on the user's system using an OpenGL capable hardware. If the system
- does not have an OpenGL capable hardware, this setting will be
- ignored. The 3D display is always done per software.</desc>
- <label>Use OpenGL</label>
- </info>
- <value>false</value>
- </prop>
- <prop oor:name="OpenGL_Faster" oor:type="xs:boolean" oor:nillable="false">
- <!-- OldPath: 3D-Engine/OpenGL_Faster -->
- <!-- OldLocation: soffice.ini -->
- <!-- UIHints: Tools - Options - General - Other - [Section] 3D-View -->
- <info>
- <desc>Specifies whether all geometry data will be simultaneously
- transferred in an array to the graphic driver. Not every graphic
- driver correctly supports this OpenGL capability. For this reason,
- this option can be deactivated in case of presentation errors of 3D
- output. All geometry data will be then transferred as single
- components. This option is only available if OpenGL is used, otherwise
- it is disabled.</desc>
- <label>Optimized output</label>
- </info>
- <value>true</value>
- </prop>
- <prop oor:name="ShowFull" oor:type="xs:boolean" oor:nillable="false">
- <!-- OldPath: 3D-Engine/ShowFull -->
- <!-- OldLocation: soffice.ini -->
- <!-- UIHints: Tools - Options - General - Other - [Section] 3D-View -->
- <info>
- <desc>Specifies interaction with full display. If a 3-D object is
- rotated or moved, the full display is rotated or moved and not a grid
- frame.</desc>
- <label>Object refresh during interaction</label>
- </info>
- <value>false</value>
- </prop>
- </group>
<group oor:name="Dictionaries">
<info>
<desc>Contains settings related to dictionaries.</desc>
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx
index 371b76603043..1b30545fc840 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -700,22 +700,6 @@ ConfigurationValue const ConfigurationValues[] =
},
{
- SETTING_ENABLE_OPENGL,
- "/apps/openoffice/use_opengl",
- RTL_CONSTASCII_STRINGPARAM("OpenGL"),
- false,
- SETTINGS_LAST
- },
-
- {
- SETTING_OPTIMIZE_OPENGL,
- "/apps/openoffice/optimize_opengl",
- RTL_CONSTASCII_STRINGPARAM("OpenGL_Faster"),
- false,
- SETTINGS_LAST
- },
-
- {
SETTING_USE_SYSTEM_FONT,
"/apps/openoffice/use_system_font",
RTL_CONSTASCII_STRINGPARAM("AccessibilityIsSystemFont"),
diff --git a/shell/source/backends/gconfbe/gconfaccess.hxx b/shell/source/backends/gconfbe/gconfaccess.hxx
index 699c4869e29b..bad128df9b67 100644
--- a/shell/source/backends/gconfbe/gconfaccess.hxx
+++ b/shell/source/backends/gconfbe/gconfaccess.hxx
@@ -62,8 +62,6 @@ enum ConfigurationSetting
SETTING_SHOW_INACTIVE_MENUITEMS,
SETTING_SHOW_FONT_PREVIEW,
SETTING_SHOW_FONT_HISTORY,
- SETTING_ENABLE_OPENGL,
- SETTING_OPTIMIZE_OPENGL,
SETTING_SAVE_DOCUMENT_WINDOWS,
SETTING_SAVE_DOCUMENT_VIEW_INFO,
SETTING_USE_SYSTEM_FONT,