summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-25 11:01:20 +0200
committerNoel Grandin <noel@peralex.com>2014-03-25 14:32:56 +0200
commitb5e11641a7cec634c603213869a3475b1e01084e (patch)
tree330df25cfb778c4c3c793c86dc315706b651d10c /sw
parent436cd900956b5fd0b6583954c002f8c28ca32698 (diff)
svtools: sal_Bool->bool
Change-Id: I90320997ed79be2556eafa4c35af6b968b378454
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/uibase/dochdl/swdtflvr.cxx18
-rw-r--r--sw/source/core/uibase/inc/swdtflvr.hxx4
2 files changed, 11 insertions, 11 deletions
diff --git a/sw/source/core/uibase/dochdl/swdtflvr.cxx b/sw/source/core/uibase/dochdl/swdtflvr.cxx
index f5c4af05247e..9e148f46e5f8 100644
--- a/sw/source/core/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/core/uibase/dochdl/swdtflvr.cxx
@@ -390,7 +390,7 @@ namespace
}
}
-sal_Bool SwTransferable::GetData( const DataFlavor& rFlavor )
+bool SwTransferable::GetData( const DataFlavor& rFlavor )
{
sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor );
@@ -399,7 +399,7 @@ sal_Bool SwTransferable::GetData( const DataFlavor& rFlavor )
// 2) we have either a clipboard document (pClpDocFac), or
// we have a SwWrtShell (so we can generate a new clipboard document)
if( !HasFormat( nFormat ) || ( pClpDocFac == NULL && pWrtShell == NULL ) )
- return sal_False;
+ return false;
if( !pClpDocFac )
{
@@ -597,11 +597,11 @@ sal_Bool SwTransferable::GetData( const DataFlavor& rFlavor )
return bOK;
}
-sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
+bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
void* pObject, sal_uInt32 nObjectType,
const DataFlavor& /*rFlavor*/ )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
WriterRef xWrt;
switch( nObjectType )
@@ -676,7 +676,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
pSrcStm.reset();
}
- bRet = sal_True;
+ bRet = true;
xWorkStore->dispose();
xWorkStore = uno::Reference < embed::XStorage >();
@@ -743,7 +743,7 @@ sal_Bool SwTransferable::WriteObject( SotStorageStreamRef& xStream,
{
xStream->WriteChar( '\0' ); // terminate with a zero
xStream->Commit();
- bRet = sal_True;
+ bRet = true;
}
}
@@ -949,7 +949,7 @@ int SwTransferable::PrepareForCopy( sal_Bool bIsCut )
//ObjectDescriptor was already filly from the old DocShell.
//Now adjust it. Thus in GetData the first query can still
//be answered with delayed rendering.
- aObjDesc.mbCanLink = sal_False;
+ aObjDesc.mbCanLink = false;
Size aSz( OLESIZE );
aObjDesc.maSize = OutputDevice::LogicToLogic( aSz, MAP_TWIP, MAP_100TH_MM );
@@ -1046,7 +1046,7 @@ int SwTransferable::CopyGlossary( SwTextBlocks& rGlossary,
//ObjectDescriptor was already filled from the old DocShell.
//Now adjust it. Thus in GetData the first query can still
//be answered with delayed rendering.
- aObjDesc.mbCanLink = sal_False;
+ aObjDesc.mbCanLink = false;
Size aSz( OLESIZE );
aObjDesc.maSize = OutputDevice::LogicToLogic( aSz, MAP_TWIP, MAP_100TH_MM );
@@ -3066,7 +3066,7 @@ void SwTransferable::SetDataForDragAndDrop( const Point& rSttPos )
//ObjectDescriptor was already filled from the old DocShell.
//Now adjust it. Thus in GetData the first query can still
//be answered with delayed rendering.
- aObjDesc.mbCanLink = sal_False;
+ aObjDesc.mbCanLink = false;
aObjDesc.maDragStartPos = rSttPos;
aObjDesc.maSize = OutputDevice::LogicToLogic( Size( OLESIZE ),
MAP_TWIP, MAP_100TH_MM );
diff --git a/sw/source/core/uibase/inc/swdtflvr.hxx b/sw/source/core/uibase/inc/swdtflvr.hxx
index d68a9daac07a..0cef72140788 100644
--- a/sw/source/core/uibase/inc/swdtflvr.hxx
+++ b/sw/source/core/uibase/inc/swdtflvr.hxx
@@ -137,8 +137,8 @@ class SW_DLLPUBLIC SwTransferable : public TransferableHelper
protected:
virtual void AddSupportedFormats();
- virtual sal_Bool GetData( const css::datatransfer::DataFlavor& rFlavor );
- virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm,
+ virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor );
+ virtual bool WriteObject( SotStorageStreamRef& rxOStm,
void* pUserObject,
sal_uInt32 nUserObjectId,
const css::datatransfer::DataFlavor& rFlavor );