diff options
Diffstat (limited to 'vcl/inc')
172 files changed, 5203 insertions, 5017 deletions
diff --git a/vcl/inc/cupsmgr.hxx b/vcl/inc/cupsmgr.hxx index 295f479d5cb8..b76e8ef99289 100644 --- a/vcl/inc/cupsmgr.hxx +++ b/vcl/inc/cupsmgr.hxx @@ -71,7 +71,7 @@ class CUPSManager : public PrinterInfoManager virtual void initialize(); - void getOptionsFromDocumentSetup( const JobData& rJob, int& rNumOptions, void** rOptions ) const; + void getOptionsFromDocumentSetup( const JobData& rJob, bool bBanner, int& rNumOptions, void** rOptions ) const; void runDests(); public: // public for stub @@ -85,7 +85,7 @@ public: const char* authenticateUser( const char* ); virtual FILE* startSpool( const rtl::OUString& rPrinterName, bool bQuickCommand ); - virtual int endSpool( const rtl::OUString& rPrinterName, const rtl::OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData ); + virtual int endSpool( const rtl::OUString& rPrinterName, const rtl::OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); virtual void setupJobContextData( JobData& rData ); // changes the info about a named printer diff --git a/vcl/inc/vcl/abstdlg.hxx b/vcl/inc/vcl/abstdlg.hxx index 3e2ef6554079..012981fba7cf 100644 --- a/vcl/inc/vcl/abstdlg.hxx +++ b/vcl/inc/vcl/abstdlg.hxx @@ -42,7 +42,7 @@ class VCL_DLLPUBLIC VclAbstractDialog { public: virtual short Execute() = 0; - //virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ) = 0; + //virtual void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 ) = 0; virtual ~VclAbstractDialog(); }; diff --git a/vcl/inc/vcl/accel.h b/vcl/inc/vcl/accel.h index aec7e7c1bbd2..bf3006c9ca7b 100644 --- a/vcl/inc/vcl/accel.h +++ b/vcl/inc/vcl/accel.h @@ -43,11 +43,11 @@ class Accelerator; class ImplAccelEntry { public: - USHORT mnId; + sal_uInt16 mnId; KeyCode maKeyCode; Accelerator* mpAccel; Accelerator* mpAutoAccel; - BOOL mbEnabled; + sal_Bool mbEnabled; }; // ----------------- @@ -55,7 +55,7 @@ public: // ----------------- // in KEYCOD.CXX -void ImplGetKeyCode( KeyFuncType eFunc, USHORT& rCode1, USHORT& rCode2, USHORT& rCode3, USHORT& rCode4 ); +void ImplGetKeyCode( KeyFuncType eFunc, sal_uInt16& rCode1, sal_uInt16& rCode2, sal_uInt16& rCode3, sal_uInt16& rCode4 ); #endif // _SV_ACCEL_H diff --git a/vcl/inc/vcl/accel.hxx b/vcl/inc/vcl/accel.hxx index 8c5ee6dfeb68..a7bf623cb20a 100644 --- a/vcl/inc/vcl/accel.hxx +++ b/vcl/inc/vcl/accel.hxx @@ -55,16 +55,16 @@ private: // Werden vom AcceleratorManager gesetzt KeyCode maCurKeyCode; - USHORT mnCurId; - USHORT mnCurRepeat; - BOOL mbIsCancel; - BOOL* mpDel; + sal_uInt16 mnCurId; + sal_uInt16 mnCurRepeat; + sal_Bool mbIsCancel; + sal_Bool* mpDel; SAL_DLLPRIVATE void ImplInit(); SAL_DLLPRIVATE void ImplCopyData( ImplAccelData& rAccelData ); SAL_DLLPRIVATE void ImplDeleteData(); - SAL_DLLPRIVATE void ImplInsertAccel( USHORT nItemId, const KeyCode& rKeyCode, - BOOL bEnable, Accelerator* pAutoAccel ); + SAL_DLLPRIVATE void ImplInsertAccel( sal_uInt16 nItemId, const KeyCode& rKeyCode, + sal_Bool bEnable, Accelerator* pAutoAccel ); SAL_DLLPRIVATE ImplAccelEntry* ImplGetAccelData( const KeyCode& rKeyCode ) const; @@ -81,35 +81,35 @@ public: virtual void Deactivate(); virtual void Select(); - void InsertItem( USHORT nItemId, const KeyCode& rKeyCode ); + void InsertItem( sal_uInt16 nItemId, const KeyCode& rKeyCode ); void InsertItem( const ResId& rResId ); - void RemoveItem( USHORT nItemId ); + void RemoveItem( sal_uInt16 nItemId ); void RemoveItem( const KeyCode rKeyCode ); void Clear(); - USHORT GetCurItemId() const { return mnCurId; } + sal_uInt16 GetCurItemId() const { return mnCurId; } const KeyCode& GetCurKeyCode() const { return maCurKeyCode; } - USHORT GetCurRepeat() const { return mnCurRepeat; } - BOOL IsCancel() const { return mbIsCancel; } - - USHORT GetItemCount() const; - USHORT GetItemId( USHORT nPos ) const; - KeyCode GetItemKeyCode( USHORT nPos ) const; - USHORT GetItemId( const KeyCode& rKeyCode ) const; - KeyCode GetKeyCode( USHORT nItemId ) const; - BOOL IsIdValid( USHORT nItemId ) const; - BOOL IsKeyCodeValid( const KeyCode rKeyCode ) const; - BOOL Call( const KeyCode& rKeyCode, USHORT nRepeat = 0 ); - - void SetAccel( USHORT nItemId, Accelerator* pAccel ); - Accelerator* GetAccel( USHORT nItemId ) const; + sal_uInt16 GetCurRepeat() const { return mnCurRepeat; } + sal_Bool IsCancel() const { return mbIsCancel; } + + sal_uInt16 GetItemCount() const; + sal_uInt16 GetItemId( sal_uInt16 nPos ) const; + KeyCode GetItemKeyCode( sal_uInt16 nPos ) const; + sal_uInt16 GetItemId( const KeyCode& rKeyCode ) const; + KeyCode GetKeyCode( sal_uInt16 nItemId ) const; + sal_Bool IsIdValid( sal_uInt16 nItemId ) const; + sal_Bool IsKeyCodeValid( const KeyCode rKeyCode ) const; + sal_Bool Call( const KeyCode& rKeyCode, sal_uInt16 nRepeat = 0 ); + + void SetAccel( sal_uInt16 nItemId, Accelerator* pAccel ); + Accelerator* GetAccel( sal_uInt16 nItemId ) const; void SetAccel( const KeyCode rKeyCode, Accelerator* pAccel ); Accelerator* GetAccel( const KeyCode rKeyCode ) const; - void EnableItem( USHORT nItemId, BOOL bEnable = TRUE ); - BOOL IsItemEnabled( USHORT nItemId ) const; - void EnableItem( const KeyCode rKeyCode, BOOL bEnable = TRUE ); - BOOL IsItemEnabled( const KeyCode rKeyCode ) const; + void EnableItem( sal_uInt16 nItemId, sal_Bool bEnable = sal_True ); + sal_Bool IsItemEnabled( sal_uInt16 nItemId ) const; + void EnableItem( const KeyCode rKeyCode, sal_Bool bEnable = sal_True ); + sal_Bool IsItemEnabled( const KeyCode rKeyCode ) const; void SetHelpText( const XubString& rHelpText ) { maHelpStr = rHelpText; } const XubString& GetHelpText() const { return maHelpStr; } diff --git a/vcl/inc/vcl/accmgr.hxx b/vcl/inc/vcl/accmgr.hxx index 5b9880532b98..2ffa2b366920 100644 --- a/vcl/inc/vcl/accmgr.hxx +++ b/vcl/inc/vcl/accmgr.hxx @@ -55,13 +55,13 @@ public: } ~ImplAccelManager(); - BOOL InsertAccel( Accelerator* pAccel ); + sal_Bool InsertAccel( Accelerator* pAccel ); void RemoveAccel( Accelerator* pAccel ); - void EndSequence( BOOL bCancel = FALSE ); - void FlushAccel() { EndSequence( TRUE ); } + void EndSequence( sal_Bool bCancel = sal_False ); + void FlushAccel() { EndSequence( sal_True ); } - BOOL IsAccelKey( const KeyCode& rKeyCode, USHORT nRepeat ); + sal_Bool IsAccelKey( const KeyCode& rKeyCode, sal_uInt16 nRepeat ); }; #endif // _SV_ACCMGR_HXX diff --git a/vcl/inc/vcl/alpha.hxx b/vcl/inc/vcl/alpha.hxx index a31e68832ba1..8bcaf3789528 100644 --- a/vcl/inc/vcl/alpha.hxx +++ b/vcl/inc/vcl/alpha.hxx @@ -55,14 +55,14 @@ public: AlphaMask(); AlphaMask( const Bitmap& rBitmap ); AlphaMask( const AlphaMask& rAlphaMask ); - AlphaMask( const Size& rSizePixel, BYTE* pEraseTransparency = NULL ); + AlphaMask( const Size& rSizePixel, sal_uInt8* pEraseTransparency = NULL ); ~AlphaMask(); AlphaMask& operator=( const Bitmap& rBitmap ); AlphaMask& operator=( const AlphaMask& rAlphaMask ) { return (AlphaMask&) Bitmap::operator=( rAlphaMask ); } - BOOL operator!() const { return Bitmap::operator!(); } - BOOL operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); } - BOOL operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); } + sal_Bool operator!() const { return Bitmap::operator!(); } + sal_Bool operator==( const AlphaMask& rAlphaMask ) const { return Bitmap::operator==( rAlphaMask ); } + sal_Bool operator!=( const AlphaMask& rAlphaMask ) const { return Bitmap::operator!=( rAlphaMask ); } const MapMode& GetPrefMapMode() const { return Bitmap::GetPrefMapMode(); } void SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); } @@ -73,26 +73,26 @@ public: Size GetSizePixel() const { return Bitmap::GetSizePixel(); } void SetSizePixel( const Size& rNewSize ) { Bitmap::SetSizePixel( rNewSize ); } - ULONG GetSizeBytes() const { return Bitmap::GetSizeBytes(); } - ULONG GetChecksum() const { return Bitmap::GetChecksum(); } + sal_uLong GetSizeBytes() const { return Bitmap::GetSizeBytes(); } + sal_uLong GetChecksum() const { return Bitmap::GetChecksum(); } Bitmap GetBitmap() const; public: - BOOL Crop( const Rectangle& rRectPixel ); - BOOL Expand( ULONG nDX, ULONG nDY, BYTE* pInitTransparency = NULL ); - BOOL CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const AlphaMask* pAlphaSrc = NULL ); - BOOL Erase( BYTE cTransparency ); - BOOL Invert(); - BOOL Mirror( ULONG nMirrorFlags ); - BOOL Scale( const Size& rNewSize, ULONG nScaleFlag = BMP_SCALE_FAST ); - BOOL Scale( const double& rScaleX, const double& rScaleY, ULONG nScaleFlag = BMP_SCALE_FAST ); - BOOL Rotate( long nAngle10, BYTE cFillTransparency ); - BOOL Replace( const Bitmap& rMask, BYTE rReplaceTransparency ); - BOOL Replace( BYTE cSearchTransparency, BYTE cReplaceTransparency, ULONG nTol = 0UL ); - BOOL Replace( BYTE* pSearchTransparencies, BYTE* pReplaceTransparencies, - ULONG nColorCount, ULONG* pTols = NULL ); + sal_Bool Crop( const Rectangle& rRectPixel ); + sal_Bool Expand( sal_uLong nDX, sal_uLong nDY, sal_uInt8* pInitTransparency = NULL ); + sal_Bool CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const AlphaMask* pAlphaSrc = NULL ); + sal_Bool Erase( sal_uInt8 cTransparency ); + sal_Bool Invert(); + sal_Bool Mirror( sal_uLong nMirrorFlags ); + sal_Bool Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_FAST ); + sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag = BMP_SCALE_FAST ); + sal_Bool Rotate( long nAngle10, sal_uInt8 cFillTransparency ); + sal_Bool Replace( const Bitmap& rMask, sal_uInt8 rReplaceTransparency ); + sal_Bool Replace( sal_uInt8 cSearchTransparency, sal_uInt8 cReplaceTransparency, sal_uLong nTol = 0UL ); + sal_Bool Replace( sal_uInt8* pSearchTransparencies, sal_uInt8* pReplaceTransparencies, + sal_uLong nColorCount, sal_uLong* pTols = NULL ); public: @@ -102,8 +102,8 @@ public: public: - BOOL Read( SvStream& rIStm, BOOL bFileHeader = TRUE ) { return Bitmap::Read( rIStm, bFileHeader ); } - BOOL Write( SvStream& rOStm, BOOL bCompressed = TRUE, BOOL bFileHeader = TRUE ) const { return Bitmap::Write( rOStm, bCompressed, bFileHeader ); } + sal_Bool Read( SvStream& rIStm, sal_Bool bFileHeader = sal_True ) { return Bitmap::Read( rIStm, bFileHeader ); } + sal_Bool Write( SvStream& rOStm, sal_Bool bCompressed = sal_True, sal_Bool bFileHeader = sal_True ) const { return Bitmap::Write( rOStm, bCompressed, bFileHeader ); } friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx ); friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx ); diff --git a/vcl/inc/vcl/animate.hxx b/vcl/inc/vcl/animate.hxx index 5a9b1b6dfc4f..e53a51e0e932 100644 --- a/vcl/inc/vcl/animate.hxx +++ b/vcl/inc/vcl/animate.hxx @@ -71,7 +71,7 @@ struct VCL_DLLPUBLIC AnimationBitmap Size aSizePix; long nWait; Disposal eDisposal; - BOOL bUserInput; + sal_Bool bUserInput; AnimationBitmap() {} AnimationBitmap( const BitmapEx& rBmpEx, const Point& rPosPix, @@ -82,9 +82,9 @@ struct VCL_DLLPUBLIC AnimationBitmap aSizePix ( rSizePix ), nWait ( _nWait ), eDisposal ( _eDisposal ), - bUserInput ( FALSE ) {} + bUserInput ( sal_False ) {} - BOOL operator==( const AnimationBitmap& rAnimBmp ) const + sal_Bool operator==( const AnimationBitmap& rAnimBmp ) const { return( rAnimBmp.aBmpEx == aBmpEx && rAnimBmp.aPosPix == aPosPix && @@ -94,9 +94,9 @@ struct VCL_DLLPUBLIC AnimationBitmap rAnimBmp.bUserInput == bUserInput ); } - BOOL operator!=( const AnimationBitmap& rAnimBmp ) const { return !( *this == rAnimBmp ); } + sal_Bool operator!=( const AnimationBitmap& rAnimBmp ) const { return !( *this == rAnimBmp ); } - BOOL IsEqual( const AnimationBitmap& rAnimBmp ) const + sal_Bool IsEqual( const AnimationBitmap& rAnimBmp ) const { return( rAnimBmp.aPosPix == aPosPix && rAnimBmp.aSizePix == aSizePix && @@ -106,7 +106,7 @@ struct VCL_DLLPUBLIC AnimationBitmap rAnimBmp.aBmpEx.IsEqual( aBmpEx ) ); } - ULONG GetChecksum() const; + sal_uLong GetChecksum() const; }; // ------------------- @@ -125,14 +125,14 @@ struct AInfo OutputDevice* pOutDev; void* pViewData; long nExtraData; - BOOL bWithSize; - BOOL bPause; + sal_Bool bWithSize; + sal_Bool bPause; AInfo() : pOutDev( NULL ), pViewData( NULL ), nExtraData( 0L ), - bWithSize( FALSE ), - bPause( FALSE ) {} + bWithSize( sal_False ), + bPause( sal_False ) {} }; // ------------------- @@ -141,7 +141,7 @@ struct AInfo class VCL_DLLPUBLIC Animation { - SAL_DLLPRIVATE static ULONG mnAnimCount; + SAL_DLLPRIVATE static sal_uLong mnAnimCount; List maList; List maAInfoList; @@ -156,21 +156,21 @@ class VCL_DLLPUBLIC Animation long mnPos; Disposal meLastDisposal; CycleMode meCycleMode; - BOOL mbFirst; - BOOL mbIsInAnimation; - BOOL mbWithSize; - BOOL mbLoopTerminated; - BOOL mbIsWaiting; + sal_Bool mbFirst; + sal_Bool mbIsInAnimation; + sal_Bool mbWithSize; + sal_Bool mbLoopTerminated; + sal_Bool mbIsWaiting; - SAL_DLLPRIVATE void ImplRestartTimer( ULONG nTimeout ); + SAL_DLLPRIVATE void ImplRestartTimer( sal_uLong nTimeout ); DECL_DLLPRIVATE_LINK( ImplTimeoutHdl, Timer* ); public: SAL_DLLPRIVATE static void ImplIncAnimCount() { mnAnimCount++; } SAL_DLLPRIVATE static void ImplDecAnimCount() { mnAnimCount--; } - SAL_DLLPRIVATE ULONG ImplGetCurPos() const { return mnPos; } + SAL_DLLPRIVATE sal_uLong ImplGetCurPos() const { return mnPos; } public: @@ -179,28 +179,28 @@ public: ~Animation(); Animation& operator=( const Animation& rAnimation ); - BOOL operator==( const Animation& rAnimation ) const; - BOOL operator!=( const Animation& rAnimation ) const { return !(*this==rAnimation); } + sal_Bool operator==( const Animation& rAnimation ) const; + sal_Bool operator!=( const Animation& rAnimation ) const { return !(*this==rAnimation); } - BOOL IsEqual( const Animation& rAnimation ) const; + sal_Bool IsEqual( const Animation& rAnimation ) const; - BOOL IsEmpty() const; + sal_Bool IsEmpty() const; void SetEmpty(); void Clear(); - BOOL Start( OutputDevice* pOutDev, const Point& rDestPt, long nExtraData = 0, + sal_Bool Start( OutputDevice* pOutDev, const Point& rDestPt, long nExtraData = 0, OutputDevice* pFirstFrameOutDev = NULL ); - BOOL Start( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz, long nExtraData = 0, + sal_Bool Start( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz, long nExtraData = 0, OutputDevice* pFirstFrameOutDev = NULL ); void Stop( OutputDevice* pOutDev = NULL, long nExtraData = 0 ); void Draw( OutputDevice* pOutDev, const Point& rDestPt ) const; void Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSz ) const; - BOOL IsInAnimation() const { return mbIsInAnimation; } - BOOL IsTransparent() const; - BOOL IsTerminated() const { return mbLoopTerminated; } + sal_Bool IsInAnimation() const { return mbIsInAnimation; } + sal_Bool IsTransparent() const; + sal_Bool IsTerminated() const { return mbLoopTerminated; } const Size& GetDisplaySizePixel() const { return maGlobalSize; } void SetDisplaySizePixel( const Size& rSize ) { maGlobalSize = rSize; } @@ -208,8 +208,8 @@ public: const BitmapEx& GetBitmapEx() const { return maBitmapEx; } void SetBitmapEx( const BitmapEx& rBmpEx ) { maBitmapEx = rBmpEx; } - ULONG GetLoopCount() const { return mnLoopCount; } - void SetLoopCount( const ULONG nLoopCount ); + sal_uLong GetLoopCount() const { return mnLoopCount; } + void SetLoopCount( const sal_uLong nLoopCount ); void ResetLoopCount(); void SetCycleMode( CycleMode eMode ); @@ -218,31 +218,31 @@ public: void SetNotifyHdl( const Link& rLink ) { maNotifyLink = rLink; } const Link& GetNotifyHdl() const { return maNotifyLink; } - USHORT Count() const { return (USHORT) maList.Count(); } - BOOL Insert( const AnimationBitmap& rAnimationBitmap ); - const AnimationBitmap& Get( USHORT nAnimation ) const; - void Replace( const AnimationBitmap& rNewAnimationBmp, USHORT nAnimation ); + sal_uInt16 Count() const { return (sal_uInt16) maList.Count(); } + sal_Bool Insert( const AnimationBitmap& rAnimationBitmap ); + const AnimationBitmap& Get( sal_uInt16 nAnimation ) const; + void Replace( const AnimationBitmap& rNewAnimationBmp, sal_uInt16 nAnimation ); List* GetAInfoList() { return &maAInfoList; } - ULONG GetSizeBytes() const; - ULONG GetChecksum() const; + sal_uLong GetSizeBytes() const; + sal_uLong GetChecksum() const; public: - BOOL Convert( BmpConversion eConversion ); - BOOL ReduceColors( USHORT nNewColorCount, + sal_Bool Convert( BmpConversion eConversion ); + sal_Bool ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce = BMP_REDUCE_SIMPLE ); - BOOL Invert(); - BOOL Mirror( ULONG nMirrorFlags ); - BOOL Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX ); - BOOL Adjust( short nLuminancePercent = 0, + sal_Bool Invert(); + sal_Bool Mirror( sal_uLong nMirrorFlags ); + sal_Bool Dither( sal_uLong nDitherFlags = BMP_DITHER_MATRIX ); + sal_Bool Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, short nChannelRPercent = 0, short nChannelGPercent = 0, short nChannelBPercent = 0, double fGamma = 1.0, - BOOL bInvert = FALSE ); - BOOL Filter( BmpFilter eFilter, + sal_Bool bInvert = sal_False ); + sal_Bool Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, const Link* pProgress = NULL ); diff --git a/vcl/inc/vcl/apptypes.hxx b/vcl/inc/vcl/apptypes.hxx index eba7f779ee81..42273f6a292c 100644 --- a/vcl/inc/vcl/apptypes.hxx +++ b/vcl/inc/vcl/apptypes.hxx @@ -37,14 +37,14 @@ // - Application-Types - // --------------------- -#define EXC_RSCNOTLOADED ((USHORT)0x0100) -#define EXC_SYSOBJNOTCREATED ((USHORT)0x0200) -#define EXC_SYSTEM ((USHORT)0x0300) -#define EXC_DISPLAY ((USHORT)0x0400) -#define EXC_REMOTE ((USHORT)0x0500) -#define EXC_USER ((USHORT)0x1000) -#define EXC_MAJORTYPE ((USHORT)0xFF00) -#define EXC_MINORTYPE ((USHORT)0x00FF) +#define EXC_RSCNOTLOADED ((sal_uInt16)0x0100) +#define EXC_SYSOBJNOTCREATED ((sal_uInt16)0x0200) +#define EXC_SYSTEM ((sal_uInt16)0x0300) +#define EXC_DISPLAY ((sal_uInt16)0x0400) +#define EXC_REMOTE ((sal_uInt16)0x0500) +#define EXC_USER ((sal_uInt16)0x1000) +#define EXC_MAJORTYPE ((sal_uInt16)0xFF00) +#define EXC_MINORTYPE ((sal_uInt16)0x00FF) #define UNIQUEID_SV_BEGIN 64000 @@ -72,10 +72,10 @@ public: // - UserActive - // -------------- -#define USERACTIVE_MOUSEDRAG ((USHORT)0x0001) -#define USERACTIVE_INPUT ((USHORT)0x0002) -#define USERACTIVE_MODALDIALOG ((USHORT)0x0004) -#define USERACTIVE_ALL ((USHORT)0xFFFF) +#define USERACTIVE_MOUSEDRAG ((sal_uInt16)0x0001) +#define USERACTIVE_INPUT ((sal_uInt16)0x0002) +#define USERACTIVE_MODALDIALOG ((sal_uInt16)0x0004) +#define USERACTIVE_ALL ((sal_uInt16)0xFFFF) #endif // _VCL_APPTYPES_HXX diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx index 45433f4f351e..5568cc3b05d8 100644 --- a/vcl/inc/vcl/arrange.hxx +++ b/vcl/inc/vcl/arrange.hxx @@ -49,7 +49,7 @@ namespace vcl or a child WindowArranger (a node in the hierarchy), but never both */ - class WindowArranger + class VCL_DLLPUBLIC WindowArranger { protected: struct Element @@ -77,11 +77,13 @@ namespace vcl Element( Window* i_pWin, boost::shared_ptr<WindowArranger> const & i_pChild = boost::shared_ptr<WindowArranger>(), - sal_Int32 i_nExpandPriority = 0 + sal_Int32 i_nExpandPriority = 0, + const Size& i_rMinSize = Size() ) : m_pElement( i_pWin ) , m_pChild( i_pChild ) , m_nExpandPriority( i_nExpandPriority ) + , m_aMinSize( i_rMinSize ) , m_bHidden( false ) , m_nLeftBorder( 0 ) , m_nTopBorder( 0 ) @@ -102,12 +104,19 @@ namespace vcl Rectangle m_aManagedArea; long m_nOuterBorder; + rtl::OUString m_aIdentifier; + virtual Element* getElement( size_t i_nIndex ) = 0; const Element* getConstElement( size_t i_nIndex ) const { return const_cast<WindowArranger*>(this)->getElement( i_nIndex ); } public: + static long getDefaultBorder(); + + static long getBorderValue( long nBorder ) + { return nBorder >= 0 ? nBorder : -nBorder * getDefaultBorder(); } + WindowArranger( WindowArranger* i_pParent = NULL ) : m_pParentWindow( i_pParent ? i_pParent->m_pParentWindow : NULL ) , m_pParentArranger( i_pParent ) @@ -142,6 +151,9 @@ namespace vcl virtual bool isVisible() const; // true if any element is visible + virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getProperties() const; + virtual void setProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& ); + sal_Int32 getExpandPriority( size_t i_nIndex ) const { const Element* pEle = getConstElement( i_nIndex ); @@ -174,6 +186,19 @@ namespace vcl } } + void getBorders( size_t i_nIndex, long* i_pLeft = NULL, long* i_pTop = NULL, long* i_pRight = NULL, long* i_pBottom = NULL ) const + { + const Element* pEle = getConstElement( i_nIndex ); + if( pEle ) + { + if( i_pLeft ) *i_pLeft = pEle->m_nLeftBorder; + if( i_pTop ) *i_pTop = pEle->m_nTopBorder; + if( i_pRight ) *i_pRight = pEle->m_nRightBorder; + if( i_pBottom ) *i_pBottom = pEle->m_nBottomBorder; + } + } + + void show( bool i_bShow = true, bool i_bImmediateUpdate = true ); void setManagedArea( const Rectangle& i_rArea ) @@ -188,9 +213,15 @@ namespace vcl m_nOuterBorder = i_nBorder; resize(); } + + const rtl::OUString getIdentifier() const + { return m_aIdentifier; } + + void setIdentifier( const rtl::OUString& i_rId ) + { m_aIdentifier = i_rId; } }; - class RowOrColumn : public WindowArranger + class VCL_DLLPUBLIC RowOrColumn : public WindowArranger { long m_nBorderWidth; bool m_bColumn; @@ -205,7 +236,7 @@ namespace vcl public: RowOrColumn( WindowArranger* i_pParent = NULL, - bool bColumn = true, long i_nBorderWidth = 5 ) + bool bColumn = true, long i_nBorderWidth = -1 ) : WindowArranger( i_pParent ) , m_nBorderWidth( i_nBorderWidth ) , m_bColumn( bColumn ) @@ -219,7 +250,7 @@ namespace vcl // add a managed window at the given index // an index smaller than zero means add the window at the end - size_t addWindow( Window*, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 ); + size_t addWindow( Window*, sal_Int32 i_nExpandPrio = 0, const Size& i_rMinSize = Size(), size_t i_nIndex = ~0 ); void remove( Window* ); size_t addChild( boost::shared_ptr<WindowArranger> const &, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 ); @@ -231,7 +262,7 @@ namespace vcl long getBorderWidth() const { return m_nBorderWidth; } }; - class LabeledElement : public WindowArranger + class VCL_DLLPUBLIC LabeledElement : public WindowArranger { WindowArranger::Element m_aLabel; WindowArranger::Element m_aElement; @@ -249,7 +280,7 @@ namespace vcl } public: - LabeledElement( WindowArranger* i_pParent = NULL, int i_nLabelStyle = 0, long i_nDistance = 5 ) + LabeledElement( WindowArranger* i_pParent = NULL, int i_nLabelStyle = 0, long i_nDistance = -1 ) : WindowArranger( i_pParent ) , m_nDistance( i_nDistance ) , m_nLabelColumnWidth( 0 ) @@ -275,11 +306,11 @@ namespace vcl { return m_aElement.getOptimalSize( i_eType ); } }; - class LabelColumn : public RowOrColumn + class VCL_DLLPUBLIC LabelColumn : public RowOrColumn { long getLabelWidth() const; public: - LabelColumn( WindowArranger* i_pParent = NULL, long i_nBorderWidth = 5 ) + LabelColumn( WindowArranger* i_pParent = NULL, long i_nBorderWidth = -1 ) : RowOrColumn( i_pParent, true, i_nBorderWidth ) {} virtual ~LabelColumn(); @@ -289,10 +320,10 @@ namespace vcl // returns the index of the added label size_t addRow( Window* i_pLabel, boost::shared_ptr<WindowArranger> const& i_rElement, long i_nIndent = 0 ); - size_t addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent = 0 ); + size_t addRow( Window* i_pLabel, Window* i_pElement, long i_nIndent = 0, const Size& i_rElementMinSize = Size() ); }; - class Indenter : public WindowArranger + class VCL_DLLPUBLIC Indenter : public WindowArranger { long m_nIndent; WindowArranger::Element m_aElement; @@ -302,7 +333,7 @@ namespace vcl { return i_nIndex == 0 ? &m_aElement : NULL; } public: - Indenter( WindowArranger* i_pParent = NULL, long i_nIndent = 15 ) + Indenter( WindowArranger* i_pParent = NULL, long i_nIndent = 3*getDefaultBorder() ) : WindowArranger( i_pParent ) , m_nIndent( i_nIndent ) {} @@ -326,7 +357,7 @@ namespace vcl { setChild( boost::shared_ptr<WindowArranger>( i_pChild ), i_nExpandPrio ); } }; - class Spacer : public WindowArranger + class VCL_DLLPUBLIC Spacer : public WindowArranger { WindowArranger::Element m_aElement; Size m_aSize; @@ -352,7 +383,7 @@ namespace vcl virtual bool isVisible() const { return true; } }; - class MatrixArranger : public WindowArranger + class VCL_DLLPUBLIC MatrixArranger : public WindowArranger { long m_nBorderX; long m_nBorderY; @@ -371,9 +402,10 @@ namespace vcl MatrixElement( Window* i_pWin, sal_uInt32 i_nX, sal_uInt32 i_nY, boost::shared_ptr<WindowArranger> const & i_pChild = boost::shared_ptr<WindowArranger>(), - sal_Int32 i_nExpandPriority = 0 + sal_Int32 i_nExpandPriority = 0, + const Size& i_rMinSize = Size() ) - : WindowArranger::Element( i_pWin, i_pChild, i_nExpandPriority ) + : WindowArranger::Element( i_pWin, i_pChild, i_nExpandPriority, i_rMinSize ) , m_nX( i_nX ) , m_nY( i_nY ) { @@ -386,15 +418,20 @@ namespace vcl sal_uInt64 getMap( sal_uInt32 i_nX, sal_uInt32 i_nY ) { return static_cast< sal_uInt64 >(i_nX) | (static_cast< sal_uInt64>(i_nY) << 32 ); } - Size getOptimalSize( WindowSizeType, std::vector<long>& o_rColumnWidths, std::vector<long>& o_rRowHeights ) const; + static void distributeExtraSize( std::vector<long>& io_rSizes, const std::vector<sal_Int32>& i_rPrios, long i_nExtraWidth ); + + Size getOptimalSize( WindowSizeType, + std::vector<long>& o_rColumnWidths, std::vector<long>& o_rRowHeights, + std::vector<sal_Int32>& o_rColumnPrio, std::vector<sal_Int32>& o_rRowPrio + ) const; protected: virtual Element* getElement( size_t i_nIndex ) { return i_nIndex < m_aElements.size() ? &m_aElements[ i_nIndex ] : 0; } public: MatrixArranger( WindowArranger* i_pParent = NULL, - long i_nBorderX = 5, - long i_nBorderY = 5 ) + long i_nBorderX = -1, + long i_nBorderY = -1 ) : WindowArranger( i_pParent ) , m_nBorderX( i_nBorderX ) , m_nBorderY( i_nBorderY ) @@ -407,7 +444,7 @@ namespace vcl virtual size_t countElements() const { return m_aElements.size(); } // add a managed window at the given matrix position - size_t addWindow( Window*, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0 ); + size_t addWindow( Window*, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0, const Size& i_rMinSize = Size() ); void remove( Window* ); size_t addChild( boost::shared_ptr<WindowArranger> const &, sal_uInt32 i_nX, sal_uInt32 i_nY, sal_Int32 i_nExpandPrio = 0 ); diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index 6127dca70510..d514977fda38 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -157,27 +157,27 @@ class VCL_DLLPUBLIC BmpFilterParam private: BmpFilter meFilter; - ULONG mnProgressStart; - ULONG mnProgressEnd; + sal_uLong mnProgressStart; + sal_uLong mnProgressEnd; public: struct MosaicTileSize { - ULONG mnTileWidth; - ULONG mnTileHeight; + sal_uLong mnTileWidth; + sal_uLong mnTileHeight; }; struct EmbossAngles { - USHORT mnAzimuthAngle100; - USHORT mnElevationAngle100; + sal_uInt16 mnAzimuthAngle100; + sal_uInt16 mnElevationAngle100; }; private: union { - USHORT mnSepiaPercent; - BYTE mcSolarGreyThreshold; + sal_uInt16 mnSepiaPercent; + sal_uInt8 mcSolarGreyThreshold; MosaicTileSize maMosaicTileSize; EmbossAngles maEmbossAngles; @@ -185,25 +185,25 @@ private: public: - BmpFilterParam( ULONG nProgressStart = 0, ULONG nProgressEnd = 0 ) : + BmpFilterParam( sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) : meFilter( BMP_FILTER_UNKNOWN ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ) {} - BmpFilterParam( BYTE cSolarGreyThreshold, ULONG nProgressStart = 0, ULONG nProgressEnd = 0 ) : + BmpFilterParam( sal_uInt8 cSolarGreyThreshold, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) : meFilter( BMP_FILTER_SOLARIZE ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ), mcSolarGreyThreshold( cSolarGreyThreshold ) {} - BmpFilterParam( USHORT nSepiaPercent, ULONG nProgressStart = 0, ULONG nProgressEnd = 0 ) : + BmpFilterParam( sal_uInt16 nSepiaPercent, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) : meFilter( BMP_FILTER_SEPIA ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ), mnSepiaPercent( nSepiaPercent ) {} - BmpFilterParam( const Size& rMosaicTileSize, ULONG nProgressStart = 0, ULONG nProgressEnd = 0 ) : + BmpFilterParam( const Size& rMosaicTileSize, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) : meFilter( BMP_FILTER_MOSAIC ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ) { maMosaicTileSize.mnTileWidth = rMosaicTileSize.Width(); maMosaicTileSize.mnTileHeight= rMosaicTileSize.Height(); } - BmpFilterParam( USHORT nEmbossAzimuthAngle100, USHORT nEmbossElevationAngle100, - ULONG nProgressStart = 0, ULONG nProgressEnd = 0 ) : + BmpFilterParam( sal_uInt16 nEmbossAzimuthAngle100, sal_uInt16 nEmbossElevationAngle100, + sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) : meFilter( BMP_FILTER_EMBOSS_GREY ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ) { maEmbossAngles.mnAzimuthAngle100 = nEmbossAzimuthAngle100; @@ -259,65 +259,65 @@ public: SAL_DLLPRIVATE void ImplSetImpBitmap( ImpBitmap* pImpBmp ); SAL_DLLPRIVATE void ImplAssignWithSize( const Bitmap& rBitmap ); - SAL_DLLPRIVATE static BOOL ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, ULONG nOffset, BOOL bMSOFormat=FALSE ); - SAL_DLLPRIVATE static BOOL ImplReadDIBFileHeader( SvStream& rIStm, ULONG& rOffset ); - SAL_DLLPRIVATE static BOOL ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown, BOOL bMSOFormat = FALSE ); - SAL_DLLPRIVATE static BOOL ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, BOOL bQuad ); - SAL_DLLPRIVATE static BOOL ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bTopDown ); - SAL_DLLPRIVATE BOOL ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bCompressed ) const; - SAL_DLLPRIVATE static BOOL ImplWriteDIBFileHeader( SvStream& rOStm, BitmapReadAccess& rAcc ); - SAL_DLLPRIVATE static BOOL ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc ); - SAL_DLLPRIVATE static BOOL ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc, - ULONG nCompression, sal_uInt32& rImageSize ); - SAL_DLLPRIVATE static void ImplDecodeRLE( BYTE* pBuffer, DIBInfoHeader& rHeader, - BitmapWriteAccess& rAcc, BOOL bRLE4 ); - SAL_DLLPRIVATE static BOOL ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, BOOL bRLE4 ); - - SAL_DLLPRIVATE BOOL ImplScaleFast( const double& rScaleX, const double& rScaleY ); - SAL_DLLPRIVATE BOOL ImplScaleInterpolate( const double& rScaleX, const double& rScaleY ); - SAL_DLLPRIVATE BOOL ImplMakeMono( BYTE cThreshold ); - SAL_DLLPRIVATE BOOL ImplMakeMonoDither(); - SAL_DLLPRIVATE BOOL ImplMakeGreyscales( USHORT nGreyscales ); - SAL_DLLPRIVATE BOOL ImplConvertUp( USHORT nBitCount, Color* pExtColor = NULL ); - SAL_DLLPRIVATE BOOL ImplConvertDown( USHORT nBitCount, Color* pExtColor = NULL ); - SAL_DLLPRIVATE BOOL ImplConvertGhosted(); - SAL_DLLPRIVATE BOOL ImplDitherMatrix(); - SAL_DLLPRIVATE BOOL ImplDitherFloyd(); - SAL_DLLPRIVATE BOOL ImplDitherFloyd16(); - SAL_DLLPRIVATE BOOL ImplReduceSimple( USHORT nColorCount ); - SAL_DLLPRIVATE BOOL ImplReducePopular( USHORT nColorCount ); - SAL_DLLPRIVATE BOOL ImplReduceMedian( USHORT nColorCount ); - SAL_DLLPRIVATE void ImplMedianCut( ULONG* pColBuf, BitmapPalette& rPal, + SAL_DLLPRIVATE static sal_Bool ImplReadDIB( SvStream& rIStm, Bitmap& rBmp, sal_uLong nOffset, sal_Bool bMSOFormat = sal_False ); + SAL_DLLPRIVATE static sal_Bool ImplReadDIBFileHeader( SvStream& rIStm, sal_uLong& rOffset ); + SAL_DLLPRIVATE static sal_Bool ImplReadDIBInfoHeader( SvStream& rIStm, DIBInfoHeader& rHeader, sal_Bool& bTopDown, sal_Bool bMSOFormat = sal_False ); + SAL_DLLPRIVATE static sal_Bool ImplReadDIBPalette( SvStream& rIStm, BitmapWriteAccess& rAcc, sal_Bool bQuad ); + SAL_DLLPRIVATE static sal_Bool ImplReadDIBBits( SvStream& rIStm, DIBInfoHeader& rHeader, BitmapWriteAccess& rAcc, sal_Bool bTopDown ); + SAL_DLLPRIVATE sal_Bool ImplWriteDIB( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bCompressed ) const; + SAL_DLLPRIVATE static sal_Bool ImplWriteDIBFileHeader( SvStream& rOStm, BitmapReadAccess& rAcc ); + SAL_DLLPRIVATE static sal_Bool ImplWriteDIBPalette( SvStream& rOStm, BitmapReadAccess& rAcc ); + SAL_DLLPRIVATE static sal_Bool ImplWriteDIBBits( SvStream& rOStm, BitmapReadAccess& rAcc, + sal_uLong nCompression, sal_uInt32& rImageSize ); + SAL_DLLPRIVATE static void ImplDecodeRLE( sal_uInt8* pBuffer, DIBInfoHeader& rHeader, + BitmapWriteAccess& rAcc, sal_Bool bRLE4 ); + SAL_DLLPRIVATE static sal_Bool ImplWriteRLE( SvStream& rOStm, BitmapReadAccess& rAcc, sal_Bool bRLE4 ); + + SAL_DLLPRIVATE sal_Bool ImplScaleFast( const double& rScaleX, const double& rScaleY ); + SAL_DLLPRIVATE sal_Bool ImplScaleInterpolate( const double& rScaleX, const double& rScaleY ); + SAL_DLLPRIVATE sal_Bool ImplMakeMono( sal_uInt8 cThreshold ); + SAL_DLLPRIVATE sal_Bool ImplMakeMonoDither(); + SAL_DLLPRIVATE sal_Bool ImplMakeGreyscales( sal_uInt16 nGreyscales ); + SAL_DLLPRIVATE sal_Bool ImplConvertUp( sal_uInt16 nBitCount, Color* pExtColor = NULL ); + SAL_DLLPRIVATE sal_Bool ImplConvertDown( sal_uInt16 nBitCount, Color* pExtColor = NULL ); + SAL_DLLPRIVATE sal_Bool ImplConvertGhosted(); + SAL_DLLPRIVATE sal_Bool ImplDitherMatrix(); + SAL_DLLPRIVATE sal_Bool ImplDitherFloyd(); + SAL_DLLPRIVATE sal_Bool ImplDitherFloyd16(); + SAL_DLLPRIVATE sal_Bool ImplReduceSimple( sal_uInt16 nColorCount ); + SAL_DLLPRIVATE sal_Bool ImplReducePopular( sal_uInt16 nColorCount ); + SAL_DLLPRIVATE sal_Bool ImplReduceMedian( sal_uInt16 nColorCount ); + SAL_DLLPRIVATE void ImplMedianCut( sal_uLong* pColBuf, BitmapPalette& rPal, long nR1, long nR2, long nG1, long nG2, long nB1, long nB2, long nColors, long nPixels, long& rIndex ); - SAL_DLLPRIVATE BOOL ImplConvolute3( const long* pMatrix, long nDivisor, + SAL_DLLPRIVATE sal_Bool ImplConvolute3( const long* pMatrix, long nDivisor, const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE BOOL ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE BOOL ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE BOOL ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE BOOL ImplSolarize( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE BOOL ImplSepia( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE BOOL ImplMosaic( const BmpFilterParam* pFilterParam, const Link* pProgress ); - SAL_DLLPRIVATE BOOL ImplPopArt( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE sal_Bool ImplMedianFilter( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE sal_Bool ImplSobelGrey( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE sal_Bool ImplEmbossGrey( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE sal_Bool ImplSolarize( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE sal_Bool ImplSepia( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE sal_Bool ImplMosaic( const BmpFilterParam* pFilterParam, const Link* pProgress ); + SAL_DLLPRIVATE sal_Bool ImplPopArt( const BmpFilterParam* pFilterParam, const Link* pProgress ); public: Bitmap(); Bitmap( const Bitmap& rBitmap ); - Bitmap( const Size& rSizePixel, USHORT nBitCount, const BitmapPalette* pPal = NULL ); + Bitmap( const Size& rSizePixel, sal_uInt16 nBitCount, const BitmapPalette* pPal = NULL ); Bitmap( const ResId& rResId ); Bitmap( SalBitmap* pSalBitmap ); ~Bitmap(); Bitmap& operator=( const Bitmap& rBitmap ); - inline BOOL operator!() const; - inline BOOL operator==( const Bitmap& rBitmap ) const; - inline BOOL operator!=( const Bitmap& rBitmap ) const; + inline sal_Bool operator!() const; + inline sal_Bool operator==( const Bitmap& rBitmap ) const; + inline sal_Bool operator!=( const Bitmap& rBitmap ) const; - inline BOOL IsSameInstance( const Bitmap& rBmp ) const; - BOOL IsEqual( const Bitmap& rBmp ) const; + inline sal_Bool IsSameInstance( const Bitmap& rBmp ) const; + sal_Bool IsEqual( const Bitmap& rBmp ) const; - inline BOOL IsEmpty() const; + inline sal_Bool IsEmpty() const; void SetEmpty(); inline const MapMode& GetPrefMapMode() const; @@ -338,20 +338,20 @@ public: void SetSourceSizePixel( const Size& ); - USHORT GetBitCount() const; - inline ULONG GetColorCount() const; - inline ULONG GetSizeBytes() const; - BOOL HasGreyPalette() const; + sal_uInt16 GetBitCount() const; + inline sal_uLong GetColorCount() const; + inline sal_uLong GetSizeBytes() const; + sal_Bool HasGreyPalette() const; /** get system dependent bitmap data @param rData The system dependent BitmapSystemData structure to be filled - @return TRUE if the bitmap has a valid system object (e.g. not empty) + @return sal_True if the bitmap has a valid system object (e.g. not empty) */ bool GetSystemData( BitmapSystemData& rData ) const; - ULONG GetChecksum() const; + sal_uLong GetChecksum() const; Bitmap CreateDisplayBitmap( OutputDevice* pDisplay ); Bitmap GetColorTransformedBitmap() const; @@ -360,7 +360,7 @@ public: public: - BOOL MakeMono( BYTE cThreshold ); + sal_Bool MakeMono( sal_uInt8 cThreshold ); /** Convert bitmap format @@ -368,9 +368,9 @@ public: @param eConversion The format this bitmap should be converted to. - @return TRUE, if the conversion was completed successfully. + @return sal_True, if the conversion was completed successfully. */ - BOOL Convert( BmpConversion eConversion ); + sal_Bool Convert( BmpConversion eConversion ); /** Reduce number of colors for the bitmap @@ -380,9 +380,9 @@ public: @param eReduce Algorithm to use for color reduction - @return TRUE, if the color reduction operation was completed successfully. + @return sal_True, if the color reduction operation was completed successfully. */ - BOOL ReduceColors( USHORT nNewColorCount, + sal_Bool ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce = BMP_REDUCE_SIMPLE ); /** Apply a dither algorithm to the bitmap @@ -397,7 +397,7 @@ public: @param pDitherPal A custom palette to be used when dithering (not yet implemented, leave NULL) */ - BOOL Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX ); + sal_Bool Dither( sal_uLong nDitherFlags = BMP_DITHER_MATRIX ); /** Crop the bitmap @@ -409,11 +409,11 @@ public: dimension, i.e. negative left,top rectangle coordinates or exceeding width or height is ignored. - @return TRUE, if cropping was performed successfully. If + @return sal_True, if cropping was performed successfully. If nothing had to be cropped, because e.g. the crop rectangle - included the bitmap, FALSE is returned, too! + included the bitmap, sal_False is returned, too! */ - BOOL Crop( const Rectangle& rRectPixel ); + sal_Bool Crop( const Rectangle& rRectPixel ); /** Expand the bitmap by pixel padding @@ -426,11 +426,11 @@ public: @param pInitColor Color to use for padded pixel - @return TRUE, if padding was performed successfully. FALSE is + @return sal_True, if padding was performed successfully. sal_False is not only returned when the operation failed, but also if nothing had to be done, e.g. because nDX and nDY were zero. */ - BOOL Expand( ULONG nDX, ULONG nDY, + sal_Bool Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor = NULL ); /** Copy a rectangular area from another bitmap @@ -450,12 +450,12 @@ public: equal to the object this method is called on, copying takes place within the same bitmap. - @return TRUE, if the operation completed successfully. FALSE + @return sal_True, if the operation completed successfully. sal_False is not only returned when the operation failed, but also if nothing had to be done, e.g. because one of the rectangles are empty. */ - BOOL CopyPixel( const Rectangle& rRectDst, + sal_Bool CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const Bitmap* pBmpSrc = NULL ); @@ -467,9 +467,9 @@ public: @param eCombine The combine operation to perform on the bitmap - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL CombineSimple( const Bitmap& rMask, + sal_Bool CombineSimple( const Bitmap& rMask, BmpCombine eCombine ); /** Alpha-blend the given bitmap against a specified uniform @@ -486,9 +486,9 @@ public: @param rBackgroundColor Background color to use for every pixel during alpha blending - @return TRUE, if blending was successful, FALSE otherwise + @return sal_True, if blending was successful, sal_False otherwise */ - BOOL Blend( const AlphaMask& rAlpha, + sal_Bool Blend( const AlphaMask& rAlpha, const Color& rBackgroundColor ); /** Fill the entire bitmap with the given color @@ -496,24 +496,24 @@ public: @param rFillColor Color value to use for filling - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Erase( const Color& rFillColor ); + sal_Bool Erase( const Color& rFillColor ); /** Perform the Invert operation on every pixel - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Invert(); + sal_Bool Invert(); /** Mirror the bitmap @param nMirrorFlags About which axis (horizontal, vertical, or both) to mirror - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Mirror( ULONG nMirrorFlags ); + sal_Bool Mirror( sal_uLong nMirrorFlags ); /** Scale the bitmap @@ -523,10 +523,10 @@ public: @param nScaleFlag The algorithm to be used for scaling - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Scale( const Size& rNewSize, - ULONG nScaleFlag = BMP_SCALE_FAST ); + sal_Bool Scale( const Size& rNewSize, + sal_uLong nScaleFlag = BMP_SCALE_FAST ); /** Scale the bitmap @@ -536,10 +536,10 @@ public: @param rScaleY The scale factor in y direction. - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Scale( const double& rScaleX, const double& rScaleY, - ULONG nScaleFlag = BMP_SCALE_FAST ); + sal_Bool Scale( const double& rScaleX, const double& rScaleY, + sal_uLong nScaleFlag = BMP_SCALE_FAST ); /** Rotate bitmap by the specified angle @@ -552,9 +552,9 @@ public: in. The empty spaces around that rotated original bitmap are then filled with this color. - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Rotate( long nAngle10, const Color& rFillColor ); + sal_Bool Rotate( long nAngle10, const Color& rFillColor ); /** Create on-off mask from bitmap @@ -572,7 +572,7 @@ public: @return the resulting bitmask. */ - Bitmap CreateMask( const Color& rTransColor, ULONG nTol = 0UL ) const; + Bitmap CreateMask( const Color& rTransColor, sal_uLong nTol = 0UL ) const; /** Create region of similar colors in a given rectangle @@ -595,9 +595,9 @@ public: @param rReplaceColor Color to be placed in all changed pixel - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Replace( const Bitmap& rMask, const Color& rReplaceColor ); + sal_Bool Replace( const Bitmap& rMask, const Color& rReplaceColor ); /** Merge bitmap with given background color according to specified alpha mask @@ -607,9 +607,9 @@ public: @param rMergeColor Background color to be used for merging - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Replace( const AlphaMask& rAlpha, const Color& rMergeColor ); + sal_Bool Replace( const AlphaMask& rAlpha, const Color& rMergeColor ); /** Replace all pixel having the search color with the specified color @@ -624,9 +624,9 @@ public: rSearchColor and the individual pixel values, such that the corresponding pixel is still regarded a match. - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Replace( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 ); + sal_Bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 ); /** Replace all pixel having one the search colors with the corresponding replace color @@ -644,10 +644,10 @@ public: pSearchColor colors and the individual pixel values, such that the corresponding pixel is still regarded a match. - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Replace( const Color* pSearchColors, const Color* rReplaceColors, - ULONG nColorCount, ULONG* pTols = NULL ); + sal_Bool Replace( const Color* pSearchColors, const Color* rReplaceColors, + sal_uLong nColorCount, sal_uLong* pTols = NULL ); /** Convert the bitmap to a PolyPolygon @@ -664,10 +664,10 @@ public: @param pProgress A callback for showing the progress of the vectorization - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Vectorize( PolyPolygon& rPolyPoly, - ULONG nFlags = BMP_VECTORIZE_OUTER, + sal_Bool Vectorize( PolyPolygon& rPolyPoly, + sal_uLong nFlags = BMP_VECTORIZE_OUTER, const Link* pProgress = NULL ); /** Convert the bitmap to a meta file @@ -689,10 +689,10 @@ public: @param pProgress A callback for showing the progress of the vectorization - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Vectorize( GDIMetaFile& rMtf, BYTE cReduce = 0, - ULONG nFlags = BMP_VECTORIZE_INNER, + sal_Bool Vectorize( GDIMetaFile& rMtf, sal_uInt8 cReduce = 0, + sal_uLong nFlags = BMP_VECTORIZE_INNER, const Link* pProgress = NULL ); /** Change various global color characteristics @@ -718,17 +718,17 @@ public: (0.0,10.0]. Values outside this range are regarded as 1.0. @param bInvert - If TRUE, invert the channel values with the logical 'not' operator + If sal_True, invert the channel values with the logical 'not' operator - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Adjust( short nLuminancePercent = 0, + sal_Bool Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, short nChannelRPercent = 0, short nChannelGPercent = 0, short nChannelBPercent = 0, double fGamma = 1.0, - BOOL bInvert = FALSE ); + sal_Bool bInvert = sal_False ); /** Apply specified filter to the bitmap @@ -741,9 +741,9 @@ public: @param pProgress A callback for showing the progress of the vectorization - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Filter( BmpFilter eFilter, + sal_Bool Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, const Link* pProgress = NULL ); @@ -754,8 +754,8 @@ public: public: - BOOL Read( SvStream& rIStm, BOOL bFileHeader = TRUE, BOOL bMSOFormat = FALSE ); - BOOL Write( SvStream& rOStm, BOOL bCompressed = TRUE, BOOL bFileHeader = TRUE ) const; + sal_Bool Read( SvStream& rIStm, sal_Bool bFileHeader = sal_True, sal_Bool bMSOFormat = sal_False ); + sal_Bool Write( SvStream& rOStm, sal_Bool bCompressed = sal_True, sal_Bool bFileHeader = sal_True ) const; friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Bitmap& rBitmap ); friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Bitmap& rBitmap ); @@ -765,35 +765,35 @@ public: // - Inlines - // ----------- -inline BOOL Bitmap::operator!() const +inline sal_Bool Bitmap::operator!() const { return( mpImpBmp == NULL ); } // ------------------------------------------------------------------ -inline BOOL Bitmap::operator==( const Bitmap& rBitmap ) const +inline sal_Bool Bitmap::operator==( const Bitmap& rBitmap ) const { return( rBitmap.mpImpBmp == mpImpBmp ); } // ------------------------------------------------------------------ -inline BOOL Bitmap::operator!=( const Bitmap& rBitmap ) const +inline sal_Bool Bitmap::operator!=( const Bitmap& rBitmap ) const { return( rBitmap.mpImpBmp != mpImpBmp ); } // ------------------------------------------------------------------ -inline BOOL Bitmap::IsSameInstance( const Bitmap& rBitmap ) const +inline sal_Bool Bitmap::IsSameInstance( const Bitmap& rBitmap ) const { return( rBitmap.mpImpBmp == mpImpBmp ); } // ------------------------------------------------------------------ -inline BOOL Bitmap::IsEmpty() const +inline sal_Bool Bitmap::IsEmpty() const { return( mpImpBmp == NULL ); } @@ -828,17 +828,17 @@ inline void Bitmap::SetPrefSize( const Size& rSize ) // ------------------------------------------------------------------ -inline ULONG Bitmap::GetColorCount() const +inline sal_uLong Bitmap::GetColorCount() const { - return( 1UL << (ULONG) GetBitCount() ); + return( 1UL << (sal_uLong) GetBitCount() ); } // ------------------------------------------------------------------ -inline ULONG Bitmap::GetSizeBytes() const +inline sal_uLong Bitmap::GetSizeBytes() const { const Size aSizePix( GetSizePixel() ); - return( ( (ULONG) aSizePix.Width() * aSizePix.Height() * GetBitCount() ) >> 3UL ); + return( ( (sal_uLong) aSizePix.Width() * aSizePix.Height() * GetBitCount() ) >> 3UL ); } #endif // _SV_BITMAP_HXX diff --git a/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx index 965f9e611818..9a6259fa61eb 100644 --- a/vcl/inc/vcl/bitmapex.hxx +++ b/vcl/inc/vcl/bitmapex.hxx @@ -60,7 +60,7 @@ private: Size aBitmapSize; Color aTransparentColor; TransparentType eTransparent; - BOOL bAlpha; + sal_Bool bAlpha; public: @@ -81,13 +81,13 @@ public: ~BitmapEx(); BitmapEx& operator=( const BitmapEx& rBitmapEx ); - BOOL operator==( const BitmapEx& rBitmapEx ) const; - BOOL operator!=( const BitmapEx& rBitmapEx ) const { return !(*this==rBitmapEx); } - BOOL operator!() const { return !aBitmap; } + sal_Bool operator==( const BitmapEx& rBitmapEx ) const; + sal_Bool operator!=( const BitmapEx& rBitmapEx ) const { return !(*this==rBitmapEx); } + sal_Bool operator!() const { return !aBitmap; } - BOOL IsEqual( const BitmapEx& rBmpEx ) const; + sal_Bool IsEqual( const BitmapEx& rBmpEx ) const; - BOOL IsEmpty() const; + sal_Bool IsEmpty() const; void SetEmpty(); void Clear(); @@ -99,7 +99,7 @@ public: const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel ) const; - BOOL IsTransparent() const; + sal_Bool IsTransparent() const; TransparentType GetTransparentType() const { return eTransparent; } Bitmap GetBitmap( const Color* pTransReplaceColor = NULL ) const; @@ -107,7 +107,7 @@ public: BitmapEx GetColorTransformedBitmapEx() const; - BOOL IsAlpha() const; + sal_Bool IsAlpha() const; AlphaMask GetAlpha() const; const Size& GetSizePixel() const { return aBitmapSize; } @@ -122,9 +122,9 @@ public: const Color& GetTransparentColor() const { return aTransparentColor; } void SetTransparentColor( const Color& rColor ) { aTransparentColor = rColor; } - USHORT GetBitCount() const { return aBitmap.GetBitCount(); } - ULONG GetSizeBytes() const; - ULONG GetChecksum() const; + sal_uInt16 GetBitCount() const { return aBitmap.GetBitCount(); } + sal_uLong GetSizeBytes() const; + sal_uLong GetChecksum() const; public: @@ -133,9 +133,9 @@ public: @param eConversion The format this bitmap should be converted to. - @return TRUE, if the conversion was completed successfully. + @return sal_True, if the conversion was completed successfully. */ - BOOL Convert( BmpConversion eConversion ); + sal_Bool Convert( BmpConversion eConversion ); /** Reduce number of colors for the bitmap @@ -145,9 +145,9 @@ public: @param eReduce Algorithm to use for color reduction - @return TRUE, if the color reduction operation was completed successfully. + @return sal_True, if the color reduction operation was completed successfully. */ - BOOL ReduceColors( USHORT nNewColorCount, + sal_Bool ReduceColors( sal_uInt16 nNewColorCount, BmpReduce eReduce = BMP_REDUCE_SIMPLE ); /** Apply a dither algorithm to the bitmap @@ -159,7 +159,7 @@ public: @param nDitherFlags The algorithm to be used for dithering */ - BOOL Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX ); + sal_Bool Dither( sal_uLong nDitherFlags = BMP_DITHER_MATRIX ); /** Crop the bitmap @@ -171,11 +171,11 @@ public: dimension, i.e. negative left,top rectangle coordinates or exceeding width or height is ignored. - @return TRUE, if cropping was performed successfully. If + @return sal_True, if cropping was performed successfully. If nothing had to be cropped, because e.g. the crop rectangle - included the bitmap, FALSE is returned, too! + included the bitmap, sal_False is returned, too! */ - BOOL Crop( const Rectangle& rRectPixel ); + sal_Bool Crop( const Rectangle& rRectPixel ); /** Expand the bitmap by pixel padding @@ -188,13 +188,13 @@ public: @param pInitColor Color to use for padded pixel - @return TRUE, if padding was performed successfully. FALSE is + @return sal_True, if padding was performed successfully. sal_False is not only returned when the operation failed, but also if nothing had to be done, e.g. because nDX and nDY were zero. */ - BOOL Expand( ULONG nDX, ULONG nDY, + sal_Bool Expand( sal_uLong nDX, sal_uLong nDY, const Color* pInitColor = NULL, - BOOL bExpandTransparent = FALSE ); + sal_Bool bExpandTransparent = sal_False ); /** Copy a rectangular area from another bitmap @@ -213,12 +213,12 @@ public: equal to the object this method is called on, copying takes place within the same bitmap. - @return TRUE, if the operation completed successfully. FALSE + @return sal_True, if the operation completed successfully. sal_False is not only returned when the operation failed, but also if nothing had to be done, e.g. because one of the rectangles are empty. */ - BOOL CopyPixel( const Rectangle& rRectDst, + sal_Bool CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const BitmapEx* pBmpExSrc = NULL ); @@ -228,24 +228,24 @@ public: Color value to use for filling. Set the transparency part of the color to fill the mask. - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Erase( const Color& rFillColor ); + sal_Bool Erase( const Color& rFillColor ); /** Perform the Invert operation on every pixel - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Invert(); + sal_Bool Invert(); /** Mirror the bitmap @param nMirrorFlags About which axis (horizontal, vertical, or both) to mirror - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Mirror( ULONG nMirrorFlags ); + sal_Bool Mirror( sal_uLong nMirrorFlags ); /** Scale the bitmap @@ -255,9 +255,9 @@ public: @param nScaleFlag The algorithm to be used for scaling - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Scale( const Size& rNewSize, ULONG nScaleFlag = BMP_SCALE_FAST ); + sal_Bool Scale( const Size& rNewSize, sal_uLong nScaleFlag = BMP_SCALE_FAST ); /** Scale the bitmap @@ -267,9 +267,9 @@ public: @param rScaleY The scale factor in y direction. - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Scale( const double& rScaleX, const double& rScaleY, ULONG nScaleFlag = BMP_SCALE_FAST ); + sal_Bool Scale( const double& rScaleX, const double& rScaleY, sal_uLong nScaleFlag = BMP_SCALE_FAST ); /** Rotate bitmap by the specified angle @@ -282,9 +282,9 @@ public: in. The empty spaces around that rotated original bitmap are then filled with this color. - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Rotate( long nAngle10, const Color& rFillColor ); + sal_Bool Rotate( long nAngle10, const Color& rFillColor ); /** Replace all pixel having the search color with the specified color @@ -299,9 +299,9 @@ public: rSearchColor and the individual pixel values, such that the corresponding pixel is still regarded a match. - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Replace( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 ); + sal_Bool Replace( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 ); /** Replace all pixel having one the search colors with the corresponding replace color @@ -319,10 +319,10 @@ public: pSearchColor colors and the individual pixel values, such that the corresponding pixel is still regarded a match. - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Replace( const Color* pSearchColors, const Color* pReplaceColors, - ULONG nColorCount, const ULONG* pTols = NULL ); + sal_Bool Replace( const Color* pSearchColors, const Color* pReplaceColors, + sal_uLong nColorCount, const sal_uLong* pTols = NULL ); /** Change various global color characteristics @@ -347,17 +347,17 @@ public: (0.0,10.0]. Values outside this range are regarded as 1.0. @param bInvert - If TRUE, invert the channel values with the logical 'not' operator + If sal_True, invert the channel values with the logical 'not' operator - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Adjust( short nLuminancePercent = 0, + sal_Bool Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, short nChannelRPercent = 0, short nChannelGPercent = 0, short nChannelBPercent = 0, double fGamma = 1.0, - BOOL bInvert = FALSE ); + sal_Bool bInvert = sal_False ); /** Apply specified filter to the bitmap @@ -370,9 +370,9 @@ public: @param pProgress A callback for showing the progress of the vectorization - @return TRUE, if the operation was completed successfully. + @return sal_True, if the operation was completed successfully. */ - BOOL Filter( BmpFilter eFilter, + sal_Bool Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, const Link* pProgress = NULL ); diff --git a/vcl/inc/vcl/bmpacc.hxx b/vcl/inc/vcl/bmpacc.hxx index e3530b786e65..650a60a69077 100644 --- a/vcl/inc/vcl/bmpacc.hxx +++ b/vcl/inc/vcl/bmpacc.hxx @@ -98,12 +98,12 @@ protected: ColorMask maColorMask; FncGetPixel mFncGetPixel; FncSetPixel mFncSetPixel; - BOOL mbModify; + sal_Bool mbModify; SAL_DLLPRIVATE void ImplCreate( Bitmap& rBitmap ); SAL_DLLPRIVATE void ImplDestroy(); -SAL_DLLPRIVATE BOOL ImplSetAccessPointers( ULONG nFormat ); +SAL_DLLPRIVATE sal_Bool ImplSetAccessPointers( sal_uLong nFormat ); public: @@ -127,49 +127,49 @@ SAL_DLLPRIVATE BitmapBuffer* ImplGetBitmapBuffer() const { return mpBuffer; } DECL_FORMAT( _32BIT_TC_RGBA ) DECL_FORMAT( _32BIT_TC_MASK ) protected: - BitmapReadAccess( Bitmap& rBitmap, BOOL bModify ); + BitmapReadAccess( Bitmap& rBitmap, sal_Bool bModify ); void Flush(); - void ReAccess( BOOL bModify ); + void ReAccess( sal_Bool bModify ); public: BitmapReadAccess( Bitmap& rBitmap ); virtual ~BitmapReadAccess(); - inline BOOL operator!() const; + inline sal_Bool operator!() const; inline long Width() const; inline long Height() const; inline Point TopLeft() const; inline Point BottomRight() const; - inline BOOL IsTopDown() const; - inline BOOL IsBottomUp() const; + inline sal_Bool IsTopDown() const; + inline sal_Bool IsBottomUp() const; - inline ULONG GetScanlineFormat() const; - inline ULONG GetScanlineSize() const; + inline sal_uLong GetScanlineFormat() const; + inline sal_uLong GetScanlineSize() const; - inline USHORT GetBitCount() const; + inline sal_uInt16 GetBitCount() const; inline BitmapColor GetBestMatchingColor( const BitmapColor& rBitmapColor ); inline Scanline GetBuffer() const; inline Scanline GetScanline( long nY ) const; - inline BOOL HasPalette() const; + inline sal_Bool HasPalette() const; inline const BitmapPalette& GetPalette() const; - inline USHORT GetPaletteEntryCount() const; - inline const BitmapColor& GetPaletteColor( USHORT nColor ) const; + inline sal_uInt16 GetPaletteEntryCount() const; + inline const BitmapColor& GetPaletteColor( sal_uInt16 nColor ) const; inline const BitmapColor& GetBestPaletteColor( const BitmapColor& rBitmapColor ) const; - USHORT GetBestPaletteIndex( const BitmapColor& rBitmapColor ) const; + sal_uInt16 GetBestPaletteIndex( const BitmapColor& rBitmapColor ) const; - inline BOOL HasColorMask() const; + inline sal_Bool HasColorMask() const; inline ColorMask& GetColorMask() const; - inline BitmapColor GetPixelFromData( const BYTE* pData, long nX ) const; - inline void SetPixelOnData( BYTE* pData, long nX, const BitmapColor& rBitmapColor ); + inline BitmapColor GetPixelFromData( const sal_uInt8* pData, long nX ) const; + inline void SetPixelOnData( sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor ); inline BitmapColor GetPixel( long nY, long nX ) const; inline BitmapColor GetColor( long nY, long nX ) const; - inline BYTE GetLuminance( long nY, long nX ) const; + inline sal_uInt8 GetLuminance( long nY, long nX ) const; }; // --------------------- @@ -185,13 +185,13 @@ public: void CopyScanline( long nY, const BitmapReadAccess& rReadAcc ); void CopyScanline( long nY, ConstScanline aSrcScanline, - ULONG nSrcScanlineFormat, ULONG nSrcScanlineSize ); + sal_uLong nSrcScanlineFormat, sal_uLong nSrcScanlineSize ); void CopyBuffer( const BitmapReadAccess& rReadAcc ); inline void SetPalette( const BitmapPalette& rPalette ); - inline void SetPaletteEntryCount( USHORT nCount ); - inline void SetPaletteColor( USHORT nColor, const BitmapColor& rBitmapColor ); + inline void SetPaletteEntryCount( sal_uInt16 nCount ); + inline void SetPaletteColor( sal_uInt16 nColor, const BitmapColor& rBitmapColor ); inline void SetPixel( long nY, long nX, const BitmapColor& rBitmapColor ); @@ -296,7 +296,7 @@ typedef ScopedBitmapAccess< BitmapWriteAccess > ScopedBitmapWriteAccess; // - Inlines - // ----------- -inline BOOL BitmapReadAccess::operator!() const +inline sal_Bool BitmapReadAccess::operator!() const { return( mpBuffer == NULL ); } @@ -331,22 +331,22 @@ inline Point BitmapReadAccess::BottomRight() const // ------------------------------------------------------------------ -inline BOOL BitmapReadAccess::IsTopDown() const +inline sal_Bool BitmapReadAccess::IsTopDown() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); - return( mpBuffer ? sal::static_int_cast<BOOL>( BMP_SCANLINE_ADJUSTMENT( mpBuffer->mnFormat ) == BMP_FORMAT_TOP_DOWN ) : FALSE ); + return( mpBuffer ? sal::static_int_cast<sal_Bool>( BMP_SCANLINE_ADJUSTMENT( mpBuffer->mnFormat ) == BMP_FORMAT_TOP_DOWN ) : sal_False ); } // ------------------------------------------------------------------ -inline BOOL BitmapReadAccess::IsBottomUp() const +inline sal_Bool BitmapReadAccess::IsBottomUp() const { return !IsTopDown(); } // ------------------------------------------------------------------ -inline ULONG BitmapReadAccess::GetScanlineFormat() const +inline sal_uLong BitmapReadAccess::GetScanlineFormat() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); return( mpBuffer ? BMP_SCANLINE_FORMAT( mpBuffer->mnFormat ) : 0UL ); @@ -354,7 +354,7 @@ inline ULONG BitmapReadAccess::GetScanlineFormat() const // ------------------------------------------------------------------ -inline ULONG BitmapReadAccess::GetScanlineSize() const +inline sal_uLong BitmapReadAccess::GetScanlineSize() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); return( mpBuffer ? mpBuffer->mnScanlineSize : 0UL ); @@ -362,7 +362,7 @@ inline ULONG BitmapReadAccess::GetScanlineSize() const // ------------------------------------------------------------------ -inline USHORT BitmapReadAccess::GetBitCount() const +inline sal_uInt16 BitmapReadAccess::GetBitCount() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); return( mpBuffer ? mpBuffer->mnBitCount : 0 ); @@ -373,7 +373,7 @@ inline USHORT BitmapReadAccess::GetBitCount() const inline BitmapColor BitmapReadAccess::GetBestMatchingColor( const BitmapColor& rBitmapColor ) { if( HasPalette() ) - return BitmapColor( (BYTE) GetBestPaletteIndex( rBitmapColor ) ); + return BitmapColor( (sal_uInt8) GetBestPaletteIndex( rBitmapColor ) ); else return rBitmapColor; } @@ -397,7 +397,7 @@ inline Scanline BitmapReadAccess::GetScanline( long nY ) const // ------------------------------------------------------------------ -inline BOOL BitmapReadAccess::HasPalette() const +inline sal_Bool BitmapReadAccess::HasPalette() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); return( mpBuffer && !!mpBuffer->maPalette ); @@ -413,7 +413,7 @@ inline const BitmapPalette& BitmapReadAccess::GetPalette() const // ------------------------------------------------------------------ -inline USHORT BitmapReadAccess::GetPaletteEntryCount() const +inline sal_uInt16 BitmapReadAccess::GetPaletteEntryCount() const { DBG_ASSERT( HasPalette(), "Bitmap has no palette!" ); return( HasPalette() ? mpBuffer->maPalette.GetEntryCount() : 0 ); @@ -421,7 +421,7 @@ inline USHORT BitmapReadAccess::GetPaletteEntryCount() const // ------------------------------------------------------------------ -inline const BitmapColor& BitmapReadAccess::GetPaletteColor( USHORT nColor ) const +inline const BitmapColor& BitmapReadAccess::GetPaletteColor( sal_uInt16 nColor ) const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); DBG_ASSERT( HasPalette(), "Bitmap has no palette!" ); @@ -437,10 +437,10 @@ inline const BitmapColor& BitmapReadAccess::GetBestPaletteColor( const BitmapCol // ------------------------------------------------------------------ -inline BOOL BitmapReadAccess::HasColorMask() const +inline sal_Bool BitmapReadAccess::HasColorMask() const { DBG_ASSERT( mpBuffer, "Access is not valid!" ); - const ULONG nFormat = BMP_SCANLINE_FORMAT( mpBuffer->mnFormat ); + const sal_uLong nFormat = BMP_SCANLINE_FORMAT( mpBuffer->mnFormat ); return( nFormat == BMP_FORMAT_8BIT_TC_MASK || nFormat == BMP_FORMAT_16BIT_TC_MSB_MASK || @@ -469,7 +469,7 @@ inline BitmapColor BitmapReadAccess::GetPixel( long nY, long nX ) const // ------------------------------------------------------------------ -inline BitmapColor BitmapReadAccess::GetPixelFromData( const BYTE* pData, long nX ) const +inline BitmapColor BitmapReadAccess::GetPixelFromData( const sal_uInt8* pData, long nX ) const { DBG_ASSERT( pData, "Access is not valid!" ); return mFncGetPixel( pData, nX, maColorMask ); @@ -477,7 +477,7 @@ inline BitmapColor BitmapReadAccess::GetPixelFromData( const BYTE* pData, long n // ------------------------------------------------------------------ -inline void BitmapReadAccess::SetPixelOnData( BYTE* pData, long nX, const BitmapColor& rBitmapColor ) +inline void BitmapReadAccess::SetPixelOnData( sal_uInt8* pData, long nX, const BitmapColor& rBitmapColor ) { DBG_ASSERT( pData, "Access is not valid!" ); mFncSetPixel( pData, nX, rBitmapColor, maColorMask ); @@ -498,7 +498,7 @@ inline BitmapColor BitmapReadAccess::GetColor( long nY, long nX ) const // ------------------------------------------------------------------ -inline BYTE BitmapReadAccess::GetLuminance( long nY, long nX ) const +inline sal_uInt8 BitmapReadAccess::GetLuminance( long nY, long nX ) const { return GetColor( nY, nX ).GetLuminance(); } @@ -513,7 +513,7 @@ inline void BitmapWriteAccess::SetPalette( const BitmapPalette& rPalette ) // ------------------------------------------------------------------ -inline void BitmapWriteAccess::SetPaletteEntryCount( USHORT nCount ) +inline void BitmapWriteAccess::SetPaletteEntryCount( sal_uInt16 nCount ) { DBG_ASSERT( mpBuffer, "Access is not valid!" ); mpBuffer->maPalette.SetEntryCount( nCount ); @@ -521,7 +521,7 @@ inline void BitmapWriteAccess::SetPaletteEntryCount( USHORT nCount ) // ------------------------------------------------------------------ -inline void BitmapWriteAccess::SetPaletteColor( USHORT nColor, const BitmapColor& rBitmapColor ) +inline void BitmapWriteAccess::SetPaletteColor( sal_uInt16 nColor, const BitmapColor& rBitmapColor ) { DBG_ASSERT( mpBuffer, "Access is not valid!" ); DBG_ASSERT( HasPalette(), "Bitmap has no palette!" ); diff --git a/vcl/inc/vcl/brdwin.hxx b/vcl/inc/vcl/brdwin.hxx index 016e50e1366e..e6374ea032f5 100644 --- a/vcl/inc/vcl/brdwin.hxx +++ b/vcl/inc/vcl/brdwin.hxx @@ -38,39 +38,39 @@ class ImplBorderWindowView; // - ImplBorderWindow-Types - // -------------------------- -#define BORDERWINDOW_STYLE_OVERLAP ((USHORT)0x0001) -#define BORDERWINDOW_STYLE_BORDER ((USHORT)0x0002) -#define BORDERWINDOW_STYLE_FLOAT ((USHORT)0x0004) -#define BORDERWINDOW_STYLE_FRAME ((USHORT)0x0008) -#define BORDERWINDOW_STYLE_APP ((USHORT)0x0010) - -#define BORDERWINDOW_HITTEST_TITLE ((USHORT)0x0001) -#define BORDERWINDOW_HITTEST_LEFT ((USHORT)0x0002) -#define BORDERWINDOW_HITTEST_MENU ((USHORT)0x0004) -#define BORDERWINDOW_HITTEST_TOP ((USHORT)0x0008) -#define BORDERWINDOW_HITTEST_RIGHT ((USHORT)0x0010) -#define BORDERWINDOW_HITTEST_BOTTOM ((USHORT)0x0020) -#define BORDERWINDOW_HITTEST_TOPLEFT ((USHORT)0x0040) -#define BORDERWINDOW_HITTEST_TOPRIGHT ((USHORT)0x0080) -#define BORDERWINDOW_HITTEST_BOTTOMLEFT ((USHORT)0x0100) -#define BORDERWINDOW_HITTEST_BOTTOMRIGHT ((USHORT)0x0200) -#define BORDERWINDOW_HITTEST_CLOSE ((USHORT)0x0400) -#define BORDERWINDOW_HITTEST_ROLL ((USHORT)0x0800) -#define BORDERWINDOW_HITTEST_DOCK ((USHORT)0x1000) -#define BORDERWINDOW_HITTEST_HIDE ((USHORT)0x2000) -#define BORDERWINDOW_HITTEST_HELP ((USHORT)0x4000) -#define BORDERWINDOW_HITTEST_PIN ((USHORT)0x8000) - -#define BORDERWINDOW_DRAW_TITLE ((USHORT)0x0001) -#define BORDERWINDOW_DRAW_BORDER ((USHORT)0x0002) -#define BORDERWINDOW_DRAW_FRAME ((USHORT)0x0004) -#define BORDERWINDOW_DRAW_CLOSE ((USHORT)0x0008) -#define BORDERWINDOW_DRAW_ROLL ((USHORT)0x0010) -#define BORDERWINDOW_DRAW_DOCK ((USHORT)0x0020) -#define BORDERWINDOW_DRAW_HIDE ((USHORT)0x0040) -#define BORDERWINDOW_DRAW_HELP ((USHORT)0x0080) -#define BORDERWINDOW_DRAW_PIN ((USHORT)0x0100) -#define BORDERWINDOW_DRAW_MENU ((USHORT)0x0200) +#define BORDERWINDOW_STYLE_OVERLAP ((sal_uInt16)0x0001) +#define BORDERWINDOW_STYLE_BORDER ((sal_uInt16)0x0002) +#define BORDERWINDOW_STYLE_FLOAT ((sal_uInt16)0x0004) +#define BORDERWINDOW_STYLE_FRAME ((sal_uInt16)0x0008) +#define BORDERWINDOW_STYLE_APP ((sal_uInt16)0x0010) + +#define BORDERWINDOW_HITTEST_TITLE ((sal_uInt16)0x0001) +#define BORDERWINDOW_HITTEST_LEFT ((sal_uInt16)0x0002) +#define BORDERWINDOW_HITTEST_MENU ((sal_uInt16)0x0004) +#define BORDERWINDOW_HITTEST_TOP ((sal_uInt16)0x0008) +#define BORDERWINDOW_HITTEST_RIGHT ((sal_uInt16)0x0010) +#define BORDERWINDOW_HITTEST_BOTTOM ((sal_uInt16)0x0020) +#define BORDERWINDOW_HITTEST_TOPLEFT ((sal_uInt16)0x0040) +#define BORDERWINDOW_HITTEST_TOPRIGHT ((sal_uInt16)0x0080) +#define BORDERWINDOW_HITTEST_BOTTOMLEFT ((sal_uInt16)0x0100) +#define BORDERWINDOW_HITTEST_BOTTOMRIGHT ((sal_uInt16)0x0200) +#define BORDERWINDOW_HITTEST_CLOSE ((sal_uInt16)0x0400) +#define BORDERWINDOW_HITTEST_ROLL ((sal_uInt16)0x0800) +#define BORDERWINDOW_HITTEST_DOCK ((sal_uInt16)0x1000) +#define BORDERWINDOW_HITTEST_HIDE ((sal_uInt16)0x2000) +#define BORDERWINDOW_HITTEST_HELP ((sal_uInt16)0x4000) +#define BORDERWINDOW_HITTEST_PIN ((sal_uInt16)0x8000) + +#define BORDERWINDOW_DRAW_TITLE ((sal_uInt16)0x0001) +#define BORDERWINDOW_DRAW_BORDER ((sal_uInt16)0x0002) +#define BORDERWINDOW_DRAW_FRAME ((sal_uInt16)0x0004) +#define BORDERWINDOW_DRAW_CLOSE ((sal_uInt16)0x0008) +#define BORDERWINDOW_DRAW_ROLL ((sal_uInt16)0x0010) +#define BORDERWINDOW_DRAW_DOCK ((sal_uInt16)0x0020) +#define BORDERWINDOW_DRAW_HIDE ((sal_uInt16)0x0040) +#define BORDERWINDOW_DRAW_HELP ((sal_uInt16)0x0080) +#define BORDERWINDOW_DRAW_PIN ((sal_uInt16)0x0100) +#define BORDERWINDOW_DRAW_MENU ((sal_uInt16)0x0200) #define BORDERWINDOW_DRAW_ALL (BORDERWINDOW_DRAW_TITLE | \ BORDERWINDOW_DRAW_BORDER | \ BORDERWINDOW_DRAW_FRAME | \ @@ -82,11 +82,11 @@ class ImplBorderWindowView; BORDERWINDOW_DRAW_PIN | \ BORDERWINDOW_DRAW_MENU) -#define BORDERWINDOW_TITLE_NORMAL ((USHORT)0x0001) -#define BORDERWINDOW_TITLE_SMALL ((USHORT)0x0002) -#define BORDERWINDOW_TITLE_TEAROFF ((USHORT)0x0004) -#define BORDERWINDOW_TITLE_POPUP ((USHORT)0x0008) -#define BORDERWINDOW_TITLE_NONE ((USHORT)0x0010) +#define BORDERWINDOW_TITLE_NORMAL ((sal_uInt16)0x0001) +#define BORDERWINDOW_TITLE_SMALL ((sal_uInt16)0x0002) +#define BORDERWINDOW_TITLE_TEAROFF ((sal_uInt16)0x0004) +#define BORDERWINDOW_TITLE_POPUP ((sal_uInt16)0x0008) +#define BORDERWINDOW_TITLE_NONE ((sal_uInt16)0x0010) // -------------------- // - ImplBorderWindow - @@ -108,26 +108,26 @@ private: long mnMaxHeight; long mnRollHeight; long mnOrgMenuHeight; - USHORT mnTitleType; - USHORT mnBorderStyle; - BOOL mbFloatWindow; - BOOL mbSmallOutBorder; - BOOL mbFrameBorder; - BOOL mbPined; - BOOL mbRollUp; - BOOL mbMenuHide; - BOOL mbDockBtn; - BOOL mbHideBtn; - BOOL mbHelpBtn; - BOOL mbMenuBtn; - BOOL mbDisplayActive; + sal_uInt16 mnTitleType; + sal_uInt16 mnBorderStyle; + sal_Bool mbFloatWindow; + sal_Bool mbSmallOutBorder; + sal_Bool mbFrameBorder; + sal_Bool mbPined; + sal_Bool mbRollUp; + sal_Bool mbMenuHide; + sal_Bool mbDockBtn; + sal_Bool mbHideBtn; + sal_Bool mbHelpBtn; + sal_Bool mbMenuBtn; + sal_Bool mbDisplayActive; using Window::ImplInit; void ImplInit( Window* pParent, - WinBits nStyle, USHORT nTypeStyle, + WinBits nStyle, sal_uInt16 nTypeStyle, SystemParentData* pParentData ); void ImplInit( Window* pParent, - WinBits nStyle, USHORT nTypeStyle, + WinBits nStyle, sal_uInt16 nTypeStyle, const ::com::sun::star::uno::Any& ); // Copy assignment is forbidden and not implemented. @@ -138,11 +138,11 @@ public: ImplBorderWindow( Window* pParent, SystemParentData* pParentData, WinBits nStyle = 0, - USHORT nTypeStyle = 0 ); + sal_uInt16 nTypeStyle = 0 ); ImplBorderWindow( Window* pParent, WinBits nStyle = 0, - USHORT nTypeStyle = 0 ); + sal_uInt16 nTypeStyle = 0 ); ImplBorderWindow( Window* pParent, - WinBits nStyle, USHORT nTypeStyle, + WinBits nStyle, sal_uInt16 nTypeStyle, const ::com::sun::star::uno::Any& ); ~ImplBorderWindow(); @@ -158,28 +158,28 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); void InitView(); - void UpdateView( BOOL bNewView, const Size& rNewOutSize ); + void UpdateView( sal_Bool bNewView, const Size& rNewOutSize ); void InvalidateBorder(); using Window::Draw; void Draw( const Rectangle& rRect, OutputDevice* pDev, const Point& rPos ); - void SetDisplayActive( BOOL bActive ); - BOOL IsDisplayActive() const { return mbDisplayActive; } - void SetTitleType( USHORT nTitleType, const Size& rSize ); - void SetBorderStyle( USHORT nStyle ); - USHORT GetBorderStyle() const { return mnBorderStyle; } - void SetPin( BOOL bPin ); - void SetRollUp( BOOL bRollUp, const Size& rSize ); + void SetDisplayActive( sal_Bool bActive ); + sal_Bool IsDisplayActive() const { return mbDisplayActive; } + void SetTitleType( sal_uInt16 nTitleType, const Size& rSize ); + void SetBorderStyle( sal_uInt16 nStyle ); + sal_uInt16 GetBorderStyle() const { return mnBorderStyle; } + void SetPin( sal_Bool bPin ); + void SetRollUp( sal_Bool bRollUp, const Size& rSize ); void SetCloser(); - void SetDockButton( BOOL bDockButton ); - void SetHideButton( BOOL bHideButton ); - void SetHelpButton( BOOL bHelpButton ); - void SetMenuButton( BOOL bMenuButton ); + void SetDockButton( sal_Bool bDockButton ); + void SetHideButton( sal_Bool bHideButton ); + void SetHelpButton( sal_Bool bHelpButton ); + void SetMenuButton( sal_Bool bMenuButton ); void UpdateMenuHeight(); void SetMenuBarWindow( Window* pWindow ); - void SetMenuBarMode( BOOL bHide ); + void SetMenuBarMode( sal_Bool bHide ); void SetMinOutputSize( long nWidth, long nHeight ) { mnMinWidth = nWidth; mnMinHeight = nHeight; } @@ -226,18 +226,18 @@ struct ImplBorderFrameData long mnBorderSize; long mnTitleHeight; long mnTitleOff; - USHORT mnHitTest; - USHORT mnPinState; - USHORT mnCloseState; - USHORT mnRollState; - USHORT mnDockState; - USHORT mnMenuState; - USHORT mnHideState; - USHORT mnHelpState; - USHORT mnTitleType; - BOOL mbFloatWindow; - BOOL mbDragFull; - BOOL mbTitleClipped; + sal_uInt16 mnHitTest; + sal_uInt16 mnPinState; + sal_uInt16 mnCloseState; + sal_uInt16 mnRollState; + sal_uInt16 mnDockState; + sal_uInt16 mnMenuState; + sal_uInt16 mnHideState; + sal_uInt16 mnHelpState; + sal_uInt16 mnTitleType; + sal_Bool mbFloatWindow; + sal_Bool mbDragFull; + sal_Bool mbTitleClipped; }; // ======================================================================= @@ -251,23 +251,23 @@ class ImplBorderWindowView public: virtual ~ImplBorderWindowView(); - virtual BOOL MouseMove( const MouseEvent& rMEvt ); - virtual BOOL MouseButtonDown( const MouseEvent& rMEvt ); - virtual BOOL Tracking( const TrackingEvent& rTEvt ); + virtual sal_Bool MouseMove( const MouseEvent& rMEvt ); + virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ); + virtual sal_Bool Tracking( const TrackingEvent& rTEvt ); virtual String RequestHelp( const Point& rPos, Rectangle& rHelpRect ); virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ) = 0; virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const = 0; virtual long CalcTitleWidth() const = 0; - virtual void DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev = NULL, const Point* pOffset = NULL ) = 0; + virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev = NULL, const Point* pOffset = NULL ) = 0; virtual Rectangle GetMenuRect() const; void ImplInitTitle( ImplBorderFrameData* pData ); - USHORT ImplHitTest( ImplBorderFrameData* pData, const Point& rPos ); - BOOL ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); - BOOL ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); - BOOL ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt ); + sal_uInt16 ImplHitTest( ImplBorderFrameData* pData, const Point& rPos ); + sal_Bool ImplMouseMove( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); + sal_Bool ImplMouseButtonDown( ImplBorderFrameData* pData, const MouseEvent& rMEvt ); + sal_Bool ImplTracking( ImplBorderFrameData* pData, const TrackingEvent& rTEvt ); String ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect ); long ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const; }; @@ -287,7 +287,7 @@ public: virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; virtual long CalcTitleWidth() const; - virtual void DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); + virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); }; @@ -316,7 +316,7 @@ public: virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; virtual long CalcTitleWidth() const; - virtual void DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); + virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); }; @@ -337,9 +337,9 @@ public: ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow ); ~ImplStdBorderWindowView(); - virtual BOOL MouseMove( const MouseEvent& rMEvt ); - virtual BOOL MouseButtonDown( const MouseEvent& rMEvt ); - virtual BOOL Tracking( const TrackingEvent& rTEvt ); + virtual sal_Bool MouseMove( const MouseEvent& rMEvt ); + virtual sal_Bool MouseButtonDown( const MouseEvent& rMEvt ); + virtual sal_Bool Tracking( const TrackingEvent& rTEvt ); virtual String RequestHelp( const Point& rPos, Rectangle& rHelpRect ); virtual Rectangle GetMenuRect() const; @@ -347,7 +347,7 @@ public: virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; virtual long CalcTitleWidth() const; - virtual void DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); + virtual void DrawWindow( sal_uInt16 nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); }; diff --git a/vcl/inc/vcl/btndlg.hxx b/vcl/inc/vcl/btndlg.hxx index a3bfaf55caad..ec537f517374 100644 --- a/vcl/inc/vcl/btndlg.hxx +++ b/vcl/inc/vcl/btndlg.hxx @@ -42,13 +42,13 @@ class PushButton; // - ButtonDialog-Types - // ---------------------- -#define BUTTONDIALOG_BUTTON_NOTFOUND ((USHORT)0xFFFF) +#define BUTTONDIALOG_BUTTON_NOTFOUND ((sal_uInt16)0xFFFF) -#define BUTTONDIALOG_DEFBUTTON ((USHORT)0x0001) -#define BUTTONDIALOG_OKBUTTON ((USHORT)0x0002) -#define BUTTONDIALOG_CANCELBUTTON ((USHORT)0x0004) -#define BUTTONDIALOG_HELPBUTTON ((USHORT)0x0008) -#define BUTTONDIALOG_FOCUSBUTTON ((USHORT)0x0010) +#define BUTTONDIALOG_DEFBUTTON ((sal_uInt16)0x0001) +#define BUTTONDIALOG_OKBUTTON ((sal_uInt16)0x0002) +#define BUTTONDIALOG_CANCELBUTTON ((sal_uInt16)0x0004) +#define BUTTONDIALOG_HELPBUTTON ((sal_uInt16)0x0008) +#define BUTTONDIALOG_FOCUSBUTTON ((sal_uInt16)0x0010) // ---------------- // - ButtonDialog - @@ -61,14 +61,14 @@ private: Size maPageSize; Size maCtrlSize; long mnButtonSize; - USHORT mnCurButtonId; - USHORT mnFocusButtonId; - BOOL mbFormat; + sal_uInt16 mnCurButtonId; + sal_uInt16 mnFocusButtonId; + sal_Bool mbFormat; Link maClickHdl; SAL_DLLPRIVATE void ImplInitButtonDialogData(); - SAL_DLLPRIVATE PushButton* ImplCreatePushButton( USHORT nBtnFlags ); - SAL_DLLPRIVATE ImplBtnDlgItem* ImplGetItem( USHORT nId ) const; + SAL_DLLPRIVATE PushButton* ImplCreatePushButton( sal_uInt16 nBtnFlags ); + SAL_DLLPRIVATE ImplBtnDlgItem* ImplGetItem( sal_uInt16 nId ) const; DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* pBtn ); SAL_DLLPRIVATE void ImplPosControls(); @@ -92,25 +92,25 @@ public: void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } const Size& GetPageSizePixel() const { return maPageSize; } - USHORT GetCurButtonId() const { return mnCurButtonId; } + sal_uInt16 GetCurButtonId() const { return mnCurButtonId; } - void AddButton( const XubString& rText, USHORT nId, USHORT nBtnFlags, long nSepPixel = 0 ); - void AddButton( StandardButtonType eType, USHORT nId, USHORT nBtnFlags, long nSepPixel = 0 ); - void AddButton( PushButton* pBtn, USHORT nId, USHORT nBtnFlags, long nSepPixel = 0 ); - void RemoveButton( USHORT nId ); + void AddButton( const XubString& rText, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 ); + void AddButton( StandardButtonType eType, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 ); + void AddButton( PushButton* pBtn, sal_uInt16 nId, sal_uInt16 nBtnFlags, long nSepPixel = 0 ); + void RemoveButton( sal_uInt16 nId ); void Clear(); - USHORT GetButtonCount() const; - USHORT GetButtonId( USHORT nButton ) const; - PushButton* GetPushButton( USHORT nId ) const; - void SetButtonText( USHORT nId, const XubString& rText ); - XubString GetButtonText( USHORT nId ) const; - void SetButtonHelpText( USHORT nId, const XubString& rText ); - XubString GetButtonHelpText( USHORT nId ) const; - void SetButtonHelpId( USHORT nId, ULONG nHelpId ); - ULONG GetButtonHelpId( USHORT nId ) const; - - void SetFocusButton( USHORT nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; } - USHORT GetFocusButton() const { return mnFocusButtonId; } + sal_uInt16 GetButtonCount() const; + sal_uInt16 GetButtonId( sal_uInt16 nButton ) const; + PushButton* GetPushButton( sal_uInt16 nId ) const; + void SetButtonText( sal_uInt16 nId, const XubString& rText ); + XubString GetButtonText( sal_uInt16 nId ) const; + void SetButtonHelpText( sal_uInt16 nId, const XubString& rText ); + XubString GetButtonHelpText( sal_uInt16 nId ) const; + void SetButtonHelpId( sal_uInt16 nId, const rtl::OString& rHelpId ); + rtl::OString GetButtonHelpId( sal_uInt16 nId ) const; + + void SetFocusButton( sal_uInt16 nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; } + sal_uInt16 GetFocusButton() const { return mnFocusButtonId; } void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } const Link& GetClickHdl() const { return maClickHdl; } diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx index 41d3899366bf..9205f9df7661 100644 --- a/vcl/inc/vcl/button.hxx +++ b/vcl/inc/vcl/button.hxx @@ -56,17 +56,17 @@ private: SAL_DLLPRIVATE Button (const Button &); SAL_DLLPRIVATE Button & operator= (const Button &); public: - SAL_DLLPRIVATE USHORT ImplGetButtonState() const; - SAL_DLLPRIVATE USHORT& ImplGetButtonState(); - SAL_DLLPRIVATE USHORT ImplGetTextStyle( XubString& rText, WinBits nWinStyle, ULONG nDrawFlags ); + SAL_DLLPRIVATE sal_uInt16 ImplGetButtonState() const; + SAL_DLLPRIVATE sal_uInt16& ImplGetButtonState(); + SAL_DLLPRIVATE sal_uInt16 ImplGetTextStyle( XubString& rText, WinBits nWinStyle, sal_uLong nDrawFlags ); SAL_DLLPRIVATE void ImplDrawAlignedImage( OutputDevice* pDev, Point& rPos, Size& rSize, - BOOL bLayout, ULONG nImageSep, ULONG nDrawFlags, - USHORT nTextStyle, Rectangle *pSymbolRect=NULL, bool bAddImageSep = false ); + sal_Bool bLayout, sal_uLong nImageSep, sal_uLong nDrawFlags, + sal_uInt16 nTextStyle, Rectangle *pSymbolRect=NULL, bool bAddImageSep = false ); SAL_DLLPRIVATE void ImplSetFocusRect( const Rectangle &rFocusRect ); SAL_DLLPRIVATE const Rectangle& ImplGetFocusRect() const; SAL_DLLPRIVATE void ImplSetSymbolAlign( SymbolAlign eAlign ); SAL_DLLPRIVATE SymbolAlign ImplGetSymbolAlign() const; - SAL_DLLPRIVATE void ImplSetSmallSymbol( BOOL bSmall = TRUE ); + SAL_DLLPRIVATE void ImplSetSmallSymbol( sal_Bool bSmall = sal_True ); SAL_DLLPRIVATE const Rectangle& ImplGetSymbolRect() const; SAL_DLLPRIVATE void ImplSetSymbolRect(const Rectangle&); @@ -79,7 +79,6 @@ public: ~Button(); virtual void Click(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } const Link& GetClickHdl() const { return maClickHdl; } @@ -87,19 +86,19 @@ public: static XubString GetStandardText( StandardButtonType eButton ); static XubString GetStandardHelpText( StandardButtonType eButton ); - BOOL SetModeImage( const Image& rImage ); + sal_Bool SetModeImage( const Image& rImage ); const Image GetModeImage( ) const; - BOOL HasImage() const; + sal_Bool HasImage() const; void SetImageAlign( ImageAlign eAlign ); ImageAlign GetImageAlign() const; - BOOL SetModeBitmap( const BitmapEx& rBitmap ); + sal_Bool SetModeBitmap( const BitmapEx& rBitmap ); BitmapEx GetModeBitmap( ) const; - void EnableImageDisplay( BOOL bEnable ); - BOOL IsImageDisplayEnabled(); - void EnableTextDisplay( BOOL bEnable ); - BOOL IsTextDisplayEnabled(); + void EnableImageDisplay( sal_Bool bEnable ); + sal_Bool IsImageDisplayEnabled(); + void EnableTextDisplay( sal_Bool bEnable ); + sal_Bool IsTextDisplayEnabled(); void SetFocusRect( const Rectangle& rFocusRect ); const Rectangle& GetFocusRect() const; @@ -111,8 +110,8 @@ public: // - PushButton-Types - // -------------------- -#define PUSHBUTTON_DROPDOWN_TOOLBOX ((USHORT)0x0001) -#define PUSHBUTTON_DROPDOWN_MENUBUTTON ((USHORT)0x0002) +#define PUSHBUTTON_DROPDOWN_TOOLBOX ((sal_uInt16)0x0001) +#define PUSHBUTTON_DROPDOWN_MENUBUTTON ((sal_uInt16)0x0002) // -------------- // - PushButton - @@ -124,21 +123,21 @@ protected: SymbolType meSymbol; TriState meState; TriState meSaveValue; - USHORT mnDDStyle; - BOOL mbPressed; - BOOL mbInUserDraw; + sal_uInt16 mnDDStyle; + sal_Bool mbPressed; + sal_Bool mbInUserDraw; Link maToggleHdl; SAL_DLLPRIVATE void ImplInitPushButtonData(); SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SAL_DLLPRIVATE void ImplDrawPushButtonContent( OutputDevice* pDev, ULONG nDrawFlags, - const Rectangle& rRect, bool bLayout ); + SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplDrawPushButtonContent( OutputDevice* pDev, sal_uLong nDrawFlags, + const Rectangle& rRect, bool bLayout, bool bMenuBtnSep ); SAL_DLLPRIVATE void ImplDrawPushButton( bool bLayout = false ); using Button::ImplGetTextStyle; - SAL_DLLPRIVATE USHORT ImplGetTextStyle( ULONG nDrawFlags ) const; - SAL_DLLPRIVATE BOOL IsSymbol() const { return ( (meSymbol != SYMBOL_NOSYMBOL) && (meSymbol != SYMBOL_IMAGE) ); } - SAL_DLLPRIVATE BOOL IsImage() const { return Button::HasImage(); } + SAL_DLLPRIVATE sal_uInt16 ImplGetTextStyle( sal_uLong nDrawFlags ) const; + SAL_DLLPRIVATE sal_Bool IsSymbol() const { return ( (meSymbol != SYMBOL_NOSYMBOL) && (meSymbol != SYMBOL_IMAGE) ); } + SAL_DLLPRIVATE sal_Bool IsImage() const { return Button::HasImage(); } // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE PushButton( const PushButton & ); @@ -149,10 +148,10 @@ protected: using Control::ImplInitSettings; using Window::ImplInit; public: - SAL_DLLPRIVATE void ImplSetDefButton( BOOL bSet ); - SAL_DLLPRIVATE static void ImplDrawPushButtonFrame( Window* pDev, Rectangle& rRect, USHORT nStyle ); - SAL_DLLPRIVATE static BOOL ImplHitTestPushButton( Window* pDev, const Point& rPos ); - SAL_DLLPRIVATE BOOL ImplIsDefButton() const; + SAL_DLLPRIVATE void ImplSetDefButton( sal_Bool bSet ); + SAL_DLLPRIVATE static void ImplDrawPushButtonFrame( Window* pDev, Rectangle& rRect, sal_uInt16 nStyle ); + SAL_DLLPRIVATE static sal_Bool ImplHitTestPushButton( Window* pDev, const Point& rPos ); + SAL_DLLPRIVATE sal_Bool ImplIsDefButton() const; protected: PushButton( WindowType nType ); @@ -172,7 +171,7 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ); virtual void KeyUp( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void GetFocus(); virtual void LoseFocus(); @@ -188,17 +187,17 @@ public: void SetSymbolAlign( SymbolAlign eAlign ); SymbolAlign GetSymbolAlign() const; - void SetDropDown( USHORT nStyle ); - USHORT GetDropDown() const { return mnDDStyle; } + void SetDropDown( sal_uInt16 nStyle ); + sal_uInt16 GetDropDown() const { return mnDDStyle; } void SetState( TriState eState ); TriState GetState() const { return meState; } - void Check( BOOL bCheck = TRUE ); - BOOL IsChecked() const; + void Check( sal_Bool bCheck = sal_True ); + sal_Bool IsChecked() const; - void SetPressed( BOOL bPressed ); - BOOL IsPressed() const { return mbPressed; } + void SetPressed( sal_Bool bPressed ); + sal_Bool IsPressed() const { return mbPressed; } void EndSelection(); @@ -212,12 +211,12 @@ public: const Link& GetToggleHdl() const { return maToggleHdl; } }; -inline void PushButton::Check( BOOL bCheck ) +inline void PushButton::Check( sal_Bool bCheck ) { SetState( (bCheck) ? STATE_CHECK : STATE_NOCHECK ); } -inline BOOL PushButton::IsChecked() const +inline sal_Bool PushButton::IsChecked() const { return (GetState() == STATE_CHECK); } @@ -298,17 +297,17 @@ private: Rectangle maStateRect; Rectangle maMouseRect; Image maImage; - BOOL mbChecked; - BOOL mbSaveValue; - BOOL mbRadioCheck; - BOOL mbStateChanged; + sal_Bool mbChecked; + sal_Bool mbSaveValue; + sal_Bool mbRadioCheck; + sal_Bool mbStateChanged; Link maToggleHdl; SAL_DLLPRIVATE void ImplInitRadioButtonData(); SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); SAL_DLLPRIVATE void ImplDrawRadioButtonState(); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, const Size& rImageSize, Rectangle& rStateRect, Rectangle& rMouseRect, bool bLayout = false ); @@ -329,7 +328,7 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - SAL_DLLPRIVATE void ImplCallClick( BOOL bGrabFocus = FALSE, USHORT nFocusFlags = 0 ); + SAL_DLLPRIVATE void ImplCallClick( sal_Bool bGrabFocus = sal_False, sal_uInt16 nFocusFlags = 0 ); SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); protected: @@ -358,7 +357,7 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ); virtual void KeyUp( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void GetFocus(); virtual void LoseFocus(); @@ -368,22 +367,22 @@ public: virtual void Toggle(); - BOOL IsStateChanged() const { return mbStateChanged; } + sal_Bool IsStateChanged() const { return mbStateChanged; } - void EnableRadioCheck( BOOL bRadioCheck = TRUE ) { mbRadioCheck = bRadioCheck; } - BOOL IsRadioCheckEnabled() const { return mbRadioCheck; } + void EnableRadioCheck( sal_Bool bRadioCheck = sal_True ) { mbRadioCheck = bRadioCheck; } + sal_Bool IsRadioCheckEnabled() const { return mbRadioCheck; } - BOOL SetModeRadioImage( const Image& rImage ); + sal_Bool SetModeRadioImage( const Image& rImage ); const Image& GetModeRadioImage( ) const; - void SetState( BOOL bCheck ); - void Check( BOOL bCheck = TRUE ); - BOOL IsChecked() const { return mbChecked; } + void SetState( sal_Bool bCheck ); + void Check( sal_Bool bCheck = sal_True ); + sal_Bool IsChecked() const { return mbChecked; } void SaveValue() { mbSaveValue = IsChecked(); } - BOOL GetSavedValue() const { return mbSaveValue; } + sal_Bool GetSavedValue() const { return mbSaveValue; } - static Image GetRadioImage( const AllSettings& rSettings, USHORT nFlags ); + static Image GetRadioImage( const AllSettings& rSettings, sal_uInt16 nFlags ); Size CalcMinimumSize( long nMaxWidth = 0 ) const; virtual Size GetOptimalSize(WindowSizeType eType) const; @@ -418,14 +417,14 @@ private: Rectangle maMouseRect; TriState meState; TriState meSaveValue; - BOOL mbTriState; + sal_Bool mbTriState; Link maToggleHdl; SAL_DLLPRIVATE void ImplInitCheckBoxData(); SAL_DLLPRIVATE WinBits ImplInitStyle( const Window* pPrevWindow, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); SAL_DLLPRIVATE void ImplInvalidateOrDrawCheckBoxState(); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, const Size& rImageSize, Rectangle& rStateRect, Rectangle& rMouseRect, bool bLayout ); @@ -463,7 +462,7 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ); virtual void KeyUp( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void GetFocus(); virtual void LoseFocus(); @@ -476,16 +475,16 @@ public: void SetState( TriState eState ); TriState GetState() const { return meState; } - void Check( BOOL bCheck = TRUE ); - BOOL IsChecked() const; + void Check( sal_Bool bCheck = sal_True ); + sal_Bool IsChecked() const; - void EnableTriState( BOOL bTriState = TRUE ); - BOOL IsTriStateEnabled() const { return mbTriState; } + void EnableTriState( sal_Bool bTriState = sal_True ); + sal_Bool IsTriStateEnabled() const { return mbTriState; } void SaveValue() { meSaveValue = GetState(); } TriState GetSavedValue() const { return meSaveValue; } - static Image GetCheckImage( const AllSettings& rSettings, USHORT nFlags ); + static Image GetCheckImage( const AllSettings& rSettings, sal_uInt16 nFlags ); Size CalcMinimumSize( long nMaxWidth = 0 ) const; virtual Size GetOptimalSize(WindowSizeType eType) const; @@ -494,12 +493,12 @@ public: const Link& GetToggleHdl() const { return maToggleHdl; } }; -inline void CheckBox::Check( BOOL bCheck ) +inline void CheckBox::Check( sal_Bool bCheck ) { SetState( (bCheck) ? STATE_CHECK : STATE_NOCHECK ); } -inline BOOL CheckBox::IsChecked() const +inline sal_Bool CheckBox::IsChecked() const { return (GetState() == STATE_CHECK); } diff --git a/vcl/inc/vcl/canvasbitmap.hxx b/vcl/inc/vcl/canvasbitmap.hxx index 4c4ef77ff5f7..e0773257b029 100644 --- a/vcl/inc/vcl/canvasbitmap.hxx +++ b/vcl/inc/vcl/canvasbitmap.hxx @@ -67,7 +67,7 @@ namespace unotools bool m_bSwap; bool m_bPalette; - SAL_DLLPRIVATE void setComponentInfo( ULONG redShift, ULONG greenShift, ULONG blueShift ); + SAL_DLLPRIVATE void setComponentInfo( sal_uLong redShift, sal_uLong greenShift, sal_uLong blueShift ); virtual ~VclCanvasBitmap(); diff --git a/vcl/inc/vcl/cmdevt.hxx b/vcl/inc/vcl/cmdevt.hxx index 529dba50fb3d..c71160b3fce1 100644 --- a/vcl/inc/vcl/cmdevt.hxx +++ b/vcl/inc/vcl/cmdevt.hxx @@ -39,54 +39,54 @@ // - CommandExtTextInputData - // --------------------------- -#define EXTTEXTINPUT_ATTR_GRAYWAVELINE ((USHORT)0x0100) -#define EXTTEXTINPUT_ATTR_UNDERLINE ((USHORT)0x0200) -#define EXTTEXTINPUT_ATTR_BOLDUNDERLINE ((USHORT)0x0400) -#define EXTTEXTINPUT_ATTR_DOTTEDUNDERLINE ((USHORT)0x0800) -#define EXTTEXTINPUT_ATTR_DASHDOTUNDERLINE ((USHORT)0x1000) -#define EXTTEXTINPUT_ATTR_HIGHLIGHT ((USHORT)0x2000) -#define EXTTEXTINPUT_ATTR_REDTEXT ((USHORT)0x4000) -#define EXTTEXTINPUT_ATTR_HALFTONETEXT ((USHORT)0x8000) - -#define EXTTEXTINPUT_CURSOR_INVISIBLE ((USHORT)0x0001) -#define EXTTEXTINPUT_CURSOR_OVERWRITE ((USHORT)0x0002) +#define EXTTEXTINPUT_ATTR_GRAYWAVELINE ((sal_uInt16)0x0100) +#define EXTTEXTINPUT_ATTR_UNDERLINE ((sal_uInt16)0x0200) +#define EXTTEXTINPUT_ATTR_BOLDUNDERLINE ((sal_uInt16)0x0400) +#define EXTTEXTINPUT_ATTR_DOTTEDUNDERLINE ((sal_uInt16)0x0800) +#define EXTTEXTINPUT_ATTR_DASHDOTUNDERLINE ((sal_uInt16)0x1000) +#define EXTTEXTINPUT_ATTR_HIGHLIGHT ((sal_uInt16)0x2000) +#define EXTTEXTINPUT_ATTR_REDTEXT ((sal_uInt16)0x4000) +#define EXTTEXTINPUT_ATTR_HALFTONETEXT ((sal_uInt16)0x8000) + +#define EXTTEXTINPUT_CURSOR_INVISIBLE ((sal_uInt16)0x0001) +#define EXTTEXTINPUT_CURSOR_OVERWRITE ((sal_uInt16)0x0002) class VCL_DLLPUBLIC CommandExtTextInputData { private: XubString maText; - USHORT* mpTextAttr; + sal_uInt16* mpTextAttr; xub_StrLen mnCursorPos; xub_StrLen mnDeltaStart; xub_StrLen mnOldTextLen; - USHORT mnCursorFlags; - BOOL mbOnlyCursor; + sal_uInt16 mnCursorFlags; + sal_Bool mbOnlyCursor; public: CommandExtTextInputData(); CommandExtTextInputData( const XubString& rText, - const USHORT* pTextAttr, + const sal_uInt16* pTextAttr, xub_StrLen nCursorPos, - USHORT nCursorFlags, + sal_uInt16 nCursorFlags, xub_StrLen nDeltaStart, xub_StrLen nOldTextLen, - BOOL bOnlyCursor ); + sal_Bool bOnlyCursor ); CommandExtTextInputData( const CommandExtTextInputData& rData ); ~CommandExtTextInputData(); const XubString& GetText() const { return maText; } - const USHORT* GetTextAttr() const { return mpTextAttr; } - USHORT GetCharTextAttr( USHORT nIndex ) const; + const sal_uInt16* GetTextAttr() const { return mpTextAttr; } + sal_uInt16 GetCharTextAttr( sal_uInt16 nIndex ) const; xub_StrLen GetCursorPos() const { return mnCursorPos; } - BOOL IsCursorVisible() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_INVISIBLE) == 0; } - BOOL IsCursorOverwrite() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_OVERWRITE) != 0; } - USHORT GetCursorFlags() const { return mnCursorFlags; } + sal_Bool IsCursorVisible() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_INVISIBLE) == 0; } + sal_Bool IsCursorOverwrite() const { return (mnCursorFlags & EXTTEXTINPUT_CURSOR_OVERWRITE) != 0; } + sal_uInt16 GetCursorFlags() const { return mnCursorFlags; } xub_StrLen GetDeltaStart() const { return mnDeltaStart; } xub_StrLen GetOldTextLen() const { return mnOldTextLen; } - BOOL IsOnlyCursorChanged() const { return mbOnlyCursor; } + sal_Bool IsOnlyCursorChanged() const { return mbOnlyCursor; } }; -inline USHORT CommandExtTextInputData::GetCharTextAttr( USHORT nIndex ) const +inline sal_uInt16 CommandExtTextInputData::GetCharTextAttr( sal_uInt16 nIndex ) const { if ( mpTextAttr && (nIndex < maText.Len()) ) return mpTextAttr[nIndex]; @@ -124,47 +124,47 @@ inline CommandInputContextData::CommandInputContextData( LanguageType eLang ) // - CommandWheelData - // -------------------- -#define COMMAND_WHEEL_SCROLL ((USHORT)0x0001) -#define COMMAND_WHEEL_ZOOM ((USHORT)0x0002) -#define COMMAND_WHEEL_DATAZOOM ((USHORT)0x0004) +#define COMMAND_WHEEL_SCROLL ((sal_uInt16)0x0001) +#define COMMAND_WHEEL_ZOOM ((sal_uInt16)0x0002) +#define COMMAND_WHEEL_DATAZOOM ((sal_uInt16)0x0004) -#define COMMAND_WHEEL_PAGESCROLL ((ULONG)0xFFFFFFFF) +#define COMMAND_WHEEL_PAGESCROLL ((sal_uLong)0xFFFFFFFF) class VCL_DLLPUBLIC CommandWheelData { private: long mnDelta; long mnNotchDelta; - ULONG mnLines; - USHORT mnMode; - USHORT mnCode; - BOOL mbHorz; - BOOL mbDeltaIsPixel; + sal_uLong mnLines; + sal_uInt16 mnMode; + sal_uInt16 mnCode; + sal_Bool mbHorz; + sal_Bool mbDeltaIsPixel; public: CommandWheelData(); CommandWheelData( long nWheelDelta, long nWheelNotchDelta, - ULONG nScrollLines, - USHORT nWheelMode, USHORT nKeyModifier, - BOOL bHorz = FALSE, BOOL bDeltaIsPixel = FALSE ); + sal_uLong nScrollLines, + sal_uInt16 nWheelMode, sal_uInt16 nKeyModifier, + sal_Bool bHorz = sal_False, sal_Bool bDeltaIsPixel = sal_False ); long GetDelta() const { return mnDelta; } long GetNotchDelta() const { return mnNotchDelta; } - ULONG GetScrollLines() const { return mnLines; } - BOOL IsHorz() const { return mbHorz; } - BOOL IsDeltaPixel() const { return mbDeltaIsPixel; } + sal_uLong GetScrollLines() const { return mnLines; } + sal_Bool IsHorz() const { return mbHorz; } + sal_Bool IsDeltaPixel() const { return mbDeltaIsPixel; } - USHORT GetMode() const { return mnMode; } + sal_uInt16 GetMode() const { return mnMode; } - USHORT GetModifier() const + sal_uInt16 GetModifier() const { return (mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2)); } bool IsShift() const { return ((mnCode & KEY_SHIFT) != 0); } - BOOL IsMod1() const + sal_Bool IsMod1() const { return ((mnCode & KEY_MOD1) != 0); } - BOOL IsMod2() const + sal_Bool IsMod2() const { return ((mnCode & KEY_MOD2) != 0); } - BOOL IsMod3() const + sal_Bool IsMod3() const { return ((mnCode & KEY_MOD3) != 0); } }; @@ -175,14 +175,14 @@ inline CommandWheelData::CommandWheelData() mnLines = 0; mnMode = 0; mnCode = 0; - mbHorz = FALSE; - mbDeltaIsPixel = FALSE; + mbHorz = sal_False; + mbDeltaIsPixel = sal_False; } inline CommandWheelData::CommandWheelData( long nWheelDelta, long nWheelNotchDelta, - ULONG nScrollLines, - USHORT nWheelMode, USHORT nKeyModifier, - BOOL bHorz, BOOL bDeltaIsPixel ) + sal_uLong nScrollLines, + sal_uInt16 nWheelMode, sal_uInt16 nKeyModifier, + sal_Bool bHorz, sal_Bool bDeltaIsPixel ) { mnDelta = nWheelDelta; mnNotchDelta = nWheelNotchDelta; @@ -237,17 +237,17 @@ class VCL_DLLPUBLIC CommandVoiceData { private: XubString maText; - USHORT mnCommand; + sal_uInt16 mnCommand; DictationCommandType meType; public: CommandVoiceData(); CommandVoiceData( const XubString& rStr, DictationCommandType eType, - USHORT nCommand ); + sal_uInt16 nCommand ); const XubString& GetText() const { return maText; } - USHORT GetCommand() const { return mnCommand; } + sal_uInt16 GetCommand() const { return mnCommand; } DictationCommandType GetType() const { return meType; } }; @@ -259,7 +259,7 @@ inline CommandVoiceData::CommandVoiceData() inline CommandVoiceData::CommandVoiceData( const XubString& rStr, DictationCommandType eType, - USHORT nCommand ) : + sal_uInt16 nCommand ) : maText( rStr ), mnCommand( nCommand ), meType( eType ) @@ -273,26 +273,26 @@ inline CommandVoiceData::CommandVoiceData( const XubString& rStr, class VCL_DLLPUBLIC CommandModKeyData { private: - USHORT mnCode; + sal_uInt16 mnCode; public: CommandModKeyData(); - CommandModKeyData( USHORT nCode ); + CommandModKeyData( sal_uInt16 nCode ); bool IsShift() const { return (mnCode & MODKEY_SHIFT) ? true : false; } - BOOL IsMod1() const { return (mnCode & MODKEY_MOD1) ? TRUE : FALSE; } - BOOL IsMod2() const { return (mnCode & MODKEY_MOD2) ? TRUE : FALSE; } - BOOL IsMod3() const { return (mnCode & MODKEY_MOD3) ? TRUE : FALSE; } - - BOOL IsLeftShift() const { return (mnCode & MODKEY_LSHIFT) ? TRUE : FALSE; } - BOOL IsLeftMod1() const { return (mnCode & MODKEY_LMOD1) ? TRUE : FALSE; } - BOOL IsLeftMod2() const { return (mnCode & MODKEY_LMOD2) ? TRUE : FALSE; } - BOOL IsLeftMod3() const { return (mnCode & MODKEY_LMOD3) ? TRUE : FALSE; } - - BOOL IsRightShift() const { return (mnCode & MODKEY_RSHIFT) ? TRUE : FALSE; } - BOOL IsRightMod1() const { return (mnCode & MODKEY_RMOD1) ? TRUE : FALSE; } - BOOL IsRightMod2() const { return (mnCode & MODKEY_RMOD2) ? TRUE : FALSE; } - BOOL IsRightMod3() const { return (mnCode & MODKEY_RMOD3) ? TRUE : FALSE; } + sal_Bool IsMod1() const { return (mnCode & MODKEY_MOD1) ? sal_True : sal_False; } + sal_Bool IsMod2() const { return (mnCode & MODKEY_MOD2) ? sal_True : sal_False; } + sal_Bool IsMod3() const { return (mnCode & MODKEY_MOD3) ? sal_True : sal_False; } + + sal_Bool IsLeftShift() const { return (mnCode & MODKEY_LSHIFT) ? sal_True : sal_False; } + sal_Bool IsLeftMod1() const { return (mnCode & MODKEY_LMOD1) ? sal_True : sal_False; } + sal_Bool IsLeftMod2() const { return (mnCode & MODKEY_LMOD2) ? sal_True : sal_False; } + sal_Bool IsLeftMod3() const { return (mnCode & MODKEY_LMOD3) ? sal_True : sal_False; } + + sal_Bool IsRightShift() const { return (mnCode & MODKEY_RSHIFT) ? sal_True : sal_False; } + sal_Bool IsRightMod1() const { return (mnCode & MODKEY_RMOD1) ? sal_True : sal_False; } + sal_Bool IsRightMod2() const { return (mnCode & MODKEY_RMOD2) ? sal_True : sal_False; } + sal_Bool IsRightMod3() const { return (mnCode & MODKEY_RMOD3) ? sal_True : sal_False; } }; inline CommandModKeyData::CommandModKeyData() @@ -300,7 +300,7 @@ inline CommandModKeyData::CommandModKeyData() mnCode = 0L; } -inline CommandModKeyData::CommandModKeyData( USHORT nCode ) +inline CommandModKeyData::CommandModKeyData( sal_uInt16 nCode ) { mnCode = nCode; } @@ -358,15 +358,15 @@ class VCL_DLLPUBLIC CommandDialogData class VCL_DLLPUBLIC CommandSelectionChangeData { private: - ULONG mnStart; - ULONG mnEnd; + sal_uLong mnStart; + sal_uLong mnEnd; public: CommandSelectionChangeData(); - CommandSelectionChangeData( ULONG nStart, ULONG nEnd ); + CommandSelectionChangeData( sal_uLong nStart, sal_uLong nEnd ); - ULONG GetStart() const { return mnStart; } - ULONG GetEnd() const { return mnEnd; } + sal_uLong GetStart() const { return mnStart; } + sal_uLong GetEnd() const { return mnEnd; } }; inline CommandSelectionChangeData::CommandSelectionChangeData() @@ -374,8 +374,8 @@ inline CommandSelectionChangeData::CommandSelectionChangeData() mnStart = mnEnd = 0; } -inline CommandSelectionChangeData::CommandSelectionChangeData( ULONG nStart, - ULONG nEnd ) +inline CommandSelectionChangeData::CommandSelectionChangeData( sal_uLong nStart, + sal_uLong nEnd ) { mnStart = nStart; mnEnd = nEnd; @@ -385,43 +385,43 @@ inline CommandSelectionChangeData::CommandSelectionChangeData( ULONG nStart, // - CommandEvent - // ---------------- -#define COMMAND_CONTEXTMENU ((USHORT)1) -#define COMMAND_STARTDRAG ((USHORT)2) -#define COMMAND_WHEEL ((USHORT)3) -#define COMMAND_STARTAUTOSCROLL ((USHORT)4) -#define COMMAND_AUTOSCROLL ((USHORT)5) -#define COMMAND_VOICE ((USHORT)6) -#define COMMAND_STARTEXTTEXTINPUT ((USHORT)7) -#define COMMAND_EXTTEXTINPUT ((USHORT)8) -#define COMMAND_ENDEXTTEXTINPUT ((USHORT)9) -#define COMMAND_INPUTCONTEXTCHANGE ((USHORT)10) -#define COMMAND_CURSORPOS ((USHORT)11) -#define COMMAND_PASTESELECTION ((USHORT)12) -#define COMMAND_MODKEYCHANGE ((USHORT)13) -#define COMMAND_HANGUL_HANJA_CONVERSION ((USHORT)14) -#define COMMAND_INPUTLANGUAGECHANGE ((USHORT)15) -#define COMMAND_SHOWDIALOG ((USHORT)16) -#define COMMAND_MEDIA ((USHORT)17) -#define COMMAND_SELECTIONCHANGE ((USHORT)18) -#define COMMAND_PREPARERECONVERSION ((USHORT)19) -#define COMMAND_USER ((USHORT)4096) +#define COMMAND_CONTEXTMENU ((sal_uInt16)1) +#define COMMAND_STARTDRAG ((sal_uInt16)2) +#define COMMAND_WHEEL ((sal_uInt16)3) +#define COMMAND_STARTAUTOSCROLL ((sal_uInt16)4) +#define COMMAND_AUTOSCROLL ((sal_uInt16)5) +#define COMMAND_VOICE ((sal_uInt16)6) +#define COMMAND_STARTEXTTEXTINPUT ((sal_uInt16)7) +#define COMMAND_EXTTEXTINPUT ((sal_uInt16)8) +#define COMMAND_ENDEXTTEXTINPUT ((sal_uInt16)9) +#define COMMAND_INPUTCONTEXTCHANGE ((sal_uInt16)10) +#define COMMAND_CURSORPOS ((sal_uInt16)11) +#define COMMAND_PASTESELECTION ((sal_uInt16)12) +#define COMMAND_MODKEYCHANGE ((sal_uInt16)13) +#define COMMAND_HANGUL_HANJA_CONVERSION ((sal_uInt16)14) +#define COMMAND_INPUTLANGUAGECHANGE ((sal_uInt16)15) +#define COMMAND_SHOWDIALOG ((sal_uInt16)16) +#define COMMAND_MEDIA ((sal_uInt16)17) +#define COMMAND_SELECTIONCHANGE ((sal_uInt16)18) +#define COMMAND_PREPARERECONVERSION ((sal_uInt16)19) +#define COMMAND_USER ((sal_uInt16)4096) class VCL_DLLPUBLIC CommandEvent { private: Point maPos; void* mpData; - USHORT mnCommand; - BOOL mbMouseEvent; + sal_uInt16 mnCommand; + sal_Bool mbMouseEvent; public: CommandEvent(); - CommandEvent( const Point& rMousePos, USHORT nCmd, - BOOL bMEvt = FALSE, const void* pCmdData = NULL ); + CommandEvent( const Point& rMousePos, sal_uInt16 nCmd, + sal_Bool bMEvt = sal_False, const void* pCmdData = NULL ); - USHORT GetCommand() const { return mnCommand; } + sal_uInt16 GetCommand() const { return mnCommand; } const Point& GetMousePosPixel() const { return maPos; } - BOOL IsMouseEvent() const { return mbMouseEvent; } + sal_Bool IsMouseEvent() const { return mbMouseEvent; } void* GetData() const { return mpData; } const CommandExtTextInputData* GetExtTextInputData() const; @@ -439,11 +439,11 @@ inline CommandEvent::CommandEvent() { mpData = NULL; mnCommand = 0; - mbMouseEvent = FALSE; + mbMouseEvent = sal_False; } inline CommandEvent::CommandEvent( const Point& rMousePos, - USHORT nCmd, BOOL bMEvt, const void* pCmdData ) : + sal_uInt16 nCmd, sal_Bool bMEvt, const void* pCmdData ) : maPos( rMousePos ) { mpData = (void*)pCmdData; diff --git a/vcl/inc/vcl/combobox.h b/vcl/inc/vcl/combobox.h index cfcec12d75bc..387c20d544be 100644 --- a/vcl/inc/vcl/combobox.h +++ b/vcl/inc/vcl/combobox.h @@ -29,11 +29,11 @@ #ifndef _SV_COMBOBOX_H #define _SV_COMBOBOX_H -#define COMBOBOX_APPEND ((USHORT)0xFFFF) -#define COMBOBOX_ENTRY_NOTFOUND ((USHORT)0xFFFF) -#define COMBOBOX_ERROR ((USHORT)0xFFFF) +#define COMBOBOX_APPEND ((sal_uInt16)0xFFFF) +#define COMBOBOX_ENTRY_NOTFOUND ((sal_uInt16)0xFFFF) +#define COMBOBOX_ERROR ((sal_uInt16)0xFFFF) -#define COMBOBOX_USERDRAW_SELECTED ((USHORT)0x0001) +#define COMBOBOX_USERDRAW_SELECTED ((sal_uInt16)0x0001) #endif // _SV_COMBOBOX_H diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx index 3ab9f6dfa630..12385c9bd9e2 100644 --- a/vcl/inc/vcl/combobox.hxx +++ b/vcl/inc/vcl/combobox.hxx @@ -51,11 +51,11 @@ private: ImplListBox* mpImplLB; ImplBtn* mpBtn; ImplListBoxFloatingWindow* mpFloatWin; - USHORT mnDDHeight; + sal_uInt16 mnDDHeight; xub_Unicode mcMultiSep; - BOOL mbDDAutoSize : 1; - BOOL mbSyntheticModify : 1; - BOOL mbMatchCase : 1; + sal_Bool mbDDAutoSize : 1; + sal_Bool mbSyntheticModify : 1; + sal_Bool mbMatchCase : 1; Link maSelectHdl; Link maDoubleClickHdl; @@ -81,7 +81,7 @@ protected: protected: ComboBox( WindowType nType ); - BOOL IsDropDownBox() const { return mpFloatWin ? TRUE : FALSE; } + sal_Bool IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; } virtual void FillLayoutData() const; public: @@ -89,7 +89,7 @@ public: ComboBox( Window* pParent, const ResId& rResId ); ~ComboBox(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual long Notify( NotifyEvent& rNEvt ); @@ -104,7 +104,7 @@ public: virtual const Wallpaper& GetDisplayBackground() const; - virtual void SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, USHORT nFlags = WINDOW_POSSIZE_ALL ); + virtual void SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) { Edit::SetPosSizePixel( rNewPos, rNewSize ); } void SetDropDownSizePixel( const Size& rNewSize ) @@ -115,56 +115,56 @@ public: // returns empty rectangle in DropDown mode, // else it returns the PosSize of the ListBox - void SetDropDownLineCount( USHORT nLines ); - USHORT GetDropDownLineCount() const; + void SetDropDownLineCount( sal_uInt16 nLines ); + sal_uInt16 GetDropDownLineCount() const; - void EnableAutoSize( BOOL bAuto ); - BOOL IsAutoSizeEnabled() const { return mbDDAutoSize; } + void EnableAutoSize( sal_Bool bAuto ); + sal_Bool IsAutoSizeEnabled() const { return mbDDAutoSize; } - void EnableDDAutoWidth( BOOL b ); - BOOL IsDDAutoWidthEnabled() const; + void EnableDDAutoWidth( sal_Bool b ); + sal_Bool IsDDAutoWidthEnabled() const; void SetText( const XubString& rStr ); void SetText( const XubString& rStr, const Selection& rNewSelection ); - USHORT InsertEntry( const XubString& rStr, USHORT nPos = COMBOBOX_APPEND ); - USHORT InsertEntry( const XubString& rStr, const Image& rImage, USHORT nPos = COMBOBOX_APPEND ); + sal_uInt16 InsertEntry( const XubString& rStr, sal_uInt16 nPos = COMBOBOX_APPEND ); + sal_uInt16 InsertEntry( const XubString& rStr, const Image& rImage, sal_uInt16 nPos = COMBOBOX_APPEND ); void RemoveEntry( const XubString& rStr ); - void RemoveEntry( USHORT nPos ); + void RemoveEntry( sal_uInt16 nPos ); void Clear(); - USHORT GetEntryPos( const XubString& rStr ) const; - USHORT GetEntryPos( const void* pData ) const; - Image GetEntryImage( USHORT nPos ) const; - XubString GetEntry( USHORT nPos ) const; - USHORT GetEntryCount() const; + sal_uInt16 GetEntryPos( const XubString& rStr ) const; + sal_uInt16 GetEntryPos( const void* pData ) const; + Image GetEntryImage( sal_uInt16 nPos ) const; + XubString GetEntry( sal_uInt16 nPos ) const; + sal_uInt16 GetEntryCount() const; - BOOL IsTravelSelect() const; - BOOL IsInDropDown() const; + sal_Bool IsTravelSelect() const; + sal_Bool IsInDropDown() const; void ToggleDropDown(); - long CalcWindowSizePixel( USHORT nLines ) const; + long CalcWindowSizePixel( sal_uInt16 nLines ) const; void SetUserItemSize( const Size& rSz ); const Size& GetUserItemSize() const; - void EnableUserDraw( BOOL bUserDraw ); - BOOL IsUserDrawEnabled() const; + void EnableUserDraw( sal_Bool bUserDraw ); + sal_Bool IsUserDrawEnabled() const; - void DrawEntry( const UserDrawEvent& rEvt, BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE ); - void SetBorderStyle( USHORT nBorderStyle ); + void DrawEntry( const UserDrawEvent& rEvt, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False ); + void SetBorderStyle( sal_uInt16 nBorderStyle ); - void SetSeparatorPos( USHORT n ); + void SetSeparatorPos( sal_uInt16 n ); void SetSeparatorPos(); - USHORT GetSeparatorPos() const; + sal_uInt16 GetSeparatorPos() const; - void EnableAutocomplete( BOOL bEnable, BOOL bMatchCase = FALSE ); - BOOL IsAutocompleteEnabled() const; + void EnableAutocomplete( sal_Bool bEnable, sal_Bool bMatchCase = sal_False ); + sal_Bool IsAutocompleteEnabled() const; - void EnableMultiSelection( BOOL bMulti ); - BOOL IsMultiSelectionEnabled() const; + void EnableMultiSelection( sal_Bool bMulti ); + sal_Bool IsMultiSelectionEnabled() const; void SetMultiSelectionSeparator( xub_Unicode cSep ) { mcMultiSep = cSep; } xub_Unicode GetMultiSelectionSeparator() const { return mcMultiSep; } @@ -177,32 +177,32 @@ public: virtual Size GetOptimalSize(WindowSizeType eType) const; Size CalcAdjustedSize( const Size& rPrefSize ) const; using Edit::CalcSize; - Size CalcSize( USHORT nColumns, USHORT nLines ) const; - void GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const; + Size CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; + void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; void SetMRUEntries( const XubString& rEntries, xub_Unicode cSep = ';' ); XubString GetMRUEntries( xub_Unicode cSep = ';' ) const; - void SetMaxMRUCount( USHORT n ); - USHORT GetMaxMRUCount() const; + void SetMaxMRUCount( sal_uInt16 n ); + sal_uInt16 GetMaxMRUCount() const; - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; + void SetEntryData( sal_uInt16 nPos, void* pNewData ); + void* GetEntryData( sal_uInt16 nPos ) const; - void SetTopEntry( USHORT nPos ); - void ShowProminentEntry( USHORT nPos ); - USHORT GetTopEntry() const; + void SetTopEntry( sal_uInt16 nPos ); + void ShowProminentEntry( sal_uInt16 nPos ); + sal_uInt16 GetTopEntry() const; void SetProminentEntryType( ProminentEntry eType ); ProminentEntry GetProminentEntryType() const; - USHORT GetDisplayLineCount() const; + sal_uInt16 GetDisplayLineCount() const; - USHORT GetSelectEntryCount() const; - USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const; - BOOL IsEntryPosSelected( USHORT nPos ) const; - void SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE ); + sal_uInt16 GetSelectEntryCount() const; + sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const; + sal_Bool IsEntryPosSelected( sal_uInt16 nPos ) const; + void SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect = sal_True ); void SetNoSelection(); - Rectangle GetBoundingRectangle( USHORT nItem ) const; + Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const; /** checks whether a certain point lies within the bounds of a list item and returns the item as well as the character position @@ -223,7 +223,7 @@ public: if no item is at that point. */ using Control::GetIndexForPoint; - long GetIndexForPoint( const Point& rPoint, USHORT& rPos ) const; + long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPos ) const; }; #endif // _COMBOBOX_HXX diff --git a/vcl/inc/vcl/ctrl.hxx b/vcl/inc/vcl/ctrl.hxx index 1790096f8cdd..71d7d88d6003 100644 --- a/vcl/inc/vcl/ctrl.hxx +++ b/vcl/inc/vcl/ctrl.hxx @@ -48,7 +48,7 @@ protected: ::vcl::ImplControlData* mpControlData; private: - BOOL mbHasFocus; + sal_Bool mbHasFocus; Link maGetFocusHdl; Link maLoseFocusHdl; @@ -87,8 +87,8 @@ protected: @return if the Control instance has been destroyed in any of the call */ - BOOL ImplCallEventListenersAndHandler( - ULONG nEvent, const Link& rHandler, void* pCaller + sal_Bool ImplCallEventListenersAndHandler( + sal_uLong nEvent, const Link& rHandler, void* pCaller ); /** draws the given text onto the given device @@ -100,7 +100,7 @@ protected: directly at the target device, or taking the reference device into account) when returning. */ void DrawControlText( OutputDevice& _rTargetDevice, Rectangle& _io_rRect, - const XubString& _rStr, USHORT _nStyle, + const XubString& _rStr, sal_uInt16 _nStyle, MetricVector* _pVector, String* _pDisplayText ) const; virtual const Font& @@ -108,7 +108,7 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const; - void ImplInitSettings( const BOOL _bFont, const BOOL _bForeground ); + void ImplInitSettings( const sal_Bool _bFont, const sal_Bool _bForeground ); public: SAL_DLLPRIVATE void ImplClearLayoutData() const; diff --git a/vcl/inc/vcl/cursor.hxx b/vcl/inc/vcl/cursor.hxx index f1f07957db96..8a6ecf482413 100644 --- a/vcl/inc/vcl/cursor.hxx +++ b/vcl/inc/vcl/cursor.hxx @@ -42,7 +42,7 @@ class Window; // - Cursor-Styles - // ----------------- -#define CURSOR_SHADOW ((USHORT)0x0001) +#define CURSOR_SHADOW ((sal_uInt16)0x0001) #define CURSOR_DIRECTION_NONE ((unsigned char)0x00) #define CURSOR_DIRECTION_LTR ((unsigned char)0x01) #define CURSOR_DIRECTION_RTL ((unsigned char)0x02) @@ -61,15 +61,15 @@ private: Size maSize; // Groesse Point maPos; // Position short mnOrientation; // Rotation - USHORT mnStyle; // Style - BOOL mbVisible; // Ist Cursor sichtbar + sal_uInt16 mnStyle; // Style + sal_Bool mbVisible; // Ist Cursor sichtbar unsigned char mnDirection; // indicates direction public: SAL_DLLPRIVATE void ImplDraw(); SAL_DLLPRIVATE void ImplRestore(); DECL_DLLPRIVATE_LINK( ImplTimerHdl, AutoTimer* ); - SAL_DLLPRIVATE void ImplShow( BOOL bDrawDirect = TRUE ); + SAL_DLLPRIVATE void ImplShow( sal_Bool bDrawDirect = sal_True ); SAL_DLLPRIVATE void ImplHide(); SAL_DLLPRIVATE void ImplNew(); @@ -78,12 +78,12 @@ public: Cursor( const Cursor& rCursor ); ~Cursor(); - void SetStyle( USHORT nStyle ); - USHORT GetStyle() const { return mnStyle; } + void SetStyle( sal_uInt16 nStyle ); + sal_uInt16 GetStyle() const { return mnStyle; } void Show(); void Hide(); - BOOL IsVisible() const { return mbVisible; } + sal_Bool IsVisible() const { return mbVisible; } void SetWindow( Window* pWindow ); Window* GetWindow() const { return mpWindow; } @@ -110,8 +110,8 @@ public: unsigned char GetDirection() const { return mnDirection; } Cursor& operator=( const Cursor& rCursor ); - BOOL operator==( const Cursor& rCursor ) const; - BOOL operator!=( const Cursor& rCursor ) const + sal_Bool operator==( const Cursor& rCursor ) const; + sal_Bool operator!=( const Cursor& rCursor ) const { return !(Cursor::operator==( rCursor )); } }; diff --git a/vcl/inc/vcl/cvtgrf.hxx b/vcl/inc/vcl/cvtgrf.hxx index 37a3c271b52c..50d766f5565c 100644 --- a/vcl/inc/vcl/cvtgrf.hxx +++ b/vcl/inc/vcl/cvtgrf.hxx @@ -48,16 +48,16 @@ private: ConvertData* mpConvertData; public: - SAL_DLLPRIVATE ULONG ImplConvert( ULONG nInFormat, void* pInBuffer, ULONG nInBufSize, - void** ppOutBuffer, ULONG nOutFormat ); + SAL_DLLPRIVATE sal_uLong ImplConvert( sal_uLong nInFormat, void* pInBuffer, sal_uLong nInBufSize, + void** ppOutBuffer, sal_uLong nOutFormat ); public: GraphicConverter(); ~GraphicConverter(); - static ULONG Import( SvStream& rIStm, Graphic& rGraphic, ULONG nFormat = CVT_UNKNOWN ); - static ULONG Export( SvStream& rOStm, const Graphic& rGraphic, ULONG nFormat ); + static sal_uLong Import( SvStream& rIStm, Graphic& rGraphic, sal_uLong nFormat = CVT_UNKNOWN ); + static sal_uLong Export( SvStream& rOStm, const Graphic& rGraphic, sal_uLong nFormat ); ConvertData* GetConvertData() { return mpConvertData; } diff --git a/vcl/inc/vcl/cvtsvm.hxx b/vcl/inc/vcl/cvtsvm.hxx index f7c45f50ed16..de4158e08efc 100644 --- a/vcl/inc/vcl/cvtsvm.hxx +++ b/vcl/inc/vcl/cvtsvm.hxx @@ -93,18 +93,18 @@ class Stack; -class VCL_DLLPUBLIC SVMConverter +class VCL_PLUGIN_PUBLIC SVMConverter { private: SAL_DLLPRIVATE void ImplConvertFromSVM1( SvStream& rIStm, GDIMetaFile& rMtf ); SAL_DLLPRIVATE void ImplConvertToSVM1( SvStream& rOStm, GDIMetaFile& rMtf ); - SAL_DLLPRIVATE ULONG ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, - VirtualDevice& rSaveVDev, BOOL& rRop_0_1, + SAL_DLLPRIVATE sal_uLong ImplWriteActions( SvStream& rOStm, GDIMetaFile& rMtf, + VirtualDevice& rSaveVDev, sal_Bool& rRop_0_1, Color& rLineCol, Stack& rLineColStack, rtl_TextEncoding& rActualCharSet ); public: - SVMConverter( SvStream& rIStm, GDIMetaFile& rMtf, ULONG nConvertMode ); + SVMConverter( SvStream& rIStm, GDIMetaFile& rMtf, sal_uLong nConvertMode ); ~SVMConverter() {} private: diff --git a/vcl/inc/vcl/dbggui.hxx b/vcl/inc/vcl/dbggui.hxx index 326111273a1c..61d878de3451 100644 --- a/vcl/inc/vcl/dbggui.hxx +++ b/vcl/inc/vcl/dbggui.hxx @@ -51,7 +51,7 @@ void DbgDialogTest( Window* pWindow ); ->DbgData::nWarningOut and ->DbgData::nTraceOut @see DBG_OUT_USER_CHANNEL_0 */ -USHORT DbgRegisterNamedUserChannel( const XubString& _rChannelUIName, DbgPrintLine pProc ); +sal_uInt16 DbgRegisterNamedUserChannel( const XubString& _rChannelUIName, DbgPrintLine pProc ); #define DBGGUI_INIT() DbgGUIInit() #define DBGGUI_DEINIT() DbgGUIDeInit() diff --git a/vcl/inc/vcl/decoview.hxx b/vcl/inc/vcl/decoview.hxx index f5317c204a29..63434bea2830 100644 --- a/vcl/inc/vcl/decoview.hxx +++ b/vcl/inc/vcl/decoview.hxx @@ -43,45 +43,45 @@ class OutputDevice; // ------------------------ // Flags for DrawSymbol() -#define SYMBOL_DRAW_MONO ((USHORT)0x0001) -#define SYMBOL_DRAW_DISABLE ((USHORT)0x0002) +#define SYMBOL_DRAW_MONO ((sal_uInt16)0x0001) +#define SYMBOL_DRAW_DISABLE ((sal_uInt16)0x0002) // Flags for DrawFrame() -#define FRAME_DRAW_IN ((USHORT)0x0001) -#define FRAME_DRAW_OUT ((USHORT)0x0002) -#define FRAME_DRAW_GROUP ((USHORT)0x0003) -#define FRAME_DRAW_DOUBLEIN ((USHORT)0x0004) -#define FRAME_DRAW_DOUBLEOUT ((USHORT)0x0005) -#define FRAME_DRAW_MENU ((USHORT)0x0010) -#define FRAME_DRAW_WINDOWBORDER ((USHORT)0x0020) -#define FRAME_DRAW_BORDERWINDOWBORDER ((USHORT)0x0040) -#define FRAME_DRAW_MONO ((USHORT)0x1000) -#define FRAME_DRAW_NODRAW ((USHORT)0x8000) -#define FRAME_DRAW_STYLE ((USHORT)0x000F) +#define FRAME_DRAW_IN ((sal_uInt16)0x0001) +#define FRAME_DRAW_OUT ((sal_uInt16)0x0002) +#define FRAME_DRAW_GROUP ((sal_uInt16)0x0003) +#define FRAME_DRAW_DOUBLEIN ((sal_uInt16)0x0004) +#define FRAME_DRAW_DOUBLEOUT ((sal_uInt16)0x0005) +#define FRAME_DRAW_MENU ((sal_uInt16)0x0010) +#define FRAME_DRAW_WINDOWBORDER ((sal_uInt16)0x0020) +#define FRAME_DRAW_BORDERWINDOWBORDER ((sal_uInt16)0x0040) +#define FRAME_DRAW_MONO ((sal_uInt16)0x1000) +#define FRAME_DRAW_NODRAW ((sal_uInt16)0x8000) +#define FRAME_DRAW_STYLE ((sal_uInt16)0x000F) // Flags for DrawHighlightFrame() -#define FRAME_HIGHLIGHT_IN ((USHORT)0x0001) -#define FRAME_HIGHLIGHT_OUT ((USHORT)0x0002) -#define FRAME_HIGHLIGHT_TESTBACKGROUND ((USHORT)0x4000) -#define FRAME_HIGHLIGHT_STYLE ((USHORT)0x000F) +#define FRAME_HIGHLIGHT_IN ((sal_uInt16)0x0001) +#define FRAME_HIGHLIGHT_OUT ((sal_uInt16)0x0002) +#define FRAME_HIGHLIGHT_TESTBACKGROUND ((sal_uInt16)0x4000) +#define FRAME_HIGHLIGHT_STYLE ((sal_uInt16)0x000F) // Flags for DrawButton() -#define BUTTON_DRAW_DEFAULT ((USHORT)0x0001) -#define BUTTON_DRAW_NOLIGHTBORDER ((USHORT)0x0002) -#define BUTTON_DRAW_PRESSED ((USHORT)0x0004) -#define BUTTON_DRAW_CHECKED ((USHORT)0x0008) -#define BUTTON_DRAW_DONTKNOW ((USHORT)0x0010) -#define BUTTON_DRAW_MONO ((USHORT)0x0020) -#define BUTTON_DRAW_NOFILL ((USHORT)0x0040) -#define BUTTON_DRAW_DISABLED ((USHORT)0x0080) -#define BUTTON_DRAW_HIGHLIGHT ((USHORT)0x0100) -#define BUTTON_DRAW_FLAT ((USHORT)0x0200) -#define BUTTON_DRAW_NOTOPLIGHTBORDER ((USHORT)0x0400) -#define BUTTON_DRAW_NOBOTTOMSHADOWBORDER ((USHORT)0x0800) -#define BUTTON_DRAW_NOLEFTLIGHTBORDER ((USHORT)0x1000) -#define BUTTON_DRAW_NOTEXT ((USHORT)0x2000) -#define BUTTON_DRAW_NOIMAGE ((USHORT)0x4000) -#define BUTTON_DRAW_NODRAW ((USHORT)0x8000) +#define BUTTON_DRAW_DEFAULT ((sal_uInt16)0x0001) +#define BUTTON_DRAW_NOLIGHTBORDER ((sal_uInt16)0x0002) +#define BUTTON_DRAW_PRESSED ((sal_uInt16)0x0004) +#define BUTTON_DRAW_CHECKED ((sal_uInt16)0x0008) +#define BUTTON_DRAW_DONTKNOW ((sal_uInt16)0x0010) +#define BUTTON_DRAW_MONO ((sal_uInt16)0x0020) +#define BUTTON_DRAW_NOFILL ((sal_uInt16)0x0040) +#define BUTTON_DRAW_DISABLED ((sal_uInt16)0x0080) +#define BUTTON_DRAW_HIGHLIGHT ((sal_uInt16)0x0100) +#define BUTTON_DRAW_FLAT ((sal_uInt16)0x0200) +#define BUTTON_DRAW_NOTOPLIGHTBORDER ((sal_uInt16)0x0400) +#define BUTTON_DRAW_NOBOTTOMSHADOWBORDER ((sal_uInt16)0x0800) +#define BUTTON_DRAW_NOLEFTLIGHTBORDER ((sal_uInt16)0x1000) +#define BUTTON_DRAW_NOTEXT ((sal_uInt16)0x2000) +#define BUTTON_DRAW_NOIMAGE ((sal_uInt16)0x4000) +#define BUTTON_DRAW_NODRAW ((sal_uInt16)0x8000) // ------------------ // - DecorationView - @@ -97,14 +97,14 @@ public: { mpOutDev = pOutDev; } void DrawSymbol( const Rectangle& rRect, SymbolType eType, - const Color& rColor, USHORT nStyle = 0 ); + const Color& rColor, sal_uInt16 nStyle = 0 ); void DrawFrame( const Rectangle& rRect, const Color& rLeftTopColor, const Color& rRightBottomColor ); void DrawHighlightFrame( const Rectangle& rRect, - USHORT nStyle = FRAME_HIGHLIGHT_OUT ); - Rectangle DrawFrame( const Rectangle& rRect, USHORT nStyle = FRAME_DRAW_OUT ); - Rectangle DrawButton( const Rectangle& rRect, USHORT nStyle ); + sal_uInt16 nStyle = FRAME_HIGHLIGHT_OUT ); + Rectangle DrawFrame( const Rectangle& rRect, sal_uInt16 nStyle = FRAME_DRAW_OUT ); + Rectangle DrawButton( const Rectangle& rRect, sal_uInt16 nStyle ); void DrawSeparator( const Point& rStart, const Point& rStop, bool bVertical = true ); }; diff --git a/vcl/inc/vcl/dialog.hxx b/vcl/inc/vcl/dialog.hxx index 404b18127af8..7b8c3ac032f2 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -50,10 +50,10 @@ private: Dialog* mpPrevExecuteDlg; DialogImpl* mpDialogImpl; long mnMousePositioned; - BOOL mbInExecute; - BOOL mbOldSaveBack; - BOOL mbInClose; - BOOL mbModalMode; + sal_Bool mbInExecute; + sal_Bool mbOldSaveBack; + sal_Bool mbInClose; + sal_Bool mbModalMode; sal_Int8 mnCancelClose; //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event SAL_DLLPRIVATE void ImplInitDialogData(); @@ -71,11 +71,11 @@ protected: SAL_DLLPRIVATE void ImplCenterDialog(); public: - SAL_DLLPRIVATE BOOL IsInClose() const { return mbInClose; } + SAL_DLLPRIVATE sal_Bool IsInClose() const { return mbInClose; } protected: Dialog( WindowType nType ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); public: Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); @@ -86,10 +86,10 @@ public: virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual short Execute(); - BOOL IsInExecute() const { return mbInExecute; } + sal_Bool IsInExecute() const { return mbInExecute; } sal_Int8 GetCloseFlag() const { return mnCancelClose; } //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event void SetCloseFlag( sal_Int8 nCancel ) { mnCancelClose = nCancel; } //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event @@ -99,10 +99,10 @@ public: public: // Link impl: DECL_LINK( MyEndDialogHdl, Dialog* ); <= param is dialog just ended virtual void StartExecuteModal( const Link& rEndDialogHdl ); - BOOL IsStartedModal() const; + sal_Bool IsStartedModal() const; long GetResult() const; private: - BOOL ImplStartExecuteModal(); + sal_Bool ImplStartExecuteModal(); void ImplEndExecuteModal(); public: @@ -115,9 +115,9 @@ public: void GetDrawWindowBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; - void SetModalInputMode( BOOL bModal ); - void SetModalInputMode( BOOL bModal, BOOL bSubModalDialogs ); - BOOL IsModalInputMode() const { return mbModalMode; } + void SetModalInputMode( sal_Bool bModal ); + void SetModalInputMode( sal_Bool bModal, sal_Bool bSubModalDialogs ); + sal_Bool IsModalInputMode() const { return mbModalMode; } void GrabFocusToFirstControl(); }; @@ -149,7 +149,7 @@ public: private: using Window::Show; - void Show( BOOL bVisible = TRUE ); + void Show( sal_Bool bVisible = sal_True ); using Window::Hide; void Hide(); diff --git a/vcl/inc/vcl/displayconnectiondispatch.hxx b/vcl/inc/vcl/displayconnectiondispatch.hxx new file mode 100644 index 000000000000..fea1d0b7cba9 --- /dev/null +++ b/vcl/inc/vcl/displayconnectiondispatch.hxx @@ -0,0 +1,52 @@ +/************************************************************************* +* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2000, 2010 Oracle and/or its affiliates. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +* +************************************************************************/ + +#ifndef INCLUDED_VCL_DISPLAYCONNECTIONDISPATCH_HXX +#define INCLUDED_VCL_DISPLAYCONNECTIONDISPATCH_HXX + +#include "sal/config.h" + +#include "com/sun/star/awt/XDisplayConnection.hpp" +#include "cppuhelper/implbase1.hxx" + +namespace vcl { + +class DisplayConnectionDispatch: + public cppu::WeakImplHelper1< com::sun::star::awt::XDisplayConnection > +{ +public: + virtual bool dispatchEvent(void * pData, int nBytes) = 0; + + virtual bool dispatchErrorEvent(void * pData, int nBytes) = 0; + +protected: + virtual ~DisplayConnectionDispatch() {} +}; + +} + +#endif diff --git a/vcl/inc/vcl/dllapi.h b/vcl/inc/vcl/dllapi.h index dfe59bb5b739..3ec80dd0ec7d 100644 --- a/vcl/inc/vcl/dllapi.h +++ b/vcl/inc/vcl/dllapi.h @@ -38,6 +38,12 @@ #define VCL_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif +#if defined UNX && ! defined MACOS +#define VCL_PLUGIN_PUBLIC VCL_DLLPUBLIC +#else +#define VCL_PLUGIN_PUBLIC SAL_DLLPRIVATE +#endif + #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/dockingarea.hxx b/vcl/inc/vcl/dockingarea.hxx index cc56a57f3315..7ba82d380f58 100644 --- a/vcl/inc/vcl/dockingarea.hxx +++ b/vcl/inc/vcl/dockingarea.hxx @@ -54,7 +54,7 @@ public: void SetAlign( WindowAlign eNewAlign ); WindowAlign GetAlign() const; - BOOL IsHorizontal() const; + sal_Bool IsHorizontal() const; virtual void Paint( const Rectangle& rRect ); virtual void Resize(); diff --git a/vcl/inc/vcl/dockwin.hxx b/vcl/inc/vcl/dockwin.hxx index 4950e267a786..5721d979b188 100644 --- a/vcl/inc/vcl/dockwin.hxx +++ b/vcl/inc/vcl/dockwin.hxx @@ -39,24 +39,24 @@ struct DockingData { Point maMousePos; // in Rectangle maTrackRect; // in/out - BOOL mbFloating; // out - BOOL mbLivemode; // in - BOOL mbInteractive; // in + sal_Bool mbFloating; // out + sal_Bool mbLivemode; // in + sal_Bool mbInteractive; // in DockingData() {}; - DockingData( const Point& rPt, const Rectangle& rRect, BOOL b) : - maMousePos( rPt ), maTrackRect( rRect ), mbFloating( b ), mbLivemode( FALSE ), mbInteractive( TRUE ) + DockingData( const Point& rPt, const Rectangle& rRect, sal_Bool b) : + maMousePos( rPt ), maTrackRect( rRect ), mbFloating( b ), mbLivemode( sal_False ), mbInteractive( sal_True ) {}; }; struct EndDockingData { Rectangle maWindowRect; // in - BOOL mbFloating; // in - BOOL mbCancelled; // in + sal_Bool mbFloating; // in + sal_Bool mbCancelled; // in EndDockingData() {}; - EndDockingData( const Rectangle& rRect, BOOL b, BOOL bCancelled ) : + EndDockingData( const Rectangle& rRect, sal_Bool b, sal_Bool bCancelled ) : maWindowRect( rRect ), mbFloating( b ), mbCancelled( bCancelled ) {}; }; @@ -64,10 +64,10 @@ struct EndDockingData struct EndPopupModeData { Point maFloatingPos; // in - BOOL mbTearoff; // in + sal_Bool mbTearoff; // in EndPopupModeData() {}; - EndPopupModeData( const Point& rPos, BOOL bTearoff ) : + EndPopupModeData( const Point& rPos, sal_Bool bTearoff ) : maFloatingPos( rPos ), mbTearoff( bTearoff ) {}; }; @@ -111,7 +111,7 @@ private: sal_Int32 mnDockRight; sal_Int32 mnDockBottom; WinBits mnFloatBits; - BOOL mbDockCanceled:1, + sal_Bool mbDockCanceled:1, mbFloatPrevented:1, mbDockable:1, mbDocking:1, @@ -129,21 +129,21 @@ private: void ImplInitData(); DECL_LINK( PopupModeEnd, void* ); - void ImplEnableStartDocking( BOOL bEnable = TRUE ) { mbStartDockingEnabled = bEnable; } - BOOL ImplStartDockingEnabled() { return mbStartDockingEnabled; } + void ImplEnableStartDocking( sal_Bool bEnable = sal_True ) { mbStartDockingEnabled = bEnable; } + sal_Bool ImplStartDockingEnabled() { return mbStartDockingEnabled; } public: ImplDockingWindowWrapper( const Window *pWindow ); virtual ~ImplDockingWindowWrapper(); Window* GetWindow() { return mpDockingWindow; } - BOOL ImplStartDocking( const Point& rPos ); + sal_Bool ImplStartDocking( const Point& rPos ); // those methods actually call the corresponding handlers void StartDocking( const Point& rPos, Rectangle& rRect ); - BOOL Docking( const Point& rPos, Rectangle& rRect ); - void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); - BOOL PrepareToggleFloatingMode(); + sal_Bool Docking( const Point& rPos, Rectangle& rRect ); + void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ); + sal_Bool PrepareToggleFloatingMode(); void ToggleFloatingMode(); void SetDragArea( const Rectangle& rRect ); @@ -151,29 +151,29 @@ public: void Lock(); void Unlock(); - BOOL IsLocked() const; + sal_Bool IsLocked() const; - void StartPopupMode( ToolBox* pParentToolBox, ULONG nPopupModeFlags ); - BOOL IsInPopupMode() const; + void StartPopupMode( ToolBox* pParentToolBox, sal_uLong nPopupModeFlags ); + sal_Bool IsInPopupMode() const; - void TitleButtonClick( USHORT nButton ); + void TitleButtonClick( sal_uInt16 nButton ); void Pin(); void Roll(); void PopupModeEnd(); void Resizing( Size& rSize ); - BOOL Close(); + sal_Bool Close(); void Tracking( const TrackingEvent& rTEvt ); long Notify( NotifyEvent& rNEvt ); - void ShowTitleButton( USHORT nButton, BOOL bVisible = TRUE ); - BOOL IsTitleButtonVisible( USHORT nButton ) const; + void ShowTitleButton( sal_uInt16 nButton, sal_Bool bVisible = sal_True ); + sal_Bool IsTitleButtonVisible( sal_uInt16 nButton ) const; - void SetPin( BOOL bPin ); - BOOL IsPined() const; + void SetPin( sal_Bool bPin ); + sal_Bool IsPined() const; void RollUp(); void RollDown(); - BOOL IsRollUp() const; + sal_Bool IsRollUp() const; void SetRollUpOutputSizePixel( const Size& rSize ); Size GetRollUpOutputSizePixel() const; @@ -184,13 +184,13 @@ public: void SetMaxOutputSizePixel( const Size& rSize ); const Size& GetMaxOutputSizePixel() const; - BOOL IsDocking() const { return mbDocking; } - BOOL IsDockable() const { return mbDockable; } - BOOL IsDockingCanceled() const { return mbDockCanceled; } - BOOL IsFloatingPrevented() const { return mbFloatPrevented; } + sal_Bool IsDocking() const { return mbDocking; } + sal_Bool IsDockable() const { return mbDockable; } + sal_Bool IsDockingCanceled() const { return mbDockCanceled; } + sal_Bool IsFloatingPrevented() const { return mbFloatPrevented; } - void SetFloatingMode( BOOL bFloatMode = FALSE ); - BOOL IsFloatingMode() const; + void SetFloatingMode( sal_Bool bFloatMode = sal_False ); + sal_Bool IsFloatingMode() const; FloatingWindow* GetFloatingWindow() const { return mpFloatWin; } void SetFloatingPos( const Point& rNewPos ); @@ -202,7 +202,7 @@ public: virtual void SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, - USHORT nFlags = WINDOW_POSSIZE_ALL ); + sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) { mpDockingWindow->SetPosSizePixel( rNewPos, rNewSize ); } @@ -225,26 +225,26 @@ public: void RemoveWindow( const Window *pWin ); ImplDockingWindowWrapper* GetDockingWindowWrapper( const Window *pWin ); - BOOL IsDockable( const Window *pWin ); + sal_Bool IsDockable( const Window *pWin ); - BOOL IsFloating( const Window *pWin ); - void SetFloatingMode( const Window *pWin, BOOL bFloating ); + sal_Bool IsFloating( const Window *pWin ); + void SetFloatingMode( const Window *pWin, sal_Bool bFloating ); void Lock( const Window *pWin ); void Unlock( const Window *pWin ); - BOOL IsLocked( const Window *pWin ); + sal_Bool IsLocked( const Window *pWin ); void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin ); - void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin, ULONG nPopupModeFlags ); + void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin, sal_uLong nPopupModeFlags ); - BOOL IsInPopupMode( const Window *pWin ); + sal_Bool IsInPopupMode( const Window *pWin ); void EndPopupMode( const Window *pWin ); // required because those methods are not virtual in Window (!!!) and must // be availbale from the toolkit void SetPosSizePixel( Window *pWin, long nX, long nY, long nWidth, long nHeight, - USHORT nFlags = WINDOW_POSSIZE_ALL ); + sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); Rectangle GetPosSizePixel( const Window *pWin ); }; @@ -274,7 +274,7 @@ private: sal_Int32 mnDockRight; sal_Int32 mnDockBottom; WinBits mnFloatBits; - BOOL mbDockCanceled:1, + sal_Bool mbDockCanceled:1, mbDockPrevented:1, mbFloatPrevented:1, mbDockable:1, @@ -301,7 +301,7 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: - SAL_DLLPRIVATE BOOL ImplStartDocking( const Point& rPos ); + SAL_DLLPRIVATE sal_Bool ImplStartDocking( const Point& rPos ); protected: DockingWindow( WindowType nType ); @@ -312,31 +312,31 @@ public: ~DockingWindow(); virtual void StartDocking(); - virtual BOOL Docking( const Point& rPos, Rectangle& rRect ); - virtual void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); - virtual BOOL PrepareToggleFloatingMode(); + virtual sal_Bool Docking( const Point& rPos, Rectangle& rRect ); + virtual void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ); + virtual sal_Bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); - virtual void TitleButtonClick( USHORT nButton ); + virtual void TitleButtonClick( sal_uInt16 nButton ); virtual void Pin(); virtual void Roll(); virtual void PopupModeEnd(); virtual void Resizing( Size& rSize ); - virtual BOOL Close(); + virtual sal_Bool Close(); virtual void Tracking( const TrackingEvent& rTEvt ); virtual long Notify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void ShowTitleButton( USHORT nButton, BOOL bVisible = TRUE ); - BOOL IsTitleButtonVisible( USHORT nButton ) const; + void ShowTitleButton( sal_uInt16 nButton, sal_Bool bVisible = sal_True ); + sal_Bool IsTitleButtonVisible( sal_uInt16 nButton ) const; - void SetPin( BOOL bPin ); - BOOL IsPined() const; + void SetPin( sal_Bool bPin ); + sal_Bool IsPined() const; void RollUp(); void RollDown(); - BOOL IsRollUp() const; + sal_Bool IsRollUp() const; void SetRollUpOutputSizePixel( const Size& rSize ); Size GetRollUpOutputSizePixel() const; @@ -347,14 +347,14 @@ public: void SetMaxOutputSizePixel( const Size& rSize ); const Size& GetMaxOutputSizePixel() const; - BOOL IsDocking() const { return mbDocking; } - BOOL IsDockable() const { return mbDockable; } - BOOL IsDockingCanceled() const { return mbDockCanceled; } - BOOL IsDockingPrevented() const { return mbDockPrevented; } - BOOL IsFloatingPrevented() const { return mbFloatPrevented; } + sal_Bool IsDocking() const { return mbDocking; } + sal_Bool IsDockable() const { return mbDockable; } + sal_Bool IsDockingCanceled() const { return mbDockCanceled; } + sal_Bool IsDockingPrevented() const { return mbDockPrevented; } + sal_Bool IsFloatingPrevented() const { return mbFloatPrevented; } - void SetFloatingMode( BOOL bFloatMode = FALSE ); - BOOL IsFloatingMode() const; + void SetFloatingMode( sal_Bool bFloatMode = sal_False ); + sal_Bool IsFloatingMode() const; FloatingWindow* GetFloatingWindow() const { return mpFloatWin; } void SetFloatingPos( const Point& rNewPos ); @@ -366,7 +366,7 @@ public: virtual void SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, - USHORT nFlags = WINDOW_POSSIZE_ALL ); + sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) { Window::SetPosSizePixel( rNewPos, rNewSize ); } @@ -376,14 +376,14 @@ public: Size GetOutputSizePixel() const; }; -inline void DockingWindow::SetPin( BOOL bPin ) +inline void DockingWindow::SetPin( sal_Bool bPin ) { if ( mpFloatWin ) mpFloatWin->SetPin( bPin ); mbPined = bPin; } -inline BOOL DockingWindow::IsPined() const +inline sal_Bool DockingWindow::IsPined() const { if ( mpFloatWin ) return mpFloatWin->IsPined(); @@ -394,17 +394,17 @@ inline void DockingWindow::RollUp() { if ( mpFloatWin ) mpFloatWin->RollUp(); - mbRollUp = TRUE; + mbRollUp = sal_True; } inline void DockingWindow::RollDown() { if ( mpFloatWin ) mpFloatWin->RollDown(); - mbRollUp = FALSE; + mbRollUp = sal_False; } -inline BOOL DockingWindow::IsRollUp() const +inline sal_Bool DockingWindow::IsRollUp() const { if ( mpFloatWin ) return mpFloatWin->IsRollUp(); diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx index 6b0ca12eae8e..0263daa5a427 100644..100755 --- a/vcl/inc/vcl/edit.hxx +++ b/vcl/inc/vcl/edit.hxx @@ -77,11 +77,11 @@ private: XubString maRedoText; long mnXOffset; Selection maSelection; - USHORT mnAlign; + sal_uInt16 mnAlign; xub_StrLen mnMaxTextLen; AutocompleteAction meAutocompleteAction; xub_Unicode mcEchoChar; - BOOL mbModified:1, + sal_Bool mbModified:1, mbInternModified:1, mbReadOnly:1, mbInsertMode:1, @@ -101,19 +101,19 @@ private: SAL_DLLPRIVATE XubString ImplGetText() const; SAL_DLLPRIVATE void ImplRepaint( xub_StrLen nStart = 0, xub_StrLen nEnd = STRING_LEN, bool bLayout = false ); SAL_DLLPRIVATE void ImplInvalidateOrRepaint( xub_StrLen nStart = 0, xub_StrLen nEnd = STRING_LEN ); - SAL_DLLPRIVATE void ImplDelete( const Selection& rSelection, BYTE nDirection, BYTE nMode ); + SAL_DLLPRIVATE void ImplDelete( const Selection& rSelection, sal_uInt8 nDirection, sal_uInt8 nMode ); SAL_DLLPRIVATE void ImplSetText( const XubString& rStr, const Selection* pNewSelection = 0 ); SAL_DLLPRIVATE void ImplInsertText( const XubString& rStr, const Selection* pNewSelection = 0, sal_Bool bIsUserInput = sal_False ); SAL_DLLPRIVATE String ImplGetValidString( const String& rString ) const; SAL_DLLPRIVATE void ImplClearBackground( long nXStart, long nXEnd ); - SAL_DLLPRIVATE void ImplShowCursor( BOOL bOnlyIfVisible = TRUE ); + SAL_DLLPRIVATE void ImplShowCursor( sal_Bool bOnlyIfVisible = sal_True ); SAL_DLLPRIVATE void ImplAlign(); SAL_DLLPRIVATE void ImplAlignAndPaint(); SAL_DLLPRIVATE xub_StrLen ImplGetCharPos( const Point& rWindowPos ) const; - SAL_DLLPRIVATE void ImplSetCursorPos( xub_StrLen nChar, BOOL bSelect ); + SAL_DLLPRIVATE void ImplSetCursorPos( xub_StrLen nChar, sal_Bool bSelect ); SAL_DLLPRIVATE void ImplShowDDCursor(); SAL_DLLPRIVATE void ImplHideDDCursor(); - SAL_DLLPRIVATE BOOL ImplHandleKeyEvent( const KeyEvent& rKEvt ); + SAL_DLLPRIVATE sal_Bool ImplHandleKeyEvent( const KeyEvent& rKEvt ); SAL_DLLPRIVATE void ImplCopyToSelectionClipboard(); SAL_DLLPRIVATE void ImplCopy( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard ); SAL_DLLPRIVATE void ImplPaste( ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard >& rxClipboard ); @@ -127,9 +127,9 @@ protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE void ImplSetSelection( const Selection& rSelection, BOOL bPaint = TRUE ); + SAL_DLLPRIVATE void ImplSetSelection( const Selection& rSelection, sal_Bool bPaint = sal_True ); SAL_DLLPRIVATE int ImplGetNativeControlType(); static SAL_DLLPRIVATE void ImplInvalidateOutermostBorder( Window* pWin ); @@ -165,7 +165,7 @@ public: virtual void KeyInput( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); virtual void Resize(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void GetFocus(); virtual void LoseFocus(); virtual void Tracking( const TrackingEvent& rTEvt ); @@ -177,24 +177,24 @@ public: virtual void Modify(); virtual void UpdateData(); - static BOOL IsCharInput( const KeyEvent& rKEvt ); + static sal_Bool IsCharInput( const KeyEvent& rKEvt ); virtual void SetModifyFlag(); virtual void ClearModifyFlag(); - virtual BOOL IsModified() const { return mpSubEdit ? mpSubEdit->mbModified : mbModified; } + virtual sal_Bool IsModified() const { return mpSubEdit ? mpSubEdit->mbModified : mbModified; } - virtual void EnableUpdateData( ULONG nTimeout = EDIT_UPDATEDATA_TIMEOUT ); + virtual void EnableUpdateData( sal_uLong nTimeout = EDIT_UPDATEDATA_TIMEOUT ); virtual void DisableUpdateData() { delete mpUpdateDataTimer; mpUpdateDataTimer = NULL; } - virtual ULONG IsUpdateDataEnabled() const; + virtual sal_uLong IsUpdateDataEnabled() const; void SetEchoChar( xub_Unicode c ); xub_Unicode GetEchoChar() const { return mcEchoChar; } - virtual void SetReadOnly( BOOL bReadOnly = TRUE ); - virtual BOOL IsReadOnly() const { return mbReadOnly; } + virtual void SetReadOnly( sal_Bool bReadOnly = sal_True ); + virtual sal_Bool IsReadOnly() const { return mbReadOnly; } - void SetInsertMode( BOOL bInsert ); - BOOL IsInsertMode() const; + void SetInsertMode( sal_Bool bInsert ); + sal_Bool IsInsertMode() const; virtual void SetMaxTextLen( xub_StrLen nMaxLen = EDIT_NOLIMIT ); virtual xub_StrLen GetMaxTextLen() const { return mnMaxTextLen; } @@ -232,7 +232,7 @@ public: virtual Size CalcMinimumSize() const; virtual Size GetOptimalSize(WindowSizeType eType) const; - virtual Size CalcSize( USHORT nChars ) const; + virtual Size CalcSize( sal_uInt16 nChars ) const; virtual xub_StrLen GetMaxVisChars() const; xub_StrLen GetCharPos( const Point& rWindowPos ) const; @@ -248,14 +248,18 @@ public: virtual XubString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; + + // returns the minimum size a bordered Edit should have given the current + // global style settings (needed by sc's inputwin.cxx) + static Size GetMinimumEditSize(); }; -inline ULONG Edit::IsUpdateDataEnabled() const +inline sal_uLong Edit::IsUpdateDataEnabled() const { if ( mpUpdateDataTimer ) return mpUpdateDataTimer->GetTimeout(); else - return FALSE; + return sal_False; } #endif // _SV_EDIT_HXX diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx index 83902ad6b1af..9e8666ea7c78 100644 --- a/vcl/inc/vcl/event.hxx +++ b/vcl/inc/vcl/event.hxx @@ -58,13 +58,13 @@ class VCL_DLLPUBLIC KeyEvent { private: KeyCode maKeyCode; - USHORT mnRepeat; + sal_uInt16 mnRepeat; xub_Unicode mnCharCode; public: KeyEvent(); KeyEvent( xub_Unicode nChar, const KeyCode& rKeyCode, - USHORT nRepeat = 0 ); + sal_uInt16 nRepeat = 0 ); /** inits this vcl KeyEvent with all settings from the given awt event **/ KeyEvent( const ::com::sun::star::awt::KeyEvent& rEvent ); @@ -74,7 +74,7 @@ public: xub_Unicode GetCharCode() const { return mnCharCode; } const KeyCode& GetKeyCode() const { return maKeyCode; } - USHORT GetRepeat() const { return mnRepeat; } + sal_uInt16 GetRepeat() const { return mnRepeat; } KeyEvent LogicalTextDirectionality (TextDirectionality eMode) const; KeyEvent (const KeyEvent& rKeyEvent); @@ -88,7 +88,7 @@ inline KeyEvent::KeyEvent() } inline KeyEvent::KeyEvent( xub_Unicode nChar, const KeyCode& rKeyCode, - USHORT nRepeat ) : + sal_uInt16 nRepeat ) : maKeyCode( rKeyCode ) { @@ -101,24 +101,24 @@ inline KeyEvent::KeyEvent( xub_Unicode nChar, const KeyCode& rKeyCode, // -------------------- // Maus-Move-Modi -#define MOUSE_SIMPLEMOVE ((USHORT)0x0001) -#define MOUSE_DRAGMOVE ((USHORT)0x0002) -#define MOUSE_DRAGCOPY ((USHORT)0x0004) -#define MOUSE_ENTERWINDOW ((USHORT)0x0010) -#define MOUSE_LEAVEWINDOW ((USHORT)0x0020) -#define MOUSE_SYNTHETIC ((USHORT)0x0040) -#define MOUSE_MODIFIERCHANGED ((USHORT)0x0080) +#define MOUSE_SIMPLEMOVE ((sal_uInt16)0x0001) +#define MOUSE_DRAGMOVE ((sal_uInt16)0x0002) +#define MOUSE_DRAGCOPY ((sal_uInt16)0x0004) +#define MOUSE_ENTERWINDOW ((sal_uInt16)0x0010) +#define MOUSE_LEAVEWINDOW ((sal_uInt16)0x0020) +#define MOUSE_SYNTHETIC ((sal_uInt16)0x0040) +#define MOUSE_MODIFIERCHANGED ((sal_uInt16)0x0080) // Maus-Button-Down/Up-Modi -#define MOUSE_SIMPLECLICK ((USHORT)0x0001) -#define MOUSE_SELECT ((USHORT)0x0002) -#define MOUSE_MULTISELECT ((USHORT)0x0004) -#define MOUSE_RANGESELECT ((USHORT)0x0008) +#define MOUSE_SIMPLECLICK ((sal_uInt16)0x0001) +#define MOUSE_SELECT ((sal_uInt16)0x0002) +#define MOUSE_MULTISELECT ((sal_uInt16)0x0004) +#define MOUSE_RANGESELECT ((sal_uInt16)0x0008) // Maus-Buttons -#define MOUSE_LEFT ((USHORT)0x0001) -#define MOUSE_MIDDLE ((USHORT)0x0002) -#define MOUSE_RIGHT ((USHORT)0x0004) +#define MOUSE_LEFT ((sal_uInt16)0x0001) +#define MOUSE_MIDDLE ((sal_uInt16)0x0002) +#define MOUSE_RIGHT ((sal_uInt16)0x0004) // -------------- // - MouseEvent - @@ -128,53 +128,53 @@ class VCL_DLLPUBLIC MouseEvent { private: Point maPos; - USHORT mnMode; - USHORT mnClicks; - USHORT mnCode; + sal_uInt16 mnMode; + sal_uInt16 mnClicks; + sal_uInt16 mnCode; public: MouseEvent(); - MouseEvent( const Point& rPos, USHORT nClicks = 1, - USHORT nMode = 0, USHORT nButtons = 0, - USHORT nModifier = 0 ); + MouseEvent( const Point& rPos, sal_uInt16 nClicks = 1, + sal_uInt16 nMode = 0, sal_uInt16 nButtons = 0, + sal_uInt16 nModifier = 0 ); const Point& GetPosPixel() const { return maPos; } - USHORT GetMode() const { return mnMode; } + sal_uInt16 GetMode() const { return mnMode; } /** inits this vcl KeyEvent with all settings from the given awt event **/ MouseEvent( const ::com::sun::star::awt::MouseEvent& rEvent ); /** fills out the given awt KeyEvent with all settings from this vcl event **/ void InitMouseEvent( ::com::sun::star::awt::MouseEvent& rEvent ) const; - USHORT GetClicks() const { return mnClicks; } + sal_uInt16 GetClicks() const { return mnClicks; } - BOOL IsEnterWindow() const + sal_Bool IsEnterWindow() const { return ((mnMode & MOUSE_ENTERWINDOW) != 0); } - BOOL IsLeaveWindow() const + sal_Bool IsLeaveWindow() const { return ((mnMode & MOUSE_LEAVEWINDOW) != 0); } - BOOL IsSynthetic() const + sal_Bool IsSynthetic() const { return ((mnMode & MOUSE_SYNTHETIC) != 0); } - BOOL IsModifierChanged() const + sal_Bool IsModifierChanged() const { return ((mnMode & MOUSE_MODIFIERCHANGED) != 0); } - USHORT GetButtons() const + sal_uInt16 GetButtons() const { return (mnCode & (MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT)); } - BOOL IsLeft() const + sal_Bool IsLeft() const { return ((mnCode & MOUSE_LEFT) != 0); } - BOOL IsMiddle() const + sal_Bool IsMiddle() const { return ((mnCode & MOUSE_MIDDLE) != 0); } - BOOL IsRight() const + sal_Bool IsRight() const { return ((mnCode & MOUSE_RIGHT) != 0); } - USHORT GetModifier() const + sal_uInt16 GetModifier() const { return (mnCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2)); } bool IsShift() const { return ((mnCode & KEY_SHIFT) != 0); } - BOOL IsMod1() const + sal_Bool IsMod1() const { return ((mnCode & KEY_MOD1) != 0); } - BOOL IsMod2() const + sal_Bool IsMod2() const { return ((mnCode & KEY_MOD2) != 0); } - BOOL IsMod3() const + sal_Bool IsMod3() const { return ((mnCode & KEY_MOD3) != 0); } }; @@ -185,9 +185,9 @@ inline MouseEvent::MouseEvent() mnCode = 0; } -inline MouseEvent::MouseEvent( const Point& rPos, USHORT nClicks, - USHORT nMode, - USHORT nButtons, USHORT nModifier ) : +inline MouseEvent::MouseEvent( const Point& rPos, sal_uInt16 nClicks, + sal_uInt16 nMode, + sal_uInt16 nButtons, sal_uInt16 nModifier ) : maPos( rPos ) { mnClicks = nClicks; @@ -199,46 +199,46 @@ inline MouseEvent::MouseEvent( const Point& rPos, USHORT nClicks, // - HelpEvent - // ------------- -#define HELPMODE_CONTEXT ((USHORT)0x0001) -#define HELPMODE_EXTENDED ((USHORT)0x0002) -#define HELPMODE_BALLOON ((USHORT)0x0004) -#define HELPMODE_QUICK ((USHORT)0x0008) +#define HELPMODE_CONTEXT ((sal_uInt16)0x0001) +#define HELPMODE_EXTENDED ((sal_uInt16)0x0002) +#define HELPMODE_BALLOON ((sal_uInt16)0x0004) +#define HELPMODE_QUICK ((sal_uInt16)0x0008) class VCL_DLLPUBLIC HelpEvent { private: Point maPos; - USHORT mnMode; - BOOL mbKeyboardActivated; + sal_uInt16 mnMode; + sal_Bool mbKeyboardActivated; public: HelpEvent(); - HelpEvent( USHORT nHelpMode ); - HelpEvent( const Point& rMousePos, USHORT nHelpMode ); + HelpEvent( sal_uInt16 nHelpMode ); + HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode ); const Point& GetMousePosPixel() const; - USHORT GetMode() const { return mnMode; } - BOOL KeyboardActivated() const { return mbKeyboardActivated; } - void SetKeyboardActivated( BOOL bKeyboard ) { mbKeyboardActivated = bKeyboard; } + sal_uInt16 GetMode() const { return mnMode; } + sal_Bool KeyboardActivated() const { return mbKeyboardActivated; } + void SetKeyboardActivated( sal_Bool bKeyboard ) { mbKeyboardActivated = bKeyboard; } }; inline HelpEvent::HelpEvent() { mnMode = HELPMODE_CONTEXT; - mbKeyboardActivated = TRUE; + mbKeyboardActivated = sal_True; } -inline HelpEvent::HelpEvent( const Point& rMousePos, USHORT nHelpMode ) : +inline HelpEvent::HelpEvent( const Point& rMousePos, sal_uInt16 nHelpMode ) : maPos( rMousePos ) { mnMode = nHelpMode; - mbKeyboardActivated = FALSE; + mbKeyboardActivated = sal_False; } -inline HelpEvent::HelpEvent( USHORT nHelpMode ) +inline HelpEvent::HelpEvent( sal_uInt16 nHelpMode ) { mnMode = nHelpMode; - mbKeyboardActivated = TRUE; + mbKeyboardActivated = sal_True; } // ----------------- @@ -250,19 +250,19 @@ class VCL_DLLPUBLIC UserDrawEvent private: OutputDevice* mpOutDev; Rectangle maOutRect; - USHORT mnItemId; - USHORT mnStyle; + sal_uInt16 mnItemId; + sal_uInt16 mnStyle; public: UserDrawEvent(); UserDrawEvent( OutputDevice* pOut, const Rectangle& rOutRect, - USHORT nId, USHORT nStyle = 0 ); + sal_uInt16 nId, sal_uInt16 nStyle = 0 ); OutputDevice* GetDevice() const { return mpOutDev; } const Rectangle& GetRect() const { return maOutRect; } - USHORT GetItemId() const { return mnItemId; } - USHORT GetStyle() const { return mnStyle; } + sal_uInt16 GetItemId() const { return mnItemId; } + sal_uInt16 GetStyle() const { return mnStyle; } }; inline UserDrawEvent::UserDrawEvent() @@ -274,7 +274,7 @@ inline UserDrawEvent::UserDrawEvent() inline UserDrawEvent::UserDrawEvent( OutputDevice* pOut, const Rectangle& rOutRect, - USHORT nId, USHORT nStyle ) : + sal_uInt16 nId, sal_uInt16 nStyle ) : maOutRect( rOutRect ) { mpOutDev = pOut; @@ -286,13 +286,13 @@ inline UserDrawEvent::UserDrawEvent( OutputDevice* pOut, // - Tracking-Types - // ------------------ -#define ENDTRACK_CANCEL ((USHORT)0x0001) -#define ENDTRACK_KEY ((USHORT)0x0002) -#define ENDTRACK_FOCUS ((USHORT)0x0004) -#define ENDTRACK_END ((USHORT)0x1000) -#define ENDTRACK_DONTCALLHDL ((USHORT)0x8000) +#define ENDTRACK_CANCEL ((sal_uInt16)0x0001) +#define ENDTRACK_KEY ((sal_uInt16)0x0002) +#define ENDTRACK_FOCUS ((sal_uInt16)0x0004) +#define ENDTRACK_END ((sal_uInt16)0x1000) +#define ENDTRACK_DONTCALLHDL ((sal_uInt16)0x8000) -#define TRACKING_REPEAT ((USHORT)0x0100) +#define TRACKING_REPEAT ((sal_uInt16)0x0100) // ----------------- // - TrackingEvent - @@ -302,23 +302,23 @@ class VCL_DLLPUBLIC TrackingEvent { private: MouseEvent maMEvt; - USHORT mnFlags; + sal_uInt16 mnFlags; public: TrackingEvent(); TrackingEvent( const MouseEvent& rMEvt, - USHORT nTrackFlags = 0 ); + sal_uInt16 nTrackFlags = 0 ); const MouseEvent& GetMouseEvent() const { return maMEvt; } - BOOL IsTrackingRepeat() const + sal_Bool IsTrackingRepeat() const { return ((mnFlags & TRACKING_REPEAT) != 0); } - BOOL IsTrackingEnded() const + sal_Bool IsTrackingEnded() const { return ((mnFlags & ENDTRACK_END) != 0); } - BOOL IsTrackingCanceled() const + sal_Bool IsTrackingCanceled() const { return ((mnFlags & ENDTRACK_CANCEL) != 0); } - USHORT GetTrackingFlags() const { return mnFlags; } + sal_uInt16 GetTrackingFlags() const { return mnFlags; } }; inline TrackingEvent::TrackingEvent() @@ -327,7 +327,7 @@ inline TrackingEvent::TrackingEvent() } inline TrackingEvent::TrackingEvent( const MouseEvent& rMEvt, - USHORT nTrackFlags ) : + sal_uInt16 nTrackFlags ) : maMEvt( rMEvt ) { mnFlags = nTrackFlags; @@ -357,17 +357,17 @@ class VCL_DLLPUBLIC NotifyEvent private: Window* mpWindow; void* mpData; - USHORT mnType; + sal_uInt16 mnType; long mnRetValue; public: NotifyEvent(); - NotifyEvent( USHORT nType, + NotifyEvent( sal_uInt16 nType, Window* pWindow, const void* pEvent = NULL, long nRet = 0 ); - USHORT GetType() const { return mnType; } + sal_uInt16 GetType() const { return mnType; } Window* GetWindow() const { return mpWindow; } void* GetData() const { return mpData; } @@ -387,7 +387,7 @@ inline NotifyEvent::NotifyEvent() mnRetValue = 0; } -inline NotifyEvent::NotifyEvent( USHORT nType, Window* pWindow, +inline NotifyEvent::NotifyEvent( sal_uInt16 nType, Window* pWindow, const void* pEvent, long nRet ) { mpWindow = pWindow; @@ -424,30 +424,30 @@ inline const CommandEvent* NotifyEvent::GetCommandEvent() const // - DataChangedEvent - // -------------------- -#define DATACHANGED_SETTINGS ((USHORT)1) -#define DATACHANGED_DISPLAY ((USHORT)2) -#define DATACHANGED_DATETIME ((USHORT)3) -#define DATACHANGED_FONTS ((USHORT)4) -#define DATACHANGED_PRINTER ((USHORT)5) -#define DATACHANGED_FONTSUBSTITUTION ((USHORT)6) -#define DATACHANGED_USER ((USHORT)10000) +#define DATACHANGED_SETTINGS ((sal_uInt16)1) +#define DATACHANGED_DISPLAY ((sal_uInt16)2) +#define DATACHANGED_DATETIME ((sal_uInt16)3) +#define DATACHANGED_FONTS ((sal_uInt16)4) +#define DATACHANGED_PRINTER ((sal_uInt16)5) +#define DATACHANGED_FONTSUBSTITUTION ((sal_uInt16)6) +#define DATACHANGED_USER ((sal_uInt16)10000) class VCL_DLLPUBLIC DataChangedEvent { private: void* mpData; - ULONG mnFlags; - USHORT mnType; + sal_uLong mnFlags; + sal_uInt16 mnType; public: DataChangedEvent(); - DataChangedEvent( USHORT nType, + DataChangedEvent( sal_uInt16 nType, const void* pData = NULL, - ULONG nFlags = 0 ); + sal_uLong nFlags = 0 ); - USHORT GetType() const { return mnType; } + sal_uInt16 GetType() const { return mnType; } void* GetData() const { return mpData; } - ULONG GetFlags() const { return mnFlags; } + sal_uLong GetFlags() const { return mnFlags; } const AllSettings* GetOldSettings() const; }; @@ -459,9 +459,9 @@ inline DataChangedEvent::DataChangedEvent() mnType = 0; } -inline DataChangedEvent::DataChangedEvent( USHORT nType, +inline DataChangedEvent::DataChangedEvent( sal_uInt16 nType, const void* pData, - ULONG nChangeFlags ) + sal_uLong nChangeFlags ) { mpData = (void*)pData; mnFlags = nChangeFlags; diff --git a/vcl/inc/vcl/evntpost.hxx b/vcl/inc/vcl/evntpost.hxx index 2a27bbfff033..90a165506c65 100644 --- a/vcl/inc/vcl/evntpost.hxx +++ b/vcl/inc/vcl/evntpost.hxx @@ -37,13 +37,13 @@ namespace vcl { struct UserEvent { - ULONG m_nWhich; + sal_uLong m_nWhich; void* m_pData; }; class VCL_DLLPUBLIC EventPoster { - ULONG m_nId; + sal_uLong m_nId; Link m_aLink; DECL_DLLPRIVATE_LINK( DoEvent_Impl, UserEvent* ); diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx index c5cfe8947796..fd0ce90cb0d7 100644 --- a/vcl/inc/vcl/field.hxx +++ b/vcl/inc/vcl/field.hxx @@ -35,7 +35,7 @@ #include <tools/time.hxx> #include <vcl/spinfld.hxx> #include <vcl/combobox.hxx> -#include <vcl/fldunit.hxx> +#include <tools/fldunit.hxx> namespace com { namespace sun { namespace star { namespace lang { struct Locale; } } } } @@ -52,21 +52,21 @@ private: Edit* mpField; LocaleDataWrapper* mpLocaleDataWrapper; Link maErrorLink; - BOOL mbReformat; - BOOL mbStrictFormat; - BOOL mbEmptyFieldValue; - BOOL mbEmptyFieldValueEnabled; - BOOL mbDefaultLocale; + sal_Bool mbReformat; + sal_Bool mbStrictFormat; + sal_Bool mbEmptyFieldValue; + sal_Bool mbEmptyFieldValueEnabled; + sal_Bool mbDefaultLocale; protected: SAL_DLLPRIVATE void ImplSetText( const XubString& rText, Selection* pNewSel = NULL ); - SAL_DLLPRIVATE BOOL ImplGetEmptyFieldValue() const { return mbEmptyFieldValue; } + SAL_DLLPRIVATE sal_Bool ImplGetEmptyFieldValue() const { return mbEmptyFieldValue; } - void SetFieldText( const XubString& rText, BOOL bKeepSelection ); - void SetEmptyFieldValueData( BOOL bValue ) { mbEmptyFieldValue = bValue; } + void SetFieldText( const XubString& rText, sal_Bool bKeepSelection ); + void SetEmptyFieldValueData( sal_Bool bValue ) { mbEmptyFieldValue = bValue; } SAL_DLLPRIVATE LocaleDataWrapper& ImplGetLocaleDataWrapper() const; - BOOL IsDefaultLocale() const { return mbDefaultLocale; } + sal_Bool IsDefaultLocale() const { return mbDefaultLocale; } public: FormatterBase( Edit* pField = NULL ); @@ -77,11 +77,11 @@ public: void SetField( Edit* pField ) { mpField = pField; } Edit* GetField() const { return mpField; } - BOOL MustBeReformatted() const { return mbReformat; } - void MarkToBeReformatted( BOOL b ) { mbReformat = b; } + sal_Bool MustBeReformatted() const { return mbReformat; } + void MarkToBeReformatted( sal_Bool b ) { mbReformat = b; } - void SetStrictFormat( BOOL bStrict ); - BOOL IsStrictFormat() const { return mbStrictFormat; } + void SetStrictFormat( sal_Bool bStrict ); + sal_Bool IsStrictFormat() const { return mbStrictFormat; } virtual void Reformat(); virtual void ReformatAll(); @@ -95,10 +95,10 @@ public: const Link& GetErrorHdl() const { return maErrorLink; } void SetEmptyFieldValue(); - BOOL IsEmptyFieldValue() const; + sal_Bool IsEmptyFieldValue() const; - void EnableEmptyFieldValue( BOOL bEnable ) { mbEmptyFieldValueEnabled = bEnable; } - BOOL IsEmptyFieldValueEnabled() const { return mbEmptyFieldValueEnabled; } + void EnableEmptyFieldValue( sal_Bool bEnable ) { mbEmptyFieldValueEnabled = bEnable; } + sal_Bool IsEmptyFieldValueEnabled() const { return mbEmptyFieldValueEnabled; } }; @@ -106,7 +106,7 @@ public: // - PatternFormatter - // -------------------- -#define PATTERN_FORMAT_EMPTYLITERALS ((USHORT)0x0001) +#define PATTERN_FORMAT_EMPTYLITERALS ((sal_uInt16)0x0001) class VCL_DLLPUBLIC PatternFormatter : public FormatterBase { @@ -114,17 +114,17 @@ private: ByteString maEditMask; XubString maFieldString; XubString maLiteralMask; - USHORT mnFormatFlags; - BOOL mbSameMask; - BOOL mbInPattKeyInput; + sal_uInt16 mnFormatFlags; + sal_Bool mbSameMask; + sal_Bool mbInPattKeyInput; protected: PatternFormatter(); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplSetMask( const ByteString& rEditMask, const XubString& rLiteralMask ); - SAL_DLLPRIVATE BOOL ImplIsSameMask() const { return mbSameMask; } - SAL_DLLPRIVATE BOOL& ImplGetInPattKeyInput() { return mbInPattKeyInput; } + SAL_DLLPRIVATE sal_Bool ImplIsSameMask() const { return mbSameMask; } + SAL_DLLPRIVATE sal_Bool& ImplGetInPattKeyInput() { return mbInPattKeyInput; } public: ~PatternFormatter(); @@ -136,12 +136,12 @@ public: const ByteString& GetEditMask() const { return maEditMask; } const XubString& GetLiteralMask() const { return maLiteralMask; } - void SetFormatFlags( USHORT nFlags ) { mnFormatFlags = nFlags; } - USHORT GetFormatFlags() const { return mnFormatFlags; } + void SetFormatFlags( sal_uInt16 nFlags ) { mnFormatFlags = nFlags; } + sal_uInt16 GetFormatFlags() const { return mnFormatFlags; } void SetString( const XubString& rStr ); XubString GetString() const; - BOOL IsStringModified() const { return !(GetString().Equals( maFieldString )); } + sal_Bool IsStringModified() const { return !(GetString().Equals( maFieldString )); } void SelectFixedFont(); }; @@ -161,10 +161,10 @@ protected: sal_Int64 mnMin; sal_Int64 mnMax; sal_Int64 mnCorrectedValue; - USHORT mnType; - USHORT mnDecimalDigits; - BOOL mbThousandSep; - BOOL mbShowTrailingZeros; + sal_uInt16 mnType; + sal_uInt16 mnDecimalDigits; + sal_Bool mbThousandSep; + sal_Bool mbShowTrailingZeros; // the members below are used in all derivatives of NumericFormatter // not in NumericFormatter itself. @@ -183,7 +183,7 @@ protected: void FieldLast(); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE BOOL ImplNumericReformat( const XubString& rStr, double& rValue, XubString& rOutStr ); + SAL_DLLPRIVATE sal_Bool ImplNumericReformat( const XubString& rStr, double& rValue, XubString& rOutStr ); SAL_DLLPRIVATE void ImplNewFieldValue( sal_Int64 nNewValue ); SAL_DLLPRIVATE void ImplSetUserValue( sal_Int64 nNewValue, Selection* pNewSelection = NULL ); @@ -204,20 +204,20 @@ public: void SetSpinSize( sal_Int64 nNewSize ) { mnSpinSize = nNewSize; } sal_Int64 GetSpinSize() const { return mnSpinSize; } - void SetDecimalDigits( USHORT nDigits ); - USHORT GetDecimalDigits() const; + void SetDecimalDigits( sal_uInt16 nDigits ); + sal_uInt16 GetDecimalDigits() const; - void SetUseThousandSep( BOOL b ); - BOOL IsUseThousandSep() const { return mbThousandSep; } + void SetUseThousandSep( sal_Bool b ); + sal_Bool IsUseThousandSep() const { return mbThousandSep; } - void SetShowTrailingZeros( BOOL bShowTrailingZeros ); - BOOL IsShowTrailingZeros() const { return mbShowTrailingZeros; } + void SetShowTrailingZeros( sal_Bool bShowTrailingZeros ); + sal_Bool IsShowTrailingZeros() const { return mbShowTrailingZeros; } void SetUserValue( sal_Int64 nNewValue ); virtual void SetValue( sal_Int64 nNewValue ); virtual sal_Int64 GetValue() const; - BOOL IsValueModified() const; + sal_Bool IsValueModified() const; sal_Int64 GetCorrectedValue() const { return mnCorrectedValue; } Fraction ConvertToFraction( sal_Int64 nValue ); @@ -248,7 +248,7 @@ protected: virtual XubString CreateFieldText( sal_Int64 nValue ) const; SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE BOOL ImplMetricReformat( const XubString& rStr, double& rValue, XubString& rOutStr ); + SAL_DLLPRIVATE sal_Bool ImplMetricReformat( const XubString& rStr, double& rValue, XubString& rOutStr ); public: ~MetricFormatter(); @@ -301,7 +301,7 @@ private: protected: CurrencyFormatter(); virtual XubString CreateFieldText( sal_Int64 nValue ) const; - SAL_DLLPRIVATE BOOL ImplCurrencyReformat( const XubString& rStr, XubString& rOutStr ); + SAL_DLLPRIVATE sal_Bool ImplCurrencyReformat( const XubString& rStr, XubString& rOutStr ); public: ~CurrencyFormatter(); @@ -329,12 +329,12 @@ private: Date maMin; Date maMax; Date maCorrectedDate; - BOOL mbLongFormat; - BOOL mbEmptyDate; - BOOL mbShowDateCentury; - USHORT mnDateFormat; - ULONG mnExtDateFormat; - BOOL mbEnforceValidValue; + sal_Bool mbLongFormat; + sal_Bool mbEmptyDate; + sal_Bool mbShowDateCentury; + sal_uInt16 mnDateFormat; + sal_uLong mnExtDateFormat; + sal_Bool mbEnforceValidValue; SAL_DLLPRIVATE void ImplInit(); @@ -343,7 +343,7 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE const Date& ImplGetFieldDate() const { return maFieldDate; } - SAL_DLLPRIVATE BOOL ImplDateReformat( const XubString& rStr, XubString& rOutStr, + SAL_DLLPRIVATE sal_Bool ImplDateReformat( const XubString& rStr, XubString& rOutStr, const AllSettings& rSettings ); SAL_DLLPRIVATE void ImplSetUserDate( const Date& rNewDate, Selection* pNewSelection = NULL ); @@ -352,7 +352,7 @@ protected: SAL_DLLPRIVATE void ImplNewFieldValue( const Date& rDate ); CalendarWrapper& GetCalendarWrapper() const; - SAL_DLLPRIVATE BOOL ImplAllowMalformedInput() const; + SAL_DLLPRIVATE sal_Bool ImplAllowMalformedInput() const; public: ~DateFormatter(); @@ -364,7 +364,7 @@ public: void SetExtDateFormat( ExtDateFieldFormat eFormat ); - ExtDateFieldFormat GetExtDateFormat( BOOL bResolveSystemFormat = FALSE ) const; + ExtDateFieldFormat GetExtDateFormat( sal_Bool bResolveSystemFormat = sal_False ) const; void SetMin( const Date& rNewMin ); const Date& GetMin() const { return maMin; } @@ -375,27 +375,27 @@ public: // -------------------------------------------------------------- // MT: Remove these methods too, ExtDateFormat should be enough! - // What should happen if using DDMMYYYY, but ShowCentury=FALSE? + // What should happen if using DDMMYYYY, but ShowCentury=sal_False? // -------------------------------------------------------------- - void SetLongFormat( BOOL bLong ); - BOOL IsLongFormat() const { return mbLongFormat; } - void SetShowDateCentury( BOOL bShowCentury ); - BOOL IsShowDateCentury() const { return mbShowDateCentury; } + void SetLongFormat( sal_Bool bLong ); + sal_Bool IsLongFormat() const { return mbLongFormat; } + void SetShowDateCentury( sal_Bool bShowCentury ); + sal_Bool IsShowDateCentury() const { return mbShowDateCentury; } // -------------------------------------------------------------- void SetDate( const Date& rNewDate ); void SetUserDate( const Date& rNewDate ); Date GetDate() const; Date GetRealDate() const; - BOOL IsDateModified() const; + sal_Bool IsDateModified() const; void SetEmptyDate(); - BOOL IsEmptyDate() const; + sal_Bool IsEmptyDate() const; Date GetCorrectedDate() const { return maCorrectedDate; } void ResetLastDate() { maLastDate = Date( 0, 0, 0 ); } static void ExpandCentury( Date& rDate ); - static void ExpandCentury( Date& rDate, USHORT nTwoDigitYearStart ); + static void ExpandCentury( Date& rDate, sal_uInt16 nTwoDigitYearStart ); static Date GetInvalidDate() { return Date( 0, 0, 0 ); } @@ -411,8 +411,8 @@ public: In addition, if this is set to <FALSE/>, the text in the field will <em>not</em> be corrected when the control loses the focus - instead, the invalid input will be preserved. */ - void EnforceValidValue( BOOL _bEnforce ) { mbEnforceValidValue = _bEnforce; } - inline BOOL IsEnforceValidValue( ) const { return mbEnforceValidValue; } + void EnforceValidValue( sal_Bool _bEnforce ) { mbEnforceValidValue = _bEnforce; } + inline sal_Bool IsEnforceValidValue( ) const { return mbEnforceValidValue; } }; @@ -428,10 +428,10 @@ private: Time maMax; Time maCorrectedTime; TimeFieldFormat meFormat; - USHORT mnTimeFormat; - BOOL mbDuration; - BOOL mbEmptyTime; - BOOL mbEnforceValidValue; + sal_uInt16 mnTimeFormat; + sal_Bool mbDuration; + sal_Bool mbEmptyTime; + sal_Bool mbEnforceValidValue; SAL_DLLPRIVATE void ImplInit(); @@ -441,10 +441,10 @@ protected: TimeFormatter(); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE BOOL ImplTimeReformat( const XubString& rStr, XubString& rOutStr ); + SAL_DLLPRIVATE sal_Bool ImplTimeReformat( const XubString& rStr, XubString& rOutStr ); SAL_DLLPRIVATE void ImplNewFieldValue( const Time& rTime ); SAL_DLLPRIVATE void ImplSetUserTime( const Time& rNewTime, Selection* pNewSelection = NULL ); - SAL_DLLPRIVATE BOOL ImplAllowMalformedInput() const; + SAL_DLLPRIVATE sal_Bool ImplAllowMalformedInput() const; public: @@ -469,16 +469,16 @@ public: void SetFormat( TimeFieldFormat eNewFormat ); TimeFieldFormat GetFormat() const { return meFormat; } - void SetDuration( BOOL mbDuration ); - BOOL IsDuration() const { return mbDuration; } + void SetDuration( sal_Bool mbDuration ); + sal_Bool IsDuration() const { return mbDuration; } void SetTime( const Time& rNewTime ); void SetUserTime( const Time& rNewTime ); Time GetTime() const; Time GetRealTime() const; - BOOL IsTimeModified() const; + sal_Bool IsTimeModified() const; void SetEmptyTime() { FormatterBase::SetEmptyFieldValue(); } - BOOL IsEmptyTime() const { return FormatterBase::IsEmptyFieldValue(); } + sal_Bool IsEmptyTime() const { return FormatterBase::IsEmptyFieldValue(); } Time GetCorrectedTime() const { return maCorrectedTime; } static Time GetInvalidTime() { return Time( 99, 99, 99 ); } @@ -495,8 +495,8 @@ public: In addition, if this is set to <FALSE/>, the text in the field will <em>not</em> be corrected when the control loses the focus - instead, the invalid input will be preserved. */ - void EnforceValidValue( BOOL _bEnforce ) { mbEnforceValidValue = _bEnforce; } - inline BOOL IsEnforceValidValue( ) const { return mbEnforceValidValue; } + void EnforceValidValue( sal_Bool _bEnforce ) { mbEnforceValidValue = _bEnforce; } + inline sal_Bool IsEnforceValidValue( ) const { return mbEnforceValidValue; } }; @@ -583,31 +583,31 @@ public: static void SetDefaultUnit( FieldUnit eDefaultUnit ); static FieldUnit GetDefaultUnit(); - static sal_Int64 ConvertValue( sal_Int64 nValue, sal_Int64 mnBaseValue, USHORT nDecDigits, + static sal_Int64 ConvertValue( sal_Int64 nValue, sal_Int64 mnBaseValue, sal_uInt16 nDecDigits, FieldUnit eInUnit, FieldUnit eOutUnit ); - static sal_Int64 ConvertValue( sal_Int64 nValue, USHORT nDecDigits, + static sal_Int64 ConvertValue( sal_Int64 nValue, sal_uInt16 nDecDigits, FieldUnit eInUnit, MapUnit eOutUnit ); - static sal_Int64 ConvertValue( sal_Int64 nValue, USHORT nDecDigits, + static sal_Int64 ConvertValue( sal_Int64 nValue, sal_uInt16 nDecDigits, MapUnit eInUnit, FieldUnit eOutUnit ); // for backwards compatibility // caution: conversion to double loses precision - static double ConvertDoubleValue( double nValue, sal_Int64 mnBaseValue, USHORT nDecDigits, + static double ConvertDoubleValue( double nValue, sal_Int64 mnBaseValue, sal_uInt16 nDecDigits, FieldUnit eInUnit, FieldUnit eOutUnit ); - static double ConvertDoubleValue( double nValue, USHORT nDecDigits, + static double ConvertDoubleValue( double nValue, sal_uInt16 nDecDigits, FieldUnit eInUnit, MapUnit eOutUnit ); - static double ConvertDoubleValue( double nValue, USHORT nDecDigits, + static double ConvertDoubleValue( double nValue, sal_uInt16 nDecDigits, MapUnit eInUnit, FieldUnit eOutUnit ); // for backwards compatibility // caution: conversion to double loses precision - static double ConvertDoubleValue( sal_Int64 nValue, sal_Int64 nBaseValue, USHORT nDecDigits, + static double ConvertDoubleValue( sal_Int64 nValue, sal_Int64 nBaseValue, sal_uInt16 nDecDigits, FieldUnit eInUnit, FieldUnit eOutUnit ) { return ConvertDoubleValue( static_cast<double>(nValue), nBaseValue, nDecDigits, eInUnit, eOutUnit ); } - static double ConvertDoubleValue( sal_Int64 nValue, USHORT nDecDigits, + static double ConvertDoubleValue( sal_Int64 nValue, sal_uInt16 nDecDigits, FieldUnit eInUnit, MapUnit eOutUnit ) { return ConvertDoubleValue( static_cast<double>(nValue), nDecDigits, eInUnit, eOutUnit ); } - static double ConvertDoubleValue( sal_Int64 nValue, USHORT nDecDigits, + static double ConvertDoubleValue( sal_Int64 nValue, sal_uInt16 nDecDigits, MapUnit eInUnit, FieldUnit eOutUnit ) { return ConvertDoubleValue( static_cast<double>(nValue), nDecDigits, eInUnit, eOutUnit ); } }; @@ -651,7 +651,7 @@ private: Date maLast; protected: - SAL_DLLPRIVATE void ImplDateSpinArea( BOOL bUp ); + SAL_DLLPRIVATE void ImplDateSpinArea( sal_Bool bUp ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: @@ -687,7 +687,7 @@ private: Time maLast; protected: - SAL_DLLPRIVATE void ImplTimeSpinArea( BOOL bUp ); + SAL_DLLPRIVATE void ImplTimeSpinArea( sal_Bool bUp ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: @@ -734,11 +734,11 @@ public: virtual void ReformatAll(); void InsertString( const XubString& rStr, - USHORT nPos = COMBOBOX_APPEND ); + sal_uInt16 nPos = COMBOBOX_APPEND ); void RemoveString( const XubString& rStr ); using PatternFormatter::GetString; - XubString GetString( USHORT nPos ) const; - USHORT GetStringPos( const XubString& rStr ) const; + XubString GetString( sal_uInt16 nPos ) const; + sal_uInt16 GetStringPos( const XubString& rStr ) const; }; @@ -761,11 +761,11 @@ public: virtual void ReformatAll(); - void InsertValue( sal_Int64 nValue, USHORT nPos = COMBOBOX_APPEND ); + void InsertValue( sal_Int64 nValue, sal_uInt16 nPos = COMBOBOX_APPEND ); void RemoveValue( sal_Int64 nValue ); using NumericFormatter::GetValue; - sal_Int64 GetValue( USHORT nPos ) const; - USHORT GetValuePos( sal_Int64 nPos ) const; + sal_Int64 GetValue( sal_uInt16 nPos ) const; + sal_uInt16 GetValuePos( sal_Int64 nPos ) const; }; @@ -790,10 +790,10 @@ public: virtual void ReformatAll(); void InsertValue( sal_Int64 nValue, FieldUnit eInUnit = FUNIT_NONE, - USHORT nPos = COMBOBOX_APPEND ); + sal_uInt16 nPos = COMBOBOX_APPEND ); void RemoveValue( sal_Int64 nValue, FieldUnit eInUnit = FUNIT_NONE ); - sal_Int64 GetValue( USHORT nPos, FieldUnit eOutUnit = FUNIT_NONE ) const; - USHORT GetValuePos( sal_Int64 nValue, + sal_Int64 GetValue( sal_uInt16 nPos, FieldUnit eOutUnit = FUNIT_NONE ) const; + sal_uInt16 GetValuePos( sal_Int64 nValue, FieldUnit eInUnit = FUNIT_NONE ) const; // Needed, because GetValue() with nPos hide these functions @@ -821,10 +821,10 @@ public: virtual void ReformatAll(); - void InsertValue( sal_Int64 nValue, USHORT nPos = COMBOBOX_APPEND ); + void InsertValue( sal_Int64 nValue, sal_uInt16 nPos = COMBOBOX_APPEND ); void RemoveValue( sal_Int64 nValue ); - sal_Int64 GetValue( USHORT nPos ) const; - USHORT GetValuePos( sal_Int64 nValue ) const; + sal_Int64 GetValue( sal_uInt16 nPos ) const; + sal_uInt16 GetValuePos( sal_Int64 nValue ) const; // Needed, because GetValue() with nPos hide this function virtual sal_Int64 GetValue() const; @@ -850,11 +850,11 @@ public: virtual void ReformatAll(); - void InsertDate( const Date& rDate, USHORT nPos = COMBOBOX_APPEND ); + void InsertDate( const Date& rDate, sal_uInt16 nPos = COMBOBOX_APPEND ); void RemoveDate( const Date& rDate ); using DateFormatter::GetDate; - Date GetDate( USHORT nPos ) const; - USHORT GetDatePos( const Date& rDate ) const; + Date GetDate( sal_uInt16 nPos ) const; + sal_uInt16 GetDatePos( const Date& rDate ) const; }; @@ -877,11 +877,11 @@ public: virtual void ReformatAll(); - void InsertTime( const Time& rTime, USHORT nPos = COMBOBOX_APPEND ); + void InsertTime( const Time& rTime, sal_uInt16 nPos = COMBOBOX_APPEND ); void RemoveTime( const Time& rTime ); using TimeFormatter::GetTime; - Time GetTime( USHORT nPos ) const; - USHORT GetTimePos( const Time& rTime ) const; + Time GetTime( sal_uInt16 nPos ) const; + sal_uInt16 GetTimePos( const Time& rTime ) const; }; #endif // _SV_FIELD_HXX diff --git a/vcl/inc/vcl/fixbrd.hxx b/vcl/inc/vcl/fixbrd.hxx index 70916cfb8704..e091f68d4fad 100644 --- a/vcl/inc/vcl/fixbrd.hxx +++ b/vcl/inc/vcl/fixbrd.hxx @@ -51,8 +51,8 @@ class VCL_DLLPUBLIC FixedBorder : public Control { private: - USHORT mnType; - BOOL mbTransparent; + sal_uInt16 mnType; + sal_Bool mbTransparent; private: using Control::ImplInitSettings; @@ -60,7 +60,7 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ); public: @@ -69,15 +69,15 @@ public: ~FixedBorder(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); - void SetTransparent( BOOL bTransparent ); - BOOL IsTransparent() const { return mbTransparent; } - void SetBorderType( USHORT nType ); - USHORT GetBorderType() const { return mnType; } + void SetTransparent( sal_Bool bTransparent ); + sal_Bool IsTransparent() const { return mbTransparent; } + void SetBorderType( sal_uInt16 nType ); + sal_uInt16 GetBorderType() const { return mnType; } }; #endif // _SV_FIXBRD_HXX diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index 42061cfa09ea..3912f19e778a 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -48,11 +48,11 @@ private: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, + SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bFillLayout = false ) const; public: - SAL_DLLPRIVATE static USHORT ImplGetTextStyle( WinBits nWinBits ); + SAL_DLLPRIVATE static sal_uInt16 ImplGetTextStyle( WinBits nWinBits ); protected: virtual void FillLayoutData() const; virtual const Font& @@ -66,7 +66,7 @@ public: FixedText( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabelForRelation ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -87,7 +87,7 @@ private: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); SAL_DLLPRIVATE void ImplDraw( bool bLayout = false ); protected: @@ -102,7 +102,7 @@ public: FixedLine( Window* pParent, const ResId& rResId ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -124,7 +124,7 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ); protected: @@ -136,7 +136,7 @@ public: ~FixedBitmap(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -144,7 +144,7 @@ public: void SetBitmap( const Bitmap& rBitmap ); using OutputDevice::GetBitmap; const Bitmap& GetBitmap() const { return maBitmap; } - BOOL SetModeBitmap( const Bitmap& rBitmap ); + sal_Bool SetModeBitmap( const Bitmap& rBitmap ); const Bitmap& GetModeBitmap( ) const; }; @@ -156,7 +156,7 @@ class VCL_DLLPUBLIC FixedImage : public Control { private: Image maImage; - BOOL mbInUserDraw; + sal_Bool mbInUserDraw; private: using Control::ImplInitSettings; @@ -164,10 +164,10 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplInitSettings(); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, - const Point& rPos, const Size& rSize ); protected: + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, + const Point& rPos, const Size& rSize ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: @@ -176,7 +176,7 @@ public: ~FixedImage(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -186,7 +186,7 @@ public: void SetImage( const Image& rImage ); const Image& GetImage() const { return maImage; } - BOOL SetModeImage( const Image& rImage ); + sal_Bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const; Point CalcImagePos( const Point& rPos, diff --git a/vcl/inc/vcl/fldunit.hxx b/vcl/inc/vcl/fldunit.hxx deleted file mode 100644 index 93c89ada98a0..000000000000 --- a/vcl/inc/vcl/fldunit.hxx +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _VCL_FLDUNIT_HXX -#define _VCL_FLDUNIT_HXX - -#include <tools/fldunit.hxx> - -#endif // _VCL_FLDUNIT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/floatwin.hxx b/vcl/inc/vcl/floatwin.hxx index eb15b116938e..e6a5b58eea32 100644 --- a/vcl/inc/vcl/floatwin.hxx +++ b/vcl/inc/vcl/floatwin.hxx @@ -40,34 +40,34 @@ class PopupModeEvent; // - FloatingWindow-Types - // ------------------------ -#define FLOATWIN_POPUPMODE_ALLOWTEAROFF ((ULONG)0x00000001) -#define FLOATWIN_POPUPMODE_ANIMATIONSLIDE ((ULONG)0x00000002) -#define FLOATWIN_POPUPMODE_NOAUTOARRANGE ((ULONG)0x00000004) -#define FLOATWIN_POPUPMODE_NOANIMATION ((ULONG)0x00000008) -#define FLOATWIN_POPUPMODE_DOWN ((ULONG)0x00000010) -#define FLOATWIN_POPUPMODE_UP ((ULONG)0x00000020) -#define FLOATWIN_POPUPMODE_LEFT ((ULONG)0x00000040) -#define FLOATWIN_POPUPMODE_RIGHT ((ULONG)0x00000080) -#define FLOATWIN_POPUPMODE_NOFOCUSCLOSE ((ULONG)0x00000100) -#define FLOATWIN_POPUPMODE_NOKEYCLOSE ((ULONG)0x00000200) -#define FLOATWIN_POPUPMODE_NOMOUSECLOSE ((ULONG)0x00000400) -#define FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE ((ULONG)0x00000800) -#define FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE ((ULONG)0x00001000) -#define FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE ((ULONG)0x00002000) -#define FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ((ULONG)0x00004000) -#define FLOATWIN_POPUPMODE_NEWLEVEL ((ULONG)0x00008000) -#define FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE ((ULONG)0x00010000) -#define FLOATWIN_POPUPMODE_GRABFOCUS ((ULONG)0x00020000) - -#define FLOATWIN_POPUPMODEEND_CANCEL ((USHORT)0x0001) -#define FLOATWIN_POPUPMODEEND_TEAROFF ((USHORT)0x0002) -#define FLOATWIN_POPUPMODEEND_DONTCALLHDL ((USHORT)0x0004) -#define FLOATWIN_POPUPMODEEND_CLOSEALL ((USHORT)0x0008) - -#define FLOATWIN_TITLE_NORMAL ((USHORT)0x0001) -#define FLOATWIN_TITLE_TEAROFF ((USHORT)0x0002) -#define FLOATWIN_TITLE_POPUP ((USHORT)0x0004) -#define FLOATWIN_TITLE_NONE ((USHORT)0x0008) +#define FLOATWIN_POPUPMODE_ALLOWTEAROFF ((sal_uLong)0x00000001) +#define FLOATWIN_POPUPMODE_ANIMATIONSLIDE ((sal_uLong)0x00000002) +#define FLOATWIN_POPUPMODE_NOAUTOARRANGE ((sal_uLong)0x00000004) +#define FLOATWIN_POPUPMODE_NOANIMATION ((sal_uLong)0x00000008) +#define FLOATWIN_POPUPMODE_DOWN ((sal_uLong)0x00000010) +#define FLOATWIN_POPUPMODE_UP ((sal_uLong)0x00000020) +#define FLOATWIN_POPUPMODE_LEFT ((sal_uLong)0x00000040) +#define FLOATWIN_POPUPMODE_RIGHT ((sal_uLong)0x00000080) +#define FLOATWIN_POPUPMODE_NOFOCUSCLOSE ((sal_uLong)0x00000100) +#define FLOATWIN_POPUPMODE_NOKEYCLOSE ((sal_uLong)0x00000200) +#define FLOATWIN_POPUPMODE_NOMOUSECLOSE ((sal_uLong)0x00000400) +#define FLOATWIN_POPUPMODE_NOMOUSERECTCLOSE ((sal_uLong)0x00000800) +#define FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE ((sal_uLong)0x00001000) +#define FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE ((sal_uLong)0x00002000) +#define FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ((sal_uLong)0x00004000) +#define FLOATWIN_POPUPMODE_NEWLEVEL ((sal_uLong)0x00008000) +#define FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE ((sal_uLong)0x00010000) +#define FLOATWIN_POPUPMODE_GRABFOCUS ((sal_uLong)0x00020000) + +#define FLOATWIN_POPUPMODEEND_CANCEL ((sal_uInt16)0x0001) +#define FLOATWIN_POPUPMODEEND_TEAROFF ((sal_uInt16)0x0002) +#define FLOATWIN_POPUPMODEEND_DONTCALLHDL ((sal_uInt16)0x0004) +#define FLOATWIN_POPUPMODEEND_CLOSEALL ((sal_uInt16)0x0008) + +#define FLOATWIN_TITLE_NORMAL ((sal_uInt16)0x0001) +#define FLOATWIN_TITLE_TEAROFF ((sal_uInt16)0x0002) +#define FLOATWIN_TITLE_POPUP ((sal_uInt16)0x0004) +#define FLOATWIN_TITLE_NONE ((sal_uInt16)0x0008) // ------------------ // - FloatingWindow - @@ -81,18 +81,18 @@ private: Window* mpFirstPopupModeWin; ImplData* mpImplData; Rectangle maFloatRect; - ULONG mnPostId; - ULONG mnPopupModeFlags; - USHORT mnTitle; - USHORT mnOldTitle; - BOOL mbInPopupMode; - BOOL mbPopupMode; - BOOL mbPopupModeCanceled; - BOOL mbPopupModeTearOff; - BOOL mbMouseDown; - BOOL mbOldSaveBackMode; - BOOL mbGrabFocus; // act as key input window, although focus is not set - BOOL mbInCleanUp; + sal_uLong mnPostId; + sal_uLong mnPopupModeFlags; + sal_uInt16 mnTitle; + sal_uInt16 mnOldTitle; + sal_Bool mbInPopupMode; + sal_Bool mbPopupMode; + sal_Bool mbPopupModeCanceled; + sal_Bool mbPopupModeTearOff; + sal_Bool mbMouseDown; + sal_Bool mbOldSaveBackMode; + sal_Bool mbGrabFocus; // act as key input window, although focus is not set + sal_Bool mbInCleanUp; Link maPopupModeEndHdl; SAL_DLLPRIVATE void ImplCallPopupModeEnd(); @@ -109,20 +109,20 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: -#define IMPL_FLOATWIN_HITTEST_OUTSIDE ((USHORT)0x0001) -#define IMPL_FLOATWIN_HITTEST_WINDOW ((USHORT)0x0002) -#define IMPL_FLOATWIN_HITTEST_RECT ((USHORT)0x0004) - SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( Window* pReference, const Point& rPos, USHORT& rHitTest ); +#define IMPL_FLOATWIN_HITTEST_OUTSIDE ((sal_uInt16)0x0001) +#define IMPL_FLOATWIN_HITTEST_WINDOW ((sal_uInt16)0x0002) +#define IMPL_FLOATWIN_HITTEST_RECT ((sal_uInt16)0x0004) + SAL_DLLPRIVATE FloatingWindow* ImplFloatHitTest( Window* pReference, const Point& rPos, sal_uInt16& rHitTest ); SAL_DLLPRIVATE FloatingWindow* ImplFindLastLevelFloat(); - SAL_DLLPRIVATE BOOL ImplIsFloatPopupModeWindow( const Window* pWindow ); - SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = TRUE; } - SAL_DLLPRIVATE BOOL ImplIsMouseDown() const { return mbMouseDown; } + SAL_DLLPRIVATE sal_Bool ImplIsFloatPopupModeWindow( const Window* pWindow ); + SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = sal_True; } + SAL_DLLPRIVATE sal_Bool ImplIsMouseDown() const { return mbMouseDown; } SAL_DLLPRIVATE static Point ImplCalcPos( Window* pWindow, - const Rectangle& rRect, ULONG nFlags, - USHORT& rArrangeIndex ); - SAL_DLLPRIVATE void ImplEndPopupMode( USHORT nFlags = 0, ULONG nFocusId = 0 ); + const Rectangle& rRect, sal_uLong nFlags, + sal_uInt16& rArrangeIndex ); + SAL_DLLPRIVATE void ImplEndPopupMode( sal_uInt16 nFlags = 0, sal_uLong nFocusId = 0 ); SAL_DLLPRIVATE Rectangle& ImplGetItemEdgeClipRect(); - SAL_DLLPRIVATE BOOL ImplIsInPrivatePopupMode() const { return mbInPopupMode; } + SAL_DLLPRIVATE sal_Bool ImplIsInPrivatePopupMode() const { return mbInPopupMode; } public: FloatingWindow( Window* pParent, WinBits nStyle = WB_STDFLOATWIN ); @@ -135,27 +135,27 @@ public: virtual void PopupModeEnd(); - void SetTitleType( USHORT nTitle ); - USHORT GetTitleType() const { return mnTitle; } + void SetTitleType( sal_uInt16 nTitle ); + sal_uInt16 GetTitleType() const { return mnTitle; } - void StartPopupMode( const Rectangle& rRect, ULONG nFlags = 0 ); - void StartPopupMode( ToolBox* pBox, ULONG nFlags = 0 ); - void EndPopupMode( USHORT nFlags = 0 ); + void StartPopupMode( const Rectangle& rRect, sal_uLong nFlags = 0 ); + void StartPopupMode( ToolBox* pBox, sal_uLong nFlags = 0 ); + void EndPopupMode( sal_uInt16 nFlags = 0 ); void AddPopupModeWindow( Window* pWindow ); void RemovePopupModeWindow( Window* pWindow ); - ULONG GetPopupModeFlags() const { return mnPopupModeFlags; } - void SetPopupModeFlags( ULONG nFlags ) { mnPopupModeFlags = nFlags; } - BOOL IsInPopupMode() const { return mbPopupMode; } - BOOL IsInCleanUp() const { return mbInCleanUp; } - BOOL IsPopupModeCanceled() const { return mbPopupModeCanceled; } - BOOL IsPopupModeTearOff() const { return mbPopupModeTearOff; } + sal_uLong GetPopupModeFlags() const { return mnPopupModeFlags; } + void SetPopupModeFlags( sal_uLong nFlags ) { mnPopupModeFlags = nFlags; } + sal_Bool IsInPopupMode() const { return mbPopupMode; } + sal_Bool IsInCleanUp() const { return mbInCleanUp; } + sal_Bool IsPopupModeCanceled() const { return mbPopupModeCanceled; } + sal_Bool IsPopupModeTearOff() const { return mbPopupModeTearOff; } void SetPopupModeEndHdl( const Link& rLink ) { maPopupModeEndHdl = rLink; } const Link& GetPopupModeEndHdl() const { return maPopupModeEndHdl; } - BOOL GrabsFocus() const { return mbGrabFocus; } + sal_Bool GrabsFocus() const { return mbGrabFocus; } - static Point CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, ULONG nFlags, USHORT& rArrangeIndex ); + static Point CalcFloatingPosition( Window* pWindow, const Rectangle& rRect, sal_uLong nFlags, sal_uInt16& rArrangeIndex ); }; #endif // _SV_FLOATWIN_HXX diff --git a/vcl/inc/vcl/fntstyle.hxx b/vcl/inc/vcl/fntstyle.hxx index 72705fde16f2..82c8c8ad5932 100644 --- a/vcl/inc/vcl/fntstyle.hxx +++ b/vcl/inc/vcl/fntstyle.hxx @@ -47,7 +47,7 @@ enum FontRelief { RELIEF_NONE, RELIEF_EMBOSSED, RELIEF_ENGRAVED, FontRelief_FORC // - Font types - // -------------- -typedef BYTE FontKerning; +typedef sal_uInt8 FontKerning; #define KERNING_FONTSPECIFIC ((FontKerning)0x01) #define KERNING_ASIAN ((FontKerning)0x02) diff --git a/vcl/inc/vcl/font.hxx b/vcl/inc/vcl/font.hxx index d9c4d62f57d0..8ca4ba5bbb87 100644 --- a/vcl/inc/vcl/font.hxx +++ b/vcl/inc/vcl/font.hxx @@ -65,8 +65,8 @@ public: const Color& GetColor() const; void SetFillColor( const Color& ); const Color& GetFillColor() const; - void SetTransparent( BOOL bTransparent ); - BOOL IsTransparent() const; + void SetTransparent( sal_Bool bTransparent ); + sal_Bool IsTransparent() const; void SetAlign( FontAlign ); FontAlign GetAlign() const; @@ -94,11 +94,11 @@ public: void SetOrientation( short nLineOrientation ); short GetOrientation() const; - void SetVertical( BOOL bVertical ); - BOOL IsVertical() const; + void SetVertical( sal_Bool bVertical ); + sal_Bool IsVertical() const; void SetKerning( FontKerning nKerning ); FontKerning GetKerning() const; - BOOL IsKerning() const; + sal_Bool IsKerning() const; void SetWeight( FontWeight ); FontWeight GetWeight() const; @@ -106,10 +106,10 @@ public: FontWidth GetWidthType() const; void SetItalic( FontItalic ); FontItalic GetItalic() const; - void SetOutline( BOOL bOutline ); - BOOL IsOutline() const; - void SetShadow( BOOL bShadow ); - BOOL IsShadow() const; + void SetOutline( sal_Bool bOutline ); + sal_Bool IsOutline() const; + void SetShadow( sal_Bool bShadow ); + sal_Bool IsShadow() const; void SetRelief( FontRelief ); FontRelief GetRelief() const; void SetUnderline( FontUnderline ); @@ -120,17 +120,17 @@ public: FontStrikeout GetStrikeout() const; void SetEmphasisMark( FontEmphasisMark ); FontEmphasisMark GetEmphasisMark() const; - void SetWordLineMode( BOOL bWordLine ); - BOOL IsWordLineMode() const; + void SetWordLineMode( sal_Bool bWordLine ); + sal_Bool IsWordLineMode() const; void Merge( const Font& rFont ); void GetFontAttributes( ImplFontAttributes& rAttrs ) const; Font& operator=( const Font& ); - BOOL operator==( const Font& ) const; - BOOL operator!=( const Font& rFont ) const + sal_Bool operator==( const Font& ) const; + sal_Bool operator!=( const Font& rFont ) const { return !(Font::operator==( rFont )); } - BOOL IsSameInstance( const Font& ) const; + sal_Bool IsSameInstance( const Font& ) const; friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Font& ); friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Font& ); diff --git a/vcl/inc/vcl/fontcache.hxx b/vcl/inc/vcl/fontcache.hxx index f15be8dd1af7..ad261e8d8e6d 100644 --- a/vcl/inc/vcl/fontcache.hxx +++ b/vcl/inc/vcl/fontcache.hxx @@ -39,7 +39,7 @@ namespace psp { -class VCL_DLLPUBLIC FontCache +class VCL_PLUGIN_PUBLIC FontCache { struct FontDir; friend class FontDir; diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx index 70ba86ec2b35..132159e2fbac 100644 --- a/vcl/inc/vcl/fontmanager.hxx +++ b/vcl/inc/vcl/fontmanager.hxx @@ -225,7 +225,7 @@ class FontCache; class FontCache; -class VCL_DLLPUBLIC PrintFontManager +class VCL_PLUGIN_PUBLIC PrintFontManager { struct PrintFont; struct TrueTypeFontFile; diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx index ec0a8261e61d..ffbd4867ecb8 100644 --- a/vcl/inc/vcl/gdimtf.hxx +++ b/vcl/inc/vcl/gdimtf.hxx @@ -51,8 +51,8 @@ class Gradient; // - GDIMetaFile-Types - // --------------------- -#define GDI_METAFILE_END ((ULONG)0xFFFFFFFF) -#define GDI_METAFILE_LABEL_NOTFOUND ((ULONG)0xFFFFFFFF) +#define GDI_METAFILE_END ((sal_uLong)0xFFFFFFFF) +#define GDI_METAFILE_LABEL_NOTFOUND ((sal_uLong)0xFFFFFFFF) #ifndef METAFILE_END #define METAFILE_END GDI_METAFILE_END @@ -104,9 +104,9 @@ private: GDIMetaFile* pNext; OutputDevice* pOutDev; ImpLabelList* pLabelList; - BOOL bPause; - BOOL bRecord; - BOOL bUseCanvas; + sal_Bool bPause; + sal_Bool bRecord; + sal_Bool bUseCanvas; SAL_DLLPRIVATE static Color ImplColAdjustFnc( const Color& rColor, const void* pColParam ); @@ -140,7 +140,7 @@ private: protected: - virtual void Linker( OutputDevice* pOut, BOOL bLink ); + virtual void Linker( OutputDevice* pOut, sal_Bool bLink ); virtual long Hook(); public: @@ -151,12 +151,12 @@ public: using List::operator==; using List::operator!=; GDIMetaFile& operator=( const GDIMetaFile& rMtf ); - BOOL operator==( const GDIMetaFile& rMtf ) const; - BOOL operator!=( const GDIMetaFile& rMtf ) const { return !( *this == rMtf ); } + sal_Bool operator==( const GDIMetaFile& rMtf ) const; + sal_Bool operator!=( const GDIMetaFile& rMtf ) const { return !( *this == rMtf ); } void Clear(); sal_Bool IsEqual( const GDIMetaFile& rMtf ) const; - BOOL Mirror( ULONG nMirrorFlags ); + sal_Bool Mirror( sal_uLong nMirrorFlags ); void Move( long nX, long nY ); // additional Move method getting specifics how to handle MapMode( MAP_PIXEL ) void Move( long nX, long nY, long nDPIX, long nDPIY ); @@ -175,52 +175,52 @@ public: void Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, short nChannelRPercent = 0, short nChannelGPercent = 0, - short nChannelBPercent = 0, double fGamma = 1.0, BOOL bInvert = FALSE ); + short nChannelBPercent = 0, double fGamma = 1.0, sal_Bool bInvert = sal_False ); void Convert( MtfConversion eConversion ); - void ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 ); + void ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, sal_uLong nTol = 0 ); void ReplaceColors( const Color* pSearchColors, const Color* rReplaceColors, - ULONG nColorCount, ULONG* pTols = NULL ); + sal_uLong nColorCount, sal_uLong* pTols = NULL ); GDIMetaFile GetMonochromeMtf( const Color& rCol ) const; void Record( OutputDevice* pOutDev ); - BOOL IsRecord() const { return bRecord; } + sal_Bool IsRecord() const { return bRecord; } - void Play( GDIMetaFile& rMtf, ULONG nPos = GDI_METAFILE_END ); - void Play( OutputDevice* pOutDev, ULONG nPos = GDI_METAFILE_END ); + void Play( GDIMetaFile& rMtf, sal_uLong nPos = GDI_METAFILE_END ); + void Play( OutputDevice* pOutDev, sal_uLong nPos = GDI_METAFILE_END ); void Play( OutputDevice* pOutDev, const Point& rPos, - const Size& rSize, ULONG nPos = GDI_METAFILE_END ); + const Size& rSize, sal_uLong nPos = GDI_METAFILE_END ); - void Pause( BOOL bPause ); - BOOL IsPause() const { return bPause; } + void Pause( sal_Bool bPause ); + sal_Bool IsPause() const { return bPause; } void Stop(); void WindStart(); void WindEnd(); - void Wind( ULONG nAction ); + void Wind( sal_uLong nAction ); void WindPrev(); void WindNext(); - ULONG GetActionCount() const { return Count(); } + sal_uLong GetActionCount() const { return Count(); } void AddAction( MetaAction* pAction ); - void AddAction( MetaAction* pAction, ULONG nPos ); - void RemoveAction( ULONG nPos ); - MetaAction* CopyAction( ULONG nPos ) const; + void AddAction( MetaAction* pAction, sal_uLong nPos ); + void RemoveAction( sal_uLong nPos ); + MetaAction* CopyAction( sal_uLong nPos ) const; MetaAction* GetCurAction() const { return (MetaAction*) GetCurObject(); } - MetaAction* GetAction( ULONG nAction ) const { return (MetaAction*) GetObject( nAction ); } + MetaAction* GetAction( sal_uLong nAction ) const { return (MetaAction*) GetObject( nAction ); } MetaAction* FirstAction() { return (MetaAction*) First(); } MetaAction* NextAction() { return (MetaAction*) Next(); } - MetaAction* ReplaceAction( MetaAction* pAction, ULONG nAction ) { return (MetaAction*) Replace( pAction, nAction ); } + MetaAction* ReplaceAction( MetaAction* pAction, sal_uLong nAction ) { return (MetaAction*) Replace( pAction, nAction ); } - ULONG GetActionPos( const String& rLabel ); - BOOL InsertLabel( const String& rLabel, ULONG nActionPos ); + sal_uLong GetActionPos( const String& rLabel ); + sal_Bool InsertLabel( const String& rLabel, sal_uLong nActionPos ); void RemoveLabel( const String& rLabel ); void RenameLabel( const String& rLabel, const String& rNewLabel ); - ULONG GetLabelCount() const; - String GetLabel( ULONG nLabel ); + sal_uLong GetLabelCount() const; + String GetLabel( sal_uLong nLabel ); - BOOL SaveStatus(); + sal_Bool SaveStatus(); const Size& GetPrefSize() const { return aPrefSize; } void SetPrefSize( const Size& rSize ) { aPrefSize = rSize; } @@ -231,8 +231,8 @@ public: void SetHookHdl( const Link& rLink ) { aHookHdlLink = rLink; } const Link& GetHookHdl() const { return aHookHdlLink; } - ULONG GetChecksum() const; - ULONG GetSizeBytes() const; + sal_uLong GetChecksum() const; + sal_uLong GetSizeBytes() const; // Methoden zum Lesen und Schreiben des neuen Formats; // die Read-Methode kann auch das alte Format lesen @@ -244,10 +244,10 @@ public: friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, GDIMetaFile& rGDIMetaFile ); friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const GDIMetaFile& rGDIMetaFile ); - BOOL CreateThumbnail( sal_uInt32 nMaximumExtent, BitmapEx& rBmpEx, const BitmapEx* pOverlay = NULL, const Rectangle* pOverlayRect = NULL ) const; + sal_Bool CreateThumbnail( sal_uInt32 nMaximumExtent, BitmapEx& rBmpEx, const BitmapEx* pOverlay = NULL, const Rectangle* pOverlayRect = NULL ) const; - void UseCanvas( BOOL _bUseCanvas ); - BOOL GetUseCanvas() const { return bUseCanvas; } + void UseCanvas( sal_Bool _bUseCanvas ); + sal_Bool GetUseCanvas() const { return bUseCanvas; } }; /** Create a special metaaction that delegates rendering to specified diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx index 5f1b593ba44a..1d4362f00dc1 100644 --- a/vcl/inc/vcl/gfxlink.hxx +++ b/vcl/inc/vcl/gfxlink.hxx @@ -40,16 +40,16 @@ struct ImpBuffer { - ULONG mnRefCount; - BYTE* mpBuffer; + sal_uLong mnRefCount; + sal_uInt8* mpBuffer; - ImpBuffer( ULONG nSize ) + ImpBuffer( sal_uLong nSize ) { mnRefCount = 1UL; - mpBuffer = nSize ? new BYTE[ nSize ] : NULL; + mpBuffer = nSize ? new sal_uInt8[ nSize ] : NULL; } - ImpBuffer( BYTE* pBuf ) { mnRefCount = 1UL; mpBuffer = pBuf; } + ImpBuffer( sal_uInt8* pBuf ) { mnRefCount = 1UL; mpBuffer = pBuf; } ~ImpBuffer() { delete[] mpBuffer; } }; @@ -61,15 +61,15 @@ struct ImpBuffer struct ImpSwap { rtl::OUString maURL; - ULONG mnDataSize; - ULONG mnRefCount; + sal_uLong mnDataSize; + sal_uLong mnRefCount; - ImpSwap( BYTE* pData, ULONG nDataSize ); + ImpSwap( sal_uInt8* pData, sal_uLong nDataSize ); ~ImpSwap(); - BYTE* GetData() const; + sal_uInt8* GetData() const; - BOOL IsSwapped() const { return maURL.getLength() > 0; } + sal_Bool IsSwapped() const { return maURL.getLength() > 0; } void WriteTo( SvStream& rOStm ) const; }; @@ -135,7 +135,7 @@ private: sal_uInt32 mnBufSize; sal_uInt32 mnUserId; ImpGfxLink* mpImpData; - ULONG mnExtra2; + sal_uLong mnExtra2; SAL_DLLPRIVATE void ImplCopy( const GfxLink& rGfxLink ); @@ -143,7 +143,7 @@ public: GfxLink(); GfxLink( const GfxLink& ); GfxLink( const String& rPath, GfxLinkType nType ); - GfxLink( BYTE* pBuf, sal_uInt32 nBufSize, GfxLinkType nType, BOOL bOwns ); + GfxLink( sal_uInt8* pBuf, sal_uInt32 nBufSize, GfxLinkType nType, sal_Bool bOwns ); ~GfxLink(); GfxLink& operator=( const GfxLink& ); @@ -155,8 +155,8 @@ public: sal_uInt32 GetUserId() const { return mnUserId; } sal_uInt32 GetDataSize() const; - void SetData( BYTE* pBuf, sal_uInt32 nSize, GfxLinkType nType, BOOL bOwns ); - const BYTE* GetData() const; + void SetData( sal_uInt8* pBuf, sal_uInt32 nSize, GfxLinkType nType, sal_Bool bOwns ); + const sal_uInt8* GetData() const; const Size& GetPrefSize() const; void SetPrefSize( const Size& rPrefSize ); @@ -166,16 +166,16 @@ public: void SetPrefMapMode( const MapMode& rPrefMapMode ); bool IsPrefMapModeValid(); - BOOL IsNative() const; - BOOL IsUser() const { return( GFX_LINK_TYPE_USER == meType ); } + sal_Bool IsNative() const; + sal_Bool IsUser() const { return( GFX_LINK_TYPE_USER == meType ); } - BOOL LoadNative( Graphic& rGraphic ); + sal_Bool LoadNative( Graphic& rGraphic ); - BOOL ExportNative( SvStream& rOStream ) const; + sal_Bool ExportNative( SvStream& rOStream ) const; void SwapOut(); void SwapIn(); - BOOL IsSwappedOut() const { return( mpSwap != NULL ); } + sal_Bool IsSwappedOut() const { return( mpSwap != NULL ); } public: diff --git a/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/vcl/glyphcache.hxx index c28a3bfef3dd..f4d3b13c0445 100644 --- a/vcl/inc/vcl/glyphcache.hxx +++ b/vcl/inc/vcl/glyphcache.hxx @@ -49,7 +49,6 @@ class ImplFontOptions; namespace basegfx { class B2DPolyPolygon; } class RawBitmap; -class CmapResult; #include <vcl/outfont.hxx> #include <vcl/impfont.hxx> @@ -64,7 +63,7 @@ namespace vcl // ======================================================================= -class VCL_DLLPUBLIC GlyphCache +class VCL_PLUGIN_PUBLIC GlyphCache { public: explicit GlyphCache( GlyphCachePeer& ); @@ -96,7 +95,7 @@ private: void GrowNotify(); private: - ULONG CalcByteCount() const; + sal_uLong CalcByteCount() const; void GarbageCollect(); // the GlyphCache's FontList matches a font request to a serverfont instance @@ -105,8 +104,8 @@ private: struct IFSD_Hash{ size_t operator()( const ImplFontSelectData& ) const; }; typedef ::boost::unordered_map<ImplFontSelectData,ServerFont*,IFSD_Hash,IFSD_Equal > FontList; FontList maFontList; - ULONG mnMaxSize; // max overall cache size in bytes - mutable ULONG mnBytesUsed; + sal_uLong mnMaxSize; // max overall cache size in bytes + mutable sal_uLong mnBytesUsed; mutable long mnLruIndex; mutable int mnGlyphCount; ServerFont* mpCurrentGCFont; @@ -179,7 +178,7 @@ private: // ======================================================================= -class VCL_DLLPUBLIC ServerFont +class VCL_PLUGIN_PUBLIC ServerFont { public: virtual const ::rtl::OString* GetFontFileName() const { return NULL; } @@ -194,9 +193,9 @@ public: const ImplFontSelectData& GetFontSelData() const { return maFontSelData; } virtual void FetchFontMetric( ImplFontMetricData&, long& rFactor ) const = 0; - virtual ULONG GetKernPairs( ImplKernPairData** ) const { return 0; } + virtual sal_uLong GetKernPairs( ImplKernPairData** ) const { return 0; } virtual int GetGlyphKernValue( int, int ) const { return 0; } - virtual bool GetFontCodeRanges( CmapResult& ) const { return false; } + virtual const ImplFontCharMap* GetImplFontCharMap() const = 0; virtual bool GetFontCapabilities(vcl::FontCapabilities &) const { return false; } Point TransformPoint( const Point& ) const; @@ -224,7 +223,7 @@ protected: void AddRef() const { ++mnRefCount; } long GetRefCount() const { return mnRefCount; } long Release() const; - ULONG GetByteCount() const { return mnBytesUsed; } + sal_uLong GetByteCount() const { return mnBytesUsed; } virtual void InitGlyphData( int nGlyphIndex, GlyphData& ) const = 0; virtual void GarbageCollect( long ); @@ -244,7 +243,7 @@ private: // used by GlyphCache for cache LRU algorithm mutable long mnRefCount; - mutable ULONG mnBytesUsed; + mutable sal_uLong mnBytesUsed; ServerFont* mpPrevGCFont; ServerFont* mpNextGCFont; @@ -262,7 +261,7 @@ private: // ======================================================================= // a class for cache entries for physical font instances that are based on serverfonts -class VCL_DLLPUBLIC ImplServerFontEntry : public ImplFontEntry +class VCL_PLUGIN_PUBLIC ImplServerFontEntry : public ImplFontEntry { private: ServerFont* mpServerFont; @@ -279,7 +278,7 @@ public: // ======================================================================= -class VCL_DLLPUBLIC ServerFontLayout : public GenericSalLayout +class VCL_PLUGIN_PUBLIC ServerFontLayout : public GenericSalLayout { private: ServerFont& mrServerFont; @@ -324,7 +323,7 @@ protected: // ======================================================================= -class VCL_DLLPUBLIC RawBitmap +class VCL_PLUGIN_PUBLIC RawBitmap { public: RawBitmap(); @@ -333,13 +332,13 @@ public: public: unsigned char* mpBits; - ULONG mnAllocated; + sal_uLong mnAllocated; - ULONG mnWidth; - ULONG mnHeight; + sal_uLong mnWidth; + sal_uLong mnHeight; - ULONG mnScanlineSize; - ULONG mnBitCount; + sal_uLong mnScanlineSize; + sal_uLong mnBitCount; int mnXOffset; int mnYOffset; @@ -357,7 +356,7 @@ inline void ServerFont::SetExtended( int nInfo, void* pVoid ) // ExtraKernInfo allows an on-demand query of extra kerning info #i29881# // The kerning values have to be scaled to match the font size before use -class VCL_DLLPUBLIC ExtraKernInfo +class VCL_PLUGIN_PUBLIC ExtraKernInfo { public: ExtraKernInfo( sal_IntPtr nFontId ); diff --git a/vcl/inc/vcl/gradient.hxx b/vcl/inc/vcl/gradient.hxx index e451e238b912..1ed0c12ce98f 100644 --- a/vcl/inc/vcl/gradient.hxx +++ b/vcl/inc/vcl/gradient.hxx @@ -56,17 +56,17 @@ class SvStream; class Impl_Gradient { public: - ULONG mnRefCount; + sal_uLong mnRefCount; GradientStyle meStyle; Color maStartColor; Color maEndColor; - USHORT mnAngle; - USHORT mnBorder; - USHORT mnOfsX; - USHORT mnOfsY; - USHORT mnIntensityStart; - USHORT mnIntensityEnd; - USHORT mnStepCount; + sal_uInt16 mnAngle; + sal_uInt16 mnBorder; + sal_uInt16 mnOfsX; + sal_uInt16 mnOfsY; + sal_uInt16 mnIntensityStart; + sal_uInt16 mnIntensityEnd; + sal_uInt16 mnStepCount; friend SvStream& operator>>( SvStream& rIStm, Impl_Gradient& rImplGradient ); friend SvStream& operator<<( SvStream& rOStm, const Impl_Gradient& rImplGradient ); @@ -102,31 +102,31 @@ public: void SetEndColor( const Color& rColor ); const Color& GetEndColor() const { return mpImplGradient->maEndColor; } - void SetAngle( USHORT nAngle ); - USHORT GetAngle() const { return mpImplGradient->mnAngle; } + void SetAngle( sal_uInt16 nAngle ); + sal_uInt16 GetAngle() const { return mpImplGradient->mnAngle; } - void SetBorder( USHORT nBorder ); - USHORT GetBorder() const { return mpImplGradient->mnBorder; } - void SetOfsX( USHORT nOfsX ); - USHORT GetOfsX() const { return mpImplGradient->mnOfsX; } - void SetOfsY( USHORT nOfsY ); - USHORT GetOfsY() const { return mpImplGradient->mnOfsY; } + void SetBorder( sal_uInt16 nBorder ); + sal_uInt16 GetBorder() const { return mpImplGradient->mnBorder; } + void SetOfsX( sal_uInt16 nOfsX ); + sal_uInt16 GetOfsX() const { return mpImplGradient->mnOfsX; } + void SetOfsY( sal_uInt16 nOfsY ); + sal_uInt16 GetOfsY() const { return mpImplGradient->mnOfsY; } - void SetStartIntensity( USHORT nIntens ); - USHORT GetStartIntensity() const { return mpImplGradient->mnIntensityStart; } - void SetEndIntensity( USHORT nIntens ); - USHORT GetEndIntensity() const { return mpImplGradient->mnIntensityEnd; } + void SetStartIntensity( sal_uInt16 nIntens ); + sal_uInt16 GetStartIntensity() const { return mpImplGradient->mnIntensityStart; } + void SetEndIntensity( sal_uInt16 nIntens ); + sal_uInt16 GetEndIntensity() const { return mpImplGradient->mnIntensityEnd; } - void SetSteps( USHORT nSteps ); - USHORT GetSteps() const { return mpImplGradient->mnStepCount; } + void SetSteps( sal_uInt16 nSteps ); + sal_uInt16 GetSteps() const { return mpImplGradient->mnStepCount; } void GetBoundRect( const Rectangle& rRect, Rectangle &rBoundRect, Point& rCenter ) const; Gradient& operator=( const Gradient& rGradient ); - BOOL operator==( const Gradient& rGradient ) const; - BOOL operator!=( const Gradient& rGradient ) const + sal_Bool operator==( const Gradient& rGradient ) const; + sal_Bool operator!=( const Gradient& rGradient ) const { return !(Gradient::operator==( rGradient )); } - BOOL IsSameInstance( const Gradient& rGradient ) const + sal_Bool IsSameInstance( const Gradient& rGradient ) const { return (mpImplGradient == rGradient.mpImplGradient); } friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Gradient& rGradient ); diff --git a/vcl/inc/vcl/graph.h b/vcl/inc/vcl/graph.h index 803df074882d..1df2ee7a3df3 100644 --- a/vcl/inc/vcl/graph.h +++ b/vcl/inc/vcl/graph.h @@ -57,11 +57,11 @@ protected: String maUpperName; ReaderData* mpReaderData; - BOOL mbIsReading; + sal_Bool mbIsReading; GraphicReader() : mpReaderData( NULL ), - mbIsReading( FALSE ) {} + mbIsReading( sal_False ) {} public: @@ -69,11 +69,11 @@ public: const String& GetUpperFilterName() const { return maUpperName; } ReaderData* GetReaderData() const { return mpReaderData; } - BOOL IsReading() const { return mbIsReading; } + sal_Bool IsReading() const { return mbIsReading; } // TODO: when incompatible changes are possible again // the preview size hint should be redone - BOOL IsPreviewModeEnabled() const; + sal_Bool IsPreviewModeEnabled() const; void DisablePreviewMode(); void SetPreviewSize( const Size& ); Size GetPreviewSize() const; diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx index 78994327041e..3dfbb8d261d8 100644 --- a/vcl/inc/vcl/graph.hxx +++ b/vcl/inc/vcl/graph.hxx @@ -106,19 +106,19 @@ public: virtual ~Graphic(); Graphic& operator=( const Graphic& rGraphic ); - BOOL operator==( const Graphic& rGraphic ) const; - BOOL operator!=( const Graphic& rGraphic ) const; - BOOL operator!() const; + sal_Bool operator==( const Graphic& rGraphic ) const; + sal_Bool operator!=( const Graphic& rGraphic ) const; + sal_Bool operator!() const; void Clear(); GraphicType GetType() const; void SetDefaultType(); - BOOL IsSupportedGraphic() const; + sal_Bool IsSupportedGraphic() const; - BOOL IsTransparent() const; - BOOL IsAlpha() const; - BOOL IsAnimated() const; + sal_Bool IsTransparent() const; + sal_Bool IsAlpha() const; + sal_Bool IsAnimated() const; // #i102089# Access of Bitmap potentially will have to rasterconvert the Graphic // if it is a MetaFile. To be able to control this conversion it is necessary to @@ -141,7 +141,7 @@ public: Size GetSizePixel( const OutputDevice* pRefDevice = NULL ) const; - ULONG GetSizeBytes() const; + sal_uLong GetSizeBytes() const; void Draw( OutputDevice* pOutDev, const Point& rDestPt ) const; @@ -170,12 +170,12 @@ public: void SetAnimationNotifyHdl( const Link& rLink ); Link GetAnimationNotifyHdl() const; - ULONG GetAnimationLoopCount() const; + sal_uLong GetAnimationLoopCount() const; void ResetAnimationLoopCount(); List* GetAnimationInfoList() const; - ULONG GetChecksum() const; + sal_uLong GetChecksum() const; public: @@ -184,26 +184,26 @@ public: public: - static USHORT GetGraphicsCompressMode( SvStream& rIStm ); + static sal_uInt16 GetGraphicsCompressMode( SvStream& rIStm ); - void SetDocFileName( const String& rName, ULONG nFilePos ); + void SetDocFileName( const String& rName, sal_uLong nFilePos ); const String& GetDocFileName() const; - ULONG GetDocFilePos() const; + sal_uLong GetDocFilePos() const; - BOOL ReadEmbedded( SvStream& rIStream, BOOL bSwap = FALSE ); - BOOL WriteEmbedded( SvStream& rOStream ); + sal_Bool ReadEmbedded( SvStream& rIStream, sal_Bool bSwap = sal_False ); + sal_Bool WriteEmbedded( SvStream& rOStream ); - BOOL SwapOut(); - BOOL SwapOut( SvStream* pOStm ); - BOOL SwapIn(); - BOOL SwapIn( SvStream* pIStm ); - BOOL IsSwapOut() const; + sal_Bool SwapOut(); + sal_Bool SwapOut( SvStream* pOStm ); + sal_Bool SwapIn(); + sal_Bool SwapIn( SvStream* pIStm ); + sal_Bool IsSwapOut() const; void SetLink( const GfxLink& ); GfxLink GetLink() const; - BOOL IsLink() const; + sal_Bool IsLink() const; - BOOL ExportNative( SvStream& rOStream ) const; + sal_Bool ExportNative( SvStream& rOStream ) const; friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const Graphic& rGraphic ); friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, Graphic& rGraphic ); diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/vcl/graphite_adaptors.hxx index 439a87bda947..e005740a8065 100644 --- a/vcl/inc/vcl/graphite_adaptors.hxx +++ b/vcl/inc/vcl/graphite_adaptors.hxx @@ -75,7 +75,7 @@ namespace grutils // the Graphite engine. // @author tse // -class VCL_DLLPUBLIC GraphiteFontAdaptor : public gr::Font +class VCL_PLUGIN_PUBLIC GraphiteFontAdaptor : public gr::Font { typedef std::map<const gr::gid16, std::pair<gr::Rect, gr::Point> > GlyphMetricMap; friend class GrFontHasher; diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/vcl/graphite_layout.hxx index 60c7de16b1dd..92a6ec07c222 100644 --- a/vcl/inc/vcl/graphite_layout.hxx +++ b/vcl/inc/vcl/graphite_layout.hxx @@ -84,7 +84,7 @@ namespace grutils { class GrFeatureParser; } // This class uses the SIL Graphite engine to provide complex text layout services to the VCL // @author tse // -class VCL_DLLPUBLIC GraphiteLayout : public SalLayout +class VCL_PLUGIN_PUBLIC GraphiteLayout : public SalLayout { public: // Mask to allow Word break status to be stored within mvChar2BaseGlyph @@ -132,7 +132,7 @@ private: const grutils::GrFeatureParser * mpFeatures; public: - GraphiteLayout(const gr::Font & font, const grutils::GrFeatureParser * features = NULL) throw(); + explicit GraphiteLayout( const gr::Font& font, const grutils::GrFeatureParser* features = NULL ) throw(); // used by upper layers virtual bool LayoutText( ImplLayoutArgs& ); // first step of layout @@ -182,8 +182,6 @@ private: void expandOrCondense(ImplLayoutArgs &rArgs); }; - - #endif // _SV_GRAPHITELAYOUT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/graphite_serverfont.hxx b/vcl/inc/vcl/graphite_serverfont.hxx index 06a61db42f80..f0f7fecb0277 100644 --- a/vcl/inc/vcl/graphite_serverfont.hxx +++ b/vcl/inc/vcl/graphite_serverfont.hxx @@ -38,7 +38,7 @@ // Modules -class VCL_DLLPUBLIC GraphiteLayoutImpl : public GraphiteLayout +class VCL_PLUGIN_PUBLIC GraphiteLayoutImpl : public GraphiteLayout { public: GraphiteLayoutImpl(const gr::Font & font, const grutils::GrFeatureParser * features, GraphiteFontAdaptor * pFont) throw() @@ -52,14 +52,14 @@ private: // This class implments the server font specific parts. // @author tse // -class VCL_DLLPUBLIC GraphiteServerFontLayout : public ServerFontLayout +class VCL_PLUGIN_PUBLIC GraphiteServerFontLayout : public ServerFontLayout { private: mutable GraphiteFontAdaptor * mpFont; // mutable so that the DrawOffset/DrawBase can be set mutable GraphiteLayoutImpl maImpl; public: - GraphiteServerFontLayout(GraphiteFontAdaptor * font) throw(); + explicit GraphiteServerFontLayout( GraphiteFontAdaptor* font ) throw(); virtual bool LayoutText( ImplLayoutArgs& rArgs) { SalLayout::AdjustLayout(rArgs); return maImpl.LayoutText(rArgs); }; // first step of layout virtual void AdjustLayout( ImplLayoutArgs& rArgs) @@ -95,8 +95,6 @@ public: int getMaxCharPos() const { return mnEndCharPos; } }; - - #endif #endif //_SV_GRAPHITESERVERFONT_HXX diff --git a/vcl/inc/vcl/group.hxx b/vcl/inc/vcl/group.hxx index 765021fbe89b..3334988c7877 100644 --- a/vcl/inc/vcl/group.hxx +++ b/vcl/inc/vcl/group.hxx @@ -44,8 +44,8 @@ private: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, + SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout = false ); virtual void FillLayoutData() const; @@ -59,7 +59,7 @@ public: GroupBox( Window* pParent, const ResId& rResId ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/vcl/inc/vcl/hatch.hxx b/vcl/inc/vcl/hatch.hxx index 3cdcd0e24c2c..947740229f7f 100644 --- a/vcl/inc/vcl/hatch.hxx +++ b/vcl/inc/vcl/hatch.hxx @@ -42,11 +42,11 @@ class SvStream; struct ImplHatch { - ULONG mnRefCount; + sal_uLong mnRefCount; Color maColor; HatchStyle meStyle; long mnDistance; - USHORT mnAngle; + sal_uInt16 mnAngle; ImplHatch(); ImplHatch( const ImplHatch& rImplHatch ); @@ -70,13 +70,13 @@ public: Hatch(); Hatch( const Hatch& rHatch ); - Hatch( HatchStyle eStyle, const Color& rHatchColor, long nDistance, USHORT nAngle10 = 0 ); + Hatch( HatchStyle eStyle, const Color& rHatchColor, long nDistance, sal_uInt16 nAngle10 = 0 ); ~Hatch(); Hatch& operator=( const Hatch& rHatch ); - BOOL operator==( const Hatch& rHatch ) const; - BOOL operator!=( const Hatch& rHatch ) const { return !(Hatch::operator==( rHatch ) ); } - BOOL IsSameInstance( const Hatch& rHatch ) const { return( mpImplHatch == rHatch.mpImplHatch ); } + sal_Bool operator==( const Hatch& rHatch ) const; + sal_Bool operator!=( const Hatch& rHatch ) const { return !(Hatch::operator==( rHatch ) ); } + sal_Bool IsSameInstance( const Hatch& rHatch ) const { return( mpImplHatch == rHatch.mpImplHatch ); } void SetStyle( HatchStyle eStyle ); HatchStyle GetStyle() const { return mpImplHatch->meStyle; } @@ -87,8 +87,8 @@ public: void SetDistance( long nDistance ); long GetDistance() const { return mpImplHatch->mnDistance; } - void SetAngle( USHORT nAngle10 ); - USHORT GetAngle() const { return mpImplHatch->mnAngle; } + void SetAngle( sal_uInt16 nAngle10 ); + sal_uInt16 GetAngle() const { return mpImplHatch->mnAngle; } friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Hatch& rHatch ); friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Hatch& rHatch ); diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx index e91b459ee8cc..ce7d1baf4fd6 100644 --- a/vcl/inc/vcl/help.hxx +++ b/vcl/inc/vcl/help.hxx @@ -41,20 +41,26 @@ class Window; // - Help-Types - // -------------- -#define QUICKHELP_LEFT ((USHORT)0x0001) -#define QUICKHELP_CENTER ((USHORT)0x0002) -#define QUICKHELP_RIGHT ((USHORT)0x0004) -#define QUICKHELP_TOP ((USHORT)0x0008) -#define QUICKHELP_VCENTER ((USHORT)0x0010) -#define QUICKHELP_BOTTOM ((USHORT)0x0020) -#define QUICKHELP_NOAUTOPOS (QUICKHELP_LEFT | QUICKHELP_CENTER | QUICKHELP_RIGHT | QUICKHELP_TOP | QUICKHELP_VCENTER | QUICKHELP_BOTTOM) -#define QUICKHELP_CTRLTEXT ((USHORT)0x0040) -#define QUICKHELP_NOEVADEPOINTER ((USHORT)0x4000) -#define QUICKHELP_BIDI_RTL ((USHORT)0x8000) +#define QUICKHELP_LEFT ((sal_uInt16)0x0001) +#define QUICKHELP_CENTER ((sal_uInt16)0x0002) +#define QUICKHELP_RIGHT ((sal_uInt16)0x0004) +#define QUICKHELP_TOP ((sal_uInt16)0x0008) +#define QUICKHELP_VCENTER ((sal_uInt16)0x0010) +#define QUICKHELP_BOTTOM ((sal_uInt16)0x0020) +#define QUICKHELP_NOAUTOPOS (QUICKHELP_LEFT | QUICKHELP_CENTER | QUICKHELP_RIGHT | QUICKHELP_TOP | QUICKHELP_VCENTER | QUICKHELP_BOTTOM) +#define QUICKHELP_CTRLTEXT ((sal_uInt16)0x0040) +/// force the existent tip window to be re-positioned, even if the previous incarnation has the same text. Applies to ShowBallon and ShowQuickHelp. +#define QUICKHELP_FORCE_REPOSITION ((sal_uInt16)0x0080) +/// no delay when opening the quick help. Applies to ShowBallon and ShowQuickHelp +#define QUICKHELP_NO_DELAY ((sal_uInt16)0x0100) +/// force balloon-style in ShowTip +#define QUICKHELP_TIP_STYLE_BALLOON ((sal_uInt16)0x0200) +#define QUICKHELP_NOEVADEPOINTER ((sal_uInt16)0x4000) +#define QUICKHELP_BIDI_RTL ((sal_uInt16)0x8000) // By changes you must also change: rsc/vclrsc.hxx -#define OOO_HELP_INDEX ((ULONG)0xFFFFFFFF) -#define OOO_HELP_HELPONHELP ((ULONG)0xFFFFFFFE) +#define OOO_HELP_INDEX ".help:index" +#define OOO_HELP_HELPONHELP ".help:helponhelp" // -------- // - Help - @@ -72,53 +78,56 @@ public: void SetHelpFile( const String& rFileName ) { maHelpFile = rFileName; } const String& GetHelpFile() const { return maHelpFile; } - virtual BOOL Start( ULONG nHelpId, const Window* pWindow ); - virtual BOOL Start( const XubString& rKeyWord, const Window* pWindow ); - virtual void OpenHelpAgent( ULONG nHelpId ); - virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow ); + virtual sal_Bool Start( const XubString& rHelpId, const Window* pWindow ); + virtual sal_Bool SearchKeyword( const XubString& rKeyWord ); + virtual void OpenHelpAgent( const rtl::OString& rHelpId ); virtual XubString GetHelpText( const String& aHelpURL, const Window* pWindow ); static void EnableContextHelp(); static void DisableContextHelp(); - static BOOL IsContextHelpEnabled(); - static BOOL StartContextHelp(); + static sal_Bool IsContextHelpEnabled(); + static sal_Bool StartContextHelp(); static void EnableExtHelp(); static void DisableExtHelp(); - static BOOL IsExtHelpEnabled(); - static BOOL StartExtHelp(); - static BOOL EndExtHelp(); - static BOOL IsExtHelpActive(); + static sal_Bool IsExtHelpEnabled(); + static sal_Bool StartExtHelp(); + static sal_Bool EndExtHelp(); + static sal_Bool IsExtHelpActive(); static void EnableBalloonHelp(); static void DisableBalloonHelp(); - static BOOL IsBalloonHelpEnabled(); - static BOOL ShowBalloon( Window* pParent, + static sal_Bool IsBalloonHelpEnabled(); + static sal_Bool ShowBalloon( Window* pParent, const Point& rScreenPos, const XubString& rHelpText ); - static BOOL ShowBalloon( Window* pParent, + static sal_Bool ShowBalloon( Window* pParent, const Point& rScreenPos, const Rectangle&, const XubString& rHelpText ); static void EnableQuickHelp(); static void DisableQuickHelp(); - static BOOL IsQuickHelpEnabled(); - static BOOL ShowQuickHelp( Window* pParent, + static sal_Bool IsQuickHelpEnabled(); + static sal_Bool ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, const XubString& rHelpText, const XubString& rLongHelpText, - USHORT nStyle = 0 ); - static BOOL ShowQuickHelp( Window* pParent, + sal_uInt16 nStyle = 0 ); + static sal_Bool ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, const XubString& rHelpText, - USHORT nStyle = 0 ) + sal_uInt16 nStyle = 0 ) { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, XubString(), nStyle ); } - static ULONG ShowTip( Window* pParent, + static sal_uLong ShowTip( Window* pParent, const Rectangle& rScreenRect, - const XubString& rText, USHORT nStyle = 0 ); - static void HideTip( ULONG nId ); + const XubString& rText, sal_uInt16 nStyle = 0 ); + static void UpdateTip( sal_uLong nId, + Window* pParent, + const Rectangle& rScreenRect, + const XubString& rText ); + static void HideTip( sal_uLong nId ); }; #endif // _SV_HELP_HXX diff --git a/vcl/inc/vcl/helpwin.hxx b/vcl/inc/vcl/helpwin.hxx index 9066012d05f2..7862a4961bbd 100644 --- a/vcl/inc/vcl/helpwin.hxx +++ b/vcl/inc/vcl/helpwin.hxx @@ -50,8 +50,8 @@ private: Timer maShowTimer; Timer maHideTimer; - USHORT mnHelpWinStyle; - USHORT mnStyle; + sal_uInt16 mnHelpWinStyle; + sal_uInt16 mnStyle; protected: DECL_LINK( TimerHdl, Timer* ); @@ -61,33 +61,34 @@ protected: void ImplShow(); public: - HelpTextWindow( Window* pParent, const String& rText, USHORT nHelpWinStyle, USHORT nStyle ); + HelpTextWindow( Window* pParent, const String& rText, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle ); ~HelpTextWindow(); const String& GetHelpText() const { return maHelpText; } void SetHelpText( const String& rHelpText ); - USHORT GetWinStyle() const { return mnHelpWinStyle; } + sal_uInt16 GetWinStyle() const { return mnHelpWinStyle; } + sal_uInt16 GetStyle() const { return mnStyle; } // Nur merken: void SetStatusText( const String& rStatusText ) { maStatusText = rStatusText; } void SetHelpArea( const Rectangle& rRect ) { maHelpArea = rRect; } - void ShowHelp( USHORT nDelayMode ); + void ShowHelp( sal_uInt16 nDelayMode ); Size CalcOutSize() const; const Rectangle& GetHelpArea() const { return maHelpArea; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - BOOL RegisterAccessibleParent(); + sal_Bool RegisterAccessibleParent(); void RevokeAccessibleParent(); }; -void ImplShowHelpWindow( Window* pParent, USHORT nHelpWinStyle, USHORT nStyle, +void ImplShowHelpWindow( Window* pParent, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, const String& rHelpText, const String& rStatusText, const Point& rScreenPos, const Rectangle* pHelpArea = NULL ); void ImplDestroyHelpWindow( bool bUpdateHideTime ); -void ImplSetHelpWindowPos( Window* pHelpWindow, USHORT nHelpWinStyle, USHORT nStyle, +void ImplSetHelpWindowPos( Window* pHelpWindow, sal_uInt16 nHelpWinStyle, sal_uInt16 nStyle, const Point& rPos, const Rectangle* pHelpArea ); #endif // _SV_HELPWIN_HXX diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx index 428032ae2017..a83afa4510ab 100644 --- a/vcl/inc/vcl/i18nhelp.hxx +++ b/vcl/inc/vcl/i18nhelp.hxx @@ -87,7 +87,7 @@ public: sal_Bool MatchMnemonic( const String& rString, sal_Unicode cMnemonicChar ) const; String GetDate( const Date& rDate ) const; - String GetNum( long nNumber, USHORT nDecimals, BOOL bUseThousandSep = TRUE, BOOL bTrailingZeros = TRUE ) const; + String GetNum( long nNumber, sal_uInt16 nDecimals, sal_Bool bUseThousandSep = sal_True, sal_Bool bTrailingZeros = sal_True ) const; static String filterFormattingChars( const String& ); }; diff --git a/vcl/inc/vcl/idlemgr.hxx b/vcl/inc/vcl/idlemgr.hxx index a0f5aa9a052c..674bdf070c3a 100644 --- a/vcl/inc/vcl/idlemgr.hxx +++ b/vcl/inc/vcl/idlemgr.hxx @@ -50,7 +50,7 @@ public: ImplIdleMgr(); ~ImplIdleMgr(); - BOOL InsertIdleHdl( const Link& rLink, USHORT nPriority ); + sal_Bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); void RemoveIdleHdl( const Link& rLink ); void RestartIdler() diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/vcl/ilstbox.hxx index b468978f247e..850531c64d9d 100644 --- a/vcl/inc/vcl/ilstbox.hxx +++ b/vcl/inc/vcl/ilstbox.hxx @@ -37,6 +37,7 @@ #include <vcl/lstbox.h> #include <vcl/timer.hxx> +#include "vcl/quickselectionengine.hxx" class ScrollBar; class ScrollBarBox; @@ -66,7 +67,7 @@ struct ImplEntryType XubString maStr; Image maImage; void* mpUserData; - BOOL mbIsSelected; + sal_Bool mbIsSelected; long mnFlags; long mnHeight; @@ -76,7 +77,7 @@ struct ImplEntryType mnFlags( 0 ), mnHeight( 0 ) { - mbIsSelected = FALSE; + mbIsSelected = sal_False; mpUserData = NULL; } @@ -85,7 +86,7 @@ struct ImplEntryType mnFlags( 0 ), mnHeight( 0 ) { - mbIsSelected = FALSE; + mbIsSelected = sal_False; mpUserData = NULL; } @@ -94,7 +95,7 @@ struct ImplEntryType mnFlags( 0 ), mnHeight( 0 ) { - mbIsSelected = FALSE; + mbIsSelected = sal_False; mpUserData = NULL; } }; @@ -107,100 +108,98 @@ class ImplEntryList : private List { private: Window* mpWindow; // For getting the current locale when matching strings - USHORT mnLastSelected; - USHORT mnSelectionAnchor; - USHORT mnImages; + sal_uInt16 mnLastSelected; + sal_uInt16 mnSelectionAnchor; + sal_uInt16 mnImages; - USHORT mnMRUCount; - USHORT mnMaxMRUCount; + sal_uInt16 mnMRUCount; + sal_uInt16 mnMaxMRUCount; Link maSelectionChangedHdl; - BOOL mbCallSelectionChangedHdl; + sal_Bool mbCallSelectionChangedHdl; - ImplEntryType* GetEntry( USHORT nPos ) const { return (ImplEntryType*)List::GetObject( nPos ); } + ImplEntryType* GetEntry( sal_uInt16 nPos ) const { return (ImplEntryType*)List::GetObject( nPos ); } public: ImplEntryList( Window* pWindow ); ~ImplEntryList(); - USHORT InsertEntry( USHORT nPos, ImplEntryType* pNewEntry, BOOL bSort ); - void RemoveEntry( USHORT nPos ); - const ImplEntryType* GetEntryPtr( USHORT nPos ) const { return (const ImplEntryType*) GetObject( nPos ); } - ImplEntryType* GetMutableEntryPtr( USHORT nPos ) const { return (ImplEntryType*) GetObject( nPos ); } + sal_uInt16 InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry, sal_Bool bSort ); + void RemoveEntry( sal_uInt16 nPos ); + const ImplEntryType* GetEntryPtr( sal_uInt16 nPos ) const { return (const ImplEntryType*) GetObject( nPos ); } + ImplEntryType* GetMutableEntryPtr( sal_uInt16 nPos ) const { return (ImplEntryType*) GetObject( nPos ); } void Clear(); - USHORT FindMatchingEntry( const XubString& rStr, USHORT nStart = 0, BOOL bForward = TRUE, BOOL bLazy = TRUE ) const; - USHORT FindEntry( const XubString& rStr, BOOL bSearchMRUArea = FALSE ) const; - USHORT FindEntry( const void* pData ) const; + sal_uInt16 FindMatchingEntry( const XubString& rStr, sal_uInt16 nStart = 0, sal_Bool bForward = sal_True, sal_Bool bLazy = sal_True ) const; + sal_uInt16 FindEntry( const XubString& rStr, sal_Bool bSearchMRUArea = sal_False ) const; + sal_uInt16 FindEntry( const void* pData ) const; // helper: add up heights up to index nEndIndex. // GetAddedHeight( 0 ) returns 0 // GetAddedHeight( LISTBOX_ENTRY_NOTFOUND ) returns 0 // GetAddedHeight( i, k ) with k > i is equivalent -GetAddedHeight( k, i ) - long GetAddedHeight( USHORT nEndIndex, USHORT nBeginIndex = 0, long nBeginHeight = 0 ) const; - long GetEntryHeight( USHORT nPos ) const; + long GetAddedHeight( sal_uInt16 nEndIndex, sal_uInt16 nBeginIndex = 0, long nBeginHeight = 0 ) const; + long GetEntryHeight( sal_uInt16 nPos ) const; - USHORT GetEntryCount() const { return (USHORT)List::Count(); } - BOOL HasImages() const { return mnImages ? TRUE : FALSE; } + sal_uInt16 GetEntryCount() const { return (sal_uInt16)List::Count(); } + sal_Bool HasImages() const { return mnImages ? sal_True : sal_False; } - XubString GetEntryText( USHORT nPos ) const; + XubString GetEntryText( sal_uInt16 nPos ) const; - BOOL HasEntryImage( USHORT nPos ) const; - Image GetEntryImage( USHORT nPos ) const; + sal_Bool HasEntryImage( sal_uInt16 nPos ) const; + Image GetEntryImage( sal_uInt16 nPos ) const; - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; + void SetEntryData( sal_uInt16 nPos, void* pNewData ); + void* GetEntryData( sal_uInt16 nPos ) const; - void SetEntryFlags( USHORT nPos, long nFlags ); - long GetEntryFlags( USHORT nPos ) const; + void SetEntryFlags( sal_uInt16 nPos, long nFlags ); + long GetEntryFlags( sal_uInt16 nPos ) const; - void SelectEntry( USHORT nPos, BOOL bSelect ); + void SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ); - USHORT GetSelectEntryCount() const; - XubString GetSelectEntry( USHORT nIndex ) const; - USHORT GetSelectEntryPos( USHORT nIndex ) const; - BOOL IsEntrySelected( const XubString& rStr ) const; - BOOL IsEntryPosSelected( USHORT nIndex ) const; + sal_uInt16 GetSelectEntryCount() const; + XubString GetSelectEntry( sal_uInt16 nIndex ) const; + sal_uInt16 GetSelectEntryPos( sal_uInt16 nIndex ) const; + sal_Bool IsEntrySelected( const XubString& rStr ) const; + sal_Bool IsEntryPosSelected( sal_uInt16 nIndex ) const; - void SetLastSelected( USHORT nPos ) { mnLastSelected = nPos; } - USHORT GetLastSelected() const { return mnLastSelected; } + void SetLastSelected( sal_uInt16 nPos ) { mnLastSelected = nPos; } + sal_uInt16 GetLastSelected() const { return mnLastSelected; } - void SetSelectionAnchor( USHORT nPos ) { mnSelectionAnchor = nPos; } - USHORT GetSelectionAnchor() const { return mnSelectionAnchor; } + void SetSelectionAnchor( sal_uInt16 nPos ) { mnSelectionAnchor = nPos; } + sal_uInt16 GetSelectionAnchor() const { return mnSelectionAnchor; } void SetSelectionChangedHdl( const Link& rLnk ) { maSelectionChangedHdl = rLnk; } - void SetCallSelectionChangedHdl( BOOL bCall ) { mbCallSelectionChangedHdl = bCall; } + void SetCallSelectionChangedHdl( sal_Bool bCall ) { mbCallSelectionChangedHdl = bCall; } - void SetMRUCount( USHORT n ) { mnMRUCount = n; } - USHORT GetMRUCount() const { return mnMRUCount; } + void SetMRUCount( sal_uInt16 n ) { mnMRUCount = n; } + sal_uInt16 GetMRUCount() const { return mnMRUCount; } - void SetMaxMRUCount( USHORT n ) { mnMaxMRUCount = n; } - USHORT GetMaxMRUCount() const { return mnMaxMRUCount; } + void SetMaxMRUCount( sal_uInt16 n ) { mnMaxMRUCount = n; } + sal_uInt16 GetMaxMRUCount() const { return mnMaxMRUCount; } /** An Entry is selectable if its mnFlags does not have the LISTBOX_ENTRY_FLAG_DISABLE_SELECTION flag set. */ - bool IsEntrySelectable( USHORT nPos ) const; + bool IsEntrySelectable( sal_uInt16 nPos ) const; /** returns the first entry found from the given position nPos that is selectable or LISTBOX_ENTRY_NOTFOUND if non is found. If the entry at nPos is not selectable, it returns the first selectable entry after nPos if bForward is true and the first selectable entry after nPos is bForward is false. */ - USHORT FindFirstSelectable( USHORT nPos, bool bForward = true ); + sal_uInt16 FindFirstSelectable( sal_uInt16 nPos, bool bForward = true ); }; // --------------------- // - ImplListBoxWindow - // --------------------- -class ImplListBoxWindow : public Control +class ImplListBoxWindow : public Control, public ::vcl::ISearchableStringList { private: ImplEntryList* mpEntryList; // EntryListe Rectangle maFocusRect; - String maSearchStr; - Timer maSearchTimeout; Size maUserItemSize; @@ -214,22 +213,22 @@ private: long mnMaxWidth; // Maximale Breite eines Eintrags long mnMaxHeight; // Maximale Hoehe eines Eintrags - USHORT mnCurrentPos; // Position (Focus) - USHORT mnTrackingSaveSelection; // Selektion vor Tracking(); + sal_uInt16 mnCurrentPos; // Position (Focus) + sal_uInt16 mnTrackingSaveSelection; // Selektion vor Tracking(); - USHORT mnSeparatorPos; // Separator + sal_uInt16 mnSeparatorPos; // Separator - USHORT mnUserDrawEntry; + sal_uInt16 mnUserDrawEntry; - USHORT mnTop; // Ausgabe ab Zeile + sal_uInt16 mnTop; // Ausgabe ab Zeile long mnLeft; // Ausgabe ab Spalte long mnBorder; // Abstand Rahmen - Text long mnTextHeight; // Texthoehe ProminentEntry meProminentType; // where is the "prominent" entry - USHORT mnSelectModifier; // Modifiers + sal_uInt16 mnSelectModifier; // Modifiers - BOOL mbHasFocusRect: 1, + sal_Bool mbHasFocusRect: 1, mbSort: 1, // ListBox sortiert mbTrack: 1, // Tracking mbMulti: 1, // MultiListBox @@ -255,9 +254,10 @@ private: Link maUserDrawHdl; Link maMRUChangedHdl; -protected: - DECL_LINK( SearchStringTimeout, Timer* ); + ::vcl::QuickSelectionEngine + maQuickSelectionEngine; +protected: virtual void KeyInput( const KeyEvent& rKEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseMove( const MouseEvent& rMEvt ); @@ -267,8 +267,8 @@ protected: virtual void GetFocus(); virtual void LoseFocus(); - BOOL SelectEntries( USHORT nSelect, LB_EVENT_TYPE eLET, BOOL bShift = FALSE, BOOL bCtrl = FALSE ); - void ImplPaint( USHORT nPos, BOOL bErase = FALSE, bool bLayout = false ); + sal_Bool SelectEntries( sal_uInt16 nSelect, LB_EVENT_TYPE eLET, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False ); + void ImplPaint( sal_uInt16 nPos, sal_Bool bErase = sal_False, bool bLayout = false ); void ImplDoPaint( const Rectangle& rRect, bool bLayout = false ); void ImplCalcMetrics(); void ImplUpdateEntryMetrics( ImplEntryType& rEntry ); @@ -289,65 +289,65 @@ public: ImplEntryList* GetEntryList() const { return mpEntryList; } - USHORT InsertEntry( USHORT nPos, ImplEntryType* pNewEntry ); - void RemoveEntry( USHORT nPos ); + sal_uInt16 InsertEntry( sal_uInt16 nPos, ImplEntryType* pNewEntry ); + void RemoveEntry( sal_uInt16 nPos ); void Clear(); void ResetCurrentPos() { mnCurrentPos = LISTBOX_ENTRY_NOTFOUND; } - USHORT GetCurrentPos() const { return mnCurrentPos; } - USHORT GetDisplayLineCount() const; - void SetEntryFlags( USHORT nPos, long nFlags ); + sal_uInt16 GetCurrentPos() const { return mnCurrentPos; } + sal_uInt16 GetDisplayLineCount() const; + void SetEntryFlags( sal_uInt16 nPos, long nFlags ); - void DrawEntry( USHORT nPos, BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE, bool bLayout = false ); + void DrawEntry( sal_uInt16 nPos, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False, bool bLayout = false ); - void SelectEntry( USHORT nPos, BOOL bSelect ); + void SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ); void DeselectAll(); - USHORT GetEntryPosForPoint( const Point& rPoint ) const; - USHORT GetLastVisibleEntry() const; + sal_uInt16 GetEntryPosForPoint( const Point& rPoint ) const; + sal_uInt16 GetLastVisibleEntry() const; - BOOL ProcessKeyInput( const KeyEvent& rKEvt ); + sal_Bool ProcessKeyInput( const KeyEvent& rKEvt ); - void SetTopEntry( USHORT nTop ); - USHORT GetTopEntry() const { return mnTop; } + void SetTopEntry( sal_uInt16 nTop ); + sal_uInt16 GetTopEntry() const { return mnTop; } // ShowProminentEntry will set the entry correspoding to nEntryPos // either at top or in the middle depending on the chosen style - void ShowProminentEntry( USHORT nEntryPos ); + void ShowProminentEntry( sal_uInt16 nEntryPos ); void SetProminentEntryType( ProminentEntry eType ) { meProminentType = eType; } ProminentEntry GetProminentEntryType() const { return meProminentType; } using Window::IsVisible; - BOOL IsVisible( USHORT nEntry ) const; + sal_Bool IsVisible( sal_uInt16 nEntry ) const; long GetLeftIndent() const { return mnLeft; } void SetLeftIndent( long n ); void ScrollHorz( long nDiff ); - void AllowGrabFocus( BOOL b ) { mbGrabFocus = b; } - BOOL IsGrabFocusAllowed() const { return mbGrabFocus; } + void AllowGrabFocus( sal_Bool b ) { mbGrabFocus = b; } + sal_Bool IsGrabFocusAllowed() const { return mbGrabFocus; } - void SetSeparatorPos( USHORT n ) { mnSeparatorPos = n; } - USHORT GetSeparatorPos() const { return mnSeparatorPos; } + void SetSeparatorPos( sal_uInt16 n ) { mnSeparatorPos = n; } + sal_uInt16 GetSeparatorPos() const { return mnSeparatorPos; } - void SetTravelSelect( BOOL bTravelSelect ) { mbTravelSelect = bTravelSelect; } - BOOL IsTravelSelect() const { return mbTravelSelect; } - BOOL IsTrackingSelect() const { return mbTrackingSelect; } + void SetTravelSelect( sal_Bool bTravelSelect ) { mbTravelSelect = bTravelSelect; } + sal_Bool IsTravelSelect() const { return mbTravelSelect; } + sal_Bool IsTrackingSelect() const { return mbTrackingSelect; } void SetUserItemSize( const Size& rSz ); const Size& GetUserItemSize() const { return maUserItemSize; } - void EnableUserDraw( BOOL bUserDraw ) { mbUserDrawEnabled = bUserDraw; } - BOOL IsUserDrawEnabled() const { return mbUserDrawEnabled; } + void EnableUserDraw( sal_Bool bUserDraw ) { mbUserDrawEnabled = bUserDraw; } + sal_Bool IsUserDrawEnabled() const { return mbUserDrawEnabled; } - void EnableMultiSelection( BOOL bMulti, BOOL bStackMode ) { mbMulti = bMulti; mbStackMode = bStackMode; } - BOOL IsMultiSelectionEnabled() const { return mbMulti; } + void EnableMultiSelection( sal_Bool bMulti, sal_Bool bStackMode ) { mbMulti = bMulti; mbStackMode = bStackMode; } + sal_Bool IsMultiSelectionEnabled() const { return mbMulti; } - void SetMultiSelectionSimpleMode( BOOL bSimple ) { mbSimpleMode = bSimple; } - BOOL IsMultiSelectionSimpleMode() const { return mbSimpleMode; } + void SetMultiSelectionSimpleMode( sal_Bool bSimple ) { mbSimpleMode = bSimple; } + sal_Bool IsMultiSelectionSimpleMode() const { return mbSimpleMode; } - void EnableMouseMoveSelect( BOOL bMouseMoveSelect ) { mbMouseMoveSelect = bMouseMoveSelect; } - BOOL IsMouseMoveSelectEnabled() const { return mbMouseMoveSelect; } - BOOL IsMouseMoveSelect() const { return mbMouseMoveSelect||mbStackMode; } + void EnableMouseMoveSelect( sal_Bool bMouseMoveSelect ) { mbMouseMoveSelect = bMouseMoveSelect; } + sal_Bool IsMouseMoveSelectEnabled() const { return mbMouseMoveSelect; } + sal_Bool IsMouseMoveSelect() const { return mbMouseMoveSelect||mbStackMode; } - Size CalcSize( USHORT nMaxLines ) const; - Rectangle GetBoundingRectangle( USHORT nItem ) const; + Size CalcSize( sal_uInt16 nMaxLines ) const; + Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const; long GetEntryHeight() const { return mnMaxHeight; } long GetMaxEntryWidth() const { return mnMaxWidth; } @@ -365,21 +365,27 @@ public: void SetMRUChangedHdl( const Link& rLink ) { maMRUChangedHdl = rLink; } const Link& GetMRUChangedHdl() const { return maMRUChangedHdl; } - BOOL IsSelectionChanged() const { return mbSelectionChanged; } - USHORT GetSelectModifier() const { return mnSelectModifier; } + sal_Bool IsSelectionChanged() const { return mbSelectionChanged; } + sal_uInt16 GetSelectModifier() const { return mnSelectModifier; } - void EnableSort( BOOL b ) { mbSort = b; } + void EnableSort( sal_Bool b ) { mbSort = b; } - void SetReadOnly( BOOL bReadOnly ) { mbReadOnly = bReadOnly; } - BOOL IsReadOnly() const { return mbReadOnly; } + void SetReadOnly( sal_Bool bReadOnly ) { mbReadOnly = bReadOnly; } + sal_Bool IsReadOnly() const { return mbReadOnly; } using Control::ImplInitSettings; - void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - USHORT ImplGetTextStyle() const; + void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + sal_uInt16 ImplGetTextStyle() const; // pb: #106948# explicit mirroring for calc - inline void EnableMirroring() { mbMirroring = TRUE; } - inline BOOL IsMirroring() const { return mbMirroring; } + inline void EnableMirroring() { mbMirroring = sal_True; } + inline sal_Bool IsMirroring() const { return mbMirroring; } + +protected: + // ISearchableStringList + virtual ::vcl::StringEntryIdentifier CurrentEntry( String& _out_entryText ) const; + virtual ::vcl::StringEntryIdentifier NextEntry( ::vcl::StringEntryIdentifier _currentEntry, String& _out_entryText ) const; + virtual void SelectEntry( ::vcl::StringEntryIdentifier _entry ); }; // --------------- @@ -393,7 +399,7 @@ private: ScrollBar* mpHScrollBar; ScrollBar* mpVScrollBar; ScrollBarBox* mpScrollBarBox; - BOOL mbVScroll : 1, // VScroll an oder aus + sal_Bool mbVScroll : 1, // VScroll an oder aus mbHScroll : 1, // HScroll an oder aus mbAutoHScroll : 1; // AutoHScroll an oder aus Link maScrollHdl; // Weil der vom ImplListBoxWindow selbst benoetigt wird. @@ -425,55 +431,55 @@ public: virtual const Wallpaper& GetDisplayBackground() const; virtual Window* GetPreferredKeyInputWindow(); - USHORT InsertEntry( USHORT nPos, const XubString& rStr ); - USHORT InsertEntry( USHORT nPos, const Image& rImage ); - USHORT InsertEntry( USHORT nPos, const XubString& rStr, const Image& rImage ); - void RemoveEntry( USHORT nPos ); - void SetEntryData( USHORT nPos, void* pNewData ) { maLBWindow.GetEntryList()->SetEntryData( nPos, pNewData ); } + sal_uInt16 InsertEntry( sal_uInt16 nPos, const XubString& rStr ); + sal_uInt16 InsertEntry( sal_uInt16 nPos, const Image& rImage ); + sal_uInt16 InsertEntry( sal_uInt16 nPos, const XubString& rStr, const Image& rImage ); + void RemoveEntry( sal_uInt16 nPos ); + void SetEntryData( sal_uInt16 nPos, void* pNewData ) { maLBWindow.GetEntryList()->SetEntryData( nPos, pNewData ); } void Clear(); - void SetEntryFlags( USHORT nPos, long nFlags ); - long GetEntryFlags( USHORT nPos ) const; + void SetEntryFlags( sal_uInt16 nPos, long nFlags ); + long GetEntryFlags( sal_uInt16 nPos ) const; - void SelectEntry( USHORT nPos, BOOL bSelect ); + void SelectEntry( sal_uInt16 nPos, sal_Bool bSelect ); void SetNoSelection(); void ResetCurrentPos() { maLBWindow.ResetCurrentPos(); } - USHORT GetCurrentPos() const { return maLBWindow.GetCurrentPos(); } + sal_uInt16 GetCurrentPos() const { return maLBWindow.GetCurrentPos(); } - BOOL ProcessKeyInput( const KeyEvent& rKEvt ) { return maLBWindow.ProcessKeyInput( rKEvt ); } - BOOL HandleWheelAsCursorTravel( const CommandEvent& rCEvt ); + sal_Bool ProcessKeyInput( const KeyEvent& rKEvt ) { return maLBWindow.ProcessKeyInput( rKEvt ); } + sal_Bool HandleWheelAsCursorTravel( const CommandEvent& rCEvt ); - void SetSeparatorPos( USHORT n ) { maLBWindow.SetSeparatorPos( n ); } - USHORT GetSeparatorPos() const { return maLBWindow.GetSeparatorPos(); } + void SetSeparatorPos( sal_uInt16 n ) { maLBWindow.SetSeparatorPos( n ); } + sal_uInt16 GetSeparatorPos() const { return maLBWindow.GetSeparatorPos(); } - void SetTopEntry( USHORT nTop ) { maLBWindow.SetTopEntry( nTop ); } - USHORT GetTopEntry() const { return maLBWindow.GetTopEntry(); } - void ShowProminentEntry( USHORT nPos ) { maLBWindow.ShowProminentEntry( nPos ); } + void SetTopEntry( sal_uInt16 nTop ) { maLBWindow.SetTopEntry( nTop ); } + sal_uInt16 GetTopEntry() const { return maLBWindow.GetTopEntry(); } + void ShowProminentEntry( sal_uInt16 nPos ) { maLBWindow.ShowProminentEntry( nPos ); } using Window::IsVisible; - BOOL IsVisible( USHORT nEntry ) const { return maLBWindow.IsVisible( nEntry ); } + sal_Bool IsVisible( sal_uInt16 nEntry ) const { return maLBWindow.IsVisible( nEntry ); } void SetProminentEntryType( ProminentEntry eType ) { maLBWindow.SetProminentEntryType( eType ); } ProminentEntry GetProminentEntryType() const { return maLBWindow.GetProminentEntryType(); } long GetLeftIndent() const { return maLBWindow.GetLeftIndent(); } - void SetLeftIndent( USHORT n ) { maLBWindow.SetLeftIndent( n ); } + void SetLeftIndent( sal_uInt16 n ) { maLBWindow.SetLeftIndent( n ); } void ScrollHorz( short nDiff ) { maLBWindow.ScrollHorz( nDiff ); } - void SetTravelSelect( BOOL bTravelSelect ) { maLBWindow.SetTravelSelect( bTravelSelect ); } - BOOL IsTravelSelect() const { return maLBWindow.IsTravelSelect(); } - BOOL IsTrackingSelect() const { return maLBWindow.IsTrackingSelect(); } + void SetTravelSelect( sal_Bool bTravelSelect ) { maLBWindow.SetTravelSelect( bTravelSelect ); } + sal_Bool IsTravelSelect() const { return maLBWindow.IsTravelSelect(); } + sal_Bool IsTrackingSelect() const { return maLBWindow.IsTrackingSelect(); } - void EnableMultiSelection( BOOL bMulti, BOOL bStackMode ) { maLBWindow.EnableMultiSelection( bMulti, bStackMode ); } - BOOL IsMultiSelectionEnabled() const { return maLBWindow.IsMultiSelectionEnabled(); } + void EnableMultiSelection( sal_Bool bMulti, sal_Bool bStackMode ) { maLBWindow.EnableMultiSelection( bMulti, bStackMode ); } + sal_Bool IsMultiSelectionEnabled() const { return maLBWindow.IsMultiSelectionEnabled(); } - void SetMultiSelectionSimpleMode( BOOL bSimple ) { maLBWindow.SetMultiSelectionSimpleMode( bSimple ); } - BOOL IsMultiSelectionSimpleMode() const { return maLBWindow.IsMultiSelectionSimpleMode(); } + void SetMultiSelectionSimpleMode( sal_Bool bSimple ) { maLBWindow.SetMultiSelectionSimpleMode( bSimple ); } + sal_Bool IsMultiSelectionSimpleMode() const { return maLBWindow.IsMultiSelectionSimpleMode(); } - void SetReadOnly( BOOL b ) { maLBWindow.SetReadOnly( b ); } - BOOL IsReadOnly() const { return maLBWindow.IsReadOnly(); } + void SetReadOnly( sal_Bool b ) { maLBWindow.SetReadOnly( b ); } + sal_Bool IsReadOnly() const { return maLBWindow.IsReadOnly(); } - Size CalcSize( USHORT nMaxLines ) const { return maLBWindow.CalcSize( nMaxLines ); } + Size CalcSize( sal_uInt16 nMaxLines ) const { return maLBWindow.CalcSize( nMaxLines ); } long GetEntryHeight() const { return maLBWindow.GetEntryHeight(); } long GetMaxEntryWidth() const { return maLBWindow.GetMaxEntryWidth(); } @@ -489,15 +495,15 @@ public: const Link& GetUserDrawHdl() const { return maLBWindow.GetUserDrawHdl(); } void SetSelectionChangedHdl( const Link& rLnk ) { maLBWindow.GetEntryList()->SetSelectionChangedHdl( rLnk ); } - void SetCallSelectionChangedHdl( BOOL bCall ) { maLBWindow.GetEntryList()->SetCallSelectionChangedHdl( bCall ); } - BOOL IsSelectionChanged() const { return maLBWindow.IsSelectionChanged(); } - USHORT GetSelectModifier() const { return maLBWindow.GetSelectModifier(); } + void SetCallSelectionChangedHdl( sal_Bool bCall ) { maLBWindow.GetEntryList()->SetCallSelectionChangedHdl( bCall ); } + sal_Bool IsSelectionChanged() const { return maLBWindow.IsSelectionChanged(); } + sal_uInt16 GetSelectModifier() const { return maLBWindow.GetSelectModifier(); } void SetMRUEntries( const XubString& rEntries, xub_Unicode cSep ); XubString GetMRUEntries( xub_Unicode cSep ) const; - void SetMaxMRUCount( USHORT n ) { maLBWindow.GetEntryList()->SetMaxMRUCount( n ); } - USHORT GetMaxMRUCount() const { return maLBWindow.GetEntryList()->GetMaxMRUCount(); } - USHORT GetDisplayLineCount() const + void SetMaxMRUCount( sal_uInt16 n ) { maLBWindow.GetEntryList()->SetMaxMRUCount( n ); } + sal_uInt16 GetMaxMRUCount() const { return maLBWindow.GetEntryList()->GetMaxMRUCount(); } + sal_uInt16 GetDisplayLineCount() const { return maLBWindow.GetDisplayLineCount(); } // pb: #106948# explicit mirroring for calc @@ -514,9 +520,9 @@ class ImplListBoxFloatingWindow : public FloatingWindow private: ImplListBox* mpImplLB; Size maPrefSz; - USHORT mnDDLineCount; - USHORT mnPopupModeStartSaveSelection; - BOOL mbAutoWidth; + sal_uInt16 mnDDLineCount; + sal_uInt16 mnPopupModeStartSaveSelection; + sal_Bool mbAutoWidth; protected: long PreNotify( NotifyEvent& rNEvt ); @@ -529,21 +535,21 @@ public: void SetPrefSize( const Size& rSz ) { maPrefSz = rSz; } const Size& GetPrefSize() const { return maPrefSz; } - void SetAutoWidth( BOOL b ) { mbAutoWidth = b; } - BOOL IsAutoWidth() const { return mbAutoWidth; } + void SetAutoWidth( sal_Bool b ) { mbAutoWidth = b; } + sal_Bool IsAutoWidth() const { return mbAutoWidth; } Size CalcFloatSize(); - void StartFloat( BOOL bStartTracking ); + void StartFloat( sal_Bool bStartTracking ); virtual void SetPosSizePixel( long nX, long nY, - long nWidth, long nHeight, USHORT nFlags = WINDOW_POSSIZE_ALL ); + long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) { FloatingWindow::SetPosSizePixel( rNewPos, rNewSize ); } - void SetDropDownLineCount( USHORT n ) { mnDDLineCount = n; } - USHORT GetDropDownLineCount() const { return mnDDLineCount; } + void SetDropDownLineCount( sal_uInt16 n ) { mnDDLineCount = n; } + sal_uInt16 GetDropDownLineCount() const { return mnDDLineCount; } - USHORT GetPopupModeStartSaveSelection() const { return mnPopupModeStartSaveSelection; } + sal_uInt16 GetPopupModeStartSaveSelection() const { return mnPopupModeStartSaveSelection; } virtual void Resize(); }; @@ -556,7 +562,7 @@ class ImplWin : public Control { private: - USHORT mnItemPos; // wegen UserDraw muss ich wissen, welches Item ich darstelle. + sal_uInt16 mnItemPos; // wegen UserDraw muss ich wissen, welches Item ich darstelle. XubString maString; Image maImage; @@ -566,7 +572,7 @@ private: Link maMBDownHdl; Link maUserDrawHdl; - BOOL mbUserDrawEnabled : 1, + sal_Bool mbUserDrawEnabled : 1, mbInUserDraw : 1; @@ -585,8 +591,8 @@ public: virtual void LoseFocus(); virtual long PreNotify( NotifyEvent& rNEvt ); - USHORT GetItemPos() const { return mnItemPos; } - void SetItemPos( USHORT n ) { mnItemPos = n; } + sal_uInt16 GetItemPos() const { return mnItemPos; } + void SetItemPos( sal_uInt16 n ) { mnItemPos = n; } const XubString& GetString() const { return maString; } void SetString( const XubString& rStr ) { maString = rStr; } @@ -594,7 +600,7 @@ public: const Image& GetImage() const { return maImage; } void SetImage( const Image& rImg ) { maImage = rImg; } - BOOL SetModeImage( const Image& rImage ); + sal_Bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const; @@ -608,10 +614,10 @@ public: void SetUserItemSize( const Size& rSz ) { maUserItemSize = rSz; } const Size& GetUserItemSize() const { return maUserItemSize; } - void EnableUserDraw( BOOL bUserDraw ) { mbUserDrawEnabled = bUserDraw; } - BOOL IsUserDrawEnabled() const { return mbUserDrawEnabled; } + void EnableUserDraw( sal_Bool bUserDraw ) { mbUserDrawEnabled = bUserDraw; } + sal_Bool IsUserDrawEnabled() const { return mbUserDrawEnabled; } - void DrawEntry( BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE, bool bLayout = false ); + void DrawEntry( sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False, bool bLayout = false ); }; // ----------- @@ -621,7 +627,7 @@ public: class ImplBtn : public PushButton { private: - BOOL mbDown; + sal_Bool mbDown; Link maMBDownHdl; @@ -637,7 +643,7 @@ public: }; -void ImplInitFieldSettings( Window* pWin, BOOL bFont, BOOL bForeground, BOOL bBackground ); +void ImplInitFieldSettings( Window* pWin, sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); void ImplInitDropDownButton( PushButton* pButton ); #endif // _SV_ILSTBOX_HXX diff --git a/vcl/inc/vcl/image.h b/vcl/inc/vcl/image.h index fede1f42178a..86f924993ed3 100644 --- a/vcl/inc/vcl/image.h +++ b/vcl/inc/vcl/image.h @@ -44,22 +44,22 @@ public: ImplImageBmp(); ~ImplImageBmp(); - void Create( long nItemWidth, long nItemHeight, USHORT nInitSize ); - void Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHeight,USHORT nInitSize ); + void Create( long nItemWidth, long nItemHeight, sal_uInt16 nInitSize ); + void Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHeight,sal_uInt16 nInitSize ); - void Expand( USHORT nGrowSize ); + void Expand( sal_uInt16 nGrowSize ); - void Replace( USHORT nPos, USHORT nSrcPos ); - void Replace( USHORT nPos, const ImplImageBmp& rImageBmp, USHORT nSrcPos ); - void Replace( USHORT nPos, const BitmapEx& rBmpEx ); + void Replace( sal_uInt16 nPos, sal_uInt16 nSrcPos ); + void Replace( sal_uInt16 nPos, const ImplImageBmp& rImageBmp, sal_uInt16 nSrcPos ); + void Replace( sal_uInt16 nPos, const BitmapEx& rBmpEx ); - void ReplaceColors( const Color* pSrcColors, const Color* pDstColors, ULONG nColorCount ); + void ReplaceColors( const Color* pSrcColors, const Color* pDstColors, sal_uIntPtr nColorCount ); void ColorTransform(); void Invert(); - BitmapEx GetBitmapEx( USHORT nPosCount, USHORT* pPosAry ) const; + BitmapEx GetBitmapEx( sal_uInt16 nPosCount, sal_uInt16* pPosAry ) const; - void Draw( USHORT nPos, OutputDevice* pDev, const Point& rPos, USHORT nStyle, const Size* pSize = NULL ); + void Draw( sal_uInt16 nPos, OutputDevice* pDev, const Point& rPos, sal_uInt16 nStyle, const Size* pSize = NULL ); private: @@ -67,8 +67,8 @@ private: BitmapEx maDisabledBmpEx; BitmapEx* mpDisplayBmp; Size maSize; - BYTE* mpInfoAry; - USHORT mnSize; + sal_uInt8* mpInfoAry; + sal_uInt16 mnSize; void ImplUpdateDisplayBmp( OutputDevice* pOutDev ); void ImplUpdateDisabledBmpEx( int nPos ); @@ -92,12 +92,12 @@ struct ImageAryData { ::rtl::OUString maName; // Images identified by either name, or by id - USHORT mnId; + sal_uInt16 mnId; BitmapEx maBitmapEx; ImageAryData(); ImageAryData( const rtl::OUString &aName, - USHORT nId, const BitmapEx &aBitmap ); + sal_uInt16 nId, const BitmapEx &aBitmap ); ImageAryData( const ImageAryData& rData ); ~ImageAryData(); @@ -119,16 +119,16 @@ struct ImplImageList ImageAryDataNameHash maNameHash; rtl::OUString maPrefix; Size maImageSize; - ULONG mnRefCount; + sal_uIntPtr mnRefCount; ImplImageList(); ImplImageList( const ImplImageList &aSrc ); ~ImplImageList(); void AddImage( const ::rtl::OUString &aName, - USHORT nId, const BitmapEx &aBitmapEx ); - void RemoveImage( USHORT nPos ); - USHORT GetImageCount() const; + sal_uInt16 nId, const BitmapEx &aBitmapEx ); + void RemoveImage( sal_uInt16 nPos ); + sal_uInt16 GetImageCount() const; }; // -------------------- @@ -138,12 +138,12 @@ struct ImplImageList struct ImplImageRefData { ImplImageList* mpImplData; - USHORT mnIndex; + sal_uInt16 mnIndex; ImplImageRefData() {} // Um Warning zu umgehen ~ImplImageRefData(); - BOOL IsEqual( const ImplImageRefData& rData ); + sal_Bool IsEqual( const ImplImageRefData& rData ); }; // ---------------- @@ -158,7 +158,7 @@ struct ImplImageData ImplImageData( const BitmapEx& rBmpEx ); ~ImplImageData(); - BOOL IsEqual( const ImplImageData& rData ); + sal_Bool IsEqual( const ImplImageData& rData ); }; // ------------- @@ -167,7 +167,7 @@ struct ImplImageData struct ImplImage { - ULONG mnRefCount; + sal_uIntPtr mnRefCount; // TODO: use inheritance to get rid of meType+mpData void* mpData; ImageType meType; diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx index c0c7cf63be51..d536d6bd03d7 100644 --- a/vcl/inc/vcl/image.hxx +++ b/vcl/inc/vcl/image.hxx @@ -47,7 +47,7 @@ namespace com { namespace sun { namespace star { namespace graphic { class XGrap // ----------- #define IMAGE_STDBTN_COLOR Color( 0xC0, 0xC0, 0xC0 ) -#define IMAGELIST_IMAGE_NOTFOUND ((USHORT)0xFFFF) +#define IMAGELIST_IMAGE_NOTFOUND ((sal_uInt16)0xFFFF) // ----------------------- // - ImageColorTransform - @@ -87,14 +87,14 @@ public: ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > GetXGraphic() const; Image GetColorTransformedImage( ImageColorTransform eColorTransform ) const; - static void GetColorTransformArrays( ImageColorTransform eColorTransform, Color*& rpSrcColor, Color*& rpDstColor, ULONG& rColorCount ); + static void GetColorTransformArrays( ImageColorTransform eColorTransform, Color*& rpSrcColor, Color*& rpDstColor, sal_uLong& rColorCount ); void Invert(); - BOOL operator!() const { return( !mpImplData ? true : false ); } + sal_Bool operator!() const { return( !mpImplData ? true : false ); } Image& operator=( const Image& rImage ); - BOOL operator==( const Image& rImage ) const; - BOOL operator!=( const Image& rImage ) const { return !(Image::operator==( rImage )); } + sal_Bool operator==( const Image& rImage ) const; + sal_Bool operator!=( const Image& rImage ) const { return !(Image::operator==( rImage )); } private: @@ -110,7 +110,7 @@ private: class VCL_DLLPUBLIC ImageList { public: - ImageList( USHORT nInit = 8, USHORT nGrow = 4 ); + ImageList( sal_uInt16 nInit = 8, sal_uInt16 nGrow = 4 ); ImageList( const ResId& rResId ); ImageList( const ::std::vector< ::rtl::OUString >& rNameVector, const ::rtl::OUString& rPrefix, @@ -122,57 +122,57 @@ public: void InsertFromHorizontalStrip( const BitmapEx &rBitmapEx, const std::vector< rtl::OUString > &rNameVector ); void InsertFromHorizontalBitmap( const ResId& rResId, - USHORT nCount, + sal_uInt16 nCount, const Color *pNonAlphaMaskColor, const Color *pSearchColors = NULL, const Color *pReplaceColors = NULL, - ULONG nColorCount = 0); + sal_uLong nColorCount = 0); BitmapEx GetAsHorizontalStrip() const; - USHORT GetImageCount() const; + sal_uInt16 GetImageCount() const; Size GetImageSize() const; - void AddImage( USHORT nNewId, const Image& rImage ); + void AddImage( sal_uInt16 nNewId, const Image& rImage ); void AddImage( const ::rtl::OUString& rImageName, const Image& rImage ); - void ReplaceImage( USHORT nId, const Image& rImage ); + void ReplaceImage( sal_uInt16 nId, const Image& rImage ); void ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage ); - void ReplaceImage( USHORT nId, USHORT nReplaceId ); + void ReplaceImage( sal_uInt16 nId, sal_uInt16 nReplaceId ); void ReplaceImage( const ::rtl::OUString& rImageName, const ::rtl::OUString& rReplaceName ); - void RemoveImage( USHORT nId ); + void RemoveImage( sal_uInt16 nId ); void RemoveImage( const ::rtl::OUString& rImageName ); - Image GetImage( USHORT nId ) const; + Image GetImage( sal_uInt16 nId ) const; Image GetImage( const ::rtl::OUString& rImageName ) const; - USHORT GetImagePos( USHORT nId ) const; - bool HasImageAtPos( USHORT nId ) const; - USHORT GetImagePos( const ::rtl::OUString& rImageName ) const; + sal_uInt16 GetImagePos( sal_uInt16 nId ) const; + bool HasImageAtPos( sal_uInt16 nId ) const; + sal_uInt16 GetImagePos( const ::rtl::OUString& rImageName ) const; - USHORT GetImageId( USHORT nPos ) const; - void GetImageIds( ::std::vector< USHORT >& rIds ) const; + sal_uInt16 GetImageId( sal_uInt16 nPos ) const; + void GetImageIds( ::std::vector< sal_uInt16 >& rIds ) const; - ::rtl::OUString GetImageName( USHORT nPos ) const; + ::rtl::OUString GetImageName( sal_uInt16 nPos ) const; void GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const; ImageList& operator=( const ImageList& rImageList ); - BOOL operator==( const ImageList& rImageList ) const; - BOOL operator!=( const ImageList& rImageList ) const { return !(ImageList::operator==( rImageList )); } + sal_Bool operator==( const ImageList& rImageList ) const; + sal_Bool operator!=( const ImageList& rImageList ) const { return !(ImageList::operator==( rImageList )); } private: ImplImageList* mpImplData; - USHORT mnInitSize; - USHORT mnGrowSize; + sal_uInt16 mnInitSize; + sal_uInt16 mnGrowSize; SAL_DLLPRIVATE void ImplInitBitmapEx( const ::rtl::OUString& rUserImageName, const ::std::vector< ::rtl::OUString >& rImageNames, const ::rtl::OUString& rSymbolsStyle, BitmapEx& rBmpEx, const Color* pMaskColor ) const; - SAL_DLLPRIVATE void ImplInit( USHORT nItems, const Size &rSize ); - SAL_DLLPRIVATE USHORT ImplGetImageId( const ::rtl::OUString& rImageName ) const; + SAL_DLLPRIVATE void ImplInit( sal_uInt16 nItems, const Size &rSize ); + SAL_DLLPRIVATE sal_uInt16 ImplGetImageId( const ::rtl::OUString& rImageName ) const; SAL_DLLPRIVATE void ImplMakeUnique(); }; diff --git a/vcl/inc/vcl/imgctrl.hxx b/vcl/inc/vcl/imgctrl.hxx index 5867a6ff16d0..ec8ed99c93bb 100644 --- a/vcl/inc/vcl/imgctrl.hxx +++ b/vcl/inc/vcl/imgctrl.hxx @@ -41,26 +41,26 @@ class VCL_DLLPUBLIC ImageControl : public FixedImage { private: - BitmapEx maBmp; ::sal_Int16 mnScaleMode; public: ImageControl( Window* pParent, WinBits nStyle = 0 ); + ImageControl( Window* pParent, const ResId& rResId ); // set/get the scale mode. This is one of the css.awt.ImageScaleMode constants void SetScaleMode( const ::sal_Int16 _nMode ); ::sal_Int16 GetScaleMode() const { return mnScaleMode; } virtual void Resize(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Paint( const Rectangle& rRect ); virtual void GetFocus(); virtual void LoseFocus(); - void SetBitmap( const BitmapEx& rBmp ); - using OutputDevice::GetBitmap; - const BitmapEx& GetBitmap() const { return maBmp; } - BOOL SetModeBitmap( const BitmapEx& rBitmap ); +protected: + void ImplDraw( OutputDevice& rDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize ) const; +private: + sal_Bool SetModeBitmap( const BitmapEx& rBitmap ); const BitmapEx& GetModeBitmap( ) const; }; diff --git a/vcl/inc/vcl/impbmp.hxx b/vcl/inc/vcl/impbmp.hxx index 1292cce59ef5..c77e906bd8ae 100644 --- a/vcl/inc/vcl/impbmp.hxx +++ b/vcl/inc/vcl/impbmp.hxx @@ -50,8 +50,8 @@ class ImpBitmap { private: - ULONG mnRefCount; - ULONG mnChecksum; + sal_uLong mnRefCount; + sal_uLong mnChecksum; SalBitmap* mpSalBitmap; Size maSourceSize; @@ -69,29 +69,29 @@ public: public: - BOOL ImplCreate( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal ); - BOOL ImplCreate( const ImpBitmap& rImpBitmap ); - BOOL ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics ); - BOOL ImplCreate( const ImpBitmap& rImpBitmap, USHORT nNewBitCount ); + sal_Bool ImplCreate( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ); + sal_Bool ImplCreate( const ImpBitmap& rImpBitmap ); + sal_Bool ImplCreate( const ImpBitmap& rImpBitmap, SalGraphics* pGraphics ); + sal_Bool ImplCreate( const ImpBitmap& rImpBitmap, sal_uInt16 nNewBitCount ); void ImplDestroy(); Size ImplGetSize() const; Size ImplGetSourceSize() const; void ImplSetSourceSize( const Size&); - USHORT ImplGetBitCount() const; + sal_uInt16 ImplGetBitCount() const; - BitmapBuffer* ImplAcquireBuffer( BOOL bReadOnly ); - void ImplReleaseBuffer( BitmapBuffer* pBuffer, BOOL bReadOnly ); + BitmapBuffer* ImplAcquireBuffer( sal_Bool bReadOnly ); + void ImplReleaseBuffer( BitmapBuffer* pBuffer, sal_Bool bReadOnly ); public: - ULONG ImplGetRefCount() const { return mnRefCount; } + sal_uLong ImplGetRefCount() const { return mnRefCount; } void ImplIncRefCount() { mnRefCount++; } void ImplDecRefCount() { mnRefCount--; } - inline void ImplSetChecksum( ULONG nChecksum ) { mnChecksum = nChecksum; } - inline ULONG ImplGetChecksum() const { return mnChecksum; } + inline void ImplSetChecksum( sal_uLong nChecksum ) { mnChecksum = nChecksum; } + inline sal_uLong ImplGetChecksum() const { return mnChecksum; } #endif // PRIVATE }; diff --git a/vcl/inc/vcl/impfont.hxx b/vcl/inc/vcl/impfont.hxx index 06031c2c5df9..b1a73939e3d8 100644 --- a/vcl/inc/vcl/impfont.hxx +++ b/vcl/inc/vcl/impfont.hxx @@ -82,7 +82,7 @@ private: FontType meType; // used by metrics only short mnOrientation; FontKerning mnKerning; - BOOL mbWordLine:1, + sal_Bool mbWordLine:1, mbOutline:1, mbConfigLookup:1, // there was a config lookup mbShadow:1, @@ -108,8 +108,8 @@ private: long mnExtLeading; // External Leading long mnLineHeight; // Ascent+Descent+EmphasisMark long mnSlant; // Slant - USHORT mnMiscFlags; // Misc Flags - UINT32 mnRefCount; // Reference Counter + sal_uInt16 mnMiscFlags; // Misc Flags + sal_uInt32 mnRefCount; // Reference Counter enum { DEVICE_FLAG=1, SCALABLE_FLAG=2, LATIN_FLAG=4, CJK_FLAG=8, CTL_FLAG=16 }; @@ -175,7 +175,7 @@ public: class CmapResult; -class VCL_DLLPUBLIC ImplFontCharMap +class VCL_PLUGIN_PUBLIC ImplFontCharMap { public: explicit ImplFontCharMap( const CmapResult& ); @@ -197,8 +197,8 @@ public: int GetIndexFromChar( sal_uInt32 ) const; sal_uInt32 GetCharFromIndex( int ) const; - void AddReference(); - void DeReference(); + void AddReference() const; + void DeReference() const; int GetGlyphIndex( sal_uInt32 ) const; @@ -212,27 +212,23 @@ private: private: const sal_uInt32* mpRangeCodes; // pairs of StartCode/(EndCode+1) const int* mpStartGlyphs; // range-specific mapper to glyphs - const USHORT* mpGlyphIds; // individual glyphid mappings + const sal_uInt16* mpGlyphIds; // individual glyphid mappings int mnRangeCount; - int mnCharCount; - int mnRefCount; + int mnCharCount; // covered codepoints + mutable int mnRefCount; }; // CmapResult is a normalized version of the many CMAP formats -class -#ifdef UNX - VCL_DLLPUBLIC // vcl-plugins need it -#endif // UNX -CmapResult +class VCL_PLUGIN_PUBLIC CmapResult { public: explicit CmapResult( bool bSymbolic = false, const sal_uInt32* pRangeCodes = NULL, int nRangeCount = 0, - const int* pStartGlyphs = 0, const USHORT* pGlyphIds = NULL ); + const int* pStartGlyphs = 0, const sal_uInt16* pGlyphIds = NULL ); const sal_uInt32* mpRangeCodes; const int* mpStartGlyphs; - const USHORT* mpGlyphIds; + const sal_uInt16* mpGlyphIds; int mnRangeCount; bool mbSymbolic; bool mbRecoded; diff --git a/vcl/inc/vcl/impgraph.hxx b/vcl/inc/vcl/impgraph.hxx index dfb47a153f2d..22c409fb476a 100644 --- a/vcl/inc/vcl/impgraph.hxx +++ b/vcl/inc/vcl/impgraph.hxx @@ -70,11 +70,11 @@ private: GfxLink* mpGfxLink; GraphicType meType; String maDocFileURLStr; - ULONG mnDocFilePos; - mutable ULONG mnSizeBytes; - ULONG mnRefCount; - BOOL mbSwapOut; - BOOL mbSwapUnderway; + sal_uLong mnDocFilePos; + mutable sal_uLong mnSizeBytes; + sal_uLong mnRefCount; + sal_Bool mbSwapOut; + sal_Bool mbSwapUnderway; private: @@ -87,19 +87,19 @@ private: virtual ~ImpGraphic(); ImpGraphic& operator=( const ImpGraphic& rImpGraphic ); - BOOL operator==( const ImpGraphic& rImpGraphic ) const; - BOOL operator!=( const ImpGraphic& rImpGraphic ) const { return !( *this == rImpGraphic ); } + sal_Bool operator==( const ImpGraphic& rImpGraphic ) const; + sal_Bool operator!=( const ImpGraphic& rImpGraphic ) const { return !( *this == rImpGraphic ); } - void ImplClearGraphics( BOOL bCreateSwapInfo ); + void ImplClearGraphics( sal_Bool bCreateSwapInfo ); void ImplClear(); GraphicType ImplGetType() const; void ImplSetDefaultType(); - BOOL ImplIsSupportedGraphic() const; + sal_Bool ImplIsSupportedGraphic() const; - BOOL ImplIsTransparent() const; - BOOL ImplIsAlpha() const; - BOOL ImplIsAnimated() const; + sal_Bool ImplIsTransparent() const; + sal_Bool ImplIsAlpha() const; + sal_Bool ImplIsAnimated() const; Bitmap ImplGetBitmap(const GraphicConversionParameters& rParameters) const; BitmapEx ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const; @@ -112,7 +112,7 @@ private: MapMode ImplGetPrefMapMode() const; void ImplSetPrefMapMode( const MapMode& rPrefMapMode ); - ULONG ImplGetSizeBytes() const; + sal_uLong ImplGetSizeBytes() const; void ImplDraw( OutputDevice* pOutDev, const Point& rDestPt ) const; @@ -135,7 +135,7 @@ private: void ImplSetAnimationNotifyHdl( const Link& rLink ); Link ImplGetAnimationNotifyHdl() const; - ULONG ImplGetAnimationLoopCount() const; + sal_uLong ImplGetAnimationLoopCount() const; void ImplResetAnimationLoopCount(); List* ImplGetAnimationInfoList() const; @@ -147,28 +147,28 @@ private: private: - void ImplSetDocFileName( const String& rName, ULONG nFilePos ); + void ImplSetDocFileName( const String& rName, sal_uLong nFilePos ); const String& ImplGetDocFileName() const; - ULONG ImplGetDocFilePos() const; + sal_uLong ImplGetDocFilePos() const; - BOOL ImplReadEmbedded( SvStream& rIStream, BOOL bSwap = FALSE ); - BOOL ImplWriteEmbedded( SvStream& rOStream ); + sal_Bool ImplReadEmbedded( SvStream& rIStream, sal_Bool bSwap = sal_False ); + sal_Bool ImplWriteEmbedded( SvStream& rOStream ); - BOOL ImplSwapIn(); - BOOL ImplSwapIn( SvStream* pIStm ); + sal_Bool ImplSwapIn(); + sal_Bool ImplSwapIn( SvStream* pIStm ); - BOOL ImplSwapOut(); - BOOL ImplSwapOut( SvStream* pOStm ); + sal_Bool ImplSwapOut(); + sal_Bool ImplSwapOut( SvStream* pOStm ); - BOOL ImplIsSwapOut() const; + sal_Bool ImplIsSwapOut() const; void ImplSetLink( const GfxLink& ); GfxLink ImplGetLink(); - BOOL ImplIsLink() const; + sal_Bool ImplIsLink() const; - ULONG ImplGetChecksum() const; + sal_uLong ImplGetChecksum() const; - BOOL ImplExportNative( SvStream& rOStm ) const; + sal_Bool ImplExportNative( SvStream& rOStm ) const; friend SvStream& operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic ); friend SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ); diff --git a/vcl/inc/vcl/impoct.hxx b/vcl/inc/vcl/impoct.hxx index 1679b4802c63..daf6a275ada1 100644 --- a/vcl/inc/vcl/impoct.hxx +++ b/vcl/inc/vcl/impoct.hxx @@ -121,9 +121,9 @@ inline void ImpErrorQuad::ImplAddColorError7( const ImpErrorQuad& rErrQuad ) inline BitmapColor ImpErrorQuad::ImplGetColor() { - return BitmapColor( (BYTE) ( ( nRed < 0L ? 0L : nRed > 8160L ? 8160L : nRed ) >> 5L ), - (BYTE) ( ( nGreen < 0L ? 0L : nGreen > 8160L ? 8160L : nGreen ) >> 5L ), - (BYTE) ( ( nBlue < 0L ? 0L : nBlue > 8160L ? 8160L : nBlue ) >> 5L ) ); + return BitmapColor( (sal_uInt8) ( ( nRed < 0L ? 0L : nRed > 8160L ? 8160L : nRed ) >> 5L ), + (sal_uInt8) ( ( nGreen < 0L ? 0L : nGreen > 8160L ? 8160L : nGreen ) >> 5L ), + (sal_uInt8) ( ( nBlue < 0L ? 0L : nBlue > 8160L ? 8160L : nBlue ) >> 5L ) ); } // ------------- @@ -133,14 +133,14 @@ inline BitmapColor ImpErrorQuad::ImplGetColor() class ImpNodeCache { OctreeNode* pActNode; - ULONG nNew; - ULONG nDelete; - ULONG nGet; - ULONG nRelease; + sal_uLong nNew; + sal_uLong nDelete; + sal_uLong nGet; + sal_uLong nRelease; public: - ImpNodeCache( const ULONG nInitSize ); + ImpNodeCache( const sal_uLong nInitSize ); ~ImpNodeCache(); inline OctreeNode* ImplGetFreeNode(); diff --git a/vcl/inc/vcl/inputctx.hxx b/vcl/inc/vcl/inputctx.hxx index 26a43530c8d0..eaaec5e7bd1d 100644 --- a/vcl/inc/vcl/inputctx.hxx +++ b/vcl/inc/vcl/inputctx.hxx @@ -37,10 +37,10 @@ // - InputContext-Flags - // ---------------------- -#define INPUTCONTEXT_TEXT ((ULONG)0x00000001) -#define INPUTCONTEXT_EXTTEXTINPUT ((ULONG)0x00000002) -#define INPUTCONTEXT_EXTTEXTINPUT_ON ((ULONG)0x00000004) -#define INPUTCONTEXT_EXTTEXTINPUT_OFF ((ULONG)0x00000008) +#define INPUTCONTEXT_TEXT ((sal_uLong)0x00000001) +#define INPUTCONTEXT_EXTTEXTINPUT ((sal_uLong)0x00000002) +#define INPUTCONTEXT_EXTTEXTINPUT_ON ((sal_uLong)0x00000004) +#define INPUTCONTEXT_EXTTEXTINPUT_OFF ((sal_uLong)0x00000008) // ---------------- // - InputContext - @@ -50,26 +50,26 @@ class VCL_DLLPUBLIC InputContext { private: Font maFont; - ULONG mnOptions; + sal_uLong mnOptions; public: InputContext() { mnOptions = 0; } InputContext( const InputContext& rInputContext ) : maFont( rInputContext.maFont ) { mnOptions = rInputContext.mnOptions; } - InputContext( const Font& rFont, ULONG nOptions = 0 ) : + InputContext( const Font& rFont, sal_uLong nOptions = 0 ) : maFont( rFont ) { mnOptions = nOptions; } void SetFont( const Font& rFont ) { maFont = rFont; } const Font& GetFont() const { return maFont; } - void SetOptions( ULONG nOptions ) { mnOptions = nOptions; } - ULONG GetOptions() const { return mnOptions; } + void SetOptions( sal_uLong nOptions ) { mnOptions = nOptions; } + sal_uLong GetOptions() const { return mnOptions; } InputContext& operator=( const InputContext& rInputContext ); - BOOL operator==( const InputContext& rInputContext ) const; - BOOL operator!=( const InputContext& rInputContext ) const + sal_Bool operator==( const InputContext& rInputContext ) const; + sal_Bool operator!=( const InputContext& rInputContext ) const { return !(InputContext::operator==( rInputContext )); } }; @@ -80,7 +80,7 @@ inline InputContext& InputContext::operator=( const InputContext& rInputContext return *this; } -inline BOOL InputContext::operator==( const InputContext& rInputContext ) const +inline sal_Bool InputContext::operator==( const InputContext& rInputContext ) const { return ((mnOptions == rInputContext.mnOptions) && (maFont == rInputContext.maFont)); diff --git a/vcl/inc/vcl/javachild.hxx b/vcl/inc/vcl/javachild.hxx index 5765adfd26f1..a7b39d0bff8f 100644 --- a/vcl/inc/vcl/javachild.hxx +++ b/vcl/inc/vcl/javachild.hxx @@ -48,8 +48,6 @@ public: private: - SAL_DLLPRIVATE void implTestJavaException( void* pEnv ); - // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE JavaChildWindow (const JavaChildWindow &); SAL_DLLPRIVATE JavaChildWindow & operator= (const JavaChildWindow &); diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx index b51282d57b1e..7517b41ef03c 100644 --- a/vcl/inc/vcl/jobdata.hxx +++ b/vcl/inc/vcl/jobdata.hxx @@ -51,6 +51,7 @@ struct JobData int m_nColorDepth; int m_nPSLevel; // 0: no override, else languaglevel to use int m_nColorDevice; // 0: no override, -1 grey scale, +1 color + int m_nPDFDevice; // 0: PostScript, 1: PDF orientation::type m_eOrientation; ::rtl::OUString m_aPrinterName; const PPDParser* m_pParser; @@ -65,6 +66,7 @@ struct JobData m_nColorDepth( 24 ), m_nPSLevel( 0 ), m_nColorDevice( 0 ), + m_nPDFDevice( 0 ), m_eOrientation( orientation::Portrait ), m_pParser( NULL ) {} @@ -73,6 +75,8 @@ struct JobData JobData( const JobData& rData ) { *this = rData; } void setCollate( bool bCollate ); + bool setPaper( int nWidth, int nHeight ); // dimensions in pt + bool setPaperBin( int nPaperBin ); // dimensions in pt // creates a new buffer using new // it is up to the user to delete it again diff --git a/vcl/inc/vcl/jobset.h b/vcl/inc/vcl/jobset.h index 9b26c20dcd94..b1cbdb9853f9 100644 --- a/vcl/inc/vcl/jobset.h +++ b/vcl/inc/vcl/jobset.h @@ -53,18 +53,18 @@ struct ImplJobSetup { - USHORT mnRefCount; // RefCount (only independ data) - USHORT mnSystem; // Sytem - JOBSETUP_SYSTEM_xxxx + sal_uInt16 mnRefCount; // RefCount (only independ data) + sal_uInt16 mnSystem; // Sytem - JOBSETUP_SYSTEM_xxxx String maPrinterName; // Printer-Name String maDriver; // Driver-Name Orientation meOrientation; // Orientation DuplexMode meDuplexMode; // Duplex - USHORT mnPaperBin; // paper bin / in tray + sal_uInt16 mnPaperBin; // paper bin / in tray Paper mePaperFormat; // paper format long mnPaperWidth; // paper width (100th mm) long mnPaperHeight; // paper height (100th mm) - ULONG mnDriverDataLen; // length of system specific data - BYTE* mpDriverData; // system specific data (will be streamed a byte block) + sal_uIntPtr mnDriverDataLen; // length of system specific data + sal_uInt8* mpDriverData; // system specific data (will be streamed a byte block) ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > maValueMap; ImplJobSetup(); diff --git a/vcl/inc/vcl/jobset.hxx b/vcl/inc/vcl/jobset.hxx index a5a3735c3da5..0340f5dd8587 100644 --- a/vcl/inc/vcl/jobset.hxx +++ b/vcl/inc/vcl/jobset.hxx @@ -71,8 +71,8 @@ public: JobSetup& operator=( const JobSetup& rJob ); - BOOL operator==( const JobSetup& rJobSetup ) const; - BOOL operator!=( const JobSetup& rJobSetup ) const + sal_Bool operator==( const JobSetup& rJobSetup ) const; + sal_Bool operator!=( const JobSetup& rJobSetup ) const { return !(JobSetup::operator==( rJobSetup )); } friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ); diff --git a/vcl/inc/vcl/keycod.hxx b/vcl/inc/vcl/keycod.hxx index 8092f2a6d964..b5be547b1781 100644 --- a/vcl/inc/vcl/keycod.hxx +++ b/vcl/inc/vcl/keycod.hxx @@ -63,54 +63,54 @@ enum KeyFuncType { KEYFUNC_DONTKNOW, KEYFUNC_NEW, KEYFUNC_OPEN, class VCL_DLLPUBLIC KeyCode { private: - USHORT nCode; + sal_uInt16 nCode; KeyFuncType eFunc; public: KeyCode() { nCode = 0; eFunc = KEYFUNC_DONTKNOW; } KeyCode( const ResId& rResId ); - KeyCode( USHORT nKey, USHORT nModifier = 0 ) + KeyCode( sal_uInt16 nKey, sal_uInt16 nModifier = 0 ) { nCode = nKey | nModifier; eFunc = KEYFUNC_DONTKNOW; } - KeyCode( USHORT nKey, BOOL bShift, BOOL bMod1, BOOL bMod2, BOOL bMod3 ); + KeyCode( sal_uInt16 nKey, sal_Bool bShift, sal_Bool bMod1, sal_Bool bMod2, sal_Bool bMod3 ); KeyCode( KeyFuncType eFunction ); - USHORT GetFullCode() const { return nCode; } - USHORT GetFullKeyCode() const { return (nCode) ; } + sal_uInt16 GetFullCode() const { return nCode; } + sal_uInt16 GetFullKeyCode() const { return (nCode) ; } KeyFuncType GetFullFunction() const { return eFunc; } - BOOL IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const; + sal_Bool IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const; - USHORT GetCode() const + sal_uInt16 GetCode() const { return (nCode & KEY_CODE); } - USHORT GetModifier() const + sal_uInt16 GetModifier() const { return (nCode & KEY_MODTYPE); } - USHORT GetAllModifier() const + sal_uInt16 GetAllModifier() const { return (nCode & KEY_ALLMODTYPE); } - BOOL IsShift() const + sal_Bool IsShift() const { return ((nCode & KEY_SHIFT) != 0); } - BOOL IsMod1() const + sal_Bool IsMod1() const { return ((nCode & KEY_MOD1) != 0); } - BOOL IsMod2() const + sal_Bool IsMod2() const { return ((nCode & KEY_MOD2) != 0); } - BOOL IsMod3() const + sal_Bool IsMod3() const { return ((nCode & KEY_MOD3) != 0); } - USHORT GetGroup() const + sal_uInt16 GetGroup() const { return (nCode & KEYGROUP_TYPE); } XubString GetName( Window* pWindow = NULL ) const; XubString GetSymbolName( const XubString& rFontName, Window* pWindow = NULL ) const; - BOOL IsFunction() const - { return ((eFunc != KEYFUNC_DONTKNOW) ? TRUE : FALSE); } + sal_Bool IsFunction() const + { return ((eFunc != KEYFUNC_DONTKNOW) ? sal_True : sal_False); } KeyFuncType GetFunction() const; KeyCode& operator = ( const KeyCode& rKeyCode ); - BOOL operator ==( const KeyCode& rKeyCode ) const; - BOOL operator !=( const KeyCode& rKeyCode ) const; + sal_Bool operator ==( const KeyCode& rKeyCode ) const; + sal_Bool operator !=( const KeyCode& rKeyCode ) const; }; -inline KeyCode::KeyCode( USHORT nKey, BOOL bShift, BOOL bMod1, BOOL bMod2, BOOL bMod3 ) +inline KeyCode::KeyCode( sal_uInt16 nKey, sal_Bool bShift, sal_Bool bMod1, sal_Bool bMod2, sal_Bool bMod3 ) { nCode = nKey; if( bShift ) @@ -124,7 +124,7 @@ inline KeyCode::KeyCode( USHORT nKey, BOOL bShift, BOOL bMod1, BOOL bMod2, BOOL eFunc = KEYFUNC_DONTKNOW; } -inline BOOL KeyCode::operator ==( const KeyCode& rKeyCode ) const +inline sal_Bool KeyCode::operator ==( const KeyCode& rKeyCode ) const { if ( (eFunc == KEYFUNC_DONTKNOW) && (rKeyCode.eFunc == KEYFUNC_DONTKNOW) ) return (nCode == rKeyCode.nCode); @@ -132,7 +132,7 @@ inline BOOL KeyCode::operator ==( const KeyCode& rKeyCode ) const return (GetFunction() == rKeyCode.GetFunction()); } -inline BOOL KeyCode::operator !=( const KeyCode& rKeyCode ) const +inline sal_Bool KeyCode::operator !=( const KeyCode& rKeyCode ) const { if ( (eFunc == KEYFUNC_DONTKNOW) && (rKeyCode.eFunc == KEYFUNC_DONTKNOW) ) return (nCode != rKeyCode.nCode); @@ -140,7 +140,7 @@ inline BOOL KeyCode::operator !=( const KeyCode& rKeyCode ) const return (GetFunction() != rKeyCode.GetFunction()); } -inline BOOL KeyCode::IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const +inline sal_Bool KeyCode::IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const { if ( (eFunc == KEYFUNC_DONTKNOW) && (rKeyCode.eFunc == KEYFUNC_DONTKNOW) ) return (GetFullKeyCode() == rKeyCode.GetFullKeyCode()); diff --git a/vcl/inc/vcl/keycodes.hxx b/vcl/inc/vcl/keycodes.hxx index ace5df3343b4..9b4fc0893b34 100644 --- a/vcl/inc/vcl/keycodes.hxx +++ b/vcl/inc/vcl/keycodes.hxx @@ -40,139 +40,139 @@ // By changes you must also change: rsc/vclrsc.hxx // Key-Gruppen -#define KEYGROUP_NUM ((USHORT)::com::sun::star::awt::KeyGroup::NUM) -#define KEYGROUP_ALPHA ((USHORT)::com::sun::star::awt::KeyGroup::ALPHA) -#define KEYGROUP_FKEYS ((USHORT)::com::sun::star::awt::KeyGroup::FKEYS) -#define KEYGROUP_CURSOR ((USHORT)::com::sun::star::awt::KeyGroup::CURSOR) -#define KEYGROUP_MISC ((USHORT)::com::sun::star::awt::KeyGroup::MISC) -#define KEYGROUP_TYPE ((USHORT)::com::sun::star::awt::KeyGroup::TYPE) +#define KEYGROUP_NUM ((sal_uInt16)::com::sun::star::awt::KeyGroup::NUM) +#define KEYGROUP_ALPHA ((sal_uInt16)::com::sun::star::awt::KeyGroup::ALPHA) +#define KEYGROUP_FKEYS ((sal_uInt16)::com::sun::star::awt::KeyGroup::FKEYS) +#define KEYGROUP_CURSOR ((sal_uInt16)::com::sun::star::awt::KeyGroup::CURSOR) +#define KEYGROUP_MISC ((sal_uInt16)::com::sun::star::awt::KeyGroup::MISC) +#define KEYGROUP_TYPE ((sal_uInt16)::com::sun::star::awt::KeyGroup::TYPE) // Key-Codes -#define KEY_0 ((USHORT)::com::sun::star::awt::Key::NUM0) -#define KEY_1 ((USHORT)::com::sun::star::awt::Key::NUM1) -#define KEY_2 ((USHORT)::com::sun::star::awt::Key::NUM2) -#define KEY_3 ((USHORT)::com::sun::star::awt::Key::NUM3) -#define KEY_4 ((USHORT)::com::sun::star::awt::Key::NUM4) -#define KEY_5 ((USHORT)::com::sun::star::awt::Key::NUM5) -#define KEY_6 ((USHORT)::com::sun::star::awt::Key::NUM6) -#define KEY_7 ((USHORT)::com::sun::star::awt::Key::NUM7) -#define KEY_8 ((USHORT)::com::sun::star::awt::Key::NUM8) -#define KEY_9 ((USHORT)::com::sun::star::awt::Key::NUM9) - -#define KEY_A ((USHORT)::com::sun::star::awt::Key::A) -#define KEY_B ((USHORT)::com::sun::star::awt::Key::B) -#define KEY_C ((USHORT)::com::sun::star::awt::Key::C) -#define KEY_D ((USHORT)::com::sun::star::awt::Key::D) -#define KEY_E ((USHORT)::com::sun::star::awt::Key::E) -#define KEY_F ((USHORT)::com::sun::star::awt::Key::F) -#define KEY_G ((USHORT)::com::sun::star::awt::Key::G) -#define KEY_H ((USHORT)::com::sun::star::awt::Key::H) -#define KEY_I ((USHORT)::com::sun::star::awt::Key::I) -#define KEY_J ((USHORT)::com::sun::star::awt::Key::J) -#define KEY_K ((USHORT)::com::sun::star::awt::Key::K) -#define KEY_L ((USHORT)::com::sun::star::awt::Key::L) -#define KEY_M ((USHORT)::com::sun::star::awt::Key::M) -#define KEY_N ((USHORT)::com::sun::star::awt::Key::N) -#define KEY_O ((USHORT)::com::sun::star::awt::Key::O) -#define KEY_P ((USHORT)::com::sun::star::awt::Key::P) -#define KEY_Q ((USHORT)::com::sun::star::awt::Key::Q) -#define KEY_R ((USHORT)::com::sun::star::awt::Key::R) -#define KEY_S ((USHORT)::com::sun::star::awt::Key::S) -#define KEY_T ((USHORT)::com::sun::star::awt::Key::T) -#define KEY_U ((USHORT)::com::sun::star::awt::Key::U) -#define KEY_V ((USHORT)::com::sun::star::awt::Key::V) -#define KEY_W ((USHORT)::com::sun::star::awt::Key::W) -#define KEY_X ((USHORT)::com::sun::star::awt::Key::X) -#define KEY_Y ((USHORT)::com::sun::star::awt::Key::Y) -#define KEY_Z ((USHORT)::com::sun::star::awt::Key::Z) - -#define KEY_F1 ((USHORT)::com::sun::star::awt::Key::F1) -#define KEY_F2 ((USHORT)::com::sun::star::awt::Key::F2) -#define KEY_F3 ((USHORT)::com::sun::star::awt::Key::F3) -#define KEY_F4 ((USHORT)::com::sun::star::awt::Key::F4) -#define KEY_F5 ((USHORT)::com::sun::star::awt::Key::F5) -#define KEY_F6 ((USHORT)::com::sun::star::awt::Key::F6) -#define KEY_F7 ((USHORT)::com::sun::star::awt::Key::F7) -#define KEY_F8 ((USHORT)::com::sun::star::awt::Key::F8) -#define KEY_F9 ((USHORT)::com::sun::star::awt::Key::F9) -#define KEY_F10 ((USHORT)::com::sun::star::awt::Key::F10) -#define KEY_F11 ((USHORT)::com::sun::star::awt::Key::F11) -#define KEY_F12 ((USHORT)::com::sun::star::awt::Key::F12) -#define KEY_F13 ((USHORT)::com::sun::star::awt::Key::F13) -#define KEY_F14 ((USHORT)::com::sun::star::awt::Key::F14) -#define KEY_F15 ((USHORT)::com::sun::star::awt::Key::F15) -#define KEY_F16 ((USHORT)::com::sun::star::awt::Key::F16) -#define KEY_F17 ((USHORT)::com::sun::star::awt::Key::F17) -#define KEY_F18 ((USHORT)::com::sun::star::awt::Key::F18) -#define KEY_F19 ((USHORT)::com::sun::star::awt::Key::F19) -#define KEY_F20 ((USHORT)::com::sun::star::awt::Key::F20) -#define KEY_F21 ((USHORT)::com::sun::star::awt::Key::F21) -#define KEY_F22 ((USHORT)::com::sun::star::awt::Key::F22) -#define KEY_F23 ((USHORT)::com::sun::star::awt::Key::F23) -#define KEY_F24 ((USHORT)::com::sun::star::awt::Key::F24) -#define KEY_F25 ((USHORT)::com::sun::star::awt::Key::F25) -#define KEY_F26 ((USHORT)::com::sun::star::awt::Key::F26) - -#define KEY_DOWN ((USHORT)::com::sun::star::awt::Key::DOWN) -#define KEY_UP ((USHORT)::com::sun::star::awt::Key::UP) -#define KEY_LEFT ((USHORT)::com::sun::star::awt::Key::LEFT) -#define KEY_RIGHT ((USHORT)::com::sun::star::awt::Key::RIGHT) -#define KEY_HOME ((USHORT)::com::sun::star::awt::Key::HOME) -#define KEY_END ((USHORT)::com::sun::star::awt::Key::END) -#define KEY_PAGEUP ((USHORT)::com::sun::star::awt::Key::PAGEUP) -#define KEY_PAGEDOWN ((USHORT)::com::sun::star::awt::Key::PAGEDOWN) - -#define KEY_RETURN ((USHORT)::com::sun::star::awt::Key::RETURN) -#define KEY_ESCAPE ((USHORT)::com::sun::star::awt::Key::ESCAPE) -#define KEY_TAB ((USHORT)::com::sun::star::awt::Key::TAB) -#define KEY_BACKSPACE ((USHORT)::com::sun::star::awt::Key::BACKSPACE) -#define KEY_SPACE ((USHORT)::com::sun::star::awt::Key::SPACE) -#define KEY_INSERT ((USHORT)::com::sun::star::awt::Key::INSERT) -#define KEY_DELETE ((USHORT)::com::sun::star::awt::Key::DELETE) - -#define KEY_ADD ((USHORT)::com::sun::star::awt::Key::ADD) -#define KEY_SUBTRACT ((USHORT)::com::sun::star::awt::Key::SUBTRACT) -#define KEY_MULTIPLY ((USHORT)::com::sun::star::awt::Key::MULTIPLY) -#define KEY_DIVIDE ((USHORT)::com::sun::star::awt::Key::DIVIDE) -#define KEY_POINT ((USHORT)::com::sun::star::awt::Key::POINT) -#define KEY_COMMA ((USHORT)::com::sun::star::awt::Key::COMMA) -#define KEY_LESS ((USHORT)::com::sun::star::awt::Key::LESS) -#define KEY_GREATER ((USHORT)::com::sun::star::awt::Key::GREATER) -#define KEY_EQUAL ((USHORT)::com::sun::star::awt::Key::EQUAL) - -#define KEY_OPEN ((USHORT)::com::sun::star::awt::Key::OPEN) -#define KEY_CUT ((USHORT)::com::sun::star::awt::Key::CUT) -#define KEY_COPY ((USHORT)::com::sun::star::awt::Key::COPY) -#define KEY_PASTE ((USHORT)::com::sun::star::awt::Key::PASTE) -#define KEY_UNDO ((USHORT)::com::sun::star::awt::Key::UNDO) -#define KEY_REPEAT ((USHORT)::com::sun::star::awt::Key::REPEAT) -#define KEY_FIND ((USHORT)::com::sun::star::awt::Key::FIND) -#define KEY_PROPERTIES ((USHORT)::com::sun::star::awt::Key::PROPERTIES) -#define KEY_FRONT ((USHORT)::com::sun::star::awt::Key::FRONT) -#define KEY_CONTEXTMENU ((USHORT)::com::sun::star::awt::Key::CONTEXTMENU) -#define KEY_MENU ((USHORT)::com::sun::star::awt::Key::MENU) -#define KEY_HELP ((USHORT)::com::sun::star::awt::Key::HELP) -#define KEY_HANGUL_HANJA ((USHORT)::com::sun::star::awt::Key::HANGUL_HANJA) -#define KEY_DECIMAL ((USHORT)::com::sun::star::awt::Key::DECIMAL) -#define KEY_TILDE ((USHORT)::com::sun::star::awt::Key::TILDE) -#define KEY_QUOTELEFT ((USHORT)::com::sun::star::awt::Key::QUOTELEFT) -#define KEY_BRACKETLEFT ((USHORT)::com::sun::star::awt::Key::BRACKETLEFT) -#define KEY_BRACKETRIGHT ((USHORT)::com::sun::star::awt::Key::BRACKETRIGHT) -#define KEY_SEMICOLON ((USHORT)::com::sun::star::awt::Key::SEMICOLON) - -#define KEY_CAPSLOCK ((USHORT)::com::sun::star::awt::Key::CAPSLOCK) -#define KEY_NUMLOCK ((USHORT)::com::sun::star::awt::Key::NUMLOCK) -#define KEY_SCROLLLOCK ((USHORT)::com::sun::star::awt::Key::SCROLLLOCK) - -#define KEY_CODE ((USHORT)0x0FFF) +#define KEY_0 ((sal_uInt16)::com::sun::star::awt::Key::NUM0) +#define KEY_1 ((sal_uInt16)::com::sun::star::awt::Key::NUM1) +#define KEY_2 ((sal_uInt16)::com::sun::star::awt::Key::NUM2) +#define KEY_3 ((sal_uInt16)::com::sun::star::awt::Key::NUM3) +#define KEY_4 ((sal_uInt16)::com::sun::star::awt::Key::NUM4) +#define KEY_5 ((sal_uInt16)::com::sun::star::awt::Key::NUM5) +#define KEY_6 ((sal_uInt16)::com::sun::star::awt::Key::NUM6) +#define KEY_7 ((sal_uInt16)::com::sun::star::awt::Key::NUM7) +#define KEY_8 ((sal_uInt16)::com::sun::star::awt::Key::NUM8) +#define KEY_9 ((sal_uInt16)::com::sun::star::awt::Key::NUM9) + +#define KEY_A ((sal_uInt16)::com::sun::star::awt::Key::A) +#define KEY_B ((sal_uInt16)::com::sun::star::awt::Key::B) +#define KEY_C ((sal_uInt16)::com::sun::star::awt::Key::C) +#define KEY_D ((sal_uInt16)::com::sun::star::awt::Key::D) +#define KEY_E ((sal_uInt16)::com::sun::star::awt::Key::E) +#define KEY_F ((sal_uInt16)::com::sun::star::awt::Key::F) +#define KEY_G ((sal_uInt16)::com::sun::star::awt::Key::G) +#define KEY_H ((sal_uInt16)::com::sun::star::awt::Key::H) +#define KEY_I ((sal_uInt16)::com::sun::star::awt::Key::I) +#define KEY_J ((sal_uInt16)::com::sun::star::awt::Key::J) +#define KEY_K ((sal_uInt16)::com::sun::star::awt::Key::K) +#define KEY_L ((sal_uInt16)::com::sun::star::awt::Key::L) +#define KEY_M ((sal_uInt16)::com::sun::star::awt::Key::M) +#define KEY_N ((sal_uInt16)::com::sun::star::awt::Key::N) +#define KEY_O ((sal_uInt16)::com::sun::star::awt::Key::O) +#define KEY_P ((sal_uInt16)::com::sun::star::awt::Key::P) +#define KEY_Q ((sal_uInt16)::com::sun::star::awt::Key::Q) +#define KEY_R ((sal_uInt16)::com::sun::star::awt::Key::R) +#define KEY_S ((sal_uInt16)::com::sun::star::awt::Key::S) +#define KEY_T ((sal_uInt16)::com::sun::star::awt::Key::T) +#define KEY_U ((sal_uInt16)::com::sun::star::awt::Key::U) +#define KEY_V ((sal_uInt16)::com::sun::star::awt::Key::V) +#define KEY_W ((sal_uInt16)::com::sun::star::awt::Key::W) +#define KEY_X ((sal_uInt16)::com::sun::star::awt::Key::X) +#define KEY_Y ((sal_uInt16)::com::sun::star::awt::Key::Y) +#define KEY_Z ((sal_uInt16)::com::sun::star::awt::Key::Z) + +#define KEY_F1 ((sal_uInt16)::com::sun::star::awt::Key::F1) +#define KEY_F2 ((sal_uInt16)::com::sun::star::awt::Key::F2) +#define KEY_F3 ((sal_uInt16)::com::sun::star::awt::Key::F3) +#define KEY_F4 ((sal_uInt16)::com::sun::star::awt::Key::F4) +#define KEY_F5 ((sal_uInt16)::com::sun::star::awt::Key::F5) +#define KEY_F6 ((sal_uInt16)::com::sun::star::awt::Key::F6) +#define KEY_F7 ((sal_uInt16)::com::sun::star::awt::Key::F7) +#define KEY_F8 ((sal_uInt16)::com::sun::star::awt::Key::F8) +#define KEY_F9 ((sal_uInt16)::com::sun::star::awt::Key::F9) +#define KEY_F10 ((sal_uInt16)::com::sun::star::awt::Key::F10) +#define KEY_F11 ((sal_uInt16)::com::sun::star::awt::Key::F11) +#define KEY_F12 ((sal_uInt16)::com::sun::star::awt::Key::F12) +#define KEY_F13 ((sal_uInt16)::com::sun::star::awt::Key::F13) +#define KEY_F14 ((sal_uInt16)::com::sun::star::awt::Key::F14) +#define KEY_F15 ((sal_uInt16)::com::sun::star::awt::Key::F15) +#define KEY_F16 ((sal_uInt16)::com::sun::star::awt::Key::F16) +#define KEY_F17 ((sal_uInt16)::com::sun::star::awt::Key::F17) +#define KEY_F18 ((sal_uInt16)::com::sun::star::awt::Key::F18) +#define KEY_F19 ((sal_uInt16)::com::sun::star::awt::Key::F19) +#define KEY_F20 ((sal_uInt16)::com::sun::star::awt::Key::F20) +#define KEY_F21 ((sal_uInt16)::com::sun::star::awt::Key::F21) +#define KEY_F22 ((sal_uInt16)::com::sun::star::awt::Key::F22) +#define KEY_F23 ((sal_uInt16)::com::sun::star::awt::Key::F23) +#define KEY_F24 ((sal_uInt16)::com::sun::star::awt::Key::F24) +#define KEY_F25 ((sal_uInt16)::com::sun::star::awt::Key::F25) +#define KEY_F26 ((sal_uInt16)::com::sun::star::awt::Key::F26) + +#define KEY_DOWN ((sal_uInt16)::com::sun::star::awt::Key::DOWN) +#define KEY_UP ((sal_uInt16)::com::sun::star::awt::Key::UP) +#define KEY_LEFT ((sal_uInt16)::com::sun::star::awt::Key::LEFT) +#define KEY_RIGHT ((sal_uInt16)::com::sun::star::awt::Key::RIGHT) +#define KEY_HOME ((sal_uInt16)::com::sun::star::awt::Key::HOME) +#define KEY_END ((sal_uInt16)::com::sun::star::awt::Key::END) +#define KEY_PAGEUP ((sal_uInt16)::com::sun::star::awt::Key::PAGEUP) +#define KEY_PAGEDOWN ((sal_uInt16)::com::sun::star::awt::Key::PAGEDOWN) + +#define KEY_RETURN ((sal_uInt16)::com::sun::star::awt::Key::RETURN) +#define KEY_ESCAPE ((sal_uInt16)::com::sun::star::awt::Key::ESCAPE) +#define KEY_TAB ((sal_uInt16)::com::sun::star::awt::Key::TAB) +#define KEY_BACKSPACE ((sal_uInt16)::com::sun::star::awt::Key::BACKSPACE) +#define KEY_SPACE ((sal_uInt16)::com::sun::star::awt::Key::SPACE) +#define KEY_INSERT ((sal_uInt16)::com::sun::star::awt::Key::INSERT) +#define KEY_DELETE ((sal_uInt16)::com::sun::star::awt::Key::DELETE) + +#define KEY_ADD ((sal_uInt16)::com::sun::star::awt::Key::ADD) +#define KEY_SUBTRACT ((sal_uInt16)::com::sun::star::awt::Key::SUBTRACT) +#define KEY_MULTIPLY ((sal_uInt16)::com::sun::star::awt::Key::MULTIPLY) +#define KEY_DIVIDE ((sal_uInt16)::com::sun::star::awt::Key::DIVIDE) +#define KEY_POINT ((sal_uInt16)::com::sun::star::awt::Key::POINT) +#define KEY_COMMA ((sal_uInt16)::com::sun::star::awt::Key::COMMA) +#define KEY_LESS ((sal_uInt16)::com::sun::star::awt::Key::LESS) +#define KEY_GREATER ((sal_uInt16)::com::sun::star::awt::Key::GREATER) +#define KEY_EQUAL ((sal_uInt16)::com::sun::star::awt::Key::EQUAL) + +#define KEY_OPEN ((sal_uInt16)::com::sun::star::awt::Key::OPEN) +#define KEY_CUT ((sal_uInt16)::com::sun::star::awt::Key::CUT) +#define KEY_COPY ((sal_uInt16)::com::sun::star::awt::Key::COPY) +#define KEY_PASTE ((sal_uInt16)::com::sun::star::awt::Key::PASTE) +#define KEY_UNDO ((sal_uInt16)::com::sun::star::awt::Key::UNDO) +#define KEY_REPEAT ((sal_uInt16)::com::sun::star::awt::Key::REPEAT) +#define KEY_FIND ((sal_uInt16)::com::sun::star::awt::Key::FIND) +#define KEY_PROPERTIES ((sal_uInt16)::com::sun::star::awt::Key::PROPERTIES) +#define KEY_FRONT ((sal_uInt16)::com::sun::star::awt::Key::FRONT) +#define KEY_CONTEXTMENU ((sal_uInt16)::com::sun::star::awt::Key::CONTEXTMENU) +#define KEY_MENU ((sal_uInt16)::com::sun::star::awt::Key::MENU) +#define KEY_HELP ((sal_uInt16)::com::sun::star::awt::Key::HELP) +#define KEY_HANGUL_HANJA ((sal_uInt16)::com::sun::star::awt::Key::HANGUL_HANJA) +#define KEY_DECIMAL ((sal_uInt16)::com::sun::star::awt::Key::DECIMAL) +#define KEY_TILDE ((sal_uInt16)::com::sun::star::awt::Key::TILDE) +#define KEY_QUOTELEFT ((sal_uInt16)::com::sun::star::awt::Key::QUOTELEFT) +#define KEY_BRACKETLEFT ((sal_uInt16)::com::sun::star::awt::Key::BRACKETLEFT) +#define KEY_BRACKETRIGHT ((sal_uInt16)::com::sun::star::awt::Key::BRACKETRIGHT) +#define KEY_SEMICOLON ((sal_uInt16)::com::sun::star::awt::Key::SEMICOLON) + +#define KEY_CAPSLOCK ((sal_uInt16)::com::sun::star::awt::Key::CAPSLOCK) +#define KEY_NUMLOCK ((sal_uInt16)::com::sun::star::awt::Key::NUMLOCK) +#define KEY_SCROLLLOCK ((sal_uInt16)::com::sun::star::awt::Key::SCROLLLOCK) + +#define KEY_CODE ((sal_uInt16)0x0FFF) // Modifier-Tasten -#define KEY_SHIFT ((USHORT)0x1000) -#define KEY_MOD1 ((USHORT)0x2000) -#define KEY_MOD2 ((USHORT)0x4000) -#define KEY_MOD3 ((USHORT)0x8000) -#define KEY_MODTYPE ((USHORT)0xF000) -#define KEY_ALLMODTYPE ((USHORT)0xF000) +#define KEY_SHIFT ((sal_uInt16)0x1000) +#define KEY_MOD1 ((sal_uInt16)0x2000) +#define KEY_MOD2 ((sal_uInt16)0x4000) +#define KEY_MOD3 ((sal_uInt16)0x8000) +#define KEY_MODTYPE ((sal_uInt16)0xF000) +#define KEY_ALLMODTYPE ((sal_uInt16)0xF000) // extended Modifier-Keys (only used for modkey events) #define MODKEY_LSHIFT 0x0001 @@ -192,9 +192,9 @@ // - Mouse-Types - // --------------- -#define MOUSE_LEFT ((USHORT)0x0001) -#define MOUSE_MIDDLE ((USHORT)0x0002) -#define MOUSE_RIGHT ((USHORT)0x0004) +#define MOUSE_LEFT ((sal_uInt16)0x0001) +#define MOUSE_MIDDLE ((sal_uInt16)0x0002) +#define MOUSE_RIGHT ((sal_uInt16)0x0004) // ------------------- // - Indicator-Types - diff --git a/vcl/inc/vcl/lazydelete.hxx b/vcl/inc/vcl/lazydelete.hxx index 0a1e2a30f5f5..e7edee035e4d 100644 --- a/vcl/inc/vcl/lazydelete.hxx +++ b/vcl/inc/vcl/lazydelete.hxx @@ -40,6 +40,8 @@ #include <stdio.h> #endif +#include <com/sun/star/lang/XComponent.hpp> + namespace vcl { /* Helpers for lazy object deletion @@ -257,6 +259,43 @@ namespace vcl // ownership is transfered ! T* set( T* i_pNew ) { T* pOld = m_pT; m_pT = i_pNew; return pOld; } }; + + /** Similar to DeleteOnDeinit, the DeleteUnoReferenceOnDeinit + template class makes sure that a static UNO object is disposed + and released at the right time. + + Use like + static DeleteUnoReferenceOnDeinit<lang::XMultiServiceFactory> + xStaticFactory (<create factory object>); + Reference<lang::XMultiServiceFactory> xFactory (xStaticFactory.get()); + if (xFactory.is()) + <do something with xFactory> + */ + template <typename I> + class DeleteUnoReferenceOnDeinit : public ::vcl::DeleteOnDeinitBase + { + ::com::sun::star::uno::Reference<I> m_xI; + virtual void doCleanup() { set(NULL); } + public: + DeleteUnoReferenceOnDeinit(const ::com::sun::star::uno::Reference<I>& r_xI ) : m_xI( r_xI ) { + addDeinitContainer( this ); } + virtual ~DeleteUnoReferenceOnDeinit() {} + + ::com::sun::star::uno::Reference<I> get (void) { return m_xI; } + + void set (const ::com::sun::star::uno::Reference<I>& r_xNew ) + { + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent> xComponent (m_xI, ::com::sun::star::uno::UNO_QUERY); + m_xI = r_xNew; + if (xComponent.is()) try + { + xComponent->dispose(); + } + catch( ::com::sun::star::uno::Exception& ) + { + } + } + }; } #endif diff --git a/vcl/inc/vcl/lineinfo.hxx b/vcl/inc/vcl/lineinfo.hxx index be17988dd71d..046257cbdd9f 100644 --- a/vcl/inc/vcl/lineinfo.hxx +++ b/vcl/inc/vcl/lineinfo.hxx @@ -43,12 +43,12 @@ namespace basegfx { class B2DPolyPolygon; } struct ImplLineInfo { - ULONG mnRefCount; + sal_uLong mnRefCount; LineStyle meStyle; long mnWidth; - USHORT mnDashCount; + sal_uInt16 mnDashCount; long mnDashLen; - USHORT mnDotCount; + sal_uInt16 mnDotCount; long mnDotLen; long mnDistance; @@ -57,6 +57,8 @@ struct ImplLineInfo ImplLineInfo(); ImplLineInfo( const ImplLineInfo& rImplLineInfo ); + bool operator==( const ImplLineInfo& ) const; + friend SvStream& operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo ); friend SvStream& operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo ); }; @@ -83,9 +85,9 @@ public: ~LineInfo(); LineInfo& operator=( const LineInfo& rLineInfo ); - BOOL operator==( const LineInfo& rLineInfo ) const; - BOOL operator!=( const LineInfo& rLineInfo ) const { return !(LineInfo::operator==( rLineInfo ) ); } - BOOL IsSameInstance( const LineInfo& rLineInfo ) const { return( mpImplLineInfo == rLineInfo.mpImplLineInfo ); } + sal_Bool operator==( const LineInfo& rLineInfo ) const; + sal_Bool operator!=( const LineInfo& rLineInfo ) const { return !(LineInfo::operator==( rLineInfo ) ); } + sal_Bool IsSameInstance( const LineInfo& rLineInfo ) const { return( mpImplLineInfo == rLineInfo.mpImplLineInfo ); } void SetStyle( LineStyle eStyle ); LineStyle GetStyle() const { return mpImplLineInfo->meStyle; } @@ -93,14 +95,14 @@ public: void SetWidth( long nWidth ); long GetWidth() const { return mpImplLineInfo->mnWidth; } - void SetDashCount( USHORT nDashCount ); - USHORT GetDashCount() const { return mpImplLineInfo->mnDashCount; } + void SetDashCount( sal_uInt16 nDashCount ); + sal_uInt16 GetDashCount() const { return mpImplLineInfo->mnDashCount; } void SetDashLen( long nDashLen ); long GetDashLen() const { return mpImplLineInfo->mnDashLen; } - void SetDotCount( USHORT nDotCount ); - USHORT GetDotCount() const { return mpImplLineInfo->mnDotCount; } + void SetDotCount( sal_uInt16 nDotCount ); + sal_uInt16 GetDotCount() const { return mpImplLineInfo->mnDotCount; } void SetDotLen( long nDotLen ); long GetDotLen() const { return mpImplLineInfo->mnDotLen; } @@ -111,7 +113,7 @@ public: void SetLineJoin(basegfx::B2DLineJoin eLineJoin); basegfx::B2DLineJoin GetLineJoin() const { return mpImplLineInfo->meLineJoin; } - BOOL IsDefault() const { return( !mpImplLineInfo->mnWidth && ( LINE_SOLID == mpImplLineInfo->meStyle ) ); } + sal_Bool IsDefault() const { return( !mpImplLineInfo->mnWidth && ( LINE_SOLID == mpImplLineInfo->meStyle ) ); } friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, LineInfo& rLineInfo ); friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const LineInfo& rLineInfo ); diff --git a/vcl/inc/vcl/longcurr.hxx b/vcl/inc/vcl/longcurr.hxx index fdbb36f7af6c..ca4ebcadc77e 100644 --- a/vcl/inc/vcl/longcurr.hxx +++ b/vcl/inc/vcl/longcurr.hxx @@ -42,7 +42,7 @@ class LocaleDataWrapper; class VCL_DLLPUBLIC LongCurrencyFormatter : public FormatterBase { private: - SAL_DLLPRIVATE friend BOOL ImplLongCurrencyReformat( const XubString&, BigInt, BigInt, USHORT, const LocaleDataWrapper&, XubString&, LongCurrencyFormatter& ); + SAL_DLLPRIVATE friend sal_Bool ImplLongCurrencyReformat( const XubString&, BigInt, BigInt, sal_uInt16, const LocaleDataWrapper&, XubString&, LongCurrencyFormatter& ); SAL_DLLPRIVATE void ImpInit(); protected: @@ -52,9 +52,9 @@ protected: BigInt mnMax; BigInt mnCorrectedValue; String maCurrencySymbol; - USHORT mnType; - USHORT mnDecimalDigits; - BOOL mbThousandSep; + sal_uInt16 mnType; + sal_uInt16 mnDecimalDigits; + sal_Bool mbThousandSep; LongCurrencyFormatter(); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); @@ -65,8 +65,8 @@ public: virtual void Reformat(); virtual void ReformatAll(); - void SetUseThousandSep( BOOL b ); - BOOL IsUseThousandSep() const { return mbThousandSep; } + void SetUseThousandSep( sal_Bool b ); + sal_Bool IsUseThousandSep() const { return mbThousandSep; } void SetCurrencySymbol( const String& rStr ); String GetCurrencySymbol() const; @@ -76,15 +76,15 @@ public: void SetMax( BigInt nNewMax ); BigInt GetMax() const { return mnMax; } - void SetDecimalDigits( USHORT nDigits ); - USHORT GetDecimalDigits() const; + void SetDecimalDigits( sal_uInt16 nDigits ); + sal_uInt16 GetDecimalDigits() const; void SetValue( BigInt nNewValue ); void SetUserValue( BigInt nNewValue ); BigInt GetValue() const; - BOOL IsValueModified() const; + sal_Bool IsValueModified() const; void SetEmptyValue(); - BOOL IsEmptyValue() const { return !GetField()->GetText().Len(); } + sal_Bool IsEmptyValue() const { return !GetField()->GetText().Len(); } BigInt GetCorrectedValue() const { return mnCorrectedValue; } @@ -148,12 +148,12 @@ public: void ReformatAll(); void InsertValue( BigInt nValue, - USHORT nPos = COMBOBOX_APPEND ); + sal_uInt16 nPos = COMBOBOX_APPEND ); void RemoveValue( BigInt nValue ); BigInt GetValue() const { return LongCurrencyFormatter::GetValue(); } - BigInt GetValue( USHORT nPos ) const; - USHORT GetValuePos( BigInt nValue ) const; + BigInt GetValue( sal_uInt16 nPos ) const; + sal_uInt16 GetValuePos( BigInt nValue ) const; }; #endif // _LONGCURR_HXX diff --git a/vcl/inc/vcl/lstbox.h b/vcl/inc/vcl/lstbox.h index 454156f83627..f4577dc1e718 100644 --- a/vcl/inc/vcl/lstbox.h +++ b/vcl/inc/vcl/lstbox.h @@ -29,11 +29,11 @@ #ifndef _SV_LSTBOX_H #define _SV_LSTBOX_H -#define LISTBOX_APPEND ((USHORT)0xFFFF) -#define LISTBOX_ENTRY_NOTFOUND ((USHORT)0xFFFF) -#define LISTBOX_ERROR ((USHORT)0xFFFF) +#define LISTBOX_APPEND ((sal_uInt16)0xFFFF) +#define LISTBOX_ENTRY_NOTFOUND ((sal_uInt16)0xFFFF) +#define LISTBOX_ERROR ((sal_uInt16)0xFFFF) -#define LISTBOX_USERDRAW_SELECTED ((USHORT)0x0001) +#define LISTBOX_USERDRAW_SELECTED ((sal_uInt16)0x0001) // -------------------------------------------------------------------- diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx index 5d74ce5c7a99..cc1d0615cb7b 100644 --- a/vcl/inc/vcl/lstbox.hxx +++ b/vcl/inc/vcl/lstbox.hxx @@ -50,12 +50,12 @@ private: ImplListBoxFloatingWindow* mpFloatWin; ImplWin* mpImplWin; ImplBtn* mpBtn; - USHORT mnDDHeight; - USHORT mnSaveValue; - BOOL mbDDAutoSize; + sal_uInt16 mnDDHeight; + sal_uInt16 mnSaveValue; + sal_Bool mbDDAutoSize; Link maSelectHdl; Link maDoubleClickHdl; - USHORT mnLineCount; + sal_uInt16 mnLineCount; private: SAL_DLLPRIVATE void ImplInitListBoxData(); @@ -74,7 +74,7 @@ protected: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE WinBits ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - BOOL IsDropDownBox() const { return mpFloatWin ? TRUE : FALSE; } + sal_Bool IsDropDownBox() const { return mpFloatWin ? sal_True : sal_False; } protected: ListBox( WindowType nType ); @@ -86,7 +86,7 @@ public: ListBox( Window* pParent, const ResId& rResId ); ~ListBox(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual long PreNotify( NotifyEvent& rNEvt ); virtual void StateChanged( StateChangedType nType ); @@ -102,7 +102,7 @@ public: virtual const Wallpaper& GetDisplayBackground() const; virtual void SetPosSizePixel( long nX, long nY, - long nWidth, long nHeight, USHORT nFlags = WINDOW_POSSIZE_ALL ); + long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) { Control::SetPosSizePixel( rNewPos, rNewSize ); } void SetDropDownSizePixel( const Size& rNewSize ) @@ -110,42 +110,42 @@ public: Rectangle GetDropDownPosSizePixel() const; - void SetDropDownLineCount( USHORT nLines ); - USHORT GetDropDownLineCount() const; + void SetDropDownLineCount( sal_uInt16 nLines ); + sal_uInt16 GetDropDownLineCount() const; - void EnableAutoSize( BOOL bAuto ); - BOOL IsAutoSizeEnabled() const { return mbDDAutoSize; } + void EnableAutoSize( sal_Bool bAuto ); + sal_Bool IsAutoSizeEnabled() const { return mbDDAutoSize; } - void EnableDDAutoWidth( BOOL b ); - BOOL IsDDAutoWidthEnabled() const; + void EnableDDAutoWidth( sal_Bool b ); + sal_Bool IsDDAutoWidthEnabled() const; - virtual USHORT InsertEntry( const XubString& rStr, USHORT nPos = LISTBOX_APPEND ); - virtual USHORT InsertEntry( const Image& rImage, USHORT nPos = LISTBOX_APPEND ); - virtual USHORT InsertEntry( const XubString& rStr, const Image& rImage, USHORT nPos = LISTBOX_APPEND ); + virtual sal_uInt16 InsertEntry( const XubString& rStr, sal_uInt16 nPos = LISTBOX_APPEND ); + virtual sal_uInt16 InsertEntry( const Image& rImage, sal_uInt16 nPos = LISTBOX_APPEND ); + virtual sal_uInt16 InsertEntry( const XubString& rStr, const Image& rImage, sal_uInt16 nPos = LISTBOX_APPEND ); virtual void RemoveEntry( const XubString& rStr ); - virtual void RemoveEntry( USHORT nPos ); + virtual void RemoveEntry( sal_uInt16 nPos ); virtual void Clear(); - virtual USHORT GetEntryPos( const XubString& rStr ) const; - virtual USHORT GetEntryPos( const void* pData ) const; - Image GetEntryImage( USHORT nPos ) const; - virtual XubString GetEntry( USHORT nPos ) const; - virtual USHORT GetEntryCount() const; + virtual sal_uInt16 GetEntryPos( const XubString& rStr ) const; + virtual sal_uInt16 GetEntryPos( const void* pData ) const; + Image GetEntryImage( sal_uInt16 nPos ) const; + virtual XubString GetEntry( sal_uInt16 nPos ) const; + virtual sal_uInt16 GetEntryCount() const; - virtual void SelectEntry( const XubString& rStr, BOOL bSelect = TRUE ); - virtual void SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE ); + virtual void SelectEntry( const XubString& rStr, sal_Bool bSelect = sal_True ); + virtual void SelectEntryPos( sal_uInt16 nPos, sal_Bool bSelect = sal_True ); - virtual USHORT GetSelectEntryCount() const; - virtual XubString GetSelectEntry( USHORT nSelIndex = 0 ) const; - virtual USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const; + virtual sal_uInt16 GetSelectEntryCount() const; + virtual XubString GetSelectEntry( sal_uInt16 nSelIndex = 0 ) const; + virtual sal_uInt16 GetSelectEntryPos( sal_uInt16 nSelIndex = 0 ) const; - virtual BOOL IsEntrySelected( const XubString& rStr ) const; - virtual BOOL IsEntryPosSelected( USHORT nPos ) const; + virtual sal_Bool IsEntrySelected( const XubString& rStr ) const; + virtual sal_Bool IsEntryPosSelected( sal_uInt16 nPos ) const; virtual void SetNoSelection(); - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; + void SetEntryData( sal_uInt16 nPos, void* pNewData ); + void* GetEntryData( sal_uInt16 nPos ) const; /** this methods stores a combination of flags from the LISTBOX_ENTRY_FLAG_* defines at the given entry. @@ -155,51 +155,51 @@ public: to change the internal behaviour of the ListBox implementation for specific entries. */ - void SetEntryFlags( USHORT nPos, long nFlags ); + void SetEntryFlags( sal_uInt16 nPos, long nFlags ); /** this methods gets the current combination of flags from the LISTBOX_ENTRY_FLAG_* defines from the given entry. See description of the possible LISTBOX_ENTRY_FLAG_* flags for details. */ - long GetEntryFlags( USHORT nPos ) const; + long GetEntryFlags( sal_uInt16 nPos ) const; - void SetTopEntry( USHORT nPos ); - void ShowProminentEntry( USHORT nPos ); + void SetTopEntry( sal_uInt16 nPos ); + void ShowProminentEntry( sal_uInt16 nPos ); void SetTopEntryStr( const XubString& rStr ); - USHORT GetTopEntry() const; + sal_uInt16 GetTopEntry() const; void SetProminentEntryType( ProminentEntry eType ); ProminentEntry GetProminentEntryType() const; void SaveValue() { mnSaveValue = GetSelectEntryPos(); } - USHORT GetSavedValue() const { return mnSaveValue; } + sal_uInt16 GetSavedValue() const { return mnSaveValue; } - void SetSeparatorPos( USHORT n ); + void SetSeparatorPos( sal_uInt16 n ); void SetSeparatorPos(); - USHORT GetSeparatorPos() const; + sal_uInt16 GetSeparatorPos() const; - BOOL IsTravelSelect() const; - BOOL IsInDropDown() const; + sal_Bool IsTravelSelect() const; + sal_Bool IsInDropDown() const; void ToggleDropDown(); - void EnableMultiSelection( BOOL bMulti, BOOL bStackSelection ); - void EnableMultiSelection( BOOL bMulti ); - BOOL IsMultiSelectionEnabled() const; + void EnableMultiSelection( sal_Bool bMulti, sal_Bool bStackSelection ); + void EnableMultiSelection( sal_Bool bMulti ); + sal_Bool IsMultiSelectionEnabled() const; - void SetReadOnly( BOOL bReadOnly = TRUE ); - BOOL IsReadOnly() const; + void SetReadOnly( sal_Bool bReadOnly = sal_True ); + sal_Bool IsReadOnly() const; - long CalcWindowSizePixel( USHORT nLines ) const; - Rectangle GetBoundingRectangle( USHORT nItem ) const; + long CalcWindowSizePixel( sal_uInt16 nLines ) const; + Rectangle GetBoundingRectangle( sal_uInt16 nItem ) const; void SetUserItemSize( const Size& rSz ); const Size& GetUserItemSize() const; - void EnableUserDraw( BOOL bUserDraw ); - BOOL IsUserDrawEnabled() const; + void EnableUserDraw( sal_Bool bUserDraw ); + sal_Bool IsUserDrawEnabled() const; - void DrawEntry( const UserDrawEvent& rEvt, BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE ); + void DrawEntry( const UserDrawEvent& rEvt, sal_Bool bDrawImage, sal_Bool bDrawText, sal_Bool bDrawTextAtImagePos = sal_False ); void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } const Link& GetSelectHdl() const { return maSelectHdl; } @@ -209,15 +209,15 @@ public: Size CalcMinimumSize() const; virtual Size GetOptimalSize(WindowSizeType eType) const; Size CalcAdjustedSize( const Size& rPrefSize ) const; - Size CalcSize( USHORT nColumns, USHORT nLines ) const; - void GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const; + Size CalcSize( sal_uInt16 nColumns, sal_uInt16 nLines ) const; + void GetMaxVisColumnsAndLines( sal_uInt16& rnCols, sal_uInt16& rnLines ) const; void SetMRUEntries( const XubString& rEntries, xub_Unicode cSep = ';' ); XubString GetMRUEntries( xub_Unicode cSep = ';' ) const; - void SetMaxMRUCount( USHORT n ); - USHORT GetMaxMRUCount() const; + void SetMaxMRUCount( sal_uInt16 n ); + sal_uInt16 GetMaxMRUCount() const; - USHORT GetDisplayLineCount() const; + sal_uInt16 GetDisplayLineCount() const; void EnableMirroring(); @@ -240,7 +240,7 @@ public: if no item is at that point. */ using Control::GetIndexForPoint; - long GetIndexForPoint( const Point& rPoint, USHORT& rPos ) const; + long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPos ) const; }; // ---------------- @@ -255,7 +255,7 @@ public: private: // Bei MultiListBox nicht erlaubt... void SaveValue(); - USHORT GetSavedValue(); + sal_uInt16 GetSavedValue(); public: MultiListBox( Window* pParent, WinBits nStyle = 0 ); diff --git a/vcl/inc/vcl/mapmod.hxx b/vcl/inc/vcl/mapmod.hxx index 53cea6801cb2..bf666bc782cb 100644 --- a/vcl/inc/vcl/mapmod.hxx +++ b/vcl/inc/vcl/mapmod.hxx @@ -34,7 +34,7 @@ #include <vcl/sv.h> #include <vcl/dllapi.h> #include <tools/resid.hxx> -#include <vcl/mapunit.hxx> +#include <tools/mapunit.hxx> class SvStream; @@ -50,12 +50,12 @@ class ImplMapMode friend class OutputDevice; private: - ULONG mnRefCount; + sal_uLong mnRefCount; MapUnit meUnit; Point maOrigin; Fraction maScaleX; Fraction maScaleY; - BOOL mbSimple; + sal_Bool mbSimple; friend SvStream& operator>>( SvStream& rIStm, ImplMapMode& rMapMode ); friend SvStream& operator<<( SvStream& rOStm, const ImplMapMode& rMapMode ); @@ -103,11 +103,11 @@ public: { return mpImplMapMode->maScaleY; } MapMode& operator=( const MapMode& rMapMode ); - BOOL operator==( const MapMode& rMapMode ) const; - BOOL operator!=( const MapMode& rMapMode ) const + sal_Bool operator==( const MapMode& rMapMode ) const; + sal_Bool operator!=( const MapMode& rMapMode ) const { return !(MapMode::operator==( rMapMode )); } - BOOL IsDefault() const; - BOOL IsSameInstance( const MapMode& rMapMode ) const + sal_Bool IsDefault() const; + sal_Bool IsSameInstance( const MapMode& rMapMode ) const { return (mpImplMapMode == rMapMode.mpImplMapMode); } friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, MapMode& rMapMode ); diff --git a/vcl/inc/vcl/mapunit.hxx b/vcl/inc/vcl/mapunit.hxx deleted file mode 100644 index f8fb7581c469..000000000000 --- a/vcl/inc/vcl/mapunit.hxx +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _VCL_MAPUNIT_HXX -#define _VCL_MAPUNIT_HXX - -#include <tools/mapunit.hxx> - -#endif // _VCL_MAPUNIT_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx index 751f4ac16ca5..2712cefbb5d8 100644 --- a/vcl/inc/vcl/menu.hxx +++ b/vcl/inc/vcl/menu.hxx @@ -68,22 +68,22 @@ namespace vcl { struct MenuLayoutData; } // - Menu-Types - // -------------- -#define MENU_APPEND ((USHORT)0xFFFF) -#define MENU_ITEM_NOTFOUND ((USHORT)0xFFFF) +#define MENU_APPEND ((sal_uInt16)0xFFFF) +#define MENU_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) -#define POPUPMENU_EXECUTE_DOWN ((USHORT)0x0001) -#define POPUPMENU_EXECUTE_UP ((USHORT)0x0002) -#define POPUPMENU_EXECUTE_LEFT ((USHORT)0x0004) -#define POPUPMENU_EXECUTE_RIGHT ((USHORT)0x0008) +#define POPUPMENU_EXECUTE_DOWN ((sal_uInt16)0x0001) +#define POPUPMENU_EXECUTE_UP ((sal_uInt16)0x0002) +#define POPUPMENU_EXECUTE_LEFT ((sal_uInt16)0x0004) +#define POPUPMENU_EXECUTE_RIGHT ((sal_uInt16)0x0008) -#define POPUPMENU_NOMOUSEUPCLOSE ((USHORT)0x0010) +#define POPUPMENU_NOMOUSEUPCLOSE ((sal_uInt16)0x0010) // By changes you must also change: rsc/vclrsc.hxx enum MenuItemType { MENUITEM_DONTKNOW, MENUITEM_STRING, MENUITEM_IMAGE, MENUITEM_STRINGIMAGE, MENUITEM_SEPARATOR }; // By changes you must also change: rsc/vclrsc.hxx -typedef USHORT MenuItemBits; +typedef sal_uInt16 MenuItemBits; #define MIB_CHECKABLE ((MenuItemBits)0x0001) #define MIB_RADIOCHECK ((MenuItemBits)0x0002) #define MIB_AUTOCHECK ((MenuItemBits)0x0004) @@ -151,18 +151,18 @@ private: XubString aTitleText; // PopupMenu-Text - ULONG nEventId; - USHORT mnHighlightedItemPos; // for native menues: keeps track of the highlighted item - USHORT nMenuFlags; - USHORT nDefaultItem; // Id vom Default-Item - USHORT nSelectedId; + sal_uLong nEventId; + sal_uInt16 mnHighlightedItemPos; // for native menues: keeps track of the highlighted item + sal_uInt16 nMenuFlags; + sal_uInt16 nDefaultItem; // Id vom Default-Item + sal_uInt16 nSelectedId; // Fuer Ausgabe: - USHORT nCheckPos; - USHORT nImagePos; - USHORT nTextPos; + sal_uInt16 nCheckPos; + sal_uInt16 nImagePos; + sal_uInt16 nTextPos; - BOOL bIsMenuBar : 1, // Handelt es sich um den MenuBar + sal_Bool bIsMenuBar : 1, // Handelt es sich um den MenuBar bCanceled : 1, // Waehrend eines Callbacks abgebrochen bInCallback : 1, // In Activate/Deactivate bKilled : 1; // Gekillt... @@ -176,24 +176,24 @@ protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE Menu* ImplGetStartMenu(); SAL_DLLPRIVATE Menu* ImplFindSelectMenu(); - SAL_DLLPRIVATE Menu* ImplFindMenu( USHORT nId ); + SAL_DLLPRIVATE Menu* ImplFindMenu( sal_uInt16 nId ); SAL_DLLPRIVATE Size ImplCalcSize( Window* pWin ); - SAL_DLLPRIVATE BOOL ImplIsVisible( USHORT nPos ) const; - SAL_DLLPRIVATE BOOL ImplIsSelectable( USHORT nPos ) const; - SAL_DLLPRIVATE USHORT ImplGetVisibleItemCount() const; - SAL_DLLPRIVATE USHORT ImplGetFirstVisible() const; - SAL_DLLPRIVATE USHORT ImplGetPrevVisible( USHORT nPos ) const; - SAL_DLLPRIVATE USHORT ImplGetNextVisible( USHORT nPos ) const; - SAL_DLLPRIVATE void ImplPaint( Window* pWin, USHORT nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, BOOL bHighlighted = FALSE, bool bLayout = false ) const; + SAL_DLLPRIVATE sal_Bool ImplIsVisible( sal_uInt16 nPos ) const; + SAL_DLLPRIVATE sal_Bool ImplIsSelectable( sal_uInt16 nPos ) const; + SAL_DLLPRIVATE sal_uInt16 ImplGetVisibleItemCount() const; + SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisible() const; + SAL_DLLPRIVATE sal_uInt16 ImplGetPrevVisible( sal_uInt16 nPos ) const; + SAL_DLLPRIVATE sal_uInt16 ImplGetNextVisible( sal_uInt16 nPos ) const; + SAL_DLLPRIVATE void ImplPaint( Window* pWin, sal_uInt16 nBorder, long nOffY = 0, MenuItemData* pThisDataOnly = 0, sal_Bool bHighlighted = sal_False, bool bLayout = false ) const; SAL_DLLPRIVATE void ImplSelect(); - SAL_DLLPRIVATE void ImplCallHighlight( USHORT nHighlightItem ); - SAL_DLLPRIVATE void ImplCallEventListeners( ULONG nEvent, USHORT nPos ); + SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); + SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ); DECL_DLLPRIVATE_LINK( ImplCallSelect, Menu* ); SAL_DLLPRIVATE void ImplFillLayoutData() const; SAL_DLLPRIVATE SalMenu* ImplGetSalMenu() { return mpSalMenu; } SAL_DLLPRIVATE void ImplSetSalMenu( SalMenu *pMenu ); - SAL_DLLPRIVATE const XubString& ImplGetHelpText( USHORT nItemId ) const; + SAL_DLLPRIVATE const XubString& ImplGetHelpText( sal_uInt16 nItemId ) const; // returns native check and option menu symbol height; // return value is Max( rCheckHeight, rRadioHeight ) @@ -206,7 +206,7 @@ public: SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const; Menu(); - Menu( BOOL bMenuBar ); + Menu( sal_Bool bMenuBar ); SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; } @@ -220,93 +220,93 @@ public: virtual void Select(); virtual void RequestHelp( const HelpEvent& rHEvt ); - void InsertItem( USHORT nItemId, const XubString& rStr, + void InsertItem( sal_uInt16 nItemId, const XubString& rStr, MenuItemBits nItemBits = 0, - USHORT nPos = MENU_APPEND ); - void InsertItem( USHORT nItemId, const Image& rImage, + sal_uInt16 nPos = MENU_APPEND ); + void InsertItem( sal_uInt16 nItemId, const Image& rImage, MenuItemBits nItemBits = 0, - USHORT nPos = MENU_APPEND ); - void InsertItem( USHORT nItemId, + sal_uInt16 nPos = MENU_APPEND ); + void InsertItem( sal_uInt16 nItemId, const XubString& rString, const Image& rImage, MenuItemBits nItemBits = 0, - USHORT nPos = MENU_APPEND ); - void InsertItem( const ResId& rResId, USHORT nPos = MENU_APPEND ); - void InsertSeparator( USHORT nPos = MENU_APPEND ); - void RemoveItem( USHORT nPos ); - void CopyItem( const Menu& rMenu, USHORT nPos, - USHORT nNewPos = MENU_APPEND ); + sal_uInt16 nPos = MENU_APPEND ); + void InsertItem( const ResId& rResId, sal_uInt16 nPos = MENU_APPEND ); + void InsertSeparator( sal_uInt16 nPos = MENU_APPEND ); + void RemoveItem( sal_uInt16 nPos ); + void CopyItem( const Menu& rMenu, sal_uInt16 nPos, + sal_uInt16 nNewPos = MENU_APPEND ); void Clear(); void CreateAutoMnemonics(); - void SetMenuFlags( USHORT nFlags ) { nMenuFlags = nFlags; } - USHORT GetMenuFlags() const { return nMenuFlags; } + void SetMenuFlags( sal_uInt16 nFlags ) { nMenuFlags = nFlags; } + sal_uInt16 GetMenuFlags() const { return nMenuFlags; } - USHORT GetItemCount() const; - USHORT GetItemId( USHORT nPos ) const; - USHORT GetItemPos( USHORT nItemId ) const; - MenuItemType GetItemType( USHORT nPos ) const; - USHORT GetCurItemId() const; + sal_uInt16 GetItemCount() const; + sal_uInt16 GetItemId( sal_uInt16 nPos ) const; + sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; + MenuItemType GetItemType( sal_uInt16 nPos ) const; + sal_uInt16 GetCurItemId() const; - void SetDefaultItem( USHORT nItemId ) { nDefaultItem = nItemId; } - USHORT GetDefaultItem() const { return nDefaultItem; } + void SetDefaultItem( sal_uInt16 nItemId ) { nDefaultItem = nItemId; } + sal_uInt16 GetDefaultItem() const { return nDefaultItem; } - void SetItemBits( USHORT nItemId, MenuItemBits nBits ); - MenuItemBits GetItemBits( USHORT nItemId ) const; + void SetItemBits( sal_uInt16 nItemId, MenuItemBits nBits ); + MenuItemBits GetItemBits( sal_uInt16 nItemId ) const; - void SetUserValue( USHORT nItemId, ULONG nValue ); - ULONG GetUserValue( USHORT nItemId ) const; + void SetUserValue( sal_uInt16 nItemId, sal_uLong nValue ); + sal_uLong GetUserValue( sal_uInt16 nItemId ) const; - void SetPopupMenu( USHORT nItemId, PopupMenu* pMenu ); - PopupMenu* GetPopupMenu( USHORT nItemId ) const; + void SetPopupMenu( sal_uInt16 nItemId, PopupMenu* pMenu ); + PopupMenu* GetPopupMenu( sal_uInt16 nItemId ) const; - void SetAccelKey( USHORT nItemId, const KeyCode& rKeyCode ); - KeyCode GetAccelKey( USHORT nItemId ) const; + void SetAccelKey( sal_uInt16 nItemId, const KeyCode& rKeyCode ); + KeyCode GetAccelKey( sal_uInt16 nItemId ) const; - void CheckItem( USHORT nItemId, BOOL bCheck = TRUE ); - BOOL IsItemChecked( USHORT nItemId ) const; + void CheckItem( sal_uInt16 nItemId, sal_Bool bCheck = sal_True ); + sal_Bool IsItemChecked( sal_uInt16 nItemId ) const; - void SelectItem( USHORT nItemId ); + void SelectItem( sal_uInt16 nItemId ); void DeSelect() { SelectItem( 0xFFFF ); } // MENUITEMPOS_INVALID - void EnableItem( USHORT nItemId, BOOL bEnable = TRUE ); - BOOL IsItemEnabled( USHORT nItemId ) const; + void EnableItem( sal_uInt16 nItemId, sal_Bool bEnable = sal_True ); + sal_Bool IsItemEnabled( sal_uInt16 nItemId ) const; - void ShowItem( USHORT nItemId, BOOL bVisible = TRUE ); - void HideItem( USHORT nItemId ) { ShowItem( nItemId, FALSE ); } + void ShowItem( sal_uInt16 nItemId, sal_Bool bVisible = sal_True ); + void HideItem( sal_uInt16 nItemId ) { ShowItem( nItemId, sal_False ); } - BOOL IsItemVisible( USHORT nItemId ) const; - BOOL IsItemPosVisible( USHORT nItemPos ) const; - BOOL IsMenuVisible() const; - BOOL IsMenuBar() const { return bIsMenuBar; } + sal_Bool IsItemVisible( sal_uInt16 nItemId ) const; + sal_Bool IsItemPosVisible( sal_uInt16 nItemPos ) const; + sal_Bool IsMenuVisible() const; + sal_Bool IsMenuBar() const { return bIsMenuBar; } - void RemoveDisabledEntries( BOOL bCheckPopups = TRUE, BOOL bRemoveEmptyPopups = FALSE ); - BOOL HasValidEntries( BOOL bCheckPopups = TRUE ); + void RemoveDisabledEntries( sal_Bool bCheckPopups = sal_True, sal_Bool bRemoveEmptyPopups = sal_False ); + sal_Bool HasValidEntries( sal_Bool bCheckPopups = sal_True ); - void SetItemText( USHORT nItemId, const XubString& rStr ); - XubString GetItemText( USHORT nItemId ) const; + void SetItemText( sal_uInt16 nItemId, const XubString& rStr ); + XubString GetItemText( sal_uInt16 nItemId ) const; - void SetItemImage( USHORT nItemId, const Image& rImage ); - Image GetItemImage( USHORT nItemId ) const; - void SetItemImageAngle( USHORT nItemId, long nAngle10 ); - long GetItemImageAngle( USHORT nItemId ) const; - void SetItemImageMirrorMode( USHORT nItemId, BOOL bMirror ); - BOOL GetItemImageMirrorMode( USHORT ) const; + void SetItemImage( sal_uInt16 nItemId, const Image& rImage ); + Image GetItemImage( sal_uInt16 nItemId ) const; + void SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 ); + long GetItemImageAngle( sal_uInt16 nItemId ) const; + void SetItemImageMirrorMode( sal_uInt16 nItemId, sal_Bool bMirror ); + sal_Bool GetItemImageMirrorMode( sal_uInt16 ) const; - void SetItemCommand( USHORT nItemId, const XubString& rCommand ); - const XubString& GetItemCommand( USHORT nItemId ) const; + void SetItemCommand( sal_uInt16 nItemId, const XubString& rCommand ); + const XubString& GetItemCommand( sal_uInt16 nItemId ) const; - void SetHelpText( USHORT nItemId, const XubString& rString ); - const XubString& GetHelpText( USHORT nItemId ) const; + void SetHelpText( sal_uInt16 nItemId, const XubString& rString ); + const XubString& GetHelpText( sal_uInt16 nItemId ) const; - void SetTipHelpText( USHORT nItemId, const XubString& rString ); - const XubString& GetTipHelpText( USHORT nItemId ) const; + void SetTipHelpText( sal_uInt16 nItemId, const XubString& rString ); + const XubString& GetTipHelpText( sal_uInt16 nItemId ) const; - void SetHelpCommand( USHORT nItemId, const XubString& rString ); - const XubString& GetHelpCommand( USHORT nItemId ) const; + void SetHelpCommand( sal_uInt16 nItemId, const XubString& rString ); + const XubString& GetHelpCommand( sal_uInt16 nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ); + rtl::OString GetHelpId( sal_uInt16 nItemId ) const; void SetActivateHdl( const Link& rLink ) { aActivateHdl = rLink; } const Link& GetActivateHdl() const { return aActivateHdl; } @@ -322,7 +322,7 @@ public: void SetLogo( const MenuLogo& rLogo ); void SetLogo(); - BOOL HasLogo() const { return pLogo ? TRUE : FALSE; } + sal_Bool HasLogo() const { return pLogo ? sal_True : sal_False; } MenuLogo GetLogo() const; void AddEventListener( const Link& rEventListener ); @@ -337,7 +337,7 @@ public: // returns the system's menu handle if native menues are supported // pData must point to a SystemMenuData structure - BOOL GetSystemMenuData( SystemMenuData* pData ) const; + sal_Bool GetSystemMenuData( SystemMenuData* pData ) const; // accessibility helpers @@ -346,41 +346,41 @@ public: // returns the bounding box for the character at index nIndex // where nIndex is relative to the starting index of the item // with id nItemId (in coordinates of the displaying window) - Rectangle GetCharacterBounds( USHORT nItemId, long nIndex ) const; + Rectangle GetCharacterBounds( sal_uInt16 nItemId, long nIndex ) const; // -1 is returned if no character is at that point // if an index is found the corresponding item id is filled in (else 0) - long GetIndexForPoint( const Point& rPoint, USHORT& rItemID ) const; + long GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const; // returns the number of lines in the result of GetDisplayText() long GetLineCount() const; // returns the interval [start,end] of line nLine // returns [-1,-1] for an invalid line Pair GetLineStartEnd( long nLine ) const; // like GetLineStartEnd but first finds the line number for the item - Pair GetItemStartEnd( USHORT nItemId ) const; + Pair GetItemStartEnd( sal_uInt16 nItemId ) const; // returns the item id for line nLine or 0 if nLine is invalid - USHORT GetDisplayItemId( long nLine ) const; + sal_uInt16 GetDisplayItemId( long nLine ) const; // returns the bounding rectangle for an item at pos nItemPos - Rectangle GetBoundingRectangle( USHORT nItemPos ) const; - BOOL ConvertPoint( Point& rPoint, Window* pReferenceWindow ) const; + Rectangle GetBoundingRectangle( sal_uInt16 nItemPos ) const; + sal_Bool ConvertPoint( Point& rPoint, Window* pReferenceWindow ) const; ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible(); void SetAccessible( const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible ); // gets the activation key of the specified item - KeyEvent GetActivationKey( USHORT nItemId ) const; + KeyEvent GetActivationKey( sal_uInt16 nItemId ) const; Window* GetWindow() const { return pWindow; } - void SetAccessibleName( USHORT nItemId, const XubString& rStr ); - XubString GetAccessibleName( USHORT nItemId ) const; + void SetAccessibleName( sal_uInt16 nItemId, const XubString& rStr ); + XubString GetAccessibleName( sal_uInt16 nItemId ) const; - void SetAccessibleDescription( USHORT nItemId, const XubString& rStr ); - XubString GetAccessibleDescription( USHORT nItemId ) const; + void SetAccessibleDescription( sal_uInt16 nItemId, const XubString& rStr ); + XubString GetAccessibleDescription( sal_uInt16 nItemId ) const; // returns whether the item a position nItemPos is highlighted or not. - bool IsHighlighted( USHORT nItemPos ) const; + bool IsHighlighted( sal_uInt16 nItemPos ) const; - void HighlightItem( USHORT nItemPos ); + void HighlightItem( sal_uInt16 nItemPos ); void DeHighlight() { HighlightItem( 0xFFFF ); } // MENUITEMPOS_INVALID @@ -396,10 +396,10 @@ class VCL_DLLPUBLIC MenuBar : public Menu Link maCloserHdl; Link maFloatHdl; Link maHideHdl; - BOOL mbCloserVisible; - BOOL mbFloatBtnVisible; - BOOL mbHideBtnVisible; - BOOL mbDisplayable; + sal_Bool mbCloserVisible; + sal_Bool mbFloatBtnVisible; + sal_Bool mbHideBtnVisible; + sal_Bool mbDisplayable; friend class Application; friend class Menu; @@ -408,8 +408,8 @@ class VCL_DLLPUBLIC MenuBar : public Menu friend class SystemWindow; SAL_DLLPRIVATE static Window* ImplCreate( Window* pParent, Window* pWindow, MenuBar* pMenu ); - SAL_DLLPRIVATE static void ImplDestroy( MenuBar* pMenu, BOOL bDelete ); - SAL_DLLPRIVATE BOOL ImplHandleKeyEvent( const KeyEvent& rKEvent, BOOL bFromMenu = TRUE ); + SAL_DLLPRIVATE static void ImplDestroy( MenuBar* pMenu, sal_Bool bDelete ); + SAL_DLLPRIVATE sal_Bool ImplHandleKeyEvent( const KeyEvent& rKEvent, sal_Bool bFromMenu = sal_True ); public: MenuBar(); @@ -419,20 +419,20 @@ public: MenuBar& operator =( const MenuBar& rMenu ); - void ShowCloser( BOOL bShow = TRUE ); - BOOL HasCloser() const { return mbCloserVisible; } - void ShowFloatButton( BOOL bShow = TRUE ); - BOOL HasFloatButton() const { return mbFloatBtnVisible; } - void ShowHideButton( BOOL bShow = TRUE ); - BOOL HasHideButton() const { return mbHideBtnVisible; } - void ShowButtons( BOOL bClose, BOOL bFloat, BOOL bHide ); - - void SelectEntry( USHORT nId ); - BOOL HandleMenuActivateEvent( Menu *pMenu ) const; - BOOL HandleMenuDeActivateEvent( Menu *pMenu ) const; - BOOL HandleMenuHighlightEvent( Menu *pMenu, USHORT nEventId ) const; - BOOL HandleMenuCommandEvent( Menu *pMenu, USHORT nEventId ) const; - BOOL HandleMenuButtonEvent( Menu *pMenu, USHORT nEventId ) const; + void ShowCloser( sal_Bool bShow = sal_True ); + sal_Bool HasCloser() const { return mbCloserVisible; } + void ShowFloatButton( sal_Bool bShow = sal_True ); + sal_Bool HasFloatButton() const { return mbFloatBtnVisible; } + void ShowHideButton( sal_Bool bShow = sal_True ); + sal_Bool HasHideButton() const { return mbHideBtnVisible; } + void ShowButtons( sal_Bool bClose, sal_Bool bFloat, sal_Bool bHide ); + + void SelectEntry( sal_uInt16 nId ); + sal_Bool HandleMenuActivateEvent( Menu *pMenu ) const; + sal_Bool HandleMenuDeActivateEvent( Menu *pMenu ) const; + sal_Bool HandleMenuHighlightEvent( Menu *pMenu, sal_uInt16 nEventId ) const; + sal_Bool HandleMenuCommandEvent( Menu *pMenu, sal_uInt16 nEventId ) const; + sal_Bool HandleMenuButtonEvent( Menu *pMenu, sal_uInt16 nEventId ) const; void SetCloserHdl( const Link& rLink ) { maCloserHdl = rLink; } const Link& GetCloserHdl() const { return maCloserHdl; } @@ -445,31 +445,31 @@ public: // - if a menubar is not displayable, its MenuBarWindow will never be shown // and it will be hidden if it was visible before // - note: if a menubar is diplayable, this does not necessarily mean that it is currently visible - void SetDisplayable( BOOL bDisplayable ); - BOOL IsDisplayable() const { return mbDisplayable; } + void SetDisplayable( sal_Bool bDisplayable ); + sal_Bool IsDisplayable() const { return mbDisplayable; } struct MenuBarButtonCallbackArg { - USHORT nId; // Id of the button + sal_uInt16 nId; // Id of the button bool bHighlight; // highlight on/off MenuBar* pMenuBar; // menubar the button belongs to }; // add an arbitrary button to the menubar (will appear next to closer) // passed link will be call with a MenuBarButtonCallbackArg on press - USHORT AddMenuBarButton( const Image&, const Link&, USHORT nPos = 0 ); + sal_uInt16 AddMenuBarButton( const Image&, const Link&, sal_uInt16 nPos = 0 ); // add an arbitrary button to the menubar (will appear next to closer) // passed link will be call with a MenuBarButtonCallbackArg on press // passed string will be set as tooltip - USHORT AddMenuBarButton( const Image&, const Link&, const String&, USHORT nPos = 0 ); + sal_uInt16 AddMenuBarButton( const Image&, const Link&, const String&, sal_uInt16 nPos = 0 ); // set the highlight link for additional button with ID nId // highlight link will be called with a MenuBarButtonHighlightArg // the bHighlight member of that struct shall contain the new state - void SetMenuBarButtonHighlightHdl( USHORT nId, const Link& ); + void SetMenuBarButtonHighlightHdl( sal_uInt16 nId, const Link& ); // returns the rectangle occupied by the additional button named nId // coordinates are relative to the systemwindiow the menubar is attached to // if the menubar is unattached an empty rectangle is returned - Rectangle GetMenuBarButtonRectPixel( USHORT nId ); - void RemoveMenuBarButton( USHORT nId ); + Rectangle GetMenuBarButtonRectPixel( sal_uInt16 nId ); + void RemoveMenuBarButton( sal_uInt16 nId ); }; inline MenuBar& MenuBar::operator =( const MenuBar& rMenu ) @@ -496,9 +496,9 @@ private: SAL_DLLPRIVATE MenuFloatingWindow* ImplGetFloatingWindow() const { return (MenuFloatingWindow*)Menu::ImplGetWindow(); } protected: - SAL_DLLPRIVATE USHORT ImplExecute( Window* pWindow, const Rectangle& rRect, ULONG nPopupFlags, Menu* pStaredFrom, BOOL bPreSelectFirst ); - SAL_DLLPRIVATE long ImplCalcHeight( USHORT nEntries ) const; - SAL_DLLPRIVATE USHORT ImplCalcVisEntries( long nMaxHeight, USHORT nStartEntry = 0, USHORT* pLastVisible = NULL ) const; + SAL_DLLPRIVATE sal_uInt16 ImplExecute( Window* pWindow, const Rectangle& rRect, sal_uLong nPopupFlags, Menu* pStaredFrom, sal_Bool bPreSelectFirst ); + SAL_DLLPRIVATE long ImplCalcHeight( sal_uInt16 nEntries ) const; + SAL_DLLPRIVATE sal_uInt16 ImplCalcVisEntries( long nMaxHeight, sal_uInt16 nStartEntry = 0, sal_uInt16* pLastVisible = NULL ) const; public: PopupMenu(); @@ -509,15 +509,15 @@ public: void SetText( const XubString& rTitle ) { aTitleText = rTitle; } const XubString& GetText() const { return aTitleText; } - USHORT Execute( Window* pWindow, const Point& rPopupPos ); - USHORT Execute( Window* pWindow, const Rectangle& rRect, USHORT nFlags = 0 ); + sal_uInt16 Execute( Window* pWindow, const Point& rPopupPos ); + sal_uInt16 Execute( Window* pWindow, const Rectangle& rRect, sal_uInt16 nFlags = 0 ); // Fuer das TestTool - void EndExecute( USHORT nSelect = 0 ); - void SelectEntry( USHORT nId ); - void SetSelectedEntry( USHORT nId ); // for use by native submenu only + void EndExecute( sal_uInt16 nSelect = 0 ); + void SelectEntry( sal_uInt16 nId ); + void SetSelectedEntry( sal_uInt16 nId ); // for use by native submenu only - static BOOL IsInExecute(); + static sal_Bool IsInExecute(); static PopupMenu* GetActivePopupMenu(); PopupMenu& operator =( const PopupMenu& rMenu ); diff --git a/vcl/inc/vcl/menubtn.hxx b/vcl/inc/vcl/menubtn.hxx index 588bdd4772cd..1e65504b97bc 100644 --- a/vcl/inc/vcl/menubtn.hxx +++ b/vcl/inc/vcl/menubtn.hxx @@ -40,7 +40,7 @@ class PopupMenu; // - MenuButton-Types - // -------------------- -#define MENUBUTTON_MENUMODE_TIMED ((USHORT)0x0001) +#define MENUBUTTON_MENUMODE_TIMED ((sal_uInt16)0x0001) // -------------- // - MenuButton - @@ -53,8 +53,8 @@ private: Timer* mpMenuTimer; PopupMenu* mpOwnMenu; PopupMenu* mpMenu; - USHORT mnCurItemId; - USHORT mnMenuMode; + sal_uInt16 mnCurItemId; + sal_uInt16 mnMenuMode; Link maActivateHdl; Link maSelectHdl; @@ -82,13 +82,13 @@ public: virtual void Activate(); virtual void Select(); - void SetMenuMode( USHORT nMode ); - USHORT GetMenuMode() const { return mnMenuMode; } + void SetMenuMode( sal_uInt16 nMode ); + sal_uInt16 GetMenuMode() const { return mnMenuMode; } void SetPopupMenu( PopupMenu* pNewMenu ); PopupMenu* GetPopupMenu() const { return mpMenu; } - USHORT GetCurItemId() const { return mnCurItemId; } + sal_uInt16 GetCurItemId() const { return mnCurItemId; } void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; } const Link& GetActivateHdl() const { return maActivateHdl; } diff --git a/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx index f507063982bb..fd8f3b8e985b 100644 --- a/vcl/inc/vcl/metaact.hxx +++ b/vcl/inc/vcl/metaact.hxx @@ -144,8 +144,8 @@ Meta##Name##Action::~Meta##Name##Action() {} class VCL_DLLPUBLIC MetaAction { private: - ULONG mnRefCount; - UINT16 mnType; + sal_uLong mnRefCount; + sal_uInt16 mnType; virtual sal_Bool Compare( const MetaAction& ) const; @@ -154,7 +154,7 @@ protected: public: MetaAction(); - MetaAction( USHORT nType ); + MetaAction( sal_uInt16 nType ); virtual void Execute( OutputDevice* pOut ); @@ -168,8 +168,8 @@ public: sal_Bool IsEqual( const MetaAction& ) const; - USHORT GetType() const { return mnType; } - ULONG GetRefCount() const { return mnRefCount; } + sal_uInt16 GetType() const { return mnType; } + sal_uLong GetRefCount() const { return mnRefCount; } void ResetRefCount() { mnRefCount = 1; } void Duplicate() { mnRefCount++; } void Delete() { if ( 0 == --mnRefCount ) delete this; } @@ -492,8 +492,8 @@ private: Point maPt; XubString maStr; - USHORT mnIndex; - USHORT mnLen; + sal_uInt16 mnIndex; + sal_uInt16 mnLen; virtual sal_Bool Compare( const MetaAction& ) const; @@ -501,15 +501,15 @@ public: DECL_META_ACTION( Text, META_TEXT_ACTION ) MetaTextAction( const Point& rPt, const XubString& rStr, - USHORT nIndex, USHORT nLen ); + sal_uInt16 nIndex, sal_uInt16 nLen ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); const Point& GetPoint() const { return maPt; } const XubString& GetText() const { return maStr; } - USHORT GetIndex() const { return mnIndex; } - USHORT GetLen() const { return mnLen; } + sal_uInt16 GetIndex() const { return mnIndex; } + sal_uInt16 GetLen() const { return mnLen; } }; // ----------------------- @@ -523,8 +523,8 @@ private: Point maStartPt; XubString maStr; sal_Int32* mpDXAry; - USHORT mnIndex; - USHORT mnLen; + sal_uInt16 mnIndex; + sal_uInt16 mnLen; virtual sal_Bool Compare( const MetaAction& ) const; @@ -537,8 +537,8 @@ public: MetaTextArrayAction( const Point& rStartPt, const XubString& rStr, const sal_Int32* pDXAry, - USHORT nIndex, - USHORT nLen ); + sal_uInt16 nIndex, + sal_uInt16 nLen ); virtual void Execute( OutputDevice* pOut ); @@ -552,8 +552,8 @@ public: const Point& GetPoint() const { return maStartPt; } const XubString& GetText() const { return maStr; } - USHORT GetIndex() const { return mnIndex; } - USHORT GetLen() const { return mnLen; } + sal_uInt16 GetIndex() const { return mnIndex; } + sal_uInt16 GetLen() const { return mnLen; } sal_Int32* GetDXArray() const { return mpDXAry; } }; @@ -568,8 +568,8 @@ private: Point maPt; XubString maStr; sal_uInt32 mnWidth; - USHORT mnIndex; - USHORT mnLen; + sal_uInt16 mnIndex; + sal_uInt16 mnLen; virtual sal_Bool Compare( const MetaAction& ) const; @@ -578,7 +578,7 @@ public: MetaStretchTextAction( const Point& rPt, sal_uInt32 nWidth, const XubString& rStr, - USHORT nIndex, USHORT nLen ); + sal_uInt16 nIndex, sal_uInt16 nLen ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -586,8 +586,8 @@ public: const Point& GetPoint() const { return maPt; } const XubString& GetText() const { return maStr; } sal_uInt32 GetWidth() const { return mnWidth; } - USHORT GetIndex() const { return mnIndex; } - USHORT GetLen() const { return mnLen; } + sal_uInt16 GetIndex() const { return mnIndex; } + sal_uInt16 GetLen() const { return mnLen; } }; // ---------------------- @@ -600,7 +600,7 @@ private: Rectangle maRect; XubString maStr; - USHORT mnStyle; + sal_uInt16 mnStyle; virtual sal_Bool Compare( const MetaAction& ) const; @@ -608,14 +608,14 @@ public: DECL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) MetaTextRectAction( const Rectangle& rRect, - const XubString& rStr, USHORT nStyle ); + const XubString& rStr, sal_uInt16 nStyle ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); const Rectangle& GetRect() const { return maRect; } const XubString& GetText() const { return maStr; } - USHORT GetStyle() const { return mnStyle; } + sal_uInt16 GetStyle() const { return mnStyle; } }; // ---------------------- @@ -1029,20 +1029,20 @@ class VCL_DLLPUBLIC MetaClipRegionAction : public MetaAction private: Region maRegion; - BOOL mbClip; + sal_Bool mbClip; virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION ) - MetaClipRegionAction( const Region& rRegion, BOOL bClip ); + MetaClipRegionAction( const Region& rRegion, sal_Bool bClip ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); const Region& GetRegion() const { return maRegion; } - BOOL IsClipping() const { return mbClip; } + sal_Bool IsClipping() const { return mbClip; } }; // --------------------------------- @@ -1124,17 +1124,17 @@ class VCL_DLLPUBLIC MetaLineColorAction : public MetaAction private: Color maColor; - BOOL mbSet; + sal_Bool mbSet; virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( LineColor, META_LINECOLOR_ACTION ) - MetaLineColorAction( const Color& rColor, BOOL bSet ); + MetaLineColorAction( const Color& rColor, sal_Bool bSet ); const Color& GetColor() const { return maColor; } - BOOL IsSetting() const { return mbSet; } + sal_Bool IsSetting() const { return mbSet; } }; // ----------------------- @@ -1146,17 +1146,17 @@ class VCL_DLLPUBLIC MetaFillColorAction : public MetaAction private: Color maColor; - BOOL mbSet; + sal_Bool mbSet; virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( FillColor, META_FILLCOLOR_ACTION ) - MetaFillColorAction( const Color& rColor, BOOL bSet ); + MetaFillColorAction( const Color& rColor, sal_Bool bSet ); const Color& GetColor() const { return maColor; } - BOOL IsSetting() const { return mbSet; } + sal_Bool IsSetting() const { return mbSet; } }; // ----------------------- @@ -1188,17 +1188,17 @@ class VCL_DLLPUBLIC MetaTextFillColorAction : public MetaAction private: Color maColor; - BOOL mbSet; + sal_Bool mbSet; virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION ) - MetaTextFillColorAction( const Color& rColor, BOOL bSet ); + MetaTextFillColorAction( const Color& rColor, sal_Bool bSet ); const Color& GetColor() const { return maColor; } - BOOL IsSetting() const { return mbSet; } + sal_Bool IsSetting() const { return mbSet; } }; // --------------------------- @@ -1210,17 +1210,17 @@ class VCL_DLLPUBLIC MetaTextLineColorAction : public MetaAction private: Color maColor; - BOOL mbSet; + sal_Bool mbSet; virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION ) - MetaTextLineColorAction( const Color& rColor, BOOL bSet ); + MetaTextLineColorAction( const Color& rColor, sal_Bool bSet ); const Color& GetColor() const { return maColor; } - BOOL IsSetting() const { return mbSet; } + sal_Bool IsSetting() const { return mbSet; } }; // --------------------------- @@ -1232,17 +1232,17 @@ class VCL_DLLPUBLIC MetaOverlineColorAction : public MetaAction private: Color maColor; - BOOL mbSet; + sal_Bool mbSet; virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION ) - MetaOverlineColorAction( const Color& rColor, BOOL bSet ); + MetaOverlineColorAction( const Color& rColor, sal_Bool bSet ); const Color& GetColor() const { return maColor; } - BOOL IsSetting() const { return mbSet; } + sal_Bool IsSetting() const { return mbSet; } }; // ----------------------- @@ -1317,16 +1317,16 @@ class VCL_DLLPUBLIC MetaPushAction : public MetaAction { private: - USHORT mnFlags; + sal_uInt16 mnFlags; virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Push, META_PUSH_ACTION ) - MetaPushAction( USHORT nFlags ); + MetaPushAction( sal_uInt16 nFlags ); - USHORT GetFlags() const { return mnFlags; } + sal_uInt16 GetFlags() const { return mnFlags; } }; // ----------------- @@ -1369,20 +1369,20 @@ class VCL_DLLPUBLIC MetaTransparentAction : public MetaAction private: PolyPolygon maPolyPoly; - USHORT mnTransPercent; + sal_uInt16 mnTransPercent; virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Transparent, META_TRANSPARENT_ACTION ) - MetaTransparentAction( const PolyPolygon& rPolyPoly, USHORT nTransPercent ); + MetaTransparentAction( const PolyPolygon& rPolyPoly, sal_uInt16 nTransPercent ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } - USHORT GetTransparence() const { return mnTransPercent; } + sal_uInt16 GetTransparence() const { return mnTransPercent; } }; // ------------------------------ @@ -1454,17 +1454,17 @@ class VCL_DLLPUBLIC MetaRefPointAction : public MetaAction private: Point maRefPoint; - BOOL mbSet; + sal_Bool mbSet; virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( RefPoint, META_REFPOINT_ACTION ) - MetaRefPointAction( const Point& rRefPoint, BOOL bSet ); + MetaRefPointAction( const Point& rRefPoint, sal_Bool bSet ); const Point& GetRefPoint() const { return maRefPoint; } - BOOL IsSetting() const { return mbSet; } + sal_Bool IsSetting() const { return mbSet; } }; // --------------------- @@ -1478,9 +1478,9 @@ private: ByteString maComment; sal_Int32 mnValue; sal_uInt32 mnDataSize; - BYTE* mpData; + sal_uInt8* mpData; - SAL_DLLPRIVATE void ImplInitDynamicData( const BYTE* pData, sal_uInt32 nDataSize ); + SAL_DLLPRIVATE void ImplInitDynamicData( const sal_uInt8* pData, sal_uInt32 nDataSize ); virtual sal_Bool Compare( const MetaAction& ) const; protected: @@ -1489,8 +1489,8 @@ protected: public: MetaCommentAction( sal_Int32 nValue = 0L ); MetaCommentAction( const MetaCommentAction& rAct ); - MetaCommentAction( const ByteString& rComment, sal_Int32 nValue = 0L, const BYTE* pData = NULL, sal_uInt32 nDataSize = 0UL ); - MetaCommentAction( const BYTE* pData, sal_uInt32 nDataSize ); + MetaCommentAction( const ByteString& rComment, sal_Int32 nValue = 0L, const sal_uInt8* pData = NULL, sal_uInt32 nDataSize = 0UL ); + MetaCommentAction( const sal_uInt8* pData, sal_uInt32 nDataSize ); virtual void Move( long nHorzMove, long nVertMove ); virtual void Scale( double fScaleX, double fScaleY ); @@ -1503,7 +1503,7 @@ public: const ByteString& GetComment() const { return maComment; } sal_Int32 GetValue() const { return mnValue; } sal_uInt32 GetDataSize() const { return mnDataSize; } - const BYTE* GetData() const { return mpData; } + const sal_uInt8* GetData() const { return mpData; } }; // ------------------------ diff --git a/vcl/inc/vcl/metric.hxx b/vcl/inc/vcl/metric.hxx index 41cb707ffd62..677135b99990 100644 --- a/vcl/inc/vcl/metric.hxx +++ b/vcl/inc/vcl/metric.hxx @@ -54,14 +54,14 @@ public: ~FontInfo(); FontType GetType() const; - BOOL IsDeviceFont() const; - BOOL SupportsLatin() const; - BOOL SupportsCJK() const; - BOOL SupportsCTL() const; + sal_Bool IsDeviceFont() const; + sal_Bool SupportsLatin() const; + sal_Bool SupportsCJK() const; + sal_Bool SupportsCTL() const; FontInfo& operator=( const FontInfo& ); - BOOL operator==( const FontInfo& ) const; - BOOL operator!=( const FontInfo& rInfo ) const + sal_Bool operator==( const FontInfo& ) const; + sal_Bool operator!=( const FontInfo& rInfo ) const { return !operator==( rInfo ); } }; @@ -84,8 +84,8 @@ public: long GetSlant() const; FontMetric& operator=( const FontMetric& rMetric ); - BOOL operator==( const FontMetric& rMetric ) const; - BOOL operator!=( const FontMetric& rMetric ) const + sal_Bool operator==( const FontMetric& rMetric ) const; + sal_Bool operator!=( const FontMetric& rMetric ) const { return !operator==( rMetric ); } }; @@ -96,14 +96,14 @@ public: class VCL_DLLPUBLIC FontCharMap { private: - ImplFontCharMap* mpImpl; + const ImplFontCharMap* mpImpl; public: FontCharMap(); ~FontCharMap(); - BOOL IsDefaultMap() const; - BOOL HasChar( sal_uInt32 ) const; + sal_Bool IsDefaultMap() const; + sal_Bool HasChar( sal_uInt32 ) const; int CountCharsInRange( sal_uInt32 cMin, sal_uInt32 cMax ) const; int GetCharCount() const; @@ -119,7 +119,7 @@ public: private: friend class OutputDevice; - void Reset( ImplFontCharMap* pNewMap = NULL ); + void Reset( const ImplFontCharMap* pNewMap = NULL ); // prevent assignment and copy construction FontCharMap( const FontCharMap& ); @@ -136,21 +136,21 @@ class VCL_DLLPUBLIC TextRectInfo private: long mnMaxWidth; - USHORT mnLineCount; - BOOL mbEllipsis; + sal_uInt16 mnLineCount; + sal_Bool mbEllipsis; public: TextRectInfo(); - USHORT GetLineCount() const { return mnLineCount; } + sal_uInt16 GetLineCount() const { return mnLineCount; } long GetMaxLineWidth() const { return mnMaxWidth; } - BOOL IsEllipses() const { return mbEllipsis; } + sal_Bool IsEllipses() const { return mbEllipsis; } - BOOL operator ==( const TextRectInfo& rInfo ) const + sal_Bool operator ==( const TextRectInfo& rInfo ) const { return ((mnMaxWidth == rInfo.mnMaxWidth) && (mnLineCount == rInfo.mnLineCount) && (mbEllipsis == rInfo.mbEllipsis)); } - BOOL operator !=( const TextRectInfo& rInfo ) const + sal_Bool operator !=( const TextRectInfo& rInfo ) const { return !(TextRectInfo::operator==( rInfo )); } }; @@ -158,7 +158,7 @@ inline TextRectInfo::TextRectInfo() { mnMaxWidth = 0; mnLineCount = 0; - mbEllipsis = FALSE; + mbEllipsis = sal_False; } #endif // _SV_METRIC_HXX diff --git a/vcl/inc/vcl/mnemonic.hxx b/vcl/inc/vcl/mnemonic.hxx index 801ba7d26190..1a0aac80a4a4 100644 --- a/vcl/inc/vcl/mnemonic.hxx +++ b/vcl/inc/vcl/mnemonic.hxx @@ -58,7 +58,7 @@ (MNEMONIC_RANGE_4_END-MNEMONIC_RANGE_4_START+1)) #define MNEMONIC_CHAR ((sal_Unicode)'~') -#define MNEMONIC_INDEX_NOTFOUND ((USHORT)0xFFFF) +#define MNEMONIC_INDEX_NOTFOUND ((sal_uInt16)0xFFFF) // ------------------------- // - MnemonicGenerator - @@ -68,18 +68,18 @@ class VCL_DLLPUBLIC MnemonicGenerator { private: // 0 == Mnemonic; >0 == count of characters - BYTE maMnemonics[MAX_MNEMONICS]; + sal_uInt8 maMnemonics[MAX_MNEMONICS]; ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > mxCharClass; protected: - SAL_DLLPRIVATE USHORT ImplGetMnemonicIndex( sal_Unicode c ); + SAL_DLLPRIVATE sal_uInt16 ImplGetMnemonicIndex( sal_Unicode c ); SAL_DLLPRIVATE sal_Unicode ImplFindMnemonic( const XubString& rKey ); public: MnemonicGenerator(); void RegisterMnemonic( const XubString& rKey ); - BOOL CreateMnemonic( XubString& rKey ); + sal_Bool CreateMnemonic( XubString& rKey ); ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification > GetCharClass(); // returns a string where all '~'-characters and CJK mnemonics of the form (~A) are completely removed diff --git a/vcl/inc/vcl/mnemonicengine.hxx b/vcl/inc/vcl/mnemonicengine.hxx index cf32d7b70626..79f6856cb704 100644 --- a/vcl/inc/vcl/mnemonicengine.hxx +++ b/vcl/inc/vcl/mnemonicengine.hxx @@ -60,7 +60,7 @@ namespace vcl If this value is <NULL/>, searching stops. */ - virtual const void* FirstSearchEntry( String& _rEntryText ) = 0; + virtual const void* FirstSearchEntry( String& _rEntryText ) const = 0; /** returns the next list entry for the mnemonic search @@ -75,7 +75,7 @@ namespace vcl to <member>FirstSearchEntry</member> (i.e. you cycled around), then searching stops, too. */ - virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) = 0; + virtual const void* NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) const = 0; /** "selects" a given entry. @@ -118,7 +118,7 @@ namespace vcl the entry to select. This is the return value of a previous call to <member>FirstSearchEntry</member> or <member>NextSearchEntry</member>. */ - virtual void ExecuteSearchEntry( const void* _pEntry ) = 0; + virtual void ExecuteSearchEntry( const void* _pEntry ) const = 0; }; //==================================================================== diff --git a/vcl/inc/vcl/morebtn.hxx b/vcl/inc/vcl/morebtn.hxx index fe787d2b1b26..e84798479d7f 100644 --- a/vcl/inc/vcl/morebtn.hxx +++ b/vcl/inc/vcl/morebtn.hxx @@ -44,9 +44,9 @@ class VCL_DLLPUBLIC MoreButton : public PushButton { private: ImplMoreButtonData* mpMBData; - ULONG mnDelta; + sal_uLong mnDelta; MapUnit meUnit; - BOOL mbState; + sal_Bool mbState; // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE MoreButton( const MoreButton & ); @@ -68,15 +68,15 @@ public: void AddWindow( Window* pWindow ); void RemoveWindow( Window* pWindow ); - void SetDelta( ULONG nNewDelta ) { mnDelta = nNewDelta; } - ULONG GetDelta() const { return mnDelta; } + void SetDelta( sal_uLong nNewDelta ) { mnDelta = nNewDelta; } + sal_uLong GetDelta() const { return mnDelta; } void SetMapUnit( MapUnit eNewUnit = MAP_PIXEL ) { meUnit = eNewUnit; } MapUnit GetMapUnit() const { return meUnit; } using PushButton::SetState; - void SetState( BOOL bNewState = TRUE ); - BOOL GetState() const { return mbState; } + void SetState( sal_Bool bNewState = sal_True ); + sal_Bool GetState() const { return mbState; } void SetText( const XubString& rNewText ); XubString GetText() const; @@ -87,7 +87,7 @@ public: XubString GetLessText() const; }; -inline void MoreButton::SetState( BOOL bNewState ) +inline void MoreButton::SetState( sal_Bool bNewState ) { if ( mbState != bNewState ) Click(); diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx index 42eaeef2a7e4..326dae5616e3 100644 --- a/vcl/inc/vcl/msgbox.hxx +++ b/vcl/inc/vcl/msgbox.hxx @@ -45,8 +45,8 @@ class CheckBox; // Return-Werte von Execute //!!! bei Aenderungen \basic\source\runtime\methods.cxx msgbox anpassen -#define RET_OK TRUE -#define RET_CANCEL FALSE +#define RET_OK sal_True +#define RET_CANCEL sal_False #define RET_YES 2 #define RET_NO 3 #define RET_RETRY 4 @@ -71,12 +71,12 @@ protected: FixedImage* mpFixedImage; XubString maMessText; Image maImage; - USHORT mnSoundType; - BOOL mbHelpBtn; - BOOL mbSound; + sal_uInt16 mnSoundType; + sal_Bool mbHelpBtn; + sal_Bool mbSound; CheckBox* mpCheckBox; XubString maCheckBoxText; - BOOL mbCheck; + sal_Bool mbCheck; SAL_DLLPRIVATE void ImplInitMessBoxData(); SAL_DLLPRIVATE void ImplInitButtons(); @@ -100,14 +100,14 @@ public: void SetImage( const Image& rImage ) { maImage = rImage; } const Image& GetImage() const { return maImage; } - BOOL SetModeImage( const Image& rImage ); + sal_Bool SetModeImage( const Image& rImage ); const Image& GetModeImage( ) const; void SetDefaultCheckBoxText(); void SetCheckBoxText( const XubString& rText ) { maCheckBoxText = rText;} const XubString& GetCheckBoxText() const { return maCheckBoxText;} - void SetCheckBoxState( BOOL bCheck ); - BOOL GetCheckBoxState() const; + void SetCheckBoxState( sal_Bool bCheck ); + sal_Bool GetCheckBoxState() const; virtual Size GetOptimalSize(WindowSizeType eType) const; }; diff --git a/vcl/inc/vcl/octree.hxx b/vcl/inc/vcl/octree.hxx index 085ef648f98f..3cef6384a7d6 100644 --- a/vcl/inc/vcl/octree.hxx +++ b/vcl/inc/vcl/octree.hxx @@ -45,15 +45,15 @@ typedef struct OctreeNode { - ULONG nCount; - ULONG nRed; - ULONG nGreen; - ULONG nBlue; + sal_uLong nCount; + sal_uLong nRed; + sal_uLong nGreen; + sal_uLong nBlue; OctreeNode* pChild[ 8 ]; OctreeNode* pNext; OctreeNode* pNextInCache; - USHORT nPalIndex; - BOOL bLeaf; + sal_uInt16 nPalIndex; + sal_Bool bLeaf; } NODE; typedef NODE* PNODE; @@ -66,20 +66,20 @@ typedef PNODE* PPNODE; class ImpNodeCache; class BitmapReadAccess; -class VCL_DLLPUBLIC Octree +class VCL_PLUGIN_PUBLIC Octree { private: BitmapPalette aPal; - ULONG nMax; - ULONG nLeafCount; - ULONG nLevel; + sal_uLong nMax; + sal_uLong nLeafCount; + sal_uLong nLevel; PNODE pTree; PNODE pReduce[ OCTREE_BITS + 1 ]; BitmapColor* pColor; ImpNodeCache* pNodeCache; const BitmapReadAccess* pAcc; - USHORT nPalIndex; + sal_uInt16 nPalIndex; Octree() {}; @@ -93,21 +93,21 @@ private: public: - Octree( const BitmapReadAccess& rReadAcc, ULONG nColors ); - Octree( ULONG nColors ); + Octree( const BitmapReadAccess& rReadAcc, sal_uLong nColors ); + Octree( sal_uLong nColors ); ~Octree(); void AddColor( const BitmapColor& rColor ); inline const BitmapPalette& GetPalette(); - inline USHORT GetBestPaletteIndex( const BitmapColor& rColor ); + inline sal_uInt16 GetBestPaletteIndex( const BitmapColor& rColor ); }; // ------------------------------------------------------------------------ inline const BitmapPalette& Octree::GetPalette() { - aPal.SetEntryCount( (USHORT) nLeafCount ); + aPal.SetEntryCount( (sal_uInt16) nLeafCount ); nPalIndex = 0; CreatePalette( pTree ); return aPal; @@ -115,7 +115,7 @@ inline const BitmapPalette& Octree::GetPalette() // ------------------------------------------------------------------------ -inline USHORT Octree::GetBestPaletteIndex( const BitmapColor& rColor ) +inline sal_uInt16 Octree::GetBestPaletteIndex( const BitmapColor& rColor ) { pColor = &(BitmapColor&) rColor; nPalIndex = 65535; @@ -128,32 +128,32 @@ inline USHORT Octree::GetBestPaletteIndex( const BitmapColor& rColor ) // - InverseColorMap - // ------------------- -class VCL_DLLPUBLIC InverseColorMap +class VCL_PLUGIN_PUBLIC InverseColorMap { private: - BYTE* pBuffer; - BYTE* pMap; - const ULONG nBits; + sal_uInt8* pBuffer; + sal_uInt8* pMap; + const sal_uLong nBits; - SAL_DLLPRIVATE void ImplCreateBuffers( const ULONG nMax ); + SAL_DLLPRIVATE void ImplCreateBuffers( const sal_uLong nMax ); public: - InverseColorMap( const BitmapPalette& rPal ); + explicit InverseColorMap( const BitmapPalette& rPal ); ~InverseColorMap(); - inline USHORT GetBestPaletteIndex( const BitmapColor& rColor ); + inline sal_uInt16 GetBestPaletteIndex( const BitmapColor& rColor ); }; // ------------------------------------------------------------------------ -inline USHORT InverseColorMap::GetBestPaletteIndex( const BitmapColor& rColor ) +inline sal_uInt16 InverseColorMap::GetBestPaletteIndex( const BitmapColor& rColor ) { - return pMap[ ( ( (ULONG) rColor.GetRed() >> nBits ) << OCTREE_BITS_1 ) | - ( ( (ULONG) rColor.GetGreen() >> nBits ) << OCTREE_BITS ) | - ( (ULONG) rColor.GetBlue() >> nBits ) ]; + return pMap[ ( ( (sal_uLong) rColor.GetRed() >> nBits ) << OCTREE_BITS_1 ) | + ( ( (sal_uLong) rColor.GetGreen() >> nBits ) << OCTREE_BITS ) | + ( (sal_uLong) rColor.GetBlue() >> nBits ) ]; } #endif // _SV_OCTREE_HXX diff --git a/vcl/inc/vcl/outdev.h b/vcl/inc/vcl/outdev.h index 163ca349ed97..fc6bab815c48 100644 --- a/vcl/inc/vcl/outdev.h +++ b/vcl/inc/vcl/outdev.h @@ -48,14 +48,14 @@ class GetDevSizeList; // ----------------------- // flags for mnMatchType member -#define IMPL_DEVFONT_SCALABLE ((ULONG)0x00000001) -#define IMPL_DEVFONT_SYMBOL ((ULONG)0x00000002) -#define IMPL_DEVFONT_NONESYMBOL ((ULONG)0x00000004) -#define IMPL_DEVFONT_LIGHT ((ULONG)0x00000010) -#define IMPL_DEVFONT_BOLD ((ULONG)0x00000020) -#define IMPL_DEVFONT_NORMAL ((ULONG)0x00000040) -#define IMPL_DEVFONT_NONEITALIC ((ULONG)0x00000100) -#define IMPL_DEVFONT_ITALIC ((ULONG)0x00000200) +#define IMPL_DEVFONT_SCALABLE ((sal_uIntPtr)0x00000001) +#define IMPL_DEVFONT_SYMBOL ((sal_uIntPtr)0x00000002) +#define IMPL_DEVFONT_NONESYMBOL ((sal_uIntPtr)0x00000004) +#define IMPL_DEVFONT_LIGHT ((sal_uIntPtr)0x00000010) +#define IMPL_DEVFONT_BOLD ((sal_uIntPtr)0x00000020) +#define IMPL_DEVFONT_NORMAL ((sal_uIntPtr)0x00000040) +#define IMPL_DEVFONT_NONEITALIC ((sal_uIntPtr)0x00000100) +#define IMPL_DEVFONT_ITALIC ((sal_uIntPtr)0x00000200) // TODO: rename ImplDevFontListData to PhysicalFontFamily class ImplDevFontListData @@ -86,8 +86,8 @@ friend class ImplDevFontList; // TODO: remove soon String maName; // Fontname (original font family name) String maSearchName; // normalized font family name String maMapNames; // fontname aliases - ULONG mnTypeFaces; // Typeface Flags - ULONG mnMatchType; // MATCH - Type + sal_uIntPtr mnTypeFaces; // Typeface Flags + sal_uIntPtr mnMatchType; // MATCH - Type String maMatchFamilyName; // MATCH - FamilyName FontWeight meMatchWeight; // MATCH - Weight FontWidth meMatchWidth; // MATCH - Width @@ -162,9 +162,9 @@ struct ImplFontSubstEntry String maReplaceName; String maSearchName; String maSearchReplaceName; - USHORT mnFlags; + sal_uInt16 mnFlags; - ImplFontSubstEntry( const String& rFontName, const String& rSubstFontName, USHORT nSubstFlags ); + ImplFontSubstEntry( const String& rFontName, const String& rSubstFontName, sal_uInt16 nSubstFlags ); }; class ImplDirectFontSubstitution @@ -174,14 +174,14 @@ private: typedef std::list<ImplFontSubstEntry> FontSubstList; FontSubstList maFontSubstList; public: - void AddFontSubstitute( const String& rFontName, const String& rSubstName, USHORT nFlags ); + void AddFontSubstitute( const String& rFontName, const String& rSubstName, sal_uInt16 nFlags ); void RemoveFontSubstitute( int nIndex ); - bool GetFontSubstitute( int nIndex, String& rFontName, String& rSubstName, USHORT& rFlags ) const; + bool GetFontSubstitute( int nIndex, String& rFontName, String& rSubstName, sal_uInt16& rFlags ) const; int GetFontSubstituteCount() const { return maFontSubstList.size(); }; bool Empty() const { return maFontSubstList.empty(); } void Clear() { maFontSubstList.clear(); } - bool FindFontSubstitute( String& rSubstName, const String& rFontName, USHORT nFlags ) const; + bool FindFontSubstitute( String& rSubstName, const String& rFontName, sal_uInt16 nFlags ) const; }; // PreMatchFontSubstitution diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index e61b05eddc02..bf05dd040583 100644..100755 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -153,52 +153,55 @@ struct KerningPair // ---------------------- // Flags for Push() -#define PUSH_LINECOLOR ((USHORT)0x0001) -#define PUSH_FILLCOLOR ((USHORT)0x0002) -#define PUSH_FONT ((USHORT)0x0004) -#define PUSH_TEXTCOLOR ((USHORT)0x0008) -#define PUSH_MAPMODE ((USHORT)0x0010) -#define PUSH_CLIPREGION ((USHORT)0x0020) -#define PUSH_RASTEROP ((USHORT)0x0040) -#define PUSH_TEXTFILLCOLOR ((USHORT)0x0080) -#define PUSH_TEXTALIGN ((USHORT)0x0100) -#define PUSH_REFPOINT ((USHORT)0x0200) -#define PUSH_TEXTLINECOLOR ((USHORT)0x0400) -#define PUSH_TEXTLAYOUTMODE ((USHORT)0x0800) -#define PUSH_TEXTLANGUAGE ((USHORT)0x1000) -#define PUSH_OVERLINECOLOR ((USHORT)0x2000) +#define PUSH_LINECOLOR ((sal_uInt16)0x0001) +#define PUSH_FILLCOLOR ((sal_uInt16)0x0002) +#define PUSH_FONT ((sal_uInt16)0x0004) +#define PUSH_TEXTCOLOR ((sal_uInt16)0x0008) +#define PUSH_MAPMODE ((sal_uInt16)0x0010) +#define PUSH_CLIPREGION ((sal_uInt16)0x0020) +#define PUSH_RASTEROP ((sal_uInt16)0x0040) +#define PUSH_TEXTFILLCOLOR ((sal_uInt16)0x0080) +#define PUSH_TEXTALIGN ((sal_uInt16)0x0100) +#define PUSH_REFPOINT ((sal_uInt16)0x0200) +#define PUSH_TEXTLINECOLOR ((sal_uInt16)0x0400) +#define PUSH_TEXTLAYOUTMODE ((sal_uInt16)0x0800) +#define PUSH_TEXTLANGUAGE ((sal_uInt16)0x1000) +#define PUSH_OVERLINECOLOR ((sal_uInt16)0x2000) #define PUSH_ALLTEXT (PUSH_TEXTCOLOR | PUSH_TEXTFILLCOLOR | PUSH_TEXTLINECOLOR | PUSH_OVERLINECOLOR | PUSH_TEXTALIGN | PUSH_TEXTLAYOUTMODE | PUSH_TEXTLANGUAGE) #define PUSH_ALLFONT (PUSH_ALLTEXT | PUSH_FONT) -#define PUSH_ALL ((USHORT)0xFFFF) +#define PUSH_ALL ((sal_uInt16)0xFFFF) // Flags for DrawText() -#define TEXT_DRAW_DISABLE ((USHORT)0x0001) -#define TEXT_DRAW_MNEMONIC ((USHORT)0x0002) -#define TEXT_DRAW_MONO ((USHORT)0x0004) -#define TEXT_DRAW_CLIP ((USHORT)0x0008) -#define TEXT_DRAW_LEFT ((USHORT)0x0010) -#define TEXT_DRAW_CENTER ((USHORT)0x0020) -#define TEXT_DRAW_RIGHT ((USHORT)0x0040) -#define TEXT_DRAW_TOP ((USHORT)0x0080) -#define TEXT_DRAW_VCENTER ((USHORT)0x0100) -#define TEXT_DRAW_BOTTOM ((USHORT)0x0200) -#define TEXT_DRAW_ENDELLIPSIS ((USHORT)0x0400) -#define TEXT_DRAW_PATHELLIPSIS ((USHORT)0x0800) -#define TEXT_DRAW_MULTILINE ((USHORT)0x1000) -#define TEXT_DRAW_WORDBREAK ((USHORT)0x2000) -#define TEXT_DRAW_NEWSELLIPSIS ((USHORT)0x4000) - -#define TEXT_DRAW_WORDBREAK_HYPHENATION (((USHORT)0x8000) | TEXT_DRAW_WORDBREAK) +#define TEXT_DRAW_DISABLE ((sal_uInt16)0x0001) +#define TEXT_DRAW_MNEMONIC ((sal_uInt16)0x0002) +#define TEXT_DRAW_MONO ((sal_uInt16)0x0004) +#define TEXT_DRAW_CLIP ((sal_uInt16)0x0008) +#define TEXT_DRAW_LEFT ((sal_uInt16)0x0010) +#define TEXT_DRAW_CENTER ((sal_uInt16)0x0020) +#define TEXT_DRAW_RIGHT ((sal_uInt16)0x0040) +#define TEXT_DRAW_TOP ((sal_uInt16)0x0080) +#define TEXT_DRAW_VCENTER ((sal_uInt16)0x0100) +#define TEXT_DRAW_BOTTOM ((sal_uInt16)0x0200) +#define TEXT_DRAW_ENDELLIPSIS ((sal_uInt16)0x0400) +#define TEXT_DRAW_PATHELLIPSIS ((sal_uInt16)0x0800) +#define TEXT_DRAW_MULTILINE ((sal_uInt16)0x1000) +#define TEXT_DRAW_WORDBREAK ((sal_uInt16)0x2000) +#define TEXT_DRAW_NEWSELLIPSIS ((sal_uInt16)0x4000) +// in the long run we should make text style flags longer +// but at the moment we can get away with this 2 bit field for ellipsis style +#define TEXT_DRAW_CENTERELLIPSIS (TEXT_DRAW_ENDELLIPSIS | TEXT_DRAW_PATHELLIPSIS) + +#define TEXT_DRAW_WORDBREAK_HYPHENATION (((sal_uInt16)0x8000) | TEXT_DRAW_WORDBREAK) // Flags for CopyArea() -#define COPYAREA_WINDOWINVALIDATE ((USHORT)0x0001) +#define COPYAREA_WINDOWINVALIDATE ((sal_uInt16)0x0001) // Flags for DrawImage() -#define IMAGE_DRAW_DISABLE ((USHORT)0x0001) -#define IMAGE_DRAW_HIGHLIGHT ((USHORT)0x0002) -#define IMAGE_DRAW_DEACTIVE ((USHORT)0x0004) -#define IMAGE_DRAW_COLORTRANSFORM ((USHORT)0x0008) -#define IMAGE_DRAW_SEMITRANSPARENT ((USHORT)0x0010) +#define IMAGE_DRAW_DISABLE ((sal_uInt16)0x0001) +#define IMAGE_DRAW_HIGHLIGHT ((sal_uInt16)0x0002) +#define IMAGE_DRAW_DEACTIVE ((sal_uInt16)0x0004) +#define IMAGE_DRAW_COLORTRANSFORM ((sal_uInt16)0x0008) +#define IMAGE_DRAW_SEMITRANSPARENT ((sal_uInt16)0x0010) #define IMAGE_DRAW_3DLOOK 0 #define IMAGE_DRAW_BTNLOOK 0 @@ -208,63 +211,63 @@ struct KerningPair #define WAVE_NORMAL 3 // Grid -#define GRID_DOTS ((ULONG)0x00000001) -#define GRID_HORZLINES ((ULONG)0x00000002) -#define GRID_VERTLINES ((ULONG)0x00000004) +#define GRID_DOTS ((sal_uLong)0x00000001) +#define GRID_HORZLINES ((sal_uLong)0x00000002) +#define GRID_VERTLINES ((sal_uLong)0x00000004) #define GRID_LINES (GRID_HORZLINES | GRID_VERTLINES) // LayoutModes for Complex Text Layout -#define TEXT_LAYOUT_DEFAULT ((ULONG)0x00000000) -#define TEXT_LAYOUT_BIDI_LTR ((ULONG)0x00000000) -#define TEXT_LAYOUT_BIDI_RTL ((ULONG)0x00000001) -#define TEXT_LAYOUT_BIDI_STRONG ((ULONG)0x00000002) -#define TEXT_LAYOUT_TEXTORIGIN_LEFT ((ULONG)0x00000004) -#define TEXT_LAYOUT_TEXTORIGIN_RIGHT ((ULONG)0x00000008) -#define TEXT_LAYOUT_COMPLEX_DISABLED ((ULONG)0x00000100) -#define TEXT_LAYOUT_ENABLE_LIGATURES ((ULONG)0x00000200) -#define TEXT_LAYOUT_SUBSTITUTE_DIGITS ((ULONG)0x00000400) +#define TEXT_LAYOUT_DEFAULT ((sal_uLong)0x00000000) +#define TEXT_LAYOUT_BIDI_LTR ((sal_uLong)0x00000000) +#define TEXT_LAYOUT_BIDI_RTL ((sal_uLong)0x00000001) +#define TEXT_LAYOUT_BIDI_STRONG ((sal_uLong)0x00000002) +#define TEXT_LAYOUT_TEXTORIGIN_LEFT ((sal_uLong)0x00000004) +#define TEXT_LAYOUT_TEXTORIGIN_RIGHT ((sal_uLong)0x00000008) +#define TEXT_LAYOUT_COMPLEX_DISABLED ((sal_uLong)0x00000100) +#define TEXT_LAYOUT_ENABLE_LIGATURES ((sal_uLong)0x00000200) +#define TEXT_LAYOUT_SUBSTITUTE_DIGITS ((sal_uLong)0x00000400) // DrawModes -#define DRAWMODE_DEFAULT ((ULONG)0x00000000) -#define DRAWMODE_BLACKLINE ((ULONG)0x00000001) -#define DRAWMODE_BLACKFILL ((ULONG)0x00000002) -#define DRAWMODE_BLACKTEXT ((ULONG)0x00000004) -#define DRAWMODE_BLACKBITMAP ((ULONG)0x00000008) -#define DRAWMODE_BLACKGRADIENT ((ULONG)0x00000010) -#define DRAWMODE_GRAYLINE ((ULONG)0x00000020) -#define DRAWMODE_GRAYFILL ((ULONG)0x00000040) -#define DRAWMODE_GRAYTEXT ((ULONG)0x00000080) -#define DRAWMODE_GRAYBITMAP ((ULONG)0x00000100) -#define DRAWMODE_GRAYGRADIENT ((ULONG)0x00000200) -#define DRAWMODE_NOFILL ((ULONG)0x00000400) -#define DRAWMODE_NOBITMAP ((ULONG)0x00000800) -#define DRAWMODE_NOGRADIENT ((ULONG)0x00001000) -#define DRAWMODE_GHOSTEDLINE ((ULONG)0x00002000) -#define DRAWMODE_GHOSTEDFILL ((ULONG)0x00004000) -#define DRAWMODE_GHOSTEDTEXT ((ULONG)0x00008000) -#define DRAWMODE_GHOSTEDBITMAP ((ULONG)0x00010000) -#define DRAWMODE_GHOSTEDGRADIENT ((ULONG)0x00020000) -#define DRAWMODE_WHITELINE ((ULONG)0x00100000) -#define DRAWMODE_WHITEFILL ((ULONG)0x00200000) -#define DRAWMODE_WHITETEXT ((ULONG)0x00400000) -#define DRAWMODE_WHITEBITMAP ((ULONG)0x00800000) -#define DRAWMODE_WHITEGRADIENT ((ULONG)0x01000000) -#define DRAWMODE_SETTINGSLINE ((ULONG)0x02000000) -#define DRAWMODE_SETTINGSFILL ((ULONG)0x04000000) -#define DRAWMODE_SETTINGSTEXT ((ULONG)0x08000000) -#define DRAWMODE_SETTINGSGRADIENT ((ULONG)0x10000000) -#define DRAWMODE_NOTRANSPARENCY ((ULONG)0x80000000) +#define DRAWMODE_DEFAULT ((sal_uLong)0x00000000) +#define DRAWMODE_BLACKLINE ((sal_uLong)0x00000001) +#define DRAWMODE_BLACKFILL ((sal_uLong)0x00000002) +#define DRAWMODE_BLACKTEXT ((sal_uLong)0x00000004) +#define DRAWMODE_BLACKBITMAP ((sal_uLong)0x00000008) +#define DRAWMODE_BLACKGRADIENT ((sal_uLong)0x00000010) +#define DRAWMODE_GRAYLINE ((sal_uLong)0x00000020) +#define DRAWMODE_GRAYFILL ((sal_uLong)0x00000040) +#define DRAWMODE_GRAYTEXT ((sal_uLong)0x00000080) +#define DRAWMODE_GRAYBITMAP ((sal_uLong)0x00000100) +#define DRAWMODE_GRAYGRADIENT ((sal_uLong)0x00000200) +#define DRAWMODE_NOFILL ((sal_uLong)0x00000400) +#define DRAWMODE_NOBITMAP ((sal_uLong)0x00000800) +#define DRAWMODE_NOGRADIENT ((sal_uLong)0x00001000) +#define DRAWMODE_GHOSTEDLINE ((sal_uLong)0x00002000) +#define DRAWMODE_GHOSTEDFILL ((sal_uLong)0x00004000) +#define DRAWMODE_GHOSTEDTEXT ((sal_uLong)0x00008000) +#define DRAWMODE_GHOSTEDBITMAP ((sal_uLong)0x00010000) +#define DRAWMODE_GHOSTEDGRADIENT ((sal_uLong)0x00020000) +#define DRAWMODE_WHITELINE ((sal_uLong)0x00100000) +#define DRAWMODE_WHITEFILL ((sal_uLong)0x00200000) +#define DRAWMODE_WHITETEXT ((sal_uLong)0x00400000) +#define DRAWMODE_WHITEBITMAP ((sal_uLong)0x00800000) +#define DRAWMODE_WHITEGRADIENT ((sal_uLong)0x01000000) +#define DRAWMODE_SETTINGSLINE ((sal_uLong)0x02000000) +#define DRAWMODE_SETTINGSFILL ((sal_uLong)0x04000000) +#define DRAWMODE_SETTINGSTEXT ((sal_uLong)0x08000000) +#define DRAWMODE_SETTINGSGRADIENT ((sal_uLong)0x10000000) +#define DRAWMODE_NOTRANSPARENCY ((sal_uLong)0x80000000) // Antialiasing -#define ANTIALIASING_DISABLE_TEXT ((USHORT)0x0001) -#define ANTIALIASING_ENABLE_B2DDRAW ((USHORT)0x0002) -#define ANTIALIASING_PIXELSNAPHAIRLINE ((USHORT)0x0004) +#define ANTIALIASING_DISABLE_TEXT ((sal_uInt16)0x0001) +#define ANTIALIASING_ENABLE_B2DDRAW ((sal_uInt16)0x0002) +#define ANTIALIASING_PIXELSNAPHAIRLINE ((sal_uInt16)0x0004) // AddFontSubstitute -#define FONT_SUBSTITUTE_ALWAYS ((USHORT)0x0001) -#define FONT_SUBSTITUTE_SCREENONLY ((USHORT)0x0002) +#define FONT_SUBSTITUTE_ALWAYS ((sal_uInt16)0x0001) +#define FONT_SUBSTITUTE_SCREENONLY ((sal_uInt16)0x0002) -#define DEFAULTFONT_FLAGS_ONLYONE ((ULONG)0x00000001) +#define DEFAULTFONT_FLAGS_ONLYONE ((sal_uLong)0x00000001) enum OutDevType { OUTDEV_DONTKNOW, OUTDEV_WINDOW, OUTDEV_PRINTER, OUTDEV_VIRDEV }; @@ -335,8 +338,8 @@ private: mutable long mnTextOffY; mutable long mnEmphasisAscent; mutable long mnEmphasisDescent; - ULONG mnDrawMode; - ULONG mnTextLayoutMode; + sal_uLong mnDrawMode; + sal_uLong mnTextLayoutMode; ImplMapRes maMapRes; ImplThresholdRes maThresRes; OutDevType meOutDevType; @@ -354,9 +357,9 @@ private: AllSettings maSettings; MapMode maMapMode; Point maRefPoint; - USHORT mnAntialiasing; + sal_uInt16 mnAntialiasing; LanguageType meTextLanguage; - mutable BOOL mbMap:1, + mutable sal_Bool mbMap:1, mbMapIsDefault:1, mbClipRegion:1, mbBackground:1, @@ -382,8 +385,8 @@ public: SAL_DLLPRIVATE sal_Int32 ImplGetDPIX() const { return mnDPIX; } SAL_DLLPRIVATE sal_Int32 ImplGetDPIY() const { return mnDPIY; } SAL_DLLPRIVATE int ImplGetGraphics() const; - SAL_DLLPRIVATE void ImplReleaseGraphics( BOOL bRelease = TRUE ); - SAL_DLLPRIVATE BOOL ImplHasMirroredGraphics(); + SAL_DLLPRIVATE void ImplReleaseGraphics( sal_Bool bRelease = sal_True ); + SAL_DLLPRIVATE sal_Bool ImplHasMirroredGraphics(); SAL_DLLPRIVATE void ImplReMirror( Point &rPoint ) const; SAL_DLLPRIVATE void ImplReMirror( Rectangle &rRect ) const; SAL_DLLPRIVATE void ImplReMirror( Region &rRegion ) const; @@ -397,7 +400,6 @@ public: SAL_DLLPRIVATE void ImplInitClipRegion(); SAL_DLLPRIVATE bool ImplSelectClipRegion( const Region&, SalGraphics* pGraphics = NULL ); SAL_DLLPRIVATE void ImplSetClipRegion( const Region* pRegion ); - SAL_DLLPRIVATE void ImplSetTriangleClipRegion( const PolyPolygon &rPolyPolygon ); SAL_DLLPRIVATE SalLayout* ImplLayout( const String&, xub_StrLen nIndex, xub_StrLen nLen, const Point& rLogicPos = Point(0,0), @@ -412,15 +414,15 @@ public: SAL_DLLPRIVATE long ImplGetTextWidth( const SalLayout& ) const; static SAL_DLLPRIVATE XubString ImplGetEllipsisString( const OutputDevice& rTargetDevice, const XubString& rStr, - long nMaxWidth, USHORT nStyle, const ::vcl::ITextLayout& _rLayout ); + long nMaxWidth, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ); static SAL_DLLPRIVATE void ImplDrawText( OutputDevice& rTargetDevice, const Rectangle& rRect, - const String& rOrigStr, USHORT nStyle, + const String& rOrigStr, sal_uInt16 nStyle, MetricVector* pVector, String* pDisplayText, ::vcl::ITextLayout& _rLayout ); SAL_DLLPRIVATE void ImplDrawTextBackground( const SalLayout& ); - SAL_DLLPRIVATE void ImplDrawTextLines( SalLayout&, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, BOOL bWordLine, BOOL bUnderlineAbove ); + SAL_DLLPRIVATE void ImplDrawTextLines( SalLayout&, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, sal_Bool bWordLine, sal_Bool bUnderlineAbove ); SAL_DLLPRIVATE bool ImplDrawRotateText( SalLayout& ); - SAL_DLLPRIVATE void ImplDrawTextDirect( SalLayout&, BOOL bTextLines ); + SAL_DLLPRIVATE void ImplDrawTextDirect( SalLayout&, sal_Bool bTextLines ); SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& ); SAL_DLLPRIVATE void ImplDrawText( SalLayout& ); SAL_DLLPRIVATE Rectangle ImplGetTextBoundRect( const SalLayout& ); @@ -431,16 +433,16 @@ public: SAL_DLLPRIVATE void ImplInitTextLineSize(); SAL_DLLPRIVATE void ImplInitAboveTextLineSize(); SAL_DLLPRIVATE void ImplDrawWaveLine( long nBaseX, long nBaseY, long nStartX, long nStartY, long nWidth, long nHeight, long nLineWidth, short nOrientation, const Color& rColor ); - SAL_DLLPRIVATE void ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, BOOL bIsAbove ); - SAL_DLLPRIVATE void ImplDrawStraightTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, BOOL bIsAbove ); + SAL_DLLPRIVATE void ImplDrawWaveTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, sal_Bool bIsAbove ); + SAL_DLLPRIVATE void ImplDrawStraightTextLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontUnderline eTextLine, Color aColor, sal_Bool bIsAbove ); SAL_DLLPRIVATE void ImplDrawStrikeoutLine( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor ); SAL_DLLPRIVATE void ImplDrawStrikeoutChar( long nBaseX, long nBaseY, long nX, long nY, long nWidth, FontStrikeout eStrikeout, Color aColor ); - SAL_DLLPRIVATE void ImplDrawTextLine( long nBaseX, long nX, long nY, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, BOOL bUnderlineAbove ); + SAL_DLLPRIVATE void ImplDrawTextLine( long nBaseX, long nX, long nY, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, sal_Bool bUnderlineAbove ); SAL_DLLPRIVATE void ImplDrawMnemonicLine( long nX, long nY, long nWidth ); - SAL_DLLPRIVATE void ImplGetEmphasisMark( PolyPolygon& rPolyPoly, BOOL& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight, short nOrient ); - SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const PolyPolygon& rPolyPoly, BOOL bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); + SAL_DLLPRIVATE void ImplGetEmphasisMark( PolyPolygon& rPolyPoly, sal_Bool& rPolyLine, Rectangle& rRect1, Rectangle& rRect2, long& rYOff, long& rWidth, FontEmphasisMark eEmphasis, long nHeight, short nOrient ); + SAL_DLLPRIVATE void ImplDrawEmphasisMark( long nBaseX, long nX, long nY, const PolyPolygon& rPolyPoly, sal_Bool bPolyLine, const Rectangle& rRect1, const Rectangle& rRect2 ); static - SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const XubString& rStr, USHORT nStyle, const ::vcl::ITextLayout& _rLayout ); + SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const XubString& rStr, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout ); SAL_DLLPRIVATE void ImplInitFontList() const; SAL_DLLPRIVATE void ImplUpdateFontData( bool bNewFontLists ); SAL_DLLPRIVATE static void ImplUpdateAllFontData( bool bNewFontLists ); @@ -470,13 +472,13 @@ public: SAL_DLLPRIVATE void ImplDrawPolygon( const Polygon& rPoly, const PolyPolygon* pClipPolyPoly = NULL ); SAL_DLLPRIVATE void ImplDrawPolyPolygon( const PolyPolygon& rPolyPoly, const PolyPolygon* pClipPolyPoly = NULL ); - SAL_DLLPRIVATE void ImplDrawPolyPolygon( USHORT nPoly, const PolyPolygon& rPolyPoly ); - SAL_DLLPRIVATE void ImplDrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, BOOL bMtf, const PolyPolygon* pClipPolyPoly ); - SAL_DLLPRIVATE void ImplDrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, BOOL bMtf, const PolyPolygon* pClipPolyPoly ); + SAL_DLLPRIVATE void ImplDrawPolyPolygon( sal_uInt16 nPoly, const PolyPolygon& rPolyPoly ); + SAL_DLLPRIVATE void ImplDrawLinearGradient( const Rectangle& rRect, const Gradient& rGradient, sal_Bool bMtf, const PolyPolygon* pClipPolyPoly ); + SAL_DLLPRIVATE void ImplDrawComplexGradient( const Rectangle& rRect, const Gradient& rGradient, sal_Bool bMtf, const PolyPolygon* pClipPolyPoly ); - SAL_DLLPRIVATE void ImplDrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, BOOL bMtf ); - SAL_DLLPRIVATE void ImplCalcHatchValues( const Rectangle& rRect, long nDist, USHORT nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 ); - SAL_DLLPRIVATE void ImplDrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly, Point* pPtBuffer, BOOL bMtf ); + SAL_DLLPRIVATE void ImplDrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch, sal_Bool bMtf ); + SAL_DLLPRIVATE void ImplCalcHatchValues( const Rectangle& rRect, long nDist, sal_uInt16 nAngle10, Point& rPt1, Point& rPt2, Size& rInc, Point& rEndPt1 ); + SAL_DLLPRIVATE void ImplDrawHatchLine( const Line& rLine, const PolyPolygon& rPolyPoly, Point* pPtBuffer, sal_Bool bMtf ); SAL_DLLPRIVATE void ImplDrawWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); SAL_DLLPRIVATE void ImplDrawColorWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); @@ -487,14 +489,14 @@ public: SAL_DLLPRIVATE void ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void* pPosAry ); SAL_DLLPRIVATE void ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, - const Bitmap& rBitmap, const ULONG nAction ); + const Bitmap& rBitmap, const sal_uLong nAction ); SAL_DLLPRIVATE void ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, - const BitmapEx& rBitmapEx, const ULONG nAction ); + const BitmapEx& rBitmapEx, const sal_uLong nAction ); SAL_DLLPRIVATE void ImplDrawMask( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, const Bitmap& rBitmap, const Color& rMaskColor, - const ULONG nAction ); + const sal_uLong nAction ); SAL_DLLPRIVATE void ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha, const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel ); @@ -534,14 +536,14 @@ public: SAL_DLLPRIVATE void ImplGetFrameBitmap( const Point& rPt, const Size& rSize, Bitmap& rBitmap ) const; - SAL_DLLPRIVATE BOOL ImplIsRecordLayout() const; + SAL_DLLPRIVATE sal_Bool ImplIsRecordLayout() const; void ImplAddDevFontSubstitute( const XubString& rFontName, const XubString& rReplaceFontName, - USHORT nFlags = 0 ); + sal_uInt16 nFlags = 0 ); SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const Font& rFont ); - SAL_DLLPRIVATE static BOOL ImplIsUnderlineAbove( const Font& ); + SAL_DLLPRIVATE static sal_Bool ImplIsUnderlineAbove( const Font& ); // tells whether this output device is RTL in an LTR UI or LTR in a RTL UI SAL_DLLPRIVATE bool ImplIsAntiparallel() const ; @@ -591,8 +593,8 @@ public: FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, - BOOL bUnderlineAbove = FALSE ); - static BOOL IsTextUnderlineAbove( const Font& rFont ); + sal_Bool bUnderlineAbove = sal_False ); + static sal_Bool IsTextUnderlineAbove( const Font& rFont ); void DrawText( const Point& rStartPt, const XubString& rStr, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, @@ -610,15 +612,15 @@ public: bool GetCaretPositions( const XubString&, sal_Int32* pCaretXArray, xub_StrLen nIndex, xub_StrLen nLen, sal_Int32* pDXAry = NULL, long nWidth = 0, - BOOL bCellBreaking = TRUE ) const; - void DrawStretchText( const Point& rStartPt, ULONG nWidth, + sal_Bool bCellBreaking = sal_True ) const; + void DrawStretchText( const Point& rStartPt, sal_uLong nWidth, const XubString& rStr, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN ); xub_StrLen GetTextBreak( const XubString& rStr, long nTextWidth, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, - long nCharExtra = 0, BOOL bCellBreaking = TRUE ) const; + long nCharExtra = 0, sal_Bool bCellBreaking = sal_True ) const; xub_StrLen GetTextBreak( const XubString& rStr, long nTextWidth, - USHORT nExtraChar, xub_StrLen& rExtraCharPos, + sal_uInt16 nExtraChar, xub_StrLen& rExtraCharPos, xub_StrLen nIndex, xub_StrLen nLen, long nCharExtra = 0 ) const; /** Generate MetaTextActions for the text rect @@ -631,47 +633,47 @@ public: */ void AddTextRectActions( const Rectangle& rRect, const String& rOrigStr, - USHORT nStyle, + sal_uInt16 nStyle, GDIMetaFile& rMtf ); void DrawText( const Rectangle& rRect, - const XubString& rStr, USHORT nStyle = 0, + const XubString& rStr, sal_uInt16 nStyle = 0, MetricVector* pVector = NULL, String* pDisplayText = NULL, ::vcl::ITextLayout* _pTextLayout = NULL ); Rectangle GetTextRect( const Rectangle& rRect, - const XubString& rStr, USHORT nStyle = TEXT_DRAW_WORDBREAK, + const XubString& rStr, sal_uInt16 nStyle = TEXT_DRAW_WORDBREAK, TextRectInfo* pInfo = NULL, const ::vcl::ITextLayout* _pTextLayout = NULL ) const; XubString GetEllipsisString( const XubString& rStr, long nMaxWidth, - USHORT nStyle = TEXT_DRAW_ENDELLIPSIS ) const; + sal_uInt16 nStyle = TEXT_DRAW_ENDELLIPSIS ) const; void DrawCtrlText( const Point& rPos, const XubString& rStr, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, - USHORT nStyle = TEXT_DRAW_MNEMONIC, MetricVector* pVector = NULL, String* pDisplayText = NULL ); + sal_uInt16 nStyle = TEXT_DRAW_MNEMONIC, MetricVector* pVector = NULL, String* pDisplayText = NULL ); long GetCtrlTextWidth( const XubString& rStr, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, - USHORT nStyle = TEXT_DRAW_MNEMONIC ) const; + sal_uInt16 nStyle = TEXT_DRAW_MNEMONIC ) const; static XubString GetNonMnemonicString( const XubString& rStr, xub_StrLen& rMnemonicPos ); static XubString GetNonMnemonicString( const XubString& rStr ) { xub_StrLen nDummy; return GetNonMnemonicString( rStr, nDummy ); } - ULONG GetKerningPairCount() const; - void GetKerningPairs( ULONG nPairs, KerningPair* pKernPairs ) const; + sal_uLong GetKerningPairCount() const; + void GetKerningPairs( sal_uLong nPairs, KerningPair* pKernPairs ) const; - BOOL GetTextBoundRect( Rectangle& rRect, + sal_Bool GetTextBoundRect( Rectangle& rRect, const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN, - ULONG nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; - BOOL GetTextOutline( PolyPolygon&, + sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; + sal_Bool GetTextOutline( PolyPolygon&, const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0, - xub_StrLen nLen = STRING_LEN, BOOL bOptimize = TRUE, - ULONG nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; - BOOL GetTextOutlines( PolyPolyVector&, + xub_StrLen nLen = STRING_LEN, sal_Bool bOptimize = sal_True, + sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; + sal_Bool GetTextOutlines( PolyPolyVector&, const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0, - xub_StrLen nLen = STRING_LEN, BOOL bOptimize = TRUE, - ULONG nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; - BOOL GetTextOutlines( ::basegfx::B2DPolyPolygonVector&, + xub_StrLen nLen = STRING_LEN, sal_Bool bOptimize = sal_True, + sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; + sal_Bool GetTextOutlines( ::basegfx::B2DPolyPolygonVector&, const String& rStr, xub_StrLen nBase = 0, xub_StrLen nIndex = 0, - xub_StrLen nLen = STRING_LEN, BOOL bOptimize = TRUE, - ULONG nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; - BOOL GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, + xub_StrLen nLen = STRING_LEN, sal_Bool bOptimize = sal_True, + sal_uLong nLayoutWidth = 0, const sal_Int32* pDXArray = NULL ) const; + sal_Bool GetGlyphBoundRects( const Point& rOrigin, const String& rStr, int nIndex, int nLen, int nBase, MetricVector& rVector ); void DrawPixel( const Point& rPt ); @@ -735,7 +737,7 @@ public: void DrawRect( const Rectangle& rRect ); void DrawRect( const Rectangle& rRect, - ULONG nHorzRount, ULONG nVertRound ); + sal_uLong nHorzRount, sal_uLong nVertRound ); void DrawEllipse( const Rectangle& rRect ); void DrawArc( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); @@ -751,7 +753,7 @@ public: const OutputDevice& rOutDev ); void CopyArea( const Point& rDestPt, const Point& rSrcPt, const Size& rSrcSize, - USHORT nFlags = 0 ); + sal_uInt16 nFlags = 0 ); void DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap ); @@ -778,9 +780,9 @@ public: const Bitmap& rBitmap, const Color& rMaskColor ); void DrawImage( const Point& rPos, - const Image& rImage, USHORT nStyle = 0 ); + const Image& rImage, sal_uInt16 nStyle = 0 ); void DrawImage( const Point& rPos, const Size& rSize, - const Image& rImage, USHORT nStyle = 0 ); + const Image& rImage, sal_uInt16 nStyle = 0 ); void DrawGradient( const Rectangle& rRect, const Gradient& rGradient ); void DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); @@ -801,10 +803,10 @@ public: #endif void DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ); - void DrawWaveLine( const Point& rStartPos, const Point& rEndPos, USHORT nStyle ); - void DrawGrid( const Rectangle& rRect, const Size& rDist, ULONG nFlags ); + void DrawWaveLine( const Point& rStartPos, const Point& rEndPos, sal_uInt16 nStyle ); + void DrawGrid( const Rectangle& rRect, const Size& rDist, sal_uLong nFlags ); - void DrawTransparent( const PolyPolygon& rPolyPoly, USHORT nTransparencePercent ); + void DrawTransparent( const PolyPolygon& rPolyPoly, sal_uInt16 nTransparencePercent ); void DrawTransparent( const basegfx::B2DPolyPolygon& rB2DPolyPoly, double fTransparency); void DrawTransparent( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rTransparenceGradient ); @@ -817,41 +819,40 @@ public: */ BitmapEx GetBitmapEx( const Point& rSrcPt, const Size& rSize ) const; - void EnableMapMode( BOOL bEnable = TRUE ); - BOOL IsMapModeEnabled() const { return mbMap; } + void EnableMapMode( sal_Bool bEnable = sal_True ); + sal_Bool IsMapModeEnabled() const { return mbMap; } // Enabling/disabling RTL only makes sense for OutputDevices that use a mirroring SalGraphisLayout - void EnableRTL( BOOL bEnable = TRUE); - BOOL IsRTLEnabled() const { return mbEnableRTL; } + void EnableRTL( sal_Bool bEnable = sal_True); + sal_Bool IsRTLEnabled() const { return mbEnableRTL; } void SetConnectMetaFile( GDIMetaFile* pMtf ); GDIMetaFile* GetConnectMetaFile() const { return mpMetaFile; } - void EnableOutput( BOOL bEnable = TRUE ); - BOOL IsOutputEnabled() const { return mbOutput; } - BOOL IsDeviceOutput() const { return mbDevOutput; } - BOOL IsDeviceOutputNecessary() const { return (mbOutput && mbDevOutput); } - BOOL IsOutputNecessary() const { return ((mbOutput && mbDevOutput) || (mpMetaFile != NULL)); } + void EnableOutput( sal_Bool bEnable = sal_True ); + sal_Bool IsOutputEnabled() const { return mbOutput; } + sal_Bool IsDeviceOutput() const { return mbDevOutput; } + sal_Bool IsDeviceOutputNecessary() const { return (mbOutput && mbDevOutput); } + sal_Bool IsOutputNecessary() const { return ((mbOutput && mbDevOutput) || (mpMetaFile != NULL)); } void SetClipRegion(); void SetClipRegion( const Region& rRegion ); - void SetTriangleClipRegion( const PolyPolygon &rRegion ); Region GetClipRegion() const; - BOOL IsClipRegion() const { return mbClipRegion; } + sal_Bool IsClipRegion() const { return mbClipRegion; } Region GetActiveClipRegion() const; void MoveClipRegion( long nHorzMove, long nVertMove ); void IntersectClipRegion( const Rectangle& rRect ); void IntersectClipRegion( const Region& rRegion ); - void SetAntialiasing( USHORT nMode = 0 ); - USHORT GetAntialiasing() const { return mnAntialiasing; } + void SetAntialiasing( sal_uInt16 nMode = 0 ); + sal_uInt16 GetAntialiasing() const { return mnAntialiasing; } - void SetDrawMode( ULONG nDrawMode ); - ULONG GetDrawMode() const { return mnDrawMode; } + void SetDrawMode( sal_uLong nDrawMode ); + sal_uLong GetDrawMode() const { return mnDrawMode; } - void SetLayoutMode( ULONG nTextLayoutMode ); - ULONG GetLayoutMode() const { return mnTextLayoutMode; } + void SetLayoutMode( sal_uLong nTextLayoutMode ); + sal_uLong GetLayoutMode() const { return mnTextLayoutMode; } void SetDigitLanguage( LanguageType ); LanguageType GetDigitLanguage() const { return meTextLanguage; } @@ -872,18 +873,18 @@ public: void SetLineColor(); void SetLineColor( const Color& rColor ); const Color& GetLineColor() const { return maLineColor; } - BOOL IsLineColor() const { return mbLineColor; } + sal_Bool IsLineColor() const { return mbLineColor; } void SetFillColor(); void SetFillColor( const Color& rColor ); const Color& GetFillColor() const { return maFillColor; } - BOOL IsFillColor() const { return mbFillColor; } + sal_Bool IsFillColor() const { return mbFillColor; } void SetBackground(); void SetBackground( const Wallpaper& rBackground ); const Wallpaper& GetBackground() const { return maBackground; } - BOOL IsBackground() const { return mbBackground; } + sal_Bool IsBackground() const { return mbBackground; } void SetFont( const Font& rNewFont ); const Font& GetFont() const { return maFont; } @@ -899,15 +900,15 @@ public: void SetTextFillColor( const Color& rColor ); Color GetTextFillColor() const; - BOOL IsTextFillColor() const { return !maFont.IsTransparent(); } + sal_Bool IsTextFillColor() const { return !maFont.IsTransparent(); } void SetTextLineColor(); void SetTextLineColor( const Color& rColor ); const Color& GetTextLineColor() const { return maTextLineColor; } - BOOL IsTextLineColor() const { return (maTextLineColor.GetTransparency() == 0); } + sal_Bool IsTextLineColor() const { return (maTextLineColor.GetTransparency() == 0); } void SetOverlineColor(); void SetOverlineColor( const Color& rColor ); const Color& GetOverlineColor() const { return maOverlineColor; } - BOOL IsOverlineColor() const { return (maOverlineColor.GetTransparency() == 0); } + sal_Bool IsOverlineColor() const { return (maOverlineColor.GetTransparency() == 0); } void SetTextAlign( TextAlign eAlign ); TextAlign GetTextAlign() const { return maFont.GetAlign(); } @@ -921,12 +922,12 @@ public: virtual void SetMapMode( const MapMode& rNewMapMode ); virtual void SetRelativeMapMode( const MapMode& rNewMapMode ); const MapMode& GetMapMode() const { return maMapMode; } - BOOL IsMapMode() const { return mbMap; } + sal_Bool IsMapMode() const { return mbMap; } void SetRefPoint(); void SetRefPoint( const Point& rRefPoint ); const Point& GetRefPoint() const { return maRefPoint; } - BOOL IsRefPoint() const { return mbRefPoint; } + sal_Bool IsRefPoint() const { return mbRefPoint; } // #i75163# basegfx::B2DHomMatrix GetViewTransformation() const; @@ -1027,7 +1028,7 @@ public: const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const; long* LogicToLogic( long* pX, - USHORT nCount, + sal_uInt16 nCount, const MapMode* pMapModeSource, const MapMode* pMapModeDest ) const; static Point LogicToLogic( const Point& rPtSource, @@ -1063,16 +1064,16 @@ public: void Erase(); void Erase( const Rectangle& rRect ) { DrawWallpaper( rRect, GetBackground() ); } - BOOL AddTempDevFont( const String& rFileURL, const String& rFontName ); + sal_Bool AddTempDevFont( const String& rFileURL, const String& rFontName ); int GetDevFontCount() const; FontInfo GetDevFont( int nDevFontIndex ) const; int GetDevFontSizeCount( const Font& ) const; Size GetDevFontSize( const Font& rFont, int nSizeIndex ) const; - BOOL IsFontAvailable( const String& rFontName ) const; + sal_Bool IsFontAvailable( const String& rFontName ) const; FontMetric GetFontMetric() const; FontMetric GetFontMetric( const Font& rFont ) const; - BOOL GetFontCharMap( FontCharMap& rFontCharMap ) const; + sal_Bool GetFontCharMap( FontCharMap& rFontCharMap ) const; bool GetFontCapabilities( vcl::FontCapabilities& rFontCapabilities ) const; xub_StrLen HasGlyphs( const Font& rFont, const String& rStr, @@ -1091,9 +1092,9 @@ public: xub_StrLen* pKashidaPosDropped // invalid kashida positions (out) ) const; - USHORT GetBitCount() const; + sal_uInt16 GetBitCount() const; - BOOL GetTextIsRTL( const String&, xub_StrLen nIndex, + sal_Bool GetTextIsRTL( const String&, xub_StrLen nIndex, xub_StrLen nLen ) const; /** Query the existence and depth of the alpha channel @@ -1101,21 +1102,25 @@ public: @return 0, if no alpha channel available, and the bit depth of the alpha channel otherwise. */ - USHORT GetAlphaBitCount() const; - ULONG GetColorCount() const; + sal_uInt16 GetAlphaBitCount() const; + sal_uLong GetColorCount() const; - void Push( USHORT nFlags = PUSH_ALL ); + void Push( sal_uInt16 nFlags = PUSH_ALL ); void Pop(); + // returns the curren stack depth; that is the number of Push() calls minus the number of Pop() calls + // this should not normally be used since Push and Pop must always be used symmetrically + // however this may be e.g. a help when debugging code in which this somehow is not the case + sal_uInt32 GetGCStackDepth() const; /** Query availability of alpha channel - @return TRUE, if this device has an alpha channel. + @return sal_True, if this device has an alpha channel. */ - BOOL HasAlpha(); + sal_Bool HasAlpha(); /** Added return value to see if EPS could be painted directly. Theoreticaly, handing over a matrix would be needed to handle - painting rotated EPS files (e.g. contained mín Metafiles). This + painting rotated EPS files (e.g. contained in Metafiles). This would then need to be supported for Mac and PS printers, but that's too much for now, wrote #i107046# for this */ bool DrawEPS( const Point& rPt, const Size& rSz, @@ -1133,17 +1138,17 @@ public: static void EndFontSubstitution(); static void AddFontSubstitute( const XubString& rFontName, const XubString& rReplaceFontName, - USHORT nFlags = 0 ); - static void RemoveFontSubstitute( USHORT n ); - static USHORT GetFontSubstituteCount(); - static void GetFontSubstitute( USHORT n, + sal_uInt16 nFlags = 0 ); + static void RemoveFontSubstitute( sal_uInt16 n ); + static sal_uInt16 GetFontSubstituteCount(); + static void GetFontSubstitute( sal_uInt16 n, XubString& rFontName, XubString& rReplaceFontName, - USHORT& rFlags ); + sal_uInt16& rFlags ); - static Font GetDefaultFont( USHORT nType, + static Font GetDefaultFont( sal_uInt16 nType, LanguageType eLang, - ULONG nFlags, + sal_uLong nFlags, const OutputDevice* pOutDev = NULL ); /** helper method removing transparencies from a metafile (e.g. for printing) @@ -1187,17 +1192,17 @@ public: // These all just call through to the private mpGraphics functions of the same name. // Query the platform layer for control support - BOOL IsNativeControlSupported( ControlType nType, ControlPart nPart ); + sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); // Query the native control to determine if it was acted upon - BOOL HitTestNativeControl( ControlType nType, + sal_Bool HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, - BOOL& rIsInside ); + sal_Bool& rIsInside ); // Request rendering of a particular control and/or part - BOOL DrawNativeControl( ControlType nType, + sal_Bool DrawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -1205,7 +1210,7 @@ public: ::rtl::OUString aCaption ); // Request rendering of a caption string for a control - BOOL DrawNativeControlText( ControlType nType, + sal_Bool DrawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -1213,7 +1218,7 @@ public: ::rtl::OUString aCaption ); // Query the native control's actual drawing region (including adornment) - BOOL GetNativeControlRegion( ControlType nType, + sal_Bool GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/vcl/outfont.hxx index 17492c14a3be..faf2b00793f2 100644 --- a/vcl/inc/vcl/outfont.hxx +++ b/vcl/inc/vcl/outfont.hxx @@ -39,8 +39,6 @@ #include <boost/unordered_map.hpp> -#include <com/sun/star/linguistic2/XLinguServiceManager.hpp> - class ImplDevFontListData; class ImplGetDevFontList; class ImplGetDevSizeList; @@ -54,6 +52,8 @@ class ConvertChar; struct FontMatchStatus; class OutputDevice; +namespace com { namespace sun { namespace star { namespace lang { struct Locale; }}}} + // ---------------------- // - ImplFontAttributes - // ---------------------- @@ -116,7 +116,7 @@ public: // TODO: hide members behind accessor methods // TODO: make cloning cheaper // abstract base class for physical font faces -class VCL_DLLPUBLIC ImplFontData : public ImplDevFontAttributes +class VCL_PLUGIN_PUBLIC ImplFontData : public ImplDevFontAttributes { public: // by using an ImplFontData object as a factory for its corresponding @@ -140,7 +140,7 @@ public: virtual ImplFontData* Clone() const = 0; protected: - ImplFontData( const ImplDevFontAttributes&, int nMagic ); + explicit ImplFontData( const ImplDevFontAttributes&, int nMagic ); void SetBitmapSize( int nW, int nH ) { mnWidth=nW; mnHeight=nH; } long mnWidth; // Width (in pixels) @@ -185,7 +185,7 @@ public: // TODO: change to private // TODO: merge with ImplFontCache // TODO: rename to LogicalFontManager -class VCL_DLLPUBLIC ImplDevFontList +class VCL_PLUGIN_PUBLIC ImplDevFontList { private: friend class WinGlyphFallbackSubstititution; @@ -199,8 +199,8 @@ private: ImplGlyphFallbackFontSubstitution* mpFallbackHook; // device specific glyh fallback substitution public: - ImplDevFontList(); - ~ImplDevFontList(); + explicit ImplDevFontList(); + virtual ~ImplDevFontList(); // fill the list with device fonts void Add( ImplFontData* ); @@ -226,7 +226,7 @@ public: ImplGetDevSizeList* GetDevSizeList( const String& rFontName ) const; //used by 2-level font fallback - ImplDevFontListData* ImplFindByLocale(com::sun::star::lang::Locale lc) const; + ImplDevFontListData* ImplFindByLocale( com::sun::star::lang::Locale& ) const; protected: void InitMatchData() const; @@ -235,7 +235,7 @@ protected: ImplDevFontListData* ImplFindByTokenNames( const String& ) const; ImplDevFontListData* ImplFindByAliasName( const String& rSearchName, const String& rShortName ) const; ImplDevFontListData* ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const; - ImplDevFontListData* ImplFindByAttributes( ULONG nSearchType, FontWeight, FontWidth, + ImplDevFontListData* ImplFindByAttributes( sal_uLong nSearchType, FontWeight, FontWidth, FontFamily, FontItalic, const String& rSearchFamily ) const; ImplDevFontListData* FindDefaultFont() const; @@ -254,8 +254,8 @@ private: struct ImplKernPairData { - USHORT mnChar1; - USHORT mnChar2; + sal_uInt16 mnChar1; + sal_uInt16 mnChar2; long mnKern; }; @@ -267,7 +267,7 @@ struct ImplKernPairData class ImplFontMetricData : public ImplFontAttributes { public: - ImplFontMetricData( const ImplFontSelectData& ); + explicit ImplFontMetricData( const ImplFontSelectData& ); void ImplInitTextLineSize( const OutputDevice* pDev ); void ImplInitAboveTextLineSize(); @@ -324,10 +324,10 @@ public: // TODO: hide members behind accessor methods // TODO: rename ImplFontEntry to LogicalFontInstance // TODO: allow sharing of metrics for related fonts -class VCL_DLLPUBLIC ImplFontEntry +class VCL_PLUGIN_PUBLIC ImplFontEntry { public: - ImplFontEntry( const ImplFontSelectData& ); + explicit ImplFontEntry( const ImplFontSelectData& ); virtual ~ImplFontEntry(); public: // TODO: make data members private @@ -335,8 +335,8 @@ public: // TODO: make data members private ImplFontMetricData maMetric; // Font Metric const ConvertChar* mpConversion; // used e.g. for StarBats->StarSymbol long mnLineHeight; - ULONG mnRefCount; - USHORT mnSetFontFlags; // Flags returned by SalGraphics::SetFont() + sal_uLong mnRefCount; + sal_uInt16 mnSetFontFlags; // Flags returned by SalGraphics::SetFont() short mnOwnOrientation; // text angle if lower layers don't rotate text themselves short mnOrientation; // text angle in 3600 system bool mbInit; // true if maMetric member is valid @@ -393,7 +393,7 @@ public: void AddLine( ImplTextLineInfo* pLine ); void Clear(); - ImplTextLineInfo* GetLine( USHORT nLine ) const + ImplTextLineInfo* GetLine( sal_uInt16 nLine ) const { return mpLines[nLine]; } xub_StrLen Count() const { return mnLines; } diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx index 804e8c03287e..f4b8039fc9e8 100644 --- a/vcl/inc/vcl/pdfextoutdevdata.hxx +++ b/vcl/inc/vcl/pdfextoutdevdata.hxx @@ -171,7 +171,7 @@ public : rOutputRect, e.g. for cropped graphics. */ void EndGroup( const Graphic& rGraphic, - BYTE nTransparency, + sal_uInt8 nTransparency, const Rectangle& rOutputRect, const Rectangle& rVisibleOutputRect ); //--->i56629 diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx index f87ef312c8de..b1f76046678d 100644 --- a/vcl/inc/vcl/pdfwriter.hxx +++ b/vcl/inc/vcl/pdfwriter.hxx @@ -39,7 +39,8 @@ #include <vcl/font.hxx> #include <vcl/graphictools.hxx> -#include <com/sun/star/io/XOutputStream.hpp> +#include "com/sun/star/io/XOutputStream.hpp" +#include "com/sun/star/beans/XMaterialHolder.hpp" #include <list> #include <vector> @@ -48,6 +49,7 @@ class Font; class Point; class OutputDevice; +class GDIMetaFile; class MapMode; class Polygon; class LineInfo; @@ -62,15 +64,7 @@ class Wallpaper; namespace vcl { -struct PDFDocInfo -{ - String Title; // document title - String Author; // document author - String Subject; // subject - String Keywords; // keywords - String Creator; // application that created the original document - String Producer; // OpenOffice -}; +class PDFExtOutDevData; struct PDFNote { @@ -236,7 +230,7 @@ public: rtl::OUString Name; // a distinct name to identify the control rtl::OUString Description;// descriptive text for the contro (e.g. for tool tip) rtl::OUString Text; // user text to appear on the control - USHORT TextStyle; // style flags + sal_uInt16 TextStyle; // style flags bool ReadOnly; Rectangle Location; // describes the area filled by the control bool Border; // true: widget should have a border, false: no border @@ -469,7 +463,7 @@ public: FitVisible, ActionZoom }; -// These emuns are treated as integer while reading/writing to configuration +// These enums are treated as integer while reading/writing to configuration enum PDFPageLayout { DefaultLayout, @@ -490,20 +484,35 @@ public: /* The following structure describes the permissions used in PDF security */ - struct PDFSecPermissions + struct PDFEncryptionProperties { -//for both 40 and 128 bit security, see 3.5.2 PDF v 1.4 table 3.15, v 1.5 and v 1.6 table 3.20. - bool CanPrintTheDocument; + + bool Security128bit; // true to select 128 bit encryption, false for 40 bit + //for both 40 and 128 bit security, see 3.5.2 PDF v 1.4 table 3.15, v 1.5 and v 1.6 table 3.20. + bool CanPrintTheDocument; bool CanModifyTheContent; bool CanCopyOrExtract; bool CanAddOrModify; -//for revision 3 (bit 128 security) only + //for revision 3 (bit 128 security) only bool CanFillInteractive; bool CanExtractForAccessibility; bool CanAssemble; bool CanPrintFull; -//permission default set for 128 bit, accessibility only - PDFSecPermissions() : + + // encryption will only happen if EncryptionKey is not empty + // EncryptionKey is actually a construct out of OValue, UValue and DocumentIdentifier + // if these do not match, behavior is undefined, most likely an invalid PDF will be produced + // OValue, UValue, EncryptionKey and DocumentIdentifier can be computed from + // PDFDocInfo, Owner password and User password used the InitEncryption method which + // implements the algorithms described in the PDF reference chapter 3.5: Encryption + std::vector<sal_uInt8> OValue; + std::vector<sal_uInt8> UValue; + std::vector<sal_uInt8> EncryptionKey; + std::vector<sal_uInt8> DocumentIdentifier; + + //permission default set for 128 bit, accessibility only + PDFEncryptionProperties() : + Security128bit ( true ), CanPrintTheDocument ( false ), CanModifyTheContent ( false ), CanCopyOrExtract ( false ), @@ -513,6 +522,25 @@ The following structure describes the permissions used in PDF security CanAssemble ( false ), CanPrintFull ( false ) {} + + + bool Encrypt() const + { return ! OValue.empty() && ! UValue.empty() && ! DocumentIdentifier.empty(); } + }; + + struct PDFDocInfo + { + String Title; // document title + String Author; // document author + String Subject; // subject + String Keywords; // keywords + String Creator; // application that created the original document + String Producer; // OpenOffice + }; + + enum ColorMode + { + DrawColor, DrawGreyscale }; struct PDFWriterContext @@ -571,14 +599,13 @@ The following structure describes the permissions used in PDF security sal_Int32 InitialPage; sal_Int32 OpenBookmarkLevels; // -1 means all levels - struct PDFSecPermissions AccessPermissions; - - bool Encrypt; // main encryption flag, must be true to encript - bool Security128bit; // true to select 128 bit encryption, false for 40 bit - rtl::OUString OwnerPassword; // owner password for PDF, in clear text - rtl::OUString UserPassword; // user password for PDF, in clear text + PDFWriter::PDFEncryptionProperties Encryption; + PDFWriter::PDFDocInfo DocumentInfo; com::sun::star::lang::Locale DocumentLocale; // defines the document default language + sal_uInt32 DPIx, DPIy; // how to handle MapMode( MAP_PIXEL ) + // 0 here specifies a default handling + PDFWriter::ColorMode ColorMode; PDFWriterContext() : RelFsys( false ), //i56629, i49415?, i64585? @@ -605,13 +632,14 @@ The following structure describes the permissions used in PDF security FirstPageLeft( false ), InitialPage( 1 ), OpenBookmarkLevels( -1 ), - AccessPermissions( ), - Encrypt( false ), - Security128bit( true ) + Encryption(), + DPIx( 0 ), + DPIy( 0 ), + ColorMode( PDFWriter::DrawColor ) {} }; - PDFWriter( const PDFWriterContext& rContext ); + PDFWriter( const PDFWriterContext& rContext, const com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder >& ); ~PDFWriter(); /** Returns an OutputDevice for formatting @@ -636,17 +664,24 @@ The following structure describes the permissions used in PDF security returns the page id of the new page */ sal_Int32 NewPage( sal_Int32 nPageWidth = 0, sal_Int32 nPageHeight = 0, Orientation eOrientation = Inherit ); + /** Play a metafile like an outputdevice would do + */ + struct PlayMetafileContext + { + int m_nMaxImageResolution; + bool m_bOnlyLosslessCompression; + int m_nJPEGQuality; + bool m_bTransparenciesWereRemoved; + + PlayMetafileContext() + : m_nMaxImageResolution( 0 ) + , m_bOnlyLosslessCompression( false ) + , m_nJPEGQuality( 90 ) + , m_bTransparenciesWereRemoved( false ) + {} - /* - * set document info; due to the use of document information in building the PDF document ID, must be called before - * emitting anything. - */ - void SetDocInfo( const PDFDocInfo& rInfo ); - - /* - * get currently set document info - */ - const PDFDocInfo& GetDocInfo() const; + }; + void PlayMetafile( const GDIMetaFile&, const PlayMetafileContext&, vcl::PDFExtOutDevData* pDevDat = NULL ); /* sets the document locale originally passed with the context to a new value * only affects the output if used before calling <code>Emit/code>. @@ -665,9 +700,15 @@ The following structure describes the permissions used in PDF security PDFVersion GetVersion() const; + static com::sun::star::uno::Reference< com::sun::star::beans::XMaterialHolder > + InitEncryption( const rtl::OUString& i_rOwnerPassword, + const rtl::OUString& i_rUserPassword, + bool b128Bit + ); + /* functions for graphics state */ /* flag values: see vcl/outdev.hxx */ - void Push( USHORT nFlags = 0xffff ); + void Push( sal_uInt16 nFlags = 0xffff ); void Pop(); void SetClipRegion(); @@ -676,9 +717,9 @@ The following structure describes the permissions used in PDF security void IntersectClipRegion( const Rectangle& rRect ); void IntersectClipRegion( const basegfx::B2DPolyPolygon& rRegion ); - void SetAntialiasing( USHORT nMode = 0 ); + void SetAntialiasing( sal_uInt16 nMode = 0 ); - void SetLayoutMode( ULONG nMode ); + void SetLayoutMode( sal_uLong nMode ); void SetDigitLanguage( LanguageType eLang ); void SetLineColor( const Color& rColor ); @@ -709,16 +750,16 @@ The following structure describes the permissions used in PDF security FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, - BOOL bUnderlineAbove = FALSE ); + sal_Bool bUnderlineAbove = sal_False ); void DrawTextArray( const Point& rStartPt, const XubString& rStr, const sal_Int32* pDXAry = NULL, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN ); - void DrawStretchText( const Point& rStartPt, ULONG nWidth, + void DrawStretchText( const Point& rStartPt, sal_uLong nWidth, const XubString& rStr, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN ); void DrawText( const Rectangle& rRect, - const XubString& rStr, USHORT nStyle = 0 ); + const XubString& rStr, sal_uInt16 nStyle = 0 ); void DrawPixel( const Point& rPt, const Color& rColor ); void DrawPixel( const Point& rPt ) @@ -738,7 +779,7 @@ The following structure describes the permissions used in PDF security void DrawPolyPolygon( const PolyPolygon& rPolyPoly ); void DrawRect( const Rectangle& rRect ); void DrawRect( const Rectangle& rRect, - ULONG nHorzRount, ULONG nVertRound ); + sal_uLong nHorzRount, sal_uLong nVertRound ); void DrawEllipse( const Rectangle& rRect ); void DrawArc( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); @@ -778,7 +819,7 @@ The following structure describes the permissions used in PDF security void DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ); void DrawTransparent( const PolyPolygon& rPolyPoly, - USHORT nTransparencePercent ); + sal_uInt16 nTransparencePercent ); /** Start a transparency group @@ -811,7 +852,7 @@ The following structure describes the permissions used in PDF security @param nTransparencePercent The transparency factor */ - void EndTransparencyGroup( const Rectangle& rBoundRect, USHORT nTransparencePercent ); + void EndTransparencyGroup( const Rectangle& rBoundRect, sal_uInt16 nTransparencePercent ); /** End a transparency group with an alpha mask diff --git a/vcl/inc/vcl/pointr.hxx b/vcl/inc/vcl/pointr.hxx index f003300b1f56..d5d2a49b33f0 100644 --- a/vcl/inc/vcl/pointr.hxx +++ b/vcl/inc/vcl/pointr.hxx @@ -51,9 +51,9 @@ public: PointerStyle GetStyle() const { return meStyle; } - BOOL operator==( const Pointer& rPointer ) const + sal_Bool operator==( const Pointer& rPointer ) const { return (meStyle == rPointer.meStyle); } - BOOL operator!=( const Pointer& rPointer ) const + sal_Bool operator!=( const Pointer& rPointer ) const { return !(Pointer::operator==( rPointer )); } }; diff --git a/vcl/inc/vcl/polyscan.hxx b/vcl/inc/vcl/polyscan.hxx index a8d9b6a31b5a..da91477f6a67 100644 --- a/vcl/inc/vcl/polyscan.hxx +++ b/vcl/inc/vcl/polyscan.hxx @@ -90,26 +90,26 @@ public: void Set( long nStart, long nEnd ); void Set( const PolyScanSegment& rSegment ) { Set( rSegment.mnStart, rSegment.mnEnd ); } - inline BOOL GetFirstX( long& rX ); - inline BOOL GetNextX( long& rX ); + inline sal_Bool GetFirstX( long& rX ); + inline sal_Bool GetNextX( long& rX ); - BOOL GetFirstSegment( PolyScanSegment& rSegment ); - BOOL GetNextSegment( PolyScanSegment& rSegment ); + sal_Bool GetFirstSegment( PolyScanSegment& rSegment ); + sal_Bool GetNextSegment( PolyScanSegment& rSegment ); }; // ------------------------------------------------------------------------ -inline BOOL PolyScanline::GetFirstX( long& rX ) +inline sal_Bool PolyScanline::GetFirstX( long& rX ) { mpAct = mpFirst; - return( mpAct ? ( rX = mpAct->mnX, mpAct = mpAct->mpNext, TRUE ) : FALSE ); + return( mpAct ? ( rX = mpAct->mnX, mpAct = mpAct->mpNext, sal_True ) : sal_False ); } // ------------------------------------------------------------------------ -inline BOOL PolyScanline::GetNextX( long& rX ) +inline sal_Bool PolyScanline::GetNextX( long& rX ) { - return( mpAct ? ( rX = mpAct->mnX, mpAct = mpAct->mpNext, TRUE ) : FALSE ); + return( mpAct ? ( rX = mpAct->mnX, mpAct = mpAct->mpNext, sal_True ) : sal_False ); } // --------------- @@ -149,8 +149,8 @@ public: Rectangle GetBoundRect() const { return Rectangle( mnLeft, mnTop, mnRight, mnBottom ); } - ULONG Count() const { return Height(); } - PolyScanline* operator[]( ULONG nPos ) const; + sal_uLong Count() const { return Height(); } + PolyScanline* operator[]( sal_uLong nPos ) const; }; #endif // _SV_POLYSCAN_HXX diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx index e5ebf05c9415..846835e22d3b 100644 --- a/vcl/inc/vcl/ppdparser.hxx +++ b/vcl/inc/vcl/ppdparser.hxx @@ -154,7 +154,7 @@ private: // some basic attributes bool m_bColorDevice; bool m_bType42Capable; - ULONG m_nLanguageLevel; + sal_uLong m_nLanguageLevel; rtl_TextEncoding m_aFileEncoding; @@ -216,7 +216,7 @@ public: bool isColorDevice() const { return m_bColorDevice; } bool isType42Capable() const { return m_bType42Capable; } - ULONG getLanguageLevel() const { return m_nLanguageLevel; } + sal_uLong getLanguageLevel() const { return m_nLanguageLevel; } String getDefaultPaperDimension() const; void getDefaultPaperDimension( int& rWidth, int& rHeight ) const @@ -324,8 +324,8 @@ public: void getUnconstrainedValues( const PPDKey*, ::std::list< const PPDValue* >& rValues ); // for printer setup - void* getStreamableBuffer( ULONG& rBytes ) const; - void rebuildFromStreamBuffer( void* pBuffer, ULONG nBytes ); + void* getStreamableBuffer( sal_uLong& rBytes ) const; + void rebuildFromStreamBuffer( void* pBuffer, sal_uLong nBytes ); // convenience int getRenderResolution() const; diff --git a/vcl/inc/vcl/print.h b/vcl/inc/vcl/print.h index 4fe4722714c4..db236f2a0f17 100644 --- a/vcl/inc/vcl/print.h +++ b/vcl/inc/vcl/print.h @@ -56,7 +56,7 @@ struct ImplPrnQueueData // - ImplPrnQueueList - // -------------------- -class VCL_DLLPUBLIC ImplPrnQueueList +class VCL_PLUGIN_PUBLIC ImplPrnQueueList { public: boost::unordered_map< rtl::OUString, sal_Int32, rtl::OUStringHash > diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx index 8214f3425848..182258aeb3c1 100644 --- a/vcl/inc/vcl/print.hxx +++ b/vcl/inc/vcl/print.hxx @@ -77,18 +77,18 @@ class VCL_DLLPUBLIC PrinterPage { GDIMetaFile* mpMtf; JobSetup maJobSetup; - UINT16 mbNewJobSetup; + sal_uInt16 mbNewJobSetup; public: PrinterPage() : mpMtf( new GDIMetaFile() ) {} - PrinterPage( GDIMetaFile* pMtf, BOOL bNewJobSetup, const JobSetup& rSetup ) : + PrinterPage( GDIMetaFile* pMtf, sal_Bool bNewJobSetup, const JobSetup& rSetup ) : mpMtf( pMtf ), maJobSetup( rSetup ), mbNewJobSetup( bNewJobSetup ) {} ~PrinterPage() { delete mpMtf; } GDIMetaFile* GetGDIMetaFile() const { return mpMtf; } const JobSetup& GetJobSetup() const { return maJobSetup; } - BOOL IsNewJobSetup() const { return (mbNewJobSetup != 0); } + sal_Bool IsNewJobSetup() const { return (mbNewJobSetup != 0); } friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const PrinterPage& rPage ) { rOStm << rPage.mbNewJobSetup; rOStm << rPage.maJobSetup; rPage.mpMtf->Write( rOStm ); return rOStm; } @@ -164,51 +164,56 @@ class VCL_DLLPUBLIC PrinterOptions { private: - BOOL mbReduceTransparency; + sal_Bool mbReduceTransparency; PrinterTransparencyMode meReducedTransparencyMode; - BOOL mbReduceGradients; + sal_Bool mbReduceGradients; PrinterGradientMode meReducedGradientsMode; - USHORT mnReducedGradientStepCount; - BOOL mbReduceBitmaps; + sal_uInt16 mnReducedGradientStepCount; + sal_Bool mbReduceBitmaps; PrinterBitmapMode meReducedBitmapMode; - USHORT mnReducedBitmapResolution; - BOOL mbReducedBitmapsIncludeTransparency; - BOOL mbConvertToGreyscales; + sal_uInt16 mnReducedBitmapResolution; + sal_Bool mbReducedBitmapsIncludeTransparency; + sal_Bool mbConvertToGreyscales; public: PrinterOptions(); ~PrinterOptions(); - BOOL IsReduceTransparency() const { return mbReduceTransparency; } - void SetReduceTransparency( BOOL bSet ) { mbReduceTransparency = bSet; } + sal_Bool IsReduceTransparency() const { return mbReduceTransparency; } + void SetReduceTransparency( sal_Bool bSet ) { mbReduceTransparency = bSet; } PrinterTransparencyMode GetReducedTransparencyMode() const { return meReducedTransparencyMode; } void SetReducedTransparencyMode( PrinterTransparencyMode eMode ) { meReducedTransparencyMode = eMode; } - BOOL IsReduceGradients() const { return mbReduceGradients; } - void SetReduceGradients( BOOL bSet ) { mbReduceGradients = bSet; } + sal_Bool IsReduceGradients() const { return mbReduceGradients; } + void SetReduceGradients( sal_Bool bSet ) { mbReduceGradients = bSet; } PrinterGradientMode GetReducedGradientMode() const { return meReducedGradientsMode; } void SetReducedGradientMode( PrinterGradientMode eMode ) { meReducedGradientsMode = eMode; } - USHORT GetReducedGradientStepCount() const { return mnReducedGradientStepCount; } - void SetReducedGradientStepCount( USHORT nStepCount ) { mnReducedGradientStepCount = nStepCount; } + sal_uInt16 GetReducedGradientStepCount() const { return mnReducedGradientStepCount; } + void SetReducedGradientStepCount( sal_uInt16 nStepCount ) { mnReducedGradientStepCount = nStepCount; } - BOOL IsReduceBitmaps() const { return mbReduceBitmaps; } - void SetReduceBitmaps( BOOL bSet ) { mbReduceBitmaps = bSet; } + sal_Bool IsReduceBitmaps() const { return mbReduceBitmaps; } + void SetReduceBitmaps( sal_Bool bSet ) { mbReduceBitmaps = bSet; } PrinterBitmapMode GetReducedBitmapMode() const { return meReducedBitmapMode; } void SetReducedBitmapMode( PrinterBitmapMode eMode ) { meReducedBitmapMode = eMode; } - USHORT GetReducedBitmapResolution() const { return mnReducedBitmapResolution; } - void SetReducedBitmapResolution( USHORT nResolution ) { mnReducedBitmapResolution = nResolution; } + sal_uInt16 GetReducedBitmapResolution() const { return mnReducedBitmapResolution; } + void SetReducedBitmapResolution( sal_uInt16 nResolution ) { mnReducedBitmapResolution = nResolution; } - BOOL IsReducedBitmapIncludesTransparency() const { return mbReducedBitmapsIncludeTransparency; } - void SetReducedBitmapIncludesTransparency( BOOL bSet ) { mbReducedBitmapsIncludeTransparency = bSet; } + sal_Bool IsReducedBitmapIncludesTransparency() const { return mbReducedBitmapsIncludeTransparency; } + void SetReducedBitmapIncludesTransparency( sal_Bool bSet ) { mbReducedBitmapsIncludeTransparency = bSet; } - BOOL IsConvertToGreyscales() const { return mbConvertToGreyscales; } - void SetConvertToGreyscales( BOOL bSet ) { mbConvertToGreyscales = bSet; } + sal_Bool IsConvertToGreyscales() const { return mbConvertToGreyscales; } + void SetConvertToGreyscales( sal_Bool bSet ) { mbConvertToGreyscales = bSet; } + + // read printer options from configuration, parameter decides whether the set for + // print "to printer" or "to file" should be read. + // returns true if config was read, false if an error occured + bool ReadFromConfig( bool bFile ); }; // ----------- @@ -235,21 +240,21 @@ private: JobSetup maJobSetup; Point maPageOffset; Size maPaperSize; - ULONG mnError; - USHORT mnCurPage; - USHORT mnCurPrintPage; - USHORT mnPageQueueSize; - USHORT mnCopyCount; - BOOL mbDefPrinter; - BOOL mbPrinting; - BOOL mbJobActive; - BOOL mbCollateCopy; - BOOL mbPrintFile; - BOOL mbInPrintPage; - BOOL mbNewJobSetup; - BOOL mbIsQueuePrinter; - BOOL mbUserSetupCompleted; - BOOL mbUserSetupResult; + sal_uLong mnError; + sal_uInt16 mnCurPage; + sal_uInt16 mnCurPrintPage; + sal_uInt16 mnPageQueueSize; + sal_uInt16 mnCopyCount; + sal_Bool mbDefPrinter; + sal_Bool mbPrinting; + sal_Bool mbJobActive; + sal_Bool mbCollateCopy; + sal_Bool mbPrintFile; + sal_Bool mbInPrintPage; + sal_Bool mbNewJobSetup; + sal_Bool mbIsQueuePrinter; + sal_Bool mbUserSetupCompleted; + sal_Bool mbUserSetupResult; Link maErrorHdl; SAL_DLLPRIVATE void ImplInitData(); @@ -264,11 +269,11 @@ private: SAL_DLLPRIVATE bool StartJob( const rtl::OUString& rJobName, boost::shared_ptr<vcl::PrinterController>& ); - static SAL_DLLPRIVATE ULONG ImplSalPrinterErrorCodeToVCL( ULONG nError ); + static SAL_DLLPRIVATE sal_uLong ImplSalPrinterErrorCodeToVCL( sal_uLong nError ); private: SAL_DLLPRIVATE void ImplEndPrint(); - SAL_DLLPRIVATE BOOL EndJob(); + SAL_DLLPRIVATE sal_Bool EndJob(); SAL_DLLPRIVATE Printer( const Printer& rPrinter ); SAL_DLLPRIVATE Printer& operator =( const Printer& rPrinter ); public: @@ -280,8 +285,8 @@ public: protected: - void SetSelfAsQueuePrinter( BOOL bQueuePrinter ) { mbIsQueuePrinter = bQueuePrinter; } - BOOL IsQueuePrinter() const { return mbIsQueuePrinter; } + void SetSelfAsQueuePrinter( sal_Bool bQueuePrinter ) { mbIsQueuePrinter = bQueuePrinter; } + sal_Bool IsQueuePrinter() const { return mbIsQueuePrinter; } public: Printer(); @@ -299,68 +304,72 @@ public: const XubString& GetName() const { return maPrinterName; } const XubString& GetDriverName() const { return maDriver; } - BOOL IsDefPrinter() const { return mbDefPrinter; } - BOOL IsDisplayPrinter() const { return mpDisplayDev != NULL; } - BOOL IsValid() const { return !IsDisplayPrinter(); } + sal_Bool IsDefPrinter() const { return mbDefPrinter; } + sal_Bool IsDisplayPrinter() const { return mpDisplayDev != NULL; } + sal_Bool IsValid() const { return !IsDisplayPrinter(); } - ULONG GetCapabilities( USHORT nType ) const; - BOOL HasSupport( PrinterSupport eFeature ) const; + sal_uLong GetCapabilities( sal_uInt16 nType ) const; + sal_Bool HasSupport( PrinterSupport eFeature ) const; - BOOL SetJobSetup( const JobSetup& rSetup ); + sal_Bool SetJobSetup( const JobSetup& rSetup ); const JobSetup& GetJobSetup() const { return maJobSetup; } String GetJobValue( const String& rKey ) const { return maJobSetup.GetValue( rKey ); } void SetJobValue( const String& rKey, const String& rValue ) { maJobSetup.SetValue( rKey, rValue ); } - BOOL Setup( Window* pWindow = NULL ); - BOOL SetPrinterProps( const Printer* pPrinter ); + sal_Bool Setup( Window* pWindow = NULL ); + sal_Bool SetPrinterProps( const Printer* pPrinter ); - void SetPrinterOptions( const PrinterOptions& rOptions ) { *mpPrinterOptions = rOptions; } + // SetPrinterOptions is used internally only now + // in earlier times it was used only to set the options loaded directly from the configuration + // in SfxPrinter::InitJob, this is now handled internally + // should the need arise to set the printer options outside vcl, also a method would have to be devised + // to not override these again internally + SAL_DLLPRIVATE void SetPrinterOptions( const PrinterOptions& rOptions ); const PrinterOptions& GetPrinterOptions() const { return( *mpPrinterOptions ); } - BOOL SetOrientation( Orientation eOrient ); + sal_Bool SetOrientation( Orientation eOrient ); Orientation GetOrientation() const; DuplexMode GetDuplexMode() const; - BOOL SetDuplexMode( DuplexMode ); + sal_Bool SetDuplexMode( DuplexMode ); // returns the angle that a landscape page will be turned counterclockwise // wrt to portrait. The return value may be only valid for // the current paper int GetLandscapeAngle() const; - BOOL SetPaperBin( USHORT nPaperBin ); - USHORT GetPaperBin() const; - BOOL SetPaper( Paper ePaper ); - BOOL SetPaperSizeUser( const Size& rSize ); - BOOL SetPaperSizeUser( const Size& rSize, bool bMatchNearest ); + sal_Bool SetPaperBin( sal_uInt16 nPaperBin ); + sal_uInt16 GetPaperBin() const; + sal_Bool SetPaper( Paper ePaper ); + sal_Bool SetPaperSizeUser( const Size& rSize ); + sal_Bool SetPaperSizeUser( const Size& rSize, bool bMatchNearest ); Paper GetPaper() const; + static rtl::OUString GetPaperName( Paper ePaper ); + // return a UI string for the current paper; i_bPaperUser == false means an empty string for PAPER_USER + rtl::OUString GetPaperName( bool i_bPaperUser = true ) const; // returns number of available paper formats int GetPaperInfoCount() const; // returns info about paper format nPaper const PaperInfo& GetPaperInfo( int nPaper ) const; - USHORT GetPaperBinCount() const; - XubString GetPaperBinName( USHORT nPaperBin ) const; + sal_uInt16 GetPaperBinCount() const; + XubString GetPaperBinName( sal_uInt16 nPaperBin ) const; const Size& GetPaperSizePixel() const { return maPaperSize; } Size GetPaperSize() const { return PixelToLogic( maPaperSize ); } const Point& GetPageOffsetPixel() const { return maPageOffset; } Point GetPageOffset() const { return PixelToLogic( maPageOffset ); } - BOOL SetCopyCount( USHORT nCopy, BOOL bCollate = FALSE ); - USHORT GetCopyCount() const { return mnCopyCount; } - BOOL IsCollateCopy() const { return mbCollateCopy; } + sal_Bool SetCopyCount( sal_uInt16 nCopy, sal_Bool bCollate = sal_False ); + sal_uInt16 GetCopyCount() const { return mnCopyCount; } + sal_Bool IsCollateCopy() const { return mbCollateCopy; } - BOOL IsPrinting() const { return mbPrinting; } + sal_Bool IsPrinting() const { return mbPrinting; } - void SetPrintFile( const XubString& rFileName ) { maPrintFile = rFileName; } - const XubString& GetPrintFile() const { return maPrintFile; } - void EnablePrintFile( BOOL bEnable ) { mbPrintFile = bEnable; } - BOOL IsPrintFileEnabled() const { return mbPrintFile; } - BOOL AbortJob(); + sal_Bool AbortJob(); const XubString& GetCurJobName() const { return maJobName; } - USHORT GetCurPage() const { return mnCurPage; } - BOOL IsJobActive() const { return mbJobActive; } + sal_uInt16 GetCurPage() const { return mnCurPage; } + sal_Bool IsJobActive() const { return mbJobActive; } - ULONG GetError() const { return ERRCODE_TOERROR(mnError); } - ULONG GetErrorCode() const { return mnError; } + sal_uLong GetError() const { return ERRCODE_TOERROR(mnError); } + sal_uLong GetErrorCode() const { return mnError; } void SetErrorHdl( const Link& rLink ) { maErrorHdl = rLink; } const Link& GetErrorHdl() const { return maErrorHdl; } @@ -401,7 +410,7 @@ protected: PrinterController( const boost::shared_ptr<Printer>& ); public: enum NupOrderType - { LRTB, TBLR }; + { LRTB, TBLR, TBRL, RLTB }; struct MultiPageSetup { // all metrics in 100th mm @@ -479,6 +488,7 @@ public: */ void enableUIOption( const rtl::OUString& rPropName, bool bEnable ); bool isUIOptionEnabled( const rtl::OUString& rPropName ) const; + bool isUIChoiceEnabled( const rtl::OUString& rPropName, sal_Int32 nChoice ) const; /* returns the property name rPropName depends on or an empty string if no dependency exists. */ @@ -514,27 +524,31 @@ public: bool isDirectPrint() const; // implementation details, not usable outside vcl - SAL_DLLPRIVATE int getFilteredPageCount(); + // don't use outside vcl. Some of these are exported for + // the benefit of vcl's plugins. + // Still: DO NOT USE OUTSIDE VCL + VCL_PLUGIN_PUBLIC int getFilteredPageCount(); SAL_DLLPRIVATE PageSize getPageFile( int i_inUnfilteredPage, GDIMetaFile& rMtf, bool i_bMayUseCache = false ); - SAL_DLLPRIVATE PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, bool i_bMayUseCache = false ); + VCL_PLUGIN_PUBLIC PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, bool i_bMayUseCache = false ); SAL_DLLPRIVATE void printFilteredPage( int i_nPage ); SAL_DLLPRIVATE void setPrinter( const boost::shared_ptr<Printer>& ); SAL_DLLPRIVATE void setOptionChangeHdl( const Link& ); - SAL_DLLPRIVATE void createProgressDialog(); - SAL_DLLPRIVATE bool isProgressCanceled() const; + VCL_PLUGIN_PUBLIC void createProgressDialog(); + VCL_PLUGIN_PUBLIC bool isProgressCanceled() const; SAL_DLLPRIVATE void setMultipage( const MultiPageSetup& ); SAL_DLLPRIVATE const MultiPageSetup& getMultipage() const; - SAL_DLLPRIVATE void setLastPage( sal_Bool i_bLastPage ); + VCL_PLUGIN_PUBLIC void setLastPage( sal_Bool i_bLastPage ); SAL_DLLPRIVATE void setReversePrint( sal_Bool i_bReverse ); SAL_DLLPRIVATE bool getReversePrint() const; SAL_DLLPRIVATE void pushPropertiesToPrinter(); - SAL_DLLPRIVATE void setJobState( com::sun::star::view::PrintableState ); + VCL_PLUGIN_PUBLIC void setJobState( com::sun::star::view::PrintableState ); SAL_DLLPRIVATE bool setupPrinter( Window* i_pDlgParent ); SAL_DLLPRIVATE int getPageCountProtected() const; SAL_DLLPRIVATE com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParametersProtected( int i_nPage ) const; - SAL_DLLPRIVATE ULONG removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFile& o_rOut ); + SAL_DLLPRIVATE sal_uLong removeTransparencies( GDIMetaFile& i_rIn, GDIMetaFile& o_rOut ); + SAL_DLLPRIVATE void resetPrinterOptions( bool i_bFileOutput ); }; class VCL_DLLPUBLIC PrinterOptionsHelper @@ -617,28 +631,34 @@ class VCL_DLLPUBLIC PrinterOptionsHelper , mbEnabled( i_bEnabled ) {} }; + // note: in the following helper functions HelpIds are expected as an rtl::OUString + // the normal HelpId form is rtl::OString (byte string instead of UTF16 string) + // this is because the whole interface is base on UNO properties; in fact the structures + // are passed over UNO interfaces. UNO does not know a byte string, hence the string is + // transported via UTF16 strings. + // general control static com::sun::star::uno::Any getUIControlOpt( const rtl::OUString& i_rTitle, - const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpText, + const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId, const rtl::OUString& i_rType, const com::sun::star::beans::PropertyValue* i_pValue = NULL, const UIControlOptions& i_rControlOptions = UIControlOptions() ); // create a group (e.g. a TabPage); following controls will be grouped in it until the next // group begins - static com::sun::star::uno::Any getGroupControlOpt( const rtl::OUString& i_rTitle, const rtl::OUString& i_rHelpText ); + static com::sun::star::uno::Any getGroupControlOpt( const rtl::OUString& i_rTitle, const rtl::OUString& i_rHelpId ); // create a subgroup (e.g. a FixedLine); following controls will be grouped in it until the next // subgroup or group begins // setting bJobPage = true will make the subgroup appear on the first page of the print dialog static com::sun::star::uno::Any getSubgroupControlOpt( const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpText, + const rtl::OUString& i_rHelpId, const UIControlOptions& i_rControlOptions = UIControlOptions() ); // create a bool option (usually a checkbox) static com::sun::star::uno::Any getBoolControlOpt( const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpText, + const rtl::OUString& i_rHelpId, const rtl::OUString& i_rProperty, sal_Bool i_bValue, const UIControlOptions& i_rControlOptions = UIControlOptions() @@ -646,18 +666,19 @@ class VCL_DLLPUBLIC PrinterOptionsHelper // create a set of choices (either a radio button group or a list box) static com::sun::star::uno::Any getChoiceControlOpt( const rtl::OUString& i_rTitle, - const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpText, + const com::sun::star::uno::Sequence< rtl::OUString >& i_rHelpId, const rtl::OUString& i_rProperty, const com::sun::star::uno::Sequence< rtl::OUString >& i_rChoices, sal_Int32 i_nValue, const rtl::OUString& i_rType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Radio" ) ), + const com::sun::star::uno::Sequence< sal_Bool >& i_rDisabledChoices = com::sun::star::uno::Sequence< sal_Bool >(), const UIControlOptions& i_rControlOptions = UIControlOptions() ); // create an integer range (e.g. a spin field) // note: max value < min value means do not apply min/max values static com::sun::star::uno::Any getRangeControlOpt( const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpText, + const rtl::OUString& i_rHelpId, const rtl::OUString& i_rProperty, sal_Int32 i_nValue, sal_Int32 i_nMinValue = -1, @@ -668,7 +689,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper // create a string field // note: max value < min value means do not apply min/max values static com::sun::star::uno::Any getEditControlOpt( const rtl::OUString& i_rTitle, - const rtl::OUString& i_rHelpText, + const rtl::OUString& i_rHelpId, const rtl::OUString& i_rProperty, const rtl::OUString& i_rValue, const UIControlOptions& i_rControlOptions = UIControlOptions() diff --git a/vcl/inc/vcl/printergfx.hxx b/vcl/inc/vcl/printergfx.hxx index fb1df7c94498..8bfd1c69a7d2 100644 --- a/vcl/inc/vcl/printergfx.hxx +++ b/vcl/inc/vcl/printergfx.hxx @@ -365,14 +365,14 @@ public: const Point** pPolygonList); void DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, - const BYTE* pFlgAry ); + const sal_uInt8* pFlgAry ); void DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, - const BYTE* pFlgAry); + const sal_uInt8* pFlgAry); void DrawPolyPolygonBezier (sal_uInt32 nPoly, const sal_uInt32* pPoints, const Point* const* pPtAry, - const BYTE* const* pFlgAry); + const sal_uInt8* const* pFlgAry); // eps sal_Bool DrawEPS ( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize); diff --git a/vcl/inc/vcl/printerinfomanager.hxx b/vcl/inc/vcl/printerinfomanager.hxx index 665f51933688..b6ebc072b8cf 100644 --- a/vcl/inc/vcl/printerinfomanager.hxx +++ b/vcl/inc/vcl/printerinfomanager.hxx @@ -157,6 +157,8 @@ public: // there can only be one static PrinterInfoManager& get(); + // only called by SalData destructor, frees the global instance + static void release(); // get PrinterInfoManager type Type getType() const { return m_eType; } @@ -217,8 +219,10 @@ public: // this may either be a regular file or the result of popen() virtual FILE* startSpool( const rtl::OUString& rPrinterName, bool bQuickCommand ); // close the FILE* returned by startSpool and does the actual spooling + // set bBanner to "false" will attempt to suppress banner printing + // set bBanner to "true" will rely on the system default // returns a numerical job id - virtual int endSpool( const rtl::OUString& rPrinterName, const rtl::OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData ); + virtual int endSpool( const rtl::OUString& rPrinterName, const rtl::OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData, bool bBanner ); // for spadmin: whether adding or removing a printer is possible virtual bool addOrRemovePossible() const; diff --git a/vcl/inc/vcl/prndlg.hxx b/vcl/inc/vcl/prndlg.hxx index 7549d1e5ea5e..247998303178 100644 --- a/vcl/inc/vcl/prndlg.hxx +++ b/vcl/inc/vcl/prndlg.hxx @@ -60,6 +60,9 @@ namespace vcl VirtualDevice maPageVDev; rtl::OUString maReplacementString; rtl::OUString maToolTipString; + bool mbGreyscale; + FixedLine maHorzDim; + FixedLine maVertDim; public: PrintPreviewWindow( Window* pParent, const ResId& ); @@ -70,8 +73,11 @@ namespace vcl virtual void Resize(); virtual void DataChanged( const DataChangedEvent& ); - void setPreview( const GDIMetaFile&, const Size&, const rtl::OUString&, - sal_Int32 i_nDPIX, sal_Int32 i_nDPIY + void setPreview( const GDIMetaFile&, const Size& i_rPaperSize, + const rtl::OUString& i_rPaperName, + const rtl::OUString& i_rNoPageString, + sal_Int32 i_nDPIX, sal_Int32 i_nDPIY, + bool i_bGreyscale ); }; @@ -126,7 +132,6 @@ namespace vcl // border around each page CheckBox maBorderCB; - vcl::RowOrColumn maLayout; boost::shared_ptr< vcl::RowOrColumn > mxBrochureDep; boost::shared_ptr< vcl::LabeledElement >mxPagesBtnLabel; @@ -142,7 +147,7 @@ namespace vcl void showAdvancedControls( bool ); - virtual void Resize(); + // virtual void Resize(); }; class JobTabPage : public TabPage @@ -166,13 +171,13 @@ namespace vcl NumericField maCopyCountField; CheckBox maCollateBox; FixedImage maCollateImage; + CheckBox maReverseOrderBox; Image maCollateImg; Image maNoCollateImg; long mnCollateUIMode; - vcl::RowOrColumn maLayout; boost::shared_ptr<vcl::RowOrColumn> mxPrintRange; boost::shared_ptr<vcl::WindowArranger> mxDetails; @@ -182,7 +187,7 @@ namespace vcl void readFromSettings(); void storeToSettings(); - virtual void Resize(); + // virtual void Resize(); void setupLayout(); }; @@ -193,9 +198,7 @@ namespace vcl FixedLine maOptionsLine; CheckBox maToFileBox; CheckBox maCollateSingleJobsBox; - CheckBox maReverseOrderBox; - vcl::RowOrColumn maLayout; boost::shared_ptr<vcl::RowOrColumn> mxOptGroup; OutputOptPage( Window*, const ResId& ); @@ -204,7 +207,7 @@ namespace vcl void readFromSettings(); void storeToSettings(); - virtual void Resize(); + // virtual void Resize(); void setupLayout(); }; @@ -249,7 +252,6 @@ namespace vcl rtl::OUString maPrintText; rtl::OUString maDefPrtText; - vcl::RowOrColumn maLayout; boost::shared_ptr<vcl::RowOrColumn> mxPreviewCtrls; Size maDetailsCollapsedSize; diff --git a/vcl/inc/vcl/prntypes.hxx b/vcl/inc/vcl/prntypes.hxx index 086cc7314c7b..13d87a94d3ac 100644 --- a/vcl/inc/vcl/prntypes.hxx +++ b/vcl/inc/vcl/prntypes.hxx @@ -49,49 +49,50 @@ enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE }; // - QueueInfo-Types - // ------------------- -#define QUEUE_STATUS_READY ((ULONG)0x00000001) -#define QUEUE_STATUS_PAUSED ((ULONG)0x00000002) -#define QUEUE_STATUS_PENDING_DELETION ((ULONG)0x00000004) -#define QUEUE_STATUS_BUSY ((ULONG)0x00000008) -#define QUEUE_STATUS_INITIALIZING ((ULONG)0x00000010) -#define QUEUE_STATUS_WAITING ((ULONG)0x00000020) -#define QUEUE_STATUS_WARMING_UP ((ULONG)0x00000040) -#define QUEUE_STATUS_PROCESSING ((ULONG)0x00000080) -#define QUEUE_STATUS_PRINTING ((ULONG)0x00000100) -#define QUEUE_STATUS_OFFLINE ((ULONG)0x00000200) -#define QUEUE_STATUS_ERROR ((ULONG)0x00000400) -#define QUEUE_STATUS_SERVER_UNKNOWN ((ULONG)0x00000800) -#define QUEUE_STATUS_PAPER_JAM ((ULONG)0x00001000) -#define QUEUE_STATUS_PAPER_OUT ((ULONG)0x00002000) -#define QUEUE_STATUS_MANUAL_FEED ((ULONG)0x00004000) -#define QUEUE_STATUS_PAPER_PROBLEM ((ULONG)0x00008000) -#define QUEUE_STATUS_IO_ACTIVE ((ULONG)0x00010000) -#define QUEUE_STATUS_OUTPUT_BIN_FULL ((ULONG)0x00020000) -#define QUEUE_STATUS_TONER_LOW ((ULONG)0x00040000) -#define QUEUE_STATUS_NO_TONER ((ULONG)0x00080000) -#define QUEUE_STATUS_PAGE_PUNT ((ULONG)0x00100000) -#define QUEUE_STATUS_USER_INTERVENTION ((ULONG)0x00200000) -#define QUEUE_STATUS_OUT_OF_MEMORY ((ULONG)0x00400000) -#define QUEUE_STATUS_DOOR_OPEN ((ULONG)0x00800000) -#define QUEUE_STATUS_POWER_SAVE ((ULONG)0x01000000) +#define QUEUE_STATUS_READY ((sal_uLong)0x00000001) +#define QUEUE_STATUS_PAUSED ((sal_uLong)0x00000002) +#define QUEUE_STATUS_PENDING_DELETION ((sal_uLong)0x00000004) +#define QUEUE_STATUS_BUSY ((sal_uLong)0x00000008) +#define QUEUE_STATUS_INITIALIZING ((sal_uLong)0x00000010) +#define QUEUE_STATUS_WAITING ((sal_uLong)0x00000020) +#define QUEUE_STATUS_WARMING_UP ((sal_uLong)0x00000040) +#define QUEUE_STATUS_PROCESSING ((sal_uLong)0x00000080) +#define QUEUE_STATUS_PRINTING ((sal_uLong)0x00000100) +#define QUEUE_STATUS_OFFLINE ((sal_uLong)0x00000200) +#define QUEUE_STATUS_ERROR ((sal_uLong)0x00000400) +#define QUEUE_STATUS_SERVER_UNKNOWN ((sal_uLong)0x00000800) +#define QUEUE_STATUS_PAPER_JAM ((sal_uLong)0x00001000) +#define QUEUE_STATUS_PAPER_OUT ((sal_uLong)0x00002000) +#define QUEUE_STATUS_MANUAL_FEED ((sal_uLong)0x00004000) +#define QUEUE_STATUS_PAPER_PROBLEM ((sal_uLong)0x00008000) +#define QUEUE_STATUS_IO_ACTIVE ((sal_uLong)0x00010000) +#define QUEUE_STATUS_OUTPUT_BIN_FULL ((sal_uLong)0x00020000) +#define QUEUE_STATUS_TONER_LOW ((sal_uLong)0x00040000) +#define QUEUE_STATUS_NO_TONER ((sal_uLong)0x00080000) +#define QUEUE_STATUS_PAGE_PUNT ((sal_uLong)0x00100000) +#define QUEUE_STATUS_USER_INTERVENTION ((sal_uLong)0x00200000) +#define QUEUE_STATUS_OUT_OF_MEMORY ((sal_uLong)0x00400000) +#define QUEUE_STATUS_DOOR_OPEN ((sal_uLong)0x00800000) +#define QUEUE_STATUS_POWER_SAVE ((sal_uLong)0x01000000) -#define QUEUE_JOBS_DONTKNOW ((ULONG)0xFFFFFFFF) +#define QUEUE_JOBS_DONTKNOW ((sal_uLong)0xFFFFFFFF) // ----------------- // - Printer-Types - // ----------------- -#define PRINTER_CAPABILITIES_SUPPORTDIALOG ((USHORT)1) -#define PRINTER_CAPABILITIES_COPIES ((USHORT)2) -#define PRINTER_CAPABILITIES_COLLATECOPIES ((USHORT)3) -#define PRINTER_CAPABILITIES_SETORIENTATION ((USHORT)4) -#define PRINTER_CAPABILITIES_SETPAPERBIN ((USHORT)5) -#define PRINTER_CAPABILITIES_SETPAPERSIZE ((USHORT)6) -#define PRINTER_CAPABILITIES_SETPAPER ((USHORT)7) -#define PRINTER_CAPABILITIES_FAX ((USHORT)8) -#define PRINTER_CAPABILITIES_PDF ((USHORT)9) -#define PRINTER_CAPABILITIES_EXTERNALDIALOG ((USHORT)10) -#define PRINTER_CAPABILITIES_SETDUPLEX ((USHORT)11) +#define PRINTER_CAPABILITIES_SUPPORTDIALOG ((sal_uInt16)1) +#define PRINTER_CAPABILITIES_COPIES ((sal_uInt16)2) +#define PRINTER_CAPABILITIES_COLLATECOPIES ((sal_uInt16)3) +#define PRINTER_CAPABILITIES_SETORIENTATION ((sal_uInt16)4) +#define PRINTER_CAPABILITIES_SETPAPERBIN ((sal_uInt16)5) +#define PRINTER_CAPABILITIES_SETPAPERSIZE ((sal_uInt16)6) +#define PRINTER_CAPABILITIES_SETPAPER ((sal_uInt16)7) +#define PRINTER_CAPABILITIES_FAX ((sal_uInt16)8) +#define PRINTER_CAPABILITIES_PDF ((sal_uInt16)9) +#define PRINTER_CAPABILITIES_EXTERNALDIALOG ((sal_uInt16)10) +#define PRINTER_CAPABILITIES_SETDUPLEX ((sal_uInt16)11) +#define PRINTER_CAPABILITIES_USEPULLMODEL ((sal_uInt16)12) #endif // _SV_PRNTYPES_HXX diff --git a/vcl/inc/vcl/ptrstyle.hxx b/vcl/inc/vcl/ptrstyle.hxx index 75502de85823..1f6b375e81b5 100644 --- a/vcl/inc/vcl/ptrstyle.hxx +++ b/vcl/inc/vcl/ptrstyle.hxx @@ -35,7 +35,7 @@ // - Pointer-Types - // ----------------- -typedef USHORT PointerStyle; +typedef sal_uInt16 PointerStyle; #define POINTER_ARROW ((PointerStyle)0) #define POINTER_NULL ((PointerStyle)1) diff --git a/vcl/inc/vcl/quickselectionengine.hxx b/vcl/inc/vcl/quickselectionengine.hxx new file mode 100644 index 000000000000..f70736428010 --- /dev/null +++ b/vcl/inc/vcl/quickselectionengine.hxx @@ -0,0 +1,95 @@ +/************************************************************************* +* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +* +* Copyright 2009 by Sun Microsystems, Inc. +* +* OpenOffice.org - a multi-platform office productivity suite +* +* This file is part of OpenOffice.org. +* +* OpenOffice.org is free software: you can redistribute it and/or modify +* it under the terms of the GNU Lesser General Public License version 3 +* only, as published by the Free Software Foundation. +* +* OpenOffice.org is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU Lesser General Public License version 3 for more details +* (a copy is included in the LICENSE file that accompanied this code). +* +* You should have received a copy of the GNU Lesser General Public License +* version 3 along with OpenOffice.org. If not, see +* <http://www.openoffice.org/license.html> +* for a copy of the LGPLv3 License. +************************************************************************/ + +#ifndef VCL_QUICKSELECTIONENGINE_HXX +#define VCL_QUICKSELECTIONENGINE_HXX + +#include "dllapi.h" + +#include <tools/string.hxx> + +#include <memory> + +class KeyEvent; + +//........................................................................ +namespace vcl +{ +//........................................................................ + + typedef const void* StringEntryIdentifier; + + //==================================================================== + //= ISearchableStringList + //==================================================================== + // TODO: consolidate this with ::vcl::IMnemonicEntryList + class SAL_NO_VTABLE VCL_DLLPUBLIC ISearchableStringList + { + public: + /** returns the current entry in the list of searchable strings. + + Search operations will start with this entry. + */ + virtual StringEntryIdentifier CurrentEntry( String& _out_entryText ) const = 0; + + /** returns the next entry in the list. + + The implementation is expected to wrap around. That is, if the given entry denotes the last + entry in the list, then NextEntry should return the first entry. + */ + virtual StringEntryIdentifier NextEntry( StringEntryIdentifier _currentEntry, String& _out_entryText ) const = 0; + + /** selects a given entry + */ + virtual void SelectEntry( StringEntryIdentifier _entry ) = 0; + }; + + //==================================================================== + //= QuickSelectionEngine + //==================================================================== + struct QuickSelectionEngine_Data; + class VCL_DLLPUBLIC QuickSelectionEngine + { + public: + QuickSelectionEngine( ISearchableStringList& _entryList ); + ~QuickSelectionEngine(); + + bool HandleKeyEvent( const KeyEvent& _rKEvt ); + void Reset(); + + private: + ::std::auto_ptr< QuickSelectionEngine_Data > m_pData; + + private: + QuickSelectionEngine(); // never implemented + QuickSelectionEngine( const QuickSelectionEngine& ); // never implemented + QuickSelectionEngine& operator=( const QuickSelectionEngine& ); // never implemented + }; + +//........................................................................ +} // namespace vcl +//........................................................................ + +#endif // VCL_QUICKSELECTIONENGINE_HXX diff --git a/vcl/inc/vcl/regband.hxx b/vcl/inc/vcl/regband.hxx index 39f0bd3b0a08..0ebacbdb93d4 100644 --- a/vcl/inc/vcl/regband.hxx +++ b/vcl/inc/vcl/regband.hxx @@ -58,7 +58,7 @@ struct ImplRegionBandSep ImplRegionBandSep* mpNextSep; long mnXLeft; long mnXRight; - BOOL mbRemoved; + sal_Bool mbRemoved; }; enum LineType { LINE_ASCENDING, LINE_DESCENDING, LINE_HORIZONTAL }; @@ -69,7 +69,7 @@ struct ImplRegionBandPoint ImplRegionBandPoint* mpNextBandPoint; long mnX; long mnLineId; - BOOL mbEndPoint; + sal_Bool mbEndPoint; LineType meLineType; }; @@ -86,7 +86,7 @@ public: ImplRegionBandPoint* mpFirstBandPoint; // root of the list with lines long mnYTop; // actual boundary of the band long mnYBottom; - BOOL mbTouched; + sal_Bool mbTouched; // create y-band with boundaries ImplRegionBand( long nYTop, long nYBottom ); @@ -111,14 +111,14 @@ public: long GetXRightBoundary() const; // combine overlapping bands - BOOL OptimizeBand(); + sal_Bool OptimizeBand(); // generate separations from lines and process // union with existing separations void ProcessPoints(); // insert point in the list for later processing - BOOL InsertPoint( long nX, long nLineID, - BOOL bEndPoint, LineType eLineType ); + sal_Bool InsertPoint( long nX, long nLineID, + sal_Bool bEndPoint, LineType eLineType ); void Union( long nXLeft, long nXRight ); void Intersect( long nXLeft, long nXRight ); @@ -128,13 +128,13 @@ public: void MoveX( long nHorzMove ); void ScaleX( double fHorzScale ); - BOOL IsInside( long nX ); - BOOL IsInside( long nLeft, long nRight ); - BOOL IsOver( long nLeft, long nRight ); + sal_Bool IsInside( long nX ); + sal_Bool IsInside( long nLeft, long nRight ); + sal_Bool IsOver( long nLeft, long nRight ); - BOOL IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); } + sal_Bool IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); } - BOOL operator==( const ImplRegionBand& rRegionBand ) const; + sal_Bool operator==( const ImplRegionBand& rRegionBand ) const; /** Split the called band at the given vertical coordinate. After the split the called band will cover the upper part not including nY. diff --git a/vcl/inc/vcl/region.h b/vcl/inc/vcl/region.h index 62c5e51db070..5814e981aac2 100644 --- a/vcl/inc/vcl/region.h +++ b/vcl/inc/vcl/region.h @@ -50,7 +50,7 @@ struct ImplRegionHandle Region* mpRegion; ImplRegionBand* mpCurrRectBand; ImplRegionBandSep* mpCurrRectBandSep; - BOOL mbFirst; + sal_Bool mbFirst; }; // ------------------ @@ -73,8 +73,8 @@ public: ImplRegionBase( int nCount = 1 ); // TODO: replace manual refcounting virtual ~ImplRegionBase(); public: - ULONG mnRefCount; - ULONG mnRectCount; + sal_uIntPtr mnRefCount; + sal_uIntPtr mnRectCount; PolyPolygon* mpPolyPoly; basegfx::B2DPolyPolygon* mpB2DPolyPoly; }; @@ -99,14 +99,14 @@ public: void CreateBandRange( long nYTop, long nYBottom ); void InsertBands( long nYTop, long nYBottom ); - BOOL InsertSingleBand( ImplRegionBand* mpImplRegionBand, + sal_Bool InsertSingleBand( ImplRegionBand* mpImplRegionBand, long nYBandPosition ); - BOOL InsertLine( const Point & rFirstPoint, + sal_Bool InsertLine( const Point & rFirstPoint, const Point & rSecondPoint, long nLineID ); - BOOL InsertPoint( const Point &rPoint, + sal_Bool InsertPoint( const Point &rPoint, long nLineID, - BOOL bEndPoint, LineType eLineType ); + sal_Bool bEndPoint, LineType eLineType ); /** Insert one band either after another band or as the first or only band. Both the forward as well as the backward links are updated. @@ -126,7 +126,7 @@ public: void XOr( long nLeft, long nTop, long nRight, long nBottom ); // remove emtpy rects - BOOL OptimizeBandList(); + sal_Bool OptimizeBandList(); friend SvStream& operator>>( SvStream& rIStm, Region& rRegion ); friend SvStream& operator<<( SvStream& rOStm, const Region& rRegion ); diff --git a/vcl/inc/vcl/region.hxx b/vcl/inc/vcl/region.hxx index 4a9c146a158c..f21cca472252 100644..100755 --- a/vcl/inc/vcl/region.hxx +++ b/vcl/inc/vcl/region.hxx @@ -70,14 +70,19 @@ private: SAL_DLLPRIVATE inline void ImplPolyPolyRegionToBandRegion(); SAL_DLLPRIVATE const ImplRegion* ImplGetImplRegion() const { return mpImplRegion; } SAL_DLLPRIVATE ImplRegion* ImplGetImplRegion() { return mpImplRegion; } - SAL_DLLPRIVATE BOOL ImplGetFirstRect( ImplRegionInfo& rImplRegionInfo, - long& nX, long& nY, long& nWidth, long& nHeight ) const; - SAL_DLLPRIVATE BOOL ImplGetNextRect( ImplRegionInfo& rImplRegionInfo, - long& nX, long& nY, long& nWidth, long& nHeight ) const; SAL_DLLPRIVATE void ImplBeginAddRect( ); - SAL_DLLPRIVATE BOOL ImplAddRect( const Rectangle& rRect ); + SAL_DLLPRIVATE sal_Bool ImplAddRect( const Rectangle& rRect ); SAL_DLLPRIVATE void ImplEndAddRect( ); + SAL_DLLPRIVATE void ImplIntersectWithPolyPolygon( const Region& ); + SAL_DLLPRIVATE void ImplExcludePolyPolygon( const Region& ); + SAL_DLLPRIVATE void ImplUnionPolyPolygon( const Region& ); + SAL_DLLPRIVATE void ImplXOrPolyPolygon( const Region& ); +public: // public within vcl + VCL_PLUGIN_PUBLIC bool ImplGetFirstRect( ImplRegionInfo& rImplRegionInfo, + long& nX, long& nY, long& nWidth, long& nHeight ) const; + VCL_PLUGIN_PUBLIC bool ImplGetNextRect( ImplRegionInfo& rImplRegionInfo, + long& nX, long& nY, long& nWidth, long& nHeight ) const; #ifdef DBG_UTIL friend const char* ImplDbgTestRegion( const void* pObj ); #endif @@ -94,48 +99,48 @@ public: void Move( long nHorzMove, long nVertMove ); void Scale( double fScaleX, double fScaleY ); - BOOL Union( const Rectangle& rRegion ); - BOOL Intersect( const Rectangle& rRegion ); - BOOL Exclude( const Rectangle& rRegion ); - BOOL XOr( const Rectangle& rRegion ); - BOOL Union( const Region& rRegion ); - BOOL Intersect( const Region& rRegion ); - BOOL Exclude( const Region& rRegion ); - BOOL XOr( const Region& rRegion ); + sal_Bool Union( const Rectangle& rRegion ); + sal_Bool Intersect( const Rectangle& rRegion ); + sal_Bool Exclude( const Rectangle& rRegion ); + sal_Bool XOr( const Rectangle& rRegion ); + sal_Bool Union( const Region& rRegion ); + sal_Bool Intersect( const Region& rRegion ); + sal_Bool Exclude( const Region& rRegion ); + sal_Bool XOr( const Region& rRegion ); RegionType GetType() const; - BOOL IsEmpty() const { return GetType() == REGION_EMPTY; }; - BOOL IsNull() const { return GetType() == REGION_NULL; }; + sal_Bool IsEmpty() const { return GetType() == REGION_EMPTY; }; + sal_Bool IsNull() const { return GetType() == REGION_NULL; }; void SetEmpty(); void SetNull(); Rectangle GetBoundRect() const; - BOOL HasPolyPolygon() const; + sal_Bool HasPolyPolygon() const; PolyPolygon GetPolyPolygon() const; - // returns an empty polypolygon in case HasPolyPolygon is FALSE + // returns an empty polypolygon in case HasPolyPolygon is sal_False const basegfx::B2DPolyPolygon GetB2DPolyPolygon() const; // returns a PolyPolygon either copied from the set PolyPolygon region // or created from the constituent rectangles basegfx::B2DPolyPolygon ConvertToB2DPolyPolygon(); - ULONG GetRectCount() const; + sal_uLong GetRectCount() const; RegionHandle BeginEnumRects(); - BOOL GetEnumRects( RegionHandle hRegionHandle, Rectangle& rRect ); - BOOL GetNextEnumRect( RegionHandle hRegionHandle, Rectangle& rRect ) + sal_Bool GetEnumRects( RegionHandle hRegionHandle, Rectangle& rRect ); + sal_Bool GetNextEnumRect( RegionHandle hRegionHandle, Rectangle& rRect ) { return GetEnumRects( hRegionHandle, rRect ); } void EndEnumRects( RegionHandle hRegionHandle ); - BOOL IsInside( const Point& rPoint ) const; - BOOL IsInside( const Rectangle& rRect ) const; - BOOL IsOver( const Rectangle& rRect ) const; + sal_Bool IsInside( const Point& rPoint ) const; + sal_Bool IsInside( const Rectangle& rRect ) const; + sal_Bool IsOver( const Rectangle& rRect ) const; Region& operator=( const Region& rRegion ); Region& operator=( const Rectangle& rRect ); - BOOL operator==( const Region& rRegion ) const; - BOOL operator!=( const Region& rRegion ) const + sal_Bool operator==( const Region& rRegion ) const; + sal_Bool operator!=( const Region& rRegion ) const { return !(Region::operator==( rRegion )); } friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Region& rRegion ); diff --git a/vcl/inc/vcl/salatype.hxx b/vcl/inc/vcl/salatype.hxx deleted file mode 100644 index 7507c6607dbe..000000000000 --- a/vcl/inc/vcl/salatype.hxx +++ /dev/null @@ -1,50 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALATYPE_HXX -#define _SV_SALATYPE_HXX - -#include <vcl/sv.h> - -// --------------------- -// - Application-Types - -// --------------------- - -// Derzeit doppelt und in apptypes.hxx auch vorhanden - -#define INPUT_MOUSE 0x0001 -#define INPUT_KEYBOARD 0x0002 -#define INPUT_PAINT 0x0004 -#define INPUT_TIMER 0x0008 -#define INPUT_OTHER 0x0010 -#define INPUT_MOUSEANDKEYBOARD (INPUT_MOUSE | INPUT_KEYBOARD) -#define INPUT_ANY (INPUT_MOUSEANDKEYBOARD | INPUT_PAINT | INPUT_TIMER | INPUT_OTHER) - -#endif // _SV_SALATYPE_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/salbmp.hxx b/vcl/inc/vcl/salbmp.hxx index e2234323e80d..d880be0d6d37 100644 --- a/vcl/inc/vcl/salbmp.hxx +++ b/vcl/inc/vcl/salbmp.hxx @@ -39,26 +39,26 @@ class SalGraphics; class BitmapPalette; struct BitmapSystemData; -class VCL_DLLPUBLIC SalBitmap +class VCL_PLUGIN_PUBLIC SalBitmap { public: SalBitmap() {} virtual ~SalBitmap(); virtual bool Create( const Size& rSize, - USHORT nBitCount, + sal_uInt16 nBitCount, const BitmapPalette& rPal ) = 0; virtual bool Create( const SalBitmap& rSalBmp ) = 0; virtual bool Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) = 0; virtual bool Create( const SalBitmap& rSalBmp, - USHORT nNewBitCount ) = 0; + sal_uInt16 nNewBitCount ) = 0; virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas, Size& rSize, bool bMask = false ) = 0; virtual void Destroy() = 0; virtual Size GetSize() const = 0; - virtual USHORT GetBitCount() const = 0; + virtual sal_uInt16 GetBitCount() const = 0; virtual BitmapBuffer* AcquireBuffer( bool bReadOnly ) = 0; virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) = 0; diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx index 1721e201b1ae..111fdecda62d 100644 --- a/vcl/inc/vcl/salbtype.hxx +++ b/vcl/inc/vcl/salbtype.hxx @@ -43,9 +43,9 @@ // - Memory - // ---------- -typedef BYTE* HPBYTE; +typedef sal_uInt8* HPBYTE; typedef HPBYTE Scanline; -typedef const BYTE* ConstHPBYTE; +typedef const sal_uInt8* ConstHPBYTE; typedef ConstHPBYTE ConstScanline; // ------------------ @@ -85,22 +85,22 @@ typedef ConstHPBYTE ConstScanline; // ------------------------------------------------------------------ #define MASK_TO_COLOR( d_nVal, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS, d_Col ) \ -ULONG _def_cR = (BYTE) ( d_RS < 0L ? ( (d_nVal) & d_RM ) << -d_RS : ( (d_nVal) & d_RM ) >> d_RS ); \ -ULONG _def_cG = (BYTE) ( d_GS < 0L ? ( (d_nVal) & d_GM ) << -d_GS : ( (d_nVal) & d_GM ) >> d_GS ); \ -ULONG _def_cB = (BYTE) ( d_BS < 0L ? ( (d_nVal) & d_BM ) << -d_BS : ( (d_nVal) & d_BM ) >> d_BS ); \ -d_Col = BitmapColor( (BYTE) ( _def_cR | ( ( _def_cR & mnROr ) >> mnROrShift ) ), \ - (BYTE) ( _def_cG | ( ( _def_cG & mnGOr ) >> mnGOrShift ) ), \ - (BYTE) ( _def_cB | ( ( _def_cB & mnBOr ) >> mnBOrShift ) ) ); +sal_uLong _def_cR = (sal_uInt8) ( d_RS < 0L ? ( (d_nVal) & d_RM ) << -d_RS : ( (d_nVal) & d_RM ) >> d_RS ); \ +sal_uLong _def_cG = (sal_uInt8) ( d_GS < 0L ? ( (d_nVal) & d_GM ) << -d_GS : ( (d_nVal) & d_GM ) >> d_GS ); \ +sal_uLong _def_cB = (sal_uInt8) ( d_BS < 0L ? ( (d_nVal) & d_BM ) << -d_BS : ( (d_nVal) & d_BM ) >> d_BS ); \ +d_Col = BitmapColor( (sal_uInt8) ( _def_cR | ( ( _def_cR & mnROr ) >> mnROrShift ) ), \ + (sal_uInt8) ( _def_cG | ( ( _def_cG & mnGOr ) >> mnGOrShift ) ), \ + (sal_uInt8) ( _def_cB | ( ( _def_cB & mnBOr ) >> mnBOrShift ) ) ); // ------------------------------------------------------------------ #define COLOR_TO_MASK( d_rCol, d_RM, d_GM, d_BM, d_RS, d_GS, d_BS ) \ -( ( ( ( d_RS < 0L ) ? ( (UINT32) (d_rCol).GetRed() >> -d_RS ) : \ - ( (UINT32) (d_rCol).GetRed() << d_RS ) ) & d_RM ) | \ - ( ( ( d_GS < 0L ) ? ( (UINT32) (d_rCol).GetGreen() >> -d_GS ) : \ - ( (UINT32) (d_rCol).GetGreen() << d_GS ) ) & d_GM ) | \ - ( ( ( d_BS < 0L ) ? ( (UINT32) (d_rCol).GetBlue() >> -d_BS ) : \ - ( (UINT32) (d_rCol).GetBlue() << d_BS ) ) & d_BM ) ) +( ( ( ( d_RS < 0L ) ? ( (sal_uInt32) (d_rCol).GetRed() >> -d_RS ) : \ + ( (sal_uInt32) (d_rCol).GetRed() << d_RS ) ) & d_RM ) | \ + ( ( ( d_GS < 0L ) ? ( (sal_uInt32) (d_rCol).GetGreen() >> -d_GS ) : \ + ( (sal_uInt32) (d_rCol).GetGreen() << d_GS ) ) & d_GM ) | \ + ( ( ( d_BS < 0L ) ? ( (sal_uInt32) (d_rCol).GetBlue() >> -d_BS ) : \ + ( (sal_uInt32) (d_rCol).GetBlue() << d_BS ) ) & d_BM ) ) // --------------- // - BitmapColor - @@ -117,53 +117,53 @@ private: // !!! zugegriffen wird, darf diese Klasse weder // !!! in der Groesse noch der Reihenfolge der // !!! Member veraendert werden (KA 02.09.97) - BYTE mcBlueOrIndex; - BYTE mcGreen; - BYTE mcRed; - BYTE mbIndex; + sal_uInt8 mcBlueOrIndex; + sal_uInt8 mcGreen; + sal_uInt8 mcRed; + sal_uInt8 mbIndex; public: inline BitmapColor(); inline BitmapColor( const BitmapColor& rBitmapColor ); - inline BitmapColor( BYTE cRed, BYTE cGreen, BYTE cBlue ); + inline BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBlue ); inline BitmapColor( const Color& rColor ); - inline BitmapColor( BYTE cIndex ); + inline BitmapColor( sal_uInt8 cIndex ); inline ~BitmapColor() {}; - inline BOOL operator==( const BitmapColor& rBitmapColor ) const; - inline BOOL operator!=( const BitmapColor& rBitmapColor ) const; + inline sal_Bool operator==( const BitmapColor& rBitmapColor ) const; + inline sal_Bool operator!=( const BitmapColor& rBitmapColor ) const; inline BitmapColor& operator=( const BitmapColor& rBitmapColor ); - inline BOOL IsIndex() const; + inline sal_Bool IsIndex() const; - inline BYTE GetRed() const; - inline void SetRed( BYTE cRed ); + inline sal_uInt8 GetRed() const; + inline void SetRed( sal_uInt8 cRed ); - inline BYTE GetGreen() const; - inline void SetGreen( BYTE cGreen ); + inline sal_uInt8 GetGreen() const; + inline void SetGreen( sal_uInt8 cGreen ); - inline BYTE GetBlue() const; - inline void SetBlue( BYTE cBlue ); + inline sal_uInt8 GetBlue() const; + inline void SetBlue( sal_uInt8 cBlue ); - inline BYTE GetIndex() const; - inline void SetIndex( BYTE cIndex ); + inline sal_uInt8 GetIndex() const; + inline void SetIndex( sal_uInt8 cIndex ); operator Color() const; - inline operator BYTE() const; + inline operator sal_uInt8() const; - inline BYTE GetBlueOrIndex() const; + inline sal_uInt8 GetBlueOrIndex() const; inline BitmapColor& Invert(); - inline BYTE GetLuminance() const; - inline BitmapColor& IncreaseLuminance( BYTE cGreyInc ); - inline BitmapColor& DecreaseLuminance( BYTE cGreyDec ); + inline sal_uInt8 GetLuminance() const; + inline BitmapColor& IncreaseLuminance( sal_uInt8 cGreyInc ); + inline BitmapColor& DecreaseLuminance( sal_uInt8 cGreyDec ); - inline BitmapColor& Merge( const BitmapColor& rColor, BYTE cTransparency ); - inline BitmapColor& Merge( BYTE cR, BYTE cG, BYTE cB, BYTE cTransparency ); + inline BitmapColor& Merge( const BitmapColor& rColor, sal_uInt8 cTransparency ); + inline BitmapColor& Merge( sal_uInt8 cR, sal_uInt8 cG, sal_uInt8 cB, sal_uInt8 cTransparency ); - inline ULONG GetColorError( const BitmapColor& rBitmapColor ) const; + inline sal_uLong GetColorError( const BitmapColor& rBitmapColor ) const; }; // --------------- @@ -180,7 +180,7 @@ class VCL_DLLPUBLIC BitmapPalette private: BitmapColor* mpBitmapColor; - USHORT mnCount; + sal_uInt16 mnCount; public: @@ -192,21 +192,21 @@ public: inline BitmapPalette(); inline BitmapPalette( const BitmapPalette& rBitmapPalette ); - inline BitmapPalette( USHORT nCount ); + inline BitmapPalette( sal_uInt16 nCount ); inline ~BitmapPalette(); inline BitmapPalette& operator=( const BitmapPalette& rBitmapPalette ); - inline BOOL operator==( const BitmapPalette& rBitmapPalette ) const; - inline BOOL operator!=( const BitmapPalette& rBitmapPalette ) const; - inline BOOL operator!(); + inline sal_Bool operator==( const BitmapPalette& rBitmapPalette ) const; + inline sal_Bool operator!=( const BitmapPalette& rBitmapPalette ) const; + inline sal_Bool operator!(); - inline USHORT GetEntryCount() const; - inline void SetEntryCount( USHORT nCount ); + inline sal_uInt16 GetEntryCount() const; + inline void SetEntryCount( sal_uInt16 nCount ); - inline const BitmapColor& operator[]( USHORT nIndex ) const; - inline BitmapColor& operator[]( USHORT nIndex ); + inline const BitmapColor& operator[]( sal_uInt16 nIndex ) const; + inline BitmapColor& operator[]( sal_uInt16 nIndex ); - inline USHORT GetBestIndex( const BitmapColor& rCol ) const; + inline sal_uInt16 GetBestIndex( const BitmapColor& rCol ) const; bool IsGreyPalette() const; }; @@ -216,29 +216,29 @@ public: class VCL_DLLPUBLIC ColorMask { - ULONG mnRMask; - ULONG mnGMask; - ULONG mnBMask; + sal_uLong mnRMask; + sal_uLong mnGMask; + sal_uLong mnBMask; long mnRShift; long mnGShift; long mnBShift; - ULONG mnROrShift; - ULONG mnGOrShift; - ULONG mnBOrShift; - ULONG mnROr; - ULONG mnGOr; - ULONG mnBOr; + sal_uLong mnROrShift; + sal_uLong mnGOrShift; + sal_uLong mnBOrShift; + sal_uLong mnROr; + sal_uLong mnGOr; + sal_uLong mnBOr; - SAL_DLLPRIVATE inline long ImplCalcMaskShift( ULONG nMask, ULONG& rOr, ULONG& rOrShift ) const; + SAL_DLLPRIVATE inline long ImplCalcMaskShift( sal_uLong nMask, sal_uLong& rOr, sal_uLong& rOrShift ) const; public: - inline ColorMask( ULONG nRedMask = 0UL, ULONG nGreenMask = 0UL, ULONG nBlueMask = 0UL ); + inline ColorMask( sal_uLong nRedMask = 0UL, sal_uLong nGreenMask = 0UL, sal_uLong nBlueMask = 0UL ); inline ~ColorMask() {} - inline ULONG GetRedMask() const; - inline ULONG GetGreenMask() const; - inline ULONG GetBlueMask() const; + inline sal_uLong GetRedMask() const; + inline sal_uLong GetGreenMask() const; + inline sal_uLong GetBlueMask() const; inline void GetColorFor8Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const; inline void SetColorFor8Bit( const BitmapColor& rColor, HPBYTE pPixel ) const; @@ -261,14 +261,14 @@ public: struct VCL_DLLPUBLIC BitmapBuffer { - ULONG mnFormat; + sal_uLong mnFormat; long mnWidth; long mnHeight; long mnScanlineSize; - USHORT mnBitCount; + sal_uInt16 mnBitCount; ColorMask maColorMask; BitmapPalette maPalette; - BYTE* mpBits; + sal_uInt8* mpBits; BitmapBuffer(){} ~BitmapBuffer() {} @@ -279,7 +279,7 @@ struct VCL_DLLPUBLIC BitmapBuffer // --------------------- VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect, - ULONG nDstBitmapFormat, BitmapPalette* pDstPal = NULL, ColorMask* pDstMask = NULL ); + sal_uLong nDstBitmapFormat, BitmapPalette* pDstPal = NULL, ColorMask* pDstMask = NULL ); // ------------------------------------------------------------------ @@ -287,17 +287,17 @@ inline BitmapColor::BitmapColor() : mcBlueOrIndex ( 0 ), mcGreen ( 0 ), mcRed ( 0 ), - mbIndex ( FALSE ) + mbIndex ( sal_False ) { } // ------------------------------------------------------------------ -inline BitmapColor::BitmapColor( BYTE cRed, BYTE cGreen, BYTE cBlue ) : +inline BitmapColor::BitmapColor( sal_uInt8 cRed, sal_uInt8 cGreen, sal_uInt8 cBlue ) : mcBlueOrIndex ( cBlue ), mcGreen ( cGreen ), mcRed ( cRed ), - mbIndex ( FALSE ) + mbIndex ( sal_False ) { } @@ -323,17 +323,17 @@ inline BitmapColor::BitmapColor( const Color& rColor ) : // ------------------------------------------------------------------ -inline BitmapColor::BitmapColor( BYTE cIndex ) : +inline BitmapColor::BitmapColor( sal_uInt8 cIndex ) : mcBlueOrIndex ( cIndex ), mcGreen ( 0 ), mcRed ( 0 ), - mbIndex ( TRUE ) + mbIndex ( sal_True ) { } // ------------------------------------------------------------------ -inline BOOL BitmapColor::operator==( const BitmapColor& rBitmapColor ) const +inline sal_Bool BitmapColor::operator==( const BitmapColor& rBitmapColor ) const { return( ( mcBlueOrIndex == rBitmapColor.mcBlueOrIndex ) && ( mbIndex ? rBitmapColor.mbIndex : @@ -342,7 +342,7 @@ inline BOOL BitmapColor::operator==( const BitmapColor& rBitmapColor ) const // ------------------------------------------------------------------ -inline BOOL BitmapColor::operator!=( const BitmapColor& rBitmapColor ) const +inline sal_Bool BitmapColor::operator!=( const BitmapColor& rBitmapColor ) const { return !( *this == rBitmapColor ); } @@ -361,14 +361,14 @@ inline BitmapColor& BitmapColor::operator=( const BitmapColor& rBitmapColor ) // ------------------------------------------------------------------ -inline BOOL BitmapColor::IsIndex() const +inline sal_Bool BitmapColor::IsIndex() const { return mbIndex; } // ------------------------------------------------------------------ -inline BYTE BitmapColor::GetRed() const +inline sal_uInt8 BitmapColor::GetRed() const { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); return mcRed; @@ -376,7 +376,7 @@ inline BYTE BitmapColor::GetRed() const // ------------------------------------------------------------------ -inline void BitmapColor::SetRed( BYTE cRed ) +inline void BitmapColor::SetRed( sal_uInt8 cRed ) { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); mcRed = cRed; @@ -384,7 +384,7 @@ inline void BitmapColor::SetRed( BYTE cRed ) // ------------------------------------------------------------------ -inline BYTE BitmapColor::GetGreen() const +inline sal_uInt8 BitmapColor::GetGreen() const { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); return mcGreen; @@ -392,7 +392,7 @@ inline BYTE BitmapColor::GetGreen() const // ------------------------------------------------------------------ -inline void BitmapColor::SetGreen( BYTE cGreen ) +inline void BitmapColor::SetGreen( sal_uInt8 cGreen ) { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); mcGreen = cGreen; @@ -400,7 +400,7 @@ inline void BitmapColor::SetGreen( BYTE cGreen ) // ------------------------------------------------------------------ -inline BYTE BitmapColor::GetBlue() const +inline sal_uInt8 BitmapColor::GetBlue() const { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); return mcBlueOrIndex; @@ -408,7 +408,7 @@ inline BYTE BitmapColor::GetBlue() const // ------------------------------------------------------------------ -inline void BitmapColor::SetBlue( BYTE cBlue ) +inline void BitmapColor::SetBlue( sal_uInt8 cBlue ) { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); mcBlueOrIndex = cBlue; @@ -416,7 +416,7 @@ inline void BitmapColor::SetBlue( BYTE cBlue ) // ------------------------------------------------------------------ -inline BYTE BitmapColor::GetIndex() const +inline sal_uInt8 BitmapColor::GetIndex() const { DBG_ASSERT( mbIndex, "Pixel represents color values!" ); return mcBlueOrIndex; @@ -424,7 +424,7 @@ inline BYTE BitmapColor::GetIndex() const // ------------------------------------------------------------------ -inline void BitmapColor::SetIndex( BYTE cIndex ) +inline void BitmapColor::SetIndex( sal_uInt8 cIndex ) { DBG_ASSERT( mbIndex, "Pixel represents color values!" ); mcBlueOrIndex = cIndex; @@ -440,7 +440,7 @@ inline BitmapColor::operator Color() const // ------------------------------------------------------------------ -inline BitmapColor::operator BYTE() const +inline BitmapColor::operator sal_uInt8() const { DBG_ASSERT( mbIndex, "Pixel represents color values!" ); return mcBlueOrIndex; @@ -448,7 +448,7 @@ inline BitmapColor::operator BYTE() const // ------------------------------------------------------------------ -inline BYTE BitmapColor::GetBlueOrIndex() const +inline sal_uInt8 BitmapColor::GetBlueOrIndex() const { // #i47518# Yield a value regardless of mbIndex return mcBlueOrIndex; @@ -466,39 +466,39 @@ inline BitmapColor& BitmapColor::Invert() // ------------------------------------------------------------------ -inline BYTE BitmapColor::GetLuminance() const +inline sal_uInt8 BitmapColor::GetLuminance() const { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); - return( (BYTE) ( ( mcBlueOrIndex * 28UL + mcGreen * 151UL + mcRed * 77UL ) >> 8UL ) ); + return( (sal_uInt8) ( ( mcBlueOrIndex * 28UL + mcGreen * 151UL + mcRed * 77UL ) >> 8UL ) ); } // ------------------------------------------------------------------ -inline BitmapColor& BitmapColor::IncreaseLuminance( BYTE cGreyInc ) +inline BitmapColor& BitmapColor::IncreaseLuminance( sal_uInt8 cGreyInc ) { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); - mcBlueOrIndex = (BYTE) MinMax( (long) mcBlueOrIndex + cGreyInc, 0L, 255L ); - mcGreen = (BYTE) MinMax( (long) mcGreen + cGreyInc, 0L, 255L ); - mcRed = (BYTE) MinMax( (long) mcRed + cGreyInc, 0L, 255L ); + mcBlueOrIndex = (sal_uInt8) MinMax( (long) mcBlueOrIndex + cGreyInc, 0L, 255L ); + mcGreen = (sal_uInt8) MinMax( (long) mcGreen + cGreyInc, 0L, 255L ); + mcRed = (sal_uInt8) MinMax( (long) mcRed + cGreyInc, 0L, 255L ); return *this; } // ------------------------------------------------------------------ -inline BitmapColor& BitmapColor::DecreaseLuminance( BYTE cGreyDec ) +inline BitmapColor& BitmapColor::DecreaseLuminance( sal_uInt8 cGreyDec ) { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); - mcBlueOrIndex = (BYTE) MinMax( (long) mcBlueOrIndex - cGreyDec, 0L, 255L ); - mcGreen = (BYTE) MinMax( (long) mcGreen - cGreyDec, 0L, 255L ); - mcRed = (BYTE) MinMax( (long) mcRed - cGreyDec, 0L, 255L ); + mcBlueOrIndex = (sal_uInt8) MinMax( (long) mcBlueOrIndex - cGreyDec, 0L, 255L ); + mcGreen = (sal_uInt8) MinMax( (long) mcGreen - cGreyDec, 0L, 255L ); + mcRed = (sal_uInt8) MinMax( (long) mcRed - cGreyDec, 0L, 255L ); return *this; } // ------------------------------------------------------------------ -inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, BYTE cTransparency ) +inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, sal_uInt8 cTransparency ) { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); DBG_ASSERT( !rBitmapColor.mbIndex, "Pixel represents index into colortable!" ); @@ -511,7 +511,7 @@ inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, BYTE cT // ------------------------------------------------------------------ -inline BitmapColor& BitmapColor::Merge( BYTE cR, BYTE cG, BYTE cB, BYTE cTransparency ) +inline BitmapColor& BitmapColor::Merge( sal_uInt8 cR, sal_uInt8 cG, sal_uInt8 cB, sal_uInt8 cTransparency ) { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); mcBlueOrIndex = COLOR_CHANNEL_MERGE( mcBlueOrIndex, cB, cTransparency ); @@ -523,11 +523,11 @@ inline BitmapColor& BitmapColor::Merge( BYTE cR, BYTE cG, BYTE cB, BYTE cTranspa // ------------------------------------------------------------------ -inline ULONG BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) const +inline sal_uLong BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) const { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); DBG_ASSERT( !rBitmapColor.mbIndex, "Pixel represents index into colortable!" ); - return( (ULONG) ( labs( mcBlueOrIndex - rBitmapColor.mcBlueOrIndex ) + + return( (sal_uLong) ( labs( mcBlueOrIndex - rBitmapColor.mcBlueOrIndex ) + labs( mcGreen - rBitmapColor.mcGreen ) + labs( mcRed - rBitmapColor.mcRed ) ) ); } @@ -547,8 +547,8 @@ inline BitmapPalette::BitmapPalette( const BitmapPalette& rBitmapPalette ) : { if( mnCount ) { - const ULONG nSize = mnCount * sizeof( BitmapColor ); - mpBitmapColor = (BitmapColor*) new BYTE[ nSize ]; + const sal_uLong nSize = mnCount * sizeof( BitmapColor ); + mpBitmapColor = (BitmapColor*) new sal_uInt8[ nSize ]; memcpy( mpBitmapColor, rBitmapPalette.mpBitmapColor, nSize ); } else @@ -557,13 +557,13 @@ inline BitmapPalette::BitmapPalette( const BitmapPalette& rBitmapPalette ) : // ------------------------------------------------------------------ -inline BitmapPalette::BitmapPalette( USHORT nCount ) : +inline BitmapPalette::BitmapPalette( sal_uInt16 nCount ) : mnCount( nCount ) { if( mnCount ) { - const ULONG nSize = mnCount * sizeof( BitmapColor ); - mpBitmapColor = (BitmapColor*) new BYTE[ nSize ]; + const sal_uLong nSize = mnCount * sizeof( BitmapColor ); + mpBitmapColor = (BitmapColor*) new sal_uInt8[ nSize ]; memset( mpBitmapColor, 0, nSize ); } else @@ -574,20 +574,20 @@ inline BitmapPalette::BitmapPalette( USHORT nCount ) : inline BitmapPalette::~BitmapPalette() { - delete[] (BYTE*) mpBitmapColor; + delete[] (sal_uInt8*) mpBitmapColor; } // ------------------------------------------------------------------ inline BitmapPalette& BitmapPalette::operator=( const BitmapPalette& rBitmapPalette ) { - delete[] (BYTE*) mpBitmapColor; + delete[] (sal_uInt8*) mpBitmapColor; mnCount = rBitmapPalette.mnCount; if( mnCount ) { - const ULONG nSize = mnCount * sizeof( BitmapColor ); - mpBitmapColor = (BitmapColor*) new BYTE[ nSize ]; + const sal_uLong nSize = mnCount * sizeof( BitmapColor ); + mpBitmapColor = (BitmapColor*) new sal_uInt8[ nSize ]; memcpy( mpBitmapColor, rBitmapPalette.mpBitmapColor, nSize ); } else @@ -598,19 +598,19 @@ inline BitmapPalette& BitmapPalette::operator=( const BitmapPalette& rBitmapPale // ------------------------------------------------------------------ -inline BOOL BitmapPalette::operator==( const BitmapPalette& rBitmapPalette ) const +inline sal_Bool BitmapPalette::operator==( const BitmapPalette& rBitmapPalette ) const { - BOOL bRet = FALSE; + sal_Bool bRet = sal_False; if( rBitmapPalette.mnCount == mnCount ) { - bRet = TRUE; + bRet = sal_True; - for( USHORT i = 0; i < mnCount; i++ ) + for( sal_uInt16 i = 0; i < mnCount; i++ ) { if( mpBitmapColor[ i ] != rBitmapPalette.mpBitmapColor[ i ] ) { - bRet = FALSE; + bRet = sal_False; break; } } @@ -621,44 +621,44 @@ inline BOOL BitmapPalette::operator==( const BitmapPalette& rBitmapPalette ) con // ------------------------------------------------------------------ -inline BOOL BitmapPalette::operator!=( const BitmapPalette& rBitmapPalette ) const +inline sal_Bool BitmapPalette::operator!=( const BitmapPalette& rBitmapPalette ) const { return !( *this == rBitmapPalette ); } // ------------------------------------------------------------------ -inline BOOL BitmapPalette::operator!() +inline sal_Bool BitmapPalette::operator!() { return( !mnCount || !mpBitmapColor ); } // ------------------------------------------------------------------ -inline USHORT BitmapPalette::GetEntryCount() const +inline sal_uInt16 BitmapPalette::GetEntryCount() const { return mnCount; } // ------------------------------------------------------------------ -inline void BitmapPalette::SetEntryCount( USHORT nCount ) +inline void BitmapPalette::SetEntryCount( sal_uInt16 nCount ) { if( !nCount ) { - delete[] (BYTE*) mpBitmapColor; + delete[] (sal_uInt8*) mpBitmapColor; mpBitmapColor = NULL; mnCount = 0; } else if( nCount != mnCount ) { - const ULONG nNewSize = nCount * sizeof( BitmapColor ); - const ULONG nMinSize = Min( mnCount, nCount ) * sizeof( BitmapColor ); - BYTE* pNewColor = new BYTE[ nNewSize ]; + const sal_uLong nNewSize = nCount * sizeof( BitmapColor ); + const sal_uLong nMinSize = Min( mnCount, nCount ) * sizeof( BitmapColor ); + sal_uInt8* pNewColor = new sal_uInt8[ nNewSize ]; if ( nMinSize && mpBitmapColor ) memcpy( pNewColor, mpBitmapColor, nMinSize ); - delete[] (BYTE*) mpBitmapColor; + delete[] (sal_uInt8*) mpBitmapColor; memset( pNewColor + nMinSize, 0, nNewSize - nMinSize ); mpBitmapColor = (BitmapColor*) pNewColor; mnCount = nCount; @@ -667,7 +667,7 @@ inline void BitmapPalette::SetEntryCount( USHORT nCount ) // ------------------------------------------------------------------ -inline const BitmapColor& BitmapPalette::operator[]( USHORT nIndex ) const +inline const BitmapColor& BitmapPalette::operator[]( sal_uInt16 nIndex ) const { DBG_ASSERT( nIndex < mnCount, "Palette index is out of range!" ); return mpBitmapColor[ nIndex ]; @@ -675,7 +675,7 @@ inline const BitmapColor& BitmapPalette::operator[]( USHORT nIndex ) const // ------------------------------------------------------------------ -inline BitmapColor& BitmapPalette::operator[]( USHORT nIndex ) +inline BitmapColor& BitmapPalette::operator[]( sal_uInt16 nIndex ) { DBG_ASSERT( nIndex < mnCount, "Palette index is out of range!" ); return mpBitmapColor[ nIndex ]; @@ -690,17 +690,17 @@ inline BitmapColor* BitmapPalette::ImplGetColorBuffer() const } // ------------------------------------------------------------------ -inline USHORT BitmapPalette::GetBestIndex( const BitmapColor& rCol ) const +inline sal_uInt16 BitmapPalette::GetBestIndex( const BitmapColor& rCol ) const { - USHORT nRetIndex = 0; + sal_uInt16 nRetIndex = 0; if( mpBitmapColor && mnCount ) { - BOOL bFound = FALSE; + sal_Bool bFound = sal_False; for( long j = 0L; ( j < mnCount ) && !bFound; j++ ) if( rCol == mpBitmapColor[ j ] ) - nRetIndex = ( (USHORT) j ), bFound = TRUE; + nRetIndex = ( (sal_uInt16) j ), bFound = sal_True; if( !bFound ) { @@ -708,7 +708,7 @@ inline USHORT BitmapPalette::GetBestIndex( const BitmapColor& rCol ) const for( long i = nRetIndex - 1; i >= 0L; i-- ) if ( ( nActErr = rCol.GetColorError( mpBitmapColor[ i ] ) ) < nLastErr ) - nLastErr = nActErr, nRetIndex = (USHORT) i; + nLastErr = nActErr, nRetIndex = (sal_uInt16) i; } } @@ -717,7 +717,7 @@ inline USHORT BitmapPalette::GetBestIndex( const BitmapColor& rCol ) const // ------------------------------------------------------------------ -inline ColorMask::ColorMask( ULONG nRedMask, ULONG nGreenMask, ULONG nBlueMask ) : +inline ColorMask::ColorMask( sal_uLong nRedMask, sal_uLong nGreenMask, sal_uLong nBlueMask ) : mnRMask( nRedMask ), mnGMask( nGreenMask ), mnBMask( nBlueMask ), @@ -735,48 +735,48 @@ inline ColorMask::ColorMask( ULONG nRedMask, ULONG nGreenMask, ULONG nBlueMask ) // ------------------------------------------------------------------ -inline long ColorMask::ImplCalcMaskShift( ULONG nMask, ULONG& rOr, ULONG& rOrShift ) const +inline long ColorMask::ImplCalcMaskShift( sal_uLong nMask, sal_uLong& rOr, sal_uLong& rOrShift ) const { long nShift; long nRet; - ULONG nLen = 0UL; + sal_uLong nLen = 0UL; // bei welchen Bits faengt die Maske an - for( nShift = 31L; ( nShift >= 0L ) && !( nMask & ( 1 << (ULONG) nShift ) ); nShift-- ) + for( nShift = 31L; ( nShift >= 0L ) && !( nMask & ( 1 << (sal_uLong) nShift ) ); nShift-- ) {} nRet = nShift; // XXX Anzahl der gesetzten Bits ermitteln => nach rechts bis Null laufen - while( ( nShift >= 0L ) && ( nMask & ( 1 << (ULONG) nShift ) ) ) + while( ( nShift >= 0L ) && ( nMask & ( 1 << (sal_uLong) nShift ) ) ) { nShift--; nLen++; } rOrShift = 8L - nLen; - rOr = (BYTE) ( ( 0xffUL >> nLen ) << rOrShift ); + rOr = (sal_uInt8) ( ( 0xffUL >> nLen ) << rOrShift ); return( nRet -= 7 ); } // ------------------------------------------------------------------ -inline ULONG ColorMask::GetRedMask() const +inline sal_uLong ColorMask::GetRedMask() const { return mnRMask; } // ------------------------------------------------------------------ -inline ULONG ColorMask::GetGreenMask() const +inline sal_uLong ColorMask::GetGreenMask() const { return mnGMask; } // ------------------------------------------------------------------ -inline ULONG ColorMask::GetBlueMask() const +inline sal_uLong ColorMask::GetBlueMask() const { return mnBMask; } @@ -785,7 +785,7 @@ inline ULONG ColorMask::GetBlueMask() const inline void ColorMask::GetColorFor8Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const { - const UINT32 nVal = *pPixel; + const sal_uInt32 nVal = *pPixel; MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); } @@ -793,7 +793,7 @@ inline void ColorMask::GetColorFor8Bit( BitmapColor& rColor, ConstHPBYTE pPixel inline void ColorMask::SetColorFor8Bit( const BitmapColor& rColor, HPBYTE pPixel ) const { - *pPixel = (BYTE) COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); + *pPixel = (sal_uInt8) COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); } // ------------------------------------------------------------------ @@ -801,9 +801,9 @@ inline void ColorMask::SetColorFor8Bit( const BitmapColor& rColor, HPBYTE pPixel inline void ColorMask::GetColorFor16BitMSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const { #ifdef OSL_BIGENDIAN - const UINT32 nVal = *(UINT16*) pPixel; + const sal_uInt32 nVal = *(sal_uInt16*) pPixel; #else - const UINT32 nVal = pPixel[ 1 ] | ( (UINT32) pPixel[ 0 ] << 8UL ); + const sal_uInt32 nVal = pPixel[ 1 ] | ( (sal_uInt32) pPixel[ 0 ] << 8UL ); #endif MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); @@ -813,13 +813,13 @@ inline void ColorMask::GetColorFor16BitMSB( BitmapColor& rColor, ConstHPBYTE pPi inline void ColorMask::SetColorFor16BitMSB( const BitmapColor& rColor, HPBYTE pPixel ) const { - const UINT16 nVal = (UINT16)COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); + const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); #ifdef OSL_BIGENDIAN - *(UINT16*) pPixel = nVal; + *(sal_uInt16*) pPixel = nVal; #else - pPixel[ 0 ] = (BYTE)(nVal >> 8U); - pPixel[ 1 ] = (BYTE) nVal; + pPixel[ 0 ] = (sal_uInt8)(nVal >> 8U); + pPixel[ 1 ] = (sal_uInt8) nVal; #endif } @@ -828,9 +828,9 @@ inline void ColorMask::SetColorFor16BitMSB( const BitmapColor& rColor, HPBYTE pP inline void ColorMask::GetColorFor16BitLSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const { #ifdef OSL_BIGENDIAN - const UINT32 nVal = pPixel[ 0 ] | ( (UINT32) pPixel[ 1 ] << 8UL ); + const sal_uInt32 nVal = pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ); #else - const UINT32 nVal = *(UINT16*) pPixel; + const sal_uInt32 nVal = *(sal_uInt16*) pPixel; #endif MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); @@ -840,13 +840,13 @@ inline void ColorMask::GetColorFor16BitLSB( BitmapColor& rColor, ConstHPBYTE pPi inline void ColorMask::SetColorFor16BitLSB( const BitmapColor& rColor, HPBYTE pPixel ) const { - const UINT16 nVal = (UINT16)COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); + const sal_uInt16 nVal = (sal_uInt16)COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); #ifdef OSL_BIGENDIAN - pPixel[ 0 ] = (BYTE) nVal; - pPixel[ 1 ] = (BYTE)(nVal >> 8U); + pPixel[ 0 ] = (sal_uInt8) nVal; + pPixel[ 1 ] = (sal_uInt8)(nVal >> 8U); #else - *(UINT16*) pPixel = nVal; + *(sal_uInt16*) pPixel = nVal; #endif } @@ -855,7 +855,7 @@ inline void ColorMask::SetColorFor16BitLSB( const BitmapColor& rColor, HPBYTE pP inline void ColorMask::GetColorFor24Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const { - const UINT32 nVal = pPixel[ 0 ] | ( (UINT32) pPixel[ 1 ] << 8UL ) | ( (UINT32) pPixel[ 2 ] << 16UL ); + const sal_uInt32 nVal = pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ) | ( (sal_uInt32) pPixel[ 2 ] << 16UL ); MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); } @@ -863,8 +863,8 @@ inline void ColorMask::GetColorFor24Bit( BitmapColor& rColor, ConstHPBYTE pPixel inline void ColorMask::SetColorFor24Bit( const BitmapColor& rColor, HPBYTE pPixel ) const { - const UINT32 nVal = COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); - pPixel[ 0 ] = (BYTE) nVal; pPixel[ 1 ] = (BYTE) ( nVal >> 8UL ); pPixel[ 2 ] = (BYTE) ( nVal >> 16UL ); + const sal_uInt32 nVal = COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); + pPixel[ 0 ] = (sal_uInt8) nVal; pPixel[ 1 ] = (sal_uInt8) ( nVal >> 8UL ); pPixel[ 2 ] = (sal_uInt8) ( nVal >> 16UL ); } // ------------------------------------------------------------------ @@ -872,10 +872,10 @@ inline void ColorMask::SetColorFor24Bit( const BitmapColor& rColor, HPBYTE pPixe inline void ColorMask::GetColorFor32Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const { #ifdef OSL_BIGENDIAN - const UINT32 nVal = (UINT32) pPixel[ 0 ] | ( (UINT32) pPixel[ 1 ] << 8UL ) | - ( (UINT32) pPixel[ 2 ] << 16UL ) | ( (UINT32) pPixel[ 3 ] << 24UL ); + const sal_uInt32 nVal = (sal_uInt32) pPixel[ 0 ] | ( (sal_uInt32) pPixel[ 1 ] << 8UL ) | + ( (sal_uInt32) pPixel[ 2 ] << 16UL ) | ( (sal_uInt32) pPixel[ 3 ] << 24UL ); #else - const UINT32 nVal = *(UINT32*) pPixel; + const sal_uInt32 nVal = *(sal_uInt32*) pPixel; #endif MASK_TO_COLOR( nVal, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift, rColor ); @@ -886,11 +886,11 @@ inline void ColorMask::GetColorFor32Bit( BitmapColor& rColor, ConstHPBYTE pPixel inline void ColorMask::SetColorFor32Bit( const BitmapColor& rColor, HPBYTE pPixel ) const { #ifdef OSL_BIGENDIAN - const UINT32 nVal = COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); - pPixel[ 0 ] = (BYTE) nVal; pPixel[ 1 ] = (BYTE) ( nVal >> 8UL ); - pPixel[ 2 ] = (BYTE) ( nVal >> 16UL ); pPixel[ 3 ] = (BYTE) ( nVal >> 24UL ); + const sal_uInt32 nVal = COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); + pPixel[ 0 ] = (sal_uInt8) nVal; pPixel[ 1 ] = (sal_uInt8) ( nVal >> 8UL ); + pPixel[ 2 ] = (sal_uInt8) ( nVal >> 16UL ); pPixel[ 3 ] = (sal_uInt8) ( nVal >> 24UL ); #else - *(UINT32*) pPixel = COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); + *(sal_uInt32*) pPixel = COLOR_TO_MASK( rColor, mnRMask, mnGMask, mnBMask, mnRShift, mnGShift, mnBShift ); #endif } diff --git a/vcl/inc/vcl/salctrlhandle.hxx b/vcl/inc/vcl/salctrlhandle.hxx deleted file mode 100644 index 2cdb5af3a3e5..000000000000 --- a/vcl/inc/vcl/salctrlhandle.hxx +++ /dev/null @@ -1,51 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_SALCTRLHANDLE_HXX -#define _SV_SALCTRLHANDLE_HXX - -/* SalControlHandle: - * - * Container for platform-specific handles and data - * about controls. Lives as long as the VCL control - * lives. - */ - -class SalControlHandle -{ - public: - SalControlHandle() {} - virtual ~SalControlHandle(); - - // TODO: derive Sal implementation - //SalControlHandleData maData; -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/salctype.hxx b/vcl/inc/vcl/salctype.hxx index c7136b98b5bf..93eb69bd439d 100644 --- a/vcl/inc/vcl/salctype.hxx +++ b/vcl/inc/vcl/salctype.hxx @@ -29,6 +29,9 @@ #ifndef _SV_SALCTYPE_HXX #define _SV_SALCTYPE_HXX +#include <com/sun/star/script/XInvocation.hpp> +#include <com/sun/star/uno/Reference.hxx> + #include <vcl/graph.hxx> // ----------- @@ -63,9 +66,9 @@ public: Graphic maGraphic; SvStream& mrStm; - ULONG mnFormat; + sal_uLong mnFormat; - ConvertData( const Graphic& rGraphic, SvStream& rStm, ULONG nFormat ) : + ConvertData( const Graphic& rGraphic, SvStream& rStm, sal_uLong nFormat ) : maGraphic( rGraphic ), mrStm( rStm ), mnFormat( nFormat ) {} ~ConvertData() {} }; @@ -74,9 +77,18 @@ public: // - Callback - // ------------ -typedef ULONG (*SALGRFCVTPROC)( void* pInst, - ULONG nInFormat, void* pInBuffer, ULONG nInBufSize, - ULONG nOutFormat, void** ppOutBuffer ); +typedef sal_uLong (*SALGRFCVTPROC)( void* pInst, + sal_uLong nInFormat, void* pInBuffer, sal_uLong nInBufSize, + sal_uLong nOutFormat, void** ppOutBuffer ); + +// ------------------- +// - BitmapConverter - +// ------------------- + +namespace vcl +{ +com::sun::star::uno::Reference< com::sun::star::script::XInvocation > createBmpConverter(); +} #endif // _SV_SALCTYPE_HXX diff --git a/vcl/inc/vcl/saldatabasic.hxx b/vcl/inc/vcl/saldatabasic.hxx index c4716507e7e6..e080cb91ff99 100644 --- a/vcl/inc/vcl/saldatabasic.hxx +++ b/vcl/inc/vcl/saldatabasic.hxx @@ -33,11 +33,17 @@ #include <vcl/salinst.hxx> #include <osl/module.h> -class VCL_DLLPUBLIC SalData +namespace psp +{ + class PrinterInfoManager; +} + +class VCL_PLUGIN_PUBLIC SalData { public: - SalInstance* m_pInstance; // pointer to instance - oslModule m_pPlugin; // plugin library handle + SalInstance* m_pInstance; // pointer to instance + oslModule m_pPlugin; // plugin library handle + psp::PrinterInfoManager* m_pPIManager; SalData(); virtual ~SalData(); diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx index c1fa3e2b9eb4..f5b98756f5f6 100644 --- a/vcl/inc/vcl/salframe.hxx +++ b/vcl/inc/vcl/salframe.hxx @@ -62,55 +62,55 @@ struct SystemEnvData; // - SalFrameTypes - // ----------------- -#define SAL_FRAME_TOTOP_RESTOREWHENMIN ((USHORT)0x0001) -#define SAL_FRAME_TOTOP_FOREGROUNDTASK ((USHORT)0x0002) -#define SAL_FRAME_TOTOP_GRABFOCUS ((USHORT)0x0004) -#define SAL_FRAME_TOTOP_GRABFOCUS_ONLY ((USHORT)0x0008) +#define SAL_FRAME_TOTOP_RESTOREWHENMIN ((sal_uInt16)0x0001) +#define SAL_FRAME_TOTOP_FOREGROUNDTASK ((sal_uInt16)0x0002) +#define SAL_FRAME_TOTOP_GRABFOCUS ((sal_uInt16)0x0004) +#define SAL_FRAME_TOTOP_GRABFOCUS_ONLY ((sal_uInt16)0x0008) -#define SAL_FRAME_ENDEXTTEXTINPUT_COMPLETE ((USHORT)0x0001) -#define SAL_FRAME_ENDEXTTEXTINPUT_CANCEL ((USHORT)0x0002) +#define SAL_FRAME_ENDEXTTEXTINPUT_COMPLETE ((sal_uInt16)0x0001) +#define SAL_FRAME_ENDEXTTEXTINPUT_CANCEL ((sal_uInt16)0x0002) // ----------------- // - SalFrameStyle - // ----------------- -#define SAL_FRAME_STYLE_DEFAULT ((ULONG)0x00000001) -#define SAL_FRAME_STYLE_MOVEABLE ((ULONG)0x00000002) -#define SAL_FRAME_STYLE_SIZEABLE ((ULONG)0x00000004) -#define SAL_FRAME_STYLE_CLOSEABLE ((ULONG)0x00000008) +#define SAL_FRAME_STYLE_DEFAULT ((sal_uLong)0x00000001) +#define SAL_FRAME_STYLE_MOVEABLE ((sal_uLong)0x00000002) +#define SAL_FRAME_STYLE_SIZEABLE ((sal_uLong)0x00000004) +#define SAL_FRAME_STYLE_CLOSEABLE ((sal_uLong)0x00000008) // no shadow effect on WindowsXP -#define SAL_FRAME_STYLE_NOSHADOW ((ULONG)0x00000010) +#define SAL_FRAME_STYLE_NOSHADOW ((sal_uLong)0x00000010) // indicate tooltip windows, so they can always be topmost -#define SAL_FRAME_STYLE_TOOLTIP ((ULONG)0x00000020) +#define SAL_FRAME_STYLE_TOOLTIP ((sal_uLong)0x00000020) // windows without windowmanager decoration, this typically only applies to floating windows -#define SAL_FRAME_STYLE_OWNERDRAWDECORATION ((ULONG)0x00000040) +#define SAL_FRAME_STYLE_OWNERDRAWDECORATION ((sal_uLong)0x00000040) // dialogs -#define SAL_FRAME_STYLE_DIALOG ((ULONG)0x00000080) +#define SAL_FRAME_STYLE_DIALOG ((sal_uLong)0x00000080) // partial fullscreen: fullscreen on one monitor of a multimonitor display -#define SAL_FRAME_STYLE_PARTIAL_FULLSCREEN ((ULONG)0x00800000) +#define SAL_FRAME_STYLE_PARTIAL_FULLSCREEN ((sal_uLong)0x00800000) // plugged system child window -#define SAL_FRAME_STYLE_PLUG ((ULONG)0x10000000) +#define SAL_FRAME_STYLE_PLUG ((sal_uLong)0x10000000) // system child window inside another SalFrame -#define SAL_FRAME_STYLE_SYSTEMCHILD ((ULONG)0x08000000) +#define SAL_FRAME_STYLE_SYSTEMCHILD ((sal_uLong)0x08000000) // floating window -#define SAL_FRAME_STYLE_FLOAT ((ULONG)0x20000000) +#define SAL_FRAME_STYLE_FLOAT ((sal_uLong)0x20000000) // floating window that needs to be focusable -#define SAL_FRAME_STYLE_FLOAT_FOCUSABLE ((ULONG)0x04000000) +#define SAL_FRAME_STYLE_FLOAT_FOCUSABLE ((sal_uLong)0x04000000) // toolwindows should be painted with a smaller decoration -#define SAL_FRAME_STYLE_TOOLWINDOW ((ULONG)0x40000000) +#define SAL_FRAME_STYLE_TOOLWINDOW ((sal_uLong)0x40000000) // the window containing the intro bitmap, aka splashscreen -#define SAL_FRAME_STYLE_INTRO ((ULONG)0x80000000) +#define SAL_FRAME_STYLE_INTRO ((sal_uLong)0x80000000) /* -#define SAL_FRAME_STYLE_MINABLE ((ULONG)0x00000008) -#define SAL_FRAME_STYLE_MAXABLE ((ULONG)0x00000010) -#define SAL_FRAME_STYLE_BORDER ((ULONG)0x00000040) -#define SAL_FRAME_STYLE_DOC ((ULONG)0x00004000) -#define SAL_FRAME_STYLE_DIALOG ((ULONG)0x00008000) -#define SAL_FRAME_STYLE_TOOL ((ULONG)0x00010000) -#define SAL_FRAME_STYLE_FULLSIZE ((ULONG)0x00020000) +#define SAL_FRAME_STYLE_MINABLE ((sal_uLong)0x00000008) +#define SAL_FRAME_STYLE_MAXABLE ((sal_uLong)0x00000010) +#define SAL_FRAME_STYLE_BORDER ((sal_uLong)0x00000040) +#define SAL_FRAME_STYLE_DOC ((sal_uLong)0x00004000) +#define SAL_FRAME_STYLE_DIALOG ((sal_uLong)0x00008000) +#define SAL_FRAME_STYLE_TOOL ((sal_uLong)0x00010000) +#define SAL_FRAME_STYLE_FULLSIZE ((sal_uLong)0x00020000) */ // ---------------------------------------- @@ -125,10 +125,10 @@ typedef sal_uInt64 SalExtStyle; // - Flags for SetPosSize - // ------------------------ -#define SAL_FRAME_POSSIZE_X ((USHORT)0x0001) -#define SAL_FRAME_POSSIZE_Y ((USHORT)0x0002) -#define SAL_FRAME_POSSIZE_WIDTH ((USHORT)0x0004) -#define SAL_FRAME_POSSIZE_HEIGHT ((USHORT)0x0008) +#define SAL_FRAME_POSSIZE_X ((sal_uInt16)0x0001) +#define SAL_FRAME_POSSIZE_Y ((sal_uInt16)0x0002) +#define SAL_FRAME_POSSIZE_WIDTH ((sal_uInt16)0x0004) +#define SAL_FRAME_POSSIZE_HEIGHT ((sal_uInt16)0x0008) #ifdef __cplusplus @@ -141,7 +141,7 @@ using ::rtl::OString; struct SystemParentData; -class VCL_DLLPUBLIC SalFrame : public vcl::DeletionNotifier +class VCL_PLUGIN_PUBLIC SalFrame : public vcl::DeletionNotifier { // the VCL window corresponding to this frame Window* m_pWindow; @@ -161,10 +161,10 @@ public: // Event must be destroyed, when Frame is destroyed // When Event is called, SalInstance::Yield() must be returned - virtual BOOL PostEvent( void* pData ) = 0; + virtual sal_Bool PostEvent( void* pData ) = 0; virtual void SetTitle( const XubString& rTitle ) = 0; - virtual void SetIcon( USHORT nIcon ) = 0; + virtual void SetIcon( sal_uInt16 nIcon ) = 0; virtual void SetRepresentedURL( const rtl::OUString& ); virtual void SetMenu( SalMenu *pSalMenu ) = 0; virtual void DrawMenuBar() = 0; @@ -173,13 +173,13 @@ public: // Before the window is visible, a resize event // must be sent with the correct size - virtual void Show( BOOL bVisible, BOOL bNoActivate = FALSE ) = 0; - virtual void Enable( BOOL bEnable ) = 0; + virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ) = 0; + virtual void Enable( sal_Bool bEnable ) = 0; // Set ClientSize and Center the Window to the desktop // and send/post a resize message virtual void SetMinClientSize( long nWidth, long nHeight ) = 0; virtual void SetMaxClientSize( long nWidth, long nHeight ) = 0; - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags ) = 0; + virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ) = 0; virtual void GetClientSize( long& rWidth, long& rHeight ) = 0; virtual void GetWorkArea( Rectangle& rRect ) = 0; virtual SalFrame* GetParent() const = 0; @@ -187,20 +187,20 @@ public: SalFrameGeometry GetGeometry(); const SalFrameGeometry& GetUnmirroredGeometry() const { return maGeometry; } virtual void SetWindowState( const SalFrameState* pState ) = 0; - virtual BOOL GetWindowState( SalFrameState* pState ) = 0; - virtual void ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay ) = 0; + virtual sal_Bool GetWindowState( SalFrameState* pState ) = 0; + virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ) = 0; // Enable/Disable ScreenSaver, SystemAgents, ... - virtual void StartPresentation( BOOL bStart ) = 0; + virtual void StartPresentation( sal_Bool bStart ) = 0; // Show Window over all other Windows - virtual void SetAlwaysOnTop( BOOL bOnTop ) = 0; + virtual void SetAlwaysOnTop( sal_Bool bOnTop ) = 0; // Window to top and grab focus - virtual void ToTop( USHORT nFlags ) = 0; + virtual void ToTop( sal_uInt16 nFlags ) = 0; // this function can call with the same // pointer style virtual void SetPointer( PointerStyle ePointerStyle ) = 0; - virtual void CaptureMouse( BOOL bMouse ) = 0; + virtual void CaptureMouse( sal_Bool bMouse ) = 0; virtual void SetPointerPos( long nX, long nY ) = 0; // flush output buffer @@ -210,15 +210,15 @@ public: virtual void Sync() = 0; virtual void SetInputContext( SalInputContext* pContext ) = 0; - virtual void EndExtTextInput( USHORT nFlags ) = 0; + virtual void EndExtTextInput( sal_uInt16 nFlags ) = 0; - virtual String GetKeyName( USHORT nKeyCode ) = 0; - virtual String GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode ) = 0; + virtual String GetKeyName( sal_uInt16 nKeyCode ) = 0; + virtual String GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode ) = 0; // returns in 'rKeyCode' the single keycode that translates to the given unicode when using a keyboard layout of language 'aLangType' - // returns FALSE if no mapping exists or function not supported + // returns sal_False if no mapping exists or function not supported // this is required for advanced menu support - virtual BOOL MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) = 0; + virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ) = 0; // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS @@ -242,7 +242,7 @@ public: // get current modifier, button mask and mouse position struct SalPointerState { - ULONG mnState; + sal_uLong mnState; Point maPos; // in frame coordinates }; @@ -250,12 +250,12 @@ public: struct SalIndicatorState { - USHORT mnState; + sal_uInt16 mnState; }; virtual SalIndicatorState GetIndicatorState() = 0; - virtual void SimulateKeyPress( USHORT nKeyCode ) = 0; + virtual void SimulateKeyPress( sal_uInt16 nKeyCode ) = 0; // set new parent window virtual void SetParent( SalFrame* pNewParent ) = 0; @@ -273,13 +273,12 @@ public: // set clip region to none (-> rectangular windows, normal state) virtual void ResetClipRegion() = 0; // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( ULONG nRects ) = 0; + virtual void BeginSetClipRegion( sal_uLong nRects ) = 0; // add a rectangle to the clip region virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0; // done setting up the clipregion virtual void EndSetClipRegion() = 0; - // Callbacks (indepent part in vcl/source/window/winproc.cxx) // for default message handling return 0 void SetCallback( Window* pWindow, SALFRAMEPROC pProc ) @@ -291,7 +290,7 @@ public: // Call the callback set; this sometimes necessary for implementation classes // that should not now more than necessary about the SalFrame implementation // (e.g. input methods, printer update handlers). - long CallCallback( USHORT nEvent, const void* pEvent ) const + long CallCallback( sal_uInt16 nEvent, const void* pEvent ) const { return m_pProc ? m_pProc( m_pWindow, const_cast<SalFrame*>(this), nEvent, pEvent ) : 0; } }; diff --git a/vcl/inc/vcl/salgdi.hxx b/vcl/inc/vcl/salgdi.hxx index 20220151cafc..5b9e59f68d8f 100644..100755 --- a/vcl/inc/vcl/salgdi.hxx +++ b/vcl/inc/vcl/salgdi.hxx @@ -37,7 +37,6 @@ #include "osl/thread.hxx" #include "vcl/outdev.hxx" #include "vcl/salnativewidgets.hxx" -#include "vcl/salctrlhandle.hxx" #include <map> @@ -67,13 +66,13 @@ namespace basegfx { // - SalGraphics-Codes - // --------------------- -#define SAL_SETFONT_REMOVEANDMATCHNEW ((USHORT)0x0001) -#define SAL_SETFONT_USEDRAWTEXT ((USHORT)0x0002) -#define SAL_SETFONT_USEDRAWTEXTARRAY ((USHORT)0x0004) -#define SAL_SETFONT_UNICODE ((USHORT)0x0008) -#define SAL_SETFONT_BADFONT ((USHORT)0x1000) +#define SAL_SETFONT_REMOVEANDMATCHNEW ((sal_uInt16)0x0001) +#define SAL_SETFONT_USEDRAWTEXT ((sal_uInt16)0x0002) +#define SAL_SETFONT_USEDRAWTEXTARRAY ((sal_uInt16)0x0004) +#define SAL_SETFONT_UNICODE ((sal_uInt16)0x0008) +#define SAL_SETFONT_BADFONT ((sal_uInt16)0x1000) -#define SAL_COPYAREA_WINDOWINVALIDATE ((USHORT)0x0001) +#define SAL_COPYAREA_WINDOWINVALIDATE ((sal_uInt16)0x0001) // ------------------- // - common typedefs - @@ -98,7 +97,7 @@ typedef std::vector< sal_Int32 > Int32Vector; // note: all positions are in pixel and relative to // the top/left-position of the virtual output area -class VCL_DLLPUBLIC SalGraphics +class VCL_PLUGIN_PUBLIC SalGraphics { int m_nLayout; // 0: mirroring off, 1: mirror x-axis @@ -115,25 +114,24 @@ public: virtual ~SalGraphics(); protected: - virtual BOOL unionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0; - virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ) = 0; + virtual bool setClipRegion( const Region& ) = 0; // draw --> LineColor and FillColor and RasterOp and ClipRegion virtual void drawPixel( long nX, long nY ) = 0; virtual void drawPixel( long nX, long nY, SalColor nSalColor ) = 0; virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ) = 0; virtual void drawRect( long nX, long nY, long nWidth, long nHeight ) = 0; - virtual void drawPolyLine( ULONG nPoints, const SalPoint* pPtAry ) = 0; - virtual void drawPolygon( ULONG nPoints, const SalPoint* pPtAry ) = 0; + virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry ) = 0; + virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ) = 0; virtual void drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) = 0; virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ) = 0; virtual bool drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin ) = 0; - virtual sal_Bool drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) = 0; - virtual sal_Bool drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) = 0; - virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) = 0; + virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; + virtual sal_Bool drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) = 0; + virtual sal_Bool drawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) = 0; // CopyArea --> No RasterOp, but ClipRegion virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, - long nSrcHeight, USHORT nFlags ) = 0; + long nSrcHeight, sal_uInt16 nFlags ) = 0; // CopyBits and DrawBitmap --> RasterOp and ClipRegion // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics @@ -154,20 +152,20 @@ protected: // invert --> ClipRegion (only Windows or VirDevs) virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) = 0; - virtual void invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0; + virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags ) = 0; - virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ) = 0; + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ) = 0; // native widget rendering methods that require mirroring - virtual BOOL hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - const Point& aPos, BOOL& rIsInside ); - virtual BOOL drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + const Point& aPos, sal_Bool& rIsInside ); + virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& aCaption ); - virtual BOOL drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual sal_Bool drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& aCaption ); - virtual BOOL getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, + virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); @@ -200,17 +198,12 @@ public: // get device resolution virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) = 0; // get the depth of the device - virtual USHORT GetBitCount() const = 0; + virtual sal_uInt16 GetBitCount() const = 0; // get the width of the device virtual long GetGraphicsWidth() const = 0; // set the clip region to empty virtual void ResetClipRegion() = 0; - // begin setting the clip region, add rectangles to the - // region with the UnionClipRegion call - virtual void BeginSetClipRegion( ULONG nCount ) = 0; - // all rectangles were added and the clip region should be set now - virtual void EndSetClipRegion() = 0; // set the line color to transparent (= don't draw lines) virtual void SetLineColor() = 0; @@ -230,7 +223,7 @@ public: // set the text color to a specific color virtual void SetTextColor( SalColor nSalColor ) = 0; // set the font - virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel ) = 0; + virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ) = 0; // release the fonts void ReleaseFonts() { SetFont( NULL, 0 ); } // get the current font's metrics @@ -238,9 +231,9 @@ public: // get kernign pairs of the current font // return only PairCount if (pKernPairs == NULL) - virtual ULONG GetKernPairs( ULONG nMaxPairCount, ImplKernPairData* ) = 0; + virtual sal_uLong GetKernPairs( sal_uLong nMaxPairCount, ImplKernPairData* ) = 0; // get the repertoire of the current font - virtual ImplFontCharMap* GetImplFontCharMap() const = 0; + virtual const ImplFontCharMap* GetImplFontCharMap() const = 0; // get the layout capabilities of the current font virtual bool GetImplFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const = 0; // graphics must fill supplied font list @@ -251,7 +244,7 @@ public: virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName ) = 0; // CreateFontSubset: a method to get a subset of glyhps of a font // inside a new valid font file - // returns TRUE if creation of subset was successfull + // returns sal_True if creation of subset was successfull // parameters: rToFile: contains a osl file URL to write the subset to // pFont: describes from which font to create a subset // pGlyphIDs: the glyph ids to be extracted @@ -261,7 +254,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual BOOL CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, const ImplFontData* pFont, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, @@ -305,8 +298,8 @@ public: Int32Vector& rWidths, Ucs2UIntMap& rUnicodeEnc ) = 0; - virtual BOOL GetGlyphBoundRect( long nIndex, Rectangle& ) = 0; - virtual BOOL GetGlyphOutline( long nIndex, basegfx::B2DPolyPolygon& ) = 0; + virtual sal_Bool GetGlyphBoundRect( long nIndex, Rectangle& ) = 0; + virtual sal_Bool GetGlyphOutline( long nIndex, basegfx::B2DPolyPolygon& ) = 0; virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) = 0; virtual void DrawServerFontLayout( const ServerFontLayout& ) = 0; @@ -351,7 +344,7 @@ public: void mirror( long& nX, const OutputDevice *pOutDev, bool bBack = false ) const; void mirror( long& nX, long& nWidth, const OutputDevice *pOutDev, bool bBack = false ) const; - BOOL mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack = false ) const; + sal_Bool mirror( sal_uInt32 nPoints, const SalPoint *pPtAry, SalPoint *pPtAry2, const OutputDevice *pOutDev, bool bBack = false ) const; void mirror( Rectangle& rRect, const OutputDevice*, bool bBack = false ) const; void mirror( Region& rRgn, const OutputDevice *pOutDev, bool bBack = false ) const; void mirror( ControlType,const ImplControlValue&,const OutputDevice*,bool bBack = false) const; @@ -359,36 +352,35 @@ public: basegfx::B2DPolygon mirror( const basegfx::B2DPolygon& i_rPoly, const OutputDevice *pOutDev, bool bBack = false ) const; basegfx::B2DPolyPolygon mirror( const basegfx::B2DPolyPolygon& i_rPoly, const OutputDevice *pOutDev, bool bBack = false ) const; - // non virtual methods; these do eventual coordinate mirroring and + // non virtual methods; these do possible coordinate mirroring and // then delegate to protected virtual methods - BOOL UnionClipRegion( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev ); - BOOL UnionClipRegion( const ::basegfx::B2DPolyPolygon&, const OutputDevice* ); + bool SetClipRegion( const Region&, const OutputDevice *pOutDev ); // draw --> LineColor and FillColor and RasterOp and ClipRegion void DrawPixel( long nX, long nY, const OutputDevice *pOutDev ); void DrawPixel( long nX, long nY, SalColor nSalColor, const OutputDevice *pOutDev ); void DrawLine( long nX1, long nY1, long nX2, long nY2, const OutputDevice *pOutDev ); void DrawRect( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev ); - void DrawPolyLine( ULONG nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ); - void DrawPolygon( ULONG nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ); + void DrawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ); + void DrawPolygon( sal_uLong nPoints, const SalPoint* pPtAry, const OutputDevice *pOutDev ); void DrawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry, const OutputDevice *pOutDev ); bool DrawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency, const OutputDevice* ); bool DrawPolyLine( const basegfx::B2DPolygon&, double fTransparency, const basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin, const OutputDevice* ); - sal_Bool DrawPolyLineBezier( ULONG nPoints, + sal_Bool DrawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, - const BYTE* pFlgAry, + const sal_uInt8* pFlgAry, const OutputDevice *pOutDev ); - sal_Bool DrawPolygonBezier( ULONG nPoints, + sal_Bool DrawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, - const BYTE* pFlgAry, + const sal_uInt8* pFlgAry, const OutputDevice *pOutDev ); sal_Bool DrawPolyPolygonBezier( sal_uInt32 nPoly, const sal_uInt32* pPoints, const SalPoint* const* pPtAry, - const BYTE* const* pFlgAry, + const sal_uInt8* const* pFlgAry, const OutputDevice *pOutDev ); // CopyArea --> No RasterOp, but ClipRegion @@ -398,7 +390,7 @@ public: long nSrcY, long nSrcWidth, long nSrcHeight, - USHORT nFlags, + sal_uInt16 nFlags, const OutputDevice *pOutDev ); // CopyBits and DrawBitmap --> RasterOp and ClipRegion @@ -429,27 +421,27 @@ public: // invert --> ClipRegion (only Windows) void Invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags, const OutputDevice *pOutDev ); - void Invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev ); + void Invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags, const OutputDevice *pOutDev ); - BOOL DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize, const OutputDevice *pOutDev ); + sal_Bool DrawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize, const OutputDevice *pOutDev ); //------------------------------------- // Native Widget Rendering functions //------------------------------------- // Query the platform layer for control support - virtual BOOL IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); // Query the native control to determine if it was acted upon - BOOL HitTestNativeControl( ControlType nType, + sal_Bool HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, - BOOL& rIsInside, + sal_Bool& rIsInside, const OutputDevice *pOutDev ); // Request rendering of a particular control and/or part - BOOL DrawNativeControl( ControlType nType, + sal_Bool DrawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -458,7 +450,7 @@ public: const OutputDevice *pOutDev ); // Request rendering of a caption string for a control - BOOL DrawNativeControlText( ControlType nType, + sal_Bool DrawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -467,7 +459,7 @@ public: const OutputDevice *pOutDev ); // Query the native control's actual drawing region (including adornment) - BOOL GetNativeControlRegion( ControlType nType, + sal_Bool GetNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -480,7 +472,7 @@ public: static void AddDevFontSubstitute( OutputDevice* pOutDev, const String& rFontName, const String& rReplaceFontName, - USHORT nFlags = 0 ); + sal_uInt16 nFlags = 0 ); bool DrawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, diff --git a/vcl/inc/vcl/salgtype.hxx b/vcl/inc/vcl/salgtype.hxx index d6f0b6d7de2f..7f994f452f2c 100644 --- a/vcl/inc/vcl/salgtype.hxx +++ b/vcl/inc/vcl/salgtype.hxx @@ -35,11 +35,11 @@ // - SalColor - // ------------ -typedef UINT32 SalColor; -#define MAKE_SALCOLOR( r, g, b ) ((SalColor)(((UINT32)((UINT8)(b))))|(((UINT32)((UINT8)(g)))<<8)|(((UINT32)((UINT8)(r)))<<16)) -#define SALCOLOR_RED( n ) ((UINT8)((n)>>16)) -#define SALCOLOR_GREEN( n ) ((UINT8)(((UINT16)(n)) >> 8)) -#define SALCOLOR_BLUE( n ) ((UINT8)(n)) +typedef sal_uInt32 SalColor; +#define MAKE_SALCOLOR( r, g, b ) ((SalColor)(((sal_uInt32)((sal_uInt8)(b))))|(((sal_uInt32)((sal_uInt8)(g)))<<8)|(((sal_uInt32)((sal_uInt8)(r)))<<16)) +#define SALCOLOR_RED( n ) ((sal_uInt8)((n)>>16)) +#define SALCOLOR_GREEN( n ) ((sal_uInt8)(((sal_uInt16)(n)) >> 8)) +#define SALCOLOR_BLUE( n ) ((sal_uInt8)(n)) #define SALCOLOR_NONE (~(SalColor)0) // ------------ // - SalPoint - @@ -74,7 +74,7 @@ struct SalTwoRect // - SalROPColor - // --------------- -typedef USHORT SalROPColor; +typedef sal_uInt16 SalROPColor; #define SAL_ROP_0 ((SalROPColor)0) #define SAL_ROP_1 ((SalROPColor)1) #define SAL_ROP_INVERT ((SalROPColor)2) @@ -83,7 +83,7 @@ typedef USHORT SalROPColor; // - SalInvert - // ------------- -typedef USHORT SalInvert; +typedef sal_uInt16 SalInvert; #define SAL_INVERT_HIGHLIGHT ((SalInvert)0x0001) #define SAL_INVERT_50 ((SalInvert)0x0002) #define SAL_INVERT_TRACKFRAME ((SalInvert)0x0004) diff --git a/vcl/inc/vcl/salimestatus.hxx b/vcl/inc/vcl/salimestatus.hxx index 76255e4f495c..13362c20071d 100644 --- a/vcl/inc/vcl/salimestatus.hxx +++ b/vcl/inc/vcl/salimestatus.hxx @@ -31,7 +31,7 @@ #include <vcl/dllapi.h> -class VCL_DLLPUBLIC SalI18NImeStatus +class VCL_PLUGIN_PUBLIC SalI18NImeStatus { public: SalI18NImeStatus() {} diff --git a/vcl/inc/vcl/salinst.hxx b/vcl/inc/vcl/salinst.hxx index 45c354ff4d5c..d878dd7fea80 100644 --- a/vcl/inc/vcl/salinst.hxx +++ b/vcl/inc/vcl/salinst.hxx @@ -32,10 +32,12 @@ #include "com/sun/star/uno/Reference.hxx" #include "vcl/sv.h" +#include "vcl/displayconnectiondispatch.hxx" #include "vcl/dllapi.h" #include "tools/string.hxx" +#include "rtl/ref.hxx" #include "rtl/string.hxx" #include <list> @@ -61,38 +63,29 @@ struct SalItemParams; class SalSession; struct SystemGraphicsData; struct SystemWindowData; +class Menu; // --------------- // - SalInstance - // --------------- -class VCL_DLLPUBLIC SalInstance +class VCL_PLUGIN_PUBLIC SalInstance { -public: - typedef bool(*Callback)(void*,void*,int); private: - void* m_pEventInst; - void* m_pErrorInst; - Callback m_pEventCallback; - Callback m_pErrorCallback; + rtl::Reference< vcl::DisplayConnectionDispatch > m_pEventInst; public: - SalInstance() : - m_pEventInst( NULL ), - m_pErrorInst( NULL ), - m_pEventCallback( NULL ), - m_pErrorCallback( NULL ) - {} + SalInstance() {} virtual ~SalInstance(); // Frame // DisplayName for Unix ??? - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, ULONG nStyle ) = 0; - virtual SalFrame* CreateFrame( SalFrame* pParent, ULONG nStyle ) = 0; + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ) = 0; + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ) = 0; virtual void DestroyFrame( SalFrame* pFrame ) = 0; // Object (System Child Window) - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE ) = 0; + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ) = 0; virtual void DestroyObject( SalObject* pObject ) = 0; // VirtualDevice @@ -101,7 +94,7 @@ public: // pData allows for using a system dependent graphics or device context virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, long nDX, long nDY, - USHORT nBitCount, const SystemGraphicsData *pData = NULL ) = 0; + sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ) = 0; virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice ) = 0; // Printer @@ -130,42 +123,34 @@ public: // YieldMutex virtual osl::SolarMutex* GetYieldMutex() = 0; - virtual ULONG ReleaseYieldMutex() = 0; - virtual void AcquireYieldMutex( ULONG nCount ) = 0; + virtual sal_uLong ReleaseYieldMutex() = 0; + virtual void AcquireYieldMutex( sal_uLong nCount ) = 0; + // return true, if yield mutex is owned by this thread, else false + virtual bool CheckYieldMutex() = 0; // wait next event and dispatch // must returned by UserEvent (SalFrame::PostEvent) // and timer virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ) = 0; - virtual bool AnyInput( USHORT nType ) = 0; + virtual bool AnyInput( sal_uInt16 nType ) = 0; // Menues - virtual SalMenu* CreateMenu( BOOL bMenuBar ) = 0; - virtual void DestroyMenu( SalMenu* pMenu) = 0; - virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ) = 0; - virtual void DestroyMenuItem( SalMenuItem* pItem ) = 0; + virtual SalMenu* CreateMenu( sal_Bool bMenuBar, Menu* pMenu ); + virtual void DestroyMenu( SalMenu* pMenu); + virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ); + virtual void DestroyMenuItem( SalMenuItem* pItem ); // may return NULL to disable session management virtual SalSession* CreateSalSession() = 0; // methods for XDisplayConnection - // the parameters for the callbacks are: - // void* pInst: pInstance form the SetCallback call - // void* pEvent: address of the system specific event structure - // int nBytes: length of the system specific event structure - void SetEventCallback( void* pInstance, Callback pCallback ) - { m_pEventInst = pInstance; m_pEventCallback = pCallback; } - Callback GetEventCallback() const - { return m_pEventCallback; } + void SetEventCallback( rtl::Reference< vcl::DisplayConnectionDispatch > const & pInstance ) + { m_pEventInst = pInstance; } bool CallEventCallback( void* pEvent, int nBytes ) - { return m_pEventCallback ? m_pEventCallback( m_pEventInst, pEvent, nBytes ) : false; } - void SetErrorEventCallback( void* pInstance, Callback pCallback ) - { m_pErrorInst = pInstance; m_pErrorCallback = pCallback; } - Callback GetErrorEventCallback() const - { return m_pErrorCallback; } + { return m_pEventInst.is() && m_pEventInst->dispatchEvent( pEvent, nBytes ); } bool CallErrorCallback( void* pEvent, int nBytes ) - { return m_pErrorCallback ? m_pErrorCallback( m_pErrorInst, pEvent, nBytes ) : false; } + { return m_pEventInst.is() && m_pEventInst->dispatchErrorEvent( pEvent, nBytes ); } enum ConnectionIdentifierType { AsciiCString, Blob }; virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0; @@ -198,7 +183,7 @@ void DestroySalInstance( SalInstance* pInst ); void SalAbort( const XubString& rErrorText ); -VCL_DLLPUBLIC const ::rtl::OUString& SalGetDesktopEnvironment(); +VCL_PLUGIN_PUBLIC const ::rtl::OUString& SalGetDesktopEnvironment(); // ----------- // - SalData - diff --git a/vcl/inc/vcl/sallayout.hxx b/vcl/inc/vcl/sallayout.hxx index b26970c708d5..b91185769b27 100644 --- a/vcl/inc/vcl/sallayout.hxx +++ b/vcl/inc/vcl/sallayout.hxx @@ -73,7 +73,7 @@ class ImplFontData; // ----------------- // used for managing runs e.g. for BiDi, glyph and script fallback -class VCL_DLLPUBLIC ImplLayoutRuns +class VCL_PLUGIN_PUBLIC ImplLayoutRuns { private: int mnRunIndex; @@ -149,7 +149,7 @@ sal_UCS4 GetVerticalChar( sal_UCS4 ); // #i80090# GetMirroredChar also needed outside vcl, moved to svapp.hxx // VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 ); sal_UCS4 GetLocalizedChar( sal_UCS4, LanguageType ); -VCL_DLLPUBLIC const char* GetAutofallback( sal_UCS4 ) ; +VCL_PLUGIN_PUBLIC const char* GetAutofallback( sal_UCS4 ) ; // ------------- // - SalLayout - @@ -180,7 +180,7 @@ typedef sal_uInt32 sal_GlyphId; // all positions/widths are in font units // one exception: drawposition is in pixel units -class VCL_DLLPUBLIC SalLayout +class VCL_PLUGIN_PUBLIC SalLayout { public: // used by upper layers @@ -259,7 +259,7 @@ protected: // - MultiSalLayout - // ------------------ -class VCL_DLLPUBLIC MultiSalLayout : public SalLayout +class VCL_PLUGIN_PUBLIC MultiSalLayout : public SalLayout { public: virtual void DrawText( SalGraphics& ) const; @@ -272,7 +272,7 @@ public: virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const; // used only by OutputDevice::ImplLayout, TODO: make friend - MultiSalLayout( SalLayout& rBaseLayout, + explicit MultiSalLayout( SalLayout& rBaseLayout, const ImplFontData* pBaseFont = NULL ); virtual bool AddFallback( SalLayout& rFallbackLayout, ImplLayoutRuns&, const ImplFontData* pFallbackFont ); @@ -342,7 +342,7 @@ typedef std::vector<GlyphItem> GlyphVector; // --------------- -class VCL_DLLPUBLIC GenericSalLayout : public SalLayout +class VCL_PLUGIN_PUBLIC GenericSalLayout : public SalLayout { public: // used by layout engines diff --git a/vcl/inc/vcl/salmenu.hxx b/vcl/inc/vcl/salmenu.hxx index 3ddcb95d4475..63fb12ee4a84 100644 --- a/vcl/inc/vcl/salmenu.hxx +++ b/vcl/inc/vcl/salmenu.hxx @@ -41,7 +41,7 @@ class SalFrame; struct SalItemParams { - USHORT nId; // item Id + sal_uInt16 nId; // item Id MenuItemType eType; // MenuItem-Type MenuItemBits nBits; // MenuItem-Bits Menu* pMenu; // Pointer to Menu @@ -52,49 +52,49 @@ struct SalItemParams struct SalMenuButtonItem { - USHORT mnId; + sal_uInt16 mnId; Image maImage; rtl::OUString maToolTipText; SalMenuButtonItem() : mnId( 0 ) {} - SalMenuButtonItem( USHORT i_nId, const Image& rImg, const rtl::OUString& i_rTTText = rtl::OUString() ) + SalMenuButtonItem( sal_uInt16 i_nId, const Image& rImg, const rtl::OUString& i_rTTText = rtl::OUString() ) : mnId( i_nId ), maImage( rImg ), maToolTipText( i_rTTText ) {} }; -class VCL_DLLPUBLIC SalMenuItem +class VCL_PLUGIN_PUBLIC SalMenuItem { public: SalMenuItem() {} virtual ~SalMenuItem(); }; -class VCL_DLLPUBLIC SalMenu +class VCL_PLUGIN_PUBLIC SalMenu { public: SalMenu() {} virtual ~SalMenu(); - virtual BOOL VisibleMenuBar() = 0; // must return TRUE to actually DISPLAY native menu bars + virtual sal_Bool VisibleMenuBar() = 0; // must return sal_True to actually DISPLAY native menu bars // otherwise only menu messages are processed (eg, OLE on Windows) virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ) = 0; virtual void RemoveItem( unsigned nPos ) = 0; virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) = 0; virtual void SetFrame( const SalFrame* pFrame ) = 0; - virtual void CheckItem( unsigned nPos, BOOL bCheck ) = 0; - virtual void EnableItem( unsigned nPos, BOOL bEnable ) = 0; + virtual void CheckItem( unsigned nPos, sal_Bool bCheck ) = 0; + virtual void EnableItem( unsigned nPos, sal_Bool bEnable ) = 0; virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const XubString& rText )= 0; virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage ) = 0; virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName ) = 0; virtual void GetSystemMenuData( SystemMenuData* pData ) = 0; - virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, ULONG nFlags); + virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags); virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure - virtual void RemoveMenuBarButton( USHORT nId ); + virtual void RemoveMenuBarButton( sal_uInt16 nId ); // return an empty rectangle if not implemented // return Rectangle( Point( -1, -1 ), Size( 1, 1 ) ) if menu bar buttons implemented // but rectangle cannot be determined - virtual Rectangle GetMenuBarButtonRectPixel( USHORT i_nItemId, SalFrame* i_pReferenceFrame ); + virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ); }; diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/vcl/inc/vcl/salnativewidgets.hxx index bea43a41c24f..696a8660bb2f 100644..100755 --- a/vcl/inc/vcl/salnativewidgets.hxx +++ b/vcl/inc/vcl/salnativewidgets.hxx @@ -177,6 +177,7 @@ typedef sal_uInt32 ControlPart; #define PART_MENU_ITEM 250 #define PART_MENU_ITEM_CHECK_MARK 251 #define PART_MENU_ITEM_RADIO_MARK 252 +#define PART_MENU_SEPARATOR 253 /* #i77549# HACK: for scrollbars in case of thumb rect, page up and page down rect we @@ -308,7 +309,7 @@ class VCL_DLLPUBLIC ImplControlValue * * Value container for scrollbars. */ - class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue +class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue { public: long mnMin; @@ -374,12 +375,12 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue }; virtual ~TabitemValue(); - BOOL isLeftAligned() const { return (mnAlignment & TABITEM_LEFTALIGNED) != 0; } - BOOL isRightAligned() const { return (mnAlignment & TABITEM_RIGHTALIGNED) != 0; } - BOOL isBothAligned() const { return isLeftAligned() && isRightAligned(); } - BOOL isNotAligned() const { return (mnAlignment & (TABITEM_LEFTALIGNED | TABITEM_RIGHTALIGNED)) == 0; } - BOOL isFirst() const { return (mnAlignment & TABITEM_FIRST_IN_GROUP) != 0; } - BOOL isLast() const { return (mnAlignment & TABITEM_LAST_IN_GROUP) != 0; } + sal_Bool isLeftAligned() const { return (mnAlignment & TABITEM_LEFTALIGNED) != 0; } + sal_Bool isRightAligned() const { return (mnAlignment & TABITEM_RIGHTALIGNED) != 0; } + sal_Bool isBothAligned() const { return isLeftAligned() && isRightAligned(); } + sal_Bool isNotAligned() const { return (mnAlignment & (TABITEM_LEFTALIGNED | TABITEM_RIGHTALIGNED)) == 0; } + sal_Bool isFirst() const { return (mnAlignment & TABITEM_FIRST_IN_GROUP) != 0; } + sal_Bool isLast() const { return (mnAlignment & TABITEM_LAST_IN_GROUP) != 0; } }; /* SpinbuttonValue: @@ -414,10 +415,10 @@ class ToolbarValue : public ImplControlValue { public: ToolbarValue() : ImplControlValue( CTRL_TOOLBAR, BUTTONVALUE_DONTKNOW, 0 ) - { mbIsTopDockingArea = FALSE; } + { mbIsTopDockingArea = sal_False; } virtual ~ToolbarValue(); Rectangle maGripRect; - BOOL mbIsTopDockingArea; // indicates that this is the top aligned dockingarea + sal_Bool mbIsTopDockingArea; // indicates that this is the top aligned dockingarea // adjacent to the menubar }; @@ -434,6 +435,24 @@ public: int maTopDockingAreaHeight; }; +/* MenupopupValue: + * + * Value container for menu items; specifies the rectangle for the whole item which + * may be useful when drawing parts with a smaller rectangle. + */ +class MenupopupValue : public ImplControlValue +{ +public: + MenupopupValue() : ImplControlValue( CTRL_MENU_POPUP, BUTTONVALUE_DONTKNOW, 0 ) + {} + MenupopupValue( long i_nGutterWidth, const Rectangle& i_rItemRect ) + : ImplControlValue( CTRL_MENU_POPUP, BUTTONVALUE_DONTKNOW, i_nGutterWidth ) + , maItemRect( i_rItemRect ) + {} + virtual ~MenupopupValue(); + Rectangle maItemRect; +}; + /* PushButtonValue: * * Value container for pushbuttons specifying additional drawing hints diff --git a/vcl/inc/vcl/salobj.hxx b/vcl/inc/vcl/salobj.hxx index 6ba025befdbe..4e781787b0c9 100644 --- a/vcl/inc/vcl/salobj.hxx +++ b/vcl/inc/vcl/salobj.hxx @@ -40,53 +40,55 @@ struct SystemEnvData; // - SalObject-Types - // ------------------- -#define SAL_OBJECT_CLIP_INCLUDERECTS ((USHORT)0x0001) -#define SAL_OBJECT_CLIP_EXCLUDERECTS ((USHORT)0x0002) -#define SAL_OBJECT_CLIP_ABSOLUTE ((USHORT)0x0004) +#define SAL_OBJECT_CLIP_INCLUDERECTS ((sal_uInt16)0x0001) +#define SAL_OBJECT_CLIP_EXCLUDERECTS ((sal_uInt16)0x0002) +#define SAL_OBJECT_CLIP_ABSOLUTE ((sal_uInt16)0x0004) // ------------- // - SalObject - // ------------- -class VCL_DLLPUBLIC SalObject +class VCL_PLUGIN_PUBLIC SalObject { void* m_pInst; SALOBJECTPROC m_pCallback; - BOOL m_bMouseTransparent:1, + sal_Bool m_bMouseTransparent:1, m_bEraseBackground:1; public: - SalObject() : m_pInst( NULL ), m_pCallback( NULL ), m_bMouseTransparent( FALSE ), m_bEraseBackground( TRUE ) {} + SalObject() : m_pInst( NULL ), m_pCallback( NULL ), m_bMouseTransparent( sal_False ), m_bEraseBackground( sal_True ) {} virtual ~SalObject(); virtual void ResetClipRegion() = 0; - virtual USHORT GetClipRegionType() = 0; - virtual void BeginSetClipRegion( ULONG nRects ) = 0; + virtual sal_uInt16 GetClipRegionType() = 0; + virtual void BeginSetClipRegion( sal_uLong nRects ) = 0; virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0; virtual void EndSetClipRegion() = 0; virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0; - virtual void Show( BOOL bVisible ) = 0; - virtual void Enable( BOOL nEnable ) = 0; + virtual void Show( sal_Bool bVisible ) = 0; + virtual void Enable( sal_Bool nEnable ) = 0; virtual void GrabFocus() = 0; virtual void SetBackground() = 0; virtual void SetBackground( SalColor nSalColor ) = 0; - virtual void SetForwardKey( BOOL /*bEnable*/ ) {} + virtual void SetForwardKey( sal_Bool /*bEnable*/ ) {} virtual const SystemEnvData* GetSystemData() const = 0; + virtual void InterceptChildWindowKeyDown( sal_Bool bIntercept ) = 0; + void SetCallback( void* pInst, SALOBJECTPROC pProc ) { m_pInst = pInst; m_pCallback = pProc; } - long CallCallback( USHORT nEvent, const void* pEvent ) + long CallCallback( sal_uInt16 nEvent, const void* pEvent ) { return m_pCallback ? m_pCallback( m_pInst, this, nEvent, pEvent ) : 0; } - void SetMouseTransparent( BOOL bMouseTransparent ) + void SetMouseTransparent( sal_Bool bMouseTransparent ) { m_bMouseTransparent = bMouseTransparent; } - BOOL IsMouseTransparent() + sal_Bool IsMouseTransparent() { return m_bMouseTransparent; } - void EnableEraseBackground( BOOL bEnable ) + void EnableEraseBackground( sal_Bool bEnable ) { m_bEraseBackground = bEnable; } - BOOL IsEraseBackgroundEnabled() + sal_Bool IsEraseBackgroundEnabled() { return m_bEraseBackground; } }; diff --git a/vcl/inc/vcl/salprn.hxx b/vcl/inc/vcl/salprn.hxx index be387b4f1c7f..e820614e4cdd 100644 --- a/vcl/inc/vcl/salprn.hxx +++ b/vcl/inc/vcl/salprn.hxx @@ -45,14 +45,14 @@ namespace vcl { class PrinterController; } // - SalPrinterQueueInfo - // ----------------------- -struct VCL_DLLPUBLIC SalPrinterQueueInfo +struct VCL_PLUGIN_PUBLIC SalPrinterQueueInfo { XubString maPrinterName; XubString maDriver; XubString maLocation; XubString maComment; - ULONG mnStatus; - ULONG mnJobs; + sal_uLong mnStatus; + sal_uLong mnJobs; void* mpSysData; SalPrinterQueueInfo(); @@ -63,7 +63,7 @@ struct VCL_DLLPUBLIC SalPrinterQueueInfo // - SalInfoPrinter - // ------------------ -class VCL_DLLPUBLIC SalInfoPrinter +class VCL_PLUGIN_PUBLIC SalInfoPrinter { public: std::vector< PaperInfo > m_aPaperFormats; // all printer supported formats @@ -78,23 +78,23 @@ public: virtual SalGraphics* GetGraphics() = 0; virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; - virtual BOOL Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) = 0; + virtual sal_Bool Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) = 0; // This function set the driver data and // set the new indepen data in pSetupData - virtual BOOL SetPrinterData( ImplJobSetup* pSetupData ) = 0; + virtual sal_Bool SetPrinterData( ImplJobSetup* pSetupData ) = 0; // This function merged the indepen driver data // and set the new indepen data in pSetupData // Only the data must changed, where the bit // in nFlags is set - virtual BOOL SetData( ULONG nFlags, ImplJobSetup* pSetupData ) = 0; + virtual sal_Bool SetData( sal_uLong nFlags, ImplJobSetup* pSetupData ) = 0; virtual void GetPageInfo( const ImplJobSetup* pSetupData, long& rOutWidth, long& rOutHeight, long& rPageOffX, long& rPageOffY, long& rPageWidth, long& rPageHeight ) = 0; - virtual ULONG GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType ) = 0; - virtual ULONG GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0; - virtual String GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin ) = 0; + virtual sal_uLong GetCapabilities( const ImplJobSetup* pSetupData, sal_uInt16 nType ) = 0; + virtual sal_uLong GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0; + virtual String GetPaperBinName( const ImplJobSetup* pSetupData, sal_uLong nPaperBin ) = 0; // fills m_aPaperFormats and sets m_bPapersInit to true virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0; // returns angle that a landscape page will be turned counterclockwise wrt to portrait @@ -105,33 +105,33 @@ public: // - SalPrinter - // -------------- -class VCL_DLLPUBLIC SalPrinter +class VCL_PLUGIN_PUBLIC SalPrinter { public: // public for Sal Implementation SalPrinter() {} virtual ~SalPrinter(); - virtual BOOL StartJob( const String* pFileName, + virtual sal_Bool StartJob( const String* pFileName, const String& rJobName, const String& rAppName, - ULONG nCopies, + sal_uLong nCopies, bool bCollate, bool bDirect, ImplJobSetup* pSetupData ) = 0; // implement for pull model print systems only, - // default implementations (see salvtables.cxx) just returns FALSE - virtual BOOL StartJob( const String* pFileName, + // default implementations (see salvtables.cxx) just returns sal_False + virtual sal_Bool StartJob( const String* pFileName, const String& rJobName, const String& rAppName, ImplJobSetup* pSetupData, vcl::PrinterController& rController ); - virtual BOOL EndJob() = 0; - virtual BOOL AbortJob() = 0; - virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData ) = 0; - virtual BOOL EndPage() = 0; - virtual ULONG GetErrorCode() = 0; + virtual sal_Bool EndJob() = 0; + virtual sal_Bool AbortJob() = 0; + virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, sal_Bool bNewJobData ) = 0; + virtual sal_Bool EndPage() = 0; + virtual sal_uLong GetErrorCode() = 0; }; diff --git a/vcl/inc/vcl/salptype.hxx b/vcl/inc/vcl/salptype.hxx index 7ad8b2a2c5f9..ca47f599271c 100644 --- a/vcl/inc/vcl/salptype.hxx +++ b/vcl/inc/vcl/salptype.hxx @@ -35,10 +35,10 @@ // - SalJobSetupFlags - // -------------------- -#define SAL_JOBSET_ORIENTATION ((ULONG)0x00000001) -#define SAL_JOBSET_PAPERBIN ((ULONG)0x00000002) -#define SAL_JOBSET_PAPERSIZE ((ULONG)0x00000004) -#define SAL_JOBSET_DUPLEXMODE ((ULONG)0x00000008) +#define SAL_JOBSET_ORIENTATION ((sal_uLong)0x00000001) +#define SAL_JOBSET_PAPERBIN ((sal_uLong)0x00000002) +#define SAL_JOBSET_PAPERSIZE ((sal_uLong)0x00000004) +#define SAL_JOBSET_DUPLEXMODE ((sal_uLong)0x00000008) #define SAL_JOBSET_ALL (SAL_JOBSET_ORIENTATION |\ SAL_JOBSET_PAPERBIN |\ SAL_JOBSET_PAPERSIZE |\ diff --git a/vcl/inc/vcl/salsession.hxx b/vcl/inc/vcl/salsession.hxx index 5d2fc5cf34ff..c912565a920c 100644 --- a/vcl/inc/vcl/salsession.hxx +++ b/vcl/inc/vcl/salsession.hxx @@ -86,7 +86,7 @@ struct SalSessionQuitEvent : public SalSessionEvent typedef void(*SessionProc)( SalSessionEvent *pEvent); -class VCL_DLLPUBLIC SalSession +class VCL_PLUGIN_PUBLIC SalSession { SessionProc m_aProc; public: diff --git a/vcl/inc/vcl/salsys.hxx b/vcl/inc/vcl/salsys.hxx index df8223ca8759..2f2f6d08e9e6 100644 --- a/vcl/inc/vcl/salsys.hxx +++ b/vcl/inc/vcl/salsys.hxx @@ -59,7 +59,7 @@ const int SALSYSTEM_SHOWNATIVEMSGBOX_BTN_NO = 7; // - SalSystem - // ------------- -class VCL_DLLPUBLIC SalSystem +class VCL_PLUGIN_PUBLIC SalSystem { public: SalSystem() {} diff --git a/vcl/inc/vcl/saltimer.hxx b/vcl/inc/vcl/saltimer.hxx index 78c27769c7a6..4bbaddb65b31 100644 --- a/vcl/inc/vcl/saltimer.hxx +++ b/vcl/inc/vcl/saltimer.hxx @@ -43,7 +43,7 @@ * this needed to be virtualized for the sal plugin migration */ -class VCL_DLLPUBLIC SalTimer +class VCL_PLUGIN_PUBLIC SalTimer { SALTIMERPROC m_pProc; public: @@ -51,7 +51,7 @@ public: virtual ~SalTimer(); // AutoRepeat and Restart - virtual void Start( ULONG nMS ) = 0; + virtual void Start( sal_uLong nMS ) = 0; virtual void Stop() = 0; // Callbacks (indepen in \sv\source\app\timer.cxx) diff --git a/vcl/inc/vcl/salvd.hxx b/vcl/inc/vcl/salvd.hxx index 2b6c6191add6..68ed56a901d8 100644 --- a/vcl/inc/vcl/salvd.hxx +++ b/vcl/inc/vcl/salvd.hxx @@ -38,7 +38,7 @@ class SalGraphics; // - SalVirtualDevice - // -------------------- -class VCL_DLLPUBLIC SalVirtualDevice +class VCL_PLUGIN_PUBLIC SalVirtualDevice { public: // public for Sal Implementation SalVirtualDevice() {} @@ -50,7 +50,7 @@ public: // public for Sal Implementation virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; // Set new size, without saving the old contents - virtual BOOL SetSize( long nNewDX, long nNewDY ) = 0; + virtual sal_Bool SetSize( long nNewDX, long nNewDY ) = 0; /// Get actual VDev size in pixel virtual void GetSize( long& rWidth, long& rHeight ) = 0; diff --git a/vcl/inc/vcl/salwtype.hxx b/vcl/inc/vcl/salwtype.hxx index 90ccb92af6a2..d8bd6c527f85 100644 --- a/vcl/inc/vcl/salwtype.hxx +++ b/vcl/inc/vcl/salwtype.hxx @@ -46,68 +46,68 @@ class ImplFontSelectData; // Muessen mit den Defines in cmdevt.hxx uebereinstimmen, da diese // nicht konvertiert werden -#define SAL_EXTTEXTINPUT_ATTR_GRAYWAVELINE ((USHORT)0x0100) -#define SAL_EXTTEXTINPUT_ATTR_UNDERLINE ((USHORT)0x0200) -#define SAL_EXTTEXTINPUT_ATTR_BOLDUNDERLINE ((USHORT)0x0400) -#define SAL_EXTTEXTINPUT_ATTR_DOTTEDUNDERLINE ((USHORT)0x0800) -#define SAL_EXTTEXTINPUT_ATTR_DASHDOTUNDERLINE ((USHORT)0x1000) -#define SAL_EXTTEXTINPUT_ATTR_HIGHLIGHT ((USHORT)0x2000) -#define SAL_EXTTEXTINPUT_ATTR_REDTEXT ((USHORT)0x4000) -#define SAL_EXTTEXTINPUT_ATTR_HALFTONETEXT ((USHORT)0x8000) - -#define SAL_EXTTEXTINPUT_CURSOR_INVISIBLE ((USHORT)0x0001) -#define SAL_EXTTEXTINPUT_CURSOR_OVERWRITE ((USHORT)0x0002) +#define SAL_EXTTEXTINPUT_ATTR_GRAYWAVELINE ((sal_uInt16)0x0100) +#define SAL_EXTTEXTINPUT_ATTR_UNDERLINE ((sal_uInt16)0x0200) +#define SAL_EXTTEXTINPUT_ATTR_BOLDUNDERLINE ((sal_uInt16)0x0400) +#define SAL_EXTTEXTINPUT_ATTR_DOTTEDUNDERLINE ((sal_uInt16)0x0800) +#define SAL_EXTTEXTINPUT_ATTR_DASHDOTUNDERLINE ((sal_uInt16)0x1000) +#define SAL_EXTTEXTINPUT_ATTR_HIGHLIGHT ((sal_uInt16)0x2000) +#define SAL_EXTTEXTINPUT_ATTR_REDTEXT ((sal_uInt16)0x4000) +#define SAL_EXTTEXTINPUT_ATTR_HALFTONETEXT ((sal_uInt16)0x8000) + +#define SAL_EXTTEXTINPUT_CURSOR_INVISIBLE ((sal_uInt16)0x0001) +#define SAL_EXTTEXTINPUT_CURSOR_OVERWRITE ((sal_uInt16)0x0002) // ------------ // - SalEvent - // ------------ -#define SALEVENT_MOUSEMOVE ((USHORT)1) -#define SALEVENT_MOUSELEAVE ((USHORT)2) -#define SALEVENT_MOUSEBUTTONDOWN ((USHORT)3) -#define SALEVENT_MOUSEBUTTONUP ((USHORT)4) -#define SALEVENT_KEYINPUT ((USHORT)5) -#define SALEVENT_KEYUP ((USHORT)6) -#define SALEVENT_KEYMODCHANGE ((USHORT)7) -#define SALEVENT_PAINT ((USHORT)8) -#define SALEVENT_RESIZE ((USHORT)9) -#define SALEVENT_GETFOCUS ((USHORT)10) -#define SALEVENT_LOSEFOCUS ((USHORT)11) -#define SALEVENT_CLOSE ((USHORT)12) -#define SALEVENT_SHUTDOWN ((USHORT)13) -#define SALEVENT_SETTINGSCHANGED ((USHORT)14) -#define SALEVENT_VOLUMECHANGED ((USHORT)15) -#define SALEVENT_PRINTERCHANGED ((USHORT)16) -#define SALEVENT_DISPLAYCHANGED ((USHORT)17) -#define SALEVENT_FONTCHANGED ((USHORT)18) -#define SALEVENT_DATETIMECHANGED ((USHORT)19) -#define SALEVENT_KEYBOARDCHANGED ((USHORT)20) -#define SALEVENT_WHEELMOUSE ((USHORT)21) -#define SALEVENT_USEREVENT ((USHORT)22) -#define SALEVENT_MOUSEACTIVATE ((USHORT)23) -#define SALEVENT_EXTTEXTINPUT ((USHORT)24) -#define SALEVENT_ENDEXTTEXTINPUT ((USHORT)25) -#define SALEVENT_EXTTEXTINPUTPOS ((USHORT)26) -#define SALEVENT_INPUTCONTEXTCHANGE ((USHORT)27) -#define SALEVENT_MOVE ((USHORT)28) -#define SALEVENT_MOVERESIZE ((USHORT)29) -#define SALEVENT_CLOSEPOPUPS ((USHORT)30) -#define SALEVENT_EXTERNALKEYINPUT ((USHORT)31) -#define SALEVENT_EXTERNALKEYUP ((USHORT)32) -#define SALEVENT_MENUCOMMAND ((USHORT)33) -#define SALEVENT_MENUHIGHLIGHT ((USHORT)34) -#define SALEVENT_MENUACTIVATE ((USHORT)35) -#define SALEVENT_MENUDEACTIVATE ((USHORT)36) -#define SALEVENT_EXTERNALMOUSEMOVE ((USHORT)37) -#define SALEVENT_EXTERNALMOUSEBUTTONDOWN ((USHORT)38) -#define SALEVENT_EXTERNALMOUSEBUTTONUP ((USHORT)39) -#define SALEVENT_INPUTLANGUAGECHANGE ((USHORT)40) -#define SALEVENT_SHOWDIALOG ((USHORT)41) -#define SALEVENT_MENUBUTTONCOMMAND ((USHORT)42) -#define SALEVENT_SURROUNDINGTEXTREQUEST ((USHORT)43) -#define SALEVENT_SURROUNDINGTEXTSELECTIONCHANGE ((USHORT)44) -#define SALEVENT_STARTRECONVERSION ((USHORT)45) -#define SALEVENT_COUNT ((USHORT)45) +#define SALEVENT_MOUSEMOVE ((sal_uInt16)1) +#define SALEVENT_MOUSELEAVE ((sal_uInt16)2) +#define SALEVENT_MOUSEBUTTONDOWN ((sal_uInt16)3) +#define SALEVENT_MOUSEBUTTONUP ((sal_uInt16)4) +#define SALEVENT_KEYINPUT ((sal_uInt16)5) +#define SALEVENT_KEYUP ((sal_uInt16)6) +#define SALEVENT_KEYMODCHANGE ((sal_uInt16)7) +#define SALEVENT_PAINT ((sal_uInt16)8) +#define SALEVENT_RESIZE ((sal_uInt16)9) +#define SALEVENT_GETFOCUS ((sal_uInt16)10) +#define SALEVENT_LOSEFOCUS ((sal_uInt16)11) +#define SALEVENT_CLOSE ((sal_uInt16)12) +#define SALEVENT_SHUTDOWN ((sal_uInt16)13) +#define SALEVENT_SETTINGSCHANGED ((sal_uInt16)14) +#define SALEVENT_VOLUMECHANGED ((sal_uInt16)15) +#define SALEVENT_PRINTERCHANGED ((sal_uInt16)16) +#define SALEVENT_DISPLAYCHANGED ((sal_uInt16)17) +#define SALEVENT_FONTCHANGED ((sal_uInt16)18) +#define SALEVENT_DATETIMECHANGED ((sal_uInt16)19) +#define SALEVENT_KEYBOARDCHANGED ((sal_uInt16)20) +#define SALEVENT_WHEELMOUSE ((sal_uInt16)21) +#define SALEVENT_USEREVENT ((sal_uInt16)22) +#define SALEVENT_MOUSEACTIVATE ((sal_uInt16)23) +#define SALEVENT_EXTTEXTINPUT ((sal_uInt16)24) +#define SALEVENT_ENDEXTTEXTINPUT ((sal_uInt16)25) +#define SALEVENT_EXTTEXTINPUTPOS ((sal_uInt16)26) +#define SALEVENT_INPUTCONTEXTCHANGE ((sal_uInt16)27) +#define SALEVENT_MOVE ((sal_uInt16)28) +#define SALEVENT_MOVERESIZE ((sal_uInt16)29) +#define SALEVENT_CLOSEPOPUPS ((sal_uInt16)30) +#define SALEVENT_EXTERNALKEYINPUT ((sal_uInt16)31) +#define SALEVENT_EXTERNALKEYUP ((sal_uInt16)32) +#define SALEVENT_MENUCOMMAND ((sal_uInt16)33) +#define SALEVENT_MENUHIGHLIGHT ((sal_uInt16)34) +#define SALEVENT_MENUACTIVATE ((sal_uInt16)35) +#define SALEVENT_MENUDEACTIVATE ((sal_uInt16)36) +#define SALEVENT_EXTERNALMOUSEMOVE ((sal_uInt16)37) +#define SALEVENT_EXTERNALMOUSEBUTTONDOWN ((sal_uInt16)38) +#define SALEVENT_EXTERNALMOUSEBUTTONUP ((sal_uInt16)39) +#define SALEVENT_INPUTLANGUAGECHANGE ((sal_uInt16)40) +#define SALEVENT_SHOWDIALOG ((sal_uInt16)41) +#define SALEVENT_MENUBUTTONCOMMAND ((sal_uInt16)42) +#define SALEVENT_SURROUNDINGTEXTREQUEST ((sal_uInt16)43) +#define SALEVENT_SURROUNDINGTEXTSELECTIONCHANGE ((sal_uInt16)44) +#define SALEVENT_STARTRECONVERSION ((sal_uInt16)45) +#define SALEVENT_COUNT ((sal_uInt16)45) // MOUSELEAVE must send, when the pointer leave the client area and // the mouse is not captured @@ -115,39 +115,39 @@ class ImplFontSelectData; // MAC: Ctrl+Button is MOUSE_RIGHT struct SalMouseEvent { - ULONG mnTime; // Time in ms, when event is created + sal_uLong mnTime; // Time in ms, when event is created long mnX; // X-Position (Pixel, TopLeft-Output) long mnY; // Y-Position (Pixel, TopLeft-Output) - USHORT mnButton; // 0-MouseMove/MouseLeave, MOUSE_LEFT, MOUSE_RIGHT, MOUSE_MIDDLE - USHORT mnCode; // SV-ModifierCode (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT) + sal_uInt16 mnButton; // 0-MouseMove/MouseLeave, MOUSE_LEFT, MOUSE_RIGHT, MOUSE_MIDDLE + sal_uInt16 mnCode; // SV-ModifierCode (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT) }; // KEYINPUT and KEYUP struct SalKeyEvent { - ULONG mnTime; // Time in ms, when event is created - USHORT mnCode; // SV-KeyCode (KEY_xxx | KEY_SHIFT | KEY_MOD1 | KEY_MOD2) - USHORT mnCharCode; // SV-CharCode - USHORT mnRepeat; // Repeat-Count (KeyInputs-1) + sal_uLong mnTime; // Time in ms, when event is created + sal_uInt16 mnCode; // SV-KeyCode (KEY_xxx | KEY_SHIFT | KEY_MOD1 | KEY_MOD2) + sal_uInt16 mnCharCode; // SV-CharCode + sal_uInt16 mnRepeat; // Repeat-Count (KeyInputs-1) }; // MENUEVENT struct SalMenuEvent { - USHORT mnId; // Menu item ID + sal_uInt16 mnId; // Menu item ID void* mpMenu; // pointer to VCL menu (class Menu) SalMenuEvent() : mnId( 0 ), mpMenu( NULL ) {} - SalMenuEvent( USHORT i_nId, void* i_pMenu ) + SalMenuEvent( sal_uInt16 i_nId, void* i_pMenu ) : mnId( i_nId ), mpMenu( i_pMenu ) {} }; // KEYMODCHANGE struct SalKeyModEvent { - ULONG mnTime; // Time in ms, when event is created - USHORT mnCode; // SV-ModifierCode (KEY_SHIFT | KEY_MOD1 | KEY_MOD2) - USHORT mnModKeyCode; // extended Modifier (MODKEY_LEFT, MODKEY_RIGHT, MODKEY_PRESS, MODKEY_RELEASE) + sal_uLong mnTime; // Time in ms, when event is created + sal_uInt16 mnCode; // SV-ModifierCode (KEY_SHIFT | KEY_MOD1 | KEY_MOD2) + sal_uInt16 mnModKeyCode; // extended Modifier (MODKEY_LEFT, MODKEY_RIGHT, MODKEY_PRESS, MODKEY_RELEASE) }; // PAINT @@ -170,21 +170,21 @@ struct SalPaintEvent // pEvent == pData // WHEELMOUSE -#define SAL_WHEELMOUSE_EVENT_PAGESCROLL ((ULONG)0xFFFFFFFF) +#define SAL_WHEELMOUSE_EVENT_PAGESCROLL ((sal_uLong)0xFFFFFFFF) struct SalWheelMouseEvent { - ULONG mnTime; // Time in ms, when event is created + sal_uLong mnTime; // Time in ms, when event is created long mnX; // X-Position (Pixel, TopLeft-Output) long mnY; // Y-Position (Pixel, TopLeft-Output) long mnDelta; // Anzahl Drehungen long mnNotchDelta; // Anzahl feste Drehungen - ULONG mnScrollLines; // Aktuelle Anzahl zu scrollende Zeilen - USHORT mnCode; // SV-ModifierCode (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT) - BOOL mbHorz; // Horizontal - BOOL mbDeltaIsPixel; // delta value is a pixel value (on mac) + sal_uLong mnScrollLines; // Aktuelle Anzahl zu scrollende Zeilen + sal_uInt16 mnCode; // SV-ModifierCode (KEY_SHIFT | KEY_MOD1 | KEY_MOD2 | MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT) + sal_Bool mbHorz; // Horizontal + sal_Bool mbDeltaIsPixel; // delta value is a pixel value (on mac) SalWheelMouseEvent() - : mnTime( 0 ), mnX( 0 ), mnY( 0 ), mnDelta( 0 ), mnNotchDelta( 0 ), mnScrollLines( 0 ), mnCode( 0 ), mbHorz( FALSE ), mbDeltaIsPixel( FALSE ) + : mnTime( 0 ), mnX( 0 ), mnY( 0 ), mnDelta( 0 ), mnNotchDelta( 0 ), mnScrollLines( 0 ), mnCode( 0 ), mbHorz( sal_False ), mbDeltaIsPixel( sal_False ) {} }; @@ -200,13 +200,13 @@ struct SalMouseActivateEvent // EXTTEXTINPUT struct SalExtTextInputEvent { - ULONG mnTime; // Time in ms, when event is created + sal_uLong mnTime; // Time in ms, when event is created UniString maText; // Text - const USHORT* mpTextAttr; // Text-Attribute - ULONG mnCursorPos; // Cursor-Position - ULONG mnDeltaStart; // Start-Position der letzten Aenderung - BYTE mnCursorFlags; // SAL_EXTTEXTINPUT_CURSOR_xxx - BOOL mbOnlyCursor; // TRUE: Nur Cursor-Position wurde geaendert + const sal_uInt16* mpTextAttr; // Text-Attribute + sal_uLong mnCursorPos; // Cursor-Position + sal_uLong mnDeltaStart; // Start-Position der letzten Aenderung + sal_uInt8 mnCursorFlags; // SAL_EXTTEXTINPUT_CURSOR_xxx + sal_Bool mbOnlyCursor; // sal_True: Nur Cursor-Position wurde geaendert }; #endif // __cplusplus @@ -238,8 +238,8 @@ struct SalInputContextChangeEvent struct SalSurroundingTextRequestEvent { UniString maText; // Text - ULONG mnStart; // The beggining index of selected range - ULONG mnEnd; // The end index of selected range + sal_uLong mnStart; // The beggining index of selected range + sal_uLong mnEnd; // The end index of selected range }; #endif // __cplusplus @@ -249,8 +249,8 @@ struct SalSurroundingTextRequestEvent // SURROUNDINGTEXTSELECTIONCHANGE struct SalSurroundingTextSelectionChangeEvent { - ULONG mnStart; // The beggining index of selected range - ULONG mnEnd; // The end index of selected range + sal_uLong mnStart; // The beggining index of selected range + sal_uLong mnEnd; // The end index of selected range }; #endif // __cplusplus @@ -260,50 +260,50 @@ struct SalSurroundingTextSelectionChangeEvent // ------------------ typedef long (*SALFRAMEPROC)( Window* pInst, SalFrame* pFrame, - USHORT nEvent, const void* pEvent ); + sal_uInt16 nEvent, const void* pEvent ); // -------------------- // - SalObject-Events - // -------------------- -#define SALOBJ_EVENT_GETFOCUS ((USHORT)1) -#define SALOBJ_EVENT_LOSEFOCUS ((USHORT)2) -#define SALOBJ_EVENT_TOTOP ((USHORT)3) -#define SALOBJ_EVENT_COUNT ((USHORT)4) +#define SALOBJ_EVENT_GETFOCUS ((sal_uInt16)1) +#define SALOBJ_EVENT_LOSEFOCUS ((sal_uInt16)2) +#define SALOBJ_EVENT_TOTOP ((sal_uInt16)3) +#define SALOBJ_EVENT_COUNT ((sal_uInt16)4) // ------------------ // - SalObject-Types - // ------------------ typedef long (*SALOBJECTPROC)( void* pInst, SalObject* pObject, - USHORT nEvent, const void* pEvent ); + sal_uInt16 nEvent, const void* pEvent ); // ----------------- // - SalFrameState - // ----------------- // Must be the same as in syswin.hxx -#define SAL_FRAMESTATE_MASK_X ((ULONG)0x00000001) -#define SAL_FRAMESTATE_MASK_Y ((ULONG)0x00000002) -#define SAL_FRAMESTATE_MASK_WIDTH ((ULONG)0x00000004) -#define SAL_FRAMESTATE_MASK_HEIGHT ((ULONG)0x00000008) -#define SAL_FRAMESTATE_MASK_MAXIMIZED_X ((ULONG)0x00000100) -#define SAL_FRAMESTATE_MASK_MAXIMIZED_Y ((ULONG)0x00000200) -#define SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH ((ULONG)0x00000400) -#define SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT ((ULONG)0x00000800) -#define SAL_FRAMESTATE_MASK_STATE ((ULONG)0x00000010) - -#define SAL_FRAMESTATE_NORMAL ((ULONG)0x00000001) -#define SAL_FRAMESTATE_MINIMIZED ((ULONG)0x00000002) -#define SAL_FRAMESTATE_MAXIMIZED ((ULONG)0x00000004) -#define SAL_FRAMESTATE_ROLLUP ((ULONG)0x00000008) -#define SAL_FRAMESTATE_MAXIMIZED_HORZ ((ULONG)0x00000010) -#define SAL_FRAMESTATE_MAXIMIZED_VERT ((ULONG)0x00000020) -#define SAL_FRAMESTATE_SYSTEMMASK ((ULONG)0x0000FFFF) +#define SAL_FRAMESTATE_MASK_X ((sal_uLong)0x00000001) +#define SAL_FRAMESTATE_MASK_Y ((sal_uLong)0x00000002) +#define SAL_FRAMESTATE_MASK_WIDTH ((sal_uLong)0x00000004) +#define SAL_FRAMESTATE_MASK_HEIGHT ((sal_uLong)0x00000008) +#define SAL_FRAMESTATE_MASK_MAXIMIZED_X ((sal_uLong)0x00000100) +#define SAL_FRAMESTATE_MASK_MAXIMIZED_Y ((sal_uLong)0x00000200) +#define SAL_FRAMESTATE_MASK_MAXIMIZED_WIDTH ((sal_uLong)0x00000400) +#define SAL_FRAMESTATE_MASK_MAXIMIZED_HEIGHT ((sal_uLong)0x00000800) +#define SAL_FRAMESTATE_MASK_STATE ((sal_uLong)0x00000010) + +#define SAL_FRAMESTATE_NORMAL ((sal_uLong)0x00000001) +#define SAL_FRAMESTATE_MINIMIZED ((sal_uLong)0x00000002) +#define SAL_FRAMESTATE_MAXIMIZED ((sal_uLong)0x00000004) +#define SAL_FRAMESTATE_ROLLUP ((sal_uLong)0x00000008) +#define SAL_FRAMESTATE_MAXIMIZED_HORZ ((sal_uLong)0x00000010) +#define SAL_FRAMESTATE_MAXIMIZED_VERT ((sal_uLong)0x00000020) +#define SAL_FRAMESTATE_SYSTEMMASK ((sal_uLong)0x0000FFFF) struct SalFrameState { - ULONG mnMask; + sal_uLong mnMask; long mnX; long mnY; long mnWidth; @@ -312,7 +312,7 @@ struct SalFrameState long mnMaximizedY; long mnMaximizedWidth; long mnMaximizedHeight; - ULONG mnState; + sal_uLong mnState; }; // ------------------- @@ -321,11 +321,11 @@ struct SalFrameState // Muessen mit den Defines in inputctx.hxx uebereinstimmen, da diese // nicht konvertiert werden -#define SAL_INPUTCONTEXT_TEXT ((ULONG)0x00000001) -#define SAL_INPUTCONTEXT_EXTTEXTINPUT ((ULONG)0x00000002) -#define SAL_INPUTCONTEXT_EXTTEXTINPUT_ON ((ULONG)0x00000004) -#define SAL_INPUTCONTEXT_EXTTEXTINPUT_OFF ((ULONG)0x00000008) -#define SAL_INPUTCONTEXT_CHANGELANGUAGE ((ULONG)0x00000010) +#define SAL_INPUTCONTEXT_TEXT ((sal_uLong)0x00000001) +#define SAL_INPUTCONTEXT_EXTTEXTINPUT ((sal_uLong)0x00000002) +#define SAL_INPUTCONTEXT_EXTTEXTINPUT_ON ((sal_uLong)0x00000004) +#define SAL_INPUTCONTEXT_EXTTEXTINPUT_OFF ((sal_uLong)0x00000008) +#define SAL_INPUTCONTEXT_CHANGELANGUAGE ((sal_uLong)0x00000010) #ifdef __cplusplus @@ -333,7 +333,7 @@ struct SalInputContext { ImplFontSelectData* mpFont; LanguageType meLanguage; - ULONG mnOptions; + sal_uLong mnOptions; }; #endif // __cplusplus diff --git a/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx index fd675461cac5..6e894bc2263b 100644 --- a/vcl/inc/vcl/scrbar.hxx +++ b/vcl/inc/vcl/scrbar.hxx @@ -68,12 +68,12 @@ private: long mnLineSize; long mnPageSize; long mnDelta; - USHORT mnDragDraw; - USHORT mnStateFlags; + sal_uInt16 mnDragDraw; + sal_uInt16 mnStateFlags; ScrollType meScrollType; ScrollType meDDScrollType; - BOOL mbCalcSize; - BOOL mbFullDrag; + sal_Bool mbCalcSize; + sal_Bool mbFullDrag; Link maScrollHdl; Link maEndScrollHdl; @@ -82,17 +82,17 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplInitStyle( WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE void ImplUpdateRects( BOOL bUpdate = TRUE ); + SAL_DLLPRIVATE void ImplUpdateRects( sal_Bool bUpdate = sal_True ); SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos ); SAL_DLLPRIVATE long ImplCalcThumbPosPix( long nPos ); - SAL_DLLPRIVATE void ImplCalc( BOOL bUpdate = TRUE ); - SAL_DLLPRIVATE void ImplDraw( USHORT nDrawFlags, OutputDevice* pOutDev ); + SAL_DLLPRIVATE void ImplCalc( sal_Bool bUpdate = sal_True ); + SAL_DLLPRIVATE void ImplDraw( sal_uInt16 nDrawFlags, OutputDevice* pOutDev ); using Window::ImplScroll; - SAL_DLLPRIVATE long ImplScroll( long nNewPos, BOOL bCallEndScroll ); - SAL_DLLPRIVATE long ImplDoAction( BOOL bCallEndScroll ); - SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, BOOL bCallAction = TRUE ); + SAL_DLLPRIVATE long ImplScroll( long nNewPos, sal_Bool bCallEndScroll ); + SAL_DLLPRIVATE long ImplDoAction( sal_Bool bCallEndScroll ); + SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, sal_Bool bCallAction = sal_True ); SAL_DLLPRIVATE void ImplInvert(); - SAL_DLLPRIVATE BOOL ImplDrawNative( USHORT nDrawFlags ); + SAL_DLLPRIVATE sal_Bool ImplDrawNative( sal_uInt16 nDrawFlags ); SAL_DLLPRIVATE void ImplDragThumb( const Point& rMousePos ); DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); DECL_DLLPRIVATE_LINK( ImplAutoTimerHdl, AutoTimer* ); @@ -106,7 +106,7 @@ public: virtual void Tracking( const TrackingEvent& rTEvt ); virtual void KeyInput( const KeyEvent& rKEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -121,9 +121,9 @@ public: long DoScroll( long nNewPos ); long DoScrollAction( ScrollType eScrollType ); - void EnableDrag( BOOL bEnable = TRUE ) + void EnableDrag( sal_Bool bEnable = sal_True ) { mbFullDrag = bEnable; } - BOOL IsDragEnabled() const { return mbFullDrag; } + sal_Bool IsDragEnabled() const { return mbFullDrag; } void SetRangeMin( long nNewRange ); long GetRangeMin() const { return mnMinRange; } diff --git a/vcl/inc/vcl/seleng.hxx b/vcl/inc/vcl/seleng.hxx index 67c2f735ac71..8466df46a901 100644 --- a/vcl/inc/vcl/seleng.hxx +++ b/vcl/inc/vcl/seleng.hxx @@ -57,11 +57,11 @@ public: virtual void DestroyAnchor() = 0; // Cursor neu setzen, dabei die beim Anker beginnende - // Selektion der neuen Cursor-Position anpassen. TRUE == Ok - virtual BOOL SetCursorAtPoint( const Point& rPointPixel, - BOOL bDontSelectAtCursor = FALSE ) = 0; + // Selektion der neuen Cursor-Position anpassen. sal_True == Ok + virtual sal_Bool SetCursorAtPoint( const Point& rPointPixel, + sal_Bool bDontSelectAtCursor = sal_False ) = 0; - virtual BOOL IsSelectionAtPoint( const Point& rPointPixel ) = 0; + virtual sal_Bool IsSelectionAtPoint( const Point& rPointPixel ) = 0; virtual void DeselectAtPoint( const Point& rPointPixel ) = 0; // Anker loeschen & alles deselektieren virtual void DeselectAll() = 0; @@ -90,29 +90,29 @@ private: Timer aWTimer; // erzeugt kuenstliche Mouse-Moves MouseEvent aLastMove; SelectionMode eSelMode; - ULONG nUpdateInterval; + sal_uLong nUpdateInterval; // Stufigkeit fuer Mausbewegungen waehrend einer Selektion - USHORT nMouseSensitivity; - USHORT nLockedMods; - USHORT nFlags; + sal_uInt16 nMouseSensitivity; + sal_uInt16 nLockedMods; + sal_uInt16 nFlags; DECL_DLLPRIVATE_LINK( ImpWatchDog, Timer * ); - inline BOOL ShouldDeselect( BOOL bModifierKey1 ) const; + inline sal_Bool ShouldDeselect( sal_Bool bModifierKey1 ) const; // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging public: SelectionEngine( Window* pWindow, FunctionSet* pFunctions = NULL, - ULONG nAutoRepeatInterval = SELENG_AUTOREPEAT_INTERVAL ); + sal_uLong nAutoRepeatInterval = SELENG_AUTOREPEAT_INTERVAL ); ~SelectionEngine(); - // TRUE: Event wurde von Selection-Engine verarbeitet. - BOOL SelMouseButtonDown( const MouseEvent& rMEvt ); - BOOL SelMouseButtonUp( const MouseEvent& rMEvt ); - BOOL SelMouseMove( const MouseEvent& rMEvt ); + // sal_True: Event wurde von Selection-Engine verarbeitet. + sal_Bool SelMouseButtonDown( const MouseEvent& rMEvt ); + sal_Bool SelMouseButtonUp( const MouseEvent& rMEvt ); + sal_Bool SelMouseMove( const MouseEvent& rMEvt ); // Tastatur - void CursorPosChanging( BOOL bShift, BOOL bMod1 ); + void CursorPosChanging( sal_Bool bShift, sal_Bool bMod1 ); // wird benoetigt, um bei ausserhalb des Bereichs stehender // Maus ueber einen Timer Move-Events zu erzeugen @@ -120,16 +120,16 @@ public: { aArea = rNewArea; } const Rectangle& GetVisibleArea() const { return aArea; } - void SetAddMode( BOOL); - BOOL IsAddMode() const; + void SetAddMode( sal_Bool); + sal_Bool IsAddMode() const; - void AddAlways( BOOL bOn ); - BOOL IsAlwaysAdding() const; + void AddAlways( sal_Bool bOn ); + sal_Bool IsAlwaysAdding() const; - void EnableDrag( BOOL bOn ); - BOOL IsDragEnabled() const; + void EnableDrag( sal_Bool bOn ); + sal_Bool IsDragEnabled() const; void ActivateDragMode(); - BOOL IsInDragMode() const; + sal_Bool IsInDragMode() const; void SetSelectionMode( SelectionMode eMode ); SelectionMode GetSelectionMode() const { return eSelMode; } @@ -138,9 +138,9 @@ public: { pFunctionSet = pFuncs; } const FunctionSet* GetFunctionSet() const { return pFunctionSet; } - void SetMouseSensitivity( USHORT nSensitivity ) + void SetMouseSensitivity( sal_uInt16 nSensitivity ) { nMouseSensitivity = nSensitivity; } - USHORT GetMouseSensitivity() const + sal_uInt16 GetMouseSensitivity() const { return nMouseSensitivity; } const Point& GetMousePosPixel() const @@ -150,22 +150,22 @@ public: void SetWindow( Window*); Window* GetWindow() const { return pWin; } - void LockModifiers( USHORT nModifiers ) + void LockModifiers( sal_uInt16 nModifiers ) { nLockedMods = nModifiers; } - USHORT GetLockedModifiers() const { return nLockedMods; } + sal_uInt16 GetLockedModifiers() const { return nLockedMods; } - BOOL IsInSelection() const; + sal_Bool IsInSelection() const; void Reset(); void Command( const CommandEvent& rCEvt ); - BOOL HasAnchor() const; - void SetAnchor( BOOL bAnchor ); + sal_Bool HasAnchor() const; + void SetAnchor( sal_Bool bAnchor ); - void SetUpdateInterval( ULONG nInterval ); + void SetUpdateInterval( sal_uLong nInterval ); // wird im Ctor eingeschaltet - void ExpandSelectionOnMouseMove( BOOL bExpand = TRUE ) + void ExpandSelectionOnMouseMove( sal_Bool bExpand = sal_True ) { if( bExpand ) nFlags |= SELENG_EXPANDONMOVE; @@ -174,23 +174,23 @@ public: } }; -inline BOOL SelectionEngine::IsDragEnabled() const +inline sal_Bool SelectionEngine::IsDragEnabled() const { if ( nFlags & SELENG_DRG_ENAB ) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } -inline BOOL SelectionEngine::IsAddMode() const +inline sal_Bool SelectionEngine::IsAddMode() const { if ( nFlags & (SELENG_IN_ADD | SELENG_ADD_ALW) ) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } -inline void SelectionEngine::SetAddMode( BOOL bNewMode ) +inline void SelectionEngine::SetAddMode( sal_Bool bNewMode ) { if ( bNewMode ) nFlags |= SELENG_IN_ADD; @@ -198,7 +198,7 @@ inline void SelectionEngine::SetAddMode( BOOL bNewMode ) nFlags &= (~SELENG_IN_ADD); } -inline void SelectionEngine::EnableDrag( BOOL bOn ) +inline void SelectionEngine::EnableDrag( sal_Bool bOn ) { if ( bOn ) nFlags |= SELENG_DRG_ENAB; @@ -206,7 +206,7 @@ inline void SelectionEngine::EnableDrag( BOOL bOn ) nFlags &= (~SELENG_DRG_ENAB); } -inline void SelectionEngine::AddAlways( BOOL bOn ) +inline void SelectionEngine::AddAlways( sal_Bool bOn ) { if( bOn ) nFlags |= SELENG_ADD_ALW; @@ -214,39 +214,39 @@ inline void SelectionEngine::AddAlways( BOOL bOn ) nFlags &= (~SELENG_ADD_ALW); } -inline BOOL SelectionEngine::IsAlwaysAdding() const +inline sal_Bool SelectionEngine::IsAlwaysAdding() const { if ( nFlags & SELENG_ADD_ALW ) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } -inline BOOL SelectionEngine::IsInDragMode() const +inline sal_Bool SelectionEngine::IsInDragMode() const { if ( nFlags & SELENG_IN_DRG ) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } -inline BOOL SelectionEngine::IsInSelection() const +inline sal_Bool SelectionEngine::IsInSelection() const { if ( nFlags & SELENG_IN_SEL ) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } -inline BOOL SelectionEngine::HasAnchor() const +inline sal_Bool SelectionEngine::HasAnchor() const { if ( nFlags & SELENG_HAS_ANCH ) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } -inline void SelectionEngine::SetAnchor( BOOL bAnchor ) +inline void SelectionEngine::SetAnchor( sal_Bool bAnchor ) { if ( bAnchor ) nFlags |= SELENG_HAS_ANCH; diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index dc51764b6554..cc5b44169ff6 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -57,10 +57,10 @@ class ImplMachineData ImplMachineData( const ImplMachineData& rData ); private: - ULONG mnRefCount; - ULONG mnOptions; - ULONG mnScreenOptions; - ULONG mnPrintOptions; + sal_uLong mnRefCount; + sal_uLong mnOptions; + sal_uLong mnScreenOptions; + sal_uLong mnPrintOptions; long mnScreenRasterFontDeviation; }; @@ -80,17 +80,17 @@ public: MachineSettings( const MachineSettings& rSet ); ~MachineSettings(); - void SetOptions( ULONG nOptions ) + void SetOptions( sal_uLong nOptions ) { CopyData(); mpData->mnOptions = nOptions; } - ULONG GetOptions() const + sal_uLong GetOptions() const { return mpData->mnOptions; } - void SetScreenOptions( ULONG nOptions ) + void SetScreenOptions( sal_uLong nOptions ) { CopyData(); mpData->mnScreenOptions = nOptions; } - ULONG GetScreenOptions() const + sal_uLong GetScreenOptions() const { return mpData->mnScreenOptions; } - void SetPrintOptions( ULONG nOptions ) + void SetPrintOptions( sal_uLong nOptions ) { CopyData(); mpData->mnPrintOptions = nOptions; } - ULONG GetPrintOptions() const + sal_uLong GetPrintOptions() const { return mpData->mnPrintOptions; } void SetScreenRasterFontDeviation( long nDeviation ) @@ -100,8 +100,8 @@ public: const MachineSettings& operator =( const MachineSettings& rSet ); - BOOL operator ==( const MachineSettings& rSet ) const; - BOOL operator !=( const MachineSettings& rSet ) const + sal_Bool operator ==( const MachineSettings& rSet ) const; + sal_Bool operator !=( const MachineSettings& rSet ) const { return !(*this == rSet); } }; @@ -117,49 +117,49 @@ class ImplMouseData ImplMouseData( const ImplMouseData& rData ); private: - ULONG mnRefCount; - ULONG mnOptions; - ULONG mnDoubleClkTime; + sal_uLong mnRefCount; + sal_uLong mnOptions; + sal_uLong mnDoubleClkTime; long mnDoubleClkWidth; long mnDoubleClkHeight; long mnStartDragWidth; long mnStartDragHeight; - USHORT mnStartDragCode; - USHORT mnDragMoveCode; - USHORT mnDragCopyCode; - USHORT mnDragLinkCode; - USHORT mnContextMenuCode; - USHORT mnContextMenuClicks; - BOOL mbContextMenuDown; - ULONG mnScrollRepeat; - ULONG mnButtonStartRepeat; - ULONG mnButtonRepeat; - ULONG mnActionDelay; - ULONG mnMenuDelay; - ULONG mnFollow; - USHORT mnMiddleButtonAction; - USHORT mnWheelBehavior; - BOOL mbAlign1; + sal_uInt16 mnStartDragCode; + sal_uInt16 mnDragMoveCode; + sal_uInt16 mnDragCopyCode; + sal_uInt16 mnDragLinkCode; + sal_uInt16 mnContextMenuCode; + sal_uInt16 mnContextMenuClicks; + sal_Bool mbContextMenuDown; + sal_uLong mnScrollRepeat; + sal_uLong mnButtonStartRepeat; + sal_uLong mnButtonRepeat; + sal_uLong mnActionDelay; + sal_uLong mnMenuDelay; + sal_uLong mnFollow; + sal_uInt16 mnMiddleButtonAction; + sal_uInt16 mnWheelBehavior; + sal_Bool mbAlign1; }; // ----------------- // - MouseSettings - // ----------------- -#define MOUSE_OPTION_AUTOFOCUS ((ULONG)0x00000001) -#define MOUSE_OPTION_AUTOCENTERPOS ((ULONG)0x00000002) -#define MOUSE_OPTION_AUTODEFBTNPOS ((ULONG)0x00000004) +#define MOUSE_OPTION_AUTOFOCUS ((sal_uLong)0x00000001) +#define MOUSE_OPTION_AUTOCENTERPOS ((sal_uLong)0x00000002) +#define MOUSE_OPTION_AUTODEFBTNPOS ((sal_uLong)0x00000004) -#define MOUSE_FOLLOW_MENU ((ULONG)0x00000001) -#define MOUSE_FOLLOW_DDLIST ((ULONG)0x00000002) +#define MOUSE_FOLLOW_MENU ((sal_uLong)0x00000001) +#define MOUSE_FOLLOW_DDLIST ((sal_uLong)0x00000002) -#define MOUSE_MIDDLE_NOTHING ((USHORT)0) -#define MOUSE_MIDDLE_AUTOSCROLL ((USHORT)1) -#define MOUSE_MIDDLE_PASTESELECTION ((USHORT)2) +#define MOUSE_MIDDLE_NOTHING ((sal_uInt16)0) +#define MOUSE_MIDDLE_AUTOSCROLL ((sal_uInt16)1) +#define MOUSE_MIDDLE_PASTESELECTION ((sal_uInt16)2) -#define MOUSE_WHEEL_DISABLE ((USHORT)0) -#define MOUSE_WHEEL_FOCUS_ONLY ((USHORT)1) -#define MOUSE_WHEEL_ALWAYS ((USHORT)2) +#define MOUSE_WHEEL_DISABLE ((sal_uInt16)0) +#define MOUSE_WHEEL_FOCUS_ONLY ((sal_uInt16)1) +#define MOUSE_WHEEL_ALWAYS ((sal_uInt16)2) class VCL_DLLPUBLIC MouseSettings { @@ -173,14 +173,14 @@ public: MouseSettings( const MouseSettings& rSet ); ~MouseSettings(); - void SetOptions( ULONG nOptions ) + void SetOptions( sal_uLong nOptions ) { CopyData(); mpData->mnOptions = nOptions; } - ULONG GetOptions() const + sal_uLong GetOptions() const { return mpData->mnOptions; } - void SetDoubleClickTime( ULONG nDoubleClkTime ) + void SetDoubleClickTime( sal_uLong nDoubleClkTime ) { CopyData(); mpData->mnDoubleClkTime = nDoubleClkTime; } - ULONG GetDoubleClickTime() const + sal_uLong GetDoubleClickTime() const { return mpData->mnDoubleClkTime; } void SetDoubleClickWidth( long nDoubleClkWidth ) { CopyData(); mpData->mnDoubleClkWidth = nDoubleClkWidth; } @@ -199,76 +199,76 @@ public: { CopyData(); mpData->mnStartDragHeight = nDragHeight; } long GetStartDragHeight() const { return mpData->mnStartDragHeight; } - void SetStartDragCode( USHORT nCode ) + void SetStartDragCode( sal_uInt16 nCode ) { CopyData(); mpData->mnStartDragCode = nCode; } - USHORT GetStartDragCode() const + sal_uInt16 GetStartDragCode() const { return mpData->mnStartDragCode; } - void SetDragMoveCode( USHORT nCode ) + void SetDragMoveCode( sal_uInt16 nCode ) { CopyData(); mpData->mnDragMoveCode = nCode; } - USHORT GetDragMoveCode() const + sal_uInt16 GetDragMoveCode() const { return mpData->mnDragMoveCode; } - void SetDragCopyCode( USHORT nCode ) + void SetDragCopyCode( sal_uInt16 nCode ) { CopyData(); mpData->mnDragCopyCode = nCode; } - USHORT GetDragCopyCode() const + sal_uInt16 GetDragCopyCode() const { return mpData->mnDragCopyCode; } - void SetDragLinkCode( USHORT nCode ) + void SetDragLinkCode( sal_uInt16 nCode ) { CopyData(); mpData->mnDragLinkCode = nCode; } - USHORT GetDragLinkCode() const + sal_uInt16 GetDragLinkCode() const { return mpData->mnDragLinkCode; } - void SetContextMenuCode( USHORT nCode ) + void SetContextMenuCode( sal_uInt16 nCode ) { CopyData(); mpData->mnContextMenuCode = nCode; } - USHORT GetContextMenuCode() const + sal_uInt16 GetContextMenuCode() const { return mpData->mnContextMenuCode; } - void SetContextMenuClicks( USHORT nClicks ) + void SetContextMenuClicks( sal_uInt16 nClicks ) { CopyData(); mpData->mnContextMenuClicks = nClicks; } - USHORT GetContextMenuClicks() const + sal_uInt16 GetContextMenuClicks() const { return mpData->mnContextMenuClicks; } - void SetContextMenuDown( BOOL bDown ) + void SetContextMenuDown( sal_Bool bDown ) { CopyData(); mpData->mbContextMenuDown = bDown; } - BOOL GetContextMenuDown() const + sal_Bool GetContextMenuDown() const { return mpData->mbContextMenuDown; } - void SetScrollRepeat( ULONG nRepeat ) + void SetScrollRepeat( sal_uLong nRepeat ) { CopyData(); mpData->mnScrollRepeat = nRepeat; } - ULONG GetScrollRepeat() const + sal_uLong GetScrollRepeat() const { return mpData->mnScrollRepeat; } - void SetButtonStartRepeat( ULONG nRepeat ) + void SetButtonStartRepeat( sal_uLong nRepeat ) { CopyData(); mpData->mnButtonStartRepeat = nRepeat; } - ULONG GetButtonStartRepeat() const + sal_uLong GetButtonStartRepeat() const { return mpData->mnButtonStartRepeat; } - void SetButtonRepeat( ULONG nRepeat ) + void SetButtonRepeat( sal_uLong nRepeat ) { CopyData(); mpData->mnButtonRepeat = nRepeat; } - ULONG GetButtonRepeat() const + sal_uLong GetButtonRepeat() const { return mpData->mnButtonRepeat; } - void SetActionDelay( ULONG nDelay ) + void SetActionDelay( sal_uLong nDelay ) { CopyData(); mpData->mnActionDelay = nDelay; } - ULONG GetActionDelay() const + sal_uLong GetActionDelay() const { return mpData->mnActionDelay; } - void SetMenuDelay( ULONG nDelay ) + void SetMenuDelay( sal_uLong nDelay ) { CopyData(); mpData->mnMenuDelay = nDelay; } - ULONG GetMenuDelay() const + sal_uLong GetMenuDelay() const { return mpData->mnMenuDelay; } - void SetFollow( ULONG nFollow ) + void SetFollow( sal_uLong nFollow ) { CopyData(); mpData->mnFollow = nFollow; } - ULONG GetFollow() const + sal_uLong GetFollow() const { return mpData->mnFollow; } - void SetMiddleButtonAction( USHORT nAction ) + void SetMiddleButtonAction( sal_uInt16 nAction ) { CopyData(); mpData->mnMiddleButtonAction = nAction; } - USHORT GetMiddleButtonAction() const + sal_uInt16 GetMiddleButtonAction() const { return mpData->mnMiddleButtonAction; } - void SetWheelBehavior( USHORT nBehavior ) + void SetWheelBehavior( sal_uInt16 nBehavior ) { CopyData(); mpData->mnWheelBehavior = nBehavior; } - USHORT GetWheelBehavior() const + sal_uInt16 GetWheelBehavior() const { return mpData->mnWheelBehavior; } const MouseSettings& operator =( const MouseSettings& rSet ); - BOOL operator ==( const MouseSettings& rSet ) const; - BOOL operator !=( const MouseSettings& rSet ) const + sal_Bool operator ==( const MouseSettings& rSet ) const; + sal_Bool operator !=( const MouseSettings& rSet ) const { return !(*this == rSet); } }; @@ -284,16 +284,16 @@ class ImplKeyboardData ImplKeyboardData( const ImplKeyboardData& rData ); private: - ULONG mnRefCount; + sal_uLong mnRefCount; Accelerator maStandardAccel; - ULONG mnOptions; + sal_uLong mnOptions; }; // -------------------- // - KeyboardSettings - // -------------------- -#define KEYBOARD_OPTION_QUICKCURSOR ((ULONG)0x00000001) +#define KEYBOARD_OPTION_QUICKCURSOR ((sal_uLong)0x00000001) class VCL_DLLPUBLIC KeyboardSettings { @@ -312,15 +312,15 @@ public: const Accelerator& GetStandardAccel() const { return mpData->maStandardAccel; } - void SetOptions( ULONG nOptions ) + void SetOptions( sal_uLong nOptions ) { CopyData(); mpData->mnOptions = nOptions; } - ULONG GetOptions() const + sal_uLong GetOptions() const { return mpData->mnOptions; } const KeyboardSettings& operator =( const KeyboardSettings& rSet ); - BOOL operator ==( const KeyboardSettings& rSet ) const; - BOOL operator !=( const KeyboardSettings& rSet ) const + sal_Bool operator ==( const KeyboardSettings& rSet ) const; + sal_Bool operator !=( const KeyboardSettings& rSet ) const { return !(*this == rSet); } }; @@ -337,7 +337,7 @@ class ImplStyleData void SetStandardStyles(); private: - ULONG mnRefCount; + sal_uLong mnRefCount; void* mpStyleData_NotUsedYet; @@ -413,31 +413,27 @@ private: long mnIconHorzSpace; long mnIconVertSpace; long mnAntialiasedMin; - ULONG mnCursorBlinkTime; - ULONG mnDragFullOptions; - ULONG mnAnimationOptions; - ULONG mnSelectionOptions; - ULONG mnLogoDisplayTime; - ULONG mnDisplayOptions; - ULONG mnToolbarIconSize; - ULONG mnUseFlatMenues; - ULONG mnOptions; - USHORT mnScreenZoom; - USHORT mnScreenFontZoom; - USHORT mnRadioButtonStyle; - USHORT mnCheckBoxStyle; - USHORT mnPushButtonStyle; - USHORT mnTabControlStyle; - USHORT mnHighContrast; - USHORT mnUseSystemUIFonts; - USHORT mnAutoMnemonic; - USHORT mnUseImagesInMenus; - BOOL mbPreferredUseImagesInMenus; - ULONG mnUseFlatBorders; + sal_uLong mnCursorBlinkTime; + sal_uLong mnDragFullOptions; + sal_uLong mnAnimationOptions; + sal_uLong mnSelectionOptions; + sal_uLong mnLogoDisplayTime; + sal_uLong mnDisplayOptions; + sal_uLong mnToolbarIconSize; + sal_uLong mnUseFlatMenues; + sal_uLong mnOptions; + sal_uInt16 mnScreenZoom; + sal_uInt16 mnScreenFontZoom; + sal_uInt16 mnHighContrast; + sal_uInt16 mnUseSystemUIFonts; + sal_uInt16 mnAutoMnemonic; + sal_uInt16 mnUseImagesInMenus; + sal_uLong mnUseFlatBorders; + sal_Bool mbPreferredUseImagesInMenus; long mnMinThumbSize; - ULONG mnSymbolsStyle; - ULONG mnPreferredSymbolsStyle; - USHORT mnSkipDisabledInMenus; + sal_uLong mnSymbolsStyle; + sal_uLong mnPreferredSymbolsStyle; + sal_uInt16 mnSkipDisabledInMenus; Wallpaper maWorkspaceGradient; const void* mpFontOptions; }; @@ -449,90 +445,65 @@ private: // - StyleSettings - // ----------------- -#define STYLE_OPTION_MONO ((ULONG)0x00000001) -#define STYLE_OPTION_COLOR ((ULONG)0x00000002) -#define STYLE_OPTION_FLAT ((ULONG)0x00000004) -#define STYLE_OPTION_GREAT ((ULONG)0x00000008) -#define STYLE_OPTION_HIGHLIGHT ((ULONG)0x00000010) -#define STYLE_OPTION_ADVANCEDUSER ((ULONG)0x00000020) -#define STYLE_OPTION_SCROLLARROW ((ULONG)0x00000040) -#define STYLE_OPTION_SPINARROW ((ULONG)0x00000080) -#define STYLE_OPTION_SPINUPDOWN ((ULONG)0x00000100) -#define STYLE_OPTION_NOMNEMONICS ((ULONG)0x00000200) -#define STYLE_OPTION_WINSTYLE ((ULONG)0x00010000) -#define STYLE_OPTION_OS2STYLE ((ULONG)0x00020000) -#define STYLE_OPTION_MACSTYLE ((ULONG)0x00040000) -#define STYLE_OPTION_UNIXSTYLE ((ULONG)0x00080000) -#define STYLE_OPTION_SYSTEMSTYLE ((ULONG)0x000F0000) -#define STYLE_OPTION_HIDEDISABLED ((ULONG)0x00100000) - -#define DRAGFULL_OPTION_WINDOWMOVE ((ULONG)0x00000001) -#define DRAGFULL_OPTION_WINDOWSIZE ((ULONG)0x00000002) -#define DRAGFULL_OPTION_OBJECTMOVE ((ULONG)0x00000004) -#define DRAGFULL_OPTION_OBJECTSIZE ((ULONG)0x00000008) -#define DRAGFULL_OPTION_DOCKING ((ULONG)0x00000010) -#define DRAGFULL_OPTION_SPLIT ((ULONG)0x00000020) -#define DRAGFULL_OPTION_SCROLL ((ULONG)0x00000040) - -#define LOGO_DISPLAYTIME_NOLOGO ((ULONG)0) -#define LOGO_DISPLAYTIME_STARTTIME ((ULONG)0xFFFFFFFF) - -#define ANIMATION_OPTION_MINIMIZE ((ULONG)0x00000001) -#define ANIMATION_OPTION_POPUP ((ULONG)0x00000002) -#define ANIMATION_OPTION_DIALOG ((ULONG)0x00000004) -#define ANIMATION_OPTION_TREE ((ULONG)0x00000008) -#define ANIMATION_OPTION_SCROLL ((ULONG)0x00000010) - -#define SELECTION_OPTION_WORD ((ULONG)0x00000001) -#define SELECTION_OPTION_FOCUS ((ULONG)0x00000002) -#define SELECTION_OPTION_INVERT ((ULONG)0x00000004) -#define SELECTION_OPTION_SHOWFIRST ((ULONG)0x00000008) - -#define DISPLAY_OPTION_AA_DISABLE ((ULONG)0x00000001) - -#define STYLE_RADIOBUTTON_WIN ((USHORT)0x0001) -#define STYLE_RADIOBUTTON_OS2 ((USHORT)0x0002) -#define STYLE_RADIOBUTTON_MAC ((USHORT)0x0003) -#define STYLE_RADIOBUTTON_UNIX ((USHORT)0x0004) -#define STYLE_RADIOBUTTON_MONO ((USHORT)0x0005) -#define STYLE_RADIOBUTTON_STYLE ((USHORT)0x000F) - -#define STYLE_CHECKBOX_WIN ((USHORT)0x0001) -#define STYLE_CHECKBOX_OS2 ((USHORT)0x0002) -#define STYLE_CHECKBOX_MAC ((USHORT)0x0003) -#define STYLE_CHECKBOX_UNIX ((USHORT)0x0004) -#define STYLE_CHECKBOX_MONO ((USHORT)0x0005) -#define STYLE_CHECKBOX_STYLE ((USHORT)0x000F) - -#define STYLE_PUSHBUTTON_WIN ((USHORT)0x0001) -#define STYLE_PUSHBUTTON_OS2 ((USHORT)0x0002) -#define STYLE_PUSHBUTTON_MAC ((USHORT)0x0003) -#define STYLE_PUSHBUTTON_UNIX ((USHORT)0x0004) -#define STYLE_PUSHBUTTON_STYLE ((USHORT)0x000F) - -#define STYLE_TABCONTROL_SINGLELINE ((USHORT)0x0001) -#define STYLE_TABCONTROL_COLOR ((USHORT)0x0002) - -#define STYLE_TOOLBAR_ICONSIZE_UNKNOWN ((ULONG)0) -#define STYLE_TOOLBAR_ICONSIZE_SMALL ((ULONG)1) -#define STYLE_TOOLBAR_ICONSIZE_LARGE ((ULONG)2) - -#define STYLE_SYMBOLS_AUTO ((ULONG)0) -#define STYLE_SYMBOLS_DEFAULT ((ULONG)1) -#define STYLE_SYMBOLS_HICONTRAST ((ULONG)2) -#define STYLE_SYMBOLS_INDUSTRIAL ((ULONG)3) -#define STYLE_SYMBOLS_CRYSTAL ((ULONG)4) -#define STYLE_SYMBOLS_TANGO ((ULONG)5) -#define STYLE_SYMBOLS_OXYGEN ((ULONG)6) -#define STYLE_SYMBOLS_CLASSIC ((ULONG)7) -#define STYLE_SYMBOLS_HUMAN ((ULONG)8) -#define STYLE_SYMBOLS_THEMES_MAX ((ULONG)9) - -#define STYLE_MENUIMAGES_OFF ((USHORT)0) -#define STYLE_MENUIMAGES_ON ((USHORT)1) -#define STYLE_MENUIMAGES_AUTO ((USHORT)2) - -#define STYLE_CURSOR_NOBLINKTIME ((ULONG)0xFFFFFFFF) +#define STYLE_OPTION_MONO ((sal_uLong)0x00000001) +#define STYLE_OPTION_COLOR ((sal_uLong)0x00000002) +#define STYLE_OPTION_FLAT ((sal_uLong)0x00000004) +#define STYLE_OPTION_GREAT ((sal_uLong)0x00000008) +#define STYLE_OPTION_HIGHLIGHT ((sal_uLong)0x00000010) +#define STYLE_OPTION_ADVANCEDUSER ((sal_uLong)0x00000020) +#define STYLE_OPTION_SCROLLARROW ((sal_uLong)0x00000040) +#define STYLE_OPTION_SPINARROW ((sal_uLong)0x00000080) +#define STYLE_OPTION_SPINUPDOWN ((sal_uLong)0x00000100) +#define STYLE_OPTION_NOMNEMONICS ((sal_uLong)0x00000200) +#define STYLE_OPTION_HIDEDISABLED ((sal_uLong)0x00100000) + +#define DRAGFULL_OPTION_WINDOWMOVE ((sal_uLong)0x00000001) +#define DRAGFULL_OPTION_WINDOWSIZE ((sal_uLong)0x00000002) +#define DRAGFULL_OPTION_OBJECTMOVE ((sal_uLong)0x00000004) +#define DRAGFULL_OPTION_OBJECTSIZE ((sal_uLong)0x00000008) +#define DRAGFULL_OPTION_DOCKING ((sal_uLong)0x00000010) +#define DRAGFULL_OPTION_SPLIT ((sal_uLong)0x00000020) +#define DRAGFULL_OPTION_SCROLL ((sal_uLong)0x00000040) + +#define LOGO_DISPLAYTIME_NOLOGO ((sal_uLong)0) +#define LOGO_DISPLAYTIME_STARTTIME ((sal_uLong)0xFFFFFFFF) + +#define ANIMATION_OPTION_MINIMIZE ((sal_uLong)0x00000001) +#define ANIMATION_OPTION_POPUP ((sal_uLong)0x00000002) +#define ANIMATION_OPTION_DIALOG ((sal_uLong)0x00000004) +#define ANIMATION_OPTION_TREE ((sal_uLong)0x00000008) +#define ANIMATION_OPTION_SCROLL ((sal_uLong)0x00000010) + +#define SELECTION_OPTION_WORD ((sal_uLong)0x00000001) +#define SELECTION_OPTION_FOCUS ((sal_uLong)0x00000002) +#define SELECTION_OPTION_INVERT ((sal_uLong)0x00000004) +#define SELECTION_OPTION_SHOWFIRST ((sal_uLong)0x00000008) + +#define DISPLAY_OPTION_AA_DISABLE ((sal_uLong)0x00000001) + +#define STYLE_RADIOBUTTON_MONO ((sal_uInt16)0x0001) // legacy +#define STYLE_CHECKBOX_MONO ((sal_uInt16)0x0001) // legacy + +#define STYLE_TOOLBAR_ICONSIZE_UNKNOWN ((sal_uLong)0) +#define STYLE_TOOLBAR_ICONSIZE_SMALL ((sal_uLong)1) +#define STYLE_TOOLBAR_ICONSIZE_LARGE ((sal_uLong)2) + +#define STYLE_SYMBOLS_AUTO ((sal_uLong)0) +#define STYLE_SYMBOLS_DEFAULT ((sal_uLong)1) +#define STYLE_SYMBOLS_HICONTRAST ((sal_uLong)2) +#define STYLE_SYMBOLS_INDUSTRIAL ((sal_uLong)3) +#define STYLE_SYMBOLS_CRYSTAL ((sal_uLong)4) +#define STYLE_SYMBOLS_TANGO ((sal_uLong)5) +#define STYLE_SYMBOLS_OXYGEN ((sal_uLong)6) +#define STYLE_SYMBOLS_CLASSIC ((sal_uLong)7) +#define STYLE_SYMBOLS_HUMAN ((sal_uLong)8) +#define STYLE_SYMBOLS_THEMES_MAX ((sal_uLong)9) + +#define STYLE_MENUIMAGES_OFF ((sal_uInt16)0) +#define STYLE_MENUIMAGES_ON ((sal_uInt16)1) +#define STYLE_MENUIMAGES_AUTO ((sal_uInt16)2) + +#define STYLE_CURSOR_NOBLINKTIME ((sal_uLong)0xFFFFFFFF) class VCL_DLLPUBLIC StyleSettings { @@ -736,34 +707,34 @@ public: const Color& GetInactiveTabColor() const { return mpData->maInactiveTabColor; } - void SetHighContrastMode( BOOL bHighContrast ) + void SetHighContrastMode( sal_Bool bHighContrast ) { CopyData(); mpData->mnHighContrast = bHighContrast; } - BOOL GetHighContrastMode() const - { return (BOOL) mpData->mnHighContrast; } - BOOL IsHighContrastBlackAndWhite() const; - void SetUseSystemUIFonts( BOOL bUseSystemUIFonts ) + sal_Bool GetHighContrastMode() const + { return (sal_Bool) mpData->mnHighContrast; } + sal_Bool IsHighContrastBlackAndWhite() const; + void SetUseSystemUIFonts( sal_Bool bUseSystemUIFonts ) { CopyData(); mpData->mnUseSystemUIFonts = bUseSystemUIFonts; } - BOOL GetUseSystemUIFonts() const - { return (BOOL) mpData->mnUseSystemUIFonts; } - void SetUseFlatBorders( BOOL bUseFlatBorders ) + sal_Bool GetUseSystemUIFonts() const + { return (sal_Bool) mpData->mnUseSystemUIFonts; } + void SetUseFlatBorders( sal_Bool bUseFlatBorders ) { CopyData(); mpData->mnUseFlatBorders = bUseFlatBorders; } - BOOL GetUseFlatBorders() const - { return (BOOL) mpData->mnUseFlatBorders; } - void SetUseFlatMenues( BOOL bUseFlatMenues ) + sal_Bool GetUseFlatBorders() const + { return (sal_Bool) mpData->mnUseFlatBorders; } + void SetUseFlatMenues( sal_Bool bUseFlatMenues ) { CopyData(); mpData->mnUseFlatMenues = bUseFlatMenues; } - BOOL GetUseFlatMenues() const - { return (BOOL) mpData->mnUseFlatMenues; } - void SetUseImagesInMenus( BOOL bUseImagesInMenus ) + sal_Bool GetUseFlatMenues() const + { return (sal_Bool) mpData->mnUseFlatMenues; } + void SetUseImagesInMenus( sal_Bool bUseImagesInMenus ) { CopyData(); mpData->mnUseImagesInMenus = bUseImagesInMenus; } - BOOL GetUseImagesInMenus() const; - void SetPreferredUseImagesInMenus( BOOL bPreferredUseImagesInMenus ) + sal_Bool GetUseImagesInMenus() const; + void SetPreferredUseImagesInMenus( sal_Bool bPreferredUseImagesInMenus ) { CopyData(); mpData->mbPreferredUseImagesInMenus = bPreferredUseImagesInMenus; } - BOOL GetPreferredUseImagesInMenus() const + sal_Bool GetPreferredUseImagesInMenus() const { return mpData->mbPreferredUseImagesInMenus; } - void SetSkipDisabledInMenus( BOOL bSkipDisabledInMenus ) + void SetSkipDisabledInMenus( sal_Bool bSkipDisabledInMenus ) { CopyData(); mpData->mnSkipDisabledInMenus = bSkipDisabledInMenus; } - BOOL GetSkipDisabledInMenus() const - { return (BOOL) mpData->mnSkipDisabledInMenus; } + sal_Bool GetSkipDisabledInMenus() const + { return (sal_Bool) mpData->mnSkipDisabledInMenus; } void SetCairoFontOptions( const void *pOptions ) { CopyData(); mpData->mpFontOptions = pOptions; } @@ -823,23 +794,6 @@ public: const Font& GetIconFont() const { return mpData->maIconFont; } - void SetRadioButtonStyle( USHORT nStyle ) - { CopyData(); mpData->mnRadioButtonStyle = nStyle; } - USHORT GetRadioButtonStyle() const - { return mpData->mnRadioButtonStyle; } - void SetCheckBoxStyle( USHORT nStyle ) - { CopyData(); mpData->mnCheckBoxStyle = nStyle; } - USHORT GetCheckBoxStyle() const - { return mpData->mnCheckBoxStyle; } - void SetPushButtonStyle( USHORT nStyle ) - { CopyData(); mpData->mnPushButtonStyle = nStyle; } - USHORT GetPushButtonStyle() const - { return mpData->mnPushButtonStyle; } - void SetTabControlStyle( USHORT nStyle ) - { CopyData(); mpData->mnTabControlStyle = nStyle; } - USHORT GetTabControlStyle() const - { return mpData->mnTabControlStyle; } - void SetBorderSize( long nSize ) { CopyData(); mpData->mnBorderSize = nSize; } long GetBorderSize() const @@ -895,78 +849,78 @@ public: long GetCursorBlinkTime() const { return (long) mpData->mnCursorBlinkTime; } - void SetScreenZoom( USHORT nPercent ) + void SetScreenZoom( sal_uInt16 nPercent ) { CopyData(); mpData->mnScreenZoom = nPercent; } - USHORT GetScreenZoom() const + sal_uInt16 GetScreenZoom() const { return mpData->mnScreenZoom; } - void SetScreenFontZoom( USHORT nPercent ) + void SetScreenFontZoom( sal_uInt16 nPercent ) { CopyData(); mpData->mnScreenFontZoom = nPercent; } - USHORT GetScreenFontZoom() const + sal_uInt16 GetScreenFontZoom() const { return mpData->mnScreenFontZoom; } - void SetLogoDisplayTime( ULONG nDisplayTime ) + void SetLogoDisplayTime( sal_uLong nDisplayTime ) { CopyData(); mpData->mnLogoDisplayTime = nDisplayTime; } - ULONG GetLogoDisplayTime() const + sal_uLong GetLogoDisplayTime() const { return mpData->mnLogoDisplayTime; } - void SetDragFullOptions( ULONG nOptions ) + void SetDragFullOptions( sal_uLong nOptions ) { CopyData(); mpData->mnDragFullOptions = nOptions; } - ULONG GetDragFullOptions() const + sal_uLong GetDragFullOptions() const { return mpData->mnDragFullOptions; } - void SetAnimationOptions( ULONG nOptions ) + void SetAnimationOptions( sal_uLong nOptions ) { CopyData(); mpData->mnAnimationOptions = nOptions; } - ULONG GetAnimationOptions() const + sal_uLong GetAnimationOptions() const { return mpData->mnAnimationOptions; } - void SetSelectionOptions( ULONG nOptions ) + void SetSelectionOptions( sal_uLong nOptions ) { CopyData(); mpData->mnSelectionOptions = nOptions; } - ULONG GetSelectionOptions() const + sal_uLong GetSelectionOptions() const { return mpData->mnSelectionOptions; } - void SetDisplayOptions( ULONG nOptions ) + void SetDisplayOptions( sal_uLong nOptions ) { CopyData(); mpData->mnDisplayOptions = nOptions; } - ULONG GetDisplayOptions() const + sal_uLong GetDisplayOptions() const { return mpData->mnDisplayOptions; } void SetAntialiasingMinPixelHeight( long nMinPixel ) { CopyData(); mpData->mnAntialiasedMin = nMinPixel; } - ULONG GetAntialiasingMinPixelHeight() const + sal_uLong GetAntialiasingMinPixelHeight() const { return mpData->mnAntialiasedMin; } - void SetOptions( ULONG nOptions ) + void SetOptions( sal_uLong nOptions ) { CopyData(); mpData->mnOptions = nOptions; } - ULONG GetOptions() const + sal_uLong GetOptions() const { return mpData->mnOptions; } - void SetAutoMnemonic( BOOL bAutoMnemonic ) - { CopyData(); mpData->mnAutoMnemonic = (USHORT)bAutoMnemonic; } - BOOL GetAutoMnemonic() const - { return mpData->mnAutoMnemonic ? TRUE : FALSE; } + void SetAutoMnemonic( sal_Bool bAutoMnemonic ) + { CopyData(); mpData->mnAutoMnemonic = (sal_uInt16)bAutoMnemonic; } + sal_Bool GetAutoMnemonic() const + { return mpData->mnAutoMnemonic ? sal_True : sal_False; } void SetFontColor( const Color& rColor ) { CopyData(); mpData->maFontColor = rColor; } const Color& GetFontColor() const { return mpData->maFontColor; } - void SetToolbarIconSize( ULONG nSize ) + void SetToolbarIconSize( sal_uLong nSize ) { CopyData(); mpData->mnToolbarIconSize = nSize; } - ULONG GetToolbarIconSize() const + sal_uLong GetToolbarIconSize() const { return mpData->mnToolbarIconSize; } - void SetSymbolsStyle( ULONG nStyle ) + void SetSymbolsStyle( sal_uLong nStyle ) { CopyData(); mpData->mnSymbolsStyle = nStyle; } - ULONG GetSymbolsStyle() const + sal_uLong GetSymbolsStyle() const { return mpData->mnSymbolsStyle; } - void SetPreferredSymbolsStyle( ULONG nStyle ) + void SetPreferredSymbolsStyle( sal_uLong nStyle ) { CopyData(); mpData->mnPreferredSymbolsStyle = nStyle; } void SetPreferredSymbolsStyleName( const ::rtl::OUString &rName ); - ULONG GetPreferredSymbolsStyle() const + sal_uLong GetPreferredSymbolsStyle() const { return mpData->mnPreferredSymbolsStyle; } // check whether the symbols style is supported (icons are installed) - bool CheckSymbolStyle( ULONG nStyle ) const; - ULONG GetAutoSymbolsStyle() const; + bool CheckSymbolStyle( sal_uLong nStyle ) const; + sal_uLong GetAutoSymbolsStyle() const; - ULONG GetCurrentSymbolsStyle() const; + sal_uLong GetCurrentSymbolsStyle() const; void SetSymbolsStyleName( const ::rtl::OUString &rName ) { return SetSymbolsStyle( ImplNameToSymbolsStyle( rName ) ); } @@ -981,20 +935,16 @@ public: { CopyData(); mpData->maWorkspaceGradient = rWall; } void SetStandardStyles(); - void SetStandardWinStyles(); - void SetStandardOS2Styles(); - void SetStandardMacStyles(); - void SetStandardUnixStyles(); const StyleSettings& operator =( const StyleSettings& rSet ); - BOOL operator ==( const StyleSettings& rSet ) const; - BOOL operator !=( const StyleSettings& rSet ) const + sal_Bool operator ==( const StyleSettings& rSet ) const; + sal_Bool operator !=( const StyleSettings& rSet ) const { return !(*this == rSet); } protected: - ::rtl::OUString ImplSymbolsStyleToName( ULONG nStyle ) const; - ULONG ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const; + ::rtl::OUString ImplSymbolsStyleToName( sal_uLong nStyle ) const; + sal_uLong ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const; }; // ---------------- @@ -1009,10 +959,10 @@ class ImplMiscData ImplMiscData( const ImplMiscData& rData ); private: - ULONG mnRefCount; - USHORT mnEnableATT; - BOOL mbEnableLocalizedDecimalSep; - USHORT mnDisablePrinting; + sal_uLong mnRefCount; + sal_uInt16 mnEnableATT; + sal_Bool mbEnableLocalizedDecimalSep; + sal_uInt16 mnDisablePrinting; }; // ---------------- @@ -1031,16 +981,16 @@ public: MiscSettings( const MiscSettings& rSet ); ~MiscSettings(); - void SetEnableATToolSupport( BOOL bEnable ); - BOOL GetEnableATToolSupport() const; - void SetDisablePrinting( BOOL bEnable ); - BOOL GetDisablePrinting() const; - void SetEnableLocalizedDecimalSep( BOOL bEnable ); - BOOL GetEnableLocalizedDecimalSep() const; + void SetEnableATToolSupport( sal_Bool bEnable ); + sal_Bool GetEnableATToolSupport() const; + void SetDisablePrinting( sal_Bool bEnable ); + sal_Bool GetDisablePrinting() const; + void SetEnableLocalizedDecimalSep( sal_Bool bEnable ); + sal_Bool GetEnableLocalizedDecimalSep() const; const MiscSettings& operator =( const MiscSettings& rSet ); - BOOL operator ==( const MiscSettings& rSet ) const; - BOOL operator !=( const MiscSettings& rSet ) const + sal_Bool operator ==( const MiscSettings& rSet ) const; + sal_Bool operator !=( const MiscSettings& rSet ) const { return !(*this == rSet); } }; @@ -1056,8 +1006,8 @@ class ImplNotificationData ImplNotificationData( const ImplNotificationData& rData ); private: - ULONG mnRefCount; - ULONG mnOptions; + sal_uLong mnRefCount; + sal_uLong mnOptions; }; // ------------------------ @@ -1076,15 +1026,15 @@ public: NotificationSettings( const NotificationSettings& rSet ); ~NotificationSettings(); - void SetOptions( ULONG nOptions ) + void SetOptions( sal_uLong nOptions ) { CopyData(); mpData->mnOptions = nOptions; } - ULONG GetOptions() const + sal_uLong GetOptions() const { return mpData->mnOptions; } const NotificationSettings& operator =( const NotificationSettings& rSet ); - BOOL operator ==( const NotificationSettings& rSet ) const; - BOOL operator !=( const NotificationSettings& rSet ) const + sal_Bool operator ==( const NotificationSettings& rSet ) const; + sal_Bool operator !=( const NotificationSettings& rSet ) const { return !(*this == rSet); } }; @@ -1100,19 +1050,19 @@ class ImplHelpData ImplHelpData( const ImplHelpData& rData ); private: - ULONG mnRefCount; - ULONG mnOptions; - ULONG mnTipDelay; - ULONG mnTipTimeout; - ULONG mnBalloonDelay; + sal_uLong mnRefCount; + sal_uLong mnOptions; + sal_uLong mnTipDelay; + sal_uLong mnTipTimeout; + sal_uLong mnBalloonDelay; }; // ---------------- // - HelpSettings - // ---------------- -#define HELP_OPTION_QUICK ((ULONG)0x00000001) -#define HELP_OPTION_ACTIVE ((ULONG)0x00000002) +#define HELP_OPTION_QUICK ((sal_uLong)0x00000001) +#define HELP_OPTION_ACTIVE ((sal_uLong)0x00000002) class VCL_DLLPUBLIC HelpSettings { @@ -1126,27 +1076,27 @@ public: HelpSettings( const HelpSettings& rSet ); ~HelpSettings(); - void SetOptions( ULONG nOptions ) + void SetOptions( sal_uLong nOptions ) { CopyData(); mpData->mnOptions = nOptions; } - ULONG GetOptions() const + sal_uLong GetOptions() const { return mpData->mnOptions; } - void SetTipDelay( ULONG nTipDelay ) + void SetTipDelay( sal_uLong nTipDelay ) { CopyData(); mpData->mnTipDelay = nTipDelay; } - ULONG GetTipDelay() const + sal_uLong GetTipDelay() const { return mpData->mnTipDelay; } - void SetTipTimeout( ULONG nTipTimeout ) + void SetTipTimeout( sal_uLong nTipTimeout ) { CopyData(); mpData->mnTipTimeout = nTipTimeout; } - ULONG GetTipTimeout() const + sal_uLong GetTipTimeout() const { return mpData->mnTipTimeout; } - void SetBalloonDelay( ULONG nBalloonDelay ) + void SetBalloonDelay( sal_uLong nBalloonDelay ) { CopyData(); mpData->mnBalloonDelay = nBalloonDelay; } - ULONG GetBalloonDelay() const + sal_uLong GetBalloonDelay() const { return mpData->mnBalloonDelay; } const HelpSettings& operator =( const HelpSettings& rSet ); - BOOL operator ==( const HelpSettings& rSet ) const; - BOOL operator !=( const HelpSettings& rSet ) const + sal_Bool operator ==( const HelpSettings& rSet ) const; + sal_Bool operator !=( const HelpSettings& rSet ) const { return !(*this == rSet); } }; @@ -1163,7 +1113,7 @@ class ImplAllSettingsData ~ImplAllSettingsData(); private: - ULONG mnRefCount; + sal_uLong mnRefCount; MachineSettings maMachineSettings; MouseSettings maMouseSettings; KeyboardSettings maKeyboardSettings; @@ -1172,8 +1122,8 @@ private: NotificationSettings maNotificationSettings; HelpSettings maHelpSettings; ::com::sun::star::lang::Locale maLocale; - ULONG mnSystemUpdate; - ULONG mnWindowUpdate; + sal_uLong mnSystemUpdate; + sal_uLong mnWindowUpdate; ::com::sun::star::lang::Locale maUILocale; LanguageType meLanguage; LanguageType meUILanguage; @@ -1189,24 +1139,24 @@ private: // - AllSettings - // --------------- -#define SETTINGS_MACHINE ((ULONG)0x00000001) -#define SETTINGS_MOUSE ((ULONG)0x00000002) -#define SETTINGS_KEYBOARD ((ULONG)0x00000004) -#define SETTINGS_STYLE ((ULONG)0x00000008) -#define SETTINGS_MISC ((ULONG)0x00000010) -#define SETTINGS_SOUND ((ULONG)0x00000020) -#define SETTINGS_NOTIFICATION ((ULONG)0x00000040) -#define SETTINGS_HELP ((ULONG)0x00000080) -#define SETTINGS_INTERNATIONAL ((ULONG)0x00000100) /* was for class International, has no effect anymore */ -#define SETTINGS_LOCALE ((ULONG)0x00000200) -#define SETTINGS_UILOCALE ((ULONG)0x00000400) +#define SETTINGS_MACHINE ((sal_uLong)0x00000001) +#define SETTINGS_MOUSE ((sal_uLong)0x00000002) +#define SETTINGS_KEYBOARD ((sal_uLong)0x00000004) +#define SETTINGS_STYLE ((sal_uLong)0x00000008) +#define SETTINGS_MISC ((sal_uLong)0x00000010) +#define SETTINGS_SOUND ((sal_uLong)0x00000020) +#define SETTINGS_NOTIFICATION ((sal_uLong)0x00000040) +#define SETTINGS_HELP ((sal_uLong)0x00000080) +#define SETTINGS_INTERNATIONAL ((sal_uLong)0x00000100) /* was for class International, has no effect anymore */ +#define SETTINGS_LOCALE ((sal_uLong)0x00000200) +#define SETTINGS_UILOCALE ((sal_uLong)0x00000400) #define SETTINGS_ALLSETTINGS (SETTINGS_MACHINE |\ SETTINGS_MOUSE | SETTINGS_KEYBOARD |\ SETTINGS_STYLE | SETTINGS_MISC |\ SETTINGS_SOUND | SETTINGS_NOTIFICATION |\ SETTINGS_HELP |\ SETTINGS_LOCALE | SETTINGS_UILOCALE ) -#define SETTINGS_IN_UPDATE_SETTINGS ((ULONG)0x00000800) // this flag indicates that the data changed event was created +#define SETTINGS_IN_UPDATE_SETTINGS ((sal_uLong)0x00000800) // this flag indicates that the data changed event was created // in Windows::UpdateSettings probably because of a global // settings changed @@ -1265,7 +1215,7 @@ public: LanguageType GetLanguage() const; void SetUILanguage( LanguageType eLang ); LanguageType GetUILanguage() const; - BOOL GetLayoutRTL() const; // returns TRUE if UI language requires right-to-left UI + sal_Bool GetLayoutRTL() const; // returns sal_True if UI language requires right-to-left UI const LocaleDataWrapper& GetLocaleDataWrapper() const; const LocaleDataWrapper& GetUILocaleDataWrapper() const; const vcl::I18nHelper& GetLocaleI18nHelper() const; @@ -1282,22 +1232,22 @@ public: const String& rStr2, xub_StrLen nPos2, xub_StrLen nCount2 ) const; */ - void SetSystemUpdate( ULONG nUpdate ) + void SetSystemUpdate( sal_uLong nUpdate ) { CopyData(); mpData->mnSystemUpdate = nUpdate; } - ULONG GetSystemUpdate() const + sal_uLong GetSystemUpdate() const { return mpData->mnSystemUpdate; } - void SetWindowUpdate( ULONG nUpdate ) + void SetWindowUpdate( sal_uLong nUpdate ) { CopyData(); mpData->mnWindowUpdate = nUpdate; } - ULONG GetWindowUpdate() const + sal_uLong GetWindowUpdate() const { return mpData->mnWindowUpdate; } - ULONG Update( ULONG nFlags, const AllSettings& rSettings ); - ULONG GetChangeFlags( const AllSettings& rSettings ) const; + sal_uLong Update( sal_uLong nFlags, const AllSettings& rSettings ); + sal_uLong GetChangeFlags( const AllSettings& rSettings ) const; const AllSettings& operator =( const AllSettings& rSet ); - BOOL operator ==( const AllSettings& rSet ) const; - BOOL operator !=( const AllSettings& rSet ) const + sal_Bool operator ==( const AllSettings& rSet ) const; + sal_Bool operator !=( const AllSettings& rSet ) const { return !(*this == rSet); } static void LocaleSettingsChanged( sal_uInt32 nHint ); SvtSysLocale& GetSysLocale() { return mpData->maSysLocale; } diff --git a/vcl/inc/vcl/slider.hxx b/vcl/inc/vcl/slider.hxx index 5208fffcfb54..15f049555386 100644 --- a/vcl/inc/vcl/slider.hxx +++ b/vcl/inc/vcl/slider.hxx @@ -60,11 +60,11 @@ private: long mnLineSize; long mnPageSize; long mnDelta; - USHORT mnDragDraw; - USHORT mnStateFlags; + sal_uInt16 mnDragDraw; + sal_uInt16 mnStateFlags; ScrollType meScrollType; - BOOL mbCalcSize; - BOOL mbFullDrag; + sal_Bool mbCalcSize; + sal_Bool mbFullDrag; Link maSlideHdl; Link maEndSlideHdl; @@ -73,16 +73,16 @@ private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplInitSettings(); - SAL_DLLPRIVATE void ImplUpdateRects( BOOL bUpdate = TRUE ); + SAL_DLLPRIVATE void ImplUpdateRects( sal_Bool bUpdate = sal_True ); SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos ); SAL_DLLPRIVATE long ImplCalcThumbPosPix( long nPos ); - SAL_DLLPRIVATE void ImplCalc( BOOL bUpdate = TRUE ); - SAL_DLLPRIVATE void ImplDraw( USHORT nDrawFlags ); - SAL_DLLPRIVATE BOOL ImplIsPageUp( const Point& rPos ); - SAL_DLLPRIVATE BOOL ImplIsPageDown( const Point& rPos ); - SAL_DLLPRIVATE long ImplSlide( long nNewPos, BOOL bCallEndSlide ); - SAL_DLLPRIVATE long ImplDoAction( BOOL bCallEndSlide ); - SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, BOOL bCallAction = TRUE ); + SAL_DLLPRIVATE void ImplCalc( sal_Bool bUpdate = sal_True ); + SAL_DLLPRIVATE void ImplDraw( sal_uInt16 nDrawFlags ); + SAL_DLLPRIVATE sal_Bool ImplIsPageUp( const Point& rPos ); + SAL_DLLPRIVATE sal_Bool ImplIsPageDown( const Point& rPos ); + SAL_DLLPRIVATE long ImplSlide( long nNewPos, sal_Bool bCallEndSlide ); + SAL_DLLPRIVATE long ImplDoAction( sal_Bool bCallEndSlide ); + SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, sal_Bool bCallAction = sal_True ); SAL_DLLPRIVATE long ImplDoSlide( long nNewPos ); SAL_DLLPRIVATE long ImplDoSlideAction( ScrollType eScrollType ); @@ -103,9 +103,9 @@ public: virtual void Slide(); virtual void EndSlide(); - void EnableDrag( BOOL bEnable = TRUE ) + void EnableDrag( sal_Bool bEnable = sal_True ) { mbFullDrag = bEnable; } - BOOL IsDragEnabled() const { return mbFullDrag; } + sal_Bool IsDragEnabled() const { return mbFullDrag; } void SetRangeMin( long nNewRange ); long GetRangeMin() const { return mnMinRange; } diff --git a/vcl/inc/vcl/smartid.hxx b/vcl/inc/vcl/smartid.hxx deleted file mode 100644 index fa005db25c80..000000000000 --- a/vcl/inc/vcl/smartid.hxx +++ /dev/null @@ -1,90 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SMARTID_HXX_ -#define _SMARTID_HXX_ - -#include <tools/string.hxx> -#include <vcl/dllapi.h> - -/// SMART_SET_SMART only sets the Ids that are defined in the SmartId -/// the other types set whatever is given. This can also be used to reset an Id -enum SmartIdUpdateMode { SMART_SET_SMART, SMART_SET_NUM, SMART_SET_STR, SMART_SET_ALL }; - -struct ImplSmartIdData; - -/* - -SmartId is a substitute for Numeric HelpIds. They can handle Numeric and String HelpIds and offer commonly needed operators. - -Matching Ids: -if part of an Id is not set (HasNumeric HasString is False) then this part will never match to anything. Not even unset values - -*/ -class VCL_DLLPUBLIC SmartId -{ -private: - ImplSmartIdData* mpData; - SAL_DLLPRIVATE ImplSmartIdData* GetSmartIdData(); - -public: - explicit SmartId( const String& rId ); - explicit SmartId( ULONG nId ); - SmartId( const String& rId, ULONG nId ); - - SmartId(); - - SmartId( const SmartId& rId ); - SmartId& operator = ( const SmartId& rId ); - - ~SmartId(); - - void UpdateId( const SmartId& rId, SmartIdUpdateMode aMode = SMART_SET_SMART ); - - BOOL HasNumeric() const; - BOOL HasString() const; - BOOL HasAny() const; - ULONG GetNum() const; - String GetStr() const; - - String GetText() const; /// return String for UI usage - - BOOL Matches( const String &rId )const; - BOOL Matches( const ULONG nId ) const; -/// In case both Ids have both values set only the StringId is used for Matching - BOOL Matches( const SmartId &rId ) const; - - BOOL Equals( const SmartId &rId ) const; - - BOOL operator == ( const SmartId& rRight ) const; - BOOL operator < ( const SmartId& rRight ) const; -}; - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/sndstyle.hxx b/vcl/inc/vcl/sndstyle.hxx index 62268d34a6ba..170a51173726 100644 --- a/vcl/inc/vcl/sndstyle.hxx +++ b/vcl/inc/vcl/sndstyle.hxx @@ -35,7 +35,7 @@ // - Sound-Types - // --------------- -typedef USHORT SoundType; +typedef sal_uInt16 SoundType; #define SOUND_DEFAULT ((SoundType)0) #define SOUND_INFO ((SoundType)1) #define SOUND_WARNING ((SoundType)2) diff --git a/vcl/inc/vcl/spin.h b/vcl/inc/vcl/spin.h index e20cb9aaa86a..f7b69cbf2a16 100644 --- a/vcl/inc/vcl/spin.h +++ b/vcl/inc/vcl/spin.h @@ -44,10 +44,10 @@ class OutputDevice; void ImplDrawSpinButton( OutputDevice* pOutDev, const Rectangle& rUpperRect, const Rectangle& rLowerRect, - BOOL bUpperIn, BOOL bLowerIn, - BOOL bUpperEnabled = TRUE, - BOOL bLowerEnabled = TRUE, - BOOL bHorz = FALSE, BOOL bMirrorHorz = FALSE ); + sal_Bool bUpperIn, sal_Bool bLowerIn, + sal_Bool bUpperEnabled = sal_True, + sal_Bool bLowerEnabled = sal_True, + sal_Bool bHorz = sal_False, sal_Bool bMirrorHorz = sal_False ); #endif // _SV_SPIN_H diff --git a/vcl/inc/vcl/spin.hxx b/vcl/inc/vcl/spin.hxx index 6250c5020717..02141bccd448 100644 --- a/vcl/inc/vcl/spin.hxx +++ b/vcl/inc/vcl/spin.hxx @@ -45,13 +45,13 @@ private: Rectangle maUpperRect; Rectangle maLowerRect; Rectangle maFocusRect; - BOOL mbRepeat : 1; - BOOL mbUpperIn : 1; - BOOL mbLowerIn : 1; - BOOL mbInitialUp : 1; - BOOL mbInitialDown : 1; - BOOL mbHorz : 1; - BOOL mbUpperIsFocused : 1; + sal_Bool mbRepeat : 1; + sal_Bool mbUpperIn : 1; + sal_Bool mbLowerIn : 1; + sal_Bool mbInitialUp : 1; + sal_Bool mbInitialDown : 1; + sal_Bool mbHorz : 1; + sal_Bool mbUpperIsFocused : 1; Link maUpHdlLink; Link maDownHdlLink; long mnMinRange; @@ -74,7 +74,7 @@ public: virtual void Resize(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void MouseButtonUp( const MouseEvent& rMEvt ); virtual void MouseMove( const MouseEvent& rMEvt ); @@ -101,15 +101,15 @@ public: const Link& GetDownHdl() const { return maDownHdlLink; } private: - // moves the focus to the upper or lower rect. Return TRUE if the focus rect actually changed. - SAL_DLLPRIVATE BOOL ImplMoveFocus( BOOL _bUpper ); - SAL_DLLPRIVATE void ImplCalcFocusRect( BOOL _bUpper ); + // moves the focus to the upper or lower rect. Return sal_True if the focus rect actually changed. + SAL_DLLPRIVATE sal_Bool ImplMoveFocus( sal_Bool _bUpper ); + SAL_DLLPRIVATE void ImplCalcFocusRect( sal_Bool _bUpper ); - SAL_DLLPRIVATE inline BOOL ImplIsUpperEnabled( ) const + SAL_DLLPRIVATE inline sal_Bool ImplIsUpperEnabled( ) const { return mnValue + mnValueStep <= mnMaxRange; } - SAL_DLLPRIVATE inline BOOL ImplIsLowerEnabled( ) const + SAL_DLLPRIVATE inline sal_Bool ImplIsLowerEnabled( ) const { return mnValue >= mnMinRange + mnValueStep; } diff --git a/vcl/inc/vcl/spinfld.hxx b/vcl/inc/vcl/spinfld.hxx index db46c16d331b..becfe4be426f 100644 --- a/vcl/inc/vcl/spinfld.hxx +++ b/vcl/inc/vcl/spinfld.hxx @@ -50,7 +50,7 @@ protected: Link maDownHdlLink; Link maFirstHdlLink; Link maLastHdlLink; - BOOL mbRepeat:1, + sal_Bool mbRepeat:1, mbSpin:1, mbInitialUp:1, mbInitialDown:1, @@ -82,7 +82,7 @@ public: SpinField( Window* pParent, const ResId& rResId ); ~SpinField(); - virtual BOOL ShowDropDown( BOOL bShow ); + virtual sal_Bool ShowDropDown( sal_Bool bShow ); virtual void Up(); virtual void Down(); @@ -93,7 +93,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ); virtual void MouseMove( const MouseEvent& rMEvt ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Resize(); virtual void StateChanged( StateChangedType nType ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); @@ -110,7 +110,7 @@ public: virtual Size CalcMinimumSize() const; virtual Size GetOptimalSize(WindowSizeType eType) const; - virtual Size CalcSize( USHORT nChars ) const; + virtual Size CalcSize( sal_uInt16 nChars ) const; }; #endif // _SV_SPINFLD_HXX diff --git a/vcl/inc/vcl/split.hxx b/vcl/inc/vcl/split.hxx index 9cd77275820a..66371c6da1a2 100644 --- a/vcl/inc/vcl/split.hxx +++ b/vcl/inc/vcl/split.hxx @@ -48,9 +48,9 @@ private: long mnStartSplitPos; Point maDragPos; Rectangle maDragRect; - BOOL mbHorzSplit; - BOOL mbDragFull; - BOOL mbKbdSplitting; + sal_Bool mbHorzSplit; + sal_Bool mbDragFull; + sal_Bool mbKbdSplitting; long mbInKeyEvent; long mnKeyboardStepSize; Link maStartSplitHdl; @@ -62,7 +62,7 @@ private: SAL_DLLPRIVATE void ImplSplitMousePos( Point& rPos ); SAL_DLLPRIVATE void ImplStartKbdSplitting(); SAL_DLLPRIVATE void ImplKbdTracking( KeyCode aKeyCode ); - SAL_DLLPRIVATE BOOL ImplSplitterActive(); + SAL_DLLPRIVATE sal_Bool ImplSplitterActive(); SAL_DLLPRIVATE Splitter* ImplFindSibling(); SAL_DLLPRIVATE void ImplRestoreSplitter(); @@ -109,7 +109,7 @@ public: void SetLastSplitPosPixel( long nNewPos ); long GetLastSplitPosPixel() const { return mnLastSplitPos; } - BOOL IsHorizontal() const { return mbHorzSplit; } + sal_Bool IsHorizontal() const { return mbHorzSplit; } // set the stepsize of the splitter for cursor movement // the default is 10% of the reference window's width/height diff --git a/vcl/inc/vcl/splitwin.hxx b/vcl/inc/vcl/splitwin.hxx index c6671f2799c0..ce1e74958f48 100644 --- a/vcl/inc/vcl/splitwin.hxx +++ b/vcl/inc/vcl/splitwin.hxx @@ -40,7 +40,7 @@ struct ImplSplitSet; // - SplitWindowItemBits - // ----------------------- -typedef USHORT SplitWindowItemBits; +typedef sal_uInt16 SplitWindowItemBits; // ------------------------------- // - Bits fuer SplitWindow-Items - @@ -56,8 +56,8 @@ typedef USHORT SplitWindowItemBits; // - SplitWindow-Types - // --------------------- -#define SPLITWINDOW_APPEND ((USHORT)0xFFFF) -#define SPLITWINDOW_ITEM_NOTFOUND ((USHORT)0xFFFF) +#define SPLITWINDOW_APPEND ((sal_uInt16)0xFFFF) +#define SPLITWINDOW_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) // --------------- // - SplitWindow - @@ -83,10 +83,10 @@ private: long mnMSplitPos; WinBits mnWinStyle; WindowAlign meAlign; - USHORT mnSplitTest; - USHORT mnSplitPos; - USHORT mnMouseModifier; - BOOL mbDragFull:1, + sal_uInt16 mnSplitTest; + sal_uInt16 mnSplitPos; + sal_uInt16 mnMouseModifier; + sal_Bool mbDragFull:1, mbHorz:1, mbBottomRight:1, mbCalc:1, @@ -121,31 +121,31 @@ private: SAL_DLLPRIVATE void ImplUpdateSet( ImplSplitSet* pSet ); SAL_DLLPRIVATE void ImplSetWindowSize( long nDelta ); SAL_DLLPRIVATE void ImplSplitMousePos( Point& rMousePos ); - SAL_DLLPRIVATE void ImplGetButtonRect( Rectangle& rRect, long nEx, BOOL bTest ) const; - SAL_DLLPRIVATE void ImplGetAutoHideRect( Rectangle& rRect, BOOL bTest = FALSE ) const; - SAL_DLLPRIVATE void ImplGetFadeInRect( Rectangle& rRect, BOOL bTest = FALSE ) const; - SAL_DLLPRIVATE void ImplGetFadeOutRect( Rectangle& rRect, BOOL bTest = FALSE ) const; + SAL_DLLPRIVATE void ImplGetButtonRect( Rectangle& rRect, long nEx, sal_Bool bTest ) const; + SAL_DLLPRIVATE void ImplGetAutoHideRect( Rectangle& rRect, sal_Bool bTest = sal_False ) const; + SAL_DLLPRIVATE void ImplGetFadeInRect( Rectangle& rRect, sal_Bool bTest = sal_False ) const; + SAL_DLLPRIVATE void ImplGetFadeOutRect( Rectangle& rRect, sal_Bool bTest = sal_False ) const; SAL_DLLPRIVATE void ImplDrawButtonRect( const Rectangle& rRect, long nSize ); - SAL_DLLPRIVATE void ImplDrawAutoHide( BOOL bInPaint ); - SAL_DLLPRIVATE void ImplDrawFadeIn( BOOL bInPaint ); - SAL_DLLPRIVATE void ImplDrawFadeOut( BOOL bInPaint ); + SAL_DLLPRIVATE void ImplDrawAutoHide( sal_Bool bInPaint ); + SAL_DLLPRIVATE void ImplDrawFadeIn( sal_Bool bInPaint ); + SAL_DLLPRIVATE void ImplDrawFadeOut( sal_Bool bInPaint ); SAL_DLLPRIVATE void ImplNewAlign(); - SAL_DLLPRIVATE void ImplDrawGrip( const Rectangle& rRect, BOOL bHorz, BOOL bLeft ); - SAL_DLLPRIVATE void ImplDrawFadeArrow( const Point& rPt, BOOL bHorz, BOOL bLeft ); + SAL_DLLPRIVATE void ImplDrawGrip( const Rectangle& rRect, sal_Bool bHorz, sal_Bool bLeft ); + SAL_DLLPRIVATE void ImplDrawFadeArrow( const Point& rPt, sal_Bool bHorz, sal_Bool bLeft ); SAL_DLLPRIVATE void ImplStartSplit( const MouseEvent& rMEvt ); static SAL_DLLPRIVATE void ImplDrawBorder( SplitWindow* pWin ); static SAL_DLLPRIVATE void ImplDrawBorderLine( SplitWindow* pWin ); - static SAL_DLLPRIVATE void ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, BOOL bHide, - BOOL bRows, BOOL bDown = TRUE ); + static SAL_DLLPRIVATE void ImplCalcSet2( SplitWindow* pWindow, ImplSplitSet* pSet, sal_Bool bHide, + sal_Bool bRows, sal_Bool bDown = sal_True ); static SAL_DLLPRIVATE void ImplDrawBack( SplitWindow* pWindow, ImplSplitSet* pSet ); static SAL_DLLPRIVATE void ImplDrawBack( SplitWindow* pWindow, const Rectangle& rRect, const Wallpaper* pWall, const Bitmap* pBitmap ); - static SAL_DLLPRIVATE USHORT ImplTestSplit( ImplSplitSet* pSet, const Point& rPos, - long& rMouseOff, ImplSplitSet** ppFoundSet, USHORT& rFoundPos, - BOOL bRows, BOOL bDown = TRUE ); - static SAL_DLLPRIVATE USHORT ImplTestSplit( SplitWindow* pWindow, const Point& rPos, - long& rMouseOff, ImplSplitSet** ppFoundSet, USHORT& rFoundPos ); + static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( ImplSplitSet* pSet, const Point& rPos, + long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos, + sal_Bool bRows, sal_Bool bDown = sal_True ); + static SAL_DLLPRIVATE sal_uInt16 ImplTestSplit( SplitWindow* pWindow, const Point& rPos, + long& rMouseOff, ImplSplitSet** ppFoundSet, sal_uInt16& rFoundPos ); static SAL_DLLPRIVATE void ImplDrawSplitTracking( SplitWindow* pThis, const Point& rPos ); // Copy assignment is forbidden and not implemented. @@ -174,54 +174,66 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); - void InsertItem( USHORT nId, Window* pWindow, long nSize, - USHORT nPos = SPLITWINDOW_APPEND, USHORT nSetId = 0, + void InsertItem( sal_uInt16 nId, Window* pWindow, long nSize, + sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0, SplitWindowItemBits nBits = 0 ); - void InsertItem( USHORT nId, long nSize, - USHORT nPos = SPLITWINDOW_APPEND, USHORT nSetId = 0, + void InsertItem( sal_uInt16 nId, long nSize, + sal_uInt16 nPos = SPLITWINDOW_APPEND, sal_uInt16 nSetId = 0, SplitWindowItemBits nBits = 0 ); - void MoveItem( USHORT nId, USHORT nNewPos, USHORT nNewSetId = 0 ); - void RemoveItem( USHORT nId, BOOL bHide = TRUE ); + void MoveItem( sal_uInt16 nId, sal_uInt16 nNewPos, sal_uInt16 nNewSetId = 0 ); + void RemoveItem( sal_uInt16 nId, sal_Bool bHide = sal_True ); void Clear(); - void SetBaseSet( USHORT nSetId = 0 ); - USHORT GetBaseSet() const; + void SetBaseSet( sal_uInt16 nSetId = 0 ); + sal_uInt16 GetBaseSet() const; - void SetSplitSize( USHORT nSetId, long nSplitSize, - BOOL bWithChilds = FALSE ); - long GetSplitSize( USHORT nSetId ) const; - void SetItemBackground( USHORT nSetId ); - void SetItemBackground( USHORT nSetId, const Wallpaper& rWallpaper ); - Wallpaper GetItemBackground( USHORT nSetId ) const; - BOOL IsItemBackground( USHORT nSetId ) const; - void SetItemBitmap( USHORT nSetId, const Bitmap& rBitmap ); - Bitmap GetItemBitmap( USHORT nSetId ) const; + void SetSplitSize( sal_uInt16 nSetId, long nSplitSize, + sal_Bool bWithChilds = sal_False ); + long GetSplitSize( sal_uInt16 nSetId ) const; + void SetItemBackground( sal_uInt16 nSetId ); + void SetItemBackground( sal_uInt16 nSetId, const Wallpaper& rWallpaper ); + Wallpaper GetItemBackground( sal_uInt16 nSetId ) const; + sal_Bool IsItemBackground( sal_uInt16 nSetId ) const; + void SetItemBitmap( sal_uInt16 nSetId, const Bitmap& rBitmap ); + Bitmap GetItemBitmap( sal_uInt16 nSetId ) const; - void SplitItem( USHORT nId, long nNewSize, - BOOL bPropSmall = FALSE, - BOOL bPropGreat = FALSE ); - void SetItemSize( USHORT nId, long nNewSize ); - long GetItemSize( USHORT nId ) const; - long GetItemSize( USHORT nId, SplitWindowItemBits nBits ) const; - void SetItemBits( USHORT nId, SplitWindowItemBits nNewBits ); - SplitWindowItemBits GetItemBits( USHORT nId ) const; - Window* GetItemWindow( USHORT nId ) const; - USHORT GetSet( USHORT nId ) const; - BOOL GetSet( USHORT nId, USHORT& rSetId, USHORT& rPos ) const; - USHORT GetItemId( Window* pWindow ) const; - USHORT GetItemId( const Point& rPos ) const; - USHORT GetItemPos( USHORT nId, USHORT nSetId = 0 ) const; - USHORT GetItemId( USHORT nPos, USHORT nSetId = 0 ) const; - USHORT GetItemCount( USHORT nSetId = 0 ) const; - BOOL IsItemValid( USHORT nId ) const; + void SplitItem( sal_uInt16 nId, long nNewSize, + sal_Bool bPropSmall = sal_False, + sal_Bool bPropGreat = sal_False ); + void SetItemSize( sal_uInt16 nId, long nNewSize ); + long GetItemSize( sal_uInt16 nId ) const; + /** Set a range that limits the (variable part of the) size with an + upper and a lower bound (both are valid values themselves.) + @param nId + Id of the item for which the size limits are set. + @param aRange + Values of -1 define missing bounds, thus setting a range (-1,-1) + (the default) removes the size limitiation. + */ + void SetItemSizeRange (sal_uInt16 nId, const Range aRange); + /** Return the current size limits for the specified item. + */ + Range GetItemSizeRange (sal_uInt16 nId) const; + long GetItemSize( sal_uInt16 nId, SplitWindowItemBits nBits ) const; + void SetItemBits( sal_uInt16 nId, SplitWindowItemBits nNewBits ); + SplitWindowItemBits GetItemBits( sal_uInt16 nId ) const; + Window* GetItemWindow( sal_uInt16 nId ) const; + sal_uInt16 GetSet( sal_uInt16 nId ) const; + sal_Bool GetSet( sal_uInt16 nId, sal_uInt16& rSetId, sal_uInt16& rPos ) const; + sal_uInt16 GetItemId( Window* pWindow ) const; + sal_uInt16 GetItemId( const Point& rPos ) const; + sal_uInt16 GetItemPos( sal_uInt16 nId, sal_uInt16 nSetId = 0 ) const; + sal_uInt16 GetItemId( sal_uInt16 nPos, sal_uInt16 nSetId = 0 ) const; + sal_uInt16 GetItemCount( sal_uInt16 nSetId = 0 ) const; + sal_Bool IsItemValid( sal_uInt16 nId ) const; - void SetNoAlign( BOOL bNoAlign ); - BOOL IsNoAlign() const { return mbNoAlign; } + void SetNoAlign( sal_Bool bNoAlign ); + sal_Bool IsNoAlign() const { return mbNoAlign; } void SetAlign( WindowAlign eNewAlign = WINDOWALIGN_TOP ); WindowAlign GetAlign() const { return meAlign; } - BOOL IsHorizontal() const { return mbHorz; } + sal_Bool IsHorizontal() const { return mbHorz; } - BOOL IsSplitting() const { return IsTracking(); } + sal_Bool IsSplitting() const { return IsTracking(); } void SetMaxSizePixel( long nNewMaxSize ) { mnMaxSize = nNewMaxSize; } long GetMaxSizePixel() const { return mnMaxSize; } @@ -229,24 +241,24 @@ public: static Size CalcWindowSizePixel( const Size& rSize, WindowAlign eAlign, WinBits nWinStyle, - BOOL bExtra = FALSE ); + sal_Bool bExtra = sal_False ); Size CalcWindowSizePixel( const Size& rSize ) { return CalcWindowSizePixel( rSize, meAlign, mnWinStyle, (mbAutoHide || mbFadeOut) ); } Size CalcLayoutSizePixel( const Size& aNewSize ); - void ShowAutoHideButton( BOOL bShow = TRUE ); - BOOL IsAutoHideButtonVisible() const { return mbAutoHide; } - void ShowFadeInHideButton( BOOL bShow = TRUE ); - void ShowFadeInButton( BOOL bShow = TRUE ) { ShowFadeInHideButton( bShow ); } - BOOL IsFadeInButtonVisible() const { return mbFadeIn; } - void ShowFadeOutButton( BOOL bShow = TRUE ); - BOOL IsFadeOutButtonVisible() const { return mbFadeOut; } + void ShowAutoHideButton( sal_Bool bShow = sal_True ); + sal_Bool IsAutoHideButtonVisible() const { return mbAutoHide; } + void ShowFadeInHideButton( sal_Bool bShow = sal_True ); + void ShowFadeInButton( sal_Bool bShow = sal_True ) { ShowFadeInHideButton( bShow ); } + sal_Bool IsFadeInButtonVisible() const { return mbFadeIn; } + void ShowFadeOutButton( sal_Bool bShow = sal_True ); + sal_Bool IsFadeOutButtonVisible() const { return mbFadeOut; } long GetFadeInSize() const; - BOOL IsFadeNoButtonMode() const { return mbFadeNoButtonMode; } + sal_Bool IsFadeNoButtonMode() const { return mbFadeNoButtonMode; } - void SetAutoHideState( BOOL bAutoHide ); - BOOL GetAutoHideState() const { return mbAutoHideIn; } + void SetAutoHideState( sal_Bool bAutoHide ); + sal_Bool GetAutoHideState() const { return mbAutoHideIn; } Rectangle GetAutoHideRect() const; Rectangle GetFadeInRect() const; diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx index 9df46e99d14b..d039ddf8f203 100644 --- a/vcl/inc/vcl/status.hxx +++ b/vcl/inc/vcl/status.hxx @@ -43,7 +43,7 @@ typedef ::std::vector< ImplStatusItem* > ImplStatusItemList; void VCL_DLLPUBLIC DrawProgress( Window* pWindow, const Point& rPos, long nOffset, long nPrgsWidth, long nPrgsHeight, - USHORT nPercent1, USHORT nPercent2, USHORT nPercentCount, + sal_uInt16 nPercent1, sal_uInt16 nPercent2, sal_uInt16 nPercentCount, const Rectangle& rFramePosSize ); @@ -51,7 +51,7 @@ void VCL_DLLPUBLIC DrawProgress( Window* pWindow, const Point& rPos, // - StatusBarItemBits - // --------------------- -typedef USHORT StatusBarItemBits; +typedef sal_uInt16 StatusBarItemBits; // ---------------------------- // - Bits fuer StatusBarItems - @@ -70,8 +70,8 @@ typedef USHORT StatusBarItemBits; // - StatusBar-Types - // ------------------- -#define STATUSBAR_APPEND ((USHORT)0xFFFF) -#define STATUSBAR_ITEM_NOTFOUND ((USHORT)0xFFFF) +#define STATUSBAR_APPEND ((sal_uInt16)0xFFFF) +#define STATUSBAR_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) #define STATUSBAR_OFFSET ((long)5) // ------------- @@ -94,30 +94,30 @@ private: long mnCalcHeight; long mnTextY; long mnItemY; - USHORT mnCurItemId; - USHORT mnPercent; - USHORT mnPercentCount; - BOOL mbVisibleItems; - BOOL mbFormat; - BOOL mbProgressMode; - BOOL mbInUserDraw; - BOOL mbBottomBorder; + sal_uInt16 mnCurItemId; + sal_uInt16 mnPercent; + sal_uInt16 mnPercentCount; + sal_Bool mbVisibleItems; + sal_Bool mbFormat; + sal_Bool mbProgressMode; + sal_Bool mbInUserDraw; + sal_Bool mbBottomBorder; Link maClickHdl; Link maDoubleClickHdl; using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); SAL_DLLPRIVATE void ImplFormat(); - SAL_DLLPRIVATE BOOL ImplIsItemUpdate(); + SAL_DLLPRIVATE sal_Bool ImplIsItemUpdate(); using OutputDevice::ImplDrawText; - SAL_DLLPRIVATE void ImplDrawText( BOOL bOffScreen, long nOldTextWidth ); - SAL_DLLPRIVATE void ImplDrawItem( BOOL bOffScreen, USHORT nPos, BOOL bDrawText, BOOL bDrawFrame ); - SAL_DLLPRIVATE void ImplDrawProgress( BOOL bPaint, - USHORT nOldPerc, USHORT nNewPerc ); + SAL_DLLPRIVATE void ImplDrawText( sal_Bool bOffScreen, long nOldTextWidth ); + SAL_DLLPRIVATE void ImplDrawItem( sal_Bool bOffScreen, sal_uInt16 nPos, sal_Bool bDrawText, sal_Bool bDrawFrame ); + SAL_DLLPRIVATE void ImplDrawProgress( sal_Bool bPaint, + sal_uInt16 nOldPerc, sal_uInt16 nNewPerc ); SAL_DLLPRIVATE void ImplCalcProgressRect(); - SAL_DLLPRIVATE Rectangle ImplGetItemRectPos( USHORT nPos ) const; - SAL_DLLPRIVATE USHORT ImplGetFirstVisiblePos() const; + SAL_DLLPRIVATE Rectangle ImplGetItemRectPos( sal_uInt16 nPos ) const; + SAL_DLLPRIVATE sal_uInt16 ImplGetFirstVisiblePos() const; SAL_DLLPRIVATE void ImplCalcBorder(); public: @@ -138,65 +138,65 @@ public: virtual void DoubleClick(); virtual void UserDraw( const UserDrawEvent& rUDEvt ); - void InsertItem( USHORT nItemId, ULONG nWidth, + void InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, StatusBarItemBits nBits = SIB_CENTER | SIB_IN, long nOffset = STATUSBAR_OFFSET, - USHORT nPos = STATUSBAR_APPEND ); - void RemoveItem( USHORT nItemId ); + sal_uInt16 nPos = STATUSBAR_APPEND ); + void RemoveItem( sal_uInt16 nItemId ); - void ShowItem( USHORT nItemId ); - void HideItem( USHORT nItemId ); - BOOL IsItemVisible( USHORT nItemId ) const; + void ShowItem( sal_uInt16 nItemId ); + void HideItem( sal_uInt16 nItemId ); + sal_Bool IsItemVisible( sal_uInt16 nItemId ) const; void ShowItems(); void HideItems(); - BOOL AreItemsVisible() const { return mbVisibleItems; } + sal_Bool AreItemsVisible() const { return mbVisibleItems; } void CopyItems( const StatusBar& rStatusBar ); void Clear(); - USHORT GetItemCount() const; - USHORT GetItemId( USHORT nPos ) const; - USHORT GetItemId( const Point& rPos ) const; - USHORT GetItemPos( USHORT nItemId ) const; - Rectangle GetItemRect( USHORT nItemId ) const; - Point GetItemTextPos( USHORT nItemId ) const; - USHORT GetCurItemId() const { return mnCurItemId; } + sal_uInt16 GetItemCount() const; + sal_uInt16 GetItemId( sal_uInt16 nPos ) const; + sal_uInt16 GetItemId( const Point& rPos ) const; + sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; + Rectangle GetItemRect( sal_uInt16 nItemId ) const; + Point GetItemTextPos( sal_uInt16 nItemId ) const; + sal_uInt16 GetCurItemId() const { return mnCurItemId; } - ULONG GetItemWidth( USHORT nItemId ) const; - StatusBarItemBits GetItemBits( USHORT nItemId ) const; - long GetItemOffset( USHORT nItemId ) const; + sal_uLong GetItemWidth( sal_uInt16 nItemId ) const; + StatusBarItemBits GetItemBits( sal_uInt16 nItemId ) const; + long GetItemOffset( sal_uInt16 nItemId ) const; - void SetItemText( USHORT nItemId, const XubString& rText ); - const XubString& GetItemText( USHORT nItemId ) const; + void SetItemText( sal_uInt16 nItemId, const XubString& rText ); + const XubString& GetItemText( sal_uInt16 nItemId ) const; - void SetItemData( USHORT nItemId, void* pNewData ); - void* GetItemData( USHORT nItemId ) const; + void SetItemData( sal_uInt16 nItemId, void* pNewData ); + void* GetItemData( sal_uInt16 nItemId ) const; - void SetItemCommand( USHORT nItemId, const XubString& rCommand ); - const XubString& GetItemCommand( USHORT nItemId ); + void SetItemCommand( sal_uInt16 nItemId, const XubString& rCommand ); + const XubString& GetItemCommand( sal_uInt16 nItemId ); - void SetHelpText( USHORT nItemId, const XubString& rText ); - const XubString& GetHelpText( USHORT nItemId ) const; + void SetHelpText( sal_uInt16 nItemId, const XubString& rText ); + const XubString& GetHelpText( sal_uInt16 nItemId ) const; using Window::SetQuickHelpText; - void SetQuickHelpText( USHORT nItemId, const XubString& rText ); + void SetQuickHelpText( sal_uInt16 nItemId, const XubString& rText ); using Window::GetQuickHelpText; - const XubString& GetQuickHelpText( USHORT nItemId ) const; + const XubString& GetQuickHelpText( sal_uInt16 nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ); + rtl::OString GetHelpId( sal_uInt16 nItemId ) const; - void SetBottomBorder( BOOL bBottomBorder = TRUE ); - BOOL IsBottomBorder() const { return mbBottomBorder; } + void SetBottomBorder( sal_Bool bBottomBorder = sal_True ); + sal_Bool IsBottomBorder() const { return mbBottomBorder; } - void SetTopBorder( BOOL bTopBorder = TRUE ); - BOOL IsTopBorder() const; + void SetTopBorder( sal_Bool bTopBorder = sal_True ); + sal_Bool IsTopBorder() const; void StartProgressMode( const XubString& rText ); - void SetProgressValue( USHORT nPercent ); + void SetProgressValue( sal_uInt16 nPercent ); void EndProgressMode(); - BOOL IsProgressMode() const { return mbProgressMode; } + sal_Bool IsProgressMode() const { return mbProgressMode; } void ResetProgressMode(); void SetText( const XubString& rText ); @@ -206,9 +206,9 @@ public: const XubString& GetHelpText() const { return Window::GetHelpText(); } - void SetHelpId( ULONG nId ) - { Window::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { Window::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return Window::GetHelpId(); } Size CalcWindowSizePixel() const; @@ -219,9 +219,9 @@ public: const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } using Window::SetAccessibleName; - void SetAccessibleName( USHORT nItemId, const XubString& rName ); + void SetAccessibleName( sal_uInt16 nItemId, const XubString& rName ); using Window::GetAccessibleName; - const XubString& GetAccessibleName( USHORT nItemId ) const; + const XubString& GetAccessibleName( sal_uInt16 nItemId ) const; }; #endif // _SV_STATUS_HXX diff --git a/vcl/inc/vcl/stdtext.hxx b/vcl/inc/vcl/stdtext.hxx index 96bd7ec14a1f..693a2692b010 100644 --- a/vcl/inc/vcl/stdtext.hxx +++ b/vcl/inc/vcl/stdtext.hxx @@ -40,16 +40,16 @@ class Window; // ------------------ #define STANDARD_TEXT_FIRST STANDARD_TEXT_SERVICE_NOT_AVAILABLE -#define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((USHORT)0) +#define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((sal_uInt16)0) #define STANDARD_TEXT_LAST STANDARD_TEXT_SERVICE_NOT_AVAILABLE -XubString VCL_DLLPUBLIC GetStandardText( USHORT nStdText ); +XubString VCL_DLLPUBLIC GetStandardText( sal_uInt16 nStdText ); // ------------------------------------- // - Hilfsmethoden fuer Standard-Texte - // ------------------------------------- -void VCL_DLLPUBLIC ShowServiceNotAvailableError( Window* pParent, const XubString& rServiceName, BOOL bError ); +void VCL_DLLPUBLIC ShowServiceNotAvailableError( Window* pParent, const XubString& rServiceName, sal_Bool bError ); #endif // _VCL_STDTEXT_HXX diff --git a/vcl/inc/vcl/strhelper.hxx b/vcl/inc/vcl/strhelper.hxx index cf433beadea6..450139b0ba14 100644 --- a/vcl/inc/vcl/strhelper.hxx +++ b/vcl/inc/vcl/strhelper.hxx @@ -47,10 +47,10 @@ int VCL_DLLPUBLIC GetCommandLineTokenCount( const String& ); int VCL_DLLPUBLIC GetCommandLineTokenCount( const ByteString& ); // returns number of tokens (zero if empty or whitespace only) -String VCL_DLLPUBLIC WhitespaceToSpace( const String&, BOOL bProtect = TRUE ); -ByteString VCL_DLLPUBLIC WhitespaceToSpace( const ByteString&, BOOL bProtect = TRUE ); +String VCL_DLLPUBLIC WhitespaceToSpace( const String&, sal_Bool bProtect = sal_True ); +ByteString VCL_DLLPUBLIC WhitespaceToSpace( const ByteString&, sal_Bool bProtect = sal_True ); // returns a string with multiple adjacent occurrences of whitespace -// converted to a single space. if bProtect is TRUE (nonzero), then +// converted to a single space. if bProtect is sal_True (nonzero), then // doublequote, singlequote and singleleftquote protect their respective // contents diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index df6229e62e6c..7f9fc9ecd928 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -78,8 +78,8 @@ VCL_DLLPUBLIC sal_UCS4 GetMirroredChar( sal_UCS4 ); // - SystemWindowMode - // -------------------- -#define SYSTEMWINDOW_MODE_NOAUTOMODE ((USHORT)0x0001) -#define SYSTEMWINDOW_MODE_DIALOG ((USHORT)0x0002) +#define SYSTEMWINDOW_MODE_NOAUTOMODE ((sal_uInt16)0x0001) +#define SYSTEMWINDOW_MODE_DIALOG ((sal_uInt16)0x0002) // ------------- // - EventHook - @@ -119,7 +119,7 @@ public: const UniString& GetDomain() const { return aDomainName; } int GetPID() const { return nPID; } - BOOL IsConnectToSame( const ApplicationAddress& rAdr ) const; + sal_Bool IsConnectToSame( const ApplicationAddress& rAdr ) const; }; inline ApplicationAddress::ApplicationAddress() @@ -149,12 +149,12 @@ inline ApplicationAddress::ApplicationAddress( const UniString& rHost, int nPIDP nPID = nPIDPar; } -inline BOOL ApplicationAddress::IsConnectToSame( const ApplicationAddress& rAdr ) const +inline sal_Bool ApplicationAddress::IsConnectToSame( const ApplicationAddress& rAdr ) const { if ( nPID && ((nPID == rAdr.nPID) && (aHostName.Equals( rAdr.aHostName))) ) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } #define APPEVENT_PARAM_DELIMITER '\n' @@ -184,12 +184,12 @@ public: const UniString& GetData() const { return aData; } const ApplicationAddress& GetAppAddress() const { return aAppAddr; } - BOOL IsOpenEvent() const; - BOOL IsPrintEvent() const; - BOOL IsDiskInsertEvent() const; + sal_Bool IsOpenEvent() const; + sal_Bool IsPrintEvent() const; + sal_Bool IsDiskInsertEvent() const; - USHORT GetParamCount() const { return aData.GetTokenCount( APPEVENT_PARAM_DELIMITER ); } - UniString GetParam( USHORT nParam ) const { return aData.GetToken( nParam, APPEVENT_PARAM_DELIMITER ); } + sal_uInt16 GetParamCount() const { return aData.GetTokenCount( APPEVENT_PARAM_DELIMITER ); } + UniString GetParam( sal_uInt16 nParam ) const { return aData.GetToken( nParam, APPEVENT_PARAM_DELIMITER ); } }; inline ApplicationEvent::ApplicationEvent( const UniString& rSenderAppName, @@ -203,28 +203,28 @@ inline ApplicationEvent::ApplicationEvent( const UniString& rSenderAppName, { } -inline BOOL ApplicationEvent::IsOpenEvent() const +inline sal_Bool ApplicationEvent::IsOpenEvent() const { if ( aEvent.Equals( APPEVENT_OPEN_STRING )) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } -inline BOOL ApplicationEvent::IsPrintEvent() const +inline sal_Bool ApplicationEvent::IsPrintEvent() const { if ( aEvent.Equals( APPEVENT_PRINT_STRING )) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } -inline BOOL ApplicationEvent::IsDiskInsertEvent() const +inline sal_Bool ApplicationEvent::IsDiskInsertEvent() const { if ( aEvent.Equals( APPEVENT_DISKINSERT_STRING )) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } class VCL_DLLPUBLIC PropertyHandler @@ -245,9 +245,9 @@ public: virtual int Main() = 0; - virtual BOOL QueryExit(); + virtual sal_Bool QueryExit(); - virtual void UserEvent( ULONG nEvent, void* pEventData ); + virtual void UserEvent( sal_uLong nEvent, void* pEventData ); virtual void ActivateExtHelp(); virtual void DeactivateExtHelp(); @@ -264,11 +264,11 @@ public: static void InitAppRes( const ResId& rResId ); - static USHORT GetCommandLineParamCount(); - static XubString GetCommandLineParam( USHORT nParam ); + static sal_uInt16 GetCommandLineParamCount(); + static XubString GetCommandLineParam( sal_uInt16 nParam ); static const XubString& GetAppFileName(); - virtual USHORT Exception( USHORT nError ); + virtual sal_uInt16 Exception( sal_uInt16 nError ); static void Abort( const XubString& rErrorText ); static void Execute(); @@ -278,23 +278,23 @@ public: static void EndYield(); static osl::SolarMutex& GetSolarMutex(); static oslThreadIdentifier GetMainThreadIdentifier(); - static ULONG ReleaseSolarMutex(); - static void AcquireSolarMutex( ULONG nCount ); + static sal_uLong ReleaseSolarMutex(); + static void AcquireSolarMutex( sal_uLong nCount ); static void EnableNoYieldMode( bool i_bNoYield ); static void AddPostYieldListener( const Link& i_rListener ); static void RemovePostYieldListener( const Link& i_rListener ); - static BOOL IsInMain(); - static BOOL IsInExecute(); - static BOOL IsShutDown(); - static BOOL IsInModalMode(); - static USHORT GetModalModeCount(); + static sal_Bool IsInMain(); + static sal_Bool IsInExecute(); + static sal_Bool IsShutDown(); + static sal_Bool IsInModalMode(); + static sal_uInt16 GetModalModeCount(); - static USHORT GetDispatchLevel(); - static BOOL AnyInput( USHORT nType = INPUT_ANY ); - static ULONG GetLastInputInterval(); - static BOOL IsUICaptured(); - static BOOL IsUserActive( USHORT nTest = USERACTIVE_ALL ); + static sal_uInt16 GetDispatchLevel(); + static sal_Bool AnyInput( sal_uInt16 nType = INPUT_ANY ); + static sal_uLong GetLastInputInterval(); + static sal_Bool IsUICaptured(); + static sal_Bool IsUserActive( sal_uInt16 nTest = USERACTIVE_ALL ); virtual void SystemSettingsChanging( AllSettings& rSettings, Window* pFrame ); @@ -321,22 +321,22 @@ public: static void RemoveEventListener( const Link& rEventListener ); static void AddKeyListener( const Link& rKeyListener ); static void RemoveKeyListener( const Link& rKeyListener ); - static void ImplCallEventListeners( ULONG nEvent, Window* pWin, void* pData ); + static void ImplCallEventListeners( sal_uLong nEvent, Window* pWin, void* pData ); static void ImplCallEventListeners( VclSimpleEvent* pEvent ); - static BOOL HandleKey( ULONG nEvent, Window *pWin, KeyEvent* pKeyEvent ); + static sal_Bool HandleKey( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); - static ULONG PostKeyEvent( ULONG nEvent, Window *pWin, KeyEvent* pKeyEvent ); - static ULONG PostMouseEvent( ULONG nEvent, Window *pWin, MouseEvent* pMouseEvent ); + static sal_uLong PostKeyEvent( sal_uLong nEvent, Window *pWin, KeyEvent* pKeyEvent ); + static sal_uLong PostMouseEvent( sal_uLong nEvent, Window *pWin, MouseEvent* pMouseEvent ); static void RemoveMouseAndKeyEvents( Window *pWin ); - static BOOL IsProcessedMouseOrKeyEvent( ULONG nEventId ); + static sal_Bool IsProcessedMouseOrKeyEvent( sal_uLong nEventId ); - static ULONG PostUserEvent( ULONG nEvent, void* pEventData = NULL ); - static ULONG PostUserEvent( const Link& rLink, void* pCaller = NULL ); - static BOOL PostUserEvent( ULONG& rEventId, ULONG nEvent, void* pEventData = NULL ); - static BOOL PostUserEvent( ULONG& rEventId, const Link& rLink, void* pCaller = NULL ); - static void RemoveUserEvent( ULONG nUserEvent ); + static sal_uLong PostUserEvent( sal_uLong nEvent, void* pEventData = NULL ); + static sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL ); + static sal_Bool PostUserEvent( sal_uLong& rEventId, sal_uLong nEvent, void* pEventData = NULL ); + static sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); + static void RemoveUserEvent( sal_uLong nUserEvent ); - static BOOL InsertIdleHdl( const Link& rLink, USHORT nPriority ); + static sal_Bool InsertIdleHdl( const Link& rLink, sal_uInt16 nPriority ); static void RemoveIdleHdl( const Link& rLink ); virtual void AppEvent( const ApplicationEvent& rAppEvent ); @@ -385,15 +385,15 @@ public: static const LocaleDataWrapper& GetAppLocaleDataWrapper(); - static BOOL InsertAccel( Accelerator* pAccel ); + static sal_Bool InsertAccel( Accelerator* pAccel ); static void RemoveAccel( Accelerator* pAccel ); static void FlushAccel(); - static BOOL CallAccel( const KeyCode& rKeyCode, USHORT nRepeat = 0 ); + static sal_Bool CallAccel( const KeyCode& rKeyCode, sal_uInt16 nRepeat = 0 ); - static ULONG AddHotKey( const KeyCode& rKeyCode, const Link& rLink, void* pData = NULL ); - static void RemoveHotKey( ULONG nId ); - static ULONG AddEventHook( VCLEventHookProc pProc, void* pData = NULL ); - static void RemoveEventHook( ULONG nId ); + static sal_uLong AddHotKey( const KeyCode& rKeyCode, const Link& rLink, void* pData = NULL ); + static void RemoveHotKey( sal_uLong nId ); + static sal_uLong AddEventHook( VCLEventHookProc pProc, void* pData = NULL ); + static void RemoveEventHook( sal_uLong nId ); static long CallEventHooks( NotifyEvent& rEvt ); static long CallPreNotify( NotifyEvent& rEvt ); static long CallEvent( NotifyEvent& rEvt ); @@ -401,24 +401,24 @@ public: static void SetHelp( Help* pHelp = NULL ); static Help* GetHelp(); - static void EnableAutoHelpId( BOOL bEnabled = TRUE ); - static BOOL IsAutoHelpIdEnabled(); + static void EnableAutoHelpId( sal_Bool bEnabled = sal_True ); + static sal_Bool IsAutoHelpIdEnabled(); - static void EnableAutoMnemonic( BOOL bEnabled = TRUE ); - static BOOL IsAutoMnemonicEnabled(); + static void EnableAutoMnemonic( sal_Bool bEnabled = sal_True ); + static sal_Bool IsAutoMnemonicEnabled(); - static ULONG GetReservedKeyCodeCount(); - static const KeyCode* GetReservedKeyCode( ULONG i ); - static String GetReservedKeyCodeDescription( ULONG i ); + static sal_uLong GetReservedKeyCodeCount(); + static const KeyCode* GetReservedKeyCode( sal_uLong i ); + static String GetReservedKeyCodeDescription( sal_uLong i ); static void SetDefDialogParent( Window* pWindow ); static Window* GetDefDialogParent(); - static void EnableDialogCancel( BOOL bDialogCancel = TRUE ); - static BOOL IsDialogCancelEnabled(); + static void EnableDialogCancel( sal_Bool bDialogCancel = sal_True ); + static sal_Bool IsDialogCancelEnabled(); - static void SetSystemWindowMode( USHORT nMode ); - static USHORT GetSystemWindowMode(); + static void SetSystemWindowMode( sal_uInt16 nMode ); + static sal_uInt16 GetSystemWindowMode(); static void SetDialogScaleX( short nScale ); static short GetDialogScaleX(); @@ -432,16 +432,16 @@ public: // The global service manager has to be created before! static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > GetVCLToolkit(); - static UnoWrapperBase* GetUnoWrapper( BOOL bCreateIfNotExists = TRUE ); + static UnoWrapperBase* GetUnoWrapper( sal_Bool bCreateIfNotExists = sal_True ); static void SetUnoWrapper( UnoWrapperBase* pWrapper ); static void SetFilterHdl( const Link& rLink ); static const Link& GetFilterHdl(); - static BOOL IsAccessibilityEnabled(); + static sal_Bool IsAccessibilityEnabled(); - static void EnableHeadlessMode( BOOL bEnable = TRUE ); - static BOOL IsHeadlessModeEnabled(); + static void EnableHeadlessMode( sal_Bool bEnable = sal_True ); + static sal_Bool IsHeadlessModeEnabled(); static void ShowNativeErrorBox(const String& sTitle , const String& sMessage); @@ -564,7 +564,7 @@ protected: */ class SolarMutexReleaser { - ULONG mnReleased; + sal_uLong mnReleased; const bool mbRescheduleDuringAcquire; public: enum @@ -596,10 +596,10 @@ public: VCL_DLLPUBLIC Application* GetpApp(); -VCL_DLLPUBLIC BOOL InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); +VCL_DLLPUBLIC sal_Bool InitVCL( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & ); VCL_DLLPUBLIC void DeInitVCL(); -VCL_DLLPUBLIC BOOL InitAccessBridge( BOOL bAllowCancel, BOOL &rCancelled ); +VCL_DLLPUBLIC sal_Bool InitAccessBridge( sal_Bool bAllowCancel, sal_Bool &rCancelled ); // only allowed to call, if no thread is running. You must call JoinMainLoopThread to free all memory. VCL_DLLPUBLIC void CreateMainLoopThread( oslWorkerFunction pWorker, void * pThreadData ); diff --git a/vcl/inc/vcl/svcompat.hxx b/vcl/inc/vcl/svcompat.hxx index 2aa0c82ad284..70d31381287f 100644 --- a/vcl/inc/vcl/svcompat.hxx +++ b/vcl/inc/vcl/svcompat.hxx @@ -36,10 +36,10 @@ // ----------- #define COMPAT_FORMAT( char1, char2, char3, char4 ) \ - ((ULONG)((((ULONG)(char)(char1)))| \ - (((ULONG)(char)(char2))<<8UL)| \ - (((ULONG)(char)(char3))<<16UL)| \ - ((ULONG)(char)(char4))<<24UL)) + ((sal_uLong)((((sal_uLong)(char)(char1)))| \ + (((sal_uLong)(char)(char2))<<8UL)| \ + (((sal_uLong)(char)(char3))<<16UL)| \ + ((sal_uLong)(char)(char4))<<24UL)) class SvStream; @@ -51,21 +51,21 @@ class SvStream; class ImplCompat { SvStream* mpRWStm; - UINT32 mnCompatPos; - UINT32 mnTotalSize; - UINT16 mnStmMode; - UINT16 mnVersion; + sal_uInt32 mnCompatPos; + sal_uInt32 mnTotalSize; + sal_uInt16 mnStmMode; + sal_uInt16 mnVersion; ImplCompat() {} ImplCompat( const ImplCompat& rCompat ) {} ImplCompat& operator=( const ImplCompat& rCompat ) { return *this; } - BOOL operator==( const ImplCompat& rCompat ) { return FALSE; } + sal_Bool operator==( const ImplCompat& rCompat ) { return sal_False; } public: - ImplCompat( SvStream& rStm, USHORT nStreamMode, UINT16 nVersion = 1 ); + ImplCompat( SvStream& rStm, sal_uInt16 nStreamMode, sal_uInt16 nVersion = 1 ); ~ImplCompat(); - UINT16 GetVersion() const { return mnVersion; } + sal_uInt16 GetVersion() const { return mnVersion; } }; #endif // _SV_SVCOMPAT_HXX diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx index 69ac3f540b65..b28283f1a405 100644 --- a/vcl/inc/vcl/svdata.hxx +++ b/vcl/inc/vcl/svdata.hxx @@ -30,17 +30,21 @@ #define _SV_SVDATA_HXX #include <osl/thread.hxx> -#include <tools/string.hxx> -#include <tools/gen.hxx> -#include <tools/shl.hxx> -#include <tools/link.hxx> -#include <vcl/vclevent.hxx> -#include <vcl/sv.h> -#include <tools/color.hxx> -#include <tools/debug.hxx> -#include <vcl/dllapi.h> -#include <com/sun/star/uno/Reference.hxx> -#include <unotools/options.hxx> +#include <rtl/ref.hxx> +#include "tools/gen.hxx" +#include "tools/shl.hxx" +#include "tools/link.hxx" +#include "tools/fldunit.hxx" +#include "tools/string.hxx" +#include "vcl/vclevent.hxx" +#include "vcl/sv.h" +#include "tools/color.hxx" +#include "tools/debug.hxx" +#include "vcl/dllapi.h" +#include "com/sun/star/uno/Reference.hxx" +#include "unotools/options.hxx" + +#include <boost/unordered_map.hpp> namespace com { namespace sun { @@ -51,9 +55,6 @@ namespace lang { namespace frame { class XSessionManagerClient; } -namespace awt { - class XDisplayConnection; -} }}} struct ImplTimerData; @@ -150,21 +151,23 @@ struct ImplSVAppData ImplHotKey* mpFirstHotKey; // HotKey-Verwaltung ImplEventHook* mpFirstEventHook; // Event-Hooks VclEventListeners2* mpPostYieldListeners; // post yield listeners - ULONG mnLastInputTime; // GetLastInputTime() - USHORT mnDispatchLevel; // DispatchLevel - USHORT mnModalMode; // ModalMode Count - USHORT mnModalDialog; // ModalDialog Count - USHORT mnAccessCount; // AccessHdl Count - USHORT mnSysWinMode; // Modus, wann SystemWindows erzeugt werden sollen - USHORT mnLayout; // --- RTL-Flags --- currently not used, only for testing + sal_uLong mnLastInputTime; // GetLastInputTime() + sal_uInt16 mnDispatchLevel; // DispatchLevel + sal_uInt16 mnModalMode; // ModalMode Count + sal_uInt16 mnModalDialog; // ModalDialog Count + sal_uInt16 mnAccessCount; // AccessHdl Count + sal_uInt16 mnSysWinMode; // Modus, wann SystemWindows erzeugt werden sollen + sal_uInt16 mnLayout; // --- RTL-Flags --- currently not used, only for testing short mnDialogScaleX; // Scale X-Positions and sizes in Dialogs - BOOL mbInAppMain; // is Application::Main() on stack - BOOL mbInAppExecute; // is Application::Execute() on stack - BOOL mbAppQuit; // is Application::Quit() called - BOOL mbSettingsInit; // TRUE: Settings are initialized - BOOL mbDialogCancel; // TRUE: Alle Dialog::Execute()-Aufrufe werden mit return FALSE sofort beendet - BOOL mbNoYield; // Application::Yield will not wait for events if the queue is empty + sal_Bool mbInAppMain; // is Application::Main() on stack + sal_Bool mbInAppExecute; // is Application::Execute() on stack + sal_Bool mbAppQuit; // is Application::Quit() called + sal_Bool mbSettingsInit; // sal_True: Settings are initialized + sal_Bool mbDialogCancel; // sal_True: Alle Dialog::Execute()-Aufrufe werden mit return sal_False sofort beendet + sal_Bool mbNoYield; // Application::Yield will not wait for events if the queue is empty // essentially that makes it the same as Application::Reschedule + long mnDefaultLayoutBorder; // default value in pixel for layout distances used + // in window arrangers /** Controls whether showing any IME status window is toggled on or off. @@ -202,10 +205,9 @@ struct ImplSVGDIData long mnRealAppFontX; // AppFont X-Numenator for 40/tel Width long mnAppFontX; // AppFont X-Numenator for 40/tel Width + DialogScaleX long mnAppFontY; // AppFont Y-Numenator for 80/tel Height - BOOL mbFontSubChanged; // TRUE: FontSubstitution wurde zwischen Begin/End geaendert + sal_Bool mbFontSubChanged; // sal_True: FontSubstitution wurde zwischen Begin/End geaendert utl::DefaultFontConfiguration* mpDefaultFontConfiguration; utl::FontSubstConfiguration* mpFontSubstConfiguration; - bool mbPrinterPullModel; // true: use pull model instead of normal push model when printing bool mbNativeFontConfig; // true: do not override UI font bool mbNoXORClipping; // true: do not use XOR to achieve clipping effects }; @@ -232,11 +234,11 @@ struct ImplSVWinData AutoTimer* mpTrackTimer; // tracking timer ImageList* mpMsgBoxImgList; // ImageList for MessageBox Window* mpAutoScrollWin; // window, that is in AutoScrollMode mode - USHORT mnTrackFlags; // tracking flags - USHORT mnAutoScrollFlags; // auto scroll flags - BOOL mbNoDeactivate; // TRUE: keine Deactivate durchfuehren - BOOL mbNoSaveFocus; // TRUE: menues must not save/restore focus - BOOL mbNoSaveBackground; // TRUE: save background is unnecessary or even less performant + sal_uInt16 mnTrackFlags; // tracking flags + sal_uInt16 mnAutoScrollFlags; // auto scroll flags + sal_Bool mbNoDeactivate; // sal_True: keine Deactivate durchfuehren + sal_Bool mbNoSaveFocus; // sal_True: menues must not save/restore focus + sal_Bool mbNoSaveBackground; // sal_True: save background is unnecessary or even less performant }; @@ -244,6 +246,8 @@ struct ImplSVWinData // - ImplSVCtrlData - // ------------------ +typedef std::vector< std::pair< String, FieldUnit > > FieldUnitStringList; + struct ImplSVCtrlData { ImageList* mpCheckImgList; // ImageList for CheckBoxes @@ -256,15 +260,17 @@ struct ImplSVCtrlData Image* mpDisclosurePlus; Image* mpDisclosureMinus; ImplTBDragMgr* mpTBDragMgr; // DragMgr for ToolBox - USHORT mnCheckStyle; // CheckBox-Style for ImageList-Update - USHORT mnRadioStyle; // Radio-Style for ImageList-Update - ULONG mnLastCheckFColor; // Letzte FaceColor fuer CheckImage - ULONG mnLastCheckWColor; // Letzte WindowColor fuer CheckImage - ULONG mnLastCheckWTextColor; // Letzte WindowTextColor fuer CheckImage - ULONG mnLastCheckLColor; // Letzte LightColor fuer CheckImage - ULONG mnLastRadioFColor; // Letzte FaceColor fuer RadioImage - ULONG mnLastRadioWColor; // Letzte WindowColor fuer RadioImage - ULONG mnLastRadioLColor; // Letzte LightColor fuer RadioImage + sal_uInt16 mnCheckStyle; // CheckBox-Style for ImageList-Update + sal_uInt16 mnRadioStyle; // Radio-Style for ImageList-Update + sal_uLong mnLastCheckFColor; // Letzte FaceColor fuer CheckImage + sal_uLong mnLastCheckWColor; // Letzte WindowColor fuer CheckImage + sal_uLong mnLastCheckWTextColor; // Letzte WindowTextColor fuer CheckImage + sal_uLong mnLastCheckLColor; // Letzte LightColor fuer CheckImage + sal_uLong mnLastRadioFColor; // Letzte FaceColor fuer RadioImage + sal_uLong mnLastRadioWColor; // Letzte WindowColor fuer RadioImage + sal_uLong mnLastRadioLColor; // Letzte LightColor fuer RadioImage + FieldUnitStringList* mpFieldUnitStrings; // list with field units + FieldUnitStringList* mpCleanUnitStrings; // same list but with some "fluff" like spaces removed }; @@ -274,18 +280,18 @@ struct ImplSVCtrlData struct ImplSVHelpData { - BOOL mbContextHelp : 1; // is ContextHelp enabled - BOOL mbExtHelp : 1; // is ExtendedHelp enabled - BOOL mbExtHelpMode : 1; // is in ExtendedHelp Mode - BOOL mbOldBalloonMode : 1; // BallonMode, befor ExtHelpMode started - BOOL mbBalloonHelp : 1; // is BalloonHelp enabled - BOOL mbQuickHelp : 1; // is QuickHelp enabled - BOOL mbSetKeyboardHelp : 1; // tiphelp was activated by keyboard - BOOL mbKeyboardHelp : 1; // tiphelp was activated by keyboard - BOOL mbAutoHelpId : 1; // generate HelpIds - BOOL mbRequestingHelp : 1; // In Window::RequestHelp + sal_Bool mbContextHelp : 1; // is ContextHelp enabled + sal_Bool mbExtHelp : 1; // is ExtendedHelp enabled + sal_Bool mbExtHelpMode : 1; // is in ExtendedHelp Mode + sal_Bool mbOldBalloonMode : 1; // BallonMode, befor ExtHelpMode started + sal_Bool mbBalloonHelp : 1; // is BalloonHelp enabled + sal_Bool mbQuickHelp : 1; // is QuickHelp enabled + sal_Bool mbSetKeyboardHelp : 1; // tiphelp was activated by keyboard + sal_Bool mbKeyboardHelp : 1; // tiphelp was activated by keyboard + sal_Bool mbAutoHelpId : 1; // generate HelpIds + sal_Bool mbRequestingHelp : 1; // In Window::RequestHelp HelpTextWindow* mpHelpWin; // HelpWindow - ULONG mnLastHelpHideTime; // ticks of last show + sal_uLong mnLastHelpHideTime; // ticks of last show }; struct ImplSVNWFData @@ -312,10 +318,8 @@ struct ImplSVNWFData // window background before drawing the native // checkbox bool mbScrollbarJumpPage; // true for "jump to here" behavior + int mnStatusBarLowerRightOffset; // amount in pixel to avoid in the lower righthand corner bool mbCanDrawWidgetAnySize; // set to true currently on gtk - // signals that widgets can be drawn in any size and - // brdwin.cxx ImplSmallBorderWindowView::DrawWindow - // should not do GetNativeControlRegion }; @@ -329,18 +333,18 @@ struct ImplSVData SalInstance* mpDefInst; // Default SalInstance Application* mpApp; // pApp WorkWindow* mpDefaultWin; // Default-Window - BOOL mbDeInit; // Is VCL deinitializing - ULONG mnThreadCount; // is VCL MultiThread enabled + sal_Bool mbDeInit; // Is VCL deinitializing + sal_uLong mnThreadCount; // is VCL MultiThread enabled ImplConfigData* mpFirstConfigData; // Zeiger auf ersten Config-Block ImplTimerData* mpFirstTimerData; // list of all running timers SalTimer* mpSalTimer; // interface to sal event loop/timers SalI18NImeStatus* mpImeStatus; // interface to ime status window SalSystem* mpSalSystem; // SalSystem interface ResMgr* mpResMgr; // SV-Resource-Manager - ULONG mnTimerPeriod; // current timer period - ULONG mnTimerUpdate; // TimerCallbackProcs on stack - BOOL mbNotAllTimerCalled;// TRUE: Es muessen noch Timer abgearbeitet werden - BOOL mbNoCallTimer; // TRUE: No Timeout calls + sal_uLong mnTimerPeriod; // current timer period + sal_uLong mnTimerUpdate; // TimerCallbackProcs on stack + sal_Bool mbNotAllTimerCalled;// sal_True: Es muessen noch Timer abgearbeitet werden + sal_Bool mbNoCallTimer; // sal_True: No Timeout calls ImplSVAppData maAppData; // indepen data for class Application ImplSVGDIData maGDIData; // indepen data for Output classes ImplSVWinData maWinData; // indepen data for Windows classes @@ -350,24 +354,24 @@ struct ImplSVData UnoWrapperBase* mpUnoWrapper; Window* mpIntroWindow; // the splash screen DockingManager* mpDockingManager; - BOOL mbIsTestTool; + sal_Bool mbIsTestTool; oslThreadIdentifier mnMainThreadId; - ::com::sun::star::uno::Reference< - ::com::sun::star::awt::XDisplayConnection > mxDisplayConnection; + rtl::Reference< vcl::DisplayConnection > mxDisplayConnection; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxAccessBridge; com::sun::star::uno::Reference< com::sun::star::frame::XSessionManagerClient > xSMClient; ::vcl::SettingsConfigItem* mpSettingsConfigItem; std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList; + boost::unordered_map< int, rtl::OUString >* mpPaperNames; }; void ImplInitSVData(); void ImplDeInitSVData(); void ImplDestroySVData(); Window* ImplGetDefaultWindow(); -VCL_DLLPUBLIC ResMgr* ImplGetResMgr(); -VCL_DLLPUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr +VCL_PLUGIN_PUBLIC ResMgr* ImplGetResMgr(); +VCL_PLUGIN_PUBLIC ResId VclResId( sal_Int32 nId ); // throws std::bad_alloc if no res mgr DockingManager* ImplGetDockingManager(); void ImplWindowAutoMnemonic( Window* pWindow ); @@ -375,7 +379,7 @@ void ImplUpdateSystemProcessWindow(); Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); // SVAPP.CXX -BOOL ImplCallHotKey( const KeyCode& rKeyCode ); +sal_Bool ImplCallHotKey( const KeyCode& rKeyCode ); void ImplFreeHotKeyData(); void ImplFreeEventHookData(); @@ -383,11 +387,15 @@ void ImplFreeEventHookData(); long ImplCallPreNotify( NotifyEvent& rEvt ); long ImplCallEvent( NotifyEvent& rEvt ); -extern VCL_DLLPUBLIC ImplSVData* pImplSVData; -inline VCL_DLLPUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; } +extern VCL_PLUGIN_PUBLIC ImplSVData* pImplSVData; +inline VCL_PLUGIN_PUBLIC ImplSVData* ImplGetSVData() { return pImplSVData; } inline ImplSVData* ImplGetAppSVData() { return ImplGetSVData(); } -bool ImplInitAccessBridge( BOOL bAllowCancel, BOOL &rCancelled ); +bool ImplInitAccessBridge( sal_Bool bAllowCancel, sal_Bool &rCancelled ); + +FieldUnitStringList* ImplGetFieldUnits(); +FieldUnitStringList* ImplGetCleanedFieldUnits(); + // ----------------------------------------------------------------------- @@ -415,20 +423,20 @@ struct ImplDelData { ImplDelData* mpNext; const Window* mpWindow; - BOOL mbDel; + sal_Bool mbDel; ImplDelData( const Window* pWindow = NULL ) - : mpNext( NULL ), mpWindow( NULL ), mbDel( FALSE ) + : mpNext( NULL ), mpWindow( NULL ), mbDel( sal_False ) { if( pWindow ) AttachToWindow( pWindow ); } virtual ~ImplDelData(); bool IsDead() const { - DBG_ASSERT( mbDel == FALSE, "object deleted while in use !" ); - return (mbDel!=FALSE); + DBG_ASSERT( mbDel == sal_False, "object deleted while in use !" ); + return (mbDel!=sal_False); } - BOOL /*deprecated */IsDelete() const { return (BOOL)IsDead(); } + sal_Bool /*deprecated */IsDelete() const { return (sal_Bool)IsDead(); } private: void AttachToWindow( const Window* ); @@ -440,12 +448,12 @@ private: struct ImplSVEvent { - ULONG mnEvent; + sal_uLong mnEvent; void* mpData; Link* mpLink; Window* mpWindow; ImplDelData maDelData; - BOOL mbCall; + sal_Bool mbCall; }; #endif // _SV_SVDATA_HXX diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/vcl/svids.hrc index 50e334deaa3b..bc76c70e1ebe 100644 --- a/vcl/inc/vcl/svids.hrc +++ b/vcl/inc/vcl/svids.hrc @@ -31,11 +31,7 @@ #include "svl/solar.hrc" #define SV_RESID_STDOFFSET 0 -#define SV_RESID_WINOFFSET 1 -#define SV_RESID_OS2OFFSET 2 -#define SV_RESID_MACOFFSET 3 -#define SV_RESID_UNIXOFFSET 4 -#define SV_RESID_MONOOFFSET 5 +#define SV_RESID_MONOOFFSET 1 // Achtung: Diese Id's muessen min. 10 Werte auseinanderliegen, da // je nach Style noch ein Offset aufgerechnet wird @@ -58,6 +54,8 @@ #define SV_DISCLOSURE_PLUS 1060 #define SV_DISCLOSURE_MINUS 1061 +#define RID_STR_PAPERNAMES 1070 + #define SV_RESID_MENU_EDIT 2000 #define SV_MENU_EDIT_UNDO 1 #define SV_MENU_EDIT_CUT 2 @@ -118,8 +116,10 @@ #define SV_PRINT_PRT_NUP_ORIENTATION_PORTRAIT 1 #define SV_PRINT_PRT_NUP_ORIENTATION_LANDSCAPE 2 -#define SV_PRINT_PRT_NUP_ORDER_LRTD 0 -#define SV_PRINT_PRT_NUP_ORDER_TDLR 1 +#define SV_PRINT_PRT_NUP_ORDER_LRTB 0 +#define SV_PRINT_PRT_NUP_ORDER_TBLR 1 +#define SV_PRINT_PRT_NUP_ORDER_TBRL 2 +#define SV_PRINT_PRT_NUP_ORDER_RLTB 3 #define SV_PRINT_TAB_JOB 2 #define SV_PRINT_PRINTERS_FL 1 @@ -143,12 +143,12 @@ #define SV_PRINT_LOCATION_TXT 21 #define SV_PRINT_COMMENT_TXT 22 #define SV_PRINT_DETAILS_BTN 23 +#define SV_PRINT_OPT_REVERSE 24 #define SV_PRINT_TAB_OPT 3 #define SV_PRINT_OPT_PRINT_FL 1 #define SV_PRINT_OPT_TOFILE 2 #define SV_PRINT_OPT_SINGLEJOBS 3 -#define SV_PRINT_OPT_REVERSE 4 #define SV_DLG_PRINT_PROGRESS 2049 #define SV_PRINT_PROGRESS_CANCEL 1 @@ -206,7 +206,8 @@ #define SV_ACCESSERROR_JAVA_NOT_CONFIGURED 10507 #define SV_ACCESSERROR_JAVA_DISABLED 10508 #define SV_ACCESSERROR_TURNAROUND_MSG 10509 -#define SV_ACCESSERROR_LAST SV_ACCESSERROR_TURNAROUND_MSG +#define SV_ACCESSERROR_NO_FONTS 10510 +#define SV_ACCESSERROR_LAST SV_ACCESSERROR_NO_FONTS #define SV_SHORTCUT_HELP 10600 #define SV_SHORTCUT_CONTEXTHELP 10601 diff --git a/vcl/inc/vcl/symbol.hxx b/vcl/inc/vcl/symbol.hxx index cb7074986911..c03bf9a6af58 100644 --- a/vcl/inc/vcl/symbol.hxx +++ b/vcl/inc/vcl/symbol.hxx @@ -36,7 +36,7 @@ // ---------------- // By changes you must also change: rsc/vclrsc.hxx -typedef USHORT SymbolType; +typedef sal_uInt16 SymbolType; #define SYMBOL_DONTKNOW ((SymbolType)0) #define SYMBOL_IMAGE ((SymbolType)1) #define SYMBOL_ARROW_UP ((SymbolType)2) @@ -72,9 +72,6 @@ typedef USHORT SymbolType; #define SYMBOL_DOCK ((SymbolType)32) #define SYMBOL_HIDE ((SymbolType)33) #define SYMBOL_HELP ((SymbolType)34) -#define SYMBOL_OS2CLOSE ((SymbolType)35) -#define SYMBOL_OS2FLOAT ((SymbolType)36) -#define SYMBOL_OS2HIDE ((SymbolType)37) #define SYMBOL_MENU SYMBOL_SPIN_DOWN #define SYMBOL_NOSYMBOL (SYMBOL_DONTKNOW) diff --git a/vcl/inc/vcl/syschild.hxx b/vcl/inc/vcl/syschild.hxx index 459f97e68abd..275e41312f17 100644 --- a/vcl/inc/vcl/syschild.hxx +++ b/vcl/inc/vcl/syschild.hxx @@ -44,7 +44,8 @@ class VCL_DLLPUBLIC SystemChildWindow : public Window { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, BOOL bShow = FALSE ); + SAL_DLLPRIVATE void ImplInitSysChild( Window* pParent, WinBits nStyle, SystemWindowData *pData, sal_Bool bShow = sal_False ); + SAL_DLLPRIVATE void ImplTestJavaException( void* pEnv ); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE SystemChildWindow (const SystemChildWindow &); @@ -53,7 +54,7 @@ private: public: SystemChildWindow( Window* pParent, WinBits nStyle = 0 ); // create a SystemChildWindow using the given SystemWindowData - SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, BOOL bShow = TRUE ); + SystemChildWindow( Window* pParent, WinBits nStyle, SystemWindowData *pData, sal_Bool bShow = sal_True ); SystemChildWindow( Window* pParent, const ResId& rResId ); ~SystemChildWindow(); @@ -61,9 +62,13 @@ public: // per default systemchildwindows erase their background for better plugin support // however, this might not always be required - void EnableEraseBackground( BOOL bEnable = TRUE ); - BOOL IsEraseBackgroundEnabled(); - void SetForwardKey( BOOL bEnable ); + void EnableEraseBackground( sal_Bool bEnable = sal_True ); + sal_Bool IsEraseBackgroundEnabled(); + void SetForwardKey( sal_Bool bEnable ); + // return the platform specific handle/id of this window; + // in case the flag bUseJava is set, a java compatible overlay window + // is created on which other java windows can be created (plugin interface) + sal_IntPtr GetParentWindowHandle( sal_Bool bUseJava = sal_False ); }; #endif // _SV_SYSCHILD_HXX diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx index b25a1275673e..120ba30f4dff 100644 --- a/vcl/inc/vcl/sysdata.hxx +++ b/vcl/inc/vcl/sysdata.hxx @@ -181,6 +181,7 @@ struct SystemFontData // -------------------- typedef std::vector<SystemGlyphData> SystemGlyphDataVector; + struct SystemTextLayoutData { unsigned long nSize; // size in bytes of this structure diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx index dcc287a4e2cc..0fd2fd8d1512 100644 --- a/vcl/inc/vcl/syswin.hxx +++ b/vcl/inc/vcl/syswin.hxx @@ -66,27 +66,27 @@ class TaskPaneList; // - WindowStateData - // ------------------- -#define WINDOWSTATE_MASK_X ((ULONG)0x00000001) -#define WINDOWSTATE_MASK_Y ((ULONG)0x00000002) -#define WINDOWSTATE_MASK_WIDTH ((ULONG)0x00000004) -#define WINDOWSTATE_MASK_HEIGHT ((ULONG)0x00000008) -#define WINDOWSTATE_MASK_STATE ((ULONG)0x00000010) -#define WINDOWSTATE_MASK_MINIMIZED ((ULONG)0x00000020) -#define WINDOWSTATE_MASK_MAXIMIZED_X ((ULONG)0x00000100) -#define WINDOWSTATE_MASK_MAXIMIZED_Y ((ULONG)0x00000200) -#define WINDOWSTATE_MASK_MAXIMIZED_WIDTH ((ULONG)0x00000400) -#define WINDOWSTATE_MASK_MAXIMIZED_HEIGHT ((ULONG)0x00000800) +#define WINDOWSTATE_MASK_X ((sal_uLong)0x00000001) +#define WINDOWSTATE_MASK_Y ((sal_uLong)0x00000002) +#define WINDOWSTATE_MASK_WIDTH ((sal_uLong)0x00000004) +#define WINDOWSTATE_MASK_HEIGHT ((sal_uLong)0x00000008) +#define WINDOWSTATE_MASK_STATE ((sal_uLong)0x00000010) +#define WINDOWSTATE_MASK_MINIMIZED ((sal_uLong)0x00000020) +#define WINDOWSTATE_MASK_MAXIMIZED_X ((sal_uLong)0x00000100) +#define WINDOWSTATE_MASK_MAXIMIZED_Y ((sal_uLong)0x00000200) +#define WINDOWSTATE_MASK_MAXIMIZED_WIDTH ((sal_uLong)0x00000400) +#define WINDOWSTATE_MASK_MAXIMIZED_HEIGHT ((sal_uLong)0x00000800) #define WINDOWSTATE_MASK_POS (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y) #define WINDOWSTATE_MASK_ALL (WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_WIDTH | WINDOWSTATE_MASK_HEIGHT | WINDOWSTATE_MASK_MAXIMIZED_X | WINDOWSTATE_MASK_MAXIMIZED_Y | WINDOWSTATE_MASK_MAXIMIZED_WIDTH | WINDOWSTATE_MASK_MAXIMIZED_HEIGHT | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED) -#define WINDOWSTATE_STATE_NORMAL ((ULONG)0x00000001) -#define WINDOWSTATE_STATE_MINIMIZED ((ULONG)0x00000002) -#define WINDOWSTATE_STATE_MAXIMIZED ((ULONG)0x00000004) -#define WINDOWSTATE_STATE_ROLLUP ((ULONG)0x00000008) -#define WINDOWSTATE_STATE_MAXIMIZED_HORZ ((ULONG)0x00000010) -#define WINDOWSTATE_STATE_MAXIMIZED_VERT ((ULONG)0x00000020) +#define WINDOWSTATE_STATE_NORMAL ((sal_uLong)0x00000001) +#define WINDOWSTATE_STATE_MINIMIZED ((sal_uLong)0x00000002) +#define WINDOWSTATE_STATE_MAXIMIZED ((sal_uLong)0x00000004) +#define WINDOWSTATE_STATE_ROLLUP ((sal_uLong)0x00000008) +#define WINDOWSTATE_STATE_MAXIMIZED_HORZ ((sal_uLong)0x00000010) +#define WINDOWSTATE_STATE_MAXIMIZED_VERT ((sal_uLong)0x00000020) -class VCL_DLLPUBLIC WindowStateData +class VCL_PLUGIN_PUBLIC WindowStateData { private: sal_uInt32 mnValidMask; @@ -107,7 +107,7 @@ public: mnMaximizedX = mnMaximizedY = mnMaximizedWidth = mnMaximizedHeight = 0; } - void SetMask( ULONG nValidMask ) { mnValidMask = nValidMask; } + void SetMask( sal_uLong nValidMask ) { mnValidMask = nValidMask; } sal_uInt32 GetMask() const { return mnValidMask; } void SetX( int nX ) { mnX = nX; } @@ -134,12 +134,12 @@ public: // - SystemWindow-Types - // ---------------------- -#define MENUBAR_MODE_NORMAL ((USHORT)0) -#define MENUBAR_MODE_HIDE ((USHORT)1) +#define MENUBAR_MODE_NORMAL ((sal_uInt16)0) +#define MENUBAR_MODE_HIDE ((sal_uInt16)1) -#define TITLE_BUTTON_DOCKING ((USHORT)1) -#define TITLE_BUTTON_HIDE ((USHORT)2) -#define TITLE_BUTTON_MENU ((USHORT)4) +#define TITLE_BUTTON_DOCKING ((sal_uInt16)1) +#define TITLE_BUTTON_HIDE ((sal_uInt16)2) +#define TITLE_BUTTON_MENU ((sal_uInt16)4) // ---------------- // - SystemWindow - @@ -156,20 +156,20 @@ private: Size maOrgSize; Size maRollUpOutSize; Size maMinOutSize; - BOOL mbPined; - BOOL mbRollUp; - BOOL mbRollFunc; - BOOL mbDockBtn; - BOOL mbHideBtn; - BOOL mbSysChild; - USHORT mnMenuBarMode; - USHORT mnIcon; + sal_Bool mbPined; + sal_Bool mbRollUp; + sal_Bool mbRollFunc; + sal_Bool mbDockBtn; + sal_Bool mbHideBtn; + sal_Bool mbSysChild; + sal_uInt16 mnMenuBarMode; + sal_uInt16 mnIcon; ImplData* mpImplData; #if _SOLAR__PRIVATE public: using Window::ImplIsInTaskPaneList; - SAL_DLLPRIVATE BOOL ImplIsInTaskPaneList( Window* pWin ); + SAL_DLLPRIVATE sal_Bool ImplIsInTaskPaneList( Window* pWin ); #endif private: @@ -193,34 +193,34 @@ public: virtual long Notify( NotifyEvent& rNEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); - virtual BOOL Close(); - virtual void TitleButtonClick( USHORT nButton ); + virtual sal_Bool Close(); + virtual void TitleButtonClick( sal_uInt16 nButton ); virtual void Pin(); virtual void Roll(); virtual void Resizing( Size& rSize ); - void SetIcon( USHORT nIcon ); - USHORT GetIcon() const { return mnIcon; } + void SetIcon( sal_uInt16 nIcon ); + sal_uInt16 GetIcon() const { return mnIcon; } // for systems like MacOSX which can display the URL a document is loaded from // separately from the window title void SetRepresentedURL( const rtl::OUString& ); const rtl::OUString& GetRepresentedURL() const; - void SetZLevel( BYTE nLevel ); - BYTE GetZLevel() const; + void SetZLevel( sal_uInt8 nLevel ); + sal_uInt8 GetZLevel() const; - void EnableSaveBackground( BOOL bSave = TRUE ); - BOOL IsSaveBackgroundEnabled() const; + void EnableSaveBackground( sal_Bool bSave = sal_True ); + sal_Bool IsSaveBackgroundEnabled() const; - void ShowTitleButton( USHORT nButton, BOOL bVisible = TRUE ); - BOOL IsTitleButtonVisible( USHORT nButton ) const; + void ShowTitleButton( sal_uInt16 nButton, sal_Bool bVisible = sal_True ); + sal_Bool IsTitleButtonVisible( sal_uInt16 nButton ) const; - void SetPin( BOOL bPin ); - BOOL IsPined() const { return mbPined; } + void SetPin( sal_Bool bPin ); + sal_Bool IsPined() const { return mbPined; } void RollUp(); void RollDown(); - BOOL IsRollUp() const { return mbRollUp; } + sal_Bool IsRollUp() const { return mbRollUp; } void SetRollUpOutputSizePixel( const Size& rSize ) { maRollUpOutSize = rSize; } Size GetRollUpOutputSizePixel() const { return maRollUpOutSize; } @@ -232,12 +232,12 @@ public: Size GetResizeOutputSizePixel() const; void SetWindowState( const ByteString& rStr ); - ByteString GetWindowState( ULONG nMask = WINDOWSTATE_MASK_ALL ) const; + ByteString GetWindowState( sal_uLong nMask = WINDOWSTATE_MASK_ALL ) const; void SetMenuBar( MenuBar* pMenuBar ); MenuBar* GetMenuBar() const { return mpMenuBar; } - void SetMenuBarMode( USHORT nMode ); - USHORT GetMenuBarMode() const { return mnMenuBarMode; } + void SetMenuBarMode( sal_uInt16 nMode ); + sal_uInt16 GetMenuBarMode() const { return mnMenuBarMode; } TaskPaneList* GetTaskPaneList(); void GetWindowStateData( WindowStateData& rData ) const; diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx index 5463246ec8a0..c6525138f73b 100644 --- a/vcl/inc/vcl/tabctrl.hxx +++ b/vcl/inc/vcl/tabctrl.hxx @@ -45,8 +45,8 @@ class ListBox; // -------------------- #ifndef TAB_APPEND -#define TAB_APPEND ((USHORT)0xFFFF) -#define TAB_PAGE_NOTFOUND ((USHORT)0xFFFF) +#define TAB_APPEND ((sal_uInt16)0xFFFF) +#define TAB_PAGE_NOTFOUND ((sal_uInt16)0xFFFF) #endif /* !TAB_APPEND */ // -------------- @@ -62,40 +62,30 @@ private: long mnLastHeight; long mnBtnSize; long mnMaxPageWidth; - USHORT mnActPageId; - USHORT mnCurPageId; - USHORT mnFirstPagePos; - USHORT mnLastFirstPagePos; - BOOL mbFormat; - BOOL mbRestoreHelpId; - BOOL mbRestoreUnqId; - BOOL mbSingleLine; - BOOL mbScroll; - BOOL mbRestoreSmartId; - BOOL mbSmallInvalidate; - BOOL mbExtraSpace; + sal_uInt16 mnActPageId; + sal_uInt16 mnCurPageId; + sal_Bool mbFormat; + sal_Bool mbRestoreHelpId; + sal_Bool mbRestoreUnqId; + sal_Bool mbSmallInvalidate; + sal_Bool mbExtraSpace; Link maActivateHdl; Link maDeactivateHdl; using Control::ImplInitSettings; - SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); - SAL_DLLPRIVATE ImplTabItem* ImplGetItem( USHORT nId ) const; - SAL_DLLPRIVATE void ImplScrollBtnsColor(); - SAL_DLLPRIVATE void ImplSetScrollBtnsState(); - SAL_DLLPRIVATE void ImplPosScrollBtns(); + SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); + SAL_DLLPRIVATE ImplTabItem* ImplGetItem( sal_uInt16 nId ) const; SAL_DLLPRIVATE Size ImplGetItemSize( ImplTabItem* pItem, long nMaxWidth ); - SAL_DLLPRIVATE Rectangle ImplGetTabRect( USHORT nPos, long nWidth = -1, long nHeight = -1 ); - SAL_DLLPRIVATE void ImplChangeTabPage( USHORT nId, USHORT nOldId ); - SAL_DLLPRIVATE BOOL ImplPosCurTabPage(); - SAL_DLLPRIVATE void ImplActivateTabPage( BOOL bNext ); - SAL_DLLPRIVATE void ImplSetFirstPagePos( USHORT nPagePos ); + SAL_DLLPRIVATE Rectangle ImplGetTabRect( sal_uInt16 nPos, long nWidth = -1, long nHeight = -1 ); + SAL_DLLPRIVATE void ImplChangeTabPage( sal_uInt16 nId, sal_uInt16 nOldId ); + SAL_DLLPRIVATE sal_Bool ImplPosCurTabPage(); + SAL_DLLPRIVATE void ImplActivateTabPage( sal_Bool bNext ); SAL_DLLPRIVATE void ImplShowFocus(); SAL_DLLPRIVATE void ImplDrawItem( ImplTabItem* pItem, const Rectangle& rCurRect, bool bLayout = false, bool bFirstInGroup = false, bool bLastInGroup = false, bool bIsCurrentItem = false ); SAL_DLLPRIVATE void ImplPaint( const Rectangle& rRect, bool bLayout = false ); SAL_DLLPRIVATE void ImplFreeLayoutData(); SAL_DLLPRIVATE long ImplHandleKeyEvent( const KeyEvent& rKeyEvent ); - DECL_DLLPRIVATE_LINK( ImplScrollBtnHdl, PushButton* pBtn ); DECL_DLLPRIVATE_LINK( ImplListBoxSelectHdl, ListBox* ); DECL_DLLPRIVATE_LINK( ImplWindowEventListener, VclSimpleEvent* ); @@ -144,55 +134,52 @@ public: Point GetItemsOffset() const; void InsertPage( const ResId& rResId, - USHORT nPos = TAB_APPEND ); - void InsertPage( USHORT nPageId, const XubString& rText, - USHORT nPos = TAB_APPEND ); - void RemovePage( USHORT nPageId ); + sal_uInt16 nPos = TAB_APPEND ); + void InsertPage( sal_uInt16 nPageId, const XubString& rText, + sal_uInt16 nPos = TAB_APPEND ); + void RemovePage( sal_uInt16 nPageId ); void Clear(); - void EnablePage( USHORT nPageId, bool bEnable = true ); + void EnablePage( sal_uInt16 nPageId, bool bEnable = true ); - USHORT GetPageCount() const; - USHORT GetPageId( USHORT nPos ) const; - USHORT GetPagePos( USHORT nPageId ) const; - USHORT GetPageId( const Point& rPos ) const; + sal_uInt16 GetPageCount() const; + sal_uInt16 GetPageId( sal_uInt16 nPos ) const; + sal_uInt16 GetPagePos( sal_uInt16 nPageId ) const; + sal_uInt16 GetPageId( const Point& rPos ) const; - void SetCurPageId( USHORT nPageId ); - USHORT GetCurPageId() const; + void SetCurPageId( sal_uInt16 nPageId ); + sal_uInt16 GetCurPageId() const; - void SetFirstPageId( USHORT nPageId ); - USHORT GetFirstPageId() const { return GetPageId( mnFirstPagePos ); } - - void SelectTabPage( USHORT nPageId ); + void SelectTabPage( sal_uInt16 nPageId ); void SetMaxPageWidth( long nMaxWidth ) { mnMaxPageWidth = nMaxWidth; } long GetMaxPageWidth() const { return mnMaxPageWidth; } void ResetMaxPageWidth() { SetMaxPageWidth( 0 ); } - BOOL IsMaxPageWidth() const { return mnMaxPageWidth != 0; } + sal_Bool IsMaxPageWidth() const { return mnMaxPageWidth != 0; } - void SetTabPage( USHORT nPageId, TabPage* pPage ); - TabPage* GetTabPage( USHORT nPageId ) const; - USHORT GetTabPageResId( USHORT nPageId ) const; + void SetTabPage( sal_uInt16 nPageId, TabPage* pPage ); + TabPage* GetTabPage( sal_uInt16 nPageId ) const; + sal_uInt16 GetTabPageResId( sal_uInt16 nPageId ) const; - void SetPageText( USHORT nPageId, const XubString& rText ); - XubString GetPageText( USHORT nPageId ) const; + void SetPageText( sal_uInt16 nPageId, const XubString& rText ); + XubString GetPageText( sal_uInt16 nPageId ) const; - void SetHelpText( USHORT nPageId, const XubString& rText ); - const XubString& GetHelpText( USHORT nPageId ) const; + void SetHelpText( sal_uInt16 nPageId, const XubString& rText ); + const XubString& GetHelpText( sal_uInt16 nPageId ) const; - void SetHelpId( USHORT nPageId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nPageId ) const; + void SetHelpId( sal_uInt16 nPageId, const rtl::OString& rHelpId ); + rtl::OString GetHelpId( sal_uInt16 nPageId ) const; - void SetPageImage( USHORT nPageId, const Image& rImage ); - const Image* GetPageImage( USHORT nPageId ) const; + void SetPageImage( sal_uInt16 nPageId, const Image& rImage ); + const Image* GetPageImage( sal_uInt16 nPageId ) const; void SetHelpText( const XubString& rText ) { Control::SetHelpText( rText ); } const XubString& GetHelpText() const { return Control::GetHelpText(); } - void SetHelpId( ULONG nId ) - { Control::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { Control::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return Control::GetHelpId(); } void SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; } @@ -203,19 +190,19 @@ public: // returns (control relative) bounding rectangle for the // character at index nIndex relative to the text of page nPageId using Control::GetCharacterBounds; - Rectangle GetCharacterBounds( USHORT nPageId, long nIndex ) const; + Rectangle GetCharacterBounds( sal_uInt16 nPageId, long nIndex ) const; // returns the index relative to the text of page nPageId (also returned) // at position rPoint (control relative) using Control::GetIndexForPoint; - long GetIndexForPoint( const Point& rPoint, USHORT& rPageId ) const; + long GetIndexForPoint( const Point& rPoint, sal_uInt16& rPageId ) const; // returns the bounding rectangle of the union of tab page area and the // corresponding tab - Rectangle GetTabPageBounds( USHORT nPageId ) const; + Rectangle GetTabPageBounds( sal_uInt16 nPageId ) const; // returns the rectangle of the tab for page nPageId - Rectangle GetTabBounds( USHORT nPageId ) const; + Rectangle GetTabBounds( sal_uInt16 nPageId ) const; }; #endif // _SV_TABCTRL_HXX diff --git a/vcl/inc/vcl/tabdlg.hxx b/vcl/inc/vcl/tabdlg.hxx index 51591522d8e5..0b654b409f33 100644 --- a/vcl/inc/vcl/tabdlg.hxx +++ b/vcl/inc/vcl/tabdlg.hxx @@ -46,7 +46,7 @@ private: FixedLine* mpFixedLine; Window* mpViewWindow; WindowAlign meViewAlign; - BOOL mbPosControls; + sal_Bool mbPosControls; SAL_DLLPRIVATE void ImplInitTabDialogData(); SAL_DLLPRIVATE void ImplPosControls(); diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx index c385583e6ad7..92a00f892845 100644 --- a/vcl/inc/vcl/tabpage.hxx +++ b/vcl/inc/vcl/tabpage.hxx @@ -49,7 +49,7 @@ public: TabPage( Window* pParent, const ResId& rResId ); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); diff --git a/vcl/inc/vcl/taskpanelist.hxx b/vcl/inc/vcl/taskpanelist.hxx index 0eb4f20cd97d..102f755554f2 100644 --- a/vcl/inc/vcl/taskpanelist.hxx +++ b/vcl/inc/vcl/taskpanelist.hxx @@ -37,12 +37,12 @@ class VCL_DLLPUBLIC TaskPaneList { ::std::vector<Window *> mTaskPanes; - Window *FindNextPane( Window *pWindow, BOOL bForward = TRUE ); - Window *FindNextFloat( Window *pWindow, BOOL bForward = TRUE ); - Window *FindNextSplitter( Window *pWindow, BOOL bForward = TRUE ); + Window *FindNextPane( Window *pWindow, sal_Bool bForward = sal_True ); + Window *FindNextFloat( Window *pWindow, sal_Bool bForward = sal_True ); + Window *FindNextSplitter( Window *pWindow, sal_Bool bForward = sal_True ); public: - BOOL IsInList( Window *pWindow ); + sal_Bool IsInList( Window *pWindow ); public: TaskPaneList(); @@ -50,7 +50,7 @@ public: void AddWindow( Window *pWindow ); void RemoveWindow( Window *pWindow ); - BOOL HandleKeyEvent( KeyEvent aKeyEvent ); + sal_Bool HandleKeyEvent( KeyEvent aKeyEvent ); }; #endif diff --git a/vcl/inc/vcl/textlayout.hxx b/vcl/inc/vcl/textlayout.hxx index 0f593ed00e21..5902573f8746 100644..100755 --- a/vcl/inc/vcl/textlayout.hxx +++ b/vcl/inc/vcl/textlayout.hxx @@ -118,7 +118,7 @@ namespace vcl virtual ~ControlTextRenderer(); Rectangle DrawText( const Rectangle& _rRect, - const XubString& _rText, USHORT _nStyle = 0, + const XubString& _rText, sal_uInt16 _nStyle = 0, MetricVector* _pVector = NULL, String* _pDisplayText = NULL ); private: diff --git a/vcl/inc/vcl/throbber.hxx b/vcl/inc/vcl/throbber.hxx new file mode 100644 index 000000000000..ce45631d2fda --- /dev/null +++ b/vcl/inc/vcl/throbber.hxx @@ -0,0 +1,101 @@ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * This file is part of OpenOffice.org. + * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. + * + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). + * + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * <http://www.openoffice.org/license.html> + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#ifndef VCL_THROBBER_HXX +#define VCL_THROBBER_HXX + +#include "vcl/dllapi.h" +#include "vcl/imgctrl.hxx" +#include "vcl/timer.hxx" + +#include <com/sun/star/graphic/XGraphic.hpp> + +#include <vector> + +class VCL_DLLPUBLIC Throbber : public ImageControl +{ +public: + enum ImageSet + { + /// no (default) images at all + IMAGES_NONE, + /// automatically decide between different image sets, depending on what fits best the actual size + IMAGES_AUTO, + /// default images, 16x16 pixels + IMAGES_16_PX, + /// default images, 32x32 pixels + IMAGES_32_PX, + /// default images, 64x64 pixels + IMAGES_64_PX, + }; + +public: + Throbber( Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet = IMAGES_AUTO ); + Throbber( Window* i_parentWindow, const ResId& i_resId, const ImageSet i_imageSet = IMAGES_AUTO ); + ~Throbber(); + + // Properties + void setStepTime( sal_Int32 nStepTime ) { mnStepTime = nStepTime; } + sal_Int32 getStepTime() const { return mnStepTime; } + + void setRepeat( sal_Bool bRepeat ) { mbRepeat = bRepeat; } + sal_Bool getRepeat() const { return mbRepeat; } + + // animation control + void start(); + void stop(); + bool isRunning() const; + + void setImageList( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > >& ImageList ); + void setImageList( ::std::vector< Image > const& i_images ); + + // default images + static ::std::vector< ::rtl::OUString > + getDefaultImageURLs( const ImageSet i_imageSet ); + +protected: + // Window overridables + virtual void Resize(); + +private: + SAL_DLLPRIVATE void initImages(); + +private: + ::std::vector< Image > maImageList; + + sal_Bool mbRepeat; + sal_Int32 mnStepTime; + sal_Int32 mnCurStep; + sal_Int32 mnStepCount; + AutoTimer maWaitTimer; + ImageSet meImageSet; + + DECL_LINK( TimeOutHdl, void* ); +}; + +#endif // VCL_THROBBER_HXX + diff --git a/vcl/inc/vcl/timer.hxx b/vcl/inc/vcl/timer.hxx index ae2ca9a3ba99..efc4b00924a7 100644 --- a/vcl/inc/vcl/timer.hxx +++ b/vcl/inc/vcl/timer.hxx @@ -44,9 +44,9 @@ class VCL_DLLPUBLIC Timer { protected: ImplTimerData* mpTimerData; - ULONG mnTimeout; - BOOL mbActive; - BOOL mbAuto; + sal_uLong mnTimeout; + sal_Bool mbActive; + sal_Bool mbAuto; Link maTimeoutHdl; public: @@ -59,9 +59,9 @@ public: void Start(); void Stop(); - void SetTimeout( ULONG nTimeout ); - ULONG GetTimeout() const { return mnTimeout; } - BOOL IsActive() const { return mbActive; } + void SetTimeout( sal_uLong nTimeout ); + sal_uLong GetTimeout() const { return mnTimeout; } + sal_Bool IsActive() const { return mbActive; } void SetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink; } const Link& GetTimeoutHdl() const { return maTimeoutHdl; } diff --git a/vcl/inc/vcl/toolbox.h b/vcl/inc/vcl/toolbox.h index bc169c18e160..aec0c11cf790 100644 --- a/vcl/inc/vcl/toolbox.h +++ b/vcl/inc/vcl/toolbox.h @@ -69,7 +69,7 @@ struct ImplToolItem XubString maQuickHelpText; XubString maHelpText; String maCommandStr; - ULONG mnHelpId; + rtl::OString maHelpId; Rectangle maRect; Rectangle maCalcRect; // the overall horizontal item size, including one or more of [image size + textlength + dropdown arrow] @@ -79,8 +79,8 @@ struct ImplToolItem ToolBoxItemType meType; ToolBoxItemBits mnBits; TriState meState; - USHORT mnId; - BOOL mbEnabled:1, + sal_uInt16 mnId; + sal_Bool mbEnabled:1, mbVisible:1, mbEmptyBtn:1, mbShowWindow:1, @@ -88,11 +88,11 @@ struct ImplToolItem mbVisibleText:1; // indicates if text will definitely be drawn, influences dropdown pos ImplToolItem(); - ImplToolItem( USHORT nItemId, const Image& rImage, + ImplToolItem( sal_uInt16 nItemId, const Image& rImage, ToolBoxItemBits nItemBits ); - ImplToolItem( USHORT nItemId, const XubString& rTxt, + ImplToolItem( sal_uInt16 nItemId, const XubString& rTxt, ToolBoxItemBits nItemBits ); - ImplToolItem( USHORT nItemId, const Image& rImage, + ImplToolItem( sal_uInt16 nItemId, const Image& rImage, const XubString& rTxt, ToolBoxItemBits nItemBits ); ~ImplToolItem(); @@ -104,18 +104,18 @@ struct ImplToolItem // the default size is the precomputed size for standard items // ie those that are just ordinary buttons (no windows or text etc.) // bCheckMaxWidth indicates that item windows must not exceed maxWidth in which case they will be painted as buttons - Size GetSize( BOOL bHorz, BOOL bCheckMaxWidth, long maxWidth, const Size& rDefaultSize ); + Size GetSize( sal_Bool bHorz, sal_Bool bCheckMaxWidth, long maxWidth, const Size& rDefaultSize ); // only useful for buttons: returns if the text or image part or both can be drawn according to current button drawing style - void DetermineButtonDrawStyle( ButtonType eButtonType, BOOL& rbImage, BOOL& rbText ) const; + void DetermineButtonDrawStyle( ButtonType eButtonType, sal_Bool& rbImage, sal_Bool& rbText ) const; // returns the rectangle which contains the drop down arrow // or an empty rect if there is none // bHorz denotes the toolbox alignment - Rectangle GetDropDownRect( BOOL bHorz ) const; + Rectangle GetDropDownRect( sal_Bool bHorz ) const; - // returns TRUE if the toolbar item is currently clipped, which can happen for docked toolbars - BOOL IsClipped() const; + // returns sal_True if the toolbar item is currently clipped, which can happen for docked toolbars + sal_Bool IsClipped() const; }; namespace vcl @@ -123,8 +123,8 @@ namespace vcl struct ToolBoxLayoutData : public ControlLayoutData { - std::vector< USHORT > m_aLineItemIds; - std::vector< USHORT > m_aLineItemPositions; + std::vector< sal_uInt16 > m_aLineItemIds; + std::vector< sal_uInt16 > m_aLineItemPositions; }; @@ -150,8 +150,8 @@ struct ImplToolBoxPrivateData // the optional custom menu PopupMenu* mpMenu; - USHORT maMenuType; - ULONG mnEventId; + sal_uInt16 maMenuType; + sal_uIntPtr mnEventId; // called when menu button is clicked and before the popup menu is executed Link maMenuButtonHdl; @@ -166,7 +166,7 @@ struct ImplToolBoxPrivateData vcl::IImageListProvider* mpImageListProvider; vcl::ImageListType meImageListType; - BOOL mbIsLocked:1, // keeps last lock state from ImplDockingWindowWrapper + sal_Bool mbIsLocked:1, // keeps last lock state from ImplDockingWindowWrapper mbAssumeDocked:1, // only used during calculations to override current floating/popup mode mbAssumeFloating:1, mbAssumePopupMode:1, diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index 66a13e975b1f..ccd7c229346b 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -54,27 +54,27 @@ namespace vcl // - ToolBoxCustomizeEvent - // ------------------------- -#define TOOLBOX_CUSTOMIZE_RESIZE ((USHORT)0xFFFE) +#define TOOLBOX_CUSTOMIZE_RESIZE ((sal_uInt16)0xFFFE) class VCL_DLLPUBLIC ToolBoxCustomizeEvent { private: ToolBox* mpTargetBox; void* mpData; - USHORT mnIdFrom; - USHORT mnPosTo; + sal_uInt16 mnIdFrom; + sal_uInt16 mnPosTo; public: ToolBoxCustomizeEvent(); ToolBoxCustomizeEvent( ToolBox* pDropBox, - USHORT nId, USHORT nPos = 0, + sal_uInt16 nId, sal_uInt16 nPos = 0, void* pUserData = NULL ); ToolBox* GetTargetBox() const { return mpTargetBox; } - USHORT GetTargetPos() const { return mnPosTo; } - USHORT GetSourceId() const { return mnIdFrom; } + sal_uInt16 GetTargetPos() const { return mnPosTo; } + sal_uInt16 GetSourceId() const { return mnIdFrom; } void* GetData() const { return mpData; } - BOOL IsResized() const; + sal_Bool IsResized() const; }; inline ToolBoxCustomizeEvent::ToolBoxCustomizeEvent() @@ -86,7 +86,7 @@ inline ToolBoxCustomizeEvent::ToolBoxCustomizeEvent() } inline ToolBoxCustomizeEvent::ToolBoxCustomizeEvent( ToolBox* pDropBox, - USHORT nId, USHORT nPos, + sal_uInt16 nId, sal_uInt16 nPos, void* pUserData ) { mpTargetBox = pDropBox; @@ -95,19 +95,19 @@ inline ToolBoxCustomizeEvent::ToolBoxCustomizeEvent( ToolBox* pDropBox, mpData = pUserData; } -inline BOOL ToolBoxCustomizeEvent::IsResized() const +inline sal_Bool ToolBoxCustomizeEvent::IsResized() const { if ( mnPosTo == TOOLBOX_CUSTOMIZE_RESIZE ) - return TRUE; + return sal_True; else - return FALSE; + return sal_False; } // ------------------- // - ToolBoxItemBits - // ------------------- -typedef USHORT ToolBoxItemBits; +typedef sal_uInt16 ToolBoxItemBits; // -------------------------- // - Bits fuer ToolBoxItems - @@ -130,20 +130,20 @@ typedef USHORT ToolBoxItemBits; // - ToolBox-Types - // ----------------- -#define TOOLBOX_STYLE_OUTBUTTON ((USHORT)0x0001) -#define TOOLBOX_STYLE_HANDPOINTER ((USHORT)0x0002) -#define TOOLBOX_STYLE_FLAT ((USHORT)0x0004) +#define TOOLBOX_STYLE_OUTBUTTON ((sal_uInt16)0x0001) +#define TOOLBOX_STYLE_HANDPOINTER ((sal_uInt16)0x0002) +#define TOOLBOX_STYLE_FLAT ((sal_uInt16)0x0004) -#define TOOLBOX_APPEND ((USHORT)0xFFFF) -#define TOOLBOX_ITEM_NOTFOUND ((USHORT)0xFFFF) +#define TOOLBOX_APPEND ((sal_uInt16)0xFFFF) +#define TOOLBOX_ITEM_NOTFOUND ((sal_uInt16)0xFFFF) // item ids in the custom menu may not exceed this constant -#define TOOLBOX_MENUITEM_START ((USHORT)0xE000) +#define TOOLBOX_MENUITEM_START ((sal_uInt16)0xE000) // defines for the menubutton -#define TOOLBOX_MENUTYPE_NONE ((USHORT)0x0000) // no menu at all, scrolling by spin buttons -#define TOOLBOX_MENUTYPE_CLIPPEDITEMS ((USHORT)0x0001) // menu will contain "more" indicator -#define TOOLBOX_MENUTYPE_CUSTOMIZE ((USHORT)0x0002) // menu will contain "customization" and "more" indicator +#define TOOLBOX_MENUTYPE_NONE ((sal_uInt16)0x0000) // no menu at all, scrolling by spin buttons +#define TOOLBOX_MENUTYPE_CLIPPEDITEMS ((sal_uInt16)0x0001) // menu will contain "more" indicator +#define TOOLBOX_MENUTYPE_CUSTOMIZE ((sal_uInt16)0x0002) // menu will contain "customization" and "more" indicator // By changes you must also change: rsc/vclrsc.hxx enum ButtonType { BUTTON_SYMBOL, BUTTON_TEXT, BUTTON_SYMBOLTEXT }; @@ -184,7 +184,7 @@ private: Rectangle maInDockRect; Rectangle maPaintRect; FloatingWindow* mpFloatWin; - USHORT mnKeyModifier; + sal_uInt16 mnKeyModifier; long mnDX; long mnDY; long mnMaxItemWidth; // max item width @@ -198,22 +198,22 @@ private: long mnBottomBorder; long mnLastResizeDY; long mnActivateCount; - USHORT mnLastFocusItemId; - USHORT mnFocusPos; - USHORT mnOutStyle; - USHORT mnHighItemId; - USHORT mnCurItemId; - USHORT mnDownItemId; - USHORT mnCurPos; - USHORT mnLines; // total number of toolbox lines - USHORT mnCurLine; // the currently visible line - USHORT mnCurLines; // number of lines due to line breaking - USHORT mnVisLines; // number of visible lines (for scrolling) - USHORT mnFloatLines; // number of lines during floating mode - USHORT mnDockLines; - USHORT mnConfigItem; - USHORT mnMouseClicks; - USHORT mnMouseModifier; + sal_uInt16 mnLastFocusItemId; + sal_uInt16 mnFocusPos; + sal_uInt16 mnOutStyle; + sal_uInt16 mnHighItemId; + sal_uInt16 mnCurItemId; + sal_uInt16 mnDownItemId; + sal_uInt16 mnCurPos; + sal_uInt16 mnLines; // total number of toolbox lines + sal_uInt16 mnCurLine; // the currently visible line + sal_uInt16 mnCurLines; // number of lines due to line breaking + sal_uInt16 mnVisLines; // number of visible lines (for scrolling) + sal_uInt16 mnFloatLines; // number of lines during floating mode + sal_uInt16 mnDockLines; + sal_uInt16 mnConfigItem; + sal_uInt16 mnMouseClicks; + sal_uInt16 mnMouseModifier; unsigned int mbDrag:1, mbSelection:1, mbCommandDrag:1, @@ -252,44 +252,44 @@ private: private: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); using DockingWindow::ImplInitSettings; - SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SAL_DLLPRIVATE void ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE ImplToolItem* ImplGetItem( USHORT nId ) const; - SAL_DLLPRIVATE BOOL ImplCalcItem(); - SAL_DLLPRIVATE USHORT ImplCalcBreaks( long nWidth, long* pMaxLineWidth, BOOL bCalcHorz ); - SAL_DLLPRIVATE void ImplFormat( BOOL bResize = FALSE ); - SAL_DLLPRIVATE void ImplDrawSpin( BOOL bUpperIn, BOOL bLowerIn ); - SAL_DLLPRIVATE void ImplDrawNext( BOOL bIn ); - SAL_DLLPRIVATE void ImplDrawSeparator( USHORT nPos, Rectangle rRect ); - SAL_DLLPRIVATE void ImplDrawItem( USHORT nPos, BOOL bHighlight = FALSE, BOOL bPaint = FALSE, BOOL bLayout = FALSE ); + SAL_DLLPRIVATE ImplToolItem* ImplGetItem( sal_uInt16 nId ) const; + SAL_DLLPRIVATE sal_Bool ImplCalcItem(); + SAL_DLLPRIVATE sal_uInt16 ImplCalcBreaks( long nWidth, long* pMaxLineWidth, sal_Bool bCalcHorz ); + SAL_DLLPRIVATE void ImplFormat( sal_Bool bResize = sal_False ); + SAL_DLLPRIVATE void ImplDrawSpin( sal_Bool bUpperIn, sal_Bool bLowerIn ); + SAL_DLLPRIVATE void ImplDrawNext( sal_Bool bIn ); + SAL_DLLPRIVATE void ImplDrawSeparator( sal_uInt16 nPos, Rectangle rRect ); + SAL_DLLPRIVATE void ImplDrawItem( sal_uInt16 nPos, sal_Bool bHighlight = sal_False, sal_Bool bPaint = sal_False, sal_Bool bLayout = sal_False ); using Window::ImplInvalidate; - SAL_DLLPRIVATE void ImplInvalidate( BOOL bNewCalc = FALSE, BOOL bFullPaint = FALSE ); - SAL_DLLPRIVATE void ImplUpdateItem( USHORT nIndex = 0xFFFF ); + SAL_DLLPRIVATE void ImplInvalidate( sal_Bool bNewCalc = sal_False, sal_Bool bFullPaint = sal_False ); + SAL_DLLPRIVATE void ImplUpdateItem( sal_uInt16 nIndex = 0xFFFF ); SAL_DLLPRIVATE void ImplStartCustomizeMode(); SAL_DLLPRIVATE void ImplEndCustomizeMode(); SAL_DLLPRIVATE const XubString& ImplConvertMenuString( const XubString& rStr ); - SAL_DLLPRIVATE BOOL ImplHandleMouseMove( const MouseEvent& rMEvt, BOOL bRepeat = FALSE ); - SAL_DLLPRIVATE BOOL ImplHandleMouseButtonUp( const MouseEvent& rMEvt, BOOL bCancel = FALSE ); - SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, BOOL bNoGrabFocus = FALSE ); - SAL_DLLPRIVATE BOOL ImplChangeHighlightUpDn( BOOL bUp, BOOL bNoCycle = FALSE ); - SAL_DLLPRIVATE USHORT ImplGetItemLine( ImplToolItem* pCurrentItem ); - SAL_DLLPRIVATE ImplToolItem* ImplGetFirstValidItem( USHORT nLine ); - SAL_DLLPRIVATE ImplToolItem* ImplGetLastValidItem( USHORT nLine ); - SAL_DLLPRIVATE BOOL ImplOpenItem( KeyCode aKeyCode ); - SAL_DLLPRIVATE BOOL ImplActivateItem( KeyCode aKeyCode ); + SAL_DLLPRIVATE sal_Bool ImplHandleMouseMove( const MouseEvent& rMEvt, sal_Bool bRepeat = sal_False ); + SAL_DLLPRIVATE sal_Bool ImplHandleMouseButtonUp( const MouseEvent& rMEvt, sal_Bool bCancel = sal_False ); + SAL_DLLPRIVATE void ImplChangeHighlight( ImplToolItem* pItem, sal_Bool bNoGrabFocus = sal_False ); + SAL_DLLPRIVATE sal_Bool ImplChangeHighlightUpDn( sal_Bool bUp, sal_Bool bNoCycle = sal_False ); + SAL_DLLPRIVATE sal_uInt16 ImplGetItemLine( ImplToolItem* pCurrentItem ); + SAL_DLLPRIVATE ImplToolItem* ImplGetFirstValidItem( sal_uInt16 nLine ); + SAL_DLLPRIVATE ImplToolItem* ImplGetLastValidItem( sal_uInt16 nLine ); + SAL_DLLPRIVATE sal_Bool ImplOpenItem( KeyCode aKeyCode ); + SAL_DLLPRIVATE sal_Bool ImplActivateItem( KeyCode aKeyCode ); SAL_DLLPRIVATE void ImplShowFocus(); SAL_DLLPRIVATE void ImplHideFocus(); SAL_DLLPRIVATE void ImplUpdateInputEnable(); SAL_DLLPRIVATE void ImplFillLayoutData() const; SAL_DLLPRIVATE void ImplUpdateCustomMenu(); - SAL_DLLPRIVATE BOOL ImplHasClippedItems(); + SAL_DLLPRIVATE sal_Bool ImplHasClippedItems(); SAL_DLLPRIVATE Point ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize ) const; SAL_DLLPRIVATE void ImplExecuteCustomMenu(); - SAL_DLLPRIVATE BOOL ImplIsFloatingMode() const; - SAL_DLLPRIVATE BOOL ImplIsInPopupMode() const; - SAL_DLLPRIVATE const XubString& ImplGetHelpText( USHORT nItemId ) const; + SAL_DLLPRIVATE sal_Bool ImplIsFloatingMode() const; + SAL_DLLPRIVATE sal_Bool ImplIsInPopupMode() const; + SAL_DLLPRIVATE const XubString& ImplGetHelpText( sal_uInt16 nItemId ) const; SAL_DLLPRIVATE Size ImplGetOptimalFloatingSize( FloatingSizeMode eMode ); - SAL_DLLPRIVATE BOOL ImplHasExternalMenubutton(); + SAL_DLLPRIVATE sal_Bool ImplHasExternalMenubutton(); SAL_DLLPRIVATE void ImplDrawFloatwinBorder( ImplToolItem* pItem ); DECL_DLLPRIVATE_LINK( ImplCallExecuteCustomMenu, void* ); @@ -304,7 +304,7 @@ private: SAL_DLLPRIVATE void ImplUpdateImageList(); // called if StateChanged public: - SAL_DLLPRIVATE void ImplFloatControl( BOOL bStart, FloatingWindow* pWindow = NULL ); + SAL_DLLPRIVATE void ImplFloatControl( sal_Bool bStart, FloatingWindow* pWindow = NULL ); SAL_DLLPRIVATE void ImplDisableFlatButtons(); static SAL_DLLPRIVATE int ImplGetDragWidth( ToolBox* pThis ); @@ -313,35 +313,35 @@ public: long& rRight, long& rBottom, const ToolBox *pThis ); static SAL_DLLPRIVATE void ImplDrawGrip( ToolBox* pThis ); static SAL_DLLPRIVATE void ImplDrawGradientBackground( ToolBox* pThis, ImplDockingWindowWrapper *pWrapper ); - static SAL_DLLPRIVATE BOOL ImplDrawNativeBackground( ToolBox* pThis, const Region &rRegion ); + static SAL_DLLPRIVATE sal_Bool ImplDrawNativeBackground( ToolBox* pThis, const Region &rRegion ); static SAL_DLLPRIVATE void ImplDrawTransparentBackground( ToolBox* pThis, const Region &rRegion ); - static SAL_DLLPRIVATE void ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion, BOOL bIsInPopupMode ); + static SAL_DLLPRIVATE void ImplDrawConstantBackground( ToolBox* pThis, const Region &rRegion, sal_Bool bIsInPopupMode ); static SAL_DLLPRIVATE void ImplDrawBackground( ToolBox* pThis, const Rectangle &rRect ); - static SAL_DLLPRIVATE void ImplErase( ToolBox* pThis, const Rectangle &rRect, BOOL bHighlight = FALSE, BOOL bHasOpenPopup = FALSE ); + static SAL_DLLPRIVATE void ImplErase( ToolBox* pThis, const Rectangle &rRect, sal_Bool bHighlight = sal_False, sal_Bool bHasOpenPopup = sal_False ); static SAL_DLLPRIVATE void ImplDrawBorder( ToolBox* pWin ); static SAL_DLLPRIVATE const ImplToolItem *ImplGetFirstClippedItem( const ToolBox* pThis ); - static SAL_DLLPRIVATE Size ImplCalcSize( const ToolBox* pThis, USHORT nCalcLines, USHORT nCalcMode = 0 ); + static SAL_DLLPRIVATE Size ImplCalcSize( const ToolBox* pThis, sal_uInt16 nCalcLines, sal_uInt16 nCalcMode = 0 ); static SAL_DLLPRIVATE void ImplCalcFloatSizes( ToolBox* pThis ); - static SAL_DLLPRIVATE Size ImplCalcFloatSize( ToolBox* pThis, USHORT& rLines ); + static SAL_DLLPRIVATE Size ImplCalcFloatSize( ToolBox* pThis, sal_uInt16& rLines ); static SAL_DLLPRIVATE void ImplCalcMinMaxFloatSize( ToolBox* pThis, Size& rMinSize, Size& rMaxSize ); static SAL_DLLPRIVATE void ImplSetMinMaxFloatSize( ToolBox *pThis ); - static SAL_DLLPRIVATE USHORT ImplCalcLines( ToolBox* pThis, long nToolSize ); - static SAL_DLLPRIVATE USHORT ImplTestLineSize( ToolBox* pThis, const Point& rPos ); - static SAL_DLLPRIVATE void ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, USHORT nLineMode ); - static SAL_DLLPRIVATE USHORT ImplFindItemPos( ToolBox* pBox, const Point& rPos ); - static SAL_DLLPRIVATE USHORT ImplFindItemPos( const ImplToolItem* pItem, const std::vector< ImplToolItem >& rList ); - static SAL_DLLPRIVATE void ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, BOOL bBlack, BOOL bColTransform, - BOOL bLeft = FALSE, BOOL bTop = FALSE, + static SAL_DLLPRIVATE sal_uInt16 ImplCalcLines( ToolBox* pThis, long nToolSize ); + static SAL_DLLPRIVATE sal_uInt16 ImplTestLineSize( ToolBox* pThis, const Point& rPos ); + static SAL_DLLPRIVATE void ImplLineSizing( ToolBox* pThis, const Point& rPos, Rectangle& rRect, sal_uInt16 nLineMode ); + static SAL_DLLPRIVATE sal_uInt16 ImplFindItemPos( ToolBox* pBox, const Point& rPos ); + static SAL_DLLPRIVATE sal_uInt16 ImplFindItemPos( const ImplToolItem* pItem, const std::vector< ImplToolItem >& rList ); + static SAL_DLLPRIVATE void ImplDrawToolArrow( ToolBox* pBox, long nX, long nY, sal_Bool bBlack, sal_Bool bColTransform, + sal_Bool bLeft = sal_False, sal_Bool bTop = sal_False, long nSize = 6 ); static SAL_DLLPRIVATE void SetToolArrowClipregion( ToolBox* pBox, long nX, long nY, - BOOL bLeft = FALSE, BOOL bTop = FALSE, + sal_Bool bLeft = sal_False, sal_Bool bTop = sal_False, long nSize = 6 ); - static SAL_DLLPRIVATE void ImplDrawMenubutton( ToolBox *pThis, BOOL bHighlight ); - static SAL_DLLPRIVATE USHORT ImplCountLineBreaks( const ToolBox *pThis ); + static SAL_DLLPRIVATE void ImplDrawMenubutton( ToolBox *pThis, sal_Bool bHighlight ); + static SAL_DLLPRIVATE sal_uInt16 ImplCountLineBreaks( const ToolBox *pThis ); SAL_DLLPRIVATE ImplToolBoxPrivateData* ImplGetToolBoxPrivateData() const { return mpData; } protected: - void SetCurItemId(USHORT nSet) { mnCurItemId = nSet; } + void SetCurItemId(sal_uInt16 nSet) { mnCurItemId = nSet; } public: ToolBox( Window* pParent, WinBits nStyle = 0 ); @@ -375,36 +375,36 @@ public: virtual void LoseFocus(); virtual void KeyInput( const KeyEvent& rKEvt ); - virtual BOOL PrepareToggleFloatingMode(); + virtual sal_Bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); virtual void StartDocking(); - virtual BOOL Docking( const Point& rPos, Rectangle& rRect ); - virtual void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); + virtual sal_Bool Docking( const Point& rPos, Rectangle& rRect ); + virtual void EndDocking( const Rectangle& rRect, sal_Bool bFloatMode ); virtual void Resizing( Size& rSize ); void InsertItem( const ResId& rResId, - USHORT nPos = TOOLBOX_APPEND ); - void InsertItem( USHORT nItemId, const Image& rImage, + sal_uInt16 nPos = TOOLBOX_APPEND ); + void InsertItem( sal_uInt16 nItemId, const Image& rImage, ToolBoxItemBits nBits = 0, - USHORT nPos = TOOLBOX_APPEND ); - void InsertItem( USHORT nItemId, const Image& rImage, + sal_uInt16 nPos = TOOLBOX_APPEND ); + void InsertItem( sal_uInt16 nItemId, const Image& rImage, const XubString& rText, ToolBoxItemBits nBits = 0, - USHORT nPos = TOOLBOX_APPEND ); - void InsertItem( USHORT nItemId, const XubString& rText, + sal_uInt16 nPos = TOOLBOX_APPEND ); + void InsertItem( sal_uInt16 nItemId, const XubString& rText, ToolBoxItemBits nBits = 0, - USHORT nPos = TOOLBOX_APPEND ); - void InsertWindow( USHORT nItemId, Window* pWindow, + sal_uInt16 nPos = TOOLBOX_APPEND ); + void InsertWindow( sal_uInt16 nItemId, Window* pWindow, ToolBoxItemBits nBits = 0, - USHORT nPos = TOOLBOX_APPEND ); - void InsertSpace( USHORT nPos = TOOLBOX_APPEND ); - void InsertSeparator( USHORT nPos = TOOLBOX_APPEND, - USHORT nPixSize = 0 ); - void InsertBreak( USHORT nPos = TOOLBOX_APPEND ); - void RemoveItem( USHORT nPos ); - void MoveItem( USHORT nItemId, USHORT nNewPos = TOOLBOX_APPEND ); - void CopyItem( const ToolBox& rToolBox, USHORT nItemId, - USHORT nNewPos = TOOLBOX_APPEND ); + sal_uInt16 nPos = TOOLBOX_APPEND ); + void InsertSpace( sal_uInt16 nPos = TOOLBOX_APPEND ); + void InsertSeparator( sal_uInt16 nPos = TOOLBOX_APPEND, + sal_uInt16 nPixSize = 0 ); + void InsertBreak( sal_uInt16 nPos = TOOLBOX_APPEND ); + void RemoveItem( sal_uInt16 nPos ); + void MoveItem( sal_uInt16 nItemId, sal_uInt16 nNewPos = TOOLBOX_APPEND ); + void CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId, + sal_uInt16 nNewPos = TOOLBOX_APPEND ); void CopyItems( const ToolBox& rToolBox ); void Clear(); void RecalcItems(); @@ -421,106 +421,106 @@ public: void SetAlign( WindowAlign eNewAlign = WINDOWALIGN_TOP ); WindowAlign GetAlign() const { return meAlign; } - BOOL IsHorizontal() const { return mbHorz; } + sal_Bool IsHorizontal() const { return mbHorz; } - void SetLineCount( USHORT nNewLines ); - USHORT GetLineCount() const { return mnLines; } - USHORT GetCurLine() const { return mnCurLine; } - void ShowLine( BOOL bNext ); + void SetLineCount( sal_uInt16 nNewLines ); + sal_uInt16 GetLineCount() const { return mnLines; } + sal_uInt16 GetCurLine() const { return mnCurLine; } + void ShowLine( sal_Bool bNext ); // Used to enable/disable scrolling one page at a time for toolbar - void SetPageScroll( BOOL b ); - BOOL GetPageScroll(); + void SetPageScroll( sal_Bool b ); + sal_Bool GetPageScroll(); void SetNextToolBox( const XubString& rStr ); const XubString& GetNextToolBox() const { return maNextToolBoxStr; } - USHORT GetItemCount() const; - ToolBoxItemType GetItemType( USHORT nPos ) const; - USHORT GetItemPos( USHORT nItemId ) const; - USHORT GetItemPos( const Point& rPos ) const; - USHORT GetItemId( USHORT nPos ) const; - USHORT GetItemId( const Point& rPos ) const; - Rectangle GetItemRect( USHORT nItemId ) const; - Rectangle GetItemPosRect( USHORT nPos ) const; - Rectangle GetItemDropDownRect( USHORT nItemId ) const; - Rectangle GetItemPosDropDownRect( USHORT nPos ) const; + sal_uInt16 GetItemCount() const; + ToolBoxItemType GetItemType( sal_uInt16 nPos ) const; + sal_uInt16 GetItemPos( sal_uInt16 nItemId ) const; + sal_uInt16 GetItemPos( const Point& rPos ) const; + sal_uInt16 GetItemId( sal_uInt16 nPos ) const; + sal_uInt16 GetItemId( const Point& rPos ) const; + Rectangle GetItemRect( sal_uInt16 nItemId ) const; + Rectangle GetItemPosRect( sal_uInt16 nPos ) const; + Rectangle GetItemDropDownRect( sal_uInt16 nItemId ) const; + Rectangle GetItemPosDropDownRect( sal_uInt16 nPos ) const; // retrieves the optimal position to place a popup window for this item (subtoolbar or dropdown) - Point GetItemPopupPosition( USHORT nItemId, const Size& rSize ) const; + Point GetItemPopupPosition( sal_uInt16 nItemId, const Size& rSize ) const; Rectangle GetScrollRect() const; Rectangle GetMenubuttonRect() const; - USHORT GetCurItemId() const { return mnCurItemId; } - USHORT GetDownItemId() const { return mnDownItemId; } - USHORT GetClicks() const { return mnMouseClicks; } - USHORT GetModifier() const { return mnMouseModifier; } - USHORT GetKeyModifier() const { return mnKeyModifier; } - - void SetItemBits( USHORT nItemId, ToolBoxItemBits nBits ); - ToolBoxItemBits GetItemBits( USHORT nItemId ) const; - - void SetItemData( USHORT nItemId, void* pNewData ); - void* GetItemData( USHORT nItemId ) const; - void SetItemImage( USHORT nItemId, const Image& rImage ); - Image GetItemImage( USHORT nItemId ) const; - void SetItemImageAngle( USHORT nItemId, long nAngle10 ); - long GetItemImageAngle( USHORT nItemId ) const; - void SetItemImageMirrorMode( USHORT nItemId, BOOL bMirror ); - BOOL GetItemImageMirrorMode( USHORT ) const; - void SetItemHighImage( USHORT nItemId, const Image& rImage ); - Image GetItemHighImage( USHORT nItemId ) const; - void SetItemText( USHORT nItemId, const XubString& rText ); - const XubString& GetItemText( USHORT nItemId ) const; - void SetItemWindow( USHORT nItemId, Window* pNewWindow ); - Window* GetItemWindow( USHORT nItemId ) const; - USHORT GetHighlightItemId() const { return mnHighItemId; } + sal_uInt16 GetCurItemId() const { return mnCurItemId; } + sal_uInt16 GetDownItemId() const { return mnDownItemId; } + sal_uInt16 GetClicks() const { return mnMouseClicks; } + sal_uInt16 GetModifier() const { return mnMouseModifier; } + sal_uInt16 GetKeyModifier() const { return mnKeyModifier; } + + void SetItemBits( sal_uInt16 nItemId, ToolBoxItemBits nBits ); + ToolBoxItemBits GetItemBits( sal_uInt16 nItemId ) const; + + void SetItemData( sal_uInt16 nItemId, void* pNewData ); + void* GetItemData( sal_uInt16 nItemId ) const; + void SetItemImage( sal_uInt16 nItemId, const Image& rImage ); + Image GetItemImage( sal_uInt16 nItemId ) const; + void SetItemImageAngle( sal_uInt16 nItemId, long nAngle10 ); + long GetItemImageAngle( sal_uInt16 nItemId ) const; + void SetItemImageMirrorMode( sal_uInt16 nItemId, sal_Bool bMirror ); + sal_Bool GetItemImageMirrorMode( sal_uInt16 ) const; + void SetItemHighImage( sal_uInt16 nItemId, const Image& rImage ); + Image GetItemHighImage( sal_uInt16 nItemId ) const; + void SetItemText( sal_uInt16 nItemId, const XubString& rText ); + const XubString& GetItemText( sal_uInt16 nItemId ) const; + void SetItemWindow( sal_uInt16 nItemId, Window* pNewWindow ); + Window* GetItemWindow( sal_uInt16 nItemId ) const; + sal_uInt16 GetHighlightItemId() const { return mnHighItemId; } void StartSelection(); void EndSelection(); - void SetItemDown( USHORT nItemId, BOOL bDown, BOOL bRelease = TRUE ); - BOOL IsItemDown( USHORT nItemId ) const; + void SetItemDown( sal_uInt16 nItemId, sal_Bool bDown, sal_Bool bRelease = sal_True ); + sal_Bool IsItemDown( sal_uInt16 nItemId ) const; - void SetItemState( USHORT nItemId, TriState eState ); - TriState GetItemState( USHORT nItemId ) const; + void SetItemState( sal_uInt16 nItemId, TriState eState ); + TriState GetItemState( sal_uInt16 nItemId ) const; - void CheckItem( USHORT nItemId, BOOL bCheck = TRUE ); - BOOL IsItemChecked( USHORT nItemId ) const; + void CheckItem( sal_uInt16 nItemId, sal_Bool bCheck = sal_True ); + sal_Bool IsItemChecked( sal_uInt16 nItemId ) const; - void EnableItem( USHORT nItemId, BOOL bEnable = TRUE ); - BOOL IsItemEnabled( USHORT nItemId ) const; + void EnableItem( sal_uInt16 nItemId, sal_Bool bEnable = sal_True ); + sal_Bool IsItemEnabled( sal_uInt16 nItemId ) const; - void TriggerItem( USHORT nItemId, BOOL bShift = FALSE, BOOL bCtrl = FALSE ); - void ShowItem( USHORT nItemId, BOOL bVisible = TRUE ); - void HideItem( USHORT nItemId ) { ShowItem( nItemId, FALSE ); } - BOOL IsItemVisible( USHORT nItemId ) const; - BOOL IsItemReallyVisible( USHORT nItemId ) const; + void TriggerItem( sal_uInt16 nItemId, sal_Bool bShift = sal_False, sal_Bool bCtrl = sal_False ); + void ShowItem( sal_uInt16 nItemId, sal_Bool bVisible = sal_True ); + void HideItem( sal_uInt16 nItemId ) { ShowItem( nItemId, sal_False ); } + sal_Bool IsItemVisible( sal_uInt16 nItemId ) const; + sal_Bool IsItemReallyVisible( sal_uInt16 nItemId ) const; - void SetItemCommand( USHORT nItemId, const XubString& rCommand ); - const XubString& GetItemCommand( USHORT nItemId ) const; + void SetItemCommand( sal_uInt16 nItemId, const XubString& rCommand ); + const XubString& GetItemCommand( sal_uInt16 nItemId ) const; using Window::SetQuickHelpText; - void SetQuickHelpText( USHORT nItemId, const XubString& rText ); + void SetQuickHelpText( sal_uInt16 nItemId, const XubString& rText ); using Window::GetQuickHelpText; - const XubString& GetQuickHelpText( USHORT nItemId ) const; + const XubString& GetQuickHelpText( sal_uInt16 nItemId ) const; - void SetHelpText( USHORT nItemId, const XubString& rText ); - const XubString& GetHelpText( USHORT nItemId ) const; + void SetHelpText( sal_uInt16 nItemId, const XubString& rText ); + const XubString& GetHelpText( sal_uInt16 nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( sal_uInt16 nItemId, const rtl::OString& rHelpId ); + rtl::OString GetHelpId( sal_uInt16 nItemId ) const; // window size according to current alignment, floating state and number of lines Size CalcWindowSizePixel() const; // window size according to current alignment, floating state and a given number of lines - Size CalcWindowSizePixel( USHORT nCalcLines ) const; + Size CalcWindowSizePixel( sal_uInt16 nCalcLines ) const; // window size according to current floating state and a given number of lines and a given alignment - Size CalcWindowSizePixel( USHORT nCalcLines, WindowAlign eAlign ) const; + Size CalcWindowSizePixel( sal_uInt16 nCalcLines, WindowAlign eAlign ) const; // floating window size according to number of lines (uses the number of line breaks) Size CalcFloatingWindowSizePixel() const; // floating window size with a given number of lines - Size CalcFloatingWindowSizePixel( USHORT nCalcLines ) const; + Size CalcFloatingWindowSizePixel( sal_uInt16 nCalcLines ) const; // automatic window size for popoup mode Size CalcPopupWindowSizePixel() const; @@ -529,8 +529,8 @@ public: void SetDockingRects( const Rectangle& rOutRect, const Rectangle& rInRect ); - void SetFloatingLines( USHORT nFloatLines ); - USHORT GetFloatingLines() const; + void SetFloatingLines( sal_uInt16 nFloatLines ); + sal_uInt16 GetFloatingLines() const; void SetBorder( long nX, long nY ); long GetBorderX() const { return mnBorderX; } @@ -540,35 +540,35 @@ public: WinBits GetStyle() const { return mnWinStyle; } // enable/disable undocking - void Lock( BOOL bLock = TRUE ); + void Lock( sal_Bool bLock = sal_True ); // read configuration to determine locking behaviour - static BOOL AlwaysLocked(); + static sal_Bool AlwaysLocked(); - void EnableMenuStrings( BOOL bEnable = TRUE ) { mbMenuStrings = (bEnable != 0); } - BOOL IsMenuStringsEnabled() const { return mbMenuStrings; } + void EnableMenuStrings( sal_Bool bEnable = sal_True ) { mbMenuStrings = (bEnable != 0); } + sal_Bool IsMenuStringsEnabled() const { return mbMenuStrings; } - void SetOutStyle( USHORT nNewStyle ); - USHORT GetOutStyle() const { return mnOutStyle; } + void SetOutStyle( sal_uInt16 nNewStyle ); + sal_uInt16 GetOutStyle() const { return mnOutStyle; } - void EnableCustomize( BOOL bEnable = TRUE ); - BOOL IsCustomize() { return mbCustomize; } + void EnableCustomize( sal_Bool bEnable = sal_True ); + sal_Bool IsCustomize() { return mbCustomize; } void StartCustomize( const Rectangle& rRect, void* pData = NULL ); - void SetCustomizeMode( BOOL ); - BOOL IsInCustomizeMode() const { return mbCustomizeMode; } + void SetCustomizeMode( sal_Bool ); + sal_Bool IsInCustomizeMode() const { return mbCustomizeMode; } static void StartCustomizeMode(); static void EndCustomizeMode(); - static BOOL IsCustomizeMode(); + static sal_Bool IsCustomizeMode(); void SetHelpText( const XubString& rText ) { DockingWindow::SetHelpText( rText ); } const XubString& GetHelpText() const { return DockingWindow::GetHelpText(); } - void SetHelpId( ULONG nId ) - { DockingWindow::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { DockingWindow::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return DockingWindow::GetHelpId(); } void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } @@ -595,9 +595,9 @@ public: // the private toolbox items will only use item ids starting from TOOLBOX_MENUITEM_START // to allow for customization of the menu the coresponding handler is called // when the menu button was clicked and before the menu is executed - void SetMenuType( USHORT aType = TOOLBOX_MENUTYPE_CUSTOMIZE ); - USHORT GetMenuType() const; - BOOL IsMenuEnabled() const; + void SetMenuType( sal_uInt16 aType = TOOLBOX_MENUTYPE_CUSTOMIZE ); + sal_uInt16 GetMenuType() const; + sal_Bool IsMenuEnabled() const; PopupMenu* GetMenu() const; void SetMenuButtonHdl( const Link& rLink ); const Link& GetMenuButtonHdl() const; @@ -608,11 +608,11 @@ public: // allow Click Handler to detect special key bool IsShift() const { return mbIsShift; } // allow Click Handler to distinguish between mouse and key input - BOOL IsKeyEvent() const { return mbIsKeyEvent; } + sal_Bool IsKeyEvent() const { return mbIsKeyEvent; } // allows framework to set/query the planned popupmode - BOOL WillUsePopupMode() const; - void WillUsePopupMode( BOOL b); + sal_Bool WillUsePopupMode() const; + void WillUsePopupMode( sal_Bool b); // accessibility helpers @@ -621,30 +621,30 @@ public: // returns the bounding box for the character at index nIndex // where nIndex is relative to the starting index of the item // with id nItemId (in coordinates of the displaying window) - Rectangle GetCharacterBounds( USHORT nItemId, long nIndex ) const; + Rectangle GetCharacterBounds( sal_uInt16 nItemId, long nIndex ) const; // -1 is returned if no character is at that point // if an index is found the corresponding item id is filled in (else 0) - long GetIndexForPoint( const Point& rPoint, USHORT& rItemID ) const; + long GetIndexForPoint( const Point& rPoint, sal_uInt16& rItemID ) const; // returns the number of portions in the result of GetDisplayText() long GetTextCount() const; // returns the interval [start,end] of text portion nText // returns [-1,-1] for an invalid text number Pair GetTextStartEnd( long nText ) const; // returns the item id for text portion nText or 0 if nText is invalid - USHORT GetDisplayItemId( long nText ) const; + sal_uInt16 GetDisplayItemId( long nText ) const; const Size& GetDefaultImageSize() const; - void ChangeHighlight( USHORT nPos ); + void ChangeHighlight( sal_uInt16 nPos ); void SetImageListProvider(vcl::IImageListProvider* _pProvider); }; -inline void ToolBox::CheckItem( USHORT nItemId, BOOL bCheck ) +inline void ToolBox::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) { SetItemState( nItemId, (bCheck) ? STATE_CHECK : STATE_NOCHECK ); } -inline BOOL ToolBox::IsItemChecked( USHORT nItemId ) const +inline sal_Bool ToolBox::IsItemChecked( sal_uInt16 nItemId ) const { return (GetItemState( nItemId ) == STATE_CHECK); } @@ -666,12 +666,12 @@ inline void ToolBox::SetDockingRects( const Rectangle& rOutRect, maInDockRect = rInRect; } -inline void ToolBox::SetFloatingLines( USHORT nNewLines ) +inline void ToolBox::SetFloatingLines( sal_uInt16 nNewLines ) { mnFloatLines = nNewLines; } -inline USHORT ToolBox::GetFloatingLines() const +inline sal_uInt16 ToolBox::GetFloatingLines() const { return mnFloatLines; } diff --git a/vcl/inc/vcl/vclenum.hxx b/vcl/inc/vcl/vclenum.hxx index 492f2293afaf..80b84b2fb0f2 100644 --- a/vcl/inc/vcl/vclenum.hxx +++ b/vcl/inc/vcl/vclenum.hxx @@ -240,7 +240,7 @@ enum FontStrikeout { STRIKEOUT_NONE, STRIKEOUT_SINGLE, STRIKEOUT_DOUBLE, #ifndef ENUM_FONTEMPHASISMARK_DECLARED #define ENUM_FONTEMPHASISMARK_DECLARED -typedef USHORT FontEmphasisMark; +typedef sal_uInt16 FontEmphasisMark; #define EMPHASISMARK_NONE ((FontEmphasisMark)0x0000) #define EMPHASISMARK_DOT ((FontEmphasisMark)0x0001) #define EMPHASISMARK_CIRCLE ((FontEmphasisMark)0x0002) diff --git a/vcl/inc/vcl/vclevent.hxx b/vcl/inc/vcl/vclevent.hxx index d4801fa9ed0a..c7347f7cd978 100644 --- a/vcl/inc/vcl/vclevent.hxx +++ b/vcl/inc/vcl/vclevent.hxx @@ -187,7 +187,7 @@ namespace com { namespace sun { namespace star { #define VCLEVENT_WINDOW_STARTDOCKING 1217 // pData = DockingData #define VCLEVENT_WINDOW_DOCKING 1218 #define VCLEVENT_WINDOW_ENDDOCKING 1219 // pData = EndDockingData -#define VCLEVENT_WINDOW_PREPARETOGGLEFLOATING 1220 // pData = BOOL +#define VCLEVENT_WINDOW_PREPARETOGGLEFLOATING 1220 // pData = sal_Bool #define VCLEVENT_WINDOW_TOGGLEFLOATING 1221 #define VCLEVENT_WINDOW_ENDPOPUPMODE 1222 // pData = EndPopupModeData @@ -198,13 +198,13 @@ namespace com { namespace sun { namespace star { class VCL_DLLPUBLIC VclSimpleEvent { private: - ULONG nId; + sal_uLong nId; public: - VclSimpleEvent( ULONG n ) { nId = n; } + VclSimpleEvent( sal_uLong n ) { nId = n; } TYPEINFO(); - ULONG GetId() const { return nId; } + sal_uLong GetId() const { return nId; } }; class VCL_DLLPUBLIC VclWindowEvent : public VclSimpleEvent @@ -214,7 +214,7 @@ private: void* pData; public: - VclWindowEvent( Window* pWin, ULONG n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } + VclWindowEvent( Window* pWin, sal_uLong n, void* pDat = NULL ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } TYPEINFO(); Window* GetWindow() const { return pWindow; } @@ -228,7 +228,7 @@ private: MouseEvent aEvent; public: - VclMouseEvent( Window* pWin, ULONG n, const MouseEvent& rEvent ) : VclWindowEvent( pWin, n ), aEvent(rEvent) { ; } + VclMouseEvent( Window* pWin, sal_uLong n, const MouseEvent& rEvent ) : VclWindowEvent( pWin, n ), aEvent(rEvent) { ; } TYPEINFO(); const MouseEvent& GetEvent() const { return aEvent; } @@ -239,20 +239,20 @@ class VCL_DLLPUBLIC VclMenuEvent : public VclSimpleEvent { private: Menu* pMenu; - USHORT mnPos; + sal_uInt16 mnPos; public: - VclMenuEvent( Menu* pM, ULONG n, USHORT nPos ) : VclSimpleEvent(n) { pMenu = pM; mnPos = nPos; } + VclMenuEvent( Menu* pM, sal_uLong n, sal_uInt16 nPos ) : VclSimpleEvent(n) { pMenu = pM; mnPos = nPos; } TYPEINFO(); Menu* GetMenu() const { return pMenu; } - USHORT GetItemPos() const { return mnPos; } + sal_uInt16 GetItemPos() const { return mnPos; } }; class VCL_DLLPUBLIC VclAccessibleEvent: public VclSimpleEvent { public: - VclAccessibleEvent( ULONG n, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible ); + VclAccessibleEvent( sal_uLong n, const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& rxAccessible ); virtual ~VclAccessibleEvent(); ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible() const; @@ -266,9 +266,9 @@ public: void Call( VclSimpleEvent* pEvent ) const; // stops notifying when any handler has processed the event - // and returns TRUE in that case - // a handler must return TRUE to signal that it has processed the event - BOOL Process( VclSimpleEvent* pEvent ) const; + // and returns sal_True in that case + // a handler must return sal_True to signal that it has processed the event + sal_Bool Process( VclSimpleEvent* pEvent ) const; void addListener( const Link& rListener ); void removeListener( const Link& rListener ); private: diff --git a/vcl/inc/vcl/virdev.hxx b/vcl/inc/vcl/virdev.hxx index f3e52813c486..79b8233cf964 100644 --- a/vcl/inc/vcl/virdev.hxx +++ b/vcl/inc/vcl/virdev.hxx @@ -50,13 +50,13 @@ private: SalVirtualDevice* mpVirDev; VirtualDevice* mpPrev; VirtualDevice* mpNext; - USHORT mnBitCount; - BOOL mbScreenComp; + sal_uInt16 mnBitCount; + sal_Bool mbScreenComp; sal_Int8 mnAlphaDepth; - BYTE meRefDevMode; + sal_uInt8 meRefDevMode; - SAL_DLLPRIVATE void ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, USHORT nBitCount, const SystemGraphicsData *pData = NULL ); - SAL_DLLPRIVATE BOOL ImplSetOutputSizePixel( const Size& rNewSize, BOOL bErase ); + SAL_DLLPRIVATE void ImplInitVirDev( const OutputDevice* pOutDev, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData = NULL ); + SAL_DLLPRIVATE sal_Bool ImplSetOutputSizePixel( const Size& rNewSize, sal_Bool bErase ); // Copy assignment is forbidden and not implemented. VirtualDevice (const VirtualDevice &); @@ -73,9 +73,9 @@ private: SAL_DLLPRIVATE bool ForceZeroExtleadBug() const { return ((meRefDevMode & REFDEV_FORCE_ZERO_EXTLEAD) != 0); } public: - VirtualDevice( USHORT nBitCount = 0 ); + VirtualDevice( sal_uInt16 nBitCount = 0 ); VirtualDevice( const OutputDevice& rCompDev, - USHORT nBitCount = 0 ); + sal_uInt16 nBitCount = 0 ); /** Create a virtual device with alpha channel @param rCompDev @@ -93,18 +93,18 @@ public: are allowed here, with 1 denoting binary mask. */ VirtualDevice( const OutputDevice& rCompDev, - USHORT nBitCount, USHORT nAlphaBitCount ); + sal_uInt16 nBitCount, sal_uInt16 nAlphaBitCount ); /** Create a virtual device using an existing system dependent device or graphics context Any rendering will happen directly on the context and not on any intermediate bitmap. Note: This might not be suported on all platforms ! */ - VirtualDevice( const SystemGraphicsData *pData, USHORT nBitCount ); + VirtualDevice( const SystemGraphicsData *pData, sal_uInt16 nBitCount ); virtual ~VirtualDevice(); - BOOL SetOutputSizePixel( const Size& rNewSize, BOOL bErase = TRUE ); - BOOL SetOutputSize( const Size& rNewSize, BOOL bErase = TRUE ) + sal_Bool SetOutputSizePixel( const Size& rNewSize, sal_Bool bErase = sal_True ); + sal_Bool SetOutputSize( const Size& rNewSize, sal_Bool bErase = sal_True ) { return SetOutputSizePixel( LogicToPixel( rNewSize ), bErase ); } // reference device modes for different compatibility levels diff --git a/vcl/inc/vcl/wall.hxx b/vcl/inc/vcl/wall.hxx index 0011501392be..66a2a11038ed 100644 --- a/vcl/inc/vcl/wall.hxx +++ b/vcl/inc/vcl/wall.hxx @@ -90,7 +90,7 @@ class VCL_DLLPUBLIC Wallpaper private: ImplWallpaper* mpImplWallpaper; - SAL_DLLPRIVATE void ImplMakeUnique( BOOL bReleaseCache = TRUE ); + SAL_DLLPRIVATE void ImplMakeUnique( sal_Bool bReleaseCache = sal_True ); SAL_DLLPRIVATE Gradient ImplGetApplicationGradient() const; public: @@ -114,26 +114,26 @@ public: void SetBitmap( const BitmapEx& rBitmap ); void SetBitmap(); BitmapEx GetBitmap() const; - BOOL IsBitmap() const; + sal_Bool IsBitmap() const; void SetGradient( const Gradient& rGradient ); void SetGradient(); Gradient GetGradient() const; - BOOL IsGradient() const; + sal_Bool IsGradient() const; void SetRect( const Rectangle& rRect ); void SetRect(); Rectangle GetRect() const; - BOOL IsRect() const; + sal_Bool IsRect() const; - BOOL IsFixed() const; - BOOL IsScrollable() const; + sal_Bool IsFixed() const; + sal_Bool IsScrollable() const; Wallpaper& operator=( const Wallpaper& rWallpaper ); - BOOL operator==( const Wallpaper& rWallpaper ) const; - BOOL operator!=( const Wallpaper& rWallpaper ) const + sal_Bool operator==( const Wallpaper& rWallpaper ) const; + sal_Bool operator!=( const Wallpaper& rWallpaper ) const { return !(Wallpaper::operator==( rWallpaper )); } - BOOL IsSameInstance( const Wallpaper& rWallpaper ) const + sal_Bool IsSameInstance( const Wallpaper& rWallpaper ) const { return (mpImplWallpaper == rWallpaper.mpImplWallpaper); } friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Wallpaper& rWallpaper ); diff --git a/vcl/inc/vcl/wall2.hxx b/vcl/inc/vcl/wall2.hxx index 311ad3b9cf1c..162614262095 100644 --- a/vcl/inc/vcl/wall2.hxx +++ b/vcl/inc/vcl/wall2.hxx @@ -41,7 +41,7 @@ private: Gradient* mpGradient; Rectangle* mpRect; WallpaperStyle meStyle; - ULONG mnRefCount; + sal_uLong mnRefCount; BitmapEx* mpCache; friend SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper ); diff --git a/vcl/inc/vcl/windata.hxx b/vcl/inc/vcl/windata.hxx deleted file mode 100644 index bd8815b83f77..000000000000 --- a/vcl/inc/vcl/windata.hxx +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SV_WINDATA_HXX -#define _SV_WINDATA_HXX - -#include <vcl/sv.h> - -class SalFrame; -class Window; - -// -------------- -// - Prototypes - -// -------------- - -long ImplWindowFrameProc( Window* pInst, SalFrame* pFrame, USHORT nEvent, const void* pEvent ); - -// ----------- -// - HitTest - -// ----------- - -#define WINDOW_HITTEST_INSIDE ((USHORT)0x0001) -#define WINDOW_HITTEST_TRANSPARENT ((USHORT)0x0002) - -#endif // _SV_WINDATA_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h index d52616a1c183..12f6eedc2906 100644 --- a/vcl/inc/vcl/window.h +++ b/vcl/inc/vcl/window.h @@ -39,7 +39,7 @@ #ifndef _SV_POINTR_HXX #include <vcl/pointr.hxx> #endif -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <vcl/vclevent.hxx> #include <com/sun/star/uno/Reference.hxx> #include <cppuhelper/weakref.hxx> @@ -57,7 +57,6 @@ class VirtualDevice; class Cursor; class ImplDevFontList; class ImplFontCache; -class SmartId; class VCLXWindow; class SalFrame; class SalObject; @@ -100,10 +99,24 @@ namespace dnd { class XDropTarget; } } } } } -namespace vcl { struct ControlLayoutData; } +namespace vcl { + struct ControlLayoutData; + struct ExtWindowImpl; +} + +// -------------- +// - Prototypes - +// -------------- +long ImplWindowFrameProc( Window* pInst, SalFrame* pFrame, sal_uInt16 nEvent, const void* pEvent ); +// ----------- +// - HitTest - +// ----------- + +#define WINDOW_HITTEST_INSIDE ((sal_uInt16)0x0001) +#define WINDOW_HITTEST_TRANSPARENT ((sal_uInt16)0x0002) // --------------- // - ImplWinData - @@ -112,17 +125,15 @@ namespace vcl { struct ControlLayoutData; } struct ImplWinData { UniString* mpExtOldText; - USHORT* mpExtOldAttrAry; + sal_uInt16* mpExtOldAttrAry; Rectangle* mpCursorRect; long mnCursorExtWidth; Rectangle* mpFocusRect; Rectangle* mpTrackRect; - USHORT mnTrackFlags; - USHORT mnIsTopWindow; - BOOL mbMouseOver; // tracks mouse over for native widget paint effect - BOOL mbEnableNativeWidget; // toggle native widget rendering - SmartId* mpSmartHelpId; - SmartId* mpSmartUniqueId; + sal_uInt16 mnTrackFlags; + sal_uInt16 mnIsTopWindow; + sal_Bool mbMouseOver; // tracks mouse over for native widget paint effect + sal_Bool mbEnableNativeWidget; // toggle native widget rendering ::std::list< Window* > maTopWindowChildren; }; @@ -136,9 +147,9 @@ struct ImplOverlapData VirtualDevice* mpSaveBackDev; // Gesicherte Hintergrund-Bitmap Region* mpSaveBackRgn; // Gesicherte Region, was invalidiert werden muss Window* mpNextBackWin; // Naechstes Fenster mit Hintergrund-Sicherung - ULONG mnSaveBackSize; // Groesse Bitmap fuer Hintergrund-Sicherung - BOOL mbSaveBack; // TRUE: Background sichern - BYTE mnTopLevel; // Level for Overlap-Window + sal_uIntPtr mnSaveBackSize; // Groesse Bitmap fuer Hintergrund-Sicherung + sal_Bool mbSaveBack; // sal_True: Background sichern + sal_uInt8 mnTopLevel; // Level for Overlap-Window }; // ----------------- @@ -162,9 +173,9 @@ struct ImplFrameData sal_Int32 mnDPIX; // Original Screen Resolution sal_Int32 mnDPIY; // Original Screen Resolution ImplMapRes maMapUnitRes; // for LogicUnitToPixel - ULONG mnAllSaveBackSize; // Groesse aller Bitmaps fuer Hintergrund-Sicherung - ULONG mnFocusId; // FocusId for PostUserLink - ULONG mnMouseMoveId; // MoveId for PostUserLink + sal_uIntPtr mnAllSaveBackSize; // Groesse aller Bitmaps fuer Hintergrund-Sicherung + sal_uIntPtr mnFocusId; // FocusId for PostUserLink + sal_uIntPtr mnMouseMoveId; // MoveId for PostUserLink long mnLastMouseX; // last x mouse position long mnLastMouseY; // last y mouse position long mnBeforeLastMouseX; // last but one x mouse position @@ -173,23 +184,23 @@ struct ImplFrameData long mnFirstMouseY; // first y mouse position by mousebuttondown long mnLastMouseWinX; // last x mouse position, rel. to pMouseMoveWin long mnLastMouseWinY; // last y mouse position, rel. to pMouseMoveWin - USHORT mnModalMode; // frame based modal count (app based makes no sense anymore) - ULONG mnMouseDownTime; // mouse button down time for double click - USHORT mnClickCount; // mouse click count - USHORT mnFirstMouseCode; // mouse code by mousebuttondown - USHORT mnMouseCode; // mouse code - USHORT mnMouseMode; // mouse mode + sal_uInt16 mnModalMode; // frame based modal count (app based makes no sense anymore) + sal_uIntPtr mnMouseDownTime; // mouse button down time for double click + sal_uInt16 mnClickCount; // mouse click count + sal_uInt16 mnFirstMouseCode; // mouse code by mousebuttondown + sal_uInt16 mnMouseCode; // mouse code + sal_uInt16 mnMouseMode; // mouse mode MapUnit meMapUnit; // last MapUnit for LogicUnitToPixel - BOOL mbHasFocus; // focus - BOOL mbInMouseMove; // is MouseMove on stack - BOOL mbMouseIn; // is Mouse inside the frame - BOOL mbStartDragCalled; // is command startdrag called - BOOL mbNeedSysWindow; // set, when FrameSize <= IMPL_MIN_NEEDSYSWIN - BOOL mbMinimized; // set, when FrameSize <= 0 - BOOL mbStartFocusState; // FocusState, beim abschicken des Events - BOOL mbInSysObjFocusHdl; // Innerhalb vom GetFocus-Handler eines SysChilds - BOOL mbInSysObjToTopHdl; // Innerhalb vom ToTop-Handler eines SysChilds - BOOL mbSysObjFocus; // Hat ein SysChild den Focus + sal_Bool mbHasFocus; // focus + sal_Bool mbInMouseMove; // is MouseMove on stack + sal_Bool mbMouseIn; // is Mouse inside the frame + sal_Bool mbStartDragCalled; // is command startdrag called + sal_Bool mbNeedSysWindow; // set, when FrameSize <= IMPL_MIN_NEEDSYSWIN + sal_Bool mbMinimized; // set, when FrameSize <= 0 + sal_Bool mbStartFocusState; // FocusState, beim abschicken des Events + sal_Bool mbInSysObjFocusHdl; // Innerhalb vom GetFocus-Handler eines SysChilds + sal_Bool mbInSysObjToTopHdl; // Innerhalb vom ToTop-Handler eines SysChilds + sal_Bool mbSysObjFocus; // Hat ein SysChild den Focus ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource > mxDragSource; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > mxDropTarget; @@ -197,9 +208,27 @@ struct ImplFrameData ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxClipboard; ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::clipboard::XClipboard > mxSelection; - BOOL mbInternalDragGestureRecognizer; + sal_Bool mbInternalDragGestureRecognizer; +}; + +// ----------------------- +// - ImplAccessibleInfos - +// ----------------------- + +struct ImplAccessibleInfos +{ + sal_uInt16 nAccessibleRole; + String* pAccessibleName; + String* pAccessibleDescription; + Window* pLabeledByWindow; + Window* pLabelForWindow; + Window* pMemberOfWindow; + + ImplAccessibleInfos(); + ~ImplAccessibleInfos(); }; + // --------------- // - WindowImpl - // --------------- @@ -240,6 +269,7 @@ public: ImplDelData* mpFirstDel; void* mpUserData; + vcl::ExtWindowImpl* mpExtImpl; Cursor* mpCursor; Pointer maPointer; Fraction maZoom; @@ -255,8 +285,8 @@ public: long mnY; long mnAbsScreenX; Point maPos; - ULONG mnHelpId; - ULONG mnUniqId; + rtl::OString maHelpId; + rtl::OString maUniqId; XubString maHelpText; XubString maQuickHelpText; InputContext maInputContext; @@ -275,15 +305,15 @@ public: WinBits mnPrevExtendedStyle; WindowType mnType; ControlPart mnNativeBackground; - USHORT mnWaitCount; - USHORT mnPaintFlags; - USHORT mnGetFocusFlags; - USHORT mnParentClipMode; - USHORT mnActivateMode; - USHORT mnDlgCtrlFlags; - USHORT mnLockCount; + sal_uInt16 mnWaitCount; + sal_uInt16 mnPaintFlags; + sal_uInt16 mnGetFocusFlags; + sal_uInt16 mnParentClipMode; + sal_uInt16 mnActivateMode; + sal_uInt16 mnDlgCtrlFlags; + sal_uInt16 mnLockCount; AlwaysInputMode meAlwaysInputMode; - BOOL mbFrame:1, + sal_Bool mbFrame:1, mbBorderWin:1, mbOverlapWin:1, mbSysWin:1, @@ -356,7 +386,8 @@ public: mbDisableAccessibleLabelForRelation:1, mbDisableAccessibleLabeledByRelation:1, mbHelpTextDynamic:1, - mbFakeFocusSet:1; + mbFakeFocusSet:1, + mbInterceptChildWindowKeyDown:1; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer; }; @@ -365,9 +396,9 @@ public: // - Hilfsmethoden - // ----------------- -long ImplHandleMouseEvent( Window* pWindow, USHORT nSVEvent, BOOL bMouseLeave, - long nX, long nY, ULONG nMsgTime, - USHORT nCode, USHORT nMode ); +long ImplHandleMouseEvent( Window* pWindow, sal_uInt16 nSVEvent, sal_Bool bMouseLeave, + long nX, long nY, sal_uIntPtr nMsgTime, + sal_uInt16 nCode, sal_uInt16 nMode ); void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight ); #endif // _SV_WINDOW_H diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 172e099a236d..df82b7870854 100644..100755 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -34,7 +34,7 @@ #include <vcl/outdev.hxx> #include <tools/resid.hxx> #include <vcl/pointr.hxx> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <vcl/apptypes.hxx> #include <vcl/inputctx.hxx> #include <vcl/vclevent.hxx> @@ -45,7 +45,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/weakref.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <vcl/smartid.hxx> +#include <boost/shared_ptr.hpp> class VirtualDevice; struct ImplDelData; @@ -90,6 +90,13 @@ namespace accessibility { namespace com { namespace sun { namespace star { +namespace beans { + struct PropertyValue; +}}}} + +namespace com { +namespace sun { +namespace star { namespace rendering { class XCanvas; class XSpriteCanvas; @@ -117,7 +124,11 @@ namespace dnd { class XDropTarget; } } } } } -namespace vcl { struct ControlLayoutData; } +namespace vcl { + struct ControlLayoutData; + class WindowArranger; + struct ExtWindowImpl; +} namespace svt { class PopupWindowControllerImpl; } @@ -126,113 +137,113 @@ namespace svt { class PopupWindowControllerImpl; } // --------------- // Type fuer GetWindow() -#define WINDOW_PARENT ((USHORT)0) -#define WINDOW_FIRSTCHILD ((USHORT)1) -#define WINDOW_LASTCHILD ((USHORT)2) -#define WINDOW_PREV ((USHORT)3) -#define WINDOW_NEXT ((USHORT)4) -#define WINDOW_FIRSTOVERLAP ((USHORT)5) -#define WINDOW_LASTOVERLAP ((USHORT)6) -#define WINDOW_OVERLAP ((USHORT)7) -#define WINDOW_PARENTOVERLAP ((USHORT)8) -#define WINDOW_CLIENT ((USHORT)9) -#define WINDOW_REALPARENT ((USHORT)10) -#define WINDOW_FRAME ((USHORT)11) -#define WINDOW_BORDER ((USHORT)12) -#define WINDOW_FIRSTTOPWINDOWCHILD ((USHORT)13) -#define WINDOW_LASTTOPWINDOWCHILD ((USHORT)14) -#define WINDOW_PREVTOPWINDOWSIBLING ((USHORT)15) -#define WINDOW_NEXTTOPWINDOWSIBLING ((USHORT)16) +#define WINDOW_PARENT ((sal_uInt16)0) +#define WINDOW_FIRSTCHILD ((sal_uInt16)1) +#define WINDOW_LASTCHILD ((sal_uInt16)2) +#define WINDOW_PREV ((sal_uInt16)3) +#define WINDOW_NEXT ((sal_uInt16)4) +#define WINDOW_FIRSTOVERLAP ((sal_uInt16)5) +#define WINDOW_LASTOVERLAP ((sal_uInt16)6) +#define WINDOW_OVERLAP ((sal_uInt16)7) +#define WINDOW_PARENTOVERLAP ((sal_uInt16)8) +#define WINDOW_CLIENT ((sal_uInt16)9) +#define WINDOW_REALPARENT ((sal_uInt16)10) +#define WINDOW_FRAME ((sal_uInt16)11) +#define WINDOW_BORDER ((sal_uInt16)12) +#define WINDOW_FIRSTTOPWINDOWCHILD ((sal_uInt16)13) +#define WINDOW_LASTTOPWINDOWCHILD ((sal_uInt16)14) +#define WINDOW_PREVTOPWINDOWSIBLING ((sal_uInt16)15) +#define WINDOW_NEXTTOPWINDOWSIBLING ((sal_uInt16)16) // Flags for SetPosSizePixel() -#define WINDOW_POSSIZE_X ((USHORT)0x0001) -#define WINDOW_POSSIZE_Y ((USHORT)0x0002) -#define WINDOW_POSSIZE_WIDTH ((USHORT)0x0004) -#define WINDOW_POSSIZE_HEIGHT ((USHORT)0x0008) +#define WINDOW_POSSIZE_X ((sal_uInt16)0x0001) +#define WINDOW_POSSIZE_Y ((sal_uInt16)0x0002) +#define WINDOW_POSSIZE_WIDTH ((sal_uInt16)0x0004) +#define WINDOW_POSSIZE_HEIGHT ((sal_uInt16)0x0008) #define WINDOW_POSSIZE_POS (WINDOW_POSSIZE_X | WINDOW_POSSIZE_Y) #define WINDOW_POSSIZE_SIZE (WINDOW_POSSIZE_WIDTH | WINDOW_POSSIZE_HEIGHT) #define WINDOW_POSSIZE_POSSIZE (WINDOW_POSSIZE_POS | WINDOW_POSSIZE_SIZE) #define WINDOW_POSSIZE_ALL (WINDOW_POSSIZE_POSSIZE) -#define WINDOW_POSSIZE_DROPDOWN ((USHORT)0x0010) +#define WINDOW_POSSIZE_DROPDOWN ((sal_uInt16)0x0010) // Flags for Show() -#define SHOW_NOPARENTUPDATE ((USHORT)0x0001) -#define SHOW_NOFOCUSCHANGE ((USHORT)0x0002) -#define SHOW_NOACTIVATE ((USHORT)0x0004) -#define SHOW_FOREGROUNDTASK ((USHORT)0x0008) +#define SHOW_NOPARENTUPDATE ((sal_uInt16)0x0001) +#define SHOW_NOFOCUSCHANGE ((sal_uInt16)0x0002) +#define SHOW_NOACTIVATE ((sal_uInt16)0x0004) +#define SHOW_FOREGROUNDTASK ((sal_uInt16)0x0008) // Flags for SetZOrder() -#define WINDOW_ZORDER_BEFOR ((USHORT)0x0001) -#define WINDOW_ZORDER_BEHIND ((USHORT)0x0002) -#define WINDOW_ZORDER_FIRST ((USHORT)0x0004) -#define WINDOW_ZORDER_LAST ((USHORT)0x0008) +#define WINDOW_ZORDER_BEFOR ((sal_uInt16)0x0001) +#define WINDOW_ZORDER_BEHIND ((sal_uInt16)0x0002) +#define WINDOW_ZORDER_FIRST ((sal_uInt16)0x0004) +#define WINDOW_ZORDER_LAST ((sal_uInt16)0x0008) // Activate-Flags -#define ACTIVATE_MODE_GRABFOCUS ((USHORT)0x0001) +#define ACTIVATE_MODE_GRABFOCUS ((sal_uInt16)0x0001) // ToTop-Flags -#define TOTOP_RESTOREWHENMIN ((USHORT)0x0001) -#define TOTOP_FOREGROUNDTASK ((USHORT)0x0002) -#define TOTOP_NOGRABFOCUS ((USHORT)0x0004) -#define TOTOP_GRABFOCUSONLY ((USHORT)0x0008) +#define TOTOP_RESTOREWHENMIN ((sal_uInt16)0x0001) +#define TOTOP_FOREGROUNDTASK ((sal_uInt16)0x0002) +#define TOTOP_NOGRABFOCUS ((sal_uInt16)0x0004) +#define TOTOP_GRABFOCUSONLY ((sal_uInt16)0x0008) // Flags for Invalidate -#define INVALIDATE_CHILDREN ((USHORT)0x0001) -#define INVALIDATE_NOCHILDREN ((USHORT)0x0002) -#define INVALIDATE_NOERASE ((USHORT)0x0004) -#define INVALIDATE_UPDATE ((USHORT)0x0008) -#define INVALIDATE_TRANSPARENT ((USHORT)0x0010) -#define INVALIDATE_NOTRANSPARENT ((USHORT)0x0020) -#define INVALIDATE_NOCLIPCHILDREN ((USHORT)0x4000) +#define INVALIDATE_CHILDREN ((sal_uInt16)0x0001) +#define INVALIDATE_NOCHILDREN ((sal_uInt16)0x0002) +#define INVALIDATE_NOERASE ((sal_uInt16)0x0004) +#define INVALIDATE_UPDATE ((sal_uInt16)0x0008) +#define INVALIDATE_TRANSPARENT ((sal_uInt16)0x0010) +#define INVALIDATE_NOTRANSPARENT ((sal_uInt16)0x0020) +#define INVALIDATE_NOCLIPCHILDREN ((sal_uInt16)0x4000) // Temporaer fuer Kompatibilitaet #define INVALIDATE_BACKGROUND INVALIDATE_TRANSPARENT // Flags for Validate -#define VALIDATE_CHILDREN ((USHORT)0x0001) -#define VALIDATE_NOCHILDREN ((USHORT)0x0002) +#define VALIDATE_CHILDREN ((sal_uInt16)0x0001) +#define VALIDATE_NOCHILDREN ((sal_uInt16)0x0002) // Flags for Scroll -#define SCROLL_CLIP ((USHORT)0x0001) -#define SCROLL_CHILDREN ((USHORT)0x0002) -#define SCROLL_NOCHILDREN ((USHORT)0x0004) -#define SCROLL_NOERASE ((USHORT)0x0008) -#define SCROLL_NOINVALIDATE ((USHORT)0x0010) -#define SCROLL_NOWINDOWINVALIDATE ((USHORT)0x0020) -#define SCROLL_USECLIPREGION ((USHORT)0x0040) -#define SCROLL_UPDATE ((USHORT)0x0080) +#define SCROLL_CLIP ((sal_uInt16)0x0001) +#define SCROLL_CHILDREN ((sal_uInt16)0x0002) +#define SCROLL_NOCHILDREN ((sal_uInt16)0x0004) +#define SCROLL_NOERASE ((sal_uInt16)0x0008) +#define SCROLL_NOINVALIDATE ((sal_uInt16)0x0010) +#define SCROLL_NOWINDOWINVALIDATE ((sal_uInt16)0x0020) +#define SCROLL_USECLIPREGION ((sal_uInt16)0x0040) +#define SCROLL_UPDATE ((sal_uInt16)0x0080) // Flags for ParentClipMode -#define PARENTCLIPMODE_CLIP ((USHORT)0x0001) -#define PARENTCLIPMODE_NOCLIP ((USHORT)0x0002) +#define PARENTCLIPMODE_CLIP ((sal_uInt16)0x0001) +#define PARENTCLIPMODE_NOCLIP ((sal_uInt16)0x0002) // Flags for Invert() -#define INVERT_HIGHLIGHT ((USHORT)0x0001) -#define INVERT_50 ((USHORT)0x0002) +#define INVERT_HIGHLIGHT ((sal_uInt16)0x0001) +#define INVERT_50 ((sal_uInt16)0x0002) // Flags for ShowTracking() -#define SHOWTRACK_SMALL ((USHORT)0x0001) -#define SHOWTRACK_BIG ((USHORT)0x0002) -#define SHOWTRACK_SPLIT ((USHORT)0x0003) -#define SHOWTRACK_OBJECT ((USHORT)0x0004) -#define SHOWTRACK_WINDOW ((USHORT)0x1000) -#define SHOWTRACK_CLIP ((USHORT)0x2000) -#define SHOWTRACK_STYLE ((USHORT)0x000F) +#define SHOWTRACK_SMALL ((sal_uInt16)0x0001) +#define SHOWTRACK_BIG ((sal_uInt16)0x0002) +#define SHOWTRACK_SPLIT ((sal_uInt16)0x0003) +#define SHOWTRACK_OBJECT ((sal_uInt16)0x0004) +#define SHOWTRACK_WINDOW ((sal_uInt16)0x1000) +#define SHOWTRACK_CLIP ((sal_uInt16)0x2000) +#define SHOWTRACK_STYLE ((sal_uInt16)0x000F) // Flags for StartTracking() -#define STARTTRACK_KEYINPUT ((USHORT)0x0001) -#define STARTTRACK_KEYMOD ((USHORT)0x0002) -#define STARTTRACK_NOKEYCANCEL ((USHORT)0x0004) -#define STARTTRACK_SCROLLREPEAT ((USHORT)0x0008) -#define STARTTRACK_BUTTONREPEAT ((USHORT)0x0010) -#define STARTTRACK_MOUSEBUTTONDOWN ((USHORT)0x0020) -#define STARTTRACK_FOCUSCANCEL ((USHORT)0x0040) +#define STARTTRACK_KEYINPUT ((sal_uInt16)0x0001) +#define STARTTRACK_KEYMOD ((sal_uInt16)0x0002) +#define STARTTRACK_NOKEYCANCEL ((sal_uInt16)0x0004) +#define STARTTRACK_SCROLLREPEAT ((sal_uInt16)0x0008) +#define STARTTRACK_BUTTONREPEAT ((sal_uInt16)0x0010) +#define STARTTRACK_MOUSEBUTTONDOWN ((sal_uInt16)0x0020) +#define STARTTRACK_FOCUSCANCEL ((sal_uInt16)0x0040) // Flags for StartAutoScroll() -#define AUTOSCROLL_VERT ((USHORT)0x0001) -#define AUTOSCROLL_HORZ ((USHORT)0x0002) +#define AUTOSCROLL_VERT ((sal_uInt16)0x0001) +#define AUTOSCROLL_HORZ ((sal_uInt16)0x0002) // Flags for StateChanged() -typedef USHORT StateChangedType; +typedef sal_uInt16 StateChangedType; #define STATE_CHANGE_INITSHOW ((StateChangedType)1) #define STATE_CHANGE_VISIBLE ((StateChangedType)2) #define STATE_CHANGE_UPDATEMODE ((StateChangedType)3) @@ -255,49 +266,49 @@ typedef USHORT StateChangedType; #define STATE_CHANGE_USER ((StateChangedType)10000) // GetFocusFlags -#define GETFOCUS_TAB ((USHORT)0x0001) -#define GETFOCUS_CURSOR ((USHORT)0x0002) -#define GETFOCUS_MNEMONIC ((USHORT)0x0004) -#define GETFOCUS_FORWARD ((USHORT)0x0010) -#define GETFOCUS_BACKWARD ((USHORT)0x0020) -#define GETFOCUS_AROUND ((USHORT)0x0040) -#define GETFOCUS_UNIQUEMNEMONIC ((USHORT)0x0100) -#define GETFOCUS_INIT ((USHORT)0x0200) -#define GETFOCUS_FLOATWIN_POPUPMODEEND_CANCEL ((USHORT)0x0400) +#define GETFOCUS_TAB ((sal_uInt16)0x0001) +#define GETFOCUS_CURSOR ((sal_uInt16)0x0002) +#define GETFOCUS_MNEMONIC ((sal_uInt16)0x0004) +#define GETFOCUS_FORWARD ((sal_uInt16)0x0010) +#define GETFOCUS_BACKWARD ((sal_uInt16)0x0020) +#define GETFOCUS_AROUND ((sal_uInt16)0x0040) +#define GETFOCUS_UNIQUEMNEMONIC ((sal_uInt16)0x0100) +#define GETFOCUS_INIT ((sal_uInt16)0x0200) +#define GETFOCUS_FLOATWIN_POPUPMODEEND_CANCEL ((sal_uInt16)0x0400) // Draw-Flags fuer Draw() -#define WINDOW_DRAW_MONO ((ULONG)0x00000001) -#define WINDOW_DRAW_NOBORDER ((ULONG)0x00000002) -#define WINDOW_DRAW_NOCONTROLS ((ULONG)0x00000004) -#define WINDOW_DRAW_NODISABLE ((ULONG)0x00000008) -#define WINDOW_DRAW_NOMNEMONIC ((ULONG)0x00000010) -#define WINDOW_DRAW_NOSELECTION ((ULONG)0x00000020) -#define WINDOW_DRAW_NOFOCUS ((ULONG)0x00000040) -#define WINDOW_DRAW_NOBACKGROUND ((ULONG)0x00000080) -#define WINDOW_DRAW_ROLLOVER ((ULONG)0x00000100) +#define WINDOW_DRAW_MONO ((sal_uLong)0x00000001) +#define WINDOW_DRAW_NOBORDER ((sal_uLong)0x00000002) +#define WINDOW_DRAW_NOCONTROLS ((sal_uLong)0x00000004) +#define WINDOW_DRAW_NODISABLE ((sal_uLong)0x00000008) +#define WINDOW_DRAW_NOMNEMONIC ((sal_uLong)0x00000010) +#define WINDOW_DRAW_NOSELECTION ((sal_uLong)0x00000020) +#define WINDOW_DRAW_NOFOCUS ((sal_uLong)0x00000040) +#define WINDOW_DRAW_NOBACKGROUND ((sal_uLong)0x00000080) +#define WINDOW_DRAW_ROLLOVER ((sal_uLong)0x00000100) // Border-Styles fuer SetBorder() -#define WINDOW_BORDER_NORMAL ((USHORT)0x0001) -#define WINDOW_BORDER_MONO ((USHORT)0x0002) -#define WINDOW_BORDER_ACTIVE ((USHORT)0x0004) -#define WINDOW_BORDER_DOUBLEOUT ((USHORT)0x0008) -#define WINDOW_BORDER_MENU ((USHORT)0x0010) -#define WINDOW_BORDER_NOBORDER ((USHORT)0x1000) -#define WINDOW_BORDER_REMOVEBORDER ((USHORT)0x2000) +#define WINDOW_BORDER_NORMAL ((sal_uInt16)0x0001) +#define WINDOW_BORDER_MONO ((sal_uInt16)0x0002) +#define WINDOW_BORDER_ACTIVE ((sal_uInt16)0x0004) +#define WINDOW_BORDER_DOUBLEOUT ((sal_uInt16)0x0008) +#define WINDOW_BORDER_MENU ((sal_uInt16)0x0010) +#define WINDOW_BORDER_NOBORDER ((sal_uInt16)0x1000) +#define WINDOW_BORDER_REMOVEBORDER ((sal_uInt16)0x2000) // DialogControl-Flags -#define WINDOW_DLGCTRL_RETURN ((USHORT)0x0001) -#define WINDOW_DLGCTRL_WANTFOCUS ((USHORT)0x0002) -#define WINDOW_DLGCTRL_MOD1TAB ((USHORT)0x0004) -#define WINDOW_DLGCTRL_FLOATWIN_POPUPMODEEND_CANCEL ((USHORT)0x0008) +#define WINDOW_DLGCTRL_RETURN ((sal_uInt16)0x0001) +#define WINDOW_DLGCTRL_WANTFOCUS ((sal_uInt16)0x0002) +#define WINDOW_DLGCTRL_MOD1TAB ((sal_uInt16)0x0004) +#define WINDOW_DLGCTRL_FLOATWIN_POPUPMODEEND_CANCEL ((sal_uInt16)0x0008) // GetWindowClipRegionPixel-Flags -#define WINDOW_GETCLIPREGION_NULL ((USHORT)0x0001) -#define WINDOW_GETCLIPREGION_NOCHILDREN ((USHORT)0x0002) +#define WINDOW_GETCLIPREGION_NULL ((sal_uInt16)0x0001) +#define WINDOW_GETCLIPREGION_NOCHILDREN ((sal_uInt16)0x0002) // EndExtTextInput-Flags -#define EXTTEXTINPUT_END_COMPLETE ((USHORT)0x0001) -#define EXTTEXTINPUT_END_CANCEL ((USHORT)0x0002) +#define EXTTEXTINPUT_END_COMPLETE ((sal_uInt16)0x0001) +#define EXTTEXTINPUT_END_CANCEL ((sal_uInt16)0x0002) #define IMPL_MINSIZE_BUTTON_WIDTH 70 #define IMPL_MINSIZE_BUTTON_HEIGHT 22 @@ -382,7 +393,7 @@ public: SAL_DLLPRIVATE void ImplWindowRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplSetFrameParent( const Window* pParent ); SAL_DLLPRIVATE void ImplInsertWindow( Window* pParent ); - SAL_DLLPRIVATE void ImplRemoveWindow( BOOL bRemoveFrameData ); + SAL_DLLPRIVATE void ImplRemoveWindow( sal_Bool bRemoveFrameData ); SAL_DLLPRIVATE Window* ImplGetWindow(); SAL_DLLPRIVATE ImplFrameData* ImplGetFrameData(); SAL_DLLPRIVATE SalFrame* ImplGetFrame() const; @@ -390,26 +401,26 @@ public: SAL_DLLPRIVATE SalGraphics* ImplGetFrameGraphics() const; SAL_DLLPRIVATE void ImplCallFocusChangeActivate( Window* pNewOverlapWindow, Window* pOldOverlapWindow ); SAL_DLLPRIVATE Window* ImplFindWindow( const Point& rFramePos ); - SAL_DLLPRIVATE USHORT ImplHitTest( const Point& rFramePos ); + SAL_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rFramePos ); SAL_DLLPRIVATE Window* ImplGetParent() const; SAL_DLLPRIVATE Window* ImplGetClientWindow() const; SAL_DLLPRIVATE Window* ImplGetBorderWindow() const; SAL_DLLPRIVATE Window* ImplGetFirstOverlapWindow(); SAL_DLLPRIVATE const Window* ImplGetFirstOverlapWindow() const; SAL_DLLPRIVATE Window* ImplGetFrameWindow() const; - SAL_DLLPRIVATE BOOL ImplIsRealParentPath( const Window* pWindow ) const; - SAL_DLLPRIVATE BOOL ImplIsChild( const Window* pWindow, BOOL bSystemWindow = FALSE ) const; - SAL_DLLPRIVATE BOOL ImplIsWindowOrChild( const Window* pWindow, BOOL bSystemWindow = FALSE ) const; + SAL_DLLPRIVATE sal_Bool ImplIsRealParentPath( const Window* pWindow ) const; + SAL_DLLPRIVATE sal_Bool ImplIsChild( const Window* pWindow, sal_Bool bSystemWindow = sal_False ) const; + SAL_DLLPRIVATE sal_Bool ImplIsWindowOrChild( const Window* pWindow, sal_Bool bSystemWindow = sal_False ) const; SAL_DLLPRIVATE Window* ImplGetSameParent( const Window* pWindow ) const; - SAL_DLLPRIVATE BOOL ImplIsDockingWindow() const; - SAL_DLLPRIVATE BOOL ImplIsFloatingWindow() const; - SAL_DLLPRIVATE BOOL ImplIsToolbox() const; - SAL_DLLPRIVATE BOOL ImplIsSplitter() const; - SAL_DLLPRIVATE BOOL ImplIsPushButton() const; - SAL_DLLPRIVATE BOOL ImplIsOverlapWindow() const; - SAL_DLLPRIVATE void ImplSetActive( BOOL bActive ); - SAL_DLLPRIVATE BOOL ImplIsMouseTransparent() const; - SAL_DLLPRIVATE void ImplSetMouseTransparent( BOOL bTransparent ); + SAL_DLLPRIVATE sal_Bool ImplIsDockingWindow() const; + SAL_DLLPRIVATE sal_Bool ImplIsFloatingWindow() const; + SAL_DLLPRIVATE sal_Bool ImplIsToolbox() const; + SAL_DLLPRIVATE sal_Bool ImplIsSplitter() const; + SAL_DLLPRIVATE sal_Bool ImplIsPushButton() const; + SAL_DLLPRIVATE sal_Bool ImplIsOverlapWindow() const; + SAL_DLLPRIVATE void ImplSetActive( sal_Bool bActive ); + SAL_DLLPRIVATE sal_Bool ImplIsMouseTransparent() const; + SAL_DLLPRIVATE void ImplSetMouseTransparent( sal_Bool bTransparent ); SAL_DLLPRIVATE int ImplTestMousePointerSet(); SAL_DLLPRIVATE PointerStyle ImplGetMousePointer() const; SAL_DLLPRIVATE void ImplResetReallyVisible(); @@ -424,20 +435,20 @@ public: SAL_DLLPRIVATE Point ImplFrameToOutput( const Point& rPos ); SAL_DLLPRIVATE void ImplOutputToFrame( Rectangle& rRect ); SAL_DLLPRIVATE void ImplFrameToOutput( Rectangle& rRect ); - SAL_DLLPRIVATE BOOL ImplSysObjClip( const Region* pOldRegion ); + SAL_DLLPRIVATE sal_Bool ImplSysObjClip( const Region* pOldRegion ); SAL_DLLPRIVATE void ImplUpdateSysObjChildsClip(); SAL_DLLPRIVATE void ImplUpdateSysObjOverlapsClip(); SAL_DLLPRIVATE void ImplUpdateSysObjClip(); - SAL_DLLPRIVATE BOOL ImplSetClipFlagChilds( BOOL bSysObjOnlySmaller = FALSE ); - SAL_DLLPRIVATE BOOL ImplSetClipFlagOverlapWindows( BOOL bSysObjOnlySmaller = FALSE ); - SAL_DLLPRIVATE BOOL ImplSetClipFlag( BOOL bSysObjOnlySmaller = FALSE ); + SAL_DLLPRIVATE sal_Bool ImplSetClipFlagChilds( sal_Bool bSysObjOnlySmaller = sal_False ); + SAL_DLLPRIVATE sal_Bool ImplSetClipFlagOverlapWindows( sal_Bool bSysObjOnlySmaller = sal_False ); + SAL_DLLPRIVATE sal_Bool ImplSetClipFlag( sal_Bool bSysObjOnlySmaller = sal_False ); SAL_DLLPRIVATE void ImplIntersectWindowClipRegion( Region& rRegion ); SAL_DLLPRIVATE void ImplIntersectWindowRegion( Region& rRegion ); SAL_DLLPRIVATE void ImplExcludeWindowRegion( Region& rRegion ); SAL_DLLPRIVATE void ImplExcludeOverlapWindows( Region& rRegion ); SAL_DLLPRIVATE void ImplExcludeOverlapWindows2( Region& rRegion ); - SAL_DLLPRIVATE void ImplClipBoundaries( Region& rRegion, BOOL bThis, BOOL bOverlaps ); - SAL_DLLPRIVATE BOOL ImplClipChilds( Region& rRegion ); + SAL_DLLPRIVATE void ImplClipBoundaries( Region& rRegion, sal_Bool bThis, sal_Bool bOverlaps ); + SAL_DLLPRIVATE sal_Bool ImplClipChilds( Region& rRegion ); SAL_DLLPRIVATE void ImplClipAllChilds( Region& rRegion ); SAL_DLLPRIVATE void ImplClipSiblings( Region& rRegion ); SAL_DLLPRIVATE void ImplInitWinClipRegion(); @@ -447,26 +458,30 @@ public: SAL_DLLPRIVATE void ImplIntersectAndUnionOverlapWindows2( const Region& rInterRegion, Region& rRegion ); SAL_DLLPRIVATE void ImplCalcOverlapRegionOverlaps( const Region& rInterRegion, Region& rRegion ); SAL_DLLPRIVATE void ImplCalcOverlapRegion( const Rectangle& rSourceRect, Region& rRegion, - BOOL bChilds, BOOL bParent, BOOL bSiblings ); - SAL_DLLPRIVATE void ImplCallPaint( const Region* pRegion, USHORT nPaintFlags ); + sal_Bool bChilds, sal_Bool bParent, sal_Bool bSiblings ); + SAL_DLLPRIVATE void ImplCallPaint( const Region* pRegion, sal_uInt16 nPaintFlags ); SAL_DLLPRIVATE void ImplCallOverlapPaint(); SAL_DLLPRIVATE void ImplPostPaint(); - SAL_DLLPRIVATE void ImplInvalidateFrameRegion( const Region* pRegion, USHORT nFlags ); + SAL_DLLPRIVATE void ImplInvalidateFrameRegion( const Region* pRegion, sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplInvalidateOverlapFrameRegion( const Region& rRegion ); SAL_DLLPRIVATE void ImplInvalidateParentFrameRegion( Region& rRegion ); - SAL_DLLPRIVATE void ImplInvalidate( const Region* rRegion, USHORT nFlags ); - SAL_DLLPRIVATE void ImplValidateFrameRegion( const Region* rRegion, USHORT nFlags ); - SAL_DLLPRIVATE void ImplValidate( const Region* rRegion, USHORT nFlags ); - SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, BOOL bChilds ); - SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, BOOL bChilds ); - SAL_DLLPRIVATE void ImplScroll( const Rectangle& rRect, long nHorzScroll, long nVertScroll, USHORT nFlags ); - SAL_DLLPRIVATE void ImplUpdateAll( BOOL bOverlapWindows = TRUE ); + SAL_DLLPRIVATE void ImplInvalidate( const Region* rRegion, sal_uInt16 nFlags ); + SAL_DLLPRIVATE void ImplValidateFrameRegion( const Region* rRegion, sal_uInt16 nFlags ); + SAL_DLLPRIVATE void ImplValidate( const Region* rRegion, sal_uInt16 nFlags ); + SAL_DLLPRIVATE void ImplMoveInvalidateRegion( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_Bool bChilds ); + SAL_DLLPRIVATE void ImplMoveAllInvalidateRegions( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_Bool bChilds ); + SAL_DLLPRIVATE void ImplScroll( const Rectangle& rRect, long nHorzScroll, long nVertScroll, sal_uInt16 nFlags ); + SAL_DLLPRIVATE void ImplUpdateAll( sal_Bool bOverlapWindows = sal_True ); SAL_DLLPRIVATE void ImplUpdateWindowPtr( Window* pWindow ); SAL_DLLPRIVATE void ImplUpdateWindowPtr(); - SAL_DLLPRIVATE void ImplUpdateOverlapWindowPtr( BOOL bNewFrame ); - SAL_DLLPRIVATE BOOL ImplUpdatePos(); + SAL_DLLPRIVATE void ImplUpdateOverlapWindowPtr( sal_Bool bNewFrame ); + SAL_DLLPRIVATE sal_Bool ImplUpdatePos(); SAL_DLLPRIVATE void ImplUpdateSysObjPos(); SAL_DLLPRIVATE WindowImpl* ImplGetWindowImpl() const { return mpWindowImpl; } + SAL_DLLPRIVATE void ImplFreeExtWindowImpl(); + // creates ExtWindowImpl on demand, but may return NULL (e.g. if mbInDtor) + SAL_DLLPRIVATE vcl::ExtWindowImpl* ImplGetExtWindowImpl() const; + SAL_DLLPRIVATE void ImplDeleteOwnedChildren(); /** check whether a font is suitable for UI The font to be tested will be checked whether it could display a @@ -481,34 +496,34 @@ public: <FALSE/> if the font is unsuitable as UI font */ SAL_DLLPRIVATE bool ImplCheckUIFont( const Font& rFont ); - SAL_DLLPRIVATE void ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl = TRUE ); + SAL_DLLPRIVATE void ImplUpdateGlobalSettings( AllSettings& rSettings, sal_Bool bCallHdl = sal_True ); SAL_DLLPRIVATE void ImplAlignChilds(); - SAL_DLLPRIVATE void ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, USHORT nFlags ); + SAL_DLLPRIVATE void ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplToBottomChild(); SAL_DLLPRIVATE void ImplCalcToTop( ImplCalcToTopData* pPrevData ); SAL_DLLPRIVATE void ImplCalcChildOverlapToTop( ImplCalcToTopData* pPrevData ); - SAL_DLLPRIVATE void ImplToTop( USHORT nFlags ); - SAL_DLLPRIVATE void ImplStartToTop( USHORT nFlags ); - SAL_DLLPRIVATE void ImplFocusToTop( USHORT nFlags, BOOL bReallyVisible ); + SAL_DLLPRIVATE void ImplToTop( sal_uInt16 nFlags ); + SAL_DLLPRIVATE void ImplStartToTop( sal_uInt16 nFlags ); + SAL_DLLPRIVATE void ImplFocusToTop( sal_uInt16 nFlags, sal_Bool bReallyVisible ); SAL_DLLPRIVATE void ImplShowAllOverlaps(); SAL_DLLPRIVATE void ImplHideAllOverlaps(); SAL_DLLPRIVATE void ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ); - SAL_DLLPRIVATE void ImplCallMouseMove( USHORT nMouseCode, BOOL bModChanged = FALSE ); + SAL_DLLPRIVATE void ImplCallMouseMove( sal_uInt16 nMouseCode, sal_Bool bModChanged = sal_False ); SAL_DLLPRIVATE void ImplGenerateMouseMove(); - SAL_DLLPRIVATE void ImplGrabFocus( USHORT nFlags ); + SAL_DLLPRIVATE void ImplGrabFocus( sal_uInt16 nFlags ); SAL_DLLPRIVATE void ImplInvertFocus( const Rectangle& rRect ); - SAL_DLLPRIVATE void ImplControlFocus( USHORT nFlags = 0 ); - SAL_DLLPRIVATE Window* ImplGetDlgWindow( USHORT n, USHORT nType, USHORT nStart = 0, USHORT nEnd = 0xFFFF, USHORT* pIndex = NULL ); - SAL_DLLPRIVATE BOOL ImplDlgCtrl( const KeyEvent& rKEvt, BOOL bKeyInput ); - SAL_DLLPRIVATE BOOL ImplHasDlgCtrl(); + SAL_DLLPRIVATE void ImplControlFocus( sal_uInt16 nFlags = 0 ); + SAL_DLLPRIVATE Window* ImplGetDlgWindow( sal_uInt16 n, sal_uInt16 nType, sal_uInt16 nStart = 0, sal_uInt16 nEnd = 0xFFFF, sal_uInt16* pIndex = NULL ); + SAL_DLLPRIVATE sal_Bool ImplDlgCtrl( const KeyEvent& rKEvt, sal_Bool bKeyInput ); + SAL_DLLPRIVATE sal_Bool ImplHasDlgCtrl(); SAL_DLLPRIVATE void ImplDlgCtrlNextWindow(); - SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( Window* pWindow, BOOL bGetFocus ); + SAL_DLLPRIVATE void ImplDlgCtrlFocusChanged( Window* pWindow, sal_Bool bGetFocus ); SAL_DLLPRIVATE Window* ImplFindDlgCtrlWindow( Window* pWindow ); SAL_DLLPRIVATE long ImplLogicUnitToPixelX( long nX, MapUnit eUnit ); SAL_DLLPRIVATE long ImplLogicUnitToPixelY( long nY, MapUnit eUnit ); - SAL_DLLPRIVATE BOOL ImplIsWindowInFront( const Window* pTestWindow ) const; + SAL_DLLPRIVATE sal_Bool ImplIsWindowInFront( const Window* pTestWindow ) const; SAL_DLLPRIVATE void ImplSaveOverlapBackground(); - SAL_DLLPRIVATE BOOL ImplRestoreOverlapBackground( Region& rInvRegion ); + SAL_DLLPRIVATE sal_Bool ImplRestoreOverlapBackground( Region& rInvRegion ); SAL_DLLPRIVATE void ImplDeleteOverlapBackground(); SAL_DLLPRIVATE void ImplInvalidateAllOverlapBackgrounds(); SAL_DLLPRIVATE static void ImplNewInputContext(); @@ -524,14 +539,15 @@ public: SAL_DLLPRIVATE static void ImplCalcSymbolRect( Rectangle& rRect ); SAL_DLLPRIVATE void ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY ); - SAL_DLLPRIVATE BOOL ImplGetCurrentBackgroundColor( Color& rCol ); - SAL_DLLPRIVATE BOOL ImplIsAccessibleCandidate() const; - SAL_DLLPRIVATE BOOL ImplIsAccessibleNativeFrame() const; - SAL_DLLPRIVATE USHORT ImplGetAccessibleCandidateChildWindowCount( USHORT nFirstWindowType ) const; - SAL_DLLPRIVATE Window* ImplGetAccessibleCandidateChild( USHORT nChild, USHORT& rChildCount, USHORT nFirstWindowType, BOOL bTopLevel = TRUE ) const; - SAL_DLLPRIVATE BOOL ImplRegisterAccessibleNativeFrame(); + SAL_DLLPRIVATE sal_Bool ImplGetCurrentBackgroundColor( Color& rCol ); + SAL_DLLPRIVATE sal_Bool ImplIsAccessibleCandidate() const; + SAL_DLLPRIVATE sal_Bool ImplIsAccessibleNativeFrame() const; + SAL_DLLPRIVATE sal_uInt16 ImplGetAccessibleCandidateChildWindowCount( sal_uInt16 nFirstWindowType ) const; + SAL_DLLPRIVATE Window* ImplGetAccessibleCandidateChild( sal_uInt16 nChild, sal_uInt16& rChildCount, sal_uInt16 nFirstWindowType, sal_Bool bTopLevel = sal_True ) const; + SAL_DLLPRIVATE sal_Bool ImplRegisterAccessibleNativeFrame(); SAL_DLLPRIVATE void ImplRevokeAccessibleNativeFrame(); SAL_DLLPRIVATE void ImplCallResize(); + SAL_DLLPRIVATE void ImplExtResize(); SAL_DLLPRIVATE void ImplCallMove(); SAL_DLLPRIVATE Rectangle ImplOutputToUnmirroredAbsoluteScreenPixel( const Rectangle& rRect ) const; SAL_DLLPRIVATE void ImplMirrorFramePos( Point &pt ) const; @@ -543,16 +559,16 @@ public: SAL_DLLPRIVATE ::std::vector<Window *>& ImplGetOwnerDrawList(); SAL_DLLPRIVATE Window* ImplGetTopmostFrameWindow(); - SAL_DLLPRIVATE Rectangle ImplGetWindowExtentsRelative( Window *pRelativeWindow, BOOL bClientOnly ) const; - SAL_DLLPRIVATE void ImplNotifyIconifiedState( BOOL bIconified ); + SAL_DLLPRIVATE Rectangle ImplGetWindowExtentsRelative( Window *pRelativeWindow, sal_Bool bClientOnly ) const; + SAL_DLLPRIVATE void ImplNotifyIconifiedState( sal_Bool bIconified ); SAL_DLLPRIVATE bool ImplStopDnd(); SAL_DLLPRIVATE void ImplStartDnd(); SAL_DLLPRIVATE static void ImplInitAppFontData( Window* pWindow ); SAL_DLLPRIVATE void ImplPaintToDevice( OutputDevice* pTargetOutDev, const Point& rPos ); - SAL_DLLPRIVATE BOOL ImplIsInTaskPaneList(); - SAL_DLLPRIVATE void ImplIsInTaskPaneList( BOOL mbIsInTaskList ); + SAL_DLLPRIVATE sal_Bool ImplIsInTaskPaneList(); + SAL_DLLPRIVATE void ImplIsInTaskPaneList( sal_Bool mbIsInTaskList ); SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const; @@ -568,10 +584,10 @@ protected: // Single argument ctors shall be explicit. explicit Window( WindowType nType ); - void SetCompoundControl( BOOL bCompound ); + void SetCompoundControl( sal_Bool bCompound ); - void ImplCallEventListeners( ULONG nEvent, void* pData = NULL ); - void CallEventListeners( ULONG nEvent, void* pData = NULL ); + void ImplCallEventListeners( sal_uLong nEvent, void* pData = NULL ); + void CallEventListeners( sal_uLong nEvent, void* pData = NULL ); void FireVclEvent( VclSimpleEvent* pEvent ); // FIXME: this is a hack to workaround missing layout functionality @@ -590,7 +606,9 @@ public: virtual void KeyUp( const KeyEvent& rKEvt ); virtual void PrePaint(); virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + + virtual void PostPaint(); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ); virtual void Move(); virtual void Resize(); virtual void Activate(); @@ -600,7 +618,7 @@ public: virtual void RequestHelp( const HelpEvent& rHEvt ); virtual void Command( const CommandEvent& rCEvt ); virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void UserEvent( ULONG nEvent, void* pEventData ); + virtual void UserEvent( sal_uLong nEvent, void* pEventData ); virtual void StateChanged( StateChangedType nStateChange ); virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); @@ -612,16 +630,16 @@ public: /*virtual*/ void AddChildEventListener( const Link& rEventListener ); /*virtual*/ void RemoveChildEventListener( const Link& rEventListener ); - ULONG PostUserEvent( ULONG nEvent, void* pEventData = NULL ); - ULONG PostUserEvent( const Link& rLink, void* pCaller = NULL ); - BOOL PostUserEvent( ULONG& rEventId, ULONG nEvent, void* pEventData = NULL ); - BOOL PostUserEvent( ULONG& rEventId, const Link& rLink, void* pCaller = NULL ); - void RemoveUserEvent( ULONG nUserEvent ); + sal_uLong PostUserEvent( sal_uLong nEvent, void* pEventData = NULL ); + sal_uLong PostUserEvent( const Link& rLink, void* pCaller = NULL ); + sal_Bool PostUserEvent( sal_uLong& rEventId, sal_uLong nEvent, void* pEventData = NULL ); + sal_Bool PostUserEvent( sal_uLong& rEventId, const Link& rLink, void* pCaller = NULL ); + void RemoveUserEvent( sal_uLong nUserEvent ); void PostStateChanged( StateChangedType nState ); void IncrementLockCount(); void DecrementLockCount(); - BOOL IsLocked( BOOL bChilds = FALSE ) const; + sal_Bool IsLocked( sal_Bool bChilds = sal_False ) const; // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS @@ -635,64 +653,64 @@ public: WinBits GetPrevExtendedStyle() const; void SetType( WindowType nType ); WindowType GetType() const; - BOOL IsSystemWindow() const; - BOOL IsDialog() const; - BOOL IsMenuFloatingWindow() const; - BOOL IsToolbarFloatingWindow() const; - BOOL IsTopWindow() const; + sal_Bool IsSystemWindow() const; + sal_Bool IsDialog() const; + sal_Bool IsMenuFloatingWindow() const; + sal_Bool IsToolbarFloatingWindow() const; + sal_Bool IsTopWindow() const; SystemWindow* GetSystemWindow() const; - void EnableAllResize( BOOL bEnable = TRUE ); - BOOL IsAllResizeEnabled() const; + void EnableAllResize( sal_Bool bEnable = sal_True ); + sal_Bool IsAllResizeEnabled() const; - void SetBorderStyle( USHORT nBorderStyle ); - USHORT GetBorderStyle() const; + void SetBorderStyle( sal_uInt16 nBorderStyle ); + sal_uInt16 GetBorderStyle() const; void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; Size CalcWindowSize( const Size& rOutSz ) const; Size CalcOutputSize( const Size& rWinSz ) const; long CalcTitleWidth() const; - void EnableClipSiblings( BOOL bClipSiblings = TRUE ); - BOOL IsClipSiblingsEnabled() const; + void EnableClipSiblings( sal_Bool bClipSiblings = sal_True ); + sal_Bool IsClipSiblingsEnabled() const; - void EnableChildTransparentMode( BOOL bEnable = TRUE ); - BOOL IsChildTransparentModeEnabled() const; + void EnableChildTransparentMode( sal_Bool bEnable = sal_True ); + sal_Bool IsChildTransparentModeEnabled() const; - void SetMouseTransparent( BOOL bTransparent ); - BOOL IsMouseTransparent() const; - void SetPaintTransparent( BOOL bTransparent ); - BOOL IsPaintTransparent() const; - void SetDialogControlStart( BOOL bStart ); - BOOL IsDialogControlStart() const; - void SetDialogControlFlags( USHORT nFlags ); - USHORT GetDialogControlFlags() const; + void SetMouseTransparent( sal_Bool bTransparent ); + sal_Bool IsMouseTransparent() const; + void SetPaintTransparent( sal_Bool bTransparent ); + sal_Bool IsPaintTransparent() const; + void SetDialogControlStart( sal_Bool bStart ); + sal_Bool IsDialogControlStart() const; + void SetDialogControlFlags( sal_uInt16 nFlags ); + sal_uInt16 GetDialogControlFlags() const; struct PointerState { - ULONG mnState; // the button state + sal_uLong mnState; // the button state Point maPos; // mouse position in output coordinates }; PointerState GetPointerState(); - BOOL IsMouseOver(); + sal_Bool IsMouseOver(); - ULONG GetCurrentModButtons(); + sal_uLong GetCurrentModButtons(); void SetInputContext( const InputContext& rInputContext ); const InputContext& GetInputContext() const; - void EndExtTextInput( USHORT nFlags ); - BOOL IsExtTextInput() const; + void EndExtTextInput( sal_uInt16 nFlags ); + sal_Bool IsExtTextInput() const; void SetCursorRect( const Rectangle* pRect = NULL, long nExtTextInputWidth = 0 ); const Rectangle* GetCursorRect() const; long GetCursorExtTextInputWidth() const; - void EnableChildNotify( BOOL bEnable ); - BOOL IsChildNotify() const; + void EnableChildNotify( sal_Bool bEnable ); + sal_Bool IsChildNotify() const; using OutputDevice::SetSettings; virtual void SetSettings( const AllSettings& rSettings ); - virtual void SetSettings( const AllSettings& rSettings, BOOL bChild ); - void UpdateSettings( const AllSettings& rSettings, BOOL bChild = FALSE ); + virtual void SetSettings( const AllSettings& rSettings, sal_Bool bChild ); + void UpdateSettings( const AllSettings& rSettings, sal_Bool bChild = sal_False ); void NotifyAllChilds( DataChangedEvent& rDCEvt ); void SetPointFont( const Font& rFont ); @@ -704,26 +722,26 @@ public: void SetControlFont(); void SetControlFont( const Font& rFont ); Font GetControlFont() const; - BOOL IsControlFont() const; + sal_Bool IsControlFont() const; void SetControlForeground(); void SetControlForeground( const Color& rColor ); Color GetControlForeground() const; - BOOL IsControlForeground() const; + sal_Bool IsControlForeground() const; void SetControlBackground(); void SetControlBackground( const Color& rColor ); Color GetControlBackground() const; - BOOL IsControlBackground() const; + sal_Bool IsControlBackground() const; - void SetParentClipMode( USHORT nMode = 0 ); - USHORT GetParentClipMode() const; + void SetParentClipMode( sal_uInt16 nMode = 0 ); + sal_uInt16 GetParentClipMode() const; void SetWindowRegionPixel(); void SetWindowRegionPixel( const Region& rRegion ); const Region& GetWindowRegionPixel() const; - BOOL IsWindowRegionPixel() const; - Region GetWindowClipRegionPixel( USHORT nFlags = 0 ) const; + sal_Bool IsWindowRegionPixel() const; + Region GetWindowClipRegionPixel( sal_uInt16 nFlags = 0 ) const; Region GetPaintRegion() const; - BOOL IsInPaint() const; + sal_Bool IsInPaint() const; // while IsInPaint returns true ExpandPaintClipRegion adds the // submitted region to the paint clip region so you can // paint additional parts of your window if necessary @@ -732,23 +750,23 @@ public: void SetParent( Window* pNewParent ); Window* GetParent() const; - void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); - void Hide( USHORT nFlags = 0 ) { Show( FALSE, nFlags ); } - BOOL IsVisible() const; - BOOL IsReallyVisible() const; + void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 ); + void Hide( sal_uInt16 nFlags = 0 ) { Show( sal_False, nFlags ); } + sal_Bool IsVisible() const; + sal_Bool IsReallyVisible() const; // Do not use this function, use IsReallyVisible() - BOOL IsParentPathVisible() const; - BOOL IsReallyShown() const; - BOOL IsInInitShow() const; + sal_Bool IsParentPathVisible() const; + sal_Bool IsReallyShown() const; + sal_Bool IsInInitShow() const; void Enable( bool bEnable = true, bool bChild = true ); void Disable( bool bChild = true ) { Enable( false, bChild ); } - BOOL IsEnabled() const; + sal_Bool IsEnabled() const; - void EnableInput( BOOL bEnable = TRUE, BOOL bChild = TRUE ); - void EnableInput( BOOL bEnable, BOOL bChild, BOOL bSysWin, + void EnableInput( sal_Bool bEnable = sal_True, sal_Bool bChild = sal_True ); + void EnableInput( sal_Bool bEnable, sal_Bool bChild, sal_Bool bSysWin, const Window* pExcludeWindow = NULL ); - BOOL IsInputEnabled() const; + sal_Bool IsInputEnabled() const; /** Override <code>EnableInput</code>. This can be necessary due to other people using EnableInput for whole window hierarchies. @@ -762,12 +780,12 @@ public: @param bChild if true children are recursively set to AlwaysEnableInput */ - void AlwaysEnableInput( BOOL bAlways, BOOL bChild = TRUE ); + void AlwaysEnableInput( sal_Bool bAlways, sal_Bool bChild = sal_True ); /** returns the current AlwaysEnableInput state @return true if window is in AlwaysEnableInput state */ - BOOL IsAlwaysEnableInput() const; + sal_Bool IsAlwaysEnableInput() const; /** Override <code>EnableInput</code>, counterpart to AlwaysEnableInput. Windows with AlwaysDisableInput will not get key events even if enabled and input enabled.This can be necessary due to other people using EnableInput @@ -782,12 +800,12 @@ public: @param bChild if true children are recursively set to AlwaysDisableInput */ - void AlwaysDisableInput( BOOL bAlways, BOOL bChild = TRUE ); + void AlwaysDisableInput( sal_Bool bAlways, sal_Bool bChild = sal_True ); /** returns the current AlwaysDisableInput state @return true if window is in AlwaysEnableInput state */ - BOOL IsAlwaysDisableInput() const; + sal_Bool IsAlwaysDisableInput() const; /** usually event handlers (see AddEventListener and AddChildEventListener) are not called on disabled, modal or input disabled windows. There are however rare cases in which one wants a Window or rather one of its Control subclasses to @@ -813,21 +831,21 @@ public: /** A window is in modal mode if one of its children or subchildren is a running modal window (a modal dialog) - @returns TRUE if a child or subchild is a running modal window + @returns sal_True if a child or subchild is a running modal window */ - BOOL IsInModalMode() const; + sal_Bool IsInModalMode() const; - void SetActivateMode( USHORT nMode ); - USHORT GetActivateMode() const; + void SetActivateMode( sal_uInt16 nMode ); + sal_uInt16 GetActivateMode() const; - void ToTop( USHORT nFlags = 0 ); - void SetZOrder( Window* pRefWindow, USHORT nFlags ); - void EnableAlwaysOnTop( BOOL bEnable = TRUE ); - BOOL IsAlwaysOnTopEnabled() const; + void ToTop( sal_uInt16 nFlags = 0 ); + void SetZOrder( Window* pRefWindow, sal_uInt16 nFlags ); + void EnableAlwaysOnTop( sal_Bool bEnable = sal_True ); + sal_Bool IsAlwaysOnTopEnabled() const; virtual void SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, - USHORT nFlags = WINDOW_POSSIZE_ALL ); + sal_uInt16 nFlags = WINDOW_POSSIZE_ALL ); virtual void SetPosPixel( const Point& rNewPos ); virtual Point GetPosPixel() const; virtual void SetSizePixel( const Size& rNewSize ); @@ -835,8 +853,8 @@ public: virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); virtual void SetOutputSizePixel( const Size& rNewSize ); - BOOL IsDefaultPos() const; - BOOL IsDefaultSize() const; + sal_Bool IsDefaultPos() const; + sal_Bool IsDefaultSize() const; // those conversion routines might deliver different results during UI mirroring Point OutputToScreenPixel( const Point& rPos ) const; @@ -852,40 +870,40 @@ public: // window extents of the client window, coordinates to be used in SetPosPixel Rectangle GetClientWindowExtentsRelative( Window *pRelativeWindow ) const; - virtual BOOL IsScrollable() const; + virtual sal_Bool IsScrollable() const; virtual void Scroll( long nHorzScroll, long nVertScroll, - USHORT nFlags = 0 ); + sal_uInt16 nFlags = 0 ); virtual void Scroll( long nHorzScroll, long nVertScroll, - const Rectangle& rRect, USHORT nFlags = 0 ); - virtual void Invalidate( USHORT nFlags = 0 ); - virtual void Invalidate( const Rectangle& rRect, USHORT nFlags = 0 ); - virtual void Invalidate( const Region& rRegion, USHORT nFlags = 0 ); - void Validate( USHORT nFlags = 0 ); - void Validate( const Rectangle& rRect, USHORT nFlags = 0 ); - void Validate( const Region& rRegion, USHORT nFlags = 0 ); - BOOL HasPaintEvent() const; + const Rectangle& rRect, sal_uInt16 nFlags = 0 ); + virtual void Invalidate( sal_uInt16 nFlags = 0 ); + virtual void Invalidate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ); + virtual void Invalidate( const Region& rRegion, sal_uInt16 nFlags = 0 ); + void Validate( sal_uInt16 nFlags = 0 ); + void Validate( const Rectangle& rRect, sal_uInt16 nFlags = 0 ); + void Validate( const Region& rRegion, sal_uInt16 nFlags = 0 ); + sal_Bool HasPaintEvent() const; void Update(); void Flush(); void Sync(); // toggles new docking support, enabled via toolkit - void EnableDocking( BOOL bEnable = TRUE ); + void EnableDocking( sal_Bool bEnable = sal_True ); // retrieves the single dockingmanager instance static DockingManager* GetDockingManager(); - void EnablePaint( BOOL bEnable ); - BOOL IsPaintEnabled() const; - void SetUpdateMode( BOOL bUpdate ); - BOOL IsUpdateMode() const; - void SetParentUpdateMode( BOOL bUpdate ); - BOOL IsParentUpdateMode() const; + void EnablePaint( sal_Bool bEnable ); + sal_Bool IsPaintEnabled() const; + void SetUpdateMode( sal_Bool bUpdate ); + sal_Bool IsUpdateMode() const; + void SetParentUpdateMode( sal_Bool bUpdate ); + sal_Bool IsParentUpdateMode() const; void GrabFocus(); - BOOL HasFocus() const; - BOOL HasChildPathFocus( BOOL bSystemWindow = FALSE ) const; - BOOL IsActive() const; - BOOL HasActiveChildFrame(); - USHORT GetGetFocusFlags() const; + sal_Bool HasFocus() const; + sal_Bool HasChildPathFocus( sal_Bool bSystemWindow = sal_False ) const; + sal_Bool IsActive() const; + sal_Bool HasActiveChildFrame(); + sal_uInt16 GetGetFocusFlags() const; void GrabFocusToDocument(); /** @@ -895,35 +913,35 @@ public: */ void SetFakeFocus( bool bFocus ); - BOOL IsCompoundControl() const; - BOOL HasCompoundControlFocus() const; + sal_Bool IsCompoundControl() const; + sal_Bool HasCompoundControlFocus() const; static sal_uIntPtr SaveFocus(); - static BOOL EndSaveFocus( sal_uIntPtr nSaveId, BOOL bRestore = TRUE ); + static sal_Bool EndSaveFocus( sal_uIntPtr nSaveId, sal_Bool bRestore = sal_True ); void CaptureMouse(); void ReleaseMouse(); - BOOL IsMouseCaptured() const; + sal_Bool IsMouseCaptured() const; void SetPointer( const Pointer& rPointer ); const Pointer& GetPointer() const; - void EnableChildPointerOverwrite( BOOL bOverwrite = TRUE ); - BOOL IsChildPointerOverwrite() const; + void EnableChildPointerOverwrite( sal_Bool bOverwrite = sal_True ); + sal_Bool IsChildPointerOverwrite() const; void SetPointerPosPixel( const Point& rPos ); Point GetPointerPosPixel(); Point GetLastPointerPosPixel(); - void ShowPointer( BOOL bVisible ); - BOOL IsPointerVisible() const; + void ShowPointer( sal_Bool bVisible ); + sal_Bool IsPointerVisible() const; void EnterWait(); void LeaveWait(); - BOOL IsWait() const; + sal_Bool IsWait() const; void SetCursor( Cursor* pCursor ); Cursor* GetCursor() const; void SetZoom( const Fraction& rZoom ); const Fraction& GetZoom() const; - BOOL IsZoom() const; + sal_Bool IsZoom() const; long CalcZoom( long n ) const; virtual void SetText( const XubString& rStr ); @@ -943,59 +961,55 @@ public: void SetQuickHelpText( const XubString& rHelpText ); const XubString& GetQuickHelpText() const; - void SetHelpId( ULONG nHelpId ); /// deprecated - ULONG GetHelpId() const; /// deprecated - void SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode = SMART_SET_SMART ); - SmartId GetSmartHelpId() const; + void SetHelpId( const rtl::OString& ); + const rtl::OString& GetHelpId() const; - void SetUniqueId( ULONG nUniqueId ); /// deprecated - ULONG GetUniqueId() const; /// deprecated - void SetSmartUniqueId( const SmartId& aId, SmartIdUpdateMode aMode = SMART_SET_SMART ); - SmartId GetSmartUniqueId() const; - SmartId GetSmartUniqueOrHelpId() const; + void SetUniqueId( const rtl::OString& ); + const rtl::OString& GetUniqueId() const; + const rtl::OString& GetUniqueOrHelpId() const; Window* FindWindow( const Point& rPos ) const; - USHORT GetChildCount() const; - Window* GetChild( USHORT nChild ) const; - Window* GetWindow( USHORT nType ) const; - BOOL IsChild( const Window* pWindow, BOOL bSystemWindow = FALSE ) const; - BOOL IsWindowOrChild( const Window* pWindow, BOOL bSystemWindow = FALSE ) const; + sal_uInt16 GetChildCount() const; + Window* GetChild( sal_uInt16 nChild ) const; + Window* GetWindow( sal_uInt16 nType ) const; + sal_Bool IsChild( const Window* pWindow, sal_Bool bSystemWindow = sal_False ) const; + sal_Bool IsWindowOrChild( const Window* pWindow, sal_Bool bSystemWindow = sal_False ) const; void SetData( void* pNewData ); void* GetData() const; - Bitmap SnapShot( BOOL bBorder=TRUE ) const; + Bitmap SnapShot( sal_Bool bBorder = sal_True ) const; void ShowFocus( const Rectangle& rRect ); void HideFocus(); - void Invert( const Rectangle& rRect, USHORT nFlags = 0 ); - void Invert( const Polygon& rPoly, USHORT nFlags = 0 ); + void Invert( const Rectangle& rRect, sal_uInt16 nFlags = 0 ); + void Invert( const Polygon& rPoly, sal_uInt16 nFlags = 0 ); // transparent background for selected or checked items in toolboxes etc. - void DrawSelectionBackground( const Rectangle& rRect, USHORT highlight, BOOL bChecked, BOOL bDrawBorder, BOOL bDrawExtBorderOnly ); + void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, sal_Bool bChecked, sal_Bool bDrawBorder, sal_Bool bDrawExtBorderOnly ); // the same, but fills a passed Color with a text color complementing the selection background - void DrawSelectionBackground( const Rectangle& rRect, USHORT highlight, BOOL bChecked, BOOL bDrawBorder, BOOL bDrawExtBorderOnly, Color* pSelectionTextColor ); + void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, sal_Bool bChecked, sal_Bool bDrawBorder, sal_Bool bDrawExtBorderOnly, Color* pSelectionTextColor ); // support rounded edges in the selection rect - void DrawSelectionBackground( const Rectangle& rRect, USHORT highlight, BOOL bChecked, BOOL bDrawBorder, BOOL bDrawExtBorderOnly, long nCornerRadius, Color* pSelectionTextColor, Color* pPaintColor ); + void DrawSelectionBackground( const Rectangle& rRect, sal_uInt16 highlight, sal_Bool bChecked, sal_Bool bDrawBorder, sal_Bool bDrawExtBorderOnly, long nCornerRadius, Color* pSelectionTextColor, Color* pPaintColor ); void ShowTracking( const Rectangle& rRect, - USHORT nFlags = SHOWTRACK_SMALL ); + sal_uInt16 nFlags = SHOWTRACK_SMALL ); void HideTracking(); void InvertTracking( const Rectangle& rRect, - USHORT nFlags = SHOWTRACK_SMALL ); - void InvertTracking( const Polygon& rPoly, USHORT nFlags = 0 ); + sal_uInt16 nFlags = SHOWTRACK_SMALL ); + void InvertTracking( const Polygon& rPoly, sal_uInt16 nFlags = 0 ); - void StartTracking( USHORT nFlags = 0 ); - void EndTracking( USHORT nFlags = 0 ); - BOOL IsTracking() const; + void StartTracking( sal_uInt16 nFlags = 0 ); + void EndTracking( sal_uInt16 nFlags = 0 ); + sal_Bool IsTracking() const; - void StartAutoScroll( USHORT nFlags ); + void StartAutoScroll( sal_uInt16 nFlags ); void EndAutoScroll(); - BOOL IsAutoScroll() const; + sal_Bool IsAutoScroll() const; - BOOL HandleScrollCommand( const CommandEvent& rCmd, + sal_Bool HandleScrollCommand( const CommandEvent& rCmd, ScrollBar* pHScrl = NULL, ScrollBar* pVScrl = NULL ); @@ -1006,20 +1020,20 @@ public: ::com::sun::star::uno::Any GetSystemDataAny() const; // API zum Setzen/Abfragen des Komponenteninterfaces - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( BOOL bCreate = TRUE ); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface( sal_Bool bCreate = sal_True ); virtual void SetComponentInterface( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ); // Accessibility - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible( BOOL bCreate = TRUE ); + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > GetAccessible( sal_Bool bCreate = sal_True ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); void SetAccessible( ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ); Window* GetAccessibleParentWindow() const; - USHORT GetAccessibleChildWindowCount(); - Window* GetAccessibleChildWindow( USHORT n ); + sal_uInt16 GetAccessibleChildWindowCount(); + Window* GetAccessibleChildWindow( sal_uInt16 n ); - void SetAccessibleRole( USHORT nRole ); - USHORT GetAccessibleRole() const; + void SetAccessibleRole( sal_uInt16 nRole ); + sal_uInt16 GetAccessibleRole() const; void SetAccessibleName( const String& rName ); String GetAccessibleName() const; @@ -1027,9 +1041,20 @@ public: void SetAccessibleDescription( const String& rDescr ); String GetAccessibleDescription() const; + void SetAccessibleRelationLabeledBy( Window* pLabeledBy ); + Window* GetAccessibleRelationLabeledBy() const; + + void SetAccessibleRelationLabelFor( Window* pLabelFor ); + Window* GetAccessibleRelationLabelFor() const; + + void SetAccessibleRelationMemberOf( Window* pMemberOf ); + Window* GetAccessibleRelationMemberOf() const; + + // to avoid sending accessibility events in cases like closing dialogs // by default checks complete parent path - BOOL IsAccessibilityEventsSuppressed( BOOL bTraverseParentPath = TRUE ); + sal_Bool IsAccessibilityEventsSuppressed( sal_Bool bTraverseParentPath = sal_True ); + void SetAccessibilityEventsSuppressed(sal_Bool bSuppressed); /// request XCanvas render interface for this window ::com::sun::star::uno::Reference< @@ -1051,11 +1076,10 @@ public: void SetWindowPeer( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xPeer, VCLXWindow* pVCLXWindow ); // Merken, ob vom Toolkit erzeugt - BOOL IsCreatedWithToolkit() const; - void SetCreatedWithToolkit( BOOL b ); + sal_Bool IsCreatedWithToolkit() const; + void SetCreatedWithToolkit( sal_Bool b ); - Window* GetLabelFor() const; - Window* GetLabeledBy() const; + // Deprecated - can use SetAccessibleRelationLabelFor/By nowadys virtual Window* GetParentLabelFor( const Window* pLabel ) const; virtual Window* GetParentLabeledBy( const Window* pLabeled ) const; KeyEvent GetActivationKey() const; @@ -1079,8 +1103,8 @@ public: //------------------------------------- // form controls must never use native widgets, this can be toggled here - void EnableNativeWidget( BOOL bEnable = TRUE ); - BOOL IsNativeWidgetEnabled() const; + void EnableNativeWidget( sal_Bool bEnable = sal_True ); + sal_Bool IsNativeWidgetEnabled() const; // a helper method for a Control's Draw method void PaintToDevice( OutputDevice* pDevice, const Point& rPos, const Size& rSize ); @@ -1101,12 +1125,64 @@ public: INDICATOR_NUM_LOCK INDICATOR_SCROLL_LOCK */ - USHORT GetIndicatorState() const; + sal_uInt16 GetIndicatorState() const; - void SimulateKeyPress( USHORT nKeyCode ) const; + void SimulateKeyPress( sal_uInt16 nKeyCode ) const; + + // let the window intercept the KeyDown messages of the system children + void InterceptChildWindowKeyDown( sal_Bool bIntercept ); virtual XubString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; + + // ExtImpl + + // layouting + boost::shared_ptr< vcl::WindowArranger > getLayout(); + + /* add a child Window + addWindow will do the following things + - insert the passed window into the child list (equivalent to i_pWin->SetParent( this )) + - mark the window as "owned", meaning that the added Window will be destroyed by + the parent's desctructor. + This means: do not pass in member windows or stack objects here. Do not cause + the destructor of the added window to be called in any way. + + to avoid ownership pass i_bTakeOwnership as "false" + */ + void addWindow( Window* i_pWin, bool i_bTakeOwnership = true ); + + /* remove a child Window + the remove window functions will + - reparent the searched window (equivalent to i_pWin->SetParent( i_pNewParent )) + - return a pointer to the removed window or NULL if i_pWin was not found + caution: ownership passes to the new parent or the caller, if the new parent was NULL + */ + Window* removeWindow( Window* i_pWin, Window* i_pNewParent = NULL ); + + /* return the identifier of this window + */ + const rtl::OUString& getIdentifier() const; + /* set an identifier + identifiers have only loosely defined rules per se + in context of Window they must be unique over the window + hierarchy you'd like to find them again using the findWindow method + */ + void setIdentifier( const rtl::OUString& ); + + /* returns the first found descendant that matches + the passed identifier or NULL + */ + Window* findWindow( const rtl::OUString& ) const; + + /* get/set properties + this will contain window properties (like visible, enabled) + as well as properties of derived classes (e.g. text of Edit fields) + */ + virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getProperties() const; + /* + */ + virtual void setProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& ); }; diff --git a/vcl/inc/vcl/wintypes.hxx b/vcl/inc/vcl/wintypes.hxx deleted file mode 100644 index 55de8b4fb5be..000000000000 --- a/vcl/inc/vcl/wintypes.hxx +++ /dev/null @@ -1,35 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SV_WINTYPES_HXX -#define _SV_WINTYPES_HXX - -#include <tools/wintypes.hxx> - -#endif // _SV_WINTYPES_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/impbmpconv.hxx b/vcl/inc/vcl/wpropset.hxx index 0d82ed119d6d..ac0f98fd3525 100644 --- a/vcl/inc/vcl/impbmpconv.hxx +++ b/vcl/inc/vcl/wpropset.hxx @@ -26,15 +26,42 @@ * ************************************************************************/ -#ifndef _VCL_IMPBMPCONV_HXX_ -#define _VCL_IMPBMPCONV_HXX_ +#ifndef VCL_WPROPSET_HXX +#define VCL_WPROPSET_HXX -#include <com/sun/star/script/XInvocation.hpp> -#include <com/sun/star/uno/Reference.hxx> +#include "vcl/dllapi.h" + +#include "tools/link.hxx" +#include "vcl/arrange.hxx" + +#include "com/sun/star/beans/XPropertySet.hpp" + +class VclWindowEvent; namespace vcl { -com::sun::star::uno::Reference< com::sun::star::script::XInvocation > createBmpConverter(); + class WindowPropertySetData; + class WindowPropertySetListener; + + class VCL_DLLPUBLIC WindowPropertySet + { + WindowPropertySetData* mpImpl; + + void addWindowToSet( Window* ); + void addLayoutToSet( const boost::shared_ptr<WindowArranger>& ); + void setupProperties(); + + DECL_LINK( ChildEventListener, VclWindowEvent* ); + + void propertyChange( const com::sun::star::beans::PropertyChangeEvent& ); + friend class vcl::WindowPropertySetListener; + + public: + WindowPropertySet( Window* i_pTopWindow, bool i_bTakeOwnership ); + ~WindowPropertySet(); + + com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > getPropertySet() const; + }; } #endif diff --git a/vcl/inc/vcl/wrkwin.hxx b/vcl/inc/vcl/wrkwin.hxx index 50c1cf60dbb7..c58f6971ffc0 100644 --- a/vcl/inc/vcl/wrkwin.hxx +++ b/vcl/inc/vcl/wrkwin.hxx @@ -41,9 +41,9 @@ struct SystemParentData; // ---------------------- // Presentation Flags -#define PRESENTATION_HIDEALLAPPS ((USHORT)0x0001) -#define PRESENTATION_NOFULLSCREEN ((USHORT)0x0002) -#define PRESENTATION_NOAUTOSHOW ((USHORT)0x0004) +#define PRESENTATION_HIDEALLAPPS ((sal_uInt16)0x0001) +#define PRESENTATION_NOFULLSCREEN ((sal_uInt16)0x0002) +#define PRESENTATION_NOAUTOSHOW ((sal_uInt16)0x0004) // -------------- // - WorkWindow - @@ -52,8 +52,8 @@ struct SystemParentData; class VCL_DLLPUBLIC WorkWindow : public SystemWindow { private: - USHORT mnPresentationFlags; - BOOL mbPresentationMode:1, + sal_uInt16 mnPresentationFlags; + sal_Bool mbPresentationMode:1, mbPresentationVisible:1, mbPresentationFull:1, mbFullScreenMode:1; @@ -69,7 +69,7 @@ protected: WorkWindow( WindowType nType ); SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle, SystemParentData* pSystemParentData = NULL ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE void ImplSetFrameState( ULONG aFrameState ); + SAL_DLLPRIVATE void ImplSetFrameState( sal_uLong aFrameState ); public: WorkWindow( Window* pParent, const ResId& rResId ); @@ -78,7 +78,7 @@ public: WorkWindow( SystemParentData* pParent ); // Not in the REMOTE-Version ~WorkWindow(); - virtual BOOL Close(); + virtual sal_Bool Close(); /** The default value of nDisplay = -1 means "don't care" and allows to backends to use any screen [** or display? terminology!] @@ -87,23 +87,23 @@ public: NOTE: The default value cannot be 0, because 0 is a legitimate screen number. */ - void ShowFullScreenMode( BOOL bFullScreenMode = TRUE, sal_Int32 nDisplay = -1 ); - void EndFullScreenMode() { ShowFullScreenMode( FALSE ); } - BOOL IsFullScreenMode() const { return mbFullScreenMode; } + void ShowFullScreenMode( sal_Bool bFullScreenMode = sal_True, sal_Int32 nDisplay = -1 ); + void EndFullScreenMode() { ShowFullScreenMode( sal_False ); } + sal_Bool IsFullScreenMode() const { return mbFullScreenMode; } - void StartPresentationMode( BOOL bPresentation = TRUE, USHORT nFlags = 0, sal_Int32 nDisplay = 0 ); - void EndPresentationMode() { StartPresentationMode( FALSE ); } - BOOL IsPresentationMode() const { return mbPresentationMode; } + void StartPresentationMode( sal_Bool bPresentation = sal_True, sal_uInt16 nFlags = 0, sal_Int32 nDisplay = 0 ); + void EndPresentationMode() { StartPresentationMode( sal_False ); } + sal_Bool IsPresentationMode() const { return mbPresentationMode; } - BOOL IsMinimized() const; + sal_Bool IsMinimized() const; - BOOL SetPluginParent( SystemParentData* pParent ); + sal_Bool SetPluginParent( SystemParentData* pParent ); void Minimize(); void Restore(); - void Maximize( BOOL bMaximize = TRUE ); - BOOL IsMaximized() const; + void Maximize( sal_Bool bMaximize = sal_True ); + sal_Bool IsMaximized() const; }; #endif // _SV_WRKWIN_HXX diff --git a/vcl/inc/vcl/xconnection.hxx b/vcl/inc/vcl/xconnection.hxx index 1c4c5dd45140..bd3270fa24c7 100644 --- a/vcl/inc/vcl/xconnection.hxx +++ b/vcl/inc/vcl/xconnection.hxx @@ -29,11 +29,12 @@ #ifndef _VCL_XCONNECTION_HXX #define _VCL_XCONNECTION_HXX -#include <com/sun/star/awt/XDisplayConnection.hpp> -#include <cppuhelper/implbase1.hxx> #include <osl/mutex.hxx> +#include <rtl/ref.hxx> #include <com/sun/star/uno/Reference.hxx> +#include "vcl/displayconnectiondispatch.hxx" + #ifndef _STLP_LIST #include <list> #endif @@ -41,7 +42,7 @@ namespace vcl { class DisplayConnection : - public ::cppu::WeakImplHelper1< ::com::sun::star::awt::XDisplayConnection > + public DisplayConnectionDispatch { ::osl::Mutex m_aMutex; ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler > > @@ -53,9 +54,11 @@ namespace vcl { DisplayConnection(); virtual ~DisplayConnection(); - static bool dispatchEvent( void* pThis, void* pData, int nBytes ); - static bool dispatchErrorEvent( void* pThis, void* pData, int nBytes ); - void dispatchDowningEvent(); + void start(); + void terminate(); + + virtual bool dispatchEvent( void* pData, int nBytes ); + virtual bool dispatchErrorEvent( void* pData, int nBytes ); // XDisplayConnection virtual void SAL_CALL addEventHandler( const ::com::sun::star::uno::Any& window, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler >& handler, sal_Int32 eventMask ) throw(); |