[Libreoffice-commits] core.git: 4 commits - icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_svg icon-themes/crystal icon-themes/elementary icon-themes/galaxy icon-themes/hicontrast icon-themes/oxygen icon-themes/sifr icon-themes/tango icon-themes/tango_testing sc/inc sc/source sc/uiconfig sd/uiconfig

Caolán McNamara caolanm at redhat.com
Thu Dec 22 09:02:24 UTC 2016 

 dev/null                                     |binary
 icon-themes/breeze/links.txt                 |   16 
 icon-themes/breeze/sc/res/na03.png           |binary
 icon-themes/breeze/sc/res/na05.png           |binary
 icon-themes/breeze/sc/res/na06.png           |binary
 icon-themes/breeze/sc/res/na07.png           |binary
 icon-themes/breeze/sc/res/nc01.png           |binary
 icon-themes/breeze/sc/res/nc02.png           |binary
 icon-themes/breeze_dark/links.txt            |   16 
 icon-themes/breeze_dark/sc/res/na03.png      |binary
 icon-themes/breeze_dark/sc/res/na05.png      |binary
 icon-themes/breeze_dark/sc/res/na06.png      |binary
 icon-themes/breeze_dark/sc/res/na07.png      |binary
 icon-themes/breeze_dark/sc/res/nc01.png      |binary
 icon-themes/breeze_dark/sc/res/nc02.png      |binary
 icon-themes/breeze_svg/links.txt             |   16 
 icon-themes/breeze_svg/sc/imglst/na03.svg    |  116 
 icon-themes/breeze_svg/sc/imglst/na05.svg    |  112 
 icon-themes/breeze_svg/sc/imglst/na06.svg    |  112 
 icon-themes/breeze_svg/sc/imglst/na07.svg    |  102 
 icon-themes/breeze_svg/sc/imglst/nc01.svg    |  111 
 icon-themes/breeze_svg/sc/imglst/nc02.svg    |  116 
 icon-themes/breeze_svg/sc/res/na03.svg       |  116 
 icon-themes/breeze_svg/sc/res/na05.svg       |  112 
 icon-themes/breeze_svg/sc/res/na06.svg       |  112 
 icon-themes/breeze_svg/sc/res/na07.svg       |  102 
 icon-themes/breeze_svg/sc/res/nc01.svg       |  111 
 icon-themes/breeze_svg/sc/res/nc02.svg       |  116 
 icon-themes/crystal/sc/res/nc05.png          |binary
 icon-themes/elementary/links.txt             |   14 
 icon-themes/elementary/sc/res/na010.png      |binary
 icon-themes/elementary/sc/res/na011.png      |binary
 icon-themes/elementary/sc/res/na03.png       |binary
 icon-themes/elementary/sc/res/na07.png       |binary
 icon-themes/elementary/sc/res/na09.png       |binary
 icon-themes/elementary/sc/res/nc02.png       |binary
 icon-themes/elementary/sc/res/nc03.png       |binary
 icon-themes/elementary/sc/res/nc07.png       |binary
 icon-themes/galaxy/sc/res/na010.png          |binary
 icon-themes/galaxy/sc/res/na011.png          |binary
 icon-themes/galaxy/sc/res/na03.png           |binary
 icon-themes/galaxy/sc/res/na05.png           |binary
 icon-themes/galaxy/sc/res/na06.png           |binary
 icon-themes/galaxy/sc/res/na07.png           |binary
 icon-themes/galaxy/sc/res/na09.png           |binary
 icon-themes/galaxy/sc/res/nc01.png           |binary
 icon-themes/galaxy/sc/res/nc02.png           |binary
 icon-themes/galaxy/sc/res/nc03.png           |binary
 icon-themes/galaxy/sc/res/nc04.png           |binary
 icon-themes/galaxy/sc/res/nc05.png           |binary
 icon-themes/galaxy/sc/res/nc06.png           |binary
 icon-themes/galaxy/sc/res/nc07.png           |binary
 icon-themes/galaxy/sc/res/nc08.png           |binary
 icon-themes/hicontrast/sc/res/na010.png      |binary
 icon-themes/hicontrast/sc/res/na011.png      |binary
 icon-themes/hicontrast/sc/res/na03.png       |binary
 icon-themes/hicontrast/sc/res/na05.png       |binary
 icon-themes/hicontrast/sc/res/na06.png       |binary
 icon-themes/hicontrast/sc/res/na07.png       |binary
 icon-themes/hicontrast/sc/res/na09.png       |binary
 icon-themes/hicontrast/sc/res/nc01.png       |binary
 icon-themes/hicontrast/sc/res/nc02.png       |binary
 icon-themes/hicontrast/sc/res/nc03.png       |binary
 icon-themes/hicontrast/sc/res/nc04.png       |binary
 icon-themes/hicontrast/sc/res/nc05.png       |binary
 icon-themes/hicontrast/sc/res/nc06.png       |binary
 icon-themes/hicontrast/sc/res/nc07.png       |binary
 icon-themes/hicontrast/sc/res/nc08.png       |binary
 icon-themes/oxygen/sc/res/na010.png          |binary
 icon-themes/oxygen/sc/res/na011.png          |binary
 icon-themes/oxygen/sc/res/na05.png           |binary
 icon-themes/oxygen/sc/res/na06.png           |binary
 icon-themes/oxygen/sc/res/na07.png           |binary
 icon-themes/oxygen/sc/res/na09.png           |binary
 icon-themes/oxygen/sc/res/nc01.png           |binary
 icon-themes/oxygen/sc/res/nc02.png           |binary
 icon-themes/oxygen/sc/res/nc03.png           |binary
 icon-themes/oxygen/sc/res/nc04.png           |binary
 icon-themes/oxygen/sc/res/nc05.png           |binary
 icon-themes/oxygen/sc/res/nc06.png           |binary
 icon-themes/oxygen/sc/res/nc07.png           |binary
 icon-themes/oxygen/sc/res/nc08.png           |binary
 icon-themes/sifr/links.txt                   |   14 
 icon-themes/tango/links.txt                  |   14 
 icon-themes/tango_testing/sc/imglst/nc02.svg |15831 ----------
 icon-themes/tango_testing/sc/imglst/nc03.svg |39609 ---------------------------
 icon-themes/tango_testing/sc/imglst/nc07.svg | 1011 
 icon-themes/tango_testing/sc/res/nc01.png    |binary
 icon-themes/tango_testing/sc/res/nc02.png    |binary
 icon-themes/tango_testing/sc/res/nc02.svg    |15831 ++++++++++
 icon-themes/tango_testing/sc/res/nc03.png    |binary
 icon-themes/tango_testing/sc/res/nc03.svg    |39609 +++++++++++++++++++++++++++
 icon-themes/tango_testing/sc/res/nc04.png    |binary
 icon-themes/tango_testing/sc/res/nc05.png    |binary
 icon-themes/tango_testing/sc/res/nc06.png    |binary
 icon-themes/tango_testing/sc/res/nc07.png    |binary
 icon-themes/tango_testing/sc/res/nc07.svg    | 1011 
 icon-themes/tango_testing/sc/res/nc08.png    |binary
 icon-themes/tango_testing/sc/res/sc20175.png |binary
 icon-themes/tango_testing/sc/res/sc20186.png |binary
 sc/inc/sc.hrc                                |   12 
 sc/source/ui/inc/content.hxx                 |    1 
 sc/source/ui/navipi/content.cxx              |    7 
 sc/source/ui/navipi/navipi.src               |   52 
 sc/source/ui/unoobj/targuno.cxx              |    5 
 sc/uiconfig/scalc/ui/navigatorpanel.ui       |   14 
 sd/uiconfig/simpress/ui/navigatorpanel.ui    |    2 
 107 files changed, 57226 insertions(+), 57197 deletions(-)

