diff options
author | Noel Grandin <noel@peralex.com> | 2014-03-25 11:01:20 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-03-25 14:32:56 +0200 |
commit | b5e11641a7cec634c603213869a3475b1e01084e (patch) | |
tree | 330df25cfb778c4c3c793c86dc315706b651d10c /sd | |
parent | 436cd900956b5fd0b6583954c002f8c28ca32698 (diff) |
svtools: sal_Bool->bool
Change-Id: I90320997ed79be2556eafa4c35af6b968b378454
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/app/sdxfer.cxx | 14 | ||||
-rw-r--r-- | sd/source/ui/dlg/sdtreelb.cxx | 10 | ||||
-rw-r--r-- | sd/source/ui/inc/TabControl.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/sdtreelb.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/inc/sdxfer.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/view/sdview2.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/tabcontr.cxx | 4 |
7 files changed, 19 insertions, 19 deletions
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 71f2251d745a..d3b09d26da20 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -439,13 +439,13 @@ void SdTransferable::AddSupportedFormats() } } -sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor ) +bool SdTransferable::GetData( const DataFlavor& rFlavor ) { if (SD_MOD()==NULL) - return sal_False; + return false; sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); - sal_Bool bOK = sal_False; + bool bOK = false; CreateData(); @@ -562,9 +562,9 @@ sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor ) return bOK; } -sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject, sal_uInt32 nObjectType, const DataFlavor& ) +bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject, sal_uInt32 nObjectType, const DataFlavor& ) { - sal_Bool bRet = sal_False; + bool bRet = false; switch( nObjectType ) { @@ -593,7 +593,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject catch( Exception& ) { OSL_FAIL( "sd::SdTransferable::WriteObject(), exception catched!" ); - bRet = sal_False; + bRet = false; } } break; @@ -628,7 +628,7 @@ sal_Bool SdTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pObject delete pSrcStm; } - bRet = sal_True; + bRet = true; rxOStm->Commit(); } catch ( Exception& ) diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 7c8d9d2d25f7..2209ad2d4ada 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -125,21 +125,21 @@ void SdPageObjsTLB::SdPageObjsTransferable::AddSupportedFormats() -sal_Bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) +bool SdPageObjsTLB::SdPageObjsTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { sal_uLong nFormatId = SotExchange::GetFormat( rFlavor ); switch (nFormatId) { case SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK: SetINetBookmark( maBookmark, rFlavor ); - return sal_True; + return true; case SOT_FORMATSTR_ID_TREELISTBOX: SetAny(maTreeListBoxData, rFlavor); - return sal_True; + return true; default: - return sal_False; + return false; } } @@ -1604,7 +1604,7 @@ void SdPageObjsTLB::AddShapeToTransferable ( aObjectDescriptor.maDisplayName = pDocShell->GetMedium()->GetURLObject().GetURLNoPass(); else aObjectDescriptor.maDisplayName = OUString(); - aObjectDescriptor.mbCanLink = sal_False; + aObjectDescriptor.mbCanLink = false; rTransferable.SetStartPos(aDragPos); rTransferable.SetObjectDescriptor( aObjectDescriptor ); diff --git a/sd/source/ui/inc/TabControl.hxx b/sd/source/ui/inc/TabControl.hxx index da35355fde29..0948247fd569 100644 --- a/sd/source/ui/inc/TabControl.hxx +++ b/sd/source/ui/inc/TabControl.hxx @@ -95,7 +95,7 @@ private: virtual ~TabControlTransferable(); virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); virtual void DragFinished( sal_Int8 nDropAction ); }; diff --git a/sd/source/ui/inc/sdtreelb.hxx b/sd/source/ui/inc/sdtreelb.hxx index bc42e3c249f0..31658b37c18f 100644 --- a/sd/source/ui/inc/sdtreelb.hxx +++ b/sd/source/ui/inc/sdtreelb.hxx @@ -101,7 +101,7 @@ public: SAL_DLLPRIVATE virtual ~SdPageObjsTransferable(); SAL_DLLPRIVATE virtual void AddSupportedFormats(); - SAL_DLLPRIVATE virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + SAL_DLLPRIVATE virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); SAL_DLLPRIVATE virtual void DragFinished( sal_Int8 nDropAction ); SAL_DLLPRIVATE virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); diff --git a/sd/source/ui/inc/sdxfer.hxx b/sd/source/ui/inc/sdxfer.hxx index 70b621f81acf..7aa90c662742 100644 --- a/sd/source/ui/inc/sdxfer.hxx +++ b/sd/source/ui/inc/sdxfer.hxx @@ -107,8 +107,8 @@ public: protected: virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); virtual void ObjectReleased(); virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& rId ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx index f20058b03acb..c65f7cb36d4b 100644 --- a/sd/source/ui/view/sdview2.cxx +++ b/sd/source/ui/view/sdview2.cxx @@ -204,7 +204,7 @@ struct SdNavigatorDropEvent : public ExecuteDropEvent aObjDesc.maSize = GetAllMarkedRect().GetSize(); aObjDesc.maDragStartPos = rDragPos; aObjDesc.maDisplayName = aDisplayName; - aObjDesc.mbCanLink = sal_False; + aObjDesc.mbCanLink = false; pTransferable->SetStartPos( rDragPos ); pTransferable->SetObjectDescriptor( aObjDesc ); diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 73b0357431ad..77cccb63dc79 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -62,9 +62,9 @@ void TabControl::TabControlTransferable::AddSupportedFormats() -sal_Bool TabControl::TabControlTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& ) +bool TabControl::TabControlTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& ) { - return sal_False; + return false; } |