diff options
49 files changed, 275 insertions, 277 deletions
diff --git a/chart2/source/controller/main/ChartTransferable.cxx b/chart2/source/controller/main/ChartTransferable.cxx index 08e2aee47bf4..a04d755655e6 100644 --- a/chart2/source/controller/main/ChartTransferable.cxx +++ b/chart2/source/controller/main/ChartTransferable.cxx @@ -75,10 +75,10 @@ void ChartTransferable::AddSupportedFormats() AddFormat( SOT_FORMAT_BITMAP ); } -sal_Bool ChartTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) +bool ChartTransferable::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); - sal_Bool bResult = sal_False; + bool bResult = false; if( HasFormat( nFormat )) { @@ -101,12 +101,12 @@ sal_Bool ChartTransferable::GetData( const ::com::sun::star::datatransfer::DataF return bResult; } -sal_Bool ChartTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, +bool ChartTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const datatransfer::DataFlavor& /* rFlavor */ ) { // called from SetObject, put data into stream - sal_Bool bRet = sal_False; + bool bRet = false; switch ( nUserObjectId ) { case CHARTTRANSFER_OBJECTTYPE_DRAWMODEL: diff --git a/chart2/source/controller/main/ChartTransferable.hxx b/chart2/source/controller/main/ChartTransferable.hxx index efbd1b3b9a53..d8d4ba015be9 100644 --- a/chart2/source/controller/main/ChartTransferable.hxx +++ b/chart2/source/controller/main/ChartTransferable.hxx @@ -43,8 +43,8 @@ protected: // implementation of TransferableHelper methods 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, + 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 ); private: diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx index e7d6fd281a5b..9a0fd8201062 100644 --- a/dbaccess/source/ui/browser/dbexchange.cxx +++ b/dbaccess/source/ui/browser/dbexchange.cxx @@ -134,7 +134,7 @@ namespace dbaui osl_atomic_decrement( &m_refCount ); } - sal_Bool ODataClipboard::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ ) + bool ODataClipboard::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ ) { if (nUserObjectId == SOT_FORMAT_RTF || nUserObjectId == SOT_FORMATSTR_ID_HTML ) { @@ -145,7 +145,7 @@ namespace dbaui return pExport->Write(); } } - return sal_False; + return false; } void ODataClipboard::AddSupportedFormats() @@ -159,7 +159,7 @@ namespace dbaui ODataAccessObjectTransferable::AddSupportedFormats(); } - sal_Bool ODataClipboard::GetData( const DataFlavor& rFlavor ) + bool ODataClipboard::GetData( const DataFlavor& rFlavor ) { const sal_uLong nFormat = SotExchange::GetFormat(rFlavor); switch (nFormat) diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx b/dbaccess/source/ui/inc/JoinExchange.hxx index 0d83f99be8ad..4f7d5bbdc496 100644 --- a/dbaccess/source/ui/inc/JoinExchange.hxx +++ b/dbaccess/source/ui/inc/JoinExchange.hxx @@ -61,7 +61,7 @@ namespace dbaui protected: 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 ); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/dbaccess/source/ui/inc/TableRowExchange.hxx b/dbaccess/source/ui/inc/TableRowExchange.hxx index 0f034744115c..360603b855d6 100644 --- a/dbaccess/source/ui/inc/TableRowExchange.hxx +++ b/dbaccess/source/ui/inc/TableRowExchange.hxx @@ -34,8 +34,8 @@ namespace dbaui OTableRowExchange(const ::std::vector< ::boost::shared_ptr<OTableRow> >& _rvTableRow); 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(); }; } diff --git a/dbaccess/source/ui/inc/dbexchange.hxx b/dbaccess/source/ui/inc/dbexchange.hxx index 8db707404c6f..047044f1e366 100644 --- a/dbaccess/source/ui/inc/dbexchange.hxx +++ b/dbaccess/source/ui/inc/dbexchange.hxx @@ -77,9 +77,9 @@ namespace dbaui protected: 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 ObjectReleased(); - virtual sal_Bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); }; } diff --git a/dbaccess/source/ui/querydesign/JoinExchange.cxx b/dbaccess/source/ui/querydesign/JoinExchange.cxx index 5ee0fb66be3d..4488c5346e8f 100644 --- a/dbaccess/source/ui/querydesign/JoinExchange.cxx +++ b/dbaccess/source/ui/querydesign/JoinExchange.cxx @@ -113,16 +113,16 @@ namespace dbaui AddFormat( SOT_FORMATSTR_ID_SBA_TABID ); } - sal_Bool OJoinExchObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) + bool OJoinExchObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { sal_uInt32 nFormat = SotExchange::GetFormat(rFlavor); if ( SOT_FORMATSTR_ID_SBA_JOIN == nFormat ) // this is a HACK // we don't really copy our data, the instances using us have to call GetSourceDescription .... // if, one day, we have a _lot_ of time, this hack should be removed .... - return sal_True; + return true; - return sal_False; + return false; } Any SAL_CALL OJoinExchObj::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) diff --git a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx index fd485d9dcc6e..5c3d1c6a5dbc 100644 --- a/dbaccess/source/ui/tabledesign/TableRowExchange.cxx +++ b/dbaccess/source/ui/tabledesign/TableRowExchange.cxx @@ -30,7 +30,7 @@ namespace dbaui : m_vTableRow(_rvTableRow) { } - sal_Bool OTableRowExchange::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ ) + bool OTableRowExchange::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /*rFlavor*/ ) { if(nUserObjectId == SOT_FORMATSTR_ID_SBA_TABED) { @@ -42,22 +42,22 @@ namespace dbaui ::std::vector< ::boost::shared_ptr<OTableRow> >::const_iterator aEnd = pRows->end(); for(;aIter != aEnd;++aIter) WriteOTableRow(*rxOStm, **aIter); - return sal_True; + return true; } } - return sal_False; + return false; } void OTableRowExchange::AddSupportedFormats() { if ( !m_vTableRow.empty() ) AddFormat(SOT_FORMATSTR_ID_SBA_TABED); } - sal_Bool OTableRowExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) + bool OTableRowExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { sal_uLong nFormat = SotExchange::GetFormat(rFlavor); if(nFormat == SOT_FORMATSTR_ID_SBA_TABED) return SetObject(&m_vTableRow,SOT_FORMATSTR_ID_SBA_TABED,rFlavor); - return sal_False; + return false; } void OTableRowExchange::ObjectReleased() { diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx index c30b72078fd1..f77148c9dae9 100644 --- a/include/svtools/embedtransfer.hxx +++ b/include/svtools/embedtransfer.hxx @@ -36,7 +36,7 @@ private: protected: 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 ObjectReleased(); public: diff --git a/include/svtools/stringtransfer.hxx b/include/svtools/stringtransfer.hxx index eca545c86e1b..d0dad086a4a4 100644 --- a/include/svtools/stringtransfer.hxx +++ b/include/svtools/stringtransfer.hxx @@ -42,7 +42,7 @@ namespace svt protected: // TransferableHelper overridables virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ); + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& _rFlavor ); }; diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 969312bc2f38..87d998dcf0fd 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -71,7 +71,7 @@ struct TransferableObjectDescriptor sal_uInt32 mnOle2Misc; OUString maTypeName; OUString maDisplayName; - sal_Bool mbCanLink; + bool mbCanLink; TransferableObjectDescriptor() : mnViewAspect(::com::sun::star::embed::Aspects::MSOLE_CONTENT) @@ -88,23 +88,23 @@ struct AcceptDropEvent sal_Int8 mnAction; Point maPosPixel; const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent maDragEvent; - sal_Bool mbLeaving; - sal_Bool mbDefault; + bool mbLeaving; + bool mbDefault; AcceptDropEvent() : mnAction( DND_ACTION_NONE ), - mbLeaving( sal_False ), - mbDefault( sal_False ) {} + mbLeaving( false ), + mbDefault( false ) {} AcceptDropEvent( sal_Int8 nAction, const Point& rPosPixel, const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& rDragEvent, - sal_Bool bLeaving = sal_False ) : + bool bLeaving = false ) : mnAction( nAction ), maPosPixel( rPosPixel ), maDragEvent( rDragEvent ), mbLeaving( bLeaving ), - mbDefault( sal_False ) {} + mbDefault( false ) {} }; struct ExecuteDropEvent @@ -112,11 +112,11 @@ struct ExecuteDropEvent sal_Int8 mnAction; Point maPosPixel; const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent maDropEvent; - sal_Bool mbDefault; + bool mbDefault; ExecuteDropEvent() : mnAction( DND_ACTION_NONE ), - mbDefault( sal_False ) {} + mbDefault( false ) {} ExecuteDropEvent( sal_Int8 nAction, const Point& rPosPixel, @@ -124,7 +124,7 @@ struct ExecuteDropEvent mnAction( nAction ), maPosPixel( rPosPixel ), maDropEvent( rDropEvent ), - mbDefault( sal_False ) {} + mbDefault( false ) {} }; class SVT_DLLPUBLIC TransferableHelper : public ::cppu::WeakImplHelper4< ::com::sun::star::datatransfer::XTransferable, @@ -218,26 +218,26 @@ protected: void AddFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); void RemoveFormat( SotFormatStringId nFormat ); void RemoveFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - sal_Bool HasFormat( SotFormatStringId nFormat ); - inline sal_Bool HasFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { return isDataFlavorSupported( rFlavor ); } + bool HasFormat( SotFormatStringId nFormat ); + inline bool HasFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { return isDataFlavorSupported( rFlavor ); } void ClearFormats(); - sal_Bool SetAny( const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - sal_Bool SetString( const OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - sal_Bool SetBitmapEx( const BitmapEx& rBitmap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - sal_Bool SetGDIMetaFile( const GDIMetaFile& rMtf, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - sal_Bool SetGraphic( const Graphic& rGraphic, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - sal_Bool SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - sal_Bool SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - sal_Bool SetINetBookmark( const INetBookmark& rBmk, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - sal_Bool SetINetImage( const INetImage& rINtImg, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); - sal_Bool SetObject( void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetAny( const ::com::sun::star::uno::Any& rAny, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetString( const OUString& rString, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetBitmapEx( const BitmapEx& rBitmap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetGDIMetaFile( const GDIMetaFile& rMtf, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetGraphic( const Graphic& rGraphic, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetINetBookmark( const INetBookmark& rBmk, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetINetImage( const INetImage& rINtImg, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool SetObject( void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); protected: virtual void AddSupportedFormats() = 0; - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) = 0; - 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 ) = 0; + virtual bool WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); virtual void DragFinished( sal_Int8 nDropAction ); virtual void ObjectReleased(); @@ -295,8 +295,8 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& GetTransferable() const { return mxTransfer; } ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > GetXTransferable() const; - sal_Bool HasFormat( SotFormatStringId nFormat ) const; - sal_Bool HasFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) const; + bool HasFormat( SotFormatStringId nFormat ) const; + bool HasFormat( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) const; sal_uInt32 GetFormatCount() const; @@ -305,7 +305,7 @@ public: DataFlavorExVector& GetDataFlavorExVector() const {return *mpFormats; } - sal_Bool StartClipboardListening( ); + bool StartClipboardListening( ); void StopClipboardListening( ); void Rebind( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& _rxNewData ); @@ -315,11 +315,11 @@ public: ::com::sun::star::uno::Any GetAny( SotFormatStringId nFormat ) const; ::com::sun::star::uno::Any GetAny( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) const; - sal_Bool GetString( SotFormatStringId nFormat, OUString& rStr ); - sal_Bool GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, OUString& rStr ); + bool GetString( SotFormatStringId nFormat, OUString& rStr ); + bool GetString( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, OUString& rStr ); - sal_Bool GetBitmapEx( SotFormatStringId nFormat, BitmapEx& rBmp ); - sal_Bool GetBitmapEx( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, BitmapEx& rBmp ); + bool GetBitmapEx( SotFormatStringId nFormat, BitmapEx& rBmp ); + bool GetBitmapEx( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, BitmapEx& rBmp ); /** Return as GDI metafile. @@ -329,45 +329,45 @@ public: metafile, with over 3 million (!) actions; which is just too large for any reasonable handling - and you need to set a limit. */ - sal_Bool GetGDIMetaFile( SotFormatStringId nFormat, GDIMetaFile& rMtf, size_t nMaxActions = 0 ); - sal_Bool GetGDIMetaFile( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, GDIMetaFile& rMtf ); + bool GetGDIMetaFile( SotFormatStringId nFormat, GDIMetaFile& rMtf, size_t nMaxActions = 0 ); + bool GetGDIMetaFile( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, GDIMetaFile& rMtf ); - sal_Bool GetGraphic( SotFormatStringId nFormat, Graphic& rGraphic ); - sal_Bool GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ); + bool GetGraphic( SotFormatStringId nFormat, Graphic& rGraphic ); + bool GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ); - sal_Bool GetImageMap( SotFormatStringId nFormat, ImageMap& rIMap ); - sal_Bool GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rImap ); + bool GetImageMap( SotFormatStringId nFormat, ImageMap& rIMap ); + bool GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rImap ); - sal_Bool GetTransferableObjectDescriptor( SotFormatStringId nFormat, TransferableObjectDescriptor& rDesc ); - sal_Bool GetTransferableObjectDescriptor( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, TransferableObjectDescriptor& rDesc ); + bool GetTransferableObjectDescriptor( SotFormatStringId nFormat, TransferableObjectDescriptor& rDesc ); + bool GetTransferableObjectDescriptor( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, TransferableObjectDescriptor& rDesc ); - sal_Bool GetINetBookmark( SotFormatStringId nFormat, INetBookmark& rBmk ); - sal_Bool GetINetBookmark( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ); + bool GetINetBookmark( SotFormatStringId nFormat, INetBookmark& rBmk ); + bool GetINetBookmark( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ); - sal_Bool GetINetImage( SotFormatStringId nFormat, INetImage& rINtImg ); - sal_Bool GetINetImage( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg ); + bool GetINetImage( SotFormatStringId nFormat, INetImage& rINtImg ); + bool GetINetImage( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg ); - sal_Bool GetFileList( SotFormatStringId nFormat, FileList& rFileList ); - sal_Bool GetFileList( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, FileList& rFileList ); + bool GetFileList( SotFormatStringId nFormat, FileList& rFileList ); + bool GetFileList( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, FileList& rFileList ); - sal_Bool GetSequence( SotFormatStringId nFormat, ::com::sun::star::uno::Sequence< sal_Int8 >& rSeq ); - sal_Bool GetSequence( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Sequence< sal_Int8 >& rSeq ); + bool GetSequence( SotFormatStringId nFormat, ::com::sun::star::uno::Sequence< sal_Int8 >& rSeq ); + bool GetSequence( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Sequence< sal_Int8 >& rSeq ); - sal_Bool GetSotStorageStream( SotFormatStringId nFormat, SotStorageStreamRef& rStreamRef ); - sal_Bool GetSotStorageStream( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, SotStorageStreamRef& rStreamRef ); + bool GetSotStorageStream( SotFormatStringId nFormat, SotStorageStreamRef& rStreamRef ); + bool GetSotStorageStream( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, SotStorageStreamRef& rStreamRef ); - sal_Bool GetInputStream( SotFormatStringId nFormat, ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& xStream ); - sal_Bool GetInputStream( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& xStream ); + bool GetInputStream( SotFormatStringId nFormat, ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& xStream ); + bool GetInputStream( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Reference < com::sun::star::io::XInputStream >& xStream ); - sal_Bool GetInterface( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf ); + bool GetInterface( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rIf ); public: static TransferableDataHelper CreateFromSystemClipboard( Window * pWindow ); static TransferableDataHelper CreateFromSelection( Window * pWindow ); - static sal_Bool IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor, + static bool IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor, const ::com::sun::star::datatransfer::DataFlavor& rRequestFlavor, - sal_Bool bCompareParameters = sal_False ); + bool bCompareParameters = false ); }; class SVT_DLLPUBLIC DragSourceHelper @@ -405,7 +405,7 @@ private: // not available DragSourceHelper(); DragSourceHelper& operator=( const DragSourceHelper& rDragSourceHelper ); - sal_Bool operator==( const DragSourceHelper& rDragSourceHelper ) const; + bool operator==( const DragSourceHelper& rDragSourceHelper ) const; public: @@ -457,7 +457,7 @@ private: // not available DropTargetHelper(); DropTargetHelper& operator=( const DropTargetHelper& rDropTargetHelper ); - sal_Bool operator==( const DropTargetHelper& rDropTargetHelper ) const; + bool operator==( const DropTargetHelper& rDropTargetHelper ) const; void ImplConstruct(); @@ -477,8 +477,8 @@ public: virtual ~DropTargetHelper(); // typically called by the application in ::AcceptDrop and ::ExecuteDrop and (see above) - sal_Bool IsDropFormatSupported( SotFormatStringId nFormat ); - sal_Bool IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + bool IsDropFormatSupported( SotFormatStringId nFormat ); + bool IsDropFormatSupported( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); DataFlavorExVector& GetDataFlavorExVector() const {return *mpFormats; } @@ -493,7 +493,7 @@ class SVT_DLLPUBLIC TransferDataContainer : public TransferableHelper protected: 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 ); public: @@ -512,7 +512,7 @@ public: void CopyByteString( sal_uLong nFormatId, const OString& rStr ); void CopyAnyData( sal_uLong nFormatId, const sal_Char* pData, sal_uLong nLen ); - sal_Bool HasAnyData() const; + bool HasAnyData() const; using TransferableHelper::StartDrag; void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, diff --git a/include/svx/dbaexchange.hxx b/include/svx/dbaexchange.hxx index e66c3358bef7..eb56fb0b76c6 100644 --- a/include/svx/dbaexchange.hxx +++ b/include/svx/dbaexchange.hxx @@ -147,7 +147,7 @@ namespace svx protected: // TransferableHelper overridables virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); static sal_uInt32 getDescriptorFormatId(); @@ -225,7 +225,7 @@ namespace svx protected: 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 ObjectReleased(); protected: @@ -275,7 +275,7 @@ namespace svx protected: 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 ObjectReleased(); static sal_uInt32 getDescriptorFormatId(); }; diff --git a/include/svx/dbaobjectex.hxx b/include/svx/dbaobjectex.hxx index a28905bf5178..957b739b98b8 100644 --- a/include/svx/dbaobjectex.hxx +++ b/include/svx/dbaobjectex.hxx @@ -63,7 +63,7 @@ namespace svx protected: // TransferableHelper overridables virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); static sal_uInt32 getDescriptorFormatId(bool _bExtractForm); }; diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index 9526ecb94a9e..b9bf2ac4e9b5 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -174,8 +174,8 @@ protected: // TransferableHelper 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 DragFinished( sal_Int8 nDropAction ); virtual void ObjectReleased(); diff --git a/include/svx/xmlexchg.hxx b/include/svx/xmlexchg.hxx index 441aac77d26e..6530b2d45c25 100644 --- a/include/svx/xmlexchg.hxx +++ b/include/svx/xmlexchg.hxx @@ -69,7 +69,7 @@ namespace svx // TransferableHelper overridables virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); OXFormsDescriptor m_aDescriptor; diff --git a/reportdesign/source/ui/dlg/GroupExchange.cxx b/reportdesign/source/ui/dlg/GroupExchange.cxx index 4b6dd5fa7b88..979dd5c65cde 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.cxx +++ b/reportdesign/source/ui/dlg/GroupExchange.cxx @@ -49,14 +49,14 @@ namespace rptui } } - sal_Bool OGroupExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) + bool OGroupExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { sal_uLong nFormat = SotExchange::GetFormat(rFlavor); if(nFormat == OGroupExchange::getReportGroupId() ) { return SetAny(uno::makeAny(m_aGroupRow),rFlavor); } - return sal_False; + return false; } void OGroupExchange::ObjectReleased() diff --git a/reportdesign/source/ui/dlg/GroupExchange.hxx b/reportdesign/source/ui/dlg/GroupExchange.hxx index 01eb4373718e..5499f8012f34 100644 --- a/reportdesign/source/ui/dlg/GroupExchange.hxx +++ b/reportdesign/source/ui/dlg/GroupExchange.hxx @@ -37,7 +37,7 @@ namespace rptui static sal_uInt32 getReportGroupId(); protected: 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 ObjectReleased(); }; } diff --git a/reportdesign/source/ui/inc/dlgedclip.hxx b/reportdesign/source/ui/inc/dlgedclip.hxx index c3ba51c00174..b439cd41e7ac 100644 --- a/reportdesign/source/ui/inc/dlgedclip.hxx +++ b/reportdesign/source/ui/inc/dlgedclip.hxx @@ -70,7 +70,7 @@ public: protected: // TransferableHelper overridables virtual void AddSupportedFormats(); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); private: TSectionElements m_aCopyElements; }; diff --git a/reportdesign/source/ui/report/dlgedclip.cxx b/reportdesign/source/ui/report/dlgedclip.cxx index a48c2c0c529d..cd217f9d0440 100644 --- a/reportdesign/source/ui/report/dlgedclip.cxx +++ b/reportdesign/source/ui/report/dlgedclip.cxx @@ -52,12 +52,10 @@ void OReportExchange::AddSupportedFormats() AddFormat(getDescriptorFormatId()); } -sal_Bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor ) +bool OReportExchange::GetData( const datatransfer::DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); - return (nFormatId == getDescriptorFormatId()) ? - SetAny( uno::Any(m_aCopyElements), _rFlavor ) - : sal_False; + return (nFormatId == getDescriptorFormatId()) && SetAny( uno::Any(m_aCopyElements), _rFlavor ); } sal_Bool OReportExchange::canExtract(const DataFlavorExVector& _rFlavor) diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 2c93ddf3fed5..319c88b056f5 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -376,9 +376,9 @@ void ScDrawTransferObj::AddSupportedFormats() // AddFormat( SOT_FORMATSTR_ID_SVIM ); } -sal_Bool ScDrawTransferObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) +bool ScDrawTransferObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { - sal_Bool bOK = false; + bool bOK = false; sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); if ( bOleObj && nFormat != SOT_FORMAT_GDIMETAFILE ) @@ -477,12 +477,12 @@ sal_Bool ScDrawTransferObj::GetData( const ::com::sun::star::datatransfer::DataF return bOK; } -sal_Bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, +bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const ::com::sun::star::datatransfer::DataFlavor& /* rFlavor */ ) { // called from SetObject, put data into stream - sal_Bool bRet = false; + bool bRet = false; switch (nUserObjectId) { case SCDRAWTRANS_TYPE_DRAWMODEL: @@ -602,7 +602,7 @@ sal_Bool ScDrawTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUse delete pSrcStm; } - bRet = sal_True; + bRet = true; xWorkStore->dispose(); xWorkStore = uno::Reference < embed::XStorage >(); diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx index 473e62bad48e..0640de5fdc58 100644 --- a/sc/source/ui/app/lnktrans.cxx +++ b/sc/source/ui/app/lnktrans.cxx @@ -55,9 +55,9 @@ void ScLinkTransferObj::AddSupportedFormats() } } -sal_Bool ScLinkTransferObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) +bool ScLinkTransferObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { - sal_Bool bOK = false; + bool bOK = false; if ( !aLinkURL.isEmpty() ) { INetBookmark aBmk( aLinkURL, aLinkText ); diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index 1cd64b9da525..fd90579d352e 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -391,9 +391,9 @@ ScDrawTransferObj* ScSelectionTransferObj::GetDrawData() return pDrawData; } -sal_Bool ScSelectionTransferObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) +bool ScSelectionTransferObj::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { - sal_Bool bOK = false; + bool bOK = false; uno::Reference<datatransfer::XTransferable> xSource; switch (eMode) diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 47d04da48901..95f7e9056ea8 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -247,10 +247,10 @@ void ScTransferObj::AddSupportedFormats() AddFormat( SOT_FORMATSTR_ID_EDITENGINE ); } -sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) +bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) { sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); - bool bOK = false; + bool bOK = false; if( HasFormat( nFormat ) ) { @@ -396,7 +396,7 @@ sal_Bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor ) return bOK; } -sal_Bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, +bool ScTransferObj::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32 nUserObjectId, const datatransfer::DataFlavor& rFlavor ) { // called from SetObject, put data into stream diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index 44a9daeaa409..aeb73895f94d 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -73,8 +73,8 @@ public: virtual ~ScDrawTransferObj(); 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, + 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 void DragFinished( sal_Int8 nDropAction ); diff --git a/sc/source/ui/inc/lnktrans.hxx b/sc/source/ui/inc/lnktrans.hxx index d9ccdebd06aa..c22b1e6b56f3 100644 --- a/sc/source/ui/inc/lnktrans.hxx +++ b/sc/source/ui/inc/lnktrans.hxx @@ -36,7 +36,7 @@ public: void SetLinkURL( const OUString& rURL, const OUString& rText ); 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 ObjectReleased(); virtual void DragFinished( sal_Int8 nDropAction ); }; diff --git a/sc/source/ui/inc/seltrans.hxx b/sc/source/ui/inc/seltrans.hxx index dc76157ca603..fb411ad751a8 100644 --- a/sc/source/ui/inc/seltrans.hxx +++ b/sc/source/ui/inc/seltrans.hxx @@ -65,7 +65,7 @@ public: ScDrawTransferObj* GetDrawData(); 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 ObjectReleased(); }; diff --git a/sc/source/ui/inc/transobj.hxx b/sc/source/ui/inc/transobj.hxx index 61e9fc0a32f6..d27556f046a6 100644 --- a/sc/source/ui/inc/transobj.hxx +++ b/sc/source/ui/inc/transobj.hxx @@ -72,8 +72,8 @@ public: virtual ~ScTransferObj(); 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, + 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 void DragFinished( sal_Int8 nDropAction ); 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; } diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx index c42f7e5d3003..c4c95e3c351b 100644 --- a/sfx2/source/doc/objembed.cxx +++ b/sfx2/source/doc/objembed.cxx @@ -164,7 +164,7 @@ void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescrip rDesc.maSize = OutputDevice::LogicToLogic( GetVisArea().GetSize(), GetMapUnit(), MAP_100TH_MM ); rDesc.maDragStartPos = Point(); rDesc.maDisplayName = ""; - rDesc.mbCanLink = sal_False; + rDesc.mbCanLink = false; } diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 9881346341f1..829ae99795be 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -1976,7 +1976,7 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla aDesc.maSize = OutputDevice::LogicToLogic( aSize, aMapUnit, MAP_100TH_MM ); aDesc.maDragStartPos = Point(); aDesc.maDisplayName = ""; - aDesc.mbCanLink = sal_False; + aDesc.mbCanLink = false; SvMemoryStream aMemStm( 1024, 1024 ); WriteTransferableObjectDescriptor( aMemStm, aDesc ); diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx index ee9a77eb51ad..36a00b3a22cf 100644 --- a/svtools/source/misc/embedtransfer.cxx +++ b/svtools/source/misc/embedtransfer.cxx @@ -76,9 +76,9 @@ void SvEmbedTransferHelper::AddSupportedFormats() -sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) +bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( m_xObj.is() ) { @@ -132,7 +132,7 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D if ( bDeleteStream ) delete pStream; - if( ( bRet = ( aSeq.getLength() > 0 ) ) == sal_True ) + if( ( bRet = ( aSeq.getLength() > 0 ) ) ) { aAny <<= aSeq; SetAny( aAny, rFlavor ); @@ -158,7 +158,7 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D aAny <<= uno::Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aMemStm.GetData() ), aMemStm.Seek( STREAM_SEEK_TO_END ) ); SetAny( aAny, rFlavor ); - bRet = sal_True; + bRet = true; } else if ( m_xObj.is() && :: svt::EmbeddedObjectRef::TryRunningState( m_xObj ) ) { @@ -167,7 +167,7 @@ sal_Bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::D { uno::Any aAny = xTransferable->getTransferData( rFlavor ); SetAny( aAny, rFlavor ); - bRet = sal_True; + bRet = true; } } } @@ -241,7 +241,7 @@ void SvEmbedTransferHelper::FillTransferableObjectDescriptor( TransferableObject rDesc.maSize = OutputDevice::LogicToLogic( aSize, aMapMode, MapMode( MAP_100TH_MM ) ); rDesc.maDragStartPos = Point(); rDesc.maDisplayName = ""; - rDesc.mbCanLink = sal_False; + rDesc.mbCanLink = false; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/stringtransfer.cxx b/svtools/source/misc/stringtransfer.cxx index d37b225b2104..44349ae3e2e3 100644 --- a/svtools/source/misc/stringtransfer.cxx +++ b/svtools/source/misc/stringtransfer.cxx @@ -44,13 +44,13 @@ namespace svt } - sal_Bool OStringTransferable::GetData( const DataFlavor& _rFlavor ) + bool OStringTransferable::GetData( const DataFlavor& _rFlavor ) { sal_uInt32 nFormat = SotExchange::GetFormat( _rFlavor ); if (SOT_FORMAT_STRING == nFormat) return SetString( m_sContent, _rFlavor ); - return sal_False; + return false; } diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx index def8b3d54ae0..d3df6a98c211 100644 --- a/svtools/source/misc/transfer.cxx +++ b/svtools/source/misc/transfer.cxx @@ -348,7 +348,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th try { DataFlavor aSubstFlavor; - sal_Bool bDone = sal_False; + bool bDone = false; // add formats if not already done if( !mpFormats->size() ) @@ -366,7 +366,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th && SotExchange::GetFormatDataFlavor(FORMAT_BITMAP, aSubstFlavor)) { GetData( aSubstFlavor ); - bDone = sal_True; + bDone = true; } else if( SotExchange::GetFormatDataFlavor( SOT_FORMATSTR_ID_EMF, aSubstFlavor ) && TransferableDataHelper::IsEqual( aSubstFlavor, rFlavor ) && @@ -393,7 +393,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th { maAny <<= ( aSeq = Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aDstStm.GetData() ), aDstStm.Seek( STREAM_SEEK_TO_END ) ) ); - bDone = sal_True; + bDone = true; } } } @@ -423,7 +423,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const DataFlavor& rFlavor ) th { maAny <<= ( aSeq = Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( aDstStm.GetData() ), aDstStm.Seek( STREAM_SEEK_TO_END ) ) ); - bDone = sal_True; + bDone = true; } } } @@ -500,7 +500,7 @@ sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& r { if( TransferableDataHelper::IsEqual( *aIter, rFlavor ) ) { - bRet = sal_True; + bRet = true; break; } } @@ -631,7 +631,7 @@ void TransferableHelper::AddFormat( SotFormatStringId nFormat ) void TransferableHelper::AddFormat( const DataFlavor& rFlavor ) { - sal_Bool bAdd = sal_True; + bool bAdd = true; for (DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); aIter != aEnd ; ++aIter) { @@ -652,7 +652,7 @@ void TransferableHelper::AddFormat( const DataFlavor& rFlavor ) #endif } - bAdd = sal_False; + bAdd = false; break; } } @@ -712,15 +712,15 @@ void TransferableHelper::RemoveFormat( const DataFlavor& rFlavor ) -sal_Bool TransferableHelper::HasFormat( SotFormatStringId nFormat ) +bool TransferableHelper::HasFormat( SotFormatStringId nFormat ) { - sal_Bool bRet = sal_False; + bool bRet = false; for (DataFlavorExVector::const_iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); aIter != aEnd ; ++aIter) { if( nFormat == (*aIter).mnSotId ) { - bRet = sal_True; + bRet = true; break; } } @@ -738,7 +738,7 @@ void TransferableHelper::ClearFormats() -sal_Bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) +bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) { maAny = rAny; return( maAny.hasValue() ); @@ -746,7 +746,7 @@ sal_Bool TransferableHelper::SetAny( const Any& rAny, const DataFlavor& ) -sal_Bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& rFlavor ) +bool TransferableHelper::SetString( const OUString& rString, const DataFlavor& rFlavor ) { DataFlavor aFileFlavor; @@ -769,7 +769,7 @@ sal_Bool TransferableHelper::SetString( const OUString& rString, const DataFlavo -sal_Bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavor& rFlavor ) +bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataFlavor& rFlavor ) { if( !rBitmapEx.IsEmpty() ) { @@ -809,7 +809,7 @@ sal_Bool TransferableHelper::SetBitmapEx( const BitmapEx& rBitmapEx, const DataF -sal_Bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlavor& ) +bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const DataFlavor& ) { if( rMtf.GetActionSize() ) { @@ -824,7 +824,7 @@ sal_Bool TransferableHelper::SetGDIMetaFile( const GDIMetaFile& rMtf, const Data -sal_Bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& ) +bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlavor& ) { if( rGraphic.GetType() != GRAPHIC_NONE ) { @@ -841,7 +841,7 @@ sal_Bool TransferableHelper::SetGraphic( const Graphic& rGraphic, const DataFlav -sal_Bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& ) +bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const ::com::sun::star::datatransfer::DataFlavor& ) { SvMemoryStream aMemStm( 8192, 8192 ); @@ -854,7 +854,7 @@ sal_Bool TransferableHelper::SetImageMap( const ImageMap& rIMap, const ::com::su -sal_Bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, +bool TransferableHelper::SetTransferableObjectDescriptor( const TransferableObjectDescriptor& rDesc, const ::com::sun::star::datatransfer::DataFlavor& ) { PrepareOLE( rDesc ); @@ -869,7 +869,7 @@ sal_Bool TransferableHelper::SetTransferableObjectDescriptor( const Transferable -sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, +bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { rtl_TextEncoding eSysCSet = osl_getThreadTextEncoding(); @@ -959,7 +959,7 @@ sal_Bool TransferableHelper::SetINetBookmark( const INetBookmark& rBmk, -sal_Bool TransferableHelper::SetINetImage( const INetImage& rINtImg, +bool TransferableHelper::SetINetImage( const INetImage& rINtImg, const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { SvMemoryStream aMemStm( 1024, 1024 ); @@ -974,7 +974,7 @@ sal_Bool TransferableHelper::SetINetImage( const INetImage& rINtImg, -sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjectId, const DataFlavor& rFlavor ) +bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjectId, const DataFlavor& rFlavor ) { SotStorageStreamRef xStm( new SotStorageStream( OUString() ) ); @@ -1005,10 +1005,10 @@ sal_Bool TransferableHelper::SetObject( void* pUserObject, sal_uInt32 nUserObjec -sal_Bool TransferableHelper::WriteObject( SotStorageStreamRef&, void*, sal_uInt32, const DataFlavor& ) +bool TransferableHelper::WriteObject( SotStorageStreamRef&, void*, sal_uInt32, const DataFlavor& ) { OSL_FAIL( "TransferableHelper::WriteObject( ... ) not implemented" ); - return sal_False; + return false; } @@ -1473,19 +1473,19 @@ void TransferableDataHelper::InitFormats() -sal_Bool TransferableDataHelper::HasFormat( SotFormatStringId nFormat ) const +bool TransferableDataHelper::HasFormat( SotFormatStringId nFormat ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + bool bRet = false; while( aIter != aEnd ) { if( nFormat == (*aIter++).mnSotId ) { aIter = aEnd; - bRet = sal_True; + bRet = true; } } @@ -1494,19 +1494,19 @@ sal_Bool TransferableDataHelper::HasFormat( SotFormatStringId nFormat ) const -sal_Bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const +bool TransferableDataHelper::HasFormat( const DataFlavor& rFlavor ) const { ::osl::MutexGuard aGuard( mpImpl->maMutex ); DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + bool bRet = false; while( aIter != aEnd ) { if( TransferableDataHelper::IsEqual( rFlavor, *aIter++ ) ) { aIter = aEnd; - bRet = sal_True; + bRet = true; } } @@ -1624,7 +1624,7 @@ Any TransferableDataHelper::GetAny( const DataFlavor& rFlavor ) const -sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, OUString& rStr ) +bool TransferableDataHelper::GetString( SotFormatStringId nFormat, OUString& rStr ) { DataFlavor aFlavor; return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetString( aFlavor, rStr ) ); @@ -1632,10 +1632,10 @@ sal_Bool TransferableDataHelper::GetString( SotFormatStringId nFormat, OUString& -sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rStr ) +bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& rStr ) { Any aAny( GetAny( rFlavor ) ); - sal_Bool bRet = sal_False; + bool bRet = false; if( aAny.hasValue() ) { @@ -1645,7 +1645,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& if( aAny >>= aOUString ) { rStr = aOUString; - bRet = sal_True; + bRet = true; } else if( aAny >>= aSeq ) { @@ -1659,7 +1659,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& --nLen; rStr = OUString( pChars, nLen, osl_getThreadTextEncoding() ); - bRet = sal_True; + bRet = true; } } @@ -1668,7 +1668,7 @@ sal_Bool TransferableDataHelper::GetString( const DataFlavor& rFlavor, OUString& -sal_Bool TransferableDataHelper::GetBitmapEx( SotFormatStringId nFormat, BitmapEx& rBmpEx ) +bool TransferableDataHelper::GetBitmapEx( SotFormatStringId nFormat, BitmapEx& rBmpEx ) { if(FORMAT_BITMAP == nFormat) { @@ -1690,7 +1690,7 @@ sal_Bool TransferableDataHelper::GetBitmapEx( SotFormatStringId nFormat, BitmapE -sal_Bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& rBmpEx ) +bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapEx& rBmpEx ) { SotStorageStreamRef xStm; DataFlavor aSubstFlavor; @@ -1777,7 +1777,7 @@ sal_Bool TransferableDataHelper::GetBitmapEx( const DataFlavor& rFlavor, BitmapE -sal_Bool TransferableDataHelper::GetGDIMetaFile(SotFormatStringId nFormat, GDIMetaFile& rMtf, size_t nMaxActions) +bool TransferableDataHelper::GetGDIMetaFile(SotFormatStringId nFormat, GDIMetaFile& rMtf, size_t nMaxActions) { DataFlavor aFlavor; return SotExchange::GetFormatDataFlavor(nFormat, aFlavor) && @@ -1787,11 +1787,11 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile(SotFormatStringId nFormat, GDIMe -sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaFile& rMtf ) +bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIMetaFile& rMtf ) { SotStorageStreamRef xStm; DataFlavor aSubstFlavor; - sal_Bool bRet = sal_False; + bool bRet = false; if( GetSotStorageStream( rFlavor, xStm ) ) { @@ -1809,7 +1809,7 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIM if( GraphicConverter::Import( *xStm, aGraphic ) == ERRCODE_NONE ) { rMtf = aGraphic.GetGDIMetaFile(); - bRet = sal_True; + bRet = true; } } @@ -1823,7 +1823,7 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIM if( GraphicConverter::Import( *xStm, aGraphic ) == ERRCODE_NONE ) { rMtf = aGraphic.GetGDIMetaFile(); - bRet = sal_True; + bRet = true; } } @@ -1832,7 +1832,7 @@ sal_Bool TransferableDataHelper::GetGDIMetaFile( const DataFlavor& rFlavor, GDIM -sal_Bool TransferableDataHelper::GetGraphic( SotFormatStringId nFormat, Graphic& rGraphic ) +bool TransferableDataHelper::GetGraphic( SotFormatStringId nFormat, Graphic& rGraphic ) { if(FORMAT_BITMAP == nFormat) { @@ -1854,10 +1854,10 @@ sal_Bool TransferableDataHelper::GetGraphic( SotFormatStringId nFormat, Graphic& -sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ) +bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, Graphic& rGraphic ) { DataFlavor aFlavor; - sal_Bool bRet = sal_False; + bool bRet = false; if(SotExchange::GetFormatDataFlavor(SOT_FORMATSTR_ID_PNG, aFlavor) && TransferableDataHelper::IsEqual(aFlavor, rFlavor)) @@ -1865,7 +1865,7 @@ sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfe // try to get PNG first BitmapEx aBmpEx; - if( ( bRet = GetBitmapEx( aFlavor, aBmpEx ) ) == sal_True ) + if( ( bRet = GetBitmapEx( aFlavor, aBmpEx ) ) ) rGraphic = aBmpEx; } else if(SotExchange::GetFormatDataFlavor( SOT_FORMAT_BITMAP, aFlavor ) && @@ -1873,7 +1873,7 @@ sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfe { BitmapEx aBmpEx; - if( ( bRet = GetBitmapEx( aFlavor, aBmpEx ) ) == sal_True ) + if( ( bRet = GetBitmapEx( aFlavor, aBmpEx ) ) ) rGraphic = aBmpEx; } else if( SotExchange::GetFormatDataFlavor( SOT_FORMAT_GDIMETAFILE, aFlavor ) && @@ -1881,7 +1881,7 @@ sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfe { GDIMetaFile aMtf; - if( ( bRet = GetGDIMetaFile( aFlavor, aMtf ) ) == sal_True ) + if( ( bRet = GetGDIMetaFile( aFlavor, aMtf ) ) ) rGraphic = aMtf; } else @@ -1900,7 +1900,7 @@ sal_Bool TransferableDataHelper::GetGraphic( const ::com::sun::star::datatransfe -sal_Bool TransferableDataHelper::GetImageMap( SotFormatStringId nFormat, ImageMap& rIMap ) +bool TransferableDataHelper::GetImageMap( SotFormatStringId nFormat, ImageMap& rIMap ) { DataFlavor aFlavor; return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetImageMap( aFlavor, rIMap ) ); @@ -1908,10 +1908,10 @@ sal_Bool TransferableDataHelper::GetImageMap( SotFormatStringId nFormat, ImageMa -sal_Bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rIMap ) +bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, ImageMap& rIMap ) { SotStorageStreamRef xStm; - sal_Bool bRet = GetSotStorageStream( rFlavor, xStm ); + bool bRet = GetSotStorageStream( rFlavor, xStm ); if( bRet ) { @@ -1924,7 +1924,7 @@ sal_Bool TransferableDataHelper::GetImageMap( const ::com::sun::star::datatransf -sal_Bool TransferableDataHelper::GetTransferableObjectDescriptor( SotFormatStringId nFormat, TransferableObjectDescriptor& rDesc ) +bool TransferableDataHelper::GetTransferableObjectDescriptor( SotFormatStringId nFormat, TransferableObjectDescriptor& rDesc ) { DataFlavor aFlavor; return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetTransferableObjectDescriptor( aFlavor, rDesc ) ); @@ -1932,7 +1932,7 @@ sal_Bool TransferableDataHelper::GetTransferableObjectDescriptor( SotFormatStrin -sal_Bool TransferableDataHelper::GetTransferableObjectDescriptor( const ::com::sun::star::datatransfer::DataFlavor&, TransferableObjectDescriptor& rDesc ) +bool TransferableDataHelper::GetTransferableObjectDescriptor( const ::com::sun::star::datatransfer::DataFlavor&, TransferableObjectDescriptor& rDesc ) { rDesc = *mpObjDesc; return true; @@ -1940,7 +1940,7 @@ sal_Bool TransferableDataHelper::GetTransferableObjectDescriptor( const ::com::s -sal_Bool TransferableDataHelper::GetINetBookmark( SotFormatStringId nFormat, INetBookmark& rBmk ) +bool TransferableDataHelper::GetINetBookmark( SotFormatStringId nFormat, INetBookmark& rBmk ) { DataFlavor aFlavor; return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetINetBookmark( aFlavor, rBmk ) ); @@ -1948,9 +1948,9 @@ sal_Bool TransferableDataHelper::GetINetBookmark( SotFormatStringId nFormat, INe -sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ) +bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetBookmark& rBmk ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( HasFormat( rFlavor )) { const SotFormatStringId nFormat = SotExchange::GetFormat( rFlavor ); @@ -1965,7 +1965,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR == nFormat ) { rBmk = INetBookmark( aString, aString ); - bRet = sal_True; + bRet = true; } else { @@ -1997,7 +1997,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr aDesc = aString.copy( nStart+1, nLen ); rBmk = INetBookmark( aURL, aDesc ); - bRet = sal_True; + bRet = true; } } } @@ -2013,7 +2013,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr const sal_Char* p2 = reinterpret_cast< const sal_Char* >( aSeq.getConstArray() ) + 1024; rBmk = INetBookmark( OUString( p1, strlen(p1), osl_getThreadTextEncoding() ), OUString( p2, strlen(p2), osl_getThreadTextEncoding() ) ); - bRet = sal_True; + bRet = true; } } break; @@ -2056,17 +2056,17 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr if( pStream ) { OString aLine; - sal_Bool bSttFnd = sal_False; + bool bSttFnd = false; while( pStream->ReadLine( aLine ) ) { if (aLine.equalsIgnoreAsciiCase("[InternetShortcut]")) - bSttFnd = sal_True; + bSttFnd = true; else if (bSttFnd && aLine.copy(0, 4).equalsIgnoreAsciiCase("URL=")) { rBmk = INetBookmark( OStringToOUString(aLine.copy(4), eTextEncoding), OStringToOUString(aDesc.copy(0, aDesc.getLength() - 4), eTextEncoding) ); - bRet = sal_True; + bRet = true; break; } } @@ -2087,7 +2087,7 @@ sal_Bool TransferableDataHelper::GetINetBookmark( const ::com::sun::star::datatr -sal_Bool TransferableDataHelper::GetINetImage( SotFormatStringId nFormat, +bool TransferableDataHelper::GetINetImage( SotFormatStringId nFormat, INetImage& rINtImg ) { DataFlavor aFlavor; @@ -2096,12 +2096,12 @@ sal_Bool TransferableDataHelper::GetINetImage( SotFormatStringId nFormat, -sal_Bool TransferableDataHelper::GetINetImage( +bool TransferableDataHelper::GetINetImage( const ::com::sun::star::datatransfer::DataFlavor& rFlavor, INetImage& rINtImg ) { SotStorageStreamRef xStm; - sal_Bool bRet = GetSotStorageStream( rFlavor, xStm ); + bool bRet = GetSotStorageStream( rFlavor, xStm ); if( bRet ) bRet = rINtImg.Read( *xStm, SotExchange::GetFormat( rFlavor ) ); @@ -2110,7 +2110,7 @@ sal_Bool TransferableDataHelper::GetINetImage( -sal_Bool TransferableDataHelper::GetFileList( SotFormatStringId nFormat, +bool TransferableDataHelper::GetFileList( SotFormatStringId nFormat, FileList& rFileList ) { DataFlavor aFlavor; @@ -2119,12 +2119,12 @@ sal_Bool TransferableDataHelper::GetFileList( SotFormatStringId nFormat, -sal_Bool TransferableDataHelper::GetFileList( +bool TransferableDataHelper::GetFileList( const ::com::sun::star::datatransfer::DataFlavor&, FileList& rFileList ) { SotStorageStreamRef xStm; - sal_Bool bRet = sal_False; + bool bRet = false; for( sal_uInt32 i = 0, nFormatCount = GetFormatCount(); ( i < nFormatCount ) && !bRet; ++i ) { @@ -2142,7 +2142,7 @@ sal_Bool TransferableDataHelper::GetFileList( if( !aDiskString.isEmpty() && aDiskString[0] != '#' ) rFileList.AppendFile( OStringToOUString(aDiskString, RTL_TEXTENCODING_UTF8) ); - bRet = sal_True; + bRet = true; } else bRet = ( ( ReadFileList( *xStm, rFileList ) ).GetError() == ERRCODE_NONE ); @@ -2155,7 +2155,7 @@ sal_Bool TransferableDataHelper::GetFileList( -sal_Bool TransferableDataHelper::GetSequence( SotFormatStringId nFormat, Sequence< sal_Int8 >& rSeq ) +bool TransferableDataHelper::GetSequence( SotFormatStringId nFormat, Sequence< sal_Int8 >& rSeq ) { DataFlavor aFlavor; return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetSequence( aFlavor, rSeq ) ); @@ -2163,7 +2163,7 @@ sal_Bool TransferableDataHelper::GetSequence( SotFormatStringId nFormat, Sequenc -sal_Bool TransferableDataHelper::GetSequence( const DataFlavor& rFlavor, Sequence< sal_Int8 >& rSeq ) +bool TransferableDataHelper::GetSequence( const DataFlavor& rFlavor, Sequence< sal_Int8 >& rSeq ) { #ifdef DEBUG fprintf( stderr, "TransferableDataHelper requests sequence of data\n" ); @@ -2175,7 +2175,7 @@ sal_Bool TransferableDataHelper::GetSequence( const DataFlavor& rFlavor, Sequenc -sal_Bool TransferableDataHelper::GetSotStorageStream( SotFormatStringId nFormat, SotStorageStreamRef& rxStream ) +bool TransferableDataHelper::GetSotStorageStream( SotFormatStringId nFormat, SotStorageStreamRef& rxStream ) { DataFlavor aFlavor; return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetSotStorageStream( aFlavor, rxStream ) ); @@ -2183,10 +2183,10 @@ sal_Bool TransferableDataHelper::GetSotStorageStream( SotFormatStringId nFormat, -sal_Bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor, SotStorageStreamRef& rxStream ) +bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor, SotStorageStreamRef& rxStream ) { Sequence< sal_Int8 > aSeq; - sal_Bool bRet = GetSequence( rFlavor, aSeq ); + bool bRet = GetSequence( rFlavor, aSeq ); if( bRet ) { @@ -2198,7 +2198,7 @@ sal_Bool TransferableDataHelper::GetSotStorageStream( const DataFlavor& rFlavor, return bRet; } -sal_Bool TransferableDataHelper::GetInputStream( SotFormatStringId nFormat, Reference < XInputStream >& rxStream ) +bool TransferableDataHelper::GetInputStream( SotFormatStringId nFormat, Reference < XInputStream >& rxStream ) { DataFlavor aFlavor; return( SotExchange::GetFormatDataFlavor( nFormat, aFlavor ) && GetInputStream( aFlavor, rxStream ) ); @@ -2206,10 +2206,10 @@ sal_Bool TransferableDataHelper::GetInputStream( SotFormatStringId nFormat, Refe -sal_Bool TransferableDataHelper::GetInputStream( const DataFlavor& rFlavor, Reference < XInputStream >& rxStream ) +bool TransferableDataHelper::GetInputStream( const DataFlavor& rFlavor, Reference < XInputStream >& rxStream ) { Sequence< sal_Int8 > aSeq; - sal_Bool bRet = GetSequence( rFlavor, aSeq ); + bool bRet = GetSequence( rFlavor, aSeq ); if( bRet ) rxStream = new ::comphelper::SequenceInputStream( aSeq ); @@ -2227,7 +2227,7 @@ void TransferableDataHelper::Rebind( const Reference< XTransferable >& _rxNewCon -sal_Bool TransferableDataHelper::StartClipboardListening( ) +bool TransferableDataHelper::StartClipboardListening( ) { ::osl::MutexGuard aGuard( mpImpl->maMutex ); @@ -2324,12 +2324,12 @@ TransferableDataHelper TransferableDataHelper::CreateFromSelection( Window* pWin } -sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor, - const ::com::sun::star::datatransfer::DataFlavor& rRequestFlavor, - sal_Bool ) +bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer::DataFlavor& rInternalFlavor, + const ::com::sun::star::datatransfer::DataFlavor& rRequestFlavor, + bool ) { Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); - sal_Bool bRet = sal_False; + bool bRet = false; try { @@ -2351,7 +2351,7 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer:: xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( "utf-16" ) || xRequestType2->getParameterValue( aCharsetString ).equalsIgnoreAsciiCase( "unicode" ) ) { - bRet = sal_True; + bRet = true; } } else if( xRequestType1->getFullMediaType().equalsIgnoreAsciiCase( "application/x-openoffice" ) ) @@ -2363,11 +2363,11 @@ sal_Bool TransferableDataHelper::IsEqual( const ::com::sun::star::datatransfer:: xRequestType2->hasParameter( aFormatString ) && xRequestType1->getParameterValue( aFormatString ).equalsIgnoreAsciiCase( xRequestType2->getParameterValue( aFormatString ) ) ) { - bRet = sal_True; + bRet = true; } } else - bRet = sal_True; + bRet = true; } } } diff --git a/svtools/source/misc/transfer2.cxx b/svtools/source/misc/transfer2.cxx index 3fd0bc6e482f..14d04e6ae204 100644 --- a/svtools/source/misc/transfer2.cxx +++ b/svtools/source/misc/transfer2.cxx @@ -148,7 +148,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::drop( const DropTargetDropEv ( (DropTargetDragEvent&)( aAcceptEvent.maDragEvent ) ).LocationX = rDTDE.LocationX; ( (DropTargetDragEvent&)( aAcceptEvent.maDragEvent ) ).LocationY = rDTDE.LocationY; ( (DropTargetDragEvent&)( aAcceptEvent.maDragEvent ) ).SourceActions = rDTDE.SourceActions; - aAcceptEvent.mbLeaving = sal_False; + aAcceptEvent.mbLeaving = false; aAcceptEvent.mbDefault = aExecuteEvt.mbDefault; sal_Int8 nRet = mrParent.AcceptDrop( aAcceptEvent ); @@ -229,7 +229,7 @@ void SAL_CALL DropTargetHelper::DropTargetListener::dragExit( const DropTargetEv { if( mpLastDragOverEvent ) { - mpLastDragOverEvent->mbLeaving = sal_True; + mpLastDragOverEvent->mbLeaving = true; mrParent.AcceptDrop( *mpLastDragOverEvent ); delete mpLastDragOverEvent; mpLastDragOverEvent = NULL; @@ -322,16 +322,16 @@ sal_Int8 DropTargetHelper::ExecuteDrop( const ExecuteDropEvent& ) -sal_Bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat ) +bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat ) { DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + bool bRet = false; while( aIter != aEnd ) { if( nFormat == (*aIter++).mnSotId ) { - bRet = sal_True; + bRet = true; aIter = aEnd; } } @@ -341,16 +341,16 @@ sal_Bool DropTargetHelper::IsDropFormatSupported( SotFormatStringId nFormat ) -sal_Bool DropTargetHelper::IsDropFormatSupported( const DataFlavor& rFlavor ) +bool DropTargetHelper::IsDropFormatSupported( const DataFlavor& rFlavor ) { DataFlavorExVector::iterator aIter( mpFormats->begin() ), aEnd( mpFormats->end() ); - sal_Bool bRet = sal_False; + bool bRet = false; while( aIter != aEnd ) { if( TransferableDataHelper::IsEqual( rFlavor, *aIter++ ) ) { - bRet = sal_True; + bRet = true; aIter = aEnd; } } @@ -415,12 +415,12 @@ void TransferDataContainer::AddSupportedFormats() -sal_Bool TransferDataContainer::GetData( const +bool TransferDataContainer::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { TDataCntnrEntryList::iterator aIter( pImpl->aFmtList.begin() ), aEnd( pImpl->aFmtList.end() ); - sal_Bool bFnd = sal_False; + bool bFnd = false; sal_uLong nFmtId = SotExchange::GetFormat( rFlavor ); // test first the list @@ -587,7 +587,7 @@ void TransferDataContainer::CopyAny( sal_uInt16 nFmt, -sal_Bool TransferDataContainer::HasAnyData() const +bool TransferDataContainer::HasAnyData() const { return pImpl->aFmtList.begin() != pImpl->aFmtList.end() || 0 != pImpl->pBookmk; diff --git a/svx/source/fmcomp/dbaexchange.cxx b/svx/source/fmcomp/dbaexchange.cxx index a32cb57e7b8f..a54e46eba65f 100644 --- a/svx/source/fmcomp/dbaexchange.cxx +++ b/svx/source/fmcomp/dbaexchange.cxx @@ -224,7 +224,7 @@ namespace svx } - sal_Bool OColumnTransferable::GetData( const DataFlavor& _rFlavor ) + bool OColumnTransferable::GetData( const DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); switch (nFormatId) @@ -236,7 +236,7 @@ namespace svx if (nFormatId == getDescriptorFormatId()) return SetAny( makeAny( m_aDescriptor.createPropertyValueSequence() ), _rFlavor ); - return sal_False; + return false; } @@ -469,7 +469,7 @@ namespace svx } - sal_Bool ODataAccessObjectTransferable::GetData( const DataFlavor& rFlavor ) + bool ODataAccessObjectTransferable::GetData( const DataFlavor& rFlavor ) { sal_uIntPtr nFormat = SotExchange::GetFormat(rFlavor); switch (nFormat) @@ -482,7 +482,7 @@ namespace svx case SOT_FORMATSTR_ID_SBA_DATAEXCHANGE: return SetString(m_sCompatibleObjectDescription, rFlavor); } - return sal_False; + return false; } @@ -644,7 +644,7 @@ namespace svx AddFormat(getDescriptorFormatId()); } - sal_Bool OMultiColumnTransferable::GetData( const DataFlavor& _rFlavor ) + bool OMultiColumnTransferable::GetData( const DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); if (nFormatId == getDescriptorFormatId()) @@ -652,7 +652,7 @@ namespace svx return SetAny( makeAny( m_aDescriptors ), _rFlavor ); } - return sal_False; + return false; } diff --git a/svx/source/fmcomp/dbaobjectex.cxx b/svx/source/fmcomp/dbaobjectex.cxx index 5af2af2e6b21..3c41b1aef9ac 100644 --- a/svx/source/fmcomp/dbaobjectex.cxx +++ b/svx/source/fmcomp/dbaobjectex.cxx @@ -90,13 +90,13 @@ namespace svx } - sal_Bool OComponentTransferable::GetData( const DataFlavor& _rFlavor ) + bool OComponentTransferable::GetData( const DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat(_rFlavor); if ( nFormatId == getDescriptorFormatId(true) || nFormatId == getDescriptorFormatId(false) ) return SetAny( makeAny( m_aDescriptor.createPropertyValueSequence() ), _rFlavor ); - return sal_False; + return false; } diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index fcc6c1a85ebc..b02ea58f3e99 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -43,14 +43,14 @@ namespace svx AddFormat( SOT_FORMATSTR_ID_XFORMS ); } - sal_Bool OXFormsTransferable::GetData( const DataFlavor& _rFlavor ) + bool OXFormsTransferable::GetData( const DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor ); if ( SOT_FORMATSTR_ID_XFORMS == nFormatId ) { return SetString(OUString("XForms-Transferable"), _rFlavor); } - return sal_False; + return false; } const OXFormsDescriptor &OXFormsTransferable::extractDescriptor( const TransferableDataHelper &_rData ) { diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index 48677d8742e9..69e5ae3282d7 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -115,9 +115,9 @@ namespace svxform } - sal_Bool OLocalExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& /*_rFlavor*/ ) + bool OLocalExchange::GetData( const ::com::sun::star::datatransfer::DataFlavor& /*_rFlavor*/ ) { - return sal_False; // do not have any formats by default + return false; // do not have any formats by default } @@ -290,7 +290,7 @@ namespace svxform } - sal_Bool OControlExchange::GetData( const DataFlavor& _rFlavor ) + bool OControlExchange::GetData( const DataFlavor& _rFlavor ) { const sal_uInt32 nFormatId = SotExchange::GetFormat( _rFlavor ); @@ -312,7 +312,7 @@ namespace svxform else return OLocalExchange::GetData( _rFlavor ); - return sal_True; + return true; } diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 0721035749ec..05a7003af8de 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -507,10 +507,10 @@ void GalleryTransferable::AddSupportedFormats() } } -sal_Bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor ) +bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor ) { sal_uInt32 nFormat = SotExchange::GetFormat( rFlavor ); - sal_Bool bRet = sal_False; + bool bRet = false; InitData( false ); @@ -543,10 +543,10 @@ sal_Bool GalleryTransferable::GetData( const datatransfer::DataFlavor& rFlavor ) return bRet; } -sal_Bool GalleryTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, +bool GalleryTransferable::WriteObject( SotStorageStreamRef& rxOStm, void* pUserObject, sal_uInt32, const datatransfer::DataFlavor& ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( pUserObject ) { diff --git a/svx/source/inc/fmexch.hxx b/svx/source/inc/fmexch.hxx index d2d529716290..742f51c016ea 100644 --- a/svx/source/inc/fmexch.hxx +++ b/svx/source/inc/fmexch.hxx @@ -82,7 +82,7 @@ namespace svxform // TransferableHelper virtual void DragFinished( sal_Int8 nDropAction ); - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); private: void StartDrag( Window* pWindow, sal_Int8 nDragSourceActions, sal_Int32 nDragPointer = DND_POINTER_NONE, sal_Int32 nDragImage = DND_IMAGE_NONE ) @@ -225,7 +225,7 @@ namespace svxform inline static sal_Bool hasHiddenControlModelsFormat( const DataFlavorExVector& _rFormats ); protected: - virtual sal_Bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); + virtual bool GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ); virtual void AddSupportedFormats(); }; diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 4c1391317a47..a36e8173f426 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -49,8 +49,8 @@ private: 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 ); public: @@ -67,14 +67,14 @@ void SvxColorValueSetData::AddSupportedFormats() -sal_Bool SvxColorValueSetData::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) +bool SvxColorValueSetData::GetData( const ::com::sun::star::datatransfer::DataFlavor& rFlavor ) { - sal_Bool bRet = sal_False; + bool bRet = false; if( SotExchange::GetFormat( rFlavor ) == SOT_FORMATSTR_ID_XFA ) { SetObject( &maData, 0, rFlavor ); - bRet = sal_True; + bRet = true; } return bRet; @@ -82,7 +82,7 @@ sal_Bool SvxColorValueSetData::GetData( const ::com::sun::star::datatransfer::Da -sal_Bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*, sal_uInt32 , const ::com::sun::star::datatransfer::DataFlavor& ) +bool SvxColorValueSetData::WriteObject( SotStorageStreamRef& rxOStm, void*, sal_uInt32 , const ::com::sun::star::datatransfer::DataFlavor& ) { WriteXFillExchangeData( *rxOStm, maData ); return( rxOStm->GetError() == ERRCODE_NONE ); 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 ); |