New commits:
commit f05aa32b588c77c79213dbbb77c7c46d98a7559c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 21 21:30:41 2016 +0000

    some apparently leftover icons, move them anyway
    
    Change-Id: Ie051dfe7c124acab7fb81de80e97715fdd8b59a5

diff --git a/icon-themes/tango_testing/sc/imglst/sc20175.png b/icon-themes/tango_testing/sc/res/sc20175.png
similarity index 100%
rename from icon-themes/tango_testing/sc/imglst/sc20175.png
rename to icon-themes/tango_testing/sc/res/sc20175.png
diff --git a/icon-themes/tango_testing/sc/imglst/sc20186.png b/icon-themes/tango_testing/sc/res/sc20186.png
similarity index 100%
rename from icon-themes/tango_testing/sc/imglst/sc20186.png
rename to icon-themes/tango_testing/sc/res/sc20186.png
commit d7fd3ae7ddc93f1fb6d90739729b711efc7c7327
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 21 20:52:37 2016 +0000

    move na stragglers to res
    
    Change-Id: I56359bd86a48deb7c11264c65445196fcf454ee7

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 98c9ee8..cb1e1dc 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1047,8 +1047,8 @@ sc/res/lc26047.png cmd/lc_dbviewfunctions.png
 sc/res/lc26048.png cmd/lc_autosum.png
 sc/res/lc26050.png cmd/lc_cancel.png
 sc/res/lc26051.png cmd/lc_ok.png
-sc/imglst/na010.png cmd/sc_selectobject.png
-sc/imglst/na011.png cmd/lc_ok.png
+sc/res/na010.png cmd/sc_selectobject.png
+sc/res/na011.png cmd/lc_ok.png
 sc/res/nc03.png cmd/sc_viewdatasourcebrowser.png
 sc/res/nc04.png cmd/sc_gallery.png
 sc/res/nc05.png cmd/sc_insertobject.png
diff --git a/icon-themes/breeze/sc/imglst/na03.png b/icon-themes/breeze/sc/res/na03.png
similarity index 100%
rename from icon-themes/breeze/sc/imglst/na03.png
rename to icon-themes/breeze/sc/res/na03.png
diff --git a/icon-themes/breeze/sc/imglst/na05.png b/icon-themes/breeze/sc/res/na05.png
similarity index 100%
rename from icon-themes/breeze/sc/imglst/na05.png
rename to icon-themes/breeze/sc/res/na05.png
diff --git a/icon-themes/breeze/sc/imglst/na06.png b/icon-themes/breeze/sc/res/na06.png
similarity index 100%
rename from icon-themes/breeze/sc/imglst/na06.png
rename to icon-themes/breeze/sc/res/na06.png
diff --git a/icon-themes/breeze/sc/imglst/na07.png b/icon-themes/breeze/sc/res/na07.png
similarity index 100%
rename from icon-themes/breeze/sc/imglst/na07.png
rename to icon-themes/breeze/sc/res/na07.png
diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt
index bd28270..495cc37 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -1043,8 +1043,8 @@ sc/res/lc26047.png cmd/lc_dbviewfunctions.png
 sc/res/lc26048.png cmd/lc_autosum.png
 sc/res/lc26050.png cmd/lc_cancel.png
 sc/res/lc26051.png cmd/lc_ok.png
-sc/imglst/na010.png cmd/sc_selectobject.png
-sc/imglst/na011.png cmd/lc_ok.png
+sc/res/na010.png cmd/sc_selectobject.png
+sc/res/na011.png cmd/lc_ok.png
 sc/res/nc03.png cmd/sc_viewdatasourcebrowser.png
 sc/res/nc04.png cmd/sc_gallery.png
 sc/res/nc05.png cmd/sc_insertobject.png
diff --git a/icon-themes/breeze_dark/sc/imglst/na03.png b/icon-themes/breeze_dark/sc/res/na03.png
similarity index 100%
rename from icon-themes/breeze_dark/sc/imglst/na03.png
rename to icon-themes/breeze_dark/sc/res/na03.png
diff --git a/icon-themes/breeze_dark/sc/imglst/na05.png b/icon-themes/breeze_dark/sc/res/na05.png
similarity index 100%
rename from icon-themes/breeze_dark/sc/imglst/na05.png
rename to icon-themes/breeze_dark/sc/res/na05.png
diff --git a/icon-themes/breeze_dark/sc/imglst/na06.png b/icon-themes/breeze_dark/sc/res/na06.png
similarity index 100%
rename from icon-themes/breeze_dark/sc/imglst/na06.png
rename to icon-themes/breeze_dark/sc/res/na06.png
diff --git a/icon-themes/breeze_dark/sc/imglst/na07.png b/icon-themes/breeze_dark/sc/res/na07.png
similarity index 100%
rename from icon-themes/breeze_dark/sc/imglst/na07.png
rename to icon-themes/breeze_dark/sc/res/na07.png
diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt
index adabdc3..914759e 100644
--- a/icon-themes/breeze_svg/links.txt
+++ b/icon-themes/breeze_svg/links.txt
@@ -1009,8 +1009,8 @@ sc/res/lc26047.png cmd/lc_dbviewfunctions.png
 sc/res/lc26048.png cmd/lc_autosum.png
 sc/res/lc26050.png cmd/lc_cancel.png
 sc/res/lc26051.png cmd/lc_ok.png
