summaryrefslogtreecommitdiffstats
path: root/sc/source/ui/app
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/app')
-rw-r--r--sc/source/ui/app/drwtrans.cxx86
-rw-r--r--sc/source/ui/app/lnktrans.cxx12
-rw-r--r--sc/source/ui/app/seltrans.cxx74
-rw-r--r--sc/source/ui/app/transobj.cxx58
4 files changed, 115 insertions, 115 deletions
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index 745e23863025..0910bd124ba6 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -73,9 +73,9 @@
using namespace com::sun::star;
-#define SCDRAWTRANS_TYPE_EMBOBJ 1
-#define SCDRAWTRANS_TYPE_DRAWMODEL 2
-#define SCDRAWTRANS_TYPE_DOCUMENT 3
+#define SCDRAWTRANS_TYPE_EMBOBJ SotClipboardFormatId::STRING
+#define SCDRAWTRANS_TYPE_DRAWMODEL SotClipboardFormatId::BITMAP
+#define SCDRAWTRANS_TYPE_DOCUMENT SotClipboardFormatId::GDIMETAFILE
ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContainerShell,
const TransferableObjectDescriptor& rDesc ) :
@@ -288,38 +288,38 @@ void ScDrawTransferObj::AddSupportedFormats()
{
if ( bGrIsBit ) // single bitmap graphic
{
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_SVXB );
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::SVXB );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
}
else if ( bGraphic ) // other graphic
{
// #i25616#
- AddFormat( SOT_FORMATSTR_ID_DRAWING );
+ AddFormat( SotClipboardFormatId::DRAWING );
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_SVXB );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::SVXB );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
}
else if ( pBookmark ) // url button
{
-// AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_SOLK );
- AddFormat( SOT_FORMAT_STRING );
- AddFormat( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR );
- AddFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK );
- AddFormat( SOT_FORMATSTR_ID_DRAWING );
+// AddFormat( SotClipboardFormatId::EMBED_SOURCE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::SOLK );
+ AddFormat( SotClipboardFormatId::STRING );
+ AddFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR );
+ AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK );
+ AddFormat( SotClipboardFormatId::DRAWING );
}
else if ( bOleObj ) // single OLE object
{
- AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::EMBED_SOURCE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
CreateOLEData();
@@ -337,29 +337,29 @@ void ScDrawTransferObj::AddSupportedFormats()
}
else // any drawing objects
{
- AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_DRAWING );
+ AddFormat( SotClipboardFormatId::EMBED_SOURCE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::DRAWING );
// leave out bitmap and metafile if there are only controls
if ( !lcl_HasOnlyControls( pModel ) )
{
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
}
}
// if( pImageMap )
-// AddFormat( SOT_FORMATSTR_ID_SVIM );
+// AddFormat( SotClipboardFormatId::SVIM );
}
bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc )
{
bool bOK = false;
- sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
+ SotClipboardFormatId nFormat = SotExchange::GetFormat( rFlavor );
- if ( bOleObj && nFormat != SOT_FORMAT_GDIMETAFILE )
+ if ( bOleObj && nFormat != SotClipboardFormatId::GDIMETAFILE )
{
CreateOLEData();
@@ -384,17 +384,17 @@ bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, c
if( HasFormat( nFormat ) )
{
- if ( nFormat == SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR || nFormat == SOT_FORMATSTR_ID_OBJECTDESCRIPTOR )
+ if ( nFormat == SotClipboardFormatId::LINKSRCDESCRIPTOR || nFormat == SotClipboardFormatId::OBJECTDESCRIPTOR )
{
bOK = SetTransferableObjectDescriptor( aObjDesc, rFlavor );
}
- else if ( nFormat == SOT_FORMATSTR_ID_DRAWING )
+ else if ( nFormat == SotClipboardFormatId::DRAWING )
{
bOK = SetObject( pModel, SCDRAWTRANS_TYPE_DRAWMODEL, rFlavor );
}
- else if ( nFormat == SOT_FORMAT_BITMAP
- || nFormat == SOT_FORMATSTR_ID_PNG
- || nFormat == SOT_FORMAT_GDIMETAFILE )
+ else if ( nFormat == SotClipboardFormatId::BITMAP
+ || nFormat == SotClipboardFormatId::PNG
+ || nFormat == SotClipboardFormatId::GDIMETAFILE )
{
// #i71538# use complete SdrViews
// SdrExchangeView aView( pModel );
@@ -402,12 +402,12 @@ bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, c
SdrPageView* pPv = aView.ShowSdrPage(aView.GetModel()->GetPage(0));
OSL_ENSURE( pPv, "pPv not there..." );
aView.MarkAllObj( pPv );
- if ( nFormat == SOT_FORMAT_GDIMETAFILE )
+ if ( nFormat == SotClipboardFormatId::GDIMETAFILE )
bOK = SetGDIMetaFile( aView.GetMarkedObjMetaFile(true), rFlavor );
else
bOK = SetBitmapEx( aView.GetMarkedObjBitmapEx(true), rFlavor );
}
- else if ( nFormat == SOT_FORMATSTR_ID_SVXB )
+ else if ( nFormat == SotClipboardFormatId::SVXB )
{
// only enabled for single graphics object
@@ -423,7 +423,7 @@ bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, c
}
}
}
- else if ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE )
+ else if ( nFormat == SotClipboardFormatId::EMBED_SOURCE )
{
if ( bOleObj ) // single OLE object
{
@@ -450,7 +450,7 @@ bool ScDrawTransferObj::GetData( const css::datatransfer::DataFlavor& rFlavor, c
return bOK;
}
-bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
+bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
const ::com::sun::star::datatransfer::DataFlavor& /* rFlavor */ )
{
// called from SetObject, put data into stream
@@ -741,7 +741,7 @@ void ScDrawTransferObj::InitDocShell()
Point(aSrcSize.Width()/2, aSrcSize.Height()/2),
NULL, 0, OUString(), OUString());
- // put objects to right layer (see ScViewFunc::PasteDataFormat for SOT_FORMATSTR_ID_DRAWING)
+ // put objects to right layer (see ScViewFunc::PasteDataFormat for SotClipboardFormatId::DRAWING)
SdrPage* pPage = pDestModel->GetPage(0);
if (pPage)
diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx
index a386cd0bd886..213ec96db35d 100644
--- a/sc/source/ui/app/lnktrans.cxx
+++ b/sc/source/ui/app/lnktrans.cxx
@@ -44,12 +44,12 @@ void ScLinkTransferObj::AddSupportedFormats()
{
// TransferableHelper::SetINetBookmark formats
- AddFormat( SOT_FORMATSTR_ID_SOLK );
- AddFormat( SOT_FORMAT_STRING );
- AddFormat( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR );
- AddFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK );
- AddFormat( SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_FILECONTENT );
+ AddFormat( SotClipboardFormatId::SOLK );
+ AddFormat( SotClipboardFormatId::STRING );
+ AddFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR );
+ AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK );
+ AddFormat( SotClipboardFormatId::FILEGRPDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::FILECONTENT );
}
}
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index c965c1d26b2b..6acc11e70234 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -197,62 +197,62 @@ void ScSelectionTransferObj::AddSupportedFormats()
case SC_SELTRANS_CELL:
case SC_SELTRANS_CELLS:
// same formats as in ScTransferObj::AddSupportedFormats
- AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
- AddFormat( SOT_FORMATSTR_ID_HTML );
- AddFormat( SOT_FORMATSTR_ID_SYLK );
- AddFormat( SOT_FORMATSTR_ID_LINK );
- AddFormat( SOT_FORMATSTR_ID_DIF );
- AddFormat( SOT_FORMAT_STRING );
- AddFormat( SOT_FORMAT_RTF );
+ AddFormat( SotClipboardFormatId::EMBED_SOURCE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
+ AddFormat( SotClipboardFormatId::HTML );
+ AddFormat( SotClipboardFormatId::SYLK );
+ AddFormat( SotClipboardFormatId::LINK );
+ AddFormat( SotClipboardFormatId::DIF );
+ AddFormat( SotClipboardFormatId::STRING );
+ AddFormat( SotClipboardFormatId::RTF );
if ( eMode == SC_SELTRANS_CELL )
- AddFormat( SOT_FORMATSTR_ID_EDITENGINE );
+ AddFormat( SotClipboardFormatId::EDITENGINE );
break;
// different graphic formats as in ScDrawTransferObj::AddSupportedFormats:
case SC_SELTRANS_DRAW_BITMAP:
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_SVXB );
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::SVXB );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
break;
case SC_SELTRANS_DRAW_GRAPHIC:
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_SVXB );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::SVXB );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
break;
case SC_SELTRANS_DRAW_BOOKMARK:
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_SOLK );
- AddFormat( SOT_FORMAT_STRING );
- AddFormat( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR );
- AddFormat( SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK );
- AddFormat( SOT_FORMATSTR_ID_DRAWING );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::SOLK );
+ AddFormat( SotClipboardFormatId::STRING );
+ AddFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR );
+ AddFormat( SotClipboardFormatId::NETSCAPE_BOOKMARK );
+ AddFormat( SotClipboardFormatId::DRAWING );
break;
case SC_SELTRANS_DRAW_OLE:
- AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::EMBED_SOURCE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
break;
case SC_SELTRANS_DRAW_OTHER:
// other drawing objects
- AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMATSTR_ID_DRAWING );
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::EMBED_SOURCE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::DRAWING );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
break;
default:
diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx
index f76f3b9bf0d1..4b452c8ff89f 100644
--- a/sc/source/ui/app/transobj.cxx
+++ b/sc/source/ui/app/transobj.cxx
@@ -65,10 +65,10 @@
using namespace com::sun::star;
-#define SCTRANS_TYPE_IMPEX 1
-#define SCTRANS_TYPE_EDIT_RTF 2
-#define SCTRANS_TYPE_EDIT_BIN 3
-#define SCTRANS_TYPE_EMBOBJ 4
+#define SCTRANS_TYPE_IMPEX SotClipboardFormatId::STRING
+#define SCTRANS_TYPE_EDIT_RTF SotClipboardFormatId::BITMAP
+#define SCTRANS_TYPE_EDIT_BIN SotClipboardFormatId::GDIMETAFILE
+#define SCTRANS_TYPE_EMBOBJ SotClipboardFormatId::PRIVATE
void ScTransferObj::GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCROW& nRow, SCCOL& nCol )
{
@@ -209,7 +209,7 @@ ScTransferObj* ScTransferObj::GetOwnClipboard( vcl::Window* pUIWin )
// may be from other clipboard operations (like flushing, #86059#)
TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pUIWin ) );
- if ( !aDataHelper.HasFormat( SOT_FORMATSTR_ID_DIF ) )
+ if ( !aDataHelper.HasFormat( SotClipboardFormatId::DIF ) )
{
// OSL_FAIL("ScTransferObj wasn't released");
pObj = NULL;
@@ -220,36 +220,36 @@ ScTransferObj* ScTransferObj::GetOwnClipboard( vcl::Window* pUIWin )
void ScTransferObj::AddSupportedFormats()
{
- AddFormat( SOT_FORMATSTR_ID_EMBED_SOURCE );
- AddFormat( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR );
- AddFormat( SOT_FORMAT_GDIMETAFILE );
- AddFormat( SOT_FORMATSTR_ID_PNG );
- AddFormat( SOT_FORMAT_BITMAP );
+ AddFormat( SotClipboardFormatId::EMBED_SOURCE );
+ AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
+ AddFormat( SotClipboardFormatId::GDIMETAFILE );
+ AddFormat( SotClipboardFormatId::PNG );
+ AddFormat( SotClipboardFormatId::BITMAP );
// ScImportExport formats
- AddFormat( SOT_FORMATSTR_ID_HTML );
- AddFormat( SOT_FORMATSTR_ID_SYLK );
- AddFormat( SOT_FORMATSTR_ID_LINK );
- AddFormat( SOT_FORMATSTR_ID_DIF );
- AddFormat( SOT_FORMAT_STRING );
+ AddFormat( SotClipboardFormatId::HTML );
+ AddFormat( SotClipboardFormatId::SYLK );
+ AddFormat( SotClipboardFormatId::LINK );
+ AddFormat( SotClipboardFormatId::DIF );
+ AddFormat( SotClipboardFormatId::STRING );
- AddFormat( SOT_FORMAT_RTF );
+ AddFormat( SotClipboardFormatId::RTF );
if ( aBlock.aStart == aBlock.aEnd )
- AddFormat( SOT_FORMATSTR_ID_EDITENGINE );
+ AddFormat( SotClipboardFormatId::EDITENGINE );
}
bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUString& /*rDestDoc*/ )
{
- sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
+ SotClipboardFormatId nFormat = SotExchange::GetFormat( rFlavor );
bool bOK = false;
if( HasFormat( nFormat ) )
{
- if ( nFormat == SOT_FORMATSTR_ID_LINKSRCDESCRIPTOR || nFormat == SOT_FORMATSTR_ID_OBJECTDESCRIPTOR )
+ if ( nFormat == SotClipboardFormatId::LINKSRCDESCRIPTOR || nFormat == SotClipboardFormatId::OBJECTDESCRIPTOR )
{
bOK = SetTransferableObjectDescriptor( aObjDesc, rFlavor );
}
- else if ( ( nFormat == SOT_FORMAT_RTF || nFormat == SOT_FORMATSTR_ID_EDITENGINE ) &&
+ else if ( ( nFormat == SotClipboardFormatId::RTF || nFormat == SotClipboardFormatId::EDITENGINE ) &&
aBlock.aStart == aBlock.aEnd )
{
// RTF from a single cell is handled by EditEngine
@@ -275,19 +275,19 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt
}
bOK = SetObject( &aEngine,
- (nFormat == FORMAT_RTF) ? SCTRANS_TYPE_EDIT_RTF : SCTRANS_TYPE_EDIT_BIN,
+ (nFormat == SotClipboardFormatId::RTF) ? SCTRANS_TYPE_EDIT_RTF : SCTRANS_TYPE_EDIT_BIN,
rFlavor );
}
- else if ( ScImportExport::IsFormatSupported( nFormat ) || nFormat == SOT_FORMAT_RTF )
+ else if ( ScImportExport::IsFormatSupported( nFormat ) || nFormat == SotClipboardFormatId::RTF )
{
// if this transfer object was used to create a DDE link, filtered rows
// have to be included for subsequent calls (to be consistent with link data)
- if ( nFormat == SOT_FORMATSTR_ID_LINK )
+ if ( nFormat == SotClipboardFormatId::LINK )
bUsedForLink = true;
bool bIncludeFiltered = pDoc->IsCutMode() || bUsedForLink;
- bool bReduceBlockFormat = nFormat == SOT_FORMATSTR_ID_HTML || nFormat == SOT_FORMAT_RTF;
+ bool bReduceBlockFormat = nFormat == SotClipboardFormatId::HTML || nFormat == SotClipboardFormatId::RTF;
ScRange aReducedBlock = aBlock;
if (bReduceBlockFormat && (aBlock.aEnd.Col() == MAXCOL || aBlock.aEnd.Row() == MAXROW) && aBlock.aStart.Tab() == aBlock.aEnd.Tab())
{
@@ -332,7 +332,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt
OSL_FAIL("unknown DataType");
}
}
- else if ( nFormat == SOT_FORMAT_BITMAP || nFormat == SOT_FORMATSTR_ID_PNG )
+ else if ( nFormat == SotClipboardFormatId::BITMAP || nFormat == SotClipboardFormatId::PNG )
{
Rectangle aMMRect = pDoc->GetMMRect( aBlock.aStart.Col(), aBlock.aStart.Row(),
aBlock.aEnd.Col(), aBlock.aEnd.Row(),
@@ -346,7 +346,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt
Bitmap aBmp = aVirtDev.GetBitmap( Point(), aVirtDev.GetOutputSize() );
bOK = SetBitmapEx( aBmp, rFlavor );
}
- else if ( nFormat == SOT_FORMAT_GDIMETAFILE )
+ else if ( nFormat == SotClipboardFormatId::GDIMETAFILE )
{
// #i123405# Do not limit visual size calculation for metafile creation.
// It seems unlikely that removing the limitation causes problems since
@@ -375,7 +375,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt
bOK = SetGDIMetaFile( aMtf, rFlavor );
}
- else if ( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE )
+ else if ( nFormat == SotClipboardFormatId::EMBED_SOURCE )
{
//TODO/LATER: differentiate between formats?!
// #i123405# Do limit visual size calculation to PageSize
@@ -388,7 +388,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt
return bOK;
}
-bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId,
+bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, SotClipboardFormatId nUserObjectId,
const datatransfer::DataFlavor& rFlavor )
{
// called from SetObject, put data into stream
@@ -400,7 +400,7 @@ bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject,
{
ScImportExport* pImpEx = (ScImportExport*)pUserObject;
- sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
+ SotClipboardFormatId nFormat = SotExchange::GetFormat( rFlavor );
// mba: no BaseURL for data exchange
if ( pImpEx->ExportStream( *rxOStm, OUString(), nFormat ) )
bRet = ( rxOStm->GetError() == ERRCODE_NONE );
generated by cgit (git 2.34.1) at 2024-07-27 12:51:29 +0000