i121873 - Integrate the Presenter Screen

133 files changed, 593 insertions, 1183 deletions

diff --git a/configure.in b/configure.in
index bce50ec5adfa..e6dc9fe37546 100644
--- a/configure.in
+++ b/configure.in
@@ -516,9 +516,6 @@ AC_ARG_WITH(beanshell-jar,
 [  --with-beanshell-jar=JARFILE   Specify path to jarfile manually ],
 [ BSH_JAR="$withval"
 ])
-AC_ARG_ENABLE(presenter-screen,
-[  --enable-presenter-screen           enables the build of the Presenter Screen extension
-],,)
 AC_ARG_ENABLE(pdfimport,
 [  --enable-pdfimport          enables the build of the PDF Import extension
 ],,)
@@ -6394,16 +6391,6 @@ fi
 AC_SUBST(ENABLE_OPENGL)
 
 
-AC_MSG_CHECKING([whether to build the Presenter Screen extension])
-if test -n "$enable_presenter_screen" -a "$enable_presenter_screen" != "no"; then
-   AC_MSG_RESULT([yes])
-   ENABLE_PRESENTER_SCREEN=YES
-else
-   AC_MSG_RESULT([no])
-   ENABLE_PRESENTER_SCREEN=NO
-fi
-AC_SUBST(ENABLE_PRESENTER_SCREEN)
-
 AC_MSG_CHECKING([whether to build the PDF Import extension])
 if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then
   AC_MSG_RESULT([yes])
@@ -6432,16 +6419,6 @@ AC_SUBST(SYSTEM_POPPLER)
 AC_SUBST(POPPLER_CFLAGS)
 AC_SUBST(POPPLER_LIBS)
 
-if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then
-  AC_MSG_CHECKING([for sdext module])
-  if test -d ./sdext; then
-   AC_MSG_RESULT([OK])
-  else
-   AC_MSG_ERROR([not existing. get it (did you get the -extensions tarball?)])
-  fi
-  BUILD_TYPE="$BUILD_TYPE SDEXT"
-fi
-
 AC_MSG_CHECKING([whether to build the Wiki Publisher extension])
 if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test  "$WITH_JAVA" != "no"; then
   AC_MSG_RESULT([yes])