-sc/imglst/na010.png cmd/sc_selectobject.png
-sc/imglst/na011.png cmd/lc_ok.png
+sc/res/na010.png cmd/sc_selectobject.png
+sc/res/na011.png cmd/lc_ok.png
 sc/res/nc03.png cmd/sc_viewdatasourcebrowser.png
 sc/res/nc04.png cmd/sc_gallery.png
 sc/res/nc05.png cmd/sc_insertobject.png
diff --git a/icon-themes/breeze_svg/sc/imglst/na03.svg b/icon-themes/breeze_svg/sc/res/na03.svg
similarity index 100%
rename from icon-themes/breeze_svg/sc/imglst/na03.svg
rename to icon-themes/breeze_svg/sc/res/na03.svg
diff --git a/icon-themes/breeze_svg/sc/imglst/na05.svg b/icon-themes/breeze_svg/sc/res/na05.svg
similarity index 100%
rename from icon-themes/breeze_svg/sc/imglst/na05.svg
rename to icon-themes/breeze_svg/sc/res/na05.svg
diff --git a/icon-themes/breeze_svg/sc/imglst/na06.svg b/icon-themes/breeze_svg/sc/res/na06.svg
similarity index 100%
rename from icon-themes/breeze_svg/sc/imglst/na06.svg
rename to icon-themes/breeze_svg/sc/res/na06.svg
diff --git a/icon-themes/breeze_svg/sc/imglst/na07.svg b/icon-themes/breeze_svg/sc/res/na07.svg
similarity index 100%
rename from icon-themes/breeze_svg/sc/imglst/na07.svg
rename to icon-themes/breeze_svg/sc/res/na07.svg
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 0d43d35..5632b60 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -461,8 +461,8 @@ sc/res/lc26047.png cmd/lc_insertformula.png
 sc/res/lc26048.png cmd/lc_autosum.png
 sc/res/lc26050.png cmd/lc_cancel.png
 sc/res/lc26051.png cmd/lc_ok.png
-sc/imglst/na05.png cmd/sc_upsearch.png
-sc/imglst/na06.png cmd/sc_downsearch.png
+sc/res/na05.png cmd/sc_upsearch.png
+sc/res/na06.png cmd/sc_downsearch.png
 sc/res/nc01.png cmd/sc_inserttable.png
 sc/res/nc04.png cmd/sc_insertgraphic.png
 sc/res/nc05.png cmd/sc_drawchart.png
diff --git a/icon-themes/elementary/sc/imglst/na010.png b/icon-themes/elementary/sc/res/na010.png
similarity index 100%
rename from icon-themes/elementary/sc/imglst/na010.png
rename to icon-themes/elementary/sc/res/na010.png
diff --git a/icon-themes/oxygen/sc/imglst/na011.png b/icon-themes/elementary/sc/res/na011.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/na011.png
rename to icon-themes/elementary/sc/res/na011.png
diff --git a/icon-themes/galaxy/sc/imglst/na03.png b/icon-themes/elementary/sc/res/na03.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/na03.png
rename to icon-themes/elementary/sc/res/na03.png
diff --git a/icon-themes/oxygen/sc/imglst/na07.png b/icon-themes/elementary/sc/res/na07.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/na07.png
rename to icon-themes/elementary/sc/res/na07.png
diff --git a/icon-themes/oxygen/sc/imglst/na09.png b/icon-themes/elementary/sc/res/na09.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/na09.png
rename to icon-themes/elementary/sc/res/na09.png
diff --git a/icon-themes/galaxy/sc/imglst/na010.png b/icon-themes/galaxy/sc/res/na010.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/na010.png
rename to icon-themes/galaxy/sc/res/na010.png
diff --git a/icon-themes/galaxy/sc/imglst/na011.png b/icon-themes/galaxy/sc/res/na011.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/na011.png
rename to icon-themes/galaxy/sc/res/na011.png
diff --git a/icon-themes/elementary/sc/imglst/na03.png b/icon-themes/galaxy/sc/res/na03.png
similarity index 100%
rename from icon-themes/elementary/sc/imglst/na03.png
rename to icon-themes/galaxy/sc/res/na03.png
diff --git a/icon-themes/galaxy/sc/imglst/na05.png b/icon-themes/galaxy/sc/res/na05.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/na05.png
rename to icon-themes/galaxy/sc/res/na05.png
diff --git a/icon-themes/galaxy/sc/imglst/na06.png b/icon-themes/galaxy/sc/res/na06.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/na06.png
rename to icon-themes/galaxy/sc/res/na06.png
diff --git a/icon-themes/galaxy/sc/imglst/na07.png b/icon-themes/galaxy/sc/res/na07.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/na07.png
rename to icon-themes/galaxy/sc/res/na07.png
diff --git a/icon-themes/galaxy/sc/imglst/na09.png b/icon-themes/galaxy/sc/res/na09.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/na09.png
rename to icon-themes/galaxy/sc/res/na09.png
diff --git a/icon-themes/hicontrast/sc/imglst/na010.png b/icon-themes/hicontrast/sc/res/na010.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/na010.png
rename to icon-themes/hicontrast/sc/res/na010.png
diff --git a/icon-themes/hicontrast/sc/imglst/na011.png b/icon-themes/hicontrast/sc/res/na011.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/na011.png
rename to icon-themes/hicontrast/sc/res/na011.png
diff --git a/icon-themes/hicontrast/sc/imglst/na03.png b/icon-themes/hicontrast/sc/res/na03.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/na03.png
rename to icon-themes/hicontrast/sc/res/na03.png
diff --git a/icon-themes/hicontrast/sc/imglst/na05.png b/icon-themes/hicontrast/sc/res/na05.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/na05.png
rename to icon-themes/hicontrast/sc/res/na05.png
diff --git a/icon-themes/hicontrast/sc/imglst/na06.png b/icon-themes/hicontrast/sc/res/na06.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/na06.png
rename to icon-themes/hicontrast/sc/res/na06.png
diff --git a/icon-themes/hicontrast/sc/imglst/na07.png b/icon-themes/hicontrast/sc/res/na07.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/na07.png
rename to icon-themes/hicontrast/sc/res/na07.png
diff --git a/icon-themes/hicontrast/sc/imglst/na09.png b/icon-themes/hicontrast/sc/res/na09.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/na09.png
rename to icon-themes/hicontrast/sc/res/na09.png
diff --git a/icon-themes/oxygen/sc/imglst/na010.png b/icon-themes/oxygen/sc/res/na010.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/na010.png
rename to icon-themes/oxygen/sc/res/na010.png
diff --git a/icon-themes/elementary/sc/imglst/na011.png b/icon-themes/oxygen/sc/res/na011.png
similarity index 100%
rename from icon-themes/elementary/sc/imglst/na011.png
rename to icon-themes/oxygen/sc/res/na011.png
diff --git a/icon-themes/oxygen/sc/imglst/na05.png b/icon-themes/oxygen/sc/res/na05.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/na05.png
rename to icon-themes/oxygen/sc/res/na05.png
diff --git a/icon-themes/oxygen/sc/imglst/na06.png b/icon-themes/oxygen/sc/res/na06.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/na06.png
rename to icon-themes/oxygen/sc/res/na06.png
diff --git a/icon-themes/elementary/sc/imglst/na07.png b/icon-themes/oxygen/sc/res/na07.png
similarity index 100%
rename from icon-themes/elementary/sc/imglst/na07.png
rename to icon-themes/oxygen/sc/res/na07.png
diff --git a/icon-themes/elementary/sc/imglst/na09.png b/icon-themes/oxygen/sc/res/na09.png
similarity index 100%
rename from icon-themes/elementary/sc/imglst/na09.png
rename to icon-themes/oxygen/sc/res/na09.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index a3ac5d3..8a0c0a4 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -45,8 +45,8 @@ sw/res/sr20013.png cmd/sc_insertfootnote.png
 sw/res/sr20014.png sw/imglst/sc20183.png
 sw/res/sr20017.png cmd/sc_insertindexesentry.png
 # Navigator - Calc
