[Libreoffice-commits] core.git: include/svl svl/source svl/unx

[Caolán McNamara]

 include/svl/svdde.hxx             |   10 +++++-----
 svl/source/svdde/ddecli.cxx       |    2 +-
 svl/source/svdde/ddedata.cxx      |   22 ++++++++--------------
 svl/source/svdde/ddesvr.cxx       |    6 +++---
 svl/unx/source/svdde/ddedummy.cxx |    2 +-
 5 files changed, 18 insertions(+), 24 deletions(-)

New commits:
commit 12949ecdbf90016eb0e4fbf31e495f7464ea1153
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 18 16:59:13 2015 +0000

    another round of build fixing
    
    Change-Id: I79964b1e091b9a11a0e5724c6ce8465b31d25bff

diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index b3b5c50..5eb8990 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -78,8 +78,8 @@ public:
 
     DdeData&        operator = ( const DdeData& );
 
-    static sal_uLong GetExternalFormat( sal_uLong nFmt );
-    static sal_uLong GetInternalFormat( sal_uLong nFmt );
+    static sal_uLong GetExternalFormat(SotClipboardFormatId nFmt);
+    static SotClipboardFormatId GetInternalFormat(sal_uLong nFmt);
 };
 
 
@@ -394,9 +394,9 @@ public:
     void            AddTopic( const DdeTopic& );
     void            RemoveTopic( const DdeTopic& );
 
-    void            AddFormat( sal_uLong );
-    void            RemoveFormat( sal_uLong );
-    bool            HasFormat( sal_uLong );
+    void            AddFormat(SotClipboardFormatId);
+    void            RemoveFormat(SotClipboardFormatId);
+    bool            HasFormat(SotClipboardFormatId);
 
 private:
       //              DdeService( const DdeService& );
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx
index 7443724..860f7c6 100644
--- a/svl/source/svdde/ddecli.cxx
+++ b/svl/source/svdde/ddecli.cxx
@@ -273,7 +273,7 @@ void DdeTransaction::Execute()
     HSZ     hItem = *pName;
     void*   pData = (void*)(const void *)aDdeData;
     DWORD   nData = (DWORD)(long)aDdeData;
-    sal_uLong   nIntFmt = aDdeData.pImp->nFmt;
+    SotClipboardFormatId nIntFmt = aDdeData.pImp->nFmt;
     UINT    nExtFmt  = DdeData::GetExternalFormat( nIntFmt );
     DdeInstData* pInst = ImpGetInstData();
 
diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx
index e3f7eb3..26f0cf9 100644
--- a/svl/source/svdde/ddedata.cxx
+++ b/svl/source/svdde/ddedata.cxx
@@ -113,7 +113,7 @@ DdeData& DdeData::operator = ( const DdeData& rData )
     return *this;
 }
 
-sal_uLong DdeData::GetExternalFormat( sal_uLong nFmt )
+sal_uLong DdeData::GetExternalFormat(SotClipboardFormatId nFmt)
 {
     switch( nFmt )
     {
@@ -139,35 +139,29 @@ sal_uLong DdeData::GetExternalFormat( sal_uLong nFmt )
     return nFmt;
 }
 
-sal_uLong DdeData::GetInternalFormat( sal_uLong nFmt )
+SotClipboardFormatId DdeData::GetInternalFormat(sal_uLong nFmt)
 {
     switch( nFmt )
     {
     case CF_TEXT:
-        nFmt = SotClipboardFormatId::STRING;
-        break;
-
+        return SotClipboardFormatId::STRING;
     case CF_BITMAP:
-        nFmt = SotClipboardFormatId::BITMAP;
-        break;
-
+        return SotClipboardFormatId::BITMAP;
     case CF_METAFILEPICT:
-        nFmt = SotClipboardFormatId::GDIMETAFILE;
-        break;
-
+        return SotClipboardFormatId::GDIMETAFILE;
     default:
 #if defined(WNT)
         if( nFmt >= CF_MAX )
         {
             TCHAR szName[ 256 ];
 
-            if( GetClipboardFormatName( nFmt, szName, sizeof(szName) ) )
-                nFmt = SotExchange::RegisterFormatName( OUString(reinterpret_cast<const sal_Unicode*>(szName)) );
+            if(GetClipboardFormatName( nFmt, szName, sizeof(szName) ))
+                return SotExchange::RegisterFormatName( OUString(reinterpret_cast<const sal_Unicode*>(szName)) );
         }
 #endif
         break;
     }
-    return nFmt;
+    return static_cast<SotClipboardFormatId>(nFmt);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx
index 984d899..0178aa8 100644
--- a/svl/source/svdde/ddesvr.cxx
+++ b/svl/source/svdde/ddesvr.cxx
@@ -565,12 +565,12 @@ bool DdeService::HasCbFormat( sal_uInt16 nFmt )
     return false;
 }
 
-bool DdeService::HasFormat( sal_uLong nFmt )
+bool DdeService::HasFormat(SotClipboardFormatId nFmt)
 {
     return HasCbFormat( (sal_uInt16)DdeData::GetExternalFormat( nFmt ));
 }
 
-void DdeService::AddFormat( sal_uLong nFmt )
+void DdeService::AddFormat(SotClipboardFormatId nFmt)
 {
     nFmt = DdeData::GetExternalFormat( nFmt );
     for ( size_t i = 0, n = aFormats.size(); i < n; ++i )
@@ -579,7 +579,7 @@ void DdeService::AddFormat( sal_uLong nFmt )
     aFormats.push_back( nFmt );
 }
 
-void DdeService::RemoveFormat( sal_uLong nFmt )
+void DdeService::RemoveFormat(SotClipboardFormatId nFmt)
 {
     nFmt = DdeData::GetExternalFormat( nFmt );
     for ( DdeFormats::iterator it = aFormats.begin(); it != aFormats.end(); ++it )
diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx
index d53594e..dfe846b 100644
--- a/svl/unx/source/svdde/ddedummy.cxx
+++ b/svl/unx/source/svdde/ddedummy.cxx
@@ -252,7 +252,7 @@ OUString DdeService::GetHelp()
     return OUString();
 }
 
-void DdeService::AddFormat( SAL_UNUSED_PARAMETER sal_uLong )
+void DdeService::AddFormat(SAL_UNUSED_PARAMETER SotClipboardFormatId)
 {
 }