[Libreoffice-commits] core.git: vcl/inc vcl/source vcl/unx

[Caolán McNamara]

 vcl/inc/svids.hrc                   |    4 ++
 vcl/source/src/images.src           |   60 ++++++++++++++++++++++++++++++++++++
 vcl/unx/generic/window/salframe.cxx |    6 +--
 vcl/unx/gtk/gtksalframe.cxx         |    2 -
 vcl/unx/gtk3/gtk3gtkframe.cxx       |    2 -
 5 files changed, 69 insertions(+), 5 deletions(-)

New commits:
commit 65fca19cd5268eb8c162d5c8bd2328912a4aaea3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Mar 16 13:52:49 2017 +0000

    fix tinderbox build, ends up using gen backend and icons are missing
    
    put the icons back, and replace the bare 1 etc which hid the usage
    
    Change-Id: Id90de7b29a29141b448107adb4028407ed203e2a

diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 156402c4e5a1..1fba0b44f9b7 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -188,10 +188,14 @@
 #define SV_ICON_SIZE32_START                        21000
 #define SV_ICON_SIZE16_START                        23000
 
+#define SV_ICON_ID_OFFICE                               1
 #define SV_ICON_ID_TEXT                                 2
+#define SV_ICON_ID_TEXT_TEMPLATE                        3
 #define SV_ICON_ID_SPREADSHEET                          4
+#define SV_ICON_ID_SPREADSHEET_TEMPLATE                 5
 #define SV_ICON_ID_DRAWING                              6
 #define SV_ICON_ID_PRESENTATION                         8
+#define SV_ICON_ID_MASTER_DOCUMENT                     10
 #define SV_ICON_ID_TEMPLATE                            11
 #define SV_ICON_ID_DATABASE                            12
 #define SV_ICON_ID_FORMULA                             13
diff --git a/vcl/source/src/images.src b/vcl/source/src/images.src
index ec3141ea47d3..10b0eb7bf292 100644
--- a/vcl/source/src/images.src
+++ b/vcl/source/src/images.src
@@ -254,6 +254,21 @@ Bitmap (SV_ICON_SIZE16_START)
     File = "mainapp_16_8.png" ;
 };
 
+Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_OFFICE)
+{
+    File = "mainapp_48_8.png" ;
+};
+
+Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_OFFICE)
+{
+    File = "mainapp_32_8.png" ;
+};
+
+Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_OFFICE)
+{
+    File = "mainapp_16_8.png" ;
+};
+
 Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_TEXT)
 {
     File = "odt_48_8.png" ;
@@ -269,6 +284,21 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_TEXT)
     File = "odt_16_8.png" ;
 };
 
+Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_TEXT_TEMPLATE)
+{
+    File = "ott_48_8.png" ;
+};
+
+Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_TEXT_TEMPLATE)
+{
+    File = "ott_32_8.png" ;
+};
+
+Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_TEXT_TEMPLATE)
+{
+    File = "ott_16_8.png" ;
+};
+
 Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_SPREADSHEET)
 {
     File = "ods_48_8.png" ;
@@ -284,6 +314,21 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_SPREADSHEET)
     File = "ods_16_8.png" ;
 };
 
+Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
+{
+    File = "ots_48_8.png" ;
+};
+
+Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
+{
+    File = "ots_32_8.png" ;
+};
+
+Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_SPREADSHEET_TEMPLATE)
+{
+    File = "ots_16_8.png" ;
+};
+
 Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_DRAWING)
 {
     File = "odg_48_8.png" ;
@@ -314,6 +359,21 @@ Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_PRESENTATION)
     File = "odp_16_8.png" ;
 };
 
+Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_MASTER_DOCUMENT)
+{
+    File = "odm_48_8.png" ;
+};
+
+Bitmap (SV_ICON_SIZE32_START + SV_ICON_ID_MASTER_DOCUMENT)
+{
+    File = "odm_32_8.png" ;
+};
+
+Bitmap (SV_ICON_SIZE16_START + SV_ICON_ID_MASTER_DOCUMENT)
+{
+    File = "odm_16_8.png" ;
+};
+
 Bitmap (SV_ICON_SIZE48_START + SV_ICON_ID_DATABASE)
 {
     File = "odb_48_8.png" ;
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index f4dee74f99a3..ea6271946b1f 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -538,8 +538,8 @@ void X11SalFrame::Init( SalFrameStyleFlags nSalFrameStyle, SalX11Screen nXScreen
             try
             {
                 bOk = lcl_SelectAppIconPixmap( pDisplay_, m_nXScreen,
-                                               mnIconID != 1 ? mnIconID :
-                                               (mpParent ? mpParent->mnIconID : 1), 32,
+                                               mnIconID != SV_ICON_ID_OFFICE ? mnIconID :
+                                               (mpParent ? mpParent->mnIconID : SV_ICON_ID_OFFICE), 32,
                                                Hints.icon_pixmap, Hints.icon_mask, netwm_icon );
             }
             catch( css::uno::Exception& )
@@ -818,7 +818,7 @@ X11SalFrame::X11SalFrame( SalFrame *pParent, SalFrameStyleFlags nSalFrameStyle,
     mbShaded                    = false;
     mbFullScreen                = false;
 
-    mnIconID                    = 1; // ICON_LO_DEFAULT
+    mnIconID                    = SV_ICON_ID_OFFICE;
 
     m_pClipRectangles           = nullptr;
     m_nCurClipRect              = 0;
diff --git a/vcl/unx/gtk/gtksalframe.cxx b/vcl/unx/gtk/gtksalframe.cxx
index 24544f4ef29e..c03764ff3158 100644
--- a/vcl/unx/gtk/gtksalframe.cxx
+++ b/vcl/unx/gtk/gtksalframe.cxx
@@ -1046,7 +1046,7 @@ void GtkSalFrame::InitCommon()
     }
     updateScreenNumber();
 
-    SetIcon(1);
+    SetIcon(SV_ICON_ID_OFFICE);
 
     m_nWorkArea = pDisp->getWMAdaptor()->getCurrentWorkArea();
     /* #i64117# gtk sets a nice background pixmap
diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx
index 9bfe6027405c..9ecef8367aa0 100644
--- a/vcl/unx/gtk3/gtk3gtkframe.cxx
+++ b/vcl/unx/gtk3/gtk3gtkframe.cxx
@@ -1158,7 +1158,7 @@ void GtkSalFrame::InitCommon()
     }
     updateScreenNumber();
 
-    SetIcon(1);
+    SetIcon(SV_ICON_ID_OFFICE);
 }
 
 GtkSalFrame *GtkSalFrame::getFromWindow( GtkWindow *pWindow )