-sc/imglst/na05.png cmd/sc_upsearch.png
-sc/imglst/na06.png cmd/sc_downsearch.png
+sc/res/na05.png cmd/sc_upsearch.png
+sc/res/na06.png cmd/sc_downsearch.png
 sc/res/nc01.png cmd/sc_inserttable.png
 sc/res/nc04.png cmd/sc_insertgraphic.png
 sc/res/nc05.png cmd/sc_drawchart.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 41f509b..537b49c 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -277,8 +277,8 @@ cmd/sc_circlepie.png cmd/sc_basicshapes.circle-pie.png
 sfx2/res/sortascending.png cmd/lc_sortascending.png
 svx/res/symphony/rotate_left.png cmd/sc_rotateleft.png
 svx/res/symphony/rotate_right.png cmd/sc_rotateright.png
-sc/imglst/na05.png cmd/sc_upsearch.png
-sc/imglst/na06.png cmd/sc_downsearch.png
+sc/res/na05.png cmd/sc_upsearch.png
+sc/res/na06.png cmd/sc_downsearch.png
 sc/res/nc01.png cmd/sc_inserttable.png
 sc/res/nc04.png cmd/sc_insertgraphic.png
 sc/res/nc05.png cmd/sc_drawchart.png
diff --git a/sc/uiconfig/scalc/ui/navigatorpanel.ui b/sc/uiconfig/scalc/ui/navigatorpanel.ui
index b56069a..f17825a 100644
--- a/sc/uiconfig/scalc/ui/navigatorpanel.ui
+++ b/sc/uiconfig/scalc/ui/navigatorpanel.ui
@@ -85,7 +85,7 @@
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Data Range</property>
                     <property name="action_name">datarange</property>
-                    <property name="icon_name">sc/imglst/na03.png</property>
+                    <property name="icon_name">sc/res/na03.png</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -98,7 +98,7 @@
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Start</property>
                     <property name="action_name">start</property>
-                    <property name="icon_name">sc/imglst/na05.png</property>
+                    <property name="icon_name">sc/res/na05.png</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -111,7 +111,7 @@
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">End</property>
                     <property name="action_name">end</property>
-                    <property name="icon_name">sc/imglst/na06.png</property>
+                    <property name="icon_name">sc/res/na06.png</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -124,7 +124,7 @@
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Contents</property>
                     <property name="action_name">contents</property>
-                    <property name="icon_name">sc/imglst/na011.png</property>
+                    <property name="icon_name">sc/res/na011.png</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -137,7 +137,7 @@
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Toggle</property>
                     <property name="action_name">toggle</property>
-                    <property name="icon_name">sc/imglst/na010.png</property>
+                    <property name="icon_name">sc/res/na010.png</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -150,7 +150,7 @@
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Scenarios</property>
                     <property name="action_name">scenarios</property>
-                    <property name="icon_name">sc/imglst/na07.png</property>
+                    <property name="icon_name">sc/res/na07.png</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -163,7 +163,7 @@
                     <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Drag Mode</property>
                     <property name="action_name">dragmode</property>
-                    <property name="icon_name">sc/imglst/na09.png</property>
+                    <property name="icon_name">sc/res/na09.png</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
commit 76dfd119dfcd5fbfe295a8883ac2860cbac280c5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 21 20:40:14 2016 +0000

    unwind RID_IMAGELIST_NAVCONT ImageList
    
    Change-Id: I5e057ce9df205ca2431e7a7a455b00fcec6123db

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 1369642..98c9ee8 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1049,12 +1049,12 @@ sc/res/lc26050.png cmd/lc_cancel.png
 sc/res/lc26051.png cmd/lc_ok.png
 sc/imglst/na010.png cmd/sc_selectobject.png
 sc/imglst/na011.png cmd/lc_ok.png
-sc/imglst/nc03.png cmd/sc_viewdatasourcebrowser.png
-sc/imglst/nc04.png cmd/sc_gallery.png
-sc/imglst/nc05.png cmd/sc_insertobject.png
-sc/imglst/nc06.png cmd/sc_showannotations.png
-sc/imglst/nc07.png sc/res/droplink.png
-sc/imglst/nc08.png cmd/sc_gallery.png
+sc/res/nc03.png cmd/sc_viewdatasourcebrowser.png
+sc/res/nc04.png cmd/sc_gallery.png
+sc/res/nc05.png cmd/sc_insertobject.png
+sc/res/nc06.png cmd/sc_showannotations.png
+sc/res/nc07.png sc/res/droplink.png
+sc/res/nc08.png cmd/sc_gallery.png
 sc/res/sc26047.png cmd/sc_dbviewfunctions.png
 sc/res/sc26048.png cmd/sc_autosum.png
 sc/res/sc26050.png cmd/sc_cancel.png
diff --git a/icon-themes/breeze/sc/imglst/nc01.png b/icon-themes/breeze/sc/res/nc01.png
similarity index 100%
rename from icon-themes/breeze/sc/imglst/nc01.png
rename to icon-themes/breeze/sc/res/nc01.png
diff --git a/icon-themes/breeze/sc/imglst/nc02.png b/icon-themes/breeze/sc/res/nc02.png
similarity index 100%
rename from icon-themes/breeze/sc/imglst/nc02.png
rename to icon-themes/breeze/sc/res/nc02.png
diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt
index 5cfdd0a..bd28270 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -1045,12 +1045,12 @@ sc/res/lc26050.png cmd/lc_cancel.png
 sc/res/lc26051.png cmd/lc_ok.png
 sc/imglst/na010.png cmd/sc_selectobject.png
 sc/imglst/na011.png cmd/lc_ok.png
