Attachment #47817 for issue #81024

View | Details | Raw Unified | Return to issue 81024
Collapse All | Expand All




						   static_cast<XTransferable*>(this));
	  
  CFIndex flavorCount = CFArrayGetCount(flavorTypeArray);
  if ( flavorCount )
  {
    ClipboardItemPtr_t clipboardItem;

    for (CFIndex flavorIndex = 0; flavorIndex < flavorCount; flavorIndex++)
    {
      CFStringRef systemFlavor = (CFStringRef)CFArrayGetValueAtIndex(flavorTypeArray, flavorIndex);
      if ( systemFlavor )
      {
        DataFlavor oOOFlavor = mpDataFlavorMapper->systemToOpenOfficeFlavor(systemFlavor);
        if (isValidFlavor(oOOFlavor))
        {
          mClipboardItems.push_back(ClipboardItemPtr_t(new ClipboardItem(clipboardItemId, systemFlavor, oOOFlavor)));
        }
        CFRelease( systemFlavor );
      }
    }
  }
}


/* Compares two DataFlavors. Returns true if both DataFlavor have the same media type
   and the number of parameter and all parameter values do match otherwise false
   is returned.

Lines 171-176 Link Here

(-)dtrans/source/aqua/aqua_clipboard.cxx (+1 lines)
171	throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot set clipboard contents")),	171	throw RuntimeException(OUString(RTL_CONSTASCII_USTRINGPARAM("AquaClipboard: Cannot set clipboard contents")),
172	static_cast<XClipboardEx*>(this));	172	static_cast<XClipboardEx*>(this));
173	}	173	}
		174	CFRelease( systemFlavor );
174	}	175	}
175	}	176	}
176	}	177	}

Return to issue 81024

Lines 221-241 Link Here

(-)dtrans/source/aqua/OSXTransferable.cxx (-13 / +18 lines)
221	static_cast<XTransferable*>(this));	221	static_cast<XTransferable*>(this));
222		222
223	CFIndex flavorCount = CFArrayGetCount(flavorTypeArray);	223	CFIndex flavorCount = CFArrayGetCount(flavorTypeArray);
224	ClipboardItemPtr_t clipboardItem;	224	if ( flavorCount )
225		225	{
226	for (CFIndex flavorIndex = 0; flavorIndex < flavorCount; flavorIndex++)	226	ClipboardItemPtr_t clipboardItem;
227	{	227
228	CFStringRef systemFlavor = (CFStringRef)CFArrayGetValueAtIndex(flavorTypeArray, flavorIndex);	228	for (CFIndex flavorIndex = 0; flavorIndex < flavorCount; flavorIndex++)
229	DataFlavor oOOFlavor = mpDataFlavorMapper->systemToOpenOfficeFlavor(systemFlavor);	229	{
230		230	CFStringRef systemFlavor = (CFStringRef)CFArrayGetValueAtIndex(flavorTypeArray, flavorIndex);
231	if (isValidFlavor(oOOFlavor))	231	if ( systemFlavor )
232	{	232	{
233	mClipboardItems.push_back(ClipboardItemPtr_t(new ClipboardItem(clipboardItemId, systemFlavor, oOOFlavor)));	233	DataFlavor oOOFlavor = mpDataFlavorMapper->systemToOpenOfficeFlavor(systemFlavor);
234	}	234	if (isValidFlavor(oOOFlavor))
235	}	235	{
		236	mClipboardItems.push_back(ClipboardItemPtr_t(new ClipboardItem(clipboardItemId, systemFlavor, oOOFlavor)));
		237	}
		238	CFRelease( systemFlavor );
		239	}
		240	}
		241	}
236	}	242	}
237		243
238
239	/* Compares two DataFlavors. Returns true if both DataFlavor have the same media type	244	/* Compares two DataFlavors. Returns true if both DataFlavor have the same media type
240	and the number of parameter and all parameter values do match otherwise false	245	and the number of parameter and all parameter values do match otherwise false
241	is returned.	246	is returned.