nativeb: #i110826# add separate template button to StartCenter again, add HC images for StartCenter

2 files changed, 81 insertions, 43 deletions

diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index e255d586392a..e4d37d1fe059 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -164,16 +164,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     {
     }
 
-    // get icon images from vcl resource and set them on the appropriate buttons
-    loadImage( FwkResId( BMP_BACKING_WRITER ), maWriterButton );
-    loadImage( FwkResId( BMP_BACKING_CALC ), maCalcButton );
-    loadImage( FwkResId( BMP_BACKING_IMPRESS ), maImpressButton );
-    loadImage( FwkResId( BMP_BACKING_DRAW ), maDrawButton );
-    loadImage( FwkResId( BMP_BACKING_DATABASE ), maDBButton );
-    loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton );
-    loadImage( FwkResId( BMP_BACKING_FOLDER ), maOpenButton );
-    loadImage( FwkResId( BMP_BACKING_FOLDER ), maTemplateButton );
-
     String aExtHelpText( FwkResId( STR_BACKING_EXTHELP ) );
     String aRegHelpText( FwkResId( STR_BACKING_REGHELP ) );
     String aInfoHelpText( FwkResId( STR_BACKING_INFOHELP ) );
@@ -188,10 +178,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 
     SetStyle( GetStyle() | WB_DIALOGCONTROL );
 
-    // add some breathing space for the images
-    maButtonImageSize.Width() += 12;
-    maButtonImageSize.Height() += 12;
-
     // force tab cycling in toolbox
     maToolbox.SetStyle( maToolbox.GetStyle() | WB_FORCETABCYCLE );
 
@@ -237,6 +223,11 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 
     // init background
     initBackground();
+
+    // add some breathing space for the images
+    maButtonImageSize.Width() += 12;
+    maButtonImageSize.Height() += 12;
+
 }
 
 
@@ -325,6 +316,17 @@ void BackingWindow::initBackground()
         else
             mnBtnPos = maBackgroundLeft.GetSizePixel().Width() + 40;
     }
+
+    // get icon images from fwk resource and set them on the appropriate buttons
+    loadImage( FwkResId( BMP_BACKING_WRITER ), maWriterButton );
+    loadImage( FwkResId( BMP_BACKING_CALC ), maCalcButton );
+    loadImage( FwkResId( BMP_BACKING_IMPRESS ), maImpressButton );
+    loadImage( FwkResId( BMP_BACKING_DRAW ), maDrawButton );
+    loadImage( FwkResId( BMP_BACKING_DATABASE ), maDBButton );
+    loadImage( FwkResId( BMP_BACKING_FORMULA ), maMathButton );
+    loadImage( FwkResId( BMP_BACKING_OPENFILE ), maOpenButton );
+    loadImage( FwkResId( BMP_BACKING_OPENTEMPLATE ), maTemplateButton );
+
 }
 
 void BackingWindow::initControls()
@@ -551,7 +553,7 @@ void BackingWindow::layoutButton(
 
     long nTextWidth = i_rBtn.GetTextWidth( i_rBtn.GetText() );
 
-    nTextWidth += maButtonImageSize.Width();
+    nTextWidth += maButtonImageSize.Width() + 8; // add some fuzz to be on the safe side
     if( nColumn >= 0 && nColumn < static_cast<int>(sizeof(mnColumnWidth)/sizeof(mnColumnWidth[0])) )
     {
         if( nTextWidth > mnColumnWidth[nColumn] )
diff --git a/framework/source/services/fwk_services.src b/framework/source/services/fwk_services.src
index 7e2ee3253e71..7ad8b4c3cede 100644
--- a/framework/source/services/fwk_services.src
+++ b/framework/source/services/fwk_services.src
@@ -53,34 +53,6 @@ Window DLG_BACKING
     {
         Text [ en-US ] = "~Open a document...";
     };
-    Bitmap BMP_BACKING_WRITER
-    {
-        File = "odt_32.png";
-    };
-    Bitmap BMP_BACKING_CALC
-    {
-        File = "ods_32.png";
-    };
-    Bitmap BMP_BACKING_IMPRESS
-    {
-        File = "odp_32.png";
-    };
-    Bitmap BMP_BACKING_DRAW
-    {
-        File = "odg_32.png";
-    };
-    Bitmap BMP_BACKING_DATABASE
-    {
-        File = "odb_32.png";
-    };
-    Bitmap BMP_BACKING_FORMULA
-    {
-        File = "odf_32.png";
-    };
-    Bitmap BMP_BACKING_FOLDER
-    {
-        File = "folder_32.png";
-    };
     String STR_BACKING_EXTHELP
     {
         Text [ en-US ] = "Add new features to %PRODUCTNAME";
@@ -137,6 +109,38 @@ Resource RES_BACKING_IMAGES
     {
         File = "addtemplate_32.png";
     };
+    Bitmap BMP_BACKING_WRITER
+    {
+        File = "odt_32.png";
+    };
+    Bitmap BMP_BACKING_CALC
+    {
+        File = "ods_32.png";
+    };
+    Bitmap BMP_BACKING_IMPRESS
+    {
+        File = "odp_32.png";
+    };
+    Bitmap BMP_BACKING_DRAW
+    {
+        File = "odg_32.png";
+    };
+    Bitmap BMP_BACKING_DATABASE
+    {
+        File = "odb_32.png";
+    };
+    Bitmap BMP_BACKING_FORMULA
+    {
+        File = "odf_32.png";
+    };
+    Bitmap BMP_BACKING_OPENFILE
+    {
+        File = "folder_32.png";
+    };
+    Bitmap BMP_BACKING_OPENTEMPLATE
+    {
+        File = "templates_32.png";
+    };
 };
 
 Resource RES_BACKING_IMAGES_HC
@@ -177,6 +181,38 @@ Resource RES_BACKING_IMAGES_HC
     {
         File = "template_hc.png";
     };
+    Bitmap BMP_BACKING_WRITER
+    {
+        File = "odt_32_hc.png";
+    };
+    Bitmap BMP_BACKING_CALC
+    {
+        File = "ods_32_hc.png";
+    };
+    Bitmap BMP_BACKING_IMPRESS
+    {
+        File = "odp_32_hc.png";
+    };
+    Bitmap BMP_BACKING_DRAW
+    {
+        File = "odg_32_hc.png";
+    };
+    Bitmap BMP_BACKING_DATABASE
+    {
+        File = "odb_32_hc.png";
+    };
+    Bitmap BMP_BACKING_FORMULA
+    {
+        File = "odf_32_hc.png";
+    };
+    Bitmap BMP_BACKING_OPENFILE
+    {
+        File = "folder_32_hc.png";
+    };
+    Bitmap BMP_BACKING_OPENTEMPLATE
+    {
+        File = "templates_32_hc.png";
+    };
 };
 
 Window WIN_TABWINDOW