diff --git a/sc/inc/tablink.hxx b/sc/inc/tablink.hxx index b3b02c97ee66..60a26b62a0f9 100644 --- a/sc/inc/tablink.hxx +++ b/sc/inc/tablink.hxx @@ -2,9 +2,9 @@ * * $RCSfile: tablink.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: nn $ $Date: 2001-05-04 12:07:44 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:20:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -66,6 +66,10 @@ #include "refreshtimer.hxx" #endif +#ifndef _EMBOBJ_HXX +#include +#endif + #ifndef _LNKBASE_HXX //autogen #include #endif diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index 2324ae16bd63..95ad7eca1492 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: htmlexp2.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: er $ $Date: 2001-05-08 16:31:41 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:20:58 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -80,6 +80,7 @@ #include #include #include +#include #ifndef SVTOOLS_URIHELPER_HXX #include #endif @@ -225,13 +226,11 @@ void ScHTMLExport::WriteGraphEntry( ScHTMLGraphEntry* pE ) case OBJ_OLE2: { const SvInPlaceObjectRef& rRef = ((SdrOle2Obj*)pObject)->GetObjRef(); - GDIMetaFile* pPic = NULL; - SvData aData( FORMAT_GDIMETAFILE ); - if( rRef->GetData( &aData ) ) - aData.GetData( &pPic, TRANSFER_REFERENCE ); - if( pPic ) + TransferableDataHelper aOleData( rRef->CreateTransferableSnapshot() ); + GDIMetaFile aMtf; + if( aOleData.GetGDIMetaFile( FORMAT_GDIMETAFILE, aMtf ) ) { - Graphic aGraph( *pPic ); + Graphic aGraph( aMtf ); String aLinkName; WriteImage( aLinkName, aGraph, aOpt ); pE->bWritten = TRUE; diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index e53c2858b30d..7de316442d65 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impex.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: er $ $Date: 2001-05-22 15:15:38 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:23:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -232,17 +232,6 @@ void ScImportExport::SetExtOptions( const ScAsciiOptions& rOpt ) } -BOOL ScImportExport::IsFormatSupported( SvDataObject* pObj ) -{ - return BOOL( pObj->HasFormat( FORMAT_STRING ) - || pObj->HasFormat( SOT_FORMATSTR_ID_SYLK ) - || pObj->HasFormat( SOT_FORMATSTR_ID_LINK ) - || pObj->HasFormat( SOT_FORMATSTR_ID_HTML ) - || pObj->HasFormat( SOT_FORMATSTR_ID_HTML_SIMPLE ) - || pObj->HasFormat( SOT_FORMATSTR_ID_DIF ) ); -} - - BOOL ScImportExport::IsFormatSupported( ULONG nFormat ) { return BOOL( nFormat == FORMAT_STRING @@ -254,15 +243,6 @@ BOOL ScImportExport::IsFormatSupported( ULONG nFormat ) } -void ScImportExport::AddFormats( SvDataTypeList* pList ) -{ - pList->Insert( SvDataType( SOT_FORMATSTR_ID_HTML, MEDIUM_MEMORY ), LIST_APPEND ); - pList->Insert( SvDataType( SOT_FORMATSTR_ID_SYLK, MEDIUM_MEMORY ), LIST_APPEND ); - pList->Insert( SvDataType( SOT_FORMATSTR_ID_LINK, MEDIUM_MEMORY ), LIST_APPEND ); - pList->Insert( SvDataType( SOT_FORMATSTR_ID_DIF, MEDIUM_MEMORY ), LIST_APPEND ); - pList->Insert( SvDataType( FORMAT_STRING, MEDIUM_MEMORY ), LIST_APPEND ); -} - ////////////////////////////////////////////////////////////////////////////// // Vorbereitung fuer Undo: Undo-Dokument erzeugen @@ -325,6 +305,7 @@ void ScImportExport::EndPaste() ///////////////////////////////////////////////////////////////////////////// +#if 0 BOOL ScImportExport::ImportData( SvData& rData ) { ULONG nFmt = rData.GetFormat(); @@ -366,17 +347,7 @@ BOOL ScImportExport::ImportData( SvData& rData ) } } -BOOL ScImportExport::ExportData( SvData& rData ) -{ - SvMemoryStream aStrm; - if( ExportStream( aStrm, rData.GetFormat() ) ) - { - aStrm << (BYTE) 0; - rData.SetData( (void*)aStrm.GetData(), aStrm.Tell() ); - return TRUE; - } - return FALSE; -} +#endif BOOL ScImportExport::ImportData( const String& rMimeType, const ::com::sun::star::uno::Any & rValue ) diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 1bda9630e22b..d7ec8bc6e33e 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tablink.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: nn $ $Date: 2001-05-04 12:08:24 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:23:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -102,7 +102,7 @@ TYPEINIT1(ScTableLink, ::so3::SvBaseLink); ScTableLink::ScTableLink(ScDocShell* pDocSh, const String& rFile, const String& rFilter, const String& rOpt, ULONG nRefresh ): - ::so3::SvBaseLink(LINKUPDATE_ONCALL,FORMAT_FILE), + ::so3::SvBaseLink(so3::LINKUPDATE_ONCALL,FORMAT_FILE), ScRefreshTimer( nRefresh ), pDocShell(pDocSh), aFileName(rFile), @@ -117,7 +117,7 @@ ScTableLink::ScTableLink(ScDocShell* pDocSh, const String& rFile, ScTableLink::ScTableLink(SfxObjectShell* pShell, const String& rFile, const String& rFilter, const String& rOpt, ULONG nRefresh ): - ::so3::SvBaseLink(LINKUPDATE_ONCALL,FORMAT_FILE), + ::so3::SvBaseLink(so3::LINKUPDATE_ONCALL,FORMAT_FILE), ScRefreshTimer( nRefresh ), pDocShell((ScDocShell*)pShell), aFileName(rFile), diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index b4192f122be4..cf6eefcd176a 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fuins2.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: jp $ $Date: 2001-03-08 20:50:17 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:24:00 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -616,9 +616,9 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, SdrView* pVi pView->InsertObject(pObj, *pPV); // Dies veranlaesst Chart zum sofortigen Update - SvData aEmpty; + //SvData aEmpty; - aIPObj->SendDataChanged( aEmpty ); + //aIPObj->SendDataChanged( aEmpty ); aIPObj->SendViewChanged(); if (!rReq.IsAPI()) diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index c3be4bfc7db7..b153b7a9babb 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -2,9 +2,9 @@ * * $RCSfile: impex.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: jp $ $Date: 2001-03-08 20:50:39 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:24:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -70,14 +70,11 @@ #include "global.hxx" #endif -class SvDataObject; -class SvDataTypeList; class ScDocShell; class ScDocument; class SvStream; class SfxMedium; class ScAsciiOptions; -class SvData; class ScImportExport { @@ -133,8 +130,6 @@ public: BOOL IsUndo() const { return bUndo; } void SetUndo( BOOL b ) { bUndo = b; } - static void AddFormats( SvDataTypeList* ); - static BOOL IsFormatSupported( SvDataObject* ); static BOOL IsFormatSupported( ULONG nFormat ); static const sal_Unicode* ScanNextFieldFromString( const sal_Unicode* p, String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, BOOL bMergeSeps ); @@ -166,9 +161,6 @@ public: BOOL ExportData( const String& rMimeType, ::com::sun::star::uno::Any & rValue ); - BOOL ImportData( SvData& rData ); - BOOL ExportData( SvData& rData ); - BOOL IsOverflow() const { return bOverflow; } // nach dem Importieren }; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 77bb1e7ae29f..90c34ea83c68 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -2,9 +2,9 @@ * * $RCSfile: navipi.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mba $ $Date: 2001-06-11 08:29:22 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:24:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -364,9 +364,6 @@ protected: virtual void Paint( const Rectangle& rRec ); virtual void Resizing( Size& rSize ); - virtual BOOL Drop( const DropEvent& rEvt ); - virtual BOOL QueryDrop( DropEvent& rEvt ); - public: ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Window* pParent ); ~ScNavigatorDlg(); @@ -394,9 +391,6 @@ public: virtual void Resizing( Size& rSize ); - virtual BOOL Drop( const DropEvent& rEvt ); - virtual BOOL QueryDrop( DropEvent& rEvt ); - private: ScNavigatorDlg* pNavigator; }; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index d6895bf3b92e..9c62336a6f2e 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -2,9 +2,9 @@ * * $RCSfile: content.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: nn $ $Date: 2001-05-14 08:42:47 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:26:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -76,7 +76,6 @@ #include #include #include -#include #include #include #include diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index e79e6d6f46da..d6563295126b 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -2,9 +2,9 @@ * * $RCSfile: navipi.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: mba $ $Date: 2001-06-11 08:29:22 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:26:23 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,7 +78,6 @@ #include #include #include -#include #include #include #include @@ -369,7 +368,7 @@ USHORT ColumnEdit::NumStrToAlpha( String& rStr ) USHORT nColumn = 0; if ( CharClass::isAsciiNumeric(rStr) ) - nColumn = NumToAlpha( rStr.ToInt32(), rStr ); + nColumn = NumToAlpha( (USHORT)rStr.ToInt32(), rStr ); else rStr.Erase(); @@ -724,16 +723,6 @@ void __EXPORT ScNavigatorDialogWrapper::Resizing( Size& rSize ) ((ScNavigatorDlg*)GetWindow())->Resizing(rSize); } -BOOL __EXPORT ScNavigatorDialogWrapper::Drop( const DropEvent& rEvt ) -{ - return GetWindow()->Drop(rEvt); -} - -BOOL __EXPORT ScNavigatorDialogWrapper::QueryDrop( DropEvent& rEvt ) -{ - return GetWindow()->QueryDrop(rEvt); -} - //======================================================================== // class ScNavigatorPI //======================================================================== @@ -1616,6 +1605,7 @@ SfxChildAlignment __EXPORT ScNavigatorDlg::CheckAlignment( // //------------------------------------------------------------------------ +#if 0 BOOL __EXPORT ScNavigatorDlg::Drop( const DropEvent& rEvt ) { BOOL bReturn = FALSE; @@ -1663,6 +1653,7 @@ BOOL __EXPORT ScNavigatorDlg::QueryDrop( DropEvent& rEvt ) return bReturn; } +#endif diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 688bcca651c1..1d00510540d3 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -2,9 +2,9 @@ * * $RCSfile: chartuno.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: jp $ $Date: 2001-03-08 20:52:48 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:27:18 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -299,8 +299,8 @@ void SAL_CALL ScChartsObj::addNewByName( const rtl::OUString& aName, pModel->AddUndo( new SdrUndoInsertObj( *pObj ) ); //! Undo-Kommentar? // Dies veranlaesst Chart zum sofortigen Update - SvData aEmpty; - aIPObj->SendDataChanged( aEmpty ); + //SvData aEmpty; + //aIPObj->SendDataChanged( aEmpty ); aIPObj->SendViewChanged(); } } diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 87e4b7f84594..d50f1fd75a9f 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfun3.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: nn $ $Date: 2001-05-11 18:29:47 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:28:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -407,8 +407,9 @@ void ScViewFunc::PasteFromSystem() PasteDraw(); else { - SvDataObjectRef pClipObj = SvDataObject::PasteClipboard(); - if (pClipObj.Is()) + TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) ); + +// if (pClipObj.Is()) { ULONG nBiff = Exchange::RegisterFormatName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff5"))); @@ -416,46 +417,52 @@ void ScViewFunc::PasteFromSystem() // als erstes SvDraw-Model, dann Grafik // (Grafik darf nur bei einzelner Grafik drinstehen) - if (pClipObj->HasFormat( SOT_FORMATSTR_ID_DRAWING )) + if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_DRAWING )) PasteFromSystem( SOT_FORMATSTR_ID_DRAWING ); - else if (pClipObj->HasFormat( SOT_FORMATSTR_ID_SVXB )) + else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_SVXB )) PasteFromSystem( SOT_FORMATSTR_ID_SVXB ); - else if (pClipObj->HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE )) + else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE )) { - // Wenn es vom Writer kommt, statt OLE RTF einfuegen + // If it's a Writer object, insert RTF instead of OLE - SvObjectDescriptor aDesc( pClipObj ); - // GlobalName vom Writer wie da in docsh.cxx - SvGlobalName aWriterName( SO3_SW_CLASSID ); - SvGlobalName aSwWebName( SO3_SWWEB_CLASSID ); - if ((aDesc.GetClassName() == aWriterName || aDesc.GetClassName() == aSwWebName) && - pClipObj->HasFormat(FORMAT_RTF)) + BOOL bDoRtf = FALSE; + SotStorageStreamRef xStm; + TransferableObjectDescriptor aObjDesc; + if( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) && + aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_EMBED_SOURCE, xStm ) ) + { + SvStorageRef xStore( new SvStorage( *xStm ) ); + bDoRtf = ( ( aObjDesc.maClassName == SvGlobalName( SO3_SW_CLASSID ) || + aObjDesc.maClassName == SvGlobalName( SO3_SWWEB_CLASSID ) ) + && aDataHelper.HasFormat( SOT_FORMAT_RTF ) ); + } + if ( bDoRtf ) PasteFromSystem( FORMAT_RTF ); else PasteFromSystem( SOT_FORMATSTR_ID_EMBED_SOURCE ); } - else if (pClipObj->HasFormat( SOT_FORMATSTR_ID_LINK_SOURCE )) + else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_LINK_SOURCE )) PasteFromSystem( SOT_FORMATSTR_ID_LINK_SOURCE ); // FORMAT_PRIVATE no longer here (can't work if pOwnClip is NULL) - else if (pClipObj->HasFormat(nBiff)) // before xxx_OLE formats + else if (aDataHelper.HasFormat(nBiff)) // before xxx_OLE formats PasteFromSystem(nBiff); - else if (pClipObj->HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE )) + else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE )) PasteFromSystem( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE ); - else if (pClipObj->HasFormat( SOT_FORMATSTR_ID_LINK_SOURCE_OLE )) + else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_LINK_SOURCE_OLE )) PasteFromSystem( SOT_FORMATSTR_ID_LINK_SOURCE_OLE ); - else if (pClipObj->HasFormat(FORMAT_RTF)) + else if (aDataHelper.HasFormat(FORMAT_RTF)) PasteFromSystem(FORMAT_RTF); - else if (pClipObj->HasFormat(SOT_FORMATSTR_ID_HTML)) + else if (aDataHelper.HasFormat(SOT_FORMATSTR_ID_HTML)) PasteFromSystem(SOT_FORMATSTR_ID_HTML); - else if (pClipObj->HasFormat(SOT_FORMATSTR_ID_HTML_SIMPLE)) + else if (aDataHelper.HasFormat(SOT_FORMATSTR_ID_HTML_SIMPLE)) PasteFromSystem(SOT_FORMATSTR_ID_HTML_SIMPLE); - else if (pClipObj->HasFormat(SOT_FORMATSTR_ID_SYLK)) + else if (aDataHelper.HasFormat(SOT_FORMATSTR_ID_SYLK)) PasteFromSystem(SOT_FORMATSTR_ID_SYLK); - else if (pClipObj->HasFormat(FORMAT_STRING)) + else if (aDataHelper.HasFormat(FORMAT_STRING)) PasteFromSystem(FORMAT_STRING); - else if (pClipObj->HasFormat(FORMAT_GDIMETAFILE)) + else if (aDataHelper.HasFormat(FORMAT_GDIMETAFILE)) PasteFromSystem(FORMAT_GDIMETAFILE); - else if (pClipObj->HasFormat(FORMAT_BITMAP)) + else if (aDataHelper.HasFormat(FORMAT_BITMAP)) PasteFromSystem(FORMAT_BITMAP); // else // ErrorMessage(STR_PASTE_ERROR); diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 8b23ded30d99..8031f4251bc4 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfun4.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.13 $ * - * last change: $Author: nn $ $Date: 2001-03-30 19:14:44 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:28:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -95,7 +95,6 @@ #include #include #include -#include #include #include @@ -153,9 +152,10 @@ void ScViewFunc::PasteRTF( USHORT nStartCol, USHORT nStartRow, if (bPasteIsDrop) { - DropEvent aDropEvt; - if (aEditView.QueryDrop( aDropEvt )) - aEditView.Drop( aDropEvt ); + //! paste drag server content into EditEngine + //DropEvent aDropEvt; + //if (aEditView.QueryDrop( aDropEvt )) + // aEditView.Drop( aDropEvt ); } else aEditView.PasteSpecial(); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 3e81e52ca592..a40c582c828b 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -2,9 +2,9 @@ * * $RCSfile: viewfun5.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: nn $ $Date: 2001-05-14 08:43:38 $ + * last change: $Author: nn $ $Date: 2001-06-29 20:28:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,7 +86,6 @@ #include #include #include -#include #include #include @@ -477,13 +476,15 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } else if ( nFormatId == SOT_FORMAT_FILE ) { - USHORT nCount = DragServer::GetItemCount(); - if (nCount == 0) // normal handling (not D&D) + //! multiple files? + //USHORT nCount = DragServer::GetItemCount(); + //if (nCount == 0) // normal handling (not D&D) { String aFile; if ( aDataHelper.GetString( nFormatId, aFile ) ) bRet = PasteFile( aPos, aFile ); } +#if 0 else // use multiple items from drag server { for( USHORT i = 0; i < nCount ; i++ ) @@ -502,6 +503,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } bRet = TRUE; } +#endif } else if ( nFormatId == SOT_FORMATSTR_ID_SOLK || nFormatId == SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR ||