[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 sw/source
Caolán McNamara
caolanm at redhat.com
Mon Dec 5 11:10:38 UTC 2016
dev/null |binary
icon-themes/breeze/sw/res/nc20000.png |binary
icon-themes/breeze/sw/res/nc20006.png |binary
icon-themes/breeze_dark/sw/res/nc20000.png |binary
icon-themes/breeze_dark/sw/res/nc20006.png |binary
icon-themes/breeze_svg/sw/imglst/nc20000.svg | 140
icon-themes/breeze_svg/sw/imglst/nc20006.svg | 149
icon-themes/breeze_svg/sw/res/nc20000.svg | 140
icon-themes/breeze_svg/sw/res/nc20006.svg | 149
icon-themes/crystal/sw/res/nc20001.png |binary
icon-themes/crystal/sw/res/nc20004.png |binary
icon-themes/crystal/sw/res/nc20005.png |binary
icon-themes/elementary/sw/res/nc20000.png |binary
icon-themes/galaxy/sw/res/nc20000.png |binary
icon-themes/galaxy/sw/res/nc20001.png |binary
icon-themes/galaxy/sw/res/nc20002.png |binary
icon-themes/galaxy/sw/res/nc20003.png |binary
icon-themes/galaxy/sw/res/nc20004.png |binary
icon-themes/galaxy/sw/res/nc20005.png |binary
icon-themes/galaxy/sw/res/nc20006.png |binary
icon-themes/galaxy/sw/res/nc20007.png |binary
icon-themes/galaxy/sw/res/nc20008.png |binary
icon-themes/galaxy/sw/res/nc20009.png |binary
icon-themes/galaxy/sw/res/nc20010.png |binary
icon-themes/galaxy/sw/res/nc20011.png |binary
icon-themes/hicontrast/sw/res/nc20000.png |binary
icon-themes/hicontrast/sw/res/nc20001.png |binary
icon-themes/hicontrast/sw/res/nc20002.png |binary
icon-themes/hicontrast/sw/res/nc20003.png |binary
icon-themes/hicontrast/sw/res/nc20004.png |binary
icon-themes/hicontrast/sw/res/nc20005.png |binary
icon-themes/hicontrast/sw/res/nc20006.png |binary
icon-themes/hicontrast/sw/res/nc20007.png |binary
icon-themes/hicontrast/sw/res/nc20008.png |binary
icon-themes/hicontrast/sw/res/nc20009.png |binary
icon-themes/hicontrast/sw/res/nc20010.png |binary
icon-themes/hicontrast/sw/res/nc20011.png |binary
icon-themes/oxygen/sw/res/nc20000.png |binary
icon-themes/oxygen/sw/res/nc20001.png |binary
icon-themes/oxygen/sw/res/nc20002.png |binary
icon-themes/oxygen/sw/res/nc20003.png |binary
icon-themes/oxygen/sw/res/nc20004.png |binary
icon-themes/oxygen/sw/res/nc20005.png |binary
icon-themes/oxygen/sw/res/nc20006.png |binary
icon-themes/oxygen/sw/res/nc20007.png |binary
icon-themes/oxygen/sw/res/nc20008.png |binary
icon-themes/oxygen/sw/res/nc20009.png |binary
icon-themes/oxygen/sw/res/nc20010.png |binary
icon-themes/oxygen/sw/res/nc20011.png |binary
icon-themes/sifr/sw/res/nc20007.png |binary
icon-themes/tango/sw/res/nc20000.png |binary
icon-themes/tango_testing/sw/imglst/nc20000.svg | 357
icon-themes/tango_testing/sw/imglst/nc20001.svg |15775 ------
icon-themes/tango_testing/sw/imglst/nc20002.svg |16007 ------
icon-themes/tango_testing/sw/imglst/nc20004-sr20010.svg | 974
icon-themes/tango_testing/sw/imglst/nc20006.svg |16007 ------
icon-themes/tango_testing/sw/imglst/nc20007.svg |39129 ----------------
icon-themes/tango_testing/sw/imglst/nc20008.svg |16027 ------
icon-themes/tango_testing/sw/imglst/nc20009.svg |16206 ------
icon-themes/tango_testing/sw/res/nc20000.png |binary
icon-themes/tango_testing/sw/res/nc20000.svg | 357
icon-themes/tango_testing/sw/res/nc20001.png |binary
icon-themes/tango_testing/sw/res/nc20001.svg |15775 ++++++
icon-themes/tango_testing/sw/res/nc20002.png |binary
icon-themes/tango_testing/sw/res/nc20002.svg |16007 ++++++
icon-themes/tango_testing/sw/res/nc20003.png |binary
icon-themes/tango_testing/sw/res/nc20004-sr20010.svg | 974
icon-themes/tango_testing/sw/res/nc20004.png |binary
icon-themes/tango_testing/sw/res/nc20005.png |binary
icon-themes/tango_testing/sw/res/nc20006.png |binary
icon-themes/tango_testing/sw/res/nc20006.svg |16007 ++++++
icon-themes/tango_testing/sw/res/nc20007.png |binary
icon-themes/tango_testing/sw/res/nc20007.svg |39129 ++++++++++++++++
icon-themes/tango_testing/sw/res/nc20008.png |binary
icon-themes/tango_testing/sw/res/nc20008.svg |16027 ++++++
icon-themes/tango_testing/sw/res/nc20009.png |binary
icon-themes/tango_testing/sw/res/nc20009.svg |16206 ++++++
icon-themes/tango_testing/sw/res/nc20010.png |binary
icon-themes/tango_testing/sw/res/nc20011.png |binary
sw/source/ui/misc/outline.cxx | 14
sw/source/uibase/config/uinums.cxx | 10
sw/source/uibase/inc/conttree.hxx | 5
sw/source/uibase/inc/outline.hxx | 4
sw/source/uibase/inc/swcont.hxx | 1
sw/source/uibase/inc/uinums.hxx | 2
sw/source/uibase/inc/utlui.hrc | 19
sw/source/uibase/uno/unotxdoc.cxx | 29
sw/source/uibase/utlui/content.cxx | 68
sw/source/uibase/utlui/glbltree.cxx | 13
sw/source/uibase/utlui/navipi.cxx | 8
sw/source/uibase/utlui/navipi.src | 96
91 files changed, 120940 insertions(+), 120871 deletions(-)
New commits:
commit 42d68eada6a745bdccb210efffcde8668061e3ef
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 5 10:39:01 2016 +0000
unroll IMG_NAVI_ENTRYBMP ImageList
Change-Id: Icb00102f064b845b33a072880c60a9aae5dc4a55
diff --git a/icon-themes/breeze/sw/imglst/nc20000.png b/icon-themes/breeze/sw/res/nc20000.png
similarity index 100%
rename from icon-themes/breeze/sw/imglst/nc20000.png
rename to icon-themes/breeze/sw/res/nc20000.png
diff --git a/icon-themes/breeze/sw/imglst/nc20006.png b/icon-themes/breeze/sw/res/nc20006.png
similarity index 100%
rename from icon-themes/breeze/sw/imglst/nc20006.png
rename to icon-themes/breeze/sw/res/nc20006.png
diff --git a/icon-themes/breeze_dark/sw/imglst/nc20000.png b/icon-themes/breeze_dark/sw/res/nc20000.png
similarity index 100%
rename from icon-themes/breeze_dark/sw/imglst/nc20000.png
rename to icon-themes/breeze_dark/sw/res/nc20000.png
diff --git a/icon-themes/breeze_dark/sw/imglst/nc20006.png b/icon-themes/breeze_dark/sw/res/nc20006.png
similarity index 100%
rename from icon-themes/breeze_dark/sw/imglst/nc20006.png
rename to icon-themes/breeze_dark/sw/res/nc20006.png
diff --git a/icon-themes/breeze_svg/sw/imglst/nc20000.svg b/icon-themes/breeze_svg/sw/res/nc20000.svg
similarity index 100%
rename from icon-themes/breeze_svg/sw/imglst/nc20000.svg
rename to icon-themes/breeze_svg/sw/res/nc20000.svg
diff --git a/icon-themes/breeze_svg/sw/imglst/nc20006.svg b/icon-themes/breeze_svg/sw/res/nc20006.svg
similarity index 100%
rename from icon-themes/breeze_svg/sw/imglst/nc20006.svg
rename to icon-themes/breeze_svg/sw/res/nc20006.svg
diff --git a/icon-themes/oxygen/sw/imglst/nc20001.png b/icon-themes/crystal/sw/res/nc20001.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/nc20001.png
rename to icon-themes/crystal/sw/res/nc20001.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20004.png b/icon-themes/crystal/sw/res/nc20004.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/nc20004.png
rename to icon-themes/crystal/sw/res/nc20004.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20005.png b/icon-themes/crystal/sw/res/nc20005.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/nc20005.png
rename to icon-themes/crystal/sw/res/nc20005.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20000.png b/icon-themes/elementary/sw/res/nc20000.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/nc20000.png
rename to icon-themes/elementary/sw/res/nc20000.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20000.png b/icon-themes/galaxy/sw/res/nc20000.png
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/nc20000.png
rename to icon-themes/galaxy/sw/res/nc20000.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20001.png b/icon-themes/galaxy/sw/res/nc20001.png
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/nc20001.png
rename to icon-themes/galaxy/sw/res/nc20001.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20002.png b/icon-themes/galaxy/sw/res/nc20002.png
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/nc20002.png
rename to icon-themes/galaxy/sw/res/nc20002.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20003.png b/icon-themes/galaxy/sw/res/nc20003.png
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/nc20003.png
rename to icon-themes/galaxy/sw/res/nc20003.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20004.png b/icon-themes/galaxy/sw/res/nc20004.png
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/nc20004.png
rename to icon-themes/galaxy/sw/res/nc20004.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20005.png b/icon-themes/galaxy/sw/res/nc20005.png
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/nc20005.png
rename to icon-themes/galaxy/sw/res/nc20005.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20006.png b/icon-themes/galaxy/sw/res/nc20006.png
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/nc20006.png
rename to icon-themes/galaxy/sw/res/nc20006.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20007.png b/icon-themes/galaxy/sw/res/nc20007.png
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/nc20007.png
rename to icon-themes/galaxy/sw/res/nc20007.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20008.png b/icon-themes/galaxy/sw/res/nc20008.png
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/nc20008.png
rename to icon-themes/galaxy/sw/res/nc20008.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20009.png b/icon-themes/galaxy/sw/res/nc20009.png
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/nc20009.png
rename to icon-themes/galaxy/sw/res/nc20009.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20010.png b/icon-themes/galaxy/sw/res/nc20010.png
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/nc20010.png
rename to icon-themes/galaxy/sw/res/nc20010.png
diff --git a/icon-themes/galaxy/sw/imglst/nc20011.png b/icon-themes/galaxy/sw/res/nc20011.png
similarity index 100%
rename from icon-themes/galaxy/sw/imglst/nc20011.png
rename to icon-themes/galaxy/sw/res/nc20011.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20000.png b/icon-themes/hicontrast/sw/res/nc20000.png
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/nc20000.png
rename to icon-themes/hicontrast/sw/res/nc20000.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20001.png b/icon-themes/hicontrast/sw/res/nc20001.png
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/nc20001.png
rename to icon-themes/hicontrast/sw/res/nc20001.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20002.png b/icon-themes/hicontrast/sw/res/nc20002.png
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/nc20002.png
rename to icon-themes/hicontrast/sw/res/nc20002.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20003.png b/icon-themes/hicontrast/sw/res/nc20003.png
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/nc20003.png
rename to icon-themes/hicontrast/sw/res/nc20003.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20004.png b/icon-themes/hicontrast/sw/res/nc20004.png
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/nc20004.png
rename to icon-themes/hicontrast/sw/res/nc20004.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20005.png b/icon-themes/hicontrast/sw/res/nc20005.png
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/nc20005.png
rename to icon-themes/hicontrast/sw/res/nc20005.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20006.png b/icon-themes/hicontrast/sw/res/nc20006.png
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/nc20006.png
rename to icon-themes/hicontrast/sw/res/nc20006.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20007.png b/icon-themes/hicontrast/sw/res/nc20007.png
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/nc20007.png
rename to icon-themes/hicontrast/sw/res/nc20007.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20008.png b/icon-themes/hicontrast/sw/res/nc20008.png
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/nc20008.png
rename to icon-themes/hicontrast/sw/res/nc20008.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20009.png b/icon-themes/hicontrast/sw/res/nc20009.png
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/nc20009.png
rename to icon-themes/hicontrast/sw/res/nc20009.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20010.png b/icon-themes/hicontrast/sw/res/nc20010.png
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/nc20010.png
rename to icon-themes/hicontrast/sw/res/nc20010.png
diff --git a/icon-themes/hicontrast/sw/imglst/nc20011.png b/icon-themes/hicontrast/sw/res/nc20011.png
similarity index 100%
rename from icon-themes/hicontrast/sw/imglst/nc20011.png
rename to icon-themes/hicontrast/sw/res/nc20011.png
diff --git a/icon-themes/elementary/sw/imglst/nc20000.png b/icon-themes/oxygen/sw/res/nc20000.png
similarity index 100%
rename from icon-themes/elementary/sw/imglst/nc20000.png
rename to icon-themes/oxygen/sw/res/nc20000.png
diff --git a/icon-themes/crystal/sw/imglst/nc20001.png b/icon-themes/oxygen/sw/res/nc20001.png
similarity index 100%
rename from icon-themes/crystal/sw/imglst/nc20001.png
rename to icon-themes/oxygen/sw/res/nc20001.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20002.png b/icon-themes/oxygen/sw/res/nc20002.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/nc20002.png
rename to icon-themes/oxygen/sw/res/nc20002.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20003.png b/icon-themes/oxygen/sw/res/nc20003.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/nc20003.png
rename to icon-themes/oxygen/sw/res/nc20003.png
diff --git a/icon-themes/crystal/sw/imglst/nc20004.png b/icon-themes/oxygen/sw/res/nc20004.png
similarity index 100%
rename from icon-themes/crystal/sw/imglst/nc20004.png
rename to icon-themes/oxygen/sw/res/nc20004.png
diff --git a/icon-themes/crystal/sw/imglst/nc20005.png b/icon-themes/oxygen/sw/res/nc20005.png
similarity index 100%
rename from icon-themes/crystal/sw/imglst/nc20005.png
rename to icon-themes/oxygen/sw/res/nc20005.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20006.png b/icon-themes/oxygen/sw/res/nc20006.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/nc20006.png
rename to icon-themes/oxygen/sw/res/nc20006.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20007.png b/icon-themes/oxygen/sw/res/nc20007.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/nc20007.png
rename to icon-themes/oxygen/sw/res/nc20007.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20008.png b/icon-themes/oxygen/sw/res/nc20008.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/nc20008.png
rename to icon-themes/oxygen/sw/res/nc20008.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20009.png b/icon-themes/oxygen/sw/res/nc20009.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/nc20009.png
rename to icon-themes/oxygen/sw/res/nc20009.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20010.png b/icon-themes/oxygen/sw/res/nc20010.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/nc20010.png
rename to icon-themes/oxygen/sw/res/nc20010.png
diff --git a/icon-themes/oxygen/sw/imglst/nc20011.png b/icon-themes/oxygen/sw/res/nc20011.png
similarity index 100%
rename from icon-themes/oxygen/sw/imglst/nc20011.png
rename to icon-themes/oxygen/sw/res/nc20011.png
diff --git a/icon-themes/sifr/sw/imglst/nc20007.png b/icon-themes/sifr/sw/res/nc20007.png
similarity index 100%
rename from icon-themes/sifr/sw/imglst/nc20007.png
rename to icon-themes/sifr/sw/res/nc20007.png
diff --git a/icon-themes/tango/sw/imglst/nc20000.png b/icon-themes/tango/sw/res/nc20000.png
similarity index 100%
rename from icon-themes/tango/sw/imglst/nc20000.png
rename to icon-themes/tango/sw/res/nc20000.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20000.png b/icon-themes/tango_testing/sw/res/nc20000.png
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20000.png
rename to icon-themes/tango_testing/sw/res/nc20000.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20000.svg b/icon-themes/tango_testing/sw/res/nc20000.svg
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20000.svg
rename to icon-themes/tango_testing/sw/res/nc20000.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20001.png b/icon-themes/tango_testing/sw/res/nc20001.png
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20001.png
rename to icon-themes/tango_testing/sw/res/nc20001.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20001.svg b/icon-themes/tango_testing/sw/res/nc20001.svg
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20001.svg
rename to icon-themes/tango_testing/sw/res/nc20001.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20002.png b/icon-themes/tango_testing/sw/res/nc20002.png
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20002.png
rename to icon-themes/tango_testing/sw/res/nc20002.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20002.svg b/icon-themes/tango_testing/sw/res/nc20002.svg
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20002.svg
rename to icon-themes/tango_testing/sw/res/nc20002.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20003.png b/icon-themes/tango_testing/sw/res/nc20003.png
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20003.png
rename to icon-themes/tango_testing/sw/res/nc20003.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20004-sr20010.svg b/icon-themes/tango_testing/sw/res/nc20004-sr20010.svg
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20004-sr20010.svg
rename to icon-themes/tango_testing/sw/res/nc20004-sr20010.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20004.png b/icon-themes/tango_testing/sw/res/nc20004.png
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20004.png
rename to icon-themes/tango_testing/sw/res/nc20004.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20005.png b/icon-themes/tango_testing/sw/res/nc20005.png
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20005.png
rename to icon-themes/tango_testing/sw/res/nc20005.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20006.png b/icon-themes/tango_testing/sw/res/nc20006.png
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20006.png
rename to icon-themes/tango_testing/sw/res/nc20006.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20006.svg b/icon-themes/tango_testing/sw/res/nc20006.svg
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20006.svg
rename to icon-themes/tango_testing/sw/res/nc20006.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20007.png b/icon-themes/tango_testing/sw/res/nc20007.png
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20007.png
rename to icon-themes/tango_testing/sw/res/nc20007.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20007.svg b/icon-themes/tango_testing/sw/res/nc20007.svg
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20007.svg
rename to icon-themes/tango_testing/sw/res/nc20007.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20008.png b/icon-themes/tango_testing/sw/res/nc20008.png
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20008.png
rename to icon-themes/tango_testing/sw/res/nc20008.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20008.svg b/icon-themes/tango_testing/sw/res/nc20008.svg
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20008.svg
rename to icon-themes/tango_testing/sw/res/nc20008.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20009.png b/icon-themes/tango_testing/sw/res/nc20009.png
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20009.png
rename to icon-themes/tango_testing/sw/res/nc20009.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20009.svg b/icon-themes/tango_testing/sw/res/nc20009.svg
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20009.svg
rename to icon-themes/tango_testing/sw/res/nc20009.svg
diff --git a/icon-themes/tango_testing/sw/imglst/nc20010.png b/icon-themes/tango_testing/sw/res/nc20010.png
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20010.png
rename to icon-themes/tango_testing/sw/res/nc20010.png
diff --git a/icon-themes/tango_testing/sw/imglst/nc20011.png b/icon-themes/tango_testing/sw/res/nc20011.png
similarity index 100%
rename from icon-themes/tango_testing/sw/imglst/nc20011.png
rename to icon-themes/tango_testing/sw/res/nc20011.png
diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx
index 86068a1..f641f9b 100644
--- a/sw/source/uibase/inc/conttree.hxx
+++ b/sw/source/uibase/inc/conttree.hxx
@@ -73,7 +73,6 @@ class SwContentTree
, public SfxListener
{
VclPtr<SwNavigationPI> m_xDialog;
- ImageList m_aEntryImages;
OUString m_sSpace;
AutoTimer m_aUpdTimer;
@@ -111,7 +110,6 @@ class SwContentTree
bool m_bIsLastReadOnly :1;
bool m_bIsOutlineMoveable :1;
bool m_bViewHasChanged :1;
- bool m_bIsImageListInitialized : 1;
static bool bIsInDrag;
@@ -265,8 +263,6 @@ private:
AutoTimer aUpdateTimer;
OUString aContextStrings[GLOBAL_CONTEXT_COUNT];
- ImageList aEntryImages;
-
SwWrtShell* pActiveShell;
SvTreeListEntry* pEmphasisEntry; // Drag'n Drop emphasis
SvTreeListEntry* pDDSource; // source for Drag'n Drop
@@ -277,7 +273,6 @@ private:
bool bIsInternalDrag :1;
bool bLastEntryEmphasis :1; // Drag'n Drop
- bool bIsImageListInitialized : 1;
static const SfxObjectShell* pShowShell;
diff --git a/sw/source/uibase/inc/swcont.hxx b/sw/source/uibase/inc/swcont.hxx
index 29179d7..078304a 100644
--- a/sw/source/uibase/inc/swcont.hxx
+++ b/sw/source/uibase/inc/swcont.hxx
@@ -25,7 +25,6 @@
class SwContentType;
-// synchronize order and number with ResIds!!
enum class ContentTypeId
{
OUTLINE = 0,
diff --git a/sw/source/uibase/inc/utlui.hrc b/sw/source/uibase/inc/utlui.hrc
index f6d2880..843eba4 100644
--- a/sw/source/uibase/inc/utlui.hrc
+++ b/sw/source/uibase/inc/utlui.hrc
@@ -145,7 +145,6 @@
#define RES_FRMEX_MENU (STR_AUTH_FIELD_END + 1)
-#define IMG_NAVI_ENTRYBMP (RC_UTLUI_BEGIN + 4)
#define ILIST_DB_DLG (RC_UTLUI_BEGIN + 6)
#define IMG_VIEWLAYOUT_AUTOMATIC (RC_UTLUI_BEGIN + 12)
@@ -155,9 +154,21 @@
#define IMG_VIEWLAYOUT_SINGLECOLUMN (RC_UTLUI_BEGIN + 16)
#define IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE (RC_UTLUI_BEGIN + 17)
#define IMG_PAGE_BREAK (RC_UTLUI_BEGIN + 18)
-#define RID_BMP_DROP_REGION (RC_UTLUI_BEGIN + 19)
-#define RID_BMP_DROP_LINK (RC_UTLUI_BEGIN + 20)
-#define RID_BMP_DROP_COPY (RC_UTLUI_BEGIN + 21)
+#define RID_BMP_NAVI_OUTLINE (RC_UTLUI_BEGIN + 19)
+#define RID_BMP_NAVI_TABLE (RC_UTLUI_BEGIN + 20)
+#define RID_BMP_NAVI_FRAME (RC_UTLUI_BEGIN + 21)
+#define RID_BMP_NAVI_GRAPHIC (RC_UTLUI_BEGIN + 22)
+#define RID_BMP_NAVI_OLE (RC_UTLUI_BEGIN + 23)
+#define RID_BMP_NAVI_BOOKMARK (RC_UTLUI_BEGIN + 24)
+#define RID_BMP_NAVI_REGION (RC_UTLUI_BEGIN + 25)
+#define RID_BMP_NAVI_URLFIELD (RC_UTLUI_BEGIN + 26)
+#define RID_BMP_NAVI_REFERENCE (RC_UTLUI_BEGIN + 27)
+#define RID_BMP_NAVI_INDEX (RC_UTLUI_BEGIN + 28)
+#define RID_BMP_NAVI_POSTIT (RC_UTLUI_BEGIN + 29)
+#define RID_BMP_NAVI_DRAWOBJECT (RC_UTLUI_BEGIN + 30)
+#define RID_BMP_DROP_REGION (RC_UTLUI_BEGIN + 31)
+#define RID_BMP_DROP_LINK (RC_UTLUI_BEGIN + 32)
+#define RID_BMP_DROP_COPY (RC_UTLUI_BEGIN + 33)
//local ids of the Database ImageLists
#define IMG_COLLAPSE 18002 /*RID_SVXIMG_COLLAPSEDNODE*/
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 3aa6ec2..531bec7 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -4033,31 +4033,26 @@ static Any lcl_GetDisplayBitmap(const OUString& _sLinkSuffix)
OUString sLinkSuffix = _sLinkSuffix;
if(!sLinkSuffix.isEmpty())
sLinkSuffix = sLinkSuffix.copy(1);
- ContentTypeId nImgId(ContentTypeId::UNKNOWN);
- bool bNotFound = false;
+ sal_uInt16 nImgId(0);
if(sLinkSuffix == "outline")
- nImgId = ContentTypeId::OUTLINE;
+ nImgId = RID_BMP_NAVI_OUTLINE;
else if(sLinkSuffix == "table")
- nImgId = ContentTypeId::TABLE;
+ nImgId = RID_BMP_NAVI_TABLE;
else if(sLinkSuffix == "frame")
- nImgId = ContentTypeId::FRAME;
+ nImgId = RID_BMP_NAVI_FRAME;
else if(sLinkSuffix == "graphic")
- nImgId = ContentTypeId::GRAPHIC;
- else if(sLinkSuffix == "region")
- nImgId = ContentTypeId::REGION;
+ nImgId = RID_BMP_NAVI_GRAPHIC;
else if(sLinkSuffix == "ole")
- nImgId = ContentTypeId::OLE;
+ nImgId = RID_BMP_NAVI_OLE;
else if(sLinkSuffix.isEmpty())
- nImgId = ContentTypeId::BOOKMARK;
- else
- bNotFound = true;
- if(!bNotFound)
+ nImgId = RID_BMP_NAVI_BOOKMARK;
+ else if(sLinkSuffix == "region")
+ nImgId = RID_BMP_NAVI_REGION;
+
+ if (nImgId)
{
- ImageList aEntryImages( SW_RES(IMG_NAVI_ENTRYBMP) );
- const Image& rImage = aEntryImages.GetImage( (int)nImgId + 2000 );
- Bitmap aBitmap( rImage.GetBitmapEx().GetBitmap() );
- aRet <<= VCLUnoHelper::CreateBitmap( aBitmap );
+ aRet <<= VCLUnoHelper::CreateBitmap(BitmapEx(SW_RES(nImgId)).GetBitmap());
}
return aRet;
}
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 512248b..56cd415 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -797,7 +797,6 @@ SwContentTree::SwContentTree(vcl::Window* pParent, SwNavigationPI* pDialog)
, m_bIsLastReadOnly(false)
, m_bIsOutlineMoveable(true)
, m_bViewHasChanged(false)
- , m_bIsImageListInitialized(false)
, m_bIsKeySpace(false)
{
SetHelpId(HID_NAVIGATOR_TREELIST);
@@ -1531,13 +1530,61 @@ IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl, SvTreeListBox*, bool)
return false;
}
-void SwContentTree::Display( bool bActive )
+namespace
{
- if(!m_bIsImageListInitialized)
+ BitmapEx GetBitmapForContentTypeId(ContentTypeId eType)
{
- m_aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
- m_bIsImageListInitialized = true;
- }
+ sal_uInt16 nResId(0);
+
+ switch (eType)
+ {
+ case ContentTypeId::OUTLINE:
+ nResId = RID_BMP_NAVI_OUTLINE;
+ break;
+ case ContentTypeId::TABLE:
+ nResId = RID_BMP_NAVI_TABLE;
+ break;
+ case ContentTypeId::FRAME:
+ nResId = RID_BMP_NAVI_FRAME;
+ break;
+ case ContentTypeId::GRAPHIC:
+ nResId = RID_BMP_NAVI_GRAPHIC;
+ break;
+ case ContentTypeId::OLE:
+ nResId = RID_BMP_NAVI_OLE;
+ break;
+ case ContentTypeId::BOOKMARK:
+ nResId = RID_BMP_NAVI_BOOKMARK;
+ break;
+ case ContentTypeId::REGION:
+ nResId = RID_BMP_NAVI_REGION;
+ break;
+ case ContentTypeId::URLFIELD:
+ nResId = RID_BMP_NAVI_URLFIELD;
+ break;
+ case ContentTypeId::REFERENCE:
+ nResId = RID_BMP_NAVI_REFERENCE;
+ break;
+ case ContentTypeId::INDEX:
+ nResId = RID_BMP_NAVI_INDEX;
+ break;
+ case ContentTypeId::POSTIT:
+ nResId = RID_BMP_NAVI_POSTIT;
+ break;
+ case ContentTypeId::DRAWOBJECT:
+ nResId = RID_BMP_NAVI_DRAWOBJECT;
+ break;
+ case ContentTypeId::UNKNOWN:
+ SAL_WARN("sw.ui", "ContentTypeId::UNKNOWN has no bitmap preview");
+ break;
+ }
+
+ return BitmapEx(SW_RES(nResId));
+ };
+}
+
+void SwContentTree::Display( bool bActive )
+{
// First read the selected entry to select it later again if necessary
// -> the user data here are no longer valid!
SvTreeListEntry* pOldSelEntry = FirstSelected();
@@ -1596,9 +1643,9 @@ void SwContentTree::Display( bool bActive )
OUString sEntry = (*ppContentT)->GetName();
SvTreeListEntry* pEntry;
- const Image& rImage = m_aEntryImages.GetImage(SID_SW_START + (int)nCntType);
+ Image aImage(GetBitmapForContentTypeId(nCntType));
bool bChOnDemand = 0 != (*ppContentT)->GetMemberCount();
- pEntry = InsertEntry(sEntry, rImage, rImage,
+ pEntry = InsertEntry(sEntry, aImage, aImage,
nullptr, bChOnDemand, TREELIST_APPEND, (*ppContentT));
if(nCntType == m_nLastSelType)
pSelEntry = pEntry;
@@ -1647,9 +1694,9 @@ void SwContentTree::Display( bool bActive )
&m_aHiddenContentArr[m_nRootType];
if(!(*ppRootContentT))
(*ppRootContentT) = new SwContentType(pShell, m_nRootType, m_nOutlineLevel );
- const Image& rImage = m_aEntryImages.GetImage(20000 + (int)m_nRootType);
+ Image aImage(GetBitmapForContentTypeId(m_nRootType));
SvTreeListEntry* pParent = InsertEntry(
- (*ppRootContentT)->GetName(), rImage, rImage,
+ (*ppRootContentT)->GetName(), aImage, aImage,
nullptr, false, TREELIST_APPEND, *ppRootContentT);
if(m_nRootType != ContentTypeId::OUTLINE)
@@ -3521,7 +3568,6 @@ void SwContentTree::DataChanged(const DataChangedEvent& rDCEvt)
{
FindActiveTypeAndRemoveUserData();
- m_bIsImageListInitialized = false;
Display(true);
}
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index 038cf7d..cee4def 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -145,7 +145,6 @@ SwGlobalTree::SwGlobalTree(vcl::Window* pParent, SwNavigationPI* pDialog)
, pDocInserter(nullptr)
, bIsInternalDrag(false)
, bLastEntryEmphasis(false)
- , bIsImageListInitialized(false)
{
SetDragDropMode(DragDropMode::APP_COPY |
DragDropMode::CTRL_MOVE |
@@ -622,13 +621,8 @@ void SwGlobalTree::Clear()
SvTreeListBox::Clear();
}
-void SwGlobalTree::Display(bool bOnlyUpdateUserData)
+void SwGlobalTree::Display(bool bOnlyUpdateUserData)
{
- if(!bIsImageListInitialized)
- {
- aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
- bIsImageListInitialized = true;
- }
size_t nCount = pSwGlblDocContents->size();
if(bOnlyUpdateUserData && GetEntryCount() == pSwGlblDocContents->size())
{
@@ -673,14 +667,14 @@ void SwGlobalTree::Display(bool bOnlyUpdateUserData)
{
const SwTOXBase* pBase = pCont->GetTOX();
sEntry = pBase->GetTitle();
- aImage = aEntryImages.GetImage(SID_SW_START + (int)ContentTypeId::INDEX);
+ aImage = Image(Bitmap(SW_RES(RID_BMP_NAVI_INDEX)));
}
break;
case GLBLDOC_SECTION:
{
const SwSection* pSect = pCont->GetSection();
sEntry = pSect->GetSectionName();
- aImage = aEntryImages.GetImage(SID_SW_START + (int)ContentTypeId::REGION);
+ aImage = Image(Bitmap(SW_RES(RID_BMP_DROP_REGION)));
}
break;
}
@@ -1244,7 +1238,6 @@ void SwGlobalTree::DataChanged( const DataChangedEvent& rDCEvt )
if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) &&
(rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
{
- aEntryImages = ImageList(SW_RES(IMG_NAVI_ENTRYBMP));
Update(true);
}
SvTreeListBox::DataChanged( rDCEvt );
diff --git a/sw/source/uibase/utlui/navipi.src b/sw/source/uibase/utlui/navipi.src
index e3cb27a..e1e5bc9 100644
--- a/sw/source/uibase/utlui/navipi.src
+++ b/sw/source/uibase/utlui/navipi.src
@@ -24,25 +24,64 @@
#include "helpid.h"
#include "access.hrc"
-ImageList IMG_NAVI_ENTRYBMP
-{
- Prefix = "nc";
- IdList =
- {
- 20000 ;
- 20001 ;
- 20002 ;
- 20003 ;
- 20004 ;
- 20005 ;
- 20006 ;
- 20007 ;
- 20008 ;
- 20009 ;
- 20010 ;
- 20011 ;
- };
- IdCount = { 12 ; };
+Bitmap RID_BMP_NAVI_OUTLINE
+{
+ File = "nc20000.png" ;
+};
+
+Bitmap RID_BMP_NAVI_TABLE
+{
+ File = "nc20001.png" ;
+};
+
+Bitmap RID_BMP_NAVI_FRAME
+{
+ File = "nc20002.png" ;
+};
+
+Bitmap RID_BMP_NAVI_GRAPHIC
+{
+ File = "nc20003.png" ;
+};
+
+Bitmap RID_BMP_NAVI_OLE
+{
+ File = "nc20004.png" ;
+};
+
+Bitmap RID_BMP_NAVI_BOOKMARK
+{
+ File = "nc20005.png" ;
+};
+
+Bitmap RID_BMP_NAVI_REGION
+{
+ File = "nc20006.png" ;
+};
+
+Bitmap RID_BMP_NAVI_URLFIELD
+{
+ File = "nc20007.png" ;
+};
+
+Bitmap RID_BMP_NAVI_REFERENCE
+{
+ File = "nc20008.png" ;
+};
+
+Bitmap RID_BMP_NAVI_INDEX
+{
+ File = "nc20009.png" ;
+};
+
+Bitmap RID_BMP_NAVI_POSTIT
+{
+ File = "nc20010.png" ;
+};
+
+Bitmap RID_BMP_NAVI_DRAWOBJECT
+{
+ File = "nc20011.png" ;
};
Bitmap RID_BMP_DROP_REGION
commit dae92e11061a718a0c74384b086bca14aa2213ac
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 5 10:11:53 2016 +0000
convert these Image resources to Bitmap
Change-Id: Iff9e956f65190c0e9dc99ada5df613fc0be9516e
diff --git a/sw/source/uibase/inc/utlui.hrc b/sw/source/uibase/inc/utlui.hrc
index 6789d2a..f6d2880 100644
--- a/sw/source/uibase/inc/utlui.hrc
+++ b/sw/source/uibase/inc/utlui.hrc
@@ -155,9 +155,9 @@
#define IMG_VIEWLAYOUT_SINGLECOLUMN (RC_UTLUI_BEGIN + 16)
#define IMG_VIEWLAYOUT_SINGLECOLUMN_ACTIVE (RC_UTLUI_BEGIN + 17)
#define IMG_PAGE_BREAK (RC_UTLUI_BEGIN + 18)
-#define RID_IMG_DROP_REGION (RC_UTLUI_BEGIN + 19)
-#define RID_IMG_DROP_LINK (RC_UTLUI_BEGIN + 20)
-#define RID_IMG_DROP_COPY (RC_UTLUI_BEGIN + 21)
+#define RID_BMP_DROP_REGION (RC_UTLUI_BEGIN + 19)
+#define RID_BMP_DROP_LINK (RC_UTLUI_BEGIN + 20)
+#define RID_BMP_DROP_COPY (RC_UTLUI_BEGIN + 21)
//local ids of the Database ImageLists
#define IMG_COLLAPSE 18002 /*RID_SVXIMG_COLLAPSEDNODE*/
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index c6eeb70..1a73048 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -1107,16 +1107,16 @@ void SwNavigationPI::SetRegionDropMode(RegionMode nNewMode)
switch (nNewMode)
{
case RegionMode::NONE:
- nImageId = RID_IMG_DROP_REGION;
+ nImageId = RID_BMP_DROP_REGION;
break;
case RegionMode::LINK:
- nImageId = RID_IMG_DROP_LINK;
+ nImageId = RID_BMP_DROP_LINK;
break;
case RegionMode::EMBEDDED:
- nImageId = RID_IMG_DROP_COPY;
+ nImageId = RID_BMP_DROP_COPY;
break;
}
- m_aContentToolBox->SetItemImage(m_aContentToolBox->GetItemId("dragmode"), Image(SW_RES(nImageId)));
+ m_aContentToolBox->SetItemImage(m_aContentToolBox->GetItemId("dragmode"), Image(BitmapEx(SW_RES(nImageId))));
}
void SwNavigationPI::ToggleTree()
diff --git a/sw/source/uibase/utlui/navipi.src b/sw/source/uibase/utlui/navipi.src
index 85c9feb..e3cb27a 100644
--- a/sw/source/uibase/utlui/navipi.src
+++ b/sw/source/uibase/utlui/navipi.src
@@ -45,28 +45,19 @@ ImageList IMG_NAVI_ENTRYBMP
IdCount = { 12 ; };
};
-Image RID_IMG_DROP_REGION
+Bitmap RID_BMP_DROP_REGION
{
- ImageBitmap = Bitmap
- {
- File = "sc20235.png" ;
- };
+ File = "sc20235.png" ;
};
-Image RID_IMG_DROP_LINK
+Bitmap RID_BMP_DROP_LINK
{
- ImageBitmap = Bitmap
- {
- File = "sc20238.png" ;
- };
+ File = "sc20238.png" ;
};
-Image RID_IMG_DROP_COPY
+Bitmap RID_BMP_DROP_COPY
{
- ImageBitmap = Bitmap
- {
- File = "sc20239.png" ;
- };
+ File = "sc20239.png" ;
};
String STR_ACCESS_TL_GLOBAL
commit e5ecb998fd78137aec32ad2cc996eaa4bb3e499d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 5 09:52:43 2016 +0000
avoid coverity#1371269 Missing move assignment operator
Change-Id: I0ba8991ecc0934d839ac4e1bfe80f0568057fcc7
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 5520f22..62cd020 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -305,7 +305,7 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool )
const SwNumRulesWithName *pRules = pChapterNumRules->GetRules( nLevelNo );
if( pRules )
{
- *xNumRule = pRules->MakeNumRule(rWrtSh);
+ xNumRule.reset(pRules->MakeNumRule(rWrtSh));
xNumRule->SetRuleType( OUTLINE_RULE );
}
else
diff --git a/sw/source/uibase/config/uinums.cxx b/sw/source/uibase/config/uinums.cxx
index 9d2772a3..f6eb039 100644
--- a/sw/source/uibase/config/uinums.cxx
+++ b/sw/source/uibase/config/uinums.cxx
@@ -159,19 +159,19 @@ SwNumRulesWithName& SwNumRulesWithName::operator=(const SwNumRulesWithName &rCop
return *this;
}
-SwNumRule SwNumRulesWithName::MakeNumRule(SwWrtShell& rSh) const
+SwNumRule* SwNumRulesWithName::MakeNumRule(SwWrtShell& rSh) const
{
// #i89178#
- SwNumRule aChg(maName, numfunc::GetDefaultPositionAndSpaceMode());
- aChg.SetAutoRule( false );
+ SwNumRule* pChg = new SwNumRule(maName, numfunc::GetDefaultPositionAndSpaceMode());
+ pChg->SetAutoRule( false );
for (sal_uInt16 n = 0; n < MAXLEVEL; ++n)
{
SwNumFormatGlobal* pFormat = aFormats[ n ];
if (!pFormat)
continue;
- aChg.Set(n, pFormat->MakeNumFormat(rSh));
+ pChg->Set(n, pFormat->MakeNumFormat(rSh));
}
- return aChg;
+ return pChg;
}
void SwNumRulesWithName::GetNumFormat(
diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx
index 08bdb2d..4dc28f6 100644
--- a/sw/source/uibase/inc/uinums.hxx
+++ b/sw/source/uibase/inc/uinums.hxx
@@ -73,7 +73,7 @@ public:
SwNumRulesWithName &operator=(const SwNumRulesWithName &);
const OUString& GetName() const { return maName; }
- SwNumRule MakeNumRule(SwWrtShell& rSh) const;
+ SwNumRule* MakeNumRule(SwWrtShell& rSh) const;
void GetNumFormat(size_t, SwNumFormat const*&, OUString const*&) const;
};
commit 7dde56f2cfb970464f5ebbacac6ebb8b6d9cceef
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Dec 5 09:48:17 2016 +0000
use a std::unique_ptr
Change-Id: I23fdc5f86d8fb9da3c74fab4e47636600fa408b7
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 1e61f43..5520f22 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -167,7 +167,7 @@ SwOutlineTabDialog::SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* p
pUserButton->SetClickHdl(LINK(this, SwOutlineTabDialog, FormHdl));
pUserButton->SetAccessibleRole( css::accessibility::AccessibleRole::BUTTON_MENU );
- pNumRule = new SwNumRule( *rSh.GetOutlineNumRule() );
+ xNumRule.reset(new SwNumRule(*rSh.GetOutlineNumRule()));
GetCancelButton().SetClickHdl(LINK(this, SwOutlineTabDialog, CancelHdl));
m_nNumPosId = AddTabPage("position", &SwNumPositionTabPage::Create, nullptr);
@@ -208,7 +208,7 @@ SwOutlineTabDialog::~SwOutlineTabDialog()
void SwOutlineTabDialog::dispose()
{
- delete pNumRule;
+ xNumRule.reset();
SfxTabDialog::dispose();
}
@@ -294,7 +294,7 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool )
{
const OUString aName(pDlg->GetName());
pChapterNumRules->ApplyNumRules( SwNumRulesWithName(
- *pNumRule, aName ), pDlg->GetCurEntryPos() );
+ *xNumRule, aName ), pDlg->GetCurEntryPos() );
pMenu->SetItemText(pMenu->GetItemId(pDlg->GetCurEntryPos()), aName);
}
return false;
@@ -305,11 +305,11 @@ IMPL_LINK( SwOutlineTabDialog, MenuSelectHdl, Menu *, pMenu, bool )
const SwNumRulesWithName *pRules = pChapterNumRules->GetRules( nLevelNo );
if( pRules )
{
- *pNumRule = pRules->MakeNumRule(rWrtSh);
- pNumRule->SetRuleType( OUTLINE_RULE );
+ *xNumRule = pRules->MakeNumRule(rWrtSh);
+ xNumRule->SetRuleType( OUTLINE_RULE );
}
else
- *pNumRule = *rWrtSh.GetOutlineNumRule();
+ *xNumRule = *rWrtSh.GetOutlineNumRule();
}
sal_uInt16 nPageId = GetCurPageId();
@@ -406,7 +406,7 @@ short SwOutlineTabDialog::Ok()
}
}
- rWrtSh.SetOutlineNumRule( *pNumRule);
+ rWrtSh.SetOutlineNumRule(*xNumRule);
// #i30443#
rWrtSh.EndAction();
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index 27a5459..b97af7a 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -52,7 +52,7 @@ class SwOutlineTabDialog : public SfxTabDialog
OUString aCollNames[MAXLEVEL];
SwWrtShell& rWrtSh;
- SwNumRule* pNumRule;
+ std::unique_ptr<SwNumRule> xNumRule;
SwChapterNumRules* pChapterNumRules;
bool bModified : 1;
@@ -72,7 +72,7 @@ public:
virtual ~SwOutlineTabDialog() override;
virtual void dispose() override;
- SwNumRule* GetNumRule() {return pNumRule;}
+ SwNumRule* GetNumRule() { return xNumRule.get(); }
sal_uInt16 GetLevel(const OUString &rFormatName) const;
OUString* GetCollNames() {return aCollNames;}
More information about the Libreoffice-commits
mailing list