-sc/imglst/nc03.png cmd/sc_viewdatasourcebrowser.png
-sc/imglst/nc04.png cmd/sc_gallery.png
-sc/imglst/nc05.png cmd/sc_insertobject.png
-sc/imglst/nc06.png cmd/sc_showannotations.png
-sc/imglst/nc07.png sc/res/droplink.png
-sc/imglst/nc08.png cmd/sc_gallery.png
+sc/res/nc03.png cmd/sc_viewdatasourcebrowser.png
+sc/res/nc04.png cmd/sc_gallery.png
+sc/res/nc05.png cmd/sc_insertobject.png
+sc/res/nc06.png cmd/sc_showannotations.png
+sc/res/nc07.png sc/res/droplink.png
+sc/res/nc08.png cmd/sc_gallery.png
 sc/res/sc26047.png cmd/sc_dbviewfunctions.png
 sc/res/sc26048.png cmd/sc_autosum.png
 sc/res/sc26050.png cmd/sc_cancel.png
diff --git a/icon-themes/breeze_dark/sc/imglst/nc01.png b/icon-themes/breeze_dark/sc/res/nc01.png
similarity index 100%
rename from icon-themes/breeze_dark/sc/imglst/nc01.png
rename to icon-themes/breeze_dark/sc/res/nc01.png
diff --git a/icon-themes/breeze_dark/sc/imglst/nc02.png b/icon-themes/breeze_dark/sc/res/nc02.png
similarity index 100%
rename from icon-themes/breeze_dark/sc/imglst/nc02.png
rename to icon-themes/breeze_dark/sc/res/nc02.png
diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt
index 44d7588..adabdc3 100644
--- a/icon-themes/breeze_svg/links.txt
+++ b/icon-themes/breeze_svg/links.txt
@@ -1011,12 +1011,12 @@ sc/res/lc26050.png cmd/lc_cancel.png
 sc/res/lc26051.png cmd/lc_ok.png
 sc/imglst/na010.png cmd/sc_selectobject.png
 sc/imglst/na011.png cmd/lc_ok.png
-sc/imglst/nc03.png cmd/sc_viewdatasourcebrowser.png
-sc/imglst/nc04.png cmd/sc_gallery.png
-sc/imglst/nc05.png cmd/sc_insertobject.png
-sc/imglst/nc06.png cmd/sc_showannotations.png
-sc/imglst/nc07.png sc/res/droplink.png
-sc/imglst/nc08.png cmd/sc_gallery.png
+sc/res/nc03.png cmd/sc_viewdatasourcebrowser.png
+sc/res/nc04.png cmd/sc_gallery.png
+sc/res/nc05.png cmd/sc_insertobject.png
+sc/res/nc06.png cmd/sc_showannotations.png
+sc/res/nc07.png sc/res/droplink.png
+sc/res/nc08.png cmd/sc_gallery.png
 sc/res/sc26047.png cmd/sc_dbviewfunctions.png
 sc/res/sc26048.png cmd/sc_autosum.png
 sc/res/sc26050.png cmd/sc_cancel.png
diff --git a/icon-themes/breeze_svg/sc/imglst/nc01.svg b/icon-themes/breeze_svg/sc/res/nc01.svg
similarity index 100%
rename from icon-themes/breeze_svg/sc/imglst/nc01.svg
rename to icon-themes/breeze_svg/sc/res/nc01.svg
diff --git a/icon-themes/breeze_svg/sc/imglst/nc02.svg b/icon-themes/breeze_svg/sc/res/nc02.svg
similarity index 100%
rename from icon-themes/breeze_svg/sc/imglst/nc02.svg
rename to icon-themes/breeze_svg/sc/res/nc02.svg
diff --git a/icon-themes/oxygen/sc/imglst/nc05.png b/icon-themes/crystal/sc/res/nc05.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/nc05.png
rename to icon-themes/crystal/sc/res/nc05.png
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 30db7cd..0d43d35 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -463,11 +463,11 @@ sc/res/lc26050.png cmd/lc_cancel.png
 sc/res/lc26051.png cmd/lc_ok.png
 sc/imglst/na05.png cmd/sc_upsearch.png
 sc/imglst/na06.png cmd/sc_downsearch.png
-sc/imglst/nc01.png cmd/sc_inserttable.png
-sc/imglst/nc04.png cmd/sc_insertgraphic.png
-sc/imglst/nc05.png cmd/sc_drawchart.png
-sc/imglst/nc06.png cmd/sc_insertannotation.png
-sc/imglst/nc08.png cmd/sc_insertdraw.png
+sc/res/nc01.png cmd/sc_inserttable.png
+sc/res/nc04.png cmd/sc_insertgraphic.png
+sc/res/nc05.png cmd/sc_drawchart.png
+sc/res/nc06.png cmd/sc_insertannotation.png
+sc/res/nc08.png cmd/sc_insertdraw.png
 sc/res/sc26047.png cmd/sc_insertformula.png
 sc/res/sc26048.png cmd/sc_autosum.png
 sc/res/sc26050.png cmd/sc_cancel.png
