From f448d677bcaa9ad68876ea292d93978f729335a0 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@suse.com>
Date: Tue, 8 Oct 2013 12:25:11 +0200
Subject: oglcanvas: cleanup canvas services, demote oglcanvas a bit.

Remove long-dead service instances, demote oglcanvas to be below
cairocanvas (we're not quite mature yet).

Change-Id: Ie6051895fd93a1a518eaa4fb4f71b62bff330a83
---
 .../registry/data/org/openoffice/Office/Canvas.xcu | 23 +++++-----------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
index 266e4d2a8e08..8851827f8292 100644
--- a/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Canvas.xcu
@@ -31,50 +31,37 @@
         <value oor:separator=",">com.sun.star.comp.rendering.BitmapCanvas.GDI+,
                                  com.sun.star.comp.rendering.Canvas.GDI+,
                                  com.sun.star.comp.rendering.Canvas.Cairo,
-                                 com.sun.star.comp.rendering.Canvas.GL,
-                                 com.sun.star.comp.rendering.Canvas.Java,
                                  com.sun.star.comp.rendering.Canvas.VCL
         </value>
       </prop>
       <prop oor:name="AcceleratedImplementations" oor:type="oor:string-list">
-        <value oor:separator=",">com.sun.star.comp.rendering.Canvas.GL,
-                                 com.sun.star.comp.rendering.Canvas.Java
-        </value>
+        <value oor:separator=","/>
       </prop>
       <prop oor:name="AntialiasingImplementations" oor:type="oor:string-list">
         <value oor:separator=",">com.sun.star.comp.rendering.BitmapCanvas.GDI+,
                                  com.sun.star.comp.rendering.Canvas.GDI+,
-                                 com.sun.star.comp.rendering.Canvas.Cairo,
-                                 com.sun.star.comp.rendering.Canvas.GL,
-                                 com.sun.star.comp.rendering.Canvas.Java
+                                 com.sun.star.comp.rendering.Canvas.Cairo
         </value>
       </prop>
     </node>
     <node oor:name="com.sun.star.rendering.SpriteCanvas" oor:op="replace">
       <prop oor:name="PreferredImplementations" oor:type="oor:string-list">
         <value oor:separator=",">com.sun.star.comp.rendering.SpriteCanvas.DX9,
-                                 com.sun.star.comp.rendering.SpriteCanvas.DX5,
-                                 com.sun.star.comp.rendering.SpriteCanvas.OGL,
                                  com.sun.star.comp.rendering.SpriteCanvas.Cairo,
-                                 com.sun.star.comp.rendering.SpriteCanvas.GL,
-                                 com.sun.star.comp.rendering.SpriteCanvas.Java,
+                                 com.sun.star.comp.rendering.SpriteCanvas.OGL,
                                  com.sun.star.comp.rendering.SpriteCanvas.VCL
         </value>
       </prop>
       <prop oor:name="AcceleratedImplementations" oor:type="oor:string-list">
         <value oor:separator=",">com.sun.star.comp.rendering.SpriteCanvas.DX9,
-                                 com.sun.star.comp.rendering.SpriteCanvas.DX5,
                                  com.sun.star.comp.rendering.SpriteCanvas.Cairo,
-                                 com.sun.star.comp.rendering.SpriteCanvas.GL,
-                                 com.sun.star.comp.rendering.SpriteCanvas.Java
+                                 com.sun.star.comp.rendering.SpriteCanvas.OGL
         </value>
       </prop>
       <prop oor:name="AntialiasingImplementations" oor:type="oor:string-list">
         <value oor:separator=",">com.sun.star.comp.rendering.SpriteCanvas.DX9,
-                                 com.sun.star.comp.rendering.SpriteCanvas.DX5,
                                  com.sun.star.comp.rendering.SpriteCanvas.Cairo,
-                                 com.sun.star.comp.rendering.SpriteCanvas.GL,
-                                 com.sun.star.comp.rendering.SpriteCanvas.Java
+                                 com.sun.star.comp.rendering.SpriteCanvas.OGL
         </value>
       </prop>
     </node>
-- 
cgit