SotClipboardFormatId::FILE->SotClipboardFormatId::SIMPLE_FILE

Change-Id: Ice4963da8a856b1d2ada13e5b699157a0217e06c

4 files changed, 14 insertions, 14 deletions

diff --git a/sw/source/core/docnode/section.cxx b/sw/source/core/docnode/section.cxx
index 2bc1eb1b10b4..14ef8d405964 100644
--- a/sw/source/core/docnode/section.cxx
+++ b/sw/source/core/docnode/section.cxx
@@ -1144,7 +1144,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
         return ;
 
     const OUString sName( pDShell->GetMedium()->GetName() );
-    const OUString sMimeType( SotExchange::GetFormatMimeType( SotClipboardFormatId::FILE ));
+    const OUString sMimeType( SotExchange::GetFormatMimeType( SotClipboardFormatId::SIMPLE_FILE ));
     uno::Any aValue;
     aValue <<= sName; // Arbitrary name
 
@@ -1256,7 +1256,7 @@ static void lcl_UpdateLinksInSect( SwBaseLink& rUpdLnk, SwSectionNode& rSectNd )
         pRead = SwReaderWriter::GetReader( READER_WRITER_RTF );
         break;
 
-    case SotClipboardFormatId::FILE:
+    case SotClipboardFormatId::SIMPLE_FILE:
         if ( rValue.hasValue() )
         {
             OUString sFileName;
@@ -1533,7 +1533,7 @@ void SwSection::CreateLink( LinkCreateType eCreateType )
         break;
     case FILE_LINK_SECTION:
         {
-            pLnk->SetContentType( SotClipboardFormatId::FILE );
+            pLnk->SetContentType( SotClipboardFormatId::SIMPLE_FILE );
             sal_Int32 nIndex = 0;
             const OUString sFile(sCmd.getToken( 0, sfx2::cTokenSeparator, nIndex ));
             const OUString sFltr(sCmd.getToken( 0, sfx2::cTokenSeparator, nIndex ));
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index fdb2dee289d0..27c2f338fb45 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -584,7 +584,7 @@ bool SwTransferable::GetData( const DataFlavor& rFlavor, const OUString& rDestDo
         case SotClipboardFormatId::FILEGRPDESCRIPTOR:
         case SotClipboardFormatId::FILECONTENT:
         case SotClipboardFormatId::UNIFORMRESOURCELOCATOR:
-        case SotClipboardFormatId::FILE:
+        case SotClipboardFormatId::SIMPLE_FILE:
             if( (TRNSFR_INETFLD & eBufferType) && pBkmk )
                 bOK = SetINetBookmark( *pBkmk, rFlavor );
             break;
@@ -1371,7 +1371,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
                                             pPt, bMsg );
                 break;
 
-            case SotClipboardFormatId::FILE:
+            case SotClipboardFormatId::SIMPLE_FILE:
                 nRet = SwTransferable::_PasteFileName( rData, rSh, nFormat,
                                 ( EXCHG_IN_ACTION_MOVE == nClearedAction
                                     ? SW_PASTESDR_REPLACE
@@ -1448,7 +1448,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
         case EXCHG_OUT_ACTION_INSERT_HYPERLINK:
             {
                 OUString sURL, sDesc;
-                if( SotClipboardFormatId::FILE == nFormat )
+                if( SotClipboardFormatId::SIMPLE_FILE == nFormat )
                 {
                     if( rData.GetString( nFormat, sURL ) && !sURL.isEmpty() )
                     {
@@ -1490,7 +1490,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
             case SotClipboardFormatId::BITMAP:
             case SotClipboardFormatId::PNG:
             case SotClipboardFormatId::NETSCAPE_BOOKMARK:
-            case SotClipboardFormatId::FILE:
+            case SotClipboardFormatId::SIMPLE_FILE:
             case SotClipboardFormatId::FILEGRPDESCRIPTOR:
             case SotClipboardFormatId::UNIFORMRESOURCELOCATOR:
                 nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
@@ -2292,7 +2292,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
         }
         break;
 
-    case SotClipboardFormatId::FILE:
+    case SotClipboardFormatId::SIMPLE_FILE:
         {
             OUString sTxt;
             if( ( nRet = rData.GetString( nFmt, sTxt ) ) )
@@ -2322,7 +2322,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
                                             aGraphic, &rFlt );
 
         if( !nRet && SW_PASTESDR_SETATTR == nAction &&
-            SotClipboardFormatId::FILE == nFmt &&
+            SotClipboardFormatId::SIMPLE_FILE == nFmt &&
             // only at frame selection
             rSh.IsFrmSelected() )
         {
@@ -2739,10 +2739,10 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
         for( sal_uLong n = 0, nEnd = aFileList.Count(); n < nEnd; ++n )
         {
             TransferDataContainer* pHlp = new TransferDataContainer;
-            pHlp->CopyString( SotClipboardFormatId::FILE, aFileList.GetFile( n ));
+            pHlp->CopyString( SotClipboardFormatId::SIMPLE_FILE, aFileList.GetFile( n ));
             TransferableDataHelper aData( pHlp );
 
-            if( SwTransferable::_PasteFileName( aData, rSh, SotClipboardFormatId::FILE, nAct,
+            if( SwTransferable::_PasteFileName( aData, rSh, SotClipboardFormatId::SIMPLE_FILE, nAct,
                                             pPt, 0, bMsg, 0 ))
             {
                 if( bLink )
diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx
index b1bf72faaeb7..4cbbc3f48835 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -290,7 +290,7 @@ sal_Int8 SwGlobalTree::AcceptDrop( const AcceptDropEvent& rEvt )
             if( pDDSource != pDropEntry )
                 nRet = rEvt.mnAction;
         }
-        else if( IsDropFormatSupported( SotClipboardFormatId::FILE ) ||
+        else if( IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ) ||
                   IsDropFormatSupported( SotClipboardFormatId::STRING ) ||
                   IsDropFormatSupported( SotClipboardFormatId::FILE_LIST ) ||
                   IsDropFormatSupported( SotClipboardFormatId::SOLK ) ||
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index b1d03a069bbf..c89a0628ade0 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -1100,7 +1100,7 @@ OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
         sFileName = aFileList.GetFile( 0 );
     }
     else if( rData.HasFormat( nFmt = SotClipboardFormatId::STRING ) ||
-              rData.HasFormat( nFmt = SotClipboardFormatId::FILE ) ||
+              rData.HasFormat( nFmt = SotClipboardFormatId::SIMPLE_FILE ) ||
              rData.HasFormat( nFmt = SotClipboardFormatId::FILENAME ))
     {
         (void)rData.GetString(nFmt, sFileName);
@@ -1125,7 +1125,7 @@ OUString SwNavigationPI::CreateDropFileName( TransferableDataHelper& rData )
 sal_Int8 SwNavigationPI::AcceptDrop( const AcceptDropEvent& /*rEvt*/ )
 {
     return ( !SwContentTree::IsInDrag() &&
-        ( aContentTree.IsDropFormatSupported( SotClipboardFormatId::FILE ) ||
+        ( aContentTree.IsDropFormatSupported( SotClipboardFormatId::SIMPLE_FILE ) ||
           aContentTree.IsDropFormatSupported( SotClipboardFormatId::STRING ) ||
           aContentTree.IsDropFormatSupported( SotClipboardFormatId::SOLK ) ||
            aContentTree.IsDropFormatSupported( SotClipboardFormatId::NETSCAPE_BOOKMARK )||