github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

RichEdit: RTF now has precendence over images

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8674 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-07-12 07:34:04 +00:00
parent c07f3c3c58
commit 5bdae46e3a
1 changed files with 22 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

42
uppsrc/RichEdit/Clip.cpp
View file

@ -30,18 +30,6 @@ bool RichEdit::Accept(PasteClip& d, RichText& clip)
{
if(IsReadOnly())
return false;
for(int i = 0; i < RichObject::GetTypeCount(); i++) {
RichObjectType& rt = RichObject::GetType(i);
if(rt.Accept(d)) {
Value data = rt.Read(d);
if(!IsNull(data)) {
RichPara p;
p.Cat(RichObject(&rt, data, pagesz), formatinfo);
clip.Cat(p);
}
return true;
}
}
if(AcceptFiles(d)) {
Vector<String> s = GetFiles(d);
if(s.GetCount()) {
@ -61,17 +49,31 @@ bool RichEdit::Accept(PasteClip& d, RichText& clip)
}
d.Reject();
}
if(d.Accept("text/QTF"))
if(d.Accept("text/QTF")) {
clip = ParseQTF(~d, 0, context);
else
if(d.Accept(RTFS))
return true;
}
if(d.Accept(RTFS)) {
clip = ParseRTF(~d);
else
if(AcceptText(d))
return true;
}
for(int i = 0; i < RichObject::GetTypeCount(); i++) {
RichObjectType& rt = RichObject::GetType(i);
if(rt.Accept(d)) {
Value data = rt.Read(d);
if(!IsNull(data)) {
RichPara p;
p.Cat(RichObject(&rt, data, pagesz), formatinfo);
clip.Cat(p);
}
return true;
}
}
if(AcceptText(d)) {
clip = AsRichText(GetWString(d), formatinfo);
else
return false;
return true;
return true;
}
return false;
}
void RichEdit::ClipPaste(RichText& clip)