SotClipboardFormatId::FILE->SotClipboardFormatId::SIMPLE_FILE

Change-Id: Ice4963da8a856b1d2ada13e5b699157a0217e06c

5 files changed, 11 insertions, 11 deletions

diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index cf79f30ca94d..6fd83b41360b 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -60,7 +60,7 @@ ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const OUString& rFile,
                         const OUString& rFilter, const OUString& rOpt,
                         const OUString& rArea, const ScRange& rDest,
                         sal_uLong nRefresh ) :
-    ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,SotClipboardFormatId::FILE),
+    ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,SotClipboardFormatId::SIMPLE_FILE),
     ScRefreshTimer  ( nRefresh ),
     pImpl           ( new AreaLink_Impl() ),
     aFileName       (rFile),
diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx
index 5bde93bc1945..9fcef4ef70e0 100644
--- a/sc/source/ui/docshell/externalrefmgr.cxx
+++ b/sc/source/ui/docshell/externalrefmgr.cxx
@@ -1274,7 +1274,7 @@ ScExternalRefCache::DocItem* ScExternalRefCache::getDocItem(sal_uInt16 nFileId)
 }
 
 ScExternalRefLink::ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId, const OUString& rFilter) :
-    ::sfx2::SvBaseLink(::sfx2::LINKUPDATE_ONCALL, SotClipboardFormatId::FILE),
+    ::sfx2::SvBaseLink(::sfx2::LINKUPDATE_ONCALL, SotClipboardFormatId::SIMPLE_FILE),
     mnFileId(nFileId),
     maFilterName(rFilter),
     mpDoc(pDoc),
diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx
index cca5968910a9..fc1a801827b0 100644
--- a/sc/source/ui/docshell/tablink.cxx
+++ b/sc/source/ui/docshell/tablink.cxx
@@ -59,7 +59,7 @@ TYPEINIT1(ScTableLink, ::sfx2::SvBaseLink);
 ScTableLink::ScTableLink(ScDocShell* pDocSh, const OUString& rFile,
                             const OUString& rFilter, const OUString& rOpt,
                             sal_uLong nRefresh ):
-    ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,SotClipboardFormatId::FILE),
+    ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,SotClipboardFormatId::SIMPLE_FILE),
     ScRefreshTimer( nRefresh ),
     pImpl( new TableLink_Impl ),
     aFileName(rFile),
@@ -76,7 +76,7 @@ ScTableLink::ScTableLink(ScDocShell* pDocSh, const OUString& rFile,
 ScTableLink::ScTableLink(SfxObjectShell* pShell, const OUString& rFile,
                             const OUString& rFilter, const OUString& rOpt,
                             sal_uLong nRefresh ):
-    ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,SotClipboardFormatId::FILE),
+    ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ONCALL,SotClipboardFormatId::SIMPLE_FILE),
     ScRefreshTimer( nRefresh ),
     pImpl( new TableLink_Impl ),
     aFileName(rFile),
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 ) )