Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't reset bullet number and outline number when applying style sheet.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@65170 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2010-08-03 17:15:33 +00:00
parent a492bccff9
commit bbd55ff956
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/richtext/richtextbuffer.cpp
View File

@@ -2654,6 +2654,13 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
// So when changing a list style interactively, could retrieve level based on current style, then // So when changing a list style interactively, could retrieve level based on current style, then
// set appropriate indent and apply new style. // set appropriate indent and apply new style.
int outline = -1;
int num = -1;
if (para->GetAttributes().HasOutlineLevel())
outline = para->GetAttributes().GetOutlineLevel();
if (para->GetAttributes().HasBulletNumber())
num = para->GetAttributes().GetBulletNumber();
if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty()) if (!para->GetAttributes().GetParagraphStyleName().IsEmpty() && !para->GetAttributes().GetListStyleName().IsEmpty())
{ {
int currentIndent = para->GetAttributes().GetLeftIndent(); int currentIndent = para->GetAttributes().GetLeftIndent();
@@ -2704,6 +2711,11 @@ bool wxRichTextParagraphLayoutBox::ApplyStyleSheet(wxRichTextStyleSheet* styleSh
foundCount ++; foundCount ++;
} }
} }
if (outline != -1)
para->GetAttributes().SetOutlineLevel(outline);
if (num != -1)
para->GetAttributes().SetBulletNumber(num);
} }
node = node->GetNext(); node = node->GetNext();