[Libreoffice-commits] core.git: Branch 'feature/opengl-vcl' - 2 commits - officecfg/registry shell/source
Markus Mohrhard
markus.mohrhard at collabora.co.uk
Thu Oct 30 12:33:02 PDT 2014
officecfg/registry/data/org/openoffice/Office/Common.xcu | 8 -
officecfg/registry/data/org/openoffice/Setup.xcu | 2
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 67 -------------
shell/source/backends/gconfbe/gconfaccess.cxx | 16 ---
shell/source/backends/gconfbe/gconfaccess.hxx | 2
5 files changed, 95 deletions(-)
New commits:
commit 2b905ac7c000ac4df919a1ce1a92117e36aad7a7
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Thu Oct 30 01:47:12 2014 +0100
this configuration option is totally unused
Change-Id: I6057dfff10d8c776080df2de0b259bd401cd7fb7
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 166a106..4e0f2a3 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2067,16 +2067,6 @@
<desc>Contains settings which are used during the Office startup to
check for unfinished work.</desc>
</info>
- <prop oor:name="DevelopmentChart" oor:type="xs:boolean" oor:nillable="false">
- <info>
- <desc>Specifies that If this option is set to true, the new
- development chart library is used instead of the standard one. Do not
- set this option to true unless you know exactly what to do. This new
- library will be unstable and incomplete most of the time. This flag
- will be removed when the new library is in a stable state.</desc>
- </info>
- <value>false</value>
- </prop>
<set oor:name="RecoveryList" oor:node-type="RecoveryEntry">
<info>
<desc>Contains the documents that were opened when the office
commit 8a8200e338fb2e3ebdd0944d1d3eed31b84c84c2
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date: Thu Oct 30 01:40:53 2014 +0100
that stuff seems to be totally unused
Change-Id: Ice7bc99fc5f3d26ced1b7cd5a1dbf29b0e635471
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index dcb3f70..f29eb6c 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -695,12 +695,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 51ff7c0..9b17125 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 9e72795..166a106 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 5add3bb..9fad634 100644
--- a/shell/source/backends/gconfbe/gconfaccess.cxx
+++ b/shell/source/backends/gconfbe/gconfaccess.cxx
@@ -701,22 +701,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 699c486..bad128d 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,
More information about the Libreoffice-commits
mailing list