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

Stephan Bergmann (via logerrit) logerrit at kemper.freedesktop.org
Thu Nov 19 12:07:08 UTC 2020


 svl/source/svdde/ddedata.cxx |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 1d467df12391ae7d1f56ef0cebc6c3c74fea0800
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Nov 19 10:20:55 2020 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Nov 19 13:06:27 2020 +0100

    svl/source/svdde/ddedata.cxx is only compiled on Windows anyway
    
    (cf. svl/Library_svl.mk)
    
    Change-Id: Iff41c9c56c1e0ca52ea93268ddfa76b6630d2eb4
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106124
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx
index cbea590c0658..7cf9c0b1daa6 100644
--- a/svl/source/svdde/ddedata.cxx
+++ b/svl/source/svdde/ddedata.cxx
@@ -133,11 +133,9 @@ sal_uLong DdeData::GetExternalFormat(SotClipboardFormatId nFmt)
         return CF_METAFILEPICT;
     default:
         {
-#if defined(_WIN32)
             OUString aName( SotExchange::GetFormatName( nFmt ) );
             if( !aName.isEmpty() )
                 return RegisterClipboardFormatW( o3tl::toW(aName.getStr()) );
-#endif
         }
     }
     return static_cast<sal_uLong>(nFmt);
@@ -154,7 +152,6 @@ SotClipboardFormatId DdeData::GetInternalFormat(sal_uLong nFmt)
     case CF_METAFILEPICT:
         return SotClipboardFormatId::GDIMETAFILE;
     default:
-#if defined(_WIN32)
         if( nFmt >= CF_MAX )
         {
             WCHAR szName[ 256 ];
@@ -162,7 +159,6 @@ SotClipboardFormatId DdeData::GetInternalFormat(sal_uLong nFmt)
             if(GetClipboardFormatNameW( nFmt, szName, SAL_N_ELEMENTS(szName) ))
                 return SotExchange::RegisterFormatName( OUString(o3tl::toU(szName)) );
         }
-#endif
         break;
     }
     return static_cast<SotClipboardFormatId>(nFmt);


More information about the Libreoffice-commits mailing list