diff --git a/sdext/source/presenter/bitmaps/Background.png b/default_images/presenter/Background.png
index 7b32e4ab974b..7b32e4ab974b 100644
--- a/sdext/source/presenter/bitmaps/Background.png
+++ b/default_images/presenter/Background.png
diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottom.png b/default_images/presenter/BorderActiveBottom.png
index 8314c9efd092..8314c9efd092 100644
--- a/sdext/source/presenter/bitmaps/BorderActiveBottom.png
+++ b/default_images/presenter/BorderActiveBottom.png
diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png b/default_images/presenter/BorderActiveBottomCallout.png
index b7c33223a33c..b7c33223a33c 100644
--- a/sdext/source/presenter/bitmaps/BorderActiveBottomCallout.png
+++ b/default_images/presenter/BorderActiveBottomCallout.png
diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png b/default_images/presenter/BorderActiveBottomLeft.png
index 8d573e864942..8d573e864942 100644
--- a/sdext/source/presenter/bitmaps/BorderActiveBottomLeft.png
+++ b/default_images/presenter/BorderActiveBottomLeft.png
diff --git a/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png b/default_images/presenter/BorderActiveBottomRight.png
index 35ef8e9213db..35ef8e9213db 100644
--- a/sdext/source/presenter/bitmaps/BorderActiveBottomRight.png
+++ b/default_images/presenter/BorderActiveBottomRight.png
diff --git a/sdext/source/presenter/bitmaps/BorderActiveLeft.png b/default_images/presenter/BorderActiveLeft.png
index 57d4a3dbbcd3..57d4a3dbbcd3 100644
--- a/sdext/source/presenter/bitmaps/BorderActiveLeft.png
+++ b/default_images/presenter/BorderActiveLeft.png
diff --git a/sdext/source/presenter/bitmaps/BorderActiveRight.png b/default_images/presenter/BorderActiveRight.png
index 9a9857190b9d..9a9857190b9d 100644
--- a/sdext/source/presenter/bitmaps/BorderActiveRight.png
+++ b/default_images/presenter/BorderActiveRight.png
diff --git a/sdext/source/presenter/bitmaps/BorderActiveTop.png b/default_images/presenter/BorderActiveTop.png
index e0bea9d55448..e0bea9d55448 100644
--- a/sdext/source/presenter/bitmaps/BorderActiveTop.png
+++ b/default_images/presenter/BorderActiveTop.png
diff --git a/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png b/default_images/presenter/BorderActiveTopLeft.png
index 62d63271fe21..62d63271fe21 100644
--- a/sdext/source/presenter/bitmaps/BorderActiveTopLeft.png
+++ b/default_images/presenter/BorderActiveTopLeft.png
diff --git a/sdext/source/presenter/bitmaps/BorderActiveTopRight.png b/default_images/presenter/BorderActiveTopRight.png
index 450c8e0cc5e7..450c8e0cc5e7 100644
--- a/sdext/source/presenter/bitmaps/BorderActiveTopRight.png
+++ b/default_images/presenter/BorderActiveTopRight.png
diff --git a/sdext/source/presenter/bitmaps/BorderBottom.png b/default_images/presenter/BorderBottom.png
index 7ad2fd6c2a03..7ad2fd6c2a03 100644
--- a/sdext/source/presenter/bitmaps/BorderBottom.png
+++ b/default_images/presenter/BorderBottom.png
diff --git a/sdext/source/presenter/bitmaps/BorderBottomLeft.png b/default_images/presenter/BorderBottomLeft.png
index 019de149b3af..019de149b3af 100644
--- a/sdext/source/presenter/bitmaps/BorderBottomLeft.png
+++ b/default_images/presenter/BorderBottomLeft.png
diff --git a/sdext/source/presenter/bitmaps/BorderBottomRight.png b/default_images/presenter/BorderBottomRight.png
index 82de5791c1cd..82de5791c1cd 100644
--- a/sdext/source/presenter/bitmaps/BorderBottomRight.png
+++ b/default_images/presenter/BorderBottomRight.png
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png b/default_images/presenter/BorderCurrentSlideBottom.png
index 7000bc22f6c4..7000bc22f6c4 100644
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottom.png
+++ b/default_images/presenter/BorderCurrentSlideBottom.png
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png b/default_images/presenter/BorderCurrentSlideBottomLeft.png
index 7571c8d94b1f..7571c8d94b1f 100644
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomLeft.png
+++ b/default_images/presenter/BorderCurrentSlideBottomLeft.png
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png b/default_images/presenter/BorderCurrentSlideBottomRight.png
index c0af63ff58b8..c0af63ff58b8 100644
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideBottomRight.png
+++ b/default_images/presenter/BorderCurrentSlideBottomRight.png
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png b/default_images/presenter/BorderCurrentSlideLeft.png
index 7000bc22f6c4..7000bc22f6c4 100644
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideLeft.png
+++ b/default_images/presenter/BorderCurrentSlideLeft.png
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png b/default_images/presenter/BorderCurrentSlideRight.png
index 7000bc22f6c4..7000bc22f6c4 100644
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideRight.png
+++ b/default_images/presenter/BorderCurrentSlideRight.png
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png b/default_images/presenter/BorderCurrentSlideTop.png
index 7000bc22f6c4..7000bc22f6c4 100644
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideTop.png
+++ b/default_images/presenter/BorderCurrentSlideTop.png
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png b/default_images/presenter/BorderCurrentSlideTopLeft.png
index fdfabd42ae9f..fdfabd42ae9f 100644
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopLeft.png
+++ b/default_images/presenter/BorderCurrentSlideTopLeft.png
diff --git a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png b/default_images/presenter/BorderCurrentSlideTopRight.png
index 5b4b642e9f34..5b4b642e9f34 100644
--- a/sdext/source/presenter/bitmaps/BorderCurrentSlideTopRight.png
+++ b/default_images/presenter/BorderCurrentSlideTopRight.png
diff --git a/sdext/source/presenter/bitmaps/BorderLeft.png b/default_images/presenter/BorderLeft.png
index cbdb267b8789..cbdb267b8789 100644
--- a/sdext/source/presenter/bitmaps/BorderLeft.png
+++ b/default_images/presenter/BorderLeft.png
diff --git a/sdext/source/presenter/bitmaps/BorderRight.png b/default_images/presenter/BorderRight.png
index 333073328ddd..333073328ddd 100644
--- a/sdext/source/presenter/bitmaps/BorderRight.png
+++ b/default_images/presenter/BorderRight.png
diff --git a/sdext/source/presenter/bitmaps/BorderToolbarBottom.png b/default_images/presenter/BorderToolbarBottom.png
index 23a3bc3595aa..23a3bc3595aa 100644
--- a/sdext/source/presenter/bitmaps/BorderToolbarBottom.png
+++ b/default_images/presenter/BorderToolbarBottom.png
diff --git a/sdext/source/presenter/bitmaps/BorderToolbarLeft.png b/default_images/presenter/BorderToolbarLeft.png
index 839ab5091a8e..839ab5091a8e 100644
--- a/sdext/source/presenter/bitmaps/BorderToolbarLeft.png
+++ b/default_images/presenter/BorderToolbarLeft.png
diff --git a/sdext/source/presenter/bitmaps/BorderToolbarRight.png b/default_images/presenter/BorderToolbarRight.png
index e5c4b9d25a16..e5c4b9d25a16 100644
--- a/sdext/source/presenter/bitmaps/BorderToolbarRight.png
+++ b/default_images/presenter/BorderToolbarRight.png
diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTop.png b/default_images/presenter/BorderToolbarTop.png
index c45b97c434cd..c45b97c434cd 100644
--- a/sdext/source/presenter/bitmaps/BorderToolbarTop.png
+++ b/default_images/presenter/BorderToolbarTop.png
diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png b/default_images/presenter/BorderToolbarTopLeft.png
index 978e98a9bbc4..978e98a9bbc4 100644
--- a/sdext/source/presenter/bitmaps/BorderToolbarTopLeft.png
+++ b/default_images/presenter/BorderToolbarTopLeft.png
diff --git a/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png b/default_images/presenter/BorderToolbarTopRight.png
index 7dc3d98860ea..7dc3d98860ea 100644
--- a/sdext/source/presenter/bitmaps/BorderToolbarTopRight.png
+++ b/default_images/presenter/BorderToolbarTopRight.png
diff --git a/sdext/source/presenter/bitmaps/BorderTop.png b/default_images/presenter/BorderTop.png
index dee68e828147..dee68e828147 100644
--- a/sdext/source/presenter/bitmaps/BorderTop.png
+++ b/default_images/presenter/BorderTop.png
diff --git a/sdext/source/presenter/bitmaps/BorderTopLeft.png b/default_images/presenter/BorderTopLeft.png
index bbec4e42be42..bbec4e42be42 100644
--- a/sdext/source/presenter/bitmaps/BorderTopLeft.png
+++ b/default_images/presenter/BorderTopLeft.png
diff --git a/sdext/source/presenter/bitmaps/BorderTopRight.png b/default_images/presenter/BorderTopRight.png
index 3416b16c9e91..3416b16c9e91 100644
--- a/sdext/source/presenter/bitmaps/BorderTopRight.png
+++ b/default_images/presenter/BorderTopRight.png
diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png b/default_images/presenter/ButtonEffectNextDisabled.png
index 5417cf72c928..5417cf72c928 100644
--- a/sdext/source/presenter/bitmaps/ButtonEffectNextDisabled.png
+++ b/default_images/presenter/ButtonEffectNextDisabled.png
diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png b/default_images/presenter/ButtonEffectNextMouseOver.png
index 96805e392176..96805e392176 100644
--- a/sdext/source/presenter/bitmaps/ButtonEffectNextMouseOver.png
+++ b/default_images/presenter/ButtonEffectNextMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png b/default_images/presenter/ButtonEffectNextNormal.png
index 6dbd732e0977..6dbd732e0977 100644
--- a/sdext/source/presenter/bitmaps/ButtonEffectNextNormal.png
+++ b/default_images/presenter/ButtonEffectNextNormal.png
diff --git a/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png b/default_images/presenter/ButtonEffectNextSelected.png
index eb6e6d45bb23..eb6e6d45bb23 100644
--- a/sdext/source/presenter/bitmaps/ButtonEffectNextSelected.png
+++ b/default_images/presenter/ButtonEffectNextSelected.png
diff --git a/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png b/default_images/presenter/ButtonFrameCenterMouseOver.png
index b97799f1f314..b97799f1f314 100644
--- a/sdext/source/presenter/bitmaps/ButtonFrameCenterMouseOver.png
+++ b/default_images/presenter/ButtonFrameCenterMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png b/default_images/presenter/ButtonFrameCenterNormal.png
index 4cf7218f3b52..4cf7218f3b52 100644
--- a/sdext/source/presenter/bitmaps/ButtonFrameCenterNormal.png
+++ b/default_images/presenter/ButtonFrameCenterNormal.png
diff --git a/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png b/default_images/presenter/ButtonFrameLeftMouseOver.png
index 1f2ab6a00cab..1f2ab6a00cab 100644
--- a/sdext/source/presenter/bitmaps/ButtonFrameLeftMouseOver.png
+++ b/default_images/presenter/ButtonFrameLeftMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png b/default_images/presenter/ButtonFrameLeftNormal.png
index 0e92cb37d7d8..0e92cb37d7d8 100644
--- a/sdext/source/presenter/bitmaps/ButtonFrameLeftNormal.png
+++ b/default_images/presenter/ButtonFrameLeftNormal.png
diff --git a/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png b/default_images/presenter/ButtonFrameRightMouseOver.png
index 0f49ad4f7e61..0f49ad4f7e61 100644
--- a/sdext/source/presenter/bitmaps/ButtonFrameRightMouseOver.png
+++ b/default_images/presenter/ButtonFrameRightMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png b/default_images/presenter/ButtonFrameRightNormal.png
index 4ca69670e513..4ca69670e513 100644
--- a/sdext/source/presenter/bitmaps/ButtonFrameRightNormal.png
+++ b/default_images/presenter/ButtonFrameRightNormal.png
diff --git a/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png b/default_images/presenter/ButtonHelpDisabled.png
index 12f4903b6cf8..12f4903b6cf8 100644
--- a/sdext/source/presenter/bitmaps/ButtonHelpDisabled.png
+++ b/default_images/presenter/ButtonHelpDisabled.png
diff --git a/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png b/default_images/presenter/ButtonHelpMouseOver.png
index 7bddef561f11..7bddef561f11 100644
--- a/sdext/source/presenter/bitmaps/ButtonHelpMouseOver.png
+++ b/default_images/presenter/ButtonHelpMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ButtonHelpNormal.png b/default_images/presenter/ButtonHelpNormal.png
index 99c693215ba9..99c693215ba9 100644
--- a/sdext/source/presenter/bitmaps/ButtonHelpNormal.png
+++ b/default_images/presenter/ButtonHelpNormal.png
diff --git a/sdext/source/presenter/bitmaps/ButtonHelpSelected.png b/default_images/presenter/ButtonHelpSelected.png
index f162db27650e..f162db27650e 100644
--- a/sdext/source/presenter/bitmaps/ButtonHelpSelected.png
+++ b/default_images/presenter/ButtonHelpSelected.png
diff --git a/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png b/default_images/presenter/ButtonMinusDisabled.png
index ff61106eb7ec..ff61106eb7ec 100644
--- a/sdext/source/presenter/bitmaps/ButtonMinusDisabled.png
+++ b/default_images/presenter/ButtonMinusDisabled.png
diff --git a/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png b/default_images/presenter/ButtonMinusMouseOver.png
index 787249912b9c..787249912b9c 100644
--- a/sdext/source/presenter/bitmaps/ButtonMinusMouseOver.png
+++ b/default_images/presenter/ButtonMinusMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ButtonMinusNormal.png b/default_images/presenter/ButtonMinusNormal.png
index e2d993384fef..e2d993384fef 100644
--- a/sdext/source/presenter/bitmaps/ButtonMinusNormal.png
+++ b/default_images/presenter/ButtonMinusNormal.png
diff --git a/sdext/source/presenter/bitmaps/ButtonMinusSelected.png b/default_images/presenter/ButtonMinusSelected.png
index 5d15de3b916f..5d15de3b916f 100644
--- a/sdext/source/presenter/bitmaps/ButtonMinusSelected.png
+++ b/default_images/presenter/ButtonMinusSelected.png
diff --git a/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png b/default_images/presenter/ButtonNotesDisabled.png
index 09e31d26c649..09e31d26c649 100644
--- a/sdext/source/presenter/bitmaps/ButtonNotesDisabled.png
+++ b/default_images/presenter/ButtonNotesDisabled.png
diff --git a/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png b/default_images/presenter/ButtonNotesMouseOver.png
index 099d6bf0f2b1..099d6bf0f2b1 100644
--- a/sdext/source/presenter/bitmaps/ButtonNotesMouseOver.png
+++ b/default_images/presenter/ButtonNotesMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ButtonNotesNormal.png b/default_images/presenter/ButtonNotesNormal.png
index 551392622506..551392622506 100644
--- a/sdext/source/presenter/bitmaps/ButtonNotesNormal.png
+++ b/default_images/presenter/ButtonNotesNormal.png
diff --git a/sdext/source/presenter/bitmaps/ButtonNotesSelected.png b/default_images/presenter/ButtonNotesSelected.png
index f5494fb1c678..f5494fb1c678 100644
--- a/sdext/source/presenter/bitmaps/ButtonNotesSelected.png
+++ b/default_images/presenter/ButtonNotesSelected.png
diff --git a/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png b/default_images/presenter/ButtonPlusDisabled.png
index e6ba3f3e78a7..e6ba3f3e78a7 100644
--- a/sdext/source/presenter/bitmaps/ButtonPlusDisabled.png
+++ b/default_images/presenter/ButtonPlusDisabled.png
diff --git a/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png b/default_images/presenter/ButtonPlusMouseOver.png
index 9d21dc40a6eb..9d21dc40a6eb 100644
--- a/sdext/source/presenter/bitmaps/ButtonPlusMouseOver.png
+++ b/default_images/presenter/ButtonPlusMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ButtonPlusNormal.png b/default_images/presenter/ButtonPlusNormal.png
index 2e075c2a3a87..2e075c2a3a87 100644
--- a/sdext/source/presenter/bitmaps/ButtonPlusNormal.png
+++ b/default_images/presenter/ButtonPlusNormal.png
diff --git a/sdext/source/presenter/bitmaps/ButtonPlusSelected.png b/default_images/presenter/ButtonPlusSelected.png
index b9d6fe1ed929..b9d6fe1ed929 100644
--- a/sdext/source/presenter/bitmaps/ButtonPlusSelected.png
+++ b/default_images/presenter/ButtonPlusSelected.png
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png b/default_images/presenter/ButtonSlideNextDisabled.png
index 7f3bce058f4c..7f3bce058f4c 100644
--- a/sdext/source/presenter/bitmaps/ButtonSlideNextDisabled.png
+++ b/default_images/presenter/ButtonSlideNextDisabled.png
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png b/default_images/presenter/ButtonSlideNextMouseOver.png
index 4dc13655965b..4dc13655965b 100644
--- a/sdext/source/presenter/bitmaps/ButtonSlideNextMouseOver.png
+++ b/default_images/presenter/ButtonSlideNextMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png b/default_images/presenter/ButtonSlideNextNormal.png
index 711b8ca8caf6..711b8ca8caf6 100644
--- a/sdext/source/presenter/bitmaps/ButtonSlideNextNormal.png
+++ b/default_images/presenter/ButtonSlideNextNormal.png
diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png b/default_images/presenter/ButtonSlidePreviousDisabled.png
index 383780eab2cf..383780eab2cf 100644
--- a/sdext/source/presenter/bitmaps/ButtonSlidePreviousDisabled.png
+++ b/default_images/presenter/ButtonSlidePreviousDisabled.png
diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png b/default_images/presenter/ButtonSlidePreviousMouseOver.png
index dc35c62deaf2..dc35c62deaf2 100644
--- a/sdext/source/presenter/bitmaps/ButtonSlidePreviousMouseOver.png
+++ b/default_images/presenter/ButtonSlidePreviousMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png b/default_images/presenter/ButtonSlidePreviousNormal.png
index 26262b4568d7..26262b4568d7 100644
--- a/sdext/source/presenter/bitmaps/ButtonSlidePreviousNormal.png
+++ b/default_images/presenter/ButtonSlidePreviousNormal.png
diff --git a/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png b/default_images/presenter/ButtonSlidePreviousSelected.png
index 7274263a43f5..7274263a43f5 100644
--- a/sdext/source/presenter/bitmaps/ButtonSlidePreviousSelected.png
+++ b/default_images/presenter/ButtonSlidePreviousSelected.png
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png b/default_images/presenter/ButtonSlideSorterDisabled.png
index ce7d4ad51514..ce7d4ad51514 100644
--- a/sdext/source/presenter/bitmaps/ButtonSlideSorterDisabled.png
+++ b/default_images/presenter/ButtonSlideSorterDisabled.png
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png b/default_images/presenter/ButtonSlideSorterMouseOver.png
index 2e7f518ac9e3..2e7f518ac9e3 100644
--- a/sdext/source/presenter/bitmaps/ButtonSlideSorterMouseOver.png
+++ b/default_images/presenter/ButtonSlideSorterMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png b/default_images/presenter/ButtonSlideSorterNormal.png
index 7aa914f41c01..7aa914f41c01 100644
--- a/sdext/source/presenter/bitmaps/ButtonSlideSorterNormal.png
+++ b/default_images/presenter/ButtonSlideSorterNormal.png
diff --git a/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png b/default_images/presenter/ButtonSlideSorterSelected.png
index 143f995a004c..143f995a004c 100644
--- a/sdext/source/presenter/bitmaps/ButtonSlideSorterSelected.png
+++ b/default_images/presenter/ButtonSlideSorterSelected.png
diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png b/default_images/presenter/LabelMouseOverCenter.png
index 6eb75d386f46..6eb75d386f46 100644
--- a/sdext/source/presenter/bitmaps/LabelMouseOverCenter.png
+++ b/default_images/presenter/LabelMouseOverCenter.png
diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png b/default_images/presenter/LabelMouseOverLeft.png
index 9455246332cf..9455246332cf 100644
--- a/sdext/source/presenter/bitmaps/LabelMouseOverLeft.png
+++ b/default_images/presenter/LabelMouseOverLeft.png
diff --git a/sdext/source/presenter/bitmaps/LabelMouseOverRight.png b/default_images/presenter/LabelMouseOverRight.png
index 1f972d0cebea..1f972d0cebea 100644
--- a/sdext/source/presenter/bitmaps/LabelMouseOverRight.png
+++ b/default_images/presenter/LabelMouseOverRight.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png b/default_images/presenter/ScrollbarArrowDownDisabled.png
index 4dd16272fad7..4dd16272fad7 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowDownDisabled.png
+++ b/default_images/presenter/ScrollbarArrowDownDisabled.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png b/default_images/presenter/ScrollbarArrowDownMouseOver.png
index d1980a2a1a05..d1980a2a1a05 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowDownMouseOver.png
+++ b/default_images/presenter/ScrollbarArrowDownMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png b/default_images/presenter/ScrollbarArrowDownNormal.png
index 166f10057c11..166f10057c11 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowDownNormal.png
+++ b/default_images/presenter/ScrollbarArrowDownNormal.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png b/default_images/presenter/ScrollbarArrowDownSelected.png
index 21d42945ce98..21d42945ce98 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowDownSelected.png
+++ b/default_images/presenter/ScrollbarArrowDownSelected.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png b/default_images/presenter/ScrollbarArrowUpDisabled.png
index 44f60683bc59..44f60683bc59 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowUpDisabled.png
+++ b/default_images/presenter/ScrollbarArrowUpDisabled.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png b/default_images/presenter/ScrollbarArrowUpMouseOver.png
index 9795885632dc..9795885632dc 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowUpMouseOver.png
+++ b/default_images/presenter/ScrollbarArrowUpMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png b/default_images/presenter/ScrollbarArrowUpNormal.png
index 804ced846065..804ced846065 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowUpNormal.png
+++ b/default_images/presenter/ScrollbarArrowUpNormal.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png b/default_images/presenter/ScrollbarArrowUpSelected.png
index d7be4f324f86..d7be4f324f86 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarArrowUpSelected.png
+++ b/default_images/presenter/ScrollbarArrowUpSelected.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png b/default_images/presenter/ScrollbarPagerMiddleMouseOver.png
index 84b781af9fb8..84b781af9fb8 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleMouseOver.png
+++ b/default_images/presenter/ScrollbarPagerMiddleMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png b/default_images/presenter/ScrollbarPagerMiddleNormal.png
index a06ba667f118..a06ba667f118 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarPagerMiddleNormal.png
+++ b/default_images/presenter/ScrollbarPagerMiddleNormal.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png b/default_images/presenter/ScrollbarThumbBottomMouseOver.png
index 482f13638755..482f13638755 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomMouseOver.png
+++ b/default_images/presenter/ScrollbarThumbBottomMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png b/default_images/presenter/ScrollbarThumbBottomNormal.png
index ec46e172c134..ec46e172c134 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarThumbBottomNormal.png
+++ b/default_images/presenter/ScrollbarThumbBottomNormal.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png b/default_images/presenter/ScrollbarThumbMiddleMouseOver.png
index 62066c24b687..62066c24b687 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleMouseOver.png
+++ b/default_images/presenter/ScrollbarThumbMiddleMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png b/default_images/presenter/ScrollbarThumbMiddleNormal.png
index c25e4edcf595..c25e4edcf595 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarThumbMiddleNormal.png
+++ b/default_images/presenter/ScrollbarThumbMiddleNormal.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png b/default_images/presenter/ScrollbarThumbTopMouseOver.png
index 714481df996d..714481df996d 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarThumbTopMouseOver.png
+++ b/default_images/presenter/ScrollbarThumbTopMouseOver.png
diff --git a/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png b/default_images/presenter/ScrollbarThumbTopNormal.png
index 7e0922c74966..7e0922c74966 100644
--- a/sdext/source/presenter/bitmaps/ScrollbarThumbTopNormal.png
+++ b/default_images/presenter/ScrollbarThumbTopNormal.png
diff --git a/sdext/source/presenter/bitmaps/ViewBackground.png b/default_images/presenter/ViewBackground.png
index ca52d8262a88..ca52d8262a88 100644
--- a/sdext/source/presenter/bitmaps/ViewBackground.png
+++ b/default_images/presenter/ViewBackground.png
diff --git a/extensions.lst b/extensions.lst
index 4fde85c9dc81..a62f4f3b5031 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -34,13 +34,13 @@
 # Some extensions that are installed indepently of the language.
 
 # the presenter console extension
-[ language=all && ENABLE_PRESENTER_SCREEN=YES ]
-    file://presenter/presenter-screen.oxt
+# [ language=all && ENABLE_XXX ]
+#    file://XXX.oxt
 
 # English dictionary
 [ language=en.* || language=de || language=it ]
     b7ce02d25eb302e5b23572cdccaea461 http://numbertext.org/tmp/dict-en.oxt
-    
+
 # English (USA, en_US) dictionary
 [ language==nl || language==ru ]
     e2eab80772ab1aa09716954219351a80 http://sourceforge.net/projects/aoo-extensions/files/1470/1/en_US.oxt/download "en_US.oxt"
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
index cd815e1df90f..74db3aa88b37 100644
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/PresenterScreen.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/PresenterScreen.xcu
@@ -22,7 +22,7 @@
 
 
 <!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">