diff --git a/icon-themes/oxygen/sc/imglst/nc02.png b/icon-themes/elementary/sc/res/nc02.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/nc02.png
rename to icon-themes/elementary/sc/res/nc02.png
diff --git a/icon-themes/elementary/sc/imglst/nc03.png b/icon-themes/elementary/sc/res/nc03.png
similarity index 100%
rename from icon-themes/elementary/sc/imglst/nc03.png
rename to icon-themes/elementary/sc/res/nc03.png
diff --git a/icon-themes/oxygen/sc/imglst/nc07.png b/icon-themes/elementary/sc/res/nc07.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/nc07.png
rename to icon-themes/elementary/sc/res/nc07.png
diff --git a/icon-themes/galaxy/sc/imglst/nc01.png b/icon-themes/galaxy/sc/res/nc01.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/nc01.png
rename to icon-themes/galaxy/sc/res/nc01.png
diff --git a/icon-themes/galaxy/sc/imglst/nc02.png b/icon-themes/galaxy/sc/res/nc02.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/nc02.png
rename to icon-themes/galaxy/sc/res/nc02.png
diff --git a/icon-themes/galaxy/sc/imglst/nc03.png b/icon-themes/galaxy/sc/res/nc03.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/nc03.png
rename to icon-themes/galaxy/sc/res/nc03.png
diff --git a/icon-themes/galaxy/sc/imglst/nc04.png b/icon-themes/galaxy/sc/res/nc04.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/nc04.png
rename to icon-themes/galaxy/sc/res/nc04.png
diff --git a/icon-themes/galaxy/sc/imglst/nc05.png b/icon-themes/galaxy/sc/res/nc05.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/nc05.png
rename to icon-themes/galaxy/sc/res/nc05.png
diff --git a/icon-themes/galaxy/sc/imglst/nc06.png b/icon-themes/galaxy/sc/res/nc06.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/nc06.png
rename to icon-themes/galaxy/sc/res/nc06.png
diff --git a/icon-themes/galaxy/sc/imglst/nc07.png b/icon-themes/galaxy/sc/res/nc07.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/nc07.png
rename to icon-themes/galaxy/sc/res/nc07.png
diff --git a/icon-themes/galaxy/sc/imglst/nc08.png b/icon-themes/galaxy/sc/res/nc08.png
similarity index 100%
rename from icon-themes/galaxy/sc/imglst/nc08.png
rename to icon-themes/galaxy/sc/res/nc08.png
diff --git a/icon-themes/hicontrast/sc/imglst/nc01.png b/icon-themes/hicontrast/sc/res/nc01.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/nc01.png
rename to icon-themes/hicontrast/sc/res/nc01.png
diff --git a/icon-themes/hicontrast/sc/imglst/nc02.png b/icon-themes/hicontrast/sc/res/nc02.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/nc02.png
rename to icon-themes/hicontrast/sc/res/nc02.png
diff --git a/icon-themes/hicontrast/sc/imglst/nc03.png b/icon-themes/hicontrast/sc/res/nc03.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/nc03.png
rename to icon-themes/hicontrast/sc/res/nc03.png
diff --git a/icon-themes/hicontrast/sc/imglst/nc04.png b/icon-themes/hicontrast/sc/res/nc04.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/nc04.png
rename to icon-themes/hicontrast/sc/res/nc04.png
diff --git a/icon-themes/hicontrast/sc/imglst/nc05.png b/icon-themes/hicontrast/sc/res/nc05.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/nc05.png
rename to icon-themes/hicontrast/sc/res/nc05.png
diff --git a/icon-themes/hicontrast/sc/imglst/nc06.png b/icon-themes/hicontrast/sc/res/nc06.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/nc06.png
rename to icon-themes/hicontrast/sc/res/nc06.png
diff --git a/icon-themes/hicontrast/sc/imglst/nc07.png b/icon-themes/hicontrast/sc/res/nc07.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/nc07.png
rename to icon-themes/hicontrast/sc/res/nc07.png
diff --git a/icon-themes/hicontrast/sc/imglst/nc08.png b/icon-themes/hicontrast/sc/res/nc08.png
similarity index 100%
rename from icon-themes/hicontrast/sc/imglst/nc08.png
rename to icon-themes/hicontrast/sc/res/nc08.png
diff --git a/icon-themes/oxygen/sc/imglst/nc01.png b/icon-themes/oxygen/sc/res/nc01.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/nc01.png
rename to icon-themes/oxygen/sc/res/nc01.png
diff --git a/icon-themes/elementary/sc/imglst/nc02.png b/icon-themes/oxygen/sc/res/nc02.png
similarity index 100%
rename from icon-themes/elementary/sc/imglst/nc02.png
rename to icon-themes/oxygen/sc/res/nc02.png
diff --git a/icon-themes/oxygen/sc/imglst/nc03.png b/icon-themes/oxygen/sc/res/nc03.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/nc03.png
rename to icon-themes/oxygen/sc/res/nc03.png
diff --git a/icon-themes/oxygen/sc/imglst/nc04.png b/icon-themes/oxygen/sc/res/nc04.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/nc04.png
rename to icon-themes/oxygen/sc/res/nc04.png
diff --git a/icon-themes/crystal/sc/imglst/nc05.png b/icon-themes/oxygen/sc/res/nc05.png
similarity index 100%
rename from icon-themes/crystal/sc/imglst/nc05.png
rename to icon-themes/oxygen/sc/res/nc05.png
diff --git a/icon-themes/oxygen/sc/imglst/nc06.png b/icon-themes/oxygen/sc/res/nc06.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/nc06.png
rename to icon-themes/oxygen/sc/res/nc06.png
diff --git a/icon-themes/elementary/sc/imglst/nc07.png b/icon-themes/oxygen/sc/res/nc07.png
similarity index 100%
rename from icon-themes/elementary/sc/imglst/nc07.png
rename to icon-themes/oxygen/sc/res/nc07.png
diff --git a/icon-themes/oxygen/sc/imglst/nc08.png b/icon-themes/oxygen/sc/res/nc08.png
similarity index 100%
rename from icon-themes/oxygen/sc/imglst/nc08.png
rename to icon-themes/oxygen/sc/res/nc08.png
diff --git a/icon-themes/sifr/links.txt b/icon-themes/sifr/links.txt
index 079d5ad..a3ac5d3 100644
--- a/icon-themes/sifr/links.txt
+++ b/icon-themes/sifr/links.txt
@@ -47,11 +47,11 @@ sw/res/sr20017.png cmd/sc_insertindexesentry.png
 # Navigator - Calc
 sc/imglst/na05.png cmd/sc_upsearch.png
 sc/imglst/na06.png cmd/sc_downsearch.png
-sc/imglst/nc01.png cmd/sc_inserttable.png
-sc/imglst/nc04.png cmd/sc_insertgraphic.png
-sc/imglst/nc05.png cmd/sc_drawchart.png
-sc/imglst/nc06.png cmd/sc_insertannotation.png
-sc/imglst/nc08.png cmd/sc_insertdraw.png
+sc/res/nc01.png cmd/sc_inserttable.png
+sc/res/nc04.png cmd/sc_insertgraphic.png
+sc/res/nc05.png cmd/sc_drawchart.png
+sc/res/nc06.png cmd/sc_insertannotation.png
+sc/res/nc08.png cmd/sc_insertdraw.png
 sc/res/table.png cmd/sc_inserttable.png
 
 # Thesaurus
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index e77da0e..41f509b 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -279,11 +279,11 @@ svx/res/symphony/rotate_left.png cmd/sc_rotateleft.png
 svx/res/symphony/rotate_right.png cmd/sc_rotateright.png
 sc/imglst/na05.png cmd/sc_upsearch.png
 sc/imglst/na06.png cmd/sc_downsearch.png
