[Libreoffice-commits] core.git: sfx2/source
Stephan Bergmann
sbergman at redhat.com
Wed Apr 20 15:13:12 UTC 2016
sfx2/source/appl/impldde.cxx | 12 ++++++------
sfx2/source/appl/impldde.hxx | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 12a4f93d1d412d58b1b13d814de589b10aa41e01
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Wed Apr 20 17:12:40 2016 +0200
Use bool instead of a sal_uInt8 bit
Change-Id: Id918fd609afaa4fcfcd90f60baac165d7d6280d9
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index e7a2732..d139e06 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -121,7 +121,7 @@ SvDDEObject::SvDDEObject()
: pConnection( nullptr ), pLink( nullptr ), pRequest( nullptr ), pGetData( nullptr )
{
SetUpdateTimeout( 100 );
- bWaitForData = sal_False;
+ bWaitForData = false;
}
SvDDEObject::~SvDDEObject()
@@ -151,7 +151,7 @@ bool SvDDEObject::GetData( css::uno::Any & rData /*out param*/,
return false;
// Lock against Reentrance
- bWaitForData = sal_True;
+ bWaitForData = true;
// if you want to print, we'll wait until the data is available
if( bSynchron )
@@ -166,7 +166,7 @@ bool SvDDEObject::GetData( css::uno::Any & rData /*out param*/,
aReq.Execute();
} while( aReq.GetError() && ImplHasOtherFormat( aReq ) );
- bWaitForData = sal_False;
+ bWaitForData = false;
}
else
{
@@ -341,7 +341,7 @@ IMPL_LINK_TYPED( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void )
aVal <<= aSeq;
DataChanged( SotExchange::GetFormatMimeType(
pData->GetFormat() ), aVal );
- bWaitForData = sal_False;
+ bWaitForData = false;
}
}
}
@@ -365,13 +365,13 @@ IMPL_LINK_TYPED( SvDDEObject, ImplDoneDDEData, bool, bValid, void )
}
else if( pReq == pRequest )
{
- bWaitForData = sal_False;
+ bWaitForData = false;
}
}
}
else
// End waiting
- bWaitForData = sal_False;
+ bWaitForData = false;
}
}
diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx
index d3ea678..18208cf 100644
--- a/sfx2/source/appl/impldde.hxx
+++ b/sfx2/source/appl/impldde.hxx
@@ -40,7 +40,7 @@ class SvDDEObject : public SvLinkSource
DdeRequest* pRequest;
css::uno::Any * pGetData;
- sal_uInt8 bWaitForData : 1; // waiting for data?
+ bool bWaitForData; // waiting for data?
static bool ImplHasOtherFormat( DdeTransaction& );
More information about the Libreoffice-commits
mailing list