some placeholder bitmap finetuning

4 files changed, 121 insertions, 227 deletions

diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index f17bec667bfa..b0adfebdde7e 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -34,197 +34,117 @@
 #include "res_bmp.hrc"
 
 // preview bitmaps for layouts
-Bitmap BMP_LAYOUT_ADDEMPTY_57X71
+Bitmap BMP_LAYOUT_EMPTY
 {
-    File = "layout_addempty_57x71.png";
+    File = "layout_empty.png";
 };
-Bitmap BMP_LAYOUT_ADDEMPTY_57X71_H
+Bitmap BMP_LAYOUT_EMPTY_H
 {
-    File = "layout_addempty_57x71_h.png";
+    File = "layout_empty_h.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD01_57X71
+Bitmap BMP_LAYOUT_HEAD01
 {
-    File = "layout_addhead01_57x71.png";
+    File = "layout_head01.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD01_57X71_H
+Bitmap BMP_LAYOUT_HEAD01_H
 {
-    File = "layout_addhead01_57x71_h.png";
+    File = "layout_head01_h.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD02_57X71
+Bitmap BMP_LAYOUT_HEAD02
 {
-    File = "layout_addhead02_57x71.png";
+    File = "layout_head02.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD02_57X71_H
+Bitmap BMP_LAYOUT_HEAD02_H
 {
-    File = "layout_addhead02_57x71_h.png";
+    File = "layout_head02_h.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD02A_57X71
+Bitmap BMP_LAYOUT_HEAD02A
 {
-    File = "layout_addhead02a_57x71.png";
+    File = "layout_head02a.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD02A_57X71_H
+Bitmap BMP_LAYOUT_HEAD02A_H
 {
-    File = "layout_addhead02a_57x71_h.png";
+    File = "layout_head02a_h.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD02B_57X71
+Bitmap BMP_LAYOUT_HEAD02B
 {
-    File = "layout_addhead02b_57x71.png";
+    File = "layout_head02b.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD02B_57X71_H
+Bitmap BMP_LAYOUT_HEAD02B_H
 {
-    File = "layout_addhead02b_57x71_h.png";
+    File = "layout_head02b_h.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD03_57X71
+Bitmap BMP_LAYOUT_HEAD03
 {
-    File = "layout_addhead03_57x71.png";
+    File = "layout_head03.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD03_57X71_H
+Bitmap BMP_LAYOUT_HEAD03_H
 {
-    File = "layout_addhead03_57x71_h.png";
+    File = "layout_head03_h.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD03A_57X71
+Bitmap BMP_LAYOUT_HEAD03A
 {
-    File = "layout_addhead03a_57x71.png";
+    File = "layout_head03a.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD03A_57X71_H
+Bitmap BMP_LAYOUT_HEAD03A_H
 {
-    File = "layout_addhead03a_57x71_h.png";
+    File = "layout_head03a_h.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD04_57X71
+Bitmap BMP_LAYOUT_HEAD03B
 {
-    File = "layout_addhead04_57x71.png";
+    File = "layout_head03b.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD04_57X71_H
+Bitmap BMP_LAYOUT_HEAD03B_H
 {
-    File = "layout_addhead04_57x71_h.png";
+    File = "layout_head03b_h.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD06_57X71
+Bitmap BMP_LAYOUT_HEAD03C
 {
-    File = "layout_addhead06_57x71.png";
+    File = "layout_head03c.png";
 };
-Bitmap BMP_LAYOUT_ADDHEAD06_57X71_H
+Bitmap BMP_LAYOUT_HEAD03C_H
 {
-    File = "layout_addhead06_57x71_h.png";
+    File = "layout_head03c_h.png";
 };
-Bitmap BMP_LAYOUT_ADDTEXTONLY_57X71
+Bitmap BMP_LAYOUT_HEAD04
 {
-    File = "layout_addtextonly_57x71.png";
+    File = "layout_head04.png";
 };
-Bitmap BMP_LAYOUT_ADDTEXTONLY_57X71_H
+Bitmap BMP_LAYOUT_HEAD04_H
 {
-    File = "layout_addtextonly_57x71_h.png";
+    File = "layout_head04_h.png";
 };
-Bitmap BMP_LAYOUT_ADDVERTICAL01_57X71
+Bitmap BMP_LAYOUT_HEAD06
 {
-    File = "layout_addvertical01_57x71.png";
+    File = "layout_head06.png";
 };
-Bitmap BMP_LAYOUT_ADDVERTICAL01_57X71_H
+Bitmap BMP_LAYOUT_HEAD06_H
 {
-    File = "layout_addvertical01_57x71_h.png";
+    File = "layout_head06_h.png";
 };
-Bitmap BMP_LAYOUT_ADDVERTICAL02_57X71
+Bitmap BMP_LAYOUT_TEXTONLY
 {
-    File = "layout_addvertical02_57x71.png";
+    File = "layout_textonly.png";
 };
-Bitmap BMP_LAYOUT_ADDVERTICAL02_57X71_H
+Bitmap BMP_LAYOUT_TEXTONLY_H
 {
-    File = "layout_addvertical02_57x71_h.png";
+    File = "layout_textonly_h.png";
 };
-Bitmap BMP_LAYOUT_EMPTY_57X71
+Bitmap BMP_LAYOUT_VERTICAL01
 {
-    File = "layout_empty_57x71.png";
+    File = "layout_vertical01.png";
 };
-Bitmap BMP_LAYOUT_EMPTY_57X71_H
+Bitmap BMP_LAYOUT_VERTICAL01_H
 {
-    File = "layout_empty_57x71_h.png";
+    File = "layout_vertical01_h.png";
 };
-Bitmap BMP_LAYOUT_HEAD01_57X71
+Bitmap BMP_LAYOUT_VERTICAL02
 {
-    File = "layout_head01_57x71.png";
+    File = "layout_vertical02.png";
 };
-Bitmap BMP_LAYOUT_HEAD01_57X71_H
+Bitmap BMP_LAYOUT_VERTICAL02_H
 {
-    File = "layout_head01_57x71_h.png";
-};
-Bitmap BMP_LAYOUT_HEAD02_57X71
-{
-    File = "layout_head02_57x71.png";
-};
-Bitmap BMP_LAYOUT_HEAD02_57X71_H
-{
-    File = "layout_head02_57x71_h.png";
-};
-Bitmap BMP_LAYOUT_HEAD02A_57X71
-{
-    File = "layout_head02a_57x71.png";
-};
-Bitmap BMP_LAYOUT_HEAD02A_57X71_H
-{
-    File = "layout_head02a_57x71_h.png";
-};
-Bitmap BMP_LAYOUT_HEAD02B_57X71
-{
-    File = "layout_head02b_57x71.png";
-};
-Bitmap BMP_LAYOUT_HEAD02B_57X71_H
-{
-    File = "layout_head02b_57x71_h.png";
-};
-Bitmap BMP_LAYOUT_HEAD03_57X71
-{
-    File = "layout_head03_57x71.png";
-};
-Bitmap BMP_LAYOUT_HEAD03_57X71_H
-{
-    File = "layout_head03_57x71_h.png";
-};
-Bitmap BMP_LAYOUT_HEAD03A_57X71
-{
-    File = "layout_head03a_57x71.png";
-};
-Bitmap BMP_LAYOUT_HEAD03A_57X71_H
-{
-    File = "layout_head03a_57x71_h.png";
-};
-Bitmap BMP_LAYOUT_HEAD04_57X71
-{
-    File = "layout_head04_57x71.png";
-};
-Bitmap BMP_LAYOUT_HEAD04_57X71_H
-{
-    File = "layout_head04_57x71_h.png";
-};
-Bitmap BMP_LAYOUT_HEAD06_57X71
-{
-    File = "layout_head06_57x71.png";
-};
-Bitmap BMP_LAYOUT_HEAD06_57X71_H
-{
-    File = "layout_head06_57x71_h.png";
-};
-Bitmap BMP_LAYOUT_TEXTONLY_57X71
-{
-    File = "layout_textonly_57x71.png";
-};
-Bitmap BMP_LAYOUT_TEXTONLY_57X71_H
-{
-    File = "layout_textonly_57x71_h.png";
-};
-Bitmap BMP_LAYOUT_VERTICAL01_57X71
-{
-    File = "layout_vertical01_57x71.png";
-};
-Bitmap BMP_LAYOUT_VERTICAL01_57X71_H
-{
-    File = "layout_vertical01_57x71_h.png";
-};
-Bitmap BMP_LAYOUT_VERTICAL02_57X71
-{
-    File = "layout_vertical02_57x71.png";
-};
-Bitmap BMP_LAYOUT_VERTICAL02_57X71_H
-{
-    File = "layout_vertical02_57x71_h.png";
+    File = "layout_vertical02_h.png";
 };
 
 Bitmap BMP_FOILH_01
diff --git a/sd/source/ui/dlg/layoutdialog.cxx b/sd/source/ui/dlg/layoutdialog.cxx
index a7ddfe48f55c..613fd46fdfca 100644
--- a/sd/source/ui/dlg/layoutdialog.cxx
+++ b/sd/source/ui/dlg/layoutdialog.cxx
@@ -83,45 +83,41 @@ struct snewfoil_value_info
 };
 static snewfoil_value_info standard[] =
 {
-    {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_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_TEXT2OBJ},
-    {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_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},
+    {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB,        AUTOLAYOUT_NONE},
+    {BMP_LAYOUT_HEAD03, BMP_LAYOUT_HEAD03_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB,       AUTOLAYOUT_TITLE},
+    {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_ENUM},
+    {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB,       AUTOLAYOUT_2TEXT},
+    {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB,  AUTOLAYOUT_ONLY_TITLE},
+    {BMP_LAYOUT_TEXTONLY, BMP_LAYOUT_TEXTONLY_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB,   AUTOLAYOUT_ONLY_TEXT},
+    {BMP_LAYOUT_HEAD03B, BMP_LAYOUT_HEAD03B_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_2OBJTEXT},
+    {BMP_LAYOUT_HEAD03C, BMP_LAYOUT_HEAD03C_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_TEXT2OBJ},
+    {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
+    {BMP_LAYOUT_HEAD02B, BMP_LAYOUT_HEAD02B_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
+    {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_4OBJ},
+    {BMP_LAYOUT_HEAD06, BMP_LAYOUT_HEAD06_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_6CLIPART},
     {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };
 
 static snewfoil_value_info v_standard[] =
 {
     // vertical
-    {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},
+    {BMP_LAYOUT_VERTICAL02, BMP_LAYOUT_VERTICAL02_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART},
+    {BMP_LAYOUT_VERTICAL01, BMP_LAYOUT_VERTICAL01_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
+    {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
+    {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART,   WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
     {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };
 
 // -----------------------------------------------------------------------
 
-static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, const bool bHighContrast, const bool bInsertPage )
+static void fillLayoutValueSet( ValueSet* pValue, snewfoil_value_info* pInfo, const bool bHighContrast )
 {
-    USHORT nResOffset = bInsertPage ? (BMP_LAYOUT_ADDEMPTY_57X71) - (BMP_LAYOUT_EMPTY_57X71) : 0;
-
     Size aLayoutItemSize;
     for( ; pInfo->mnBmpResId; pInfo++ )
     {
         String aText( SdResId( pInfo->mnStrResId ) );
-        BitmapEx aBmp( SdResId( (bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId) + nResOffset ) );
-        aBmp.Expand( 3, 3, 0, TRUE );
+        BitmapEx aBmp( SdResId( (bHighContrast ? pInfo->mnHCBmpResId : pInfo->mnBmpResId) ) );
+
         pValue->InsertItem( static_cast<USHORT>(pInfo->maAutoLayout)+1, aBmp, aText );
 
         aLayoutItemSize.Width() = std::max( aLayoutItemSize.Width(), aBmp.GetSizePixel().Width() );
@@ -167,7 +163,7 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pP
     mpLayoutSet1->EnableFullItemMode( FALSE );
     mpLayoutSet1->SetColor( GetControlBackground() );
 
-    fillLayoutValueSet( mpLayoutSet1, &standard[0], bHighContrast, bInsertPage );
+    fillLayoutValueSet( mpLayoutSet1, &standard[0], bHighContrast );
 
     if( bVerticalEnabled )
         appendEntry( -1, aTitle1 );
@@ -183,7 +179,7 @@ SdLayoutDialogContent::SdLayoutDialogContent( ViewShellBase& rBase, ::Window* pP
         mpLayoutSet2->EnableFullItemMode( FALSE );
         mpLayoutSet2->SetColor( GetControlBackground() );
 
-        fillLayoutValueSet( mpLayoutSet2, &v_standard[0], bHighContrast, bInsertPage );
+        fillLayoutValueSet( mpLayoutSet2, &v_standard[0], bHighContrast );
 
         appendEntry( -1, aTitle2 );
         appendEntry( 1, mpLayoutSet2 );
diff --git a/sd/source/ui/inc/res_bmp.hrc b/sd/source/ui/inc/res_bmp.hrc
index 43d0d85aa65f..ae6cdc1a20e1 100644
--- a/sd/source/ui/inc/res_bmp.hrc
+++ b/sd/source/ui/inc/res_bmp.hrc
@@ -170,54 +170,34 @@
 #define BMP_COMMENTS_INDICATOR              RID_SD_START+338
 #define BMP_COMMENTS_INDICATOR_H            RID_SD_START+339
 
-#define BMP_LAYOUT_EMPTY_57X71              RID_SD_START+340
-#define BMP_LAYOUT_EMPTY_57X71_H            RID_SD_START+341
-#define BMP_LAYOUT_HEAD01_57X71             RID_SD_START+342
-#define BMP_LAYOUT_HEAD01_57X71_H           RID_SD_START+343
-#define BMP_LAYOUT_HEAD02_57X71             RID_SD_START+344
-#define BMP_LAYOUT_HEAD02_57X71_H           RID_SD_START+345
-#define BMP_LAYOUT_HEAD02A_57X71            RID_SD_START+346
-#define BMP_LAYOUT_HEAD02A_57X71_H          RID_SD_START+347
-#define BMP_LAYOUT_HEAD02B_57X71            RID_SD_START+348
-#define BMP_LAYOUT_HEAD02B_57X71_H          RID_SD_START+349
-#define BMP_LAYOUT_HEAD03_57X71             RID_SD_START+350
-#define BMP_LAYOUT_HEAD03_57X71_H           RID_SD_START+351
-#define BMP_LAYOUT_HEAD03A_57X71            RID_SD_START+352
-#define BMP_LAYOUT_HEAD03A_57X71_H          RID_SD_START+353
-#define BMP_LAYOUT_HEAD04_57X71             RID_SD_START+354
-#define BMP_LAYOUT_HEAD04_57X71_H           RID_SD_START+355
-#define BMP_LAYOUT_HEAD06_57X71             RID_SD_START+356
-#define BMP_LAYOUT_HEAD06_57X71_H           RID_SD_START+357
-#define BMP_LAYOUT_TEXTONLY_57X71           RID_SD_START+358
-#define BMP_LAYOUT_TEXTONLY_57X71_H         RID_SD_START+359
-#define BMP_LAYOUT_VERTICAL01_57X71         RID_SD_START+360
-#define BMP_LAYOUT_VERTICAL01_57X71_H       RID_SD_START+361
-#define BMP_LAYOUT_VERTICAL02_57X71         RID_SD_START+362
-#define BMP_LAYOUT_VERTICAL02_57X71_H       RID_SD_START+363
-#define BMP_LAYOUT_ADDEMPTY_57X71           RID_SD_START+364
-#define BMP_LAYOUT_ADDEMPTY_57X71_H         RID_SD_START+365
-#define BMP_LAYOUT_ADDHEAD01_57X71          RID_SD_START+366
-#define BMP_LAYOUT_ADDHEAD01_57X71_H        RID_SD_START+367
-#define BMP_LAYOUT_ADDHEAD02_57X71          RID_SD_START+368
-#define BMP_LAYOUT_ADDHEAD02_57X71_H        RID_SD_START+369
-#define BMP_LAYOUT_ADDHEAD02A_57X71         RID_SD_START+370
-#define BMP_LAYOUT_ADDHEAD02A_57X71_H       RID_SD_START+371
-#define BMP_LAYOUT_ADDHEAD02B_57X71         RID_SD_START+372
-#define BMP_LAYOUT_ADDHEAD02B_57X71_H       RID_SD_START+373
-#define BMP_LAYOUT_ADDHEAD03_57X71          RID_SD_START+374
-#define BMP_LAYOUT_ADDHEAD03_57X71_H        RID_SD_START+375
-#define BMP_LAYOUT_ADDHEAD03A_57X71         RID_SD_START+376
-#define BMP_LAYOUT_ADDHEAD03A_57X71_H       RID_SD_START+377
-#define BMP_LAYOUT_ADDHEAD04_57X71          RID_SD_START+378
-#define BMP_LAYOUT_ADDHEAD04_57X71_H        RID_SD_START+379
-#define BMP_LAYOUT_ADDHEAD06_57X71          RID_SD_START+380
-#define BMP_LAYOUT_ADDHEAD06_57X71_H        RID_SD_START+381
-#define BMP_LAYOUT_ADDTEXTONLY_57X71        RID_SD_START+382
-#define BMP_LAYOUT_ADDTEXTONLY_57X71_H      RID_SD_START+383
-#define BMP_LAYOUT_ADDVERTICAL01_57X71      RID_SD_START+384
-#define BMP_LAYOUT_ADDVERTICAL01_57X71_H    RID_SD_START+385
-#define BMP_LAYOUT_ADDVERTICAL02_57X71      RID_SD_START+386
-#define BMP_LAYOUT_ADDVERTICAL02_57X71_H    RID_SD_START+387
+#define BMP_LAYOUT_EMPTY                    RID_SD_START+340
+#define BMP_LAYOUT_EMPTY_H                  RID_SD_START+341
+#define BMP_LAYOUT_HEAD01                   RID_SD_START+342
+#define BMP_LAYOUT_HEAD01_H                 RID_SD_START+343
+#define BMP_LAYOUT_HEAD02                   RID_SD_START+344
+#define BMP_LAYOUT_HEAD02_H                 RID_SD_START+345
+#define BMP_LAYOUT_HEAD02A                  RID_SD_START+346
+#define BMP_LAYOUT_HEAD02A_H                RID_SD_START+347
+#define BMP_LAYOUT_HEAD02B                  RID_SD_START+348
+#define BMP_LAYOUT_HEAD02B_H                RID_SD_START+349
+#define BMP_LAYOUT_HEAD03                   RID_SD_START+350
+#define BMP_LAYOUT_HEAD03_H                 RID_SD_START+351
+#define BMP_LAYOUT_HEAD03A                  RID_SD_START+352
+#define BMP_LAYOUT_HEAD03A_H                RID_SD_START+353
+#define BMP_LAYOUT_HEAD03B                  RID_SD_START+354
+#define BMP_LAYOUT_HEAD03B_H                RID_SD_START+355
+#define BMP_LAYOUT_HEAD03C                  RID_SD_START+356
+#define BMP_LAYOUT_HEAD03C_H                RID_SD_START+357
+#define BMP_LAYOUT_HEAD04                   RID_SD_START+358
+#define BMP_LAYOUT_HEAD04_H                 RID_SD_START+359
+#define BMP_LAYOUT_HEAD06                   RID_SD_START+360
+#define BMP_LAYOUT_HEAD06_H                 RID_SD_START+361
+#define BMP_LAYOUT_TEXTONLY                 RID_SD_START+362
+#define BMP_LAYOUT_TEXTONLY_H               RID_SD_START+363
+#define BMP_LAYOUT_VERTICAL01               RID_SD_START+364
+#define BMP_LAYOUT_VERTICAL01_H             RID_SD_START+365
+#define BMP_LAYOUT_VERTICAL02               RID_SD_START+366
+#define BMP_LAYOUT_VERTICAL02_H             RID_SD_START+367
 
 #define BMP_FOILH_01                        RID_SD_START+388
 #define BMP_FOILH_01_H                      RID_SD_START+389
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index c07049b86baf..a69f91683282 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -164,26 +164,24 @@ static snewfoil_value_info handout[] =
 
 static snewfoil_value_info standard[] =
 {
-    {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_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_TEXT2OBJ},
-    {BMP_LAYOUT_HEAD02B_57X71, BMP_LAYOUT_HEAD02B_57X71_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},
+    {BMP_LAYOUT_EMPTY, BMP_LAYOUT_EMPTY_H, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB,        AUTOLAYOUT_NONE},
+    {BMP_LAYOUT_HEAD03, BMP_LAYOUT_HEAD03_H, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB,       AUTOLAYOUT_TITLE},
+    {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_ENUM},
+    {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB,       AUTOLAYOUT_2TEXT},
+    {BMP_LAYOUT_HEAD01, BMP_LAYOUT_HEAD01_H, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB,  AUTOLAYOUT_ONLY_TITLE},
+    {BMP_LAYOUT_TEXTONLY, BMP_LAYOUT_TEXTONLY_H, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB,   AUTOLAYOUT_ONLY_TEXT},
+    {BMP_LAYOUT_HEAD03B, BMP_LAYOUT_HEAD03B_H, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_2OBJTEXT},
+    {BMP_LAYOUT_HEAD03C, BMP_LAYOUT_HEAD03C_H, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_TEXT2OBJ},
+    {BMP_LAYOUT_HEAD03A, BMP_LAYOUT_HEAD03A_H, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
+    {BMP_LAYOUT_HEAD02B, BMP_LAYOUT_HEAD02B_H, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
+    {BMP_LAYOUT_HEAD04, BMP_LAYOUT_HEAD04_H, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB,        AUTOLAYOUT_4OBJ},
+    {BMP_LAYOUT_HEAD06, BMP_LAYOUT_HEAD06_H, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB,    AUTOLAYOUT_6CLIPART},
 
     // vertical
-    {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},
+    {BMP_LAYOUT_VERTICAL02, BMP_LAYOUT_VERTICAL02_H, STR_AL_VERT_TITLE_TEXT_CHART, WritingMode_TB_RL,AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART},
+    {BMP_LAYOUT_VERTICAL01, BMP_LAYOUT_VERTICAL01_H, STR_AL_VERT_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE},
+    {BMP_LAYOUT_HEAD02, BMP_LAYOUT_HEAD02_H, STR_AL_TITLE_VERT_OUTLINE, WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE},
+    {BMP_LAYOUT_HEAD02A, BMP_LAYOUT_HEAD02A_H, STR_AL_TITLE_VERT_OUTLINE_CLIPART,   WritingMode_TB_RL, AUTOLAYOUT_TITLE_VERTICAL_OUTLINE_CLIPART},
     {0, 0, 0, WritingMode_LR_TB, AUTOLAYOUT_NONE}
 };