X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbfc8d9a612c3c498b0716e828629674f4e63363..f8f0558494f702a24cb1e8ca667dca8d02ba5dc9:/src/richtext/richtextliststylepage.cpp

diff --git a/src/richtext/richtextliststylepage.cpp b/src/richtext/richtextliststylepage.cpp
index b257498fb8..bc08d77e07 100644
--- a/src/richtext/richtextliststylepage.cpp
+++ b/src/richtext/richtextliststylepage.cpp
@@ -527,8 +527,11 @@ iaculis malesuada. Donec bibendum ipsum ut ante porta fringilla.\n");
 
     wxRichTextListStyleDefinition* def = wxDynamicCast(wxRichTextFormattingDialog::GetDialogStyleDefinition(this),
         wxRichTextListStyleDefinition);
+        
+    wxRichTextStyleSheet* styleSheet = wxRichTextFormattingDialog::GetDialog(this)->GetStyleSheet();
+
+    wxTextAttrEx attr(styleSheet ? def->GetStyle() : def->GetStyleMergedWithBase(styleSheet));
 
-    wxTextAttrEx attr(def->GetStyle());
     attr.SetFlags(attr.GetFlags() &
       (wxTEXT_ATTR_ALIGNMENT|wxTEXT_ATTR_LEFT_INDENT|wxTEXT_ATTR_RIGHT_INDENT|wxTEXT_ATTR_PARA_SPACING_BEFORE|wxTEXT_ATTR_PARA_SPACING_AFTER|
        wxTEXT_ATTR_LINE_SPACING|
@@ -643,7 +646,7 @@ bool wxRichTextListStylePage::TransferDataFromWindow()
         attr->SetLineSpacing(lineSpacing);
 
     /// BULLETS
-    if (true) // m_hasBulletStyle)
+    // if (m_hasBulletStyle)
     {
         long bulletStyle = 0;