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 /svx | |
| parent | tdf#89783: sal_uInt16 replacement by size_t (diff) | |
| download | core-dcde8abaaf7e136a49222e9c73644b6868373659.tar.gz core-dcde8abaaf7e136a49222e9c73644b6868373659.zip | |
SotClipboardFormatId::FILE->SotClipboardFormatId::SIMPLE_FILE
Change-Id: Ice4963da8a856b1d2ada13e5b699157a0217e06c
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/galbrws2.cxx | 4 | ||||
| -rw-r--r-- | svx/source/gallery2/galmisc.cxx | 4 | ||||
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 4 | ||||
| -rw-r--r-- | svx/source/svdraw/svdotxln.cxx | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index c68f6f91feb7..13e34abe9b30 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -276,7 +276,7 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos { if( aDataHelper.HasFormat( SotClipboardFormatId::DRAWING ) || aDataHelper.HasFormat( SotClipboardFormatId::FILE_LIST ) || - aDataHelper.HasFormat( SotClipboardFormatId::FILE ) || + aDataHelper.HasFormat( SotClipboardFormatId::SIMPLE_FILE ) || aDataHelper.HasFormat( SotClipboardFormatId::SVXB ) || aDataHelper.HasFormat( SotClipboardFormatId::GDIMETAFILE ) || aDataHelper.HasFormat( SotClipboardFormatId::BITMAP ) ) @@ -576,7 +576,7 @@ sal_Int8 GalleryBrowser2::AcceptDrop( DropTargetHelper& rTarget, const AcceptDro { if( rTarget.IsDropFormatSupported( SotClipboardFormatId::DRAWING ) || rTarget.IsDropFormatSupported( SotClipboardFormatId::FILE_LIST ) || - rTarget.IsDropFormatSupported( SotClipboardFormatId::FILE ) || + rTarget.IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ) || rTarget.IsDropFormatSupported( SotClipboardFormatId::SVXB ) || rTarget.IsDropFormatSupported( SotClipboardFormatId::GDIMETAFILE ) || rTarget.IsDropFormatSupported( SotClipboardFormatId::BITMAP ) ) diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 7a7809df927a..4cafc7439793 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -485,7 +485,7 @@ void GalleryTransferable::AddSupportedFormats() else { if( mpURL ) - AddFormat( SotClipboardFormatId::FILE ); + AddFormat( SotClipboardFormatId::SIMPLE_FILE ); if( mpGraphicObject ) { @@ -521,7 +521,7 @@ bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor, cons // TODO/MBA: do we need a BaseURL here?! bRet = SetImageMap( *mpImageMap, rFlavor ); } - else if( ( SotClipboardFormatId::FILE == nFormat ) && mpURL ) + else if( ( SotClipboardFormatId::SIMPLE_FILE == nFormat ) && mpURL ) { bRet = SetString( mpURL->GetMainURL( INetURLObject::NO_DECODE ), rFlavor ); } diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index c0f5ecd6d00e..c95be5bf51ff 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -1193,7 +1193,7 @@ bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran bRet = InsertModelStream( xModelStm, nInsertPos ); } else if( aDataHelper.HasFormat( SotClipboardFormatId::FILE_LIST ) || - aDataHelper.HasFormat( SotClipboardFormatId::FILE ) ) + aDataHelper.HasFormat( SotClipboardFormatId::SIMPLE_FILE ) ) { FileList aFileList; @@ -1202,7 +1202,7 @@ bool GalleryTheme::InsertTransferable( const uno::Reference< datatransfer::XTran else { OUString aFile; - if (aDataHelper.GetString(SotClipboardFormatId::FILE, aFile) && !aFile.isEmpty()) + if (aDataHelper.GetString(SotClipboardFormatId::SIMPLE_FILE, aFile) && !aFile.isEmpty()) aFileList.AppendFile( aFile ); } diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index e1156160bde3..632c734086e1 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -41,7 +41,7 @@ class ImpSdrObjTextLink: public ::sfx2::SvBaseLink public: ImpSdrObjTextLink( SdrTextObj* pObj1 ) - : ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SotClipboardFormatId::FILE ), + : ::sfx2::SvBaseLink( ::sfx2::LINKUPDATE_ONCALL, SotClipboardFormatId::SIMPLE_FILE ), pSdrObj( pObj1 ) {} virtual ~ImpSdrObjTextLink(); |