+<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" oor:name="PresenterScreen">
   <node oor:name="PresenterScreenSettings">
     <node oor:name="ToolBars">
       <node oor:name="ToolBar" oor:op="replace">
@@ -33,7 +33,7 @@
             <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>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlidePreviousNormal.png</value></prop>
               </node>
               <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:PrevSlide</value></prop>
               <node oor:name="Font">
@@ -45,7 +45,7 @@
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlidePreviousMouseOver.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlidePreviousMouseOver.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -53,7 +53,7 @@
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlidePreviousDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlidePreviousDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -63,7 +63,7 @@
             <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>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonEffectNextNormal.png</value></prop>
               </node>
               <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:NextEffect</value></prop>
               <node oor:name="Font">
@@ -75,7 +75,7 @@
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonEffectNextMouseOver.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonEffectNextMouseOver.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -83,7 +83,7 @@
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonEffectNextDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonEffectNextDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -93,7 +93,7 @@
             <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>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesNormal.png</value></prop>
               </node>
               <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowNotes</value></prop>
               <node oor:name="Font">
@@ -105,7 +105,7 @@
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesMouseOver.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesMouseOver.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -113,7 +113,7 @@
             </node>
             <node oor:name="Selected">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesSelected.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesSelected.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -122,7 +122,7 @@
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonNotesDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonNotesDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -132,7 +132,7 @@
             <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>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterNormal.png</value></prop>
               </node>
               <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowSlideSorter</value></prop>
               <node oor:name="Font">
@@ -144,7 +144,7 @@
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterMouseOver.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterMouseOver.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -152,7 +152,7 @@
             </node>
             <node oor:name="Selected">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterSelected.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterSelected.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -161,7 +161,7 @@
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideSorterDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideSorterDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -223,7 +223,7 @@
             <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>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpNormal.png</value></prop>
               </node>
               <prop oor:name="Action"><value>vnd.com.sun.star.comp.PresenterScreen:ShowHelp</value></prop>
               <node oor:name="Font">
@@ -235,7 +235,7 @@
             </node>
             <node oor:name="MouseOver">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpMouseOver.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpMouseOver.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -243,7 +243,7 @@
             </node>
             <node oor:name="Selected">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpSelected.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpSelected.png</value></prop>
               </node>
               <node oor:name="Font">
                 <prop oor:name="Color"><value>FFFFFF</value></prop>
@@ -252,7 +252,7 @@
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonHelpDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonHelpDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -277,18 +277,18 @@
             <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>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/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>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonPlusMouseOver.png</value></prop>
               </node>
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonPlusDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonPlusDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -297,18 +297,18 @@
             <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>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/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>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonMinusMouseOver.png</value></prop>
               </node>
             </node>
             <node oor:name="Disabled">
               <node oor:name="Icon">
-                <prop oor:name="NormalFileName"><value>bitmaps/ButtonMinusDisabled.png</value></prop>
+                <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonMinusDisabled.png</value></prop>
               </node>
             </node>
           </node>
@@ -342,35 +342,35 @@
       <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>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarArrowUpNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarArrowUpMouseOver.png</value></prop>
+          <prop oor:name="DisabledFileName"><value>private:graphicrepository/presenter/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>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarArrowDownNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarArrowDownMouseOver.png</value></prop>
+          <prop oor:name="DisabledFileName"><value>private:graphicrepository/presenter/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>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarPagerMiddleNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/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>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarThumbTopNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/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>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarThumbBottomNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/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>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ScrollbarThumbMiddleNormal.png</value></prop>
+          <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/ScrollbarThumbMiddleMouseOver.png</value></prop>
         </node>
       </node>
     </node>
@@ -383,28 +383,28 @@
       </node>
       <node oor:name="CurrentSlideBorderBitmaps">
         <node oor:name="TopLeft" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideTopLeft.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideTopLeft.png</value></prop>
         </node>
         <node oor:name="Top" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideTop.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideTop.png</value></prop>
         </node>
         <node oor:name="TopRight" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideTopRight.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideTopRight.png</value></prop>
         </node>
         <node oor:name="Left" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideLeft.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideLeft.png</value></prop>
         </node>
         <node oor:name="Right" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideRight.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideRight.png</value></prop>
         </node>
         <node oor:name="BottomLeft" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideBottomLeft.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideBottomLeft.png</value></prop>
         </node>
         <node oor:name="Bottom" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideBottom.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideBottom.png</value></prop>
         </node>
         <node oor:name="BottomRight" oor:op="replace">
-          <prop oor:name="NormalFileName"><value>bitmaps/BorderCurrentSlideBottomRight.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/BorderCurrentSlideBottomRight.png</value></prop>
         </node>
       </node>
     </node>
@@ -630,39 +630,39 @@
             </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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/BorderBottom.png</value></prop>
                 <prop oor:name="YOffset"><value>-6</value></prop>
               </node>
             </node>
@@ -684,39 +684,39 @@
             </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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/BorderActiveBottom.png</value></prop>
                 <prop oor:name="YOffset"><value>-6</value></prop>
               </node>
             </node>
@@ -739,37 +739,37 @@
             </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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/BorderToolbarBottom.png</value></prop>
                 <prop oor:name="YOffset"><value>-4</value></prop>
               </node>
             </node>
@@ -786,7 +786,7 @@
             </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="NormalFileName"><value>private:graphicrepository/presenter/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>
@@ -804,7 +804,7 @@
               </prop>
             </node>
             <node oor:name="Background">
-              <prop oor:name="NormalFileName"><value>bitmaps/ViewBackground.png</value></prop>
+              <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/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>
@@ -836,7 +836,7 @@
           </node>
         </node>
         <node oor:name="Background">
-          <prop oor:name="NormalFileName"><value>bitmaps/Background.png</value></prop>
+          <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/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>
@@ -844,33 +844,33 @@
         <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="NormalFileName"><value>private:graphicrepository/presenter/ButtonFrameLeftNormal.png</value></prop>
+            <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/ButtonFrameCenterNormal.png</value></prop>
+            <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/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="NormalFileName"><value>private:graphicrepository/presenter/ButtonFrameRightNormal.png</value></prop>
+            <prop oor:name="MouseOverFileName"><value>private:graphicrepository/presenter/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>
+            <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/LabelMouseOverLeft.png</value></prop>
           </node>
           <node oor:name="LabelCenter" oor:op="replace">
-            <prop oor:name="NormalFileName"><value>bitmaps/LabelMouseOverCenter.png</value></prop>
+            <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/LabelMouseOverCenter.png</value></prop>
           </node>
           <node oor:name="LabelRight" oor:op="replace">
-            <prop oor:name="NormalFileName"><value>bitmaps/LabelMouseOverRight.png</value></prop>
+            <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/LabelMouseOverRight.png</value></prop>
           </node>
           <node oor:name="MousePointerNextEffect" oor:op="replace">
-            <prop oor:name="NormalFileName"><value>bitmaps/ButtonSlideNextNormal.png</value></prop>
+            <prop oor:name="NormalFileName"><value>private:graphicrepository/presenter/ButtonSlideNextNormal.png</value></prop>
           </node>
         </node>
         <node oor:name="Fonts">
diff --git a/officecfg/registry/data/org/openoffice/Office/makefile.mk b/officecfg/registry/data/org/openoffice/Office/makefile.mk
index f0efa832bac2..aa97150ead4a 100644
--- a/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/Office/makefile.mk
@@ -41,24 +41,25 @@ XCUFILES= \
     Embedding.xcu \
     ExtensionDependencies.xcu \
     ExtensionManager.xcu \
+    FormWizard.xcu \
+    Histories.xcu \
     Impress.xcu	\
     Jobs.xcu \
     Labels.xcu \
     Linguistic.xcu \
     Logging.xcu \
     Math.xcu \
+    Paths.xcu \
+    PresenterScreen.xcu \
     ProtocolHandler.xcu \
-    Security.xcu \
-    Scripting.xcu \
     SFX.xcu \
+    Scripting.xcu \
+    Security.xcu \
     TableWizard.xcu \
     UI.xcu \
     Views.xcu \
     WebWizard.xcu \
-    FormWizard.xcu \
     Writer.xcu \
-    Paths.xcu \
-    Histories.xcu
 
 MODULEFILES= \
     Accelerators-macosx.xcu \
diff --git a/officecfg/registry/data/org/openoffice/makefile.mk b/officecfg/registry/data/org/openoffice/makefile.mk
index 913dec2c988b..11b08571aa4e 100755
--- a/officecfg/registry/data/org/openoffice/makefile.mk
+++ b/officecfg/registry/data/org/openoffice/makefile.mk
@@ -32,13 +32,14 @@ PACKAGE=org.openoffice
 # --- Targets ------------------------------------------------------
 
 XCUFILES= \
+    FirstStartWizard.xcu \
     Inet.xcu \
+    Interaction.xcu \
     Setup.xcu \
     System.xcu \
-    VCL.xcu \
-    FirstStartWizard.xcu \
     UserProfile.xcu \
-    Interaction.xcu
+    VCL.xcu \
+
 
 MODULEFILES= \
     Inet-macosx.xcu \
diff --git a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
index 4764a643a2c9..9eef7c543ba6 100644
--- a/sdext/source/presenter/registry/schema/org/openoffice/Office/extension/PresenterScreen.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/PresenterScreen.xcs
@@ -21,7 +21,7 @@
  ***********************************************************-->
 
 
-<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">
+<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" oor:name="PresenterScreen">
   <info>
     <author>AF</author>
     <desc>Configuration of the Presenter Screen extension.</desc>
@@ -159,6 +159,7 @@
       </prop>
     </group>
     <group oor:name="ToolBarDescription">
+      <info><desc>Describes a ToolBar.</desc></info>
       <node-ref oor:name="Font" oor:node-type="Font">
         <info><desc>Font used for displaying the text.</desc></info>
       </node-ref>
@@ -173,6 +174,7 @@
       </prop>
     </group>
     <group oor:name="ToolBarEntry">
+      <info><desc>Describes a ToolBar 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>
@@ -199,6 +201,7 @@
       </set>
     </group>
     <group oor:name="Button">
+      <info><desc>Describes 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>
@@ -216,6 +219,7 @@
       </prop>
     </group>
     <group oor:name="HelpEntry">
+      <info><desc>Describes a Help entry.</desc></info>
       <prop oor:name="Left" oor:type="xs:string">
         <info><desc>Typically a list of keyboard key names.</desc></info>
       </prop>
@@ -284,8 +288,9 @@
       </prop>
     </group>
     <group oor:name="PresenterString">
-      <info><desc></desc></info>
+      <info><desc>A Presenter string</desc></info>
       <prop oor:name="String" oor:type="xs:string">
+        <info><desc>The localized string.</desc></info>
       </prop>
     </group>
     <group oor:name="ViewDescription">
diff --git a/officecfg/registry/schema/org/openoffice/Office/makefile.mk b/officecfg/registry/schema/org/openoffice/Office/makefile.mk
index bfdda65b88ec..2f5a0de341d2 100644
--- a/officecfg/registry/schema/org/openoffice/Office/makefile.mk
+++ b/officecfg/registry/schema/org/openoffice/Office/makefile.mk
@@ -43,10 +43,13 @@ XCSFILES= \
     Compatibility.xcs \
     DataAccess.xcs \
     Draw.xcs \
-    Events.xcs \
     Embedding.xcs \
+    Events.xcs \
+    ExtendedColorScheme.xcs \
     ExtensionDependencies.xcs \
     ExtensionManager.xcs \
+    FormWizard.xcs \
+    Histories.xcs \
     Impress.xcs \
     Java.xcs \
     Jobs.xcs \
@@ -54,26 +57,24 @@ XCSFILES= \
     Linguistic.xcs \
     Logging.xcs \
     Math.xcs \
+    OOoImprovement.xcs \
     OptionsDialog.xcs \
+    Paths.xcs \
+    PresenterScreen.xcs \
     ProtocolHandler.xcs \
+    Recovery.xcs \
     SFX.xcs \
+    Scripting.xcs \
+    Security.xcs \
     Substitution.xcs \
+    TabBrowse.xcs \
     TableWizard.xcs \
+    TypeDetection.xcs \
     UI.xcs \
     Views.xcs \
+    WebWizard.xcs \
     Writer.xcs \
     WriterWeb.xcs \
-    Scripting.xcs \
-    Security.xcs \
-    WebWizard.xcs \
-    Recovery.xcs \
-    FormWizard.xcs \
-    ExtendedColorScheme.xcs \
-    TypeDetection.xcs \
-    TabBrowse.xcs \
-    Paths.xcs \
-    Histories.xcs \
-    OOoImprovement.xcs
 
 .INCLUDE :  target.mk
 
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index a915c5f1ab21..fe244c7d15cb 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -175,7 +175,8 @@ my_components = \
     xmx \
     xsltdlg \
     xstor \
-    PresentationMinimizer
+    PresentationMinimizer \
+    PresenterScreen
 
 .IF "$(OS)" == "MACOSX"
 my_components += component/vcl/vcl.macosx
diff --git a/postprocess/packregistry/makefile.mk b/postprocess/packregistry/makefile.mk
index 07d41cf7a598..3241f7fb80ba 100644
--- a/postprocess/packregistry/makefile.mk
+++ b/postprocess/packregistry/makefile.mk
@@ -121,6 +121,10 @@ MY_FILES_impress = \
     $(MY_MOD)/fcfg_impress_types.xcu \
     $(MY_MOD)/org/openoffice/Office/Common-impress.xcu \
     $(MY_MOD)/org/openoffice/Office/Embedding-impress.xcu \
+    $(MY_MOD)/org/openoffice/Office/Jobs/Jobs-presenterscreen.xcu \
+    $(MY_MOD)/org/openoffice/Office/ProtocolHandler/ProtocolHandler-presenterscreen.xcu \
+    $(MY_XCS)/Office/PresenterScreen.xcs \
+    $(MY_XCU)/Office/PresenterScreen.xcu \
     $(MY_MOD)/org/openoffice/Setup-impress.xcu
 
 MY_FILES_korea = \
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 86549930b414..274b29882df5 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1350,6 +1350,19 @@ File gid_File_Lib_PresentationMinimizer
   #endif
 End
 
