added new layout images

9 files changed, 296 insertions, 280 deletions

diff --git a/sd/source/ui/app/layoutctrl.cxx b/sd/source/ui/app/layoutctrl.cxx
index 71069cadab8f..5f731d24d2ad 100644
--- a/sd/source/ui/app/layoutctrl.cxx
+++ b/sd/source/ui/app/layoutctrl.cxx
@@ -41,9 +41,9 @@
 #include <vcl/status.hxx>
 #include <vcl/toolbox.hxx>
 
-#include <svtools/languageoptions.hxx>
-#include <svtools/style.hxx>
-#include <svtools/stritem.hxx>
+#include <svl/languageoptions.hxx>
+#include <svl/style.hxx>
+#include <svl/stritem.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/valueset.hxx>
 
@@ -150,10 +150,12 @@ SfxPopupWindowType SdLayoutControl::GetPopupWindowType() const
 
 SfxPopupWindow* SdLayoutControl::CreatePopupWindow()
 {
+    /*
     OUString sResourceName( RTL_CONSTASCII_USTRINGPARAM( "private:resource/dockingwindow/" ) );
     sResourceName += OUString::valueOf( static_cast<sal_Int32>(GetId()) );
     createAndPositionSubToolBar( sResourceName );
-/*
+    */
+
     SfxPopupWindow* pWin = 0;
 
     ToolBox& rTbx = GetToolBox();
@@ -168,7 +170,6 @@ SfxPopupWindow* SdLayoutControl::CreatePopupWindow()
         }
      }
     SetPopupWindow( pWin );
-    */
     return 0;
 }
 
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 77ef817e4c44..ff9d4a63946e 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -33,286 +33,283 @@
 #include "glob.hrc"
 #include "res_bmp.hrc"
 
-Bitmap BMP_FOIL_00
+// preview bitmaps for layouts
+Bitmap BMP_ADDEMPTY_57X71
 {
-    File = "foil00.bmp" ;
+    File = "layout_addempty_57x71.png";
 };
-Bitmap BMP_FOIL_00_H
+Bitmap BMP_LAYOUT_ADDEMPTY_57X71_H
 {
-    File = "foil00_h.bmp" ;
+    File = "layout_addempty_57x71_h.png";
 };
-Bitmap BMP_FOIL_01
+Bitmap BMP_LAYOUT_ADDHEAD01_57X71
 {
-    File = "foil01.bmp" ;
+    File = "layout_addhead01_57x71.png";
 };
-Bitmap BMP_FOIL_01_H
+Bitmap BMP_LAYOUT_ADDHEAD01_57X71_H
 {
-    File = "foil01_h.bmp" ;
+    File = "layout_addhead01_57x71_h.png";
 };
-Bitmap BMP_FOIL_02
+Bitmap BMP_LAYOUT_ADDHEAD02_57X71
 {
-    File = "foil02.bmp" ;
+    File = "layout_addhead02_57x71.png";
 };
-Bitmap BMP_FOIL_02_H
+Bitmap BMP_LAYOUT_ADDHEAD02_57X71_H
 {
-    File = "foil02_h.bmp" ;
+    File = "layout_addhead02_57x71_h.png";
 };
-Bitmap BMP_FOIL_03
+Bitmap BMP_LAYOUT_ADDHEAD02A_57X71
 {
-    File = "foil03.bmp" ;
+    File = "layout_addhead02a_57x71.png";
 };
-Bitmap BMP_FOIL_03_H
+Bitmap BMP_LAYOUT_ADDHEAD02A_57X71_H
 {
-    File = "foil03_h.bmp" ;
+    File = "layout_addhead02a_57x71_h.png";
 };
-Bitmap BMP_FOIL_04
+Bitmap BMP_LAYOUT_ADDHEAD02B_57X71
 {
-    File = "foil04.bmp" ;
+    File = "layout_addhead02b_57x71.png";
 };
-Bitmap BMP_FOIL_04_H
+Bitmap BMP_LAYOUT_ADDHEAD02B_57X71_H
 {
-    File = "foil04_h.bmp" ;
+    File = "layout_addhead02b_57x71_h.png";
 };
-Bitmap BMP_FOIL_05
+Bitmap BMP_LAYOUT_ADDHEAD03_57X71
 {
-    File = "foil05.bmp" ;
+    File = "layout_addhead03_57x71.png";
 };
-Bitmap BMP_FOIL_06
+Bitmap BMP_LAYOUT_ADDHEAD03_57X71_H
 {
-    File = "foil06.bmp" ;
+    File = "layout_addhead03_57x71_h.png";
 };
-Bitmap BMP_FOIL_06_H
+Bitmap BMP_LAYOUT_ADDHEAD03A_57X71
 {
-    File = "foil06_h.bmp" ;
+    File = "layout_addhead03a_57x71.png";
 };
-Bitmap BMP_FOIL_07
+Bitmap BMP_LAYOUT_ADDHEAD03A_57X71_H
 {
-    File = "foil07.bmp" ;
+    File = "layout_addhead03a_57x71_h.png";
 };
-Bitmap BMP_FOIL_07_H
+Bitmap BMP_LAYOUT_ADDHEAD04_57X71
 {
-    File = "foil07_h.bmp" ;
+    File = "layout_addhead04_57x71.png";
 };
-Bitmap BMP_FOIL_08
+Bitmap BMP_LAYOUT_ADDHEAD04_57X71_H
 {
-    File = "foil08.bmp" ;
+    File = "layout_addhead04_57x71_h.png";
 };
-Bitmap BMP_FOIL_08_H
+Bitmap BMP_LAYOUT_ADDHEAD06_57X71
 {
-    File = "foil08_h.bmp" ;
+    File = "layout_addhead06_57x71.png";
 };
-Bitmap BMP_FOIL_09
+Bitmap BMP_LAYOUT_ADDHEAD06_57X71_H
 {
-    File = "foil09.bmp" ;
+    File = "layout_addhead06_57x71_h.png";
 };
