Commits

Thomas Lange [tl]  committed e6c9220

cws tl77: #i115136#, #i111876# new clipboard format for EditEngine

  • Participants
  • Parent commits 0e015c4

Comments (0)

Files changed (2)

File editeng/source/editeng/eeobj.cxx

 
 uno::Sequence< datatransfer::DataFlavor > EditDataObject::getTransferDataFlavors(  ) throw(uno::RuntimeException)
 {
-    uno::Sequence< datatransfer::DataFlavor > aDataFlavors(3);
+    uno::Sequence< datatransfer::DataFlavor > aDataFlavors(4);
 
     // not an actual format but only means to identify the origin of the data (needed for Calc)
     SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_DATASOURCE_EDITENGINE, aDataFlavors.getArray()[0] );
 
     SotExchange::GetFormatDataFlavor( SOT_FORMAT_STRING, aDataFlavors.getArray()[1] );
     SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_ID_EDITENGINE, aDataFlavors.getArray()[2] );
-//TL_TEST    SotExchange::GetFormatDataFlavor( SOT_FORMAT_RTF, aDataFlavors.getArray()[3] );
+    SotExchange::GetFormatDataFlavor( SOT_FORMAT_RTF, aDataFlavors.getArray()[3] );
 
 	return aDataFlavors;
 }
 {
 	ULONG nT = SotExchange::GetFormat( rFlavor );
     sal_Bool bSupported = nT == SOT_FORMAT_STRING ||
-//TL_TEST            nT == SOT_FORMAT_RTF ||
+            nT == SOT_FORMAT_RTF ||
             nT == SOT_FORMATSTR_ID_EDITENGINE ||
             nT == SOT_FORMATSTR_DATASOURCE_EDITENGINE;  // not an actual format but only means to identify the origin of the data (needed for Calc)
 	return bSupported;

File sot/source/base/exchange.cxx

             /* 12 SOT_FORMATSTR_ID_SVXB*/					{ "application/x-openoffice-svxb;windows_formatname=\"SVXB (StarView Bitmap/Animation)\"", "SVXB (StarView Bitmap/Animation)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /* 13 SOT_FORMATSTR_ID_SVIM*/					{ "application/x-openoffice-svim;windows_formatname=\"SVIM (StarView ImageMap)\"", "SVIM (StarView ImageMap)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /* 14 SOT_FORMATSTR_ID_XFA*/					{ "application/x-openoffice-xfa;windows_formatname=\"XFA (XOutDev FillAttr)\"", "XFA (XOutDev FillAttr)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
-            /* 15 SOT_FORMATSTR_ID_EDITENGINE*/             { "application/x-openoffice-editengine;windows_formatname=\"EditEngineFormat\"", "EditEngineFormat", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
+            /* 15 SOT_FORMATSTR_ID_EDITENGINE*/             { "application/x-openoffice-editengine;windows_formatname=\"ODF (OpenDocument Format)\"", "ODF (OpenDocument Format)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /* 16 SOT_FORMATSTR_ID_INTERNALLINK_STATE*/		{ "application/x-openoffice-internallink-state;windows_formatname=\"StatusInfo vom SvxInternalLink\"", "StatusInfo vom SvxInternalLink", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /* 17 SOT_FORMATSTR_ID_SOLK*/					{ "application/x-openoffice-solk;windows_formatname=\"SOLK (StarOffice Link)\"", "SOLK (StarOffice Link)", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },
             /* 18 SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK*/		{ "application/x-openoffice-netscape-bookmark;windows_formatname=\"Netscape Bookmark\"", "Netscape Bookmark", &::getCppuType( (const Sequence< sal_Int8 >*) 0 ) },