+File gid_File_Lib_PresenterScreen
+    TXT_FILE_BODY;
+    Styles = (PACKED);
+    Dir = SCP2_OOO_BIN_DIR;
+  #ifdef UNX
+    Name = STRING(CONCAT2(PresenterScreen.uno,UNXSUFFIX));
+  #elif defined OS2
+    Name = "PresenterScreen.dll";
+  #else
+    Name = "PresenterScreen.uno.dll";
+  #endif
+End
+
 File gid_File_Lib_Sdbc_2
     TXT_FILE_BODY;
     Styles = (PACKED);
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index b020a7f0a9e5..d2acefc802db 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -339,6 +339,7 @@ Module gid_Module_Root_Files_5
 	gid_File_Lib_Fastsax_Uno,
 	gid_File_Lib_Slideshow,
     gid_File_Lib_PresentationMinimizer
+    gid_File_Lib_PresenterScreen
 	gid_File_Lib_Recentfile,
 	gid_File_Lib_Scriptframe,
 	gid_File_Lib_Sdbc_2,
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 9f2319d395cd..ca2baa7ff131 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -35,6 +35,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
+#include <vcl/imagerepository.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -263,18 +264,17 @@ Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap (
 
     if (pCanvas.get()!=NULL && rsURL.getLength()>0 && mpGraphicFilter.get()!=NULL)
     {
-        Graphic aGraphic;
-        OUString sFileName;
-        if (osl::FileBase::getSystemPathFromFileURL(rsURL, sFileName)
-            == osl::FileBase::E_None)
+        sal_Int32 nIndex = 0;
+        if( rsURL.getToken( 0, '/', nIndex ).equalsAsciiL(
+            RTL_CONSTASCII_STRINGPARAM( "private:graphicrepository" ) ) )
         {
-            if (mpGraphicFilter->ImportGraphic(aGraphic, rsURL) == GRFILTER_OK)
-            {
-                BitmapEx aBitmapEx (aGraphic.GetBitmapEx());
+            OUString sPathName( rsURL.copy( nIndex ) );
+            BitmapEx aBitmap;
+            if ( ::vcl::ImageRepository::loadImage( sPathName, aBitmap, false )
+                && !aBitmap.IsEmpty() )
                 return cppcanvas::VCLFactory::getInstance().createBitmap(
                     pCanvas,
-                    aBitmapEx)->getUNOBitmap();
-            }
+                    aBitmap)->getUNOBitmap();
         }
     }
 
diff --git a/sdext/prj/build.lst b/sdext/prj/build.lst
index 29350f7ca526..bf319f0a961b 100644
--- a/sdext/prj/build.lst
+++ b/sdext/prj/build.lst
@@ -2,9 +2,7 @@ dx	sdext	:	L10N:l10n offuh comphelper unotools readlicense_oo cppu tools cppuhel
 dx	sdext									usr1	-	all	sdext_mkout NULL
 dx	sdext\prj								get		-	all	sdext_prj NULL
 dx	sdext\source\minimizer					nmake	-	all sdext_minimizer sdext_inc NULL
-dx  sdext\source\presenter\registry\data\org\openoffice\Office\extension nmake   - all sdext_presenter_xcu  NULL
-dx	sdext\source\presenter\help\en-US\com.sun.PresenterScreen					nmake	-	all sdext_presenter_help NULL
-dx	sdext\source\presenter					nmake	-	all sdext_presenter sdext_inc sdext_presenter_xcu sdext_presenter_help NULL
+dx	sdext\source\presenter					nmake	-	all sdext_presenter sdext_inc  NULL
 dx	sdext\inc								nmake	-	all	sdext_inc				NULL
 dx  sdext\source\pdfimport\xpdfwrapper     nmake   -   all dx_xpdfwrap                        NULL
 dx  sdext\source\pdfimport\xpdftest        nmake   -   all dx_parsetest               dx_xpdfwrap NULL
diff --git a/sdext/prj/d.lst b/sdext/prj/d.lst
index aacc8a5d041a..bd865bf962a0 100644
--- a/sdext/prj/d.lst
+++ b/sdext/prj/d.lst
@@ -1,10 +1,7 @@
-mkdir: %_DEST%\bin%_EXT%\presenter
 mkdir: %_DEST%\bin%_EXT%\pdfimport
 ..\%__SRC%\bin\pdf2xml.* %_DEST%\bin%_EXT%\pdf2xml.*
 ..\%__SRC%\bin\pdfunzip.* %_DEST%\bin%_EXT%\pdfunzip.*
 ..\%__SRC%\bin\pdfimport.oxt %_DEST%\bin%_EXT%\pdfimport\pdfimport.oxt
-..\%__SRC%\bin\presenter-screen.oxt %_DEST%\bin%_EXT%\presenter\presenter-screen.oxt
-..\%__SRC%\bin\presenter-screen_develop.zip %_DEST%\bin%_EXT%\presenter\presenter-screen_develop.zip
 
 
 
@@ -17,14 +14,18 @@ mkdir: %_DEST%\xml%_EXT%\registry\spool
 mkdir: %_DEST%\xml%_EXT%\registry\spool\org
 mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice
 mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Addons
+mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs
 mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\ProtocolHandler
 
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\Addons\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Addons
+..\%__SRC%\misc\registry\spool\org\openoffice\Office\Jobs\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\Jobs
 ..\%__SRC%\misc\registry\spool\org\openoffice\Office\ProtocolHandler\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\ProtocolHandler
 
 mkdir: %_DEST%\xml%_EXT%
 ..\%__SRC%\misc\PresentationMinimizer.component %_DEST%\xml%_EXT%\PresentationMinimizer.component
+..\%__SRC%\misc\PresenterScreen.component %_DEST%\xml%_EXT%\PresenterScreen.component
 
 ..\%__SRC%\bin\PresentationMinimizer*.dll %_DEST%\bin%_EXT%\PresentationMinimizer*.dll
 ..\%__SRC%\lib\PresentationMinimizer*.so %_DEST%\lib%_EXT%
+..\%__SRC%\bin\PresenterScreen*.dll %_DEST%\bin%_EXT%\PresenterScreen*.dll
+..\%__SRC%\lib\PresenterScreen*.so %_DEST%\lib%_EXT%
+..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu b/sdext/source/presenter/Jobs.xcu
index 99c830bc53cc..99c830bc53cc 100644
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/Jobs.xcu
+++ b/sdext/source/presenter/Jobs.xcu
diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx
index 0912d78066b0..25a70c92427a 100644
--- a/sdext/source/presenter/PresenterAccessibility.cxx
+++ b/sdext/source/presenter/PresenterAccessibility.cxx
@@ -462,7 +462,7 @@ public:
         OUString sName (A2S("Presenter Console"));
         PresenterConfigurationAccess aConfiguration (
             rxContext,
-            OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+            OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
             PresenterConfigurationAccess::READ_ONLY);
         aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Console/String"))
             >>= sName;
