Turn presenter screen from bundled extension to plain code

The immediate trigger was 5e5c11c664f67ff9fd1120905b09a32bea3b2f6c "fdo#42070 Fix RTL support in presenter console" causing build failures on Mac OS X when linking the extension against vcl, but there should be more benefits of going from a bundled-anyway extension to plain code. (Not the least to get rid of the com.sun.star.drawing.XPresenterHelper hack.) To avoid unnecessary confusion between the newly plain code and any instance of the old extension still installed (per-user or shared), I renamed all relevant identifiers as follows: * UNO implementation com.sun.star.comp.Draw.framework.PresenterScreenJob -> org.libreoffice.comp.PresenterScreenJob * UNO implementation com.sun.star.sdext.presenter.PresenterProtocolHandler -> org.libreoffice.comp.PresenterScreenProtocolHandler * protocol handler schema vnd.com.sun.star.comp.PresenterScreen -> vnd.org.libreoffice.presenterscreen * configuration schema /org.openoffice.Office.extension.PresenterScreen -> /org.openoffice.Office.PresenterScreen (it appears this contains little to no user-changeable data anyway, so not migrating it to a new user profile due to the schema name change should not be problematic) * job ID onDocumentOpenedJob -> org.libreoffice.PresenterScreen Even with these precautions, having the presenter screen installed both as plain code and as a (per-user or shared) extension still leads to a crash when activating presentation mode (likely due to how both codes want to take control of the screen). To mitigate this, existing installations of the extension are explicitly not migrated to new user profiles. The sdext/source/presenter/bitmaps/*.png files were moved to icon-themes/galaxy/sd/res/presenterscreen-*.png and are now accessed via SdResId (adding the relevant data to sd/source/ui/inc/res_bmp.hrc and sd/source/ui/app/res_bmp.src; not sure whether these locations are already ideal). The code itself has been left mostly unchanged in sdext/source/presenter/, and it still clumsily communicates with sd core code via XPresenterHelper. There is a lot of room for improvement here. The help data is left untouched at sdext/source/presenter/help/ and needs to be incorporated properly into helpcontent2 in a follow-up commit. The --disable-ext-presenter-console configure switch is gone. Change-Id: I71adb7ae6dcdbd1802151fce6e3871d8a2026332
author: Stephan Bergmann <sbergman@redhat.com> 2012-11-21 17:19:28 +0100
committer: Stephan Bergmann <sbergman@redhat.com> 2012-11-21 17:47:43 +0100
commit: ea91c7d90d74e1ca039ba669b5d3e14fa359c0fa (patch)
tree: 1f8bd3b84fa18737164ed944d9db401794985677 /sdext
parent: 397f3e5d7b0b079ef3a6ef4b859ea2b2ab814b67 (diff)
120 files changed, 35 insertions, 2354 deletions
diff --git a/sdext/Configuration_presenter.mk b/sdext/Configuration_presenter.mk
deleted file mode 100644
index 456a17294049..000000000000
--- a/sdext/Configuration_presenter.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Configuration_Configuration,presenter-screen,nodeliver))
-
-$(eval $(call gb_Configuration_add_schemas,presenter-screen,sdext/source/presenter/registry/schema,\
-    org/openoffice/Office/extension/PresenterScreen.xcs \
-))
-
-$(eval $(call gb_Configuration_add_datas,presenter-screen,sdext/source/presenter/registry/data,\
-    org/openoffice/Office/Jobs.xcu \
-    org/openoffice/Office/ProtocolHandler.xcu \
-))
-
-$(eval $(call gb_Configuration_add_localized_datas,presenter-screen,sdext/source/presenter/registry/data,\
-    org/openoffice/Office/extension/PresenterScreen.xcu \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/CustomTarget_presenter.mk b/sdext/CustomTarget_presenter.mk
deleted file mode 100644
index e559bde7167c..000000000000
--- a/sdext/CustomTarget_presenter.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen))
-
-$(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \
-	$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp
-
-$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp : \
-		$(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \
-		| $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/.dir
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
-	sed "s/PLATFORMID/$(PLATFORMID)/" < $< > $@
-
-# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/Extension_presenter.mk b/sdext/Extension_presenter.mk
deleted file mode 100644
index 93c18a8740ef..000000000000
--- a/sdext/Extension_presenter.mk
+++ /dev/null
@@ -1,146 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Extension_Extension,presenter-screen,sdext/source/presenter))
-
-$(eval $(call gb_Extension_add_libraries,presenter-screen,\
-    PresenterScreen \
-))
-
-$(eval $(call gb_Extension_add_file,presenter-screen,components.rdb,$(call gb_Rdb_get_target,presenter)))
-
-$(eval $(call gb_Extension_add_files,presenter-screen,bitmaps,\
-    $(SRCDIR)/icon-themes/galaxy/desktop/res/extension_32.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/Background.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveBottom.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveLeft.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveRight.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveTop.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderActiveTopRight.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderBottom.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderBottomLeft.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderBottomRight.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderLeft.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderRight.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarBottom.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarLeft.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarRight.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarTop.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderTop.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderTopLeft.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/BorderTopRight.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonHelpNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonHelpSelected.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonMinusNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonMinusSelected.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonNotesNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonNotesSelected.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonPlusNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonPlusSelected.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/LabelMouseOverRight.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png \
-    $(SRCDIR)/sdext/source/presenter/bitmaps/ViewBackground.png \
-))
-
-$(eval $(call gb_Extension_add_file,presenter-screen,registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs,$(call gb_XcsTarget_get_target,sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs)))
-
-$(eval $(call gb_Extension_add_file,presenter-screen,registry/data/org/openoffice/Office/extension/PresenterScreen.xcu,$(call gb_XcuFile_for_extension,sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu)))
-
-$(eval $(call gb_Extension_add_files,presenter-screen,registry/data/org/openoffice/Office,\
-    $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu) \
-    $(call gb_XcuDataTarget_get_target,sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu) \
-))
-
-$(eval $(call gb_Extension_add_helpfile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp,com.sun.PresenterScreen/presenter.xhp))
-
-$(eval $(call gb_Extension_add_helptreefile,presenter-screen,$(SRCDIR)/sdext/source/presenter/help/en-US,help.tree,com.sun.PresenterScreen/help.tree,com.sun.PresenterScreen-$(PLATFORMID)))
-
-
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index 8153e0d9a845..87418159ef36 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -31,10 +31,6 @@ $(eval $(call gb_Library_set_componentfile,PresenterScreen,sdext/source/presente
 
 $(eval $(call gb_Library_use_sdk_api,PresenterScreen))
 
-$(eval $(call gb_Library_add_defs,PresenterScreen,\
-    -DPRESENTER_IMPL_IDENTIFIER=\"com.sun.PresenterScreen-$(PLATFORMID)\" \
-))
-
 $(eval $(call gb_Library_use_libraries,PresenterScreen,\
     cppu \
     cppuhelper \
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 7bba9d936232..779b3bf6b6d7 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Module_Module,sdext))
 
+$(eval $(call gb_Module_add_targets,sdext,\
+    Library_presenter \
+))
+
 ifeq ($(ENABLE_MINIMIZER),YES)
 $(eval $(call gb_Module_add_targets,sdext,\
     Configuration_minimizer \
@@ -53,14 +57,4 @@ $(eval $(call gb_Module_add_check_targets,sdext,\
 ))
 endif
 
-ifeq ($(ENABLE_PRESENTER_SCREEN),YES)
-$(eval $(call gb_Module_add_targets,sdext,\
-    Configuration_presenter \
-    CustomTarget_presenter \
-    Extension_presenter \
-    Library_presenter \
-    Rdb_presenter \
-))
-endif
-
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/Rdb_presenter.mk b/sdext/Rdb_presenter.mk
deleted file mode 100644
index c1d4125202b7..000000000000
--- a/sdext/Rdb_presenter.mk
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Rdb_Rdb,presenter))
-
-$(eval $(call gb_Rdb_add_components,presenter,\
-    sdext/source/presenter/presenter \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/sdext/source/presenter/META-INF/manifest.xml b/sdext/source/presenter/META-INF/manifest.xml
deleted file mode 100644
index a25f22fdf81a..000000000000
--- a/sdext/source/presenter/META-INF/manifest.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
-    <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-components;platform=@PLATFORM@"
-    manifest:full-path="components.rdb"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-    manifest:full-path="registry/data/org/openoffice/Office/Jobs.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-    manifest:full-path="registry/data/org/openoffice/Office/ProtocolHandler.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-data"
-    manifest:full-path="registry/data/org/openoffice/Office/extension/PresenterScreen.xcu"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.configuration-schema"
-    manifest:full-path="registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs"/>
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.help"
-    manifest:full-path="help"/>
-</manifest:manifest>
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index b19bac9a6867..b3f8048b05e5 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -435,7 +435,7 @@ public:
         OUString sName (A2S("Presenter Console"));
         PresenterConfigurationAccess aConfiguration (
             rxContext,
-            OUString("/org.openoffice.Office.extension.PresenterScreen/"),
+            OUString("/org.openoffice.Office.PresenterScreen/"),
             PresenterConfigurationAccess::READ_ONLY);
         aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Console/String"))
             >>= sName;
@@ -465,7 +465,7 @@ public:
         {
             PresenterConfigurationAccess aConfiguration (
                 rxContext,
-                OUString("/org.openoffice.Office.extension.PresenterScreen/"),
+                OUString("/org.openoffice.Office.PresenterScreen/"),
                 PresenterConfigurationAccess::READ_ONLY);
             aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String"))
                 >>= sName;
@@ -1886,7 +1886,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
     {
         PresenterConfigurationAccess aConfiguration (
             rxContext,
-            OUString("/org.openoffice.Office.extension.PresenterScreen/"),
+            OUString("/org.openoffice.Office.PresenterScreen/"),
             PresenterConfigurationAccess::READ_ONLY);
         aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Notes/String"))
             >>= sName;
diff --git a/sdext/source/presenter/PresenterBitmapContainer.cxx b/sdext/source/presenter/PresenterBitmapContainer.cxx
index 88c4d6d16928..30e4eaf25ff9 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
@@ -18,7 +18,6 @@
  */
 
 #include "PresenterBitmapContainer.hxx"
-#include "PresenterComponent.hxx"
 #include "PresenterConfigurationAccess.hxx"
 
 #include <com/sun/star/deployment/XPackageInformationProvider.hpp>
@@ -45,11 +44,9 @@ PresenterBitmapContainer::PresenterBitmapContainer (
     const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
     const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
-    const OUString& rsBasePath,
     const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper)
     : mpParentContainer(rpParentContainer),
       maIconContainer(),