-Bitmap BMP_FOIL_09_H
+Bitmap BMP_LAYOUT_ADDTEXTONLY_57X71
 {
-    File = "foil09_h.bmp" ;
+    File = "layout_addtextonly_57x71.png";
 };
-Bitmap BMP_FOIL_10
+Bitmap BMP_LAYOUT_ADDTEXTONLY_57X71_H
 {
-    File = "foil10.bmp" ;
+    File = "layout_addtextonly_57x71_h.png";
 };
-Bitmap BMP_FOIL_10_H
+Bitmap BMP_LAYOUT_ADDVERTICAL01_57X71
 {
-    File = "foil10_h.bmp" ;
+    File = "layout_addvertical01_57x71.png";
 };
-Bitmap BMP_FOIL_11
+Bitmap BMP_LAYOUT_ADDVERTICAL01_57X71_H
 {
-    File = "foil11.bmp" ;
+    File = "layout_addvertical01_57x71_h.png";
 };
-Bitmap BMP_FOIL_11_H
+Bitmap BMP_LAYOUT_ADDVERTICAL02_57X71
 {
-    File = "foil11_h.bmp" ;
+    File = "layout_addvertical02_57x71.png";
 };
-Bitmap BMP_FOIL_12
+Bitmap BMP_LAYOUT_ADDVERTICAL02_57X71_H
 {
-    File = "foil12.bmp" ;
+    File = "layout_addvertical02_57x71_h.png";
 };
-Bitmap BMP_FOIL_12_H
+Bitmap BMP_LAYOUT_EMPTY_57X71
 {
-    File = "foil12_h.bmp" ;
+    File = "layout_empty_57x71.png";
 };
-Bitmap BMP_FOIL_13
+Bitmap BMP_LAYOUT_EMPTY_57X71_H
 {
-    File = "foil13.bmp" ;
+    File = "layout_empty_57x71_h.png";
 };
-Bitmap BMP_FOIL_13_H
+Bitmap BMP_LAYOUT_HEAD01_57X71
 {
-    File = "foil13_h.bmp" ;
+    File = "layout_head01_57x71.png";
 };
-Bitmap BMP_FOIL_14
+Bitmap BMP_LAYOUT_HEAD01_57X71_H
 {
-    File = "foil14.bmp" ;
+    File = "layout_head01_57x71_h.png";
 };
-Bitmap BMP_FOIL_14_H
+Bitmap BMP_LAYOUT_HEAD02_57X71
 {
-    File = "foil14_h.bmp" ;
+    File = "layout_head02_57x71.png";
 };
-Bitmap BMP_FOIL_15
+Bitmap BMP_LAYOUT_HEAD02_57X71_H
 {
-    File = "foil15.bmp" ;
+    File = "layout_head02_57x71_h.png";
 };
-Bitmap BMP_FOIL_15_H
+Bitmap BMP_LAYOUT_HEAD02A_57X71
 {
-    File = "foil15_h.bmp" ;
+    File = "layout_head02a_57x71.png";
 };
-Bitmap BMP_FOIL_16
+Bitmap BMP_LAYOUT_HEAD02A_57X71_H
 {
-    File = "foil16.bmp" ;
+    File = "layout_head02a_57x71_h.png";
 };
-Bitmap BMP_FOIL_16_H
+Bitmap BMP_LAYOUT_HEAD02B_57X71
 {
-    File = "foil16_h.bmp" ;
+    File = "layout_head02b_57x71.png";
 };
-Bitmap BMP_FOIL_17
+Bitmap BMP_LAYOUT_HEAD02B_57X71_H
 {
-    File = "foil17.bmp" ;
+    File = "layout_head02b_57x71_h.png";
 };
-Bitmap BMP_FOIL_17_H
+Bitmap BMP_LAYOUT_HEAD03_57X71
 {
-    File = "foil17_h.bmp" ;
+    File = "layout_head03_57x71.png";
 };
-Bitmap BMP_FOIL_18
+Bitmap BMP_LAYOUT_HEAD03_57X71_H
 {
-    File = "foil18.bmp" ;
+    File = "layout_head03_57x71_h.png";
 };
-Bitmap BMP_FOIL_18_H
+Bitmap BMP_LAYOUT_HEAD03A_57X71
 {
-    File = "foil18_h.bmp" ;
+    File = "layout_head03a_57x71.png";
 };
-Bitmap BMP_FOIL_19
+Bitmap BMP_LAYOUT_HEAD03A_57X71_H
 {
-    File = "foil19.bmp" ;
+    File = "layout_head03a_57x71_h.png";
 };
-Bitmap BMP_FOIL_19_H
+Bitmap BMP_LAYOUT_HEAD04_57X71
 {
-    File = "foil19_h.bmp" ;
+    File = "layout_head04_57x71.png";
 };
-Bitmap BMP_FOIL_20
+Bitmap BMP_LAYOUT_HEAD04_57X71_H
 {
-    File = "foil20.bmp" ;
+    File = "layout_head04_57x71_h.png";
 };
-Bitmap BMP_FOIL_20_H
+Bitmap BMP_LAYOUT_HEAD06_57X71
 {
-    File = "foil20_h.bmp" ;
+    File = "layout_head06_57x71.png";
 };
-Bitmap BMP_FOIL_21
+Bitmap BMP_LAYOUT_HEAD06_57X71_H
 {
-    File = "foil21.bmp" ;
+    File = "layout_head06_57x71_h.png";
 };
-Bitmap BMP_FOIL_21_H
+Bitmap BMP_LAYOUT_TEXTONLY_57X71
 {
-    File = "foil21_h.bmp" ;
+    File = "layout_textonly_57x71.png";
 };
-Bitmap BMP_FOIL_22
+Bitmap BMP_LAYOUT_TEXTONLY_57X71_H
 {
-    File = "foil22.bmp" ;
+    File = "layout_textonly_57x71_h.png";
 };
