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 /svtools | |
| parent | edbf82cbfc8d886db40b1b6e3d7b3ef84fddf604 (diff) | |
SotClipboardFormatId::FILE->SotClipboardFormatId::SIMPLE_FILE
Change-Id: Ice4963da8a856b1d2ada13e5b699157a0217e06c
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/misc/openfiledroptargetlistener.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/misc/transfer.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx index 042c5c78ab7a..baec61c590d9 100644 --- a/svtools/source/misc/openfiledroptargetlistener.cxx +++ b/svtools/source/misc/openfiledroptargetlistener.cxx @@ -88,7 +88,7 @@ void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::Dr // then, if necessary, the file format OUString aFilePath; - if ( !bFormatFound && aHelper.GetString( SotClipboardFormatId::FILE, aFilePath ) ) + if ( !bFormatFound && aHelper.GetString( SotClipboardFormatId::SIMPLE_FILE, aFilePath ) ) implts_OpenFile( aFilePath ); } dtde.Context->dropComplete( css::datatransfer::dnd::DNDConstants::ACTION_NONE != nAction ); @@ -132,7 +132,7 @@ void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd { try { - bool bAccept = ( implts_IsDropFormatSupported( SotClipboardFormatId::FILE ) || + bool bAccept = ( implts_IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ) || implts_IsDropFormatSupported( SotClipboardFormatId::FILE_LIST ) ); if ( !bAccept ) diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index 5c2ccbe7b414..4e0ef5c3cb06 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -721,7 +721,7 @@ bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& r DataFlavor aFileFlavor; if( !rString.isEmpty() && - SotExchange::GetFormatDataFlavor( SotClipboardFormatId::FILE, aFileFlavor ) && + SotExchange::GetFormatDataFlavor( SotClipboardFormatId::SIMPLE_FILE, aFileFlavor ) && TransferableDataHelper::IsEqual( aFileFlavor, rFlavor ) ) { const OString aByteStr(OUStringToOString(rString, osl_getThreadTextEncoding())); |