-      msBasePath(rsBasePath),
       mxCanvas(rxCanvas),
       mxPresenterHelper(rxPresenterHelper)
 {
@@ -58,7 +55,7 @@ PresenterBitmapContainer::PresenterBitmapContainer (
     // Get access to the configuration.
     PresenterConfigurationAccess aConfiguration (
         rxComponentContext,
-        A2S("org.openoffice.Office.extension.PresenterScreen"),
+        A2S("org.openoffice.Office.PresenterScreen"),
         PresenterConfigurationAccess::READ_ONLY);
     Reference<container::XNameAccess> xBitmapList (
         aConfiguration.GetConfigurationNode(rsConfigurationBase),
@@ -72,11 +69,9 @@ PresenterBitmapContainer::PresenterBitmapContainer (
     const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
     const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
-    const OUString& rsBasePath,
     const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper)
     : mpParentContainer(rpParentContainer),
       maIconContainer(),
-      msBasePath(rsBasePath),
       mxCanvas(rxCanvas),
       mxPresenterHelper(rxPresenterHelper)
 {
@@ -150,7 +145,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
     const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
     const ::rtl::OUString& rsPath,
     const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper,
-    const OUString& rsBasePath,
     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
     const SharedBitmapDescriptor& rpDefault)
 {
@@ -167,7 +161,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
                 pBitmap = LoadBitmap(
                     xBitmapProperties,
                     rxPresenterHelper,
-                    rsBasePath,
                     rxCanvas,
                     rpDefault);
         }
@@ -191,7 +184,6 @@ void PresenterBitmapContainer::ProcessBitmap (
     maIconContainer[sName] = LoadBitmap(
         rxProperties,
         mxPresenterHelper,
-        msBasePath,
         mxCanvas,
         SharedBitmapDescriptor());
 }
@@ -199,7 +191,6 @@ void PresenterBitmapContainer::ProcessBitmap (
 SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
     const Reference<beans::XPropertySet>& rxProperties,
     const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper,
-    const OUString& rsBasePath,
     const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
     const SharedBitmapDescriptor& rpDefault)
 {
@@ -219,7 +210,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::Normal,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
@@ -228,7 +219,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::MouseOver,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
@@ -237,7 +228,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::ButtonDown,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
@@ -246,7 +237,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::Disabled,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
@@ -255,7 +246,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::Mask,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
diff --git a/sdext/source/presenter/PresenterBitmapContainer.hxx b/sdext/source/presenter/PresenterBitmapContainer.hxx
index 1a44c7f3fc27..c06f6cf58bd5 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.hxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.hxx
@@ -98,14 +98,12 @@ public:
         const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
         const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
-        const ::rtl::OUString& rsBasePath,
         const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper = NULL);
     PresenterBitmapContainer (
         const css::uno::Reference<css::container::XNameAccess>& rsRootNode,
         const ::boost::shared_ptr<PresenterBitmapContainer>& rpParentContainer,
         const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
-        const ::rtl::OUString& rsBasePath,
         const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper = NULL);
     ~PresenterBitmapContainer (void);
 
@@ -120,7 +118,6 @@ public:
         const css::uno::Reference<css::container::XHierarchicalNameAccess>& rxNode,
         const ::rtl::OUString& rsPathToBitmapNode,
         const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper,
-        const ::rtl::OUString& rsBitmapBasePath,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
         const ::boost::shared_ptr<BitmapDescriptor>& rpDefaultBitmap);
 
@@ -128,7 +125,6 @@ private:
     ::boost::shared_ptr<PresenterBitmapContainer> mpParentContainer;
     typedef ::std::map<rtl::OUString, ::boost::shared_ptr<BitmapDescriptor> > BitmapContainer;
     BitmapContainer maIconContainer;
-    ::rtl::OUString msBasePath;
     css::uno::Reference<css::rendering::XCanvas> mxCanvas;
     css::uno::Reference<css::drawing::XPresenterHelper> mxPresenterHelper;
 
@@ -140,7 +136,6 @@ private:
     static ::boost::shared_ptr<BitmapDescriptor> LoadBitmap (
         const css::uno::Reference<css::beans::XPropertySet>& rxProperties,
         const css::uno::Reference<css::drawing::XPresenterHelper>& rxPresenterHelper,
-        const ::rtl::OUString& rsBasePath,
         const css::uno::Reference<css::rendering::XCanvas>& rxCanvas,
         const ::boost::shared_ptr<PresenterBitmapContainer::BitmapDescriptor>& rpDefault);
     static BitmapDescriptor::TexturingMode
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
index cb4d049e6216..de18f450ea0e 100644
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ b/sdext/source/presenter/PresenterComponent.cxx
@@ -17,13 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "PresenterComponent.hxx"
 #include "cppuhelper/factory.hxx"
 #include "cppuhelper/implementationentry.hxx"
-#include <com/sun/star/deployment/DeploymentException.hpp>
-#include <com/sun/star/deployment/XPackageInformationProvider.hpp>
 
-#include "PresenterExtensionIdentifier.hxx"
 #include "PresenterProtocolHandler.hxx"
 #include "PresenterScreen.hxx"
 
@@ -35,41 +31,6 @@ using ::rtl::OUString;
 
 namespace sdext { namespace presenter {
 
-::rtl::OUString PresenterComponent::GetBasePath (
-    const Reference<XComponentContext>& rxComponentContext)
-{
-    return GetBasePath(rxComponentContext, gsExtensionIdentifier);
-}
-
-::rtl::OUString PresenterComponent::GetBasePath (
-    const Reference<XComponentContext>& rxComponentContext,
-    const OUString& rsExtensionIdentifier)
-{
-    static ::rtl::OUString sBasePath;
-    if (sBasePath.isEmpty())
-    {
-        // Determine the base path of the bitmaps.
-        Reference<deployment::XPackageInformationProvider> xInformationProvider (
-            rxComponentContext->getValueByName(
-                OUString(RTL_CONSTASCII_USTRINGPARAM(
-                    "/singletons/com.sun.star.deployment.PackageInformationProvider"))),
-            UNO_QUERY);
-        if (xInformationProvider.is())
-        {
-            try
-            {
-                sBasePath = xInformationProvider->getPackageLocation(rsExtensionIdentifier)
-                    + OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-            }
-            catch (const deployment::DeploymentException&)
-            {
-            }
-        }
-    }
-
-    return sBasePath;
-}
-
 rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
 
 static struct ImplementationEntry gServiceEntries[] =
diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx
deleted file mode 100644
index b9a428a4c58f..000000000000
--- a/sdext/source/presenter/PresenterComponent.hxx
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef SDEXT_PRESENTER_COMPONENT_HXX
-#define SDEXT_PRESENTER_COMPONENT_HXX
-
-#include <com/sun/star/uno/XComponentContext.hpp>
-
-namespace css = ::com::sun::star;
-
-namespace sdext { namespace presenter {
-
-/** This string is replaced automatically by the makefile during the
-    building of this extension.
-*/
-class PresenterComponent
-{
-public:
-    const static ::rtl::OUString gsExtensionIdentifier;
-
-    static ::rtl::OUString GetBasePath (
-        const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext);
-    static ::rtl::OUString GetBasePath (
-        const css::uno::Reference<css::uno::XComponentContext>& rxComponentContext,
-        const ::rtl::OUString& rsExtensionIdentifier);
-};
-
-} }
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index 2ae90dc1085a..5fdb8bc5d026 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -34,7 +34,7 @@ using ::rtl::OUString;
 namespace sdext { namespace presenter {
 
 const ::rtl::OUString PresenterConfigurationAccess::msPresenterScreenRootName =
-    A2S("/org.openoffice.Office.extension.PresenterScreen/");
+    A2S("/org.openoffice.Office.PresenterScreen/");
 
 PresenterConfigurationAccess::PresenterConfigurationAccess (
     const Reference<XComponentContext>& rxContext,
diff --git a/sdext/source/presenter/PresenterExtensionIdentifier.hxx b/sdext/source/presenter/PresenterExtensionIdentifier.hxx
deleted file mode 100644
index 089f8e377da8..000000000000
--- a/sdext/source/presenter/PresenterExtensionIdentifier.hxx
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef SDEXT_PRESENTER_EXTENSION_IDENTIFIER_HXX
-#define SDEXT_PRESENTER_EXTENSION_IDENTIFIER_HXX
-
-namespace sdext { namespace presenter {
-
-const ::rtl::OUString PresenterComponent::gsExtensionIdentifier(
-    RTL_CONSTASCII_USTRINGPARAM(PRESENTER_IMPL_IDENTIFIER));
-
-} }
-
-#endif
diff --git a/sdext/source/presenter/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index e2c2f3d0aca7..ee6729ffa692 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -346,7 +346,7 @@ void PresenterHelpView::ReadHelpStrings (void)
     mpTextContainer.reset(new TextContainer());
     PresenterConfigurationAccess aConfiguration (
         mxComponentContext,
-        OUString("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString("/org.openoffice.Office.PresenterScreen/"),
         PresenterConfigurationAccess::READ_ONLY);
     Reference<container::XNameAccess> xStrings (
         aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/HelpView/HelpStrings")),
diff --git a/sdext/source/presenter/PresenterProtocolHandler.cxx b/sdext/source/presenter/PresenterProtocolHandler.cxx
index 45b671827acf..34da2bd17fb2 100644
--- a/sdext/source/presenter/PresenterProtocolHandler.cxx
+++ b/sdext/source/presenter/PresenterProtocolHandler.cxx
@@ -47,8 +47,6 @@ using ::rtl::OUString;
 namespace sdext { namespace presenter {
 
 namespace {
-    const static OUString gsProtocol (A2S("vnd.com.sun.star.comp.PresenterScreen:"));
-
     class Command
     {
     public:
@@ -240,7 +238,7 @@ private:
 
 OUString PresenterProtocolHandler::getImplementationName_static (void)
 {
-    return A2S("vnd.sun.star.sdext.presenter.PresenterProtocolHandler");
+    return OUString("org.libreoffice.comp.PresenterScreenProtocolHandler");
 }
 
 Sequence<OUString> PresenterProtocolHandler::getSupportedServiceNames_static (void)
@@ -309,7 +307,7 @@ Reference<frame::XDispatch> SAL_CALL PresenterProtocolHandler::queryDispatch (
 
     Reference<frame::XDispatch> xDispatch;
 
-    if (rURL.Protocol == gsProtocol)
+    if (rURL.Protocol == "vnd.org.libreoffice.presenterscreen:")
     {
         xDispatch.set(Dispatch::Create(rURL.Path, mpPresenterController));
     }
@@ -432,7 +430,7 @@ void SAL_CALL PresenterProtocolHandler::Dispatch::dispatch(
     (void)rArguments;
     ThrowIfDisposed();
 
-    if (rURL.Protocol == gsProtocol
+    if (rURL.Protocol == "vnd.org.libreoffice.presenterscreen:"
         && rURL.Path == msURLPath)
     {
         if (mpCommand.get() != NULL)
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index bfa2ae2a43d8..d4fadf6e9597 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -95,14 +95,12 @@ namespace {
 
 OUString PresenterScreenJob::getImplementationName_static (void)
 {
-    return A2S("com.sun.star.comp.Draw.framework.PresenterScreenJob");
+    return OUString("org.libreoffice.comp.PresenterScreenJob");
 }
 
 Sequence<OUString> PresenterScreenJob::getSupportedServiceNames_static (void)
 {
-    static const ::rtl::OUString sServiceName(
-        A2S("com.sun.star.drawing.framework.PresenterScreenJob"));
-    return Sequence<rtl::OUString>(&sServiceName, 1);
+    return Sequence<rtl::OUString>();
 }
 
 Reference<XInterface> PresenterScreenJob::Create (const Reference<uno::XComponentContext>& rxContext)
@@ -505,7 +503,7 @@ sal_Int32 PresenterScreen::GetPresenterScreenNumber (
             Reference<XComponentContext> xContext (mxContextWeak);
             PresenterConfigurationAccess aConfiguration (
                 xContext,
-                OUString("/org.openoffice.Office.extension.PresenterScreen/"),
+                OUString("/org.openoffice.Office.PresenterScreen/"),
                 PresenterConfigurationAccess::READ_ONLY);
             bool bStartAlways (false);
             if (aConfiguration.GetConfigurationNode(
@@ -654,7 +652,7 @@ void PresenterScreen::SetupConfiguration (
     {
         PresenterConfigurationAccess aConfiguration (
             rxContext,
-            OUString("org.openoffice.Office.extension.PresenterScreen"),
+            OUString("org.openoffice.Office.PresenterScreen"),
             PresenterConfigurationAccess::READ_ONLY);
         maViewDescriptors.clear();
         ProcessViewDescriptions(aConfiguration);
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index 576458bd0256..cb87d61f4166 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -20,7 +20,6 @@
 #include "PresenterScrollBar.hxx"
 #include "PresenterBitmapContainer.hxx"
 #include "PresenterCanvasHelper.hxx"
-#include "PresenterComponent.hxx"
 #include "PresenterGeometryHelper.hxx"
 #include "PresenterPaintManager.hxx"
 #include "PresenterTimer.hxx"
@@ -272,8 +271,7 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx
                             OUString("PresenterScreenSettings/ScrollBar/Bitmaps"),
                             ::boost::shared_ptr<PresenterBitmapContainer>(),
                             mxComponentContext,
-                            mxCanvas,
-                            PresenterComponent::GetBasePath(mxComponentContext)));
+                            mxCanvas));
                         mpSharedBitmaps = mpBitmaps;
                     }
                     catch(Exception&)
diff --git a/sdext/source/presenter/PresenterSlideSorter.cxx b/sdext/source/presenter/PresenterSlideSorter.cxx
index 6c5d75da837a..eb0ce723c163 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -22,7 +22,6 @@
 #include "PresenterSlideSorter.hxx"
 #include "PresenterButton.hxx"
 #include "PresenterCanvasHelper.hxx"
-#include "PresenterComponent.hxx"
 #include "PresenterGeometryHelper.hxx"
 #include "PresenterHelper.hxx"
 #include "PresenterPaintManager.hxx"
@@ -1725,7 +1724,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer (
 {
     PresenterConfigurationAccess aConfiguration (
         rxContext,
-        OUString("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString("/org.openoffice.Office.PresenterScreen/"),
         PresenterConfigurationAccess::READ_ONLY);
     Reference<container::XHierarchicalNameAccess> xBitmaps (
         aConfiguration.GetConfigurationNode(
@@ -1738,8 +1737,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer (
         A2S("PresenterScreenSettings/SlideSorter/CurrentSlideBorderBitmaps"),
         ::boost::shared_ptr<PresenterBitmapContainer>(),
         rxContext,
-        rxCanvas,
-        PresenterComponent::GetBasePath(rxContext));
+        rxCanvas);
 
     mpTopLeft = aContainer.GetBitmap(A2S("TopLeft"));
     mpTop = aContainer.GetBitmap(A2S("Top"));
diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx
index e64f1073c4f7..1fc2f85475af 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -20,7 +20,6 @@
 #include "PresenterTheme.hxx"
 #include "PresenterBitmapContainer.hxx"
 #include "PresenterCanvasHelper.hxx"
-#include "PresenterComponent.hxx"
 #include "PresenterConfigurationAccess.hxx"
 #include "PresenterHelper.hxx"
 #include <com/sun/star/awt/Point.hpp>
@@ -93,7 +92,6 @@ public:
     Reference<XComponentContext> mxComponentContext;
     Reference<rendering::XCanvas> mxCanvas;
     Reference<drawing::XPresenterHelper> mxPresenterHelper;
-    OUString msBasePath;
 
     ReadContext (
         const Reference<XComponentContext>& rxContext,
@@ -119,8 +117,6 @@ public:
 
     BorderSize ReadBorderSize (const Reference<container::XNameAccess>& rxNode);
 
-    void SetBitmapSourceExtension (const OUString& rsExtensionName);
-
 private:
     Any GetByName (
         const Reference<container::XNameAccess>& rxNode,
@@ -293,7 +289,7 @@ PresenterTheme::~PresenterTheme (void)
 
     PresenterConfigurationAccess aConfiguration (
         mxContext,
-        OUString("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString("/org.openoffice.Office.PresenterScreen/"),
         PresenterConfigurationAccess::READ_ONLY);
 
     return aReadContext.ReadTheme(aConfiguration, msThemeName);
@@ -381,7 +377,7 @@ bool PresenterTheme::ConvertToColor (
     ::boost::shared_ptr<PresenterConfigurationAccess> pConfiguration (
         new PresenterConfigurationAccess(
             mxContext,
-            OUString("/org.openoffice.Office.extension.PresenterScreen/"),
+            OUString("/org.openoffice.Office.PresenterScreen/"),
             PresenterConfigurationAccess::READ_WRITE));
 
     // Get configuration node for the view style container of the current
@@ -625,26 +621,11 @@ void PresenterTheme::Theme::Read (
         mpParentTheme = rReadContext.ReadTheme(rConfiguration, sParentThemeName);
     }
 
-    // Read the extension that contains the bitmaps referenced in this
-    // theme.
-    OUString sBitmapSourceExtension;
-    if ((PresenterConfigurationAccess::GetConfigurationNode(
-        mxThemeRoot, A2S("BitmapSourceExtension")) >>= sBitmapSourceExtension)
-        && !sBitmapSourceExtension.isEmpty())
-    {
-        rReadContext.SetBitmapSourceExtension(sBitmapSourceExtension);
-    }
-    else
-    {
-        rReadContext.SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier);
-    }
-
     // Background.
     mpBackground = PresenterBitmapContainer::LoadBitmap(
         mxThemeRoot,
         A2S("Background"),
         rReadContext.mxPresenterHelper,
-        rReadContext.msBasePath,
         rReadContext.mxCanvas,
         SharedBitmapDescriptor());
 
@@ -667,8 +648,7 @@ void PresenterTheme::Theme::Read (
                 ? mpParentTheme->mpIconContainer
                 : ::boost::shared_ptr<PresenterBitmapContainer>(),
             rReadContext.mxComponentContext,
-            rReadContext.mxCanvas,
-            rReadContext.msBasePath));
+            rReadContext.mxCanvas));
 
     // Read fonts.
     Reference<container::XNameAccess> xFontNode(
@@ -720,8 +700,7 @@ ReadContext::ReadContext (
     const Reference<rendering::XCanvas>& rxCanvas)
     : mxComponentContext(rxContext),
       mxCanvas(rxCanvas),
-      mxPresenterHelper(),
-      msBasePath()
+      mxPresenterHelper()
 {
     Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager());
     if (xFactory.is())
@@ -732,9 +711,6 @@ ReadContext::ReadContext (
                 rxContext),
             UNO_QUERY_THROW);
     }
-
-    // Get base path to bitmaps.
-    SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier);
 }
 
 ReadContext::~ReadContext (void)
@@ -866,12 +842,6 @@ BorderSize ReadContext::ReadBorderSize (const Reference<container::XNameAccess>&
     return aBorderSize;
 }
 
-void ReadContext::SetBitmapSourceExtension (const OUString& rsExtensionIdentifier)
-{
-    // Get base path to bitmaps.
-    msBasePath = PresenterComponent::GetBasePath(mxComponentContext, rsExtensionIdentifier);
-}
-
 //===== PaneStyleContainer ====================================================
 
 void PaneStyleContainer::Read (
@@ -953,7 +923,6 @@ void PaneStyleContainer::ProcessPaneStyle(
                 : ::boost::shared_ptr<PresenterBitmapContainer>(),
             rReadContext.mxComponentContext,
             rReadContext.mxCanvas,
-            rReadContext.msBasePath,
             rReadContext.mxPresenterHelper));
     }
 
@@ -1088,7 +1057,6 @@ void ViewStyleContainer::ProcessViewStyle(
         xBackgroundNode,
         OUString(),
         rReadContext.mxPresenterHelper,
-        rReadContext.msBasePath,
         rReadContext.mxCanvas,
         SharedBitmapDescriptor()));
     if (pBackground.get() != NULL && pBackground->GetNormalBitmap().is())
diff --git a/sdext/source/presenter/PresenterToolBar.cxx b/sdext/source/presenter/PresenterToolBar.cxx
index 60e44faaed9f..ac69c76720a8 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -22,7 +22,6 @@
 
 #include "PresenterBitmapContainer.hxx"
 #include "PresenterCanvasHelper.hxx"
-#include "PresenterComponent.hxx"
 #include "PresenterGeometryHelper.hxx"
 #include "PresenterPaintManager.hxx"
 #include "PresenterPaneBase.hxx"
@@ -120,7 +119,6 @@ class PresenterToolBar::Context
     : private ::boost::noncopyable
 {
 public:
-    ::rtl::OUString msBasePath;
     Reference<drawing::XPresenterHelper> mxPresenterHelper;
     css::uno::Reference<css::rendering::XCanvas> mxCanvas;
 };
@@ -633,11 +631,9 @@ void PresenterToolBar::CreateControls (
     // Expand the macro in the bitmap file names.
     PresenterConfigurationAccess aConfiguration (
         mxComponentContext,
-        OUString("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString("/org.openoffice.Office.PresenterScreen/"),
         PresenterConfigurationAccess::READ_ONLY);
 
-    const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext));
-
     mpCurrentContainerPart.reset(new ElementContainerPart());
     maElementContainer.clear();
     maElementContainer.push_back(mpCurrentContainerPart);
@@ -651,7 +647,6 @@ void PresenterToolBar::CreateControls (
             PresenterConfigurationAccess::GetConfigurationNode(xToolBarNode, A2S("Entries")),
             UNO_QUERY);
         Context aContext;
-        aContext.msBasePath = sBasePath;
         aContext.mxPresenterHelper = mpPresenterController->GetPresenterHelper();
         aContext.mxCanvas = mxCanvas;
         if (xEntries.is()
@@ -1468,7 +1463,6 @@ void ElementMode::ReadElementMode (
         xIconNode,
         A2S(""),
         rContext.mxPresenterHelper,
-        rContext.msBasePath,
         rContext.mxCanvas,
         rpDefaultMode.get()!=NULL ? rpDefaultMode->mpIcon : SharedBitmapDescriptor());
     }
diff --git a/sdext/source/presenter/PresenterWindowManager.cxx b/sdext/source/presenter/PresenterWindowManager.cxx
index 7d38f1a7ee7f..7c8124d17d13 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -534,7 +534,7 @@ void PresenterWindowManager::RestoreViewMode (void)
     sal_Int32 nMode (0);
     PresenterConfigurationAccess aConfiguration (
         mxComponentContext,
-        OUString("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString("/org.openoffice.Office.PresenterScreen/"),
         PresenterConfigurationAccess::READ_ONLY);
     aConfiguration.GetConfigurationNode(A2S("Presenter/InitialViewMode")) >>= nMode;
     switch (nMode)
@@ -560,7 +560,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode)
     {
         PresenterConfigurationAccess aConfiguration (
             mxComponentContext,
-            OUString("/org.openoffice.Office.extension.PresenterScreen/"),
+            OUString("/org.openoffice.Office.PresenterScreen/"),
             PresenterConfigurationAccess::READ_WRITE);
         aConfiguration.GoToChild(A2S("Presenter"));
         Any aValue;
diff --git a/sdext/source/presenter/bitmaps/Background.png b/sdext/source/presenter/bitmaps/Background.png
deleted file mode 100644
index 7b32e4ab974b..000000000000
--- a/sdext/source/presenter/bitmaps/Background.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottom.png b/sdext/source/presenter/bitmaps/BorderActiveBottom.png
deleted file mode 100644
index 8314c9efd092..000000000000
--- a/sdext/source/presenter/bitmaps/BorderActiveBottom.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png b/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png
deleted file mode 100644
index b7c33223a33c..000000000000
--- a/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png b/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png
deleted file mode 100644
index 8d573e864942..000000000000
--- a/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png b/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png
deleted file mode 100644
index 35ef8e9213db..000000000000
--- a/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderActiveLeft.png b/sdext/source/presenter/bitmaps/BorderActiveLeft.png
deleted file mode 100644
index 57d4a3dbbcd3..000000000000
--- a/sdext/source/presenter/bitmaps/BorderActiveLeft.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderActiveRight.png b/sdext/source/presenter/bitmaps/BorderActiveRight.png
deleted file mode 100644
index 9a9857190b9d..000000000000
--- a/sdext/source/presenter/bitmaps/BorderActiveRight.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderActiveTop.png b/sdext/source/presenter/bitmaps/BorderActiveTop.png
deleted file mode 100644
index e0bea9d55448..000000000000
--- a/sdext/source/presenter/bitmaps/BorderActiveTop.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png b/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png
deleted file mode 100644
index 62d63271fe21..000000000000
--- a/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderActiveTopRight.png b/sdext/source/presenter/bitmaps/BorderActiveTopRight.png
deleted file mode 100644
index 450c8e0cc5e7..000000000000
--- a/sdext/source/presenter/bitmaps/BorderActiveTopRight.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderBottom.png b/sdext/source/presenter/bitmaps/BorderBottom.png
deleted file mode 100644
index 7ad2fd6c2a03..000000000000
--- a/sdext/source/presenter/bitmaps/BorderBottom.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderBottomLeft.png b/sdext/source/presenter/bitmaps/BorderBottomLeft.png
deleted file mode 100644
index 019de149b3af..000000000000
--- a/sdext/source/presenter/bitmaps/BorderBottomLeft.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderBottomRight.png b/sdext/source/presenter/bitmaps/BorderBottomRight.png
deleted file mode 100644
index 82de5791c1cd..000000000000
--- a/sdext/source/presenter/bitmaps/BorderBottomRight.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png
deleted file mode 100644
index 7000bc22f6c4..000000000000
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png
deleted file mode 100644
index 7571c8d94b1f..000000000000
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png
deleted file mode 100644
index c0af63ff58b8..000000000000
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png
deleted file mode 100644
index 7000bc22f6c4..000000000000
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png
deleted file mode 100644
index 7000bc22f6c4..000000000000
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png
deleted file mode 100644
index 7000bc22f6c4..000000000000
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png
deleted file mode 100644
index fdfabd42ae9f..000000000000
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png b/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png
deleted file mode 100644
index 5b4b642e9f34..000000000000
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderLeft.png b/sdext/source/presenter/bitmaps/BorderLeft.png
deleted file mode 100644
index cbdb267b8789..000000000000
--- a/sdext/source/presenter/bitmaps/BorderLeft.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderRight.png b/sdext/source/presenter/bitmaps/BorderRight.png
deleted file mode 100644
index 333073328ddd..000000000000
--- a/sdext/source/presenter/bitmaps/BorderRight.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderToolbarBottom.png b/sdext/source/presenter/bitmaps/BorderToolbarBottom.png
deleted file mode 100644
index 23a3bc3595aa..000000000000
--- a/sdext/source/presenter/bitmaps/BorderToolbarBottom.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderToolbarLeft.png b/sdext/source/presenter/bitmaps/BorderToolbarLeft.png
deleted file mode 100644
index 839ab5091a8e..000000000000
--- a/sdext/source/presenter/bitmaps/BorderToolbarLeft.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderToolbarRight.png b/sdext/source/presenter/bitmaps/BorderToolbarRight.png
deleted file mode 100644
index e5c4b9d25a16..000000000000
--- a/sdext/source/presenter/bitmaps/BorderToolbarRight.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTop.png b/sdext/source/presenter/bitmaps/BorderToolbarTop.png
deleted file mode 100644
index c45b97c434cd..000000000000
--- a/sdext/source/presenter/bitmaps/BorderToolbarTop.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png b/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png
deleted file mode 100644
index 978e98a9bbc4..000000000000
--- a/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png b/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png
deleted file mode 100644
index 7dc3d98860ea..000000000000
--- a/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderTop.png b/sdext/source/presenter/bitmaps/BorderTop.png
deleted file mode 100644
index dee68e828147..000000000000
--- a/sdext/source/presenter/bitmaps/BorderTop.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderTopLeft.png b/sdext/source/presenter/bitmaps/BorderTopLeft.png
deleted file mode 100644
index bbec4e42be42..000000000000
--- a/sdext/source/presenter/bitmaps/BorderTopLeft.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/BorderTopRight.png b/sdext/source/presenter/bitmaps/BorderTopRight.png
deleted file mode 100644
index 3416b16c9e91..000000000000
--- a/sdext/source/presenter/bitmaps/BorderTopRight.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png b/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png
deleted file mode 100644
index 5417cf72c928..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png b/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png
deleted file mode 100644
index 96805e392176..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png b/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png
deleted file mode 100644
index 6dbd732e0977..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png b/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png
deleted file mode 100644
index eb6e6d45bb23..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png b/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png
deleted file mode 100644
index b97799f1f314..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png b/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png
deleted file mode 100644
index 4cf7218f3b52..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png b/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png
deleted file mode 100644
index 1f2ab6a00cab..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png b/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png
deleted file mode 100644
index 0e92cb37d7d8..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png b/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png
deleted file mode 100644
index 0f49ad4f7e61..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png b/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png
deleted file mode 100644
index 4ca69670e513..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png b/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png
deleted file mode 100644
index 12f4903b6cf8..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png b/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png
deleted file mode 100644
index 7bddef561f11..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonHelpNormal.png b/sdext/source/presenter/bitmaps/ButtonHelpNormal.png
deleted file mode 100644
index 99c693215ba9..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonHelpNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonHelpSelected.png b/sdext/source/presenter/bitmaps/ButtonHelpSelected.png
deleted file mode 100644
index f162db27650e..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonHelpSelected.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png b/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png
deleted file mode 100644
index ff61106eb7ec..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png b/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png
deleted file mode 100644
index 787249912b9c..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonMinusNormal.png b/sdext/source/presenter/bitmaps/ButtonMinusNormal.png
deleted file mode 100644
index e2d993384fef..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonMinusNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonMinusSelected.png b/sdext/source/presenter/bitmaps/ButtonMinusSelected.png
deleted file mode 100644
index 5d15de3b916f..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonMinusSelected.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png b/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png
deleted file mode 100644
index 09e31d26c649..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png b/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png
deleted file mode 100644
index 099d6bf0f2b1..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonNotesNormal.png b/sdext/source/presenter/bitmaps/ButtonNotesNormal.png
deleted file mode 100644
index 551392622506..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonNotesNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonNotesSelected.png b/sdext/source/presenter/bitmaps/ButtonNotesSelected.png
deleted file mode 100644
index f5494fb1c678..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonNotesSelected.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png b/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png
deleted file mode 100644
index e6ba3f3e78a7..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png b/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png
deleted file mode 100644
index 9d21dc40a6eb..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonPlusNormal.png b/sdext/source/presenter/bitmaps/ButtonPlusNormal.png
deleted file mode 100644
index 2e075c2a3a87..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonPlusNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonPlusSelected.png b/sdext/source/presenter/bitmaps/ButtonPlusSelected.png
deleted file mode 100644
index b9d6fe1ed929..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonPlusSelected.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png b/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png
deleted file mode 100644
index 7f3bce058f4c..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png b/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png
deleted file mode 100644
index 4dc13655965b..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png b/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png
deleted file mode 100644
index 711b8ca8caf6..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png b/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png
deleted file mode 100644
index 383780eab2cf..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png b/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png
deleted file mode 100644
index dc35c62deaf2..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png b/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png
deleted file mode 100644
index 26262b4568d7..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png b/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png
deleted file mode 100644
index 7274263a43f5..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png b/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png
deleted file mode 100644
index ce7d4ad51514..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png b/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png
deleted file mode 100644
index 2e7f518ac9e3..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png b/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png
deleted file mode 100644
index 7aa914f41c01..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png b/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png
deleted file mode 100644
index 143f995a004c..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png
deleted file mode 100644
index bc1055a97689..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png b/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png
deleted file mode 100644
index 8cfe81dd1d5a..000000000000
--- a/sdext/source/presenter/bitmaps/ButtonSwitchMonitorNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png b/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png
deleted file mode 100644
index 6eb75d386f46..000000000000
--- a/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png b/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png
deleted file mode 100644
index 9455246332cf..000000000000
--- a/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverRight.png b/sdext/source/presenter/bitmaps/LabelMouseOverRight.png
deleted file mode 100644
index 1f972d0cebea..000000000000
--- a/sdext/source/presenter/bitmaps/LabelMouseOverRight.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png b/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png
deleted file mode 100644
index 4dd16272fad7..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png
deleted file mode 100644
index d1980a2a1a05..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png b/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png
deleted file mode 100644
index 166f10057c11..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png b/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png
deleted file mode 100644
index 21d42945ce98..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png b/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png
deleted file mode 100644
index 44f60683bc59..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png
deleted file mode 100644
index 9795885632dc..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png b/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png
deleted file mode 100644
index 804ced846065..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png b/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png
deleted file mode 100644
index d7be4f324f86..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png
deleted file mode 100644
index 84b781af9fb8..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png b/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png
deleted file mode 100644
index a06ba667f118..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png
deleted file mode 100644
index 482f13638755..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png b/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png
deleted file mode 100644
index ec46e172c134..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png
deleted file mode 100644
index 62066c24b687..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png b/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png
deleted file mode 100644
index c25e4edcf595..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png b/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png
deleted file mode 100644
index 714481df996d..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png b/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png
deleted file mode 100644
index 7e0922c74966..000000000000
--- a/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png
+++ /dev/null
diff --git a/sdext/source/presenter/bitmaps/ViewBackground.png b/sdext/source/presenter/bitmaps/ViewBackground.png
deleted file mode 100644
index ca52d8262a88..000000000000
--- a/sdext/source/presenter/bitmaps/ViewBackground.png
+++ /dev/null
diff --git a/sdext/source/presenter/description-en-US.txt b/sdext/source/presenter/description-en-US.txt
deleted file mode 100644
index 26a10c622fe9..000000000000
--- a/sdext/source/presenter/description-en-US.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-The Presenter Console Extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide.
-To avoid confusions by displaying a large number of presentation elements, the Presenter Console displays the elements on three different easily changeable views.
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
deleted file mode 100644
index e8c52f047c03..000000000000
--- a/sdext/source/presenter/description.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-<description
-
-  xmlns="http://openoffice.org/extensions/description/2006"
-  xmlns:dep="http://openoffice.org/extensions/description/2006"
-  xmlns:xlink="http://www.w3.org/1999/xlink">
-
-  <identifier value="com.sun.PresenterScreen-@PLATFORM@" />
-
-  <dependencies>
-    <OpenOffice.org-minimal-version value="3.3" dep:name="OpenOffice.org 3.3"/>
-  </dependencies>
-
-  <version value="1.1.1" />
-
-  <platform value="@PLATFORM@" />
-
-  <publisher>
-      <name xlink:href="http://www.documentfoundation.org" lang="en-US">The Document Foundation</name>
-  </publisher>
-
-  <display-name>
-    <name lang="en-US">Presenter Console</name>
-  </display-name>
-
-  <icon>
-    <default xlink:href="bitmaps/extension_32.png" />
-  </icon>
-
-  <extension-description>
-    <src xlink:href="description-en-US.txt" lang="en-US" />
-  </extension-description>
-
-</description>
diff --git a/sdext/source/presenter/presenter.component b/sdext/source/presenter/presenter.component
index 698180404f5e..ee7d1d63c9f1 100644
--- a/sdext/source/presenter/presenter.component
+++ b/sdext/source/presenter/presenter.component
@@ -8,12 +8,9 @@
  *
 -->
 <component xmlns="http://openoffice.org/2010/uno-components"
-        loader="com.sun.star.loader.SharedLibrary"
-	prefix="presenter">
-    <implementation name="com.sun.star.comp.Draw.framework.PresenterScreenJob">
-        <service name="com.sun.star.drawing.framework.PresenterScreenJob"/>
-    </implementation>
-    <implementation name="vnd.sun.star.sdext.presenter.PresenterProtocolHandler">
+        loader="com.sun.star.loader.SharedLibrary" prefix="presenter">
+    <implementation name="org.libreoffice.comp.PresenterScreenJob"/>
+    <implementation name="org.libreoffice.comp.PresenterScreenProtocolHandler">
         <service name="com.sun.star.frame.ProtocolHandler"/>
     </implementation>
 </component>
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
deleted file mode 100644
index a7991b8cad21..000000000000
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-<oor:component-data oor:name="Jobs" oor:package="org.openoffice.Office" 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="Jobs">
-        <node oor:name="onDocumentOpenedJob" oor:op="replace">
-            <prop oor:name="Service">
-                <value>com.sun.star.comp.Draw.framework.PresenterScreenJob</value>
-            </prop>
-            <prop oor:name="Context">
-                <value>com.sun.star.presentation.PresentationDocument</value>
-            </prop>
-        </node>
-    </node>
-    <node oor:name="Events">
-        <node oor:name="onDocumentOpened" oor:op="fuse">
-            <node oor:name="JobList">
-                <node oor:name="onDocumentOpenedJob" oor:op="replace"/>
-            </node>
-        </node>
-    </node>
-</oor:component-data>
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu
deleted file mode 100644
index b1ecdb0d47fa..000000000000
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-<oor:component-data xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="ProtocolHandler" oor:package="org.openoffice.Office">
-  <node oor:name="HandlerSet">
-    <node oor:name="vnd.sun.star.sdext.presenter.PresenterProtocolHandler" oor:op="replace">
-      <prop oor:name="Protocols">
-        <value>vnd.com.sun.star.comp.PresenterScreen:*</value>
-      </prop>
-    </node>
-  </node>
-</oor:component-data>
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
deleted file mode 100644
index 837805794dc3..000000000000
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
+++ /dev/null
@@ -1,1253 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-<!DOCTYPE oor:component-data SYSTEM "../../../../component-update.dtd">
-<oor:component-data 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" oor:package="org.openoffice.Office.extension" oor:name="PresenterScreen">
-  <node oor:name="PresenterScreenSettings">
-    <node oor:name="ToolBars">
-      <node oor:name="ToolBar" oor:op="replace">
-        <node oor:name="Entries">
-          <node oor:name="a" oor:op="replace">
-            <prop oor:name="Name"><value>PreviousSlide</value></prop>
-            <prop oor:name="Type"><value>Button</value></prop>
-            <node oor:name="Normal">
-              <prop oor:name="Text"><value xml:lang="en-US">Previous</value></prop>
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlidePreviousNormal.png</value></prop>
-              </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:PrevSlide</value></prop>
-              <node oor:name="Font">
-                <prop oor:name="Size"><value>12</value></prop>
-                <prop oor:name="Style"><value>Bold</value></prop>
-                <prop oor:name="Color"><value>B3B7BC</value></prop>
-                <prop oor:name="Anchor"><value>Center</value></prop>
-              </node>
-            </node>
-            <node oor:name="MouseOver">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlidePreviousMouseOver.png</value></prop>
-              </node>
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>FFFFFF</value></prop>
-              </node>
-            </node>
-            <node oor:name="Disabled">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlidePreviousDisabled.png</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="b" oor:op="replace">
-            <prop oor:name="Name"><value>NextEffect</value></prop>
-            <prop oor:name="Type"><value>Button</value></prop>
-            <node oor:name="Normal">
-              <prop oor:name="Text"><value xml:lang="en-US">Next</value></prop>
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonEffectNextNormal.png</value></prop>
-              </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:NextEffect</value></prop>
-              <node oor:name="Font">
-                <prop oor:name="Size"><value>12</value></prop>
-                <prop oor:name="Style"><value>Bold</value></prop>
-                <prop oor:name="Color"><value>B3B7BC</value></prop>
-                <prop oor:name="Anchor"><value>Center</value></prop>
-              </node>
-            </node>
-            <node oor:name="MouseOver">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonEffectNextMouseOver.png</value></prop>
-              </node>
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>FFFFFF</value></prop>
-              </node>
-            </node>
-            <node oor:name="Disabled">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonEffectNextDisabled.png</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="c" oor:op="replace">
-            <prop oor:name="Name"><value>Notes</value></prop>
-            <prop oor:name="Type"><value>Button</value></prop>
-            <node oor:name="Normal">
-              <prop oor:name="Text"><value xml:lang="en-US">Notes</value></prop>
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesNormal.png</value></prop>
-              </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowNotes</value></prop>
-              <node oor:name="Font">
-                <prop oor:name="Size"><value>12</value></prop>
-                <prop oor:name="Style"><value>Bold</value></prop>
-                <prop oor:name="Color"><value>B3B7BC</value></prop>
-                <prop oor:name="Anchor"><value>Center</value></prop>
-              </node>
-            </node>
-            <node oor:name="MouseOver">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesMouseOver.png</value></prop>
-              </node>
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>FFFFFF</value></prop>
-              </node>
-            </node>
-            <node oor:name="Selected">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesSelected.png</value></prop>
-              </node>
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>FFFFFF</value></prop>
-              </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseNotes</value></prop>
-            </node>
-            <node oor:name="Disabled">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesDisabled.png</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="d" oor:op="replace">
-            <prop oor:name="Name"><value>SlideSorter</value></prop>
-            <prop oor:name="Type"><value>Button</value></prop>
-            <node oor:name="Normal">
-              <prop oor:name="Text"><value xml:lang="en-US">Slides</value></prop>
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterNormal.png</value></prop>
-              </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowSlideSorter</value></prop>
-              <node oor:name="Font">
-                <prop oor:name="Size"><value>12</value></prop>
-                <prop oor:name="Style"><value>Bold</value></prop>
-                <prop oor:name="Color"><value>B3B7BC</value></prop>
-                <prop oor:name="Anchor"><value>Center</value></prop>
-              </node>
-            </node>
-            <node oor:name="MouseOver">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterMouseOver.png</value></prop>
-              </node>
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>FFFFFF</value></prop>
-              </node>
-            </node>
-            <node oor:name="Selected">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterSelected.png</value></prop>
-              </node>
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>FFFFFF</value></prop>
-              </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter</value></prop>
-            </node>
-            <node oor:name="Disabled">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterDisabled.png</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="e" oor:op="replace">
-            <prop oor:name="Type"><value>VerticalSeparator</value></prop>
-            <node oor:name="Normal">
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>76797C</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="f" oor:op="replace">
-            <prop oor:name="Type"><value>ChangeOrientation</value></prop>
-          </node>
-          <node oor:name="g" oor:op="replace">
-            <prop oor:name="Type"><value>CurrentTimeLabel</value></prop>
-            <node oor:name="Normal">
-              <node oor:name="Font">
-                <prop oor:name="Size"><value>18</value></prop>
-                <prop oor:name="Style"><value>Bold</value></prop>
-                <prop oor:name="Color"><value>ffffff</value></prop>
-                <prop oor:name="Anchor"><value>Center</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="h" oor:op="replace">
-            <prop oor:name="Type"><value>HorizontalSeparator</value></prop>
-            <node oor:name="Normal">
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>71767a</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="i" oor:op="replace">
-            <prop oor:name="Type"><value>PresentationTimeLabel</value></prop>
-            <node oor:name="Normal">
-              <node oor:name="Font">
-                <prop oor:name="Size"><value>26</value></prop>
-                <prop oor:name="Style"><value>Bold</value></prop>
-                <prop oor:name="Color"><value>ffe969</value></prop>
-                <prop oor:name="Anchor"><value>Center</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="j" oor:op="replace">
-            <prop oor:name="Type"><value>ChangeOrientation</value></prop>
-          </node>
-          <node oor:name="k" oor:op="replace">
-            <prop oor:name="Type"><value>VerticalSeparator</value></prop>
-            <node oor:name="Normal">
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>76797C</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="l" oor:op="replace">
-            <prop oor:name="Name"><value>SwitchMonitor</value></prop>
-            <prop oor:name="Type"><value>Button</value></prop>
-            <node oor:name="Normal">
-              <prop oor:name="Text"><value xml:lang="en-US">Exchange</value></prop>
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSwitchMonitorNormal.png</value></prop>
-              </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:SwitchMonitor</value></prop>
-              <node oor:name="Font">
-                <prop oor:name="Size"><value>12</value></prop>
-                <prop oor:name="Style"><value>Bold</value></prop>
-                <prop oor:name="Color"><value>B3B7BC</value></prop>
-                <prop oor:name="Anchor"><value>Center</value></prop>
-              </node>
-            </node>
-            <node oor:name="MouseOver">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSwitchMonitorMouseOver.png</value></prop>
-              </node>
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>FFFFFF</value></prop>
-              </node>
-            </node>
-            <node oor:name="Disabled">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSwitchMonitorDisabled.png</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="m" oor:op="replace">
-            <prop oor:name="Type"><value>VerticalSeparator</value></prop>
-            <node oor:name="Normal">
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>76797C</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="n" oor:op="replace">
-            <prop oor:name="Name"><value>Help</value></prop>
-            <prop oor:name="Type"><value>Button</value></prop>
-            <node oor:name="Normal">
-              <prop oor:name="Text"><value xml:lang="en-US">Help</value></prop>
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpNormal.png</value></prop>
-              </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowHelp</value></prop>
-              <node oor:name="Font">
-                <prop oor:name="Size"><value>12</value></prop>
-                <prop oor:name="Style"><value>Bold</value></prop>
-                <prop oor:name="Color"><value>B3B7BC</value></prop>
-                <prop oor:name="Anchor"><value>Center</value></prop>
-              </node>
-            </node>
-            <node oor:name="MouseOver">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpMouseOver.png</value></prop>
-              </node>
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>FFFFFF</value></prop>
-              </node>
-            </node>
-            <node oor:name="Selected">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpSelected.png</value></prop>
-              </node>
-              <node oor:name="Font">
-                <prop oor:name="Color"><value>FFFFFF</value></prop>
-              </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseHelp</value></prop>
-            </node>
-            <node oor:name="Disabled">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpDisabled.png</value></prop>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-      <node oor:name="NotesToolBar" oor:op="replace">
-        <node oor:name="Entries">
-          <node oor:name="a" oor:op="replace">
-            <prop oor:name="Name"><value>Zoom</value></prop>
-            <prop oor:name="Type"><value>Label</value></prop>
-            <node oor:name="Normal">
-              <prop oor:name="Text"><value xml:lang="en-US">Zoom</value></prop>
-              <node oor:name="Font">
-                <prop oor:name="Size"><value>14</value></prop>
-                <prop oor:name="Style"><value>Bold</value></prop>
-                <prop oor:name="Color"><value>B3B7BC</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="b" oor:op="replace">
-            <prop oor:name="Name"><value>Grow</value></prop>
-            <prop oor:name="Type"><value>Button</value></prop>
-            <node oor:name="Normal">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonPlusNormal.png</value></prop>
-              </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:GrowNotesFont</value></prop>
-            </node>
-            <node oor:name="MouseOver">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonPlusMouseOver.png</value></prop>
-              </node>
-            </node>
-            <node oor:name="Disabled">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonPlusDisabled.png</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="c" oor:op="replace">
-            <prop oor:name="Name"><value>Shrink</value></prop>
-            <prop oor:name="Type"><value>Button</value></prop>
-            <node oor:name="Normal">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonMinusNormal.png</value></prop>
-              </node>
-              <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShrinkNotesFont</value></prop>
-            </node>
-            <node oor:name="MouseOver">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonMinusMouseOver.png</value></prop>
-              </node>
-            </node>
-            <node oor:name="Disabled">
-              <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonMinusDisabled.png</value></prop>
-              </node>
-            </node>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node oor:name="Buttons">
-      <node oor:name="SlideSorterCloser" oor:op="replace">
-        <prop oor:name="Name"><value>SlideSorterCloser</value></prop>
-        <prop oor:name="Text">
-          <value xml:lang="en-US">Close</value>
-        </prop>
-        <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseSlideSorter</value></prop>
-      </node>
-      <node oor:name="NotesViewCloser" oor:op="replace">
-        <prop oor:name="Name"><value>NotesViewCloser</value></prop>
-        <prop oor:name="Text">
-          <value xml:lang="en-US">Close</value>
-        </prop>
-        <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseNotes</value></prop>
-      </node>
-      <node oor:name="HelpViewCloser" oor:op="replace">
-        <prop oor:name="Name"><value>HelpViewCloser</value></prop>
-        <prop oor:name="Text">
-          <value xml:lang="en-US">Close</value>
-        </prop>
-        <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:CloseHelp</value></prop>
-      </node>
-    </node>
-    <node oor:name="ScrollBar">
-      <node oor:name="Bitmaps">
-        <node oor:name="up" oor:op="replace">
-          <prop oor:name="Name"><value>Up</value></prop>
-          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarArrowUpNormal.png</value></prop>
-          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarArrowUpMouseOver.png</value></prop>
-          <prop oor:name="DisabledFileName"><value>bitmaps/ScrollbarArrowUpDisabled.png</value></prop>
-        </node>
-        <node oor:name="down" oor:op="replace">
-          <prop oor:name="Name"><value>Down</value></prop>
-          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarArrowDownNormal.png</value></prop>
-          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarArrowDownMouseOver.png</value></prop>
-          <prop oor:name="DisabledFileName"><value>bitmaps/ScrollbarArrowDownDisabled.png</value></prop>
-        </node>
-        <node oor:name="pagervertical" oor:op="replace">
-          <prop oor:name="Name"><value>PagerVertical</value></prop>
-          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarPagerMiddleNormal.png</value></prop>
-          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarPagerMiddleMouseOver.png</value></prop>
-        </node>
-        <node oor:name="thumbtop" oor:op="replace">
-          <prop oor:name="Name"><value>ThumbTop</value></prop>
-          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarThumbTopNormal.png</value></prop>
-          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarThumbTopMouseOver.png</value></prop>
-        </node>
-        <node oor:name="thumbbottom" oor:op="replace">
-          <prop oor:name="Name"><value>ThumbBottom</value></prop>
-          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarThumbBottomNormal.png</value></prop>
-          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarThumbBottomMouseOver.png</value></prop>
-        </node>
-        <node oor:name="thumbvertical" oor:op="replace">
-          <prop oor:name="Name"><value>ThumbVertical</value></prop>
-          <prop oor:name="NormalFileName"><value>bitmaps/ScrollbarThumbMiddleNormal.png</value></prop>
-          <prop oor:name="MouseOverFileName"><value>bitmaps/ScrollbarThumbMiddleMouseOver.png</value></prop>
-        </node>
-      </node>
-    </node>
-    <node oor:name="SlideSorter">
-      <node oor:name="BorderSize">
-        <prop oor:name="Left"><value>9</value></prop>
-        <prop oor:name="Top"><value>9</value></prop>
-        <prop oor:name="Right"><value>9</value></prop>
-        <prop oor:name="Bottom"><value>9</value></prop>
-      </node>
-      <node oor:name="CurrentSlideBorderBitmaps">
-        <node oor:name="TopLeft" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideTopLeft.png</value></prop>
-        </node>
-        <node oor:name="Top" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideTop.png</value></prop>
-        </node>
-        <node oor:name="TopRight" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideTopRight.png</value></prop>
-        </node>
-        <node oor:name="Left" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideLeft.png</value></prop>
-        </node>
-        <node oor:name="Right" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideRight.png</value></prop>
-        </node>
-        <node oor:name="BottomLeft" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideBottomLeft.png</value></prop>
-        </node>
-        <node oor:name="Bottom" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideBottom.png</value></prop>
-        </node>
-        <node oor:name="BottomRight" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideBottomRight.png</value></prop>
-        </node>
-      </node>
-    </node>
-    <node oor:name="HelpView">
-      <node oor:name="HelpStrings">
-        <node oor:name="a" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">Left click, right or down arrow, spacebar, page down, enter, return, 'N'</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Next slide, or next effect</value>
-          </prop>
-        </node>
-        <node oor:name="b" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">Right click, left or up arrow, page up, backspace, 'P'</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Previous slide, or previous effect</value>
-          </prop>
-        </node>
-        <node oor:name="c" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US"> </value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US"> </value>
-          </prop>
-        </node>
-        <node oor:name="d" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">Home</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">First slide</value>
-          </prop>
-        </node>
-        <node oor:name="e" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">End</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Last slide</value>
-          </prop>
-        </node>
-        <node oor:name="f" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US"> </value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US"> </value>
-          </prop>
-        </node>
-        <node oor:name="g" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">Alt-Page Up</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Previous slide without effects</value>
-          </prop>
-        </node>
-        <node oor:name="h" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">Alt-Page Down</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Next slide without effects</value>
-          </prop>
-        </node>
-        <node oor:name="i" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US"> </value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US"> </value>
-          </prop>
-        </node>
-        <node oor:name="j" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">'B', '.'</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Blacks/Unblacks the screen</value>
-          </prop>
-        </node>
-        <node oor:name="k" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">'W', ','</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Whites/Unwhites the screen</value>
-          </prop>
-        </node>
-        <node oor:name="l" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US"> </value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US"> </value>
-          </prop>
-        </node>
-        <node oor:name="m" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">Esc, '-'</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">End slide show</value>
-          </prop>
-        </node>
-        <node oor:name="n" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US"> </value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US"> </value>
-          </prop>
-        </node>
-        <node oor:name="o" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">Number followed by Enter</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Go to that slide</value>
-          </prop>
-        </node>
-        <node oor:name="p" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US"> </value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US"> </value>
-          </prop>
-        </node>
-        <node oor:name="q" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">'G', 'S'</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Grow/Shrink size of notes font</value>
-          </prop>
-        </node>
-        <node oor:name="r" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">'A', 'Z'</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Scroll notes up/down</value>
-          </prop>
-        </node>
-        <node oor:name="s" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">'H', 'L'</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Move caret in notes view backward/forward</value>
-          </prop>
-        </node>
-        <node oor:name="t" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US"> </value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US"> </value>
-          </prop>
-        </node>
-        <node oor:name="u" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">Ctrl-'1'</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Shows the Presenter Console</value>
-          </prop>
-        </node>
-        <node oor:name="v" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">Ctrl-'2'</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Shows the Presentation Notes</value>
-          </prop>
-        </node>
-        <node oor:name="w" oor:op="replace">
-          <prop oor:name="Left">
-            <value xml:lang="en-US">Ctrl-'3'</value>
-          </prop>
-          <prop oor:name="Right">
-            <value xml:lang="en-US">Shows the Slides Overview</value>
-          </prop>
-        </node>
-      </node>
-    </node>
-  </node>
-  <node oor:name="Presenter">
-    <node oor:name="Themes">
-      <node oor:name="Theme_1" oor:op="replace">
-        <prop oor:name="ThemeName">
-          <value>DefaultTheme</value>
-        </prop>
-        <node oor:name="PaneStyles">
-          <node oor:name="PaneStyle_1" oor:op="replace">
-            <prop oor:name="StyleName">
-              <value>DefaultPaneStyle</value>
-            </prop>
-            <node oor:name="TitleFont">
-              <prop oor:name="FamilyName"><value></value></prop>
-              <prop oor:name="Style"><value>Bold</value></prop>
-              <prop oor:name="Size"><value>14</value></prop>
-              <prop oor:name="Color"><value>B3B7BC</value></prop>
-              <prop oor:name="Anchor"><value>Center</value></prop>
-              <prop oor:name="YOffset"><value>-7</value></prop>
-            </node>
-            <node oor:name="InnerBorderSize">
-              <prop oor:name="Left"><value>6</value></prop>
-              <prop oor:name="Top"><value>6</value></prop>
-              <prop oor:name="Right"><value>6</value></prop>
-              <prop oor:name="Bottom"><value>6</value></prop>
-            </node>
-            <node oor:name="OuterBorderSize">
-              <prop oor:name="Left"><value>20</value></prop>
-              <prop oor:name="Top"><value>28</value></prop>
-              <prop oor:name="Right"><value>20</value></prop>
-              <prop oor:name="Bottom"><value>29</value></prop>
-            </node>
-            <node oor:name="BorderBitmapList">
-              <node oor:name="Top" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderTop.png</value></prop>
-                <prop oor:name="YOffset"><value>6</value></prop>
-              </node>
-              <node oor:name="TopLeft" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderTopLeft.png</value></prop>
-                <prop oor:name="XOffset"><value>6</value></prop>
-                <prop oor:name="YOffset"><value>6</value></prop>
-              </node>
-              <node oor:name="TopRight" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderTopRight.png</value></prop>
-                <prop oor:name="XOffset"><value>-6</value></prop>
-                <prop oor:name="YOffset"><value>6</value></prop>
-              </node>
-              <node oor:name="Left" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderLeft.png</value></prop>
-                <prop oor:name="XOffset"><value>6</value></prop>
-              </node>
-              <node oor:name="Right" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderRight.png</value></prop>
-                <prop oor:name="XOffset"><value>-6</value></prop>
-              </node>
-              <node oor:name="BottomLeft" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderBottomLeft.png</value></prop>
-                <prop oor:name="XOffset"><value>6</value></prop>
-                <prop oor:name="YOffset"><value>-6</value></prop>
-              </node>
-              <node oor:name="BottomRight" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderBottomRight.png</value></prop>
-                <prop oor:name="XOffset"><value>-6</value></prop>
-                <prop oor:name="YOffset"><value>-6</value></prop>
-              </node>
-              <node oor:name="Bottom" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderBottom.png</value></prop>
-                <prop oor:name="YOffset"><value>-6</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="PaneStyle_2" oor:op="replace">
-            <prop oor:name="StyleName">
-              <value>ActivePaneStyle</value>
-            </prop>
-            <prop oor:name="ParentStyle">
-              <value>DefaultPaneStyle</value>
-            </prop>
-            <node oor:name="TitleFont">
-              <prop oor:name="FamilyName"><value></value></prop>
-              <prop oor:name="Style"><value>Bold</value></prop>
-              <prop oor:name="Size"><value>14</value></prop>
-              <prop oor:name="Color"><value>FFFFFF</value></prop>
-              <prop oor:name="Anchor"><value>Center</value></prop>
-              <prop oor:name="YOffset"><value>-10</value></prop>
-            </node>
-            <node oor:name="BorderBitmapList">
-              <node oor:name="Top" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveTop.png</value></prop>
-                <prop oor:name="YOffset"><value>6</value></prop>
-              </node>
-              <node oor:name="TopLeft" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveTopLeft.png</value></prop>
-                <prop oor:name="XOffset"><value>6</value></prop>
-                <prop oor:name="YOffset"><value>6</value></prop>
-              </node>
-              <node oor:name="TopRight" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveTopRight.png</value></prop>
-                <prop oor:name="XOffset"><value>-6</value></prop>
-                <prop oor:name="YOffset"><value>6</value></prop>
-              </node>
-              <node oor:name="Left" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveLeft.png</value></prop>
-                <prop oor:name="XOffset"><value>6</value></prop>
-              </node>
-              <node oor:name="Right" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveRight.png</value></prop>
-                <prop oor:name="XOffset"><value>-6</value></prop>
-              </node>
-              <node oor:name="BottomLeft" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveBottomLeft.png</value></prop>
-                <prop oor:name="XOffset"><value>6</value></prop>
-                <prop oor:name="YOffset"><value>-6</value></prop>
-              </node>
-              <node oor:name="BottomRight" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveBottomRight.png</value></prop>
-                <prop oor:name="XOffset"><value>-6</value></prop>
-                <prop oor:name="YOffset"><value>-6</value></prop>
-              </node>
-              <node oor:name="Bottom" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveBottom.png</value></prop>
-                <prop oor:name="YOffset"><value>-6</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="PaneStyle_3" oor:op="replace">
-            <prop oor:name="StyleName">
-              <value>ToolbarPaneStyle</value>
-            </prop>
-            <node oor:name="InnerBorderSize">
-              <prop oor:name="Left"><value>4</value></prop>
-              <prop oor:name="Top"><value>4</value></prop>
-              <prop oor:name="Right"><value>4</value></prop>
-              <prop oor:name="Bottom"><value>4</value></prop>
-            </node>
-            <node oor:name="OuterBorderSize">
-              <prop oor:name="Left"><value>8</value></prop>
-              <prop oor:name="Top"><value>8</value></prop>
-              <prop oor:name="Right"><value>8</value></prop>
-              <prop oor:name="Bottom"><value>0</value></prop>
-            </node>
-            <node oor:name="BorderBitmapList">
-              <node oor:name="Top" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarTop.png</value></prop>
-                <prop oor:name="YOffset"><value>4</value></prop>
-              </node>
-              <node oor:name="TopLeft" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarTopLeft.png</value></prop>
-                <prop oor:name="XOffset"><value>4</value></prop>
-                <prop oor:name="YOffset"><value>4</value></prop>
-              </node>
-              <node oor:name="TopRight" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarTopRight.png</value></prop>
-                <prop oor:name="XOffset"><value>-4</value></prop>
-                <prop oor:name="YOffset"><value>4</value></prop>
-              </node>
-              <node oor:name="Left" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarLeft.png</value></prop>
-                <prop oor:name="XOffset"><value>4</value></prop>
-              </node>
-              <node oor:name="Right" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarRight.png</value></prop>
-                <prop oor:name="XOffset"><value>-4</value></prop>
-              </node>
-              <node oor:name="BottomLeft" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarLeft.png</value></prop>
-                <prop oor:name="XOffset"><value>4</value></prop>
-              </node>
-              <node oor:name="BottomRight" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarRight.png</value></prop>
-                <prop oor:name="XOffset"><value>-4</value></prop>
-              </node>
-              <node oor:name="Bottom" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderToolbarBottom.png</value></prop>
-                <prop oor:name="YOffset"><value>-4</value></prop>
-              </node>
-            </node>
-          </node>
-          <node oor:name="PaneStyle_4" oor:op="replace">
-            <prop oor:name="StyleName">
-              <value>ActiveBottomCalloutPaneStyle</value>
-            </prop>
-            <prop oor:name="ParentStyle">
-              <value>ActivePaneStyle</value>
-            </prop>
-            <node oor:name="OuterBorderSize">
-              <prop oor:name="Bottom"><value>52</value></prop>
-            </node>
-            <node oor:name="BorderBitmapList">
-              <node oor:name="BottomCallout" oor:op="replace">
-                <prop oor:name="NormalFileName"><value>bitmaps/BorderActiveBottomCallout.png</value></prop>
-                <prop oor:name="YOffset"><value>-6</value></prop>
-                <prop oor:name="XHotSpot"><value>49</value></prop>
-                <prop oor:name="YHotSpot"><value>41</value></prop>
-              </node>
-            </node>
-          </node>
-        </node>
-        <node oor:name="ViewStyles">
-          <node oor:name="ViewStyle_1" oor:op="replace">
-            <prop oor:name="StyleName"><value>DefaultViewStyle</value></prop>
-            <node oor:name="Font">
-              <prop oor:name="FamilyName"><value></value></prop>
-              <prop oor:name="Size"><value>20</value></prop>
-              <prop oor:name="Color"><value>FFFFFF</value>
-              </prop>
-            </node>
-            <node oor:name="Background">
-              <prop oor:name="NormalFileName"><value>bitmaps/ViewBackground.png</value></prop>
-              <prop oor:name="HorizontalTexturingMode"><value>Repeat</value></prop>
-              <prop oor:name="VerticalTexturingMode"><value>Repeat</value></prop>
-              <prop oor:name="ReplacementColor"><value>33000000</value></prop>
-            </node>
-          </node>
-          <node oor:name="ViewStyle_2" oor:op="replace">
-            <prop oor:name="StyleName"><value>NotesViewStyle</value></prop>
-            <prop oor:name="ParentStyle"><value>DefaultViewStyle</value></prop>
-            <node oor:name="Font">
-              <prop oor:name="FamilyName"><value></value></prop>
-              <prop oor:name="Style"><value>Bold</value></prop>
-              <prop oor:name="Size"><value>26</value></prop>
-              <prop oor:name="Color"><value>d1d6dc</value></prop>
-            </node>
-          </node>
-          <node oor:name="ViewStyle_3" oor:op="replace">
-            <prop oor:name="StyleName"><value>SlideSorterViewStyle</value></prop>
-            <prop oor:name="ParentStyle"><value>DefaultViewStyle</value></prop>
-          </node>
-          <node oor:name="ViewStyle_4" oor:op="replace">
-            <prop oor:name="StyleName"><value>HelpViewStyle</value></prop>
-            <prop oor:name="ParentStyle"><value>DefaultViewStyle</value></prop>
-            <node oor:name="Font">
-              <prop oor:name="FamilyName"><value></value></prop>
-              <prop oor:name="Style"><value>Bold</value></prop>
-              <prop oor:name="Size"><value>20</value></prop>
-              <prop oor:name="Color"><value>ffffff</value></prop>
-            </node>
-          </node>
-        </node>
-        <node oor:name="Background">
-          <prop oor:name="NormalFileName"><value>bitmaps/Background.png</value></prop>
-          <prop oor:name="ReplacementColor"><value>E4EFF9</value></prop>
-          <prop oor:name="HorizontalTexturingMode"><value>Repeat</value></prop>
-          <prop oor:name="VerticalTexturingMode"><value>Stretch</value></prop>
-        </node>
-        <node oor:name="Bitmaps">
-          <node oor:name="ButtonFrameLeft" oor:op="replace">
-            <prop oor:name="Name"><value>ButtonFrameLeft</value></prop>
-            <prop oor:name="NormalFileName"><value>bitmaps/ButtonFrameLeftNormal.png</value></prop>
-            <prop oor:name="MouseOverFileName"><value>bitmaps/ButtonFrameLeftMouseOver.png</value></prop>
-            <prop oor:name="YOffset"><value>2</value></prop>
-          </node>
-          <node oor:name="ButtonFrameCenter" oor:op="replace">
-            <prop oor:name="Name"><value>ButtonFrameCenter</value></prop>
-            <prop oor:name="NormalFileName"><value>bitmaps/ButtonFrameCenterNormal.png</value></prop>
-            <prop oor:name="MouseOverFileName"><value>bitmaps/ButtonFrameCenterMouseOver.png</value></prop>
-            <prop oor:name="YOffset"><value>2</value></prop>
-          </node>
-          <node oor:name="ButtonFrameRight" oor:op="replace">
-            <prop oor:name="Name"><value>ButtonFrameRight</value></prop>
-            <prop oor:name="NormalFileName"><value>bitmaps/ButtonFrameRightNormal.png</value></prop>
-            <prop oor:name="MouseOverFileName"><value>bitmaps/ButtonFrameRightMouseOver.png</value></prop>
-            <prop oor:name="YOffset"><value>2</value></prop>
-          </node>
-          <node oor:name="LabelLeft" oor:op="replace">
-            <prop oor:name="NormalFileName"><value>bitmaps/LabelMouseOverLeft.png</value></prop>
-          </node>
-          <node oor:name="LabelCenter" oor:op="replace">
-            <prop oor:name="NormalFileName"><value>bitmaps/LabelMouseOverCenter.png</value></prop>
-          </node>
-          <node oor:name="LabelRight" oor:op="replace">
-            <prop oor:name="NormalFileName"><value>bitmaps/LabelMouseOverRight.png</value></prop>
-          </node>
-          <node oor:name="MousePointerNextEffect" oor:op="replace">
-            <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideNextNormal.png</value></prop>
-          </node>
-        </node>
-        <node oor:name="Fonts">
-          <node oor:name="ButtonFont" oor:op="replace">
-            <prop oor:name="FamilyName"><value></value></prop>
-            <prop oor:name="Style"><value>Bold</value></prop>
-            <prop oor:name="Size"><value>18</value></prop>
-            <prop oor:name="Color"><value>b3b7bc</value></prop>
-          </node>
-          <node oor:name="ButtonMouseOverFont" oor:op="replace">
-            <prop oor:name="FamilyName"><value></value></prop>
-            <prop oor:name="Style"><value>Bold</value></prop>
-            <prop oor:name="Size"><value>18</value></prop>
-            <prop oor:name="Color"><value>ffffff</value></prop>
-          </node>
-          <node oor:name="SlideSorterLabelFont" oor:op="replace">
-            <prop oor:name="FamilyName"><value></value></prop>
-            <prop oor:name="Style"><value>Bold</value></prop>
-            <prop oor:name="Size"><value>20</value></prop>
-            <prop oor:name="Color"><value>ffffff</value></prop>
-          </node>
-          <node oor:name="PendingSlideNumberFont" oor:op="replace">
-            <prop oor:name="FamilyName"><value></value></prop>
-            <prop oor:name="Style"><value>Bold</value></prop>
-            <prop oor:name="Size"><value>24</value></prop>
-            <prop oor:name="Color"><value>e02050</value></prop>
-          </node>
-        </node>
-        <node oor:name="StyleAssociations">
-          <node oor:name="PreviewPane" oor:op="replace">
-            <prop oor:name="ResourceURL">
-              <value>private:resource/pane/Presenter/Pane1</value>
-            </prop>
-            <prop oor:name="StyleName">
-              <value>ActivePaneStyle</value>
-            </prop>
-          </node>
-          <node oor:name="PreviewView" oor:op="replace">
-            <prop oor:name="ResourceURL">
-              <value>private:resource/view/Presenter/CurrentSlidePreview</value>
-            </prop>
-            <prop oor:name="StyleName">
-              <value>DefaultViewStyle</value>
-            </prop>
-          </node>
-          <node oor:name="NextSlidePreviewPane" oor:op="replace">
-            <prop oor:name="ResourceURL">
-              <value>private:resource/pane/Presenter/Pane2</value>
-            </prop>
-            <prop oor:name="StyleName">
-              <value>DefaultPaneStyle</value>
-            </prop>
-          </node>
-          <node oor:name="NextSlidePreviewView" oor:op="replace">
-            <prop oor:name="ResourceURL">
-              <value>private:resource/view/Presenter/NextSlidePreview</value>
-            </prop>
-            <prop oor:name="StyleName">
-              <value>DefaultViewStyle</value>
-            </prop>
-          </node>
-          <node oor:name="ToolBarPane" oor:op="replace">
-            <prop oor:name="ResourceURL">
-              <value>private:resource/pane/Presenter/Pane4</value>
-            </prop>
-            <prop oor:name="StyleName">
-              <value>ToolbarPaneStyle</value>
-            </prop>
-          </node>
-          <node oor:name="ToolBarView" oor:op="replace">
-            <prop oor:name="ResourceURL">
-              <value>private:resource/view/Presenter/ToolBar</value>
-            </prop>
-            <prop oor:name="StyleName">
-              <value>DefaultViewStyle</value>
-            </prop>
-          </node>
-          <node oor:name="NotesPane" oor:op="replace">
-            <prop oor:name="ResourceURL">
-              <value>private:resource/pane/Presenter/Pane3</value>
-            </prop>
-            <prop oor:name="StyleName">
-              <value>ActivePaneStyle</value>
-            </prop>
-          </node>
-          <node oor:name="NotesView" oor:op="replace">
-            <prop oor:name="ResourceURL">
-              <value>private:resource/view/Presenter/Notes</value>
-            </prop>
-            <prop oor:name="StyleName">
-              <value>NotesViewStyle</value>
-            </prop>
-          </node>
-          <node oor:name="SlideSorter" oor:op="replace">
-            <prop oor:name="ResourceURL">
-              <value>private:resource/view/Presenter/SlideSorter</value>
-            </prop>
-            <prop oor:name="StyleName">
-              <value>SlideSorterViewStyle</value>
-            </prop>
-          </node>
-          <node oor:name="OverlayPane" oor:op="replace">
-            <prop oor:name="ResourceURL">
-              <value>private:resource/pane/Presenter/Overlay</value>
-            </prop>
-            <prop oor:name="StyleName">
-              <value>ActivePaneStyle</value>
-            </prop>
-          </node>
-          <node oor:name="HelpView" oor:op="replace">
-            <prop oor:name="ResourceURL">
-              <value>private:resource/view/Presenter/Help</value>
-            </prop>
-            <prop oor:name="StyleName">
-              <value>HelpViewStyle</value>
-            </prop>
-          </node>
-          <node oor:name="HelpPane" oor:op="replace">
-            <prop oor:name="ResourceURL">
-              <value>private:resource/pane/Presenter/Pane6</value>
-            </prop>
-            <prop oor:name="StyleName">
-              <value>ActivePaneStyle</value>
-            </prop>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node oor:name="Views">
-      <node oor:name="CurrentSlidePreview" oor:op="replace">
-        <prop oor:name="ViewURL">
-          <value>private:resource/view/Presenter/CurrentSlidePreview</value>
-        </prop>
-        <prop oor:name="Title">
-          <value xml:lang="en-US">Current Slide (%CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT%)</value>
-        </prop>
-        <prop oor:name="AccessibleTitle">
-          <value xml:lang="en-US">Current Slide, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT%</value>
-        </prop>
-        <prop oor:name="IsOpaque"><value>true</value></prop>
-        <node oor:name="Strings">
-          <node oor:name="ClickToExitPresentationText" oor:op="replace">
-            <prop oor:name="String">
-              <value xml:lang="en-US">Click to exit presentation...</value>
-            </prop>
-          </node>
-          <node oor:name="ClickToExitPresentationTitle" oor:op="replace">
-            <prop oor:name="String">
-              <value xml:lang="en-US">Current Slide (end)</value>
-            </prop>
-          </node>
-        </node>
-      </node>
-      <node oor:name="NextSlidePreview" oor:op="replace">
-        <prop oor:name="ViewURL">
-          <value>private:resource/view/Presenter/NextSlidePreview</value>
-        </prop>
-        <prop oor:name="Title">
-          <value xml:lang="en-US">Next Slide</value>
-        </prop>
-        <prop oor:name="IsOpaque"><value>false</value></prop>
-      </node>
-      <node oor:name="ToolBar" oor:op="replace">
-        <prop oor:name="ViewURL">
-          <value>private:resource/view/Presenter/ToolBar</value>
-        </prop>
-        <prop oor:name="IsOpaque"><value>false</value></prop>
-      </node>
-      <node oor:name="NotesView" oor:op="replace">
-        <prop oor:name="ViewURL">
-          <value>private:resource/view/Presenter/Notes</value>
-        </prop>
-        <prop oor:name="Title">
-          <value xml:lang="en-US">Notes</value>
-        </prop>
-        <prop oor:name="IsOpaque"><value>false</value></prop>
-      </node>
-      <node oor:name="SlideSorter" oor:op="replace">
-        <prop oor:name="ViewURL">
-          <value>private:resource/view/Presenter/SlideSorter</value>
-        </prop>
-        <prop oor:name="IsOpaque"><value>false</value></prop>
-        <prop oor:name="Title">
-          <value xml:lang="en-US"></value>
-        </prop>
-        <prop oor:name="AccessibleTitle">
-          <value xml:lang="en-US">Slide Overview, %CURRENT_SLIDE_NAME%, %CURRENT_SLIDE_NUMBER% of %SLIDE_COUNT%</value>
-        </prop>
-      </node>
-      <node oor:name="HelpView" oor:op="replace">
-        <prop oor:name="ViewURL">
-          <value>private:resource/view/Presenter/Help</value>
-        </prop>
-        <prop oor:name="Title">
-          <value xml:lang="en-US">Help</value>
-        </prop>
-        <prop oor:name="IsOpaque"><value>false</value></prop>
-      </node>
-    </node>
-    <node oor:name="Layouts">
-      <node oor:name="DefaultLayout" oor:op="replace">
-        <prop oor:name="LayoutName">
-          <value>DefaultLayout</value>
-        </prop>
-        <node oor:name="Layout">
-          <node oor:name="CurrentSlidePreview" oor:op="replace">
-            <prop oor:name="PaneURL">
-              <value>private:resource/pane/Presenter/Pane1</value>
-            </prop>
-            <prop oor:name="ViewURL">
-              <value>private:resource/view/Presenter/CurrentSlidePreview</value>
-            </prop>
-            <prop oor:name="RelativeX">
-              <value>0.05</value>
-            </prop>
-            <prop oor:name="RelativeY">
-              <value>0.05</value>
-            </prop>
-            <prop oor:name="RelativeWidth">
-              <value>0.50</value>
-            </prop>
-            <prop oor:name="RelativeHeight">
-              <value>0.50</value>
-            </prop>
-          </node>
-          <node oor:name="NextSlidePreview" oor:op="replace">
-            <prop oor:name="PaneURL">
-              <value>private:resource/pane/Presenter/Pane2</value>
-            </prop>
-            <prop oor:name="ViewURL">
-              <value>private:resource/view/Presenter/NextSlidePreview</value>
-            </prop>
-            <prop oor:name="RelativeX">
-              <value>0.60</value>
-            </prop>
-            <prop oor:name="RelativeY">
-              <value>0.05</value>
-            </prop>
-            <prop oor:name="RelativeWidth">
-              <value>0.35</value>
-            </prop>
-            <prop oor:name="RelativeHeight">
-              <value>0.35</value>
-            </prop>
-          </node>
-          <node oor:name="ToolBar" oor:op="replace">
-            <prop oor:name="PaneURL">
-              <value>private:resource/pane/Presenter/Pane4</value>
-            </prop>
-            <prop oor:name="ViewURL">
-              <value>private:resource/view/Presenter/ToolBar</value>
-            </prop>
-            <prop oor:name="RelativeX">
-              <value>0.60</value>
-            </prop>
-            <prop oor:name="RelativeY">
-              <value>0.45</value>
-            </prop>
-            <prop oor:name="RelativeWidth">
-              <value>0.25</value>
-            </prop>
-            <prop oor:name="RelativeHeight">
-              <value>0.1</value>
-            </prop>
-          </node>
-          <node oor:name="NotesView" oor:op="replace">
-            <prop oor:name="PaneURL">
-              <value>private:resource/pane/Presenter/Pane3</value>
-            </prop>
-            <prop oor:name="ViewURL">
-              <value>private:resource/view/Presenter/Notes</value>
-            </prop>
-            <prop oor:name="RelativeX">
-              <value>0.05</value>
-            </prop>
-            <prop oor:name="RelativeY">
-              <value>0.60</value>
-            </prop>
-            <prop oor:name="RelativeWidth">
-              <value>0.9</value>
-            </prop>
-            <prop oor:name="RelativeHeight">
-              <value>0.35</value>
-            </prop>
-          </node>
-          <node oor:name="SlideSorter" oor:op="replace">
-            <prop oor:name="PaneURL">
-              <value>private:resource/pane/Presenter/Overlay</value>
-            </prop>
-            <prop oor:name="ViewURL">
-              <value>private:resource/view/Presenter/SlideSorter</value>
-            </prop>
-            <prop oor:name="RelativeX">
-              <value>0.05</value>
-            </prop>
-            <prop oor:name="RelativeY">
-              <value>0.05</value>
-            </prop>
-            <prop oor:name="RelativeWidth">
-              <value>0.95</value>
-            </prop>
-            <prop oor:name="RelativeHeight">
-              <value>0.8</value>
-            </prop>
-          </node>
-          <node oor:name="HelpView" oor:op="replace">
-            <prop oor:name="PaneURL">
-              <value>private:resource/pane/Presenter/Pane6</value>
-            </prop>
-            <prop oor:name="ViewURL">
-              <value>private:resource/view/Presenter/Help</value>
-            </prop>
-            <prop oor:name="RelativeX">
-              <value>0.05</value>
-            </prop>
-            <prop oor:name="RelativeY">
-              <value>0.05</value>
-            </prop>
-            <prop oor:name="RelativeWidth">
-              <value>0.95</value>
-            </prop>
-            <prop oor:name="RelativeHeight">
-              <value>0.8</value>
-            </prop>
-          </node>
-        </node>
-      </node>
-    </node>
-    <node oor:name="Accessibility">
-      <node oor:name="Console" oor:op="replace">
-        <prop oor:name="String">
-          <value xml:lang="en-US">Presenter Console</value>
-        </prop>
-      </node>
-      <node oor:name="Preview" oor:op="replace">
-        <prop oor:name="String">
-          <value xml:lang="en-US">Current Slide Info</value>
-        </prop>
-      </node>
-      <node oor:name="Notes" oor:op="replace">
-        <prop oor:name="String">
-          <value xml:lang="en-US">Presenter Notes</value>
-        </prop>
-      </node>
-    </node>
-  </node>
-</oor:component-data>
diff --git a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
deleted file mode 100644
index 74900896c96a..000000000000
--- a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
+++ /dev/null
@@ -1,465 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-<oor:component-schema xml:lang="en-US" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:package="org.openoffice.Office.extension" oor:name="PresenterScreen">
-  <info>
-    <author>AF</author>
-    <desc>Configuration of the Presenter Screen extension.</desc>
-  </info>
-  <import oor:component="org.openoffice.Office.Impress"></import>
-  <templates>
-    <group oor:name="BitmapDescriptor">
-      <info><desc>Describes one bitmap that can be used as button icon or to paint
-          a pane border.</desc></info>
-      <prop oor:name="Name" oor:type="xs:string">
-        <info><desc>Name of the bitmap.  Used to look-up the bitmap in a container.</desc></info>
-      </prop>
-      <prop oor:name="Text" oor:type="xs:string" oor:localized="true">
-        <info><desc>Text that is displayed together with the icon.</desc></info>
-      </prop>
-      <prop oor:name="NormalFileName" oor:type="xs:string">
-        <info><desc>Relative file name to the bitmap for the normal icon.</desc></info>
-      </prop>
-      <prop oor:name="MouseOverFileName" oor:type="xs:string">
-        <info><desc>Relative file name to the bitmap for the mouse over icon.</desc></info>
-      </prop>
-      <prop oor:name="ButtonDownFileName" oor:type="xs:string">
-        <info><desc>Relative file name to the bitmap for the button down icon.</desc></info>
-      </prop>
-      <prop oor:name="DisabledFileName" oor:type="xs:string">
-        <info><desc>Relative file name to the bitmap for the icon in disabled state.</desc></info>
-      </prop>
-      <prop oor:name="SelectedFileName" oor:type="xs:string">
-        <info><desc>Relative file name to the bitmap for the icon in disabled state.</desc></info>
-      </prop>
-      <prop oor:name="MaskFileName" oor:type="xs:string">
-        <info><desc>The file name of the mask bitmap. Use red for pixel outside of
-            the border and blue for inside pixels.</desc></info>
-        <value></value>
-      </prop>
-      <prop oor:name="XOffset" oor:type="xs:int">
-        <info><desc>Horizontal offset to move the bitmap just outside the
-            window border.</desc></info>
-        <value>0</value>
-      </prop>
-      <prop oor:name="YOffset" oor:type="xs:int">
-        <info><desc>Vertical offset to move the bitmap just outside the
-            window border.</desc></info>
-        <value>0</value>
-      </prop>
-      <prop oor:name="XHotSpot" oor:type="xs:int">
-        <info><desc>Horizontal position of a hot spot.</desc></info>
-      </prop>
-      <prop oor:name="YHotSpot" oor:type="xs:int">
-        <info><desc>Vertical position of a hot spot.</desc></info>
-      </prop>
-      <prop oor:name="ReplacementColor" oor:type="xs:hexBinary">
-        <info><desc>Color that is used as replacement for the bitmap when the later
-            can for some reason not be used.</desc></info>
-      </prop>
-      <prop oor:name="HorizontalTexturingMode" oor:type="xs:string">
-        <info><desc>Horizontal texturing mode.</desc></info>
-        <constraints>
-          <enumeration oor:value="Once">
-            <info><desc>Show texture only once</desc></info>
-          </enumeration>
-          <enumeration oor:value="Repeat">
-            <info><desc>Repeat the texture</desc></info>
-          </enumeration>
-          <enumeration oor:value="Stretch">
-            <info><desc>Stretch the texture to cover the paint area</desc></info>
-          </enumeration>
-        </constraints>
-      </prop>
-      <prop oor:name="VerticalTexturingMode" oor:type="xs:string">
-        <info><desc>Vertical texturing mode.</desc></info>
-        <constraints>
-          <enumeration oor:value="Once">
-            <info><desc>Show texture only once</desc></info>
-          </enumeration>
-          <enumeration oor:value="Repeat">
-            <info><desc>Repeat the texture</desc></info>
-          </enumeration>
-          <enumeration oor:value="Stretch">
-            <info><desc>Stretch the texture to cover the paint area</desc></info>
-          </enumeration>
-        </constraints>
-        <value>Once</value>
-      </prop>
-    </group>
-    <group oor:name="ThemeBorderSize">
-      <info><desc>Four values describing the sizes of a border around a
-          rectangular area.</desc></info>
-      <prop oor:name="Left" oor:type="xs:int">
-        <info><desc>Left border size.</desc></info>
-      </prop>
-      <prop oor:name="Top" oor:type="xs:int">
-        <info><desc>Top border size.</desc></info>
-      </prop>
-      <prop oor:name="Right" oor:type="xs:int">
-        <info><desc>Right border size.</desc></info>
-      </prop>
-      <prop oor:name="Bottom" oor:type="xs:int">
-        <info><desc>Bottom border size.</desc></info>
-      </prop>
-    </group>
-    <group oor:name="Font">
-      <info><desc>Font description.</desc></info>
-      <prop oor:name="FamilyName" oor:type="xs:string">
-        <info><desc>The name of the font family.</desc></info>
-      </prop>
-      <prop oor:name="Size" oor:type="xs:int">
-        <info><desc>Font size.</desc></info>
-      </prop>
-      <prop oor:name="Style" oor:type="xs:string">
-        <info><desc>Something like "Bold" or "Italic" or "Bold Italic".</desc></info>
-      </prop>
-      <prop oor:name="Color" oor:type="xs:hexBinary">
-        <info><desc>Font color.</desc></info>
-      </prop>
-      <prop oor:name="Anchor" oor:type="xs:string">
-        <info><desc>Orientation of text.  Can be left, right, or centered.</desc></info>
-        <constraints>
-          <enumeration oor:value="Left">
-            <info><desc>Flush left</desc></info>
-          </enumeration>
-          <enumeration oor:value="Right">
-            <info><desc>Flush right</desc></info>
-          </enumeration>
-          <enumeration oor:value="Center">
-            <info><desc>Centered</desc></info>
-          </enumeration>
-        </constraints>
-      </prop>
-      <prop oor:name="XOffset" oor:type="xs:int">
-        <info><desc>Horizontal offset in relation to the anchor point.</desc></info>
-      </prop>
-      <prop oor:name="YOffset" oor:type="xs:int">
-        <info><desc>Vertical offset in relation to the anchor point.</desc></info>
-      </prop>
-    </group>
-    <group oor:name="ToolBarDescription">
-      <info><desc>Description of a tool bar entry state.</desc></info>
-      <node-ref oor:name="Font" oor:node-type="Font">
-        <info><desc>Font used for displaying the text.</desc></info>
-      </node-ref>
-      <node-ref oor:name="Icon" oor:node-type="BitmapDescriptor">
-        <info><desc>The icon to display.</desc></info>
-      </node-ref>
-      <prop oor:name="Text" oor:type="xs:string" oor:localized="true">
-        <info><desc>The text to display.</desc></info>
-      </prop>
-      <prop oor:name="Action" oor:type="xs:string">
-        <info><desc>Action to execute when a button is triggered.</desc></info>
-      </prop>
-    </group>
-    <group oor:name="ToolBarEntry">
-      <info><desc>Definition of a tool bar entry.</desc></info>
-      <prop oor:name="Name" oor:type="xs:string">
-        <info><desc>Name of the entry.  May be used to have mode dependant entries.</desc></info>
-      </prop>
-      <prop oor:name="Type" oor:type="xs:string">
-        <info><desc>Type of the entry.  Examples are "Label" and "Button".</desc></info>
-      </prop>
-      <node-ref oor:name="Normal" oor:node-type="ToolBarDescription">
-        <info><desc>Description of a tool bar entry in normal mode (not selected, not mouse over)</desc></info>
-      </node-ref>
-      <node-ref oor:name="MouseOver" oor:node-type="ToolBarDescription">
-        <info><desc>Description of a tool bar entry when the mouse is over it.</desc></info>
-      </node-ref>
-      <node-ref oor:name="Selected" oor:node-type="ToolBarDescription">
-        <info><desc>Description of a tool bar entry when it is selected.</desc></info>
-      </node-ref>
-      <node-ref oor:name="Disabled" oor:node-type="ToolBarDescription">
-        <info><desc>Description of a tool bar entry when it is disabled.</desc></info>
-      </node-ref>
-    </group>
-    <group oor:name="ToolBar">
-      <info><desc>Definition of one tool bar.</desc></info>
-      <set oor:name="Entries" oor:node-type="ToolBarEntry">
-        <info><desc>Entries of the tool bars.</desc></info>
-      </set>
-    </group>
-    <group oor:name="Button">
-      <info><desc>Description of a button.</desc></info>
-      <prop oor:name="Name" oor:type="xs:string">
-        <info><desc>Name of the button that is used to look up the button.</desc></info>
-      </prop>
-      <node-ref oor:name="Font" oor:node-type="Font">
-        <info><desc>Font used for displaying the text.</desc></info>
-      </node-ref>
-      <node-ref oor:name="Icon" oor:node-type="BitmapDescriptor">
-        <info><desc>The icon to display.</desc></info>
-      </node-ref>
-      <prop oor:name="Text" oor:type="xs:string" oor:localized="true">
-        <info><desc>The text to display.</desc></info>
-      </prop>
-      <prop oor:name="Action" oor:type="xs:string">
-        <info><desc>Action to execute when a button is triggered.</desc></info>
-      </prop>
-    </group>
-    <group oor:name="HelpEntry">
-      <info><desc>Description of a help entry.</desc></info>
-      <prop oor:name="Left" oor:type="xs:string" oor:localized="true">
-        <info><desc>Typically a list of keyboard key names.</desc></info>
-      </prop>
-      <prop oor:name="Right" oor:type="xs:string" oor:localized="true">
-        <info><desc>Typically a description of the action triggered by pressing the keys on the left.</desc></info>
-      </prop>
-    </group>
-    <group oor:name="PaneStyle">
-      <info><desc>Visual properties of a pane style:
-          the border of a pane and its title font.</desc></info>
-      <prop oor:name="StyleName" oor:type="xs:string">
-        <info><desc>Name of the style.  Used for referencing the style.
-            Has to be unique among pane styles and view styles
-            in one theme.</desc></info>
-      </prop>
-      <prop oor:name="ParentStyle" oor:type="xs:string">
-        <info><desc>Name of the parent style.  Values not supplied in this style
-            are taken from the parent style.  Empty string or missing
-            mean no parent.</desc></info>
-        <value></value>
-      </prop>
-      <node-ref oor:name="TitleFont" oor:node-type="Font">
-        <info><desc>Font used for displaying the pane title.</desc></info>
-      </node-ref>
-      <node-ref oor:name="InnerBorderSize" oor:node-type="ThemeBorderSize">
-        <info><desc>Size of the inner part of the border.</desc></info>
-      </node-ref>
-      <node-ref oor:name="OuterBorderSize" oor:node-type="ThemeBorderSize">
-        <info><desc>Size of the outer part of the border.</desc></info>
-      </node-ref>
-      <set oor:name="BorderBitmapList" oor:node-type="BitmapDescriptor">
-        <info><desc>Bitmaps that are used to paint the borders of
-            a pane.</desc></info>
-      </set>
-    </group>
-    <group oor:name="ViewStyle">
-      <info><desc>Visual properties of a view style:
-          font and backround color.</desc></info>
-      <prop oor:name="StyleName" oor:type="xs:string">
-        <info><desc>Name of the style.  Used for referencing the style.
-            Has to be unique among pane styles and view styles
-            in one theme.</desc></info>
-      </prop>
-      <prop oor:name="ParentStyle" oor:type="xs:string">
-        <info><desc>Name of the parent style.  Values not supplied in this style
-            are taken from the parent style.  Empty string or missing
-            mean no parent.</desc></info>
-        <value></value>
-      </prop>
-      <node-ref oor:name="Font" oor:node-type="Font">
-        <info><desc>Font used for text display inside a view.</desc></info>
-      </node-ref>
-      <node-ref oor:name="Background" oor:node-type="BitmapDescriptor">
-        <info><desc>Color (or bitmap) that is used to paint the
-            background of a view.</desc></info>
-      </node-ref>
-    </group>
-    <group oor:name="Style_Association">
-      <info><desc>Association of a drawing framework resource to a
-          style of the presenter theme.</desc></info>
-      <prop oor:name="ResourceURL" oor:type="xs:string">
-        <info><desc>URL of a drawing framework resource.</desc></info>
-      </prop>
-      <prop oor:name="StyleName" oor:type="xs:string">
-        <info><desc>Name of a pane style or a view style.</desc></info>
-      </prop>
-    </group>
-    <group oor:name="PresenterString">
-      <info><desc>Presenter string, whatever that might mean.</desc></info>
-      <prop oor:name="String" oor:type="xs:string" oor:localized="true">
-          <info><desc>Just a string.</desc></info>
-      </prop>
-    </group>
-    <group oor:name="ViewDescription">
-      <info><desc>Association of a drawing framework resource to a
-          style of the presenter theme.</desc></info>
-      <prop oor:name="ViewURL" oor:type="xs:string">
-        <info><desc>URL of a drawing framework view.</desc></info>
-      </prop>
-      <prop oor:name="StyleName" oor:type="xs:string">
-        <info><desc>Name of a view style.</desc></info>
-      </prop>
-      <prop oor:name="Title" oor:type="xs:string" oor:localized="true">
-        <info><desc>Title displayed for the component.  An empty or missing
-            title means that no title is displayed.</desc></info>
-        <value></value>
-      </prop>
-      <prop oor:name="AccessibleTitle" oor:type="xs:string" oor:localized="true">
-        <info><desc>Title displayed for the component when accessibility support is active.
-            An empty or missing title means that no title is displayed.</desc></info>
-        <value></value>
-      </prop>
-      <prop oor:name="IsOpaque" oor:type="xs:boolean">
-        <info><desc>When the value is false then the background is painted before the
-            view is painted.</desc></info>
-        <value>false</value>
-      </prop>
-      <set oor:name="Strings" oor:node-type="PresenterString">
-        <info><desc>List of localizable strings used by the view.</desc></info>
-      </set>
-    </group>
-    <group oor:name="PresenterTheme">
-      <info><desc>Visual properties of the presenter view.  The values in a theme
-          are hints and can be ignored.</desc></info>
-      <prop oor:name="ThemeName" oor:type="xs:string">
-        <info><desc>Name of the theme.  Used for referencing the theme.
-            Has to be unique among all themes.  The name of the
-            default theme is 'DefaultTheme'</desc></info>
-      </prop>
-      <prop oor:name="ParentTheme" oor:type="xs:string">
-        <info><desc>Name of the parent theme.  Values not supplied in this theme
-            are taken from the parent theme.  Empty string or missing
-            mean default theme.</desc></info>
-        <value></value>
-      </prop>
-      <prop oor:name="BitmapSourceExtension" oor:type="xs:string">
-        <info><desc>Name of the extension which contains the bitmaps
-            referenced by this theme.</desc></info>
-        <value></value>
-      </prop>
-      <node-ref oor:name="Background" oor:node-type="BitmapDescriptor">
-        <info><desc>Color or bitmap that is used to paint the
-            background.</desc></info>
-      </node-ref>
-      <set oor:name="PaneStyles" oor:node-type="PaneStyle">
-        <info><desc>List of pane styles.</desc></info>
-      </set>
-      <set oor:name="ViewStyles" oor:node-type="ViewStyle">
-        <info><desc>List of view styles.</desc></info>
-      </set>
-      <set oor:name="StyleAssociations" oor:node-type="Style_Association">
-        <info><desc>List of style associations.</desc></info>
-      </set>
-      <set oor:name="Bitmaps" oor:node-type="BitmapDescriptor">
-        <info><desc>List of additional bitmaps for example for buttons.</desc></info>
-      </set>
-      <set oor:name="Fonts" oor:node-type="Font">
-        <info><desc>List of additional fonts.</desc></info>
-      </set>
-    </group>
-    <group oor:name="PresenterComponentLayout">
-      <info><desc>Layout of a component of the presenter screen.</desc></info>
-      <prop oor:name="PaneURL" oor:type="xs:string">
-        <info><desc>URL of a pane resource.</desc></info>
-      </prop>
-      <prop oor:name="ViewURL" oor:type="xs:string">
-        <info><desc>URL of a view resource that is to be displayed in
-            the pane.</desc></info>
-      </prop>
-      <prop oor:name="RelativeX" oor:type="xs:double">
-        <info><desc>Relative x position in the range of [0,1].</desc></info>
-      </prop>
-      <prop oor:name="RelativeY" oor:type="xs:double">
-        <info><desc>Relative y position in the range of [0,1].</desc></info>
-      </prop>
-      <prop oor:name="RelativeWidth" oor:type="xs:double">
-        <info><desc>Relative width in the range of [0,1].</desc></info>
-      </prop>
-      <prop oor:name="RelativeHeight" oor:type="xs:double">
-        <info><desc>Relative height in the range of [0,1].</desc></info>
-      </prop>
-    </group>
-    <group oor:name="PresenterLayout">
-      <info><desc>Layout of all components of the presenter screen.</desc></info>
-      <prop oor:name="LayoutName" oor:type="xs:string">
-        <info><desc>Name of the layout.  Used for referencing the layout.
-            Has to be unique among all presenter layouts.</desc></info>
-      </prop>
-      <prop oor:name="ParentLayout" oor:type="xs:string">
-        <info><desc>Name of the parent layout.  Values not supplied in this layout
-            are taken from the parent layout.  Missing or empty string
-            mean no parent layout.</desc></info>
-        <value></value>
-      </prop>
-      <set oor:name="Layout" oor:node-type="PresenterComponentLayout">
-        <info><desc>List of component layouts.</desc></info>
-      </set>
-    </group>
-  </templates>
-  <component>
-    <group oor:name="PresenterScreenSettings">
-      <info><desc>Settings regarding controls that are only used by the Presenter
-          Screen.</desc></info>
-      <set oor:name="ToolBars" oor:node-type="ToolBar">
-        <info><desc>Set of tool bars.</desc></info>
-      </set>
-      <set oor:name="Buttons" oor:node-type="Button">
-        <info><desc>Set of buttons.</desc></info>
-      </set>
-      <group oor:name="ScrollBar">
-        <info><desc>Settings of scroll bars.</desc></info>
-        <set oor:name="Bitmaps" oor:node-type="BitmapDescriptor">
-          <info><desc>Bitmaps of icons used for displaying the scroll bar.</desc></info>
-        </set>
-      </group>
-      <group oor:name="SlideSorter">
-        <info><desc>Settings of the slide sorter of the presenter screen.</desc></info>
-        <node-ref oor:name="BorderSize" oor:node-type="ThemeBorderSize">
-          <info><desc>Size of the border around the current slide.</desc></info>
-        </node-ref>
-        <set oor:name="CurrentSlideBorderBitmaps" oor:node-type="BitmapDescriptor">
-          <info><desc>Bitmaps that are used to paint the border around the current
-              slide.</desc></info>
-        </set>
-      </group>
-      <group oor:name="HelpView">
-        <info><desc>Settings of help view.</desc></info>
-        <set oor:name="HelpStrings" oor:node-type="HelpEntry">
-          <info><desc>List of entries displayed in the help view.</desc></info>
-        </set>
-      </group>
-    </group>
-    <group oor:name="Presenter">
-      <info><desc>General properties of the presenter view.</desc></info>
-      <prop oor:name="StartAlways" oor:type="xs:boolean">
-        <info><desc>When true then presenter screen is displayed on single screen systems
-            or when fullscreen presentation spans all screens.</desc></info>
-        <value>false</value>
-      </prop>
-      <set oor:name="Themes" oor:node-type="PresenterTheme">
-        <info><desc>List of available themes.</desc></info>
-      </set>
-      <prop oor:name="CurrentTheme" oor:type="xs:string">
-        <info><desc>Name of the current theme.  An empty name or the string "DefaultTheme"
-            specify the default theme.</desc></info>
-        <value>DefaultTheme</value>
-      </prop>
-      <set oor:name="Views" oor:node-type="ViewDescription">
-        <info><desc>Description of the views.</desc></info>
-      </set>
-      <set oor:name="Layouts" oor:node-type="PresenterLayout">
-        <info><desc>List of visible presenter components.</desc></info>
-      </set>
-      <prop oor:name="CurrentLayout" oor:type="xs:string">
-        <info><desc>Name of the current layout.  An empty name or the
-            string "DefaultLayout" specify the default layout.</desc></info>
-        <value>DefaultLayout</value>
-      </prop>
-      <set oor:name="Accessibility" oor:node-type="PresenterString">
-        <info><desc>Strings that are used make the presenter console accessible.</desc></info>
-      </set>
-      <prop oor:name="InitialViewMode" oor:type="xs:int">
-        <info><desc>The view mode on start up of the extension.  Valid values are 0 for the Preview-only mode, 1 for the notes view, 2 for the slide overview.</desc></info>
-        <value>0</value>
-      </prop>
-    </group>
-  </component>
-</oor:component-schema>
author	Stephan Bergmann <sbergman@redhat.com>	2012-11-21 17:19:28 +0100
committer	Stephan Bergmann <sbergman@redhat.com>	2012-11-21 17:47:43 +0100
commit	ea91c7d90d74e1ca039ba669b5d3e14fa359c0fa (patch)
tree	1f8bd3b84fa18737164ed944d9db401794985677 /sdext
parent	397f3e5d7b0b079ef3a6ef4b859ea2b2ab814b67 (diff)