Turn presenter screen from bundled extension to plain code

The immediate trigger was 5e5c11c664f67ff9fd1120905b09a32bea3b2f6c "fdo#42070
Fix RTL support in presenter console" causing build failures on Mac OS X when
linking the extension against vcl, but there should be more benefits of going
from a bundled-anyway extension to plain code.  (Not the least to get rid of the
com.sun.star.drawing.XPresenterHelper hack.)

To avoid unnecessary confusion between the newly plain code and any instance of
the old extension still installed (per-user or shared), I renamed all relevant
identifiers as follows:
* UNO implementation com.sun.star.comp.Draw.framework.PresenterScreenJob ->
org.libreoffice.comp.PresenterScreenJob
* UNO implementation com.sun.star.sdext.presenter.PresenterProtocolHandler ->
org.libreoffice.comp.PresenterScreenProtocolHandler
* protocol handler schema vnd.com.sun.star.comp.PresenterScreen ->
vnd.org.libreoffice.presenterscreen
* configuration schema /org.openoffice.Office.extension.PresenterScreen ->
/org.openoffice.Office.PresenterScreen (it appears this contains little to no
user-changeable data anyway, so not migrating it to a new user profile due to
the schema name change should not be problematic)
* job ID onDocumentOpenedJob -> org.libreoffice.PresenterScreen

Even with these precautions, having the presenter screen installed both as plain
code and as a (per-user or shared) extension still leads to a crash when
activating presentation mode (likely due to how both codes want to take control
of the screen).  To mitigate this, existing installations of the extension are
explicitly not migrated to new user profiles.