@@ -495,7 +495,7 @@ public:
         {
             PresenterConfigurationAccess aConfiguration (
                 rxContext,
-                OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+                OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
                 PresenterConfigurationAccess::READ_ONLY);
             aConfiguration.GetConfigurationNode(A2S("Presenter/Accessibility/Preview/String"))
                 >>= sName;
@@ -2249,7 +2249,7 @@ rtl::Reference<PresenterAccessible::AccessibleObject> AccessibleNotes::Create (
     {
         PresenterConfigurationAccess aConfiguration (
             rxContext,
-            OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+            OUString::createFromAscii("/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 4a21ed302e8c..239260275732 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.cxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.cxx
@@ -25,7 +25,6 @@
 #include "precompiled_sdext.hxx"
 
 #include "PresenterBitmapContainer.hxx"
-#include "PresenterComponent.hxx"
 #include "PresenterConfigurationAccess.hxx"
 
 #include <com/sun/star/deployment/XPackageInformationProvider.hpp>
@@ -69,11 +68,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)
 {
@@ -82,7 +79,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),
@@ -100,11 +97,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)
 {
@@ -193,7 +188,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)
 {
@@ -210,7 +204,6 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
                 pBitmap = LoadBitmap(
                     xBitmapProperties,
                     rxPresenterHelper,
-                    rsBasePath,
                     rxCanvas,
                     rpDefault);
         }
@@ -237,7 +230,6 @@ void PresenterBitmapContainer::ProcessBitmap (
     maIconContainer[sName] = LoadBitmap(
         rxProperties,
         mxPresenterHelper,
-        msBasePath,
         mxCanvas,
         SharedBitmapDescriptor());
 }
@@ -248,7 +240,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)
 {
@@ -268,7 +259,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::Normal,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
@@ -277,7 +268,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::MouseOver,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
@@ -286,7 +277,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::ButtonDown,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
@@ -295,7 +286,7 @@ SharedBitmapDescriptor PresenterBitmapContainer::LoadBitmap (
         {
             pBitmap->SetBitmap(
                 BitmapDescriptor::Disabled,
-                rxPresenterHelper->loadBitmap(rsBasePath + sFileName, rxCanvas));
+                rxPresenterHelper->loadBitmap(sFileName, rxCanvas));
         }
         catch (Exception&)
         {}
@@ -304,7 +295,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 e5c1e8ee35f5..afc3aa79c50c 100644
--- a/sdext/source/presenter/PresenterBitmapContainer.hxx
+++ b/sdext/source/presenter/PresenterBitmapContainer.hxx
@@ -103,14 +103,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);
 
@@ -125,7 +123,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);
 
@@ -133,7 +130,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;
 
@@ -145,7 +141,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/PresenterClock.cxx b/sdext/source/presenter/PresenterClock.cxx
index eecc80b1e2cc..7e0cfaf90153 100644
--- a/sdext/source/presenter/PresenterClock.cxx
+++ b/sdext/source/presenter/PresenterClock.cxx
@@ -25,7 +25,6 @@
 #include "precompiled_sdext.hxx"
 
 #include "PresenterClock.hxx"
-#include "PresenterComponent.hxx"
 #include "PresenterConfigurationAccess.hxx"
 #include "PresenterGeometryHelper.hxx"
 #include <com/sun/star/awt/InvalidateStyle.hpp>
@@ -202,7 +201,6 @@ namespace {
         void LoadBitmap (
             const OUString& rsKey,
             const ::std::vector<Any>& rValues,
-            const OUString& rsBitmapPath,
             const Reference<container::XNameAccess>& rxBitmapLoader);
         void ScaleBitmaps (void);
     };
@@ -1036,7 +1034,7 @@ void AnalogBitmapPainter::PrepareBitmaps (const Reference<rendering::XCanvas>& r
         // Get access to the clock bitmaps in the configuration.
         PresenterConfigurationAccess aConfiguration (
             mxComponentContext,
-            OUString::createFromAscii("org.openoffice.Office.extension.PresenterScreen"),
+            OUString::createFromAscii("org.openoffice.Office.PresenterScreen"),
             PresenterConfigurationAccess::READ_ONLY);
 
         Reference<container::XNameAccess> xTheme (GetTheme(aConfiguration));
@@ -1118,17 +1116,6 @@ void AnalogBitmapPainter::LoadBitmaps (
     const Reference<rendering::XCanvas>& rxCanvas)
 {
     (void)rConfiguration;
-
-    // Get base path to bitmaps.
-    Reference<deployment::XPackageInformationProvider> xInformationProvider (
-        mxComponentContext->getValueByName(OUString::createFromAscii(
-            "/singletons/com.sun.star.deployment.PackageInformationProvider")),
-        UNO_QUERY);
-    OUString sLocation;
-    if (xInformationProvider.is())
-        sLocation = xInformationProvider->getPackageLocation(gsExtensionIdentifier);
-    sLocation += OUString::createFromAscii("/");
-
     // Create the bitmap loader.
     Reference<lang::XMultiComponentFactory> xFactory (
         mxComponentContext->getServiceManager(), UNO_QUERY);
@@ -1161,7 +1148,6 @@ void AnalogBitmapPainter::LoadBitmaps (
             this,
             _1,
             _2,
-            sLocation,
             xBitmapLoader));
 }
 
@@ -1171,7 +1157,6 @@ void AnalogBitmapPainter::LoadBitmaps (
 void AnalogBitmapPainter::LoadBitmap (
     const OUString& rsKey,
     const ::std::vector<Any>& rValues,
-    const OUString& rsBitmapPath,
     const Reference<container::XNameAccess>& rxBitmapLoader)
 {
     if (rValues.size() == 3)
@@ -1195,7 +1180,7 @@ void AnalogBitmapPainter::LoadBitmap (
         rValues[2] >>= pDescriptor->maOffset.Y;
 
         pDescriptor->mxBitmap = Reference<rendering::XBitmap>(
-            rxBitmapLoader->getByName(rsBitmapPath+sFileName), UNO_QUERY);
+            rxBitmapLoader->getByName(sFileName), UNO_QUERY);
 
         if ( ! pDescriptor->mxBitmap.is())
             mbThemeLoadingFailed = true;
diff --git a/sdext/source/presenter/PresenterComponent.cxx b/sdext/source/presenter/PresenterComponent.cxx
deleted file mode 100644
index 3302ab63f047..000000000000
--- a/sdext/source/presenter/PresenterComponent.cxx
+++ /dev/null
@@ -1,146 +0,0 @@
-/**************************************************************
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_sdext.hxx"
-
-#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"
-
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::uno;
-using namespace cppu;
-using namespace osl;
-using ::rtl::OUString;
-
-
-
-namespace sdext { namespace presenter {
-
-static OUString gsBasePath;
-
-::rtl::OUString PresenterComponent::GetBasePath (
-    const Reference<XComponentContext>& rxComponentContext)
-{
-    return GetBasePath(rxComponentContext, gsExtensionIdentifier);
-}
-
-
-
-
-::rtl::OUString PresenterComponent::GetBasePath (
-    const Reference<XComponentContext>& rxComponentContext,
-    const OUString& rsExtensionIdentifier)
-{
-    if (gsBasePath.getLength() == 0)
-    {
-        // 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
-            {
-                gsBasePath = xInformationProvider->getPackageLocation(rsExtensionIdentifier)
-                    + OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
-            }
-            catch(deployment::DeploymentException&)
-            {
-            }
-        }
-    }
-
-    return gsBasePath;
-}
-
-
-
-rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
-
-static struct ImplementationEntry gServiceEntries[] =
-{
-    {
-        PresenterProtocolHandler::Create,
-        PresenterProtocolHandler::getImplementationName_static,
-        PresenterProtocolHandler::getSupportedServiceNames_static,
-        createSingleComponentFactory, &g_moduleCount.modCnt, 0
-    },
-    {
-        PresenterScreenJob::Create,
-        PresenterScreenJob::getImplementationName_static,
-        PresenterScreenJob::getSupportedServiceNames_static,
-        createSingleComponentFactory, 0, 0
-    },
-    { 0, 0, 0, 0, 0, 0 }
-};
-
-
-
-
-extern "C"
-{
-    sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
-    {
-        return g_moduleCount.canUnload( &g_moduleCount , pTime );
-    }
-
-
-
-
-    void SAL_CALL component_getImplementationEnvironment(
-        const sal_Char ** ppEnvTypeName, uno_Environment ** )
-    {
-        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
-    }
-
-
-
-
-    sal_Bool SAL_CALL component_writeInfo(
-        void * pServiceManager, void * pRegistryKey )
-    {
-        return component_writeInfoHelper(pServiceManager, pRegistryKey, gServiceEntries);
-    }
-
-
-
-
-    void * SAL_CALL component_getFactory(
-        const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
-    {
-        return component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries);
-    }
-
-}
-
-} } // end of namespace sdext::presenter
diff --git a/sdext/source/presenter/PresenterComponent.hxx b/sdext/source/presenter/PresenterComponent.hxx
deleted file mode 100644
index 059f4ad497b9..000000000000
--- a/sdext/source/presenter/PresenterComponent.hxx
+++ /dev/null
@@ -1,51 +0,0 @@
-/**************************************************************
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- *************************************************************/
-
-
-
-#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
diff --git a/sdext/source/presenter/PresenterConfigurationAccess.cxx b/sdext/source/presenter/PresenterConfigurationAccess.cxx
index eb727f6f2aa8..1ee457415acf 100644
--- a/sdext/source/presenter/PresenterConfigurationAccess.cxx
+++ b/sdext/source/presenter/PresenterConfigurationAccess.cxx
@@ -40,7 +40,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/PresenterHelpView.cxx b/sdext/source/presenter/PresenterHelpView.cxx
index fd50f060973a..d9608ccd8882 100644
--- a/sdext/source/presenter/PresenterHelpView.cxx
+++ b/sdext/source/presenter/PresenterHelpView.cxx
@@ -385,7 +385,7 @@ void PresenterHelpView::ReadHelpStrings (void)
     mpTextContainer.reset(new TextContainer());
     PresenterConfigurationAccess aConfiguration (
         mxComponentContext,
-        OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
         PresenterConfigurationAccess::READ_ONLY);
     Reference<container::XNameAccess> xStrings (
         aConfiguration.GetConfigurationNode(A2S("PresenterScreenSettings/HelpView/HelpStrings")),
diff --git a/sdext/source/presenter/PresenterExtensionIdentifier.txx b/sdext/source/presenter/PresenterScreen.component
index 875782970951..ce058818c6fd 100644
--- a/sdext/source/presenter/PresenterExtensionIdentifier.txx
+++ b/sdext/source/presenter/PresenterScreen.component
@@ -1,5 +1,6 @@
-/**************************************************************
- * 
+<?xml version="1.0" encoding="UTF-8"?>
+<!--***********************************************************
+ *
  * 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
@@ -7,31 +8,23 @@
  * 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
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
- *************************************************************/
-
-
-
-#ifndef SDEXT_PRESENTER_EXTENSION_IDENTIFIER_HXX
-#define SDEXT_PRESENTER_EXTENSION_IDENTIFIER_HXX
-
-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::OUString::createFromAscii("com.sun.PresenterScreen-UPDATED_PLATFORM"));
-
-} }
-
-#endif
+ *
+ ***********************************************************-->
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <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">
+    <service name="com.sun.star.frame.ProtocolHandler"/>
+  </implementation>
+</component>
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 602ad6436446..ebdd2daf53e9 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.cxx
@@ -541,7 +541,7 @@ sal_Int32 PresenterScreen::GetScreenNumber (
             // is set.
             PresenterConfigurationAccess aConfiguration (
                 xContext,
-                OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+                OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
                 PresenterConfigurationAccess::READ_ONLY);
             bool bStartAlways (false);
             if (aConfiguration.GetConfigurationNode(
@@ -704,7 +704,7 @@ void PresenterScreen::SetupConfiguration (
     {
         PresenterConfigurationAccess aConfiguration (
             rxContext,
-            OUString::createFromAscii("org.openoffice.Office.extension.PresenterScreen"),
+            OUString::createFromAscii("org.openoffice.Office.PresenterScreen"),
             PresenterConfigurationAccess::READ_ONLY);
         maViewDescriptors.clear();
         ProcessViewDescriptions(aConfiguration);
diff --git a/sdext/source/presenter/PresenterScreen.hrc b/sdext/source/presenter/PresenterScreen.hrc
new file mode 100644
index 000000000000..e2b53d2544bf
--- /dev/null
+++ b/sdext/source/presenter/PresenterScreen.hrc
@@ -0,0 +1,113 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#define SDEXT_PRESENTER_RES_START 255
+
+#define BACKGROUND      SDEXT_PRESENTER_RES_START +     1
+#define BORDERACTIVEBOTTOM      SDEXT_PRESENTER_RES_START +     2
+#define BORDERACTIVEBOTTOMCALLOUT       SDEXT_PRESENTER_RES_START +     3
+#define BORDERACTIVEBOTTOMLEFT      SDEXT_PRESENTER_RES_START +     4
+#define BORDERACTIVEBOTTOMRIGHT     SDEXT_PRESENTER_RES_START +     5
+#define BORDERACTIVELEFT        SDEXT_PRESENTER_RES_START +     6
+#define BORDERACTIVERIGHT       SDEXT_PRESENTER_RES_START +     7
+#define BORDERACTIVETOP     SDEXT_PRESENTER_RES_START +     8
+#define BORDERACTIVETOPLEFT     SDEXT_PRESENTER_RES_START +     9
+#define BORDERACTIVETOPRIGHT        SDEXT_PRESENTER_RES_START +     10
+#define BORDERBOTTOM        SDEXT_PRESENTER_RES_START +     11
+#define BORDERBOTTOMLEFT        SDEXT_PRESENTER_RES_START +     12
+#define BORDERBOTTOMRIGHT       SDEXT_PRESENTER_RES_START +     13
+#define BORDERCURRENTSLIDEBOTTOM        SDEXT_PRESENTER_RES_START +     14
+#define BORDERCURRENTSLIDEBOTTOMLEFT        SDEXT_PRESENTER_RES_START +     15
+#define BORDERCURRENTSLIDEBOTTOMRIGHT       SDEXT_PRESENTER_RES_START +     16
+#define BORDERCURRENTSLIDELEFT      SDEXT_PRESENTER_RES_START +     17
+#define BORDERCURRENTSLIDERIGHT     SDEXT_PRESENTER_RES_START +     18
+#define BORDERCURRENTSLIDETOP       SDEXT_PRESENTER_RES_START +     19
+#define BORDERCURRENTSLIDETOPLEFT       SDEXT_PRESENTER_RES_START +     20
+#define BORDERCURRENTSLIDETOPRIGHT      SDEXT_PRESENTER_RES_START +     21
+#define BORDERLEFT      SDEXT_PRESENTER_RES_START +     22
+#define BORDERRIGHT     SDEXT_PRESENTER_RES_START +     23
+#define BORDERTOOLBARBOTTOM     SDEXT_PRESENTER_RES_START +     24
+#define BORDERTOOLBARLEFT       SDEXT_PRESENTER_RES_START +     25
+#define BORDERTOOLBARRIGHT      SDEXT_PRESENTER_RES_START +     26
+#define BORDERTOOLBARTOP        SDEXT_PRESENTER_RES_START +     27
+#define BORDERTOOLBARTOPLEFT        SDEXT_PRESENTER_RES_START +     28
+#define BORDERTOOLBARTOPRIGHT       SDEXT_PRESENTER_RES_START +     29
+#define BORDERTOP       SDEXT_PRESENTER_RES_START +     30
+#define BORDERTOPLEFT       SDEXT_PRESENTER_RES_START +     31
+#define BORDERTOPRIGHT      SDEXT_PRESENTER_RES_START +     32
+#define BUTTONEFFECTNEXTDISABLED        SDEXT_PRESENTER_RES_START +     33
+#define BUTTONEFFECTNEXTMOUSEOVER       SDEXT_PRESENTER_RES_START +     34
+#define BUTTONEFFECTNEXTNORMAL      SDEXT_PRESENTER_RES_START +     35
+#define BUTTONEFFECTNEXTSELECTED        SDEXT_PRESENTER_RES_START +     36
+#define BUTTONFRAMECENTERMOUSEOVER      SDEXT_PRESENTER_RES_START +     37
+#define BUTTONFRAMECENTERNORMAL     SDEXT_PRESENTER_RES_START +     38
+#define BUTTONFRAMELEFTMOUSEOVER        SDEXT_PRESENTER_RES_START +     39
+#define BUTTONFRAMELEFTNORMAL       SDEXT_PRESENTER_RES_START +     40
+#define BUTTONFRAMERIGHTMOUSEOVER       SDEXT_PRESENTER_RES_START +     41
+#define BUTTONFRAMERIGHTNORMAL      SDEXT_PRESENTER_RES_START +     42
+#define BUTTONHELPDISABLED      SDEXT_PRESENTER_RES_START +     43
+#define BUTTONHELPMOUSEOVER     SDEXT_PRESENTER_RES_START +     44
+#define BUTTONHELPNORMAL        SDEXT_PRESENTER_RES_START +     45
+#define BUTTONHELPSELECTED      SDEXT_PRESENTER_RES_START +     46
+#define BUTTONMINUSDISABLED     SDEXT_PRESENTER_RES_START +     47
+#define BUTTONMINUSMOUSEOVER        SDEXT_PRESENTER_RES_START +     48
+#define BUTTONMINUSNORMAL       SDEXT_PRESENTER_RES_START +     49
+#define BUTTONMINUSSELECTED     SDEXT_PRESENTER_RES_START +     50
+#define BUTTONNOTESDISABLED     SDEXT_PRESENTER_RES_START +     51
+#define BUTTONNOTESMOUSEOVER        SDEXT_PRESENTER_RES_START +     52
+#define BUTTONNOTESNORMAL       SDEXT_PRESENTER_RES_START +     53
+#define BUTTONNOTESSELECTED     SDEXT_PRESENTER_RES_START +     54
+#define BUTTONPLUSDISABLED      SDEXT_PRESENTER_RES_START +     55
+#define BUTTONPLUSMOUSEOVER     SDEXT_PRESENTER_RES_START +     56
+#define BUTTONPLUSNORMAL        SDEXT_PRESENTER_RES_START +     57
+#define BUTTONPLUSSELECTED      SDEXT_PRESENTER_RES_START +     58
+#define BUTTONSLIDENEXTDISABLED     SDEXT_PRESENTER_RES_START +     59
+#define BUTTONSLIDENEXTMOUSEOVER        SDEXT_PRESENTER_RES_START +     60
+#define BUTTONSLIDENEXTNORMAL       SDEXT_PRESENTER_RES_START +     61
+#define BUTTONSLIDEPREVIOUSDISABLED     SDEXT_PRESENTER_RES_START +     62
+#define BUTTONSLIDEPREVIOUSMOUSEOVER        SDEXT_PRESENTER_RES_START +     63
+#define BUTTONSLIDEPREVIOUSNORMAL       SDEXT_PRESENTER_RES_START +     64
+#define BUTTONSLIDEPREVIOUSSELECTED     SDEXT_PRESENTER_RES_START +     65
+#define BUTTONSLIDESORTERDISABLED       SDEXT_PRESENTER_RES_START +     66
+#define BUTTONSLIDESORTERMOUSEOVER      SDEXT_PRESENTER_RES_START +     67
+#define BUTTONSLIDESORTERNORMAL     SDEXT_PRESENTER_RES_START +     68
+#define BUTTONSLIDESORTERSELECTED       SDEXT_PRESENTER_RES_START +     69
+#define LABELMOUSEOVERCENTER        SDEXT_PRESENTER_RES_START +     70
+#define LABELMOUSEOVERLEFT      SDEXT_PRESENTER_RES_START +     71
+#define LABELMOUSEOVERRIGHT     SDEXT_PRESENTER_RES_START +     72
+#define SCROLLBARARROWDOWNDISABLED      SDEXT_PRESENTER_RES_START +     73
+#define SCROLLBARARROWDOWNMOUSEOVER     SDEXT_PRESENTER_RES_START +     74
+#define SCROLLBARARROWDOWNNORMAL        SDEXT_PRESENTER_RES_START +     75
+#define SCROLLBARARROWDOWNSELECTED      SDEXT_PRESENTER_RES_START +     76
+#define SCROLLBARARROWUPDISABLED        SDEXT_PRESENTER_RES_START +     77
+#define SCROLLBARARROWUPMOUSEOVER       SDEXT_PRESENTER_RES_START +     78
+#define SCROLLBARARROWUPNORMAL      SDEXT_PRESENTER_RES_START +     79
+#define SCROLLBARARROWUPSELECTED        SDEXT_PRESENTER_RES_START +     80
+#define SCROLLBARPAGERMIDDLEMOUSEOVER       SDEXT_PRESENTER_RES_START +     81
+#define SCROLLBARPAGERMIDDLENORMAL      SDEXT_PRESENTER_RES_START +     82
+#define SCROLLBARTHUMBBOTTOMMOUSEOVER       SDEXT_PRESENTER_RES_START +     83
+#define SCROLLBARTHUMBBOTTOMNORMAL      SDEXT_PRESENTER_RES_START +     84
+#define SCROLLBARTHUMBMIDDLEMOUSEOVER       SDEXT_PRESENTER_RES_START +     85
+#define SCROLLBARTHUMBMIDDLENORMAL      SDEXT_PRESENTER_RES_START +     86
+#define SCROLLBARTHUMBTOPMOUSEOVER      SDEXT_PRESENTER_RES_START +     87
+#define SCROLLBARTHUMBTOPNORMAL     SDEXT_PRESENTER_RES_START +     88
+#define VIEWBACKGROUND      SDEXT_PRESENTER_RES_START +     89
+
diff --git a/sdext/source/presenter/PresenterScreen.src b/sdext/source/presenter/PresenterScreen.src
new file mode 100644
index 000000000000..f5129bf0a7f2
--- /dev/null
+++ b/sdext/source/presenter/PresenterScreen.src
@@ -0,0 +1,113 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+#include "PresenterScreen.hrc"
+
+Bitmap BACKGROUND{ File = "presenter/Background.png"; };
+Bitmap BORDERACTIVEBOTTOM{ File = "presenter/BorderActiveBottom.png"; };
+Bitmap BORDERACTIVEBOTTOMCALLOUT{ File = "presenter/BorderActiveBottomCallout.png"; };
+Bitmap BORDERACTIVEBOTTOMLEFT{ File = "presenter/BorderActiveBottomLeft.png"; };
+Bitmap BORDERACTIVEBOTTOMRIGHT{ File = "presenter/BorderActiveBottomRight.png"; };
+Bitmap BORDERACTIVELEFT{ File = "presenter/BorderActiveLeft.png"; };
+Bitmap BORDERACTIVERIGHT{ File = "presenter/BorderActiveRight.png"; };
+Bitmap BORDERACTIVETOP{ File = "presenter/BorderActiveTop.png"; };
+Bitmap BORDERACTIVETOPLEFT{ File = "presenter/BorderActiveTopLeft.png"; };
+Bitmap BORDERACTIVETOPRIGHT{ File = "presenter/BorderActiveTopRight.png"; };
+Bitmap BORDERBOTTOM{ File = "presenter/BorderBottom.png"; };
+Bitmap BORDERBOTTOMLEFT{ File = "presenter/BorderBottomLeft.png"; };
+Bitmap BORDERBOTTOMRIGHT{ File = "presenter/BorderBottomRight.png"; };
+Bitmap BORDERCURRENTSLIDEBOTTOM{ File = "presenter/BorderCurrentSlideBottom.png"; };
+Bitmap BORDERCURRENTSLIDEBOTTOMLEFT{ File = "presenter/BorderCurrentSlideBottomLeft.png"; };
+Bitmap BORDERCURRENTSLIDEBOTTOMRIGHT{ File = "presenter/BorderCurrentSlideBottomRight.png"; };
+Bitmap BORDERCURRENTSLIDELEFT{ File = "presenter/BorderCurrentSlideLeft.png"; };
+Bitmap BORDERCURRENTSLIDERIGHT{ File = "presenter/BorderCurrentSlideRight.png"; };
+Bitmap BORDERCURRENTSLIDETOP{ File = "presenter/BorderCurrentSlideTop.png"; };
+Bitmap BORDERCURRENTSLIDETOPLEFT{ File = "presenter/BorderCurrentSlideTopLeft.png"; };
+Bitmap BORDERCURRENTSLIDETOPRIGHT{ File = "presenter/BorderCurrentSlideTopRight.png"; };
+Bitmap BORDERLEFT{ File = "presenter/BorderLeft.png"; };
+Bitmap BORDERRIGHT{ File = "presenter/BorderRight.png"; };
+Bitmap BORDERTOOLBARBOTTOM{ File = "presenter/BorderToolbarBottom.png"; };
+Bitmap BORDERTOOLBARLEFT{ File = "presenter/BorderToolbarLeft.png"; };
+Bitmap BORDERTOOLBARRIGHT{ File = "presenter/BorderToolbarRight.png"; };
+Bitmap BORDERTOOLBARTOP{ File = "presenter/BorderToolbarTop.png"; };
+Bitmap BORDERTOOLBARTOPLEFT{ File = "presenter/BorderToolbarTopLeft.png"; };
+Bitmap BORDERTOOLBARTOPRIGHT{ File = "presenter/BorderToolbarTopRight.png"; };
+Bitmap BORDERTOP{ File = "presenter/BorderTop.png"; };
+Bitmap BORDERTOPLEFT{ File = "presenter/BorderTopLeft.png"; };
+Bitmap BORDERTOPRIGHT{ File = "presenter/BorderTopRight.png"; };
+Bitmap BUTTONEFFECTNEXTDISABLED{ File = "presenter/ButtonEffectNextDisabled.png"; };
+Bitmap BUTTONEFFECTNEXTMOUSEOVER{ File = "presenter/ButtonEffectNextMouseOver.png"; };
+Bitmap BUTTONEFFECTNEXTNORMAL{ File = "presenter/ButtonEffectNextNormal.png"; };
+Bitmap BUTTONEFFECTNEXTSELECTED{ File = "presenter/ButtonEffectNextSelected.png"; };
+Bitmap BUTTONFRAMECENTERMOUSEOVER{ File = "presenter/ButtonFrameCenterMouseOver.png"; };
+Bitmap BUTTONFRAMECENTERNORMAL{ File = "presenter/ButtonFrameCenterNormal.png"; };
+Bitmap BUTTONFRAMELEFTMOUSEOVER{ File = "presenter/ButtonFrameLeftMouseOver.png"; };
+Bitmap BUTTONFRAMELEFTNORMAL{ File = "presenter/ButtonFrameLeftNormal.png"; };
+Bitmap BUTTONFRAMERIGHTMOUSEOVER{ File = "presenter/ButtonFrameRightMouseOver.png"; };
+Bitmap BUTTONFRAMERIGHTNORMAL{ File = "presenter/ButtonFrameRightNormal.png"; };
+Bitmap BUTTONHELPDISABLED{ File = "presenter/ButtonHelpDisabled.png"; };
+Bitmap BUTTONHELPMOUSEOVER{ File = "presenter/ButtonHelpMouseOver.png"; };
+Bitmap BUTTONHELPNORMAL{ File = "presenter/ButtonHelpNormal.png"; };
+Bitmap BUTTONHELPSELECTED{ File = "presenter/ButtonHelpSelected.png"; };
+Bitmap BUTTONMINUSDISABLED{ File = "presenter/ButtonMinusDisabled.png"; };
+Bitmap BUTTONMINUSMOUSEOVER{ File = "presenter/ButtonMinusMouseOver.png"; };
+Bitmap BUTTONMINUSNORMAL{ File = "presenter/ButtonMinusNormal.png"; };
+Bitmap BUTTONMINUSSELECTED{ File = "presenter/ButtonMinusSelected.png"; };
+Bitmap BUTTONNOTESDISABLED{ File = "presenter/ButtonNotesDisabled.png"; };
+Bitmap BUTTONNOTESMOUSEOVER{ File = "presenter/ButtonNotesMouseOver.png"; };
+Bitmap BUTTONNOTESNORMAL{ File = "presenter/ButtonNotesNormal.png"; };
+Bitmap BUTTONNOTESSELECTED{ File = "presenter/ButtonNotesSelected.png"; };
+Bitmap BUTTONPLUSDISABLED{ File = "presenter/ButtonPlusDisabled.png"; };
+Bitmap BUTTONPLUSMOUSEOVER{ File = "presenter/ButtonPlusMouseOver.png"; };
+Bitmap BUTTONPLUSNORMAL{ File = "presenter/ButtonPlusNormal.png"; };
+Bitmap BUTTONPLUSSELECTED{ File = "presenter/ButtonPlusSelected.png"; };
+Bitmap BUTTONSLIDENEXTDISABLED{ File = "presenter/ButtonSlideNextDisabled.png"; };
+Bitmap BUTTONSLIDENEXTMOUSEOVER{ File = "presenter/ButtonSlideNextMouseOver.png"; };
+Bitmap BUTTONSLIDENEXTNORMAL{ File = "presenter/ButtonSlideNextNormal.png"; };
+Bitmap BUTTONSLIDEPREVIOUSDISABLED{ File = "presenter/ButtonSlidePreviousDisabled.png"; };
+Bitmap BUTTONSLIDEPREVIOUSMOUSEOVER{ File = "presenter/ButtonSlidePreviousMouseOver.png"; };
+Bitmap BUTTONSLIDEPREVIOUSNORMAL{ File = "presenter/ButtonSlidePreviousNormal.png"; };
+Bitmap BUTTONSLIDEPREVIOUSSELECTED{ File = "presenter/ButtonSlidePreviousSelected.png"; };
+Bitmap BUTTONSLIDESORTERDISABLED{ File = "presenter/ButtonSlideSorterDisabled.png"; };
+Bitmap BUTTONSLIDESORTERMOUSEOVER{ File = "presenter/ButtonSlideSorterMouseOver.png"; };
+Bitmap BUTTONSLIDESORTERNORMAL{ File = "presenter/ButtonSlideSorterNormal.png"; };
+Bitmap BUTTONSLIDESORTERSELECTED{ File = "presenter/ButtonSlideSorterSelected.png"; };
+Bitmap LABELMOUSEOVERCENTER{ File = "presenter/LabelMouseOverCenter.png"; };
+Bitmap LABELMOUSEOVERLEFT{ File = "presenter/LabelMouseOverLeft.png"; };
+Bitmap LABELMOUSEOVERRIGHT{ File = "presenter/LabelMouseOverRight.png"; };
+Bitmap SCROLLBARARROWDOWNDISABLED{ File = "presenter/ScrollbarArrowDownDisabled.png"; };
+Bitmap SCROLLBARARROWDOWNMOUSEOVER{ File = "presenter/ScrollbarArrowDownMouseOver.png"; };
+Bitmap SCROLLBARARROWDOWNNORMAL{ File = "presenter/ScrollbarArrowDownNormal.png"; };
+Bitmap SCROLLBARARROWDOWNSELECTED{ File = "presenter/ScrollbarArrowDownSelected.png"; };
+Bitmap SCROLLBARARROWUPDISABLED{ File = "presenter/ScrollbarArrowUpDisabled.png"; };
+Bitmap SCROLLBARARROWUPMOUSEOVER{ File = "presenter/ScrollbarArrowUpMouseOver.png"; };
+Bitmap SCROLLBARARROWUPNORMAL{ File = "presenter/ScrollbarArrowUpNormal.png"; };
+Bitmap SCROLLBARARROWUPSELECTED{ File = "presenter/ScrollbarArrowUpSelected.png"; };
+Bitmap SCROLLBARPAGERMIDDLEMOUSEOVER{ File = "presenter/ScrollbarPagerMiddleMouseOver.png"; };
+Bitmap SCROLLBARPAGERMIDDLENORMAL{ File = "presenter/ScrollbarPagerMiddleNormal.png"; };
+Bitmap SCROLLBARTHUMBBOTTOMMOUSEOVER{ File = "presenter/ScrollbarThumbBottomMouseOver.png"; };
+Bitmap SCROLLBARTHUMBBOTTOMNORMAL{ File = "presenter/ScrollbarThumbBottomNormal.png"; };
+Bitmap SCROLLBARTHUMBMIDDLEMOUSEOVER{ File = "presenter/ScrollbarThumbMiddleMouseOver.png"; };
+Bitmap SCROLLBARTHUMBMIDDLENORMAL{ File = "presenter/ScrollbarThumbMiddleNormal.png"; };
+Bitmap SCROLLBARTHUMBTOPMOUSEOVER{ File = "presenter/ScrollbarThumbTopMouseOver.png"; };
+Bitmap SCROLLBARTHUMBTOPNORMAL{ File = "presenter/ScrollbarThumbTopNormal.png"; };
+Bitmap VIEWBACKGROUND{ File = "presenter/ViewBackground.png"; };
+
diff --git a/sdext/source/presenter/PresenterScrollBar.cxx b/sdext/source/presenter/PresenterScrollBar.cxx
index b84999a6c606..384b02a2e1df 100644
--- a/sdext/source/presenter/PresenterScrollBar.cxx
+++ b/sdext/source/presenter/PresenterScrollBar.cxx
@@ -27,7 +27,6 @@
 #include "PresenterScrollBar.hxx"
 #include "PresenterBitmapContainer.hxx"
 #include "PresenterCanvasHelper.hxx"
-#include "PresenterComponent.hxx"
 #include "PresenterGeometryHelper.hxx"
 #include "PresenterPaintManager.hxx"
 #include "PresenterTimer.hxx"
@@ -329,8 +328,7 @@ void PresenterScrollBar::SetCanvas (const Reference<css::rendering::XCanvas>& rx
                             OUString::createFromAscii("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 50ac8c9eb2db..a38ce06f3271 100644
--- a/sdext/source/presenter/PresenterSlideSorter.cxx
+++ b/sdext/source/presenter/PresenterSlideSorter.cxx
@@ -27,7 +27,6 @@
 #include "PresenterSlideSorter.hxx"
 #include "PresenterButton.hxx"
 #include "PresenterCanvasHelper.hxx"
-#include "PresenterComponent.hxx"
 #include "PresenterGeometryHelper.hxx"
 #include "PresenterHelper.hxx"
 #include "PresenterPaintManager.hxx"
@@ -2061,7 +2060,7 @@ PresenterSlideSorter::CurrentSlideFrameRenderer::CurrentSlideFrameRenderer (
 {
     PresenterConfigurationAccess aConfiguration (
         rxContext,
-        OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
         PresenterConfigurationAccess::READ_ONLY);
     Reference<container::XHierarchicalNameAccess> xBitmaps (
         aConfiguration.GetConfigurationNode(
@@ -2074,8 +2073,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 bdeb56c4fb14..72656ec1e887 100644
--- a/sdext/source/presenter/PresenterTheme.cxx
+++ b/sdext/source/presenter/PresenterTheme.cxx
@@ -27,7 +27,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>
@@ -102,7 +101,6 @@ public:
     Reference<XComponentContext> mxComponentContext;
     Reference<rendering::XCanvas> mxCanvas;
     Reference<drawing::XPresenterHelper> mxPresenterHelper;
-    OUString msBasePath;
 
     ReadContext (
         const Reference<XComponentContext>& rxContext,
@@ -128,8 +126,6 @@ public:
 
     BorderSize ReadBorderSize (const Reference<container::XNameAccess>& rxNode);
 
-    void SetBitmapSourceExtension (const OUString& rsExtensionName);
-
 private:
     Any GetByName (
         const Reference<container::XNameAccess>& rxNode,
@@ -336,7 +332,7 @@ void SAL_CALL PresenterTheme::disposing (void)
 
     PresenterConfigurationAccess aConfiguration (
         mxContext,
-        OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
         PresenterConfigurationAccess::READ_ONLY);
 
     return aReadContext.ReadTheme(aConfiguration, msThemeName);
@@ -446,7 +442,7 @@ bool PresenterTheme::ConvertToColor (
     ::boost::shared_ptr<PresenterConfigurationAccess> pConfiguration (
         new PresenterConfigurationAccess(
             mxContext,
-            OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+            OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
             PresenterConfigurationAccess::READ_WRITE));
 
     // Get configuration node for the view style container of the current
@@ -749,26 +745,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.getLength()>0)
-    {
-        rReadContext.SetBitmapSourceExtension(sBitmapSourceExtension);
-    }
-    else
-    {
-        rReadContext.SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier);
-    }
-
     // Background.
     mpBackground = PresenterBitmapContainer::LoadBitmap(
         mxThemeRoot,
         A2S("Background"),
         rReadContext.mxPresenterHelper,
-        rReadContext.msBasePath,
         rReadContext.mxCanvas,
         SharedBitmapDescriptor());
 
@@ -791,8 +772,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(
@@ -856,8 +836,7 @@ ReadContext::ReadContext (
     const Reference<rendering::XCanvas>& rxCanvas)
     : mxComponentContext(rxContext),
       mxCanvas(rxCanvas),
-      mxPresenterHelper(),
-      msBasePath()
+      mxPresenterHelper()
 {
     Reference<lang::XMultiComponentFactory> xFactory (rxContext->getServiceManager());
     if (xFactory.is())
@@ -868,9 +847,6 @@ ReadContext::ReadContext (
                 rxContext),
             UNO_QUERY_THROW);
     }
-
-    // Get base path to bitmaps.
-    SetBitmapSourceExtension(PresenterComponent::gsExtensionIdentifier);
 }
 
 
@@ -1021,17 +997,6 @@ BorderSize ReadContext::ReadBorderSize (const Reference<container::XNameAccess>&
 }
 
 
-
-
-void ReadContext::SetBitmapSourceExtension (const OUString& rsExtensionIdentifier)
-{
-    // Get base path to bitmaps.
-    msBasePath = PresenterComponent::GetBasePath(mxComponentContext, rsExtensionIdentifier);
-}
-
-
-
-
 //===== PaneStyleContainer ====================================================
 
 void PaneStyleContainer::Read (
@@ -1116,7 +1081,6 @@ void PaneStyleContainer::ProcessPaneStyle(
                 : ::boost::shared_ptr<PresenterBitmapContainer>(),
             rReadContext.mxComponentContext,
             rReadContext.mxCanvas,
-            rReadContext.msBasePath,
             rReadContext.mxPresenterHelper));
     }
 
@@ -1275,7 +1239,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 2b34e27228b1..2fdae656af55 100644
--- a/sdext/source/presenter/PresenterToolBar.cxx
+++ b/sdext/source/presenter/PresenterToolBar.cxx
@@ -28,7 +28,6 @@
 
 #include "PresenterBitmapContainer.hxx"
 #include "PresenterCanvasHelper.hxx"
-#include "PresenterComponent.hxx"
 #include "PresenterGeometryHelper.hxx"
 #include "PresenterPaintManager.hxx"
 #include "PresenterPaneBase.hxx"
@@ -127,7 +126,6 @@ class PresenterToolBar::Context
     : private ::boost::noncopyable
 {
 public:
-    ::rtl::OUString msBasePath;
     Reference<drawing::XPresenterHelper> mxPresenterHelper;
     css::uno::Reference<css::rendering::XCanvas> mxCanvas;
 };
@@ -773,11 +771,9 @@ void PresenterToolBar::CreateControls (
     // Expand the macro in the bitmap file names.
     PresenterConfigurationAccess aConfiguration (
         mxComponentContext,
-        OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
         PresenterConfigurationAccess::READ_ONLY);
 
-    const OUString sBasePath (PresenterComponent::GetBasePath(mxComponentContext));
-
     mpCurrentContainerPart.reset(new ElementContainerPart());
     maElementContainer.clear();
     maElementContainer.push_back(mpCurrentContainerPart);
@@ -791,7 +787,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()
@@ -1668,7 +1663,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 00dfbcf45666..8332a3d9d137 100644
--- a/sdext/source/presenter/PresenterWindowManager.cxx
+++ b/sdext/source/presenter/PresenterWindowManager.cxx
@@ -749,7 +749,7 @@ void PresenterWindowManager::RestoreViewMode (void)
     sal_Int32 nMode (0);
     PresenterConfigurationAccess aConfiguration (
         mxComponentContext,
-        OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+        OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
         PresenterConfigurationAccess::READ_ONLY);
     aConfiguration.GetConfigurationNode(A2S("Presenter/InitialViewMode")) >>= nMode;
     switch (nMode)
@@ -778,7 +778,7 @@ void PresenterWindowManager::StoreViewMode (const ViewMode eViewMode)
     {
         PresenterConfigurationAccess aConfiguration (
             mxComponentContext,
-            OUString::createFromAscii("/org.openoffice.Office.extension.PresenterScreen/"),
+            OUString::createFromAscii("/org.openoffice.Office.PresenterScreen/"),
             PresenterConfigurationAccess::READ_WRITE);
         aConfiguration.GoToChild(A2S("Presenter"));
         Any aValue;
diff --git a/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu b/sdext/source/presenter/ProtocolHandler.xcu
index 6b9ca6c25b90..6b9ca6c25b90 100644
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/ProtocolHandler.xcu
+++ b/sdext/source/presenter/ProtocolHandler.xcu
diff --git a/sdext/source/presenter/components.cxx b/sdext/source/presenter/components.cxx
new file mode 100644
index 000000000000..656d0f2a004a
--- /dev/null
+++ b/sdext/source/presenter/components.cxx
@@ -0,0 +1,74 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_sdext.hxx"
+
+#include <cppuhelper/factory.hxx>
+#include <cppuhelper/implementationentry.hxx>
+
+#include "PresenterProtocolHandler.hxx"
+#include "PresenterScreen.hxx"
+
+
+namespace sdext { namespace presenter {
+
+
+rtl_StandardModuleCount g_moduleCount = MODULE_COUNT_INIT;
+
+static struct cppu::ImplementationEntry gServiceEntries[] =
+{
+    {
+        PresenterProtocolHandler::Create,
+        PresenterProtocolHandler::getImplementationName_static,
+        PresenterProtocolHandler::getSupportedServiceNames_static,
+        cppu::createSingleComponentFactory, &g_moduleCount.modCnt, 0
+    },
+    {
+        PresenterScreenJob::Create,
+        PresenterScreenJob::getImplementationName_static,
+        PresenterScreenJob::getSupportedServiceNames_static,
+        cppu::createSingleComponentFactory, 0, 0
+    },
+    { 0, 0, 0, 0, 0, 0 }
+};
+
+extern "C"
+{
+    SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload( TimeValue *pTime )
+    {
+        return g_moduleCount.canUnload( &g_moduleCount , pTime );
+    }
+
+    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
+        const sal_Char ** ppEnvTypeName, uno_Environment ** )
+    {
+        *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
+    }
+
+    SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
+        const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
+    {
+        return cppu::component_getFactoryHelper( pImplName, pServiceManager, pRegistryKey , gServiceEntries);
+    }
+}
+
+} } // end of namespace sdext::presenter
diff --git a/sdext/source/presenter/delzip b/sdext/source/presenter/delzip
deleted file mode 100644
index 636fda90bfcb..000000000000
--- a/sdext/source/presenter/delzip
+++ /dev/null
@@ -1 +0,0 @@
-ECHO is OFF
diff --git a/sdext/source/presenter/description.xml b/sdext/source/presenter/description.xml
deleted file mode 100644
index 68b126dc66ff..000000000000
--- a/sdext/source/presenter/description.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--***********************************************************
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- ***********************************************************-->
-<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-UPDATED_SUPPORTED_PLATFORM" />
-
-  <dependencies>
-    <OpenOffice.org-minimal-version value="4.0" dep:name="OpenOffice"/>
-    <OpenOffice.org-maximal-version value="4.9" dep:name="OpenOffice"/>
-  </dependencies>
-
-  <registration>
-    <simple-license accept-by="admin" default-license-id="lic-en-US" suppress-if-required="true" >
-      <license-text xlink:href="licensefile" lang="isocode" license-id="lic-isocode"/>
-    </simple-license>
-  </registration>
-
-  <version value="1.2.0"/>
-
-  <platform value="UPDATED_SUPPORTED_PLATFORM" />
-
-  <publisher>
-      <name xlink:href="http://www.openoffice.org" lang="en">Apache Software Foundation</name>
-  </publisher>
-
-  <display-name>
-    <name lang="en">Presenter Console</name>
-  </display-name>
-
-  <icon>
-    <default xlink:href="bitmaps/extension_32.png" />
-    <high-contrast xlink:href="bitmaps/extension_32_h.png" />
-  </icon>
-
-</description>
diff --git a/sdext/source/presenter/help/component.txt b/sdext/source/presenter/help/component.txt
deleted file mode 100644
index 26a10c622fe9..000000000000
--- a/sdext/source/presenter/help/component.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/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 f6531d70ca7d..000000000000
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#**************************************************************
-#  
-#  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
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the 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/help/en-US/com.sun.PresenterScreen/presenter.xhp b/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
deleted file mode 100644
index a315c1a06702..000000000000
--- a/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<helpdocument version="1.0">
-
-<!--***********************************************************
- * 
- * 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
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- * 
- ***********************************************************-->
-
-
-
-
-<meta>
-      <topic id="textpresenterxml" indexer="include" status="PUBLISH">
-         <title xml-lang="en-US" id="tit" l10n="NEW">@PRESENTEREXTENSIONPRODUCTNAME@ Keyboard Shortcuts</title>
-         <filename>/com.sun.PresenterScreen-PLATFORMID/presenter.xhp</filename>
-      </topic>
-   </meta>
-   <body>
-<bookmark xml-lang="en-US" branch="hid/com.sun.PresenterScreen" id="bm_id3138439" localize="false"/>
-<bookmark xml-lang="en-US" branch="index" id="bm_id0921200912285678"><bookmark_value>@PRESENTEREXTENSIONPRODUCTNAME@ shortcuts</bookmark_value>
-</bookmark>
-<paragraph xml-lang="en-US" id="hd_id0921201912165661" role="heading" level="1" l10n="NEW">@PRESENTEREXTENSIONPRODUCTNAME@ Keyboard Shortcuts</paragraph>
-      <paragraph xml-lang="en-US" id="par_id0921201912165656" role="paragraph" l10n="NEW">When running a slide show using the @PRESENTEREXTENSIONPRODUCTNAME@, you can use the following keys:</paragraph>
-      <table id="tbl_id0921200901051232">
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104028" role="tablehead" l10n="NEW">Action</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104093" role="tablehead" l10n="NEW">Key or Keys</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id092120090110418" role="tablecontent" l10n="NEW">Next slide, or next effect</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104120" role="tablecontent" l10n="NEW">Left click, right arrow, down arrow, spacebar, page down, enter, return, 'N'</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104165" role="tablecontent" l10n="NEW">Previous slide, or previous effect</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104115" role="tablecontent" l10n="NEW">Right click, left arrow, up arrow, page up, backspace, 'P'</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104164" role="tablecontent" l10n="NEW">First slide</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104148" role="tablecontent" l10n="NEW">Home</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104221" role="tablecontent" l10n="NEW">Last slide</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104277" role="tablecontent" l10n="NEW">End</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104279" role="tablecontent" l10n="NEW">Previous slide without effects</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id092120090110423" role="tablecontent" l10n="NEW">Alt+Page Up</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id092120090110427" role="tablecontent" l10n="NEW">Next slide without effects</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104261" role="tablecontent" l10n="NEW">Alt+Page Down</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104383" role="tablecontent" l10n="NEW">Black/Unblack the screen</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id092120090110431" role="tablecontent" l10n="NEW">'B', '.'</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104311" role="tablecontent" l10n="NEW">White/Unwhite the screen</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104359" role="tablecontent" l10n="NEW">'W', ','</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104336" role="tablecontent" l10n="NEW">End slide show</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104419" role="tablecontent" l10n="NEW">Esc, '-'</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104460" role="tablecontent" l10n="NEW">Go to slide number</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id092120090110440" role="tablecontent" l10n="NEW">Number followed by Enter</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104427" role="tablecontent" l10n="NEW">Grow/Shrink size of notes font</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104442" role="tablecontent" l10n="NEW">'G', 'S'</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104473" role="tablecontent" l10n="NEW">Scroll notes up/down</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id092120090110459" role="tablecontent" l10n="NEW">'A', 'Z'</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id092120090110456" role="tablecontent" l10n="NEW">Move caret in notes view backward/forward</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id092120090110457" role="tablecontent" l10n="NEW">'H', 'L'</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104566" role="tablecontent" l10n="NEW">Show the @PRESENTEREXTENSIONPRODUCTNAME@</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104544" role="tablecontent" l10n="NEW">Ctrl-'1'</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104535" role="tablecontent" l10n="NEW">Show the Presentation Notes</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104680" role="tablecontent" l10n="NEW">Ctrl-'2'</paragraph>
-            </tablecell>
-         </tablerow>
-         <tablerow>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104634" role="tablecontent" l10n="NEW">Show the Slides Overview</paragraph>
-            </tablecell>
-            <tablecell>
-               <paragraph xml-lang="en-US" id="par_id0921200901104632" role="tablecontent" l10n="NEW">Ctrl-'3'</paragraph>
-            </tablecell>
-         </tablerow>
-      </table>
-
-   </body>
-</helpdocument>
diff --git a/sdext/source/presenter/makefile.mk b/sdext/source/presenter/makefile.mk
index 6fc59c68fb8e..b1541c857737 100644
--- a/sdext/source/presenter/makefile.mk
+++ b/sdext/source/presenter/makefile.mk
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  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
@@ -7,20 +7,18 @@
 #  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
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
-
-
 PRJ=..$/..
 PRJNAME=sdext
 TARGET=PresenterScreen
@@ -28,21 +26,19 @@ GEN_HID=FALSE
 EXTNAME=PresenterScreen
 
 ENABLE_EXCEPTIONS=TRUE
-# survive zip dependencies
-MAXLINELENGTH:=80000
+
+PACKAGE=org.openoffice.Office
+ABSXCSROOT=$(SOLARXMLDIR)
+XCSROOT=..
+DTDDIR=$(ABSXCSROOT)
+XSLDIR=$(ABSXCSROOT)$/processing
+PROCESSOUT=$(MISC)$/$(TARGET)
+PROCESSORDIR=$(SOLARBINDIR)
 
 # --- 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)" != ""
 
 @all:
@@ -52,307 +48,116 @@ PACKAGE=com.sun.PresenterScreen-$(PLATFORMID)
 
 .INCLUDE :  $(PRJ)$/util$/makefile.pmk
 
-
 DLLPRE=
-common_build_zip=
 
 # --- 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)$/PresenterPaneAnimator.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
+SLOFILES=\
+    $(SLO)$/components.obj \
+    $(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)$/PresenterPaneAnimator.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 \
 
 
 # --- Library -----------------------------------
 
-SHL1TARGET=		$(TARGET).uno
+SHL1TARGET=$(TARGET).uno
 
-SHL1STDLIBS=	$(CPPUHELPERLIB)	\
-                $(CPPULIB)			\
-                $(SALLIB)
+SHL1STDLIBS= \
+    $(CPPUHELPERLIB) \
+    $(CPPULIB) \
+    $(SALLIB)
 
 SHL1DEPN=
-SHL1IMPLIB=		i$(SHL1TARGET)
-SHL1LIBS=		$(SLB)$/$(TARGET).lib
-SHL1DEF=		$(MISC)$/$(SHL1TARGET).def
-SHL1VERSIONMAP=$(SOLARENV)/src/reg-component.map
+SHL1IMPLIB=    i$(SHL1TARGET)
+SHL1LIBS=    $(SLB)$/$(TARGET).lib
+SHL1DEF=    $(MISC)$/$(SHL1TARGET).def
+SHL1VERSIONMAP=$(SOLARENV)/src/component.map
 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=		*
-
-EXTENSIONDIR=$(ZIP1DIR)
-
-.INCLUDE : extension_pre.mk
-
-.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$/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 \
-    $(ZIP1DIR)$/bitmaps$/extension_32_h.png
-
-COMPONENT_LIBRARY= 								\
-    $(ZIP1DIR)$/$(TARGET).uno$(DLLPOST)
-
-PLATFORMID:=$(RTL_OS:l)_$(RTL_ARCH:l)
-
-COMPONENT_HELP= 								\
-    $(ZIP1DIR)$/help/component.txt				\
-    $(foreach,l,$(alllangiso) $(ZIP1DIR)$/help$/$l$/com.sun.PresenterScreen-$(PLATFORMID)$/presenter.xhp)
-
-ZIP1DEPS=					\
-    $(PACKLICS) 			\
-    $(DESCRIPTION)			\
-    $(COMPONENT_MANIFEST)	\
-    $(COMPONENT_FILES)		\
-    $(COMPONENT_BITMAPS)	\
-    $(COMPONENT_IMAGES)    	\
-    $(COMPONENT_LIBRARY)	\
-    $(COMPONENT_HELP)
-
-#	$(COMPONENT_MERGED_XCU) \
-
-
-LINKNAME:=help
-XHPLINKSRC:=$(ZIP1DIR)/help
-
-my_XHPFILES= \
-    presenter.xhp
-
-LINKLINKFILES= \
-    $(PACKAGE)/{$(my_XHPFILES)}
+DEF1NAME=    $(SHL1TARGET)
 
-# --- Targets ----------------------------------
+# ------------------------------------------------------------------------------
 
-.INCLUDE : target.mk
-.INCLUDE : extension_helplink.mk
+# Resource files
 
-$(SLO)$/PresenterComponent.obj : $(INCCOM)$/PresenterExtensionIdentifier.hxx
+SRS1NAME=$(TARGET)
+SRC1FILES =  \
+        $(TARGET).src \
 
-$(INCCOM)$/PresenterExtensionIdentifier.hxx : PresenterExtensionIdentifier.txx
-    $(TYPE) $< | sed s/UPDATED_PLATFORM/$(PLATFORMID)/ > $@
+SRSFILELIST=\
+        $(SRS)$/$(TARGET).srs \
 
-$(ZIP1DIR)$/help$/component.txt : help$/$$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
+RESLIB1NAME=$(TARGET)
+RESLIB1SRSFILES= $(SRSFILELIST)
 
-$(ZIP1DIR)/help/%/com.sun.PresenterScreen-$(PLATFORMID)/presenter.xhp : $(COMMONMISC)/%/com.sun.PresenterScreen/presenter.xhp
-    @echo creating $@
-    @-$(MKDIRHIER) $(@:d)
-    $(TYPE) $< | sed "s/PLATFORMID/$(PLATFORMID)/" | sed 's/@PRESENTEREXTENSIONPRODUCTNAME@/Presenter Console/g' > $@
 
-.IF "$(ZIP1TARGETN)"!=""
-$(ZIP1TARGETN) : $(HELPLINKALLTARGETS)
+PACKAGEDIR=$(subst,.,$/ $(PACKAGE))
+SPOOLDIR=$(MISC)$/registry$/spool
 
-.ENDIF          # "$(ZIP1TARGETN)"!=""
+XCUFILES= \
+    Jobs.xcu \
+    ProtocolHandler.xcu
 
-$(COMPONENT_BITMAPS) : bitmaps$/$$(@:f)
-    @-$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
+MYXCUFILES= \
+    $(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-presenterscreen.xcu \
+    $(SPOOLDIR)$/$(PACKAGEDIR)$/ProtocolHandler/ProtocolHandler-presenterscreen.xcu
+
+
+# --- Targets ----------------------------------
+
+.INCLUDE : target.mk
 
-$(COMPONENT_IMAGES) : $(SOLARSRC)$/$(RSCDEFIMG)$/desktop$/res$/$$(@:f)
-    @@-$(MKDIRHIER) $(@:d)
-    $(COPY) $< $@
+ALLTAR : $(MYXCUFILES)
 
-$(COMPONENT_LIBRARY) : $(DLLDEST)$/$$(@:f)
+XCU_SOURCEDIR:=.
+
+$(SPOOLDIR)$/$(PACKAGEDIR)$/Jobs$/Jobs-presenterscreen.xcu : $(XCU_SOURCEDIR)$/Jobs.xcu
+    @-$(MKDIRHIER) $(@:d)
+    @$(COPY) $< $@
+
+$(SPOOLDIR)$/$(PACKAGEDIR)$/ProtocolHandler$/ProtocolHandler-presenterscreen.xcu : $(XCU_SOURCEDIR)$/ProtocolHandler.xcu
     @-$(MKDIRHIER) $(@:d)
-    +$(COPY) $< $@
-.IF "$(OS)$(CPU)"=="WNTI"
- .IF "$(COM)"=="GCC"
-    $(GNUCOPY) $(SOLARBINDIR)$/mingwm10.dll $(ZIP1DIR)
- .ELSE
-    .IF "$(PACKMS)"!=""
-        .IF "$(CCNUMVER)" <= "001399999999"
-            $(GNUCOPY) $(PACKMS)$/msvcr71.dll $(ZIP1DIR)
-            $(GNUCOPY) $(PACKMS)$/msvcp71.dll $(ZIP1DIR)
-        .ELSE
-            .IF "$(CCNUMVER)" <= "001499999999"
-                $(GNUCOPY) $(PACKMS)$/msvcr80.dll $(ZIP1DIR)
-                $(GNUCOPY) $(PACKMS)$/msvcp80.dll $(ZIP1DIR)
-                $(GNUCOPY) $(PACKMS)$/msvcm80.dll $(ZIP1DIR)
-                $(GNUCOPY) $(PACKMS)$/Microsoft.VC80.CRT.manifest $(ZIP1DIR)
-            .ELSE
-                $(GNUCOPY) $(PACKMS)$/msvcr90.dll $(ZIP1DIR)
-                $(GNUCOPY) $(PACKMS)$/msvcp90.dll $(ZIP1DIR)
-                $(GNUCOPY) $(PACKMS)$/msvcm90.dll $(ZIP1DIR)
-                $(GNUCOPY) $(PACKMS)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR)
-            .ENDIF
-        .ENDIF
-    .ELSE        # "$(PACKMS)"!=""
-        .IF "$(CCNUMVER)" <= "001399999999"
-            $(GNUCOPY) $(SOLARBINDIR)$/msvcr71.dll $(ZIP1DIR)
-            $(GNUCOPY) $(SOLARBINDIR)$/msvcp71.dll $(ZIP1DIR)
-        .ELSE
-            .IF "$(CCNUMVER)" <= "001499999999"
-                $(GNUCOPY) $(SOLARBINDIR)$/msvcr80.dll $(ZIP1DIR)
-                $(GNUCOPY) $(SOLARBINDIR)$/msvcp80.dll $(ZIP1DIR)
-                $(GNUCOPY) $(SOLARBINDIR)$/msvcm80.dll $(ZIP1DIR)
-                $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC80.CRT.manifest $(ZIP1DIR)
-            .ELSE
-                $(GNUCOPY) $(SOLARBINDIR)$/msvcr90.dll $(ZIP1DIR)
-                $(GNUCOPY) $(SOLARBINDIR)$/msvcp90.dll $(ZIP1DIR)
-                $(GNUCOPY) $(SOLARBINDIR)$/msvcm90.dll $(ZIP1DIR)
-                $(GNUCOPY) $(SOLARBINDIR)$/Microsoft.VC90.CRT.manifest $(ZIP1DIR)
-            .ENDIF
-        .ENDIF
-    .ENDIF         # "$(PACKMS)"!=""
- .ENDIF	#"$(COM)"=="GCC"
-.ENDIF
-
-.INCLUDE : extension_post.mk
+    @$(COPY) $< $@
+
+ALLTAR : $(MISC)/PresenterScreen.component
+
+$(MISC)/PresenterScreen.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt PresenterScreen.component
+    $(XSLTPROC) --nonet --stringparam uri \
+    '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+    $(SOLARENV)/bin/createcomponent.xslt PresenterScreen.component
 
 .ENDIF # L10N_framework
-.ENDIF # "$(ENABLE_PRESENTER_SCREEN)" != "NO"
diff --git a/sdext/source/presenter/manifest.xml b/sdext/source/presenter/manifest.xml
deleted file mode 100644
index 50cbebbd514b..000000000000
--- a/sdext/source/presenter/manifest.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE manifest:manifest PUBLIC "-//OpenOffice.org//DTD Manifest 1.0//EN" "Manifest.dtd">
-<!--***********************************************************
- *
- * 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
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- ***********************************************************-->
-<manifest:manifest xmlns:manifest="http://openoffice.org/2001/manifest">
-  <manifest:file-entry manifest:media-type="application/vnd.sun.star.uno-component;type=native"
-    manifest:full-path="PresenterScreen.unoSHARED_EXTENSION"/>
-  <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:file-entry manifest:media-type="application/vnd.sun.star.package-bundle-description"
-    manifest:full-path="help/component.txt"/>
-</manifest:manifest>
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 44661a376d4e..000000000000
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/extension/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#**************************************************************
-#  
-#  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
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the 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 d1551ff50cc1..000000000000
--- a/sdext/source/presenter/registry/data/org/openoffice/Office/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#**************************************************************
-#  
-#  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
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the 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/set_soenv.in b/set_soenv.in
index 302ac0652d1f..ef96c7d750af 100644
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1676,7 +1676,6 @@ ToFile( "ENABLE_CAIRO",      "@ENABLE_CAIRO@",     "e" );
 ToFile( "ENABLE_CAIRO_CANVAS", "@ENABLE_CAIRO_CANVAS@",     "e" );
 ToFile( "ENABLE_OPENGL",     "@ENABLE_OPENGL@",    "e" );
 ToFile( "ENABLE_PDFIMPORT",  "@ENABLE_PDFIMPORT@", "e" );
-ToFile( "ENABLE_PRESENTER_SCREEN","@ENABLE_PRESENTER_SCREEN@","e" );
 ToFile( "ENABLE_REPORTBUILDER","@ENABLE_REPORTBUILDER@","e" );
 ToFile( "SYSTEM_JFREEREPORT","@SYSTEM_JFREEREPORT@","e" );
 ToFile( "OOO_JUNIT_JAR",     "@OOO_JUNIT_JAR@",    "e" );