зеркало из https://github.com/mozilla/pjs.git
updates to sync with nsString2 api
This commit is contained in:
Родитель
25093ccc16
Коммит
2491a0aa62
|
@ -539,10 +539,10 @@ nsImageFrame::TriggerLink(nsIPresContext& aPresContext,
|
||||||
aPresContext.GetLinkHandler(&handler);
|
aPresContext.GetLinkHandler(&handler);
|
||||||
if (nsnull != handler) {
|
if (nsnull != handler) {
|
||||||
if (aClick) {
|
if (aClick) {
|
||||||
handler->OnLinkClick(mContent, eLinkVerb_Replace, aURLSpec, aTargetSpec);
|
handler->OnLinkClick(mContent, eLinkVerb_Replace, aURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
handler->OnOverLink(mContent, aURLSpec, aTargetSpec);
|
handler->OnOverLink(mContent, aURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
|
||||||
}
|
}
|
||||||
NS_RELEASE(handler);
|
NS_RELEASE(handler);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1079,7 +1079,7 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
|
||||||
|
|
||||||
// if we didn't find the type, but we do have a src, we can determine the mimetype
|
// if we didn't find the type, but we do have a src, we can determine the mimetype
|
||||||
// based on the file extension
|
// based on the file extension
|
||||||
if(!mimeType && src)
|
if(!mimeType && src.GetUnicode())
|
||||||
{
|
{
|
||||||
char* extension;
|
char* extension;
|
||||||
char* cString = src.ToNewCString();
|
char* cString = src.ToNewCString();
|
||||||
|
|
|
@ -539,10 +539,10 @@ nsImageFrame::TriggerLink(nsIPresContext& aPresContext,
|
||||||
aPresContext.GetLinkHandler(&handler);
|
aPresContext.GetLinkHandler(&handler);
|
||||||
if (nsnull != handler) {
|
if (nsnull != handler) {
|
||||||
if (aClick) {
|
if (aClick) {
|
||||||
handler->OnLinkClick(mContent, eLinkVerb_Replace, aURLSpec, aTargetSpec);
|
handler->OnLinkClick(mContent, eLinkVerb_Replace, aURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
handler->OnOverLink(mContent, aURLSpec, aTargetSpec);
|
handler->OnOverLink(mContent, aURLSpec.GetUnicode(), aTargetSpec.GetUnicode());
|
||||||
}
|
}
|
||||||
NS_RELEASE(handler);
|
NS_RELEASE(handler);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1079,7 +1079,7 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
|
||||||
|
|
||||||
// if we didn't find the type, but we do have a src, we can determine the mimetype
|
// if we didn't find the type, but we do have a src, we can determine the mimetype
|
||||||
// based on the file extension
|
// based on the file extension
|
||||||
if(!mimeType && src)
|
if(!mimeType && src.GetUnicode())
|
||||||
{
|
{
|
||||||
char* extension;
|
char* extension;
|
||||||
char* cString = src.ToNewCString();
|
char* cString = src.ToNewCString();
|
||||||
|
|
Загрузка…
Ссылка в новой задаче