зеркало из https://github.com/mozilla/pjs.git
Changing return value for IsLargeDataSet() to PRBool.
This commit is contained in:
Родитель
4f1a2b40bb
Коммит
32a54f52ba
|
@ -101,11 +101,10 @@ class nsITransferable : public nsISupports {
|
||||||
NS_IMETHOD AddDataFlavor(nsIDataFlavor * aDataFlavor) = 0;
|
NS_IMETHOD AddDataFlavor(nsIDataFlavor * aDataFlavor) = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns whether the data is large
|
* Returns PR_TRUE if the data is large.
|
||||||
*
|
*
|
||||||
* @return NS_OK is data set is larg, NS_ERROR_FAILURE if data set is small
|
|
||||||
*/
|
*/
|
||||||
NS_IMETHOD IsLargeDataSet() = 0;
|
NS_IMETHOD_(PRBool) IsLargeDataSet() = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sets the converter for this transferable
|
* Sets the converter for this transferable
|
||||||
|
|
|
@ -212,6 +212,7 @@ NS_IMETHODIMP nsTransferable::AddDataFlavor(nsIDataFlavor * aDataFlavor)
|
||||||
nsAutoString mimeInQuestion;
|
nsAutoString mimeInQuestion;
|
||||||
aDataFlavor->GetMimeType(mimeInQuestion);
|
aDataFlavor->GetMimeType(mimeInQuestion);
|
||||||
|
|
||||||
|
// Do we have the data flavor already?
|
||||||
PRInt32 i;
|
PRInt32 i;
|
||||||
for (i=0;i<mDataArray->Count();i++) {
|
for (i=0;i<mDataArray->Count();i++) {
|
||||||
DataStruct * data = (DataStruct *)mDataArray->ElementAt(i);
|
DataStruct * data = (DataStruct *)mDataArray->ElementAt(i);
|
||||||
|
@ -239,9 +240,9 @@ NS_IMETHODIMP nsTransferable::AddDataFlavor(nsIDataFlavor * aDataFlavor)
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
NS_IMETHODIMP nsTransferable::IsLargeDataSet()
|
NS_IMETHODIMP_(PRBool) nsTransferable::IsLargeDataSet()
|
||||||
{
|
{
|
||||||
return NS_ERROR_FAILURE;
|
return PR_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -56,7 +56,7 @@ public:
|
||||||
NS_IMETHOD SetTransferData(nsIDataFlavor * aFlavor, void * aData, PRUint32 aDataLen);
|
NS_IMETHOD SetTransferData(nsIDataFlavor * aFlavor, void * aData, PRUint32 aDataLen);
|
||||||
|
|
||||||
NS_IMETHOD AddDataFlavor(nsIDataFlavor * aDataFlavor);
|
NS_IMETHOD AddDataFlavor(nsIDataFlavor * aDataFlavor);
|
||||||
NS_IMETHOD IsLargeDataSet();
|
NS_IMETHOD_(PRBool) IsLargeDataSet();
|
||||||
|
|
||||||
NS_IMETHOD SetConverter(nsIFormatConverter * aConverter);
|
NS_IMETHOD SetConverter(nsIFormatConverter * aConverter);
|
||||||
NS_IMETHOD GetConverter(nsIFormatConverter ** aConverter);
|
NS_IMETHOD GetConverter(nsIFormatConverter ** aConverter);
|
||||||
|
|
|
@ -1325,7 +1325,7 @@ nsEditorAppCore::Exit()
|
||||||
nsITransferable * trans = nsnull; // XXX this needs fixin
|
nsITransferable * trans = nsnull; // XXX this needs fixin
|
||||||
clipboard->GetData(trans);
|
clipboard->GetData(trans);
|
||||||
if (nsnull != trans) {
|
if (nsnull != trans) {
|
||||||
if (NS_OK == trans->IsLargeDataSet()) {
|
if (PR_TRUE == trans->IsLargeDataSet()) {
|
||||||
// XXX A Dialog goes here to see if they want to "force" a copy
|
// XXX A Dialog goes here to see if they want to "force" a copy
|
||||||
// of the data to the clipboard
|
// of the data to the clipboard
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче