From 6fecd2df2797318f651ea4ab0d2d3880b2244751 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 18 Mar 2015 16:34:51 +0000 Subject: some more blind fixing towards a windows build Change-Id: I92f0df38fae820dac2df8289a9a38d7d0f12bc26 --- svl/source/svdde/ddedata.cxx | 10 +++++----- svl/source/svdde/ddeimp.hxx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx index 070bde18ca85..e3f7eb3062cb 100644 --- a/svl/source/svdde/ddedata.cxx +++ b/svl/source/svdde/ddedata.cxx @@ -36,10 +36,10 @@ DdeData::DdeData() pImp->hData = NULL; pImp->nData = 0; pImp->pData = NULL; - pImp->nFmt = CF_TEXT; + pImp->nFmt = SotClipboardFormatId::STRING; } -DdeData::DdeData( const void* p, long n, sal_uLong f ) +DdeData::DdeData(const void* p, long n, SotClipboardFormatId f) { pImp = new DdeDataImp; pImp->hData = NULL; @@ -54,7 +54,7 @@ DdeData::DdeData( const OUString& s ) pImp->hData = NULL; pImp->pData = (LPBYTE)s.getStr(); pImp->nData = s.getLength()+1; - pImp->nFmt = CF_TEXT; + pImp->nFmt = SotClipboardFormatId::STRING; } DdeData::DdeData( const DdeData& rData ) @@ -80,12 +80,12 @@ void DdeData::Lock() pImp->pData = DdeAccessData( pImp->hData, (LPDWORD) &pImp->nData ); } -sal_uLong DdeData::GetFormat() const +SotClipboardFormatId DdeData::GetFormat() const { return pImp->nFmt; } -void DdeData::SetFormat( sal_uLong nFmt ) +void DdeData::SetFormat(SotClipboardFormatId nFmt) { pImp->nFmt = nFmt; } diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx index c8e2efa4881c..945f639c5c8e 100644 --- a/svl/source/svdde/ddeimp.hxx +++ b/svl/source/svdde/ddeimp.hxx @@ -90,7 +90,7 @@ struct DdeDataImp HDDEDATA hData; LPBYTE pData; long nData; - sal_uLong nFmt; + SotClipboardFormatId nFmt; }; class DdeConnection; -- cgit