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 /sc/source/ui/view | |
| parent | edbf82cbfc8d886db40b1b6e3d7b3ef84fddf604 (diff) | |
SotClipboardFormatId::FILE->SotClipboardFormatId::SIMPLE_FILE
Change-Id: Ice4963da8a856b1d2ada13e5b699157a0217e06c
Diffstat (limited to 'sc/source/ui/view')
| -rw-r--r-- | sc/source/ui/view/gridwin.cxx | 12 | ||||
| -rw-r--r-- | sc/source/ui/view/viewfun5.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 0e6afcdf1b94..13ce217a0163 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -3818,7 +3818,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) IsDropFormatSupported( SotClipboardFormatId::SBA_FIELDDATAEXCHANGE ) || ( !bMove && ( IsDropFormatSupported( SotClipboardFormatId::FILE_LIST ) || - IsDropFormatSupported( SotClipboardFormatId::FILE ) || + IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ) || IsDropFormatSupported( SotClipboardFormatId::SOLK ) || IsDropFormatSupported( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) || IsDropFormatSupported( SotClipboardFormatId::NETSCAPE_BOOKMARK ) || @@ -3833,7 +3833,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) IsDropFormatSupported( SotClipboardFormatId::LINK_SOURCE_OLE ) || IsDropFormatSupported( SotClipboardFormatId::LINK ) || IsDropFormatSupported( SotClipboardFormatId::FILE_LIST ) || - IsDropFormatSupported( SotClipboardFormatId::FILE ) || + IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ) || IsDropFormatSupported( SotClipboardFormatId::SOLK ) || IsDropFormatSupported( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) || IsDropFormatSupported( SotClipboardFormatId::NETSCAPE_BOOKMARK ) || @@ -3947,8 +3947,8 @@ static SotClipboardFormatId lcl_GetDropFormatId( const uno::Reference<datatransf nFormatId = SotClipboardFormatId::STRING; else if ( aDataHelper.HasFormat( SotClipboardFormatId::FILE_LIST ) ) nFormatId = SotClipboardFormatId::FILE_LIST; - else if ( aDataHelper.HasFormat( SotClipboardFormatId::FILE ) ) // #i62773# FILE_LIST/FILE before STRING (Unix file managers) - nFormatId = SotClipboardFormatId::FILE; + else if ( aDataHelper.HasFormat( SotClipboardFormatId::SIMPLE_FILE ) ) // #i62773# FILE_LIST/FILE before STRING (Unix file managers) + nFormatId = SotClipboardFormatId::SIMPLE_FILE; else if ( aDataHelper.HasFormat( SotClipboardFormatId::STRING ) ) nFormatId = SotClipboardFormatId::STRING; else if ( aDataHelper.HasFormat( SotClipboardFormatId::GDIMETAFILE ) ) @@ -3974,8 +3974,8 @@ static SotClipboardFormatId lcl_GetDropLinkId( const uno::Reference<datatransfer nFormatId = SotClipboardFormatId::LINK; else if ( aDataHelper.HasFormat( SotClipboardFormatId::FILE_LIST ) ) nFormatId = SotClipboardFormatId::FILE_LIST; - else if ( aDataHelper.HasFormat( SotClipboardFormatId::FILE ) ) - nFormatId = SotClipboardFormatId::FILE; + else if ( aDataHelper.HasFormat( SotClipboardFormatId::SIMPLE_FILE ) ) + nFormatId = SotClipboardFormatId::SIMPLE_FILE; else if ( aDataHelper.HasFormat( SotClipboardFormatId::SOLK ) ) nFormatId = SotClipboardFormatId::SOLK; else if ( aDataHelper.HasFormat( SotClipboardFormatId::UNIFORMRESOURCELOCATOR ) ) diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 08c9f9e9b029..ef3b99c30ee8 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -586,7 +586,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId, } } } - else if ( nFormatId == SotClipboardFormatId::FILE ) + else if ( nFormatId == SotClipboardFormatId::SIMPLE_FILE ) { OUString aFile; if ( aDataHelper.GetString( nFormatId, aFile ) ) |