-Bitmap BMP_FOIL_22_H
+Bitmap BMP_LAYOUT_VERTICAL01_57X71
 {
-    File = "foil22_h.bmp" ;
+    File = "layout_vertical01_57x71.png";
 };
-Bitmap BMP_FOIL_23
+Bitmap BMP_LAYOUT_VERTICAL01_57X71_H
 {
-    File = "foil23.bmp" ;
+    File = "layout_vertical01_57x71_h.png";
 };
-Bitmap BMP_FOIL_23_H
+Bitmap BMP_LAYOUT_VERTICAL02_57X71
 {
-    File = "foil23_h.bmp" ;
+    File = "layout_vertical02_57x71.png";
 };
-Bitmap BMP_FOIL_24
+Bitmap BMP_LAYOUT_VERTICAL02_57X71_H
 {
-    File = "foil24.bmp" ;
-};
-Bitmap BMP_FOIL_24_H
-{
-    File = "foil24_h.bmp" ;
-};
-Bitmap BMP_FOIL_25
-{
-    File = "foil25.bmp" ;
-};
-Bitmap BMP_FOIL_25_H
-{
-    File = "foil25_h.bmp" ;
-};
-Bitmap BMP_FOIL_26
-{
-    File = "foil26.bmp" ;
-};
-Bitmap BMP_FOIL_26_H
-{
-    File = "foil26_h.bmp" ;
-};
-Bitmap BMP_FOIL_27
-{
-    File = "foil27.bmp" ;
-};
-Bitmap BMP_FOIL_27_H
-{
-    File = "foil27_h.bmp" ;
+    File = "layout_vertical02_57x71_h.png";
 };
+
 Bitmap BMP_FOILH_01
 {
-    File = "foilh01.bmp" ;
+    File = "foilh01.png";
 };
 Bitmap BMP_FOILH_01_H
 {
-    File = "foilh01_h.bmp" ;
+    File = "foilh01_h.png";
 };
 Bitmap BMP_FOILH_02
 {
-    File = "foilh02.bmp" ;
+    File = "foilh02.png";
 };
 Bitmap BMP_FOILH_02_H
 {
-    File = "foilh02_h.bmp" ;
+    File = "foilh02_h.png";
 };
 Bitmap BMP_FOILH_03
 {
-    File = "foilh03.bmp" ;
+    File = "foilh03.png";
 };
 Bitmap BMP_FOILH_03_H
 {
-    File = "foilh03_h.bmp" ;
+    File = "foilh03_h.png";
 };
 Bitmap BMP_FOILH_04
 {
-    File = "foilh04.bmp" ;
+    File = "foilh04.png";
 };
 Bitmap BMP_FOILH_04_H
 {
-    File = "foilh04_h.bmp" ;
+    File = "foilh04_h.png";
 };
 Bitmap BMP_FOILH_06
 {
-    File = "foilh06.bmp" ;
+    File = "foilh06.png";
 };
 Bitmap BMP_FOILH_06_H
 {
-    File = "foilh06_h.bmp" ;
+    File = "foilh06_h.png";
 };
 Bitmap BMP_FOILH_09
 {
-    File = "foilh09.bmp" ;
+    File = "foilh09.png";
 };
 Bitmap BMP_FOILH_09_H
 {
-    File = "foilh09_h.bmp" ;
+    File = "foilh09_h.png";
+};
+
+
+Bitmap BMP_PLACEHOLDER_CHART_57X71
+{
+    File = "placeholder_chart_57x71.png";
 };
-Bitmap BMP_FOILN_01
+Bitmap BMP_PLACEHOLDER_CHART_57X71_H
 {
-    File = "foiln01.bmp" ;
+    File = "placeholder_chart_57x71_h.png";
 };
-Bitmap BMP_FOILN_01_H
+Bitmap BMP_PLACEHOLDER_IMAGE_57X71
 {
-    File = "foiln01_h.bmp" ;
+    File = "placeholder_image_57x71.png";
 };
-Bitmap BMP_FOIL_NONE
+Bitmap BMP_PLACEHOLDER_IMAGE_57X71_H
 {
-    File = "foilnone.bmp" ;
+    File = "placeholder_image_57x71_h.png";
 };
+Bitmap BMP_PLACEHOLDER_MOVIE_57X71
+{
+    File = "placeholder_movie_57x71.png";
+};
+Bitmap BMP_PLACEHOLDER_MOVIE_57X71_H
+{
+    File = "placeholder_movie_57x71_h.png";
+};
+Bitmap BMP_PLACEHOLDER_TABLE_57X71
+{
+    File = "placeholder_table_57x71.png";
+};
+Bitmap BMP_PLACEHOLDER_TABLE_57X71_H
+{
+    File = "placeholder_table_57x71_h.png";
+};
+
 Bitmap BMP_PAGE
 {
     File = "page.bmp" ;
@@ -495,26 +492,6 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
     #undef STYLE_IMAGE_LISTEF
 };
 
