gbuildize sdext

8 files changed, 87 insertions, 510 deletions

diff --git a/sdext/source/presenter/Makefile b/sdext/source/presenter/Makefile
new file mode 100644
index 000000000000..2f7171a3fef1
--- /dev/null
+++ b/sdext/source/presenter/Makefile
@@ -0,0 +1,40 @@
+# -*- 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.
+
+PARTIAL_BUILD := T
+SOURCEDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
+
+include $(GBUILDDIR)/gbuild_simple.mk
+
+manifest.xml :
+	sed "s/SHARED_EXTENSION/$(gb_Library_DLLEXT)/" $(SOURCEDIR)manifest.xml > $@
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : manifest.xml
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/source/presenter/PresenterExtensionIdentifier.txx b/sdext/source/presenter/PresenterExtensionIdentifier.hxx
index e505fd092bba..5e4f9001b678 100644
--- a/sdext/source/presenter/PresenterExtensionIdentifier.txx
+++ b/sdext/source/presenter/PresenterExtensionIdentifier.hxx
@@ -30,11 +30,8 @@
 
 namespace sdext { namespace presenter {
 
-/** The UPDATE_IDENTIFIER part of the string below is replaced by the
-    makefile.mk with the actual, platform specific, extension identifier.
-*/
 const ::rtl::OUString PresenterComponent::gsExtensionIdentifier(
-    RTL_CONSTASCII_USTRINGPARAM("com.sun.PresenterScreen-UPDATED_PLATFORM"));
+    RTL_CONSTASCII_USTRINGPARAM(PRESENTER_IMPL_IDENTIFIER));
 
 } }
 
diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile
new file mode 100644
index 000000000000..68f6dcd7bad6
--- /dev/null
+++ b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/Makefile
@@ -0,0 +1,40 @@
+# -*- 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.
+
+PARTIAL_BUILD := T
+SOURCEDIR := $(dir $(realpath $(lastword $(MAKEFILE_LIST))))
+
+include $(OUTDIR)/inc/rtlbootstrap.mk
+
+presenter.xhp :
+	sed "s/PLATFORMID/$(RTL_OS)_$(RTL_ARCH)/" < $(SOURCEDIR)/presenter.xhp > $@
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : presenter.xhp
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk
deleted file mode 100644
index 95678f13aa11..000000000000
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=../../../../..
-PRJNAME=sdext
-TARGET=PresenterScreenHelp
-EXTNAME=PresenterScreen
-
-PACKAGE = com.sun.PresenterScreen
-
-# --- Settings ----------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(ENABLE_PRESENTER_SCREEN)" == "NO"
-do_nothing:
-    @echo "Presenter Screen build disabled."
-.ELSE
-
-XHPFILES= \
-    presenter.xhp
-
-
-.INCLUDE : target.mk
-.INCLUDE : tg_help.mk
-
-.ENDIF
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
deleted file mode 100644
index 883482f36ba6..000000000000
--- a/sdext/source/presenter/makefile.mk
+++ /dev/null
@@ -1,355 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=sdext
-TARGET=PresenterScreen
-GEN_HID=FALSE
-EXTNAME=PresenterScreen
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-# survive zip dependencies
-MAXLINELENGTH:=100000
-
-# --- Settings ----------------------------------
-
-.INCLUDE : rtlbootstrap.mk
-.INCLUDE : settings.mk
-
-PACKAGE=com.sun.PresenterScreen-$(PLATFORMID)
-
-.IF "$(ENABLE_PRESENTER_SCREEN)" == "NO"
-@all:
-    @echo "Presenter Screen build disabled."
-.ELSE
-
-.IF "$(L10N_framework)"==""
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-DLLPRE=
-
-# --- Files -------------------------------------
-
-SLOFILES=										\
-    $(SLO)$/PresenterAccessibility.obj			\
-    $(SLO)$/PresenterAnimation.obj				\
-    $(SLO)$/PresenterAnimator.obj				\
-    $(SLO)$/PresenterBitmapContainer.obj		\
-    $(SLO)$/PresenterButton.obj					\
-    $(SLO)$/PresenterCanvasHelper.obj			\
-    $(SLO)$/PresenterConfigurationAccess.obj	\
-    $(SLO)$/PresenterController.obj				\
-    $(SLO)$/PresenterCurrentSlideObserver.obj	\
-    $(SLO)$/PresenterFrameworkObserver.obj		\
-    $(SLO)$/PresenterGeometryHelper.obj			\
-    $(SLO)$/PresenterHelper.obj					\
-    $(SLO)$/PresenterHelpView.obj				\
-    $(SLO)$/PresenterNotesView.obj				\
-    $(SLO)$/PresenterPaintManager.obj			\
-    $(SLO)$/PresenterPane.obj					\
-    $(SLO)$/PresenterPaneBase.obj				\
-    $(SLO)$/PresenterPaneBorderManager.obj		\
-    $(SLO)$/PresenterPaneBorderPainter.obj		\
-    $(SLO)$/PresenterPaneContainer.obj			\
-    $(SLO)$/PresenterPaneFactory.obj			\
-    $(SLO)$/PresenterProtocolHandler.obj		\
-    $(SLO)$/PresenterScreen.obj					\
-    $(SLO)$/PresenterScrollBar.obj				\
-    $(SLO)$/PresenterSlidePreview.obj			\
-    $(SLO)$/PresenterSlideShowView.obj			\
-    $(SLO)$/PresenterSlideSorter.obj			\
-    $(SLO)$/PresenterSprite.obj					\
-    $(SLO)$/PresenterSpritePane.obj				\
-    $(SLO)$/PresenterTextView.obj				\
-    $(SLO)$/PresenterTheme.obj					\
-    $(SLO)$/PresenterTimer.obj					\
-    $(SLO)$/PresenterToolBar.obj				\
-    $(SLO)$/PresenterUIPainter.obj				\
-    $(SLO)$/PresenterViewFactory.obj			\
-    $(SLO)$/PresenterWindowManager.obj			\
-    $(SLO)$/PresenterComponent.obj
-
-
-# --- Library -----------------------------------
-
-SHL1TARGET=$(ENFORCEDSHLPREFIX)$(TARGET).uno
-
-SHL1STDLIBS=	$(CPPUHELPERLIB)	\
-                $(CPPULIB)			\
-                $(SALLIB)
-
-SHL1DEPN=
-SHL1IMPLIB=		i$(SHL1TARGET)
-SHL1LIBS=		$(SLB)$/$(TARGET).lib
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-.IF "$(GUI)"=="WNT"
-SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map
-.ELSE # just a quick hack for GCC fdo#42865
-SHL1USE_EXPORTS = name
-.ENDIF
-SHL1RPATH=      OXT
-DEF1NAME=		$(SHL1TARGET)
-
-ZIP2TARGET=		presenter-screen_develop
-ZIP2DIR=		$(COMMONMISC)
-ZIP2EXT=		.zip
-ZIP2FLAGS=-r
-ZIP2LIST=		*/com.sun.PresenterScreen/*.xhp
-
-ZIP1TARGET=		presenter-screen
-ZIP1DIR=		$(MISC)$/$(TARGET)
-ZIP1EXT=		.oxt
-ZIP1FLAGS=-r
-ZIP1LIST=		*
-
-DESCRIPTION:=$(ZIP1DIR)$/description.xml
-
-.IF "$(WITH_LANG)"==""
-FIND_XCU=registry/data
-.ELSE			# "$(WITH_LANG)"==""
-FIND_XCU=$(MISC)$/$(EXTNAME)_in$/merge
-.ENDIF			# "$(WITH_LANG)"==""
-
-COMPONENT_FILES=																			\
-    $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/Jobs.xcu							\
-    $(ZIP1DIR)$/registry$/data$/org$/openoffice$/Office$/ProtocolHandler.xcu				\
-    $(ZIP1DIR)$/registry$/schema/org$/openoffice$/Office$/extension$/PresenterScreen.xcs   	\
-    $(ZIP1DIR)$/registry$/data/$/org$/openoffice$/Office$/extension$/PresenterScreen.xcu 
-
-COMPONENT_BITMAPS=												\
-    $(ZIP1DIR)$/bitmaps$/BorderTop.png							\
-    $(ZIP1DIR)$/bitmaps$/BorderTopLeft.png						\
-    $(ZIP1DIR)$/bitmaps$/BorderTopRight.png						\
-    $(ZIP1DIR)$/bitmaps$/BorderLeft.png							\
-    $(ZIP1DIR)$/bitmaps$/BorderRight.png						\
-    $(ZIP1DIR)$/bitmaps$/BorderBottomLeft.png					\
-    $(ZIP1DIR)$/bitmaps$/BorderBottomRight.png					\
-    $(ZIP1DIR)$/bitmaps$/BorderBottom.png						\
-                                                                \
-    $(ZIP1DIR)$/bitmaps$/BorderActiveTop.png					\
-    $(ZIP1DIR)$/bitmaps$/BorderActiveTopLeft.png				\
-    $(ZIP1DIR)$/bitmaps$/BorderActiveTopRight.png				\
-    $(ZIP1DIR)$/bitmaps$/BorderActiveLeft.png					\
-    $(ZIP1DIR)$/bitmaps$/BorderActiveRight.png					\
-    $(ZIP1DIR)$/bitmaps$/BorderActiveBottomLeft.png				\
-    $(ZIP1DIR)$/bitmaps$/BorderActiveBottomRight.png			\
-    $(ZIP1DIR)$/bitmaps$/BorderActiveBottom.png					\
-    $(ZIP1DIR)$/bitmaps$/BorderActiveBottomCallout.png			\
-                                                                \
-    $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideTop.png				\
-    $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideTopLeft.png			\
-    $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideTopRight.png			\
-    $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideLeft.png				\
-    $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideRight.png			\
-    $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideBottomLeft.png		\
-    $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideBottomRight.png		\
-    $(ZIP1DIR)$/bitmaps$/BorderCurrentSlideBottom.png			\
-                                                                \
-    $(ZIP1DIR)$/bitmaps$/BorderToolbarTop.png					\
-    $(ZIP1DIR)$/bitmaps$/BorderToolbarTopLeft.png				\
-    $(ZIP1DIR)$/bitmaps$/BorderToolbarTopRight.png				\
-    $(ZIP1DIR)$/bitmaps$/BorderToolbarLeft.png					\
-    $(ZIP1DIR)$/bitmaps$/BorderToolbarRight.png					\
-    $(ZIP1DIR)$/bitmaps$/BorderToolbarBottom.png				\
-                                                                \
-    $(ZIP1DIR)$/bitmaps$/Background.png							\
-    $(ZIP1DIR)$/bitmaps$/ViewBackground.png						\
-                                                                \
-    $(ZIP1DIR)$/bitmaps$/ButtonSlidePreviousNormal.png			\
-    $(ZIP1DIR)$/bitmaps$/ButtonSlidePreviousMouseOver.png		\
-    $(ZIP1DIR)$/bitmaps$/ButtonSlidePreviousSelected.png		\
-    $(ZIP1DIR)$/bitmaps$/ButtonSlidePreviousDisabled.png		\
-    $(ZIP1DIR)$/bitmaps$/ButtonEffectNextNormal.png				\
-    $(ZIP1DIR)$/bitmaps$/ButtonEffectNextMouseOver.png			\
-    $(ZIP1DIR)$/bitmaps$/ButtonEffectNextSelected.png			\
-    $(ZIP1DIR)$/bitmaps$/ButtonEffectNextDisabled.png			\
-    $(ZIP1DIR)$/bitmaps$/ButtonNotesNormal.png					\
-    $(ZIP1DIR)$/bitmaps$/ButtonNotesMouseOver.png				\
-    $(ZIP1DIR)$/bitmaps$/ButtonNotesSelected.png				\
-    $(ZIP1DIR)$/bitmaps$/ButtonNotesDisabled.png				\
-    $(ZIP1DIR)$/bitmaps$/ButtonSwitchMonitorNormal.png				\
-    $(ZIP1DIR)$/bitmaps$/ButtonSwitchMonitorMouseOver.png			\
-    $(ZIP1DIR)$/bitmaps$/ButtonSlideSorterNormal.png			\
-    $(ZIP1DIR)$/bitmaps$/ButtonSlideSorterMouseOver.png			\
-    $(ZIP1DIR)$/bitmaps$/ButtonSlideSorterSelected.png			\
-    $(ZIP1DIR)$/bitmaps$/ButtonSlideSorterDisabled.png			\
-    $(ZIP1DIR)$/bitmaps$/ButtonHelpNormal.png					\
-    $(ZIP1DIR)$/bitmaps$/ButtonHelpMouseOver.png				\
-    $(ZIP1DIR)$/bitmaps$/ButtonHelpSelected.png					\
-    $(ZIP1DIR)$/bitmaps$/ButtonHelpDisabled.png					\
-                                                                \
-    $(ZIP1DIR)$/bitmaps/ScrollbarArrowUpNormal.png				\
-    $(ZIP1DIR)$/bitmaps/ScrollbarArrowUpMouseOver.png			\
-    $(ZIP1DIR)$/bitmaps/ScrollbarArrowUpSelected.png			\
-    $(ZIP1DIR)$/bitmaps/ScrollbarArrowUpDisabled.png			\
-    $(ZIP1DIR)$/bitmaps/ScrollbarArrowDownNormal.png			\
-    $(ZIP1DIR)$/bitmaps/ScrollbarArrowDownMouseOver.png			\
-    $(ZIP1DIR)$/bitmaps/ScrollbarArrowDownSelected.png			\
-    $(ZIP1DIR)$/bitmaps/ScrollbarArrowDownDisabled.png			\
-    $(ZIP1DIR)$/bitmaps/ScrollbarPagerMiddleNormal.png			\
-    $(ZIP1DIR)$/bitmaps/ScrollbarPagerMiddleMouseOver.png		\
-    $(ZIP1DIR)$/bitmaps/ScrollbarThumbTopNormal.png				\
-    $(ZIP1DIR)$/bitmaps/ScrollbarThumbTopMouseOver.png			\
-    $(ZIP1DIR)$/bitmaps/ScrollbarThumbBottomNormal.png			\
-    $(ZIP1DIR)$/bitmaps/ScrollbarThumbBottomMouseOver.png		\
-    $(ZIP1DIR)$/bitmaps/ScrollbarThumbMiddleNormal.png			\
-    $(ZIP1DIR)$/bitmaps/ScrollbarThumbMiddleMouseOver.png		\
-                                                                \
-    $(ZIP1DIR)$/bitmaps$/ButtonPlusNormal.png					\
-    $(ZIP1DIR)$/bitmaps$/ButtonPlusMouseOver.png				\
-    $(ZIP1DIR)$/bitmaps$/ButtonPlusSelected.png					\
-    $(ZIP1DIR)$/bitmaps$/ButtonPlusDisabled.png					\
-    $(ZIP1DIR)$/bitmaps$/ButtonMinusNormal.png					\
-    $(ZIP1DIR)$/bitmaps$/ButtonMinusMouseOver.png				\
-    $(ZIP1DIR)$/bitmaps$/ButtonMinusSelected.png				\
-    $(ZIP1DIR)$/bitmaps$/ButtonMinusDisabled.png				\
-                                                                \
-    $(ZIP1DIR)$/bitmaps$/ButtonFrameLeftNormal.png				\
-    $(ZIP1DIR)$/bitmaps$/ButtonFrameCenterNormal.png			\
-    $(ZIP1DIR)$/bitmaps$/ButtonFrameRightNormal.png				\
-    $(ZIP1DIR)$/bitmaps$/ButtonFrameLeftMouseOver.png			\
-    $(ZIP1DIR)$/bitmaps$/ButtonFrameCenterMouseOver.png			\
-    $(ZIP1DIR)$/bitmaps$/ButtonFrameRightMouseOver.png			\
-                                                                \
-    $(ZIP1DIR)$/bitmaps$/LabelMouseOverLeft.png					\
-    $(ZIP1DIR)$/bitmaps$/LabelMouseOverCenter.png				\
-    $(ZIP1DIR)$/bitmaps$/LabelMouseOverRight.png
-
-COMPONENT_IMAGES=\
-    $(ZIP1DIR)$/bitmaps$/extension_32.png
-
-COMPONENT_MANIFEST= 							\
-    $(ZIP1DIR)$/META-INF$/manifest.xml
-
-COMPONENT_LIBRARY= 								\
-    $(ZIP1DIR)$/$(TARGET).uno$(DLLPOST)
-
-PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l)
-
-COMPONENT_HELP= 								\
-    $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
-
-COMPONENT_DESCRIPTION= \
-    $(foreach,lang,$(alllangiso) $(ZIP1DIR)$/description-$(lang).txt)
-
-ZIP1DEPS=					\
-    $(DESCRIPTION)			\
-    $(COMPONENT_MANIFEST)	\
-    $(COMPONENT_FILES)		\
-    $(COMPONENT_BITMAPS)	\
-    $(COMPONENT_IMAGES)    	\
-    $(COMPONENT_LIBRARY)	\
-    $(COMPONENT_DESCRIPTION)	\
-    $(COMPONENT_HELP)
-
-LINKNAME:=help
-XHPLINKSRC:=$(ZIP1DIR)/help
-
-my_XHPFILES= \
-    presenter.xhp
-
-LINKLINKFILES= \
-    $(PACKAGE)/{$(my_XHPFILES)}
-
-# --- Targets ----------------------------------
-.ENDIF # L10N_framework
-
-.INCLUDE : target.mk
-.INCLUDE : extension_helplink.mk
-
-.IF "$(L10N_framework)"==""
-$(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx
-
-$(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx
-    $(TYPE) $< | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
-
-$(COMPONENT_MANIFEST) : $$(@:f)
-    @-$(MKDIRHIER) $(@:d)
-    +$(TYPE) $< | $(SED) "s/SHARED_EXTENSION/$(DLLPOST)/" > $@
-
-$(ZIP1DIR)$/help$/%$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp : $(COMMONMISC)$/%$/com.sun.PresenterScreen$/presenter.xhp
-    @echo creating $@
-    @-$(MKDIRHIER) $(@:d)
-    $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" > $@
-
-.IF "$(ZIP1TARGETN)"!=""
-$(ZIP1TARGETN) : $(HELPLINKALLTARGETS)
-
-.ENDIF          # "$(ZIP1TARGETN)"!=""
-
-$(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
-    @-$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
-
-$(COMPONENT_IMAGES) : $(SRC_ROOT)/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
-
-$(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
-    @-$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
-
-$(COMPONENT_DESCRIPTION) : $(DESCRIPTION)
-
-$(ZIP1DIR)/%.xcu : %.xcu
-    @@-$(MKDIRHIER) $(@:d)
-    $(GNUCOPY) $< $@
-
-$(ZIP1DIR)$/%.xcs : %.xcs
-    @@-$(MKDIRHIER) $(@:d)
-    $(GNUCOPY) $< $@
-
-.INCLUDE .IGNORE : $(ZIP1DIR)_lang_track.mk
-.IF "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
-PHONYDESC=.PHONY
-.ENDIF			# "$(LAST_WITH_LANG)"!="$(WITH_LANG)"
-$(DESCRIPTION) $(PHONYDESC) : $$(@:f)
-    @-$(MKDIRHIER) $(@:d)
-    @echo LAST_WITH_LANG=$(WITH_LANG) > $(ZIP1DIR)_lang_track.mk
-    $(GNUCOPY) description-en-US.txt $(ZIP1DIR)/description-en-US.txt
-.IF "$(WITH_LANG)" != ""
-    $(XRMEX) -p $(PRJNAME) -i description.xml -o $@ -m $(LOCALIZESDF) -l all
-    sed s/UPDATED_PLATFORM/$(PLATFORMID)/ < $@ > $@.new
-    mv $@.new $@
-.ELSE
-    sed s/UPDATED_PLATFORM/$(PLATFORMID)/ < description.xml > $@
-.ENDIF
-
-ALLTAR: $(MISC)/../bin/presenter-screen.oxt
-# hotfix to missing localizations
-.IF "$(WITH_LANG)"!=""
-    $(COPY) $(ZIP1DIR)_in/merge/org/openoffice/Office/extension/PresenterScreen.xcu $(ZIP1DIR)/registry/data/org/openoffice/Office/extension/
-    cd $(ZIP1DIR);zip -r -u ../../bin/presenter-screen.oxt registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
-.ENDIF
-
-.ELSE
-ivo:
-    $(ECHO)
-.ENDIF # L10N_framework
-
-.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk b/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk
deleted file mode 100644
index d3efd284ff66..000000000000
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk
+++ /dev/null
@@ -1,51 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..$/..$/..$/..
-
-PRJNAME=sdext
-TARGET=data_ooOfficeext
-PACKAGE=org.openoffice.Office.extension
-EXTENSIONNAME=PresenterScreen
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-XCSROOT=$(PRJ)$/source$/presenter
-ABSXCSROOT=$(PWD)/$(PRJ)$/source$/presenter
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES= \
-    PresenterScreen.xcu
-
-MODULEFILES=
-
-LOCALIZEDFILES= \
-    PresenterScreen.xcu
-
-.INCLUDE :  target.mk
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk b/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk
deleted file mode 100644
index 358ffd9f59a5..000000000000
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk
+++ /dev/null
@@ -1,48 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..$/..$/..
-
-PRJNAME=sdext
-TARGET=data_ooOffice
-PACKAGE=org.openoffice.Office
-EXTNAME=presenter
-
-.INCLUDE :  settings.mk
-.INCLUDE :  $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES=				\
-    Jobs.xcu			\
-    ProtocolHandler.xcu
-
-MODULEFILES=
-
-LOCALIZEDFILES=
-
-.INCLUDE :  target.mk
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
index deba55ab258b..888142b7d89f 100644
--- a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
+++ b/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
@@ -163,6 +163,7 @@
       </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>
@@ -177,6 +178,7 @@
       </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>
@@ -203,6 +205,7 @@
       </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>
@@ -220,6 +223,7 @@
       </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>
@@ -288,8 +292,9 @@
       </prop>
     </group>
     <group oor:name="PresenterString">
-      <info><desc></desc></info>
+      <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">