The sdext/source/presenter/bitmaps/*.png files were moved to
icon-themes/galaxy/sd/res/presenterscreen-*.png and are now accessed via SdResId
(adding the relevant data to sd/source/ui/inc/res_bmp.hrc and
sd/source/ui/app/res_bmp.src; not sure whether these locations are already
ideal).

The code itself has been left mostly unchanged in sdext/source/presenter/, and
it still clumsily communicates with sd core code via XPresenterHelper.  There is
a lot of room for improvement here.

The help data is left untouched at sdext/source/presenter/help/ and needs to
be incorporated properly into helpcontent2 in a follow-up commit.

The --disable-ext-presenter-console configure switch is gone.

Change-Id: I71adb7ae6dcdbd1802151fce6e3871d8a2026332

4 files changed, 756 insertions, 22 deletions

diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index cfdd2a4c7a1a..c209e1097686 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -348,3 +348,460 @@ Bitmap BMP_COMMENTS_INDICATOR
 {
     File = "comments_indicator.bmp";
 };
+
+// Presenter Screen bitmaps:
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_LEFT
+{
+    File = "presenterscreen-BorderLeft.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED
+{
+    File = "presenterscreen-ButtonSlideNextDisabled.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED
+{
+    File = "presenterscreen-ButtonSlidePreviousSelected.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP
+{
+    File = "presenterscreen-BorderCurrentSlideTop.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED
+{
+    File = "presenterscreen-ButtonNotesSelected.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED
+{
+    File = "presenterscreen-ScrollbarArrowDownSelected.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BACKGROUND
+{
+    File = "presenterscreen-Background.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_RIGHT
+{
+    File = "presenterscreen-BorderRight.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP
+{
+    File = "presenterscreen-BorderActiveTop.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED
+{
+    File = "presenterscreen-ButtonHelpDisabled.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT
+{
+    File = "presenterscreen-BorderActiveRight.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL
+{
+    File = "presenterscreen-ButtonFrameCenterNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER
+{
+    File = "presenterscreen-ScrollbarThumbMiddleMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT
+{
+    File = "presenterscreen-BorderCurrentSlideBottomRight.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_TOP_LEFT
+{
+    File = "presenterscreen-BorderTopLeft.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM
+{
+    File = "presenterscreen-BorderActiveBottom.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT
+{
+    File = "presenterscreen-BorderBottomLeft.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP
+{
+    File = "presenterscreen-BorderToolbarTop.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT
+{
+    File = "presenterscreen-BorderActiveLeft.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL
+{
+    File = "presenterscreen-ButtonHelpNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT
+{
+    File = "presenterscreen-BorderActiveBottomCallout.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT
+{
+    File = "presenterscreen-BorderToolbarLeft.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL
+{
+    File = "presenterscreen-ButtonSlideSorterNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL
+{
+    File = "presenterscreen-ScrollbarPagerMiddleNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL
+{
+    File = "presenterscreen-ButtonFrameRightNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER
+{
+    File = "presenterscreen-ButtonEffectNextMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER
+{
+    File = "presenterscreen-ScrollbarThumbTopMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED
+{
+    File = "presenterscreen-ButtonEffectNextDisabled.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER
+{
+    File = "presenterscreen-ButtonFrameCenterMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT
+{
+    File = "presenterscreen-BorderCurrentSlideLeft.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER
+{
+    File = "presenterscreen-ButtonFrameLeftMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED
+{
+    File = "presenterscreen-ButtonHelpSelected.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_VIEW_BACKGROUND
+{
+    File = "presenterscreen-ViewBackground.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER
+{
+    File = "presenterscreen-ButtonNotesMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER
+{
+    File = "presenterscreen-ButtonPlusMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED
+{
+    File = "presenterscreen-ButtonSlideSorterSelected.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT
+{
+    File = "presenterscreen-LabelMouseOverRight.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL
+{
+    File = "presenterscreen-ButtonSwitchMonitorNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT
+{
+    File = "presenterscreen-BorderToolbarRight.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL
+{
+    File = "presenterscreen-ScrollbarThumbMiddleNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED
+{
+    File = "presenterscreen-ButtonEffectNextSelected.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL
+{
+    File = "presenterscreen-ScrollbarArrowDownNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT
+{
+    File = "presenterscreen-BorderCurrentSlideTopRight.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL
+{
+    File = "presenterscreen-ButtonPlusNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT
+{
+    File = "presenterscreen-BorderToolbarTopRight.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED
+{
+    File = "presenterscreen-ButtonMinusDisabled.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED
+{
+    File = "presenterscreen-ScrollbarArrowDownDisabled.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER
+{
+    File = "presenterscreen-ButtonFrameRightMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER
+{
+    File = "presenterscreen-ButtonSwitchMonitorMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED
+{
+    File = "presenterscreen-ButtonSlidePreviousDisabled.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED
+{
+    File = "presenterscreen-ButtonMinusSelected.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER
+{
+    File = "presenterscreen-LabelMouseOverCenter.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER
+{
+    File = "presenterscreen-ButtonSlideNextMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL
+{
+    File = "presenterscreen-ButtonSlideNextNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER
+{
+    File = "presenterscreen-ButtonSlidePreviousMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_TOP
+{
+    File = "presenterscreen-BorderTop.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL
+{
+    File = "presenterscreen-ButtonFrameLeftNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER
+{
+    File = "presenterscreen-ScrollbarArrowUpMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL
+{
+    File = "presenterscreen-ButtonNotesNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED
+{
+    File = "presenterscreen-ButtonSlideSorterDisabled.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL
+{
+    File = "presenterscreen-ButtonEffectNextNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT
+{
+    File = "presenterscreen-BorderToolbarTopLeft.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT
+{
+    File = "presenterscreen-BorderActiveBottomRight.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_BOTTOM
+{
+    File = "presenterscreen-BorderBottom.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT
+{
+    File = "presenterscreen-BorderActiveBottomLeft.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER
+{
+    File = "presenterscreen-ScrollbarArrowDownMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED
+{
+    File = "presenterscreen-ButtonPlusSelected.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT
+{
+    File = "presenterscreen-BorderActiveTopRight.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL
+{
+    File = "presenterscreen-ButtonSlidePreviousNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER
+{
+    File = "presenterscreen-ButtonSlideSorterMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER
+{
+    File = "presenterscreen-ButtonMinusMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED
+{
+    File = "presenterscreen-ButtonNotesDisabled.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT
+{
+    File = "presenterscreen-BorderCurrentSlideBottomLeft.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT
+{
+    File = "presenterscreen-BorderTopRight.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER
+{
+    File = "presenterscreen-ButtonHelpMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL
+{
+    File = "presenterscreen-ScrollbarThumbTopNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED
+{
+    File = "presenterscreen-ScrollbarArrowUpSelected.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED
+{
+    File = "presenterscreen-ScrollbarArrowUpDisabled.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL
+{
+    File = "presenterscreen-ScrollbarArrowUpNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM
+{
+    File = "presenterscreen-BorderToolbarBottom.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT
+{
+    File = "presenterscreen-BorderCurrentSlideTopLeft.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL
+{
+    File = "presenterscreen-ButtonMinusNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER
+{
+    File = "presenterscreen-ScrollbarThumbBottomMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT
+{
+    File = "presenterscreen-BorderActiveTopLeft.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM
+{
+    File = "presenterscreen-BorderCurrentSlideBottom.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER
+{
+    File = "presenterscreen-ScrollbarPagerMiddleMouseOver.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT
+{
+    File = "presenterscreen-LabelMouseOverLeft.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT
+{
+    File = "presenterscreen-BorderCurrentSlideRight.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT
+{
+    File = "presenterscreen-BorderBottomRight.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL
+{
+    File = "presenterscreen-ScrollbarThumbBottomNormal.png";
+};
+
+Bitmap BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED
+{
+    File = "presenterscreen-ButtonPlusDisabled.png";
+};
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index ce85b79d408f..47dee23b838b 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -107,6 +107,99 @@
 #define BMP_PLACEHOLDER_MOVIE_LARGE_HOVER   (RID_SD_START+417)
 #define BMP_PLACEHOLDER_LARGE_END           (RID_SD_START+418)      // until here!
 
+// Presenter Screen bitmaps:
+#define BMP_PRESENTERSCREEN_BACKGROUND (RID_SD_START+500)
+#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM (RID_SD_START+501)
+#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT (RID_SD_START+502)
+#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT (RID_SD_START+503)
+#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT (RID_SD_START+504)
+#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT (RID_SD_START+505)
+#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT (RID_SD_START+506)
+#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP (RID_SD_START+507)
+#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT (RID_SD_START+508)
+#define BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT (RID_SD_START+509)
+#define BMP_PRESENTERSCREEN_BORDER_BOTTOM (RID_SD_START+510)
+#define BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT (RID_SD_START+511)
+#define BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT (RID_SD_START+512)
+#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM (RID_SD_START+513)
+#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT (RID_SD_START+514)
+#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT (RID_SD_START+515)
+#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT (RID_SD_START+516)
+#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT (RID_SD_START+517)
+#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP (RID_SD_START+518)
+#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT (RID_SD_START+519)
+#define BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT (RID_SD_START+520)
+#define BMP_PRESENTERSCREEN_BORDER_LEFT (RID_SD_START+521)
+#define BMP_PRESENTERSCREEN_BORDER_RIGHT (RID_SD_START+522)
+#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM (RID_SD_START+523)
+#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT (RID_SD_START+524)
+#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT (RID_SD_START+525)
+#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP (RID_SD_START+526)
+#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT (RID_SD_START+527)
+#define BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT (RID_SD_START+528)
+#define BMP_PRESENTERSCREEN_BORDER_TOP (RID_SD_START+529)
+#define BMP_PRESENTERSCREEN_BORDER_TOP_LEFT (RID_SD_START+530)
+#define BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT (RID_SD_START+531)
+#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED (RID_SD_START+532)
+#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER (RID_SD_START+533)
+#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL (RID_SD_START+534)
+#define BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED (RID_SD_START+535)
+#define BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER (RID_SD_START+536)
+#define BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL (RID_SD_START+537)
+#define BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER (RID_SD_START+538)
+#define BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL (RID_SD_START+539)
+#define BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER (RID_SD_START+540)
+#define BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL (RID_SD_START+541)
+#define BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED (RID_SD_START+542)
+#define BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER (RID_SD_START+543)
+#define BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL (RID_SD_START+544)
+#define BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED (RID_SD_START+545)
+#define BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED (RID_SD_START+546)
+#define BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER (RID_SD_START+547)
+#define BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL (RID_SD_START+548)
+#define BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED (RID_SD_START+549)
+#define BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED (RID_SD_START+550)
+#define BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER (RID_SD_START+551)
+#define BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL (RID_SD_START+552)
+#define BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED (RID_SD_START+553)
+#define BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED (RID_SD_START+554)
+#define BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER (RID_SD_START+555)
+#define BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL (RID_SD_START+556)
+#define BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED (RID_SD_START+557)
+#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED (RID_SD_START+558)
+#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER (RID_SD_START+559)
+#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL (RID_SD_START+560)
+#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED (RID_SD_START+561)
+#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER (RID_SD_START+562)
+#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL (RID_SD_START+563)
+#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED (RID_SD_START+564)
+#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED (RID_SD_START+565)
+#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER (RID_SD_START+566)
+#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL (RID_SD_START+567)
+#define BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED (RID_SD_START+568)
+#define BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER (RID_SD_START+569)
+#define BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL (RID_SD_START+570)
+#define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER (RID_SD_START+571)
+#define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT (RID_SD_START+572)
+#define BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT (RID_SD_START+573)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED (RID_SD_START+574)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER (RID_SD_START+575)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL (RID_SD_START+576)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED (RID_SD_START+577)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED (RID_SD_START+578)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER (RID_SD_START+579)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL (RID_SD_START+580)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED (RID_SD_START+581)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER (RID_SD_START+582)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL (RID_SD_START+583)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER (RID_SD_START+584)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL (RID_SD_START+585)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER (RID_SD_START+586)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL (RID_SD_START+587)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER (RID_SD_START+588)
+#define BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL (RID_SD_START+589)
+#define BMP_PRESENTERSCREEN_VIEW_BACKGROUND (RID_SD_START+590)
+
 // -----------------------------------------------------------------------------
 
 /*
diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx
index 157eb949a863..8ad42092ced9 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -26,6 +26,9 @@
  *
  ************************************************************************/
 
+#include "sal/config.h"
+
+#include <cstddef>
 
 #include "PresenterHelper.hxx"
 #include "CanvasUpdateRequester.hxx"
@@ -34,12 +37,14 @@
 #include <com/sun/star/awt/WindowAttribute.hpp>
 #include <com/sun/star/awt/WindowClass.hpp>
 #include <com/sun/star/awt/WindowDescriptor.hpp>
-#include <osl/file.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
 
+#include "res_bmp.hrc"
+#include "sdresid.hxx"
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using ::rtl::OUString;
@@ -245,39 +250,221 @@ void SAL_CALL PresenterHelper::toTop (
 
 
 
+namespace {
+
+struct IdMapEntry {
+    char const * sid;
+    sal_uInt32 nid;
+};
+
+}
 
 Reference<rendering::XBitmap> SAL_CALL PresenterHelper::loadBitmap (
-    const OUString& rsURL,
+    const OUString& id,
     const Reference<rendering::XCanvas>& rxCanvas)
     throw (RuntimeException)
 {
     if ( ! rxCanvas.is())
         return NULL;
 
-    ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex());
+    static IdMapEntry const map[] = {
+        { "bitmaps/Background.png", BMP_PRESENTERSCREEN_BACKGROUND },
+        { "bitmaps/BorderActiveBottom.png",
+          BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM },
+        { "bitmaps/BorderActiveBottomCallout.png",
+          BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_CALLOUT },
+        { "bitmaps/BorderActiveBottomLeft.png",
+          BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_LEFT },
+        { "bitmaps/BorderActiveBottomRight.png",
+          BMP_PRESENTERSCREEN_BORDER_ACTIVE_BOTTOM_RIGHT },
+        { "bitmaps/BorderActiveLeft.png",
+          BMP_PRESENTERSCREEN_BORDER_ACTIVE_LEFT },
+        { "bitmaps/BorderActiveRight.png",
+          BMP_PRESENTERSCREEN_BORDER_ACTIVE_RIGHT },
+        { "bitmaps/BorderActiveTop.png",
+          BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP },
+        { "bitmaps/BorderActiveTopLeft.png",
+          BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_LEFT },
+        { "bitmaps/BorderActiveTopRight.png",
+          BMP_PRESENTERSCREEN_BORDER_ACTIVE_TOP_RIGHT },
+        { "bitmaps/BorderBottom.png", BMP_PRESENTERSCREEN_BORDER_BOTTOM },
+        { "bitmaps/BorderBottomLeft.png",
+          BMP_PRESENTERSCREEN_BORDER_BOTTOM_LEFT },
+        { "bitmaps/BorderBottomRight.png",
+          BMP_PRESENTERSCREEN_BORDER_BOTTOM_RIGHT },
+        { "bitmaps/BorderCurrentSlideBottom.png",
+          BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM },
+        { "bitmaps/BorderCurrentSlideBottomLeft.png",
+          BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_LEFT },
+        { "bitmaps/BorderCurrentSlideBottomRight.png",
+          BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_BOTTOM_RIGHT },
+        { "bitmaps/BorderCurrentSlideLeft.png",
+          BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_LEFT },
+        { "bitmaps/BorderCurrentSlideRight.png",
+          BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_RIGHT },
+        { "bitmaps/BorderCurrentSlideTop.png",
+          BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP },
+        { "bitmaps/BorderCurrentSlideTopLeft.png",
+          BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_LEFT },
+        { "bitmaps/BorderCurrentSlideTopRight.png",
+          BMP_PRESENTERSCREEN_BORDER_CURRENT_SLIDE_TOP_RIGHT },
+        { "bitmaps/BorderLeft.png", BMP_PRESENTERSCREEN_BORDER_LEFT },
+        { "bitmaps/BorderRight.png", BMP_PRESENTERSCREEN_BORDER_RIGHT },
+        { "bitmaps/BorderToolbarBottom.png",
+          BMP_PRESENTERSCREEN_BORDER_TOOLBAR_BOTTOM },
+        { "bitmaps/BorderToolbarLeft.png",
+          BMP_PRESENTERSCREEN_BORDER_TOOLBAR_LEFT },
+        { "bitmaps/BorderToolbarRight.png",
+          BMP_PRESENTERSCREEN_BORDER_TOOLBAR_RIGHT },
+        { "bitmaps/BorderToolbarTop.png",
+          BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP },
+        { "bitmaps/BorderToolbarTopLeft.png",
+          BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_LEFT },
+        { "bitmaps/BorderToolbarTopRight.png",
+          BMP_PRESENTERSCREEN_BORDER_TOOLBAR_TOP_RIGHT },
+        { "bitmaps/BorderTop.png", BMP_PRESENTERSCREEN_BORDER_TOP },
+        { "bitmaps/BorderTopLeft.png", BMP_PRESENTERSCREEN_BORDER_TOP_LEFT },
+        { "bitmaps/BorderTopRight.png", BMP_PRESENTERSCREEN_BORDER_TOP_RIGHT },
+        { "bitmaps/ButtonEffectNextDisabled.png",
+          BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_DISABLED },
+        { "bitmaps/ButtonEffectNextMouseOver.png",
+          BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_MOUSE_OVER },
+        { "bitmaps/ButtonEffectNextNormal.png",
+          BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_NORMAL },
+        { "bitmaps/ButtonEffectNextSelected.png",
+          BMP_PRESENTERSCREEN_BUTTON_EFFECT_NEXT_SELECTED },
+        { "bitmaps/ButtonFrameCenterMouseOver.png",
+          BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_MOUSE_OVER },
+        { "bitmaps/ButtonFrameCenterNormal.png",
+          BMP_PRESENTERSCREEN_BUTTON_FRAME_CENTER_NORMAL },
+        { "bitmaps/ButtonFrameLeftMouseOver.png",
+          BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_MOUSE_OVER },
+        { "bitmaps/ButtonFrameLeftNormal.png",
+          BMP_PRESENTERSCREEN_BUTTON_FRAME_LEFT_NORMAL },
+        { "bitmaps/ButtonFrameRightMouseOver.png",
+          BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_MOUSE_OVER },
+        { "bitmaps/ButtonFrameRightNormal.png",
+          BMP_PRESENTERSCREEN_BUTTON_FRAME_RIGHT_NORMAL },
+        { "bitmaps/ButtonHelpDisabled.png",
+          BMP_PRESENTERSCREEN_BUTTON_HELP_DISABLED },
+        { "bitmaps/ButtonHelpMouseOver.png",
+          BMP_PRESENTERSCREEN_BUTTON_HELP_MOUSE_OVER },
+        { "bitmaps/ButtonHelpNormal.png",
+          BMP_PRESENTERSCREEN_BUTTON_HELP_NORMAL },
+        { "bitmaps/ButtonHelpSelected.png",
+          BMP_PRESENTERSCREEN_BUTTON_HELP_SELECTED },
+        { "bitmaps/ButtonMinusDisabled.png",
+          BMP_PRESENTERSCREEN_BUTTON_MINUS_DISABLED },
+        { "bitmaps/ButtonMinusMouseOver.png",
+          BMP_PRESENTERSCREEN_BUTTON_MINUS_MOUSE_OVER },
+        { "bitmaps/ButtonMinusNormal.png",
+          BMP_PRESENTERSCREEN_BUTTON_MINUS_NORMAL },
+        { "bitmaps/ButtonMinusSelected.png",
+          BMP_PRESENTERSCREEN_BUTTON_MINUS_SELECTED },
+        { "bitmaps/ButtonNotesDisabled.png",
+          BMP_PRESENTERSCREEN_BUTTON_NOTES_DISABLED },
+        { "bitmaps/ButtonNotesMouseOver.png",
+          BMP_PRESENTERSCREEN_BUTTON_NOTES_MOUSE_OVER },
+        { "bitmaps/ButtonNotesNormal.png",
+          BMP_PRESENTERSCREEN_BUTTON_NOTES_NORMAL },
+        { "bitmaps/ButtonNotesSelected.png",
+          BMP_PRESENTERSCREEN_BUTTON_NOTES_SELECTED },
+        { "bitmaps/ButtonPlusDisabled.png",
+          BMP_PRESENTERSCREEN_BUTTON_PLUS_DISABLED },
+        { "bitmaps/ButtonPlusMouseOver.png",
+          BMP_PRESENTERSCREEN_BUTTON_PLUS_MOUSE_OVER },
+        { "bitmaps/ButtonPlusNormal.png",
+          BMP_PRESENTERSCREEN_BUTTON_PLUS_NORMAL },
+        { "bitmaps/ButtonPlusSelected.png",
+          BMP_PRESENTERSCREEN_BUTTON_PLUS_SELECTED },
+        { "bitmaps/ButtonSlideNextDisabled.png",
+          BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_DISABLED },
+        { "bitmaps/ButtonSlideNextMouseOver.png",
+          BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_MOUSE_OVER },
+        { "bitmaps/ButtonSlideNextNormal.png",
+          BMP_PRESENTERSCREEN_BUTTON_SLIDE_NEXT_NORMAL },
+        { "bitmaps/ButtonSlidePreviousDisabled.png",
+          BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_DISABLED },
+        { "bitmaps/ButtonSlidePreviousMouseOver.png",
+          BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_MOUSE_OVER },
+        { "bitmaps/ButtonSlidePreviousNormal.png",
+          BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_NORMAL },
+        { "bitmaps/ButtonSlidePreviousSelected.png",
+          BMP_PRESENTERSCREEN_BUTTON_SLIDE_PREVIOUS_SELECTED },
+        { "bitmaps/ButtonSlideSorterDisabled.png",
+          BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_DISABLED },
+        { "bitmaps/ButtonSlideSorterMouseOver.png",
+          BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_MOUSE_OVER },
+        { "bitmaps/ButtonSlideSorterNormal.png",
+          BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_NORMAL },
+        { "bitmaps/ButtonSlideSorterSelected.png",
+          BMP_PRESENTERSCREEN_BUTTON_SLIDE_SORTER_SELECTED },
+        { "bitmaps/ButtonSwitchMonitorMouseOver.png",
+          BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_MOUSE_OVER },
+        { "bitmaps/ButtonSwitchMonitorNormal.png",
+          BMP_PRESENTERSCREEN_BUTTON_SWITCH_MONITOR_NORMAL },
+        { "bitmaps/LabelMouseOverCenter.png",
+          BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_CENTER },
+        { "bitmaps/LabelMouseOverLeft.png",
+          BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_LEFT },
+        { "bitmaps/LabelMouseOverRight.png",
+          BMP_PRESENTERSCREEN_LABEL_MOUSE_OVER_RIGHT },
+        { "bitmaps/ScrollbarArrowDownDisabled.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_DISABLED },
+        { "bitmaps/ScrollbarArrowDownMouseOver.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_MOUSE_OVER },
+        { "bitmaps/ScrollbarArrowDownNormal.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_NORMAL },
+        { "bitmaps/ScrollbarArrowDownSelected.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_DOWN_SELECTED },
+        { "bitmaps/ScrollbarArrowUpDisabled.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_DISABLED },
+        { "bitmaps/ScrollbarArrowUpMouseOver.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_MOUSE_OVER },
+        { "bitmaps/ScrollbarArrowUpNormal.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_NORMAL },
+        { "bitmaps/ScrollbarArrowUpSelected.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_ARROW_UP_SELECTED },
+        { "bitmaps/ScrollbarPagerMiddleMouseOver.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_MOUSE_OVER },
+        { "bitmaps/ScrollbarPagerMiddleNormal.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_PAGER_MIDDLE_NORMAL },
+        { "bitmaps/ScrollbarThumbBottomMouseOver.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_MOUSE_OVER },
+        { "bitmaps/ScrollbarThumbBottomNormal.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_BOTTOM_NORMAL },
+        { "bitmaps/ScrollbarThumbMiddleMouseOver.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_MOUSE_OVER },
+        { "bitmaps/ScrollbarThumbMiddleNormal.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_MIDDLE_NORMAL },
+        { "bitmaps/ScrollbarThumbTopMouseOver.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_MOUSE_OVER },
+        { "bitmaps/ScrollbarThumbTopNormal.png",
+          BMP_PRESENTERSCREEN_SCROLLBAR_THUMB_TOP_NORMAL },
+        { "bitmaps/ViewBackground.png", BMP_PRESENTERSCREEN_VIEW_BACKGROUND }
+    };
+    sal_uInt32 nid = 0;
+    for (std::size_t i = 0; i != SAL_N_ELEMENTS(map); ++i) {
+        if (id.equalsAscii(map[i].sid)) {
+            nid = map[i].nid;
+            break;
+        }
+    }
+    if (nid == 0) {
+        return 0;
+    }
 
-    if (mpGraphicFilter.get() == NULL)
-        mpGraphicFilter.reset(new GraphicFilter(sal_False));
+    ::osl::MutexGuard aGuard (::osl::Mutex::getGlobalMutex());
 
     const cppcanvas::CanvasSharedPtr pCanvas (
         cppcanvas::VCLFactory::getInstance().createCanvas(
             Reference<css::rendering::XBitmapCanvas>(rxCanvas,UNO_QUERY)));
 
-    if (pCanvas.get()!=NULL && !rsURL.isEmpty() && mpGraphicFilter.get()!=NULL)
+    if (pCanvas.get()!=NULL)
     {
-        Graphic aGraphic;
-        OUString sFileName;
-        if (osl::FileBase::getSystemPathFromFileURL(rsURL, sFileName)
-            == osl::FileBase::E_None)
-        {
-            if (mpGraphicFilter->ImportGraphic(aGraphic, rsURL) == GRFILTER_OK)
-            {
-                BitmapEx aBitmapEx (aGraphic.GetBitmapEx());
-                return cppcanvas::VCLFactory::getInstance().createBitmap(
-                    pCanvas,
-                    aBitmapEx)->getUNOBitmap();
-            }
-        }
+        BitmapEx aBitmapEx = SdResId(nid);
+        return cppcanvas::VCLFactory::getInstance().createBitmap(
+            pCanvas, aBitmapEx)->getUNOBitmap();
     }
 
     return NULL;
diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx
index 4ad837f74242..dbe3e80857ed 100644
--- a/sd/source/ui/presenter/PresenterHelper.hxx
+++ b/sd/source/ui/presenter/PresenterHelper.hxx
@@ -25,9 +25,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase2.hxx>
-#include <svtools/filter.hxx>
 #include <boost/noncopyable.hpp>
-#include <boost/scoped_ptr.hpp>
 
 namespace css = ::com::sun::star;
 
@@ -104,7 +102,6 @@ public:
 
 private:
     css::uno::Reference<css::uno::XComponentContext> mxComponentContext;
-    ::boost::scoped_ptr<GraphicFilter> mpGraphicFilter;
 };
 
 } } // end of namespace ::sd::presenter