-sc/imglst/nc01.png cmd/sc_inserttable.png
-sc/imglst/nc04.png cmd/sc_insertgraphic.png
-sc/imglst/nc05.png cmd/sc_drawchart.png
-sc/imglst/nc06.png cmd/sc_insertannotation.png
-sc/imglst/nc08.png cmd/sc_insertdraw.png
+sc/res/nc01.png cmd/sc_inserttable.png
+sc/res/nc04.png cmd/sc_insertgraphic.png
+sc/res/nc05.png cmd/sc_drawchart.png
+sc/res/nc06.png cmd/sc_insertannotation.png
+sc/res/nc08.png cmd/sc_insertdraw.png
 sc/res/table.png cmd/sc_inserttable.png
 sd/imglst/nv03.png cmd/sc_firstpage.png
 sd/imglst/nv04.png cmd/sc_navigateback.png
diff --git a/icon-themes/tango_testing/sc/imglst/nc01.png b/icon-themes/tango_testing/sc/res/nc01.png
similarity index 100%
rename from icon-themes/tango_testing/sc/imglst/nc01.png
rename to icon-themes/tango_testing/sc/res/nc01.png
diff --git a/icon-themes/tango_testing/sc/imglst/nc02.png b/icon-themes/tango_testing/sc/res/nc02.png
similarity index 100%
rename from icon-themes/tango_testing/sc/imglst/nc02.png
rename to icon-themes/tango_testing/sc/res/nc02.png
diff --git a/icon-themes/tango_testing/sc/imglst/nc02.svg b/icon-themes/tango_testing/sc/res/nc02.svg
similarity index 99%
rename from icon-themes/tango_testing/sc/imglst/nc02.svg
rename to icon-themes/tango_testing/sc/res/nc02.svg
index 79da553..f0db904 100644
--- a/icon-themes/tango_testing/sc/imglst/nc02.svg
+++ b/icon-themes/tango_testing/sc/res/nc02.svg
@@ -16,7 +16,7 @@
    width="16"
    height="16"
    sodipodi:docname="nc02.svg"
-   inkscape:export-filename="/home/alexander/libo/icon-themes/tango_testing/sc/imglst/nc02.png"
+   inkscape:export-filename="/home/alexander/libo/icon-themes/tango_testing/sc/res/nc02.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <metadata
diff --git a/icon-themes/tango_testing/sc/imglst/nc03.png b/icon-themes/tango_testing/sc/res/nc03.png
similarity index 100%
rename from icon-themes/tango_testing/sc/imglst/nc03.png
rename to icon-themes/tango_testing/sc/res/nc03.png
diff --git a/icon-themes/tango_testing/sc/imglst/nc03.svg b/icon-themes/tango_testing/sc/res/nc03.svg
similarity index 99%
rename from icon-themes/tango_testing/sc/imglst/nc03.svg
rename to icon-themes/tango_testing/sc/res/nc03.svg
index 3f70550..f8d4b33 100644
--- a/icon-themes/tango_testing/sc/imglst/nc03.svg
+++ b/icon-themes/tango_testing/sc/res/nc03.svg
@@ -16,7 +16,7 @@
    width="16"
    height="16"
    sodipodi:docname="nc03.svg"
-   inkscape:export-filename="/home/alexander/libo/icon-themes/tango_testing/sc/imglst/nc03.png"
+   inkscape:export-filename="/home/alexander/libo/icon-themes/tango_testing/sc/res/nc03.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <metadata
diff --git a/icon-themes/tango_testing/sc/imglst/nc04.png b/icon-themes/tango_testing/sc/res/nc04.png
similarity index 100%
rename from icon-themes/tango_testing/sc/imglst/nc04.png
rename to icon-themes/tango_testing/sc/res/nc04.png
diff --git a/icon-themes/tango_testing/sc/imglst/nc05.png b/icon-themes/tango_testing/sc/res/nc05.png
similarity index 100%
rename from icon-themes/tango_testing/sc/imglst/nc05.png
rename to icon-themes/tango_testing/sc/res/nc05.png
diff --git a/icon-themes/tango_testing/sc/imglst/nc06.png b/icon-themes/tango_testing/sc/res/nc06.png
similarity index 100%
rename from icon-themes/tango_testing/sc/imglst/nc06.png
rename to icon-themes/tango_testing/sc/res/nc06.png
diff --git a/icon-themes/tango_testing/sc/imglst/nc07.png b/icon-themes/tango_testing/sc/res/nc07.png
similarity index 100%
rename from icon-themes/tango_testing/sc/imglst/nc07.png
rename to icon-themes/tango_testing/sc/res/nc07.png
diff --git a/icon-themes/tango_testing/sc/imglst/nc07.svg b/icon-themes/tango_testing/sc/res/nc07.svg
similarity index 99%
rename from icon-themes/tango_testing/sc/imglst/nc07.svg
rename to icon-themes/tango_testing/sc/res/nc07.svg
index 0429944..344802a 100644
--- a/icon-themes/tango_testing/sc/imglst/nc07.svg
+++ b/icon-themes/tango_testing/sc/res/nc07.svg
@@ -16,7 +16,7 @@
    width="16"
    height="16"
    sodipodi:docname="nc07.svg"
-   inkscape:export-filename="/home/alexander/libo/icon-themes/tango_testing/sc/imglst/nc07.png"
+   inkscape:export-filename="/home/alexander/libo/icon-themes/tango_testing/sc/res/nc07.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <metadata
diff --git a/icon-themes/tango_testing/sc/imglst/nc08.png b/icon-themes/tango_testing/sc/res/nc08.png
similarity index 100%
rename from icon-themes/tango_testing/sc/imglst/nc08.png
rename to icon-themes/tango_testing/sc/res/nc08.png
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 3f3300e..98053e5 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -692,7 +692,6 @@
 #define RID_OBJECTBAR_TOOLS     (SC_RESOURCE_START+35)
 #define RID_SC_FUNCTION_DESCRIPTIONS1   (SC_RESOURCE_START+43)
 #define RID_SC_FUNCTION_DESCRIPTIONS2   (SC_RESOURCE_START+44)
-#define RID_IMAGELIST_NAVCONT   (SC_RESOURCE_START+52)
 #define RID_DRAW_OBJECTBAR      (SC_RESOURCE_START+53)
 #define RID_GRAPHIC_OBJECTBAR   (SC_RESOURCE_START+54)
 #define RID_MEDIA_OBJECTBAR     (SC_RESOURCE_START+60)
@@ -1032,6 +1031,17 @@
 #define RID_BMP_INPUT_CANCEL    (BMP_START + 38)
 #define RID_BMP_INPUT_OK        (BMP_START + 39)
 
