Merge remote-tracking branch 'origin/master' into hotfix/v6.2.1

Merge branch release/v6.2.0 into master
fix bug #49040 (#537 )
2026-04-07 13:55:33 +08:00 · 2021-03-22 11:43:27 +03:00 · 2021-03-18 10:17:58 +00:00 · 2021-03-15 22:11:34 +03:00 · 2021-03-15 15:25:29 +00:00 · 2021-03-01 08:42:25 +00:00
1 changed files with 1 additions and 1 deletions
--- a/ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp
+++ b/ASCOfficeOdfFileW/source/OdfFormat/odf_style_context.cpp
@ -49,7 +49,7 @@ namespace cpdoccore {

 namespace odf_writer {

-static int style_family_counts_[26]={};//согласно количеству разных стилей
+static int style_family_counts_[1024]={};//согласно количеству разных стилей


 void calc_paragraph_properties_content(std::vector<style_paragraph_properties*> & parProps, paragraph_format_properties * result)
Author	SHA1	Message	Date
Alexander Trofimov	31b196840b	Merge remote-tracking branch 'origin/master' into hotfix/v6.2.1	2021-03-22 11:43:27 +03:00
papacarlo	ddbb99414f	Merge branch release/v6.2.0 into master	2021-03-18 10:17:58 +00:00
Elena Subbotina	af5329264e	fix bug #49040 (#537 )	2021-03-15 22:11:34 +03:00
papacarlo	fa9a2ed203	Merge branch release/v6.2.0 into master	2021-03-15 15:25:29 +00:00
papacarlo	2a5a5df225	Merge branch release/v6.2.0 into master	2021-03-01 08:42:25 +00:00
papacarlo	8e7deaa1bc	Merge branch hotfix/v6.1.1 into master	2021-01-28 08:12:35 +00:00