diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-03-18 12:56:25 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-03-18 13:07:59 +0000 |
| commit | dcde8abaaf7e136a49222e9c73644b6868373659 (patch) | |
| tree | 4cf4ee5aea9304ad88e09692d546a17ed27856ab /sd | |
| parent | edbf82cbfc8d886db40b1b6e3d7b3ef84fddf604 (diff) | |
SotClipboardFormatId::FILE->SotClipboardFormatId::SIMPLE_FILE
Change-Id: Ice4963da8a856b1d2ada13e5b699157a0217e06c
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/pglink.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview2.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/sdview3.cxx | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/core/pglink.cxx b/sd/source/core/pglink.cxx index 65862e4f34f4..bc158653f96a 100644 --- a/sd/source/core/pglink.cxx +++ b/sd/source/core/pglink.cxx @@ -31,7 +31,7 @@ SdPageLink::SdPageLink(SdPage* pPg, const OUString& rFileName, const OUString& rBookmarkName) : - ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SotClipboardFormatId::FILE), + ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SotClipboardFormatId::SIMPLE_FILE), pPage(pPg) { pPage->SetFileName(rFileName); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index ab82b7c1d149..5a7a0a8031c9 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1281,7 +1281,7 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent) { sal_Int8 nResult (DND_ACTION_NONE); - if ( !bIsInDrag && IsDropFormatSupported( SotClipboardFormatId::FILE ) ) + if ( !bIsInDrag && IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ) ) { nResult = rEvent.mnAction; } @@ -1342,7 +1342,7 @@ sal_Int8 SdPageObjsTLB::ExecuteDrop( const ExecuteDropEvent& rEvt ) TransferableDataHelper aDataHelper( rEvt.maDropEvent.Transferable ); OUString aFile; - if( aDataHelper.GetString( SotClipboardFormatId::FILE, aFile ) && + if( aDataHelper.GetString( SotClipboardFormatId::SIMPLE_FILE, aFile ) && static_cast<SdNavigatorWin*>(mpParent)->InsertFile( aFile ) ) { nRet = rEvt.mnAction; diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index 1fc129943eb9..6899e061aac0 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -588,7 +588,7 @@ sal_Int8 View::AcceptDrop( const AcceptDropEvent& rEvt, DropTargetHelper& rTarge const bool bEditEngine = rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::EDITENGINE ); const bool bString = rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::STRING ); const bool bRTF = rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::RTF ); - const bool bFile = rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::FILE ); + const bool bFile = rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ); const bool bFileList = rTargetHelper.IsDropFormatSupported( SotClipboardFormatId::FILE_LIST ); if( mpDropMarker ) diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 4aa492a116ef..ba6dc816b9f7 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -1454,11 +1454,11 @@ bool View::InsertData( const TransferableDataHelper& rDataHelper, bReturn = true; } - if(!bReturn && CHECK_FORMAT_TRANS(SotClipboardFormatId::FILE)) + if(!bReturn && CHECK_FORMAT_TRANS(SotClipboardFormatId::SIMPLE_FILE)) { OUString aDropFile; - if( aDataHelper.GetString( SotClipboardFormatId::FILE, aDropFile ) ) + if( aDataHelper.GetString( SotClipboardFormatId::SIMPLE_FILE, aDropFile ) ) { maDropFileVector.clear(); maDropFileVector.push_back( aDropFile ); |