[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - include/svtools svtools/source

[Caolán McNamara]

 include/svtools/imagemgr.hrc     |    1 +
 svtools/source/misc/imagemgr.src |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 26b05891ffa465df8953eac005489b4d4fae4922
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Aug 3 12:58:54 2016 +0100

    Resolves: tdf#96873 include template image to make it available in help
    
    alternatively move it into the helpimg dir and change the usage
    in helpcontent2, but do it this way to keep it together with the others
    
    Change-Id: I84c6b10aed948a5fea835dc86bade5a4390c716b
    (cherry picked from commit 61062608a27ceaef5424203d849f88c7fb77b8d0)
    Reviewed-on: https://gerrit.libreoffice.org/27826
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/include/svtools/imagemgr.hrc b/include/svtools/imagemgr.hrc
index fc09804..4d6f313 100644
--- a/include/svtools/imagemgr.hrc
+++ b/include/svtools/imagemgr.hrc
@@ -58,6 +58,7 @@
 #define IMG_GLOBAL_DOC                  (IMAGELIST_START + 150)
 #define IMG_DRAW                        (IMAGELIST_START + 151)
 #define IMG_DRAWTEMPLATE                (IMAGELIST_START + 152)
+#define IMG_TEMPLATE                    (IMAGELIST_START + 166)
 #define IMG_OO_DATABASE_DOC             (IMAGELIST_START + 169)
 #define IMG_OO_DRAW_DOC                 (IMAGELIST_START + 170)
 #define IMG_OO_MATH_DOC                 (IMAGELIST_START + 171)
diff --git a/svtools/source/misc/imagemgr.src b/svtools/source/misc/imagemgr.src
index c750faa..de0d7d8 100644
--- a/svtools/source/misc/imagemgr.src
+++ b/svtools/source/misc/imagemgr.src
@@ -78,6 +78,7 @@
     IMG_SVM ; \
     IMG_TABLE ; \
     IMG_TEXTFILE ; \
+    IMG_TEMPLATE ; \
     IMG_TIFF ; \
     IMG_WMF ; \
     IMG_WRITER ; \
@@ -94,7 +95,7 @@ ImageList RID_SVTOOLS_IMAGELIST_BIG
     };
     IdCount =
     {
-        66 ;
+        67 ;
     };
 };
 
@@ -108,7 +109,7 @@ ImageList RID_SVTOOLS_IMAGELIST_SMALL
     };
     IdCount =
     {
-        66;
+        67;
     };
 };