diff options
| author | Eike Rathke <erack@redhat.com> | 2016-12-13 23:11:35 +0100 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2016-12-13 23:12:49 +0100 |
| commit | 3b4712c3969c705edcfc756492da6db7c0d2e018 (patch) | |
| tree | 4f14a05f147e9837beac7b529b3e51225c651c02 /svx/source | |
| parent | 48b561c770699c9730de25ada2934cda36110eba (diff) | |
add "Linked graphics" to RID_SVXSTRARY_NUMBERINGTYPE
... and exclude it at the relevant places that load this resource.
In preparation of eliminating another duplicated UI string definition
instance.
Change-Id: Ia500fffe5c044a76bce2d72e6ea22ff71bb1dfb1
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/dialog/numberingtype.src | 1 | ||||
| -rw-r--r-- | svx/source/dialog/pagenumberlistbox.cxx | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/svx/source/dialog/numberingtype.src b/svx/source/dialog/numberingtype.src index f0702d8403fb..49534111df19 100644 --- a/svx/source/dialog/numberingtype.src +++ b/svx/source/dialog/numberingtype.src @@ -26,6 +26,7 @@ StringArray RID_SVXSTRARY_NUMBERINGTYPE < "None" ; 5/*SVX_NUM_NUMBER_NONE */; > ; < "Bullet" ; 6/*SVX_NUM_CHAR_SPECIAL */; > ; < "Graphics" ; 8/*SVX_NUM_BITMAP */; > ; + < "Linked graphics" ; 136/*SVX_NUM_BITMAP|0x80 */; > ; < "1, 2, 3, ..." ; 4/*SVX_NUM_ARABIC */; > ; < "A, B, C, ..." ; 0/*SVX_NUM_CHARS_UPPER_LETTER */; > ; < "a, b, c, ..." ; 1/*SVX_NUM_CHARS_LOWER_LETTER */; > ; diff --git a/svx/source/dialog/pagenumberlistbox.cxx b/svx/source/dialog/pagenumberlistbox.cxx index 2e333b3992c8..9a6859293333 100644 --- a/svx/source/dialog/pagenumberlistbox.cxx +++ b/svx/source/dialog/pagenumberlistbox.cxx @@ -19,6 +19,7 @@ #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> #include <svx/pagenumberlistbox.hxx> +#include <editeng/numitem.hxx> #include <tools/resary.hxx> #include <vcl/builderfactory.hxx> #include <com/sun/star/style/NumberingType.hpp> @@ -38,6 +39,7 @@ PageNumberListBox::PageNumberListBox(vcl::Window* pParent) // for Bullet and Graphics, ignore those here. case css::style::NumberingType::CHAR_SPECIAL: case css::style::NumberingType::BITMAP: + case css::style::NumberingType::BITMAP | LINK_TOKEN: break; default: { |