diff options
| author | Cao Cuong Ngo <cao.cuong.ngo@gmail.com> | 2013-04-10 20:41:54 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-04-13 17:33:05 +0200 |
| commit | 6f504b6307179f00075bd1dadd722ff2e8855ea9 (patch) | |
| tree | 56a3e1fd7f4e4d213bb7942ed2cd25de15c35eb4 /filter | |
| parent | add46920608b6f5b79c0ca33845eae4e1e59a4b6 (diff) | |
fdo#47018 Impress crashes when modifying bullet
Default numbering rules shouldn't be left zero nor hard-coded.
Reviewed-on: https://gerrit.libreoffice.org/3312
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit 5785db93c5739846fb0a84b138be485044d4bda5)
Conflicts:
sd/source/core/drawdoc4.cxx
sd/source/core/stlpool.cxx
Change-Id: I8a34331006abf3de8c170f8dca43ccf9cec92f04
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 306309d592db..beb774b52579 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -47,6 +47,7 @@ #include <svx/svdocapt.hxx> #include <svx/svdotable.hxx> #include <editeng/outlobj.hxx> +#include <editeng/numdef.hxx> #include <svx/svdattr.hxx> #include "svx/xattr.hxx" #include "svx/svditext.hxx" @@ -4283,20 +4284,20 @@ PPTStyleSheet::PPTStyleSheet( const DffRecordHeader& rSlideHd, SvStream& rIn, Sd eNumRuleType = SVX_RULETYPE_NUMBERING; break; case TSS_TYPE_SUBTITLE : - nLevels = 10; + nLevels = SVX_MAX_NUM; eNumRuleType = SVX_RULETYPE_NUMBERING; break; case TSS_TYPE_BODY : case TSS_TYPE_HALFBODY : case TSS_TYPE_QUARTERBODY : - nLevels = 10; + nLevels = SVX_MAX_NUM; eNumRuleType = SVX_RULETYPE_PRESENTATION_NUMBERING; break; default : case TSS_TYPE_NOTES : case TSS_TYPE_UNUSED : case TSS_TYPE_TEXT_IN_SHAPE : - nLevels = 10; + nLevels = SVX_MAX_NUM; eNumRuleType = SVX_RULETYPE_NUMBERING; break; } |