-Bitmap BMP_PRESOBJ_GRAPHIC
-{
-    File = "image.bmp" ;
-};
-Bitmap BMP_PRESOBJ_OBJECT
-{
-    File = "object.bmp" ;
-};
-Bitmap BMP_PRESOBJ_CHART
-{
-    File = "chart.bmp" ;
-};
-Bitmap BMP_PRESOBJ_ORGCHART
-{
-    File = "orgchart.bmp" ;
-};
-Bitmap BMP_PRESOBJ_TABLE
-{
-    File = "table.bmp" ;
-};
 Bitmap BMP_WAIT_ICON
 {
     File = "waiticon.bmp";
diff --git a/sd/source/ui/dlg/layoutdialog.cxx b/sd/source/ui/dlg/layoutdialog.cxx
index c431db29d651..5c8cd4c1aa66 100644
--- a/sd/source/ui/dlg/layoutdialog.cxx
+++ b/sd/source/ui/dlg/layoutdialog.cxx
@@ -50,7 +50,7 @@ SFX_IMPL_DOCKINGWINDOW(LayoutDialogChildWindow, SID_LAYOUT_DIALOG_WIN)
 #include <sfx2/imagemgr.hxx>
 #include <sfx2/tbxctrl.hxx>
 
-#include <svtools/languageoptions.hxx>
+#include <svl/languageoptions.hxx>
 #include <svtools/valueset.hxx>
 
 #include <svx/toolbarmenu.hxx>
@@ -135,38 +135,41 @@ struct snewfoil_value_info
 };
 static snewfoil_value_info standard[] =
 {
-    {BMP_FOIL_20, BMP_FOIL_20_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB,        AUTOLAYOUT_NONE},
-    {BMP_FOIL_00, BMP_FOIL_00_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB,       AUTOLAYOUT_TITLE},
-    {BMP_FOIL_01, BMP_FOIL_01_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_ENUM},
-    {BMP_FOIL_03, BMP_FOIL_03_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB,       AUTOLAYOUT_2TEXT},
-    {BMP_FOIL_19, BMP_FOIL_19_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB,  AUTOLAYOUT_ONLY_TITLE},
-    {BMP_FOIL_25, BMP_FOIL_25_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB,   AUTOLAYOUT_ONLY_TEXT},
-    {BMP_FOIL_12, BMP_FOIL_12_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_TEXT2OBJ},
-    {BMP_FOIL_15, BMP_FOIL_15_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_2OBJTEXT},
-    {BMP_FOIL_16, BMP_FOIL_16_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
-    {BMP_FOIL_14, BMP_FOIL_14_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
-    {BMP_FOIL_18, BMP_FOIL_18_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_4OBJ},
-    {BMP_FOIL_27, BMP_FOIL_27_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_6CLIPART},
+    {BMP_LAYOUT_EMPTY_57X71, BMP_LAYOUT_EMPTY_57X71_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB,        AUTOLAYOUT_NONE},
+    {BMP_LAYOUT_HEAD03_57X71, BMP_LAYOUT_HEAD03_57X71_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB,       AUTOLAYOUT_TITLE},
+    {BMP_LAYOUT_HEAD02_57X71, BMP_LAYOUT_HEAD02_57X71_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_ENUM},
+    {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB,       AUTOLAYOUT_2TEXT},
+    {BMP_LAYOUT_HEAD01_57X71, BMP_LAYOUT_HEAD01_57X71_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB,  AUTOLAYOUT_ONLY_TITLE},
+    {BMP_LAYOUT_TEXTONLY_57X71, BMP_LAYOUT_TEXTONLY_57X71_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB,   AUTOLAYOUT_ONLY_TEXT},
+//  {BMP_FOIL_12, BMP_FOIL_12_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_TEXT2OBJ},
+//    {BMP_FOIL_15, BMP_FOIL_15_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_2OBJTEXT},
+    {BMP_LAYOUT_HEAD03A_57X71, BMP_LAYOUT_HEAD03A_57X71_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
+    {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
+    {BMP_LAYOUT_HEAD04_57X71, BMP_LAYOUT_HEAD04_57X71_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_4OBJ},
+    {BMP_LAYOUT_HEAD06_57X71, BMP_LAYOUT_HEAD06_57X71_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_6CLIPART},
 
     // vertical
-    {BMP_FOIL_21, BMP_FOIL_21_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART},
-    {BMP_FOIL_22, BMP_FOIL_22_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
-    {BMP_FOIL_23, BMP_FOIL_23_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
-    {BMP_FOIL_24, BMP_FOIL_24_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART,   WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
+    {BMP_LAYOUT_VERTICAL02_57X71, BMP_LAYOUT_VERTICAL02_57X71_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART},
+    {BMP_LAYOUT_VERTICAL01_57X71, BMP_LAYOUT_VERTICAL01_57X71_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
+    {BMP_LAYOUT_HEAD02_57X71, BMP_LAYOUT_HEAD02_57X71_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
+    {BMP_LAYOUT_HEAD02A_57X71, BMP_LAYOUT_HEAD02A_57X71_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART,   WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
 
     {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };
 
 // -----------------------------------------------------------------------
 
+
 SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, Window* pParent )
-: SfxPopupWindow(SID_ASSIGN_LAYOUT, rBase.GetFrame()->GetTopFrame()->GetFrameInterface(), pParent, SdResId( FLT_WIN_LAYOUT_DIALOG ))
+: SfxPopupWindow(SID_ASSIGN_LAYOUT, rBase.GetFrame()->GetTopFrame()->GetFrameInterface(), pParent, WB_CLIPCHILDREN|WB_DIALOGCONTROL|WB_SYSTEMWINDOW/*SdResId( FLT_WIN_LAYOUT_DIALOG )*/)
 , meCurrentLayout( AUTOLAYOUT_NONE )
 , mrBase(rBase)
 {
     String sResetSlideLayout( SdResId( STR_RESET_LAYOUT ) );
 
-    FreeResource();
+//  FreeResource();
+
+    //SetStyle( 2 );
 
 //  SetHelpId( HID_POPUP_LAYOUT );
 
@@ -281,15 +284,18 @@ IMPL_LINK( SdLayoutDialogContent, SelectHdl, void *, pControl )
 {
     if ( IsInPopupMode() )
         EndPopupMode();
-/*
+
     AutoLayout eLayout = meCurrentLayout;
 
     if( pControl == mpLayoutSet )
         eLayout = static_cast< AutoLayout >(mpLayoutSet->GetSelectItemId()-1);
 
     const SfxUInt32Item aItem(ID_VAL_WHATLAYOUT, eLayout);
-    GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0);
-*/
+    if( mrBase.GetMainViewShell().get() && mrBase.GetMainViewShell()->GetViewFrame() )
+    {
+        mrBase.GetMainViewShell()->GetViewFrame()->GetBindings().GetDispatcher()->Execute(SID_ASSIGN_LAYOUT,SFX_CALLMODE_ASYNCHRON,&aItem,0);
+    }
+
     return 0;
 }
 
diff --git a/sd/source/ui/dlg/layoutdialog.src b/sd/source/ui/dlg/layoutdialog.src
index a9a3d315faf0..c890ca3d5b4d 100644
--- a/sd/source/ui/dlg/layoutdialog.src
+++ b/sd/source/ui/dlg/layoutdialog.src
@@ -32,7 +32,7 @@
 #include "layoutdialog.hrc"
 #include "helpids.h"
 
-DockingWindow FLT_WIN_LAYOUT_DIALOG
+FloatingWindow FLT_WIN_LAYOUT_DIALOG
 {
     HelpId = HID_SD_SLIDE_LAYOUTS;
     Border = TRUE ;
@@ -42,12 +42,14 @@ DockingWindow FLT_WIN_LAYOUT_DIALOG
     Moveable = TRUE ;
     Closeable = TRUE ;
     Zoomable = TRUE ;
-    Dockable = TRUE ;
+    ClipChildren = TRUE ;
     EnableResizing = TRUE ;
 
     String STR_RESET_LAYOUT
     {
         Text[ en-US ] = "Reset Slide Layout";
     };
+
+    Text [en-US] = "Slide Layout";
 };
 
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 0dd5451c1f45..319f0765cd78 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -70,36 +70,6 @@
 #define RID_GRAFFILTERS         RID_APP_START+29
 #define RID_GRAFFILTERS_TBX     RID_APP_START+30
 
-#define BMP_FOIL_00             RID_APP_START+10
-#define BMP_FOIL_01             RID_APP_START+11
-#define BMP_FOIL_02             RID_APP_START+12
-#define BMP_FOIL_03             RID_APP_START+13
-#define BMP_FOIL_04             RID_APP_START+14
-#define BMP_FOIL_05             RID_APP_START+15
-#define BMP_FOIL_06             RID_APP_START+16
-#define BMP_FOIL_07             RID_APP_START+17
-#define BMP_FOIL_08             RID_APP_START+18
-#define BMP_FOIL_09             RID_APP_START+19
-#define BMP_FOIL_10             RID_APP_START+20
-#define BMP_FOIL_11             RID_APP_START+21
-#define BMP_FOIL_12             RID_APP_START+22
-#define BMP_FOIL_13             RID_APP_START+23
-#define BMP_FOIL_14             RID_APP_START+24
-#define BMP_FOIL_15             RID_APP_START+25
-#define BMP_FOIL_16             RID_APP_START+26
-#define BMP_FOIL_17             RID_APP_START+27
-#define BMP_FOIL_18             RID_APP_START+28
-#define BMP_FOIL_19             RID_APP_START+29
-#define BMP_FOIL_20             RID_APP_START+30
-#define BMP_FOILH_01            RID_APP_START+31
-#define BMP_FOILH_02            RID_APP_START+32
-#define BMP_FOILH_03            RID_APP_START+33
-#define BMP_FOILH_04            RID_APP_START+34
-#define BMP_FOILH_06            RID_APP_START+35
-#define BMP_FOILH_09            RID_APP_START+36
-#define BMP_FOILN_01            RID_APP_START+40
-#define BMP_FOIL_25             RID_APP_START+41
-
 // Bitmaps fuer Tree-ListBox im Effekte-TabDialog
 #define BMP_PAGE                RID_APP_START+42
 #define BMP_PAGEOBJS            RID_APP_START+43
@@ -173,38 +143,6 @@
 #define BMP_EFFECT_UNCOVER_TO_B             RID_APP_START+171
 #define BMP_EFFECT_UNCOVER_TO_LL            RID_APP_START+172
 
-#define BMP_FOIL_00_H                       RID_SD_START+182
-#define BMP_FOIL_01_H                       RID_SD_START+183
-#define BMP_FOIL_02_H                       RID_SD_START+184
-#define BMP_FOIL_03_H                       RID_SD_START+185
-#define BMP_FOIL_04_H                       RID_SD_START+186
-#define BMP_FOIL_05_H                       RID_SD_START+187
-#define BMP_FOIL_06_H                       RID_SD_START+188
-#define BMP_FOIL_07_H                       RID_SD_START+189
-#define BMP_FOIL_08_H                       RID_SD_START+190
-#define BMP_FOIL_09_H                       RID_SD_START+191
-#define BMP_FOIL_10_H                       RID_SD_START+192
-#define BMP_FOIL_11_H                       RID_SD_START+193
-#define BMP_FOIL_12_H                       RID_SD_START+194
-#define BMP_FOIL_13_H                       RID_SD_START+195
-#define BMP_FOIL_14_H                       RID_SD_START+196
-#define BMP_FOIL_15_H                       RID_SD_START+197
-#define BMP_FOIL_16_H                       RID_SD_START+198
-#define BMP_FOIL_17_H                       RID_SD_START+199
-#define BMP_FOIL_18_H                       RID_SD_START+200
-#define BMP_FOIL_19_H                       RID_SD_START+201
-#define BMP_FOIL_20_H                       RID_SD_START+202
-#define BMP_FOIL_21_H                       RID_SD_START+203
-#define BMP_FOIL_22_H                       RID_SD_START+204
-#define BMP_FOIL_23_H                       RID_SD_START+205
-#define BMP_FOIL_24_H                       RID_SD_START+206
-#define BMP_FOILH_01_H                      RID_SD_START+207
-#define BMP_FOILH_02_H                      RID_SD_START+208
-#define BMP_FOILH_03_H                      RID_SD_START+209
-#define BMP_FOILH_04_H                      RID_SD_START+210
-#define BMP_FOILH_06_H                      RID_SD_START+211
-#define BMP_FOILN_01_H                      RID_SD_START+212
-
 #define BMP_PAGE_H                          RID_SD_START+213
 #define BMP_PAGEOBJS_H                      RID_SD_START+214
 #define BMP_OBJECTS_H                       RID_SD_START+215
@@ -231,15 +169,80 @@
 #define BMP_FADE_EFFECT_INDICATOR           RID_SD_START+331
 #define BMP_FADE_EFFECT_INDICATOR_H         RID_SD_START+332
 
-#define BMP_FOILH_09_H                      RID_SD_START+333
-#define BMP_FOIL_25_H                       RID_SD_START+334
-#define BMP_FOIL_26_H                       RID_SD_START+335
-#define BMP_FOIL_27                         RID_SD_START+336
-#define BMP_FOIL_27_H                       RID_SD_START+337
-
 #define BMP_COMMENTS_INDICATOR              RID_SD_START+338
 #define BMP_COMMENTS_INDICATOR_H            RID_SD_START+339
 
+#define BMP_ADDEMPTY_57X71                  RID_SD_START+340
+#define BMP_LAYOUT_ADDEMPTY_57X71_H         RID_SD_START+341
+#define BMP_LAYOUT_ADDHEAD01_57X71          RID_SD_START+342
+#define BMP_LAYOUT_ADDHEAD01_57X71_H        RID_SD_START+343
+#define BMP_LAYOUT_ADDHEAD02_57X71          RID_SD_START+344
+#define BMP_LAYOUT_ADDHEAD02_57X71_H        RID_SD_START+345
+#define BMP_LAYOUT_ADDHEAD02A_57X71         RID_SD_START+346
+#define BMP_LAYOUT_ADDHEAD02A_57X71_H       RID_SD_START+347
+#define BMP_LAYOUT_ADDHEAD02B_57X71         RID_SD_START+348
+#define BMP_LAYOUT_ADDHEAD02B_57X71_H       RID_SD_START+349
+#define BMP_LAYOUT_ADDHEAD03_57X71          RID_SD_START+350
+#define BMP_LAYOUT_ADDHEAD03_57X71_H        RID_SD_START+351
+#define BMP_LAYOUT_ADDHEAD03A_57X71         RID_SD_START+352
+#define BMP_LAYOUT_ADDHEAD03A_57X71_H       RID_SD_START+353
+#define BMP_LAYOUT_ADDHEAD04_57X71          RID_SD_START+354
+#define BMP_LAYOUT_ADDHEAD04_57X71_H        RID_SD_START+355
+#define BMP_LAYOUT_ADDHEAD06_57X71          RID_SD_START+356
+#define BMP_LAYOUT_ADDHEAD06_57X71_H        RID_SD_START+357
+#define BMP_LAYOUT_ADDTEXTONLY_57X71        RID_SD_START+358
+#define BMP_LAYOUT_ADDTEXTONLY_57X71_H      RID_SD_START+359
+#define BMP_LAYOUT_ADDVERTICAL01_57X71      RID_SD_START+360
+#define BMP_LAYOUT_ADDVERTICAL01_57X71_H    RID_SD_START+361
+#define BMP_LAYOUT_ADDVERTICAL02_57X71      RID_SD_START+362
+#define BMP_LAYOUT_ADDVERTICAL02_57X71_H    RID_SD_START+363
+#define BMP_LAYOUT_EMPTY_57X71              RID_SD_START+364
+#define BMP_LAYOUT_EMPTY_57X71_H            RID_SD_START+365
+#define BMP_LAYOUT_HEAD01_57X71             RID_SD_START+366
+#define BMP_LAYOUT_HEAD01_57X71_H           RID_SD_START+367
+#define BMP_LAYOUT_HEAD02_57X71             RID_SD_START+368
+#define BMP_LAYOUT_HEAD02_57X71_H           RID_SD_START+369
+#define BMP_LAYOUT_HEAD02A_57X71            RID_SD_START+370
+#define BMP_LAYOUT_HEAD02A_57X71_H          RID_SD_START+371
+#define BMP_LAYOUT_HEAD02B_57X71            RID_SD_START+372
+#define BMP_LAYOUT_HEAD02B_57X71_H          RID_SD_START+373
+#define BMP_LAYOUT_HEAD03_57X71             RID_SD_START+374
+#define BMP_LAYOUT_HEAD03_57X71_H           RID_SD_START+375
+#define BMP_LAYOUT_HEAD03A_57X71            RID_SD_START+376
+#define BMP_LAYOUT_HEAD03A_57X71_H          RID_SD_START+377
+#define BMP_LAYOUT_HEAD04_57X71             RID_SD_START+378
+#define BMP_LAYOUT_HEAD04_57X71_H           RID_SD_START+379
+#define BMP_LAYOUT_HEAD06_57X71             RID_SD_START+380
+#define BMP_LAYOUT_HEAD06_57X71_H           RID_SD_START+381
+#define BMP_LAYOUT_TEXTONLY_57X71           RID_SD_START+382
+#define BMP_LAYOUT_TEXTONLY_57X71_H         RID_SD_START+383
+#define BMP_LAYOUT_VERTICAL01_57X71         RID_SD_START+384
+#define BMP_LAYOUT_VERTICAL01_57X71_H       RID_SD_START+385
+#define BMP_LAYOUT_VERTICAL02_57X71         RID_SD_START+386
+#define BMP_LAYOUT_VERTICAL02_57X71_H       RID_SD_START+387
+
+#define BMP_FOILH_01                        RID_SD_START+388
+#define BMP_FOILH_01_H                      RID_SD_START+389
+#define BMP_FOILH_02                        RID_SD_START+390
+#define BMP_FOILH_02_H                      RID_SD_START+391
+#define BMP_FOILH_03                        RID_SD_START+392
+#define BMP_FOILH_03_H                      RID_SD_START+393
+#define BMP_FOILH_04                        RID_SD_START+394
+#define BMP_FOILH_04_H                      RID_SD_START+395
+#define BMP_FOILH_06                        RID_SD_START+396
+#define BMP_FOILH_06_H                      RID_SD_START+397
+#define BMP_FOILH_09                        RID_SD_START+398
+#define BMP_FOILH_09_H                      RID_SD_START+399
+
+#define BMP_PLACEHOLDER_CHART_57X71         RID_SD_START+400
+#define BMP_PLACEHOLDER_CHART_57X71_H       RID_SD_START+401
+#define BMP_PLACEHOLDER_IMAGE_57X71         RID_SD_START+402
+#define BMP_PLACEHOLDER_IMAGE_57X71_H       RID_SD_START+403
+#define BMP_PLACEHOLDER_MOVIE_57X71         RID_SD_START+404
+#define BMP_PLACEHOLDER_MOVIE_57X71_H       RID_SD_START+405
+#define BMP_PLACEHOLDER_TABLE_57X71         RID_SD_START+406
+#define BMP_PLACEHOLDER_TABLE_57X71_H       RID_SD_START+407
+
 // -----------------------------------------------------------------------------
 
 #define IMG_PIPETTE_H                       RID_APP_START+21
diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx
index 54164c08c138..a87d14541cd8 100644
--- a/sd/source/ui/inc/view/viewoverlaymanager.hxx
+++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx
@@ -31,10 +31,8 @@
 #ifndef _SD_VIEWOVERLAYMANAGER_HXX
 #define _SD_VIEWOVERLAYMANAGER_HXX
 
-//#include <com/sun/star/drawing/XDrawView.hpp>
-
 #include <vcl/image.hxx>
-#include <svtools/lstner.hxx>
+#include <svl/lstner.hxx>
 #include "EventMultiplexer.hxx"
 #include "ViewShellBase.hxx"
 
@@ -63,7 +61,6 @@ public:
     static const int ButtonCount = 4;
     static Image maLargeButtonImages[ButtonCount];
     static Image maSmallButtonImages[ButtonCount];
-    static USHORT mnButtonSlots[ButtonCount];
 
 private:
     void UpdateImages();
@@ -72,9 +69,6 @@ private:
     ULONG mnUpdateTagsEvent;
 
     ViewTagVector   maTagVector;
-
-//  ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawView > mxView;
-//  ::com::sun::star::uno::Reference< ::com::sun::star::office::XAnnotationAccess > mxCurrentPage;
 };
 
 }
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 5f9dbf0f6e74..afa5bb886f53 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -140,13 +140,16 @@ struct snewfoil_value_info
 
 static snewfoil_value_info notes[] =
 {
+/*
     {BMP_FOILN_01, BMP_FOILN_01_H, STR_AUTOLAYOUT_NOTES, WritingMode_LR_TB,
      AUTOLAYOUT_NOTES},
+*/
     {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
 };
 
 static snewfoil_value_info handout[] =
 {
+/*
     {BMP_FOILH_01, BMP_FOILH_01_H, STR_AUTOLAYOUT_HANDOUT1, WritingMode_LR_TB,
      AUTOLAYOUT_HANDOUT1},
     {BMP_FOILH_02, BMP_FOILH_02_H, STR_AUTOLAYOUT_HANDOUT2, WritingMode_LR_TB,
@@ -159,11 +162,13 @@ static snewfoil_value_info handout[] =
      AUTOLAYOUT_HANDOUT6},
     {BMP_FOILH_09, BMP_FOILH_09_H, STR_AUTOLAYOUT_HANDOUT9, WritingMode_LR_TB,
      AUTOLAYOUT_HANDOUT9},
+*/
     {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE},
 };
 
 static snewfoil_value_info standard[] =
 {
+/*
     {BMP_FOIL_20, BMP_FOIL_20_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB,        AUTOLAYOUT_NONE},
     {BMP_FOIL_00, BMP_FOIL_00_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB,       AUTOLAYOUT_TITLE},
     {BMP_FOIL_01, BMP_FOIL_01_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_ENUM},
@@ -177,7 +182,7 @@ static snewfoil_value_info standard[] =
     {BMP_FOIL_14, BMP_FOIL_14_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
     {BMP_FOIL_18, BMP_FOIL_18_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_4OBJ},
     {BMP_FOIL_27, BMP_FOIL_27_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_6CLIPART},
-/*
+/ *
     {BMP_FOIL_11, BMP_FOIL_11_H, STR_AUTOLAYOUT_OBJ, WritingMode_LR_TB,         AUTOLAYOUT_OBJ},
     {BMP_FOIL_02, BMP_FOIL_02_H, STR_AUTOLAYOUT_CHART, WritingMode_LR_TB,       AUTOLAYOUT_CHART},
     {BMP_FOIL_08, BMP_FOIL_08_H, STR_AUTOLAYOUT_TAB, WritingMode_LR_TB,         AUTOLAYOUT_TAB},
@@ -189,13 +194,13 @@ static snewfoil_value_info standard[] =
     {BMP_FOIL_13, BMP_FOIL_13_H, STR_AUTOLAYOUT_OBJTEXT, WritingMode_LR_TB,     AUTOLAYOUT_OBJTEXT},
     {BMP_FOIL_17, BMP_FOIL_17_H, STR_AUTOLAYOUT_TEXTOVEROBJ, WritingMode_LR_TB, AUTOLAYOUT_TEXTOVEROBJ},
     {BMP_FOIL_26, BMP_FOIL_26_H, STR_AUTOLAYOUT_4CLIPART, WritingMode_LR_TB,    AUTOLAYOUT_4CLIPART},
-*/
+* /
     // vertical
     {BMP_FOIL_21, BMP_FOIL_21_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART},
     {BMP_FOIL_22, BMP_FOIL_22_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
     {BMP_FOIL_23, BMP_FOIL_23_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
     {BMP_FOIL_24, BMP_FOIL_24_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART,   WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
-
+*/
     {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };
 
diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx
index d9fe0cb8ac65..8d6cb76dd7e9 100644
--- a/sd/source/ui/toolpanel/ToolPanel.cxx
+++ b/sd/source/ui/toolpanel/ToolPanel.cxx
@@ -108,7 +108,7 @@ sal_uInt32 ToolPanel::AddControl (
     }
 
     // Replace the old links for cycling between first and last child by
-    // current ones.
+    // current onems.
     if (nControlCount > 0)
     {
         ::Window* pFirst = mpControlContainer->GetControl(0)->GetWindow();
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 802296322c35..bc4debb1afb3 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -41,7 +41,10 @@
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 
+#include <tools/rcid.h>
+
 #include <vcl/help.hxx>
+#include <vcl/imagerepository.hxx>
 
 #include <svx/sdrpagewindow.hxx>
 #include <svx/sdrpaintwindow.hxx>
@@ -52,6 +55,7 @@
 
 #include "view/viewoverlaymanager.hxx"
 
+#include "res_bmp.hrc"
 #include "DrawDocShell.hxx"
 #include "DrawViewShell.hxx"
 #include "DrawController.hxx"
@@ -72,6 +76,36 @@ namespace sd {
 
 class ImageButtonHdl;
 
+// --------------------------------------------------------------------
+
+Image ViewOverlayManager::maSmallButtonImages[ViewOverlayManager::ButtonCount];
+Image ViewOverlayManager::maLargeButtonImages[ViewOverlayManager::ButtonCount];
+
+static USHORT gButtonSlots[ViewOverlayManager::ButtonCount] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
+static USHORT gButtonResId[ViewOverlayManager::ButtonCount] = { BMP_PLACEHOLDER_TABLE_57X71, BMP_PLACEHOLDER_CHART_57X71, BMP_PLACEHOLDER_IMAGE_57X71, BMP_PLACEHOLDER_MOVIE_57X71 };
+static USHORT gButtonResIdHc[ViewOverlayManager::ButtonCount] = { BMP_PLACEHOLDER_TABLE_57X71_H, BMP_PLACEHOLDER_CHART_57X71_H, BMP_PLACEHOLDER_IMAGE_57X71_H, BMP_PLACEHOLDER_MOVIE_57X71_H };
+
+// --------------------------------------------------------------------
+
+static Image loadImageResource( USHORT nId )
+{
+    /*
+    OUString sURL( OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/sd/bitmap/" ) ) );
+    sURL += OUString::valueOf( (sal_Int32)nId );
+
+    BitmapEx aBmpEx;
+    vcl::ImageRepository::loadImage( sURL, aBmpEx, false );
+    return Image( aBmpEx );
+    */
+
+    SdResId aResId( nId );
+    aResId.SetRT( RSC_BITMAP );
+
+    return Image( BitmapEx( aResId ) );
+}
+
+// --------------------------------------------------------------------
+
 const sal_uInt32 SMART_TAG_HDL_NUM = SAL_MAX_UINT32;
 
 class ChangePlaceholderTag : public SmartTag
@@ -306,7 +340,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList )
         Size aShapeSizePix = pDev->LogicToPixel(rSnapRect.GetSize());
         long nShapeSizePix = std::min(aShapeSizePix.Width(),aShapeSizePix.Height());
 
-        Image* pImages = (nShapeSizePix > 300) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0];
+        Image* pImages = &ViewOverlayManager::maLargeButtonImages[0]; //(nShapeSizePix > 300) ? &ViewOverlayManager::maLargeButtonImages[0] : &ViewOverlayManager::maSmallButtonImages[0];
 
         Size aButtonSize( pDev->PixelToLogic(pImages[0].GetSizePixel()) );
         if( 200 > nShapeSizePix )
@@ -340,7 +374,7 @@ void ChangePlaceholderTag::addCustomHandles( SdrHdlList& rHandlerList )
                 aImg = Image(b);
             }
 
-            ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, ViewOverlayManager::mnButtonSlots[i], aImg, aPoint );
+            ImageButtonHdl* pHdl = new ImageButtonHdl( xThis, gButtonSlots[i], aImg, aPoint );
             pHdl->SetObjHdlNum( SMART_TAG_HDL_NUM );
             pHdl->SetPageView( mrView.GetSdrPageView() );
 
@@ -385,12 +419,6 @@ void ChangePlaceholderTag::deselect()
 
 // --------------------------------------------------------------------
 
-Image ViewOverlayManager::maSmallButtonImages[ViewOverlayManager::ButtonCount];
-Image ViewOverlayManager::maLargeButtonImages[ViewOverlayManager::ButtonCount];
-USHORT ViewOverlayManager::mnButtonSlots[ViewOverlayManager::ButtonCount] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
-
-// --------------------------------------------------------------------
-
 static Image lcl_getslotimage( ::com::sun::star::uno::Reference<com::sun::star::frame::XFrame>& xFrame, USHORT nSID, BOOL b1, BOOL b2 )
 {
     rtl::OUString aSlotURL( RTL_CONSTASCII_USTRINGPARAM( "slot:" ));
@@ -433,8 +461,8 @@ void ViewOverlayManager::UpdateImages()
         Reference<XFrame> xFrame(mrBase.GetFrame()->GetTopFrame()->GetFrameInterface(), UNO_QUERY_THROW);
         for( int i = 0; i < ButtonCount; i++ )
         {
-            maSmallButtonImages[i] = lcl_getslotimage( xFrame, mnButtonSlots[i], FALSE, FALSE );
-            maLargeButtonImages[i] = lcl_getslotimage( xFrame, mnButtonSlots[i], TRUE, FALSE );
+            maSmallButtonImages[i] = loadImageResource( gButtonResId[i] );
+//          maLargeButtonImages[i] = lcl_getslotimage( xFrame, mnButtonSlots[i], TRUE, FALSE );
         }
     }
     catch( Exception& )