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

Fixed URL saving/loading

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48558 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-09-04 14:21:29 +00:00
parent 4b5ac600de
commit 03cd212405
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/richtext/richtextxml.cpp
View File

@@ -929,6 +929,9 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara
if (!attr.GetCharacterStyleName().empty()) if (!attr.GetCharacterStyleName().empty())
str << wxT(" characterstyle=\"") << wxString(attr.GetCharacterStyleName()) << wxT("\""); str << wxT(" characterstyle=\"") << wxString(attr.GetCharacterStyleName()) << wxT("\"");
if (attr.HasURL())
str << wxT(" url=\"") << attr.GetURL() << wxT("\"");
if (isPara) if (isPara)
{ {
if (attr.HasAlignment()) if (attr.HasAlignment())
@@ -973,9 +976,6 @@ wxString wxRichTextXMLHandler::CreateStyle(const wxTextAttrEx& attr, bool isPara
if (attr.HasBulletName()) if (attr.HasBulletName())
str << wxT(" bulletname=\"") << attr.GetBulletName() << wxT("\""); str << wxT(" bulletname=\"") << attr.GetBulletName() << wxT("\"");
if (attr.HasURL())
str << wxT(" url=\"") << attr.GetURL() << wxT("\"");
if (!attr.GetParagraphStyleName().empty()) if (!attr.GetParagraphStyleName().empty())
str << wxT(" parstyle=\"") << wxString(attr.GetParagraphStyleName()) << wxT("\""); str << wxT(" parstyle=\"") << wxString(attr.GetParagraphStyleName()) << wxT("\"");
@@ -1099,6 +1099,10 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
attr.SetTextEffectFlags(wxAtoi(value)); attr.SetTextEffectFlags(wxAtoi(value));
} }
value = node->GetAttribute(wxT("url"), wxEmptyString);
if (!value.empty())
attr.SetURL(value);
// Set paragraph attributes // Set paragraph attributes
if (isPara) if (isPara)
{ {
@@ -1172,10 +1176,6 @@ bool wxRichTextXMLHandler::GetStyle(wxTextAttrEx& attr, wxXmlNode* node, bool is
if (!value.empty()) if (!value.empty())
attr.SetBulletName(value); attr.SetBulletName(value);
value = node->GetAttribute(wxT("url"), wxEmptyString);
if (!value.empty())
attr.SetURL(value);
value = node->GetAttribute(wxT("parstyle"), wxEmptyString); value = node->GetAttribute(wxT("parstyle"), wxEmptyString);
if (!value.empty()) if (!value.empty())
attr.SetParagraphStyleName(value); attr.SetParagraphStyleName(value);