+// navigator - in the same order as SC_CONTENT_...
+#define RID_BMP_CONTENT_ROOT      (BMP_START + 40)
+#define RID_BMP_CONTENT_TABLE     (BMP_START + 41)
+#define RID_BMP_CONTENT_RANGENAME (BMP_START + 42)
+#define RID_BMP_CONTENT_DBAREA    (BMP_START + 43)
+#define RID_BMP_CONTENT_GRAPHIC   (BMP_START + 44)
+#define RID_BMP_CONTENT_OLEOBJECT (BMP_START + 45)
+#define RID_BMP_CONTENT_NOTE      (BMP_START + 46)
+#define RID_BMP_CONTENT_AREALINK  (BMP_START + 47)
+#define RID_BMP_CONTENT_DRAWING   (BMP_START + 48)
+
 #define BMP_END                 (BMP_START + 100)
 
 #define SC_DIALOGS_START        (BMP_END)
diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx
index 4a673c7..20ac0b1 100644
--- a/sc/source/ui/inc/content.hxx
+++ b/sc/source/ui/inc/content.hxx
@@ -43,7 +43,6 @@ const sal_uLong SC_CONTENT_NOCHILD  = ~0UL;
 class ScContentTree : public SvTreeListBox
 {
     VclPtr<ScNavigatorDlg>  pParentWindow;
-    ImageList               aEntryImages;
     o3tl::enumarray<ScContentId, SvTreeListEntry*> pRootNodes;
     ScContentId             nRootType;          // set as Root
     OUString                aManualDoc;         // Switched in Navigator (Title)
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 5139c36..9f96bd1 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -114,7 +114,6 @@ ScDocShell* ScContentTree::GetManualOrCurrent()
 ScContentTree::ScContentTree(vcl::Window* pParent, ScNavigatorDlg* pNavigatorDlg)
     : SvTreeListBox(pParent, WB_BORDER | WB_QUICK_SEARCH)
     , pParentWindow(pNavigatorDlg)
-    , aEntryImages(ScResId(RID_IMAGELIST_NAVCONT))
     , nRootType(ScContentId::ROOT)
     , bHiddenDoc(false)
     , pHiddenDocument(nullptr)
@@ -226,11 +225,11 @@ void ScContentTree::InitRoot( ScContentId nType )
         return;
     }
 
-    const Image& rImage = aEntryImages.GetImage( (int) nType );
-    OUString aName( ScResId( SCSTR_CONTENT_ROOT + (int)nType ) );
+    Image aImage(BitmapEx(ScResId(RID_BMP_CONTENT_ROOT + (int)nType)));
+    OUString aName(ScResId(SCSTR_CONTENT_ROOT + (int)nType));
     // wieder an die richtige Position:
     sal_uInt16 nPos = nRootType != ScContentId::ROOT ? 0 : pPosList[nType]-1;
-    SvTreeListEntry* pNew = InsertEntry( aName, rImage, rImage, nullptr, false, nPos );
+    SvTreeListEntry* pNew = InsertEntry( aName, aImage, aImage, nullptr, false, nPos );
 
     pRootNodes[nType] = pNew;
 }
diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src
index 90e73f9..58a9370 100644
--- a/sc/source/ui/navipi/navipi.src
+++ b/sc/source/ui/navipi/navipi.src
@@ -19,22 +19,44 @@
 
 #include "sc.hrc"
 
-ImageList RID_IMAGELIST_NAVCONT
+Bitmap RID_BMP_CONTENT_TABLE
 {
-    Prefix = "nc";
-    // SC_CONTENT_...
-    IdList =
-    {
-        1 ;
-        2 ;
-        3 ;
-        4 ;
-        5 ;
-        6 ;
-        7 ;
-        8 ;
-    };
-    IdCount = { 8 ; };
+    File = "nc01.png";
+};
+
+Bitmap RID_BMP_CONTENT_RANGENAME
+{
+    File = "nc02.png";
+};
+
+Bitmap RID_BMP_CONTENT_DBAREA
+{
+    File = "nc03.png";
+};
+
+Bitmap RID_BMP_CONTENT_GRAPHIC
+{
+    File = "nc04.png";
+};
+
+Bitmap RID_BMP_CONTENT_OLEOBJECT
+{
+    File = "nc05.png";
+};
+
+Bitmap RID_BMP_CONTENT_NOTE
+{
+    File = "nc06.png";
+};
+
+Bitmap RID_BMP_CONTENT_AREALINK
+{
+    File = "nc07.png";
+};
+
+Bitmap RID_BMP_CONTENT_DRAWING
+{
+    File = "nc08.png";
 };
 
 Image RID_IMG_DROP_URL
diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx
index 0e080ad..3180a13 100644
--- a/sc/source/ui/unoobj/targuno.cxx
+++ b/sc/source/ui/unoobj/targuno.cxx
@@ -222,9 +222,8 @@ void ScLinkTargetTypeObj::SetLinkTargetBitmap( uno::Any& rRet, sal_uInt16 nType
     }
     if (nImgId != ScContentId::ROOT)
     {
-        ImageList aEntryImages( ScResId( RID_IMAGELIST_NAVCONT ) );
-        const Image& rImage = aEntryImages.GetImage( (sal_uInt16)nImgId );
-        rRet <<= uno::Reference< awt::XBitmap > (VCLUnoHelper::CreateBitmap( rImage.GetBitmapEx() ));
+        BitmapEx aBitmapEx(ScResId(RID_BMP_CONTENT_ROOT + (int)nImgId));
+        rRet <<= uno::Reference< awt::XBitmap > (VCLUnoHelper::CreateBitmap(aBitmapEx));
     }
 }
 
commit a0c1e7bc8e8836d4f47d9cdeabc8b2cdfdf2345b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Dec 21 21:21:10 2016 +0000

    should be sd icon, not sc
    
    Change-Id: Ib12d6b821e27cedf324e16c548254099b100fd3e

diff --git a/sd/uiconfig/simpress/ui/navigatorpanel.ui b/sd/uiconfig/simpress/ui/navigatorpanel.ui
index 93e454a..55f9b19 100644
--- a/sd/uiconfig/simpress/ui/navigatorpanel.ui
+++ b/sd/uiconfig/simpress/ui/navigatorpanel.ui
@@ -119,7 +119,7 @@
                 <property name="can_focus">False</property>
                 <property name="tooltip_text" translatable="yes">Drag Mode</property>
                 <property name="action_name">dragmode</property>
-                <property name="icon_name">sc/imglst/na09.png</property>
+                <property name="icon_name">sd/imglst/nv09.png</property>
               </object>
               <packing>
                 <property name="expand">False</property>

More information about the Libreoffice-commits mailing list