diff options
Diffstat (limited to 'vcl/inc/vcl')
204 files changed, 5989 insertions, 5988 deletions
diff --git a/vcl/inc/vcl/ImageListProvider.hxx b/vcl/inc/vcl/ImageListProvider.hxx index 7fc678b485fd..79f90659ebaa 100644 --- a/vcl/inc/vcl/ImageListProvider.hxx +++ b/vcl/inc/vcl/ImageListProvider.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/abstdlg.hxx b/vcl/inc/vcl/abstdlg.hxx index 3e2ef6554079..ab5ee9f44d88 100644 --- a/vcl/inc/vcl/abstdlg.hxx +++ b/vcl/inc/vcl/abstdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -41,9 +41,9 @@ class Link; class VCL_DLLPUBLIC VclAbstractDialog { public: - virtual short Execute() = 0; - //virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ) = 0; - virtual ~VclAbstractDialog(); + virtual short Execute() = 0; + //virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ) = 0; + virtual ~VclAbstractDialog(); }; class VCL_DLLPUBLIC VclAbstractDialog2 @@ -57,7 +57,7 @@ public: class VCL_DLLPUBLIC VclAbstractTerminatedDialog : public VclAbstractDialog { public: - virtual void EndDialog(long nResult =0) = 0; + virtual void EndDialog(long nResult =0) = 0; }; class VCL_DLLPUBLIC VclAbstractRefreshableDialog : public VclAbstractDialog @@ -80,13 +80,13 @@ public: class VCL_DLLPUBLIC VclAbstractDialogFactory { public: - virtual ~VclAbstractDialogFactory(); // needed for export of vtable - static VclAbstractDialogFactory* Create(); + virtual ~VclAbstractDialogFactory(); // needed for export of vtable + static VclAbstractDialogFactory* Create(); // nDialogId was previously a ResId without ResMgr; the ResourceId is now // an implementation detail of the factory - virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ) = 0; - - // creates instance of PasswordToOpenModifyDialog from cui + virtual VclAbstractDialog* CreateVclDialog( Window* pParent, sal_uInt32 nResId ) = 0; + + // creates instance of PasswordToOpenModifyDialog from cui virtual AbstractPasswordToOpenModifyDialog * CreatePasswordToOpenModifyDialog( Window * pParent, sal_uInt16 nMinPasswdLen, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify ) = 0; }; diff --git a/vcl/inc/vcl/accel.h b/vcl/inc/vcl/accel.h index aec7e7c1bbd2..86ce9835c5e1 100644 --- a/vcl/inc/vcl/accel.h +++ b/vcl/inc/vcl/accel.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,11 +43,11 @@ class Accelerator; class ImplAccelEntry { public: - USHORT mnId; - KeyCode maKeyCode; - Accelerator* mpAccel; - Accelerator* mpAutoAccel; - BOOL mbEnabled; + USHORT mnId; + KeyCode maKeyCode; + Accelerator* mpAccel; + Accelerator* mpAutoAccel; + BOOL mbEnabled; }; // ----------------- @@ -57,6 +57,6 @@ public: // in KEYCOD.CXX void ImplGetKeyCode( KeyFuncType eFunc, USHORT& rCode1, USHORT& rCode2, USHORT& rCode3, USHORT& rCode4 ); -#endif // _SV_ACCEL_H +#endif // _SV_ACCEL_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/accel.hxx b/vcl/inc/vcl/accel.hxx index 8c5ee6dfeb68..7973bb0608f1 100644 --- a/vcl/inc/vcl/accel.hxx +++ b/vcl/inc/vcl/accel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -47,18 +47,18 @@ class VCL_DLLPUBLIC Accelerator : public Resource friend class ImplAccelManager; private: - ImplAccelData* mpData; - XubString maHelpStr; - Link maActivateHdl; - Link maDeactivateHdl; - Link maSelectHdl; + ImplAccelData* mpData; + XubString maHelpStr; + Link maActivateHdl; + Link maDeactivateHdl; + Link maSelectHdl; // Werden vom AcceleratorManager gesetzt - KeyCode maCurKeyCode; - USHORT mnCurId; - USHORT mnCurRepeat; - BOOL mbIsCancel; - BOOL* mpDel; + KeyCode maCurKeyCode; + USHORT mnCurId; + USHORT mnCurRepeat; + BOOL mbIsCancel; + BOOL* mpDel; SAL_DLLPRIVATE void ImplInit(); SAL_DLLPRIVATE void ImplCopyData( ImplAccelData& rAccelData ); @@ -75,55 +75,55 @@ public: Accelerator(); Accelerator( const Accelerator& rAccel ); Accelerator( const ResId& rResId ); - virtual ~Accelerator(); - - virtual void Activate(); - virtual void Deactivate(); - virtual void Select(); - - void InsertItem( USHORT nItemId, const KeyCode& rKeyCode ); - void InsertItem( const ResId& rResId ); - void RemoveItem( USHORT nItemId ); - void RemoveItem( const KeyCode rKeyCode ); - void Clear(); - - USHORT 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; - 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 SetHelpText( const XubString& rHelpText ) { maHelpStr = rHelpText; } + virtual ~Accelerator(); + + virtual void Activate(); + virtual void Deactivate(); + virtual void Select(); + + void InsertItem( USHORT nItemId, const KeyCode& rKeyCode ); + void InsertItem( const ResId& rResId ); + void RemoveItem( USHORT nItemId ); + void RemoveItem( const KeyCode rKeyCode ); + void Clear(); + + USHORT 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; + 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 SetHelpText( const XubString& rHelpText ) { maHelpStr = rHelpText; } const XubString& GetHelpText() const { return maHelpStr; } - void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; } - const Link& GetActivateHdl() const { return maActivateHdl; } - void SetDeactivateHdl( const Link& rLink ) { maDeactivateHdl = rLink; } - const Link& GetDeactivateHdl() const { return maDeactivateHdl; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } + void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; } + const Link& GetActivateHdl() const { return maActivateHdl; } + void SetDeactivateHdl( const Link& rLink ) { maDeactivateHdl = rLink; } + const Link& GetDeactivateHdl() const { return maDeactivateHdl; } + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } - Accelerator& operator=( const Accelerator& rAccel ); + Accelerator& operator=( const Accelerator& rAccel ); }; -#endif // _SV_ACCEL_HXX +#endif // _SV_ACCEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/accmgr.hxx b/vcl/inc/vcl/accmgr.hxx index cafbd5750b57..e36201420589 100644 --- a/vcl/inc/vcl/accmgr.hxx +++ b/vcl/inc/vcl/accmgr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/alpha.hxx b/vcl/inc/vcl/alpha.hxx index a31e68832ba1..9d4647fee9dd 100644 --- a/vcl/inc/vcl/alpha.hxx +++ b/vcl/inc/vcl/alpha.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -58,25 +58,25 @@ public: AlphaMask( const Size& rSizePixel, BYTE* 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 ); } + 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 ); } - const MapMode& GetPrefMapMode() const { return Bitmap::GetPrefMapMode(); } - void SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); } + const MapMode& GetPrefMapMode() const { return Bitmap::GetPrefMapMode(); } + void SetPrefMapMode( const MapMode& rMapMode ) { Bitmap::SetPrefMapMode( rMapMode ); } - const Size& GetPrefSize() const { return Bitmap::GetPrefSize(); } - void SetPrefSize( const Size& rSize ) { Bitmap::SetPrefSize( rSize ); } + const Size& GetPrefSize() const { return Bitmap::GetPrefSize(); } + void SetPrefSize( const Size& rSize ) { Bitmap::SetPrefSize( rSize ); } - Size GetSizePixel() const { return Bitmap::GetSizePixel(); } - void SetSizePixel( const Size& rNewSize ) { Bitmap::SetSizePixel( rNewSize ); } + 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(); } + ULONG GetSizeBytes() const { return Bitmap::GetSizeBytes(); } + ULONG GetChecksum() const { return Bitmap::GetChecksum(); } - Bitmap GetBitmap() const; + Bitmap GetBitmap() const; public: @@ -96,14 +96,14 @@ public: public: - BitmapReadAccess* AcquireReadAccess() { return Bitmap::AcquireReadAccess(); } - BitmapWriteAccess* AcquireWriteAccess() { return Bitmap::AcquireWriteAccess(); } - void ReleaseAccess( BitmapReadAccess* pAccess ); + BitmapReadAccess* AcquireReadAccess() { return Bitmap::AcquireReadAccess(); } + BitmapWriteAccess* AcquireWriteAccess() { return Bitmap::AcquireWriteAccess(); } + void ReleaseAccess( BitmapReadAccess* pAccess ); 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 ); } + 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 ); } 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..b7b816c2b822 100644 --- a/vcl/inc/vcl/animate.hxx +++ b/vcl/inc/vcl/animate.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -48,7 +48,7 @@ enum Disposal DISPOSE_NOT, DISPOSE_BACK, DISPOSE_FULL, - DISPOSE_PREVIOUS + DISPOSE_PREVIOUS }; enum CycleMode @@ -66,25 +66,25 @@ enum CycleMode struct VCL_DLLPUBLIC AnimationBitmap { - BitmapEx aBmpEx; - Point aPosPix; - Size aSizePix; - long nWait; - Disposal eDisposal; - BOOL bUserInput; + BitmapEx aBmpEx; + Point aPosPix; + Size aSizePix; + long nWait; + Disposal eDisposal; + BOOL bUserInput; AnimationBitmap() {} AnimationBitmap( const BitmapEx& rBmpEx, const Point& rPosPix, const Size& rSizePix, long _nWait = 0L, Disposal _eDisposal = DISPOSE_NOT ) : - aBmpEx ( rBmpEx ), - aPosPix ( rPosPix ), - aSizePix ( rSizePix ), - nWait ( _nWait ), - eDisposal ( _eDisposal ), - bUserInput ( FALSE ) {} - - BOOL operator==( const AnimationBitmap& rAnimBmp ) const + aBmpEx ( rBmpEx ), + aPosPix ( rPosPix ), + aSizePix ( rSizePix ), + nWait ( _nWait ), + eDisposal ( _eDisposal ), + bUserInput ( FALSE ) {} + + 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 ); } + BOOL operator!=( const AnimationBitmap& rAnimBmp ) const { return !( *this == rAnimBmp ); } - BOOL IsEqual( const AnimationBitmap& rAnimBmp ) const + 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; + ULONG GetChecksum() const; }; // ------------------- @@ -115,21 +115,21 @@ struct VCL_DLLPUBLIC AnimationBitmap struct AInfo { - Bitmap aLastSaveBitmap; - Bitmap aBackBitmap; - Rectangle aClipRect; - Size aLastSaveSize; - Point aLastSavePoint; - Point aStartOrg; - Size aStartSize; - OutputDevice* pOutDev; - void* pViewData; - long nExtraData; - BOOL bWithSize; - BOOL bPause; - - AInfo() : pOutDev( NULL ), - pViewData( NULL ), + Bitmap aLastSaveBitmap; + Bitmap aBackBitmap; + Rectangle aClipRect; + Size aLastSaveSize; + Point aLastSavePoint; + Point aStartOrg; + Size aStartSize; + OutputDevice* pOutDev; + void* pViewData; + long nExtraData; + BOOL bWithSize; + BOOL bPause; + + AInfo() : pOutDev( NULL ), + pViewData( NULL ), nExtraData( 0L ), bWithSize( FALSE ), bPause( FALSE ) {} @@ -141,26 +141,26 @@ struct AInfo class VCL_DLLPUBLIC Animation { - SAL_DLLPRIVATE static ULONG mnAnimCount; - - List maList; - List maAInfoList; - Link maNotifyLink; - BitmapEx maBitmapEx; - Timer maTimer; - Size maGlobalSize; - List* mpViewList; - void* mpExtraData; - long mnLoopCount; - long mnLoops; - long mnPos; - Disposal meLastDisposal; - CycleMode meCycleMode; - BOOL mbFirst; - BOOL mbIsInAnimation; - BOOL mbWithSize; - BOOL mbLoopTerminated; - BOOL mbIsWaiting; + SAL_DLLPRIVATE static ULONG mnAnimCount; + + List maList; + List maAInfoList; + Link maNotifyLink; + BitmapEx maBitmapEx; + Timer maTimer; + Size maGlobalSize; + List* mpViewList; + void* mpExtraData; + long mnLoopCount; + long mnLoops; + long mnPos; + Disposal meLastDisposal; + CycleMode meCycleMode; + BOOL mbFirst; + BOOL mbIsInAnimation; + BOOL mbWithSize; + BOOL mbLoopTerminated; + BOOL mbIsWaiting; SAL_DLLPRIVATE void ImplRestartTimer( ULONG nTimeout ); @@ -173,81 +173,81 @@ public: SAL_DLLPRIVATE ULONG ImplGetCurPos() const { return mnPos; } -public: +public: Animation(); Animation( const Animation& rAnimation ); ~Animation(); - Animation& operator=( const Animation& rAnimation ); - BOOL operator==( const Animation& rAnimation ) const; - BOOL operator!=( const Animation& rAnimation ) const { return !(*this==rAnimation); } + Animation& operator=( const Animation& rAnimation ); + BOOL operator==( const Animation& rAnimation ) const; + BOOL operator!=( const Animation& rAnimation ) const { return !(*this==rAnimation); } - BOOL IsEqual( const Animation& rAnimation ) const; + BOOL IsEqual( const Animation& rAnimation ) const; - BOOL IsEmpty() const; - void SetEmpty(); + BOOL IsEmpty() const; + void SetEmpty(); - void Clear(); + void Clear(); - BOOL Start( OutputDevice* pOutDev, const Point& rDestPt, long nExtraData = 0, + 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, + 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 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; + 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; } + BOOL IsInAnimation() const { return mbIsInAnimation; } + BOOL IsTransparent() const; + BOOL IsTerminated() const { return mbLoopTerminated; } - const Size& GetDisplaySizePixel() const { return maGlobalSize; } - void SetDisplaySizePixel( const Size& rSize ) { maGlobalSize = rSize; } + const Size& GetDisplaySizePixel() const { return maGlobalSize; } + void SetDisplaySizePixel( const Size& rSize ) { maGlobalSize = rSize; } - const BitmapEx& GetBitmapEx() const { return maBitmapEx; } - void SetBitmapEx( const BitmapEx& rBmpEx ) { maBitmapEx = rBmpEx; } + const BitmapEx& GetBitmapEx() const { return maBitmapEx; } + void SetBitmapEx( const BitmapEx& rBmpEx ) { maBitmapEx = rBmpEx; } - ULONG GetLoopCount() const { return mnLoopCount; } - void SetLoopCount( const ULONG nLoopCount ); - void ResetLoopCount(); + ULONG GetLoopCount() const { return mnLoopCount; } + void SetLoopCount( const ULONG nLoopCount ); + void ResetLoopCount(); - void SetCycleMode( CycleMode eMode ); - CycleMode GetCycleMode() const { return meCycleMode; } + void SetCycleMode( CycleMode eMode ); + CycleMode GetCycleMode() const { return meCycleMode; } - void SetNotifyHdl( const Link& rLink ) { maNotifyLink = rLink; } - const Link& GetNotifyHdl() const { return maNotifyLink; } + 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 ); + 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 ); - List* GetAInfoList() { return &maAInfoList; } - ULONG GetSizeBytes() const; - ULONG GetChecksum() const; + List* GetAInfoList() { return &maAInfoList; } + ULONG GetSizeBytes() const; + ULONG GetChecksum() const; public: - BOOL Convert( BmpConversion eConversion ); - BOOL ReduceColors( USHORT nNewColorCount, + BOOL Convert( BmpConversion eConversion ); + BOOL ReduceColors( USHORT nNewColorCount, BmpReduce eReduce = BMP_REDUCE_SIMPLE ); - BOOL Invert(); - BOOL Mirror( ULONG nMirrorFlags ); - BOOL Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX ); - BOOL Adjust( short nLuminancePercent = 0, + BOOL Invert(); + BOOL Mirror( ULONG nMirrorFlags ); + BOOL Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX ); + BOOL Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, - short nChannelRPercent = 0, - short nChannelGPercent = 0, + short nChannelRPercent = 0, + short nChannelGPercent = 0, short nChannelBPercent = 0, double fGamma = 1.0, BOOL bInvert = FALSE ); - BOOL Filter( BmpFilter eFilter, + BOOL Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, const Link* pProgress = NULL ); - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, Animation& rAnimation ); - friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const Animation& rAnimation ); + friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, Animation& rAnimation ); + friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const Animation& rAnimation ); }; #endif // _SV_ANIMATE_HXX diff --git a/vcl/inc/vcl/apptypes.hxx b/vcl/inc/vcl/apptypes.hxx index eba7f779ee81..b2f17a34e8f1 100644 --- a/vcl/inc/vcl/apptypes.hxx +++ b/vcl/inc/vcl/apptypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/arrange.hxx b/vcl/inc/vcl/arrange.hxx index 45433f4f351e..8cb5af4a77c3 100644 --- a/vcl/inc/vcl/arrange.hxx +++ b/vcl/inc/vcl/arrange.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -90,7 +90,7 @@ namespace vcl {} void deleteChild() { m_pChild.reset(); } - + sal_Int32 getExpandPriority() const; Size getOptimalSize( WindowSizeType ) const; bool isVisible() const; @@ -101,11 +101,11 @@ namespace vcl WindowArranger* m_pParentArranger; Rectangle m_aManagedArea; long m_nOuterBorder; - + 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: WindowArranger( WindowArranger* i_pParent = NULL ) @@ -125,7 +125,7 @@ namespace vcl // be direct children of that window // violating that condition will result in undefined behavior virtual void setParentWindow( Window* ); - + virtual void setParent( WindowArranger* ); virtual size_t countElements() const = 0; @@ -139,21 +139,21 @@ namespace vcl const Element* pEle = getConstElement( i_nIndex ); return pEle ? pEle->m_pElement : NULL; } - + virtual bool isVisible() const; // true if any element is visible - + sal_Int32 getExpandPriority( size_t i_nIndex ) const { const Element* pEle = getConstElement( i_nIndex ); return pEle ? pEle->getExpandPriority() : 0; } - + Size getMinimumSize( size_t i_nIndex ) const { const Element* pEle = getConstElement( i_nIndex ); return pEle ? pEle->m_aMinSize : Size(); } - + bool setMinimumSize( size_t i_nIndex, const Size& i_rMinSize ) { Element* pEle = getElement( i_nIndex ); @@ -173,7 +173,7 @@ namespace vcl pEle->m_nBottomBorder = i_nBottom; } } - + void show( bool i_bShow = true, bool i_bImmediateUpdate = true ); void setManagedArea( const Rectangle& i_rArea ) @@ -227,7 +227,7 @@ namespace vcl size_t addChild( WindowArranger* i_pNewChild, sal_Int32 i_nExpandPrio = 0, size_t i_nIndex = ~0 ) { return addChild( boost::shared_ptr<WindowArranger>( i_pNewChild ), i_nExpandPrio, i_nIndex ); } void remove( boost::shared_ptr<WindowArranger> const & ); - + long getBorderWidth() const { return m_nBorderWidth; } }; @@ -268,13 +268,13 @@ namespace vcl void setElement( boost::shared_ptr<WindowArranger> const & ); void setLabelColumnWidth( long i_nWidth ) { m_nLabelColumnWidth = i_nWidth; } - + Size getLabelSize( WindowSizeType i_eType ) const { return m_aLabel.getOptimalSize( i_eType ); } Size getElementSize( WindowSizeType i_eType ) const { return m_aElement.getOptimalSize( i_eType ); } }; - + class LabelColumn : public RowOrColumn { long getLabelWidth() const; @@ -283,10 +283,10 @@ namespace vcl : RowOrColumn( i_pParent, true, i_nBorderWidth ) {} virtual ~LabelColumn(); - + virtual Size getOptimalSize( WindowSizeType ) const; virtual void resize(); - + // 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 ); @@ -325,7 +325,7 @@ namespace vcl void setChild( WindowArranger* i_pChild, sal_Int32 i_nExpandPrio = 0 ) { setChild( boost::shared_ptr<WindowArranger>( i_pChild ), i_nExpandPrio ); } }; - + class Spacer : public WindowArranger { WindowArranger::Element m_aElement; @@ -356,18 +356,18 @@ namespace vcl { long m_nBorderX; long m_nBorderY; - + struct MatrixElement : public WindowArranger::Element { sal_uInt32 m_nX; sal_uInt32 m_nY; - + MatrixElement() : WindowArranger::Element() , m_nX( 0 ) , m_nY( 0 ) {} - + MatrixElement( Window* i_pWin, sal_uInt32 i_nX, sal_uInt32 i_nY, boost::shared_ptr<WindowArranger> const & i_pChild = boost::shared_ptr<WindowArranger>(), @@ -382,7 +382,7 @@ namespace vcl std::vector< MatrixElement > m_aElements; std::map< sal_uInt64, size_t > m_aMatrixMap; // maps (x | (y << 32)) to index in m_aElements - + 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 ); } diff --git a/vcl/inc/vcl/bitmap.hxx b/vcl/inc/vcl/bitmap.hxx index b84ed70db927..58195e9ae7dd 100644 --- a/vcl/inc/vcl/bitmap.hxx +++ b/vcl/inc/vcl/bitmap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -39,35 +39,35 @@ // - Defines - // ----------- -#define BMP_MIRROR_NONE 0x00000000UL -#define BMP_MIRROR_HORZ 0x00000001UL -#define BMP_MIRROR_VERT 0x00000002UL +#define BMP_MIRROR_NONE 0x00000000UL +#define BMP_MIRROR_HORZ 0x00000001UL +#define BMP_MIRROR_VERT 0x00000002UL // ----------------------------------------------------------------------------- -#define BMP_SCALE_NONE 0x00000000UL -#define BMP_SCALE_FAST 0x00000001UL -#define BMP_SCALE_INTERPOLATE 0x00000002UL +#define BMP_SCALE_NONE 0x00000000UL +#define BMP_SCALE_FAST 0x00000001UL +#define BMP_SCALE_INTERPOLATE 0x00000002UL // ----------------------------------------------------------------------------- -#define BMP_DITHER_NONE 0x00000000UL -#define BMP_DITHER_MATRIX 0x00000001UL -#define BMP_DITHER_FLOYD 0x00000002UL -#define BMP_DITHER_FLOYD_16 0x00000004UL +#define BMP_DITHER_NONE 0x00000000UL +#define BMP_DITHER_MATRIX 0x00000001UL +#define BMP_DITHER_FLOYD 0x00000002UL +#define BMP_DITHER_FLOYD_16 0x00000004UL // ----------------------------------------------------------------------------- -#define BMP_VECTORIZE_NONE BMP_VECTORIZE_OUTER -#define BMP_VECTORIZE_INNER 0x00000001UL -#define BMP_VECTORIZE_OUTER 0x00000002UL -#define BMP_VECTORIZE_BOUND_ONLY 0x00000004UL -#define BMP_VECTORIZE_REDUCE_EDGES 0x00000008UL +#define BMP_VECTORIZE_NONE BMP_VECTORIZE_OUTER +#define BMP_VECTORIZE_INNER 0x00000001UL +#define BMP_VECTORIZE_OUTER 0x00000002UL +#define BMP_VECTORIZE_BOUND_ONLY 0x00000004UL +#define BMP_VECTORIZE_REDUCE_EDGES 0x00000008UL // ----------------------------------------------------------------------------- -#define BMP_COL_TRANS Color( 252, 3, 251 ) -#define BMP_COLOR_MONOCHROME_THRESHOLD 128 +#define BMP_COL_TRANS Color( 252, 3, 251 ) +#define BMP_COLOR_MONOCHROME_THRESHOLD 128 // --------- // - Enums - @@ -164,9 +164,9 @@ class VCL_DLLPUBLIC BmpFilterParam friend class Animation; private: - BmpFilter meFilter; - ULONG mnProgressStart; - ULONG mnProgressEnd; + BmpFilter meFilter; + ULONG mnProgressStart; + ULONG mnProgressEnd; public: struct MosaicTileSize @@ -184,8 +184,8 @@ public: private: union { - USHORT mnSepiaPercent; - BYTE mcSolarGreyThreshold; + USHORT mnSepiaPercent; + BYTE mcSolarGreyThreshold; MosaicTileSize maMosaicTileSize; EmbossAngles maEmbossAngles; @@ -231,8 +231,8 @@ class Color; class SvStream; struct DIBInfoHeader; class ResId; -class GDIMetaFile; -class AlphaMask; +class GDIMetaFile; +class AlphaMask; class OutputDevice; class SalBitmap; @@ -288,25 +288,25 @@ public: 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 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, 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 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 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 ); public: @@ -322,11 +322,11 @@ public: inline BOOL operator==( const Bitmap& rBitmap ) const; inline BOOL operator!=( const Bitmap& rBitmap ) const; - inline BOOL IsSameInstance( const Bitmap& rBmp ) const; - BOOL IsEqual( const Bitmap& rBmp ) const; + inline BOOL IsSameInstance( const Bitmap& rBmp ) const; + BOOL IsEqual( const Bitmap& rBmp ) const; - inline BOOL IsEmpty() const; - void SetEmpty(); + inline BOOL IsEmpty() const; + void SetEmpty(); inline const MapMode& GetPrefMapMode() const; inline void SetPrefMapMode( const MapMode& rMapMode ); @@ -335,7 +335,7 @@ public: inline void SetPrefSize( const Size& rSize ); Size GetSizePixel() const; - void SetSizePixel( const Size& rNewSize ); + void SetSizePixel( const Size& rNewSize ); /** * The pixel size of a bitmap's source (e.g. an image file) @@ -349,17 +349,17 @@ public: USHORT GetBitCount() const; inline ULONG GetColorCount() const; inline ULONG GetSizeBytes() const; - BOOL HasGreyPalette() const; + 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) */ bool GetSystemData( BitmapSystemData& rData ) const; - ULONG GetChecksum() const; + ULONG GetChecksum() const; Bitmap CreateDisplayBitmap( OutputDevice* pDisplay ); Bitmap GetColorTransformedBitmap( BmpColorMode eColorMode ) const; @@ -390,7 +390,7 @@ public: @return TRUE, if the color reduction operation was completed successfully. */ - BOOL ReduceColors( USHORT nNewColorCount, + BOOL ReduceColors( USHORT nNewColorCount, BmpReduce eReduce = BMP_REDUCE_SIMPLE ); /** Apply a dither algorithm to the bitmap @@ -405,7 +405,7 @@ public: @param pDitherPal A custom palette to be used when dithering (not yet implemented, leave NULL) */ - BOOL Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX ); + BOOL Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX ); /** Crop the bitmap @@ -425,7 +425,7 @@ public: /** Expand the bitmap by pixel padding - @param nDX + @param nDX Number of pixel to pad at the right border of the bitmap @param nDY @@ -438,7 +438,7 @@ public: 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, + BOOL Expand( ULONG nDX, ULONG nDY, const Color* pInitColor = NULL ); /** Copy a rectangular area from another bitmap @@ -471,7 +471,7 @@ public: @param rMask The mask bitmap in the selected combine operation - + @param eCombine The combine operation to perform on the bitmap @@ -496,8 +496,8 @@ public: @return TRUE, if blending was successful, FALSE otherwise */ - BOOL Blend( const AlphaMask& rAlpha, - const Color& rBackgroundColor ); + BOOL Blend( const AlphaMask& rAlpha, + const Color& rBackgroundColor ); /** Fill the entire bitmap with the given color @@ -513,13 +513,13 @@ public: @return TRUE, if the operation was completed successfully. */ 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 TRUE, if the operation was completed successfully. */ BOOL Mirror( ULONG nMirrorFlags ); @@ -531,7 +531,7 @@ public: @param nScaleFlag The algorithm to be used for scaling - @return TRUE, if the operation was completed successfully. + @return TRUE, if the operation was completed successfully. */ BOOL Scale( const Size& rNewSize, ULONG nScaleFlag = BMP_SCALE_FAST ); @@ -544,9 +544,9 @@ public: @param rScaleY The scale factor in y direction. - @return TRUE, if the operation was completed successfully. + @return TRUE, if the operation was completed successfully. */ - BOOL Scale( const double& rScaleX, const double& rScaleY, + BOOL Scale( const double& rScaleX, const double& rScaleY, ULONG nScaleFlag = BMP_SCALE_FAST ); /** Rotate bitmap by the specified angle @@ -560,7 +560,7 @@ 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 TRUE, if the operation was completed successfully. */ BOOL Rotate( long nAngle10, const Color& rFillColor ); @@ -593,17 +593,17 @@ public: @return the generated region. */ - Region CreateRegion( const Color& rColor, const Rectangle& rRect ) const; + Region CreateRegion( const Color& rColor, const Rectangle& rRect ) const; /** Replace all pixel where the given mask is on with the specified color @param rMask Mask specifying which pixel should be replaced - + @param rReplaceColor Color to be placed in all changed pixel - @return TRUE, if the operation was completed successfully. + @return TRUE, if the operation was completed successfully. */ BOOL Replace( const Bitmap& rMask, const Color& rReplaceColor ); @@ -611,11 +611,11 @@ public: @param rAlpha Alpha mask specifying the amount of background color to merge in - + @param rMergeColor Background color to be used for merging - @return TRUE, if the operation was completed successfully. + @return TRUE, if the operation was completed successfully. */ BOOL Replace( const AlphaMask& rAlpha, const Color& rMergeColor ); @@ -623,7 +623,7 @@ public: @param rSearchColor Color specifying which pixel should be replaced - + @param rReplaceColor Color to be placed in all changed pixel @@ -632,7 +632,7 @@ 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 TRUE, if the operation was completed successfully. */ BOOL Replace( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 ); @@ -640,7 +640,7 @@ public: @param pSearchColor Array of colors specifying which pixel should be replaced - + @param pReplaceColor Array of colors to be placed in all changed pixel @@ -652,12 +652,12 @@ 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 TRUE, if the operation was completed successfully. */ - BOOL Replace( const Color* pSearchColors, const Color* rReplaceColors, + BOOL Replace( const Color* pSearchColors, const Color* rReplaceColors, ULONG nColorCount, ULONG* pTols = NULL ); - /** Convert the bitmap to a PolyPolygon + /** Convert the bitmap to a PolyPolygon This works by putting continuous areas of the same color into a polygon, by tracing its bounding line. @@ -672,9 +672,9 @@ public: @param pProgress A callback for showing the progress of the vectorization - @return TRUE, if the operation was completed successfully. + @return TRUE, if the operation was completed successfully. */ - BOOL Vectorize( PolyPolygon& rPolyPoly, + BOOL Vectorize( PolyPolygon& rPolyPoly, ULONG nFlags = BMP_VECTORIZE_OUTER, const Link* pProgress = NULL ); @@ -697,9 +697,9 @@ public: @param pProgress A callback for showing the progress of the vectorization - @return TRUE, if the operation was completed successfully. + @return TRUE, if the operation was completed successfully. */ - BOOL Vectorize( GDIMetaFile& rMtf, BYTE cReduce = 0, + BOOL Vectorize( GDIMetaFile& rMtf, BYTE cReduce = 0, ULONG nFlags = BMP_VECTORIZE_INNER, const Link* pProgress = NULL ); @@ -728,12 +728,12 @@ public: @param bInvert If TRUE, invert the channel values with the logical 'not' operator - @return TRUE, if the operation was completed successfully. + @return TRUE, if the operation was completed successfully. */ - BOOL Adjust( short nLuminancePercent = 0, + BOOL Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, - short nChannelRPercent = 0, - short nChannelGPercent = 0, + short nChannelRPercent = 0, + short nChannelGPercent = 0, short nChannelBPercent = 0, double fGamma = 1.0, BOOL bInvert = FALSE ); @@ -748,10 +748,10 @@ public: @param pProgress A callback for showing the progress of the vectorization - - @return TRUE, if the operation was completed successfully. + + @return TRUE, if the operation was completed successfully. */ - BOOL Filter( BmpFilter eFilter, + BOOL Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, const Link* pProgress = NULL ); @@ -801,7 +801,7 @@ inline BOOL Bitmap::IsSameInstance( const Bitmap& rBitmap ) const // ------------------------------------------------------------------ -inline BOOL Bitmap::IsEmpty() const +inline BOOL Bitmap::IsEmpty() const { return( mpImpBmp == NULL ); } diff --git a/vcl/inc/vcl/bitmapex.hxx b/vcl/inc/vcl/bitmapex.hxx index 15e38cf1c286..79cee2120378 100644 --- a/vcl/inc/vcl/bitmapex.hxx +++ b/vcl/inc/vcl/bitmapex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,7 +40,7 @@ enum TransparentType { - TRANSPARENT_NONE, + TRANSPARENT_NONE, TRANSPARENT_COLOR, TRANSPARENT_BITMAP }; @@ -55,12 +55,12 @@ class VCL_DLLPUBLIC BitmapEx private: - Bitmap aBitmap; - Bitmap aMask; - Size aBitmapSize; - Color aTransparentColor; - TransparentType eTransparent; - BOOL bAlpha; + Bitmap aBitmap; + Bitmap aMask; + Size aBitmapSize; + Color aTransparentColor; + TransparentType eTransparent; + BOOL bAlpha; public: @@ -80,51 +80,51 @@ public: BitmapEx( const Bitmap& rBmp, const Color& rTransparentColor ); ~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; } + 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; } - BOOL IsEqual( const BitmapEx& rBmpEx ) const; + BOOL IsEqual( const BitmapEx& rBmpEx ) const; - BOOL IsEmpty() const; - void SetEmpty(); - void Clear(); + BOOL IsEmpty() const; + void SetEmpty(); + void Clear(); - void Draw( OutputDevice* pOutDev, + void Draw( OutputDevice* pOutDev, const Point& rDestPt ) const; - void Draw( OutputDevice* pOutDev, + void Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSize ) const; - void Draw( OutputDevice* pOutDev, + void Draw( OutputDevice* pOutDev, const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel ) const; - BOOL IsTransparent() const; - TransparentType GetTransparentType() const { return eTransparent; } + BOOL IsTransparent() const; + TransparentType GetTransparentType() const { return eTransparent; } - Bitmap GetBitmap( const Color* pTransReplaceColor = NULL ) const; - Bitmap GetMask() const; + Bitmap GetBitmap( const Color* pTransReplaceColor = NULL ) const; + Bitmap GetMask() const; BitmapEx GetColorTransformedBitmapEx( BmpColorMode eColorMode ) const; - BOOL IsAlpha() const; - AlphaMask GetAlpha() const; + BOOL IsAlpha() const; + AlphaMask GetAlpha() const; const Size& GetSizePixel() const { return aBitmapSize; } - void SetSizePixel( const Size& rNewSize ); + void SetSizePixel( const Size& rNewSize ); - const Size& GetPrefSize() const { return aBitmap.GetPrefSize(); } - void SetPrefSize( const Size& rPrefSize ) { aBitmap.SetPrefSize( rPrefSize ); } + const Size& GetPrefSize() const { return aBitmap.GetPrefSize(); } + void SetPrefSize( const Size& rPrefSize ) { aBitmap.SetPrefSize( rPrefSize ); } - const MapMode& GetPrefMapMode() const { return aBitmap.GetPrefMapMode(); } - void SetPrefMapMode( const MapMode& rPrefMapMode ) { aBitmap.SetPrefMapMode( rPrefMapMode ); } + const MapMode& GetPrefMapMode() const { return aBitmap.GetPrefMapMode(); } + void SetPrefMapMode( const MapMode& rPrefMapMode ) { aBitmap.SetPrefMapMode( rPrefMapMode ); } - const Color& GetTransparentColor() const { return aTransparentColor; } - void SetTransparentColor( const Color& rColor ) { aTransparentColor = rColor; } + 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; + USHORT GetBitCount() const { return aBitmap.GetBitCount(); } + ULONG GetSizeBytes() const; + ULONG GetChecksum() const; public: @@ -135,7 +135,7 @@ public: @return TRUE, if the conversion was completed successfully. */ - BOOL Convert( BmpConversion eConversion ); + BOOL Convert( BmpConversion eConversion ); /** Reduce number of colors for the bitmap @@ -147,7 +147,7 @@ public: @return TRUE, if the color reduction operation was completed successfully. */ - BOOL ReduceColors( USHORT nNewColorCount, + BOOL ReduceColors( USHORT 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 ); + BOOL Dither( ULONG nDitherFlags = BMP_DITHER_MATRIX ); /** Crop the bitmap @@ -175,11 +175,11 @@ public: nothing had to be cropped, because e.g. the crop rectangle included the bitmap, FALSE is returned, too! */ - BOOL Crop( const Rectangle& rRectPixel ); + BOOL Crop( const Rectangle& rRectPixel ); /** Expand the bitmap by pixel padding - @param nDX + @param nDX Number of pixel to pad at the right border of the bitmap @param nDY @@ -192,8 +192,8 @@ public: 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, - const Color* pInitColor = NULL, + BOOL Expand( ULONG nDX, ULONG nDY, + const Color* pInitColor = NULL, BOOL bExpandTransparent = FALSE ); /** Copy a rectangular area from another bitmap @@ -218,7 +218,7 @@ public: nothing had to be done, e.g. because one of the rectangles are empty. */ - BOOL CopyPixel( const Rectangle& rRectDst, + BOOL CopyPixel( const Rectangle& rRectDst, const Rectangle& rRectSrc, const BitmapEx* pBmpExSrc = NULL ); @@ -230,22 +230,22 @@ public: @return TRUE, if the operation was completed successfully. */ - BOOL Erase( const Color& rFillColor ); + BOOL Erase( const Color& rFillColor ); /** Perform the Invert operation on every pixel @return TRUE, if the operation was completed successfully. */ - BOOL Invert(); + 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 TRUE, if the operation was completed successfully. */ - BOOL Mirror( ULONG nMirrorFlags ); + BOOL Mirror( 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 TRUE, if the operation was completed successfully. */ - BOOL Scale( const Size& rNewSize, ULONG nScaleFlag = BMP_SCALE_FAST ); + BOOL Scale( const Size& rNewSize, 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 TRUE, if the operation was completed successfully. */ - BOOL Scale( const double& rScaleX, const double& rScaleY, ULONG nScaleFlag = BMP_SCALE_FAST ); + BOOL Scale( const double& rScaleX, const double& rScaleY, ULONG nScaleFlag = BMP_SCALE_FAST ); /** Rotate bitmap by the specified angle @@ -282,15 +282,15 @@ 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 TRUE, if the operation was completed successfully. */ - BOOL Rotate( long nAngle10, const Color& rFillColor ); + BOOL Rotate( long nAngle10, const Color& rFillColor ); /** Replace all pixel having the search color with the specified color @param rSearchColor Color specifying which pixel should be replaced - + @param rReplaceColor Color to be placed in all changed pixel @@ -299,15 +299,15 @@ 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 TRUE, if the operation was completed successfully. */ - BOOL Replace( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 ); + BOOL Replace( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 ); /** Replace all pixel having one the search colors with the corresponding replace color @param pSearchColor Array of colors specifying which pixel should be replaced - + @param pReplaceColor Array of colors to be placed in all changed pixel @@ -319,9 +319,9 @@ 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 TRUE, if the operation was completed successfully. */ - BOOL Replace( const Color* pSearchColors, const Color* pReplaceColors, + BOOL Replace( const Color* pSearchColors, const Color* pReplaceColors, ULONG nColorCount, const ULONG* pTols = NULL ); /** Change various global color characteristics @@ -349,12 +349,12 @@ public: @param bInvert If TRUE, invert the channel values with the logical 'not' operator - @return TRUE, if the operation was completed successfully. + @return TRUE, if the operation was completed successfully. */ - BOOL Adjust( short nLuminancePercent = 0, + BOOL Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, - short nChannelRPercent = 0, - short nChannelGPercent = 0, + short nChannelRPercent = 0, + short nChannelGPercent = 0, short nChannelBPercent = 0, double fGamma = 1.0, BOOL bInvert = FALSE ); @@ -369,10 +369,10 @@ public: @param pProgress A callback for showing the progress of the vectorization - - @return TRUE, if the operation was completed successfully. + + @return TRUE, if the operation was completed successfully. */ - BOOL Filter( BmpFilter eFilter, + BOOL Filter( BmpFilter eFilter, const BmpFilterParam* pFilterParam = NULL, const Link* pProgress = NULL ); @@ -391,8 +391,8 @@ public: public: - friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx ); - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx ); + friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const BitmapEx& rBitmapEx ); + friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, BitmapEx& rBitmapEx ); static BitmapEx AutoScaleBitmap(BitmapEx & aBitmap, const long aStandardSize); }; diff --git a/vcl/inc/vcl/bmpacc.hxx b/vcl/inc/vcl/bmpacc.hxx index e3530b786e65..3c1801b6b798 100644 --- a/vcl/inc/vcl/bmpacc.hxx +++ b/vcl/inc/vcl/bmpacc.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -89,7 +89,7 @@ private: BitmapReadAccess() {} BitmapReadAccess( const BitmapReadAccess& ) {} - BitmapReadAccess& operator=( const BitmapReadAccess& ) { return *this; } + BitmapReadAccess& operator=( const BitmapReadAccess& ) { return *this; } protected: Bitmap maBitmap; @@ -168,8 +168,8 @@ public: inline BitmapColor GetPixelFromData( const BYTE* pData, long nX ) const; inline void SetPixelOnData( BYTE* 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 BitmapColor GetColor( long nY, long nX ) const; + inline BYTE GetLuminance( long nY, long nX ) const; }; // --------------------- @@ -184,7 +184,7 @@ public: virtual ~BitmapWriteAccess(); void CopyScanline( long nY, const BitmapReadAccess& rReadAcc ); - void CopyScanline( long nY, ConstScanline aSrcScanline, + void CopyScanline( long nY, ConstScanline aSrcScanline, ULONG nSrcScanlineFormat, ULONG nSrcScanlineSize ); void CopyBuffer( const BitmapReadAccess& rReadAcc ); @@ -195,15 +195,15 @@ public: inline void SetPixel( long nY, long nX, const BitmapColor& rBitmapColor ); - void SetLineColor(); - void SetLineColor( const Color& rColor ); - Color GetLineColor() const; + void SetLineColor(); + void SetLineColor( const Color& rColor ); + Color GetLineColor() const; - void SetFillColor(); - void SetFillColor( const Color& rColor ); - Color GetFillColor() const; + void SetFillColor(); + void SetFillColor( const Color& rColor ); + Color GetFillColor() const; - void Erase( const Color& rColor ); + void Erase( const Color& rColor ); void DrawLine( const Point& rStart, const Point& rEnd ); @@ -219,18 +219,18 @@ public: private: BitmapColor* mpLineColor; - BitmapColor* mpFillColor; + BitmapColor* mpFillColor; BitmapWriteAccess() {} BitmapWriteAccess( const BitmapWriteAccess& ) : BitmapReadAccess() {} - BitmapWriteAccess& operator=( const BitmapWriteAccess& ) { return *this; } + BitmapWriteAccess& operator=( const BitmapWriteAccess& ) { return *this; } }; // ------------------- // - Accessor Helper - // ------------------- -/** This template handles BitmapAccess the RAII way. +/** This template handles BitmapAccess the RAII way. Please don't use directly, but the ready-made typedefs for BitmapReadAccess and BitmapWriteAccess below. @@ -250,23 +250,23 @@ public: mrBitmap.ReleaseAccess( mpAccess ); } - Access* get() { return mpAccess; } - const Access* get() const { return mpAccess; } + Access* get() { return mpAccess; } + const Access* get() const { return mpAccess; } - Access* operator->() { return mpAccess; } - const Access* operator->() const { return mpAccess; } + Access* operator->() { return mpAccess; } + const Access* operator->() const { return mpAccess; } - Access& operator*() { return *mpAccess; } - const Access& operator*() const { return *mpAccess; } + Access& operator*() { return *mpAccess; } + const Access& operator*() const { return *mpAccess; } private: - Access* mpAccess; - Bitmap& mrBitmap; + Access* mpAccess; + Bitmap& mrBitmap; }; /** This wrapper handles BitmapReadAccess the RAII way. - Use as follows: + Use as follows: Bitmap aBitmap ScopedBitmapReadAccess pReadAccess( aBitmap.AcquireReadAccess(), aBitmap ); pReadAccess->SetPixel()... @@ -280,7 +280,7 @@ typedef ScopedBitmapAccess< BitmapReadAccess > ScopedBitmapReadAccess; /** This wrapper handles BitmapWriteAccess the RAII way. - Use as follows: + Use as follows: Bitmap aBitmap ScopedBitmapWriteAccess pWriteAccess( aBitmap.AcquireWriteAccess(), aBitmap ); pWriteAccess->SetPixel()... diff --git a/vcl/inc/vcl/bmpfast.hxx b/vcl/inc/vcl/bmpfast.hxx index b43df0e115b2..ae4fe0b033af 100644 --- a/vcl/inc/vcl/bmpfast.hxx +++ b/vcl/inc/vcl/bmpfast.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/brdwin.hxx b/vcl/inc/vcl/brdwin.hxx index 016e50e1366e..219cbb84bba6 100644 --- a/vcl/inc/vcl/brdwin.hxx +++ b/vcl/inc/vcl/brdwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -38,55 +38,55 @@ 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_DRAW_ALL (BORDERWINDOW_DRAW_TITLE | \ - BORDERWINDOW_DRAW_BORDER | \ - BORDERWINDOW_DRAW_FRAME | \ - BORDERWINDOW_DRAW_CLOSE | \ - BORDERWINDOW_DRAW_ROLL | \ - BORDERWINDOW_DRAW_DOCK | \ - BORDERWINDOW_DRAW_HIDE | \ - BORDERWINDOW_DRAW_HELP | \ - BORDERWINDOW_DRAW_PIN | \ +#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_DRAW_ALL (BORDERWINDOW_DRAW_TITLE | \ + BORDERWINDOW_DRAW_BORDER | \ + BORDERWINDOW_DRAW_FRAME | \ + BORDERWINDOW_DRAW_CLOSE | \ + BORDERWINDOW_DRAW_ROLL | \ + BORDERWINDOW_DRAW_DOCK | \ + BORDERWINDOW_DRAW_HIDE | \ + BORDERWINDOW_DRAW_HELP | \ + 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 ((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) // -------------------- // - ImplBorderWindow - @@ -100,34 +100,34 @@ class ImplBorderWindow : public Window friend class ImplStdBorderWindowView; private: - ImplBorderWindowView* mpBorderView; - Window* mpMenuBarWindow; - long mnMinWidth; - long mnMinHeight; - long mnMaxWidth; - 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; + ImplBorderWindowView* mpBorderView; + Window* mpMenuBarWindow; + long mnMinWidth; + long mnMinHeight; + long mnMaxWidth; + 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; + BOOL mbDisplayActive; using Window::ImplInit; - void ImplInit( Window* pParent, + void ImplInit( Window* pParent, WinBits nStyle, USHORT nTypeStyle, SystemParentData* pParentData ); - void ImplInit( Window* pParent, - WinBits nStyle, USHORT nTypeStyle, + void ImplInit( Window* pParent, + WinBits nStyle, USHORT nTypeStyle, const ::com::sun::star::uno::Any& ); // Copy assignment is forbidden and not implemented. @@ -142,53 +142,53 @@ public: ImplBorderWindow( Window* pParent, WinBits nStyle = 0, USHORT nTypeStyle = 0 ); ImplBorderWindow( Window* pParent, - WinBits nStyle, USHORT nTypeStyle, + WinBits nStyle, USHORT nTypeStyle, const ::com::sun::star::uno::Any& ); ~ImplBorderWindow(); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Activate(); - virtual void Deactivate(); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - void InitView(); - void UpdateView( BOOL bNewView, const Size& rNewOutSize ); - void InvalidateBorder(); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Activate(); + virtual void Deactivate(); + virtual void Resize(); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + void InitView(); + void UpdateView( 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 SetCloser(); - void SetDockButton( BOOL bDockButton ); - void SetHideButton( BOOL bHideButton ); - void SetHelpButton( BOOL bHelpButton ); - void SetMenuButton( BOOL bMenuButton ); - - void UpdateMenuHeight(); - void SetMenuBarWindow( Window* pWindow ); - void SetMenuBarMode( BOOL bHide ); - - void SetMinOutputSize( long nWidth, long nHeight ) + 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 SetCloser(); + void SetDockButton( BOOL bDockButton ); + void SetHideButton( BOOL bHideButton ); + void SetHelpButton( BOOL bHelpButton ); + void SetMenuButton( BOOL bMenuButton ); + + void UpdateMenuHeight(); + void SetMenuBarWindow( Window* pWindow ); + void SetMenuBarMode( BOOL bHide ); + + void SetMinOutputSize( long nWidth, long nHeight ) { mnMinWidth = nWidth; mnMinHeight = nHeight; } - void SetMaxOutputSize( long nWidth, long nHeight ) + void SetMaxOutputSize( long nWidth, long nHeight ) { mnMaxWidth = nWidth; mnMaxHeight = nHeight; } - void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, + void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, sal_Int32& rRightBorder, sal_Int32& rBottomBorder ) const; - long CalcTitleWidth() const; + long CalcTitleWidth() const; Rectangle GetMenuRect() const; }; @@ -201,42 +201,42 @@ public: struct ImplBorderFrameData { - ImplBorderWindow* mpBorderWindow; - OutputDevice* mpOutDev; - Rectangle maTitleRect; - Rectangle maPinRect; - Rectangle maCloseRect; - Rectangle maRollRect; - Rectangle maDockRect; - Rectangle maMenuRect; - Rectangle maHideRect; - Rectangle maHelpRect; - Point maMouseOff; - long mnWidth; - long mnHeight; - long mnTrackX; - long mnTrackY; - long mnTrackWidth; - long mnTrackHeight; - sal_Int32 mnLeftBorder; - sal_Int32 mnTopBorder; - sal_Int32 mnRightBorder; - sal_Int32 mnBottomBorder; - long mnNoTitleTop; - 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; + ImplBorderWindow* mpBorderWindow; + OutputDevice* mpOutDev; + Rectangle maTitleRect; + Rectangle maPinRect; + Rectangle maCloseRect; + Rectangle maRollRect; + Rectangle maDockRect; + Rectangle maMenuRect; + Rectangle maHideRect; + Rectangle maHelpRect; + Point maMouseOff; + long mnWidth; + long mnHeight; + long mnTrackX; + long mnTrackY; + long mnTrackWidth; + long mnTrackHeight; + sal_Int32 mnLeftBorder; + sal_Int32 mnTopBorder; + sal_Int32 mnRightBorder; + sal_Int32 mnBottomBorder; + long mnNoTitleTop; + 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; }; @@ -249,27 +249,27 @@ struct ImplBorderFrameData class ImplBorderWindowView { public: - virtual ~ImplBorderWindowView(); + virtual ~ImplBorderWindowView(); - virtual BOOL MouseMove( const MouseEvent& rMEvt ); - virtual BOOL MouseButtonDown( const MouseEvent& rMEvt ); - virtual BOOL Tracking( const TrackingEvent& rTEvt ); - virtual String RequestHelp( const Point& rPos, Rectangle& rHelpRect ); + virtual BOOL MouseMove( const MouseEvent& rMEvt ); + virtual BOOL MouseButtonDown( const MouseEvent& rMEvt ); + virtual 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, + 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 long CalcTitleWidth() const = 0; + virtual void DrawWindow( USHORT 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 ); - String ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect ); - long ImplCalcTitleWidth( const ImplBorderFrameData* pData ) 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 ); + String ImplRequestHelp( ImplBorderFrameData* pData, const Point& rPos, Rectangle& rHelpRect ); + long ImplCalcTitleWidth( const ImplBorderFrameData* pData ) const; }; // ======================================================================= @@ -283,11 +283,11 @@ class ImplNoBorderWindowView : public ImplBorderWindowView public: ImplNoBorderWindowView( ImplBorderWindow* pBorderWindow ); - virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ); - virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, + virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ); + 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 long CalcTitleWidth() const; + virtual void DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); }; @@ -299,24 +299,24 @@ public: class ImplSmallBorderWindowView : public ImplBorderWindowView { - ImplBorderWindow* mpBorderWindow; - OutputDevice* mpOutDev; - long mnWidth; - long mnHeight; - sal_Int32 mnLeftBorder; - sal_Int32 mnTopBorder; - sal_Int32 mnRightBorder; - sal_Int32 mnBottomBorder; + ImplBorderWindow* mpBorderWindow; + OutputDevice* mpOutDev; + long mnWidth; + long mnHeight; + sal_Int32 mnLeftBorder; + sal_Int32 mnTopBorder; + sal_Int32 mnRightBorder; + sal_Int32 mnBottomBorder; bool mbNWFBorder; public: ImplSmallBorderWindowView( ImplBorderWindow* pBorderWindow ); - virtual void Init( OutputDevice* pOutDev, long nWidth, long nHeight ); - virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, + virtual void Init( OutputDevice* pOutDev, long nWidth, long nHeight ); + 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 long CalcTitleWidth() const; + virtual void DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); }; @@ -329,28 +329,28 @@ public: class ImplStdBorderWindowView : public ImplBorderWindowView { - ImplBorderFrameData maFrameData; - VirtualDevice* mpATitleVirDev; - VirtualDevice* mpDTitleVirDev; + ImplBorderFrameData maFrameData; + VirtualDevice* mpATitleVirDev; + VirtualDevice* mpDTitleVirDev; public: ImplStdBorderWindowView( ImplBorderWindow* pBorderWindow ); ~ImplStdBorderWindowView(); - virtual BOOL MouseMove( const MouseEvent& rMEvt ); - virtual BOOL MouseButtonDown( const MouseEvent& rMEvt ); - virtual BOOL Tracking( const TrackingEvent& rTEvt ); - virtual String RequestHelp( const Point& rPos, Rectangle& rHelpRect ); + virtual BOOL MouseMove( const MouseEvent& rMEvt ); + virtual BOOL MouseButtonDown( const MouseEvent& rMEvt ); + virtual BOOL Tracking( const TrackingEvent& rTEvt ); + virtual String RequestHelp( const Point& rPos, Rectangle& rHelpRect ); virtual Rectangle GetMenuRect() const; - virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ); - virtual void GetBorder( sal_Int32& rLeftBorder, sal_Int32& rTopBorder, + virtual void Init( OutputDevice* pDev, long nWidth, long nHeight ); + 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 long CalcTitleWidth() const; + virtual void DrawWindow( USHORT nDrawFlags, OutputDevice* pOutDev, const Point* pOffset ); }; -#endif // _SV_BRDWIN_HXX +#endif // _SV_BRDWIN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/btndlg.hxx b/vcl/inc/vcl/btndlg.hxx index b5dca5cdad21..71f962538e76 100644 --- a/vcl/inc/vcl/btndlg.hxx +++ b/vcl/inc/vcl/btndlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -41,13 +41,13 @@ class PushButton; // - ButtonDialog-Types - // ---------------------- -#define BUTTONDIALOG_BUTTON_NOTFOUND ((USHORT)0xFFFF) +#define BUTTONDIALOG_BUTTON_NOTFOUND ((USHORT)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 ((USHORT)0x0001) +#define BUTTONDIALOG_OKBUTTON ((USHORT)0x0002) +#define BUTTONDIALOG_CANCELBUTTON ((USHORT)0x0004) +#define BUTTONDIALOG_HELPBUTTON ((USHORT)0x0008) +#define BUTTONDIALOG_FOCUSBUTTON ((USHORT)0x0010) // ---------------- // - ButtonDialog - @@ -57,19 +57,19 @@ class VCL_DLLPUBLIC ButtonDialog : public Dialog { private: ImplBtnDlgItemList* mpItemList; - Size maPageSize; - Size maCtrlSize; - long mnButtonSize; - USHORT mnCurButtonId; - USHORT mnFocusButtonId; - BOOL mbFormat; - Link maClickHdl; - - SAL_DLLPRIVATE void ImplInitButtonDialogData(); - SAL_DLLPRIVATE PushButton* ImplCreatePushButton( USHORT nBtnFlags ); - SAL_DLLPRIVATE ImplBtnDlgItem* ImplGetItem( USHORT nId ) const; + Size maPageSize; + Size maCtrlSize; + long mnButtonSize; + USHORT mnCurButtonId; + USHORT mnFocusButtonId; + BOOL mbFormat; + Link maClickHdl; + + SAL_DLLPRIVATE void ImplInitButtonDialogData(); + SAL_DLLPRIVATE PushButton* ImplCreatePushButton( USHORT nBtnFlags ); + SAL_DLLPRIVATE ImplBtnDlgItem* ImplGetItem( USHORT nId ) const; DECL_DLLPRIVATE_LINK( ImplClickHdl, PushButton* pBtn ); - SAL_DLLPRIVATE void ImplPosControls(); + SAL_DLLPRIVATE void ImplPosControls(); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE ButtonDialog( const ButtonDialog & ); @@ -83,38 +83,38 @@ public: ButtonDialog( Window* pParent, const ResId& rResId ); ~ButtonDialog(); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void Resize(); + virtual void StateChanged( StateChangedType nStateChange ); - virtual void Click(); + virtual void Click(); - void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } - const Size& GetPageSizePixel() const { return maPageSize; } + void SetPageSizePixel( const Size& rSize ) { maPageSize = rSize; } + const Size& GetPageSizePixel() const { return maPageSize; } - USHORT GetCurButtonId() const { return mnCurButtonId; } + USHORT 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 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 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 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; } + void SetFocusButton( USHORT nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; } + USHORT GetFocusButton() const { return mnFocusButtonId; } - void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } - const Link& GetClickHdl() const { return maClickHdl; } + void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } + const Link& GetClickHdl() const { return maClickHdl; } }; -#endif // _SV_BTNDLG_HXX +#endif // _SV_BTNDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/button.hxx b/vcl/inc/vcl/button.hxx index 706e831869a1..81da43294217 100644 --- a/vcl/inc/vcl/button.hxx +++ b/vcl/inc/vcl/button.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -79,7 +79,7 @@ public: ~Button(); virtual void Click(); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } const Link& GetClickHdl() const { return maClickHdl; } @@ -340,14 +340,14 @@ protected: virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const; - inline void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; } - inline const Rectangle& GetMouseRect( ) const { return maMouseRect; } - inline void SetStateRect( const Rectangle& _rStateRect ) { maStateRect = _rStateRect; } - inline const Rectangle& GetStateRect( ) const { return maStateRect; } + inline void SetMouseRect( const Rectangle& _rMouseRect ) { maMouseRect = _rMouseRect; } + inline const Rectangle& GetMouseRect( ) const { return maMouseRect; } + inline void SetStateRect( const Rectangle& _rStateRect ) { maStateRect = _rStateRect; } + inline const Rectangle& GetStateRect( ) const { return maStateRect; } // draws the radio button (the knob image), in it's current state (pressed/checked) // at the usual location, which can be overridden with SetStateRect - void DrawRadioButtonState( ); + void DrawRadioButtonState( ); public: RadioButton( Window* pParent, WinBits nWinStyle = 0 ); @@ -391,17 +391,17 @@ public: void SetToggleHdl( const Link& rLink ) { maToggleHdl = rLink; } const Link& GetToggleHdl() const { return maToggleHdl; } - + /** GetRadioButtonGroup returns a list of pointers to <code>RadioButton</code>s in the same group. - + The pointers in the returned list are valid at the time call returns. However rescheduling or giving up the SolarMutex may mean events get executed that lead to the pointers getting invalid. - + @param io_rGroup gets cleared on entering the function. on return contains the <code>RadioButton</code>s in the same group as this <code>RadioButton</code>. - + @param bIncludeThis defines whether <code>this</code> is contained in the returned list */ @@ -451,9 +451,9 @@ protected: SAL_DLLPRIVATE virtual void ImplDrawCheckBoxState(); SAL_DLLPRIVATE const Rectangle& GetStateRect() const { return maStateRect; } - SAL_DLLPRIVATE const Rectangle& GetMouseRect() const { return maMouseRect; } + SAL_DLLPRIVATE const Rectangle& GetMouseRect() const { return maMouseRect; } public: - SAL_DLLPRIVATE void ImplCheck(); + SAL_DLLPRIVATE void ImplCheck(); SAL_DLLPRIVATE void ImplSetMinimumNWFSize(); public: CheckBox( Window* pParent, WinBits nStyle = 0 ); diff --git a/vcl/inc/vcl/canvasbitmap.hxx b/vcl/inc/vcl/canvasbitmap.hxx index 4c4ef77ff5f7..0ad9249fb6f0 100644 --- a/vcl/inc/vcl/canvasbitmap.hxx +++ b/vcl/inc/vcl/canvasbitmap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -42,7 +42,7 @@ namespace vcl { namespace unotools { - class VCL_DLLPUBLIC VclCanvasBitmap : + class VCL_DLLPUBLIC VclCanvasBitmap : public cppu::WeakImplHelper3< com::sun::star::rendering::XIntegerReadOnlyBitmap, com::sun::star::rendering::XBitmapPalette, com::sun::star::rendering::XIntegerBitmapColorSpace > @@ -120,7 +120,7 @@ namespace unotools are not reflected in this object (copy on write). */ explicit VclCanvasBitmap( const BitmapEx& rBitmap ); - + /// Retrieve contained bitmap. Call me with locked Solar mutex! BitmapEx getBitmapEx() const; }; diff --git a/vcl/inc/vcl/canvastools.hxx b/vcl/inc/vcl/canvastools.hxx index e82d397a92f0..556af319b871 100644 --- a/vcl/inc/vcl/canvastools.hxx +++ b/vcl/inc/vcl/canvastools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -57,7 +57,7 @@ namespace basegfx class B2DPolyPolygon; } -namespace com { namespace sun { namespace star { namespace geometry +namespace com { namespace sun { namespace star { namespace geometry { struct RealPoint2D; struct RealSize2D; @@ -68,7 +68,7 @@ namespace com { namespace sun { namespace star { namespace geometry struct RealBezierSegment2D; } } } } -namespace com { namespace sun { namespace star { namespace rendering +namespace com { namespace sun { namespace star { namespace rendering { class XGraphicDevice; class XBitmap; @@ -86,40 +86,40 @@ namespace vcl /** Create an XPolyPolygon from VCL/Tools polygon */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > - VCL_DLLPUBLIC xPolyPolygonFromPolygon( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, - const ::Polygon& inputPolygon ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > + VCL_DLLPUBLIC xPolyPolygonFromPolygon( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, + const ::Polygon& inputPolygon ); /** Create an XPolyPolygon from VCL/Tools polyPolygon */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > - VCL_DLLPUBLIC xPolyPolygonFromPolyPolygon( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, - const ::PolyPolygon& inputPolyPolygon ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XPolyPolygon2D > + VCL_DLLPUBLIC xPolyPolygonFromPolyPolygon( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, + const ::PolyPolygon& inputPolyPolygon ); /** Create an VCL/Tools polygon from a point sequence */ - ::Polygon VCL_DLLPUBLIC polygonFromPoint2DSequence( - const ::com::sun::star::uno::Sequence< + ::Polygon VCL_DLLPUBLIC polygonFromPoint2DSequence( + const ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D >& rPoints ); /** Create an VCL/Tools polyPolygon from a point sequence sequence */ - ::PolyPolygon VCL_DLLPUBLIC polyPolygonFromPoint2DSequenceSequence( - const ::com::sun::star::uno::Sequence< + ::PolyPolygon VCL_DLLPUBLIC polyPolygonFromPoint2DSequenceSequence( + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealPoint2D > >& rPoints ); /** Create an VCL/Tools polygon from a bezier segment sequence */ - ::Polygon VCL_DLLPUBLIC polygonFromBezier2DSequence( - const ::com::sun::star::uno::Sequence< + ::Polygon VCL_DLLPUBLIC polygonFromBezier2DSequence( + const ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D >& rPoints ); /** Create an VCL/Tools polyPolygon from a bezier segment sequence sequence */ - ::PolyPolygon VCL_DLLPUBLIC polyPolygonFromBezier2DSequenceSequence( - const ::com::sun::star::uno::Sequence< + ::PolyPolygon VCL_DLLPUBLIC polyPolygonFromBezier2DSequenceSequence( + const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::geometry::RealBezierSegment2D > >& rPoints ); // Bitmap conversions @@ -127,21 +127,21 @@ namespace vcl /** Create an XBitmap from VCL Bitmap */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > - VCL_DLLPUBLIC xBitmapFromBitmap( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, - const ::Bitmap& inputBitmap ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > + VCL_DLLPUBLIC xBitmapFromBitmap( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, + const ::Bitmap& inputBitmap ); /** Create an XBitmap from VCL BitmapEx */ - ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > - VCL_DLLPUBLIC xBitmapFromBitmapEx( const ::com::sun::star::uno::Reference< - ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, - const ::BitmapEx& inputBitmap ); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > + VCL_DLLPUBLIC xBitmapFromBitmapEx( const ::com::sun::star::uno::Reference< + ::com::sun::star::rendering::XGraphicDevice >& xGraphicDevice, + const ::BitmapEx& inputBitmap ); /** Create a BitmapEx from an XBitmap */ - ::BitmapEx VCL_DLLPUBLIC bitmapExFromXBitmap( const ::com::sun::star::uno::Reference< + ::BitmapEx VCL_DLLPUBLIC bitmapExFromXBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XIntegerReadOnlyBitmap >& xInputBitmap ); /** get a unique identifier for identification in XUnoTunnel interface @@ -157,7 +157,7 @@ namespace vcl Note that this method assumes a color space equivalent to the one returned from createStandardColorSpace() */ - ::com::sun::star::uno::Sequence< double > + ::com::sun::star::uno::Sequence< double > VCL_DLLPUBLIC colorToStdColorSpaceSequence( const Color& rColor ); /** Convert color to device color sequence @@ -168,9 +168,9 @@ namespace vcl @param xColorSpace Color space to convert into */ - ::com::sun::star::uno::Sequence< double > + ::com::sun::star::uno::Sequence< double > VCL_DLLPUBLIC colorToDoubleSequence( const Color& rColor, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& xColorSpace ); /** Convert from standard device color space to VCL/Tools color @@ -178,7 +178,7 @@ namespace vcl Note that this method assumes a color space equivalent to the one returned from createStandardColorSpace() */ - Color VCL_DLLPUBLIC stdColorSpaceSequenceToColor( + Color VCL_DLLPUBLIC stdColorSpaceSequenceToColor( const ::com::sun::star::uno::Sequence< double >& rColor ); /** Convert color to device color sequence @@ -190,7 +190,7 @@ namespace vcl Color space to convert from */ Color VCL_DLLPUBLIC doubleSequenceToColor( const ::com::sun::star::uno::Sequence< double > rColor, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XColorSpace >& xColorSpace ); /// Convert [0,1] double value to [0,255] int @@ -213,41 +213,41 @@ namespace vcl // Geometry conversions (vcl/tools <-> x) // =================================================================== - // geometry::Real - ::com::sun::star::geometry::RealSize2D VCL_DLLPUBLIC size2DFromSize( const Size& ); - ::com::sun::star::geometry::RealPoint2D VCL_DLLPUBLIC point2DFromPoint( const Point& ); - ::com::sun::star::geometry::RealRectangle2D VCL_DLLPUBLIC rectangle2DFromRectangle( const Rectangle& ); + // geometry::Real + ::com::sun::star::geometry::RealSize2D VCL_DLLPUBLIC size2DFromSize( const Size& ); + ::com::sun::star::geometry::RealPoint2D VCL_DLLPUBLIC point2DFromPoint( const Point& ); + ::com::sun::star::geometry::RealRectangle2D VCL_DLLPUBLIC rectangle2DFromRectangle( const Rectangle& ); - Size VCL_DLLPUBLIC sizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& ); - Point VCL_DLLPUBLIC pointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& ); - Rectangle VCL_DLLPUBLIC rectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& ); + Size VCL_DLLPUBLIC sizeFromRealSize2D( const ::com::sun::star::geometry::RealSize2D& ); + Point VCL_DLLPUBLIC pointFromRealPoint2D( const ::com::sun::star::geometry::RealPoint2D& ); + Rectangle VCL_DLLPUBLIC rectangleFromRealRectangle2D( const ::com::sun::star::geometry::RealRectangle2D& ); - // geometry::Integer - ::com::sun::star::geometry::IntegerSize2D VCL_DLLPUBLIC integerSize2DFromSize( const Size& ); - ::com::sun::star::geometry::IntegerPoint2D VCL_DLLPUBLIC integerPoint2DFromPoint( const Point& ); - ::com::sun::star::geometry::IntegerRectangle2D VCL_DLLPUBLIC integerRectangle2DFromRectangle( const Rectangle& ); + // geometry::Integer + ::com::sun::star::geometry::IntegerSize2D VCL_DLLPUBLIC integerSize2DFromSize( const Size& ); + ::com::sun::star::geometry::IntegerPoint2D VCL_DLLPUBLIC integerPoint2DFromPoint( const Point& ); + ::com::sun::star::geometry::IntegerRectangle2D VCL_DLLPUBLIC integerRectangle2DFromRectangle( const Rectangle& ); - Size VCL_DLLPUBLIC sizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& ); - Point VCL_DLLPUBLIC pointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& ); - Rectangle VCL_DLLPUBLIC rectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& ); + Size VCL_DLLPUBLIC sizeFromIntegerSize2D( const ::com::sun::star::geometry::IntegerSize2D& ); + Point VCL_DLLPUBLIC pointFromIntegerPoint2D( const ::com::sun::star::geometry::IntegerPoint2D& ); + Rectangle VCL_DLLPUBLIC rectangleFromIntegerRectangle2D( const ::com::sun::star::geometry::IntegerRectangle2D& ); - // basegfx::B2D - Size VCL_DLLPUBLIC sizeFromB2DSize( const ::basegfx::B2DVector& ); - Point VCL_DLLPUBLIC pointFromB2DPoint( const ::basegfx::B2DPoint& ); - Rectangle VCL_DLLPUBLIC rectangleFromB2DRectangle( const ::basegfx::B2DRange& ); + // basegfx::B2D + Size VCL_DLLPUBLIC sizeFromB2DSize( const ::basegfx::B2DVector& ); + Point VCL_DLLPUBLIC pointFromB2DPoint( const ::basegfx::B2DPoint& ); + Rectangle VCL_DLLPUBLIC rectangleFromB2DRectangle( const ::basegfx::B2DRange& ); - basegfx::B2DVector VCL_DLLPUBLIC b2DSizeFromSize( const Size& ); - basegfx::B2DPoint VCL_DLLPUBLIC b2DPointFromPoint( const Point& ); - basegfx::B2DRange VCL_DLLPUBLIC b2DRectangleFromRectangle( const Rectangle& ); + basegfx::B2DVector VCL_DLLPUBLIC b2DSizeFromSize( const Size& ); + basegfx::B2DPoint VCL_DLLPUBLIC b2DPointFromPoint( const Point& ); + basegfx::B2DRange VCL_DLLPUBLIC b2DRectangleFromRectangle( const Rectangle& ); // basegfx::B2I - Size VCL_DLLPUBLIC sizeFromB2ISize( const ::basegfx::B2IVector& ); - Point VCL_DLLPUBLIC pointFromB2IPoint( const ::basegfx::B2IPoint& ); - Rectangle VCL_DLLPUBLIC rectangleFromB2IRectangle( const ::basegfx::B2IRange& ); + Size VCL_DLLPUBLIC sizeFromB2ISize( const ::basegfx::B2IVector& ); + Point VCL_DLLPUBLIC pointFromB2IPoint( const ::basegfx::B2IPoint& ); + Rectangle VCL_DLLPUBLIC rectangleFromB2IRectangle( const ::basegfx::B2IRange& ); - basegfx::B2IVector VCL_DLLPUBLIC b2ISizeFromSize( const Size& ); - basegfx::B2IPoint VCL_DLLPUBLIC b2IPointFromPoint( const Point& ); - basegfx::B2IRange VCL_DLLPUBLIC b2IRectangleFromRectangle( const Rectangle& ); + basegfx::B2IVector VCL_DLLPUBLIC b2ISizeFromSize( const Size& ); + basegfx::B2IPoint VCL_DLLPUBLIC b2IPointFromPoint( const Point& ); + basegfx::B2IRange VCL_DLLPUBLIC b2IRectangleFromRectangle( const Rectangle& ); } } diff --git a/vcl/inc/vcl/cmdevt.h b/vcl/inc/vcl/cmdevt.h index 0ecf03ca22bb..2143d40b398a 100644 --- a/vcl/inc/vcl/cmdevt.h +++ b/vcl/inc/vcl/cmdevt.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -33,31 +33,31 @@ // - CommandVoiceData - // -------------------- -#define DICTATIONCOMMAND_SYSTEM 0x1000 -#define DICTATIONCOMMAND_USER 0x2000 +#define DICTATIONCOMMAND_SYSTEM 0x1000 +#define DICTATIONCOMMAND_USER 0x2000 -#define DICTATIONCOMMAND_UNKNOWN 0x0001 -#define DICTATIONCOMMAND_NEWPARAGRAPH 0x0002 -#define DICTATIONCOMMAND_NEWLINE 0x0003 -#define DICTATIONCOMMAND_BOLD_ON 0x0004 -#define DICTATIONCOMMAND_BOLD_OFF 0x0005 -#define DICTATIONCOMMAND_ITALIC_ON 0x0006 -#define DICTATIONCOMMAND_ITALIC_OFF 0x0007 -#define DICTATIONCOMMAND_UNDERLINE_ON 0x0008 -#define DICTATIONCOMMAND_UNDERLINE_OFF 0x0009 -#define DICTATIONCOMMAND_NUMBERING_ON 0x0010 -#define DICTATIONCOMMAND_NUMBERING_OFF 0x0011 -#define DICTATIONCOMMAND_TAB 0x0012 -#define DICTATIONCOMMAND_LEFT 0x0013 -#define DICTATIONCOMMAND_RIGHT 0x0014 -#define DICTATIONCOMMAND_UP 0x0015 -#define DICTATIONCOMMAND_DOWN 0x0016 -#define DICTATIONCOMMAND_UNDO 0x0017 -#define DICTATIONCOMMAND_REPEAT 0x0018 -#define DICTATIONCOMMAND_DEL 0x0019 +#define DICTATIONCOMMAND_UNKNOWN 0x0001 +#define DICTATIONCOMMAND_NEWPARAGRAPH 0x0002 +#define DICTATIONCOMMAND_NEWLINE 0x0003 +#define DICTATIONCOMMAND_BOLD_ON 0x0004 +#define DICTATIONCOMMAND_BOLD_OFF 0x0005 +#define DICTATIONCOMMAND_ITALIC_ON 0x0006 +#define DICTATIONCOMMAND_ITALIC_OFF 0x0007 +#define DICTATIONCOMMAND_UNDERLINE_ON 0x0008 +#define DICTATIONCOMMAND_UNDERLINE_OFF 0x0009 +#define DICTATIONCOMMAND_NUMBERING_ON 0x0010 +#define DICTATIONCOMMAND_NUMBERING_OFF 0x0011 +#define DICTATIONCOMMAND_TAB 0x0012 +#define DICTATIONCOMMAND_LEFT 0x0013 +#define DICTATIONCOMMAND_RIGHT 0x0014 +#define DICTATIONCOMMAND_UP 0x0015 +#define DICTATIONCOMMAND_DOWN 0x0016 +#define DICTATIONCOMMAND_UNDO 0x0017 +#define DICTATIONCOMMAND_REPEAT 0x0018 +#define DICTATIONCOMMAND_DEL 0x0019 -#define DICTATIONCOMMAND_COMMANDMODE (DICTATIONCOMMAND_SYSTEM + 1) -#define DICTATIONCOMMAND_DICTATIONMODE (DICTATIONCOMMAND_SYSTEM + 2) +#define DICTATIONCOMMAND_COMMANDMODE (DICTATIONCOMMAND_SYSTEM + 1) +#define DICTATIONCOMMAND_DICTATIONMODE (DICTATIONCOMMAND_SYSTEM + 2) #endif // _VCL_CMDEVT_H diff --git a/vcl/inc/vcl/cmdevt.hxx b/vcl/inc/vcl/cmdevt.hxx index 24508a3b3e2f..02ffb79bd3f4 100644 --- a/vcl/inc/vcl/cmdevt.hxx +++ b/vcl/inc/vcl/cmdevt.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -164,7 +164,7 @@ public: { return ((mnCode & KEY_MOD1) != 0); } BOOL IsMod2() const { return ((mnCode & KEY_MOD2) != 0); } - BOOL IsMod3() const + BOOL IsMod3() const { return ((mnCode & KEY_MOD3) != 0); } }; @@ -319,7 +319,7 @@ class VCL_DLLPUBLIC CommandDialogData CommandDialogData( int nDialogId = SHOWDIALOG_ID_PREFERENCES ) : m_nDialogId( nDialogId ) {} - + int GetDialogId() const { return m_nDialogId; } }; @@ -327,23 +327,23 @@ class VCL_DLLPUBLIC CommandDialogData // Media Commands // -------------- -#define MEDIA_COMMAND_CHANNEL_DOWN ((sal_Int16)1) // Decrement the channel value, for example, for a TV or radio tuner. -#define MEDIA_COMMAND_CHANNEL_UP ((sal_Int16)2) // Increment the channel value, for example, for a TV or radio tuner. -#define MEDIA_COMMAND_NEXTTRACK ((sal_Int16)3) // Go to next media track/slide. -#define MEDIA_COMMAND_PAUSE ((sal_Int16)4) // Pause. If already paused, take no further action. This is a direct PAUSE command that has no state. -#define MEDIA_COMMAND_PLAY ((sal_Int16)5) // Begin playing at the current position. If already paused, it will resume. This is a direct PLAY command that has no state. -#define MEDIA_COMMAND_PLAY_PAUSE ((sal_Int16)6) // Play or pause playback. -#define MEDIA_COMMAND_PREVIOUSTRACK ((sal_Int16)7) // Go to previous media track/slide. -#define MEDIA_COMMAND_RECORD ((sal_Int16)8) // Begin recording the current stream. -#define MEDIA_COMMAND_REWIND ((sal_Int16)9)// Go backward in a stream at a higher rate of speed. -#define MEDIA_COMMAND_STOP ((sal_Int16)10)// Stop playback. -#define MEDIA_COMMAND_MIC_ON_OFF_TOGGLE ((sal_Int16)11)// Toggle the microphone. +#define MEDIA_COMMAND_CHANNEL_DOWN ((sal_Int16)1) // Decrement the channel value, for example, for a TV or radio tuner. +#define MEDIA_COMMAND_CHANNEL_UP ((sal_Int16)2) // Increment the channel value, for example, for a TV or radio tuner. +#define MEDIA_COMMAND_NEXTTRACK ((sal_Int16)3) // Go to next media track/slide. +#define MEDIA_COMMAND_PAUSE ((sal_Int16)4) // Pause. If already paused, take no further action. This is a direct PAUSE command that has no state. +#define MEDIA_COMMAND_PLAY ((sal_Int16)5) // Begin playing at the current position. If already paused, it will resume. This is a direct PLAY command that has no state. +#define MEDIA_COMMAND_PLAY_PAUSE ((sal_Int16)6) // Play or pause playback. +#define MEDIA_COMMAND_PREVIOUSTRACK ((sal_Int16)7) // Go to previous media track/slide. +#define MEDIA_COMMAND_RECORD ((sal_Int16)8) // Begin recording the current stream. +#define MEDIA_COMMAND_REWIND ((sal_Int16)9)// Go backward in a stream at a higher rate of speed. +#define MEDIA_COMMAND_STOP ((sal_Int16)10)// Stop playback. +#define MEDIA_COMMAND_MIC_ON_OFF_TOGGLE ((sal_Int16)11)// Toggle the microphone. #define MEDIA_COMMAND_MICROPHONE_VOLUME_DOWN ((sal_Int16)12)// Increase microphone volume. #define MEDIA_COMMAND_MICROPHONE_VOLUME_MUTE ((sal_Int16)13)// Mute the microphone. #define MEDIA_COMMAND_MICROPHONE_VOLUME_UP ((sal_Int16)14)// Decrease microphone volume. -#define MEDIA_COMMAND_VOLUME_DOWN ((sal_Int16)15)// Lower the volume. -#define MEDIA_COMMAND_VOLUME_MUTE ((sal_Int16)16)// Mute the volume. -#define MEDIA_COMMAND_VOLUME_UP ((sal_Int16)17)// Raise the volume. +#define MEDIA_COMMAND_VOLUME_DOWN ((sal_Int16)15)// Lower the volume. +#define MEDIA_COMMAND_VOLUME_MUTE ((sal_Int16)16)// Mute the volume. +#define MEDIA_COMMAND_VOLUME_UP ((sal_Int16)17)// Raise the volume. #define MEDIA_COMMAND_MENU ((sal_Int16)18)// Button Menu pressed. #define MEDIA_COMMAND_MENU_HOLD ((sal_Int16)19)// Button Menu (long) pressed. #define MEDIA_COMMAND_PLAY_HOLD ((sal_Int16)20)// Button Play (long) pressed. @@ -401,7 +401,7 @@ inline CommandSelectionChangeData::CommandSelectionChangeData( ULONG nStart, #define COMMAND_HANGUL_HANJA_CONVERSION ((USHORT)14) #define COMMAND_INPUTLANGUAGECHANGE ((USHORT)15) #define COMMAND_SHOWDIALOG ((USHORT)16) -#define COMMAND_MEDIA ((USHORT)17) +#define COMMAND_MEDIA ((USHORT)17) #define COMMAND_SELECTIONCHANGE ((USHORT)18) #define COMMAND_PREPARERECONVERSION ((USHORT)19) #define COMMAND_USER ((USHORT)4096) @@ -429,9 +429,9 @@ public: const CommandWheelData* GetWheelData() const; const CommandScrollData* GetAutoScrollData() const; const CommandVoiceData* GetVoiceData() const; - const CommandModKeyData* GetModKeyData() const; + const CommandModKeyData* GetModKeyData() const; const CommandDialogData* GetDialogData() const; - sal_Int16 GetMediaCommand() const; + sal_Int16 GetMediaCommand() const; const CommandSelectionChangeData* GetSelectionChangeData() const; }; diff --git a/vcl/inc/vcl/combobox.h b/vcl/inc/vcl/combobox.h index cfcec12d75bc..14057dfcce0d 100644 --- a/vcl/inc/vcl/combobox.h +++ b/vcl/inc/vcl/combobox.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -29,12 +29,12 @@ #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 ((USHORT)0xFFFF) +#define COMBOBOX_ENTRY_NOTFOUND ((USHORT)0xFFFF) +#define COMBOBOX_ERROR ((USHORT)0xFFFF) -#define COMBOBOX_USERDRAW_SELECTED ((USHORT)0x0001) +#define COMBOBOX_USERDRAW_SELECTED ((USHORT)0x0001) -#endif // _SV_COMBOBOX_H +#endif // _SV_COMBOBOX_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/combobox.hxx b/vcl/inc/vcl/combobox.hxx index 3ab9f6dfa630..b232de1bc54c 100644 --- a/vcl/inc/vcl/combobox.hxx +++ b/vcl/inc/vcl/combobox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -107,11 +107,11 @@ public: virtual void SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, USHORT nFlags = WINDOW_POSSIZE_ALL ); void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) { Edit::SetPosSizePixel( rNewPos, rNewSize ); } - void SetDropDownSizePixel( const Size& rNewSize ) + void SetDropDownSizePixel( const Size& rNewSize ) { if( IsDropDownBox() ) SetPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); } - Rectangle GetDropDownPosSizePixel() const; - Rectangle GetListPosSizePixel() const; + Rectangle GetDropDownPosSizePixel() const; + Rectangle GetListPosSizePixel() const; // returns empty rectangle in DropDown mode, // else it returns the PosSize of the ListBox @@ -143,7 +143,7 @@ public: BOOL IsTravelSelect() const; BOOL IsInDropDown() const; - void ToggleDropDown(); + void ToggleDropDown(); long CalcWindowSizePixel( USHORT nLines ) const; @@ -188,20 +188,20 @@ public: void SetEntryData( USHORT nPos, void* pNewData ); void* GetEntryData( USHORT nPos ) const; - void SetTopEntry( USHORT nPos ); + void SetTopEntry( USHORT nPos ); void ShowProminentEntry( USHORT nPos ); - USHORT GetTopEntry() const; + USHORT GetTopEntry() const; void SetProminentEntryType( ProminentEntry eType ); ProminentEntry GetProminentEntryType() const; - USHORT GetDisplayLineCount() const; + USHORT GetDisplayLineCount() const; - USHORT GetSelectEntryCount() const; - USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const; - BOOL IsEntryPosSelected( USHORT nPos ) const; - void SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE ); - void SetNoSelection(); + USHORT GetSelectEntryCount() const; + USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const; + BOOL IsEntryPosSelected( USHORT nPos ) const; + void SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE ); + void SetNoSelection(); Rectangle GetBoundingRectangle( USHORT nItem ) const; /** checks whether a certain point lies within the bounds of diff --git a/vcl/inc/vcl/configsettings.hxx b/vcl/inc/vcl/configsettings.hxx index c40e9681513d..e33e76d4520f 100644 --- a/vcl/inc/vcl/configsettings.hxx +++ b/vcl/inc/vcl/configsettings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -62,7 +62,7 @@ namespace vcl const rtl::OUString& getValue( const rtl::OUString& rGroup, const rtl::OUString& rKey ) const; void setValue( const rtl::OUString& rGroup, const rtl::OUString& rKey, const rtl::OUString& rValue ); - + virtual void Commit(); }; diff --git a/vcl/inc/vcl/controldata.hxx b/vcl/inc/vcl/controldata.hxx index b30184be2481..0306a8d395f6 100644 --- a/vcl/inc/vcl/controldata.hxx +++ b/vcl/inc/vcl/controldata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/controllayout.hxx b/vcl/inc/vcl/controllayout.hxx index 0cad923c6b33..3d43f0177061 100644 --- a/vcl/inc/vcl/controllayout.hxx +++ b/vcl/inc/vcl/controllayout.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -44,14 +44,14 @@ struct VCL_DLLPUBLIC ControlLayoutData // contains the string really displayed // there must be exactly one bounding rectangle in m_aUnicodeBoundRects // for every character in m_aDisplayText - String m_aDisplayText; + String m_aDisplayText; // the bounding rectangle of every character // where one character may consist of many glyphs - std::vector< Rectangle > m_aUnicodeBoundRects; + std::vector< Rectangle > m_aUnicodeBoundRects; // start indices of lines - std::vector< long > m_aLineIndices; + std::vector< long > m_aLineIndices; // notify parent control on destruction - const Control* m_pParent; + const Control* m_pParent; ControlLayoutData() : m_pParent( NULL ) {} ~ControlLayoutData(); diff --git a/vcl/inc/vcl/ctrl.hxx b/vcl/inc/vcl/ctrl.hxx index 1790096f8cdd..f9d423a7b6d4 100644 --- a/vcl/inc/vcl/ctrl.hxx +++ b/vcl/inc/vcl/ctrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -48,9 +48,9 @@ protected: ::vcl::ImplControlData* mpControlData; private: - BOOL mbHasFocus; - Link maGetFocusHdl; - Link maLoseFocusHdl; + BOOL mbHasFocus; + Link maGetFocusHdl; + Link maLoseFocusHdl; SAL_DLLPRIVATE void ImplInitControlData(); @@ -60,10 +60,10 @@ private: protected: Control( WindowType nType ); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const; // helper method for composite controls - void AppendLayoutData( const Control& rSubControl ) const; + void AppendLayoutData( const Control& rSubControl ) const; /// creates the mpData->mpLayoutData structure void CreateLayoutData() const; @@ -87,7 +87,7 @@ protected: @return if the Control instance has been destroyed in any of the call */ - BOOL ImplCallEventListenersAndHandler( + BOOL ImplCallEventListenersAndHandler( ULONG nEvent, const Link& rHandler, void* pCaller ); @@ -137,15 +137,15 @@ public: Control( Window* pParent, const ResId& rResId ); ~Control(); - virtual void GetFocus(); - virtual void LoseFocus(); - virtual long Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void GetFocus(); + virtual void LoseFocus(); + virtual long Notify( NotifyEvent& rNEvt ); + virtual void StateChanged( StateChangedType nStateChange ); virtual void Resize(); virtual void DataChanged( const DataChangedEvent& rDCEvt ); // invalidates layout data - virtual void SetText( const String& rStr ); + virtual void SetText( const String& rStr ); // gets the displayed text virtual String GetDisplayText() const; // returns the bounding box for the character at index nIndex (in control coordinates) @@ -173,12 +173,12 @@ public: */ long ToRelativeLineIndex( long nIndex ) const; - void SetGetFocusHdl( const Link& rLink ) { maGetFocusHdl = rLink; } - const Link& GetGetFocusHdl() const { return maGetFocusHdl; } - void SetLoseFocusHdl( const Link& rLink ) { maLoseFocusHdl = rLink; } - const Link& GetLoseFocusHdl() const { return maLoseFocusHdl; } + void SetGetFocusHdl( const Link& rLink ) { maGetFocusHdl = rLink; } + const Link& GetGetFocusHdl() const { return maGetFocusHdl; } + void SetLoseFocusHdl( const Link& rLink ) { maLoseFocusHdl = rLink; } + const Link& GetLoseFocusHdl() const { return maLoseFocusHdl; } - void SetLayoutDataParent( const Control* pParent ) const; + void SetLayoutDataParent( const Control* pParent ) const; virtual Size GetOptimalSize(WindowSizeType eType) const; @@ -197,6 +197,6 @@ public: } }; -#endif // _SV_CTRL_HXX +#endif // _SV_CTRL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/cursor.hxx b/vcl/inc/vcl/cursor.hxx index f1f07957db96..afa8c9324705 100644 --- a/vcl/inc/vcl/cursor.hxx +++ b/vcl/inc/vcl/cursor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -42,7 +42,7 @@ class Window; // - Cursor-Styles - // ----------------- -#define CURSOR_SHADOW ((USHORT)0x0001) +#define CURSOR_SHADOW ((USHORT)0x0001) #define CURSOR_DIRECTION_NONE ((unsigned char)0x00) #define CURSOR_DIRECTION_LTR ((unsigned char)0x01) #define CURSOR_DIRECTION_RTL ((unsigned char)0x02) @@ -54,67 +54,67 @@ class Window; class VCL_DLLPUBLIC Cursor { private: - ImplCursorData* mpData; // Interne Daten - Window* mpWindow; // Window (only for shadow cursor) - long mnSlant; // Schraegstellung - long mnOffsetY; // Offset fuer Rotation - Size maSize; // Groesse - Point maPos; // Position - short mnOrientation; // Rotation - USHORT mnStyle; // Style - BOOL mbVisible; // Ist Cursor sichtbar - unsigned char mnDirection; // indicates direction + ImplCursorData* mpData; // Interne Daten + Window* mpWindow; // Window (only for shadow cursor) + long mnSlant; // Schraegstellung + long mnOffsetY; // Offset fuer Rotation + Size maSize; // Groesse + Point maPos; // Position + short mnOrientation; // Rotation + USHORT mnStyle; // Style + BOOL mbVisible; // Ist Cursor sichtbar + unsigned char mnDirection; // indicates direction public: - SAL_DLLPRIVATE void ImplDraw(); - SAL_DLLPRIVATE void ImplRestore(); + SAL_DLLPRIVATE void ImplDraw(); + SAL_DLLPRIVATE void ImplRestore(); DECL_DLLPRIVATE_LINK( ImplTimerHdl, AutoTimer* ); - SAL_DLLPRIVATE void ImplShow( BOOL bDrawDirect = TRUE ); - SAL_DLLPRIVATE void ImplHide(); - SAL_DLLPRIVATE void ImplNew(); + SAL_DLLPRIVATE void ImplShow( BOOL bDrawDirect = TRUE ); + SAL_DLLPRIVATE void ImplHide(); + SAL_DLLPRIVATE void ImplNew(); public: Cursor(); Cursor( const Cursor& rCursor ); ~Cursor(); - void SetStyle( USHORT nStyle ); - USHORT GetStyle() const { return mnStyle; } + void SetStyle( USHORT nStyle ); + USHORT GetStyle() const { return mnStyle; } - void Show(); - void Hide(); - BOOL IsVisible() const { return mbVisible; } + void Show(); + void Hide(); + BOOL IsVisible() const { return mbVisible; } - void SetWindow( Window* pWindow ); - Window* GetWindow() const { return mpWindow; } + void SetWindow( Window* pWindow ); + Window* GetWindow() const { return mpWindow; } - void SetPos( const Point& rNewPos ); - const Point& GetPos() const { return maPos; } - void SetOffsetY( long mnOffsetY = 0 ); - long GetOffsetY() const { return mnOffsetY; } + void SetPos( const Point& rNewPos ); + const Point& GetPos() const { return maPos; } + void SetOffsetY( long mnOffsetY = 0 ); + long GetOffsetY() const { return mnOffsetY; } - void SetSize( const Size& rNewSize ); - const Size& GetSize() const { return maSize; } - void SetWidth( long nNewWidth ); - long GetWidth() const { return maSize.Width(); } - void SetHeight( long nNewHeight ); - long GetHeight() const { return maSize.Height(); } + void SetSize( const Size& rNewSize ); + const Size& GetSize() const { return maSize; } + void SetWidth( long nNewWidth ); + long GetWidth() const { return maSize.Width(); } + void SetHeight( long nNewHeight ); + long GetHeight() const { return maSize.Height(); } - void SetSlant( long nSlant = 0 ); - long GetSlant() const { return mnSlant; } + void SetSlant( long nSlant = 0 ); + long GetSlant() const { return mnSlant; } - void SetOrientation( short nOrientation = 0 ); - short GetOrientation() const { return mnOrientation; } + void SetOrientation( short nOrientation = 0 ); + short GetOrientation() const { return mnOrientation; } - void SetDirection( unsigned char nDirection = 0 ); - unsigned char GetDirection() const { return mnDirection; } + void SetDirection( unsigned char nDirection = 0 ); + unsigned char GetDirection() const { return mnDirection; } - Cursor& operator=( const Cursor& rCursor ); - BOOL operator==( const Cursor& rCursor ) const; - BOOL operator!=( const Cursor& rCursor ) const + Cursor& operator=( const Cursor& rCursor ); + BOOL operator==( const Cursor& rCursor ) const; + BOOL operator!=( const Cursor& rCursor ) const { return !(Cursor::operator==( rCursor )); } }; -#endif // _SV_CURSOR_HXX +#endif // _SV_CURSOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/cvtgrf.hxx b/vcl/inc/vcl/cvtgrf.hxx index 37a3c271b52c..259f28c84b40 100644 --- a/vcl/inc/vcl/cvtgrf.hxx +++ b/vcl/inc/vcl/cvtgrf.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -37,15 +37,15 @@ // - GraphicConverter - // -------------------- -struct ConvertData; -class Graphic; +struct ConvertData; +class Graphic; class VCL_DLLPUBLIC GraphicConverter { private: - Link maFilterHdl; - ConvertData* mpConvertData; + Link maFilterHdl; + ConvertData* mpConvertData; public: SAL_DLLPRIVATE ULONG ImplConvert( ULONG nInFormat, void* pInBuffer, ULONG nInBufSize, @@ -56,13 +56,13 @@ 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 ULONG Import( SvStream& rIStm, Graphic& rGraphic, ULONG nFormat = CVT_UNKNOWN ); + static ULONG Export( SvStream& rOStm, const Graphic& rGraphic, ULONG nFormat ); - ConvertData* GetConvertData() { return mpConvertData; } + ConvertData* GetConvertData() { return mpConvertData; } - void SetFilterHdl( const Link& rLink ) { maFilterHdl = rLink; } - const Link& GetFilterHdl() const { return maFilterHdl; } + void SetFilterHdl( const Link& rLink ) { maFilterHdl = rLink; } + const Link& GetFilterHdl() const { return maFilterHdl; } }; #endif // _SV_CVTGRF_HXX diff --git a/vcl/inc/vcl/cvtsvm.hxx b/vcl/inc/vcl/cvtsvm.hxx index f7c45f50ed16..0b41f6f64338 100644 --- a/vcl/inc/vcl/cvtsvm.hxx +++ b/vcl/inc/vcl/cvtsvm.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -37,55 +37,55 @@ // - Defines - // ----------- -#define CONVERT_TO_SVM1 0x00000001UL -#define CONVERT_FROM_SVM1 0x00000002UL +#define CONVERT_TO_SVM1 0x00000001UL +#define CONVERT_FROM_SVM1 0x00000002UL -#define GDI_PIXEL_ACTION 1 -#define GDI_POINT_ACTION 2 -#define GDI_LINE_ACTION 3 -#define GDI_RECT_ACTION 4 -#define GDI_ELLIPSE_ACTION 5 -#define GDI_ARC_ACTION 6 -#define GDI_PIE_ACTION 7 -#define GDI_INVERTRECT_ACTION 8 -#define GDI_HIGHLIGHTRECT_ACTION 9 -#define GDI_POLYLINE_ACTION 10 -#define GDI_POLYGON_ACTION 11 -#define GDI_POLYPOLYGON_ACTION 12 -#define GDI_TEXT_ACTION 13 -#define GDI_TEXTARRAY_ACTION 14 -#define GDI_STRETCHTEXT_ACTION 15 -#define GDI_ICON_ACTION 16 -#define GDI_BITMAP_ACTION 17 -#define GDI_BITMAPSCALE_ACTION 18 -#define GDI_PEN_ACTION 19 -#define GDI_FONT_ACTION 20 -#define GDI_BACKBRUSH_ACTION 21 -#define GDI_FILLBRUSH_ACTION 22 -#define GDI_MAPMODE_ACTION 23 -#define GDI_CLIPREGION_ACTION 24 -#define GDI_RASTEROP_ACTION 25 -#define GDI_PUSH_ACTION 26 -#define GDI_POP_ACTION 27 -#define GDI_MOVECLIPREGION_ACTION 28 -#define GDI_ISECTCLIPREGION_ACTION 29 -#define GDI_MTF_ACTION 30 -#define GDI_BITMAPSCALEPART_ACTION 32 -#define GDI_GRADIENT_ACTION 33 +#define GDI_PIXEL_ACTION 1 +#define GDI_POINT_ACTION 2 +#define GDI_LINE_ACTION 3 +#define GDI_RECT_ACTION 4 +#define GDI_ELLIPSE_ACTION 5 +#define GDI_ARC_ACTION 6 +#define GDI_PIE_ACTION 7 +#define GDI_INVERTRECT_ACTION 8 +#define GDI_HIGHLIGHTRECT_ACTION 9 +#define GDI_POLYLINE_ACTION 10 +#define GDI_POLYGON_ACTION 11 +#define GDI_POLYPOLYGON_ACTION 12 +#define GDI_TEXT_ACTION 13 +#define GDI_TEXTARRAY_ACTION 14 +#define GDI_STRETCHTEXT_ACTION 15 +#define GDI_ICON_ACTION 16 +#define GDI_BITMAP_ACTION 17 +#define GDI_BITMAPSCALE_ACTION 18 +#define GDI_PEN_ACTION 19 +#define GDI_FONT_ACTION 20 +#define GDI_BACKBRUSH_ACTION 21 +#define GDI_FILLBRUSH_ACTION 22 +#define GDI_MAPMODE_ACTION 23 +#define GDI_CLIPREGION_ACTION 24 +#define GDI_RASTEROP_ACTION 25 +#define GDI_PUSH_ACTION 26 +#define GDI_POP_ACTION 27 +#define GDI_MOVECLIPREGION_ACTION 28 +#define GDI_ISECTCLIPREGION_ACTION 29 +#define GDI_MTF_ACTION 30 +#define GDI_BITMAPSCALEPART_ACTION 32 +#define GDI_GRADIENT_ACTION 33 -#define GDI_TRANSPARENT_COMMENT 1024 -#define GDI_HATCH_COMMENT 1025 -#define GDI_REFPOINT_COMMENT 1026 -#define GDI_TEXTLINECOLOR_COMMENT 1027 -#define GDI_TEXTLINE_COMMENT 1028 -#define GDI_FLOATTRANSPARENT_COMMENT 1029 -#define GDI_GRADIENTEX_COMMENT 1030 -#define GDI_COMMENT_COMMENT 1031 -#define GDI_UNICODE_COMMENT 1032 +#define GDI_TRANSPARENT_COMMENT 1024 +#define GDI_HATCH_COMMENT 1025 +#define GDI_REFPOINT_COMMENT 1026 +#define GDI_TEXTLINECOLOR_COMMENT 1027 +#define GDI_TEXTLINE_COMMENT 1028 +#define GDI_FLOATTRANSPARENT_COMMENT 1029 +#define GDI_GRADIENTEX_COMMENT 1030 +#define GDI_COMMENT_COMMENT 1031 +#define GDI_UNICODE_COMMENT 1032 -#define GDI_LINEJOIN_ACTION 1033 -#define GDI_EXTENDEDPOLYGON_ACTION 1034 -#define GDI_LINEDASHDOT_ACTION 1035 +#define GDI_LINEJOIN_ACTION 1033 +#define GDI_EXTENDEDPOLYGON_ACTION 1034 +#define GDI_LINEDASHDOT_ACTION 1035 // ---------------- // - SVMConverter - @@ -96,9 +96,9 @@ class Stack; class VCL_DLLPUBLIC 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, + 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, Color& rLineCol, Stack& rLineColStack, rtl_TextEncoding& rActualCharSet ); @@ -110,7 +110,7 @@ public: private: // Not implemented SVMConverter( const SVMConverter& ); - SVMConverter& operator=( const SVMConverter& ); + SVMConverter& operator=( const SVMConverter& ); }; #endif // _SV_CVTMTF_HXX diff --git a/vcl/inc/vcl/dbggui.hxx b/vcl/inc/vcl/dbggui.hxx index 326111273a1c..55777f7b06e3 100644 --- a/vcl/inc/vcl/dbggui.hxx +++ b/vcl/inc/vcl/dbggui.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/decoview.hxx b/vcl/inc/vcl/decoview.hxx index f5317c204a29..1b81be0bbbfe 100644 --- a/vcl/inc/vcl/decoview.hxx +++ b/vcl/inc/vcl/decoview.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -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 ((USHORT)0x0001) +#define SYMBOL_DRAW_DISABLE ((USHORT)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_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_MONO ((USHORT)0x1000) +#define FRAME_DRAW_NODRAW ((USHORT)0x8000) +#define FRAME_DRAW_STYLE ((USHORT)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 ((USHORT)0x0001) +#define FRAME_HIGHLIGHT_OUT ((USHORT)0x0002) +#define FRAME_HIGHLIGHT_TESTBACKGROUND ((USHORT)0x4000) +#define FRAME_HIGHLIGHT_STYLE ((USHORT)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 ((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) // ------------------ // - DecorationView - @@ -90,21 +90,21 @@ class OutputDevice; class VCL_DLLPUBLIC DecorationView { private: - OutputDevice* mpOutDev; + OutputDevice* mpOutDev; public: DecorationView( OutputDevice* pOutDev ) { mpOutDev = pOutDev; } - void DrawSymbol( const Rectangle& rRect, SymbolType eType, + void DrawSymbol( const Rectangle& rRect, SymbolType eType, const Color& rColor, USHORT nStyle = 0 ); - void DrawFrame( const Rectangle& rRect, + void DrawFrame( const Rectangle& rRect, const Color& rLeftTopColor, const Color& rRightBottomColor ); - void DrawHighlightFrame( const Rectangle& rRect, + 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 ); + Rectangle DrawFrame( const Rectangle& rRect, USHORT nStyle = FRAME_DRAW_OUT ); + Rectangle DrawButton( const Rectangle& rRect, USHORT 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..0f7dbfd0082a 100644 --- a/vcl/inc/vcl/dialog.hxx +++ b/vcl/inc/vcl/dialog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -46,15 +46,15 @@ struct DialogImpl; class VCL_DLLPUBLIC Dialog : public SystemWindow { private: - Window* mpDialogParent; - Dialog* mpPrevExecuteDlg; + Window* mpDialogParent; + Dialog* mpPrevExecuteDlg; DialogImpl* mpDialogImpl; - long mnMousePositioned; - BOOL mbInExecute; - BOOL mbOldSaveBack; - BOOL mbInClose; - BOOL mbModalMode; - sal_Int8 mnCancelClose; //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event + long mnMousePositioned; + BOOL mbInExecute; + BOOL mbOldSaveBack; + BOOL mbInClose; + BOOL mbModalMode; + sal_Int8 mnCancelClose; //liuchen 2009-7-22, support Excel VBA UserForm_QueryClose event SAL_DLLPRIVATE void ImplInitDialogData(); SAL_DLLPRIVATE void ImplInitSettings(); @@ -75,24 +75,24 @@ public: 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, ULONG nFlags ); public: Dialog( Window* pParent, WinBits nStyle = WB_STDDIALOG ); Dialog( Window* pParent, const ResId& rResId ); virtual ~Dialog(); - virtual long Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual long Notify( NotifyEvent& rNEvt ); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual BOOL Close(); + virtual BOOL Close(); - virtual short Execute(); - BOOL IsInExecute() const { return mbInExecute; } + virtual short Execute(); + 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 + 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 //////////////////////////////////////// // Dialog::Execute replacement API @@ -109,17 +109,17 @@ public: // Dialog::Execute replacement API //////////////////////////////////////// - void EndDialog( long nResult = 0 ); - static void EndAllDialogs( Window* pParent=NULL ); + void EndDialog( long nResult = 0 ); + static void EndAllDialogs( Window* pParent=NULL ); 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( BOOL bModal ); + void SetModalInputMode( BOOL bModal, BOOL bSubModalDialogs ); + BOOL IsModalInputMode() const { return mbModalMode; } - void GrabFocusToFirstControl(); + void GrabFocusToFirstControl(); }; // ------------------ @@ -149,15 +149,15 @@ public: private: using Window::Show; - void Show( BOOL bVisible = TRUE ); + void Show( BOOL bVisible = TRUE ); using Window::Hide; - void Hide(); + void Hide(); // Copy assignment is forbidden and not implemented. SAL_DLLPRIVATE ModalDialog (const ModalDialog &); SAL_DLLPRIVATE ModalDialog & operator= (const ModalDialog &); }; -#endif // _SV_DIALOG_HXX +#endif // _SV_DIALOG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/dllapi.h b/vcl/inc/vcl/dllapi.h index dfe59bb5b739..3be73d34f0e5 100644 --- a/vcl/inc/vcl/dllapi.h +++ b/vcl/inc/vcl/dllapi.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/dndevdis.hxx b/vcl/inc/vcl/dndevdis.hxx index 41be5ba3fc38..e568cb582b5e 100644 --- a/vcl/inc/vcl/dndevdis.hxx +++ b/vcl/inc/vcl/dndevdis.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -36,10 +36,10 @@ #include <cppuhelper/implbase3.hxx> #include <vcl/window.hxx> -class DNDEventDispatcher: public ::cppu::WeakImplHelper3< +class DNDEventDispatcher: public ::cppu::WeakImplHelper3< ::com::sun::star::datatransfer::dnd::XDropTargetListener, ::com::sun::star::datatransfer::dnd::XDropTargetDragContext, - ::com::sun::star::datatransfer::dnd::XDragGestureListener > + ::com::sun::star::datatransfer::dnd::XDragGestureListener > { Window * m_pTopWindow; Window * m_pCurrentWindow; @@ -51,24 +51,24 @@ class DNDEventDispatcher: public ::cppu::WeakImplHelper3< /* * fire the events on the dnd listener container of the specified window */ - - sal_Int32 fireDragEnterEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, - const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction, + + sal_Int32 fireDragEnterEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, + const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction, const ::com::sun::star::uno::Sequence< ::com::sun::star::datatransfer::DataFlavor >& aFlavorList ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 fireDragOverEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, - const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException); + sal_Int32 fireDragOverEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, + const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException); sal_Int32 fireDragExitEvent( Window *pWindow ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 fireDropActionChangedEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, - const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException); + sal_Int32 fireDropActionChangedEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDragContext >& xContext, + const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 fireDropEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext, - const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction, + sal_Int32 fireDropEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& xContext, + const sal_Int8 nDropAction, const Point& rLocation, const sal_Int8 nSourceAction, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTransferable ) throw(::com::sun::star::uno::RuntimeException); - sal_Int32 fireDragGestureEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource, + sal_Int32 fireDragGestureEvent( Window *pWindow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& xSource, const ::com::sun::star::uno::Any event, const Point& rOrigin, const sal_Int8 nDragAction )throw(::com::sun::star::uno::RuntimeException); public: @@ -96,7 +96,7 @@ public: /* * XDragGestureListener */ - + virtual void SAL_CALL dragGestureRecognized( const ::com::sun::star::datatransfer::dnd::DragGestureEvent& dge ) throw(::com::sun::star::uno::RuntimeException); @@ -104,11 +104,11 @@ public: * XEventListener */ - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& eo ) throw(::com::sun::star::uno::RuntimeException); }; //================================================================================================== -// +// //================================================================================================== #endif diff --git a/vcl/inc/vcl/dndhelp.hxx b/vcl/inc/vcl/dndhelp.hxx index 73adc8a4508a..b8d7749b1707 100644 --- a/vcl/inc/vcl/dndhelp.hxx +++ b/vcl/inc/vcl/dndhelp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -91,14 +91,14 @@ class VCL_DLLPUBLIC DragAndDropWrapper : private: DragAndDropClient* mpClient; -public: +public: DragAndDropWrapper( DragAndDropClient* pClient ); ~DragAndDropWrapper(); // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::lang::XEventListener void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException); @@ -121,7 +121,7 @@ public: void SAL_CALL dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException); }; -}} // namespace vcl::unohelper +}} // namespace vcl::unohelper #endif // _VCL_DNDHELP_HXX diff --git a/vcl/inc/vcl/dndlcon.hxx b/vcl/inc/vcl/dndlcon.hxx index 1c3654c1a9ea..62ddbecafa1f 100644 --- a/vcl/inc/vcl/dndlcon.hxx +++ b/vcl/inc/vcl/dndlcon.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -38,8 +38,8 @@ #include <vcl/unohelp2.hxx> -class DNDListenerContainer : public ::vcl::unohelper::MutexHelper, - public ::cppu::WeakComponentImplHelper4< +class DNDListenerContainer : public ::vcl::unohelper::MutexHelper, + public ::cppu::WeakComponentImplHelper4< ::com::sun::star::datatransfer::dnd::XDragGestureRecognizer, \ ::com::sun::star::datatransfer::dnd::XDropTargetDragContext, ::com::sun::star::datatransfer::dnd::XDropTargetDropContext, @@ -56,7 +56,7 @@ public: DNDListenerContainer( sal_Int8 nDefaultActions ); virtual ~DNDListenerContainer(); - sal_uInt32 fireDropEvent( + sal_uInt32 fireDropEvent( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetDropContext >& context, sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& transferable ); @@ -77,14 +77,14 @@ public: sal_Int8 dropAction, sal_Int32 locationX, sal_Int32 locationY, sal_Int8 sourceActions ); sal_uInt32 fireDragGestureEvent( - sal_Int8 dragAction, sal_Int32 dragOriginX, sal_Int32 dragOriginY, + sal_Int8 dragAction, sal_Int32 dragOriginX, sal_Int32 dragOriginY, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragSource >& dragSource, const ::com::sun::star::uno::Any& triggerEvent ); /* * XDragGestureRecognizer */ - + virtual void SAL_CALL addDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeDragGestureListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDragGestureListener >& dgl ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL resetRecognizer( ) throw(::com::sun::star::uno::RuntimeException); @@ -108,7 +108,7 @@ public: /* * XDropTarget */ - + virtual void SAL_CALL addDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL removeDropTargetListener( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTargetListener >& dtl ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isActive( ) throw(::com::sun::star::uno::RuntimeException); @@ -119,7 +119,7 @@ public: //================================================================================================== -// +// //================================================================================================== #endif diff --git a/vcl/inc/vcl/dockingarea.hxx b/vcl/inc/vcl/dockingarea.hxx index cc56a57f3315..3cda9021551b 100644 --- a/vcl/inc/vcl/dockingarea.hxx +++ b/vcl/inc/vcl/dockingarea.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -33,7 +33,7 @@ #include <vcl/window.hxx> // ------------------------------------------ -// A simple container for docked toolbars +// A simple container for docked toolbars // - its main purpose is theming support // ------------------------------------------ diff --git a/vcl/inc/vcl/dockwin.hxx b/vcl/inc/vcl/dockwin.hxx index 4950e267a786..33e5a4b201c5 100644 --- a/vcl/inc/vcl/dockwin.hxx +++ b/vcl/inc/vcl/dockwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -88,30 +88,30 @@ class ImplDockingWindowWrapper private: // the original 'Docking'window - Window *mpDockingWindow; + Window *mpDockingWindow; // the original DockingWindow members FloatingWindow* mpFloatWin; - Window* mpOldBorderWin; - Window* mpParent; - Point maFloatPos; - Point maDockPos; - Point maMouseOff; - Point maMouseStart; - Size maRollUpOutSize; - Size maMinOutSize; - Size maMaxOutSize; + Window* mpOldBorderWin; + Window* mpParent; + Point maFloatPos; + Point maDockPos; + Point maMouseOff; + Point maMouseStart; + Size maRollUpOutSize; + Size maMinOutSize; + Size maMaxOutSize; Rectangle maDragArea; - long mnTrackX; - long mnTrackY; - long mnTrackWidth; - long mnTrackHeight; - sal_Int32 mnDockLeft; - sal_Int32 mnDockTop; - sal_Int32 mnDockRight; - sal_Int32 mnDockBottom; - WinBits mnFloatBits; - BOOL mbDockCanceled:1, + long mnTrackX; + long mnTrackY; + long mnTrackWidth; + long mnTrackHeight; + sal_Int32 mnDockLeft; + sal_Int32 mnDockTop; + sal_Int32 mnDockRight; + sal_Int32 mnDockBottom; + WinBits mnFloatBits; + BOOL mbDockCanceled:1, mbFloatPrevented:1, mbDockable:1, mbDocking:1, @@ -126,7 +126,7 @@ private: mbStartDockingEnabled:1, mbLocked:1; - void ImplInitData(); + void ImplInitData(); DECL_LINK( PopupModeEnd, void* ); void ImplEnableStartDocking( BOOL bEnable = TRUE ) { mbStartDockingEnabled = bEnable; } @@ -140,11 +140,11 @@ public: 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(); - void ToggleFloatingMode(); + void StartDocking( const Point& rPos, Rectangle& rRect ); + BOOL Docking( const Point& rPos, Rectangle& rRect ); + void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); + BOOL PrepareToggleFloatingMode(); + void ToggleFloatingMode(); void SetDragArea( const Rectangle& rRect ); Rectangle GetDragArea() const; @@ -156,60 +156,60 @@ public: void StartPopupMode( ToolBox* pParentToolBox, ULONG nPopupModeFlags ); BOOL IsInPopupMode() const; - void TitleButtonClick( USHORT nButton ); - void Pin(); - void Roll(); - void PopupModeEnd(); - void Resizing( Size& rSize ); - BOOL Close(); - void Tracking( const TrackingEvent& rTEvt ); - long Notify( NotifyEvent& rNEvt ); + void TitleButtonClick( USHORT nButton ); + void Pin(); + void Roll(); + void PopupModeEnd(); + void Resizing( Size& rSize ); + 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( USHORT nButton, BOOL bVisible = TRUE ); + BOOL IsTitleButtonVisible( USHORT nButton ) const; - void SetPin( BOOL bPin ); - BOOL IsPined() const; + void SetPin( BOOL bPin ); + BOOL IsPined() const; - void RollUp(); - void RollDown(); - BOOL IsRollUp() const; + void RollUp(); + void RollDown(); + BOOL IsRollUp() const; - void SetRollUpOutputSizePixel( const Size& rSize ); - Size GetRollUpOutputSizePixel() const; + void SetRollUpOutputSizePixel( const Size& rSize ); + Size GetRollUpOutputSizePixel() const; - void SetMinOutputSizePixel( const Size& rSize ); - const Size& GetMinOutputSizePixel() const; + void SetMinOutputSizePixel( const Size& rSize ); + const Size& GetMinOutputSizePixel() const; - void SetMaxOutputSizePixel( const Size& rSize ); - const Size& GetMaxOutputSizePixel() const; + 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; } + BOOL IsDocking() const { return mbDocking; } + BOOL IsDockable() const { return mbDockable; } + BOOL IsDockingCanceled() const { return mbDockCanceled; } + BOOL IsFloatingPrevented() const { return mbFloatPrevented; } - void SetFloatingMode( BOOL bFloatMode = FALSE ); - BOOL IsFloatingMode() const; + void SetFloatingMode( BOOL bFloatMode = FALSE ); + BOOL IsFloatingMode() const; FloatingWindow* GetFloatingWindow() const { return mpFloatWin; } - void SetFloatingPos( const Point& rNewPos ); - Point GetFloatingPos() const; + void SetFloatingPos( const Point& rNewPos ); + Point GetFloatingPos() const; - void SetFloatStyle( WinBits nWinStyle ); - WinBits GetFloatStyle() const; - void SetTabStop(); + void SetFloatStyle( WinBits nWinStyle ); + WinBits GetFloatStyle() const; + void SetTabStop(); - virtual void SetPosSizePixel( long nX, long nY, + virtual void SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, USHORT nFlags = WINDOW_POSSIZE_ALL ); - void SetPosSizePixel( const Point& rNewPos, + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) { mpDockingWindow->SetPosSizePixel( rNewPos, rNewSize ); } - Point GetPosPixel() const; - Size GetSizePixel() const; - void SetOutputSizePixel( const Size& rNewSize ); - Size GetOutputSizePixel() const; + Point GetPosPixel() const; + Size GetSizePixel() const; + void SetOutputSizePixel( const Size& rNewSize ); + Size GetOutputSizePixel() const; }; class VCL_DLLPUBLIC DockingManager @@ -238,11 +238,11 @@ public: void StartPopupMode( ToolBox *pParentToolBox, const Window *pWin, ULONG nPopupModeFlags ); BOOL IsInPopupMode( const Window *pWin ); - void EndPopupMode( 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, + void SetPosSizePixel( Window *pWin, long nX, long nY, long nWidth, long nHeight, USHORT nFlags = WINDOW_POSSIZE_ALL ); Rectangle GetPosSizePixel( const Window *pWin ); @@ -257,24 +257,24 @@ class VCL_DLLPUBLIC DockingWindow : public Window class ImplData; private: FloatingWindow* mpFloatWin; - Window* mpOldBorderWin; + Window* mpOldBorderWin; ImplData* mpImplData; - Point maFloatPos; - Point maDockPos; - Point maMouseOff; - Point maMouseStart; - Size maRollUpOutSize; - Size maMinOutSize; - long mnTrackX; - long mnTrackY; - long mnTrackWidth; - long mnTrackHeight; - sal_Int32 mnDockLeft; - sal_Int32 mnDockTop; - sal_Int32 mnDockRight; - sal_Int32 mnDockBottom; - WinBits mnFloatBits; - BOOL mbDockCanceled:1, + Point maFloatPos; + Point maDockPos; + Point maMouseOff; + Point maMouseStart; + Size maRollUpOutSize; + Size maMinOutSize; + long mnTrackX; + long mnTrackY; + long mnTrackWidth; + long mnTrackHeight; + sal_Int32 mnDockLeft; + sal_Int32 mnDockTop; + sal_Int32 mnDockRight; + sal_Int32 mnDockBottom; + WinBits mnFloatBits; + BOOL mbDockCanceled:1, mbDockPrevented:1, mbFloatPrevented:1, mbDockable:1, @@ -311,69 +311,69 @@ public: DockingWindow( Window* pParent, const ResId& rResId ); ~DockingWindow(); - virtual void StartDocking(); - virtual BOOL Docking( const Point& rPos, Rectangle& rRect ); - virtual void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); - virtual BOOL PrepareToggleFloatingMode(); - virtual void ToggleFloatingMode(); - - virtual void TitleButtonClick( USHORT nButton ); - virtual void Pin(); - virtual void Roll(); - virtual void PopupModeEnd(); - virtual void Resizing( Size& rSize ); - virtual 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 SetPin( BOOL bPin ); - BOOL IsPined() const; - - void RollUp(); - void RollDown(); - BOOL IsRollUp() const; - - void SetRollUpOutputSizePixel( const Size& rSize ); - Size GetRollUpOutputSizePixel() const; - - void SetMinOutputSizePixel( const Size& rSize ); - const Size& GetMinOutputSizePixel() const; - - 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; } - - void SetFloatingMode( BOOL bFloatMode = FALSE ); - BOOL IsFloatingMode() const; + virtual void StartDocking(); + virtual BOOL Docking( const Point& rPos, Rectangle& rRect ); + virtual void EndDocking( const Rectangle& rRect, BOOL bFloatMode ); + virtual BOOL PrepareToggleFloatingMode(); + virtual void ToggleFloatingMode(); + + virtual void TitleButtonClick( USHORT nButton ); + virtual void Pin(); + virtual void Roll(); + virtual void PopupModeEnd(); + virtual void Resizing( Size& rSize ); + virtual 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 SetPin( BOOL bPin ); + BOOL IsPined() const; + + void RollUp(); + void RollDown(); + BOOL IsRollUp() const; + + void SetRollUpOutputSizePixel( const Size& rSize ); + Size GetRollUpOutputSizePixel() const; + + void SetMinOutputSizePixel( const Size& rSize ); + const Size& GetMinOutputSizePixel() const; + + 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; } + + void SetFloatingMode( BOOL bFloatMode = FALSE ); + BOOL IsFloatingMode() const; FloatingWindow* GetFloatingWindow() const { return mpFloatWin; } - void SetFloatingPos( const Point& rNewPos ); - Point GetFloatingPos() const; + void SetFloatingPos( const Point& rNewPos ); + Point GetFloatingPos() const; - void SetFloatStyle( WinBits nWinStyle ); - WinBits GetFloatStyle() const; - void SetTabStop(); + void SetFloatStyle( WinBits nWinStyle ); + WinBits GetFloatStyle() const; + void SetTabStop(); - virtual void SetPosSizePixel( long nX, long nY, + virtual void SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, USHORT nFlags = WINDOW_POSSIZE_ALL ); - void SetPosSizePixel( const Point& rNewPos, + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) { Window::SetPosSizePixel( rNewPos, rNewSize ); } - Point GetPosPixel() const; - Size GetSizePixel() const; - void SetOutputSizePixel( const Size& rNewSize ); - Size GetOutputSizePixel() const; + Point GetPosPixel() const; + Size GetSizePixel() const; + void SetOutputSizePixel( const Size& rNewSize ); + Size GetOutputSizePixel() const; }; inline void DockingWindow::SetPin( BOOL bPin ) @@ -448,6 +448,6 @@ inline void DockingWindow::SetFloatingPos( const Point& rNewPos ) } -#endif // _SV_DOCKWIN_HXX +#endif // _SV_DOCKWIN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/edit.hxx b/vcl/inc/vcl/edit.hxx index 6b0ca12eae8e..b8549cdf855e 100644 --- a/vcl/inc/vcl/edit.hxx +++ b/vcl/inc/vcl/edit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -53,8 +53,8 @@ struct Impl_IMEInfos; // - Edit-Types - // -------------- -#define EDIT_NOLIMIT STRING_LEN -#define EDIT_UPDATEDATA_TIMEOUT 350 +#define EDIT_NOLIMIT STRING_LEN +#define EDIT_UPDATEDATA_TIMEOUT 350 typedef XubString (*FncGetSpecialChars)( Window* pWin, const Font& rFont ); @@ -68,20 +68,20 @@ class VCL_DLLPUBLIC Edit : public Control, public vcl::unohelper::DragAndDropCli { private: Edit* mpSubEdit; - Timer* mpUpdateDataTimer; - DDInfo* mpDDInfo; - Impl_IMEInfos* mpIMEInfos; - XubString maText; - XubString maSaveValue; - XubString maUndoText; - XubString maRedoText; - long mnXOffset; - Selection maSelection; - USHORT mnAlign; - xub_StrLen mnMaxTextLen; - AutocompleteAction meAutocompleteAction; - xub_Unicode mcEchoChar; - BOOL mbModified:1, + Timer* mpUpdateDataTimer; + DDInfo* mpDDInfo; + Impl_IMEInfos* mpIMEInfos; + XubString maText; + XubString maSaveValue; + XubString maUndoText; + XubString maRedoText; + long mnXOffset; + Selection maSelection; + USHORT mnAlign; + xub_StrLen mnMaxTextLen; + AutocompleteAction meAutocompleteAction; + xub_Unicode mcEchoChar; + BOOL mbModified:1, mbInternModified:1, mbReadOnly:1, mbInsertMode:1, @@ -89,9 +89,9 @@ private: mbIsSubEdit:1, mbInMBDown:1, mbActivePopup:1; - Link maModifyHdl; - Link maUpdateDataHdl; - Link maAutocompleteHdl; + Link maModifyHdl; + Link maUpdateDataHdl; + Link maAutocompleteHdl; DECL_DLLPRIVATE_LINK( ImplUpdateDataHdl, Timer* ); @@ -111,7 +111,7 @@ private: 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 ImplShowDDCursor(); + SAL_DLLPRIVATE void ImplShowDDCursor(); SAL_DLLPRIVATE void ImplHideDDCursor(); SAL_DLLPRIVATE BOOL ImplHandleKeyEvent( const KeyEvent& rKEvt ); SAL_DLLPRIVATE void ImplCopyToSelectionClipboard(); @@ -160,91 +160,91 @@ public: Edit( Window* pParent, const ResId& rResId, bool bDisableAccessibleLabeledByRelation ); virtual ~Edit(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - 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 GetFocus(); - virtual void LoseFocus(); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Command( const CommandEvent& rCEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + 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 GetFocus(); + virtual void LoseFocus(); + virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void Command( const CommandEvent& rCEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual Window* GetPreferredKeyInputWindow(); - virtual void Modify(); - virtual void UpdateData(); + virtual void Modify(); + virtual void UpdateData(); - static BOOL IsCharInput( const KeyEvent& rKEvt ); + static BOOL IsCharInput( const KeyEvent& rKEvt ); - virtual void SetModifyFlag(); - virtual void ClearModifyFlag(); - virtual BOOL IsModified() const { return mpSubEdit ? mpSubEdit->mbModified : mbModified; } + virtual void SetModifyFlag(); + virtual void ClearModifyFlag(); + virtual BOOL IsModified() const { return mpSubEdit ? mpSubEdit->mbModified : mbModified; } - virtual void EnableUpdateData( ULONG nTimeout = EDIT_UPDATEDATA_TIMEOUT ); - virtual void DisableUpdateData() { delete mpUpdateDataTimer; mpUpdateDataTimer = NULL; } - virtual ULONG IsUpdateDataEnabled() const; + virtual void EnableUpdateData( ULONG nTimeout = EDIT_UPDATEDATA_TIMEOUT ); + virtual void DisableUpdateData() { delete mpUpdateDataTimer; mpUpdateDataTimer = NULL; } + virtual ULONG IsUpdateDataEnabled() const; - void SetEchoChar( xub_Unicode c ); - xub_Unicode GetEchoChar() const { return mcEchoChar; } + 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( BOOL bReadOnly = TRUE ); + virtual BOOL IsReadOnly() const { return mbReadOnly; } - void SetInsertMode( BOOL bInsert ); - BOOL IsInsertMode() const; + void SetInsertMode( BOOL bInsert ); + BOOL IsInsertMode() const; - virtual void SetMaxTextLen( xub_StrLen nMaxLen = EDIT_NOLIMIT ); - virtual xub_StrLen GetMaxTextLen() const { return mnMaxTextLen; } + virtual void SetMaxTextLen( xub_StrLen nMaxLen = EDIT_NOLIMIT ); + virtual xub_StrLen GetMaxTextLen() const { return mnMaxTextLen; } - virtual void SetSelection( const Selection& rSelection ); - virtual const Selection& GetSelection() const; + virtual void SetSelection( const Selection& rSelection ); + virtual const Selection& GetSelection() const; - virtual void ReplaceSelected( const XubString& rStr ); - virtual void DeleteSelected(); - virtual XubString GetSelected() const; + virtual void ReplaceSelected( const XubString& rStr ); + virtual void DeleteSelected(); + virtual XubString GetSelected() const; - virtual void Cut(); - virtual void Copy(); - virtual void Paste(); - void Undo(); + virtual void Cut(); + virtual void Copy(); + virtual void Paste(); + void Undo(); - virtual void SetText( const XubString& rStr ); - virtual void SetText( const XubString& rStr, const Selection& rNewSelection ); - virtual XubString GetText() const; + virtual void SetText( const XubString& rStr ); + virtual void SetText( const XubString& rStr, const Selection& rNewSelection ); + virtual XubString GetText() const; - void SaveValue() { maSaveValue = GetText(); } - const XubString& GetSavedValue() const { return maSaveValue; } + void SaveValue() { maSaveValue = GetText(); } + const XubString& GetSavedValue() const { return maSaveValue; } - virtual void SetModifyHdl( const Link& rLink ) { maModifyHdl = rLink; } - virtual const Link& GetModifyHdl() const { return maModifyHdl; } - virtual void SetUpdateDataHdl( const Link& rLink ) { maUpdateDataHdl = rLink; } + virtual void SetModifyHdl( const Link& rLink ) { maModifyHdl = rLink; } + virtual const Link& GetModifyHdl() const { return maModifyHdl; } + virtual void SetUpdateDataHdl( const Link& rLink ) { maUpdateDataHdl = rLink; } virtual const Link& GetUpdateDataHdl() const { return maUpdateDataHdl; } - void SetSubEdit( Edit* pEdit ); - Edit* GetSubEdit() const { return mpSubEdit; } + void SetSubEdit( Edit* pEdit ); + Edit* GetSubEdit() const { return mpSubEdit; } - void SetAutocompleteHdl( const Link& rHdl ); - const Link& GetAutocompleteHdl() const { return maAutocompleteHdl; } - AutocompleteAction GetAutocompleteAction() const { return meAutocompleteAction; } + void SetAutocompleteHdl( const Link& rHdl ); + const Link& GetAutocompleteHdl() const { return maAutocompleteHdl; } + AutocompleteAction GetAutocompleteAction() const { return meAutocompleteAction; } - virtual Size CalcMinimumSize() const; + virtual Size CalcMinimumSize() const; virtual Size GetOptimalSize(WindowSizeType eType) const; - virtual Size CalcSize( USHORT nChars ) const; - virtual xub_StrLen GetMaxVisChars() const; + virtual Size CalcSize( USHORT nChars ) const; + virtual xub_StrLen GetMaxVisChars() const; xub_StrLen GetCharPos( const Point& rWindowPos ) const; - + // shows a warning box saying "text too long, truncated" static void ShowTruncationWarning( Window* pParent ); - static void SetGetSpecialCharsFunction( FncGetSpecialChars fn ); - static FncGetSpecialChars GetGetSpecialCharsFunction(); + static void SetGetSpecialCharsFunction( FncGetSpecialChars fn ); + static FncGetSpecialChars GetGetSpecialCharsFunction(); - static PopupMenu* CreatePopupMenu(); - static void DeletePopupMenu( PopupMenu* pMenu ); + static PopupMenu* CreatePopupMenu(); + static void DeletePopupMenu( PopupMenu* pMenu ); virtual XubString GetSurroundingText() const; virtual Selection GetSurroundingTextSelection() const; @@ -258,6 +258,6 @@ inline ULONG Edit::IsUpdateDataEnabled() const return FALSE; } -#endif // _SV_EDIT_HXX +#endif // _SV_EDIT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/event.hxx b/vcl/inc/vcl/event.hxx index ef4eb87a9b18..64377b6a7ac2 100644 --- a/vcl/inc/vcl/event.hxx +++ b/vcl/inc/vcl/event.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -48,7 +48,7 @@ namespace com { namespace sun { namespace star { namespace awt { enum TextDirectionality { TextDirectionality_LeftToRight_TopToBottom, TextDirectionality_RightToLeft_TopToBottom, - TextDirectionality_TopToBottom_RightToLeft + TextDirectionality_TopToBottom_RightToLeft }; // ------------ @@ -219,7 +219,7 @@ public: const Point& GetMousePosPixel() const; USHORT GetMode() const { return mnMode; } BOOL KeyboardActivated() const { return mbKeyboardActivated; } - void SetKeyboardActivated( BOOL bKeyboard ) { mbKeyboardActivated = bKeyboard; } + void SetKeyboardActivated( BOOL bKeyboard ) { mbKeyboardActivated = bKeyboard; } }; inline HelpEvent::HelpEvent() diff --git a/vcl/inc/vcl/evntpost.hxx b/vcl/inc/vcl/evntpost.hxx index 2a27bbfff033..aa70ed36f528 100644 --- a/vcl/inc/vcl/evntpost.hxx +++ b/vcl/inc/vcl/evntpost.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/extoutdevdata.hxx b/vcl/inc/vcl/extoutdevdata.hxx index 28f9a05c5b9f..c23c8b27b7a2 100644 --- a/vcl/inc/vcl/extoutdevdata.hxx +++ b/vcl/inc/vcl/extoutdevdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/field.hxx b/vcl/inc/vcl/field.hxx index c5cfe8947796..a1e989c29329 100644 --- a/vcl/inc/vcl/field.hxx +++ b/vcl/inc/vcl/field.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -209,10 +209,10 @@ public: void SetUseThousandSep( BOOL b ); BOOL IsUseThousandSep() const { return mbThousandSep; } - + void SetShowTrailingZeros( BOOL bShowTrailingZeros ); BOOL IsShowTrailingZeros() const { return mbShowTrailingZeros; } - + void SetUserValue( sal_Int64 nNewValue ); virtual void SetValue( sal_Int64 nNewValue ); @@ -598,7 +598,7 @@ public: FieldUnit eInUnit, MapUnit eOutUnit ); static double ConvertDoubleValue( double nValue, USHORT 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, diff --git a/vcl/inc/vcl/fixbrd.hxx b/vcl/inc/vcl/fixbrd.hxx index 70916cfb8704..295de6de5e82 100644 --- a/vcl/inc/vcl/fixbrd.hxx +++ b/vcl/inc/vcl/fixbrd.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -38,11 +38,11 @@ // - FixedBorder-Types - // --------------------- -#define FIXEDBORDER_TYPE_IN (FRAME_DRAW_IN) -#define FIXEDBORDER_TYPE_OUT (FRAME_DRAW_OUT) -#define FIXEDBORDER_TYPE_GROUP (FRAME_DRAW_GROUP) -#define FIXEDBORDER_TYPE_DOUBLEIN (FRAME_DRAW_DOUBLEIN) -#define FIXEDBORDER_TYPE_DOUBLEOUT (FRAME_DRAW_DOUBLEOUT) +#define FIXEDBORDER_TYPE_IN (FRAME_DRAW_IN) +#define FIXEDBORDER_TYPE_OUT (FRAME_DRAW_OUT) +#define FIXEDBORDER_TYPE_GROUP (FRAME_DRAW_GROUP) +#define FIXEDBORDER_TYPE_DOUBLEIN (FRAME_DRAW_DOUBLEIN) +#define FIXEDBORDER_TYPE_DOUBLEOUT (FRAME_DRAW_DOUBLEOUT) // --------------- // - FixedBorder - @@ -51,16 +51,16 @@ class VCL_DLLPUBLIC FixedBorder : public Control { private: - USHORT mnType; - BOOL mbTransparent; + USHORT mnType; + BOOL mbTransparent; private: using Control::ImplInitSettings; using Window::ImplInit; 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 ImplInitSettings(); + SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, const Point& rPos, const Size& rSize ); public: @@ -68,18 +68,18 @@ public: FixedBorder( Window* pParent, const ResId& rResId ); ~FixedBorder(); - virtual void Paint( const Rectangle& rRect ); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); - virtual void Resize(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, 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( BOOL bTransparent ); + BOOL IsTransparent() const { return mbTransparent; } + void SetBorderType( USHORT nType ); + USHORT GetBorderType() const { return mnType; } }; -#endif // _SV_FIXBRD_HXX +#endif // _SV_FIXBRD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/fixed.hxx b/vcl/inc/vcl/fixed.hxx index d14cc750d6ea..a2a52ef598b1 100644 --- a/vcl/inc/vcl/fixed.hxx +++ b/vcl/inc/vcl/fixed.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -91,7 +91,7 @@ private: SAL_DLLPRIVATE void ImplDraw( bool bLayout = false ); protected: - virtual void FillLayoutData() const; + virtual void FillLayoutData() const; virtual const Font& GetCanonicalFont( const StyleSettings& _rStyle ) const; virtual const Color& diff --git a/vcl/inc/vcl/fldunit.hxx b/vcl/inc/vcl/fldunit.hxx index 93c89ada98a0..c5a84fcaa8a0 100644 --- a/vcl/inc/vcl/fldunit.hxx +++ b/vcl/inc/vcl/fldunit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/floatwin.hxx b/vcl/inc/vcl/floatwin.hxx index eb15b116938e..7007c7ec7724 100644 --- a/vcl/inc/vcl/floatwin.hxx +++ b/vcl/inc/vcl/floatwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -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_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_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_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_TITLE_NORMAL ((USHORT)0x0001) +#define FLOATWIN_TITLE_TEAROFF ((USHORT)0x0002) +#define FLOATWIN_TITLE_POPUP ((USHORT)0x0004) +#define FLOATWIN_TITLE_NONE ((USHORT)0x0008) // ------------------ // - FloatingWindow - @@ -78,22 +78,22 @@ class VCL_DLLPUBLIC FloatingWindow : public SystemWindow class ImplData; private: FloatingWindow* mpNextFloat; - Window* mpFirstPopupModeWin; + 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; - Link maPopupModeEndHdl; + 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; + Link maPopupModeEndHdl; SAL_DLLPRIVATE void ImplCallPopupModeEnd(); DECL_DLLPRIVATE_LINK( ImplEndPopupModeHdl, void* ); @@ -109,18 +109,18 @@ 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) +#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 ); 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 static Point ImplCalcPos( Window* pWindow, + SAL_DLLPRIVATE BOOL ImplIsFloatPopupModeWindow( const Window* pWindow ); + SAL_DLLPRIVATE void ImplSetMouseDown() { mbMouseDown = TRUE; } + SAL_DLLPRIVATE 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 ); + SAL_DLLPRIVATE void ImplEndPopupMode( USHORT nFlags = 0, ULONG nFocusId = 0 ); SAL_DLLPRIVATE Rectangle& ImplGetItemEdgeClipRect(); SAL_DLLPRIVATE BOOL ImplIsInPrivatePopupMode() const { return mbInPopupMode; } @@ -129,29 +129,29 @@ public: FloatingWindow( Window* pParent, const ResId& rResId ); ~FloatingWindow(); - virtual long Notify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - - virtual void PopupModeEnd(); - - void SetTitleType( USHORT nTitle ); - USHORT 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 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; } - - void SetPopupModeEndHdl( const Link& rLink ) { maPopupModeEndHdl = rLink; } - const Link& GetPopupModeEndHdl() const { return maPopupModeEndHdl; } + virtual long Notify( NotifyEvent& rNEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + + virtual void PopupModeEnd(); + + void SetTitleType( USHORT nTitle ); + USHORT 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 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; } + + void SetPopupModeEndHdl( const Link& rLink ) { maPopupModeEndHdl = rLink; } + const Link& GetPopupModeEndHdl() const { return maPopupModeEndHdl; } BOOL GrabsFocus() const { return mbGrabFocus; } diff --git a/vcl/inc/vcl/fntstyle.hxx b/vcl/inc/vcl/fntstyle.hxx index 72705fde16f2..103863dbe272 100644 --- a/vcl/inc/vcl/fntstyle.hxx +++ b/vcl/inc/vcl/fntstyle.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -48,9 +48,9 @@ enum FontRelief { RELIEF_NONE, RELIEF_EMBOSSED, RELIEF_ENGRAVED, FontRelief_FORC // -------------- typedef BYTE FontKerning; -#define KERNING_FONTSPECIFIC ((FontKerning)0x01) -#define KERNING_ASIAN ((FontKerning)0x02) +#define KERNING_FONTSPECIFIC ((FontKerning)0x01) +#define KERNING_ASIAN ((FontKerning)0x02) -#endif // _VCL_FNTSTYLE_HXX +#endif // _VCL_FNTSTYLE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/font.hxx b/vcl/inc/vcl/font.hxx index d9c4d62f57d0..e59575d9407f 100644 --- a/vcl/inc/vcl/font.hxx +++ b/vcl/inc/vcl/font.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -50,8 +50,8 @@ class ImplFontAttributes; class VCL_DLLPUBLIC Font { private: - Impl_Font* mpImplFont; - void MakeUnique(); + Impl_Font* mpImplFont; + void MakeUnique(); public: Font(); @@ -61,83 +61,83 @@ public: Font( FontFamily eFamily, const Size& ); ~Font(); - void SetColor( const Color& ); - const Color& GetColor() const; - void SetFillColor( const Color& ); - const Color& GetFillColor() const; - void SetTransparent( BOOL bTransparent ); - BOOL IsTransparent() const; - void SetAlign( FontAlign ); - FontAlign GetAlign() const; - - void SetName( const String& rFamilyName ); - const String& GetName() const; - void SetStyleName( const String& rStyleName ); - const String& GetStyleName() const; - void SetSize( const Size& ); - const Size& GetSize() const; - void SetHeight( long nHeight ); - long GetHeight() const; - void SetWidth( long nWidth ); - long GetWidth() const; - - void SetFamily( FontFamily ); - FontFamily GetFamily() const; - void SetCharSet( rtl_TextEncoding ); - rtl_TextEncoding GetCharSet() const; - void SetLanguage( LanguageType ); - LanguageType GetLanguage() const; - void SetCJKContextLanguage( LanguageType ); - LanguageType GetCJKContextLanguage() const; - void SetPitch( FontPitch ePitch ); - FontPitch GetPitch() const; - - void SetOrientation( short nLineOrientation ); - short GetOrientation() const; - void SetVertical( BOOL bVertical ); - BOOL IsVertical() const; - void SetKerning( FontKerning nKerning ); - FontKerning GetKerning() const; - BOOL IsKerning() const; - - void SetWeight( FontWeight ); - FontWeight GetWeight() const; - void SetWidthType( FontWidth ); - FontWidth GetWidthType() const; - void SetItalic( FontItalic ); - FontItalic GetItalic() const; - void SetOutline( BOOL bOutline ); - BOOL IsOutline() const; - void SetShadow( BOOL bShadow ); - BOOL IsShadow() const; - void SetRelief( FontRelief ); - FontRelief GetRelief() const; - void SetUnderline( FontUnderline ); - FontUnderline GetUnderline() const; - void SetOverline( FontUnderline ); - FontUnderline GetOverline() const; - void SetStrikeout( FontStrikeout ); - FontStrikeout GetStrikeout() const; - void SetEmphasisMark( FontEmphasisMark ); - FontEmphasisMark GetEmphasisMark() const; - void SetWordLineMode( BOOL bWordLine ); - BOOL IsWordLineMode() const; - - void Merge( const Font& rFont ); + void SetColor( const Color& ); + const Color& GetColor() const; + void SetFillColor( const Color& ); + const Color& GetFillColor() const; + void SetTransparent( BOOL bTransparent ); + BOOL IsTransparent() const; + void SetAlign( FontAlign ); + FontAlign GetAlign() const; + + void SetName( const String& rFamilyName ); + const String& GetName() const; + void SetStyleName( const String& rStyleName ); + const String& GetStyleName() const; + void SetSize( const Size& ); + const Size& GetSize() const; + void SetHeight( long nHeight ); + long GetHeight() const; + void SetWidth( long nWidth ); + long GetWidth() const; + + void SetFamily( FontFamily ); + FontFamily GetFamily() const; + void SetCharSet( rtl_TextEncoding ); + rtl_TextEncoding GetCharSet() const; + void SetLanguage( LanguageType ); + LanguageType GetLanguage() const; + void SetCJKContextLanguage( LanguageType ); + LanguageType GetCJKContextLanguage() const; + void SetPitch( FontPitch ePitch ); + FontPitch GetPitch() const; + + void SetOrientation( short nLineOrientation ); + short GetOrientation() const; + void SetVertical( BOOL bVertical ); + BOOL IsVertical() const; + void SetKerning( FontKerning nKerning ); + FontKerning GetKerning() const; + BOOL IsKerning() const; + + void SetWeight( FontWeight ); + FontWeight GetWeight() const; + void SetWidthType( FontWidth ); + FontWidth GetWidthType() const; + void SetItalic( FontItalic ); + FontItalic GetItalic() const; + void SetOutline( BOOL bOutline ); + BOOL IsOutline() const; + void SetShadow( BOOL bShadow ); + BOOL IsShadow() const; + void SetRelief( FontRelief ); + FontRelief GetRelief() const; + void SetUnderline( FontUnderline ); + FontUnderline GetUnderline() const; + void SetOverline( FontUnderline ); + FontUnderline GetOverline() const; + void SetStrikeout( FontStrikeout ); + FontStrikeout GetStrikeout() const; + void SetEmphasisMark( FontEmphasisMark ); + FontEmphasisMark GetEmphasisMark() const; + void SetWordLineMode( BOOL bWordLine ); + 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 + Font& operator=( const Font& ); + BOOL operator==( const Font& ) const; + BOOL operator!=( const Font& rFont ) const { return !(Font::operator==( rFont )); } - BOOL IsSameInstance( const Font& ) const; - - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Font& ); - friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Font& ); + BOOL IsSameInstance( const Font& ) const; + friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Font& ); + friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Font& ); + static Font identifyFont( const void* pBuffer, sal_uInt32 nLen ); }; -#endif // _VCL_FONT_HXX +#endif // _VCL_FONT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/fontcache.hxx b/vcl/inc/vcl/fontcache.hxx index 726549ae6e5b..8beb1e4c6a70 100644 --- a/vcl/inc/vcl/fontcache.hxx +++ b/vcl/inc/vcl/fontcache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -49,24 +49,24 @@ class VCL_DLLPUBLIC FontCache typedef std::list< PrintFontManager::PrintFont* > FontCacheEntry; struct FontFile { - FontCacheEntry m_aEntry; + FontCacheEntry m_aEntry; }; typedef std::hash_map< ::rtl::OString, FontFile, ::rtl::OStringHash > FontDirMap; struct FontDir { - sal_Int64 m_nTimestamp; - bool m_bNoFiles; + sal_Int64 m_nTimestamp; + bool m_bNoFiles; bool m_bUserOverrideOnly; - FontDirMap m_aEntries; + FontDirMap m_aEntries; FontDir() : m_nTimestamp(0), m_bNoFiles(false), m_bUserOverrideOnly( false ) {} }; - + typedef std::hash_map< int, FontDir > FontCacheData; - FontCacheData m_aCache; - String m_aCacheFile; - bool m_bDoFlush; + FontCacheData m_aCache; + String m_aCacheFile; + bool m_bDoFlush; void read(); void clearCache(); diff --git a/vcl/inc/vcl/fontmanager.hxx b/vcl/inc/vcl/fontmanager.hxx index ef9175cde698..8a97e0449053 100644 --- a/vcl/inc/vcl/fontmanager.hxx +++ b/vcl/inc/vcl/fontmanager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -80,7 +80,7 @@ enum type { UltraExpanded = 9 }; } - + namespace pitch { enum type { @@ -110,13 +110,13 @@ enum type { namespace family { enum type { - Unknown = 0, - Decorative = 1, + Unknown = 0, + Decorative = 1, Modern = 2, - Roman = 3, - Script = 4, - Swiss = 5, - System = 6 + Roman = 3, + Script = 4, + Swiss = 5, + System = 6 }; } @@ -130,12 +130,12 @@ enum type { }; } -namespace fcstatus +namespace fcstatus { -enum type { +enum type { istrue, isunset, - isfalse + isfalse }; } @@ -151,19 +151,19 @@ enum type { struct FastPrintFontInfo { - fontID m_nID; // FontID - fonttype::type m_eType; - + fontID m_nID; // FontID + fonttype::type m_eType; + // font attributes - rtl::OUString m_aFamilyName; + rtl::OUString m_aFamilyName; rtl::OUString m_aStyleName; - std::list< rtl::OUString > m_aAliases; - family::type m_eFamilyStyle; - italic::type m_eItalic; - width::type m_eWidth; - weight::type m_eWeight; - pitch::type m_ePitch; - rtl_TextEncoding m_aEncoding; + std::list< rtl::OUString > m_aAliases; + family::type m_eFamilyStyle; + italic::type m_eItalic; + width::type m_eWidth; + weight::type m_eWeight; + pitch::type m_ePitch; + rtl_TextEncoding m_aEncoding; bool m_bSubsettable; bool m_bEmbeddable; @@ -181,10 +181,10 @@ struct FastPrintFontInfo struct PrintFontInfo : public FastPrintFontInfo { - int m_nAscend; - int m_nDescend; - int m_nLeading; - int m_nWidth; + int m_nAscend; + int m_nDescend; + int m_nLeading; + int m_nWidth; PrintFontInfo() : FastPrintFontInfo(), @@ -257,20 +257,20 @@ class VCL_DLLPUBLIC PrintFontManager bool m_bKernPairsQueried; std::list< KernPair > m_aXKernPairs; std::list< KernPair > m_aYKernPairs; - std::hash_map< sal_Unicode, bool > m_bVerticalSubstitutions; + std::hash_map< sal_Unicode, bool > m_bVerticalSubstitutions; PrintFontMetrics() : m_bKernPairsQueried( false ) {} - + bool isEmpty() const { return m_aMetrics.empty(); } }; struct PrintFont { fonttype::type m_eType; - + // font attributes int m_nFamilyName; // atom - std::list< int > m_aAliases; + std::list< int > m_aAliases; int m_nPSName; // atom rtl::OUString m_aStyleName; italic::type m_eItalic; @@ -278,22 +278,22 @@ class VCL_DLLPUBLIC PrintFontManager weight::type m_eWeight; pitch::type m_ePitch; rtl_TextEncoding m_aEncoding; - bool m_bFontEncodingOnly; // set if font should be only accessed by builtin encoding + bool m_bFontEncodingOnly; // set if font should be only accessed by builtin encoding CharacterMetric m_aGlobalMetricX; CharacterMetric m_aGlobalMetricY; PrintFontMetrics* m_pMetrics; int m_nAscend; int m_nDescend; int m_nLeading; - int m_nXMin; // font bounding box - int m_nYMin; - int m_nXMax; - int m_nYMax; - bool m_bHaveVerticalSubstitutedGlyphs; + int m_nXMin; // font bounding box + int m_nYMin; + int m_nXMax; + int m_nYMax; + bool m_bHaveVerticalSubstitutedGlyphs; bool m_bUserOverride; - std::map< sal_Unicode, sal_Int32 > m_aEncodingVector; - std::map< sal_Unicode, rtl::OString > m_aNonEncoded; + std::map< sal_Unicode, sal_Int32 > m_aEncodingVector; + std::map< sal_Unicode, rtl::OString > m_aNonEncoded; PrintFont( fonttype::type eType ); virtual ~PrintFont(); @@ -319,11 +319,11 @@ class VCL_DLLPUBLIC PrintFontManager struct TrueTypeFontFile : public PrintFont { - int m_nDirectory; // atom containing system dependent path + int m_nDirectory; // atom containing system dependent path rtl::OString m_aFontFile; // relative to directory rtl::OString m_aXLFD; // mainly for administration, contains the XLFD from fonts.dir int m_nCollectionEntry; // -1 for regular fonts, 0 to ... for fonts stemming from collections - unsigned int m_nTypeFlags; // copyright bits and PS-OpenType flag + unsigned int m_nTypeFlags; // copyright bits and PS-OpenType flag TrueTypeFontFile(); virtual ~TrueTypeFontFile(); @@ -342,25 +342,25 @@ class VCL_DLLPUBLIC PrintFontManager struct XLFDEntry { - static const int MaskFoundry = 1; - static const int MaskFamily = 2; - static const int MaskAddStyle = 4; - static const int MaskItalic = 8; - static const int MaskWeight = 16; - static const int MaskWidth = 32; - static const int MaskPitch = 64; - static const int MaskEncoding = 128; - - int nMask; // contains a bit set for every valid member - - rtl::OString aFoundry; - rtl::OString aFamily; - rtl::OString aAddStyle; - italic::type eItalic; - weight::type eWeight; - width::type eWidth; - pitch::type ePitch; - rtl_TextEncoding aEncoding; + static const int MaskFoundry = 1; + static const int MaskFamily = 2; + static const int MaskAddStyle = 4; + static const int MaskItalic = 8; + static const int MaskWeight = 16; + static const int MaskWidth = 32; + static const int MaskPitch = 64; + static const int MaskEncoding = 128; + + int nMask; // contains a bit set for every valid member + + rtl::OString aFoundry; + rtl::OString aFamily; + rtl::OString aAddStyle; + italic::type eItalic; + weight::type eWeight; + width::type eWidth; + pitch::type ePitch; + rtl_TextEncoding aEncoding; XLFDEntry() { nMask = 0; } @@ -375,7 +375,7 @@ class VCL_DLLPUBLIC PrintFontManager std::hash_map< int, family::type > m_aFamilyTypes; std::list< rtl::OUString > m_aPrinterDrivers; std::list< rtl::OString > m_aFontDirectories; - std::list< int > m_aPrivateFontDirectories; + std::list< int > m_aPrivateFontDirectories; std::map< struct XLFDEntry, std::list< struct XLFDEntry > > m_aXLFD_Aliases; utl::MultiAtomProvider* m_pAtoms; @@ -392,14 +392,14 @@ class VCL_DLLPUBLIC PrintFontManager m_aAdobenameToUnicode; std::hash_multimap< sal_Unicode, rtl::OString > m_aUnicodeToAdobename; - std::hash_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode; - std::hash_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode; + std::hash_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode; + std::hash_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode; mutable FontCache* m_pFontCache; bool m_bFontconfigSuccess; mutable std::vector< fontID > m_aOverrideFonts; - + rtl::OString getAfmFile( PrintFont* pFont ) const; rtl::OString getFontFile( PrintFont* pFont ) const; @@ -447,18 +447,18 @@ class VCL_DLLPUBLIC PrintFontManager since fontconfig is asked for font substitutes before OOo will check for font availability and fontconfig will happily substitute fonts it doesn't know (e.g. "Arial Narrow" -> "DejaVu Sans Book"!) - it becomes necessary to tell the library about all the hidden font treasures - + it becomes necessary to tell the library about all the hidden font treasures + @returns true if libfontconfig accepted the directory false else (e.g. no libfontconfig found) */ bool addFontconfigDir(const rtl::OString& rDirectory); - + static bool parseXLFD( const rtl::OString& rXLFD, XLFDEntry& rEntry ); void parseXLFD_appendAliases( const std::list< rtl::OString >& rXLFDs, std::list< XLFDEntry >& rEntries ) const; void initFontsAlias(); - + bool readOverrideMetrics(); PrintFontManager(); @@ -466,17 +466,17 @@ class VCL_DLLPUBLIC PrintFontManager public: static PrintFontManager& get(); // one instance only - int addFontFile( const rtl::OString& rFileName, int nFaceNum ); + int addFontFile( const rtl::OString& rFileName, int nFaceNum ); void initialize(); // returns the number of managed fonts int getFontCount() const { return m_aFonts.size(); } - + // caution: the getFontList* methods can change the font list on demand // depending on the pParser argument. That is getFontCount() may // return a larger value after getFontList() - + // returns the ids of all managed fonts. on pParser != NULL // all fonttype::Builtin type fonts are not listed // which do not occur in the PPD of pParser @@ -503,7 +503,7 @@ public: // get a specific fonts family name aliases void getFontFamilyAliases( fontID nFontID ) const; - + // get a specific fonts type fonttype::type getFontType( fontID nFontID ) const { @@ -733,8 +733,8 @@ public: bool matchFont( FastPrintFontInfo& rInfo, const com::sun::star::lang::Locale& rLocale ); bool getFontOptions( const FastPrintFontInfo&, int nSize, void (*subcallback)(void*), ImplFontOptions& rResult ) const; - rtl::OUString Substitute( const rtl::OUString& rFontName, rtl::OUString& rMissingCodes, - const rtl::OString& rLangAttrib, italic::type& rItalic, weight::type& rWeight, + rtl::OUString Substitute( const rtl::OUString& rFontName, rtl::OUString& rMissingCodes, + const rtl::OString& rLangAttrib, italic::type& rItalic, weight::type& rWeight, width::type& rWidth, pitch::type& rPitch) const; bool hasFontconfig() const { return m_bFontconfigSuccess; } diff --git a/vcl/inc/vcl/fontsubset.hxx b/vcl/inc/vcl/fontsubset.hxx index f710434698de..392ad42a7c56 100644 --- a/vcl/inc/vcl/fontsubset.hxx +++ b/vcl/inc/vcl/fontsubset.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -38,60 +38,60 @@ namespace vcl { struct _TrueTypeFont; } // SFT's idea of a TTF font class FontSubsetInfo { public: - explicit FontSubsetInfo( void ); - virtual ~FontSubsetInfo( void ); + explicit FontSubsetInfo( void ); + virtual ~FontSubsetInfo( void ); enum FontType { - NO_FONT = 0, - SFNT_TTF = 1<<1, // SFNT container with TrueType glyphs - SFNT_CFF = 1<<2, // SFNT container with CFF-container - TYPE1_PFA = 1<<3, // PSType1 Postscript Font Ascii - TYPE1_PFB = 1<<4, // PSType1 Postscript Font Binary - CFF_FONT = 1<<5, // CFF-container with PSType2 glyphs - TYPE3_FONT = 1<<6, // PSType3 Postscript font - TYPE42_FONT = 1<<7, // PSType42 wrapper for an SFNT_TTF - ANY_SFNT = SFNT_TTF | SFNT_CFF, - ANY_TYPE1 = TYPE1_PFA | TYPE1_PFB, - ANY_FONT = 0xFF + NO_FONT = 0, + SFNT_TTF = 1<<1, // SFNT container with TrueType glyphs + SFNT_CFF = 1<<2, // SFNT container with CFF-container + TYPE1_PFA = 1<<3, // PSType1 Postscript Font Ascii + TYPE1_PFB = 1<<4, // PSType1 Postscript Font Binary + CFF_FONT = 1<<5, // CFF-container with PSType2 glyphs + TYPE3_FONT = 1<<6, // PSType3 Postscript font + TYPE42_FONT = 1<<7, // PSType42 wrapper for an SFNT_TTF + ANY_SFNT = SFNT_TTF | SFNT_CFF, + ANY_TYPE1 = TYPE1_PFA | TYPE1_PFB, + ANY_FONT = 0xFF }; - bool LoadFont( FontType eInFontType, + bool LoadFont( FontType eInFontType, const unsigned char* pFontBytes, int nByteLength ); - bool LoadFont( vcl::_TrueTypeFont* pSftTrueTypeFont ); + bool LoadFont( vcl::_TrueTypeFont* pSftTrueTypeFont ); - bool CreateFontSubset( int nOutFontTypeMask, + bool CreateFontSubset( int nOutFontTypeMask, FILE* pOutFile, const char* pOutFontName, const long* pReqGlyphIds, const sal_uInt8* pEncodedIds, int nReqGlyphCount, sal_Int32* pOutGlyphWidths = NULL ); public: // TODO: make subsetter results private and provide accessor methods instead // subsetter-provided subset details needed by e.g. Postscript or PDF - String m_aPSName; - int m_nAscent; // all metrics in PS font units - int m_nDescent; - int m_nCapHeight; - Rectangle m_aFontBBox; - FontType m_nFontType; // font-type of subset result + String m_aPSName; + int m_nAscent; // all metrics in PS font units + int m_nDescent; + int m_nCapHeight; + Rectangle m_aFontBBox; + FontType m_nFontType; // font-type of subset result private: // input-font-specific details - unsigned const char* mpInFontBytes; - int mnInByteLength; - FontType meInFontType; // allowed mask of input font-types - vcl::_TrueTypeFont* mpSftTTFont; + unsigned const char* mpInFontBytes; + int mnInByteLength; + FontType meInFontType; // allowed mask of input font-types + vcl::_TrueTypeFont* mpSftTTFont; // subset-request details - int mnReqFontTypeMask; // allowed subset-target font types - FILE* mpOutFile; - const char* mpReqFontName; - const long* mpReqGlyphIds; - const sal_uInt8* mpReqEncodedIds; - int mnReqGlyphCount; + int mnReqFontTypeMask; // allowed subset-target font types + FILE* mpOutFile; + const char* mpReqFontName; + const long* mpReqGlyphIds; + const sal_uInt8* mpReqEncodedIds; + int mnReqGlyphCount; protected: - bool CreateFontSubsetFromCff( sal_Int32* pOutGlyphWidths = NULL ); - bool CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths = NULL ); - bool CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths = NULL ); + bool CreateFontSubsetFromCff( sal_Int32* pOutGlyphWidths = NULL ); + bool CreateFontSubsetFromSfnt( sal_Int32* pOutGlyphWidths = NULL ); + bool CreateFontSubsetFromType1( sal_Int32* pOutGlyphWidths = NULL ); }; #endif // _SV_FONTSUBSET_HXX diff --git a/vcl/inc/vcl/gdimtf.hxx b/vcl/inc/vcl/gdimtf.hxx index 9e40829a26f6..14cc127aae02 100644 --- a/vcl/inc/vcl/gdimtf.hxx +++ b/vcl/inc/vcl/gdimtf.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -55,20 +55,20 @@ class Gradient; #define GDI_METAFILE_LABEL_NOTFOUND ((ULONG)0xFFFFFFFF) #ifndef METAFILE_END -#define METAFILE_END GDI_METAFILE_END +#define METAFILE_END GDI_METAFILE_END #endif #ifndef METAFILE_LABEL_NOTFOUND -#define METAFILE_LABEL_NOTFOUND GDI_METAFILE_LABEL_NOTFOUND +#define METAFILE_LABEL_NOTFOUND GDI_METAFILE_LABEL_NOTFOUND #endif // ----------- // - Defines - // ----------- -#define MTF_MIRROR_NONE 0x00000000UL -#define MTF_MIRROR_HORZ 0x00000001UL -#define MTF_MIRROR_VERT 0x00000002UL +#define MTF_MIRROR_NONE 0x00000000UL +#define MTF_MIRROR_HORZ 0x00000001UL +#define MTF_MIRROR_VERT 0x00000002UL // --------- // - Enums - @@ -112,29 +112,29 @@ private: SAL_DLLPRIVATE static Color ImplColAdjustFnc( const Color& rColor, const void* pColParam ); SAL_DLLPRIVATE static BitmapEx ImplBmpAdjustFnc( const BitmapEx& rBmpEx, const void* pBmpParam ); - SAL_DLLPRIVATE static Color ImplColConvertFnc( const Color& rColor, const void* pColParam ); + SAL_DLLPRIVATE static Color ImplColConvertFnc( const Color& rColor, const void* pColParam ); SAL_DLLPRIVATE static BitmapEx ImplBmpConvertFnc( const BitmapEx& rBmpEx, const void* pBmpParam ); - SAL_DLLPRIVATE static Color ImplColMonoFnc( const Color& rColor, const void* pColParam ); + SAL_DLLPRIVATE static Color ImplColMonoFnc( const Color& rColor, const void* pColParam ); SAL_DLLPRIVATE static BitmapEx ImplBmpMonoFnc( const BitmapEx& rBmpEx, const void* pBmpParam ); - SAL_DLLPRIVATE static Color ImplColReplaceFnc( const Color& rColor, const void* pColParam ); + SAL_DLLPRIVATE static Color ImplColReplaceFnc( const Color& rColor, const void* pColParam ); SAL_DLLPRIVATE static BitmapEx ImplBmpReplaceFnc( const BitmapEx& rBmpEx, const void* pBmpParam ); - SAL_DLLPRIVATE void ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pColParam, + SAL_DLLPRIVATE void ImplExchangeColors( ColorExchangeFnc pFncCol, const void* pColParam, BmpExchangeFnc pFncBmp, const void* pBmpParam ); - SAL_DLLPRIVATE Point ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt, + SAL_DLLPRIVATE Point ImplGetRotatedPoint( const Point& rPt, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ); - SAL_DLLPRIVATE Polygon ImplGetRotatedPolygon( const Polygon& rPoly, const Point& rRotatePt, + SAL_DLLPRIVATE Polygon ImplGetRotatedPolygon( const Polygon& rPoly, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ); - SAL_DLLPRIVATE PolyPolygon ImplGetRotatedPolyPolygon( const PolyPolygon& rPoly, const Point& rRotatePt, + SAL_DLLPRIVATE PolyPolygon ImplGetRotatedPolyPolygon( const PolyPolygon& rPoly, const Point& rRotatePt, const Size& rOffset, double fSin, double fCos ); - SAL_DLLPRIVATE void ImplAddGradientEx( GDIMetaFile& rMtf, + SAL_DLLPRIVATE void ImplAddGradientEx( GDIMetaFile& rMtf, const OutputDevice& rMapDev, const PolyPolygon& rPolyPoly, - const Gradient& rGrad ); - SAL_DLLPRIVATE bool ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, Size rDestSize ); + const Gradient& rGrad ); + SAL_DLLPRIVATE bool ImplPlayWithRenderer( OutputDevice* pOut, const Point& rPos, Size rDestSize ); SAL_DLLPRIVATE void ImplDelegate2PluggableRenderer( const MetaCommentAction* pAct, OutputDevice* pOut ); @@ -146,16 +146,16 @@ protected: public: GDIMetaFile(); GDIMetaFile( const GDIMetaFile& rMtf ); - virtual ~GDIMetaFile(); + virtual ~GDIMetaFile(); 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 ); } + BOOL operator==( const GDIMetaFile& rMtf ) const; + BOOL operator!=( const GDIMetaFile& rMtf ) const { return !( *this == rMtf ); } void Clear(); - sal_Bool IsEqual( const GDIMetaFile& rMtf ) const; + sal_Bool IsEqual( const GDIMetaFile& rMtf ) const; BOOL Mirror( ULONG nMirrorFlags ); void Move( long nX, long nY ); // additional Move method getting specifics how to handle MapMode( MAP_PIXEL ) @@ -173,12 +173,12 @@ public: */ Rectangle GetBoundRect( OutputDevice& i_rReference ); - void Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, - short nChannelRPercent = 0, short nChannelGPercent = 0, + void Adjust( short nLuminancePercent = 0, short nContrastPercent = 0, + short nChannelRPercent = 0, short nChannelGPercent = 0, short nChannelBPercent = 0, double fGamma = 1.0, BOOL bInvert = FALSE ); - void Convert( MtfConversion eConversion ); - void ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 ); - void ReplaceColors( const Color* pSearchColors, const Color* rReplaceColors, + void Convert( MtfConversion eConversion ); + void ReplaceColors( const Color& rSearchColor, const Color& rReplaceColor, ULONG nTol = 0 ); + void ReplaceColors( const Color* pSearchColors, const Color* rReplaceColors, ULONG nColorCount, ULONG* pTols = NULL ); GDIMetaFile GetMonochromeMtf( const Color& rCol ) const; @@ -205,12 +205,12 @@ public: ULONG GetActionCount() const { return Count(); } void AddAction( MetaAction* pAction ); void AddAction( MetaAction* pAction, ULONG nPos ); - void RemoveAction( ULONG nPos ); + void RemoveAction( ULONG nPos ); MetaAction* CopyAction( ULONG nPos ) const; MetaAction* GetCurAction() const { return (MetaAction*) GetCurObject(); } MetaAction* GetAction( ULONG nAction ) const { return (MetaAction*) GetObject( nAction ); } - MetaAction* FirstAction() { return (MetaAction*) First(); } - MetaAction* NextAction() { return (MetaAction*) Next(); } + MetaAction* FirstAction() { return (MetaAction*) First(); } + MetaAction* NextAction() { return (MetaAction*) Next(); } MetaAction* ReplaceAction( MetaAction* pAction, ULONG nAction ) { return (MetaAction*) Replace( pAction, nAction ); } ULONG GetActionPos( const String& rLabel ); @@ -231,13 +231,13 @@ public: void SetHookHdl( const Link& rLink ) { aHookHdlLink = rLink; } const Link& GetHookHdl() const { return aHookHdlLink; } - ULONG GetChecksum() const; + ULONG GetChecksum() const; ULONG GetSizeBytes() const; // Methoden zum Lesen und Schreiben des neuen Formats; // die Read-Methode kann auch das alte Format lesen - SvStream& Read( SvStream& rIStm ); - SvStream& Write( SvStream& rOStm ); + SvStream& Read( SvStream& rIStm ); + SvStream& Write( SvStream& rOStm ); // Stream-Operatoren schreiben das alte Format (noch) // und lesen sowohl das alte wie auch das neue Format diff --git a/vcl/inc/vcl/gfxlink.hxx b/vcl/inc/vcl/gfxlink.hxx index 5f1b593ba44a..29b6461b8f5a 100644 --- a/vcl/inc/vcl/gfxlink.hxx +++ b/vcl/inc/vcl/gfxlink.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,8 +40,8 @@ struct ImpBuffer { - ULONG mnRefCount; - BYTE* mpBuffer; + ULONG mnRefCount; + BYTE* mpBuffer; ImpBuffer( ULONG nSize ) { @@ -60,18 +60,18 @@ struct ImpBuffer struct ImpSwap { - rtl::OUString maURL; - ULONG mnDataSize; - ULONG mnRefCount; + rtl::OUString maURL; + ULONG mnDataSize; + ULONG mnRefCount; ImpSwap( BYTE* pData, ULONG nDataSize ); ~ImpSwap(); - BYTE* GetData() const; + BYTE* GetData() const; - BOOL IsSwapped() const { return maURL.getLength() > 0; } + BOOL IsSwapped() const { return maURL.getLength() > 0; } - void WriteTo( SvStream& rOStm ) const; + void WriteTo( SvStream& rOStm ) const; }; // -------------- @@ -82,14 +82,14 @@ struct ImpGfxLink { MapMode maPrefMapMode; Size maPrefSize; - bool mbPrefMapModeValid; - bool mbPrefSizeValid; + bool mbPrefMapModeValid; + bool mbPrefSizeValid; - ImpGfxLink() : + ImpGfxLink() : maPrefMapMode(), maPrefSize(), - mbPrefMapModeValid( false ), - mbPrefSizeValid( false ) + mbPrefMapModeValid( false ), + mbPrefSizeValid( false ) {} }; @@ -101,20 +101,20 @@ struct ImpGfxLink enum GfxLinkType { - GFX_LINK_TYPE_NONE = 0, - GFX_LINK_TYPE_EPS_BUFFER = 1, - GFX_LINK_TYPE_NATIVE_GIF = 2, // Don't forget to update the following defines - GFX_LINK_TYPE_NATIVE_JPG = 3, // Don't forget to update the following defines - GFX_LINK_TYPE_NATIVE_PNG = 4, // Don't forget to update the following defines - GFX_LINK_TYPE_NATIVE_TIF = 5, // Don't forget to update the following defines - GFX_LINK_TYPE_NATIVE_WMF = 6, // Don't forget to update the following defines - GFX_LINK_TYPE_NATIVE_MET = 7, // Don't forget to update the following defines - GFX_LINK_TYPE_NATIVE_PCT = 8, // Don't forget to update the following defines - GFX_LINK_TYPE_USER = 0xffff + GFX_LINK_TYPE_NONE = 0, + GFX_LINK_TYPE_EPS_BUFFER = 1, + GFX_LINK_TYPE_NATIVE_GIF = 2, // Don't forget to update the following defines + GFX_LINK_TYPE_NATIVE_JPG = 3, // Don't forget to update the following defines + GFX_LINK_TYPE_NATIVE_PNG = 4, // Don't forget to update the following defines + GFX_LINK_TYPE_NATIVE_TIF = 5, // Don't forget to update the following defines + GFX_LINK_TYPE_NATIVE_WMF = 6, // Don't forget to update the following defines + GFX_LINK_TYPE_NATIVE_MET = 7, // Don't forget to update the following defines + GFX_LINK_TYPE_NATIVE_PCT = 8, // Don't forget to update the following defines + GFX_LINK_TYPE_USER = 0xffff }; -#define GFX_LINK_FIRST_NATIVE_ID GFX_LINK_TYPE_NATIVE_GIF -#define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_PCT +#define GFX_LINK_FIRST_NATIVE_ID GFX_LINK_TYPE_NATIVE_GIF +#define GFX_LINK_LAST_NATIVE_ID GFX_LINK_TYPE_NATIVE_PCT // ----------- // - GfxLink - @@ -129,58 +129,58 @@ class VCL_DLLPUBLIC GfxLink { private: - GfxLinkType meType; - ImpBuffer* mpBuf; - ImpSwap* mpSwap; - sal_uInt32 mnBufSize; - sal_uInt32 mnUserId; + GfxLinkType meType; + ImpBuffer* mpBuf; + ImpSwap* mpSwap; + sal_uInt32 mnBufSize; + sal_uInt32 mnUserId; ImpGfxLink* mpImpData; - ULONG mnExtra2; + ULONG mnExtra2; - SAL_DLLPRIVATE void ImplCopy( const GfxLink& rGfxLink ); + SAL_DLLPRIVATE void ImplCopy( const GfxLink& rGfxLink ); -public: +public: GfxLink(); GfxLink( const GfxLink& ); GfxLink( const String& rPath, GfxLinkType nType ); GfxLink( BYTE* pBuf, sal_uInt32 nBufSize, GfxLinkType nType, BOOL bOwns ); ~GfxLink(); - GfxLink& operator=( const GfxLink& ); - sal_Bool IsEqual( const GfxLink& ) const; + GfxLink& operator=( const GfxLink& ); + sal_Bool IsEqual( const GfxLink& ) const; - GfxLinkType GetType() const; + GfxLinkType GetType() const; - void SetUserId( sal_uInt32 nUserId ) { mnUserId = nUserId; } - sal_uInt32 GetUserId() const { return mnUserId; } + void SetUserId( sal_uInt32 nUserId ) { mnUserId = nUserId; } + 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; + sal_uInt32 GetDataSize() const; + void SetData( BYTE* pBuf, sal_uInt32 nSize, GfxLinkType nType, BOOL bOwns ); + const BYTE* GetData() const; - const Size& GetPrefSize() const; - void SetPrefSize( const Size& rPrefSize ); - bool IsPrefSizeValid(); + const Size& GetPrefSize() const; + void SetPrefSize( const Size& rPrefSize ); + bool IsPrefSizeValid(); - const MapMode& GetPrefMapMode() const; - void SetPrefMapMode( const MapMode& rPrefMapMode ); - bool IsPrefMapModeValid(); + const MapMode& GetPrefMapMode() const; + void SetPrefMapMode( const MapMode& rPrefMapMode ); + bool IsPrefMapModeValid(); - BOOL IsNative() const; - BOOL IsUser() const { return( GFX_LINK_TYPE_USER == meType ); } + BOOL IsNative() const; + BOOL IsUser() const { return( GFX_LINK_TYPE_USER == meType ); } - BOOL LoadNative( Graphic& rGraphic ); + BOOL LoadNative( Graphic& rGraphic ); - BOOL ExportNative( SvStream& rOStream ) const; + BOOL ExportNative( SvStream& rOStream ) const; - void SwapOut(); - void SwapIn(); - BOOL IsSwappedOut() const { return( mpSwap != NULL ); } + void SwapOut(); + void SwapIn(); + BOOL IsSwappedOut() const { return( mpSwap != NULL ); } public: - friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const GfxLink& rGfxLink ); - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink ); + friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const GfxLink& rGfxLink ); + friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, GfxLink& rGfxLink ); }; #endif diff --git a/vcl/inc/vcl/glyphcache.hxx b/vcl/inc/vcl/glyphcache.hxx index 525ac7357271..9731440a6c98 100644 --- a/vcl/inc/vcl/glyphcache.hxx +++ b/vcl/inc/vcl/glyphcache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -65,7 +65,7 @@ public: explicit GlyphCache( GlyphCachePeer& ); /*virtual*/ ~GlyphCache(); - static GlyphCache& GetInstance(); + static GlyphCache& GetInstance(); void LoadFonts(); void ClearFontPath(); diff --git a/vcl/inc/vcl/gradient.hxx b/vcl/inc/vcl/gradient.hxx index 741af923ce8e..46abd8dd83a2 100644 --- a/vcl/inc/vcl/gradient.hxx +++ b/vcl/inc/vcl/gradient.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -80,9 +80,9 @@ public: class VCL_DLLPUBLIC Gradient { -private: - Impl_Gradient* mpImplGradient; - void MakeUnique(); +private: + Impl_Gradient* mpImplGradient; + void MakeUnique(); public: Gradient(); diff --git a/vcl/inc/vcl/graph.h b/vcl/inc/vcl/graph.h index 803df074882d..62a9a67cd99f 100644 --- a/vcl/inc/vcl/graph.h +++ b/vcl/inc/vcl/graph.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/graph.hxx b/vcl/inc/vcl/graph.hxx index 78994327041e..1f98376234b5 100644 --- a/vcl/inc/vcl/graph.hxx +++ b/vcl/inc/vcl/graph.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -203,7 +203,7 @@ public: GfxLink GetLink() const; BOOL IsLink() const; - BOOL ExportNative( SvStream& rOStream ) const; + 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/graphictools.hxx b/vcl/inc/vcl/graphictools.hxx index edd29ab9db01..5ace72cf27aa 100644 --- a/vcl/inc/vcl/graphictools.hxx +++ b/vcl/inc/vcl/graphictools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -65,29 +65,29 @@ class VCL_DLLPUBLIC SvtGraphicStroke { public: /// Style for open stroke ends - enum CapType + enum CapType { /// No additional cap - capButt=0, + capButt=0, /// Half-round cap at the line end, the center lying at the end point - capRound, + capRound, /// Half-square cap at the line end, the center lying at the end point capSquare }; /// Style for joins of individual stroke segments - enum JoinType + enum JoinType { /// Extend segment edges, until they cross - joinMiter=0, + joinMiter=0, /// Connect segments by a filled round arc - joinRound, + joinRound, /// Connect segments by a direct straight line - joinBevel, + joinBevel, /// Perform no join, leads to visible gaps between thick line segments joinNone }; enum - { + { /// Width of stroke start/end arrow to exactly fit the joining stroke normalizedArrowWidth=65536 }; @@ -98,19 +98,19 @@ public: See accessor method descriptions for argument description */ - SvtGraphicStroke( const Polygon& rPath, - const PolyPolygon& rStartArrow, - const PolyPolygon& rEndArrow, - double fTransparency, - double fStrokeWidth, - CapType aCap, - JoinType aJoin, - double fMiterLimit, - const DashArray& rDashArray ); // TODO: Dash array offset (position where to start, see PS) + SvtGraphicStroke( const Polygon& rPath, + const PolyPolygon& rStartArrow, + const PolyPolygon& rEndArrow, + double fTransparency, + double fStrokeWidth, + CapType aCap, + JoinType aJoin, + double fMiterLimit, + const DashArray& rDashArray ); // TODO: Dash array offset (position where to start, see PS) // accessors /// Query path to stroke - void getPath ( Polygon& ) const; + void getPath ( Polygon& ) const; /** Get the polygon that is put at the start of the line The polygon is in a special normalized position: the center of @@ -124,7 +124,7 @@ public: width, it has to fit every stroke with every stroke width exactly. */ - void getStartArrow ( PolyPolygon& ) const; + void getStartArrow ( PolyPolygon& ) const; /** Get the polygon that is put at the end of the line The polygon is in a special normalized position, and already @@ -138,28 +138,28 @@ public: arrow does have this width, it has to fit every stroke with every stroke width exactly. */ - void getEndArrow ( PolyPolygon& ) const; + void getEndArrow ( PolyPolygon& ) const; /** Get stroke transparency @return the transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent) */ - double getTransparency () const; + double getTransparency () const; /// Get width of the stroke - double getStrokeWidth () const; + double getStrokeWidth () const; /// Get the style in which open stroke ends are drawn - CapType getCapType () const; + CapType getCapType () const; /// Get the style in which the stroke segments are joined - JoinType getJoinType () const; + JoinType getJoinType () const; /// Get the maximum length of mitered joins - double getMiterLimit () const; + double getMiterLimit () const; /// Get an array of "on" and "off" lengths for stroke dashing - void getDashArray ( DashArray& ) const; + void getDashArray ( DashArray& ) const; /// Query a textual representation of the object's content - ::rtl::OString toString () const; + ::rtl::OString toString () const; // mutators /// Set path to stroke - void setPath ( const Polygon& ); + void setPath ( const Polygon& ); /** Set the polygon that is put at the start of the line The polygon has to be in a special normalized position, and @@ -173,7 +173,7 @@ public: arrow does have this width, it will fit every stroke with every stroke width exactly. */ - void setStartArrow ( const PolyPolygon& ); + void setStartArrow ( const PolyPolygon& ); /** Set the polygon that is put at the end of the line The polygon has to be in a special normalized position, and @@ -187,38 +187,38 @@ public: arrow does have this width, it will fit every stroke with every stroke width exactly. */ - void setEndArrow ( const PolyPolygon& ); + void setEndArrow ( const PolyPolygon& ); /** Set stroke transparency @param fTrans The transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent) */ - void setTransparency ( double fTrans ); + void setTransparency ( double fTrans ); /// Set width of the stroke - void setStrokeWidth ( double ); + void setStrokeWidth ( double ); /// Set the style in which open stroke ends are drawn - void setCapType ( CapType ); + void setCapType ( CapType ); /// Set the style in which the stroke segments are joined - void setJoinType ( JoinType ); + void setJoinType ( JoinType ); /// Set the maximum length of mitered joins - void setMiterLimit ( double ); + void setMiterLimit ( double ); /// Set the array of "on" and "off" lengths for stroke dashing - void setDashArray ( const DashArray& ); + void setDashArray ( const DashArray& ); private: // friends VCL_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const SvtGraphicStroke& rClass ); VCL_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, SvtGraphicStroke& rClass ); - Polygon maPath; - PolyPolygon maStartArrow; - PolyPolygon maEndArrow; - double mfTransparency; - double mfStrokeWidth; - CapType maCapType; - JoinType maJoinType; - double mfMiterLimit; - DashArray maDashArray; + Polygon maPath; + PolyPolygon maStartArrow; + PolyPolygon maEndArrow; + double mfTransparency; + double mfStrokeWidth; + CapType maCapType; + JoinType maJoinType; + double mfMiterLimit; + DashArray maDashArray; }; /** Encapsulates geometry and associated attributes of a filled area @@ -249,7 +249,7 @@ public: one. The part of the scanline where the winding number is non-zero gets filled. */ - fillNonZero=0, + fillNonZero=0, /** Even-odd fill rule Fill shape scanline-wise. Starting at the left, count the @@ -262,11 +262,11 @@ public: enum FillType { /// Fill with a specified solid color - fillSolid=0, + fillSolid=0, /// Fill with the specified gradient - fillGradient, + fillGradient, /// Fill with the specified hatch - fillHatch, + fillHatch, /// Fill with the specified texture (a Graphic object) fillTexture }; @@ -274,9 +274,9 @@ public: enum HatchType { /// horizontal parallel lines, one unit apart - hatchSingle=0, + hatchSingle=0, /// horizontal and verticall orthogonally crossing lines, one unit apart - hatchDouble, + hatchDouble, /// three crossing lines, like HatchType::hatchDouble, but /// with an additional diagonal line, rising to the upper /// right corner. The first diagonal line goes through the @@ -313,40 +313,40 @@ public: See accessor method descriptions for argument description */ - SvtGraphicFill( const PolyPolygon& rPath, - Color aFillColor, - double fTransparency, - FillRule aFillRule, - FillType aFillType, // TODO: Multitexturing - const Transform& aFillTransform, - bool bTiling, - HatchType aHatchType, // TODO: vector of directions and start points - Color aHatchColor, - GradientType aGradientType, // TODO: Transparent gradients (orthogonal to normal ones) - Color aGradient1stColor, // TODO: vector of colors and offsets - Color aGradient2ndColor, - int aGradientStepCount, // numbers of steps to render the gradient. gradientStepsInfinite means infinitely many. - const Graphic& aFillGraphic ); + SvtGraphicFill( const PolyPolygon& rPath, + Color aFillColor, + double fTransparency, + FillRule aFillRule, + FillType aFillType, // TODO: Multitexturing + const Transform& aFillTransform, + bool bTiling, + HatchType aHatchType, // TODO: vector of directions and start points + Color aHatchColor, + GradientType aGradientType, // TODO: Transparent gradients (orthogonal to normal ones) + Color aGradient1stColor, // TODO: vector of colors and offsets + Color aGradient2ndColor, + int aGradientStepCount, // numbers of steps to render the gradient. gradientStepsInfinite means infinitely many. + const Graphic& aFillGraphic ); // accessors /// Query path to fill - void getPath ( PolyPolygon& ) const; + void getPath ( PolyPolygon& ) const; /// Get color used for solid fills - Color getFillColor () const; + Color getFillColor () const; /** Get stroke transparency @return the transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent) */ - double getTransparency () const; + double getTransparency () const; /// Get fill rule used - FillRule getFillRule () const; + FillRule getFillRule () const; /** Get fill type used Currently, only one of the fill types can be used simultaneously. If you specify e.g. FillRule::fillGradient, hatching, texture and solid fill color are ignored. */ - FillType getFillType () const; + FillType getFillType () const; /** Get transformation applied to hatch, gradient or texture during fill A fill operation generally starts at the top left position of @@ -358,29 +358,29 @@ public: top left corner plus the translation components. */ - void getTransform ( Transform& ) const; + void getTransform ( Transform& ) const; /// deprecated - bool IsTiling () const; + bool IsTiling () const; /** Query state of texture tiling @return true, if texture is tiled, false, if output only once. */ - bool isTiling () const; + bool isTiling () const; /// Get type of hatch used - HatchType getHatchType () const; + HatchType getHatchType () const; /// Get color used for drawing the hatch - Color getHatchColor () const; + Color getHatchColor () const; /// Get type of gradient used - GradientType getGradientType () const; + GradientType getGradientType () const; /// Get start color of the gradient - Color getGradient1stColor () const; + Color getGradient1stColor () const; /// Get end color of the gradient - Color getGradient2ndColor () const; - /** Get the numbers of steps to render the gradient. + Color getGradient2ndColor () const; + /** Get the numbers of steps to render the gradient. @return the step count. gradientStepsInfinite means infinitely many. */ - int getGradientStepCount() const; + int getGradientStepCount() const; /** Get the texture graphic used The Graphic object returned is used to fill the geometry, if @@ -388,76 +388,76 @@ public: assumed to be of size 1x1, the transformation is used to scale it to the appropriate size. */ - void getGraphic ( Graphic& ) const; + void getGraphic ( Graphic& ) const; /// Query a textual representation of the object's content - ::rtl::OString toString () const; + ::rtl::OString toString () const; // mutators /// Set path to fill - void setPath ( const PolyPolygon& rPath ); - /// Set color used for solid fills - void setFillColor ( Color aFillColor ); + void setPath ( const PolyPolygon& rPath ); + /// Set color used for solid fills + void setFillColor ( Color aFillColor ); /** Set stroke transparency @param fTransparency The transparency, ranging from 0.0 (opaque) to 1.0 (fully translucent) */ - void setTransparency ( double fTransparency ); + void setTransparency ( double fTransparency ); /// Set fill rule used - void setFillRule ( FillRule aFillRule ); + void setFillRule ( FillRule aFillRule ); /** Set fill type used Currently, only one of the fill types can be used simultaneously. If you specify e.g. FillRule::fillGradient, hatching, texture and solid fill color are ignored. */ - void setFillType ( FillType aFillType ); + void setFillType ( FillType aFillType ); /// Set transformation applied to hatch, gradient or texture during fill - void setTransform ( const Transform& pTransform ); + void setTransform ( const Transform& pTransform ); /** Set state of texture tiling @param bTiling If set to true, texture is tiled, if set to false, texture is output only once. */ - void setTiling ( bool bTiling = true ); + void setTiling ( bool bTiling = true ); /// Set type of hatch used - void setHatchType ( HatchType aHatchType ); + void setHatchType ( HatchType aHatchType ); /// Set color used for drawing the hatch - void setHatchColor ( Color aHatchColor ); + void setHatchColor ( Color aHatchColor ); /// Set type of gradient used - void setGradientType ( GradientType aGradType ); + void setGradientType ( GradientType aGradType ); /// Set start color of the gradient - void setGradient1stColor ( Color aColor ); + void setGradient1stColor ( Color aColor ); /// Set end color of the gradient - void setGradient2ndColor ( Color aColor ); - /** Set the numbers of steps to render the gradient. + void setGradient2ndColor ( Color aColor ); + /** Set the numbers of steps to render the gradient. @param aCount The step count. gradientStepsInfinite means use infinitely many. */ - void setGradientStepCount( int aCount ); + void setGradientStepCount( int aCount ); /// Set the texture graphic used - void setGraphic ( const Graphic& rGraphic ); + void setGraphic ( const Graphic& rGraphic ); private: // friends VCL_DLLPUBLIC friend SvStream& operator<<( SvStream& rOStm, const SvtGraphicFill& rClass ); VCL_DLLPUBLIC friend SvStream& operator>>( SvStream& rIStm, SvtGraphicFill& rClass ); - PolyPolygon maPath; - Color maFillColor; - double mfTransparency; - FillRule maFillRule; - FillType maFillType; - Transform maFillTransform; - bool mbTiling; - HatchType maHatchType; - Color maHatchColor; - GradientType maGradientType; - Color maGradient1stColor; - Color maGradient2ndColor; - int maGradientStepCount; - Graphic maFillGraphic; + PolyPolygon maPath; + Color maFillColor; + double mfTransparency; + FillRule maFillRule; + FillType maFillType; + Transform maFillTransform; + bool mbTiling; + HatchType maHatchType; + Color maHatchColor; + GradientType maGradientType; + Color maGradient1stColor; + Color maGradient2ndColor; + int maGradientStepCount; + Graphic maFillGraphic; }; #endif /* _VCL_GRAPHICTOOLS_HXX_ */ diff --git a/vcl/inc/vcl/graphite_adaptors.hxx b/vcl/inc/vcl/graphite_adaptors.hxx index 62c1f97cd823..66413031f504 100644 --- a/vcl/inc/vcl/graphite_adaptors.hxx +++ b/vcl/inc/vcl/graphite_adaptors.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/graphite_cache.hxx b/vcl/inc/vcl/graphite_cache.hxx index 9891fb6aad7e..1c2aff06414f 100644 --- a/vcl/inc/vcl/graphite_cache.hxx +++ b/vcl/inc/vcl/graphite_cache.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/graphite_features.hxx b/vcl/inc/vcl/graphite_features.hxx index a817fa190f6e..1cb109e77aaa 100644 --- a/vcl/inc/vcl/graphite_features.hxx +++ b/vcl/inc/vcl/graphite_features.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/graphite_layout.hxx b/vcl/inc/vcl/graphite_layout.hxx index 3192822db391..f3abdfe0623a 100644 --- a/vcl/inc/vcl/graphite_layout.hxx +++ b/vcl/inc/vcl/graphite_layout.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/graphite_serverfont.hxx b/vcl/inc/vcl/graphite_serverfont.hxx index 06a61db42f80..21873e0582a1 100644 --- a/vcl/inc/vcl/graphite_serverfont.hxx +++ b/vcl/inc/vcl/graphite_serverfont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/group.hxx b/vcl/inc/vcl/group.hxx index 765021fbe89b..5eff89280e45 100644 --- a/vcl/inc/vcl/group.hxx +++ b/vcl/inc/vcl/group.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -48,7 +48,7 @@ private: SAL_DLLPRIVATE void ImplDraw( OutputDevice* pDev, ULONG nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout = false ); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const; virtual const Font& GetCanonicalFont( const StyleSettings& _rStyle ) const; virtual const Color& diff --git a/vcl/inc/vcl/hatch.hxx b/vcl/inc/vcl/hatch.hxx index 3cdcd0e24c2c..d8826ac5d199 100644 --- a/vcl/inc/vcl/hatch.hxx +++ b/vcl/inc/vcl/hatch.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -42,17 +42,17 @@ class SvStream; struct ImplHatch { - ULONG mnRefCount; - Color maColor; - HatchStyle meStyle; - long mnDistance; - USHORT mnAngle; + ULONG mnRefCount; + Color maColor; + HatchStyle meStyle; + long mnDistance; + USHORT mnAngle; ImplHatch(); ImplHatch( const ImplHatch& rImplHatch ); - friend SvStream& operator>>( SvStream& rIStm, ImplHatch& rImplHatch ); - friend SvStream& operator<<( SvStream& rOStm, const ImplHatch& rImplHatch ); + friend SvStream& operator>>( SvStream& rIStm, ImplHatch& rImplHatch ); + friend SvStream& operator<<( SvStream& rOStm, const ImplHatch& rImplHatch ); }; // --------- @@ -61,10 +61,10 @@ struct ImplHatch class VCL_DLLPUBLIC Hatch { -private: +private: - ImplHatch* mpImplHatch; - SAL_DLLPRIVATE void ImplMakeUnique(); + ImplHatch* mpImplHatch; + SAL_DLLPRIVATE void ImplMakeUnique(); public: @@ -73,19 +73,19 @@ public: Hatch( HatchStyle eStyle, const Color& rHatchColor, long nDistance, USHORT nAngle10 = 0 ); ~Hatch(); - Hatch& operator=( const Hatch& rHatch ); + 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 ); } void SetStyle( HatchStyle eStyle ); - HatchStyle GetStyle() const { return mpImplHatch->meStyle; } + HatchStyle GetStyle() const { return mpImplHatch->meStyle; } void SetColor( const Color& rColor ); - const Color& GetColor() const { return mpImplHatch->maColor; } + const Color& GetColor() const { return mpImplHatch->maColor; } void SetDistance( long nDistance ); - long GetDistance() const { return mpImplHatch->mnDistance; } + long GetDistance() const { return mpImplHatch->mnDistance; } void SetAngle( USHORT nAngle10 ); USHORT GetAngle() const { return mpImplHatch->mnAngle; } diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx index e91b459ee8cc..60ab16ae077c 100644 --- a/vcl/inc/vcl/help.hxx +++ b/vcl/inc/vcl/help.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -41,20 +41,20 @@ 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_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_CTRLTEXT ((USHORT)0x0040) #define QUICKHELP_NOEVADEPOINTER ((USHORT)0x4000) -#define QUICKHELP_BIDI_RTL ((USHORT)0x8000) +#define QUICKHELP_BIDI_RTL ((USHORT)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 ((ULONG)0xFFFFFFFF) +#define OOO_HELP_HELPONHELP ((ULONG)0xFFFFFFFE) // -------- // - Help - @@ -63,64 +63,64 @@ class Window; class VCL_DLLPUBLIC Help { private: - String maHelpFile; + String maHelpFile; public: Help(); - virtual ~Help(); + virtual ~Help(); - void SetHelpFile( const String& rFileName ) { maHelpFile = rFileName; } - const String& GetHelpFile() const { return maHelpFile; } + 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 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 XubString GetHelpText( const String& aHelpURL, const Window* pWindow ); - static void EnableContextHelp(); - static void DisableContextHelp(); - static BOOL IsContextHelpEnabled(); - static BOOL StartContextHelp(); - - static void EnableExtHelp(); - static void DisableExtHelp(); - static BOOL IsExtHelpEnabled(); - static BOOL StartExtHelp(); - static BOOL EndExtHelp(); - static BOOL IsExtHelpActive(); - - static void EnableBalloonHelp(); - static void DisableBalloonHelp(); - static BOOL IsBalloonHelpEnabled(); - static BOOL ShowBalloon( Window* pParent, + static void EnableContextHelp(); + static void DisableContextHelp(); + static BOOL IsContextHelpEnabled(); + static BOOL StartContextHelp(); + + static void EnableExtHelp(); + static void DisableExtHelp(); + static BOOL IsExtHelpEnabled(); + static BOOL StartExtHelp(); + static BOOL EndExtHelp(); + static BOOL IsExtHelpActive(); + + static void EnableBalloonHelp(); + static void DisableBalloonHelp(); + static BOOL IsBalloonHelpEnabled(); + static BOOL ShowBalloon( Window* pParent, const Point& rScreenPos, const XubString& rHelpText ); - static BOOL ShowBalloon( Window* pParent, + static 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 void EnableQuickHelp(); + static void DisableQuickHelp(); + static BOOL IsQuickHelpEnabled(); + static BOOL ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, const XubString& rHelpText, const XubString& rLongHelpText, USHORT nStyle = 0 ); - static BOOL ShowQuickHelp( Window* pParent, + static BOOL ShowQuickHelp( Window* pParent, const Rectangle& rScreenRect, const XubString& rHelpText, USHORT nStyle = 0 ) { return Help::ShowQuickHelp( pParent, rScreenRect, rHelpText, XubString(), nStyle ); } - static ULONG ShowTip( Window* pParent, + static ULONG ShowTip( Window* pParent, const Rectangle& rScreenRect, const XubString& rText, USHORT nStyle = 0 ); - static void HideTip( ULONG nId ); + static void HideTip( ULONG nId ); }; -#endif // _SV_HELP_HXX +#endif // _SV_HELP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/helper.hxx b/vcl/inc/vcl/helper.hxx index 732e98080c62..f5bb4816f210 100644 --- a/vcl/inc/vcl/helper.hxx +++ b/vcl/inc/vcl/helper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/helpwin.hxx b/vcl/inc/vcl/helpwin.hxx index 9066012d05f2..bf0fde690133 100644 --- a/vcl/inc/vcl/helpwin.hxx +++ b/vcl/inc/vcl/helpwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -39,48 +39,48 @@ class HelpTextWindow : public FloatingWindow { private: - Point maPos; - Rectangle maHelpArea; // Wenn naechste Hilfe fuers gleiche Rectangle, gleicher Text, dann Fenster stehen lassen + Point maPos; + Rectangle maHelpArea; // Wenn naechste Hilfe fuers gleiche Rectangle, gleicher Text, dann Fenster stehen lassen - Rectangle maTextRect; // Bei umgebrochenen Text in QuickHelp + Rectangle maTextRect; // Bei umgebrochenen Text in QuickHelp - String maHelpText; - String maStatusText; + String maHelpText; + String maStatusText; - Timer maShowTimer; - Timer maHideTimer; + Timer maShowTimer; + Timer maHideTimer; - USHORT mnHelpWinStyle; - USHORT mnStyle; + USHORT mnHelpWinStyle; + USHORT mnStyle; protected: DECL_LINK( TimerHdl, Timer* ); - virtual void Paint( const Rectangle& ); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual String GetText() const; - void ImplShow(); + virtual void Paint( const Rectangle& ); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual String GetText() const; + void ImplShow(); public: HelpTextWindow( Window* pParent, const String& rText, USHORT nHelpWinStyle, USHORT nStyle ); ~HelpTextWindow(); - const String& GetHelpText() const { return maHelpText; } - void SetHelpText( const String& rHelpText ); - USHORT GetWinStyle() const { return mnHelpWinStyle; } + const String& GetHelpText() const { return maHelpText; } + void SetHelpText( const String& rHelpText ); + USHORT GetWinStyle() const { return mnHelpWinStyle; } // Nur merken: - void SetStatusText( const String& rStatusText ) { maStatusText = rStatusText; } - void SetHelpArea( const Rectangle& rRect ) { maHelpArea = rRect; } + void SetStatusText( const String& rStatusText ) { maStatusText = rStatusText; } + void SetHelpArea( const Rectangle& rRect ) { maHelpArea = rRect; } - void ShowHelp( USHORT nDelayMode ); + void ShowHelp( USHORT nDelayMode ); - Size CalcOutSize() const; - const Rectangle& GetHelpArea() const { return maHelpArea; } + Size CalcOutSize() const; + const Rectangle& GetHelpArea() const { return maHelpArea; } virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); - BOOL RegisterAccessibleParent(); - void RevokeAccessibleParent(); + BOOL RegisterAccessibleParent(); + void RevokeAccessibleParent(); }; void ImplShowHelpWindow( Window* pParent, USHORT nHelpWinStyle, USHORT nStyle, diff --git a/vcl/inc/vcl/i18nhelp.hxx b/vcl/inc/vcl/i18nhelp.hxx index 428032ae2017..d8b460338bd5 100644 --- a/vcl/inc/vcl/i18nhelp.hxx +++ b/vcl/inc/vcl/i18nhelp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -39,7 +39,7 @@ namespace com { namespace sun { namespace star { namespace lang { - class XMultiServiceFactory; + class XMultiServiceFactory; } }}} @@ -57,7 +57,7 @@ namespace vcl class VCL_DLLPUBLIC I18nHelper { private: - ::osl::Mutex maMutex; + ::osl::Mutex maMutex; ::com::sun::star::lang::Locale maLocale; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; @@ -88,11 +88,11 @@ public: String GetDate( const Date& rDate ) const; String GetNum( long nNumber, USHORT nDecimals, BOOL bUseThousandSep = TRUE, BOOL bTrailingZeros = TRUE ) const; - + static String filterFormattingChars( const String& ); }; -} // namespace vcl +} // namespace vcl #endif // _VCL_I18NHELP_HXX diff --git a/vcl/inc/vcl/idlemgr.hxx b/vcl/inc/vcl/idlemgr.hxx index 75729f5ab493..edb449d960a7 100644 --- a/vcl/inc/vcl/idlemgr.hxx +++ b/vcl/inc/vcl/idlemgr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/ilstbox.hxx b/vcl/inc/vcl/ilstbox.hxx index 110e57233550..17ddd3033a49 100644 --- a/vcl/inc/vcl/ilstbox.hxx +++ b/vcl/inc/vcl/ilstbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -45,8 +45,8 @@ class ScrollBarBox; // - ListBox-Types - // ----------------- -#define HORZ_SCROLL 4 -#define IMG_TXT_DISTANCE 6 +#define HORZ_SCROLL 4 +#define IMG_TXT_DISTANCE 6 enum LB_EVENT_TYPE { @@ -63,11 +63,11 @@ enum LB_EVENT_TYPE struct ImplEntryType { - XubString maStr; - Image maImage; - void* mpUserData; - BOOL mbIsSelected; - long mnFlags; + XubString maStr; + Image maImage; + void* mpUserData; + BOOL mbIsSelected; + long mnFlags; long mnHeight; ImplEntryType( const XubString& rStr, const Image& rImage ) : @@ -107,31 +107,31 @@ class ImplEntryList : private List { private: Window* mpWindow; // For getting the current locale when matching strings - USHORT mnLastSelected; - USHORT mnSelectionAnchor; - USHORT mnImages; + USHORT mnLastSelected; + USHORT mnSelectionAnchor; + USHORT mnImages; - USHORT mnMRUCount; - USHORT mnMaxMRUCount; + USHORT mnMRUCount; + USHORT mnMaxMRUCount; - Link maSelectionChangedHdl; - BOOL mbCallSelectionChangedHdl; + Link maSelectionChangedHdl; + BOOL mbCallSelectionChangedHdl; - ImplEntryType* GetEntry( USHORT nPos ) const { return (ImplEntryType*)List::GetObject( nPos ); } + ImplEntryType* GetEntry( USHORT 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 ); } - void Clear(); + 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 ); } + 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; + 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; // helper: add up heights up to index nEndIndex. // GetAddedHeight( 0 ) returns 0 @@ -140,54 +140,54 @@ public: long GetAddedHeight( USHORT nEndIndex, USHORT nBeginIndex = 0, long nBeginHeight = 0 ) const; long GetEntryHeight( USHORT nPos ) const; - USHORT GetEntryCount() const { return (USHORT)List::Count(); } - BOOL HasImages() const { return mnImages ? TRUE : FALSE; } + USHORT GetEntryCount() const { return (USHORT)List::Count(); } + BOOL HasImages() const { return mnImages ? TRUE : FALSE; } - XubString GetEntryText( USHORT nPos ) const; + XubString GetEntryText( USHORT nPos ) const; - BOOL HasEntryImage( USHORT nPos ) const; - Image GetEntryImage( USHORT nPos ) const; + BOOL HasEntryImage( USHORT nPos ) const; + Image GetEntryImage( USHORT nPos ) const; - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; + void SetEntryData( USHORT nPos, void* pNewData ); + void* GetEntryData( USHORT nPos ) const; - void SetEntryFlags( USHORT nPos, long nFlags ); - long GetEntryFlags( USHORT nPos ) const; + void SetEntryFlags( USHORT nPos, long nFlags ); + long GetEntryFlags( USHORT nPos ) const; - void SelectEntry( USHORT nPos, BOOL bSelect ); + void SelectEntry( USHORT nPos, 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; + USHORT GetSelectEntryCount() const; + XubString GetSelectEntry( USHORT nIndex ) const; + USHORT GetSelectEntryPos( USHORT nIndex ) const; + BOOL IsEntrySelected( const XubString& rStr ) const; + BOOL IsEntryPosSelected( USHORT nIndex ) const; - void SetLastSelected( USHORT nPos ) { mnLastSelected = nPos; } - USHORT GetLastSelected() const { return mnLastSelected; } + void SetLastSelected( USHORT nPos ) { mnLastSelected = nPos; } + USHORT GetLastSelected() const { return mnLastSelected; } - void SetSelectionAnchor( USHORT nPos ) { mnSelectionAnchor = nPos; } - USHORT GetSelectionAnchor() const { return mnSelectionAnchor; } + void SetSelectionAnchor( USHORT nPos ) { mnSelectionAnchor = nPos; } + USHORT GetSelectionAnchor() const { return mnSelectionAnchor; } - void SetSelectionChangedHdl( const Link& rLnk ) { maSelectionChangedHdl = rLnk; } - void SetCallSelectionChangedHdl( BOOL bCall ) { mbCallSelectionChangedHdl = bCall; } + void SetSelectionChangedHdl( const Link& rLnk ) { maSelectionChangedHdl = rLnk; } + void SetCallSelectionChangedHdl( BOOL bCall ) { mbCallSelectionChangedHdl = bCall; } - void SetMRUCount( USHORT n ) { mnMRUCount = n; } - USHORT GetMRUCount() const { return mnMRUCount; } + void SetMRUCount( USHORT n ) { mnMRUCount = n; } + USHORT GetMRUCount() const { return mnMRUCount; } - void SetMaxMRUCount( USHORT n ) { mnMaxMRUCount = n; } - USHORT GetMaxMRUCount() const { return mnMaxMRUCount; } + void SetMaxMRUCount( USHORT n ) { mnMaxMRUCount = n; } + USHORT GetMaxMRUCount() const { return mnMaxMRUCount; } - /** An Entry is selectable if its mnFlags does not have the + /** 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( USHORT 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 ); + USHORT FindFirstSelectable( USHORT nPos, bool bForward = true ); }; // --------------------- @@ -197,89 +197,89 @@ public: class ImplListBoxWindow : public Control { private: - ImplEntryList* mpEntryList; // EntryListe - Rectangle maFocusRect; - String maSearchStr; - Timer maSearchTimeout; + ImplEntryList* mpEntryList; // EntryListe + Rectangle maFocusRect; + String maSearchStr; + Timer maSearchTimeout; - Size maUserItemSize; + Size maUserItemSize; - long mnMaxTxtHeight; // Maximale Hoehe eines Text-Items - long mnMaxTxtWidth; // Maximale Breite eines Text-Items + long mnMaxTxtHeight; // Maximale Hoehe eines Text-Items + long mnMaxTxtWidth; // Maximale Breite eines Text-Items // Entry ohne Image - long mnMaxImgTxtWidth;// Maximale Breite eines Text-Items + long mnMaxImgTxtWidth;// Maximale Breite eines Text-Items // Entry UND Image - long mnMaxImgWidth; // Maximale Breite eines Image-Items - long mnMaxImgHeight; // Maximale Hoehe eines Image-Items - long mnMaxWidth; // Maximale Breite eines Eintrags - long mnMaxHeight; // Maximale Hoehe eines Eintrags + long mnMaxImgWidth; // Maximale Breite eines Image-Items + long mnMaxImgHeight; // Maximale Hoehe eines Image-Items + long mnMaxWidth; // Maximale Breite eines Eintrags + long mnMaxHeight; // Maximale Hoehe eines Eintrags - USHORT mnCurrentPos; // Position (Focus) - USHORT mnTrackingSaveSelection; // Selektion vor Tracking(); + USHORT mnCurrentPos; // Position (Focus) + USHORT mnTrackingSaveSelection; // Selektion vor Tracking(); - USHORT mnSeparatorPos; // Separator + USHORT mnSeparatorPos; // Separator - USHORT mnUserDrawEntry; + USHORT mnUserDrawEntry; - USHORT mnTop; // Ausgabe ab Zeile - long mnLeft; // Ausgabe ab Spalte - long mnBorder; // Abstand Rahmen - Text - long mnTextHeight; // Texthoehe + USHORT 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 - - BOOL mbHasFocusRect: 1, - mbSort: 1, // ListBox sortiert - mbTrack: 1, // Tracking - mbMulti: 1, // MultiListBox - mbStackMode: 1, // StackSelection - mbSimpleMode: 1, // SimpleMode fuer MultiListBox - mbImgsDiffSz: 1, // Images haben verschiedene Groessen - mbTravelSelect: 1, // TravelSelect - mbTrackingSelect: 1, // Selektiert bei MouseMove - mbSelectionChanged: 1, // Select() nicht zu oft rufen... - mbMouseMoveSelect: 1, // Selektieren bei MouseMove - mbGrabFocus: 1, // Focus bei MBDown grabben - mbUserDrawEnabled: 1, // UserDraw possible - mbInUserDraw: 1, // In UserDraw - mbReadOnly: 1, // ReadOnly - mbMirroring: 1, // pb: #106948# explicit mirroring for calc + USHORT mnSelectModifier; // Modifiers + + BOOL mbHasFocusRect: 1, + mbSort: 1, // ListBox sortiert + mbTrack: 1, // Tracking + mbMulti: 1, // MultiListBox + mbStackMode: 1, // StackSelection + mbSimpleMode: 1, // SimpleMode fuer MultiListBox + mbImgsDiffSz: 1, // Images haben verschiedene Groessen + mbTravelSelect: 1, // TravelSelect + mbTrackingSelect: 1, // Selektiert bei MouseMove + mbSelectionChanged: 1, // Select() nicht zu oft rufen... + mbMouseMoveSelect: 1, // Selektieren bei MouseMove + mbGrabFocus: 1, // Focus bei MBDown grabben + mbUserDrawEnabled: 1, // UserDraw possible + mbInUserDraw: 1, // In UserDraw + mbReadOnly: 1, // ReadOnly + mbMirroring: 1, // pb: #106948# explicit mirroring for calc mbRight: 1, // right align Text output mbCenter: 1; // center Text output - Link maScrollHdl; - Link maSelectHdl; - Link maCancelHdl; - Link maDoubleClickHdl; - Link maUserDrawHdl; - Link maMRUChangedHdl; + Link maScrollHdl; + Link maSelectHdl; + Link maCancelHdl; + Link maDoubleClickHdl; + Link maUserDrawHdl; + Link maMRUChangedHdl; protected: - DECL_LINK( SearchStringTimeout, Timer* ); - - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - 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 ); - void ImplDoPaint( const Rectangle& rRect, bool bLayout = false ); - void ImplCalcMetrics(); - void ImplUpdateEntryMetrics( ImplEntryType& rEntry ); - void ImplCallSelect(); + DECL_LINK( SearchStringTimeout, Timer* ); + + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + 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 ); + void ImplDoPaint( const Rectangle& rRect, bool bLayout = false ); + void ImplCalcMetrics(); + void ImplUpdateEntryMetrics( ImplEntryType& rEntry ); + void ImplCallSelect(); void ImplShowFocusRect(); void ImplHideFocusRect(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); public: virtual void FillLayoutData() const; @@ -287,99 +287,99 @@ public: ImplListBoxWindow( Window* pParent, WinBits nWinStyle ); ~ImplListBoxWindow(); - ImplEntryList* GetEntryList() const { return mpEntryList; } + ImplEntryList* GetEntryList() const { return mpEntryList; } - USHORT InsertEntry( USHORT nPos, ImplEntryType* pNewEntry ); - void RemoveEntry( USHORT nPos ); - void Clear(); - void ResetCurrentPos() { mnCurrentPos = LISTBOX_ENTRY_NOTFOUND; } - USHORT GetCurrentPos() const { return mnCurrentPos; } - USHORT GetDisplayLineCount() const; + USHORT InsertEntry( USHORT nPos, ImplEntryType* pNewEntry ); + void RemoveEntry( USHORT nPos ); + void Clear(); + void ResetCurrentPos() { mnCurrentPos = LISTBOX_ENTRY_NOTFOUND; } + USHORT GetCurrentPos() const { return mnCurrentPos; } + USHORT GetDisplayLineCount() const; void SetEntryFlags( USHORT nPos, long nFlags ); - void DrawEntry( USHORT nPos, BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE, bool bLayout = false ); + void DrawEntry( USHORT nPos, BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE, bool bLayout = false ); - void SelectEntry( USHORT nPos, BOOL bSelect ); - void DeselectAll(); - USHORT GetEntryPosForPoint( const Point& rPoint ) const; + void SelectEntry( USHORT nPos, BOOL bSelect ); + void DeselectAll(); + USHORT GetEntryPosForPoint( const Point& rPoint ) const; USHORT GetLastVisibleEntry() const; - BOOL ProcessKeyInput( const KeyEvent& rKEvt ); + BOOL ProcessKeyInput( const KeyEvent& rKEvt ); - void SetTopEntry( USHORT nTop ); - USHORT GetTopEntry() const { return mnTop; } + void SetTopEntry( USHORT nTop ); + USHORT 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 SetProminentEntryType( ProminentEntry eType ) { meProminentType = eType; } ProminentEntry GetProminentEntryType() const { return meProminentType; } using Window::IsVisible; - BOOL IsVisible( USHORT nEntry ) const; + BOOL IsVisible( USHORT nEntry ) const; - long GetLeftIndent() const { return mnLeft; } - void SetLeftIndent( long n ); - void ScrollHorz( long nDiff ); + 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( BOOL b ) { mbGrabFocus = b; } + BOOL IsGrabFocusAllowed() const { return mbGrabFocus; } - void SetSeparatorPos( USHORT n ) { mnSeparatorPos = n; } - USHORT GetSeparatorPos() const { return mnSeparatorPos; } + void SetSeparatorPos( USHORT n ) { mnSeparatorPos = n; } + USHORT GetSeparatorPos() const { return mnSeparatorPos; } void SetTravelSelect( BOOL bTravelSelect ) { mbTravelSelect = bTravelSelect; } - BOOL IsTravelSelect() const { return mbTravelSelect; } - BOOL IsTrackingSelect() const { return mbTrackingSelect; } + BOOL IsTravelSelect() const { return mbTravelSelect; } + BOOL IsTrackingSelect() const { return mbTrackingSelect; } - void SetUserItemSize( const Size& rSz ); - const Size& GetUserItemSize() const { return maUserItemSize; } + void SetUserItemSize( const Size& rSz ); + const Size& GetUserItemSize() const { return maUserItemSize; } - void EnableUserDraw( BOOL bUserDraw ) { mbUserDrawEnabled = bUserDraw; } - BOOL IsUserDrawEnabled() const { return mbUserDrawEnabled; } + void EnableUserDraw( BOOL bUserDraw ) { mbUserDrawEnabled = bUserDraw; } + BOOL IsUserDrawEnabled() const { return mbUserDrawEnabled; } - void EnableMultiSelection( BOOL bMulti, BOOL bStackMode ) { mbMulti = bMulti; mbStackMode = bStackMode; } - BOOL IsMultiSelectionEnabled() const { return mbMulti; } + void EnableMultiSelection( BOOL bMulti, BOOL bStackMode ) { mbMulti = bMulti; mbStackMode = bStackMode; } + BOOL IsMultiSelectionEnabled() const { return mbMulti; } - void SetMultiSelectionSimpleMode( BOOL bSimple ) { mbSimpleMode = bSimple; } - BOOL IsMultiSelectionSimpleMode() const { return mbSimpleMode; } + void SetMultiSelectionSimpleMode( BOOL bSimple ) { mbSimpleMode = bSimple; } + BOOL IsMultiSelectionSimpleMode() const { return mbSimpleMode; } - void EnableMouseMoveSelect( BOOL bMouseMoveSelect ) { mbMouseMoveSelect = bMouseMoveSelect; } - BOOL IsMouseMoveSelectEnabled() const { return mbMouseMoveSelect; } - BOOL IsMouseMoveSelect() const { return mbMouseMoveSelect||mbStackMode; } + void EnableMouseMoveSelect( BOOL bMouseMoveSelect ) { mbMouseMoveSelect = bMouseMoveSelect; } + BOOL IsMouseMoveSelectEnabled() const { return mbMouseMoveSelect; } + BOOL IsMouseMoveSelect() const { return mbMouseMoveSelect||mbStackMode; } - Size CalcSize( USHORT nMaxLines ) const; + Size CalcSize( USHORT nMaxLines ) const; Rectangle GetBoundingRectangle( USHORT nItem ) const; - long GetEntryHeight() const { return mnMaxHeight; } - long GetMaxEntryWidth() const { return mnMaxWidth; } + long GetEntryHeight() const { return mnMaxHeight; } + long GetMaxEntryWidth() const { return mnMaxWidth; } - void SetScrollHdl( const Link& rLink ) { maScrollHdl = rLink; } - const Link& GetScrollHdl() const { return maScrollHdl; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetCancelHdl( const Link& rLink ) { maCancelHdl = rLink; } - const Link& GetCancelHdl() const { return maCancelHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetUserDrawHdl( const Link& rLink ) { maUserDrawHdl = rLink; } - const Link& GetUserDrawHdl() const { return maUserDrawHdl; } - void SetMRUChangedHdl( const Link& rLink ) { maMRUChangedHdl = rLink; } - const Link& GetMRUChangedHdl() const { return maMRUChangedHdl; } + void SetScrollHdl( const Link& rLink ) { maScrollHdl = rLink; } + const Link& GetScrollHdl() const { return maScrollHdl; } + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } + void SetCancelHdl( const Link& rLink ) { maCancelHdl = rLink; } + const Link& GetCancelHdl() const { return maCancelHdl; } + void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } + const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetUserDrawHdl( const Link& rLink ) { maUserDrawHdl = rLink; } + const Link& GetUserDrawHdl() const { return maUserDrawHdl; } + void SetMRUChangedHdl( const Link& rLink ) { maMRUChangedHdl = rLink; } + const Link& GetMRUChangedHdl() const { return maMRUChangedHdl; } - BOOL IsSelectionChanged() const { return mbSelectionChanged; } - USHORT GetSelectModifier() const { return mnSelectModifier; } + BOOL IsSelectionChanged() const { return mbSelectionChanged; } + USHORT GetSelectModifier() const { return mnSelectModifier; } - void EnableSort( BOOL b ) { mbSort = b; } + void EnableSort( BOOL b ) { mbSort = b; } - void SetReadOnly( BOOL bReadOnly ) { mbReadOnly = bReadOnly; } - BOOL IsReadOnly() const { return mbReadOnly; } + void SetReadOnly( BOOL bReadOnly ) { mbReadOnly = bReadOnly; } + BOOL IsReadOnly() const { return mbReadOnly; } using Control::ImplInitSettings; - void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); USHORT ImplGetTextStyle() const; // pb: #106948# explicit mirroring for calc - inline void EnableMirroring() { mbMirroring = TRUE; } - inline BOOL IsMirroring() const { return mbMirroring; } + inline void EnableMirroring() { mbMirroring = TRUE; } + inline BOOL IsMirroring() const { return mbMirroring; } }; // --------------- @@ -389,119 +389,119 @@ public: class ImplListBox : public Control { private: - ImplListBoxWindow maLBWindow; - ScrollBar* mpHScrollBar; - ScrollBar* mpVScrollBar; - ScrollBarBox* mpScrollBarBox; - 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. + ImplListBoxWindow maLBWindow; + ScrollBar* mpHScrollBar; + ScrollBar* mpVScrollBar; + ScrollBarBox* mpScrollBarBox; + 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. ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > mxDNDListenerContainer; protected: - virtual void GetFocus(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void GetFocus(); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - long Notify( NotifyEvent& rNEvt ); + long Notify( NotifyEvent& rNEvt ); - void ImplResizeControls(); - void ImplCheckScrollBars(); - void ImplInitScrollBars(); + void ImplResizeControls(); + void ImplCheckScrollBars(); + void ImplInitScrollBars(); - DECL_LINK( ScrollBarHdl, ScrollBar* ); - DECL_LINK( LBWindowScrolled, void* ); - DECL_LINK( MRUChanged, void* ); + DECL_LINK( ScrollBarHdl, ScrollBar* ); + DECL_LINK( LBWindowScrolled, void* ); + DECL_LINK( MRUChanged, void* ); public: ImplListBox( Window* pParent, WinBits nWinStyle ); ~ImplListBox(); - const ImplEntryList* GetEntryList() const { return maLBWindow.GetEntryList(); } - ImplListBoxWindow* GetMainWindow() { return &maLBWindow; } + const ImplEntryList* GetEntryList() const { return maLBWindow.GetEntryList(); } + ImplListBoxWindow* GetMainWindow() { return &maLBWindow; } - virtual void Resize(); + virtual void Resize(); 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 ); } - void Clear(); + 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 ); } + void Clear(); - void SetEntryFlags( USHORT nPos, long nFlags ); - long GetEntryFlags( USHORT nPos ) const; + void SetEntryFlags( USHORT nPos, long nFlags ); + long GetEntryFlags( USHORT nPos ) const; - void SelectEntry( USHORT nPos, BOOL bSelect ); - void SetNoSelection(); - void ResetCurrentPos() { maLBWindow.ResetCurrentPos(); } - USHORT GetCurrentPos() const { return maLBWindow.GetCurrentPos(); } + void SelectEntry( USHORT nPos, BOOL bSelect ); + void SetNoSelection(); + void ResetCurrentPos() { maLBWindow.ResetCurrentPos(); } + USHORT GetCurrentPos() const { return maLBWindow.GetCurrentPos(); } - BOOL ProcessKeyInput( const KeyEvent& rKEvt ) { return maLBWindow.ProcessKeyInput( rKEvt ); } - BOOL HandleWheelAsCursorTravel( const CommandEvent& rCEvt ); + BOOL ProcessKeyInput( const KeyEvent& rKEvt ) { return maLBWindow.ProcessKeyInput( rKEvt ); } + BOOL HandleWheelAsCursorTravel( const CommandEvent& rCEvt ); - void SetSeparatorPos( USHORT n ) { maLBWindow.SetSeparatorPos( n ); } - USHORT GetSeparatorPos() const { return maLBWindow.GetSeparatorPos(); } + void SetSeparatorPos( USHORT n ) { maLBWindow.SetSeparatorPos( n ); } + USHORT GetSeparatorPos() const { return maLBWindow.GetSeparatorPos(); } - void SetTopEntry( USHORT nTop ) { maLBWindow.SetTopEntry( nTop ); } - USHORT GetTopEntry() const { return maLBWindow.GetTopEntry(); } + void SetTopEntry( USHORT nTop ) { maLBWindow.SetTopEntry( nTop ); } + USHORT GetTopEntry() const { return maLBWindow.GetTopEntry(); } void ShowProminentEntry( USHORT nPos ) { maLBWindow.ShowProminentEntry( nPos ); } using Window::IsVisible; - BOOL IsVisible( USHORT nEntry ) const { return maLBWindow.IsVisible( nEntry ); } + BOOL IsVisible( USHORT 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 ScrollHorz( short nDiff ) { maLBWindow.ScrollHorz( nDiff ); } + long GetLeftIndent() const { return maLBWindow.GetLeftIndent(); } + void SetLeftIndent( USHORT 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 EnableMultiSelection( BOOL bMulti, BOOL bStackMode ) { maLBWindow.EnableMultiSelection( bMulti, bStackMode ); } - BOOL IsMultiSelectionEnabled() const { return maLBWindow.IsMultiSelectionEnabled(); } - - void SetMultiSelectionSimpleMode( BOOL bSimple ) { maLBWindow.SetMultiSelectionSimpleMode( bSimple ); } - BOOL IsMultiSelectionSimpleMode() const { return maLBWindow.IsMultiSelectionSimpleMode(); } - - void SetReadOnly( BOOL b ) { maLBWindow.SetReadOnly( b ); } - BOOL IsReadOnly() const { return maLBWindow.IsReadOnly(); } - - - Size CalcSize( USHORT nMaxLines ) const { return maLBWindow.CalcSize( nMaxLines ); } - long GetEntryHeight() const { return maLBWindow.GetEntryHeight(); } - long GetMaxEntryWidth() const { return maLBWindow.GetMaxEntryWidth(); } - - void SetScrollHdl( const Link& rLink ) { maScrollHdl = rLink; } - const Link& GetScrollHdl() const { return maScrollHdl; } - void SetSelectHdl( const Link& rLink ) { maLBWindow.SetSelectHdl( rLink ); } - const Link& GetSelectHdl() const { return maLBWindow.GetSelectHdl(); } - void SetCancelHdl( const Link& rLink ) { maLBWindow.SetCancelHdl( rLink ); } - const Link& GetCancelHdl() const { return maLBWindow.GetCancelHdl(); } - void SetDoubleClickHdl( const Link& rLink ) { maLBWindow.SetDoubleClickHdl( rLink ); } - const Link& GetDoubleClickHdl() const { return maLBWindow.GetDoubleClickHdl(); } - void SetUserDrawHdl( const Link& rLink ) { maLBWindow.SetUserDrawHdl( rLink ); } - 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 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 + BOOL IsTravelSelect() const { return maLBWindow.IsTravelSelect(); } + BOOL IsTrackingSelect() const { return maLBWindow.IsTrackingSelect(); } + + void EnableMultiSelection( BOOL bMulti, BOOL bStackMode ) { maLBWindow.EnableMultiSelection( bMulti, bStackMode ); } + BOOL IsMultiSelectionEnabled() const { return maLBWindow.IsMultiSelectionEnabled(); } + + void SetMultiSelectionSimpleMode( BOOL bSimple ) { maLBWindow.SetMultiSelectionSimpleMode( bSimple ); } + BOOL IsMultiSelectionSimpleMode() const { return maLBWindow.IsMultiSelectionSimpleMode(); } + + void SetReadOnly( BOOL b ) { maLBWindow.SetReadOnly( b ); } + BOOL IsReadOnly() const { return maLBWindow.IsReadOnly(); } + + + Size CalcSize( USHORT nMaxLines ) const { return maLBWindow.CalcSize( nMaxLines ); } + long GetEntryHeight() const { return maLBWindow.GetEntryHeight(); } + long GetMaxEntryWidth() const { return maLBWindow.GetMaxEntryWidth(); } + + void SetScrollHdl( const Link& rLink ) { maScrollHdl = rLink; } + const Link& GetScrollHdl() const { return maScrollHdl; } + void SetSelectHdl( const Link& rLink ) { maLBWindow.SetSelectHdl( rLink ); } + const Link& GetSelectHdl() const { return maLBWindow.GetSelectHdl(); } + void SetCancelHdl( const Link& rLink ) { maLBWindow.SetCancelHdl( rLink ); } + const Link& GetCancelHdl() const { return maLBWindow.GetCancelHdl(); } + void SetDoubleClickHdl( const Link& rLink ) { maLBWindow.SetDoubleClickHdl( rLink ); } + const Link& GetDoubleClickHdl() const { return maLBWindow.GetDoubleClickHdl(); } + void SetUserDrawHdl( const Link& rLink ) { maLBWindow.SetUserDrawHdl( rLink ); } + 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 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 { return maLBWindow.GetDisplayLineCount(); } // pb: #106948# explicit mirroring for calc - inline void EnableMirroring() { maLBWindow.EnableMirroring(); } + inline void EnableMirroring() { maLBWindow.EnableMirroring(); } inline void SetDropTraget(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& i_xDNDListenerContainer){ mxDNDListenerContainer= i_xDNDListenerContainer; } }; @@ -512,40 +512,40 @@ public: class ImplListBoxFloatingWindow : public FloatingWindow { private: - ImplListBox* mpImplLB; - Size maPrefSz; - USHORT mnDDLineCount; + ImplListBox* mpImplLB; + Size maPrefSz; + USHORT mnDDLineCount; USHORT mnPopupModeStartSaveSelection; - BOOL mbAutoWidth; + BOOL mbAutoWidth; protected: - long PreNotify( NotifyEvent& rNEvt ); + long PreNotify( NotifyEvent& rNEvt ); public: ImplListBoxFloatingWindow( Window* pParent ); - void SetImplListBox( ImplListBox* pLB ) { mpImplLB = pLB; } + void SetImplListBox( ImplListBox* pLB ) { mpImplLB = pLB; } - void SetPrefSize( const Size& rSz ) { maPrefSz = rSz; } - const Size& GetPrefSize() const { return maPrefSz; } + void SetPrefSize( const Size& rSz ) { maPrefSz = rSz; } + const Size& GetPrefSize() const { return maPrefSz; } - void SetAutoWidth( BOOL b ) { mbAutoWidth = b; } + void SetAutoWidth( BOOL b ) { mbAutoWidth = b; } BOOL IsAutoWidth() const { return mbAutoWidth; } - Size CalcFloatSize(); - void StartFloat( BOOL bStartTracking ); + Size CalcFloatSize(); + void StartFloat( BOOL bStartTracking ); - virtual void SetPosSizePixel( long nX, long nY, + virtual void SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, USHORT nFlags = WINDOW_POSSIZE_ALL ); - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) + 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( USHORT n ) { mnDDLineCount = n; } + USHORT GetDropDownLineCount() const { return mnDDLineCount; } USHORT GetPopupModeStartSaveSelection() const { return mnPopupModeStartSaveSelection; } - virtual void Resize(); + virtual void Resize(); }; // ----------- @@ -556,19 +556,19 @@ class ImplWin : public Control { private: - USHORT mnItemPos; // wegen UserDraw muss ich wissen, welches Item ich darstelle. - XubString maString; - Image maImage; - Image maImageHC; + USHORT mnItemPos; // wegen UserDraw muss ich wissen, welches Item ich darstelle. + XubString maString; + Image maImage; + Image maImageHC; - Rectangle maFocusRect; - Size maUserItemSize; + Rectangle maFocusRect; + Size maUserItemSize; - Link maMBDownHdl; - Link maUserDrawHdl; + Link maMBDownHdl; + Link maUserDrawHdl; - BOOL mbUserDrawEnabled : 1, - mbInUserDraw : 1; + BOOL mbUserDrawEnabled : 1, + mbInUserDraw : 1; void ImplDraw( bool bLayout = false ); @@ -579,40 +579,40 @@ public: ImplWin( Window* pParent, WinBits nWinStyle = 0 ); ~ImplWin() {}; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void GetFocus(); + virtual void LoseFocus(); virtual long PreNotify( NotifyEvent& rNEvt ); - USHORT GetItemPos() const { return mnItemPos; } - void SetItemPos( USHORT n ) { mnItemPos = n; } + USHORT GetItemPos() const { return mnItemPos; } + void SetItemPos( USHORT n ) { mnItemPos = n; } const XubString& GetString() const { return maString; } - void SetString( const XubString& rStr ) { maString = rStr; } + void SetString( const XubString& rStr ) { maString = rStr; } - const Image& GetImage() const { return maImage; } - void SetImage( const Image& rImg ) { maImage = rImg; } + const Image& GetImage() const { return maImage; } + void SetImage( const Image& rImg ) { maImage = rImg; } BOOL SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL ); const Image& GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const; - virtual void MBDown(); - void SetMBDownHdl( const Link& rLink ) { maMBDownHdl = rLink; } - const Link& GetMBDownHdl() const { return maMBDownHdl; } + virtual void MBDown(); + void SetMBDownHdl( const Link& rLink ) { maMBDownHdl = rLink; } + const Link& GetMBDownHdl() const { return maMBDownHdl; } - void SetUserDrawHdl( const Link& rLink ) { maUserDrawHdl = rLink; } - const Link& GetUserDrawHdl() const { return maUserDrawHdl; } + void SetUserDrawHdl( const Link& rLink ) { maUserDrawHdl = rLink; } + const Link& GetUserDrawHdl() const { return maUserDrawHdl; } - void SetUserItemSize( const Size& rSz ) { maUserItemSize = rSz; } - const Size& GetUserItemSize() const { return maUserItemSize; } + 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( BOOL bUserDraw ) { mbUserDrawEnabled = bUserDraw; } + BOOL IsUserDrawEnabled() const { return mbUserDrawEnabled; } - void DrawEntry( BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE, bool bLayout = false ); + void DrawEntry( BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE, bool bLayout = false ); }; // ----------- @@ -622,25 +622,25 @@ public: class ImplBtn : public PushButton { private: - BOOL mbDown; + BOOL mbDown; - Link maMBDownHdl; + Link maMBDownHdl; public: ImplBtn( Window* pParent, WinBits nWinStyle = 0 ); ~ImplBtn() {}; - virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MBDown(); - void SetMBDownHdl( const Link& rLink ) { maMBDownHdl = rLink; } - const Link& GetMBDownHdl() const { return maMBDownHdl; } + virtual void MBDown(); + void SetMBDownHdl( const Link& rLink ) { maMBDownHdl = rLink; } + const Link& GetMBDownHdl() const { return maMBDownHdl; } }; void ImplInitFieldSettings( Window* pWin, BOOL bFont, BOOL bForeground, BOOL bBackground ); void ImplInitDropDownButton( PushButton* pButton ); -#endif // _SV_ILSTBOX_HXX +#endif // _SV_ILSTBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/image.h b/vcl/inc/vcl/image.h index 397cde3af506..0234d57f6811 100644 --- a/vcl/inc/vcl/image.h +++ b/vcl/inc/vcl/image.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -44,34 +44,34 @@ 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, USHORT nInitSize ); + void Create( const BitmapEx& rBmpEx, long nItemWidth, long nItemHeight,USHORT nInitSize ); - void Expand( USHORT nGrowSize ); + void Expand( USHORT 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( USHORT nPos, USHORT nSrcPos ); + void Replace( USHORT nPos, const ImplImageBmp& rImageBmp, USHORT nSrcPos ); + void Replace( USHORT nPos, const BitmapEx& rBmpEx ); void ReplaceColors( const Color* pSrcColors, const Color* pDstColors, ULONG nColorCount ); - void ColorTransform( BmpColorMode eColorMode ); - void Invert(); + void ColorTransform( BmpColorMode eColorMode ); + void Invert(); - BitmapEx GetBitmapEx( USHORT nPosCount, USHORT* pPosAry ) const; + BitmapEx GetBitmapEx( USHORT nPosCount, USHORT* pPosAry ) const; - void Draw( USHORT nPos, OutputDevice* pDev, const Point& rPos, USHORT nStyle, const Size* pSize = NULL ); + void Draw( USHORT nPos, OutputDevice* pDev, const Point& rPos, USHORT nStyle, const Size* pSize = NULL ); private: - BitmapEx maBmpEx; - BitmapEx maDisabledBmpEx; - BitmapEx* mpDisplayBmp; - Size maSize; - BYTE* mpInfoAry; - USHORT mnSize; + BitmapEx maBmpEx; + BitmapEx maDisabledBmpEx; + BitmapEx* mpDisplayBmp; + Size maSize; + BYTE* mpInfoAry; + USHORT mnSize; - void ImplUpdateDisplayBmp( OutputDevice* pOutDev ); - void ImplUpdateDisabledBmpEx( int nPos ); + void ImplUpdateDisplayBmp( OutputDevice* pOutDev ); + void ImplUpdateDisabledBmpEx( int nPos ); private: // prevent assignment and copy construction ImplImageBmp( const ImplImageBmp& ); @@ -90,9 +90,9 @@ enum ImageType { IMAGETYPE_BITMAP, IMAGETYPE_IMAGE }; struct ImageAryData { - ::rtl::OUString maName; + ::rtl::OUString maName; // Images identified by either name, or by id - USHORT mnId; + USHORT mnId; BitmapEx maBitmapEx; ImageAryData(); @@ -104,7 +104,7 @@ struct ImageAryData bool IsLoadable() { return maBitmapEx.IsEmpty() && maName.getLength(); } void Load(const rtl::OUString &rPrefix); - ImageAryData& operator=( const ImageAryData& rData ); + ImageAryData& operator=( const ImageAryData& rData ); }; // ------------------------------------------------------------------------------ @@ -118,7 +118,7 @@ struct ImplImageList ImageAryDataVec maImages; ImageAryDataNameHash maNameHash; rtl::OUString maPrefix; - Size maImageSize; + Size maImageSize; ULONG mnRefCount; ImplImageList(); @@ -137,13 +137,13 @@ struct ImplImageList struct ImplImageRefData { - ImplImageList* mpImplData; - USHORT mnIndex; + ImplImageList* mpImplData; + USHORT mnIndex; - ImplImageRefData() {} // Um Warning zu umgehen + ImplImageRefData() {} // Um Warning zu umgehen ~ImplImageRefData(); - BOOL IsEqual( const ImplImageRefData& rData ); + BOOL IsEqual( const ImplImageRefData& rData ); }; // ---------------- @@ -152,13 +152,13 @@ struct ImplImageRefData struct ImplImageData { - ImplImageBmp* mpImageBitmap; - BitmapEx maBmpEx; + ImplImageBmp* mpImageBitmap; + BitmapEx maBmpEx; ImplImageData( const BitmapEx& rBmpEx ); ~ImplImageData(); - BOOL IsEqual( const ImplImageData& rData ); + BOOL IsEqual( const ImplImageData& rData ); }; // ------------- @@ -167,10 +167,10 @@ struct ImplImageData struct ImplImage { - ULONG mnRefCount; + ULONG mnRefCount; // TODO: use inheritance to get rid of meType+mpData - void* mpData; - ImageType meType; + void* mpData; + ImageType meType; ImplImage(); ~ImplImage(); diff --git a/vcl/inc/vcl/image.hxx b/vcl/inc/vcl/image.hxx index c0c7cf63be51..600e86ecf652 100644 --- a/vcl/inc/vcl/image.hxx +++ b/vcl/inc/vcl/image.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -46,8 +46,8 @@ namespace com { namespace sun { namespace star { namespace graphic { class XGrap // - Defines - // ----------- -#define IMAGE_STDBTN_COLOR Color( 0xC0, 0xC0, 0xC0 ) -#define IMAGELIST_IMAGE_NOTFOUND ((USHORT)0xFFFF) +#define IMAGE_STDBTN_COLOR Color( 0xC0, 0xC0, 0xC0 ) +#define IMAGELIST_IMAGE_NOTFOUND ((USHORT)0xFFFF) // ----------------------- // - ImageColorTransform - @@ -81,9 +81,9 @@ public: Image( const ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >& rxGraphic ); ~Image(); - Size GetSizePixel() const; + Size GetSizePixel() const; - BitmapEx GetBitmapEx() const; + BitmapEx GetBitmapEx() const; ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > GetXGraphic() const; Image GetColorTransformedImage( ImageColorTransform eColorTransform ) const; @@ -91,14 +91,14 @@ public: void Invert(); - 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 )); } + 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 )); } private: - ImplImage* mpImplData; + ImplImage* mpImplData; SAL_DLLPRIVATE void ImplInit( const BitmapEx& rBmpEx ); }; @@ -118,53 +118,53 @@ public: ImageList( const ImageList& rImageList ); ~ImageList(); - void Clear(); - void InsertFromHorizontalStrip( const BitmapEx &rBitmapEx, + void Clear(); + void InsertFromHorizontalStrip( const BitmapEx &rBitmapEx, const std::vector< rtl::OUString > &rNameVector ); - void InsertFromHorizontalBitmap( const ResId& rResId, + void InsertFromHorizontalBitmap( const ResId& rResId, USHORT nCount, const Color *pNonAlphaMaskColor, const Color *pSearchColors = NULL, const Color *pReplaceColors = NULL, ULONG nColorCount = 0); - BitmapEx GetAsHorizontalStrip() const; - USHORT GetImageCount() const; - Size GetImageSize() const; + BitmapEx GetAsHorizontalStrip() const; + USHORT GetImageCount() const; + Size GetImageSize() const; - void AddImage( USHORT nNewId, const Image& rImage ); - void AddImage( const ::rtl::OUString& rImageName, const Image& rImage ); + void AddImage( USHORT nNewId, const Image& rImage ); + void AddImage( const ::rtl::OUString& rImageName, const Image& rImage ); - void ReplaceImage( USHORT nId, const Image& rImage ); - void ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage ); + void ReplaceImage( USHORT nId, const Image& rImage ); + void ReplaceImage( const ::rtl::OUString& rImageName, const Image& rImage ); - void ReplaceImage( USHORT nId, USHORT nReplaceId ); - void ReplaceImage( const ::rtl::OUString& rImageName, const ::rtl::OUString& rReplaceName ); + void ReplaceImage( USHORT nId, USHORT nReplaceId ); + void ReplaceImage( const ::rtl::OUString& rImageName, const ::rtl::OUString& rReplaceName ); - void RemoveImage( USHORT nId ); - void RemoveImage( const ::rtl::OUString& rImageName ); + void RemoveImage( USHORT nId ); + void RemoveImage( const ::rtl::OUString& rImageName ); - Image GetImage( USHORT nId ) const; - Image GetImage( const ::rtl::OUString& rImageName ) const; + Image GetImage( USHORT 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; + USHORT GetImagePos( USHORT nId ) const; + bool HasImageAtPos( USHORT nId ) const; + USHORT GetImagePos( const ::rtl::OUString& rImageName ) const; - USHORT GetImageId( USHORT nPos ) const; - void GetImageIds( ::std::vector< USHORT >& rIds ) const; + USHORT GetImageId( USHORT nPos ) const; + void GetImageIds( ::std::vector< USHORT >& rIds ) const; - ::rtl::OUString GetImageName( USHORT nPos ) const; - void GetImageNames( ::std::vector< ::rtl::OUString >& rNames ) const; + ::rtl::OUString GetImageName( USHORT 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 )); } + ImageList& operator=( const ImageList& rImageList ); + BOOL operator==( const ImageList& rImageList ) const; + BOOL operator!=( const ImageList& rImageList ) const { return !(ImageList::operator==( rImageList )); } private: - ImplImageList* mpImplData; - USHORT mnInitSize; - USHORT mnGrowSize; + ImplImageList* mpImplData; + USHORT mnInitSize; + USHORT mnGrowSize; SAL_DLLPRIVATE void ImplInitBitmapEx( const ::rtl::OUString& rUserImageName, const ::std::vector< ::rtl::OUString >& rImageNames, @@ -176,6 +176,6 @@ private: SAL_DLLPRIVATE void ImplMakeUnique(); }; -#endif // _SV_IMAGE_HXX +#endif // _SV_IMAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/imagerepository.hxx b/vcl/inc/vcl/imagerepository.hxx index 7f0a3da28648..a9009df3dd29 100644 --- a/vcl/inc/vcl/imagerepository.hxx +++ b/vcl/inc/vcl/imagerepository.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/imgctrl.hxx b/vcl/inc/vcl/imgctrl.hxx index 4b68d89130b4..c72743397f05 100644 --- a/vcl/inc/vcl/imgctrl.hxx +++ b/vcl/inc/vcl/imgctrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -41,8 +41,8 @@ class VCL_DLLPUBLIC ImageControl : public FixedImage { private: - BitmapEx maBmp; - BitmapEx maBmpHC; + BitmapEx maBmp; + BitmapEx maBmpHC; ::sal_Int16 mnScaleMode; public: @@ -52,19 +52,19 @@ public: void SetScaleMode( const ::sal_Int16 _nMode ); ::sal_Int16 GetScaleMode() const { return mnScaleMode; } - virtual void Resize(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void Resize(); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); virtual void Paint( const Rectangle& rRect ); virtual void GetFocus(); virtual void LoseFocus(); - void SetBitmap( const BitmapEx& rBmp ); + void SetBitmap( const BitmapEx& rBmp ); using OutputDevice::GetBitmap; const BitmapEx& GetBitmap() const { return maBmp; } BOOL SetModeBitmap( const BitmapEx& rBitmap, BmpColorMode eMode = BMP_COLOR_NORMAL ); const BitmapEx& GetModeBitmap( BmpColorMode eMode = BMP_COLOR_NORMAL ) const; }; -#endif // _SV_IMGCTRL_HXX +#endif // _SV_IMGCTRL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/impbmp.hxx b/vcl/inc/vcl/impbmp.hxx index 1292cce59ef5..fedf9a11a993 100644 --- a/vcl/inc/vcl/impbmp.hxx +++ b/vcl/inc/vcl/impbmp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,7 +40,7 @@ struct BitmapBuffer; class SalBitmap; class BitmapPalette; class SalGraphics; -class ImplServerBitmap; +class ImplServerBitmap; class Bitmap; class OutputDevice; class Color; @@ -50,11 +50,11 @@ class ImpBitmap { private: - ULONG mnRefCount; - ULONG mnChecksum; - SalBitmap* mpSalBitmap; - Size maSourceSize; - + ULONG mnRefCount; + ULONG mnChecksum; + SalBitmap* mpSalBitmap; + Size maSourceSize; + public: ImpBitmap(); @@ -64,34 +64,34 @@ public: public: - void ImplSetSalBitmap( SalBitmap* pSalBitmap ); - SalBitmap* ImplGetSalBitmap() const { return mpSalBitmap; } + void ImplSetSalBitmap( SalBitmap* pSalBitmap ); + SalBitmap* ImplGetSalBitmap() const { return mpSalBitmap; } 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 ); - - void ImplDestroy(); - - Size ImplGetSize() const; - Size ImplGetSourceSize() const; - void ImplSetSourceSize( const Size&); - USHORT ImplGetBitCount() const; - - BitmapBuffer* ImplAcquireBuffer( BOOL bReadOnly ); - void ImplReleaseBuffer( BitmapBuffer* pBuffer, BOOL bReadOnly ); - -public: - - ULONG ImplGetRefCount() const { return mnRefCount; } - void ImplIncRefCount() { mnRefCount++; } - void ImplDecRefCount() { mnRefCount--; } - - inline void ImplSetChecksum( ULONG nChecksum ) { mnChecksum = nChecksum; } - inline ULONG ImplGetChecksum() const { return mnChecksum; } + 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 ); + + void ImplDestroy(); + + Size ImplGetSize() const; + Size ImplGetSourceSize() const; + void ImplSetSourceSize( const Size&); + USHORT ImplGetBitCount() const; + + BitmapBuffer* ImplAcquireBuffer( BOOL bReadOnly ); + void ImplReleaseBuffer( BitmapBuffer* pBuffer, BOOL bReadOnly ); + +public: + + ULONG ImplGetRefCount() const { return mnRefCount; } + void ImplIncRefCount() { mnRefCount++; } + void ImplDecRefCount() { mnRefCount--; } + + inline void ImplSetChecksum( ULONG nChecksum ) { mnChecksum = nChecksum; } + inline ULONG ImplGetChecksum() const { return mnChecksum; } #endif // PRIVATE }; diff --git a/vcl/inc/vcl/impbmpconv.hxx b/vcl/inc/vcl/impbmpconv.hxx index 0d82ed119d6d..b949ea898c3f 100644 --- a/vcl/inc/vcl/impbmpconv.hxx +++ b/vcl/inc/vcl/impbmpconv.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/impdel.hxx b/vcl/inc/vcl/impdel.hxx index 90ab82bd1878..5e39eff5541e 100644 --- a/vcl/inc/vcl/impdel.hxx +++ b/vcl/inc/vcl/impdel.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -28,14 +28,14 @@ #ifndef _VCL_IMPDEL_HXX #define _VCL_IMPDEL_HXX - + #include <list> - + namespace vcl { - + class DeletionListener; - + class DeletionNotifier { std::list< DeletionListener* > m_aListeners; @@ -44,23 +44,23 @@ ~DeletionNotifier() { notifyDelete(); } - + inline void notifyDelete(); - public: + public: void addDel( DeletionListener* pListener ) { m_aListeners.push_back( pListener ); } - + void removeDel( DeletionListener* pListener ) { m_aListeners.remove( pListener ); } }; - + class DeletionListener { - DeletionNotifier* m_pNotifier; + DeletionNotifier* m_pNotifier; public: DeletionListener( DeletionNotifier* pNotifier ) - : m_pNotifier( pNotifier ) + : m_pNotifier( pNotifier ) { if( m_pNotifier ) m_pNotifier->addDel( this ); @@ -79,12 +79,12 @@ for( std::list< DeletionListener* >::const_iterator it = m_aListeners.begin(); it != m_aListeners.end(); ++it ) (*it)->deleted(); - + m_aListeners.clear(); } - + } // namespace vcl - + #endif // _VCL_IMPDEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/impfont.hxx b/vcl/inc/vcl/impfont.hxx index 06031c2c5df9..b7a0368f89bf 100644 --- a/vcl/inc/vcl/impfont.hxx +++ b/vcl/inc/vcl/impfont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -59,38 +59,38 @@ private: friend class Font; void AskConfig(); - int mnRefCount; - String maFamilyName; - String maStyleName; - Size maSize; - Color maColor; // compatibility, now on output device - Color maFillColor; // compatibility, now on output device - rtl_TextEncoding meCharSet; - LanguageType meLanguage; - LanguageType meCJKLanguage; - FontFamily meFamily; - FontPitch mePitch; - TextAlign meAlign; - FontWeight meWeight; - FontWidth meWidthType; - FontItalic meItalic; - FontUnderline meUnderline; - FontUnderline meOverline; - FontStrikeout meStrikeout; - FontRelief meRelief; - FontEmphasisMark meEmphasisMark; - FontType meType; // used by metrics only - short mnOrientation; - FontKerning mnKerning; - BOOL mbWordLine:1, + int mnRefCount; + String maFamilyName; + String maStyleName; + Size maSize; + Color maColor; // compatibility, now on output device + Color maFillColor; // compatibility, now on output device + rtl_TextEncoding meCharSet; + LanguageType meLanguage; + LanguageType meCJKLanguage; + FontFamily meFamily; + FontPitch mePitch; + TextAlign meAlign; + FontWeight meWeight; + FontWidth meWidthType; + FontItalic meItalic; + FontUnderline meUnderline; + FontUnderline meOverline; + FontStrikeout meStrikeout; + FontRelief meRelief; + FontEmphasisMark meEmphasisMark; + FontType meType; // used by metrics only + short mnOrientation; + FontKerning mnKerning; + BOOL mbWordLine:1, mbOutline:1, mbConfigLookup:1, // there was a config lookup mbShadow:1, mbVertical:1, - mbTransparent:1; // compatibility, now on output device + mbTransparent:1; // compatibility, now on output device - friend SvStream& operator>>( SvStream& rIStm, Impl_Font& ); - friend SvStream& operator<<( SvStream& rOStm, const Impl_Font& ); + friend SvStream& operator>>( SvStream& rIStm, Impl_Font& ); + friend SvStream& operator<<( SvStream& rOStm, const Impl_Font& ); }; // ------------------ @@ -148,18 +148,18 @@ public: FontHintStyle meHintStyle; // type of font hinting to be used public: ImplFontOptions() : - meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW), - meAntiAlias(ANTIALIAS_DONTKNOW), - meAutoHint(AUTOHINT_DONTKNOW), - meHinting(HINTING_DONTKNOW), + meEmbeddedBitmap(EMBEDDEDBITMAP_DONTKNOW), + meAntiAlias(ANTIALIAS_DONTKNOW), + meAutoHint(AUTOHINT_DONTKNOW), + meHinting(HINTING_DONTKNOW), meHintStyle(HINT_SLIGHT) {} - ImplFontOptions( FontEmbeddedBitmap eEmbeddedBitmap, FontAntiAlias eAntiAlias, + ImplFontOptions( FontEmbeddedBitmap eEmbeddedBitmap, FontAntiAlias eAntiAlias, FontAutoHint eAutoHint, FontHinting eHinting, FontHintStyle eHintStyle) : - meEmbeddedBitmap(eEmbeddedBitmap), - meAntiAlias(eAntiAlias), - meAutoHint(eAutoHint), - meHinting(eHinting), + meEmbeddedBitmap(eEmbeddedBitmap), + meAntiAlias(eAntiAlias), + meAutoHint(eAutoHint), + meHinting(eHinting), meHintStyle(eHintStyle) {} FontAutoHint GetUseAutoHint() const { return meAutoHint; } @@ -226,16 +226,16 @@ class CmapResult { public: - explicit CmapResult( bool bSymbolic = false, + explicit CmapResult( bool bSymbolic = false, const sal_uInt32* pRangeCodes = NULL, int nRangeCount = 0, const int* pStartGlyphs = 0, const USHORT* pGlyphIds = NULL ); const sal_uInt32* mpRangeCodes; const int* mpStartGlyphs; const USHORT* mpGlyphIds; - int mnRangeCount; - bool mbSymbolic; - bool mbRecoded; + int mnRangeCount; + bool mbSymbolic; + bool mbRecoded; }; bool ParseCMAP( const unsigned char* pRawData, int nRawLength, CmapResult& ); diff --git a/vcl/inc/vcl/impgraph.hxx b/vcl/inc/vcl/impgraph.hxx index dfb47a153f2d..fc6b12a7e863 100644 --- a/vcl/inc/vcl/impgraph.hxx +++ b/vcl/inc/vcl/impgraph.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -42,17 +42,17 @@ struct ImpSwapInfo { - MapMode maPrefMapMode; - Size maPrefSize; + MapMode maPrefMapMode; + Size maPrefSize; }; // -------------- // - ImpGraphic - // -------------- -class OutputDevice; -class GfxLink; -struct ImpSwapFile; +class OutputDevice; +class GfxLink; +struct ImpSwapFile; class GraphicConversionParameters; class ImpGraphic @@ -61,20 +61,20 @@ class ImpGraphic private: - GDIMetaFile maMetaFile; - BitmapEx maEx; - ImpSwapInfo maSwapInfo; - Animation* mpAnimation; - GraphicReader* mpContext; - ImpSwapFile* mpSwapFile; - GfxLink* mpGfxLink; - GraphicType meType; - String maDocFileURLStr; - ULONG mnDocFilePos; + GDIMetaFile maMetaFile; + BitmapEx maEx; + ImpSwapInfo maSwapInfo; + Animation* mpAnimation; + GraphicReader* mpContext; + ImpSwapFile* mpSwapFile; + GfxLink* mpGfxLink; + GraphicType meType; + String maDocFileURLStr; + ULONG mnDocFilePos; mutable ULONG mnSizeBytes; - ULONG mnRefCount; - BOOL mbSwapOut; - BOOL mbSwapUnderway; + ULONG mnRefCount; + BOOL mbSwapOut; + BOOL mbSwapUnderway; private: @@ -84,94 +84,94 @@ private: ImpGraphic( const BitmapEx& rBmpEx ); ImpGraphic( const Animation& rAnimation ); ImpGraphic( const GDIMetaFile& rMtf ); - virtual ~ImpGraphic(); - - ImpGraphic& operator=( const ImpGraphic& rImpGraphic ); - BOOL operator==( const ImpGraphic& rImpGraphic ) const; - BOOL operator!=( const ImpGraphic& rImpGraphic ) const { return !( *this == rImpGraphic ); } + virtual ~ImpGraphic(); - void ImplClearGraphics( BOOL bCreateSwapInfo ); - void ImplClear(); + ImpGraphic& operator=( const ImpGraphic& rImpGraphic ); + BOOL operator==( const ImpGraphic& rImpGraphic ) const; + BOOL operator!=( const ImpGraphic& rImpGraphic ) const { return !( *this == rImpGraphic ); } - GraphicType ImplGetType() const; - void ImplSetDefaultType(); - BOOL ImplIsSupportedGraphic() const; + void ImplClearGraphics( BOOL bCreateSwapInfo ); + void ImplClear(); - BOOL ImplIsTransparent() const; - BOOL ImplIsAlpha() const; - BOOL ImplIsAnimated() const; + GraphicType ImplGetType() const; + void ImplSetDefaultType(); + BOOL ImplIsSupportedGraphic() const; - Bitmap ImplGetBitmap(const GraphicConversionParameters& rParameters) const; - BitmapEx ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const; - Animation ImplGetAnimation() const; - const GDIMetaFile& ImplGetGDIMetaFile() const; + BOOL ImplIsTransparent() const; + BOOL ImplIsAlpha() const; + BOOL ImplIsAnimated() const; - Size ImplGetPrefSize() const; - void ImplSetPrefSize( const Size& rPrefSize ); + Bitmap ImplGetBitmap(const GraphicConversionParameters& rParameters) const; + BitmapEx ImplGetBitmapEx(const GraphicConversionParameters& rParameters) const; + Animation ImplGetAnimation() const; + const GDIMetaFile& ImplGetGDIMetaFile() const; - MapMode ImplGetPrefMapMode() const; - void ImplSetPrefMapMode( const MapMode& rPrefMapMode ); + Size ImplGetPrefSize() const; + void ImplSetPrefSize( const Size& rPrefSize ); + + MapMode ImplGetPrefMapMode() const; + void ImplSetPrefMapMode( const MapMode& rPrefMapMode ); - ULONG ImplGetSizeBytes() const; + ULONG ImplGetSizeBytes() const; - void ImplDraw( OutputDevice* pOutDev, + void ImplDraw( OutputDevice* pOutDev, const Point& rDestPt ) const; - void ImplDraw( OutputDevice* pOutDev, - const Point& rDestPt, + void ImplDraw( OutputDevice* pOutDev, + const Point& rDestPt, const Size& rDestSize ) const; - void ImplStartAnimation( OutputDevice* pOutDev, + void ImplStartAnimation( OutputDevice* pOutDev, const Point& rDestPt, long nExtraData = 0, OutputDevice* pFirstFrameOutDev = NULL ); - void ImplStartAnimation( OutputDevice* pOutDev, + void ImplStartAnimation( OutputDevice* pOutDev, const Point& rDestPt, - const Size& rDestSize, + const Size& rDestSize, long nExtraData = 0, OutputDevice* pFirstFrameOutDev = NULL ); - void ImplStopAnimation( OutputDevice* pOutputDevice = NULL, + void ImplStopAnimation( OutputDevice* pOutputDevice = NULL, long nExtraData = 0 ); - void ImplSetAnimationNotifyHdl( const Link& rLink ); - Link ImplGetAnimationNotifyHdl() const; + void ImplSetAnimationNotifyHdl( const Link& rLink ); + Link ImplGetAnimationNotifyHdl() const; - ULONG ImplGetAnimationLoopCount() const; - void ImplResetAnimationLoopCount(); + ULONG ImplGetAnimationLoopCount() const; + void ImplResetAnimationLoopCount(); - List* ImplGetAnimationInfoList() const; + List* ImplGetAnimationInfoList() const; private: - GraphicReader* ImplGetContext(); - void ImplSetContext( GraphicReader* pReader ); + GraphicReader* ImplGetContext(); + void ImplSetContext( GraphicReader* pReader ); private: - void ImplSetDocFileName( const String& rName, ULONG nFilePos ); - const String& ImplGetDocFileName() const; - ULONG ImplGetDocFilePos() const; + void ImplSetDocFileName( const String& rName, ULONG nFilePos ); + const String& ImplGetDocFileName() const; + ULONG ImplGetDocFilePos() const; - BOOL ImplReadEmbedded( SvStream& rIStream, BOOL bSwap = FALSE ); - BOOL ImplWriteEmbedded( SvStream& rOStream ); + BOOL ImplReadEmbedded( SvStream& rIStream, BOOL bSwap = FALSE ); + BOOL ImplWriteEmbedded( SvStream& rOStream ); - BOOL ImplSwapIn(); - BOOL ImplSwapIn( SvStream* pIStm ); + BOOL ImplSwapIn(); + BOOL ImplSwapIn( SvStream* pIStm ); - BOOL ImplSwapOut(); - BOOL ImplSwapOut( SvStream* pOStm ); + BOOL ImplSwapOut(); + BOOL ImplSwapOut( SvStream* pOStm ); - BOOL ImplIsSwapOut() const; + BOOL ImplIsSwapOut() const; - void ImplSetLink( const GfxLink& ); - GfxLink ImplGetLink(); - BOOL ImplIsLink() const; + void ImplSetLink( const GfxLink& ); + GfxLink ImplGetLink(); + BOOL ImplIsLink() const; - ULONG ImplGetChecksum() const; + ULONG ImplGetChecksum() const; - BOOL ImplExportNative( SvStream& rOStm ) const; + BOOL ImplExportNative( SvStream& rOStm ) const; - friend SvStream& operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic ); - friend SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ); + friend SvStream& operator<<( SvStream& rOStm, const ImpGraphic& rImpGraphic ); + friend SvStream& operator>>( SvStream& rIStm, ImpGraphic& rImpGraphic ); }; #endif // _SV_IMPGRAPH_HXX diff --git a/vcl/inc/vcl/impimagetree.hxx b/vcl/inc/vcl/impimagetree.hxx index 849e98bb234c..8b694eb8625b 100644 --- a/vcl/inc/vcl/impimagetree.hxx +++ b/vcl/inc/vcl/impimagetree.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/impoct.hxx b/vcl/inc/vcl/impoct.hxx index 1679b4802c63..6437027db402 100644 --- a/vcl/inc/vcl/impoct.hxx +++ b/vcl/inc/vcl/impoct.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -37,28 +37,28 @@ class ImpErrorQuad { - long nRed; - long nGreen; - long nBlue; - long nReserved; - -public: - - inline ImpErrorQuad() {} - inline ImpErrorQuad( const BitmapColor& rColor ) : - nRed ( (long) rColor.GetRed() << 5L ), - nGreen ( (long) rColor.GetGreen() << 5L ), - nBlue ( (long) rColor.GetBlue() << 5L ) {} - - inline void operator=( const BitmapColor& rColor ); - inline ImpErrorQuad& operator-=( const BitmapColor& rColor ); - - inline void ImplAddColorError1( const ImpErrorQuad& rErrQuad ); - inline void ImplAddColorError3( const ImpErrorQuad& rErrQuad ); - inline void ImplAddColorError5( const ImpErrorQuad& rErrQuad ); - inline void ImplAddColorError7( const ImpErrorQuad& rErrQuad ); - - inline BitmapColor ImplGetColor(); + long nRed; + long nGreen; + long nBlue; + long nReserved; + +public: + + inline ImpErrorQuad() {} + inline ImpErrorQuad( const BitmapColor& rColor ) : + nRed ( (long) rColor.GetRed() << 5L ), + nGreen ( (long) rColor.GetGreen() << 5L ), + nBlue ( (long) rColor.GetBlue() << 5L ) {} + + inline void operator=( const BitmapColor& rColor ); + inline ImpErrorQuad& operator-=( const BitmapColor& rColor ); + + inline void ImplAddColorError1( const ImpErrorQuad& rErrQuad ); + inline void ImplAddColorError3( const ImpErrorQuad& rErrQuad ); + inline void ImplAddColorError5( const ImpErrorQuad& rErrQuad ); + inline void ImplAddColorError7( const ImpErrorQuad& rErrQuad ); + + inline BitmapColor ImplGetColor(); }; // ------------------------------------------------------------------------ @@ -121,8 +121,8 @@ 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 ), + 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 ) ); } @@ -132,19 +132,19 @@ inline BitmapColor ImpErrorQuad::ImplGetColor() class ImpNodeCache { - OctreeNode* pActNode; - ULONG nNew; - ULONG nDelete; - ULONG nGet; - ULONG nRelease; - -public: - + OctreeNode* pActNode; + ULONG nNew; + ULONG nDelete; + ULONG nGet; + ULONG nRelease; + +public: + ImpNodeCache( const ULONG nInitSize ); ~ImpNodeCache(); - inline OctreeNode* ImplGetFreeNode(); - inline void ImplReleaseNode( OctreeNode* pNode ); + inline OctreeNode* ImplGetFreeNode(); + inline void ImplReleaseNode( OctreeNode* pNode ); }; // ------------------------------------------------------------------------ diff --git a/vcl/inc/vcl/inputctx.hxx b/vcl/inc/vcl/inputctx.hxx index 26a43530c8d0..474d84c85d34 100644 --- a/vcl/inc/vcl/inputctx.hxx +++ b/vcl/inc/vcl/inputctx.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -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 ((ULONG)0x00000001) +#define INPUTCONTEXT_EXTTEXTINPUT ((ULONG)0x00000002) +#define INPUTCONTEXT_EXTTEXTINPUT_ON ((ULONG)0x00000004) +#define INPUTCONTEXT_EXTTEXTINPUT_OFF ((ULONG)0x00000008) // ---------------- // - InputContext - @@ -49,8 +49,8 @@ class VCL_DLLPUBLIC InputContext { private: - Font maFont; - ULONG mnOptions; + Font maFont; + ULONG mnOptions; public: InputContext() { mnOptions = 0; } @@ -61,29 +61,29 @@ public: maFont( rFont ) { mnOptions = nOptions; } - void SetFont( const Font& rFont ) { maFont = rFont; } - const Font& GetFont() const { return maFont; } + 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( ULONG nOptions ) { mnOptions = nOptions; } + ULONG GetOptions() const { return mnOptions; } - InputContext& operator=( const InputContext& rInputContext ); - BOOL operator==( const InputContext& rInputContext ) const; - BOOL operator!=( const InputContext& rInputContext ) const + InputContext& operator=( const InputContext& rInputContext ); + BOOL operator==( const InputContext& rInputContext ) const; + BOOL operator!=( const InputContext& rInputContext ) const { return !(InputContext::operator==( rInputContext )); } }; inline InputContext& InputContext::operator=( const InputContext& rInputContext ) { - maFont = rInputContext.maFont; - mnOptions = rInputContext.mnOptions; + maFont = rInputContext.maFont; + mnOptions = rInputContext.mnOptions; return *this; } inline BOOL InputContext::operator==( const InputContext& rInputContext ) const { - return ((mnOptions == rInputContext.mnOptions) && - (maFont == rInputContext.maFont)); + return ((mnOptions == rInputContext.mnOptions) && + (maFont == rInputContext.maFont)); } #endif // _VCL_INPUTCTX_HXX diff --git a/vcl/inc/vcl/introwin.hxx b/vcl/inc/vcl/introwin.hxx index e5503bc5dfd6..128f7afae15a 100644 --- a/vcl/inc/vcl/introwin.hxx +++ b/vcl/inc/vcl/introwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/javachild.hxx b/vcl/inc/vcl/javachild.hxx index 5765adfd26f1..413e0cf14fdf 100644 --- a/vcl/inc/vcl/javachild.hxx +++ b/vcl/inc/vcl/javachild.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -44,7 +44,7 @@ public: JavaChildWindow( Window* pParent, const ResId& rResId ); ~JavaChildWindow(); - sal_IntPtr getParentWindowHandleForJava(); + sal_IntPtr getParentWindowHandleForJava(); private: diff --git a/vcl/inc/vcl/jobdata.hxx b/vcl/inc/vcl/jobdata.hxx index b51282d57b1e..baefe2ac4819 100644 --- a/vcl/inc/vcl/jobdata.hxx +++ b/vcl/inc/vcl/jobdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -71,7 +71,7 @@ struct JobData JobData& operator=(const psp::JobData& rRight); JobData( const JobData& rData ) { *this = rData; } - + void setCollate( bool bCollate ); // creates a new buffer using new diff --git a/vcl/inc/vcl/jobset.h b/vcl/inc/vcl/jobset.h index 7d460b908a55..096f31020f5b 100644 --- a/vcl/inc/vcl/jobset.h +++ b/vcl/inc/vcl/jobset.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,11 +40,11 @@ // ------------------ // see com.sun.star.portal.client.JobSetupSystem.idl: -#define JOBSETUP_SYSTEM_DONTKNOW 0 -#define JOBSETUP_SYSTEM_WINDOWS 1 -#define JOBSETUP_SYSTEM_OS2 2 -#define JOBSETUP_SYSTEM_UNIX 3 -#define JOBSETUP_SYSTEM_MAC 4 +#define JOBSETUP_SYSTEM_DONTKNOW 0 +#define JOBSETUP_SYSTEM_WINDOWS 1 +#define JOBSETUP_SYSTEM_OS2 2 +#define JOBSETUP_SYSTEM_UNIX 3 +#define JOBSETUP_SYSTEM_MAC 4 #define JOBSETUP_SYSTEM_JAVA 5 // ---------------- @@ -53,19 +53,19 @@ struct ImplJobSetup { - USHORT mnRefCount; // RefCount (only independ data) - USHORT mnSystem; // Sytem - JOBSETUP_SYSTEM_xxxx - String maPrinterName; // Printer-Name - String maDriver; // Driver-Name - Orientation meOrientation; // Orientation + USHORT mnRefCount; // RefCount (only independ data) + USHORT 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 - 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) - ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > maValueMap; + USHORT 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) + ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > maValueMap; ImplJobSetup(); ImplJobSetup( const ImplJobSetup& rJobSetup ); @@ -77,6 +77,6 @@ struct ImplJobSetup // Papierbreite/hoehe wird wenn 0 im unabhaengigen Teil automatisch aus // Papierformat berechnet, wenn dieses ungleich PAPER_USER ist -#endif // _SV_JOBSET_H +#endif // _SV_JOBSET_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/jobset.hxx b/vcl/inc/vcl/jobset.hxx index a5a3735c3da5..80f52d90068c 100644 --- a/vcl/inc/vcl/jobset.hxx +++ b/vcl/inc/vcl/jobset.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -46,11 +46,11 @@ class VCL_DLLPUBLIC JobSetup friend class Printer; private: - ImplJobSetup* mpData; + ImplJobSetup* mpData; public: - SAL_DLLPRIVATE ImplJobSetup* ImplGetData(); - SAL_DLLPRIVATE ImplJobSetup* ImplGetConstData(); + SAL_DLLPRIVATE ImplJobSetup* ImplGetData(); + SAL_DLLPRIVATE ImplJobSetup* ImplGetConstData(); SAL_DLLPRIVATE const ImplJobSetup* ImplGetConstData() const; public: @@ -58,27 +58,27 @@ public: JobSetup( const JobSetup& rJob ); ~JobSetup(); - String GetPrinterName() const; - String GetDriverName() const; + String GetPrinterName() const; + String GetDriverName() const; - /* Get/SetValue are used to read/store additional - * Parameters in the job setup that may be used - * by the printer driver. One possible use are phone - * numbers for faxes (which disguise as printers) + /* Get/SetValue are used to read/store additional + * Parameters in the job setup that may be used + * by the printer driver. One possible use are phone + * numbers for faxes (which disguise as printers) */ - String GetValue( const String& rKey ) const; - void SetValue( const String& rKey, const String& rValue ); + String GetValue( const String& rKey ) const; + void SetValue( const String& rKey, const String& rValue ); - JobSetup& operator=( const JobSetup& rJob ); + JobSetup& operator=( const JobSetup& rJob ); - BOOL operator==( const JobSetup& rJobSetup ) const; - BOOL operator!=( const JobSetup& rJobSetup ) const + BOOL operator==( const JobSetup& rJobSetup ) const; + BOOL operator!=( const JobSetup& rJobSetup ) const { return !(JobSetup::operator==( rJobSetup )); } - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ); - friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ); + friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, JobSetup& rJobSetup ); + friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const JobSetup& rJobSetup ); }; -#endif // _SV_JOBSET_HXX +#endif // _SV_JOBSET_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/keycod.hxx b/vcl/inc/vcl/keycod.hxx index 8092f2a6d964..c1792fd715ea 100644 --- a/vcl/inc/vcl/keycod.hxx +++ b/vcl/inc/vcl/keycod.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -63,7 +63,7 @@ enum KeyFuncType { KEYFUNC_DONTKNOW, KEYFUNC_NEW, KEYFUNC_OPEN, class VCL_DLLPUBLIC KeyCode { private: - USHORT nCode; + USHORT nCode; KeyFuncType eFunc; public: @@ -74,40 +74,40 @@ public: KeyCode( USHORT nKey, BOOL bShift, BOOL bMod1, BOOL bMod2, BOOL bMod3 ); KeyCode( KeyFuncType eFunction ); - USHORT GetFullCode() const { return nCode; } - USHORT GetFullKeyCode() const { return (nCode) ; } + USHORT GetFullCode() const { return nCode; } + USHORT GetFullKeyCode() const { return (nCode) ; } KeyFuncType GetFullFunction() const { return eFunc; } - BOOL IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const; + BOOL IsDefinedKeyCodeEqual( const KeyCode& rKeyCode ) const; - USHORT GetCode() const + USHORT GetCode() const { return (nCode & KEY_CODE); } - USHORT GetModifier() const + USHORT GetModifier() const { return (nCode & KEY_MODTYPE); } - USHORT GetAllModifier() const + USHORT GetAllModifier() const { return (nCode & KEY_ALLMODTYPE); } - BOOL IsShift() const + BOOL IsShift() const { return ((nCode & KEY_SHIFT) != 0); } - BOOL IsMod1() const + BOOL IsMod1() const { return ((nCode & KEY_MOD1) != 0); } - BOOL IsMod2() const + BOOL IsMod2() const { return ((nCode & KEY_MOD2) != 0); } - BOOL IsMod3() const - { return ((nCode & KEY_MOD3) != 0); } - USHORT GetGroup() const + BOOL IsMod3() const + { return ((nCode & KEY_MOD3) != 0); } + USHORT GetGroup() const { return (nCode & KEYGROUP_TYPE); } - XubString GetName( Window* pWindow = NULL ) const; - XubString GetSymbolName( const XubString& rFontName, Window* pWindow = NULL ) const; + XubString GetName( Window* pWindow = NULL ) const; + XubString GetSymbolName( const XubString& rFontName, Window* pWindow = NULL ) const; - BOOL IsFunction() const + BOOL IsFunction() const { return ((eFunc != KEYFUNC_DONTKNOW) ? TRUE : FALSE); } KeyFuncType GetFunction() const; KeyCode& operator = ( const KeyCode& rKeyCode ); - BOOL operator ==( const KeyCode& rKeyCode ) const; - BOOL operator !=( const KeyCode& rKeyCode ) const; + BOOL operator ==( const KeyCode& rKeyCode ) const; + BOOL operator !=( const KeyCode& rKeyCode ) const; }; inline KeyCode::KeyCode( USHORT nKey, BOOL bShift, BOOL bMod1, BOOL bMod2, BOOL bMod3 ) diff --git a/vcl/inc/vcl/keycodes.hxx b/vcl/inc/vcl/keycodes.hxx index ace5df3343b4..41c21bc4d51d 100644 --- a/vcl/inc/vcl/keycodes.hxx +++ b/vcl/inc/vcl/keycodes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,118 +40,118 @@ // 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_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_MISC ((USHORT)::com::sun::star::awt::KeyGroup::MISC) +#define KEYGROUP_TYPE ((USHORT)::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_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_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) @@ -164,15 +164,15 @@ #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_CODE ((USHORT)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 ((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) // 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 ((USHORT)0x0001) +#define MOUSE_MIDDLE ((USHORT)0x0002) +#define MOUSE_RIGHT ((USHORT)0x0004) // ------------------- // - Indicator-Types - diff --git a/vcl/inc/vcl/lazydelete.hxx b/vcl/inc/vcl/lazydelete.hxx index 46804f3b54cb..713e22ef022a 100644 --- a/vcl/inc/vcl/lazydelete.hxx +++ b/vcl/inc/vcl/lazydelete.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,23 +43,23 @@ namespace vcl { /* Helpers for lazy object deletion - + With vcl it is often necessary to delete objects (especially Windows) in the right order as well as in a way ensuring that the deleted objects are not still on the stack (e.g. deleting a Window in its key handler). To make this easier a helper class is given here which takes care of both sorting as well as lazy deletion. - + The grisly details: LazyDelete is a class that LazyDeletor register to. When vcl's event loop (that is Application::Yield or Application::Reschedule) comes out of the last level, the LazyDelete::flush is called. This will cause LazyDelete to delete all registered LazyDeletor objects. - + LazyDeletor<T> is a one instance object that contains a list of <T> objects to be deleted in sorted order. It is derived from LazyDeletorBase as to be able to register itself in LazyDelete. - + The user calls the static method LazyDeletor<T>::Delete( T* ) with the object to be destroyed lazy. The static method creates the LazyDeletor<T> (which in turn registers itself in LazyDelete) if this is the first time @@ -68,19 +68,19 @@ namespace vcl that will ensure the correct order of deletion via the specialized is_less method (e.g. if a Window is a child of another Window and therefore should be destroyed first it is "less" in this sense) - + LazyDelete::flush will be called when the top of the nested event loop is reached again and will then destroy each registered LazyDeletor<T> which in turn destroys the objects needed to be destroyed lazily. After this the state is as before entering the event loop. - + Preconditions: - The class <T> of which objects are to be destroyed needs a virtual destructor or must be final, else the wrong type will be destroyed. - The destructor of <T> should call LazyDeletor<T>::Undelete( this ). This prevents duplicate deletionin case someone destroys the object prematurely. */ - + class LazyDeletorBase; class VCL_DLLPUBLIC LazyDelete { @@ -105,27 +105,27 @@ namespace vcl class VCL_DLLPUBLIC LazyDeletor : public LazyDeletorBase { static LazyDeletor< T >* s_pOneInstance; - + struct DeleteObjectEntry { T* m_pObject; bool m_bDeleted; - + DeleteObjectEntry() : m_pObject( NULL ), m_bDeleted( false ) {} - + DeleteObjectEntry( T* i_pObject ) : m_pObject( i_pObject ), m_bDeleted( false ) {} }; - + std::vector< DeleteObjectEntry > m_aObjects; typedef std::hash_map< sal_IntPtr, unsigned int > PtrToIndexMap; PtrToIndexMap m_aPtrToIndex; - + /** strict weak ordering funtion to bring objects to be destroyed lazily in correct order, e.g. for Window objects children before parents */ @@ -140,7 +140,7 @@ namespace vcl #endif if( s_pOneInstance == this ) // sanity check s_pOneInstance = NULL; - + // do the actual work unsigned int nCount = m_aObjects.size(); std::vector<T*> aRealDelete; @@ -169,7 +169,7 @@ namespace vcl delete aRealDelete[n]; } } - + public: /** mark an object for lazy deletion */ @@ -203,7 +203,7 @@ namespace vcl } } }; - + /* class DeleteOnDeinit matches a similar need as LazyDelete for static objects: you may not access vcl objects after DeInitVCL has been called this includes their destruction @@ -211,36 +211,36 @@ namespace vcl To work around this use DeleteOnDeinit<BitmapEx> which will allow you to have a static object container, that will have its contents destroyed on DeinitVCL. The single drawback is that you need to check on the container object whether it still contains content before actually accessing it. - + caveat: when constructing a vcl object, you certainly want to ensure that InitVCL has run already. However this is not necessarily the case when using a class static member or a file level static variable. In these cases make judicious use of the set() method of DeleteOnDeinit, but beware of the changing ownership. - + example use case: use a lazy initialized on call BitmapEx in a paint method. Of course a paint method would not normally be called after DeInitVCL anyway, so the check might not be necessary in a Window::Paint implementation, but always checking is a good idea. - + SomeWindow::Paint() { static vcl::DeleteOnDeinit< BitmapEx > aBmp( new BitmapEx( ResId( 1000, myResMgr ) ) ); - + if( aBmp.get() ) // check whether DeInitVCL has been called already DrawBitmapEx( Point( 10, 10 ), *aBmp.get() ); } */ - + class VCL_DLLPUBLIC DeleteOnDeinitBase { public: static void SAL_DLLPRIVATE ImplDeleteOnDeInit(); virtual ~DeleteOnDeinitBase(); protected: - static void addDeinitContainer( DeleteOnDeinitBase* i_pContainer ); + static void addDeinitContainer( DeleteOnDeinitBase* i_pContainer ); virtual void doCleanup() = 0; }; - + template < typename T > class DeleteOnDeinit : public DeleteOnDeinitBase { @@ -249,10 +249,10 @@ namespace vcl public: DeleteOnDeinit( T* i_pT ) : m_pT( i_pT ) { addDeinitContainer( this ); } virtual ~DeleteOnDeinit() {} - + // get contents T* get() { return m_pT; } - + // set contents, returning old contents // ownership is transfered ! T* set( T* i_pNew ) { T* pOld = m_pT; m_pT = i_pNew; return pOld; } diff --git a/vcl/inc/vcl/lineinfo.hxx b/vcl/inc/vcl/lineinfo.hxx index be17988dd71d..333b61f9ca3f 100644 --- a/vcl/inc/vcl/lineinfo.hxx +++ b/vcl/inc/vcl/lineinfo.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,22 +43,22 @@ namespace basegfx { class B2DPolyPolygon; } struct ImplLineInfo { - ULONG mnRefCount; - LineStyle meStyle; - long mnWidth; - USHORT mnDashCount; - long mnDashLen; - USHORT mnDotCount; - long mnDotLen; - long mnDistance; - + ULONG mnRefCount; + LineStyle meStyle; + long mnWidth; + USHORT mnDashCount; + long mnDashLen; + USHORT mnDotCount; + long mnDotLen; + long mnDistance; + basegfx::B2DLineJoin meLineJoin; ImplLineInfo(); ImplLineInfo( const ImplLineInfo& rImplLineInfo ); - friend SvStream& operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo ); - friend SvStream& operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo ); + friend SvStream& operator>>( SvStream& rIStm, ImplLineInfo& rImplLineInfo ); + friend SvStream& operator<<( SvStream& rOStm, const ImplLineInfo& rImplLineInfo ); }; // ------------ @@ -67,12 +67,12 @@ struct ImplLineInfo class VCL_DLLPUBLIC LineInfo { -private: +private: - ImplLineInfo* mpImplLineInfo; - long n1; - long n2; - long n3; + ImplLineInfo* mpImplLineInfo; + long n1; + long n2; + long n3; SAL_DLLPRIVATE void ImplMakeUnique(); @@ -82,36 +82,36 @@ public: LineInfo( const LineInfo& rLineInfo ); ~LineInfo(); - LineInfo& operator=( const LineInfo& rLineInfo ); + 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 ); } void SetStyle( LineStyle eStyle ); - LineStyle GetStyle() const { return mpImplLineInfo->meStyle; } + LineStyle GetStyle() const { return mpImplLineInfo->meStyle; } void SetWidth( long nWidth ); - long GetWidth() const { return mpImplLineInfo->mnWidth; } + long GetWidth() const { return mpImplLineInfo->mnWidth; } - void SetDashCount( USHORT nDashCount ); - USHORT GetDashCount() const { return mpImplLineInfo->mnDashCount; } + void SetDashCount( USHORT nDashCount ); + USHORT GetDashCount() const { return mpImplLineInfo->mnDashCount; } - void SetDashLen( long nDashLen ); - long GetDashLen() const { return mpImplLineInfo->mnDashLen; } + void SetDashLen( long nDashLen ); + long GetDashLen() const { return mpImplLineInfo->mnDashLen; } - void SetDotCount( USHORT nDotCount ); - USHORT GetDotCount() const { return mpImplLineInfo->mnDotCount; } + void SetDotCount( USHORT nDotCount ); + USHORT GetDotCount() const { return mpImplLineInfo->mnDotCount; } - void SetDotLen( long nDotLen ); - long GetDotLen() const { return mpImplLineInfo->mnDotLen; } + void SetDotLen( long nDotLen ); + long GetDotLen() const { return mpImplLineInfo->mnDotLen; } - void SetDistance( long nDistance ); - long GetDistance() const { return mpImplLineInfo->mnDistance; } + void SetDistance( long nDistance ); + long GetDistance() const { return mpImplLineInfo->mnDistance; } void SetLineJoin(basegfx::B2DLineJoin eLineJoin); basegfx::B2DLineJoin GetLineJoin() const { return mpImplLineInfo->meLineJoin; } - BOOL IsDefault() const { return( !mpImplLineInfo->mnWidth && ( LINE_SOLID == mpImplLineInfo->meStyle ) ); } + 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..31c7752da3d4 100644 --- a/vcl/inc/vcl/longcurr.hxx +++ b/vcl/inc/vcl/longcurr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -46,24 +46,24 @@ private: SAL_DLLPRIVATE void ImpInit(); protected: - BigInt mnFieldValue; - BigInt mnLastValue; - BigInt mnMin; - BigInt mnMax; - BigInt mnCorrectedValue; + BigInt mnFieldValue; + BigInt mnLastValue; + BigInt mnMin; + BigInt mnMax; + BigInt mnCorrectedValue; String maCurrencySymbol; - USHORT mnType; + USHORT mnType; USHORT mnDecimalDigits; BOOL mbThousandSep; LongCurrencyFormatter(); - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); + SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: ~LongCurrencyFormatter(); - virtual void Reformat(); - virtual void ReformatAll(); + virtual void Reformat(); + virtual void ReformatAll(); void SetUseThousandSep( BOOL b ); BOOL IsUseThousandSep() const { return mbThousandSep; } @@ -71,25 +71,25 @@ public: void SetCurrencySymbol( const String& rStr ); String GetCurrencySymbol() const; - void SetMin( BigInt nNewMin ); - BigInt GetMin() const { return mnMin; } - void SetMax( BigInt nNewMax ); - BigInt GetMax() const { return mnMax; } + void SetMin( BigInt nNewMin ); + BigInt GetMin() const { return mnMin; } + void SetMax( BigInt nNewMax ); + BigInt GetMax() const { return mnMax; } - void SetDecimalDigits( USHORT nDigits ); - USHORT GetDecimalDigits() const; - void SetValue( BigInt nNewValue ); - void SetUserValue( BigInt nNewValue ); - BigInt GetValue() const; - BOOL IsValueModified() const; + void SetDecimalDigits( USHORT nDigits ); + USHORT GetDecimalDigits() const; + void SetValue( BigInt nNewValue ); + void SetUserValue( BigInt nNewValue ); + BigInt GetValue() const; + BOOL IsValueModified() const; - void SetEmptyValue(); - BOOL IsEmptyValue() const { return !GetField()->GetText().Len(); } + void SetEmptyValue(); + BOOL IsEmptyValue() const { return !GetField()->GetText().Len(); } - BigInt GetCorrectedValue() const { return mnCorrectedValue; } + BigInt GetCorrectedValue() const { return mnCorrectedValue; } - BigInt Normalize( BigInt nValue ) const; - BigInt Denormalize( BigInt nValue ) const; + BigInt Normalize( BigInt nValue ) const; + BigInt Denormalize( BigInt nValue ) const; }; // --------------------- @@ -101,9 +101,9 @@ class VCL_DLLPUBLIC LongCurrencyField : public SpinField, public LongCurrencyFor friend void ImplNewLongCurrencyFieldValue( LongCurrencyField*, BigInt ); private: - BigInt mnSpinSize; - BigInt mnFirst; - BigInt mnLast; + BigInt mnSpinSize; + BigInt mnFirst; + BigInt mnLast; protected: SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); @@ -113,21 +113,21 @@ public: LongCurrencyField( Window* pParent, const ResId& rResId ); ~LongCurrencyField(); - long PreNotify( NotifyEvent& rNEvt ); - long Notify( NotifyEvent& rNEvt ); - - void Modify(); - void Up(); - void Down(); - void First(); - void Last(); - - void SetFirst( BigInt nNewFirst ) { mnFirst = nNewFirst; } - BigInt GetFirst() const { return mnFirst; } - void SetLast( BigInt nNewLast ) { mnLast = nNewLast; } - BigInt GetLast() const { return mnLast; } - void SetSpinSize( BigInt nNewSize ) { mnSpinSize = nNewSize; } - BigInt GetSpinSize() const { return mnSpinSize; } + long PreNotify( NotifyEvent& rNEvt ); + long Notify( NotifyEvent& rNEvt ); + + void Modify(); + void Up(); + void Down(); + void First(); + void Last(); + + void SetFirst( BigInt nNewFirst ) { mnFirst = nNewFirst; } + BigInt GetFirst() const { return mnFirst; } + void SetLast( BigInt nNewLast ) { mnLast = nNewLast; } + BigInt GetLast() const { return mnLast; } + void SetSpinSize( BigInt nNewSize ) { mnSpinSize = nNewSize; } + BigInt GetSpinSize() const { return mnSpinSize; } }; // ------------------- @@ -141,19 +141,19 @@ public: LongCurrencyBox( Window* pParent, const ResId& rResId ); ~LongCurrencyBox(); - long PreNotify( NotifyEvent& rNEvt ); - long Notify( NotifyEvent& rNEvt ); + long PreNotify( NotifyEvent& rNEvt ); + long Notify( NotifyEvent& rNEvt ); - void Modify(); - void ReformatAll(); + void Modify(); + void ReformatAll(); - void InsertValue( BigInt nValue, + void InsertValue( BigInt nValue, USHORT nPos = COMBOBOX_APPEND ); - void RemoveValue( BigInt nValue ); - BigInt GetValue() const + void RemoveValue( BigInt nValue ); + BigInt GetValue() const { return LongCurrencyFormatter::GetValue(); } - BigInt GetValue( USHORT nPos ) const; - USHORT GetValuePos( BigInt nValue ) const; + BigInt GetValue( USHORT nPos ) const; + USHORT GetValuePos( BigInt nValue ) const; }; #endif // _LONGCURR_HXX diff --git a/vcl/inc/vcl/lstbox.h b/vcl/inc/vcl/lstbox.h index 454156f83627..1a4824ca23b2 100644 --- a/vcl/inc/vcl/lstbox.h +++ b/vcl/inc/vcl/lstbox.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -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 ((USHORT)0xFFFF) +#define LISTBOX_ENTRY_NOTFOUND ((USHORT)0xFFFF) +#define LISTBOX_ERROR ((USHORT)0xFFFF) -#define LISTBOX_USERDRAW_SELECTED ((USHORT)0x0001) +#define LISTBOX_USERDRAW_SELECTED ((USHORT)0x0001) // -------------------------------------------------------------------- @@ -42,14 +42,14 @@ // !! Do not use these flags for user data as they are reserved !! // !! to change the internal behaviour of the ListBox implementation !! -// !! for specific entries. !! +// !! for specific entries. !! /** this flag disables a selection of an entry completly. It is not possible to select such entries either from the user interface nor from the ListBox methods. Cursor traveling is handled correctly. This flag can be used to add titles to a ListBox. */ -#define LISTBOX_ENTRY_FLAG_DISABLE_SELECTION 0x0000001 +#define LISTBOX_ENTRY_FLAG_DISABLE_SELECTION 0x0000001 /** this flag can be used to make an entry multine capable A normal entry is single line and will therefore be clipped @@ -63,6 +63,6 @@ */ #define LISTBOX_ENTRY_FLAG_DRAW_DISABLED 0x0000004 -#endif // _SV_LSTBOX_H +#endif // _SV_LSTBOX_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/lstbox.hxx b/vcl/inc/vcl/lstbox.hxx index 5d74ce5c7a99..0b0a69265a75 100644 --- a/vcl/inc/vcl/lstbox.hxx +++ b/vcl/inc/vcl/lstbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,21 +40,21 @@ class ImplBtn; class ImplWin; // -------------------------------------------------------------------- -// - ListBox - +// - ListBox - // -------------------------------------------------------------------- class VCL_DLLPUBLIC ListBox : public Control { private: - ImplListBox* mpImplLB; - ImplListBoxFloatingWindow* mpFloatWin; - ImplWin* mpImplWin; - ImplBtn* mpBtn; - USHORT mnDDHeight; - USHORT mnSaveValue; - BOOL mbDDAutoSize; - Link maSelectHdl; - Link maDoubleClickHdl; + ImplListBox* mpImplLB; + ImplListBoxFloatingWindow* mpFloatWin; + ImplWin* mpImplWin; + ImplBtn* mpBtn; + USHORT mnDDHeight; + USHORT mnSaveValue; + BOOL mbDDAutoSize; + Link maSelectHdl; + Link maDoubleClickHdl; USHORT mnLineCount; private: @@ -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; } + BOOL IsDropDownBox() const { return mpFloatWin ? TRUE : FALSE; } protected: ListBox( WindowType nType ); @@ -86,66 +86,66 @@ public: ListBox( Window* pParent, const ResId& rResId ); ~ListBox(); - virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); - virtual void Resize(); - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); - - virtual void Select(); - virtual void DoubleClick(); - virtual void GetFocus(); - virtual void LoseFocus(); + virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); + virtual void Resize(); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); + + virtual void Select(); + virtual void DoubleClick(); + virtual void GetFocus(); + virtual void LoseFocus(); virtual Window* GetPreferredKeyInputWindow(); virtual const Wallpaper& GetDisplayBackground() const; - virtual void SetPosSizePixel( long nX, long nY, + virtual void SetPosSizePixel( long nX, long nY, long nWidth, long nHeight, USHORT nFlags = WINDOW_POSSIZE_ALL ); - void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) + void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ) { Control::SetPosSizePixel( rNewPos, rNewSize ); } - void SetDropDownSizePixel( const Size& rNewSize ) + void SetDropDownSizePixel( const Size& rNewSize ) { if( IsDropDownBox() ) SetPosSizePixel( 0, 0, rNewSize.Width(), rNewSize.Height(), WINDOW_POSSIZE_SIZE | WINDOW_POSSIZE_DROPDOWN ); } - Rectangle GetDropDownPosSizePixel() const; + Rectangle GetDropDownPosSizePixel() const; - void SetDropDownLineCount( USHORT nLines ); - USHORT GetDropDownLineCount() const; + void SetDropDownLineCount( USHORT nLines ); + USHORT GetDropDownLineCount() const; - void EnableAutoSize( BOOL bAuto ); - BOOL IsAutoSizeEnabled() const { return mbDDAutoSize; } + void EnableAutoSize( BOOL bAuto ); + BOOL IsAutoSizeEnabled() const { return mbDDAutoSize; } void EnableDDAutoWidth( BOOL b ); 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 void RemoveEntry( const XubString& rStr ); - virtual void RemoveEntry( USHORT nPos ); + 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 void RemoveEntry( const XubString& rStr ); + virtual void RemoveEntry( USHORT nPos ); - virtual void Clear(); + virtual void Clear(); - virtual USHORT GetEntryPos( const XubString& rStr ) const; - virtual USHORT GetEntryPos( const void* pData ) const; + 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 USHORT 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, BOOL bSelect = TRUE ); + virtual void SelectEntryPos( USHORT nPos, BOOL bSelect = TRUE ); - virtual USHORT GetSelectEntryCount() const; - virtual XubString GetSelectEntry( USHORT nSelIndex = 0 ) const; - virtual USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const; + virtual USHORT GetSelectEntryCount() const; + virtual XubString GetSelectEntry( USHORT nSelIndex = 0 ) const; + virtual USHORT GetSelectEntryPos( USHORT nSelIndex = 0 ) const; - virtual BOOL IsEntrySelected( const XubString& rStr ) const; - virtual BOOL IsEntryPosSelected( USHORT nPos ) const; - virtual void SetNoSelection(); + virtual BOOL IsEntrySelected( const XubString& rStr ) const; + virtual BOOL IsEntryPosSelected( USHORT nPos ) const; + virtual void SetNoSelection(); - void SetEntryData( USHORT nPos, void* pNewData ); - void* GetEntryData( USHORT nPos ) const; + void SetEntryData( USHORT nPos, void* pNewData ); + void* GetEntryData( USHORT nPos ) const; /** this methods stores a combination of flags from the LISTBOX_ENTRY_FLAG_* defines at the given entry. @@ -155,71 +155,71 @@ public: to change the internal behaviour of the ListBox implementation for specific entries. */ - void SetEntryFlags( USHORT nPos, long nFlags ); + void SetEntryFlags( USHORT 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( USHORT nPos ) const; - void SetTopEntry( USHORT nPos ); + void SetTopEntry( USHORT nPos ); void ShowProminentEntry( USHORT nPos ); - void SetTopEntryStr( const XubString& rStr ); - USHORT GetTopEntry() const; + void SetTopEntryStr( const XubString& rStr ); + USHORT GetTopEntry() const; void SetProminentEntryType( ProminentEntry eType ); ProminentEntry GetProminentEntryType() const; - void SaveValue() { mnSaveValue = GetSelectEntryPos(); } - USHORT GetSavedValue() const { return mnSaveValue; } + void SaveValue() { mnSaveValue = GetSelectEntryPos(); } + USHORT GetSavedValue() const { return mnSaveValue; } - void SetSeparatorPos( USHORT n ); - void SetSeparatorPos(); - USHORT GetSeparatorPos() const; + void SetSeparatorPos( USHORT n ); + void SetSeparatorPos(); + USHORT GetSeparatorPos() const; - BOOL IsTravelSelect() const; - BOOL IsInDropDown() const; - void ToggleDropDown(); + BOOL IsTravelSelect() const; + BOOL IsInDropDown() const; + void ToggleDropDown(); - void EnableMultiSelection( BOOL bMulti, BOOL bStackSelection ); - void EnableMultiSelection( BOOL bMulti ); - BOOL IsMultiSelectionEnabled() const; + void EnableMultiSelection( BOOL bMulti, BOOL bStackSelection ); + void EnableMultiSelection( BOOL bMulti ); + BOOL IsMultiSelectionEnabled() const; - void SetReadOnly( BOOL bReadOnly = TRUE ); - BOOL IsReadOnly() const; + void SetReadOnly( BOOL bReadOnly = TRUE ); + BOOL IsReadOnly() const; - long CalcWindowSizePixel( USHORT nLines ) const; + long CalcWindowSizePixel( USHORT nLines ) const; Rectangle GetBoundingRectangle( USHORT nItem ) const; - void SetUserItemSize( const Size& rSz ); - const Size& GetUserItemSize() const; + void SetUserItemSize( const Size& rSz ); + const Size& GetUserItemSize() const; - void EnableUserDraw( BOOL bUserDraw ); - BOOL IsUserDrawEnabled() const; + void EnableUserDraw( BOOL bUserDraw ); + BOOL IsUserDrawEnabled() const; - void DrawEntry( const UserDrawEvent& rEvt, BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE ); + void DrawEntry( const UserDrawEvent& rEvt, BOOL bDrawImage, BOOL bDrawText, BOOL bDrawTextAtImagePos = FALSE ); - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } + void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } + const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - Size CalcMinimumSize() const; + 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 CalcAdjustedSize( const Size& rPrefSize ) const; + Size CalcSize( USHORT nColumns, USHORT nLines ) const; + void GetMaxVisColumnsAndLines( USHORT& rnCols, USHORT& rnLines ) const; - void SetMRUEntries( const XubString& rEntries, xub_Unicode cSep = ';' ); - XubString GetMRUEntries( xub_Unicode cSep = ';' ) const; - void SetMaxMRUCount( USHORT n ); - USHORT GetMaxMRUCount() const; + void SetMRUEntries( const XubString& rEntries, xub_Unicode cSep = ';' ); + XubString GetMRUEntries( xub_Unicode cSep = ';' ) const; + void SetMaxMRUCount( USHORT n ); + USHORT GetMaxMRUCount() const; - USHORT GetDisplayLineCount() const; + USHORT GetDisplayLineCount() const; - void EnableMirroring(); + void EnableMirroring(); /** checks whether a certain point lies within the bounds of a listbox item and returns the item as well as the character position @@ -254,14 +254,14 @@ public: using ListBox::GetSavedValue; private: // Bei MultiListBox nicht erlaubt... - void SaveValue(); - USHORT GetSavedValue(); + void SaveValue(); + USHORT GetSavedValue(); public: MultiListBox( Window* pParent, WinBits nStyle = 0 ); MultiListBox( Window* pParent, const ResId& rResId ); }; -#endif // _SV_LSTBOX_HXX +#endif // _SV_LSTBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/mapmod.hxx b/vcl/inc/vcl/mapmod.hxx index 53cea6801cb2..6888595135a5 100644 --- a/vcl/inc/vcl/mapmod.hxx +++ b/vcl/inc/vcl/mapmod.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -42,20 +42,20 @@ class SvStream; // - ImplMapMode - // -------------- -class OutputDevice; +class OutputDevice; class ImplMapMode { - friend class MapMode; - friend class OutputDevice; + friend class MapMode; + friend class OutputDevice; private: - ULONG mnRefCount; - MapUnit meUnit; - Point maOrigin; - Fraction maScaleX; - Fraction maScaleY; - BOOL mbSimple; + ULONG mnRefCount; + MapUnit meUnit; + Point maOrigin; + Fraction maScaleX; + Fraction maScaleY; + BOOL mbSimple; friend SvStream& operator>>( SvStream& rIStm, ImplMapMode& rMapMode ); friend SvStream& operator<<( SvStream& rOStm, const ImplMapMode& rMapMode ); @@ -72,10 +72,10 @@ public: class VCL_DLLPUBLIC MapMode { - friend class OutputDevice; + friend class OutputDevice; private: - ImplMapMode* mpImplMapMode; + ImplMapMode* mpImplMapMode; SAL_DLLPRIVATE void ImplMakeUnique(); @@ -87,33 +87,33 @@ public: const Fraction& rScaleX, const Fraction& rScaleY ); ~MapMode(); - void SetMapUnit( MapUnit eUnit ); - MapUnit GetMapUnit() const + void SetMapUnit( MapUnit eUnit ); + MapUnit GetMapUnit() const { return mpImplMapMode->meUnit; } - void SetOrigin( const Point& rOrigin ); - const Point& GetOrigin() const + void SetOrigin( const Point& rOrigin ); + const Point& GetOrigin() const { return mpImplMapMode->maOrigin; } - void SetScaleX( const Fraction& rScaleX ); + void SetScaleX( const Fraction& rScaleX ); const Fraction& GetScaleX() const { return mpImplMapMode->maScaleX; } - void SetScaleY( const Fraction& rScaleY ); + void SetScaleY( const Fraction& rScaleY ); const Fraction& GetScaleY() const { return mpImplMapMode->maScaleY; } - MapMode& operator=( const MapMode& rMapMode ); - BOOL operator==( const MapMode& rMapMode ) const; - BOOL operator!=( const MapMode& rMapMode ) const + MapMode& operator=( const MapMode& rMapMode ); + BOOL operator==( const MapMode& rMapMode ) const; + BOOL operator!=( const MapMode& rMapMode ) const { return !(MapMode::operator==( rMapMode )); } - BOOL IsDefault() const; - BOOL IsSameInstance( const MapMode& rMapMode ) const + BOOL IsDefault() const; + BOOL IsSameInstance( const MapMode& rMapMode ) const { return (mpImplMapMode == rMapMode.mpImplMapMode); } friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, MapMode& rMapMode ); friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const MapMode& rMapMode ); }; -#endif // _SV_MAPMOD_HXX +#endif // _SV_MAPMOD_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/mapunit.hxx b/vcl/inc/vcl/mapunit.hxx index f8fb7581c469..dfb5c121abd7 100644 --- a/vcl/inc/vcl/mapunit.hxx +++ b/vcl/inc/vcl/mapunit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -31,6 +31,6 @@ #include <tools/mapunit.hxx> -#endif // _VCL_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..4351f1cd49a0 100644 --- a/vcl/inc/vcl/menu.hxx +++ b/vcl/inc/vcl/menu.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -68,12 +68,12 @@ namespace vcl { struct MenuLayoutData; } // - Menu-Types - // -------------- -#define MENU_APPEND ((USHORT)0xFFFF) -#define MENU_ITEM_NOTFOUND ((USHORT)0xFFFF) +#define MENU_APPEND ((USHORT)0xFFFF) +#define MENU_ITEM_NOTFOUND ((USHORT)0xFFFF) -#define POPUPMENU_EXECUTE_DOWN ((USHORT)0x0001) -#define POPUPMENU_EXECUTE_UP ((USHORT)0x0002) -#define POPUPMENU_EXECUTE_LEFT ((USHORT)0x0004) +#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_NOMOUSEUPCLOSE ((USHORT)0x0010) @@ -84,22 +84,22 @@ enum MenuItemType { MENUITEM_DONTKNOW, MENUITEM_STRING, MENUITEM_IMAGE, // By changes you must also change: rsc/vclrsc.hxx typedef USHORT MenuItemBits; -#define MIB_CHECKABLE ((MenuItemBits)0x0001) -#define MIB_RADIOCHECK ((MenuItemBits)0x0002) -#define MIB_AUTOCHECK ((MenuItemBits)0x0004) -#define MIB_ABOUT ((MenuItemBits)0x0008) -#define MIB_HELP ((MenuItemBits)0x0010) -#define MIB_POPUPSELECT ((MenuItemBits)0x0020) +#define MIB_CHECKABLE ((MenuItemBits)0x0001) +#define MIB_RADIOCHECK ((MenuItemBits)0x0002) +#define MIB_AUTOCHECK ((MenuItemBits)0x0004) +#define MIB_ABOUT ((MenuItemBits)0x0008) +#define MIB_HELP ((MenuItemBits)0x0010) +#define MIB_POPUPSELECT ((MenuItemBits)0x0020) // not in rsc/vclsrc.hxx because only a prelimitary solution -#define MIB_NOSELECT ((MenuItemBits)0x0040) -#define MIB_ICON ((MenuItemBits)0x0080) -#define MIB_TEXT ((MenuItemBits)0x0100) +#define MIB_NOSELECT ((MenuItemBits)0x0040) +#define MIB_ICON ((MenuItemBits)0x0080) +#define MIB_TEXT ((MenuItemBits)0x0100) -#define MENU_FLAG_NOAUTOMNEMONICS 0x0001 -#define MENU_FLAG_HIDEDISABLEDENTRIES 0x0002 +#define MENU_FLAG_NOAUTOMNEMONICS 0x0001 +#define MENU_FLAG_HIDEDISABLEDENTRIES 0x0002 // overrides default hiding of disabled entries in popup menus -#define MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES 0x0004 +#define MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES 0x0004 // forces images & toggle visibility for toolbar config popup #define MENU_FLAG_SHOWCHECKIMAGES 0x0008 @@ -121,9 +121,9 @@ struct ImplMenuDelData struct MenuLogo { - BitmapEx aBitmap; - Color aStartColor; - Color aEndColor; + BitmapEx aBitmap; + Color aStartColor; + Color aEndColor; }; class VCL_DLLPUBLIC Menu : public Resource @@ -135,205 +135,205 @@ class VCL_DLLPUBLIC Menu : public Resource friend class SystemWindow; friend struct ImplMenuDelData; private: - ImplMenuDelData* mpFirstDel; - MenuItemList* pItemList; // Liste mit den MenuItems - MenuLogo* pLogo; - Menu* pStartedFrom; - Window* pWindow; - - Link aActivateHdl; // Active-Handler - Link aDeactivateHdl; // Deactivate-Handler - Link aHighlightHdl; // Highlight-Handler - Link aSelectHdl; // Highlight-Handler - + ImplMenuDelData* mpFirstDel; + MenuItemList* pItemList; // Liste mit den MenuItems + MenuLogo* pLogo; + Menu* pStartedFrom; + Window* pWindow; + + Link aActivateHdl; // Active-Handler + Link aDeactivateHdl; // Deactivate-Handler + Link aHighlightHdl; // Highlight-Handler + Link aSelectHdl; // Highlight-Handler + VclEventListeners maEventListeners; VclEventListeners maChildEventListeners; - XubString aTitleText; // PopupMenu-Text + 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; + ULONG nEventId; + USHORT mnHighlightedItemPos; // for native menues: keeps track of the highlighted item + USHORT nMenuFlags; + USHORT nDefaultItem; // Id vom Default-Item + USHORT nSelectedId; // Fuer Ausgabe: - USHORT nCheckPos; - USHORT nImagePos; - USHORT nTextPos; + USHORT nCheckPos; + USHORT nImagePos; + USHORT nTextPos; - BOOL bIsMenuBar : 1, // Handelt es sich um den MenuBar - bCanceled : 1, // Waehrend eines Callbacks abgebrochen - bInCallback : 1, // In Activate/Deactivate - bKilled : 1; // Gekillt... + BOOL bIsMenuBar : 1, // Handelt es sich um den MenuBar + bCanceled : 1, // Waehrend eines Callbacks abgebrochen + bInCallback : 1, // In Activate/Deactivate + bKilled : 1; // Gekillt... ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxAccessible; mutable vcl::MenuLayoutData* mpLayoutData; - SalMenu* mpSalMenu; + SalMenu* mpSalMenu; protected: - SAL_DLLPRIVATE void ImplInit(); - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - SAL_DLLPRIVATE Menu* ImplGetStartMenu(); - SAL_DLLPRIVATE Menu* ImplFindSelectMenu(); - SAL_DLLPRIVATE Menu* ImplFindMenu( USHORT nId ); - SAL_DLLPRIVATE Size ImplCalcSize( Window* pWin ); - SAL_DLLPRIVATE BOOL ImplIsVisible( USHORT nPos ) const; + SAL_DLLPRIVATE void ImplInit(); + SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); + SAL_DLLPRIVATE Menu* ImplGetStartMenu(); + SAL_DLLPRIVATE Menu* ImplFindSelectMenu(); + SAL_DLLPRIVATE Menu* ImplFindMenu( USHORT 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 void ImplSelect(); - SAL_DLLPRIVATE void ImplCallHighlight( USHORT nHighlightItem ); + 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 void ImplSelect(); + SAL_DLLPRIVATE void ImplCallHighlight( USHORT nHighlightItem ); SAL_DLLPRIVATE void ImplCallEventListeners( ULONG nEvent, USHORT nPos ); DECL_DLLPRIVATE_LINK( ImplCallSelect, Menu* ); - SAL_DLLPRIVATE void ImplFillLayoutData() const; + 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; - + // returns native check and option menu symbol height; - // return value is Max( rCheckHeight, rRadioHeight ) + // return value is Max( rCheckHeight, rRadioHeight ) SAL_DLLPRIVATE long ImplGetNativeCheckAndRadioSize( Window*, long& rCheckHeight, long& rRadioHeight, long &rMaxWidth ) const; SAL_DLLPRIVATE void ImplAddDel( ImplMenuDelData &rDel ); SAL_DLLPRIVATE void ImplRemoveDel( ImplMenuDelData &rDel ); public: - SAL_DLLPRIVATE void ImplKillLayoutData() const; + SAL_DLLPRIVATE void ImplKillLayoutData() const; SAL_DLLPRIVATE Menu* ImplGetStartedFrom() const; Menu(); Menu( BOOL bMenuBar ); SAL_DLLPRIVATE Window* ImplGetWindow() const { return pWindow; } - + SAL_DLLPRIVATE void ImplSelectWithStart( Menu* pStartMenu = NULL ); public: - virtual ~Menu(); + virtual ~Menu(); - virtual void Activate(); - virtual void Deactivate(); - virtual void Highlight(); - virtual void Select(); - virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void Activate(); + virtual void Deactivate(); + virtual void Highlight(); + virtual void Select(); + virtual void RequestHelp( const HelpEvent& rHEvt ); - void InsertItem( USHORT nItemId, const XubString& rStr, + void InsertItem( USHORT nItemId, const XubString& rStr, MenuItemBits nItemBits = 0, USHORT nPos = MENU_APPEND ); - void InsertItem( USHORT nItemId, const Image& rImage, + void InsertItem( USHORT nItemId, const Image& rImage, MenuItemBits nItemBits = 0, USHORT nPos = MENU_APPEND ); - void InsertItem( USHORT nItemId, + void InsertItem( USHORT 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, + 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 ); - void Clear(); + void Clear(); void CreateAutoMnemonics(); - void SetMenuFlags( USHORT nFlags ) { nMenuFlags = nFlags; } - USHORT GetMenuFlags() const { return nMenuFlags; } + void SetMenuFlags( USHORT nFlags ) { nMenuFlags = nFlags; } + USHORT 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; + USHORT GetItemCount() const; + USHORT GetItemId( USHORT nPos ) const; + USHORT GetItemPos( USHORT nItemId ) const; + MenuItemType GetItemType( USHORT nPos ) const; + USHORT GetCurItemId() const; - void SetDefaultItem( USHORT nItemId ) { nDefaultItem = nItemId; } - USHORT GetDefaultItem() const { return nDefaultItem; } + void SetDefaultItem( USHORT nItemId ) { nDefaultItem = nItemId; } + USHORT GetDefaultItem() const { return nDefaultItem; } - void SetItemBits( USHORT nItemId, MenuItemBits nBits ); - MenuItemBits GetItemBits( USHORT nItemId ) const; + void SetItemBits( USHORT nItemId, MenuItemBits nBits ); + MenuItemBits GetItemBits( USHORT nItemId ) const; - void SetUserValue( USHORT nItemId, ULONG nValue ); - ULONG GetUserValue( USHORT nItemId ) const; + void SetUserValue( USHORT nItemId, ULONG nValue ); + ULONG GetUserValue( USHORT nItemId ) const; - void SetPopupMenu( USHORT nItemId, PopupMenu* pMenu ); - PopupMenu* GetPopupMenu( USHORT nItemId ) const; + void SetPopupMenu( USHORT nItemId, PopupMenu* pMenu ); + PopupMenu* GetPopupMenu( USHORT nItemId ) const; - void SetAccelKey( USHORT nItemId, const KeyCode& rKeyCode ); - KeyCode GetAccelKey( USHORT nItemId ) const; + void SetAccelKey( USHORT nItemId, const KeyCode& rKeyCode ); + KeyCode GetAccelKey( USHORT nItemId ) const; - void CheckItem( USHORT nItemId, BOOL bCheck = TRUE ); - BOOL IsItemChecked( USHORT nItemId ) const; + void CheckItem( USHORT nItemId, BOOL bCheck = TRUE ); + BOOL IsItemChecked( USHORT nItemId ) const; - void SelectItem( USHORT nItemId ); - void DeSelect() { SelectItem( 0xFFFF ); } // MENUITEMPOS_INVALID + void SelectItem( USHORT nItemId ); + void DeSelect() { SelectItem( 0xFFFF ); } // MENUITEMPOS_INVALID - void EnableItem( USHORT nItemId, BOOL bEnable = TRUE ); - BOOL IsItemEnabled( USHORT nItemId ) const; + void EnableItem( USHORT nItemId, BOOL bEnable = TRUE ); + BOOL IsItemEnabled( USHORT nItemId ) const; void ShowItem( USHORT nItemId, BOOL bVisible = TRUE ); void HideItem( USHORT nItemId ) { ShowItem( nItemId, FALSE ); } - BOOL IsItemVisible( USHORT nItemId ) const; - BOOL IsItemPosVisible( USHORT nItemPos ) const; - BOOL IsMenuVisible() const; - BOOL IsMenuBar() const { return bIsMenuBar; } + BOOL IsItemVisible( USHORT nItemId ) const; + BOOL IsItemPosVisible( USHORT nItemPos ) const; + BOOL IsMenuVisible() const; + BOOL IsMenuBar() const { return bIsMenuBar; } - void RemoveDisabledEntries( BOOL bCheckPopups = TRUE, BOOL bRemoveEmptyPopups = FALSE ); - BOOL HasValidEntries( BOOL bCheckPopups = TRUE ); + void RemoveDisabledEntries( BOOL bCheckPopups = TRUE, BOOL bRemoveEmptyPopups = FALSE ); + BOOL HasValidEntries( BOOL bCheckPopups = TRUE ); - void SetItemText( USHORT nItemId, const XubString& rStr ); - XubString GetItemText( USHORT nItemId ) const; + void SetItemText( USHORT nItemId, const XubString& rStr ); + XubString GetItemText( 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 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 SetItemCommand( USHORT nItemId, const XubString& rCommand ); - const XubString& GetItemCommand( USHORT nItemId ) const; + void SetItemCommand( USHORT nItemId, const XubString& rCommand ); + const XubString& GetItemCommand( USHORT nItemId ) const; - void SetHelpText( USHORT nItemId, const XubString& rString ); - const XubString& GetHelpText( USHORT nItemId ) const; + void SetHelpText( USHORT nItemId, const XubString& rString ); + const XubString& GetHelpText( USHORT nItemId ) const; - void SetTipHelpText( USHORT nItemId, const XubString& rString ); - const XubString& GetTipHelpText( USHORT nItemId ) const; + void SetTipHelpText( USHORT nItemId, const XubString& rString ); + const XubString& GetTipHelpText( USHORT nItemId ) const; void SetHelpCommand( USHORT nItemId, const XubString& rString ); const XubString& GetHelpCommand( USHORT nItemId ) const; + + void SetHelpId( USHORT nItemId, ULONG nHelpId ); + ULONG GetHelpId( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; - - void SetActivateHdl( const Link& rLink ) { aActivateHdl = rLink; } - const Link& GetActivateHdl() const { return aActivateHdl; } + void SetActivateHdl( const Link& rLink ) { aActivateHdl = rLink; } + const Link& GetActivateHdl() const { return aActivateHdl; } - void SetDeactivateHdl( const Link& rLink ) { aDeactivateHdl = rLink; } - const Link& GetDeactivateHdl() const { return aDeactivateHdl; } + void SetDeactivateHdl( const Link& rLink ) { aDeactivateHdl = rLink; } + const Link& GetDeactivateHdl() const { return aDeactivateHdl; } - void SetHighlightHdl( const Link& rLink ) { aHighlightHdl = rLink; } - const Link& GetHighlightHdl() const { return aHighlightHdl; } + void SetHighlightHdl( const Link& rLink ) { aHighlightHdl = rLink; } + const Link& GetHighlightHdl() const { return aHighlightHdl; } - void SetSelectHdl( const Link& rLink ) { aSelectHdl = rLink; } - const Link& GetSelectHdl() const { return aSelectHdl; } - - void SetLogo( const MenuLogo& rLogo ); - void SetLogo(); - BOOL HasLogo() const { return pLogo ? TRUE : FALSE; } - MenuLogo GetLogo() const; + void SetSelectHdl( const Link& rLink ) { aSelectHdl = rLink; } + const Link& GetSelectHdl() const { return aSelectHdl; } + void SetLogo( const MenuLogo& rLogo ); + void SetLogo(); + BOOL HasLogo() const { return pLogo ? TRUE : FALSE; } + MenuLogo GetLogo() const; + void AddEventListener( const Link& rEventListener ); void RemoveEventListener( const Link& rEventListener ); //void AddChildEventListener( const Link& rEventListener ); //void RemoveChildEventListener( const Link& rEventListener ); - - Menu& operator =( const Menu& rMenu ); + + Menu& operator =( const Menu& rMenu ); // Fuer Menu-'Funktionen' - MenuItemList* GetItemList() const { return pItemList; } + MenuItemList* GetItemList() const { return pItemList; } // returns the system's menu handle if native menues are supported // pData must point to a SystemMenuData structure @@ -369,21 +369,21 @@ public: // gets the activation key of the specified item KeyEvent GetActivationKey( USHORT nItemId ) const; - Window* GetWindow() const { return pWindow; } - - void SetAccessibleName( USHORT nItemId, const XubString& rStr ); - XubString GetAccessibleName( USHORT nItemId ) const; + Window* GetWindow() const { return pWindow; } - void SetAccessibleDescription( USHORT nItemId, const XubString& rStr ); - XubString GetAccessibleDescription( USHORT nItemId ) const; + void SetAccessibleName( USHORT nItemId, const XubString& rStr ); + XubString GetAccessibleName( USHORT nItemId ) const; + void SetAccessibleDescription( USHORT nItemId, const XubString& rStr ); + XubString GetAccessibleDescription( USHORT nItemId ) const; + // returns whether the item a position nItemPos is highlighted or not. bool IsHighlighted( USHORT nItemPos ) const; void HighlightItem( USHORT nItemPos ); void DeHighlight() { HighlightItem( 0xFFFF ); } // MENUITEMPOS_INVALID - - + + void doLazyDelete(); }; @@ -393,13 +393,13 @@ public: class VCL_DLLPUBLIC MenuBar : public Menu { - Link maCloserHdl; - Link maFloatHdl; - Link maHideHdl; - BOOL mbCloserVisible; - BOOL mbFloatBtnVisible; - BOOL mbHideBtnVisible; - BOOL mbDisplayable; + Link maCloserHdl; + Link maFloatHdl; + Link maHideHdl; + BOOL mbCloserVisible; + BOOL mbFloatBtnVisible; + BOOL mbHideBtnVisible; + BOOL mbDisplayable; friend class Application; friend class Menu; @@ -407,9 +407,9 @@ class VCL_DLLPUBLIC MenuBar : public Menu friend class MenuFloatingWindow; 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 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 ); public: MenuBar(); @@ -417,29 +417,29 @@ public: MenuBar( const MenuBar& rMenu ); ~MenuBar(); - MenuBar& operator =( const MenuBar& rMenu ); + 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 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 ); + 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 SetCloserHdl( const Link& rLink ) { maCloserHdl = rLink; } - const Link& GetCloserHdl() const { return maCloserHdl; } - void SetFloatButtonClickHdl( const Link& rLink ) { maFloatHdl = rLink; } - const Link& GetFloatButtonClickHdl() const { return maFloatHdl; } - void SetHideButtonClickHdl( const Link& rLink ) { maHideHdl = rLink; } - const Link& GetHideButtonClickHdl() const { return maHideHdl; } + void SetCloserHdl( const Link& rLink ) { maCloserHdl = rLink; } + const Link& GetCloserHdl() const { return maCloserHdl; } + void SetFloatButtonClickHdl( const Link& rLink ) { maFloatHdl = rLink; } + const Link& GetFloatButtonClickHdl() const { return maFloatHdl; } + void SetHideButtonClickHdl( const Link& rLink ) { maHideHdl = rLink; } + const Link& GetHideButtonClickHdl() const { return maHideHdl; } // - by default a menubar is displayable // - if a menubar is not displayable, its MenuBarWindow will never be shown @@ -491,14 +491,14 @@ class VCL_DLLPUBLIC PopupMenu : public Menu friend struct MenuItemData; private: - Menu** pRefAutoSubMenu; // keeps track if a pointer to this Menu is stored in the MenuItemData + Menu** pRefAutoSubMenu; // keeps track if a pointer to this Menu is stored in the MenuItemData 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 long ImplCalcHeight( USHORT nEntries ) const; + SAL_DLLPRIVATE USHORT ImplCalcVisEntries( long nMaxHeight, USHORT nStartEntry = 0, USHORT* pLastVisible = NULL ) const; public: PopupMenu(); @@ -506,21 +506,21 @@ public: PopupMenu( const ResId& rResId ); ~PopupMenu(); - void SetText( const XubString& rTitle ) { aTitleText = rTitle; } - const XubString& GetText() const { return aTitleText; } + 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 ); + USHORT Execute( Window* pWindow, const Point& rPopupPos ); + USHORT Execute( Window* pWindow, const Rectangle& rRect, USHORT nFlags = 0 ); // Fuer das TestTool - void EndExecute( USHORT nSelect = 0 ); - void SelectEntry( USHORT nId ); + void EndExecute( USHORT nSelect = 0 ); + void SelectEntry( USHORT nId ); void SetSelectedEntry( USHORT nId ); // for use by native submenu only - static BOOL IsInExecute(); - static PopupMenu* GetActivePopupMenu(); + static BOOL IsInExecute(); + static PopupMenu* GetActivePopupMenu(); - PopupMenu& operator =( const PopupMenu& rMenu ); + PopupMenu& operator =( const PopupMenu& rMenu ); }; inline PopupMenu& PopupMenu::operator =( const PopupMenu& rMenu ) diff --git a/vcl/inc/vcl/menubtn.hxx b/vcl/inc/vcl/menubtn.hxx index 588bdd4772cd..f55ffdffd206 100644 --- a/vcl/inc/vcl/menubtn.hxx +++ b/vcl/inc/vcl/menubtn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,7 +40,7 @@ class PopupMenu; // - MenuButton-Types - // -------------------- -#define MENUBUTTON_MENUMODE_TIMED ((USHORT)0x0001) +#define MENUBUTTON_MENUMODE_TIMED ((USHORT)0x0001) // -------------- // - MenuButton - @@ -49,14 +49,14 @@ class PopupMenu; class VCL_DLLPUBLIC MenuButton : public PushButton { private: - Rectangle maFocusRect; - Timer* mpMenuTimer; - PopupMenu* mpOwnMenu; - PopupMenu* mpMenu; - USHORT mnCurItemId; - USHORT mnMenuMode; - Link maActivateHdl; - Link maSelectHdl; + Rectangle maFocusRect; + Timer* mpMenuTimer; + PopupMenu* mpOwnMenu; + PopupMenu* mpMenu; + USHORT mnCurItemId; + USHORT mnMenuMode; + Link maActivateHdl; + Link maSelectHdl; SAL_DLLPRIVATE void ImplInitMenuButtonData(); SAL_DLLPRIVATE void ImplExecuteMenu(); @@ -76,26 +76,26 @@ public: MenuButton( Window* pParent, const ResId& rResId ); ~MenuButton(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Activate(); - virtual void Select(); + virtual void Activate(); + virtual void Select(); - void SetMenuMode( USHORT nMode ); - USHORT GetMenuMode() const { return mnMenuMode; } + void SetMenuMode( USHORT nMode ); + USHORT GetMenuMode() const { return mnMenuMode; } - void SetPopupMenu( PopupMenu* pNewMenu ); - PopupMenu* GetPopupMenu() const { return mpMenu; } + void SetPopupMenu( PopupMenu* pNewMenu ); + PopupMenu* GetPopupMenu() const { return mpMenu; } - USHORT GetCurItemId() const { return mnCurItemId; } + USHORT GetCurItemId() const { return mnCurItemId; } - void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; } - const Link& GetActivateHdl() const { return maActivateHdl; } - void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } - const Link& GetSelectHdl() const { return maSelectHdl; } + void SetActivateHdl( const Link& rLink ) { maActivateHdl = rLink; } + const Link& GetActivateHdl() const { return maActivateHdl; } + void SetSelectHdl( const Link& rLink ) { maSelectHdl = rLink; } + const Link& GetSelectHdl() const { return maSelectHdl; } }; -#endif // _SV_MENUBTN_HXX +#endif // _SV_MENUBTN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/metaact.hxx b/vcl/inc/vcl/metaact.hxx index f507063982bb..5a85e3b7fbb3 100644 --- a/vcl/inc/vcl/metaact.hxx +++ b/vcl/inc/vcl/metaact.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -50,91 +50,91 @@ class SvStream; // - Defines - // ----------- -#define META_NULL_ACTION (0) -#define META_PIXEL_ACTION (100) -#define META_POINT_ACTION (101) -#define META_LINE_ACTION (102) -#define META_RECT_ACTION (103) -#define META_ROUNDRECT_ACTION (104) -#define META_ELLIPSE_ACTION (105) -#define META_ARC_ACTION (106) -#define META_PIE_ACTION (107) -#define META_CHORD_ACTION (108) -#define META_POLYLINE_ACTION (109) -#define META_POLYGON_ACTION (110) -#define META_POLYPOLYGON_ACTION (111) -#define META_TEXT_ACTION (112) -#define META_TEXTARRAY_ACTION (113) -#define META_STRETCHTEXT_ACTION (114) -#define META_TEXTRECT_ACTION (115) -#define META_BMP_ACTION (116) -#define META_BMPSCALE_ACTION (117) -#define META_BMPSCALEPART_ACTION (118) -#define META_BMPEX_ACTION (119) -#define META_BMPEXSCALE_ACTION (120) -#define META_BMPEXSCALEPART_ACTION (121) -#define META_MASK_ACTION (122) -#define META_MASKSCALE_ACTION (123) -#define META_MASKSCALEPART_ACTION (124) -#define META_GRADIENT_ACTION (125) -#define META_HATCH_ACTION (126) -#define META_WALLPAPER_ACTION (127) -#define META_CLIPREGION_ACTION (128) -#define META_ISECTRECTCLIPREGION_ACTION (129) -#define META_ISECTREGIONCLIPREGION_ACTION (130) -#define META_MOVECLIPREGION_ACTION (131) -#define META_LINECOLOR_ACTION (132) -#define META_FILLCOLOR_ACTION (133) -#define META_TEXTCOLOR_ACTION (134) -#define META_TEXTFILLCOLOR_ACTION (135) -#define META_TEXTALIGN_ACTION (136) -#define META_MAPMODE_ACTION (137) -#define META_FONT_ACTION (138) -#define META_PUSH_ACTION (139) -#define META_POP_ACTION (140) -#define META_RASTEROP_ACTION (141) -#define META_TRANSPARENT_ACTION (142) -#define META_EPS_ACTION (143) -#define META_REFPOINT_ACTION (144) -#define META_TEXTLINECOLOR_ACTION (145) -#define META_TEXTLINE_ACTION (146) -#define META_FLOATTRANSPARENT_ACTION (147) -#define META_GRADIENTEX_ACTION (148) -#define META_LAYOUTMODE_ACTION (149) -#define META_TEXTLANGUAGE_ACTION (150) -#define META_OVERLINECOLOR_ACTION (151) - -#define META_COMMENT_ACTION (512) +#define META_NULL_ACTION (0) +#define META_PIXEL_ACTION (100) +#define META_POINT_ACTION (101) +#define META_LINE_ACTION (102) +#define META_RECT_ACTION (103) +#define META_ROUNDRECT_ACTION (104) +#define META_ELLIPSE_ACTION (105) +#define META_ARC_ACTION (106) +#define META_PIE_ACTION (107) +#define META_CHORD_ACTION (108) +#define META_POLYLINE_ACTION (109) +#define META_POLYGON_ACTION (110) +#define META_POLYPOLYGON_ACTION (111) +#define META_TEXT_ACTION (112) +#define META_TEXTARRAY_ACTION (113) +#define META_STRETCHTEXT_ACTION (114) +#define META_TEXTRECT_ACTION (115) +#define META_BMP_ACTION (116) +#define META_BMPSCALE_ACTION (117) +#define META_BMPSCALEPART_ACTION (118) +#define META_BMPEX_ACTION (119) +#define META_BMPEXSCALE_ACTION (120) +#define META_BMPEXSCALEPART_ACTION (121) +#define META_MASK_ACTION (122) +#define META_MASKSCALE_ACTION (123) +#define META_MASKSCALEPART_ACTION (124) +#define META_GRADIENT_ACTION (125) +#define META_HATCH_ACTION (126) +#define META_WALLPAPER_ACTION (127) +#define META_CLIPREGION_ACTION (128) +#define META_ISECTRECTCLIPREGION_ACTION (129) +#define META_ISECTREGIONCLIPREGION_ACTION (130) +#define META_MOVECLIPREGION_ACTION (131) +#define META_LINECOLOR_ACTION (132) +#define META_FILLCOLOR_ACTION (133) +#define META_TEXTCOLOR_ACTION (134) +#define META_TEXTFILLCOLOR_ACTION (135) +#define META_TEXTALIGN_ACTION (136) +#define META_MAPMODE_ACTION (137) +#define META_FONT_ACTION (138) +#define META_PUSH_ACTION (139) +#define META_POP_ACTION (140) +#define META_RASTEROP_ACTION (141) +#define META_TRANSPARENT_ACTION (142) +#define META_EPS_ACTION (143) +#define META_REFPOINT_ACTION (144) +#define META_TEXTLINECOLOR_ACTION (145) +#define META_TEXTLINE_ACTION (146) +#define META_FLOATTRANSPARENT_ACTION (147) +#define META_GRADIENTEX_ACTION (148) +#define META_LAYOUTMODE_ACTION (149) +#define META_TEXTLANGUAGE_ACTION (150) +#define META_OVERLINECOLOR_ACTION (151) + +#define META_COMMENT_ACTION (512) // ------------------------------------------------------------------------ struct ImplMetaReadData { - rtl_TextEncoding meActualCharSet; + rtl_TextEncoding meActualCharSet; }; // ------------------------------------------------------------------------ struct ImplMetaWriteData { - rtl_TextEncoding meActualCharSet; + rtl_TextEncoding meActualCharSet; }; // ------------------------------------------------------------------------ -#define DECL_META_ACTION( Name, nType ) \ - Meta##Name##Action(); \ +#define DECL_META_ACTION( Name, nType ) \ + Meta##Name##Action(); \ protected: \ - virtual ~Meta##Name##Action(); \ + virtual ~Meta##Name##Action(); \ public: \ - virtual void Execute( OutputDevice* pOut ); \ - virtual MetaAction* Clone(); \ - virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); \ - virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); - -#define IMPL_META_ACTION( Name, nType ) \ -Meta##Name##Action::Meta##Name##Action() : \ - MetaAction( nType ) {} \ + virtual void Execute( OutputDevice* pOut ); \ + virtual MetaAction* Clone(); \ + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); \ + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); + +#define IMPL_META_ACTION( Name, nType ) \ +Meta##Name##Action::Meta##Name##Action() : \ + MetaAction( nType ) {} \ Meta##Name##Action::~Meta##Name##Action() {} // -------------- @@ -144,38 +144,38 @@ Meta##Name##Action::~Meta##Name##Action() {} class VCL_DLLPUBLIC MetaAction { private: - ULONG mnRefCount; - UINT16 mnType; + ULONG mnRefCount; + UINT16 mnType; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; protected: - virtual ~MetaAction(); + virtual ~MetaAction(); public: MetaAction(); MetaAction( USHORT nType ); - virtual void Execute( OutputDevice* pOut ); + virtual void Execute( OutputDevice* pOut ); virtual MetaAction* Clone(); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); - virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); - sal_Bool IsEqual( const MetaAction& ) const; + sal_Bool IsEqual( const MetaAction& ) const; - USHORT GetType() const { return mnType; } - ULONG GetRefCount() const { return mnRefCount; } - void ResetRefCount() { mnRefCount = 1; } - void Duplicate() { mnRefCount++; } - void Delete() { if ( 0 == --mnRefCount ) delete this; } + USHORT GetType() const { return mnType; } + ULONG GetRefCount() const { return mnRefCount; } + void ResetRefCount() { mnRefCount = 1; } + void Duplicate() { mnRefCount++; } + void Delete() { if ( 0 == --mnRefCount ) delete this; } public: - static MetaAction* ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData ); + static MetaAction* ReadMetaAction( SvStream& rIStm, ImplMetaReadData* pData ); }; // ------------------- @@ -185,21 +185,21 @@ public: class VCL_DLLPUBLIC MetaPixelAction : public MetaAction { private: - Point maPt; - Color maColor; + Point maPt; + Color maColor; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Pixel, META_PIXEL_ACTION ) MetaPixelAction( const Point& rPt, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Point& GetPoint() const { return maPt; } - const Color& GetColor() const { return maColor; } + const Point& GetPoint() const { return maPt; } + const Color& GetColor() const { return maColor; } }; // ------------------- @@ -209,19 +209,19 @@ public: class VCL_DLLPUBLIC MetaPointAction : public MetaAction { private: - Point maPt; + Point maPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Point, META_POINT_ACTION ) MetaPointAction( const Point& rPt ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Point& GetPoint() const { return maPt; } + const Point& GetPoint() const { return maPt; } }; // ------------------ @@ -232,11 +232,11 @@ class VCL_DLLPUBLIC MetaLineAction : public MetaAction { private: - LineInfo maLineInfo; - Point maStartPt; - Point maEndPt; + LineInfo maLineInfo; + Point maStartPt; + Point maEndPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Line, META_LINE_ACTION ) @@ -245,12 +245,12 @@ public: MetaLineAction( const Point& rStart, const Point& rEnd, const LineInfo& rLineInfo ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Point& GetStartPoint() const { return maStartPt; } - const Point& GetEndPoint() const { return maEndPt; } - const LineInfo& GetLineInfo() const { return maLineInfo; } + const Point& GetStartPoint() const { return maStartPt; } + const Point& GetEndPoint() const { return maEndPt; } + const LineInfo& GetLineInfo() const { return maLineInfo; } }; // ------------------ @@ -261,18 +261,18 @@ class VCL_DLLPUBLIC MetaRectAction : public MetaAction { private: - Rectangle maRect; + Rectangle maRect; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Rect, META_RECT_ACTION ) MetaRectAction( const Rectangle& rRect ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Rectangle& GetRect() const { return maRect; } + const Rectangle& GetRect() const { return maRect; } }; // ----------------------- @@ -283,11 +283,11 @@ class VCL_DLLPUBLIC MetaRoundRectAction : public MetaAction { private: - Rectangle maRect; - sal_uInt32 mnHorzRound; - sal_uInt32 mnVertRound; + Rectangle maRect; + sal_uInt32 mnHorzRound; + sal_uInt32 mnVertRound; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( RoundRect, META_ROUNDRECT_ACTION ) @@ -295,12 +295,12 @@ public: MetaRoundRectAction( const Rectangle& rRect, sal_uInt32 nHorzRound, sal_uInt32 nVertRound ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Rectangle& GetRect() const { return maRect; } - sal_uInt32 GetHorzRound() const { return mnHorzRound; } - sal_uInt32 GetVertRound() const { return mnVertRound; } + const Rectangle& GetRect() const { return maRect; } + sal_uInt32 GetHorzRound() const { return mnHorzRound; } + sal_uInt32 GetVertRound() const { return mnVertRound; } }; // --------------------- @@ -311,19 +311,19 @@ class VCL_DLLPUBLIC MetaEllipseAction : public MetaAction { private: - Rectangle maRect; + Rectangle maRect; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Ellipse, META_ELLIPSE_ACTION ) MetaEllipseAction( const Rectangle& rRect ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Rectangle& GetRect() const { return maRect; } + const Rectangle& GetRect() const { return maRect; } }; // ----------------- @@ -334,11 +334,11 @@ class VCL_DLLPUBLIC MetaArcAction : public MetaAction { private: - Rectangle maRect; - Point maStartPt; - Point maEndPt; + Rectangle maRect; + Point maStartPt; + Point maEndPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Arc, META_ARC_ACTION ) @@ -346,12 +346,12 @@ public: MetaArcAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Rectangle& GetRect() const { return maRect; } - const Point& GetStartPoint() const { return maStartPt; } - const Point& GetEndPoint() const { return maEndPt; } + const Rectangle& GetRect() const { return maRect; } + const Point& GetStartPoint() const { return maStartPt; } + const Point& GetEndPoint() const { return maEndPt; } }; // ----------------- @@ -362,11 +362,11 @@ class VCL_DLLPUBLIC MetaPieAction : public MetaAction { private: - Rectangle maRect; - Point maStartPt; - Point maEndPt; + Rectangle maRect; + Point maStartPt; + Point maEndPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Pie, META_PIE_ACTION ) @@ -374,12 +374,12 @@ public: MetaPieAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Rectangle& GetRect() const { return maRect; } - const Point& GetStartPoint() const { return maStartPt; } - const Point& GetEndPoint() const { return maEndPt; } + const Rectangle& GetRect() const { return maRect; } + const Point& GetStartPoint() const { return maStartPt; } + const Point& GetEndPoint() const { return maEndPt; } }; // ------------------- @@ -390,11 +390,11 @@ class VCL_DLLPUBLIC MetaChordAction : public MetaAction { private: - Rectangle maRect; - Point maStartPt; - Point maEndPt; + Rectangle maRect; + Point maStartPt; + Point maEndPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Chord, META_CHORD_ACTION ) @@ -402,12 +402,12 @@ public: MetaChordAction( const Rectangle& rRect, const Point& rStart, const Point& rEnd ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Rectangle& GetRect() const { return maRect; } - const Point& GetStartPoint() const { return maStartPt; } - const Point& GetEndPoint() const { return maEndPt; } + const Rectangle& GetRect() const { return maRect; } + const Point& GetStartPoint() const { return maStartPt; } + const Point& GetEndPoint() const { return maEndPt; } }; // ---------------------- @@ -418,10 +418,10 @@ class VCL_DLLPUBLIC MetaPolyLineAction : public MetaAction { private: - LineInfo maLineInfo; - Polygon maPoly; + LineInfo maLineInfo; + Polygon maPoly; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( PolyLine, META_POLYLINE_ACTION ) @@ -429,11 +429,11 @@ public: MetaPolyLineAction( const Polygon& rPoly ); MetaPolyLineAction( const Polygon& rPoly, const LineInfo& rLineInfo ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Polygon& GetPolygon() const { return maPoly; } - const LineInfo& GetLineInfo() const { return maLineInfo; } + const Polygon& GetPolygon() const { return maPoly; } + const LineInfo& GetLineInfo() const { return maLineInfo; } }; // --------------------- @@ -444,19 +444,19 @@ class VCL_DLLPUBLIC MetaPolygonAction : public MetaAction { private: - Polygon maPoly; + Polygon maPoly; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Polygon, META_POLYGON_ACTION ) MetaPolygonAction( const Polygon& rPoly ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Polygon& GetPolygon() const { return maPoly; } + const Polygon& GetPolygon() const { return maPoly; } }; // ------------------------- @@ -467,19 +467,19 @@ class VCL_DLLPUBLIC MetaPolyPolygonAction : public MetaAction { private: - PolyPolygon maPolyPoly; + PolyPolygon maPolyPoly; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( PolyPolygon, META_POLYPOLYGON_ACTION ) MetaPolyPolygonAction( const PolyPolygon& rPolyPoly ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } + const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } }; // ------------------ @@ -490,12 +490,12 @@ class VCL_DLLPUBLIC MetaTextAction : public MetaAction { private: - Point maPt; - XubString maStr; - USHORT mnIndex; - USHORT mnLen; + Point maPt; + XubString maStr; + USHORT mnIndex; + USHORT mnLen; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Text, META_TEXT_ACTION ) @@ -503,13 +503,13 @@ public: MetaTextAction( const Point& rPt, const XubString& rStr, USHORT nIndex, USHORT nLen ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + 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; } + const Point& GetPoint() const { return maPt; } + const XubString& GetText() const { return maStr; } + USHORT GetIndex() const { return mnIndex; } + USHORT GetLen() const { return mnLen; } }; // ----------------------- @@ -520,16 +520,16 @@ class VCL_DLLPUBLIC MetaTextArrayAction : public MetaAction { private: - Point maStartPt; - XubString maStr; - sal_Int32* mpDXAry; - USHORT mnIndex; - USHORT mnLen; + Point maStartPt; + XubString maStr; + sal_Int32* mpDXAry; + USHORT mnIndex; + USHORT mnLen; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; protected: - virtual ~MetaTextArrayAction(); + virtual ~MetaTextArrayAction(); public: MetaTextArrayAction(); @@ -540,21 +540,21 @@ public: USHORT nIndex, USHORT nLen ); - virtual void Execute( OutputDevice* pOut ); + virtual void Execute( OutputDevice* pOut ); virtual MetaAction* Clone(); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); - virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); - const Point& GetPoint() const { return maStartPt; } - const XubString& GetText() const { return maStr; } - USHORT GetIndex() const { return mnIndex; } - USHORT GetLen() const { return mnLen; } - sal_Int32* GetDXArray() const { return mpDXAry; } + const Point& GetPoint() const { return maStartPt; } + const XubString& GetText() const { return maStr; } + USHORT GetIndex() const { return mnIndex; } + USHORT GetLen() const { return mnLen; } + sal_Int32* GetDXArray() const { return mpDXAry; } }; // ------------------------- @@ -565,13 +565,13 @@ class VCL_DLLPUBLIC MetaStretchTextAction : public MetaAction { private: - Point maPt; - XubString maStr; - sal_uInt32 mnWidth; - USHORT mnIndex; - USHORT mnLen; + Point maPt; + XubString maStr; + sal_uInt32 mnWidth; + USHORT mnIndex; + USHORT mnLen; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( StretchText, META_STRETCHTEXT_ACTION ) @@ -580,14 +580,14 @@ public: const XubString& rStr, USHORT nIndex, USHORT nLen ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + 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; } - sal_uInt32 GetWidth() const { return mnWidth; } - USHORT GetIndex() const { return mnIndex; } - USHORT GetLen() const { return mnLen; } + 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; } }; // ---------------------- @@ -598,11 +598,11 @@ class VCL_DLLPUBLIC MetaTextRectAction : public MetaAction { private: - Rectangle maRect; - XubString maStr; - USHORT mnStyle; + Rectangle maRect; + XubString maStr; + USHORT mnStyle; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextRect, META_TEXTRECT_ACTION ) @@ -610,12 +610,12 @@ public: MetaTextRectAction( const Rectangle& rRect, const XubString& rStr, USHORT nStyle ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + 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; } + const Rectangle& GetRect() const { return maRect; } + const XubString& GetText() const { return maStr; } + USHORT GetStyle() const { return mnStyle; } }; // ---------------------- @@ -626,13 +626,13 @@ class VCL_DLLPUBLIC MetaTextLineAction : public MetaAction { private: - Point maPos; - long mnWidth; - FontStrikeout meStrikeout; - FontUnderline meUnderline; - FontUnderline meOverline; + Point maPos; + long mnWidth; + FontStrikeout meStrikeout; + FontUnderline meUnderline; + FontUnderline meOverline; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextLine, META_TEXTLINE_ACTION ) @@ -641,14 +641,14 @@ public: FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); - - const Point& GetStartPoint() const { return maPos; } - long GetWidth() const { return mnWidth; } - FontStrikeout GetStrikeout() const { return meStrikeout; } - FontUnderline GetUnderline() const { return meUnderline; } - FontUnderline GetOverline() const { return meOverline; } + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); + + const Point& GetStartPoint() const { return maPos; } + long GetWidth() const { return mnWidth; } + FontStrikeout GetStrikeout() const { return meStrikeout; } + FontUnderline GetUnderline() const { return meUnderline; } + FontUnderline GetOverline() const { return meOverline; } }; // ----------------- @@ -659,21 +659,21 @@ class VCL_DLLPUBLIC MetaBmpAction : public MetaAction { private: - Bitmap maBmp; - Point maPt; + Bitmap maBmp; + Point maPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Bmp, META_BMP_ACTION ) MetaBmpAction( const Point& rPt, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Bitmap& GetBitmap() const { return maBmp; } - const Point& GetPoint() const { return maPt; } + const Bitmap& GetBitmap() const { return maBmp; } + const Point& GetPoint() const { return maPt; } }; // ---------------------- @@ -684,11 +684,11 @@ class VCL_DLLPUBLIC MetaBmpScaleAction : public MetaAction { private: - Bitmap maBmp; - Point maPt; - Size maSz; + Bitmap maBmp; + Point maPt; + Size maSz; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( BmpScale, META_BMPSCALE_ACTION ) @@ -696,12 +696,12 @@ public: MetaBmpScaleAction( const Point& rPt, const Size& rSz, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Bitmap& GetBitmap() const { return maBmp; } - const Point& GetPoint() const { return maPt; } - const Size& GetSize() const { return maSz; } + const Bitmap& GetBitmap() const { return maBmp; } + const Point& GetPoint() const { return maPt; } + const Size& GetSize() const { return maSz; } }; // -------------------------- @@ -712,13 +712,13 @@ class VCL_DLLPUBLIC MetaBmpScalePartAction : public MetaAction { private: - Bitmap maBmp; - Point maDstPt; - Size maDstSz; - Point maSrcPt; - Size maSrcSz; + Bitmap maBmp; + Point maDstPt; + Size maDstSz; + Point maSrcPt; + Size maSrcSz; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( BmpScalePart, META_BMPSCALEPART_ACTION ) @@ -727,14 +727,14 @@ public: const Point& rSrcPt, const Size& rSrcSz, const Bitmap& rBmp ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Bitmap& GetBitmap() const { return maBmp; } - const Point& GetDestPoint() const { return maDstPt; } - const Size& GetDestSize() const { return maDstSz; } - const Point& GetSrcPoint() const { return maSrcPt; } - const Size& GetSrcSize() const { return maSrcSz; } + const Bitmap& GetBitmap() const { return maBmp; } + const Point& GetDestPoint() const { return maDstPt; } + const Size& GetDestSize() const { return maDstSz; } + const Point& GetSrcPoint() const { return maSrcPt; } + const Size& GetSrcSize() const { return maSrcSz; } }; // ----------------- @@ -745,21 +745,21 @@ class VCL_DLLPUBLIC MetaBmpExAction : public MetaAction { private: - BitmapEx maBmpEx; - Point maPt; + BitmapEx maBmpEx; + Point maPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( BmpEx, META_BMPEX_ACTION ) MetaBmpExAction( const Point& rPt, const BitmapEx& rBmpEx ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const BitmapEx& GetBitmapEx() const { return maBmpEx; } - const Point& GetPoint() const { return maPt; } + const BitmapEx& GetBitmapEx() const { return maBmpEx; } + const Point& GetPoint() const { return maPt; } }; // ---------------------- @@ -770,11 +770,11 @@ class VCL_DLLPUBLIC MetaBmpExScaleAction : public MetaAction { private: - BitmapEx maBmpEx; - Point maPt; - Size maSz; + BitmapEx maBmpEx; + Point maPt; + Size maSz; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( BmpExScale, META_BMPEXSCALE_ACTION ) @@ -782,12 +782,12 @@ public: MetaBmpExScaleAction( const Point& rPt, const Size& rSz, const BitmapEx& rBmpEx ) ; - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const BitmapEx& GetBitmapEx() const { return maBmpEx; } - const Point& GetPoint() const { return maPt; } - const Size& GetSize() const { return maSz; } + const BitmapEx& GetBitmapEx() const { return maBmpEx; } + const Point& GetPoint() const { return maPt; } + const Size& GetSize() const { return maSz; } }; // ---------------------------- @@ -798,13 +798,13 @@ class VCL_DLLPUBLIC MetaBmpExScalePartAction : public MetaAction { private: - BitmapEx maBmpEx; - Point maDstPt; - Size maDstSz; - Point maSrcPt; - Size maSrcSz; + BitmapEx maBmpEx; + Point maDstPt; + Size maDstSz; + Point maSrcPt; + Size maSrcSz; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( BmpExScalePart, META_BMPEXSCALEPART_ACTION ) @@ -813,14 +813,14 @@ public: const Point& rSrcPt, const Size& rSrcSz, const BitmapEx& rBmpEx ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const BitmapEx& GetBitmapEx() const { return maBmpEx; } - const Point& GetDestPoint() const { return maDstPt; } - const Size& GetDestSize() const { return maDstSz; } - const Point& GetSrcPoint() const { return maSrcPt; } - const Size& GetSrcSize() const { return maSrcSz; } + const BitmapEx& GetBitmapEx() const { return maBmpEx; } + const Point& GetDestPoint() const { return maDstPt; } + const Size& GetDestSize() const { return maDstSz; } + const Point& GetSrcPoint() const { return maSrcPt; } + const Size& GetSrcSize() const { return maSrcSz; } }; // ------------------ @@ -831,11 +831,11 @@ class VCL_DLLPUBLIC MetaMaskAction : public MetaAction { private: - Bitmap maBmp; - Color maColor; - Point maPt; + Bitmap maBmp; + Color maColor; + Point maPt; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Mask, META_MASK_ACTION ) @@ -844,12 +844,12 @@ public: const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Bitmap& GetBitmap() const { return maBmp; } - const Color& GetColor() const { return maColor; } - const Point& GetPoint() const { return maPt; } + const Bitmap& GetBitmap() const { return maBmp; } + const Color& GetColor() const { return maColor; } + const Point& GetPoint() const { return maPt; } }; // ----------------------- @@ -860,12 +860,12 @@ class VCL_DLLPUBLIC MetaMaskScaleAction : public MetaAction { private: - Bitmap maBmp; - Color maColor; - Point maPt; - Size maSz; + Bitmap maBmp; + Color maColor; + Point maPt; + Size maSz; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( MaskScale, META_MASKSCALE_ACTION ) @@ -874,13 +874,13 @@ public: const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Bitmap& GetBitmap() const { return maBmp; } - const Color& GetColor() const { return maColor; } - const Point& GetPoint() const { return maPt; } - const Size& GetSize() const { return maSz; } + const Bitmap& GetBitmap() const { return maBmp; } + const Color& GetColor() const { return maColor; } + const Point& GetPoint() const { return maPt; } + const Size& GetSize() const { return maSz; } }; // --------------------------- @@ -891,14 +891,14 @@ class VCL_DLLPUBLIC MetaMaskScalePartAction : public MetaAction { private: - Bitmap maBmp; - Color maColor; - Point maDstPt; - Size maDstSz; - Point maSrcPt; - Size maSrcSz; + Bitmap maBmp; + Color maColor; + Point maDstPt; + Size maDstSz; + Point maSrcPt; + Size maSrcSz; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( MaskScalePart, META_MASKSCALEPART_ACTION ) @@ -908,15 +908,15 @@ public: const Bitmap& rBmp, const Color& rColor ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Bitmap& GetBitmap() const { return maBmp; } - const Color& GetColor() const { return maColor; } - const Point& GetDestPoint() const { return maDstPt; } - const Size& GetDestSize() const { return maDstSz; } - const Point& GetSrcPoint() const { return maSrcPt; } - const Size& GetSrcSize() const { return maSrcSz; } + const Bitmap& GetBitmap() const { return maBmp; } + const Color& GetColor() const { return maColor; } + const Point& GetDestPoint() const { return maDstPt; } + const Size& GetDestSize() const { return maDstSz; } + const Point& GetSrcPoint() const { return maSrcPt; } + const Size& GetSrcSize() const { return maSrcSz; } }; // ---------------------- @@ -927,21 +927,21 @@ class VCL_DLLPUBLIC MetaGradientAction : public MetaAction { private: - Rectangle maRect; - Gradient maGradient; + Rectangle maRect; + Gradient maGradient; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Gradient, META_GRADIENT_ACTION ) MetaGradientAction( const Rectangle& rRect, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Rectangle& GetRect() const { return maRect; } - const Gradient& GetGradient() const { return maGradient; } + const Rectangle& GetRect() const { return maRect; } + const Gradient& GetGradient() const { return maGradient; } }; // ------------------------ @@ -952,21 +952,21 @@ class VCL_DLLPUBLIC MetaGradientExAction : public MetaAction { private: - PolyPolygon maPolyPoly; - Gradient maGradient; + PolyPolygon maPolyPoly; + Gradient maGradient; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( GradientEx, META_GRADIENTEX_ACTION ) MetaGradientExAction( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } - const Gradient& GetGradient() const { return maGradient; } + const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } + const Gradient& GetGradient() const { return maGradient; } }; // ------------------- @@ -977,21 +977,21 @@ class VCL_DLLPUBLIC MetaHatchAction : public MetaAction { private: - PolyPolygon maPolyPoly; - Hatch maHatch; + PolyPolygon maPolyPoly; + Hatch maHatch; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Hatch, META_HATCH_ACTION ) MetaHatchAction( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } - const Hatch& GetHatch() const { return maHatch; } + const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } + const Hatch& GetHatch() const { return maHatch; } }; // ----------------------- @@ -1002,10 +1002,10 @@ class VCL_DLLPUBLIC MetaWallpaperAction : public MetaAction { private: - Rectangle maRect; - Wallpaper maWallpaper; + Rectangle maRect; + Wallpaper maWallpaper; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Wallpaper, META_WALLPAPER_ACTION ) @@ -1013,11 +1013,11 @@ public: MetaWallpaperAction( const Rectangle& rRect, const Wallpaper& rPaper ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Rectangle& GetRect() const { return maRect; } - const Wallpaper& GetWallpaper() const { return maWallpaper; } + const Rectangle& GetRect() const { return maRect; } + const Wallpaper& GetWallpaper() const { return maWallpaper; } }; // ------------------------ @@ -1028,21 +1028,21 @@ class VCL_DLLPUBLIC MetaClipRegionAction : public MetaAction { private: - Region maRegion; - BOOL mbClip; + Region maRegion; + BOOL mbClip; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( ClipRegion, META_CLIPREGION_ACTION ) MetaClipRegionAction( const Region& rRegion, BOOL bClip ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + 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; } + const Region& GetRegion() const { return maRegion; } + BOOL IsClipping() const { return mbClip; } }; // --------------------------------- @@ -1053,19 +1053,19 @@ class VCL_DLLPUBLIC MetaISectRectClipRegionAction : public MetaAction { private: - Rectangle maRect; + Rectangle maRect; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( ISectRectClipRegion, META_ISECTRECTCLIPREGION_ACTION ) MetaISectRectClipRegionAction( const Rectangle& rRect ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Rectangle& GetRect() const { return maRect; } + const Rectangle& GetRect() const { return maRect; } }; // ----------------------------------- @@ -1076,19 +1076,19 @@ class VCL_DLLPUBLIC MetaISectRegionClipRegionAction : public MetaAction { private: - Region maRegion; + Region maRegion; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( ISectRegionClipRegion, META_ISECTREGIONCLIPREGION_ACTION ) MetaISectRegionClipRegionAction( const Region& rRegion ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const Region& GetRegion() const { return maRegion; } + const Region& GetRegion() const { return maRegion; } }; // ---------------------------- @@ -1099,20 +1099,20 @@ class VCL_DLLPUBLIC MetaMoveClipRegionAction : public MetaAction { private: - long mnHorzMove; - long mnVertMove; + long mnHorzMove; + long mnVertMove; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( MoveClipRegion, META_MOVECLIPREGION_ACTION ) MetaMoveClipRegionAction( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Scale( double fScaleX, double fScaleY ); - long GetHorzMove() const { return mnHorzMove; } - long GetVertMove() const { return mnVertMove; } + long GetHorzMove() const { return mnHorzMove; } + long GetVertMove() const { return mnVertMove; } }; // ----------------------- @@ -1123,18 +1123,18 @@ class VCL_DLLPUBLIC MetaLineColorAction : public MetaAction { private: - Color maColor; - BOOL mbSet; + Color maColor; + BOOL mbSet; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( LineColor, META_LINECOLOR_ACTION ) MetaLineColorAction( const Color& rColor, BOOL bSet ); - const Color& GetColor() const { return maColor; } - BOOL IsSetting() const { return mbSet; } + const Color& GetColor() const { return maColor; } + BOOL IsSetting() const { return mbSet; } }; // ----------------------- @@ -1145,18 +1145,18 @@ class VCL_DLLPUBLIC MetaFillColorAction : public MetaAction { private: - Color maColor; - BOOL mbSet; + Color maColor; + BOOL mbSet; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( FillColor, META_FILLCOLOR_ACTION ) MetaFillColorAction( const Color& rColor, BOOL bSet ); - const Color& GetColor() const { return maColor; } - BOOL IsSetting() const { return mbSet; } + const Color& GetColor() const { return maColor; } + BOOL IsSetting() const { return mbSet; } }; // ----------------------- @@ -1167,16 +1167,16 @@ class VCL_DLLPUBLIC MetaTextColorAction : public MetaAction { private: - Color maColor; + Color maColor; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextColor, META_TEXTCOLOR_ACTION ) MetaTextColorAction( const Color& rColor ); - const Color& GetColor() const { return maColor; } + const Color& GetColor() const { return maColor; } }; // --------------------------- @@ -1187,18 +1187,18 @@ class VCL_DLLPUBLIC MetaTextFillColorAction : public MetaAction { private: - Color maColor; - BOOL mbSet; + Color maColor; + BOOL mbSet; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextFillColor, META_TEXTFILLCOLOR_ACTION ) MetaTextFillColorAction( const Color& rColor, BOOL bSet ); - const Color& GetColor() const { return maColor; } - BOOL IsSetting() const { return mbSet; } + const Color& GetColor() const { return maColor; } + BOOL IsSetting() const { return mbSet; } }; // --------------------------- @@ -1209,18 +1209,18 @@ class VCL_DLLPUBLIC MetaTextLineColorAction : public MetaAction { private: - Color maColor; - BOOL mbSet; + Color maColor; + BOOL mbSet; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextLineColor, META_TEXTLINECOLOR_ACTION ) MetaTextLineColorAction( const Color& rColor, BOOL bSet ); - const Color& GetColor() const { return maColor; } - BOOL IsSetting() const { return mbSet; } + const Color& GetColor() const { return maColor; } + BOOL IsSetting() const { return mbSet; } }; // --------------------------- @@ -1231,18 +1231,18 @@ class VCL_DLLPUBLIC MetaOverlineColorAction : public MetaAction { private: - Color maColor; - BOOL mbSet; + Color maColor; + BOOL mbSet; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( OverlineColor, META_OVERLINECOLOR_ACTION ) MetaOverlineColorAction( const Color& rColor, BOOL bSet ); - const Color& GetColor() const { return maColor; } - BOOL IsSetting() const { return mbSet; } + const Color& GetColor() const { return maColor; } + BOOL IsSetting() const { return mbSet; } }; // ----------------------- @@ -1253,16 +1253,16 @@ class VCL_DLLPUBLIC MetaTextAlignAction : public MetaAction { private: - TextAlign maAlign; + TextAlign maAlign; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextAlign, META_TEXTALIGN_ACTION ) MetaTextAlignAction( TextAlign aAlign ); - TextAlign GetTextAlign() const { return maAlign; } + TextAlign GetTextAlign() const { return maAlign; } }; // --------------------- @@ -1273,18 +1273,18 @@ class VCL_DLLPUBLIC MetaMapModeAction : public MetaAction { private: - MapMode maMapMode; + MapMode maMapMode; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( MapMode, META_MAPMODE_ACTION ) MetaMapModeAction( const MapMode& rMapMode ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Scale( double fScaleX, double fScaleY ); - const MapMode& GetMapMode() const { return maMapMode; } + const MapMode& GetMapMode() const { return maMapMode; } }; // --------------------- @@ -1295,18 +1295,18 @@ class VCL_DLLPUBLIC MetaFontAction : public MetaAction { private: - Font maFont; + Font maFont; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Font, META_FONT_ACTION ) MetaFontAction( const Font& rFont ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Scale( double fScaleX, double fScaleY ); - const Font& GetFont() const { return maFont; } + const Font& GetFont() const { return maFont; } }; // ------------------ @@ -1317,16 +1317,16 @@ class VCL_DLLPUBLIC MetaPushAction : public MetaAction { private: - USHORT mnFlags; + USHORT mnFlags; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Push, META_PUSH_ACTION ) MetaPushAction( USHORT nFlags ); - USHORT GetFlags() const { return mnFlags; } + USHORT GetFlags() const { return mnFlags; } }; // ----------------- @@ -1348,16 +1348,16 @@ class VCL_DLLPUBLIC MetaRasterOpAction : public MetaAction { private: - RasterOp meRasterOp; + RasterOp meRasterOp; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( RasterOp, META_RASTEROP_ACTION ) MetaRasterOpAction( RasterOp eRasterOp ); - RasterOp GetRasterOp() const { return meRasterOp; } + RasterOp GetRasterOp() const { return meRasterOp; } }; // ------------------------- @@ -1368,21 +1368,21 @@ class VCL_DLLPUBLIC MetaTransparentAction : public MetaAction { private: - PolyPolygon maPolyPoly; - USHORT mnTransPercent; + PolyPolygon maPolyPoly; + USHORT mnTransPercent; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( Transparent, META_TRANSPARENT_ACTION ) MetaTransparentAction( const PolyPolygon& rPolyPoly, USHORT nTransPercent ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + 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; } + const PolyPolygon& GetPolyPolygon() const { return maPolyPoly; } + USHORT GetTransparence() const { return mnTransPercent; } }; // ------------------------------ @@ -1393,12 +1393,12 @@ class VCL_DLLPUBLIC MetaFloatTransparentAction : public MetaAction { private: - GDIMetaFile maMtf; - Point maPoint; - Size maSize; - Gradient maGradient; + GDIMetaFile maMtf; + Point maPoint; + Size maSize; + Gradient maGradient; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( FloatTransparent, META_FLOATTRANSPARENT_ACTION ) @@ -1406,13 +1406,13 @@ public: MetaFloatTransparentAction( const GDIMetaFile& rMtf, const Point& rPos, const Size& rSize, const Gradient& rGradient ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const GDIMetaFile& GetGDIMetaFile() const { return maMtf; } - const Point& GetPoint() const { return maPoint; } - const Size& GetSize() const { return maSize; } - const Gradient& GetGradient() const { return maGradient; } + const GDIMetaFile& GetGDIMetaFile() const { return maMtf; } + const Point& GetPoint() const { return maPoint; } + const Size& GetSize() const { return maSize; } + const Gradient& GetGradient() const { return maGradient; } }; // --------------------- @@ -1423,12 +1423,12 @@ class VCL_DLLPUBLIC MetaEPSAction : public MetaAction { private: - GfxLink maGfxLink; - GDIMetaFile maSubst; - Point maPoint; - Size maSize; + GfxLink maGfxLink; + GDIMetaFile maSubst; + Point maPoint; + Size maSize; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( EPS, META_EPS_ACTION ) @@ -1436,13 +1436,13 @@ public: MetaEPSAction( const Point& rPoint, const Size& rSize, const GfxLink& rGfxLink, const GDIMetaFile& rSubst ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - const GfxLink& GetLink() const { return maGfxLink; } - const GDIMetaFile& GetSubstitute() const { return maSubst; } - const Point& GetPoint() const { return maPoint; } - const Size& GetSize() const { return maSize; } + const GfxLink& GetLink() const { return maGfxLink; } + const GDIMetaFile& GetSubstitute() const { return maSubst; } + const Point& GetPoint() const { return maPoint; } + const Size& GetSize() const { return maSize; } }; // ---------------------- @@ -1453,18 +1453,18 @@ class VCL_DLLPUBLIC MetaRefPointAction : public MetaAction { private: - Point maRefPoint; - BOOL mbSet; + Point maRefPoint; + BOOL mbSet; - virtual sal_Bool Compare( const MetaAction& ) const; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( RefPoint, META_REFPOINT_ACTION ) MetaRefPointAction( const Point& rRefPoint, BOOL bSet ); - const Point& GetRefPoint() const { return maRefPoint; } - BOOL IsSetting() const { return mbSet; } + const Point& GetRefPoint() const { return maRefPoint; } + BOOL IsSetting() const { return mbSet; } }; // --------------------- @@ -1475,13 +1475,13 @@ class VCL_DLLPUBLIC MetaCommentAction : public MetaAction { private: - ByteString maComment; - sal_Int32 mnValue; - sal_uInt32 mnDataSize; - BYTE* mpData; + ByteString maComment; + sal_Int32 mnValue; + sal_uInt32 mnDataSize; + BYTE* mpData; - SAL_DLLPRIVATE void ImplInitDynamicData( const BYTE* pData, sal_uInt32 nDataSize ); - virtual sal_Bool Compare( const MetaAction& ) const; + SAL_DLLPRIVATE void ImplInitDynamicData( const BYTE* pData, sal_uInt32 nDataSize ); + virtual sal_Bool Compare( const MetaAction& ) const; protected: ~MetaCommentAction(); @@ -1492,18 +1492,18 @@ public: MetaCommentAction( const ByteString& rComment, sal_Int32 nValue = 0L, const BYTE* pData = NULL, sal_uInt32 nDataSize = 0UL ); MetaCommentAction( const BYTE* pData, sal_uInt32 nDataSize ); - virtual void Move( long nHorzMove, long nVertMove ); - virtual void Scale( double fScaleX, double fScaleY ); + virtual void Move( long nHorzMove, long nVertMove ); + virtual void Scale( double fScaleX, double fScaleY ); - virtual void Execute( OutputDevice* pOut ); + virtual void Execute( OutputDevice* pOut ); virtual MetaAction* Clone(); - virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); - virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); + virtual void Write( SvStream& rOStm, ImplMetaWriteData* pData ); + virtual void Read( SvStream& rIStm, ImplMetaReadData* pData ); - 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 ByteString& GetComment() const { return maComment; } + sal_Int32 GetValue() const { return mnValue; } + sal_uInt32 GetDataSize() const { return mnDataSize; } + const BYTE* GetData() const { return mpData; } }; // ------------------------ @@ -1514,15 +1514,15 @@ class VCL_DLLPUBLIC MetaLayoutModeAction : public MetaAction { private: - sal_uInt32 mnLayoutMode; - virtual sal_Bool Compare( const MetaAction& ) const; + sal_uInt32 mnLayoutMode; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( LayoutMode, META_LAYOUTMODE_ACTION ) MetaLayoutModeAction( sal_uInt32 nLayoutMode ); - sal_uInt32 GetLayoutMode() const { return mnLayoutMode; } + sal_uInt32 GetLayoutMode() const { return mnLayoutMode; } }; // ------------------------ @@ -1533,15 +1533,15 @@ class VCL_DLLPUBLIC MetaTextLanguageAction : public MetaAction { private: - LanguageType meTextLanguage; - virtual sal_Bool Compare( const MetaAction& ) const; + LanguageType meTextLanguage; + virtual sal_Bool Compare( const MetaAction& ) const; public: DECL_META_ACTION( TextLanguage, META_TEXTLANGUAGE_ACTION ) MetaTextLanguageAction( LanguageType ); - LanguageType GetTextLanguage() const { return meTextLanguage; } + LanguageType GetTextLanguage() const { return meTextLanguage; } }; #endif // _SV_METAACT_HXX diff --git a/vcl/inc/vcl/metric.hxx b/vcl/inc/vcl/metric.hxx index 41cb707ffd62..b78ce5df9247 100644 --- a/vcl/inc/vcl/metric.hxx +++ b/vcl/inc/vcl/metric.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -46,22 +46,22 @@ class VCL_DLLPUBLIC FontInfo : public Font friend class OutputDevice; protected: - ImplFontMetric* mpImplMetric; // Implementation + ImplFontMetric* mpImplMetric; // Implementation public: FontInfo(); FontInfo( const FontInfo& ); ~FontInfo(); - FontType GetType() const; - BOOL IsDeviceFont() const; - BOOL SupportsLatin() const; - BOOL SupportsCJK() const; - BOOL SupportsCTL() const; + FontType GetType() const; + BOOL IsDeviceFont() const; + BOOL SupportsLatin() const; + BOOL SupportsCJK() const; + BOOL SupportsCTL() const; - FontInfo& operator=( const FontInfo& ); - BOOL operator==( const FontInfo& ) const; - BOOL operator!=( const FontInfo& rInfo ) const + FontInfo& operator=( const FontInfo& ); + BOOL operator==( const FontInfo& ) const; + BOOL operator!=( const FontInfo& rInfo ) const { return !operator==( rInfo ); } }; @@ -76,16 +76,16 @@ public: FontMetric( const FontMetric& ); ~FontMetric() {} - long GetAscent() const; - long GetDescent() const; - long GetIntLeading() const; - long GetExtLeading() const; - long GetLineHeight() const; - long GetSlant() const; + long GetAscent() const; + long GetDescent() const; + long GetIntLeading() const; + long GetExtLeading() const; + long GetLineHeight() const; + long GetSlant() const; - FontMetric& operator=( const FontMetric& rMetric ); - BOOL operator==( const FontMetric& rMetric ) const; - BOOL operator!=( const FontMetric& rMetric ) const + FontMetric& operator=( const FontMetric& rMetric ); + BOOL operator==( const FontMetric& rMetric ) const; + BOOL operator!=( const FontMetric& rMetric ) const { return !operator==( rMetric ); } }; @@ -135,30 +135,30 @@ class VCL_DLLPUBLIC TextRectInfo friend class OutputDevice; private: - long mnMaxWidth; - USHORT mnLineCount; - BOOL mbEllipsis; + long mnMaxWidth; + USHORT mnLineCount; + BOOL mbEllipsis; public: TextRectInfo(); - USHORT GetLineCount() const { return mnLineCount; } - long GetMaxLineWidth() const { return mnMaxWidth; } - BOOL IsEllipses() const { return mbEllipsis; } + USHORT GetLineCount() const { return mnLineCount; } + long GetMaxLineWidth() const { return mnMaxWidth; } + BOOL IsEllipses() const { return mbEllipsis; } - BOOL operator ==( const TextRectInfo& rInfo ) const - { return ((mnMaxWidth == rInfo.mnMaxWidth) && - (mnLineCount == rInfo.mnLineCount) && - (mbEllipsis == rInfo.mbEllipsis)); } - BOOL operator !=( const TextRectInfo& rInfo ) const + BOOL operator ==( const TextRectInfo& rInfo ) const + { return ((mnMaxWidth == rInfo.mnMaxWidth) && + (mnLineCount == rInfo.mnLineCount) && + (mbEllipsis == rInfo.mbEllipsis)); } + BOOL operator !=( const TextRectInfo& rInfo ) const { return !(TextRectInfo::operator==( rInfo )); } }; inline TextRectInfo::TextRectInfo() { - mnMaxWidth = 0; - mnLineCount = 0; - mbEllipsis = FALSE; + mnMaxWidth = 0; + mnLineCount = 0; + mbEllipsis = FALSE; } #endif // _SV_METRIC_HXX diff --git a/vcl/inc/vcl/mnemonic.hxx b/vcl/inc/vcl/mnemonic.hxx index 801ba7d26190..bdea35ffc471 100644 --- a/vcl/inc/vcl/mnemonic.hxx +++ b/vcl/inc/vcl/mnemonic.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,25 +40,25 @@ // Mnemonic Chars, which we want support // Latin 0-9 -#define MNEMONIC_RANGE_1_START 0x30 -#define MNEMONIC_RANGE_1_END 0x39 +#define MNEMONIC_RANGE_1_START 0x30 +#define MNEMONIC_RANGE_1_END 0x39 // Latin A-Z -#define MNEMONIC_RANGE_2_START 0x41 -#define MNEMONIC_RANGE_2_END 0x5A +#define MNEMONIC_RANGE_2_START 0x41 +#define MNEMONIC_RANGE_2_END 0x5A // Cyrillic -#define MNEMONIC_RANGE_3_START 0x0410 -#define MNEMONIC_RANGE_3_END 0x042F +#define MNEMONIC_RANGE_3_START 0x0410 +#define MNEMONIC_RANGE_3_END 0x042F // Greek -#define MNEMONIC_RANGE_4_START 0x0391 -#define MNEMONIC_RANGE_4_END 0x03AB -#define MNEMONIC_RANGES 4 -#define MAX_MNEMONICS ((MNEMONIC_RANGE_1_END-MNEMONIC_RANGE_1_START+1)+\ +#define MNEMONIC_RANGE_4_START 0x0391 +#define MNEMONIC_RANGE_4_END 0x03AB +#define MNEMONIC_RANGES 4 +#define MAX_MNEMONICS ((MNEMONIC_RANGE_1_END-MNEMONIC_RANGE_1_START+1)+\ (MNEMONIC_RANGE_2_END-MNEMONIC_RANGE_2_START+1)+\ (MNEMONIC_RANGE_3_END-MNEMONIC_RANGE_3_START+1)+\ (MNEMONIC_RANGE_4_END-MNEMONIC_RANGE_4_START+1)) -#define MNEMONIC_CHAR ((sal_Unicode)'~') -#define MNEMONIC_INDEX_NOTFOUND ((USHORT)0xFFFF) +#define MNEMONIC_CHAR ((sal_Unicode)'~') +#define MNEMONIC_INDEX_NOTFOUND ((USHORT)0xFFFF) // ------------------------- // - MnemonicGenerator - @@ -68,18 +68,18 @@ class VCL_DLLPUBLIC MnemonicGenerator { private: // 0 == Mnemonic; >0 == count of characters - BYTE maMnemonics[MAX_MNEMONICS]; + BYTE 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_Unicode ImplFindMnemonic( const XubString& rKey ); + SAL_DLLPRIVATE USHORT ImplGetMnemonicIndex( sal_Unicode c ); + SAL_DLLPRIVATE sal_Unicode ImplFindMnemonic( const XubString& rKey ); public: MnemonicGenerator(); - void RegisterMnemonic( const XubString& rKey ); - BOOL CreateMnemonic( XubString& rKey ); + void RegisterMnemonic( const XubString& rKey ); + 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..3e196cbaf6bf 100644 --- a/vcl/inc/vcl/mnemonicengine.hxx +++ b/vcl/inc/vcl/mnemonicengine.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/morebtn.hxx b/vcl/inc/vcl/morebtn.hxx index fe787d2b1b26..0a9c930ebb80 100644 --- a/vcl/inc/vcl/morebtn.hxx +++ b/vcl/inc/vcl/morebtn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -56,7 +56,7 @@ private: protected: using Window::ImplInit; SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); + SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); public: MoreButton( Window* pParent, WinBits nStyle = 0 ); diff --git a/vcl/inc/vcl/msgbox.hxx b/vcl/inc/vcl/msgbox.hxx index 7b02444ed4d7..d3af9841f861 100644 --- a/vcl/inc/vcl/msgbox.hxx +++ b/vcl/inc/vcl/msgbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -45,20 +45,20 @@ 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_YES 2 -#define RET_NO 3 -#define RET_RETRY 4 +#define RET_OK TRUE +#define RET_CANCEL FALSE +#define RET_YES 2 +#define RET_NO 3 +#define RET_RETRY 4 #define RET_IGNORE 5 -#define BUTTONID_OK RET_OK -#define BUTTONID_CANCEL RET_CANCEL -#define BUTTONID_YES RET_YES -#define BUTTONID_NO RET_NO -#define BUTTONID_RETRY RET_RETRY +#define BUTTONID_OK RET_OK +#define BUTTONID_CANCEL RET_CANCEL +#define BUTTONID_YES RET_YES +#define BUTTONID_NO RET_NO +#define BUTTONID_RETRY RET_RETRY #define BUTTONID_IGNORE RET_IGNORE -#define BUTTONID_HELP 10 +#define BUTTONID_HELP 10 // ----------- // - MessBox - @@ -67,24 +67,24 @@ class CheckBox; class VCL_DLLPUBLIC MessBox : public ButtonDialog { protected: - FixedText* mpFixedText; - FixedImage* mpFixedImage; - XubString maMessText; - Image maImage; - Image maImageHC; - USHORT mnSoundType; - BOOL mbHelpBtn; - BOOL mbSound; + FixedText* mpFixedText; + FixedImage* mpFixedImage; + XubString maMessText; + Image maImage; + Image maImageHC; + USHORT mnSoundType; + BOOL mbHelpBtn; + BOOL mbSound; CheckBox* mpCheckBox; XubString maCheckBoxText; BOOL mbCheck; - SAL_DLLPRIVATE void ImplInitMessBoxData(); - SAL_DLLPRIVATE void ImplInitButtons(); - SAL_DLLPRIVATE void ImplPosControls(); + SAL_DLLPRIVATE void ImplInitMessBoxData(); + SAL_DLLPRIVATE void ImplInitButtons(); + SAL_DLLPRIVATE void ImplPosControls(); protected: - SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); + SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); MessBox( WindowType nType ); public: @@ -93,13 +93,13 @@ public: MessBox( Window* pParent, const ResId& rResId ); ~MessBox(); - virtual void StateChanged( StateChangedType nStateChange ); + virtual void StateChanged( StateChangedType nStateChange ); - void SetMessText( const XubString& rText ) { maMessText = rText; } - const XubString& GetMessText() const { return maMessText; } + void SetMessText( const XubString& rText ) { maMessText = rText; } + const XubString& GetMessText() const { return maMessText; } - void SetImage( const Image& rImage ) { maImage = rImage; } - const Image& GetImage() const { return maImage; } + void SetImage( const Image& rImage ) { maImage = rImage; } + const Image& GetImage() const { return maImage; } BOOL SetModeImage( const Image& rImage, BmpColorMode eMode = BMP_COLOR_NORMAL ); const Image& GetModeImage( BmpColorMode eMode = BMP_COLOR_NORMAL ) const; @@ -120,14 +120,14 @@ public: class VCL_DLLPUBLIC InfoBox : public MessBox { private: - SAL_DLLPRIVATE void ImplInitInfoBoxData(); + SAL_DLLPRIVATE void ImplInitInfoBoxData(); public: InfoBox( Window* pParent, const XubString& rMessage ); InfoBox( Window* pParent, const ResId & rResId ); - static Image GetStandardImage(); - static Image GetStandardImageHC(); + static Image GetStandardImage(); + static Image GetStandardImageHC(); }; // -------------- @@ -137,7 +137,7 @@ public: class VCL_DLLPUBLIC WarningBox : public MessBox { private: - SAL_DLLPRIVATE void ImplInitWarningBoxData(); + SAL_DLLPRIVATE void ImplInitWarningBoxData(); public: WarningBox( Window* pParent, WinBits nStyle, @@ -146,8 +146,8 @@ public: void SetDefaultCheckBoxText(); - static Image GetStandardImage(); - static Image GetStandardImageHC(); + static Image GetStandardImage(); + static Image GetStandardImageHC(); }; // ------------ @@ -157,15 +157,15 @@ public: class VCL_DLLPUBLIC ErrorBox : public MessBox { private: - SAL_DLLPRIVATE void ImplInitErrorBoxData(); + SAL_DLLPRIVATE void ImplInitErrorBoxData(); public: ErrorBox( Window* pParent, WinBits nStyle, const XubString& rMessage ); ErrorBox( Window* pParent, const ResId& rResId ); - static Image GetStandardImage(); - static Image GetStandardImageHC(); + static Image GetStandardImage(); + static Image GetStandardImageHC(); }; // ------------ @@ -175,7 +175,7 @@ public: class VCL_DLLPUBLIC QueryBox : public MessBox { private: - SAL_DLLPRIVATE void ImplInitQueryBoxData(); + SAL_DLLPRIVATE void ImplInitQueryBoxData(); public: QueryBox( Window* pParent, WinBits nStyle, @@ -184,10 +184,10 @@ public: void SetDefaultCheckBoxText(); - static Image GetStandardImage(); - static Image GetStandardImageHC(); + static Image GetStandardImage(); + static Image GetStandardImageHC(); }; -#endif // _SV_MSGBOX_HXX +#endif // _SV_MSGBOX_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/octree.hxx b/vcl/inc/vcl/octree.hxx index 085ef648f98f..08f5153b7754 100644 --- a/vcl/inc/vcl/octree.hxx +++ b/vcl/inc/vcl/octree.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -36,8 +36,8 @@ // - Defines - // ----------- -#define OCTREE_BITS 5 -#define OCTREE_BITS_1 10 +#define OCTREE_BITS 5 +#define OCTREE_BITS_1 10 // -------------- // - OctreeNode - @@ -45,19 +45,19 @@ typedef struct OctreeNode { - ULONG nCount; - ULONG nRed; - ULONG nGreen; - ULONG nBlue; + ULONG nCount; + ULONG nRed; + ULONG nGreen; + ULONG nBlue; OctreeNode* pChild[ 8 ]; - OctreeNode* pNext; - OctreeNode* pNextInCache; - USHORT nPalIndex; - BOOL bLeaf; + OctreeNode* pNext; + OctreeNode* pNextInCache; + USHORT nPalIndex; + BOOL bLeaf; } NODE; -typedef NODE* PNODE; -typedef PNODE* PPNODE; +typedef NODE* PNODE; +typedef PNODE* PPNODE; // ---------- // - Octree - @@ -70,37 +70,37 @@ class VCL_DLLPUBLIC Octree { private: - BitmapPalette aPal; - ULONG nMax; - ULONG nLeafCount; - ULONG nLevel; - PNODE pTree; - PNODE pReduce[ OCTREE_BITS + 1 ]; - BitmapColor* pColor; - ImpNodeCache* pNodeCache; - const BitmapReadAccess* pAcc; - USHORT nPalIndex; + BitmapPalette aPal; + ULONG nMax; + ULONG nLeafCount; + ULONG nLevel; + PNODE pTree; + PNODE pReduce[ OCTREE_BITS + 1 ]; + BitmapColor* pColor; + ImpNodeCache* pNodeCache; + const BitmapReadAccess* pAcc; + USHORT nPalIndex; Octree() {}; - void CreatePalette( PNODE pNode ); - void GetPalIndex( PNODE pNode ); + void CreatePalette( PNODE pNode ); + void GetPalIndex( PNODE pNode ); SAL_DLLPRIVATE void ImplCreateOctree(); - SAL_DLLPRIVATE void ImplDeleteOctree( PPNODE ppNode ); - SAL_DLLPRIVATE void ImplAdd( PPNODE ppNode ); - SAL_DLLPRIVATE void ImplReduce(); + SAL_DLLPRIVATE void ImplDeleteOctree( PPNODE ppNode ); + SAL_DLLPRIVATE void ImplAdd( PPNODE ppNode ); + SAL_DLLPRIVATE void ImplReduce(); -public: +public: Octree( const BitmapReadAccess& rReadAcc, ULONG nColors ); Octree( ULONG nColors ); ~Octree(); - void AddColor( const BitmapColor& rColor ); + void AddColor( const BitmapColor& rColor ); - inline const BitmapPalette& GetPalette(); - inline USHORT GetBestPaletteIndex( const BitmapColor& rColor ); + inline const BitmapPalette& GetPalette(); + inline USHORT GetBestPaletteIndex( const BitmapColor& rColor ); }; // ------------------------------------------------------------------------ @@ -132,27 +132,27 @@ class VCL_DLLPUBLIC InverseColorMap { private: - BYTE* pBuffer; - BYTE* pMap; - const ULONG nBits; + BYTE* pBuffer; + BYTE* pMap; + const ULONG nBits; - SAL_DLLPRIVATE void ImplCreateBuffers( const ULONG nMax ); + SAL_DLLPRIVATE void ImplCreateBuffers( const ULONG nMax ); public: InverseColorMap( const BitmapPalette& rPal ); ~InverseColorMap(); - inline USHORT GetBestPaletteIndex( const BitmapColor& rColor ); + inline USHORT GetBestPaletteIndex( const BitmapColor& rColor ); }; // ------------------------------------------------------------------------ inline USHORT InverseColorMap::GetBestPaletteIndex( const BitmapColor& rColor ) { - return pMap[ ( ( (ULONG) rColor.GetRed() >> nBits ) << OCTREE_BITS_1 ) | - ( ( (ULONG) rColor.GetGreen() >> nBits ) << OCTREE_BITS ) | + return pMap[ ( ( (ULONG) rColor.GetRed() >> nBits ) << OCTREE_BITS_1 ) | + ( ( (ULONG) rColor.GetGreen() >> nBits ) << OCTREE_BITS ) | ( (ULONG) rColor.GetBlue() >> nBits ) ]; } diff --git a/vcl/inc/vcl/oldprintadaptor.hxx b/vcl/inc/vcl/oldprintadaptor.hxx index 1a6705b42cb8..2d68a08eee53 100644 --- a/vcl/inc/vcl/oldprintadaptor.hxx +++ b/vcl/inc/vcl/oldprintadaptor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,10 +40,10 @@ namespace vcl public: OldStylePrintAdaptor( const boost::shared_ptr< Printer >& ); virtual ~OldStylePrintAdaptor(); - + void StartPage(); void EndPage(); - + virtual int getPageCount() const; virtual com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getPageParameters( int i_nPage ) const; virtual void printPage( int i_nPage ) const; diff --git a/vcl/inc/vcl/outdata.hxx b/vcl/inc/vcl/outdata.hxx index 2f4a9b5ed7aa..e0a3a541d42c 100644 --- a/vcl/inc/vcl/outdata.hxx +++ b/vcl/inc/vcl/outdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/outdev.h b/vcl/inc/vcl/outdev.h index a25636987439..3b9b07eefb74 100644 --- a/vcl/inc/vcl/outdev.h +++ b/vcl/inc/vcl/outdev.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -140,10 +140,10 @@ public: // nowadays these substitutions are needed for backward compatibility and tight platform integration: // - substitutions from configuration entries (Tools->Options->FontReplacement and/or fontconfig) // - device specific substitutions (e.g. for PS printer builtin fonts) -// - substitutions for missing fonts defined by configuration entries (generic and/or platform dependent fallbacks) +// - substitutions for missing fonts defined by configuration entries (generic and/or platform dependent fallbacks) // - substitutions for missing fonts defined by multi-token fontnames (e.g. fontname="SpecialFont;FallbackA;FallbackB") // - substitutions for incomplete fonts (implicit, generic, EUDC and/or platform dependent fallbacks) -// - substitutions for missing symbol fonts by translating code points into other symbol fonts +// - substitutions for missing symbol fonts by translating code points into other symbol fonts class ImplFontSubstitution { @@ -250,14 +250,14 @@ namespace basegfx { class B2DHomMatrix; } struct ImplOutDevData { - VirtualDevice* mpRotateDev; - vcl::ControlLayoutData* mpRecordLayout; - Rectangle maRecordRect; - ImplDirectFontSubstitution maDevFontSubst; + VirtualDevice* mpRotateDev; + vcl::ControlLayoutData* mpRecordLayout; + Rectangle maRecordRect; + ImplDirectFontSubstitution maDevFontSubst; // #i75163# - basegfx::B2DHomMatrix* mpViewTransform; - basegfx::B2DHomMatrix* mpInverseViewTransform; + basegfx::B2DHomMatrix* mpViewTransform; + basegfx::B2DHomMatrix* mpInverseViewTransform; }; void ImplFreeOutDevFontData(); diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx index cdabea609410..e975de6f7dbd 100644 --- a/vcl/inc/vcl/outdev.hxx +++ b/vcl/inc/vcl/outdev.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -196,10 +196,10 @@ struct KerningPair #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_COLORTRANSFORM ((USHORT)0x0008) #define IMAGE_DRAW_SEMITRANSPARENT ((USHORT)0x0010) -#define IMAGE_DRAW_MONOCHROME_BLACK ((USHORT)0x0020) -#define IMAGE_DRAW_MONOCHROME_WHITE ((USHORT)0x0040) +#define IMAGE_DRAW_MONOCHROME_BLACK ((USHORT)0x0020) +#define IMAGE_DRAW_MONOCHROME_WHITE ((USHORT)0x0040) #define IMAGE_DRAW_3DLOOK 0 #define IMAGE_DRAW_BTNLOOK 0 @@ -310,19 +310,19 @@ private: ImplOutDevData* mpOutDevData; List* mpUnoGraphicsList; vcl::PDFWriterImpl* mpPDFWriter; - vcl::ExtOutDevData* mpExtOutDevData; + vcl::ExtOutDevData* mpExtOutDevData; // TEMP TEMP TEMP VirtualDevice* mpAlphaVDev; /// Additional output pixel offset, applied in LogicToPixel (used by SetPixelOffset/GetPixelOffset) - long mnOutOffOrigX; + long mnOutOffOrigX; /// Additional output offset in _logical_ coordinates, applied in PixelToLogic (used by SetPixelOffset/GetPixelOffset) - long mnOutOffLogicX; + long mnOutOffLogicX; /// Additional output pixel offset, applied in LogicToPixel (used by SetPixelOffset/GetPixelOffset) - long mnOutOffOrigY; + long mnOutOffOrigY; /// Additional output offset in _logical_ coordinates, applied in PixelToLogic (used by SetPixelOffset/GetPixelOffset) - long mnOutOffLogicY; + long mnOutOffLogicY; /// Output offset for device output in pixel (pseudo window offset within window system's frames) long mnOutOffX; /// Output offset for device output in pixel (pseudo window offset within window system's frames) @@ -380,25 +380,25 @@ private: mbEnableRTL:1; 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 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 ImplReMirror( Point &rPoint ) const; SAL_DLLPRIVATE void ImplReMirror( Rectangle &rRect ) const; SAL_DLLPRIVATE void ImplReMirror( Region &rRegion ) const; - SAL_DLLPRIVATE void ImplInitOutDevData(); - SAL_DLLPRIVATE void ImplDeInitOutDevData(); - SAL_DLLPRIVATE void ImplInitLineColor(); - SAL_DLLPRIVATE void ImplInitFillColor(); - SAL_DLLPRIVATE bool ImplNewFont() const; - SAL_DLLPRIVATE void ImplInitFont() const; - SAL_DLLPRIVATE void ImplInitTextColor(); - 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 void ImplInitOutDevData(); + SAL_DLLPRIVATE void ImplDeInitOutDevData(); + SAL_DLLPRIVATE void ImplInitLineColor(); + SAL_DLLPRIVATE void ImplInitFillColor(); + SAL_DLLPRIVATE bool ImplNewFont() const; + SAL_DLLPRIVATE void ImplInitFont() const; + SAL_DLLPRIVATE void ImplInitTextColor(); + 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), @@ -425,78 +425,78 @@ public: SAL_DLLPRIVATE void ImplDrawSpecialText( SalLayout& ); SAL_DLLPRIVATE void ImplDrawText( SalLayout& ); SAL_DLLPRIVATE Rectangle ImplGetTextBoundRect( const SalLayout& ); - SAL_DLLPRIVATE void ImplDrawEmphasisMarks( SalLayout& ); + SAL_DLLPRIVATE void ImplDrawEmphasisMarks( SalLayout& ); - SAL_DLLPRIVATE void ImplDrawTextRect( long nBaseX, long nBaseY, long nX, long nY, long nWidth, long nHeight ); + SAL_DLLPRIVATE void ImplDrawTextRect( long nBaseX, long nBaseY, long nX, long nY, long nWidth, long nHeight ); - 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 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 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 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 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 ); static SAL_DLLPRIVATE long ImplGetTextLines( ImplMultiTextLineInfo& rLineInfo, long nWidth, const XubString& rStr, USHORT nStyle, const ::vcl::ITextLayout& _rLayout ); - SAL_DLLPRIVATE void ImplInitFontList() const; - SAL_DLLPRIVATE void ImplUpdateFontData( bool bNewFontLists ); - SAL_DLLPRIVATE static void ImplUpdateAllFontData( bool bNewFontLists ); - - SAL_DLLPRIVATE long ImplLogicXToDevicePixel( long nX ) const; - SAL_DLLPRIVATE long ImplLogicYToDevicePixel( long nY ) const; - SAL_DLLPRIVATE long ImplLogicWidthToDevicePixel( long nWidth ) const; - SAL_DLLPRIVATE long ImplLogicHeightToDevicePixel( long nHeight ) const; - SAL_DLLPRIVATE long ImplDevicePixelToLogicWidth( long nWidth ) const; - SAL_DLLPRIVATE long ImplDevicePixelToLogicHeight( long nHeight ) const; - SAL_DLLPRIVATE float ImplFloatLogicWidthToDevicePixel( float ) const; - SAL_DLLPRIVATE float ImplFloatLogicHeightToDevicePixel( float ) const; - SAL_DLLPRIVATE float ImplFloatDevicePixelToLogicWidth( float ) const; - SAL_DLLPRIVATE float ImplFloatDevicePixelToLogicHeight( float ) const; - SAL_DLLPRIVATE Point ImplLogicToDevicePixel( const Point& rLogicPt ) const; - SAL_DLLPRIVATE Size ImplLogicToDevicePixel( const Size& rLogicSize ) const; - SAL_DLLPRIVATE Rectangle ImplLogicToDevicePixel( const Rectangle& rLogicRect ) const; + SAL_DLLPRIVATE void ImplInitFontList() const; + SAL_DLLPRIVATE void ImplUpdateFontData( bool bNewFontLists ); + SAL_DLLPRIVATE static void ImplUpdateAllFontData( bool bNewFontLists ); + + SAL_DLLPRIVATE long ImplLogicXToDevicePixel( long nX ) const; + SAL_DLLPRIVATE long ImplLogicYToDevicePixel( long nY ) const; + SAL_DLLPRIVATE long ImplLogicWidthToDevicePixel( long nWidth ) const; + SAL_DLLPRIVATE long ImplLogicHeightToDevicePixel( long nHeight ) const; + SAL_DLLPRIVATE long ImplDevicePixelToLogicWidth( long nWidth ) const; + SAL_DLLPRIVATE long ImplDevicePixelToLogicHeight( long nHeight ) const; + SAL_DLLPRIVATE float ImplFloatLogicWidthToDevicePixel( float ) const; + SAL_DLLPRIVATE float ImplFloatLogicHeightToDevicePixel( float ) const; + SAL_DLLPRIVATE float ImplFloatDevicePixelToLogicWidth( float ) const; + SAL_DLLPRIVATE float ImplFloatDevicePixelToLogicHeight( float ) const; + SAL_DLLPRIVATE Point ImplLogicToDevicePixel( const Point& rLogicPt ) const; + SAL_DLLPRIVATE Size ImplLogicToDevicePixel( const Size& rLogicSize ) const; + SAL_DLLPRIVATE Rectangle ImplLogicToDevicePixel( const Rectangle& rLogicRect ) const; SAL_DLLPRIVATE ::basegfx::B2DPolygon ImplLogicToDevicePixel( const ::basegfx::B2DPolygon& ) const; SAL_DLLPRIVATE ::basegfx::B2DPolyPolygon ImplLogicToDevicePixel( const ::basegfx::B2DPolyPolygon& ) const; - SAL_DLLPRIVATE Polygon ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const; - SAL_DLLPRIVATE PolyPolygon ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const; - SAL_DLLPRIVATE LineInfo ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const; - SAL_DLLPRIVATE Rectangle ImplDevicePixelToLogic( const Rectangle& rLogicRect ) const; - SAL_DLLPRIVATE Region ImplPixelToDevicePixel( const Region& rRegion ) const; - SAL_DLLPRIVATE void ImplInvalidateViewTransform(); + SAL_DLLPRIVATE Polygon ImplLogicToDevicePixel( const Polygon& rLogicPoly ) const; + SAL_DLLPRIVATE PolyPolygon ImplLogicToDevicePixel( const PolyPolygon& rLogicPolyPoly ) const; + SAL_DLLPRIVATE LineInfo ImplLogicToDevicePixel( const LineInfo& rLineInfo ) const; + SAL_DLLPRIVATE Rectangle ImplDevicePixelToLogic( const Rectangle& rLogicRect ) const; + SAL_DLLPRIVATE Region ImplPixelToDevicePixel( const Region& rRegion ) const; + SAL_DLLPRIVATE void ImplInvalidateViewTransform(); SAL_DLLPRIVATE basegfx::B2DHomMatrix ImplGetDeviceTransformation() const; - 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 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 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, 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 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 ); - SAL_DLLPRIVATE void ImplDrawBitmapWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); - SAL_DLLPRIVATE void ImplDrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); - SAL_DLLPRIVATE void ImplDraw2ColorFrame( const Rectangle& rRect, const Color& rLeftTopColor, const Color& rRightBottomColor ); + 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 ); + SAL_DLLPRIVATE void ImplDrawBitmapWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); + SAL_DLLPRIVATE void ImplDrawGradientWallpaper( long nX, long nY, long nWidth, long nHeight, const Wallpaper& rWallpaper ); + SAL_DLLPRIVATE void ImplDraw2ColorFrame( const Rectangle& rRect, const Color& rLeftTopColor, const Color& rRightBottomColor ); - SAL_DLLPRIVATE void ImplDrawOutDevDirect( const OutputDevice* pSrcDev, void* pPosAry ); - SAL_DLLPRIVATE void ImplDrawBitmap( const Point& rDestPt, const Size& rDestSize, + 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 ); - SAL_DLLPRIVATE void ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize, + SAL_DLLPRIVATE void ImplDrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, const BitmapEx& rBitmapEx, const ULONG nAction ); - SAL_DLLPRIVATE void ImplDrawMask( const Point& rDestPt, const Size& rDestSize, + 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 ); - SAL_DLLPRIVATE void ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha, + SAL_DLLPRIVATE void ImplDrawAlpha( const Bitmap& rBmp, const AlphaMask& rAlpha, const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel ); SAL_DLLPRIVATE Bitmap ImplBlend( Bitmap aBmp, @@ -522,20 +522,20 @@ public: const sal_Int32 nDstWidth, const long* pMapX, const long* pMapY ); - SAL_DLLPRIVATE void ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask, + SAL_DLLPRIVATE void ImplPrintTransparent( const Bitmap& rBmp, const Bitmap& rMask, const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel ); - SAL_DLLPRIVATE void ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor, + SAL_DLLPRIVATE void ImplPrintMask( const Bitmap& rMask, const Color& rMaskColor, const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel ); - SAL_DLLPRIVATE void ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, + SAL_DLLPRIVATE void ImplDrawFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, const OutputDevice& rOutDev, const Region& rRegion ); - SAL_DLLPRIVATE void ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, + SAL_DLLPRIVATE void ImplGetFrameDev( const Point& rPt, const Point& rDevPt, const Size& rDevSize, OutputDevice& rOutDev ); - SAL_DLLPRIVATE void ImplGetFrameBitmap( const Point& rPt, const Size& rSize, + SAL_DLLPRIVATE void ImplGetFrameBitmap( const Point& rPt, const Size& rSize, Bitmap& rBitmap ) const; - SAL_DLLPRIVATE BOOL ImplIsRecordLayout() const; + SAL_DLLPRIVATE BOOL ImplIsRecordLayout() const; void ImplAddDevFontSubstitute( const XubString& rFontName, const XubString& rReplaceFontName, @@ -543,7 +543,7 @@ public: SAL_DLLPRIVATE static FontEmphasisMark ImplGetEmphasisMarkStyle( const Font& rFont ); SAL_DLLPRIVATE static 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 ; @@ -551,7 +551,7 @@ public: // Helper which holds the old line geometry creation and is extended to use AA when // switched on. Advantage is that line geometry is only temporarily used for paint SAL_DLLPRIVATE void ImpDrawPolyLineWithLineInfo(const Polygon& rPoly, const LineInfo& rLineInfo); - + // #i101491# // Helper who implements the DrawPolyPolygon functionality for basegfx::B2DPolyPolygon // without MetaFile processing @@ -585,8 +585,8 @@ public: vcl::PDFWriterImpl* GetPDFWriter() const { return mpPDFWriter; } - void SetExtOutDevData( vcl::ExtOutDevData* pExtOutDevData ) { mpExtOutDevData = pExtOutDevData; } - vcl::ExtOutDevData* GetExtOutDevData() const { return mpExtOutDevData; } + void SetExtOutDevData( vcl::ExtOutDevData* pExtOutDevData ) { mpExtOutDevData = pExtOutDevData; } + vcl::ExtOutDevData* GetExtOutDevData() const { return mpExtOutDevData; } void DrawTextLine( const Point& rPos, long nWidth, FontStrikeout eStrikeout, @@ -836,7 +836,7 @@ public: void SetClipRegion(); void SetClipRegion( const Region& rRegion ); - void SetTriangleClipRegion( const PolyPolygon &rRegion ); + void SetTriangleClipRegion( const PolyPolygon &rRegion ); Region GetClipRegion() const; BOOL IsClipRegion() const { return mbClipRegion; } Region GetActiveClipRegion() const; @@ -932,7 +932,7 @@ public: // #i75163# basegfx::B2DHomMatrix GetViewTransformation() const; basegfx::B2DHomMatrix GetInverseViewTransformation() const; - + basegfx::B2DHomMatrix GetViewTransformation( const MapMode& rMapMode ) const; basegfx::B2DHomMatrix GetInverseViewTransformation( const MapMode& rMapMode ) const; @@ -959,7 +959,7 @@ public: @param rOffset The offset in pixel */ - void SetPixelOffset( const Size& rOffset ); + void SetPixelOffset( const Size& rOffset ); /** Get the offset in pixel @@ -967,7 +967,7 @@ public: @return the current offset in pixel */ - Size GetPixelOffset() const; + Size GetPixelOffset() const; Point LogicToPixel( const Point& rLogicPt ) const; Size LogicToPixel( const Size& rLogicSize ) const; @@ -1050,13 +1050,13 @@ public: static basegfx::B2DPolyPolygon LogicToLogic( const basegfx::B2DPolyPolygon& rPolyPoly, const MapMode& rMapModeSource, const MapMode& rMapModeDest ); - + Size GetOutputSizePixel() const { return Size( mnOutWidth, mnOutHeight ); } - long GetOutputWidthPixel() const { return mnOutWidth; } - long GetOutputHeightPixel() const { return mnOutHeight; } - long GetOutOffXPixel() const { return mnOutOffX; } - long GetOutOffYPixel() const { return mnOutOffY; } + long GetOutputWidthPixel() const { return mnOutWidth; } + long GetOutputHeightPixel() const { return mnOutHeight; } + long GetOutOffXPixel() const { return mnOutOffX; } + long GetOutOffYPixel() const { return mnOutOffY; } Size GetOutputSize() const { return PixelToLogic( GetOutputSizePixel() ); } @@ -1084,7 +1084,7 @@ public: // i60594 // validate kashida positions against the current font // returns count of invalid kashida positions - xub_StrLen ValidateKashidas ( const String& rTxt, + xub_StrLen ValidateKashidas ( const String& rTxt, xub_StrLen nIdx, xub_StrLen nLen, xub_StrLen nKashCount, // number of suggested kashida positions (in) const xub_StrLen* pKashidaPos, // suggested kashida positions (in) @@ -1111,7 +1111,7 @@ public: @return TRUE, if this device has an alpha channel. */ - BOOL HasAlpha(); + BOOL HasAlpha(); /** Added return value to see if EPS could be painted directly. Theoreticaly, handing over a matrix would be needed to handle @@ -1190,14 +1190,14 @@ public: BOOL IsNativeControlSupported( ControlType nType, ControlPart nPart ); // Query the native control to determine if it was acted upon - BOOL HitTestNativeControl( ControlType nType, + BOOL HitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, const Point& aPos, BOOL& rIsInside ); // Request rendering of a particular control and/or part - BOOL DrawNativeControl( ControlType nType, + BOOL DrawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -1205,7 +1205,7 @@ public: ::rtl::OUString aCaption ); // Request rendering of a caption string for a control - BOOL DrawNativeControlText( ControlType nType, + BOOL DrawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, @@ -1213,7 +1213,7 @@ public: ::rtl::OUString aCaption ); // Query the native control's actual drawing region (including adornment) - BOOL GetNativeControlRegion( ControlType nType, + 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 2bbc4d591ce6..5555930b8f35 100644 --- a/vcl/inc/vcl/outfont.hxx +++ b/vcl/inc/vcl/outfont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -273,7 +273,7 @@ public: void ImplInitAboveTextLineSize(); public: // TODO: hide members behind accessor methods - // font instance attributes from the font request + // font instance attributes from the font request long mnWidth; // Reference Width short mnOrientation; // Rotation in 1/10 degrees diff --git a/vcl/inc/vcl/pdfextoutdevdata.hxx b/vcl/inc/vcl/pdfextoutdevdata.hxx index 804e8c03287e..59fdc76d354b 100644 --- a/vcl/inc/vcl/pdfextoutdevdata.hxx +++ b/vcl/inc/vcl/pdfextoutdevdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -41,7 +41,7 @@ class Graphic; -namespace vcl { class PDFWriter; } +namespace vcl { class PDFWriter; } namespace vcl { @@ -53,8 +53,8 @@ namespace vcl */ struct PDFExtOutDevBookmarkEntry { - sal_Int32 nLinkId; - rtl::OUString aBookmark; + sal_Int32 nLinkId; + rtl::OUString aBookmark; }; /* @@ -69,19 +69,19 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData const OutputDevice& mrOutDev; sal_Bool mbTaggedPDF; - sal_Bool mbExportNotes; - sal_Bool mbTransitionEffects; - sal_Bool mbUseLosslessCompression; - sal_Bool mbReduceImageResolution; + sal_Bool mbExportNotes; + sal_Bool mbTransitionEffects; + sal_Bool mbUseLosslessCompression; + sal_Bool mbReduceImageResolution; sal_Bool mbExportFormFields; sal_Bool mbExportBookmarks; sal_Bool mbExportNDests; //i56629 sal_Int32 mnFormsFormat; - sal_Int32 mnPage; + sal_Int32 mnPage; com::sun::star::lang::Locale maDocLocale; - PageSyncData* mpPageSyncData; - GlobalSyncData* mpGlobalSyncData; + PageSyncData* mpPageSyncData; + GlobalSyncData* mpGlobalSyncData; std::vector< PDFExtOutDevBookmarkEntry > maBookmarks; @@ -98,20 +98,20 @@ public : - sal_Bool GetIsExportNotes() const; - void SetIsExportNotes( const sal_Bool bExportNotes ); + sal_Bool GetIsExportNotes() const; + void SetIsExportNotes( const sal_Bool bExportNotes ); - sal_Bool GetIsExportTaggedPDF() const; - void SetIsExportTaggedPDF( const sal_Bool bTaggedPDF ); + sal_Bool GetIsExportTaggedPDF() const; + void SetIsExportTaggedPDF( const sal_Bool bTaggedPDF ); - sal_Bool GetIsExportTransitionEffects() const; - void SetIsExportTransitionEffects( const sal_Bool bTransitionalEffects ); + sal_Bool GetIsExportTransitionEffects() const; + void SetIsExportTransitionEffects( const sal_Bool bTransitionalEffects ); sal_Bool GetIsExportFormFields() const; void SetIsExportFormFields( const sal_Bool bExportFormFields ); - sal_Int32 GetFormsFormat() const; - void SetFormsFormat( const sal_Int32 nFormsFormat ); + sal_Int32 GetFormsFormat() const; + void SetFormsFormat( const sal_Int32 nFormsFormat ); sal_Bool GetIsExportBookmarks() const; void SetIsExportBookmarks( const sal_Bool bExportBookmarks ); @@ -120,14 +120,14 @@ public : void SetIsExportNamedDestinations( const sal_Bool bExportNDests ); //i56629 // PageNumber, Compression is being set by the PDFExport - sal_Int32 GetCurrentPageNumber() const; - void SetCurrentPageNumber( const sal_Int32 nPage ); + sal_Int32 GetCurrentPageNumber() const; + void SetCurrentPageNumber( const sal_Int32 nPage ); - sal_Bool GetIsLosslessCompression() const; - void SetIsLosslessCompression( const sal_Bool bLosslessCompression ); + sal_Bool GetIsLosslessCompression() const; + void SetIsLosslessCompression( const sal_Bool bLosslessCompression ); - sal_Bool GetIsReduceImageResolution() const; - void SetIsReduceImageResolution( const sal_Bool bReduceImageResolution ); + sal_Bool GetIsReduceImageResolution() const; + void SetIsReduceImageResolution( const sal_Bool bReduceImageResolution ); const com::sun::star::lang::Locale& GetDocumentLocale() const; void SetDocumentLocale( const com::sun::star::lang::Locale& rLoc ); @@ -138,14 +138,14 @@ public : Use this method to group render output. */ - void BeginGroup(); + void BeginGroup(); /** End render output This method ends grouped render output without further actions. */ - void EndGroup(); + void EndGroup(); /** End render output @@ -170,20 +170,20 @@ public : The visible part of the output. This might be less than rOutputRect, e.g. for cropped graphics. */ - void EndGroup( const Graphic& rGraphic, - BYTE nTransparency, - const Rectangle& rOutputRect, - const Rectangle& rVisibleOutputRect ); + void EndGroup( const Graphic& rGraphic, + BYTE nTransparency, + const Rectangle& rOutputRect, + const Rectangle& rVisibleOutputRect ); //--->i56629 /** Create a new named destination to be used in a link to this document from another PDF document (see PDF spec 1.4, 8.2.1) - + @parm sDestName the name this destination will be addressed with from others PDF document @param rRect target rectangle on page to be displayed if dest is jumped to - + @param nPageNr number of page the dest is on (as returned by NewPage) or -1 in which case the current page is used @@ -202,7 +202,7 @@ public : @param rRect target rectangle on page to be displayed if dest is jumped to - + @param nPageNr number of page the dest is on (as returned by NewPage) or -1 in which case the current page is used @@ -248,14 +248,14 @@ public : <p>will change a dest type link to an URL type link if necessary</p> @param nLinkId the link to be changed - + @param rURL the URL the link shall point to. there will be no error checking or any kind of conversion done to this parameter execept this: it will be output as 7bit Ascii. The URL will appear literally in the PDF file produced - + @returns 0 for success -1 in case the link id does not exist @@ -307,7 +307,7 @@ public : -1 if the item does not exist */ sal_Int32 SetOutlineItemText( sal_Int32 nItem, const rtl::OUString& rText ); - + /** Set an outline item's destination @param nItem @@ -374,7 +374,7 @@ public : */ sal_Int32 BeginStructureElement( PDFWriter::StructElement eType, const rtl::OUString& rAlias = rtl::OUString() ); /** end a logical structure element - + @see BeginStructureElement */ void EndStructureElement(); @@ -399,14 +399,14 @@ public : */ bool SetCurrentStructureElement( sal_Int32 nElement ); /** get the current structure element id - + @returns the id of the current structure element */ sal_Int32 GetCurrentStructureElement(); /** set a structure attribute on the current structural element - + SetStructureAttribute sets an attribute of the current structural element to a new value. A consistency check is performed before actually setting the value; if the check fails, the function returns <FALSE/> and the attribute remains @@ -424,7 +424,7 @@ public : */ bool SetStructureAttribute( PDFWriter::StructAttribute eAttr, PDFWriter::StructAttributeValue eVal ); /** set a structure attribute on the current structural element - + SetStructureAttributeNumerical sets an attribute of the current structural element to a new numerical value. A consistency check is performed before actually setting the value; if the check fails, the function returns <FALSE/> and the attribute diff --git a/vcl/inc/vcl/pdfwriter.hxx b/vcl/inc/vcl/pdfwriter.hxx index 4ea221e5ff54..c5d4dd136cfe 100644 --- a/vcl/inc/vcl/pdfwriter.hxx +++ b/vcl/inc/vcl/pdfwriter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -64,18 +64,18 @@ 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 + 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 }; struct PDFNote { - String Title; // optional title for the popup containing the note - String Contents; // contents of the note + String Title; // optional title for the popup containing the note + String Contents; // contents of the note }; class VCL_DLLPUBLIC PDFOutputStream @@ -231,21 +231,21 @@ public: struct VCL_DLLPUBLIC AnyWidget { protected: - WidgetType Type; // primitive RTTI + WidgetType Type; // primitive RTTI 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 - bool ReadOnly; - Rectangle Location; // describes the area filled by the control - bool Border; // true: widget should have a border, false: no border - Color BorderColor;// COL_TRANSPARENT and Border=true means get color from application settings - bool Background; // true: widget shall draw its background, false: no background - Color BackgroundColor; // COL_TRANSPARENT and Background=true means get color from application settings - Font TextFont; // an empty font will be replaced by the + 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 + bool ReadOnly; + Rectangle Location; // describes the area filled by the control + bool Border; // true: widget should have a border, false: no border + Color BorderColor;// COL_TRANSPARENT and Border=true means get color from application settings + bool Background; // true: widget shall draw its background, false: no background + Color BackgroundColor; // COL_TRANSPARENT and Background=true means get color from application settings + Font TextFont; // an empty font will be replaced by the // appropriate font from the user settings - Color TextColor; // COL_TRANSPARENT will be replaced by the appropriate color from application settings + Color TextColor; // COL_TRANSPARENT will be replaced by the appropriate color from application settings sal_Int32 TabOrder; // lowest number is first in tab order /* style flags for text are those for OutputDevice::DrawText @@ -328,7 +328,7 @@ public: will appear literally in the PDF file produced */ sal_Int32 Dest; - rtl::OUString URL; + rtl::OUString URL; bool Submit; bool SubmitGet; @@ -345,8 +345,8 @@ public: struct CheckBoxWidget : public AnyWidget { - bool Checked; - bool ButtonIsLeft; + bool Checked; + bool ButtonIsLeft; CheckBoxWidget() : AnyWidget( vcl::PDFWriter::CheckBox ), @@ -362,9 +362,9 @@ public: struct RadioButtonWidget : public AnyWidget { - bool Selected; - sal_Int32 RadioGroup; - bool ButtonIsLeft; + bool Selected; + sal_Int32 RadioGroup; + bool ButtonIsLeft; rtl::OUString OnValue; // the value of the radio button if it is selected RadioButtonWidget() @@ -390,10 +390,10 @@ public: struct EditWidget : public AnyWidget { - bool MultiLine; // whether multiple lines are allowed - bool Password; // visible echo off - bool FileSelect; // field is a file selector - sal_Int32 MaxLen; // maximum field length in characters, 0 means unlimited + bool MultiLine; // whether multiple lines are allowed + bool Password; // visible echo off + bool FileSelect; // field is a file selector + sal_Int32 MaxLen; // maximum field length in characters, 0 means unlimited EditWidget() : AnyWidget( vcl::PDFWriter::Edit ), @@ -411,10 +411,10 @@ public: struct ListBoxWidget : public AnyWidget { - bool DropDown; - bool Sort; - bool MultiSelect; - std::vector<rtl::OUString> Entries; + bool DropDown; + bool Sort; + bool MultiSelect; + std::vector<rtl::OUString> Entries; std::vector<sal_Int32> SelectedEntries; // if MultiSelect is false only the first entry of SelectedEntries // will be taken into account. the same is implicit for PDF < 1.4 @@ -436,8 +436,8 @@ public: // note: PDF only supports dropdown comboboxes struct ComboBoxWidget : public AnyWidget { - bool Sort; - std::vector<rtl::OUString> Entries; + bool Sort; + std::vector<rtl::OUString> Entries; // set the current value in AnyWidget::Text ComboBoxWidget() @@ -493,7 +493,7 @@ The following structure describes the permissions used in PDF security struct PDFSecPermissions { //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 CanPrintTheDocument; bool CanModifyTheContent; bool CanCopyOrExtract; bool CanAddOrModify; @@ -504,23 +504,23 @@ The following structure describes the permissions used in PDF security bool CanPrintFull; //permission default set for 128 bit, accessibility only PDFSecPermissions() : - CanPrintTheDocument ( false ), - CanModifyTheContent ( false ), - CanCopyOrExtract ( false ), - CanAddOrModify ( false ), - CanFillInteractive ( false ), - CanExtractForAccessibility ( true ), - CanAssemble ( false ), - CanPrintFull ( false ) + CanPrintTheDocument ( false ), + CanModifyTheContent ( false ), + CanCopyOrExtract ( false ), + CanAddOrModify ( false ), + CanFillInteractive ( false ), + CanExtractForAccessibility ( true ), + CanAssemble ( false ), + CanPrintFull ( false ) {} }; struct PDFWriterContext { /* must be a valid file: URL usable by osl */ - rtl::OUString URL; + rtl::OUString URL; /* the URL of the document being exported, used for relative links*/ - rtl::OUString BaseURL; + rtl::OUString BaseURL; /*if relative to file system should be formed*/ bool RelFsys;//i56629, i49415?, i64585? /*the action to set the PDF hyperlink to*/ @@ -532,17 +532,17 @@ The following structure describes the permissions used in PDF security bool ForcePDFAction; /* decides the PDF language level to be produced */ - PDFVersion Version; + PDFVersion Version; /* valid for PDF >= 1.4 causes the MarkInfo entry in the document catalog to be set */ - bool Tagged; + bool Tagged; /* forces the embedding of PDF standard fonts */ bool EmbedStandardFonts; /* determines in which format a form will be submitted. */ - PDFWriter::ExportDataFormat SubmitFormat; + PDFWriter::ExportDataFormat SubmitFormat; bool AllowDuplicateFieldNames; bool FieldsUseSystemFonts; /* the following data members are used to customize the PDF viewer @@ -571,12 +571,12 @@ The following structure describes the permissions used in PDF security sal_Int32 InitialPage; sal_Int32 OpenBookmarkLevels; // -1 means all levels - struct PDFSecPermissions AccessPermissions; + 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 + 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 com::sun::star::lang::Locale DocumentLocale; // defines the document default language @@ -667,8 +667,8 @@ The following structure describes the permissions used in PDF security /* functions for graphics state */ /* flag values: see vcl/outdev.hxx */ - void Push( USHORT nFlags = 0xffff ); - void Pop(); + void Push( USHORT nFlags = 0xffff ); + void Pop(); void SetClipRegion(); void SetClipRegion( const basegfx::B2DPolyPolygon& rRegion ); @@ -703,81 +703,81 @@ The following structure describes the permissions used in PDF security /* actual drawing functions */ - void DrawText( const Point& rPos, const String& rText ); + void DrawText( const Point& rPos, const String& rText ); - void DrawTextLine( const Point& rPos, long nWidth, + void DrawTextLine( const Point& rPos, long nWidth, FontStrikeout eStrikeout, FontUnderline eUnderline, FontUnderline eOverline, BOOL bUnderlineAbove = FALSE ); - void DrawTextArray( const Point& rStartPt, const XubString& rStr, + 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, ULONG nWidth, const XubString& rStr, xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN ); - void DrawText( const Rectangle& rRect, + void DrawText( const Rectangle& rRect, const XubString& rStr, USHORT nStyle = 0 ); - void DrawPixel( const Point& rPt, const Color& rColor ); - void DrawPixel( const Point& rPt ) + void DrawPixel( const Point& rPt, const Color& rColor ); + void DrawPixel( const Point& rPt ) { DrawPixel( rPt, Color( COL_TRANSPARENT ) ); } - void DrawPixel( const Polygon& rPts, const Color* pColors = NULL ); - void DrawPixel( const Polygon& rPts, const Color& rColor ) + void DrawPixel( const Polygon& rPts, const Color* pColors = NULL ); + void DrawPixel( const Polygon& rPts, const Color& rColor ) { Push(); SetLineColor( rColor ); DrawPixel( rPts ); Pop(); } - void DrawLine( const Point& rStartPt, const Point& rEndPt ); - void DrawLine( const Point& rStartPt, const Point& rEndPt, + void DrawLine( const Point& rStartPt, const Point& rEndPt ); + void DrawLine( const Point& rStartPt, const Point& rEndPt, const LineInfo& rLineInfo ); - void DrawPolyLine( const Polygon& rPoly ); - void DrawPolyLine( const Polygon& rPoly, + void DrawPolyLine( const Polygon& rPoly ); + void DrawPolyLine( const Polygon& rPoly, const LineInfo& rLineInfo ); void DrawPolyLine( const Polygon& rPoly, const ExtLineInfo& rInfo ); - void DrawPolygon( const Polygon& rPoly ); - void DrawPolyPolygon( const PolyPolygon& rPolyPoly ); - void DrawRect( const Rectangle& rRect ); - void DrawRect( const Rectangle& rRect, + void DrawPolygon( const Polygon& rPoly ); + void DrawPolyPolygon( const PolyPolygon& rPolyPoly ); + void DrawRect( const Rectangle& rRect ); + void DrawRect( const Rectangle& rRect, ULONG nHorzRount, ULONG nVertRound ); - void DrawEllipse( const Rectangle& rRect ); - void DrawArc( const Rectangle& rRect, + void DrawEllipse( const Rectangle& rRect ); + void DrawArc( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); - void DrawPie( const Rectangle& rRect, + void DrawPie( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); - void DrawChord( const Rectangle& rRect, + void DrawChord( const Rectangle& rRect, const Point& rStartPt, const Point& rEndPt ); - void DrawBitmap( const Point& rDestPt, + void DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap ); - void DrawBitmap( const Point& rDestPt, const Size& rDestSize, + void DrawBitmap( const Point& rDestPt, const Size& rDestSize, const Bitmap& rBitmap ); - void DrawBitmap( const Point& rDestPt, const Size& rDestSize, + void DrawBitmap( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, const Bitmap& rBitmap ); - void DrawBitmapEx( const Point& rDestPt, + void DrawBitmapEx( const Point& rDestPt, const BitmapEx& rBitmapEx ); - void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, + void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const BitmapEx& rBitmapEx ); - void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, + void DrawBitmapEx( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, const BitmapEx& rBitmapEx ); - void DrawMask( const Point& rDestPt, + void DrawMask( const Point& rDestPt, const Bitmap& rBitmap, const Color& rMaskColor ); - void DrawMask( const Point& rDestPt, const Size& rDestSize, + void DrawMask( const Point& rDestPt, const Size& rDestSize, const Bitmap& rBitmap, const Color& rMaskColor ); - void DrawMask( const Point& rDestPt, const Size& rDestSize, + void DrawMask( const Point& rDestPt, const Size& rDestSize, const Point& rSrcPtPixel, const Size& rSrcSizePixel, const Bitmap& rBitmap, const Color& rMaskColor ); - void DrawGradient( const Rectangle& rRect, const Gradient& rGradient ); - void DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); + void DrawGradient( const Rectangle& rRect, const Gradient& rGradient ); + void DrawGradient( const PolyPolygon& rPolyPoly, const Gradient& rGradient ); - void DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); + void DrawHatch( const PolyPolygon& rPolyPoly, const Hatch& rHatch ); - void DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ); - void DrawTransparent( const PolyPolygon& rPolyPoly, + void DrawWallpaper( const Rectangle& rRect, const Wallpaper& rWallpaper ); + void DrawTransparent( const PolyPolygon& rPolyPoly, USHORT nTransparencePercent ); /** Start a transparency group @@ -798,7 +798,7 @@ The following structure describes the permissions used in PDF security will be ignored if the produced PDF has a lower version. The drawing operations will be emitted normally. */ - void BeginTransparencyGroup(); + void BeginTransparencyGroup(); /** End a transparency group with constant transparency factor @@ -811,7 +811,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, USHORT nTransparencePercent ); /** End a transparency group with an alpha mask @@ -824,7 +824,7 @@ The following structure describes the permissions used in PDF security @param rAlphaMask The transparency mask; must be an 8 bit grayscale image */ - void EndTransparencyGroup( const Rectangle& rBoundRect, const Bitmap& rAlphaMask ); + void EndTransparencyGroup( const Rectangle& rBoundRect, const Bitmap& rAlphaMask ); /** Insert a JPG encoded image (optionally with mask) @@ -845,7 +845,7 @@ The following structure describes the permissions used in PDF security the same pixel size as the image and be either 1 bit black&white or 8 bit grey */ - void DrawJPGBitmap( SvStream& rJPGData, bool bIsTrueColor, const Size& rSrcSizePixel, const Rectangle& rTargetArea, const Bitmap& rMask ); + void DrawJPGBitmap( SvStream& rJPGData, bool bIsTrueColor, const Size& rSrcSizePixel, const Rectangle& rTargetArea, const Bitmap& rMask ); /** Create a new named destination to be used in a link from another PDF document @@ -866,7 +866,7 @@ The following structure describes the permissions used in PDF security the destination id (to be used in SetLinkDest) or -1 if page id does not exist */ - sal_Int32 CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ ); + sal_Int32 CreateNamedDest( const rtl::OUString& sDestName, const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ ); /** Create a new destination to be used in a link @param rRect @@ -883,7 +883,7 @@ The following structure describes the permissions used in PDF security the destination id (to be used in SetLinkDest) or -1 if page id does not exist */ - sal_Int32 CreateDest( const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ ); + sal_Int32 CreateDest( const Rectangle& rRect, sal_Int32 nPageNr = -1, DestAreaType eType = XYZ ); /** Create a new link on a page @param rRect @@ -898,7 +898,7 @@ The following structure describes the permissions used in PDF security the link id (to be used in SetLinkDest, SetLinkURL) or -1 if page id does not exist */ - sal_Int32 CreateLink( const Rectangle& rRect, sal_Int32 nPageNr = -1 ); + sal_Int32 CreateLink( const Rectangle& rRect, sal_Int32 nPageNr = -1 ); /** Set the destination for a link <p>will change a URL type link to a dest link if necessary</p> @@ -912,7 +912,7 @@ The following structure describes the permissions used in PDF security -1 in case the link id does not exist -2 in case the dest id does not exist */ - sal_Int32 SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ); + sal_Int32 SetLinkDest( sal_Int32 nLinkId, sal_Int32 nDestId ); /** Set the URL for a link <p>will change a dest type link to an URL type link if necessary</p> @param nLinkId @@ -927,7 +927,7 @@ The following structure describes the permissions used in PDF security 0 for success -1 in case the link id does not exist */ - sal_Int32 SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ); + sal_Int32 SetLinkURL( sal_Int32 nLinkId, const rtl::OUString& rURL ); /** Resolve link in logical structure <p> If a link is created after the corresponding visual appearance was drawn @@ -957,7 +957,7 @@ The following structure describes the permissions used in PDF security the arbitrary id set in a <code>Link</code> structure element to address the link with real id <code>nLinkId</code> */ - void SetLinkPropertyID( sal_Int32 nLinkId, sal_Int32 nPropertyID ); + void SetLinkPropertyID( sal_Int32 nLinkId, sal_Int32 nPropertyID ); /** Create a new outline item @param nParent diff --git a/vcl/inc/vcl/pngread.hxx b/vcl/inc/vcl/pngread.hxx index 64385f604537..c22ee413233b 100644 --- a/vcl/inc/vcl/pngread.hxx +++ b/vcl/inc/vcl/pngread.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,7 +43,7 @@ namespace vcl class VCL_DLLPUBLIC PNGReader { - PNGReaderImpl* mpImpl; + PNGReaderImpl* mpImpl; public: @@ -54,15 +54,15 @@ namespace vcl /* an empty preview size hint (=default) will read the whole image */ - BitmapEx Read( const Size& i_rPreviewHint = Size() ); + BitmapEx Read( const Size& i_rPreviewHint = Size() ); // retrieve every chunk that resides inside the PNG struct ChunkData { - sal_uInt32 nType; - std::vector< sal_uInt8 > aData; + sal_uInt32 nType; + std::vector< sal_uInt8 > aData; }; - const std::vector< ChunkData >& GetChunks() const; + const std::vector< ChunkData >& GetChunks() const; void SetIgnoreGammaChunk( sal_Bool b ); }; diff --git a/vcl/inc/vcl/pngwrite.hxx b/vcl/inc/vcl/pngwrite.hxx index 15c8c624a5ff..6894c651f047 100644 --- a/vcl/inc/vcl/pngwrite.hxx +++ b/vcl/inc/vcl/pngwrite.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -45,7 +45,7 @@ namespace vcl class VCL_DLLPUBLIC PNGWriter { - PNGWriterImpl* mpImpl; + PNGWriterImpl* mpImpl; public: @@ -58,8 +58,8 @@ namespace vcl // additional method to be able to modify all chunk before they are stored struct ChunkData { - sal_uInt32 nType; - std::vector< sal_uInt8 > aData; + sal_uInt32 nType; + std::vector< sal_uInt8 > aData; }; std::vector< vcl::PNGWriter::ChunkData >& GetChunks(); }; diff --git a/vcl/inc/vcl/pointr.hxx b/vcl/inc/vcl/pointr.hxx index f003300b1f56..642e3c9c5cb1 100644 --- a/vcl/inc/vcl/pointr.hxx +++ b/vcl/inc/vcl/pointr.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -41,7 +41,7 @@ class Point; class VCL_DLLPUBLIC Pointer { - PointerStyle meStyle; + PointerStyle meStyle; public: Pointer() @@ -49,11 +49,11 @@ public: Pointer( PointerStyle eStyle ) { meStyle = eStyle; } - PointerStyle GetStyle() const { return meStyle; } + PointerStyle GetStyle() const { return meStyle; } - BOOL operator==( const Pointer& rPointer ) const + BOOL operator==( const Pointer& rPointer ) const { return (meStyle == rPointer.meStyle); } - BOOL operator!=( const Pointer& rPointer ) const + 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..83859edec270 100644 --- a/vcl/inc/vcl/polyscan.hxx +++ b/vcl/inc/vcl/polyscan.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -37,14 +37,14 @@ struct ScanlinePoint { - long mnX; - ScanlinePoint* mpNext; + long mnX; + ScanlinePoint* mpNext; ScanlinePoint() : mnX( 0L ), mpNext( NULL ) {}; ScanlinePoint( long nX, ScanlinePoint* pNext ) : mnX( nX ), mpNext( pNext ) {}; ~ScanlinePoint() {}; - void Set( long nX, ScanlinePoint* pNext ) { mnX = nX, mpNext = pNext; } + void Set( long nX, ScanlinePoint* pNext ) { mnX = nX, mpNext = pNext; } }; // ------------------- @@ -53,11 +53,11 @@ struct ScanlinePoint struct PolyScanSegment { - long mnStart; - long mnEnd; - + long mnStart; + long mnEnd; + PolyScanSegment() : mnStart( 0L ), mnEnd( 0L ) {}; - PolyScanSegment( long nStart, long nEnd ) : mnStart( nStart ), mnEnd( nEnd ) {}; + PolyScanSegment( long nStart, long nEnd ) : mnStart( nStart ), mnEnd( nEnd ) {}; ~PolyScanSegment() {}; }; @@ -65,36 +65,36 @@ struct PolyScanSegment // - PolyScanline - // ---------------- -struct ScanlinePoint; -class Polygon; -class PolyPolygon; +struct ScanlinePoint; +class Polygon; +class PolyPolygon; class PolyScanline { private: - ScanlinePoint* mpFirst; - ScanlinePoint* mpLast; - ScanlinePoint* mpAct; - long mnLeft; - long mnRight; - - void ImplDelete(); - + ScanlinePoint* mpFirst; + ScanlinePoint* mpLast; + ScanlinePoint* mpAct; + long mnLeft; + long mnRight; + + void ImplDelete(); + public: - + PolyScanline(); ~PolyScanline(); - - void Insert( long nX ); - 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 ); - - BOOL GetFirstSegment( PolyScanSegment& rSegment ); - BOOL GetNextSegment( PolyScanSegment& rSegment ); + + void Insert( long nX ); + 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 ); + + BOOL GetFirstSegment( PolyScanSegment& rSegment ); + BOOL GetNextSegment( PolyScanSegment& rSegment ); }; // ------------------------------------------------------------------------ @@ -119,18 +119,18 @@ inline BOOL PolyScanline::GetNextX( long& rX ) class PolyScanner { private: - - PolyScanline* mpArray; - long mnLeft; - long mnTop; - long mnRight; - long mnBottom; + + PolyScanline* mpArray; + long mnLeft; + long mnTop; + long mnRight; + long mnBottom; PolyScanner() {}; protected: - void InsertLine( const Point& rStart, const Point& rEnd ); + void InsertLine( const Point& rStart, const Point& rEnd ); public: @@ -139,18 +139,18 @@ public: PolyScanner( const PolyPolygon& rPolyPoly ); ~PolyScanner(); - long Left() const { return mnLeft; } - long Top() const { return mnTop; } - long Right() const { return mnRight; } - long Bottom() const { return mnBottom; } + long Left() const { return mnLeft; } + long Top() const { return mnTop; } + long Right() const { return mnRight; } + long Bottom() const { return mnBottom; } - long Width() const { return( mnRight - mnLeft + 1L ); } - long Height() const { return( mnBottom - mnTop + 1L ); } + long Width() const { return( mnRight - mnLeft + 1L ); } + long Height() const { return( mnBottom - mnTop + 1L ); } - Rectangle GetBoundRect() const { return Rectangle( mnLeft, mnTop, mnRight, mnBottom ); } + Rectangle GetBoundRect() const { return Rectangle( mnLeft, mnTop, mnRight, mnBottom ); } - ULONG Count() const { return Height(); } - PolyScanline* operator[]( ULONG nPos ) const; + ULONG Count() const { return Height(); } + PolyScanline* operator[]( ULONG nPos ) const; }; #endif // _SV_POLYSCAN_HXX diff --git a/vcl/inc/vcl/popupmenuwindow.hxx b/vcl/inc/vcl/popupmenuwindow.hxx index 9759ab42fb73..59cdad454a43 100644 --- a/vcl/inc/vcl/popupmenuwindow.hxx +++ b/vcl/inc/vcl/popupmenuwindow.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/ppdparser.hxx b/vcl/inc/vcl/ppdparser.hxx index e306bf2dd61d..047b0677eca2 100644 --- a/vcl/inc/vcl/ppdparser.hxx +++ b/vcl/inc/vcl/ppdparser.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -66,22 +66,22 @@ class PPDKey typedef ::std::hash_map< ::rtl::OUString, PPDValue, ::rtl::OUStringHash > hash_type; typedef ::std::vector< PPDValue* > value_type; - String m_aKey; - hash_type m_aValues; - value_type m_aOrderedValues; - const PPDValue* m_pDefaultValue; - bool m_bQueryValue; - PPDValue m_aQueryValue; + String m_aKey; + hash_type m_aValues; + value_type m_aOrderedValues; + const PPDValue* m_pDefaultValue; + bool m_bQueryValue; + PPDValue m_aQueryValue; public: enum UIType { PickOne, PickMany, Boolean }; enum SetupType { ExitServer, Prolog, DocumentSetup, PageSetup, JCLSetup, AnySetup }; private: - bool m_bUIOption; - UIType m_eUIType; - int m_nOrderDependency; - SetupType m_eSetupType; + bool m_bUIOption; + UIType m_eUIType; + int m_nOrderDependency; + SetupType m_eSetupType; void eraseValue( const String& rOption ); public: @@ -146,42 +146,42 @@ private: static ::std::hash_map< rtl::OUString, rtl::OUString, rtl::OUStringHash >* pAllPPDFiles; - hash_type m_aKeys; - value_type m_aOrderedKeys; - ::std::list< PPDConstraint > m_aConstraints; + hash_type m_aKeys; + value_type m_aOrderedKeys; + ::std::list< PPDConstraint > m_aConstraints; // some identifying fields - String m_aPrinterName; - String m_aNickName; + String m_aPrinterName; + String m_aNickName; // the full path of the PPD file - String m_aFile; + String m_aFile; // some basic attributes - bool m_bColorDevice; - bool m_bType42Capable; - ULONG m_nLanguageLevel; + bool m_bColorDevice; + bool m_bType42Capable; + ULONG m_nLanguageLevel; rtl_TextEncoding m_aFileEncoding; // shortcuts to important keys and their default values // imageable area - const PPDValue* m_pDefaultImageableArea; - const PPDKey* m_pImageableAreas; + const PPDValue* m_pDefaultImageableArea; + const PPDKey* m_pImageableAreas; // paper dimensions - const PPDValue* m_pDefaultPaperDimension; - const PPDKey* m_pPaperDimensions; + const PPDValue* m_pDefaultPaperDimension; + const PPDKey* m_pPaperDimensions; // paper trays - const PPDValue* m_pDefaultInputSlot; - const PPDKey* m_pInputSlots; + const PPDValue* m_pDefaultInputSlot; + const PPDKey* m_pInputSlots; // resolutions - const PPDValue* m_pDefaultResolution; - const PPDKey* m_pResolutions; + const PPDValue* m_pDefaultResolution; + const PPDKey* m_pResolutions; // duplex commands - const PPDValue* m_pDefaultDuplexType; - const PPDKey* m_pDuplexTypes; + const PPDValue* m_pDefaultDuplexType; + const PPDKey* m_pDuplexTypes; // fonts - const PPDKey* m_pFontList; - + const PPDKey* m_pFontList; + // translations PPDTranslator* m_pTranslator; @@ -192,7 +192,7 @@ private: void parseOpenUI( const ByteString& rLine ); void parseConstraint( const ByteString& rLine ); void parse( std::list< ByteString >& rLines ); - + String handleTranslation( const ByteString& i_rString, bool i_bIsGlobalized ); static void scanPPDDir( const String& rDir ); @@ -237,15 +237,15 @@ public: // match the best paper for width and height String matchPaper( int nWidth, int nHeight ) const; - + bool getMargins( const String& rPaperName, int &rLeft, int& rRight, int &rUpper, int& rLower ) const; // values in pt // returns true if paper found - + // values int pt - + String getDefaultInputSlot() const; int getInputSlots() const { return m_pInputSlots ? m_pInputSlots->countValues() : 0; } @@ -277,8 +277,8 @@ public: String& rEncoding, String& rCharset ) const; String getFont( int ) const; - - + + rtl::OUString translateKey( const rtl::OUString& i_rKey, const com::sun::star::lang::Locale& i_rLocale = com::sun::star::lang::Locale() ) const; rtl::OUString translateOption( const rtl::OUString& i_rKey, diff --git a/vcl/inc/vcl/print.h b/vcl/inc/vcl/print.h index 5928cd6649a5..57c4bf074395 100644 --- a/vcl/inc/vcl/print.h +++ b/vcl/inc/vcl/print.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -48,8 +48,8 @@ namespace vcl struct ImplPrnQueueData { - QueueInfo* mpQueueInfo; - SalPrinterQueueInfo* mpSalQueueInfo; + QueueInfo* mpQueueInfo; + SalPrinterQueueInfo* mpSalQueueInfo; }; // -------------------- @@ -67,7 +67,7 @@ public: ImplPrnQueueList() {} ~ImplPrnQueueList(); - void Add( SalPrinterQueueInfo* pData ); + void Add( SalPrinterQueueInfo* pData ); ImplPrnQueueData* Get( const rtl::OUString& rPrinter ); }; diff --git a/vcl/inc/vcl/print.hxx b/vcl/inc/vcl/print.hxx index 85f41d564686..db41a166dcd2 100644 --- a/vcl/inc/vcl/print.hxx +++ b/vcl/inc/vcl/print.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -62,7 +62,7 @@ namespace vcl { // - Printer-Types - // ----------------- -#define PAGEQUEUE_ALLPAGES 0xFFFF +#define PAGEQUEUE_ALLPAGES 0xFFFF enum PrinterSupport { SUPPORT_SET_ORIENTATION, SUPPORT_SET_PAPERBIN, SUPPORT_SET_PAPERSIZE, SUPPORT_SET_PAPER, @@ -106,29 +106,29 @@ class VCL_DLLPUBLIC QueueInfo friend class Printer; private: - XubString maPrinterName; - XubString maDriver; - XubString maLocation; - XubString maComment; - sal_uInt32 mnStatus; - sal_uInt32 mnJobs; + XubString maPrinterName; + XubString maDriver; + XubString maLocation; + XubString maComment; + sal_uInt32 mnStatus; + sal_uInt32 mnJobs; public: QueueInfo(); QueueInfo( const QueueInfo& rInfo ); ~QueueInfo(); - const XubString& GetPrinterName() const { return maPrinterName; } - const XubString& GetDriver() const { return maDriver; } - const XubString& GetLocation() const { return maLocation; } - const XubString& GetComment() const { return maComment; } - sal_uInt32 GetStatus() const { return mnStatus; } - sal_uInt32 GetJobs() const { return mnJobs; } + const XubString& GetPrinterName() const { return maPrinterName; } + const XubString& GetDriver() const { return maDriver; } + const XubString& GetLocation() const { return maLocation; } + const XubString& GetComment() const { return maComment; } + sal_uInt32 GetStatus() const { return mnStatus; } + sal_uInt32 GetJobs() const { return mnJobs; } bool operator==( const QueueInfo& rInfo ) const; - friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo ); - friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo ); + friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStream, QueueInfo& rInfo ); + friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStream, const QueueInfo& rInfo ); }; // ------------------ @@ -136,7 +136,7 @@ public: // ------------------ enum PrinterTransparencyMode -{ +{ PRINTER_TRANSPARENCY_AUTO = 0, PRINTER_TRANSPARENCY_NONE = 1 }; @@ -144,7 +144,7 @@ enum PrinterTransparencyMode // ----------------------------------------------------------------------------- enum PrinterGradientMode -{ +{ PRINTER_GRADIENT_STRIPES = 0, PRINTER_GRADIENT_COLOR = 1 }; @@ -152,7 +152,7 @@ enum PrinterGradientMode // ----------------------------------------------------------------------------- enum PrinterBitmapMode -{ +{ PRINTER_BITMAP_OPTIMAL = 0, PRINTER_BITMAP_NORMAL = 1, PRINTER_BITMAP_RESOLUTION = 2 @@ -176,31 +176,31 @@ private: BOOL mbConvertToGreyscales; public: - + PrinterOptions(); ~PrinterOptions(); BOOL IsReduceTransparency() const { return mbReduceTransparency; } void SetReduceTransparency( 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; } - + PrinterGradientMode GetReducedGradientMode() const { return meReducedGradientsMode; } void SetReducedGradientMode( PrinterGradientMode eMode ) { meReducedGradientsMode = eMode; } USHORT GetReducedGradientStepCount() const { return mnReducedGradientStepCount; } void SetReducedGradientStepCount( USHORT nStepCount ) { mnReducedGradientStepCount = nStepCount; } - + BOOL IsReduceBitmaps() const { return mbReduceBitmaps; } void SetReduceBitmaps( 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; } @@ -221,53 +221,53 @@ class VCL_DLLPUBLIC Printer : public OutputDevice friend class ImplQPrinter; private: - SalInfoPrinter* mpInfoPrinter; - SalPrinter* mpPrinter; - SalGraphics* mpJobGraphics; - Printer* mpPrev; - Printer* mpNext; - VirtualDevice* mpDisplayDev; + SalInfoPrinter* mpInfoPrinter; + SalPrinter* mpPrinter; + SalGraphics* mpJobGraphics; + Printer* mpPrev; + Printer* mpNext; + VirtualDevice* mpDisplayDev; PrinterOptions* mpPrinterOptions; - XubString maPrinterName; - XubString maDriver; - XubString maPrintFile; - XubString maJobName; - 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; - Link maErrorHdl; - - SAL_DLLPRIVATE void ImplInitData(); - SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); - SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow ); + XubString maPrinterName; + XubString maDriver; + XubString maPrintFile; + XubString maJobName; + 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; + Link maErrorHdl; + + SAL_DLLPRIVATE void ImplInitData(); + SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); + SAL_DLLPRIVATE void ImplInitDisplay( const Window* pWindow ); SAL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const XubString& rPrinterName, const XubString* pDriver ); - SAL_DLLPRIVATE void ImplUpdatePageData(); - SAL_DLLPRIVATE void ImplUpdateFontList(); - SAL_DLLPRIVATE void ImplFindPaperFormatForUserSize( JobSetup&, bool bMatchNearest ); + SAL_DLLPRIVATE void ImplUpdatePageData(); + SAL_DLLPRIVATE void ImplUpdateFontList(); + SAL_DLLPRIVATE void ImplFindPaperFormatForUserSize( JobSetup&, bool bMatchNearest ); DECL_DLLPRIVATE_LINK( ImplDestroyPrinterAsync, void* ); SAL_DLLPRIVATE bool StartJob( const rtl::OUString& rJobName, boost::shared_ptr<vcl::PrinterController>& ); - + static SAL_DLLPRIVATE ULONG ImplSalPrinterErrorCodeToVCL( ULONG nError ); private: - SAL_DLLPRIVATE void ImplEndPrint(); + SAL_DLLPRIVATE void ImplEndPrint(); SAL_DLLPRIVATE BOOL EndJob(); SAL_DLLPRIVATE Printer( const Printer& rPrinter ); SAL_DLLPRIVATE Printer& operator =( const Printer& rPrinter ); @@ -280,8 +280,8 @@ public: protected: - void SetSelfAsQueuePrinter( BOOL bQueuePrinter ) { mbIsQueuePrinter = bQueuePrinter; } - BOOL IsQueuePrinter() const { return mbIsQueuePrinter; } + void SetSelfAsQueuePrinter( BOOL bQueuePrinter ) { mbIsQueuePrinter = bQueuePrinter; } + BOOL IsQueuePrinter() const { return mbIsQueuePrinter; } public: Printer(); @@ -289,84 +289,84 @@ public: Printer( const JobSetup& rJobSetup ); Printer( const QueueInfo& rQueueInfo ); Printer( const XubString& rPrinterName ); - virtual ~Printer(); + virtual ~Printer(); static const std::vector< rtl::OUString >& GetPrinterQueues(); static const QueueInfo* GetQueueInfo( const String& rPrinterName, bool bStatusUpdate ); - static XubString GetDefaultPrinterName(); + static XubString GetDefaultPrinterName(); - virtual void Error(); + virtual void Error(); - 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(); } + 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(); } - ULONG GetCapabilities( USHORT nType ) const; - BOOL HasSupport( PrinterSupport eFeature ) const; + ULONG GetCapabilities( USHORT nType ) const; + BOOL HasSupport( PrinterSupport eFeature ) const; - 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 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 ); + BOOL Setup( Window* pWindow = NULL ); + BOOL SetPrinterProps( const Printer* pPrinter ); void SetPrinterOptions( const PrinterOptions& rOptions ) { *mpPrinterOptions = rOptions; } const PrinterOptions& GetPrinterOptions() const { return( *mpPrinterOptions ); } - BOOL SetOrientation( Orientation eOrient ); - Orientation GetOrientation() const; + BOOL SetOrientation( Orientation eOrient ); + Orientation GetOrientation() const; DuplexMode GetDuplexMode() const; 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 ); - Paper GetPaper() const; + 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 ); + Paper GetPaper() const; // returns number of available paper formats - int GetPaperInfoCount() const; + int GetPaperInfoCount() const; // returns info about paper format nPaper - const PaperInfo& GetPaperInfo( int nPaper ) const; - USHORT GetPaperBinCount() const; - XubString GetPaperBinName( USHORT 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; } - - 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(); - const XubString& GetCurJobName() const { return maJobName; } - USHORT GetCurPage() const { return mnCurPage; } - BOOL IsJobActive() const { return mbJobActive; } - - ULONG GetError() const { return ERRCODE_TOERROR(mnError); } - ULONG GetErrorCode() const { return mnError; } - - void SetErrorHdl( const Link& rLink ) { maErrorHdl = rLink; } - const Link& GetErrorHdl() const { return maErrorHdl; } - + const PaperInfo& GetPaperInfo( int nPaper ) const; + USHORT GetPaperBinCount() const; + XubString GetPaperBinName( USHORT 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; } + + 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(); + const XubString& GetCurJobName() const { return maJobName; } + USHORT GetCurPage() const { return mnCurPage; } + BOOL IsJobActive() const { return mbJobActive; } + + ULONG GetError() const { return ERRCODE_TOERROR(mnError); } + ULONG GetErrorCode() const { return mnError; } + + void SetErrorHdl( const Link& rLink ) { maErrorHdl = rLink; } + const Link& GetErrorHdl() const { return maErrorHdl; } + void Compat_OldPrinterMetrics( bool bSet ); - + /** checks the printer list and updates it necessary * * sends a DataChanged event of type DATACHANGED_PRINTER @@ -375,9 +375,9 @@ public: static void updatePrinters(); /** execute a print job - + starts a print job asynchronously (that is will return - + */ static void PrintJob( const boost::shared_ptr<vcl::PrinterController>& i_pController, const JobSetup& i_rInitSetup @@ -417,7 +417,7 @@ public: long nVerticalSpacing; bool bDrawBorder; PrinterController::NupOrderType nOrder; - + MultiPageSetup() : nRows( 1 ), nColumns( 1 ), nRepeat( 1 ), aPaperSize( 21000, 29700 ) , nLeftMargin( 0 ), nTopMargin( 0 ) @@ -428,30 +428,30 @@ public: { } }; - + struct PageSize { Size aSize; // in 100th mm bool bFullPaper; // full paper, not only imageable area is printed - + PageSize( const Size& i_rSize = Size( 21000, 29700 ), bool i_bFullPaper = false ) : aSize( i_rSize ), bFullPaper( i_bFullPaper ) {} }; - + PrinterController(); virtual ~PrinterController(); - + const boost::shared_ptr<Printer>& getPrinter() const; /* for implementations: get current job properties as changed by e.g. print dialog this gets the current set of properties initially told to Printer::PrintJob - + For convenience a second sequence will be merged in to get a combined sequence. In case of duplicate property names, the value of i_MergeList wins. */ com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > getJobProperties( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rMergeList ) const; - + /* get the PropertyValue of a Property */ com::sun::star::beans::PropertyValue* getValue( const rtl::OUString& i_rPropertyName ); @@ -462,12 +462,12 @@ public: in case the property is unknown or not convertible to bool, i_bFallback is returned */ sal_Bool getBoolProperty( const rtl::OUString& i_rPropertyName, sal_Bool i_bFallback ) const; - + /* set a property value - can also be used to add another UI property */ void setValue( const rtl::OUString& i_rPropertyName, const com::sun::star::uno::Any& i_rValue ); void setValue( const com::sun::star::beans::PropertyValue& i_rValue ); - + /* return the currently active UI options. These are the same that were passed to setUIOptions. */ const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& getUIOptions() const; @@ -486,7 +486,7 @@ public: /* makeEnabled will chage the property rPropName depends on to the value that makes rPropName enabled. If the dependency itself is also disabled, no action will be performed. - + returns the property name rPropName depends on or an empty string if no change was made. */ @@ -505,14 +505,14 @@ public: virtual void printPage( int i_nPage ) const = 0; // must be overloaded by the app virtual void jobStarted(); // will be called after a possible dialog has been shown and the real printjob starts virtual void jobFinished( com::sun::star::view::PrintableState ); - + com::sun::star::view::PrintableState getJobState() const; - + void abortJob(); - + bool isShowDialogs() const; bool isDirectPrint() const; - + // implementation details, not usable outside vcl SAL_DLLPRIVATE int getFilteredPageCount(); SAL_DLLPRIVATE PageSize getPageFile( int i_inUnfilteredPage, GDIMetaFile& rMtf, bool i_bMayUseCache = false ); @@ -530,10 +530,10 @@ public: SAL_DLLPRIVATE void pushPropertiesToPrinter(); SAL_DLLPRIVATE 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 ); }; @@ -567,7 +567,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper bool hasProperty( const rtl::OUString& i_rPropertyName ) const; bool hasProperty( const char* i_pPropertyName ) const { return hasProperty( rtl::OUString::createFromAscii( i_pPropertyName ) ); } - + // returns an empty Any for not existing properties com::sun::star::uno::Any getValue( const rtl::OUString& i_rPropertyName ) const; // change a value in the property set; this will not have an effect to an eventual PrinterController @@ -601,7 +601,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper sal_Bool mbInternalOnly; sal_Bool mbEnabled; com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > maAddProps; - + UIControlOptions( const rtl::OUString& i_rDependsOnName = rtl::OUString(), sal_Int32 i_nDependsOnEntry = -1, sal_Bool i_bAttachToDependency = sal_False, @@ -643,7 +643,7 @@ class VCL_DLLPUBLIC PrinterOptionsHelper sal_Bool i_bValue, const UIControlOptions& i_rControlOptions = UIControlOptions() ); - + // 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, @@ -678,6 +678,6 @@ class VCL_DLLPUBLIC PrinterOptionsHelper } -#endif // _SV_PRINT_HXX +#endif // _SV_PRINT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/printergfx.hxx b/vcl/inc/vcl/printergfx.hxx index 61ace3af65bf..e625cd9d13b7 100644 --- a/vcl/inc/vcl/printergfx.hxx +++ b/vcl/inc/vcl/printergfx.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -61,10 +61,10 @@ private: public: - PrinterColor () : - meColorspace(eInvalid) + PrinterColor () : + meColorspace(eInvalid) {} - PrinterColor (sal_uInt16 nRed, sal_uInt16 nGreen, + PrinterColor (sal_uInt16 nRed, sal_uInt16 nGreen, sal_uInt16 nBlue) : mnRed (nRed), mnGreen (nGreen), @@ -92,11 +92,11 @@ public: sal_uInt16 GetBlue () const { return mnBlue; } sal_Bool operator== (const PrinterColor& aColor) const - { - return aColor.Is() && this->Is() - && mnRed == aColor.mnRed - && mnGreen == aColor.mnGreen - && mnBlue == aColor.mnBlue; + { + return aColor.Is() && this->Is() + && mnRed == aColor.mnRed + && mnGreen == aColor.mnGreen + && mnBlue == aColor.mnBlue; } sal_Bool operator!= (const PrinterColor& aColor) const { return ! (aColor==*this); } @@ -107,7 +107,7 @@ public: mnGreen = aColor.mnGreen; mnBlue = aColor.mnBlue; - return *this; + return *this; } PrinterColor& operator= (sal_uInt32 nRGB) @@ -117,7 +117,7 @@ public: mnGreen = (nRGB & 0x0000ff00) >> 8; mnRed = (nRGB & 0x00ff0000) >> 16; - return *this; + return *this; } }; @@ -135,7 +135,7 @@ struct CharacterMetric; /* * Bitmap Interface, this has to be filled with your actual bitmap implementation * sample implementations can be found in: - * psprint/workben/cui/pspdem.cxx + * psprint/workben/cui/pspdem.cxx * vcl/unx/source/gdi/salgdi2.cxx */ @@ -156,22 +156,22 @@ public: typedef enum { InvalidType = 0, - TrueColorImage, - MonochromeImage, - PaletteImage, + TrueColorImage, + MonochromeImage, + PaletteImage, GrayScaleImage } ImageType; /* - * printer raster operations + * printer raster operations */ struct GraphicsStatus { rtl::OString maFont; - rtl_TextEncoding maEncoding; - bool mbArtItalic; - bool mbArtBold; + rtl_TextEncoding maEncoding; + bool mbArtItalic; + bool mbArtBold; sal_Int32 mnTextHeight; sal_Int32 mnTextWidth; PrinterColor maColor; @@ -184,8 +184,8 @@ class Font3; class PrinterGfx { -private: - +private: + /* common settings */ double mfScaleX; @@ -201,18 +201,18 @@ private: osl::File* mpPageHeader; osl::File* mpPageBody; - void TranslateCoordinates (sal_Int32 &rXOut, sal_Int32 &rYOut, + void TranslateCoordinates (sal_Int32 &rXOut, sal_Int32 &rYOut, sal_Int32 nXIn, sal_Int32 nYIn ) { rXOut = nXIn; rYOut = nYIn; } void TranslateCoordinates (Point& rOut, const Point& rIn) { rOut = rIn; } - /* text/font related data, for a type1 font it has to be checked + /* text/font related data, for a type1 font it has to be checked whether this font has already been downloaded. A TrueType font will be converted into one or more Type3 fonts, containing glyphs - in no particular order. In addition to the existence of the - glyph in one of the subfonts, the mapping from unicode to the - glyph has to be remembered */ + in no particular order. In addition to the existence of the + glyph in one of the subfonts, the mapping from unicode to the + glyph has to be remembered */ std::list< sal_Int32 > maPS1Font; std::list< GlyphSet > maPS3Font; @@ -221,10 +221,10 @@ private: sal_Int32 mnFallbackID; sal_Int32 mnTextAngle; bool mbTextVertical; - PrintFontManager& mrFontMgr; + PrintFontManager& mrFontMgr; /* bitmap drawing implementation */ - + sal_Bool mbCompressBmp; void DrawPS1GrayImage (const PrinterBmp& rBitmap, const Rectangle& rArea); @@ -254,9 +254,9 @@ private: /* font / font substitution */ friend class Font3; const ::std::hash_map< fontID, fontID >* mpFontSubstitutes; - int getCharWidth (sal_Bool b_vert, sal_Unicode n_char, + int getCharWidth (sal_Bool b_vert, sal_Unicode n_char, CharacterMetric *p_bbox); - fontID getCharMetric (const Font3 &rFont, sal_Unicode n_char, + fontID getCharMetric (const Font3 &rFont, sal_Unicode n_char, CharacterMetric *p_bbox); fontID getFontSubstitute () const; fontID getFallbackID () const { return mnFallbackID; } @@ -273,7 +273,7 @@ public: { maVirtualStatus.maColor = rColor; } void PSUploadPS1Font (sal_Int32 nFontID); - void PSSetFont (const rtl::OString& rName, + void PSSetFont (const rtl::OString& rName, rtl_TextEncoding nEncoding = RTL_TEXTENCODING_DONTKNOW) { maVirtualStatus.maFont = rName; maVirtualStatus.maEncoding = nEncoding; } @@ -284,14 +284,14 @@ public: /* PS helpers */ enum pspath_t { moveto = 0, lineto = 1 }; - void PSBinLineTo (const Point& rCurrent, Point& rOld, + void PSBinLineTo (const Point& rCurrent, Point& rOld, sal_Int32& nColumn); - void PSBinMoveTo (const Point& rCurrent, Point& rOld, + void PSBinMoveTo (const Point& rCurrent, Point& rOld, sal_Int32& nColumn); void PSBinStartPath (); void PSBinEndPath (); void PSBinCurrentPath (sal_uInt32 nPoints, const Point* pPath); - void PSBinPath (const Point& rCurrent, Point& rOld, + void PSBinPath (const Point& rCurrent, Point& rOld, pspath_t eType, sal_Int32& nColumn); void PSRotate (sal_Int32 nAngle); @@ -303,27 +303,27 @@ public: void PSPointOp (const Point& rPoint, const sal_Char* pOperator); void PSHexString (const sal_uChar* pString, sal_Int16 nLen); void PSDeltaArray (const sal_Int32 *pArray, sal_Int16 nEntries); - void PSShowText (const sal_uChar* pString, - sal_Int16 nGlyphs, sal_Int16 nBytes, + void PSShowText (const sal_uChar* pString, + sal_Int16 nGlyphs, sal_Int16 nBytes, const sal_Int32* pDeltaArray = NULL); - void PSComment (const sal_Char* pComment ); - void LicenseWarning (const Point& rPoint, const sal_Unicode* pStr, - sal_Int16 nLen, const sal_Int32* pDeltaArray); + void PSComment (const sal_Char* pComment ); + void LicenseWarning (const Point& rPoint, const sal_Unicode* pStr, + sal_Int16 nLen, const sal_Int32* pDeltaArray); - void OnEndPage (); - void OnEndJob (); - void writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppliedFonts, std::list< rtl::OString >& rNeededFonts ); + void OnEndPage (); + void OnEndJob (); + void writeResources( osl::File* pFile, std::list< rtl::OString >& rSuppliedFonts, std::list< rtl::OString >& rNeededFonts ); PrintFontManager& GetFontMgr () { return mrFontMgr; } void drawVerticalizedText (const Point& rPoint, const sal_Unicode* pStr, sal_Int16 nLen, const sal_Int32* pDeltaArray ); - void drawText (const Point& rPoint, - const sal_Unicode* pStr, sal_Int16 nLen, + void drawText (const Point& rPoint, + const sal_Unicode* pStr, sal_Int16 nLen, const sal_Int32* pDeltaArray = NULL); - void drawGlyphs( const Point& rPoint, + void drawGlyphs( const Point& rPoint, sal_GlyphId* pGlyphIds, sal_Unicode* pUnicodes, sal_Int16 nLen, @@ -335,14 +335,14 @@ public: sal_Bool Init (const JobData& rData); void Clear(); - // query depth and size + // query depth and size void GetResolution (sal_Int32 &rDpiX, sal_Int32 &rDpiY) const; sal_uInt16 GetBitCount (); // clip region void ResetClipRegion (); void BeginSetClipRegion (sal_uInt32); - sal_Bool UnionClipRegion (sal_Int32 nX, sal_Int32 nY, + sal_Bool UnionClipRegion (sal_Int32 nX, sal_Int32 nY, sal_Int32 nDX, sal_Int32 nDY); void EndSetClipRegion (); @@ -351,7 +351,7 @@ public: { maLineColor = rLineColor; } void SetFillColor (const PrinterColor& rFillColor = PrinterColor()) { maFillColor = rFillColor; } - + // drawing primitives void DrawPixel (const Point& rPoint, const PrinterColor& rPixelColor); void DrawPixel (const Point& rPoint) @@ -360,17 +360,17 @@ public: void DrawRect (const Rectangle& rRectangle); void DrawPolyLine (sal_uInt32 nPoints, const Point* pPath ); void DrawPolygon (sal_uInt32 nPoints, const Point* pPath); - void DrawPolyPolygon (sal_uInt32 nPoly, - const sal_uInt32 *pPolygonSize, + void DrawPolyPolygon (sal_uInt32 nPoly, + const sal_uInt32 *pPolygonSize, const Point** pPolygonList); - void DrawPolyLineBezier (sal_uInt32 nPoints, + void DrawPolyLineBezier (sal_uInt32 nPoints, const Point* pPath, const BYTE* pFlgAry ); - void DrawPolygonBezier (sal_uInt32 nPoints, + void DrawPolygonBezier (sal_uInt32 nPoints, const Point* pPath, const BYTE* pFlgAry); void DrawPolyPolygonBezier (sal_uInt32 nPoly, - const sal_uInt32* pPoints, + const sal_uInt32* pPoints, const Point* const* pPtAry, const BYTE* const* pFlgAry); @@ -378,12 +378,12 @@ public: sal_Bool DrawEPS ( const Rectangle& rBoundingBox, void* pPtr, sal_uInt32 nSize); // image drawing - void DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, + void DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, const PrinterBmp& rBitmap); - void DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, - const PrinterBmp& rBitmap, + void DrawBitmap (const Rectangle& rDest, const Rectangle& rSrc, + const PrinterBmp& rBitmap, const PrinterBmp& rTransBitmap); - void DrawMask (const Rectangle& rDest, const Rectangle& rSrc, + void DrawMask (const Rectangle& rDest, const Rectangle& rSrc, const PrinterBmp &rBitmap, PrinterColor& rMaskColor); // font and text handling @@ -401,37 +401,37 @@ public: { return mnTextAngle; } sal_Int32 GetFontID () const { return mnFontID; } - bool GetFontVertical() const + bool GetFontVertical() const { return mbTextVertical; } sal_Int32 GetFontHeight () const { return maVirtualStatus.mnTextHeight; } sal_Int32 GetFontWidth () const { return maVirtualStatus.mnTextWidth; } - bool GetArtificialItalic() const + bool GetArtificialItalic() const { return maVirtualStatus.mbArtItalic; } - bool GetArtificialBold() const + bool GetArtificialBold() const { return maVirtualStatus.mbArtBold; } - void DrawText (const Point& rPoint, - const sal_Unicode* pStr, sal_Int16 nLen, + void DrawText (const Point& rPoint, + const sal_Unicode* pStr, sal_Int16 nLen, const sal_Int32* pDeltaArray = NULL); void SetTextColor (PrinterColor& rTextColor) { maTextColor = rTextColor; } - sal_Int32 GetCharWidth (sal_uInt16 nFrom, sal_uInt16 nTo, + sal_Int32 GetCharWidth (sal_uInt16 nFrom, sal_uInt16 nTo, long *pWidthArray); const ::std::list< KernPair >& getKernPairs( bool bVertical = false ) const; // advanced font handling sal_Bool GetGlyphBoundRect (sal_Unicode c, Rectangle& rOutRect); - sal_uInt32 GetGlyphOutline (sal_Unicode c, - sal_uInt16 **ppPolySizes, Point **ppPoints, + sal_uInt32 GetGlyphOutline (sal_Unicode c, + sal_uInt16 **ppPolySizes, Point **ppPoints, sal_uInt8 **ppFlags); // for CTL - void DrawGlyphs( const Point& rPoint, + void DrawGlyphs( const Point& rPoint, sal_GlyphId* pGlyphIds, sal_Unicode* pUnicodes, sal_Int16 nLen, sal_Int32* pDeltaArray ); - + bool getStrictSO52Compatibility() const; void setStrictSO52Compatibility( bool ); }; diff --git a/vcl/inc/vcl/printerinfomanager.hxx b/vcl/inc/vcl/printerinfomanager.hxx index ad1debee266b..1d271d192016 100644 --- a/vcl/inc/vcl/printerinfomanager.hxx +++ b/vcl/inc/vcl/printerinfomanager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -127,16 +127,16 @@ protected: std::list< WatchFile > m_aWatchFiles; rtl::OUString m_aDefaultPrinter; rtl::OUString m_aSystemPrintCommand; - + std::list< SystemPrintQueue > m_aSystemPrintQueues; - SystemQueueInfo* m_pQueueInfo; + SystemQueueInfo* m_pQueueInfo; - Type m_eType; + Type m_eType; bool m_bUseIncludeFeature; bool m_bUseJobPatch; rtl::OUString m_aSystemDefaultPaper; - + bool m_bDisableCUPS; PrinterInfoManager( Type eType = Default ); @@ -147,12 +147,12 @@ protected: // fill in font substitutions // the resulting hash_map maps from source to target font ids void fillFontSubstitutions( PrinterInfo& rInfo ) const; - + // fill default paper if not configured in config file // default paper is e.g. locale dependent // if a paper is already set it will not be overwritten void setDefaultPaper( PPDContext& rInfo ) const; - + void initSystemDefaultPaper(); public: @@ -170,7 +170,7 @@ public: // gets info about a named printer const PrinterInfo& getPrinterInfo( const rtl::OUString& rPrinter ) const; - + // gets the name of the default printer const rtl::OUString& getDefaultPrinter() const { return m_aDefaultPrinter; } @@ -209,7 +209,7 @@ public: // primarily used internally but also by padmin // returns the printer queue names virtual const std::list< SystemPrintQueue >& getSystemPrintQueues(); - + // similar but returnse whole commandlines virtual void getSystemPrintCommands( std::list< rtl::OUString >& rCommands ); @@ -220,23 +220,23 @@ public: // close the FILE* returned by startSpool and does the actual spooling // returns a numerical job id virtual int endSpool( const rtl::OUString& rPrinterName, const rtl::OUString& rJobTitle, FILE* pFile, const JobData& rDocumentJobData ); - + // for spadmin: whether adding or removing a printer is possible virtual bool addOrRemovePossible() const; - + bool getUseIncludeFeature() const { return m_bUseIncludeFeature; } bool getUseJobPatch() const { return m_bUseJobPatch; } - + // check whether a printer's feature string contains a subfeature bool checkFeatureToken( const rtl::OUString& rPrinterName, const char* pToken ) const; - + // set m_bDisableCUPS and update printer config void setCUPSDisabled( bool ); - + // gets m_bDisableCUPS, initialized from printer config bool isCUPSDisabled() const; }; - + } // namespace #endif // _PSPRINT_PRINTERINFOMANAGER_HXX_ diff --git a/vcl/inc/vcl/printerjob.hxx b/vcl/inc/vcl/printerjob.hxx index 62a1c078bc32..1d70218437d4 100644 --- a/vcl/inc/vcl/printerjob.hxx +++ b/vcl/inc/vcl/printerjob.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -41,14 +41,14 @@ namespace psp { class PrinterGfx; -class PrinterJob +class PrinterJob { private: // private data rtl::OUString maSpoolDirName; rtl::OUString maFileName; // empty: spool to command, else spool to named file - rtl::OUString maJobTitle; - int mnFileMode; + rtl::OUString maJobTitle; + int mnFileMode; osl::File* mpJobHeader; osl::File* mpJobTrailer; @@ -80,21 +80,21 @@ private: // private data sal_Int32 mnErrorCode; bool m_bQuickJob; - + private: // private methods - osl::File* CreateSpoolFile (const rtl::OUString& rName, + osl::File* CreateSpoolFile (const rtl::OUString& rName, const rtl::OUString& rExtension); void InitPaperSize (const JobData& rJobSetup); - bool writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup ); + bool writeFeatureList( osl::File* pFile, const JobData&, bool bDocumentSetup ); bool writeSetup( osl::File* pFile, const JobData& ); bool writePageSetup( osl::File* pFile, const JobData&, bool bWriteFeatures = true ); - void writeJobPatch( osl::File* File, const JobData& ); + void writeJobPatch( osl::File* File, const JobData& ); bool writeProlog (osl::File* pFile, const JobData& ); public: // for usage in PrinterGfx - + sal_uInt32 GetResolution () const { return mnResolution; } void GetScale (double &rXScale, double &rYScale) const; sal_uInt16 GetDepth () const; @@ -138,7 +138,7 @@ public: sal_Bool AbortJob (); - sal_Bool StartPage (const JobData& rJobSetup); + sal_Bool StartPage (const JobData& rJobSetup); sal_Bool EndPage (); sal_uInt32 GetErrorCode (); diff --git a/vcl/inc/vcl/prndlg.hxx b/vcl/inc/vcl/prndlg.hxx index f741cb6cd0d3..00265d725f4e 100644 --- a/vcl/inc/vcl/prndlg.hxx +++ b/vcl/inc/vcl/prndlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -60,12 +60,12 @@ namespace vcl VirtualDevice maPageVDev; rtl::OUString maReplacementString; rtl::OUString maToolTipString; - + bool useHCColorReplacement() const; public: PrintPreviewWindow( Window* pParent, const ResId& ); virtual ~PrintPreviewWindow(); - + virtual void Paint( const Rectangle& rRect ); virtual void Command( const CommandEvent& ); virtual void Resize(); @@ -75,7 +75,7 @@ namespace vcl sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); }; - + class ShowNupOrderWindow : public Window { int mnOrderMode; @@ -85,9 +85,9 @@ namespace vcl public: ShowNupOrderWindow( Window* pParent ); virtual ~ShowNupOrderWindow(); - + virtual void Paint( const Rectangle& ); - + void setValues( int i_nOrderMode, int i_nColumns, int i_nRows ) { mnOrderMode = i_nOrderMode; @@ -96,7 +96,7 @@ namespace vcl Invalidate(); } }; - + class NUpTabPage : public TabPage { public: @@ -105,10 +105,10 @@ namespace vcl RadioButton maBrochureBtn; FixedText maPagesBoxTitleTxt; ListBox maNupPagesBox; - + // controls for "Custom" page mode FixedText maNupNumPagesTxt; - NumericField maNupColEdt; + NumericField maNupColEdt; FixedText maNupTimesTxt; NumericField maNupRowsEdt; FixedText maPageMarginTxt1; @@ -126,26 +126,26 @@ namespace vcl ShowNupOrderWindow maNupOrderWin; // border around each page CheckBox maBorderCB; - + vcl::RowOrColumn maLayout; boost::shared_ptr< vcl::RowOrColumn > mxBrochureDep; boost::shared_ptr< vcl::LabeledElement >mxPagesBtnLabel; - + void setupLayout(); - + NUpTabPage( Window*, const ResId& ); virtual ~NUpTabPage(); - + void readFromSettings(); void storeToSettings(); void initFromMultiPageSetup( const vcl::PrinterController::MultiPageSetup& ); void enableNupControls( bool bEnable ); - + void showAdvancedControls( bool ); - + virtual void Resize(); }; - + class JobTabPage : public TabPage { public: @@ -158,38 +158,38 @@ namespace vcl FixedText maLocationTxt; FixedText maCommentLabel; FixedText maCommentTxt; - + PushButton maSetupButton; - + FixedLine maCopies; FixedLine maCopySpacer; FixedText maCopyCount; NumericField maCopyCountField; CheckBox maCollateBox; FixedImage maCollateImage; - + Image maCollateImg; Image maCollateHCImg; Image maNoCollateImg; Image maNoCollateHCImg; - + long mnCollateUIMode; vcl::RowOrColumn maLayout; boost::shared_ptr<vcl::RowOrColumn> mxPrintRange; boost::shared_ptr<vcl::WindowArranger> mxDetails; - + JobTabPage( Window*, const ResId& ); virtual ~JobTabPage(); void readFromSettings(); void storeToSettings(); - + virtual void Resize(); - + void setupLayout(); }; - + class OutputOptPage : public TabPage { public: @@ -200,7 +200,7 @@ namespace vcl vcl::RowOrColumn maLayout; boost::shared_ptr<vcl::RowOrColumn> mxOptGroup; - + OutputOptPage( Window*, const ResId& ); virtual ~OutputOptPage(); @@ -220,21 +220,21 @@ namespace vcl FixedText maNumPagesText; PushButton maBackwardBtn; PushButton maForwardBtn; - + TabControl maTabCtrl; NUpTabPage maNUpPage; JobTabPage maJobPage; OutputOptPage maOptionsPage; - + FixedLine maButtonLine; - + boost::shared_ptr< PrinterController > maPController; - + rtl::OUString maPageStr; rtl::OUString maNoPageStr; sal_Int32 mnCurPage; sal_Int32 mnCachedPages; - + std::list< Window* > maControls; std::map< Window*, rtl::OUString > maControlToPropertyMap; std::map< rtl::OUString, std::vector< Window* > > @@ -244,22 +244,22 @@ namespace vcl Size maNupPortraitSize; Size maNupLandscapeSize; - + // internal, used for automatic Nup-Portrait/landscape Size maFirstPageSize; - + rtl::OUString maPrintToFileText; rtl::OUString maPrintText; rtl::OUString maDefPrtText; - + vcl::RowOrColumn maLayout; boost::shared_ptr<vcl::RowOrColumn> mxPreviewCtrls; - + Size maDetailsCollapsedSize; Size maDetailsExpandedSize; - + sal_Bool mbShowLayoutPage; - + Size getJobPageSize(); void updateNup(); void updateNupFromPages(); @@ -274,41 +274,41 @@ namespace vcl void readFromSettings(); void storeToSettings(); com::sun::star::beans::PropertyValue* getValueForWindow( Window* ) const; - + virtual void Resize(); virtual void Command( const CommandEvent& ); virtual void DataChanged( const DataChangedEvent& ); - + DECL_LINK( SelectHdl, ListBox* ); DECL_LINK( ClickHdl, Button* ); DECL_LINK( ModifyHdl, Edit* ); DECL_LINK( UIOptionsChanged, void* ); - + DECL_LINK( UIOption_CheckHdl, CheckBox* ); DECL_LINK( UIOption_RadioHdl, RadioButton* ); DECL_LINK( UIOption_SelectHdl, ListBox* ); DECL_LINK( UIOption_ModifyHdl, Edit* ); - + void setupLayout(); public: PrintDialog( Window*, const boost::shared_ptr< PrinterController >& ); virtual ~PrintDialog(); - + bool isPrintToFile(); int getCopyCount(); bool isCollate(); bool isSingleJobs(); - + void previewForward(); void previewBackward(); }; - + class PrintProgressDialog : public ModelessDialog { String maStr; FixedText maText; CancelButton maButton; - + bool mbCanceled; sal_Int32 mnCur; sal_Int32 mnMax; @@ -317,17 +317,17 @@ namespace vcl bool mbNativeProgress; DECL_LINK( ClickHdl, Button* ); - + void implCalcProgressRect(); public: PrintProgressDialog( Window* i_pParent, int i_nMax ); ~PrintProgressDialog(); - + bool isCanceled() const { return mbCanceled; } void setProgress( int i_nCurrent, int i_nMax = -1 ); void tick(); void reset(); - + virtual void Paint( const Rectangle& ); }; } diff --git a/vcl/inc/vcl/prntypes.hxx b/vcl/inc/vcl/prntypes.hxx index 086cc7314c7b..3e26ee5f175c 100644 --- a/vcl/inc/vcl/prntypes.hxx +++ b/vcl/inc/vcl/prntypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -49,33 +49,33 @@ 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 ((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_JOBS_DONTKNOW ((ULONG)0xFFFFFFFF) +#define QUEUE_JOBS_DONTKNOW ((ULONG)0xFFFFFFFF) // ----------------- // - Printer-Types - @@ -93,6 +93,6 @@ enum Orientation { ORIENTATION_PORTRAIT, ORIENTATION_LANDSCAPE }; #define PRINTER_CAPABILITIES_EXTERNALDIALOG ((USHORT)10) #define PRINTER_CAPABILITIES_SETDUPLEX ((USHORT)11) -#endif // _SV_PRNTYPES_HXX +#endif // _SV_PRNTYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/ptrstyle.hxx b/vcl/inc/vcl/ptrstyle.hxx index 75502de85823..4ed6fd53ad17 100644 --- a/vcl/inc/vcl/ptrstyle.hxx +++ b/vcl/inc/vcl/ptrstyle.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -37,94 +37,94 @@ typedef USHORT PointerStyle; -#define POINTER_ARROW ((PointerStyle)0) -#define POINTER_NULL ((PointerStyle)1) -#define POINTER_WAIT ((PointerStyle)2) -#define POINTER_TEXT ((PointerStyle)3) -#define POINTER_HELP ((PointerStyle)4) -#define POINTER_CROSS ((PointerStyle)5) -#define POINTER_MOVE ((PointerStyle)6) -#define POINTER_NSIZE ((PointerStyle)7) -#define POINTER_SSIZE ((PointerStyle)8) -#define POINTER_WSIZE ((PointerStyle)9) -#define POINTER_ESIZE ((PointerStyle)10) -#define POINTER_NWSIZE ((PointerStyle)11) -#define POINTER_NESIZE ((PointerStyle)12) -#define POINTER_SWSIZE ((PointerStyle)13) -#define POINTER_SESIZE ((PointerStyle)14) -#define POINTER_WINDOW_NSIZE ((PointerStyle)15) -#define POINTER_WINDOW_SSIZE ((PointerStyle)16) -#define POINTER_WINDOW_WSIZE ((PointerStyle)17) -#define POINTER_WINDOW_ESIZE ((PointerStyle)18) -#define POINTER_WINDOW_NWSIZE ((PointerStyle)19) -#define POINTER_WINDOW_NESIZE ((PointerStyle)20) -#define POINTER_WINDOW_SWSIZE ((PointerStyle)21) -#define POINTER_WINDOW_SESIZE ((PointerStyle)22) -#define POINTER_HSPLIT ((PointerStyle)23) -#define POINTER_VSPLIT ((PointerStyle)24) -#define POINTER_HSIZEBAR ((PointerStyle)25) -#define POINTER_VSIZEBAR ((PointerStyle)26) -#define POINTER_HAND ((PointerStyle)27) -#define POINTER_REFHAND ((PointerStyle)28) -#define POINTER_PEN ((PointerStyle)29) -#define POINTER_MAGNIFY ((PointerStyle)30) -#define POINTER_FILL ((PointerStyle)31) -#define POINTER_ROTATE ((PointerStyle)32) -#define POINTER_HSHEAR ((PointerStyle)33) -#define POINTER_VSHEAR ((PointerStyle)34) -#define POINTER_MIRROR ((PointerStyle)35) -#define POINTER_CROOK ((PointerStyle)36) -#define POINTER_CROP ((PointerStyle)37) -#define POINTER_MOVEPOINT ((PointerStyle)38) -#define POINTER_MOVEBEZIERWEIGHT ((PointerStyle)39) -#define POINTER_MOVEDATA ((PointerStyle)40) -#define POINTER_COPYDATA ((PointerStyle)41) -#define POINTER_LINKDATA ((PointerStyle)42) -#define POINTER_MOVEDATALINK ((PointerStyle)43) -#define POINTER_COPYDATALINK ((PointerStyle)44) -#define POINTER_MOVEFILE ((PointerStyle)45) -#define POINTER_COPYFILE ((PointerStyle)46) -#define POINTER_LINKFILE ((PointerStyle)47) -#define POINTER_MOVEFILELINK ((PointerStyle)48) -#define POINTER_COPYFILELINK ((PointerStyle)49) -#define POINTER_MOVEFILES ((PointerStyle)50) -#define POINTER_COPYFILES ((PointerStyle)51) -#define POINTER_NOTALLOWED ((PointerStyle)52) -#define POINTER_DRAW_LINE ((PointerStyle)53) -#define POINTER_DRAW_RECT ((PointerStyle)54) -#define POINTER_DRAW_POLYGON ((PointerStyle)55) -#define POINTER_DRAW_BEZIER ((PointerStyle)56) -#define POINTER_DRAW_ARC ((PointerStyle)57) -#define POINTER_DRAW_PIE ((PointerStyle)58) -#define POINTER_DRAW_CIRCLECUT ((PointerStyle)59) -#define POINTER_DRAW_ELLIPSE ((PointerStyle)60) -#define POINTER_DRAW_FREEHAND ((PointerStyle)61) -#define POINTER_DRAW_CONNECT ((PointerStyle)62) -#define POINTER_DRAW_TEXT ((PointerStyle)63) -#define POINTER_DRAW_CAPTION ((PointerStyle)64) -#define POINTER_CHART ((PointerStyle)65) -#define POINTER_DETECTIVE ((PointerStyle)66) -#define POINTER_PIVOT_COL ((PointerStyle)67) -#define POINTER_PIVOT_ROW ((PointerStyle)68) -#define POINTER_PIVOT_FIELD ((PointerStyle)69) -#define POINTER_CHAIN ((PointerStyle)70) -#define POINTER_CHAIN_NOTALLOWED ((PointerStyle)71) -#define POINTER_TIMEEVENT_MOVE ((PointerStyle)72) -#define POINTER_TIMEEVENT_SIZE ((PointerStyle)73) -#define POINTER_AUTOSCROLL_N ((PointerStyle)74) -#define POINTER_AUTOSCROLL_S ((PointerStyle)75) -#define POINTER_AUTOSCROLL_W ((PointerStyle)76) -#define POINTER_AUTOSCROLL_E ((PointerStyle)77) -#define POINTER_AUTOSCROLL_NW ((PointerStyle)78) -#define POINTER_AUTOSCROLL_NE ((PointerStyle)79) -#define POINTER_AUTOSCROLL_SW ((PointerStyle)80) -#define POINTER_AUTOSCROLL_SE ((PointerStyle)81) -#define POINTER_AUTOSCROLL_NS ((PointerStyle)82) -#define POINTER_AUTOSCROLL_WE ((PointerStyle)83) -#define POINTER_AUTOSCROLL_NSWE ((PointerStyle)84) -#define POINTER_AIRBRUSH ((PointerStyle)85) -#define POINTER_TEXT_VERTICAL ((PointerStyle)86) -#define POINTER_PIVOT_DELETE ((PointerStyle)87) +#define POINTER_ARROW ((PointerStyle)0) +#define POINTER_NULL ((PointerStyle)1) +#define POINTER_WAIT ((PointerStyle)2) +#define POINTER_TEXT ((PointerStyle)3) +#define POINTER_HELP ((PointerStyle)4) +#define POINTER_CROSS ((PointerStyle)5) +#define POINTER_MOVE ((PointerStyle)6) +#define POINTER_NSIZE ((PointerStyle)7) +#define POINTER_SSIZE ((PointerStyle)8) +#define POINTER_WSIZE ((PointerStyle)9) +#define POINTER_ESIZE ((PointerStyle)10) +#define POINTER_NWSIZE ((PointerStyle)11) +#define POINTER_NESIZE ((PointerStyle)12) +#define POINTER_SWSIZE ((PointerStyle)13) +#define POINTER_SESIZE ((PointerStyle)14) +#define POINTER_WINDOW_NSIZE ((PointerStyle)15) +#define POINTER_WINDOW_SSIZE ((PointerStyle)16) +#define POINTER_WINDOW_WSIZE ((PointerStyle)17) +#define POINTER_WINDOW_ESIZE ((PointerStyle)18) +#define POINTER_WINDOW_NWSIZE ((PointerStyle)19) +#define POINTER_WINDOW_NESIZE ((PointerStyle)20) +#define POINTER_WINDOW_SWSIZE ((PointerStyle)21) +#define POINTER_WINDOW_SESIZE ((PointerStyle)22) +#define POINTER_HSPLIT ((PointerStyle)23) +#define POINTER_VSPLIT ((PointerStyle)24) +#define POINTER_HSIZEBAR ((PointerStyle)25) +#define POINTER_VSIZEBAR ((PointerStyle)26) +#define POINTER_HAND ((PointerStyle)27) +#define POINTER_REFHAND ((PointerStyle)28) +#define POINTER_PEN ((PointerStyle)29) +#define POINTER_MAGNIFY ((PointerStyle)30) +#define POINTER_FILL ((PointerStyle)31) +#define POINTER_ROTATE ((PointerStyle)32) +#define POINTER_HSHEAR ((PointerStyle)33) +#define POINTER_VSHEAR ((PointerStyle)34) +#define POINTER_MIRROR ((PointerStyle)35) +#define POINTER_CROOK ((PointerStyle)36) +#define POINTER_CROP ((PointerStyle)37) +#define POINTER_MOVEPOINT ((PointerStyle)38) +#define POINTER_MOVEBEZIERWEIGHT ((PointerStyle)39) +#define POINTER_MOVEDATA ((PointerStyle)40) +#define POINTER_COPYDATA ((PointerStyle)41) +#define POINTER_LINKDATA ((PointerStyle)42) +#define POINTER_MOVEDATALINK ((PointerStyle)43) +#define POINTER_COPYDATALINK ((PointerStyle)44) +#define POINTER_MOVEFILE ((PointerStyle)45) +#define POINTER_COPYFILE ((PointerStyle)46) +#define POINTER_LINKFILE ((PointerStyle)47) +#define POINTER_MOVEFILELINK ((PointerStyle)48) +#define POINTER_COPYFILELINK ((PointerStyle)49) +#define POINTER_MOVEFILES ((PointerStyle)50) +#define POINTER_COPYFILES ((PointerStyle)51) +#define POINTER_NOTALLOWED ((PointerStyle)52) +#define POINTER_DRAW_LINE ((PointerStyle)53) +#define POINTER_DRAW_RECT ((PointerStyle)54) +#define POINTER_DRAW_POLYGON ((PointerStyle)55) +#define POINTER_DRAW_BEZIER ((PointerStyle)56) +#define POINTER_DRAW_ARC ((PointerStyle)57) +#define POINTER_DRAW_PIE ((PointerStyle)58) +#define POINTER_DRAW_CIRCLECUT ((PointerStyle)59) +#define POINTER_DRAW_ELLIPSE ((PointerStyle)60) +#define POINTER_DRAW_FREEHAND ((PointerStyle)61) +#define POINTER_DRAW_CONNECT ((PointerStyle)62) +#define POINTER_DRAW_TEXT ((PointerStyle)63) +#define POINTER_DRAW_CAPTION ((PointerStyle)64) +#define POINTER_CHART ((PointerStyle)65) +#define POINTER_DETECTIVE ((PointerStyle)66) +#define POINTER_PIVOT_COL ((PointerStyle)67) +#define POINTER_PIVOT_ROW ((PointerStyle)68) +#define POINTER_PIVOT_FIELD ((PointerStyle)69) +#define POINTER_CHAIN ((PointerStyle)70) +#define POINTER_CHAIN_NOTALLOWED ((PointerStyle)71) +#define POINTER_TIMEEVENT_MOVE ((PointerStyle)72) +#define POINTER_TIMEEVENT_SIZE ((PointerStyle)73) +#define POINTER_AUTOSCROLL_N ((PointerStyle)74) +#define POINTER_AUTOSCROLL_S ((PointerStyle)75) +#define POINTER_AUTOSCROLL_W ((PointerStyle)76) +#define POINTER_AUTOSCROLL_E ((PointerStyle)77) +#define POINTER_AUTOSCROLL_NW ((PointerStyle)78) +#define POINTER_AUTOSCROLL_NE ((PointerStyle)79) +#define POINTER_AUTOSCROLL_SW ((PointerStyle)80) +#define POINTER_AUTOSCROLL_SE ((PointerStyle)81) +#define POINTER_AUTOSCROLL_NS ((PointerStyle)82) +#define POINTER_AUTOSCROLL_WE ((PointerStyle)83) +#define POINTER_AUTOSCROLL_NSWE ((PointerStyle)84) +#define POINTER_AIRBRUSH ((PointerStyle)85) +#define POINTER_TEXT_VERTICAL ((PointerStyle)86) +#define POINTER_PIVOT_DELETE ((PointerStyle)87) // --> FME 2004-07-30 #i32329# Enhanced table selection #define POINTER_TAB_SELECT_S ((PointerStyle)88) diff --git a/vcl/inc/vcl/regband.hxx b/vcl/inc/vcl/regband.hxx index 39f0bd3b0a08..3de3fbf70bcb 100644 --- a/vcl/inc/vcl/regband.hxx +++ b/vcl/inc/vcl/regband.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -55,10 +55,10 @@ IsOver. // element for the list with x-separations struct ImplRegionBandSep { - ImplRegionBandSep* mpNextSep; - long mnXLeft; - long mnXRight; - BOOL mbRemoved; + ImplRegionBandSep* mpNextSep; + long mnXLeft; + long mnXRight; + BOOL mbRemoved; }; enum LineType { LINE_ASCENDING, LINE_DESCENDING, LINE_HORIZONTAL }; @@ -66,11 +66,11 @@ enum LineType { LINE_ASCENDING, LINE_DESCENDING, LINE_HORIZONTAL }; // element for the list with x-separations struct ImplRegionBandPoint { - ImplRegionBandPoint* mpNextBandPoint; - long mnX; - long mnLineId; - BOOL mbEndPoint; - LineType meLineType; + ImplRegionBandPoint* mpNextBandPoint; + long mnX; + long mnLineId; + BOOL mbEndPoint; + LineType meLineType; }; // ------------------ @@ -80,13 +80,13 @@ struct ImplRegionBandPoint class ImplRegionBand { public: - ImplRegionBand* mpNextBand; // pointer to the next element of the list - ImplRegionBand* mpPrevBand; // pointer to the previous element of the list (only used temporaery) - ImplRegionBandSep* mpFirstSep; // root of the list with x-separations - ImplRegionBandPoint* mpFirstBandPoint; // root of the list with lines - long mnYTop; // actual boundary of the band - long mnYBottom; - BOOL mbTouched; + ImplRegionBand* mpNextBand; // pointer to the next element of the list + ImplRegionBand* mpPrevBand; // pointer to the previous element of the list (only used temporaery) + ImplRegionBandSep* mpFirstSep; // root of the list with x-separations + ImplRegionBandPoint* mpFirstBandPoint; // root of the list with lines + long mnYTop; // actual boundary of the band + long mnYBottom; + BOOL mbTouched; // create y-band with boundaries ImplRegionBand( long nYTop, long nYBottom ); @@ -107,34 +107,34 @@ public: const bool bIgnorePoints = true); ~ImplRegionBand(); - long GetXLeftBoundary() const; - long GetXRightBoundary() const; + long GetXLeftBoundary() const; + long GetXRightBoundary() const; // combine overlapping bands - BOOL OptimizeBand(); + BOOL OptimizeBand(); // generate separations from lines and process // union with existing separations - void ProcessPoints(); + void ProcessPoints(); // insert point in the list for later processing - BOOL InsertPoint( long nX, long nLineID, + BOOL InsertPoint( long nX, long nLineID, BOOL bEndPoint, LineType eLineType ); - void Union( long nXLeft, long nXRight ); - void Intersect( long nXLeft, long nXRight ); - void Exclude( long nXLeft, long nXRight ); - void XOr( long nXLeft, long nXRight ); + void Union( long nXLeft, long nXRight ); + void Intersect( long nXLeft, long nXRight ); + void Exclude( long nXLeft, long nXRight ); + void XOr( long nXLeft, long nXRight ); - void MoveX( long nHorzMove ); - void ScaleX( double fHorzScale ); + void MoveX( long nHorzMove ); + void ScaleX( double fHorzScale ); - BOOL IsInside( long nX ); - BOOL IsInside( long nLeft, long nRight ); - BOOL IsOver( long nLeft, long nRight ); + BOOL IsInside( long nX ); + BOOL IsInside( long nLeft, long nRight ); + BOOL IsOver( long nLeft, long nRight ); - BOOL IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); } + BOOL IsEmpty() const { return ((!mpFirstSep) && (!mpFirstBandPoint)); } - BOOL operator==( const ImplRegionBand& rRegionBand ) const; + 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. @@ -148,6 +148,6 @@ public: ImplRegionBand* SplitBand (const sal_Int32 nY); }; -#endif // _SV_REGBAND_HXX +#endif // _SV_REGBAND_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/region.h b/vcl/inc/vcl/region.h index 62c5e51db070..3c83d0b3a136 100644 --- a/vcl/inc/vcl/region.h +++ b/vcl/inc/vcl/region.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -47,10 +47,10 @@ const char* ImplDbgTestRegion( const void* pObj ); struct ImplRegionHandle { - Region* mpRegion; - ImplRegionBand* mpCurrRectBand; - ImplRegionBandSep* mpCurrRectBandSep; - BOOL mbFirst; + Region* mpRegion; + ImplRegionBand* mpCurrRectBand; + ImplRegionBandSep* mpCurrRectBandSep; + BOOL mbFirst; }; // ------------------ @@ -59,8 +59,8 @@ struct ImplRegionHandle struct ImplRegionInfo { - void* mpVoidCurrRectBand; - void* mpVoidCurrRectBandSep; + void* mpVoidCurrRectBand; + void* mpVoidCurrRectBandSep; }; // -------------- @@ -73,9 +73,9 @@ public: ImplRegionBase( int nCount = 1 ); // TODO: replace manual refcounting virtual ~ImplRegionBase(); public: - ULONG mnRefCount; - ULONG mnRectCount; - PolyPolygon* mpPolyPoly; + ULONG mnRefCount; + ULONG mnRectCount; + PolyPolygon* mpPolyPoly; basegfx::B2DPolyPolygon* mpB2DPolyPoly; }; @@ -84,8 +84,8 @@ class ImplRegion : public ImplRegionBase friend class Region; private: - ImplRegionBand* mpFirstBand; // root of the list with y-bands - ImplRegionBand* mpLastCheckedBand; + ImplRegionBand* mpFirstBand; // root of the list with y-bands + ImplRegionBand* mpLastCheckedBand; public: ImplRegion(); @@ -94,17 +94,17 @@ public: ImplRegion( const ImplRegion& rImplRegion ); ~ImplRegion(); - ImplRegionBand* ImplGetFirstRegionBand() const { return mpFirstBand; } - PolyPolygon* ImplGetPolyPoly() const { return mpPolyPoly; } + ImplRegionBand* ImplGetFirstRegionBand() const { return mpFirstBand; } + PolyPolygon* ImplGetPolyPoly() const { return mpPolyPoly; } - void CreateBandRange( long nYTop, long nYBottom ); - void InsertBands( long nYTop, long nYBottom ); - BOOL InsertSingleBand( ImplRegionBand* mpImplRegionBand, + void CreateBandRange( long nYTop, long nYBottom ); + void InsertBands( long nYTop, long nYBottom ); + BOOL InsertSingleBand( ImplRegionBand* mpImplRegionBand, long nYBandPosition ); - BOOL InsertLine( const Point & rFirstPoint, + BOOL InsertLine( const Point & rFirstPoint, const Point & rSecondPoint, long nLineID ); - BOOL InsertPoint( const Point &rPoint, + BOOL InsertPoint( const Point &rPoint, long nLineID, BOOL bEndPoint, LineType eLineType ); @@ -120,18 +120,18 @@ public: */ void InsertBand (ImplRegionBand* pPreviousBand, ImplRegionBand* pBandToInsert); - - void Union( long nLeft, long nTop, long nRight, long nBottom ); - void Exclude( long nLeft, long nTop, long nRight, long nBottom ); - void XOr( long nLeft, long nTop, long nRight, long nBottom ); + + void Union( long nLeft, long nTop, long nRight, long nBottom ); + void Exclude( long nLeft, long nTop, long nRight, long nBottom ); + void XOr( long nLeft, long nTop, long nRight, long nBottom ); // remove emtpy rects - BOOL OptimizeBandList(); + BOOL OptimizeBandList(); - friend SvStream& operator>>( SvStream& rIStm, Region& rRegion ); - friend SvStream& operator<<( SvStream& rOStm, const Region& rRegion ); + friend SvStream& operator>>( SvStream& rIStm, Region& rRegion ); + friend SvStream& operator<<( SvStream& rOStm, const Region& rRegion ); }; -#endif // _SV_REGION_H +#endif // _SV_REGION_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/region.hxx b/vcl/inc/vcl/region.hxx index 4a9c146a158c..52516552a442 100644 --- a/vcl/inc/vcl/region.hxx +++ b/vcl/inc/vcl/region.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -61,25 +61,25 @@ class VCL_DLLPUBLIC Region friend class Bitmap; private: - ImplRegion* mpImplRegion; - - SAL_DLLPRIVATE void ImplCopyData(); - SAL_DLLPRIVATE void ImplCreateRectRegion( const Rectangle& rRect ); - SAL_DLLPRIVATE void ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly ); - SAL_DLLPRIVATE void ImplPolyPolyRegionToBandRegionFunc(); - 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, + ImplRegion* mpImplRegion; + + SAL_DLLPRIVATE void ImplCopyData(); + SAL_DLLPRIVATE void ImplCreateRectRegion( const Rectangle& rRect ); + SAL_DLLPRIVATE void ImplCreatePolyPolyRegion( const PolyPolygon& rPolyPoly ); + SAL_DLLPRIVATE void ImplPolyPolyRegionToBandRegionFunc(); + 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, + 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 void ImplEndAddRect( ); + SAL_DLLPRIVATE void ImplBeginAddRect( ); + SAL_DLLPRIVATE BOOL ImplAddRect( const Rectangle& rRect ); + SAL_DLLPRIVATE void ImplEndAddRect( ); #ifdef DBG_UTIL - friend const char* ImplDbgTestRegion( const void* pObj ); + friend const char* ImplDbgTestRegion( const void* pObj ); #endif public: @@ -92,25 +92,25 @@ public: Region( const Region& rRegion ); ~Region(); - 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 ); + 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 ); - RegionType GetType() const; - BOOL IsEmpty() const { return GetType() == REGION_EMPTY; }; - BOOL IsNull() const { return GetType() == REGION_NULL; }; + RegionType GetType() const; + BOOL IsEmpty() const { return GetType() == REGION_EMPTY; }; + BOOL IsNull() const { return GetType() == REGION_NULL; }; - void SetEmpty(); - void SetNull(); + void SetEmpty(); + void SetNull(); - Rectangle GetBoundRect() const; + Rectangle GetBoundRect() const; BOOL HasPolyPolygon() const; PolyPolygon GetPolyPolygon() const; @@ -120,22 +120,22 @@ public: // or created from the constituent rectangles basegfx::B2DPolyPolygon ConvertToB2DPolyPolygon(); - ULONG GetRectCount() const; - RegionHandle BeginEnumRects(); - BOOL GetEnumRects( RegionHandle hRegionHandle, Rectangle& rRect ); - BOOL GetNextEnumRect( RegionHandle hRegionHandle, Rectangle& rRect ) + ULONG GetRectCount() const; + RegionHandle BeginEnumRects(); + BOOL GetEnumRects( RegionHandle hRegionHandle, Rectangle& rRect ); + BOOL GetNextEnumRect( RegionHandle hRegionHandle, Rectangle& rRect ) { return GetEnumRects( hRegionHandle, rRect ); } - void EndEnumRects( RegionHandle hRegionHandle ); + void EndEnumRects( RegionHandle hRegionHandle ); - BOOL IsInside( const Point& rPoint ) const; - BOOL IsInside( const Rectangle& rRect ) const; - BOOL IsOver( const Rectangle& rRect ) const; + BOOL IsInside( const Point& rPoint ) const; + BOOL IsInside( const Rectangle& rRect ) const; + BOOL IsOver( const Rectangle& rRect ) const; - Region& operator=( const Region& rRegion ); - Region& operator=( const Rectangle& rRect ); + Region& operator=( const Region& rRegion ); + Region& operator=( const Rectangle& rRect ); - BOOL operator==( const Region& rRegion ) const; - BOOL operator!=( const Region& rRegion ) const + BOOL operator==( const Region& rRegion ) const; + BOOL operator!=( const Region& rRegion ) const { return !(Region::operator==( rRegion )); } friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Region& rRegion ); @@ -153,6 +153,6 @@ public: static Region GetRegionFromPolyPolygon( const PolyPolygon& rPolyPoly ); }; -#endif // _SV_REGION_HXX +#endif // _SV_REGION_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/salatype.hxx b/vcl/inc/vcl/salatype.hxx index 7507c6607dbe..2fd87f31ca51 100644 --- a/vcl/inc/vcl/salatype.hxx +++ b/vcl/inc/vcl/salatype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -37,13 +37,13 @@ // 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) +#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 diff --git a/vcl/inc/vcl/salbmp.hxx b/vcl/inc/vcl/salbmp.hxx index e2234323e80d..95bb9ac37fe2 100644 --- a/vcl/inc/vcl/salbmp.hxx +++ b/vcl/inc/vcl/salbmp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -45,23 +45,23 @@ public: SalBitmap() {} virtual ~SalBitmap(); - virtual bool Create( const Size& rSize, - USHORT nBitCount, + virtual bool Create( const Size& rSize, + USHORT nBitCount, const BitmapPalette& rPal ) = 0; - virtual bool Create( const SalBitmap& rSalBmp ) = 0; - virtual bool Create( const SalBitmap& rSalBmp, + virtual bool Create( const SalBitmap& rSalBmp ) = 0; + virtual bool Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) = 0; - virtual bool Create( const SalBitmap& rSalBmp, + virtual bool Create( const SalBitmap& rSalBmp, USHORT nNewBitCount ) = 0; - virtual bool Create( const ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > xBitmapCanvas, + 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 void Destroy() = 0; + virtual Size GetSize() const = 0; + virtual USHORT GetBitCount() const = 0; - virtual BitmapBuffer* AcquireBuffer( bool bReadOnly ) = 0; - virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) = 0; + virtual BitmapBuffer* AcquireBuffer( bool bReadOnly ) = 0; + virtual void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ) = 0; virtual bool GetSystemData( BitmapSystemData& rData ) = 0; }; diff --git a/vcl/inc/vcl/salbtype.hxx b/vcl/inc/vcl/salbtype.hxx index 1721e201b1ae..5ace8c9afc93 100644 --- a/vcl/inc/vcl/salbtype.hxx +++ b/vcl/inc/vcl/salbtype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,63 +43,63 @@ // - Memory - // ---------- -typedef BYTE* HPBYTE; -typedef HPBYTE Scanline; -typedef const BYTE* ConstHPBYTE; -typedef ConstHPBYTE ConstScanline; +typedef BYTE* HPBYTE; +typedef HPBYTE Scanline; +typedef const BYTE* ConstHPBYTE; +typedef ConstHPBYTE ConstScanline; // ------------------ // - Bitmap formats - // ------------------ -#define BMP_FORMAT_BOTTOM_UP 0x00000000UL -#define BMP_FORMAT_TOP_DOWN 0x80000000UL +#define BMP_FORMAT_BOTTOM_UP 0x00000000UL +#define BMP_FORMAT_TOP_DOWN 0x80000000UL -#define BMP_FORMAT_1BIT_MSB_PAL 0x00000001UL -#define BMP_FORMAT_1BIT_LSB_PAL 0x00000002UL +#define BMP_FORMAT_1BIT_MSB_PAL 0x00000001UL +#define BMP_FORMAT_1BIT_LSB_PAL 0x00000002UL -#define BMP_FORMAT_4BIT_MSN_PAL 0x00000004UL -#define BMP_FORMAT_4BIT_LSN_PAL 0x00000008UL +#define BMP_FORMAT_4BIT_MSN_PAL 0x00000004UL +#define BMP_FORMAT_4BIT_LSN_PAL 0x00000008UL -#define BMP_FORMAT_8BIT_PAL 0x00000010UL -#define BMP_FORMAT_8BIT_TC_MASK 0x00000020UL +#define BMP_FORMAT_8BIT_PAL 0x00000010UL +#define BMP_FORMAT_8BIT_TC_MASK 0x00000020UL -// #define BMP_FORMAT_16BIT_TC_MASK 0x00000040UL +// #define BMP_FORMAT_16BIT_TC_MASK 0x00000040UL -#define BMP_FORMAT_24BIT_TC_BGR 0x00000080UL -#define BMP_FORMAT_24BIT_TC_RGB 0x00000100UL -#define BMP_FORMAT_24BIT_TC_MASK 0x00000200UL +#define BMP_FORMAT_24BIT_TC_BGR 0x00000080UL +#define BMP_FORMAT_24BIT_TC_RGB 0x00000100UL +#define BMP_FORMAT_24BIT_TC_MASK 0x00000200UL -#define BMP_FORMAT_32BIT_TC_ABGR 0x00000400UL -#define BMP_FORMAT_32BIT_TC_ARGB 0x00000800UL -#define BMP_FORMAT_32BIT_TC_BGRA 0x00001000UL -#define BMP_FORMAT_32BIT_TC_RGBA 0x00002000UL -#define BMP_FORMAT_32BIT_TC_MASK 0x00004000UL +#define BMP_FORMAT_32BIT_TC_ABGR 0x00000400UL +#define BMP_FORMAT_32BIT_TC_ARGB 0x00000800UL +#define BMP_FORMAT_32BIT_TC_BGRA 0x00001000UL +#define BMP_FORMAT_32BIT_TC_RGBA 0x00002000UL +#define BMP_FORMAT_32BIT_TC_MASK 0x00004000UL -#define BMP_FORMAT_16BIT_TC_MSB_MASK 0x00008000UL -#define BMP_FORMAT_16BIT_TC_LSB_MASK 0x00010000UL +#define BMP_FORMAT_16BIT_TC_MSB_MASK 0x00008000UL +#define BMP_FORMAT_16BIT_TC_LSB_MASK 0x00010000UL -#define BMP_SCANLINE_ADJUSTMENT( Mac_nBmpFormat ) ( (Mac_nBmpFormat) & 0x80000000UL ) -#define BMP_SCANLINE_FORMAT( Mac_nBmpFormat ) ( (Mac_nBmpFormat) & 0x7FFFFFFFUL ) +#define BMP_SCANLINE_ADJUSTMENT( Mac_nBmpFormat ) ( (Mac_nBmpFormat) & 0x80000000UL ) +#define BMP_SCANLINE_FORMAT( Mac_nBmpFormat ) ( (Mac_nBmpFormat) & 0x7FFFFFFFUL ) // ------------------------------------------------------------------ -#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 ) ), \ +#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 ) ) ); // ------------------------------------------------------------------ #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 ) : \ +( ( ( ( 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 ) ) // --------------- @@ -111,59 +111,59 @@ class Color; class VCL_DLLPUBLIC BitmapColor { private: - + // !!! Achtung: // !!! da auf die Member dieser Klasse via memcpy // !!! 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; + BYTE mcBlueOrIndex; + BYTE mcGreen; + BYTE mcRed; + BYTE mbIndex; public: - inline BitmapColor(); - inline BitmapColor( const BitmapColor& rBitmapColor ); - inline BitmapColor( BYTE cRed, BYTE cGreen, BYTE cBlue ); - inline BitmapColor( const Color& rColor ); - inline BitmapColor( BYTE cIndex ); - inline ~BitmapColor() {}; + inline BitmapColor(); + inline BitmapColor( const BitmapColor& rBitmapColor ); + inline BitmapColor( BYTE cRed, BYTE cGreen, BYTE cBlue ); + inline BitmapColor( const Color& rColor ); + inline BitmapColor( BYTE cIndex ); + inline ~BitmapColor() {}; - inline BOOL operator==( const BitmapColor& rBitmapColor ) const; - inline BOOL operator!=( const BitmapColor& rBitmapColor ) const; + inline BOOL operator==( const BitmapColor& rBitmapColor ) const; + inline BOOL operator!=( const BitmapColor& rBitmapColor ) const; inline BitmapColor& operator=( const BitmapColor& rBitmapColor ); - inline BOOL IsIndex() const; + inline BOOL IsIndex() const; - inline BYTE GetRed() const; - inline void SetRed( BYTE cRed ); + inline BYTE GetRed() const; + inline void SetRed( BYTE cRed ); - inline BYTE GetGreen() const; - inline void SetGreen( BYTE cGreen ); + inline BYTE GetGreen() const; + inline void SetGreen( BYTE cGreen ); - inline BYTE GetBlue() const; - inline void SetBlue( BYTE cBlue ); + inline BYTE GetBlue() const; + inline void SetBlue( BYTE cBlue ); - inline BYTE GetIndex() const; - inline void SetIndex( BYTE cIndex ); + inline BYTE GetIndex() const; + inline void SetIndex( BYTE cIndex ); - operator Color() const; - inline operator BYTE() const; + operator Color() const; + inline operator BYTE() const; inline BYTE GetBlueOrIndex() const; inline BitmapColor& Invert(); - inline BYTE GetLuminance() const; + inline BYTE GetLuminance() const; inline BitmapColor& IncreaseLuminance( BYTE cGreyInc ); inline BitmapColor& DecreaseLuminance( BYTE 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, BYTE cTransparency ); - inline BitmapColor& Merge( BYTE cR, BYTE cG, BYTE cB, BYTE cTransparency ); - - inline ULONG GetColorError( const BitmapColor& rBitmapColor ) const; + inline ULONG GetColorError( const BitmapColor& rBitmapColor ) const; }; // --------------- @@ -179,35 +179,35 @@ class VCL_DLLPUBLIC BitmapPalette private: - BitmapColor* mpBitmapColor; - USHORT mnCount; + BitmapColor* mpBitmapColor; + USHORT mnCount; public: - + SAL_DLLPRIVATE inline BitmapColor* ImplGetColorBuffer() const; public: - inline BitmapPalette(); - inline BitmapPalette( const BitmapPalette& rBitmapPalette ); - inline BitmapPalette( USHORT nCount ); - inline ~BitmapPalette(); + inline BitmapPalette(); + inline BitmapPalette( const BitmapPalette& rBitmapPalette ); + inline BitmapPalette( USHORT 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 BitmapPalette& operator=( const BitmapPalette& rBitmapPalette ); + inline BOOL operator==( const BitmapPalette& rBitmapPalette ) const; + inline BOOL operator!=( const BitmapPalette& rBitmapPalette ) const; + inline BOOL operator!(); - inline USHORT GetEntryCount() const; - inline void SetEntryCount( USHORT nCount ); + inline USHORT GetEntryCount() const; + inline void SetEntryCount( USHORT nCount ); - inline const BitmapColor& operator[]( USHORT nIndex ) const; - inline BitmapColor& operator[]( USHORT nIndex ); + inline const BitmapColor& operator[]( USHORT nIndex ) const; + inline BitmapColor& operator[]( USHORT nIndex ); - inline USHORT GetBestIndex( const BitmapColor& rCol ) const; - bool IsGreyPalette() const; + inline USHORT GetBestIndex( const BitmapColor& rCol ) const; + bool IsGreyPalette() const; }; // --------------- @@ -216,43 +216,43 @@ public: class VCL_DLLPUBLIC ColorMask { - ULONG mnRMask; - ULONG mnGMask; - ULONG mnBMask; - long mnRShift; - long mnGShift; - long mnBShift; - ULONG mnROrShift; - ULONG mnGOrShift; - ULONG mnBOrShift; - ULONG mnROr; - ULONG mnGOr; - ULONG mnBOr; + ULONG mnRMask; + ULONG mnGMask; + ULONG mnBMask; + long mnRShift; + long mnGShift; + long mnBShift; + ULONG mnROrShift; + ULONG mnGOrShift; + ULONG mnBOrShift; + ULONG mnROr; + ULONG mnGOr; + ULONG mnBOr; SAL_DLLPRIVATE inline long ImplCalcMaskShift( ULONG nMask, ULONG& rOr, ULONG& rOrShift ) const; public: - inline ColorMask( ULONG nRedMask = 0UL, ULONG nGreenMask = 0UL, ULONG nBlueMask = 0UL ); - inline ~ColorMask() {} + inline ColorMask( ULONG nRedMask = 0UL, ULONG nGreenMask = 0UL, ULONG nBlueMask = 0UL ); + inline ~ColorMask() {} - inline ULONG GetRedMask() const; - inline ULONG GetGreenMask() const; - inline ULONG GetBlueMask() const; + inline ULONG GetRedMask() const; + inline ULONG GetGreenMask() const; + inline ULONG GetBlueMask() const; - inline void GetColorFor8Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const; - inline void SetColorFor8Bit( const BitmapColor& rColor, HPBYTE pPixel ) const; + inline void GetColorFor8Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const; + inline void SetColorFor8Bit( const BitmapColor& rColor, HPBYTE pPixel ) const; - inline void GetColorFor16BitMSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const; - inline void SetColorFor16BitMSB( const BitmapColor& rColor, HPBYTE pPixel ) const; - inline void GetColorFor16BitLSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const; - inline void SetColorFor16BitLSB( const BitmapColor& rColor, HPBYTE pPixel ) const; + inline void GetColorFor16BitMSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const; + inline void SetColorFor16BitMSB( const BitmapColor& rColor, HPBYTE pPixel ) const; + inline void GetColorFor16BitLSB( BitmapColor& rColor, ConstHPBYTE pPixel ) const; + inline void SetColorFor16BitLSB( const BitmapColor& rColor, HPBYTE pPixel ) const; - inline void GetColorFor24Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const; - inline void SetColorFor24Bit( const BitmapColor& rColor, HPBYTE pPixel ) const; + inline void GetColorFor24Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const; + inline void SetColorFor24Bit( const BitmapColor& rColor, HPBYTE pPixel ) const; - inline void GetColorFor32Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const; - inline void SetColorFor32Bit( const BitmapColor& rColor, HPBYTE pPixel ) const; + inline void GetColorFor32Bit( BitmapColor& rColor, ConstHPBYTE pPixel ) const; + inline void SetColorFor32Bit( const BitmapColor& rColor, HPBYTE pPixel ) const; }; // --------------- @@ -261,14 +261,14 @@ public: struct VCL_DLLPUBLIC BitmapBuffer { - ULONG mnFormat; - long mnWidth; - long mnHeight; - long mnScanlineSize; - USHORT mnBitCount; - ColorMask maColorMask; - BitmapPalette maPalette; - BYTE* mpBits; + ULONG mnFormat; + long mnWidth; + long mnHeight; + long mnScanlineSize; + USHORT mnBitCount; + ColorMask maColorMask; + BitmapPalette maPalette; + BYTE* mpBits; BitmapBuffer(){} ~BitmapBuffer() {} @@ -278,56 +278,56 @@ struct VCL_DLLPUBLIC BitmapBuffer // - StretchAndConvert - // --------------------- -VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect, +VCL_DLLPUBLIC BitmapBuffer* StretchAndConvert( const BitmapBuffer& rSrcBuffer, const SalTwoRect& rTwoRect, ULONG nDstBitmapFormat, BitmapPalette* pDstPal = NULL, ColorMask* pDstMask = NULL ); // ------------------------------------------------------------------ inline BitmapColor::BitmapColor() : - mcBlueOrIndex ( 0 ), - mcGreen ( 0 ), - mcRed ( 0 ), - mbIndex ( FALSE ) + mcBlueOrIndex ( 0 ), + mcGreen ( 0 ), + mcRed ( 0 ), + mbIndex ( FALSE ) { } // ------------------------------------------------------------------ inline BitmapColor::BitmapColor( BYTE cRed, BYTE cGreen, BYTE cBlue ) : - mcBlueOrIndex ( cBlue ), - mcGreen ( cGreen ), - mcRed ( cRed ), - mbIndex ( FALSE ) + mcBlueOrIndex ( cBlue ), + mcGreen ( cGreen ), + mcRed ( cRed ), + mbIndex ( FALSE ) { } // ------------------------------------------------------------------ inline BitmapColor::BitmapColor( const BitmapColor& rBitmapColor ) : - mcBlueOrIndex ( rBitmapColor.mcBlueOrIndex ), - mcGreen ( rBitmapColor.mcGreen ), - mcRed ( rBitmapColor.mcRed ), - mbIndex ( rBitmapColor.mbIndex ) + mcBlueOrIndex ( rBitmapColor.mcBlueOrIndex ), + mcGreen ( rBitmapColor.mcGreen ), + mcRed ( rBitmapColor.mcRed ), + mbIndex ( rBitmapColor.mbIndex ) { } // ------------------------------------------------------------------ inline BitmapColor::BitmapColor( const Color& rColor ) : - mcBlueOrIndex ( rColor.GetBlue() ), - mcGreen ( rColor.GetGreen() ), - mcRed ( rColor.GetRed() ), - mbIndex ( 0 ) + mcBlueOrIndex ( rColor.GetBlue() ), + mcGreen ( rColor.GetGreen() ), + mcRed ( rColor.GetRed() ), + mbIndex ( 0 ) { } // ------------------------------------------------------------------ inline BitmapColor::BitmapColor( BYTE cIndex ) : - mcBlueOrIndex ( cIndex ), - mcGreen ( 0 ), - mcRed ( 0 ), - mbIndex ( TRUE ) + mcBlueOrIndex ( cIndex ), + mcGreen ( 0 ), + mcRed ( 0 ), + mbIndex ( TRUE ) { } @@ -498,26 +498,26 @@ inline BitmapColor& BitmapColor::DecreaseLuminance( BYTE cGreyDec ) // ------------------------------------------------------------------ -inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, BYTE cTransparency ) +inline BitmapColor& BitmapColor::Merge( const BitmapColor& rBitmapColor, BYTE cTransparency ) { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); DBG_ASSERT( !rBitmapColor.mbIndex, "Pixel represents index into colortable!" ); mcBlueOrIndex = COLOR_CHANNEL_MERGE( mcBlueOrIndex, rBitmapColor.mcBlueOrIndex, cTransparency ); mcGreen = COLOR_CHANNEL_MERGE( mcGreen, rBitmapColor.mcGreen, cTransparency ); mcRed = COLOR_CHANNEL_MERGE( mcRed, rBitmapColor.mcRed, cTransparency ); - + return *this; } // ------------------------------------------------------------------ -inline BitmapColor& BitmapColor::Merge( BYTE cR, BYTE cG, BYTE cB, BYTE cTransparency ) +inline BitmapColor& BitmapColor::Merge( BYTE cR, BYTE cG, BYTE cB, BYTE cTransparency ) { DBG_ASSERT( !mbIndex, "Pixel represents index into colortable!" ); mcBlueOrIndex = COLOR_CHANNEL_MERGE( mcBlueOrIndex, cB, cTransparency ); mcGreen = COLOR_CHANNEL_MERGE( mcGreen, cG, cTransparency ); mcRed = COLOR_CHANNEL_MERGE( mcRed, cR, cTransparency ); - + return *this; } @@ -535,8 +535,8 @@ inline ULONG BitmapColor::GetColorError( const BitmapColor& rBitmapColor ) const // ------------------------------------------------------------------ inline BitmapPalette::BitmapPalette() : - mpBitmapColor ( NULL ), - mnCount ( 0 ) + mpBitmapColor ( NULL ), + mnCount ( 0 ) { } @@ -654,9 +654,9 @@ inline void BitmapPalette::SetEntryCount( USHORT nCount ) { const ULONG nNewSize = nCount * sizeof( BitmapColor ); const ULONG nMinSize = Min( mnCount, nCount ) * sizeof( BitmapColor ); - BYTE* pNewColor = new BYTE[ nNewSize ]; + BYTE* pNewColor = new BYTE[ nNewSize ]; - if ( nMinSize && mpBitmapColor ) + if ( nMinSize && mpBitmapColor ) memcpy( pNewColor, mpBitmapColor, nMinSize ); delete[] (BYTE*) mpBitmapColor; memset( pNewColor + nMinSize, 0, nNewSize - nMinSize ); @@ -737,9 +737,9 @@ inline ColorMask::ColorMask( ULONG nRedMask, ULONG nGreenMask, ULONG nBlueMask ) inline long ColorMask::ImplCalcMaskShift( ULONG nMask, ULONG& rOr, ULONG& rOrShift ) const { - long nShift; - long nRet; - ULONG nLen = 0UL; + long nShift; + long nRet; + ULONG nLen = 0UL; // bei welchen Bits faengt die Maske an for( nShift = 31L; ( nShift >= 0L ) && !( nMask & ( 1 << (ULONG) nShift ) ); nShift-- ) diff --git a/vcl/inc/vcl/salctrlhandle.hxx b/vcl/inc/vcl/salctrlhandle.hxx index 2cdb5af3a3e5..d3fe8dec3e94 100644 --- a/vcl/inc/vcl/salctrlhandle.hxx +++ b/vcl/inc/vcl/salctrlhandle.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,7 +43,7 @@ class SalControlHandle virtual ~SalControlHandle(); // TODO: derive Sal implementation - //SalControlHandleData maData; + //SalControlHandleData maData; }; #endif diff --git a/vcl/inc/vcl/salctype.hxx b/vcl/inc/vcl/salctype.hxx index c7136b98b5bf..5e9927551390 100644 --- a/vcl/inc/vcl/salctype.hxx +++ b/vcl/inc/vcl/salctype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -35,17 +35,17 @@ // - Defines - // ----------- -#define CVT_UNKNOWN (0x00000000UL) -#define CVT_BMP (0x00000001UL) -#define CVT_GIF (0x00000002UL) -#define CVT_JPG (0x00000003UL) -#define CVT_MET (0x00000004UL) -#define CVT_PCT (0x00000005UL) -#define CVT_PNG (0x00000006UL) -#define CVT_SVM (0x00000007UL) -#define CVT_TIF (0x00000008UL) -#define CVT_WMF (0x00000009UL) -#define CVT_EMF (0x0000000aUL) +#define CVT_UNKNOWN (0x00000000UL) +#define CVT_BMP (0x00000001UL) +#define CVT_GIF (0x00000002UL) +#define CVT_JPG (0x00000003UL) +#define CVT_MET (0x00000004UL) +#define CVT_PCT (0x00000005UL) +#define CVT_PNG (0x00000006UL) +#define CVT_SVM (0x00000007UL) +#define CVT_TIF (0x00000008UL) +#define CVT_WMF (0x00000009UL) +#define CVT_EMF (0x0000000aUL) // --------------- // - ConvertData - @@ -61,9 +61,9 @@ private: public: - Graphic maGraphic; - SvStream& mrStm; - ULONG mnFormat; + Graphic maGraphic; + SvStream& mrStm; + ULONG mnFormat; ConvertData( const Graphic& rGraphic, SvStream& rStm, ULONG nFormat ) : maGraphic( rGraphic ), mrStm( rStm ), mnFormat( nFormat ) {} @@ -74,7 +74,7 @@ public: // - Callback - // ------------ -typedef ULONG (*SALGRFCVTPROC)( void* pInst, +typedef ULONG (*SALGRFCVTPROC)( void* pInst, ULONG nInFormat, void* pInBuffer, ULONG nInBufSize, ULONG nOutFormat, void** ppOutBuffer ); diff --git a/vcl/inc/vcl/saldatabasic.hxx b/vcl/inc/vcl/saldatabasic.hxx index c4716507e7e6..77968c95aef4 100644 --- a/vcl/inc/vcl/saldatabasic.hxx +++ b/vcl/inc/vcl/saldatabasic.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -36,8 +36,8 @@ class VCL_DLLPUBLIC 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 SalData(); virtual ~SalData(); diff --git a/vcl/inc/vcl/salframe.hxx b/vcl/inc/vcl/salframe.hxx index 9e7a1ab0e007..3e4671dd3a7d 100644 --- a/vcl/inc/vcl/salframe.hxx +++ b/vcl/inc/vcl/salframe.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -65,7 +65,7 @@ struct SystemEnvData; #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_GRABFOCUS_ONLY ((USHORT)0x0008) #define SAL_FRAME_ENDEXTTEXTINPUT_COMPLETE ((USHORT)0x0001) #define SAL_FRAME_ENDEXTTEXTINPUT_CANCEL ((USHORT)0x0002) @@ -143,76 +143,76 @@ struct SystemParentData; class VCL_DLLPUBLIC SalFrame : public vcl::DeletionNotifier { // the VCL window corresponding to this frame - Window* m_pWindow; - SALFRAMEPROC m_pProc; + Window* m_pWindow; + SALFRAMEPROC m_pProc; public: // public for Sal Implementation SalFrame() : m_pWindow( NULL ), m_pProc( NULL ) {} virtual ~SalFrame(); public: // public for Sal Implementation - SalFrameGeometry maGeometry; + SalFrameGeometry maGeometry; public: // SalGraphics or NULL, but two Graphics for all SalFrames // must be returned - virtual SalGraphics* GetGraphics() = 0; - virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; + virtual SalGraphics* GetGraphics() = 0; + virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; // Event must be destroyed, when Frame is destroyed // When Event is called, SalInstance::Yield() must be returned - virtual BOOL PostEvent( void* pData ) = 0; + virtual BOOL PostEvent( void* pData ) = 0; - virtual void SetTitle( const XubString& rTitle ) = 0; - virtual void SetIcon( USHORT nIcon ) = 0; + virtual void SetTitle( const XubString& rTitle ) = 0; + virtual void SetIcon( USHORT nIcon ) = 0; virtual void SetRepresentedURL( const rtl::OUString& ); virtual void SetMenu( SalMenu *pSalMenu ) = 0; virtual void DrawMenuBar() = 0; virtual void SetExtendedFrameStyle( SalExtStyle nExtStyle ) = 0; - + // 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( BOOL bVisible, BOOL bNoActivate = FALSE ) = 0; + virtual void Enable( 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 GetClientSize( long& rWidth, long& rHeight ) = 0; - virtual void GetWorkArea( Rectangle& rRect ) = 0; - virtual SalFrame* GetParent() const = 0; + virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags ) = 0; + virtual void GetClientSize( long& rWidth, long& rHeight ) = 0; + virtual void GetWorkArea( Rectangle& rRect ) = 0; + virtual SalFrame* GetParent() const = 0; // Note: x will be mirrored at parent if UI mirroring is active - 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; + 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; // Enable/Disable ScreenSaver, SystemAgents, ... - virtual void StartPresentation( BOOL bStart ) = 0; + virtual void StartPresentation( BOOL bStart ) = 0; // Show Window over all other Windows - virtual void SetAlwaysOnTop( BOOL bOnTop ) = 0; + virtual void SetAlwaysOnTop( BOOL bOnTop ) = 0; // Window to top and grab focus - virtual void ToTop( USHORT nFlags ) = 0; + virtual void ToTop( USHORT 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 SetPointerPos( long nX, long nY ) = 0; + virtual void SetPointer( PointerStyle ePointerStyle ) = 0; + virtual void CaptureMouse( BOOL bMouse ) = 0; + virtual void SetPointerPos( long nX, long nY ) = 0; // flush output buffer - virtual void Flush( void) = 0; + virtual void Flush( void) = 0; virtual void Flush( const Rectangle& ); // flush output buffer, wait till outstanding operations are done - virtual void Sync() = 0; + virtual void Sync() = 0; - virtual void SetInputContext( SalInputContext* pContext ) = 0; - virtual void EndExtTextInput( USHORT nFlags ) = 0; + virtual void SetInputContext( SalInputContext* pContext ) = 0; + virtual void EndExtTextInput( USHORT nFlags ) = 0; - virtual String GetKeyName( USHORT nKeyCode ) = 0; - virtual String GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode ) = 0; + virtual String GetKeyName( USHORT nKeyCode ) = 0; + virtual String GetSymbolKeyName( const XubString& rFontName, USHORT 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 @@ -221,17 +221,17 @@ public: // returns the input language used for the last key stroke // may be LANGUAGE_DONTKNOW if not supported by the OS - virtual LanguageType GetInputLanguage() = 0; + virtual LanguageType GetInputLanguage() = 0; - virtual SalBitmap* SnapShot() = 0; + virtual SalBitmap* SnapShot() = 0; - virtual void UpdateSettings( AllSettings& rSettings ) = 0; + virtual void UpdateSettings( AllSettings& rSettings ) = 0; - virtual void Beep( SoundType eSoundType ) = 0; + virtual void Beep( SoundType eSoundType ) = 0; // returns system data (most prominent: window handle) - virtual const SystemEnvData* GetSystemData() const = 0; - + virtual const SystemEnvData* GetSystemData() const = 0; + // sets a background bitmap on the frame; the implementation // must not make assumptions about the lifetime of the passed SalBitmap // but should copy its contents to an own buffer @@ -245,7 +245,7 @@ public: Point maPos; // in frame coordinates }; - virtual SalPointerState GetPointerState() = 0; + virtual SalPointerState GetPointerState() = 0; struct SalIndicatorState { @@ -257,12 +257,12 @@ public: virtual void SimulateKeyPress( USHORT nKeyCode ) = 0; // set new parent window - virtual void SetParent( SalFrame* pNewParent ) = 0; + virtual void SetParent( SalFrame* pNewParent ) = 0; // reparent window to act as a plugin; implementation // may choose to use a new system window inetrnally // return false to indicate failure - virtual bool SetPluginParent( SystemParentData* pNewParent ) = 0; - + virtual bool SetPluginParent( SystemParentData* pNewParent ) = 0; + // move the frame to a new screen virtual void SetScreenNumber( unsigned int nScreen ) = 0; @@ -270,18 +270,18 @@ public: // shaped system windows // set clip region to none (-> rectangular windows, normal state) - virtual void ResetClipRegion() = 0; + virtual void ResetClipRegion() = 0; // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( ULONG nRects ) = 0; + virtual void BeginSetClipRegion( ULONG nRects ) = 0; // add a rectangle to the clip region - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0; + virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0; // done setting up the clipregion - virtual void EndSetClipRegion() = 0; + 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 ) + void SetCallback( Window* pWindow, SALFRAMEPROC pProc ) { m_pWindow = pWindow; m_pProc = pProc; } // returns the instance set @@ -290,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( USHORT 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 0e29449ebda7..a92a7d91cdf1 100644 --- a/vcl/inc/vcl/salgdi.hxx +++ b/vcl/inc/vcl/salgdi.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -100,7 +100,7 @@ typedef std::vector< sal_Int32 > Int32Vector; class VCL_DLLPUBLIC SalGraphics { - int m_nLayout; // 0: mirroring off, 1: mirror x-axis + int m_nLayout; // 0: mirroring off, 1: mirror x-axis protected: // flags which hold the SetAntialiasing() value from OutputDevice @@ -115,48 +115,48 @@ 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 unionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0; + virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ) = 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 drawPolyPolygon( sal_uInt32 nPoly, const sal_uInt32* pPoints, PCONSTSALPOINT* pPtAry ) = 0; + 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 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( 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; // CopyArea --> No RasterOp, but ClipRegion - virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, + virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, USHORT nFlags ) = 0; // CopyBits and DrawBitmap --> RasterOp and ClipRegion // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics - virtual void copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics ) = 0; - virtual void drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap ) = 0; - virtual void drawBitmap( const SalTwoRect* pPosAry, + virtual void copyBits( const SalTwoRect* pPosAry, SalGraphics* pSrcGraphics ) = 0; + virtual void drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap ) = 0; + virtual void drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap, SalColor nTransparentColor ) = 0; - virtual void drawBitmap( const SalTwoRect* pPosAry, + virtual void drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap, const SalBitmap& rMaskBitmap ) = 0; - virtual void drawMask( const SalTwoRect* pPosAry, + virtual void drawMask( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap, SalColor nMaskColor ) = 0; - virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) = 0; - virtual SalColor getPixel( long nX, long nY ) = 0; + virtual SalBitmap* getBitmap( long nX, long nY, long nWidth, long nHeight ) = 0; + virtual SalColor getPixel( long nX, long nY ) = 0; // 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( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags) = 0; + virtual void invert( 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 BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ) = 0; // native widget rendering methods that require mirroring virtual BOOL hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, @@ -183,7 +183,7 @@ protected: otherwise. In this case, clients should try to emulate alpha compositing themselves */ - virtual bool drawAlphaBitmap( const SalTwoRect&, + virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) = 0; /** Render solid rectangle with given transparency @@ -192,61 +192,61 @@ protected: Transparency value (0-255) to use. 0 blits and opaque, 255 a fully transparent rectangle */ - virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) = 0; + virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ) = 0; public: // public SalGraphics methods, the interface to the independent vcl part // get device resolution - virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) = 0; + virtual void GetResolution( sal_Int32& rDPIX, sal_Int32& rDPIY ) = 0; // get the depth of the device - virtual USHORT GetBitCount() = 0; + virtual USHORT GetBitCount() = 0; // get the width of the device - virtual long GetGraphicsWidth() const = 0; + virtual long GetGraphicsWidth() const = 0; // set the clip region to empty - virtual void ResetClipRegion() = 0; + virtual void ResetClipRegion() = 0; // begin setting the clip region, add rectangles to the // region with the UnionClipRegion call - virtual void BeginSetClipRegion( ULONG nCount ) = 0; + virtual void BeginSetClipRegion( ULONG nCount ) = 0; // all rectangles were added and the clip region should be set now - virtual void EndSetClipRegion() = 0; + virtual void EndSetClipRegion() = 0; // set the line color to transparent (= don't draw lines) - virtual void SetLineColor() = 0; + virtual void SetLineColor() = 0; // set the line color to a specific color - virtual void SetLineColor( SalColor nSalColor ) = 0; + virtual void SetLineColor( SalColor nSalColor ) = 0; // set the fill color to transparent (= don't fill) - virtual void SetFillColor() = 0; + virtual void SetFillColor() = 0; // set the fill color to a specific color, shapes will be // filled accordingly - virtual void SetFillColor( SalColor nSalColor ) = 0; + virtual void SetFillColor( SalColor nSalColor ) = 0; // enable/disable XOR drawing - virtual void SetXORMode( bool bSet, bool bInvertOnly ) = 0; + virtual void SetXORMode( bool bSet, bool bInvertOnly ) = 0; // set line color for raster operations - virtual void SetROPLineColor( SalROPColor nROPColor ) = 0; + virtual void SetROPLineColor( SalROPColor nROPColor ) = 0; // set fill color for raster operations - virtual void SetROPFillColor( SalROPColor nROPColor ) = 0; + virtual void SetROPFillColor( SalROPColor nROPColor ) = 0; // set the text color to a specific color - virtual void SetTextColor( SalColor nSalColor ) = 0; + virtual void SetTextColor( SalColor nSalColor ) = 0; // set the font virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel ) = 0; // release the fonts void ReleaseFonts() { SetFont( NULL, 0 ); } // get the current font's metrics - virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel = 0 ) = 0; + virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel = 0 ) = 0; // get kernign pairs of the current font // return only PairCount if (pKernPairs == NULL) - virtual ULONG GetKernPairs( ULONG nMaxPairCount, ImplKernPairData* ) = 0; + virtual ULONG GetKernPairs( ULONG nMaxPairCount, ImplKernPairData* ) = 0; // get the repertoire of the current font virtual ImplFontCharMap* GetImplFontCharMap() const = 0; // graphics must fill supplied font list - virtual void GetDevFontList( ImplDevFontList* ) = 0; + virtual void GetDevFontList( ImplDevFontList* ) = 0; // graphics should call ImplAddDevFontSubstitute on supplied // OutputDevice for all its device specific preferred font substitutions - virtual void GetDevFontSubstList( OutputDevice* ) = 0; - virtual bool AddTempDevFont( ImplDevFontList*, const String& rFileURL, const String& rFontName ) = 0; + virtual void GetDevFontSubstList( OutputDevice* ) = 0; + 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 @@ -259,7 +259,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 BOOL CreateFontSubset( const rtl::OUString& rToFile, const ImplFontData* pFont, sal_Int32* pGlyphIDs, sal_uInt8* pEncoding, @@ -292,8 +292,8 @@ public: FontSubsetInfo& rInfo, long* pDataLen ) = 0; // frees the font data again - virtual void FreeEmbedFontData( const void* pData, long nDataLen ) = 0; - + virtual void FreeEmbedFontData( const void* pData, long nDataLen ) = 0; + // get the same widths as in CreateFontSubset and GetEmbedFontData // in case of an embeddable font also fill the mapping // between unicode and glyph id @@ -307,7 +307,7 @@ public: virtual BOOL GetGlyphOutline( long nIndex, basegfx::B2DPolyPolygon& ) = 0; virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ) = 0; - virtual void DrawServerFontLayout( const ServerFontLayout& ) = 0; + virtual void DrawServerFontLayout( const ServerFontLayout& ) = 0; /** Filter text from DrawText commands in a device specific manner <p> This function allows a device (or rather the corresponding SalGraphics @@ -340,16 +340,16 @@ public: false: no substitution has taken place, rNewText, rLen, rCutStart, rCutStop remain unchanged */ virtual bool filterText( const String& rOrigText, String& rNewText, xub_StrLen nIndex, xub_StrLen& rLen, xub_StrLen& rCutStart, xub_StrLen& rCutStop ); - + virtual bool supportsOperation( OutDevSupportType ) const = 0; // mirroring specifica - int GetLayout() { return m_nLayout; } - void SetLayout( int aLayout ) { m_nLayout = aLayout;} + int GetLayout() { return m_nLayout; } + void SetLayout( int aLayout ) { m_nLayout = aLayout;} - 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; + 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; 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,8 +359,8 @@ public: // non virtual methods; these do eventual 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 UnionClipRegion( long nX, long nY, long nWidth, long nHeight, const OutputDevice *pOutDev ); + BOOL UnionClipRegion( const ::basegfx::B2DPolyPolygon&, const OutputDevice* ); // draw --> LineColor and FillColor and RasterOp and ClipRegion void DrawPixel( long nX, long nY, const OutputDevice *pOutDev ); @@ -485,7 +485,7 @@ public: const SalBitmap& rAlphaBitmap, const OutputDevice *pOutDev ); - bool DrawAlphaRect( long nX, long nY, long nWidth, long nHeight, + bool DrawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency, const OutputDevice *pOutDev ); virtual SystemGraphicsData GetGraphicsData() const = 0; diff --git a/vcl/inc/vcl/salgeom.hxx b/vcl/inc/vcl/salgeom.hxx index c512d0a195fa..48d8e39d5121 100644 --- a/vcl/inc/vcl/salgeom.hxx +++ b/vcl/inc/vcl/salgeom.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,7 +40,7 @@ typedef struct _SalFrameGeometry { nRightDecoration, nBottomDecoration; unsigned int nScreenNumber; - + _SalFrameGeometry() : nX( 0 ), nY( 0 ), nWidth( 1 ), nHeight( 1 ), nLeftDecoration( 0 ), nTopDecoration( 0 ), diff --git a/vcl/inc/vcl/salgtype.hxx b/vcl/inc/vcl/salgtype.hxx index d6f0b6d7de2f..ea98f91c58f3 100644 --- a/vcl/inc/vcl/salgtype.hxx +++ b/vcl/inc/vcl/salgtype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -36,11 +36,11 @@ // ------------ 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)) -#define SALCOLOR_NONE (~(SalColor)0) +#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)) +#define SALCOLOR_NONE (~(SalColor)0) // ------------ // - SalPoint - // ------------ @@ -48,8 +48,8 @@ typedef UINT32 SalColor; // must equal to class Point struct SalPoint { - long mnX; - long mnY; + long mnX; + long mnY; }; typedef const SalPoint* PCONSTSALPOINT; @@ -60,14 +60,14 @@ typedef const SalPoint* PCONSTSALPOINT; struct SalTwoRect { - long mnSrcX; - long mnSrcY; - long mnSrcWidth; - long mnSrcHeight; - long mnDestX; - long mnDestY; - long mnDestWidth; - long mnDestHeight; + long mnSrcX; + long mnSrcY; + long mnSrcWidth; + long mnSrcHeight; + long mnDestX; + long mnDestY; + long mnDestWidth; + long mnDestHeight; }; // --------------- @@ -75,18 +75,18 @@ struct SalTwoRect // --------------- typedef USHORT SalROPColor; -#define SAL_ROP_0 ((SalROPColor)0) -#define SAL_ROP_1 ((SalROPColor)1) -#define SAL_ROP_INVERT ((SalROPColor)2) +#define SAL_ROP_0 ((SalROPColor)0) +#define SAL_ROP_1 ((SalROPColor)1) +#define SAL_ROP_INVERT ((SalROPColor)2) // ------------- // - SalInvert - // ------------- typedef USHORT SalInvert; -#define SAL_INVERT_HIGHLIGHT ((SalInvert)0x0001) -#define SAL_INVERT_50 ((SalInvert)0x0002) -#define SAL_INVERT_TRACKFRAME ((SalInvert)0x0004) +#define SAL_INVERT_HIGHLIGHT ((SalInvert)0x0001) +#define SAL_INVERT_50 ((SalInvert)0x0002) +#define SAL_INVERT_TRACKFRAME ((SalInvert)0x0004) #endif // _SV_SALGTYPE_HXX diff --git a/vcl/inc/vcl/salimestatus.hxx b/vcl/inc/vcl/salimestatus.hxx index 76255e4f495c..c43038b8ea0f 100644 --- a/vcl/inc/vcl/salimestatus.hxx +++ b/vcl/inc/vcl/salimestatus.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/salinst.hxx b/vcl/inc/vcl/salinst.hxx index 30187dde2108..a69980c9acea 100644 --- a/vcl/inc/vcl/salinst.hxx +++ b/vcl/inc/vcl/salinst.hxx @@ -71,10 +71,10 @@ class VCL_DLLPUBLIC SalInstance public: typedef bool(*Callback)(void*,void*,int); private: - void* m_pEventInst; - void* m_pErrorInst; - Callback m_pEventCallback; - Callback m_pErrorCallback; + void* m_pEventInst; + void* m_pErrorInst; + Callback m_pEventCallback; + Callback m_pErrorCallback; public: SalInstance() : @@ -87,57 +87,57 @@ public: // Frame // DisplayName for Unix ??? - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, ULONG nStyle ) = 0; - virtual SalFrame* CreateFrame( SalFrame* pParent, ULONG nStyle ) = 0; - virtual void DestroyFrame( SalFrame* pFrame ) = 0; + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, ULONG nStyle ) = 0; + virtual SalFrame* CreateFrame( SalFrame* pParent, 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 void DestroyObject( SalObject* pObject ) = 0; + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE ) = 0; + virtual void DestroyObject( SalObject* pObject ) = 0; // VirtualDevice // nDX and nDY in Pixel // nBitCount: 0 == Default(=as window) / 1 == Mono // pData allows for using a system dependent graphics or device context - virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, + virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, long nDX, long nDY, USHORT nBitCount, const SystemGraphicsData *pData = NULL ) = 0; - virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice ) = 0; + virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice ) = 0; // Printer // pSetupData->mpDriverData can be 0 // pSetupData must be updatet with the current // JobSetup - virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, + virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, ImplJobSetup* pSetupData ) = 0; - virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) = 0; - virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) = 0; - virtual void DestroyPrinter( SalPrinter* pPrinter ) = 0; + virtual void DestroyInfoPrinter( SalInfoPrinter* pPrinter ) = 0; + virtual SalPrinter* CreatePrinter( SalInfoPrinter* pInfoPrinter ) = 0; + virtual void DestroyPrinter( SalPrinter* pPrinter ) = 0; - virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) = 0; - virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) = 0; - virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) = 0; + virtual void GetPrinterQueueInfo( ImplPrnQueueList* pList ) = 0; + virtual void GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) = 0; + virtual void DeletePrinterQueueInfo( SalPrinterQueueInfo* pInfo ) = 0; virtual String GetDefaultPrinter() = 0; // SalTimer - virtual SalTimer* CreateSalTimer() = 0; + virtual SalTimer* CreateSalTimer() = 0; // SalI18NImeStatus - virtual SalI18NImeStatus* CreateI18NImeStatus() = 0; + virtual SalI18NImeStatus* CreateI18NImeStatus() = 0; // SalSystem - virtual SalSystem* CreateSalSystem() = 0; + virtual SalSystem* CreateSalSystem() = 0; // SalBitmap - virtual SalBitmap* CreateSalBitmap() = 0; + virtual SalBitmap* CreateSalBitmap() = 0; // YieldMutex virtual osl::SolarMutex* GetYieldMutex() = 0; - virtual ULONG ReleaseYieldMutex() = 0; - virtual void AcquireYieldMutex( ULONG nCount ) = 0; + virtual ULONG ReleaseYieldMutex() = 0; + virtual void AcquireYieldMutex( ULONG nCount ) = 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 void Yield( bool bWait, bool bHandleAllCurrentEvents ) = 0; + virtual bool AnyInput( USHORT nType ) = 0; // Menues virtual SalMenu* CreateMenu( BOOL bMenuBar ) = 0; @@ -146,7 +146,7 @@ public: virtual void DestroyMenuItem( SalMenuItem* pItem ) = 0; // may return NULL to disable session management - virtual SalSession* CreateSalSession() = 0; + virtual SalSession* CreateSalSession() = 0; // methods for XDisplayConnection @@ -154,21 +154,21 @@ public: // 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 ) + void SetEventCallback( void* pInstance, Callback pCallback ) { m_pEventInst = pInstance; m_pEventCallback = pCallback; } Callback GetEventCallback() const { return m_pEventCallback; } - bool CallEventCallback( void* pEvent, int nBytes ) + bool CallEventCallback( void* pEvent, int nBytes ) { return m_pEventCallback ? m_pEventCallback( m_pEventInst, pEvent, nBytes ) : false; } - void SetErrorEventCallback( void* pInstance, Callback pCallback ) + void SetErrorEventCallback( void* pInstance, Callback pCallback ) { m_pErrorInst = pInstance; m_pErrorCallback = pCallback; } - Callback GetErrorEventCallback() const + Callback GetErrorEventCallback() const { return m_pErrorCallback; } - bool CallErrorCallback( void* pEvent, int nBytes ) + bool CallErrorCallback( void* pEvent, int nBytes ) { return m_pErrorCallback ? m_pErrorCallback( m_pErrorInst, pEvent, nBytes ) : false; } enum ConnectionIdentifierType { AsciiCString, Blob }; - virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0; + virtual void* GetConnectionIdentifier( ConnectionIdentifierType& rReturnedType, int& rReturnedBytes ) = 0; // this is a vehicle for PrintFontManager to bridge the gap between vcl and libvclplug_* // this is only necessary because PrintFontManager is an exported vcl API and therefore diff --git a/vcl/inc/vcl/sallayout.hxx b/vcl/inc/vcl/sallayout.hxx index b26970c708d5..ffcec7f1f3e2 100644 --- a/vcl/inc/vcl/sallayout.hxx +++ b/vcl/inc/vcl/sallayout.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -197,7 +197,7 @@ public: int GetUnitsPerPixel() const { return mnUnitsPerPixel; } int GetOrientation() const { return mnOrientation; } - + virtual const ImplFontData* GetFallbackFontData( sal_GlyphId ) const; // methods using string indexing @@ -330,9 +330,9 @@ public: enum{ FALLBACK_MASK=0xFF, IS_IN_CLUSTER=0x100, IS_RTL_GLYPH=0x200, IS_DIACRITIC=0x400 }; - bool IsClusterStart() const { return ((mnFlags & IS_IN_CLUSTER) == 0); } - bool IsRTLGlyph() const { return ((mnFlags & IS_RTL_GLYPH) != 0); } - bool IsDiacritic() const { return ((mnFlags & IS_DIACRITIC) != 0); } + bool IsClusterStart() const { return ((mnFlags & IS_IN_CLUSTER) == 0); } + bool IsRTLGlyph() const { return ((mnFlags & IS_RTL_GLYPH) != 0); } + bool IsDiacritic() const { return ((mnFlags & IS_DIACRITIC) != 0); } }; // --------------- diff --git a/vcl/inc/vcl/salmenu.hxx b/vcl/inc/vcl/salmenu.hxx index 3ddcb95d4475..44857692866f 100644 --- a/vcl/inc/vcl/salmenu.hxx +++ b/vcl/inc/vcl/salmenu.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -41,12 +41,12 @@ class SalFrame; struct SalItemParams { - USHORT nId; // item Id - MenuItemType eType; // MenuItem-Type - MenuItemBits nBits; // MenuItem-Bits - Menu* pMenu; // Pointer to Menu - XubString aText; // Menu-Text - Image aImage; // Image + USHORT nId; // item Id + MenuItemType eType; // MenuItem-Type + MenuItemBits nBits; // MenuItem-Bits + Menu* pMenu; // Pointer to Menu + XubString aText; // Menu-Text + Image aImage; // Image }; @@ -55,7 +55,7 @@ struct SalMenuButtonItem USHORT mnId; Image maImage; rtl::OUString maToolTipText; - + SalMenuButtonItem() : mnId( 0 ) {} SalMenuButtonItem( USHORT i_nId, const Image& rImg, const rtl::OUString& i_rTTText = rtl::OUString() ) : mnId( i_nId ), maImage( rImg ), maToolTipText( i_rTTText ) {} @@ -90,7 +90,7 @@ public: virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, ULONG nFlags); virtual bool AddMenuBarButton( const SalMenuButtonItem& ); // return false if not implemented or failure virtual void RemoveMenuBarButton( USHORT 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 diff --git a/vcl/inc/vcl/salnativewidgets.hxx b/vcl/inc/vcl/salnativewidgets.hxx index 89b6be637005..be3eeb6c2022 100644 --- a/vcl/inc/vcl/salnativewidgets.hxx +++ b/vcl/inc/vcl/salnativewidgets.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,32 +40,32 @@ * control if it were composite). */ -typedef sal_uInt32 ControlType; +typedef sal_uInt32 ControlType; // for use in general purpose ImplControlValue #define CTRL_GENERIC 0 // Normal PushButton/Command Button -#define CTRL_PUSHBUTTON 1 +#define CTRL_PUSHBUTTON 1 // Normal single radio button -#define CTRL_RADIOBUTTON 2 +#define CTRL_RADIOBUTTON 2 // Normal single checkbox -#define CTRL_CHECKBOX 10 +#define CTRL_CHECKBOX 10 // Combobox, i.e. a ListBox // that allows data entry by user -#define CTRL_COMBOBOX 20 +#define CTRL_COMBOBOX 20 // Control that allows text entry -#define CTRL_EDITBOX 30 +#define CTRL_EDITBOX 30 // Control that allows text entry, but without the usual border // Has to be handled separately, because this one cannot handle // HAS_BACKGROUND_TEXTURE, which is drawn in the edit box'es // border window. -#define CTRL_EDITBOX_NOBORDER 31 +#define CTRL_EDITBOX_NOBORDER 31 // Control that allows text entry // ( some systems distingish between single and multi line edit boxes ) @@ -73,61 +73,61 @@ typedef sal_uInt32 ControlType; // Control that pops up a menu, // but does NOT allow data entry -#define CTRL_LISTBOX 35 +#define CTRL_LISTBOX 35 -// An edit field together with two little +// An edit field together with two little // buttons on the side (aka spin field) -#define CTRL_SPINBOX 40 +#define CTRL_SPINBOX 40 // Two standalone spin buttons // without an edit field -#define CTRL_SPINBUTTONS 45 +#define CTRL_SPINBUTTONS 45 // A single tab -#define CTRL_TAB_ITEM 50 +#define CTRL_TAB_ITEM 50 // The border around a tab area, // but without the tabs themselves. // May have a gap at the top for // the active tab -#define CTRL_TAB_PANE 55 +#define CTRL_TAB_PANE 55 // Background of a Tab Pane -#define CTRL_TAB_BODY 56 +#define CTRL_TAB_BODY 56 // Normal scrollbar, including // all parts like slider, buttons -#define CTRL_SCROLLBAR 60 +#define CTRL_SCROLLBAR 60 #define CTRL_SLIDER 65 // Border around a group of related // items, perhaps also displaying // a label of identification -#define CTRL_GROUPBOX 70 +#define CTRL_GROUPBOX 70 // A separator line -#define CTRL_FIXEDLINE 80 +#define CTRL_FIXEDLINE 80 // A rectangular border, like a // Tab Pane, but without the // possible gap for a tab -#define CTRL_FIXEDBORDER 90 +#define CTRL_FIXEDBORDER 90 // A toolbar control with buttons and a grip -#define CTRL_TOOLBAR 100 +#define CTRL_TOOLBAR 100 // The menubar -#define CTRL_MENUBAR 120 +#define CTRL_MENUBAR 120 // popup menu #define CTRL_MENU_POPUP 121 // The statusbar -#define CTRL_STATUSBAR 130 +#define CTRL_STATUSBAR 130 #define CTRL_PROGRESS 131 // Progress bar for the intro window // (aka splash screen), in case some -// wants native progress bar in the +// wants native progress bar in the // application but not for the splash // screen (used in desktop/) #define CTRL_INTROPROGRESS 132 @@ -155,24 +155,24 @@ typedef sal_uInt32 ControlType; * for example the slider of a scroll bar. */ -typedef sal_uInt32 ControlPart; +typedef sal_uInt32 ControlPart; -#define PART_ENTIRE_CONTROL 1 +#define PART_ENTIRE_CONTROL 1 #define PART_WINDOW 5 // the static listbox window containing the list -#define PART_BUTTON 100 -#define PART_BUTTON_UP 101 -#define PART_BUTTON_DOWN 102 // Also for ComboBoxes/ListBoxes -#define PART_BUTTON_LEFT 103 -#define PART_BUTTON_RIGHT 104 -#define PART_ALL_BUTTONS 105 -#define PART_TRACK_HORZ_LEFT 200 -#define PART_TRACK_VERT_UPPER 201 -#define PART_TRACK_HORZ_RIGHT 202 -#define PART_TRACK_VERT_LOWER 203 -#define PART_TRACK_HORZ_AREA 204 -#define PART_TRACK_VERT_AREA 205 -#define PART_THUMB_HORZ 210 // Also used as toolbar grip -#define PART_THUMB_VERT 211 // Also used as toolbar grip +#define PART_BUTTON 100 +#define PART_BUTTON_UP 101 +#define PART_BUTTON_DOWN 102 // Also for ComboBoxes/ListBoxes +#define PART_BUTTON_LEFT 103 +#define PART_BUTTON_RIGHT 104 +#define PART_ALL_BUTTONS 105 +#define PART_TRACK_HORZ_LEFT 200 +#define PART_TRACK_VERT_UPPER 201 +#define PART_TRACK_HORZ_RIGHT 202 +#define PART_TRACK_VERT_LOWER 203 +#define PART_TRACK_HORZ_AREA 204 +#define PART_TRACK_VERT_AREA 205 +#define PART_THUMB_HORZ 210 // Also used as toolbar grip +#define PART_THUMB_VERT 211 // Also used as toolbar grip #define PART_MENU_ITEM 250 #define PART_MENU_ITEM_CHECK_MARK 251 #define PART_MENU_ITEM_RADIO_MARK 252 @@ -184,10 +184,10 @@ typedef sal_uInt32 ControlPart; However aqua draws a little outside. The canonical way would be to enhance the HitTestNativeControl passing a ScrollbarValue additionally so all necessary information is available in the call. - . + . However since there is only this one small exception we will deviate a little and instead pass the respective rect as control region to allow for a small correction. - + So all places using HitTestNativeControl on PART_THUMB_HORZ, PART_THUMB_VERT, PART_TRACK_HORZ_LEFT, PART_TRACK_HORZ_RIGHT, PART_TRACK_VERT_UPPER, PART_TRACK_VERT_LOWER do not use the control rectangle as region but the actuall part rectangle, making @@ -208,12 +208,12 @@ typedef sal_uInt32 ControlPart; // in to draw this part is expected to be the entire // area of the control. // A control may respond to one or both. -#define PART_DRAW_BACKGROUND_HORZ 1000 -#define PART_DRAW_BACKGROUND_VERT 1001 +#define PART_DRAW_BACKGROUND_HORZ 1000 +#define PART_DRAW_BACKGROUND_VERT 1001 -// GTK+ also draws tabs right->left since there is a +// GTK+ also draws tabs right->left since there is a // hardcoded 2 pixel overlap between adjacent tabs -#define PART_TABS_DRAW_RTL 3000 +#define PART_TABS_DRAW_RTL 3000 // For themes that do not want to have the focus // rectangle part drawn by VCL but take care of the @@ -240,16 +240,16 @@ typedef sal_uInt32 ControlPart; * in the ControlState. */ -typedef sal_uInt32 ControlState; +typedef sal_uInt32 ControlState; -#define CTRL_STATE_ENABLED 0x0001 -#define CTRL_STATE_FOCUSED 0x0002 -#define CTRL_STATE_PRESSED 0x0004 -#define CTRL_STATE_ROLLOVER 0x0008 -#define CTRL_STATE_HIDDEN 0x0010 -#define CTRL_STATE_DEFAULT 0x0020 -#define CTRL_STATE_SELECTED 0x0040 -#define CTRL_CACHING_ALLOWED 0x8000 // set when the control is completely visible (i.e. not clipped) +#define CTRL_STATE_ENABLED 0x0001 +#define CTRL_STATE_FOCUSED 0x0002 +#define CTRL_STATE_PRESSED 0x0004 +#define CTRL_STATE_ROLLOVER 0x0008 +#define CTRL_STATE_HIDDEN 0x0010 +#define CTRL_STATE_DEFAULT 0x0020 +#define CTRL_STATE_SELECTED 0x0040 +#define CTRL_CACHING_ALLOWED 0x8000 // set when the control is completely visible (i.e. not clipped) /* ButtonValue: * @@ -276,7 +276,7 @@ class VCL_DLLPUBLIC ImplControlValue private: ControlType mType; ButtonValue mTristate; // Tristate value: on, off, mixed - long mNumber; // numeric value + long mNumber; // numeric value protected: ImplControlValue( ControlType i_eType, ButtonValue i_eTriState, long i_nNumber ) : mType( i_eType ) @@ -293,35 +293,35 @@ class VCL_DLLPUBLIC ImplControlValue : mType( CTRL_GENERIC ), mTristate(BUTTONVALUE_DONTKNOW), mNumber(0) {} virtual ~ImplControlValue(); - + ControlType getType() const { return mType; } - inline ButtonValue getTristateVal( void ) const { return mTristate; } - inline void setTristateVal( ButtonValue nTristate ) { mTristate = nTristate; } + inline ButtonValue getTristateVal( void ) const { return mTristate; } + inline void setTristateVal( ButtonValue nTristate ) { mTristate = nTristate; } - inline long getNumericVal( void ) const { return mNumber; } - inline void setNumericVal( long nNumeric ) { mNumber = nNumeric; } + inline long getNumericVal( void ) const { return mNumber; } + inline void setNumericVal( long nNumeric ) { mNumber = nNumeric; } }; /* ScrollbarValue: * * Value container for scrollbars. */ - class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue + class VCL_DLLPUBLIC ScrollbarValue : public ImplControlValue { public: - long mnMin; - long mnMax; - long mnCur; - long mnVisibleSize; - Rectangle maThumbRect; - Rectangle maButton1Rect; - Rectangle maButton2Rect; - ControlState mnButton1State; - ControlState mnButton2State; - ControlState mnThumbState; - ControlState mnPage1State; - ControlState mnPage2State; + long mnMin; + long mnMax; + long mnCur; + long mnVisibleSize; + Rectangle maThumbRect; + Rectangle maButton1Rect; + Rectangle maButton2Rect; + ControlState mnButton1State; + ControlState mnButton2State; + ControlState mnThumbState; + ControlState mnPage1State; + ControlState mnPage2State; inline ScrollbarValue() : ImplControlValue( CTRL_SCROLLBAR, BUTTONVALUE_DONTKNOW, 0 ) @@ -336,12 +336,12 @@ class VCL_DLLPUBLIC ImplControlValue class VCL_DLLPUBLIC SliderValue : public ImplControlValue { public: - long mnMin; - long mnMax; - long mnCur; + long mnMin; + long mnMax; + long mnCur; Rectangle maThumbRect; ControlState mnThumbState; - + SliderValue() : ImplControlValue( CTRL_SLIDER, BUTTONVALUE_DONTKNOW, 0 ) , mnMin( 0 ), mnMax( 0 ), mnCur( 0 ), mnThumbState( 0 ) @@ -390,12 +390,12 @@ class VCL_DLLPUBLIC TabitemValue : public ImplControlValue class VCL_DLLPUBLIC SpinbuttonValue : public ImplControlValue { public: - Rectangle maUpperRect; - Rectangle maLowerRect; - ControlState mnUpperState; - ControlState mnLowerState; - int mnUpperPart; - int mnLowerPart; + Rectangle maUpperRect; + Rectangle maLowerRect; + ControlState mnUpperState; + ControlState mnLowerState; + int mnUpperPart; + int mnLowerPart; inline SpinbuttonValue() : ImplControlValue( CTRL_SPINBUTTONS, BUTTONVALUE_DONTKNOW, 0 ) @@ -405,7 +405,7 @@ class VCL_DLLPUBLIC SpinbuttonValue : public ImplControlValue virtual ~SpinbuttonValue(); }; -/* Toolbarvalue: +/* Toolbarvalue: * * Value container for toolbars detailing the grip position */ @@ -415,12 +415,12 @@ public: ToolbarValue() : ImplControlValue( CTRL_TOOLBAR, BUTTONVALUE_DONTKNOW, 0 ) { mbIsTopDockingArea = FALSE; } virtual ~ToolbarValue(); - Rectangle maGripRect; + Rectangle maGripRect; BOOL mbIsTopDockingArea; // indicates that this is the top aligned dockingarea // adjacent to the menubar }; -/* MenubarValue: +/* MenubarValue: * * Value container for menubars specifying height of adjacent docking area */ @@ -433,7 +433,7 @@ public: int maTopDockingAreaHeight; }; -/* PushButtonValue: +/* PushButtonValue: * * Value container for pushbuttons specifying additional drawing hints */ @@ -444,7 +444,7 @@ public: : ImplControlValue( CTRL_PUSHBUTTON, BUTTONVALUE_DONTKNOW, 0 ) , mbBevelButton( false ), mbSingleLine( true ) {} virtual ~PushButtonValue(); - + bool mbBevelButton:1; bool mbSingleLine:1; }; diff --git a/vcl/inc/vcl/salobj.hxx b/vcl/inc/vcl/salobj.hxx index 6ba025befdbe..ca6880652d10 100644 --- a/vcl/inc/vcl/salobj.hxx +++ b/vcl/inc/vcl/salobj.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -40,9 +40,9 @@ 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 ((USHORT)0x0001) +#define SAL_OBJECT_CLIP_EXCLUDERECTS ((USHORT)0x0002) +#define SAL_OBJECT_CLIP_ABSOLUTE ((USHORT)0x0004) // ------------- // - SalObject - @@ -50,35 +50,35 @@ struct SystemEnvData; class VCL_DLLPUBLIC SalObject { - void* m_pInst; - SALOBJECTPROC m_pCallback; + void* m_pInst; + SALOBJECTPROC m_pCallback; BOOL m_bMouseTransparent:1, m_bEraseBackground:1; public: SalObject() : m_pInst( NULL ), m_pCallback( NULL ), m_bMouseTransparent( FALSE ), m_bEraseBackground( TRUE ) {} virtual ~SalObject(); - virtual void ResetClipRegion() = 0; - virtual USHORT GetClipRegionType() = 0; - virtual void BeginSetClipRegion( ULONG nRects ) = 0; - virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ) = 0; - virtual void EndSetClipRegion() = 0; + virtual void ResetClipRegion() = 0; + virtual USHORT GetClipRegionType() = 0; + virtual void BeginSetClipRegion( 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 GrabFocus() = 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 GrabFocus() = 0; - virtual void SetBackground() = 0; - virtual void SetBackground( SalColor nSalColor ) = 0; + virtual void SetBackground() = 0; + virtual void SetBackground( SalColor nSalColor ) = 0; - virtual void SetForwardKey( BOOL /*bEnable*/ ) {} + virtual void SetForwardKey( BOOL /*bEnable*/ ) {} - virtual const SystemEnvData* GetSystemData() const = 0; + virtual const SystemEnvData* GetSystemData() const = 0; - void SetCallback( void* pInst, SALOBJECTPROC pProc ) + void SetCallback( void* pInst, SALOBJECTPROC pProc ) { m_pInst = pInst; m_pCallback = pProc; } - long CallCallback( USHORT nEvent, const void* pEvent ) + long CallCallback( USHORT nEvent, const void* pEvent ) { return m_pCallback ? m_pCallback( m_pInst, this, nEvent, pEvent ) : 0; } void SetMouseTransparent( BOOL bMouseTransparent ) { m_bMouseTransparent = bMouseTransparent; } diff --git a/vcl/inc/vcl/salprn.hxx b/vcl/inc/vcl/salprn.hxx index be387b4f1c7f..9c8cea57d228 100644 --- a/vcl/inc/vcl/salprn.hxx +++ b/vcl/inc/vcl/salprn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -47,13 +47,13 @@ namespace vcl { class PrinterController; } struct VCL_DLLPUBLIC SalPrinterQueueInfo { - XubString maPrinterName; - XubString maDriver; - XubString maLocation; - XubString maComment; - ULONG mnStatus; - ULONG mnJobs; - void* mpSysData; + XubString maPrinterName; + XubString maDriver; + XubString maLocation; + XubString maComment; + ULONG mnStatus; + ULONG mnJobs; + void* mpSysData; SalPrinterQueueInfo(); ~SalPrinterQueueInfo(); @@ -66,8 +66,8 @@ struct VCL_DLLPUBLIC SalPrinterQueueInfo class VCL_DLLPUBLIC SalInfoPrinter { public: - std::vector< PaperInfo > m_aPaperFormats; // all printer supported formats - bool m_bPapersInit; // set to true after InitPaperFormats + std::vector< PaperInfo > m_aPaperFormats; // all printer supported formats + bool m_bPapersInit; // set to true after InitPaperFormats bool m_bCompatMetrics; SalInfoPrinter() : m_bPapersInit( false ), m_bCompatMetrics( false ) {} @@ -75,30 +75,30 @@ public: // SalGraphics or NULL, but two Graphics for all SalFrames // must be returned - virtual SalGraphics* GetGraphics() = 0; - virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; + virtual SalGraphics* GetGraphics() = 0; + virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; - virtual BOOL Setup( SalFrame* pFrame, ImplJobSetup* pSetupData ) = 0; + virtual 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 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 BOOL SetData( ULONG nFlags, ImplJobSetup* pSetupData ) = 0; - virtual void GetPageInfo( const ImplJobSetup* pSetupData, + 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 ULONG GetCapabilities( const ImplJobSetup* pSetupData, USHORT nType ) = 0; + virtual ULONG GetPaperBinCount( const ImplJobSetup* pSetupData ) = 0; + virtual String GetPaperBinName( const ImplJobSetup* pSetupData, ULONG nPaperBin ) = 0; // fills m_aPaperFormats and sets m_bPapersInit to true - virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0; + virtual void InitPaperFormats( const ImplJobSetup* pSetupData ) = 0; // returns angle that a landscape page will be turned counterclockwise wrt to portrait - virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) = 0; + virtual int GetLandscapeAngle( const ImplJobSetup* pSetupData ) = 0; }; // -------------- @@ -107,11 +107,11 @@ public: class VCL_DLLPUBLIC SalPrinter { -public: // public for Sal Implementation +public: // public for Sal Implementation SalPrinter() {} virtual ~SalPrinter(); - virtual BOOL StartJob( const String* pFileName, + virtual BOOL StartJob( const String* pFileName, const String& rJobName, const String& rAppName, ULONG nCopies, @@ -127,12 +127,12 @@ public: // public for Sal Implementation 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 BOOL EndJob() = 0; + virtual BOOL AbortJob() = 0; + virtual SalGraphics* StartPage( ImplJobSetup* pSetupData, BOOL bNewJobData ) = 0; + virtual BOOL EndPage() = 0; + virtual ULONG GetErrorCode() = 0; + }; #endif // _SV_SALPRN_HXX diff --git a/vcl/inc/vcl/salptype.hxx b/vcl/inc/vcl/salptype.hxx index 7ad8b2a2c5f9..aa0ba427b5f3 100644 --- a/vcl/inc/vcl/salptype.hxx +++ b/vcl/inc/vcl/salptype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -48,8 +48,8 @@ // - SalPrinterError - // ------------------- -#define SAL_PRINTER_ERROR_GENERALERROR 1 -#define SAL_PRINTER_ERROR_ABORT 2 +#define SAL_PRINTER_ERROR_GENERALERROR 1 +#define SAL_PRINTER_ERROR_ABORT 2 // ------------------- // - SalPrinterProcs - diff --git a/vcl/inc/vcl/salsession.hxx b/vcl/inc/vcl/salsession.hxx index 5d2fc5cf34ff..8e38e78f33b1 100644 --- a/vcl/inc/vcl/salsession.hxx +++ b/vcl/inc/vcl/salsession.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -41,18 +41,18 @@ enum SalSessionEventType struct SalSessionEvent { - SalSessionEventType m_eType; + SalSessionEventType m_eType; - SalSessionEvent( SalSessionEventType eType ) + SalSessionEvent( SalSessionEventType eType ) : m_eType( eType ) {} }; struct SalSessionInteractionEvent : public SalSessionEvent { - bool m_bInteractionGranted; + bool m_bInteractionGranted; - SalSessionInteractionEvent( bool bGranted ) + SalSessionInteractionEvent( bool bGranted ) : SalSessionEvent( Interaction ), m_bInteractionGranted( bGranted ) {} @@ -60,10 +60,10 @@ struct SalSessionInteractionEvent : public SalSessionEvent struct SalSessionSaveRequestEvent : public SalSessionEvent { - bool m_bShutdown; - bool m_bCancelable; + bool m_bShutdown; + bool m_bCancelable; - SalSessionSaveRequestEvent( bool bShutdown, bool bCancelable ) + SalSessionSaveRequestEvent( bool bShutdown, bool bCancelable ) : SalSessionEvent( SaveRequest ), m_bShutdown( bShutdown ), m_bCancelable( bCancelable ) @@ -72,14 +72,14 @@ struct SalSessionSaveRequestEvent : public SalSessionEvent struct SalSessionShutdownCancelEvent : public SalSessionEvent { - SalSessionShutdownCancelEvent() + SalSessionShutdownCancelEvent() : SalSessionEvent( ShutdownCancel ) {} }; struct SalSessionQuitEvent : public SalSessionEvent { - SalSessionQuitEvent() + SalSessionQuitEvent() : SalSessionEvent( Quit ) {} }; @@ -88,14 +88,14 @@ typedef void(*SessionProc)( SalSessionEvent *pEvent); class VCL_DLLPUBLIC SalSession { - SessionProc m_aProc; + SessionProc m_aProc; public: - SalSession() + SalSession() : m_aProc( 0 ) {} virtual ~SalSession(); - - void SetCallback( SessionProc aCallback ) + + void SetCallback( SessionProc aCallback ) { m_aProc = aCallback; } @@ -104,7 +104,7 @@ public: if( m_aProc ) m_aProc( pEvent ); } - + // query the session manager for a user interaction slot virtual void queryInteraction() = 0; // signal the session manager that we're done with user interaction diff --git a/vcl/inc/vcl/salsys.hxx b/vcl/inc/vcl/salsys.hxx index df8223ca8759..f197c77e4910 100644 --- a/vcl/inc/vcl/salsys.hxx +++ b/vcl/inc/vcl/salsys.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -64,16 +64,16 @@ class VCL_DLLPUBLIC SalSystem public: SalSystem() {} virtual ~SalSystem(); - + // get info about the display /* Gets the number of active screens attached to the display - + @returns the number of active screens */ virtual unsigned int GetDisplayScreenCount() = 0; /* Queries whether multiple screens are truly separate - + @returns true if screens are distinct and windows cannot be moved between them or span multiple of them false if screens form up one big display @@ -82,57 +82,57 @@ public: /* Queries the default screen number. The default screen is the screen on which windows will appear if no special positioning is made. - + @returns the default screen number */ virtual unsigned int GetDefaultDisplayNumber() = 0; /* Gets relative position and size of the screens attached to the display - + @param nScreen The screen number to be queried - + @returns position: (0,0) in case of IsMultiscreen() == true else position relative to whole display size: size of the screen */ virtual Rectangle GetDisplayScreenPosSizePixel( unsigned int nScreen ) = 0; /* Gets position and size of the work area of a screen attached to the display - + @param nScreen The screen number to be queried - + @returns position and size relative to the scree */ virtual Rectangle GetDisplayWorkAreaPosSizePixel( unsigned int nScreen ) = 0; /* Gets the name of a screen - + @param nScreen The screen number to be queried - + @returns the name of the screen */ virtual rtl::OUString GetScreenName( unsigned int nScreen ) = 0; /* Shows a native message box with the specified title, message and button - combination. - + combination. + @param rTitle The title to be shown by the dialog box. - + @param rMessage The message to be shown by the dialog box. - + @param nButtonCombination Specify which button combination the message box should display. See button combinations above. - + @param nDefaultButton - Specifies which button has the focus initially. - See button identifiers above. + Specifies which button has the focus initially. + See button identifiers above. The effect of specifying a button that doesn't belong to the specified button combination is undefined. - - @returns the identifier of the button that was pressed by the user. + + @returns the identifier of the button that was pressed by the user. See button identifier above. If the function fails the return value is 0. */ diff --git a/vcl/inc/vcl/saltimer.hxx b/vcl/inc/vcl/saltimer.hxx index 78c27769c7a6..ed79e586d97d 100644 --- a/vcl/inc/vcl/saltimer.hxx +++ b/vcl/inc/vcl/saltimer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -45,22 +45,22 @@ class VCL_DLLPUBLIC SalTimer { - SALTIMERPROC m_pProc; + SALTIMERPROC m_pProc; public: SalTimer() : m_pProc( NULL ) {} virtual ~SalTimer(); // AutoRepeat and Restart - virtual void Start( ULONG nMS ) = 0; - virtual void Stop() = 0; + virtual void Start( ULONG nMS ) = 0; + virtual void Stop() = 0; // Callbacks (indepen in \sv\source\app\timer.cxx) - void SetCallback( SALTIMERPROC pProc ) + void SetCallback( SALTIMERPROC pProc ) { - m_pProc = pProc; + m_pProc = pProc; } - void CallCallback() + void CallCallback() { if( m_pProc ) m_pProc(); diff --git a/vcl/inc/vcl/salvd.hxx b/vcl/inc/vcl/salvd.hxx index 2b6c6191add6..37e9958644de 100644 --- a/vcl/inc/vcl/salvd.hxx +++ b/vcl/inc/vcl/salvd.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -46,14 +46,14 @@ public: // public for Sal Implementation // SalGraphics or NULL, but two Graphics for all SalVirtualDevices // must be returned - virtual SalGraphics* GetGraphics() = 0; - virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; + virtual SalGraphics* GetGraphics() = 0; + virtual void ReleaseGraphics( SalGraphics* pGraphics ) = 0; // Set new size, without saving the old contents virtual BOOL SetSize( long nNewDX, long nNewDY ) = 0; /// Get actual VDev size in pixel - virtual void GetSize( long& rWidth, long& rHeight ) = 0; + virtual void GetSize( long& rWidth, long& rHeight ) = 0; }; #endif // _SV_SALVD_HXX diff --git a/vcl/inc/vcl/salwtype.hxx b/vcl/inc/vcl/salwtype.hxx index 90ccb92af6a2..fbc7832055bd 100644 --- a/vcl/inc/vcl/salwtype.hxx +++ b/vcl/inc/vcl/salwtype.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -136,7 +136,7 @@ struct SalMenuEvent { USHORT mnId; // Menu item ID void* mpMenu; // pointer to VCL menu (class Menu) - + SalMenuEvent() : mnId( 0 ), mpMenu( NULL ) {} SalMenuEvent( USHORT i_nId, void* i_pMenu ) : mnId( i_nId ), mpMenu( i_pMenu ) {} @@ -158,7 +158,7 @@ struct SalPaintEvent long mnBoundWidth; // BoundRect - Width long mnBoundHeight; // BoundRect - Height bool mbImmediateUpdate; // set to true to force an immediate update - + SalPaintEvent( long x, long y, long w, long h, bool bImmediate = false ) : mnBoundX( x ), mnBoundY( y ), mnBoundWidth( w ), mnBoundHeight( h ), @@ -182,7 +182,7 @@ struct SalWheelMouseEvent 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) - + SalWheelMouseEvent() : mnTime( 0 ), mnX( 0 ), mnY( 0 ), mnDelta( 0 ), mnNotchDelta( 0 ), mnScrollLines( 0 ), mnCode( 0 ), mbHorz( FALSE ), mbDeltaIsPixel( FALSE ) {} diff --git a/vcl/inc/vcl/scrbar.hxx b/vcl/inc/vcl/scrbar.hxx index fd675461cac5..8106317685fb 100644 --- a/vcl/inc/vcl/scrbar.hxx +++ b/vcl/inc/vcl/scrbar.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -79,19 +79,19 @@ private: SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); using Window::ImplInit; - 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 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 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 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 ); 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 void ImplInvert(); + 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 void ImplInvert(); SAL_DLLPRIVATE BOOL ImplDrawNative( USHORT nDrawFlags ); SAL_DLLPRIVATE void ImplDragThumb( const Point& rMousePos ); DECL_DLLPRIVATE_LINK( ImplTimerHdl, Timer* ); diff --git a/vcl/inc/vcl/seleng.hxx b/vcl/inc/vcl/seleng.hxx index b0ccdec69cbb..bcbe3a265860 100644 --- a/vcl/inc/vcl/seleng.hxx +++ b/vcl/inc/vcl/seleng.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -52,7 +52,7 @@ public: virtual void BeginDrag() = 0; virtual void CreateAnchor() = 0; // Anker-Pos := Cursor-Pos - virtual void DestroyAnchor() = 0; + virtual void DestroyAnchor() = 0; // Cursor neu setzen, dabei die beim Anker beginnende // Selektion der neuen Cursor-Position anpassen. TRUE == Ok @@ -77,7 +77,7 @@ public: #define SELENG_HAS_ANCH 0x0020 #define SELENG_CMDEVT 0x0040 #define SELENG_WAIT_UPEVT 0x0080 -#define SELENG_EXPANDONMOVE 0x0100 +#define SELENG_EXPANDONMOVE 0x0100 class VCL_DLLPUBLIC SelectionEngine { @@ -94,7 +94,7 @@ private: USHORT nFlags; DECL_DLLPRIVATE_LINK( ImpWatchDog, Timer * ); - inline BOOL ShouldDeselect( BOOL bModifierKey1 ) const; + inline BOOL ShouldDeselect( BOOL bModifierKey1 ) const; // determines to deselect or not when Ctrl-key is pressed on CursorPosChanging public: @@ -159,7 +159,7 @@ public: void SetAnchor( BOOL bAnchor ); // wird im Ctor eingeschaltet - void ExpandSelectionOnMouseMove( BOOL bExpand = TRUE ) + void ExpandSelectionOnMouseMove( BOOL bExpand = TRUE ) { if( bExpand ) nFlags |= SELENG_EXPANDONMOVE; @@ -248,6 +248,6 @@ inline void SelectionEngine::SetAnchor( BOOL bAnchor ) nFlags &= (~SELENG_HAS_ANCH); } -#endif // _SV_SELENG_HXX +#endif // _SV_SELENG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx index 9728e4eebc54..5fa547d6cf02 100644 --- a/vcl/inc/vcl/settings.hxx +++ b/vcl/inc/vcl/settings.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -339,7 +339,7 @@ class ImplStyleData private: ULONG mnRefCount; - void* mpStyleData_NotUsedYet; + void* mpStyleData_NotUsedYet; Color maActiveBorderColor; Color maActiveColor; @@ -513,19 +513,20 @@ private: #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_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_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_THEMES_MAX ((ULONG)8) +#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) @@ -735,33 +736,33 @@ public: const Color& GetInactiveTabColor() const { return mpData->maInactiveTabColor; } - void SetHighContrastMode( BOOL bHighContrast ) + void SetHighContrastMode( BOOL bHighContrast ) { CopyData(); mpData->mnHighContrast = bHighContrast; } - BOOL GetHighContrastMode() const + BOOL GetHighContrastMode() const { return (BOOL) mpData->mnHighContrast; } - BOOL IsHighContrastBlackAndWhite() const; - void SetUseSystemUIFonts( BOOL bUseSystemUIFonts ) + BOOL IsHighContrastBlackAndWhite() const; + void SetUseSystemUIFonts( BOOL bUseSystemUIFonts ) { CopyData(); mpData->mnUseSystemUIFonts = bUseSystemUIFonts; } - BOOL GetUseSystemUIFonts() const + BOOL GetUseSystemUIFonts() const { return (BOOL) mpData->mnUseSystemUIFonts; } - void SetUseFlatBorders( BOOL bUseFlatBorders ) + void SetUseFlatBorders( BOOL bUseFlatBorders ) { CopyData(); mpData->mnUseFlatBorders = bUseFlatBorders; } - BOOL GetUseFlatBorders() const + BOOL GetUseFlatBorders() const { return (BOOL) mpData->mnUseFlatBorders; } - void SetUseFlatMenues( BOOL bUseFlatMenues ) + void SetUseFlatMenues( BOOL bUseFlatMenues ) { CopyData(); mpData->mnUseFlatMenues = bUseFlatMenues; } - BOOL GetUseFlatMenues() const + BOOL GetUseFlatMenues() const { return (BOOL) mpData->mnUseFlatMenues; } - void SetUseImagesInMenus( BOOL bUseImagesInMenus ) + void SetUseImagesInMenus( BOOL bUseImagesInMenus ) { CopyData(); mpData->mnUseImagesInMenus = bUseImagesInMenus; } - BOOL GetUseImagesInMenus() const; + BOOL GetUseImagesInMenus() const; void SetPreferredUseImagesInMenus( BOOL bPreferredUseImagesInMenus ) { CopyData(); mpData->mbPreferredUseImagesInMenus = bPreferredUseImagesInMenus; } BOOL GetPreferredUseImagesInMenus() const { return mpData->mbPreferredUseImagesInMenus; } - void SetSkipDisabledInMenus( BOOL bSkipDisabledInMenus ) + void SetSkipDisabledInMenus( BOOL bSkipDisabledInMenus ) { CopyData(); mpData->mnSkipDisabledInMenus = bSkipDisabledInMenus; } - BOOL GetSkipDisabledInMenus() const + BOOL GetSkipDisabledInMenus() const { return (BOOL) mpData->mnSkipDisabledInMenus; } void SetCairoFontOptions( const void *pOptions ) @@ -936,9 +937,9 @@ public: { CopyData(); mpData->mnOptions = nOptions; } ULONG GetOptions() const { return mpData->mnOptions; } - void SetAutoMnemonic( BOOL bAutoMnemonic ) + void SetAutoMnemonic( BOOL bAutoMnemonic ) { CopyData(); mpData->mnAutoMnemonic = (USHORT)bAutoMnemonic; } - BOOL GetAutoMnemonic() const + BOOL GetAutoMnemonic() const { return mpData->mnAutoMnemonic ? TRUE : FALSE; } void SetFontColor( const Color& rColor ) @@ -946,34 +947,34 @@ public: const Color& GetFontColor() const { return mpData->maFontColor; } - void SetToolbarIconSize( ULONG nSize ) + void SetToolbarIconSize( ULONG nSize ) { CopyData(); mpData->mnToolbarIconSize = nSize; } - ULONG GetToolbarIconSize() const + ULONG GetToolbarIconSize() const { return mpData->mnToolbarIconSize; } - void SetSymbolsStyle( ULONG nStyle ) + void SetSymbolsStyle( ULONG nStyle ) { CopyData(); mpData->mnSymbolsStyle = nStyle; } - ULONG GetSymbolsStyle() const + ULONG GetSymbolsStyle() const { return mpData->mnSymbolsStyle; } - void SetPreferredSymbolsStyle( ULONG nStyle ) + void SetPreferredSymbolsStyle( ULONG nStyle ) { CopyData(); mpData->mnPreferredSymbolsStyle = nStyle; } - void SetPreferredSymbolsStyleName( const ::rtl::OUString &rName ); - ULONG GetPreferredSymbolsStyle() const + void SetPreferredSymbolsStyleName( const ::rtl::OUString &rName ); + ULONG GetPreferredSymbolsStyle() const { return mpData->mnPreferredSymbolsStyle; } - // check whether the symbols style is supported (icons are installed) - bool CheckSymbolStyle( ULONG nStyle ) const; + // check whether the symbols style is supported (icons are installed) + bool CheckSymbolStyle( ULONG nStyle ) const; ULONG GetAutoSymbolsStyle() const; - ULONG GetCurrentSymbolsStyle() const; + ULONG GetCurrentSymbolsStyle() const; - void SetSymbolsStyleName( const ::rtl::OUString &rName ) + void SetSymbolsStyleName( const ::rtl::OUString &rName ) { return SetSymbolsStyle( ImplNameToSymbolsStyle( rName ) ); } - ::rtl::OUString GetSymbolsStyleName() const + ::rtl::OUString GetSymbolsStyleName() const { return ImplSymbolsStyleToName( GetSymbolsStyle() ); } - ::rtl::OUString GetCurrentSymbolsStyleName() const + ::rtl::OUString GetCurrentSymbolsStyleName() const { return ImplSymbolsStyleToName( GetCurrentSymbolsStyle() ); } - + const Wallpaper& GetWorkspaceGradient() const { return mpData->maWorkspaceGradient; } void SetWorkspaceGradient( const Wallpaper& rWall ) @@ -992,8 +993,8 @@ public: { return !(*this == rSet); } protected: - ::rtl::OUString ImplSymbolsStyleToName( ULONG nStyle ) const; - ULONG ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const; + ::rtl::OUString ImplSymbolsStyleToName( ULONG nStyle ) const; + ULONG ImplNameToSymbolsStyle( const ::rtl::OUString &rName ) const; }; // ---------------- @@ -1030,12 +1031,12 @@ 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( BOOL bEnable ); + BOOL GetEnableATToolSupport() const; + void SetDisablePrinting( BOOL bEnable ); + BOOL GetDisablePrinting() const; + void SetEnableLocalizedDecimalSep( BOOL bEnable ); + BOOL GetEnableLocalizedDecimalSep() const; const MiscSettings& operator =( const MiscSettings& rSet ); BOOL operator ==( const MiscSettings& rSet ) const; @@ -1155,7 +1156,7 @@ public: class LocaleConfigurationListener; class ImplAllSettingsData { - friend class AllSettings; + friend class AllSettings; ImplAllSettingsData(); ImplAllSettingsData( const ImplAllSettingsData& rData ); @@ -1182,8 +1183,8 @@ private: CollatorWrapper* mpUICollatorWrapper; vcl::I18nHelper* mpI18nHelper; vcl::I18nHelper* mpUII18nHelper; - LocaleConfigurationListener* mpLocaleCfgListener; - SvtSysLocale maSysLocale; + LocaleConfigurationListener* mpLocaleCfgListener; + SvtSysLocale maSysLocale; }; // --------------- @@ -1207,7 +1208,7 @@ private: 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 ((ULONG)0x00000800) // this flag indicates that the data changed event was created // in Windows::UpdateSettings probably because of a global // settings changed @@ -1300,8 +1301,8 @@ public: BOOL operator ==( const AllSettings& rSet ) const; BOOL operator !=( const AllSettings& rSet ) const { return !(*this == rSet); } - static void LocaleSettingsChanged( sal_uInt32 nHint ); - SvtSysLocale& GetSysLocale() { return mpData->maSysLocale; } + static void LocaleSettingsChanged( sal_uInt32 nHint ); + SvtSysLocale& GetSysLocale() { return mpData->maSysLocale; } }; #endif // _SV_SETTINGS_HXX diff --git a/vcl/inc/vcl/slider.hxx b/vcl/inc/vcl/slider.hxx index 5208fffcfb54..fa8f5b40b277 100644 --- a/vcl/inc/vcl/slider.hxx +++ b/vcl/inc/vcl/slider.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -42,92 +42,92 @@ class VCL_DLLPUBLIC Slider : public Control { private: - Rectangle maChannel1Rect; - Rectangle maChannel2Rect; - Rectangle maThumbRect; - long mnStartPos; - long mnMouseOff; - long mnThumbPixOffset; - long mnThumbPixRange; - long mnThumbPixPos; - long mnChannelPixOffset; - long mnChannelPixRange; - long mnChannelPixTop; - long mnChannelPixBottom; - long mnMinRange; - long mnMaxRange; - long mnThumbPos; - long mnLineSize; - long mnPageSize; - long mnDelta; - USHORT mnDragDraw; - USHORT mnStateFlags; - ScrollType meScrollType; - BOOL mbCalcSize; - BOOL mbFullDrag; - Link maSlideHdl; - Link maEndSlideHdl; + Rectangle maChannel1Rect; + Rectangle maChannel2Rect; + Rectangle maThumbRect; + long mnStartPos; + long mnMouseOff; + long mnThumbPixOffset; + long mnThumbPixRange; + long mnThumbPixPos; + long mnChannelPixOffset; + long mnChannelPixRange; + long mnChannelPixTop; + long mnChannelPixBottom; + long mnMinRange; + long mnMaxRange; + long mnThumbPos; + long mnLineSize; + long mnPageSize; + long mnDelta; + USHORT mnDragDraw; + USHORT mnStateFlags; + ScrollType meScrollType; + BOOL mbCalcSize; + BOOL mbFullDrag; + Link maSlideHdl; + Link maEndSlideHdl; using Control::ImplInitSettings; using Window::ImplInit; - 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 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 long ImplDoSlide( long nNewPos ); - SAL_DLLPRIVATE long ImplDoSlideAction( ScrollType eScrollType ); + 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 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 long ImplDoSlide( long nNewPos ); + SAL_DLLPRIVATE long ImplDoSlideAction( ScrollType eScrollType ); public: Slider( Window* pParent, WinBits nStyle = WB_HORZ ); Slider( Window* pParent, const ResId& rResId ); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseButtonUp( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void KeyInput( const KeyEvent& rKEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseButtonUp( const MouseEvent& rMEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void KeyInput( const KeyEvent& rKEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Resize(); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void Slide(); - virtual void EndSlide(); + virtual void Slide(); + virtual void EndSlide(); - void EnableDrag( BOOL bEnable = TRUE ) + void EnableDrag( BOOL bEnable = TRUE ) { mbFullDrag = bEnable; } - BOOL IsDragEnabled() const { return mbFullDrag; } + BOOL IsDragEnabled() const { return mbFullDrag; } - void SetRangeMin( long nNewRange ); - long GetRangeMin() const { return mnMinRange; } - void SetRangeMax( long nNewRange ); - long GetRangeMax() const { return mnMaxRange; } - void SetRange( const Range& rRange ); - Range GetRange() const { return Range( GetRangeMin(), GetRangeMax() ); } - void SetThumbPos( long nThumbPos ); - long GetThumbPos() const { return mnThumbPos; } - void SetLineSize( long nNewSize ) { mnLineSize = nNewSize; } - long GetLineSize() const { return mnLineSize; } - void SetPageSize( long nNewSize ) { mnPageSize = nNewSize; } - long GetPageSize() const { return mnPageSize; } + void SetRangeMin( long nNewRange ); + long GetRangeMin() const { return mnMinRange; } + void SetRangeMax( long nNewRange ); + long GetRangeMax() const { return mnMaxRange; } + void SetRange( const Range& rRange ); + Range GetRange() const { return Range( GetRangeMin(), GetRangeMax() ); } + void SetThumbPos( long nThumbPos ); + long GetThumbPos() const { return mnThumbPos; } + void SetLineSize( long nNewSize ) { mnLineSize = nNewSize; } + long GetLineSize() const { return mnLineSize; } + void SetPageSize( long nNewSize ) { mnPageSize = nNewSize; } + long GetPageSize() const { return mnPageSize; } - long GetDelta() const { return mnDelta; } + long GetDelta() const { return mnDelta; } - Size CalcWindowSizePixel(); + Size CalcWindowSizePixel(); - void SetSlideHdl( const Link& rLink ) { maSlideHdl = rLink; } - const Link& GetSlideHdl() const { return maSlideHdl; } - void SetEndSlideHdl( const Link& rLink ) { maEndSlideHdl = rLink; } - const Link& GetEndSlideHdl() const { return maEndSlideHdl; } + void SetSlideHdl( const Link& rLink ) { maSlideHdl = rLink; } + const Link& GetSlideHdl() const { return maSlideHdl; } + void SetEndSlideHdl( const Link& rLink ) { maEndSlideHdl = rLink; } + const Link& GetEndSlideHdl() const { return maEndSlideHdl; } }; #endif // _SV_SLIDER_HXX diff --git a/vcl/inc/vcl/smartid.hxx b/vcl/inc/vcl/smartid.hxx index fa005db25c80..e1ed09463ef5 100644 --- a/vcl/inc/vcl/smartid.hxx +++ b/vcl/inc/vcl/smartid.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/sndstyle.hxx b/vcl/inc/vcl/sndstyle.hxx index 62268d34a6ba..1767b2610bbe 100644 --- a/vcl/inc/vcl/sndstyle.hxx +++ b/vcl/inc/vcl/sndstyle.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/sound.hxx b/vcl/inc/vcl/sound.hxx index 1a32a27154ce..abb962a2501d 100644 --- a/vcl/inc/vcl/sound.hxx +++ b/vcl/inc/vcl/sound.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/spin.h b/vcl/inc/vcl/spin.h index e20cb9aaa86a..eb52925fcf66 100644 --- a/vcl/inc/vcl/spin.h +++ b/vcl/inc/vcl/spin.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/spin.hxx b/vcl/inc/vcl/spin.hxx index 6250c5020717..5a0d59feff54 100644 --- a/vcl/inc/vcl/spin.hxx +++ b/vcl/inc/vcl/spin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/spinfld.hxx b/vcl/inc/vcl/spinfld.hxx index db46c16d331b..f2b95084a382 100644 --- a/vcl/inc/vcl/spinfld.hxx +++ b/vcl/inc/vcl/spinfld.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -41,16 +41,16 @@ class VCL_DLLPUBLIC SpinField : public Edit { protected: - Edit* mpEdit; - AutoTimer maRepeatTimer; - Rectangle maUpperRect; - Rectangle maLowerRect; - Rectangle maDropDownRect; // noch nicht angebunden... - Link maUpHdlLink; - Link maDownHdlLink; - Link maFirstHdlLink; - Link maLastHdlLink; - BOOL mbRepeat:1, + Edit* mpEdit; + AutoTimer maRepeatTimer; + Rectangle maUpperRect; + Rectangle maLowerRect; + Rectangle maDropDownRect; // noch nicht angebunden... + Link maUpHdlLink; + Link maDownHdlLink; + Link maFirstHdlLink; + Link maLastHdlLink; + BOOL mbRepeat:1, mbSpin:1, mbInitialUp:1, mbInitialDown:1, @@ -60,20 +60,20 @@ protected: mbInDropDown:1; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); private: DECL_DLLPRIVATE_LINK( ImplTimeout, Timer* ); - SAL_DLLPRIVATE void ImplInitSpinFieldData(); - SAL_DLLPRIVATE void ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea ); + SAL_DLLPRIVATE void ImplInitSpinFieldData(); + SAL_DLLPRIVATE void ImplCalcButtonAreas( OutputDevice* pDev, const Size& rOutSz, Rectangle& rDDArea, Rectangle& rSpinUpArea, Rectangle& rSpinDownArea ); protected: SpinField( WindowType nTyp ); - virtual long Notify( NotifyEvent& rNEvt ); - virtual void Command( const CommandEvent& rCEvt ); + virtual long Notify( NotifyEvent& rNEvt ); + virtual void Command( const CommandEvent& rCEvt ); - void EndDropDown(); + void EndDropDown(); virtual void FillLayoutData() const; Rectangle * ImplFindPartRect( const Point& rPt ); @@ -82,35 +82,35 @@ public: SpinField( Window* pParent, const ResId& rResId ); ~SpinField(); - virtual BOOL ShowDropDown( BOOL bShow ); - - virtual void Up(); - virtual void Down(); - virtual void First(); - virtual void Last(); - - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - 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 Resize(); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual BOOL ShowDropDown( BOOL bShow ); + + virtual void Up(); + virtual void Down(); + virtual void First(); + virtual void Last(); + + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + 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 Resize(); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); - void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } - const Link& GetUpHdl() const { return maUpHdlLink; } - void SetDownHdl( const Link& rLink ) { maDownHdlLink = rLink; } - const Link& GetDownHdl() const { return maDownHdlLink; } - void SetFirstHdl( const Link& rLink ) { maFirstHdlLink = rLink; } - const Link& GetFirstHdl() const { return maFirstHdlLink; } - void SetLastHdl( const Link& rLink ) { maLastHdlLink = rLink; } - const Link& GetLastHdl() const { return maLastHdlLink; } + void SetUpHdl( const Link& rLink ) { maUpHdlLink = rLink; } + const Link& GetUpHdl() const { return maUpHdlLink; } + void SetDownHdl( const Link& rLink ) { maDownHdlLink = rLink; } + const Link& GetDownHdl() const { return maDownHdlLink; } + void SetFirstHdl( const Link& rLink ) { maFirstHdlLink = rLink; } + const Link& GetFirstHdl() const { return maFirstHdlLink; } + void SetLastHdl( const Link& rLink ) { maLastHdlLink = rLink; } + const Link& GetLastHdl() const { return maLastHdlLink; } - virtual Size CalcMinimumSize() const; + virtual Size CalcMinimumSize() const; virtual Size GetOptimalSize(WindowSizeType eType) const; - virtual Size CalcSize( USHORT nChars ) const; + virtual Size CalcSize( USHORT nChars ) const; }; #endif // _SV_SPINFLD_HXX diff --git a/vcl/inc/vcl/split.hxx b/vcl/inc/vcl/split.hxx index 9cd77275820a..d8a9634d2a97 100644 --- a/vcl/inc/vcl/split.hxx +++ b/vcl/inc/vcl/split.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -57,8 +57,8 @@ private: Link maSplitHdl; Link maEndSplitHdl; - SAL_DLLPRIVATE void ImplInitSplitterData(); - SAL_DLLPRIVATE void ImplDrawSplitter(); + SAL_DLLPRIVATE void ImplInitSplitterData(); + SAL_DLLPRIVATE void ImplDrawSplitter(); SAL_DLLPRIVATE void ImplSplitMousePos( Point& rPos ); SAL_DLLPRIVATE void ImplStartKbdSplitting(); SAL_DLLPRIVATE void ImplKbdTracking( KeyCode aKeyCode ); @@ -72,7 +72,7 @@ private: protected: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nWinStyle ); + SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nWinStyle ); public: Splitter( Window* pParent, WinBits nStyle = WB_VSCROLL ); diff --git a/vcl/inc/vcl/splitwin.hxx b/vcl/inc/vcl/splitwin.hxx index c6671f2799c0..cdc6d0e9928e 100644 --- a/vcl/inc/vcl/splitwin.hxx +++ b/vcl/inc/vcl/splitwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -46,18 +46,18 @@ typedef USHORT SplitWindowItemBits; // - Bits fuer SplitWindow-Items - // ------------------------------- -#define SWIB_FIXED ((SplitWindowItemBits)0x0001) -#define SWIB_RELATIVESIZE ((SplitWindowItemBits)0x0002) -#define SWIB_PERCENTSIZE ((SplitWindowItemBits)0x0004) -#define SWIB_COLSET ((SplitWindowItemBits)0x0008) -#define SWIB_INVISIBLE ((SplitWindowItemBits)0x0010) +#define SWIB_FIXED ((SplitWindowItemBits)0x0001) +#define SWIB_RELATIVESIZE ((SplitWindowItemBits)0x0002) +#define SWIB_PERCENTSIZE ((SplitWindowItemBits)0x0004) +#define SWIB_COLSET ((SplitWindowItemBits)0x0008) +#define SWIB_INVISIBLE ((SplitWindowItemBits)0x0010) // --------------------- // - SplitWindow-Types - // --------------------- -#define SPLITWINDOW_APPEND ((USHORT)0xFFFF) -#define SPLITWINDOW_ITEM_NOTFOUND ((USHORT)0xFFFF) +#define SPLITWINDOW_APPEND ((USHORT)0xFFFF) +#define SPLITWINDOW_ITEM_NOTFOUND ((USHORT)0xFFFF) // --------------- // - SplitWindow - @@ -66,27 +66,27 @@ typedef USHORT SplitWindowItemBits; class VCL_DLLPUBLIC SplitWindow : public DockingWindow { private: - ImplSplitSet* mpMainSet; - ImplSplitSet* mpBaseSet; - ImplSplitSet* mpSplitSet; - long* mpLastSizes; - Rectangle maDragRect; - long mnDX; - long mnDY; - long mnLeftBorder; - long mnTopBorder; - long mnRightBorder; - long mnBottomBorder; - long mnMaxSize; - long mnMouseOff; - long mnMStartPos; - long mnMSplitPos; - WinBits mnWinStyle; - WindowAlign meAlign; - USHORT mnSplitTest; - USHORT mnSplitPos; - USHORT mnMouseModifier; - BOOL mbDragFull:1, + ImplSplitSet* mpMainSet; + ImplSplitSet* mpBaseSet; + ImplSplitSet* mpSplitSet; + long* mpLastSizes; + Rectangle maDragRect; + long mnDX; + long mnDY; + long mnLeftBorder; + long mnTopBorder; + long mnRightBorder; + long mnBottomBorder; + long mnMaxSize; + long mnMouseOff; + long mnMStartPos; + long mnMSplitPos; + WinBits mnWinStyle; + WindowAlign meAlign; + USHORT mnSplitTest; + USHORT mnSplitPos; + USHORT mnMouseModifier; + BOOL mbDragFull:1, mbHorz:1, mbBottomRight:1, mbCalc:1, @@ -106,30 +106,30 @@ private: mbFadeOutPressed:1, mbFadeNoButtonMode:1, mbNoAlign:1; - Link maStartSplitHdl; - Link maSplitHdl; - Link maSplitResizeHdl; - Link maAutoHideHdl; - Link maFadeInHdl; - Link maFadeOutHdl; + Link maStartSplitHdl; + Link maSplitHdl; + Link maSplitResizeHdl; + Link maAutoHideHdl; + Link maFadeInHdl; + Link maFadeOutHdl; using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings(); - SAL_DLLPRIVATE void ImplCalcLayout(); - SAL_DLLPRIVATE void ImplUpdate(); - 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 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 ImplNewAlign(); + SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInitSettings(); + SAL_DLLPRIVATE void ImplCalcLayout(); + SAL_DLLPRIVATE void ImplUpdate(); + 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 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 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 ImplStartSplit( const MouseEvent& rMEvt ); @@ -156,116 +156,116 @@ public: SplitWindow( Window* pParent, const ResId& rResId ); ~SplitWindow(); - virtual void StartSplit(); - virtual void Split(); - virtual void SplitResize(); - virtual void AutoHide(); - virtual void FadeIn(); - virtual void FadeOut(); + virtual void StartSplit(); + virtual void Split(); + virtual void SplitResize(); + virtual void AutoHide(); + virtual void FadeIn(); + virtual void FadeOut(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void MouseMove( const MouseEvent& rMEvt ); - virtual void Tracking( const TrackingEvent& rTEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Move(); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void MouseMove( const MouseEvent& rMEvt ); + virtual void Tracking( const TrackingEvent& rTEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Move(); + virtual void Resize(); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); virtual long PreNotify( NotifyEvent& rNEvt ); - void InsertItem( USHORT nId, Window* pWindow, long nSize, + void InsertItem( USHORT nId, Window* pWindow, long nSize, USHORT nPos = SPLITWINDOW_APPEND, USHORT nSetId = 0, SplitWindowItemBits nBits = 0 ); - void InsertItem( USHORT nId, long nSize, + void InsertItem( USHORT nId, long nSize, USHORT nPos = SPLITWINDOW_APPEND, USHORT nSetId = 0, SplitWindowItemBits nBits = 0 ); - void MoveItem( USHORT nId, USHORT nNewPos, USHORT nNewSetId = 0 ); - void RemoveItem( USHORT nId, BOOL bHide = TRUE ); - void Clear(); + void MoveItem( USHORT nId, USHORT nNewPos, USHORT nNewSetId = 0 ); + void RemoveItem( USHORT nId, BOOL bHide = TRUE ); + void Clear(); - void SetBaseSet( USHORT nSetId = 0 ); - USHORT GetBaseSet() const; + void SetBaseSet( USHORT nSetId = 0 ); + USHORT GetBaseSet() const; - void SetSplitSize( USHORT nSetId, long nSplitSize, + 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; + 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 SplitItem( USHORT nId, long nNewSize, + 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 ); + 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; + 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 SetNoAlign( BOOL bNoAlign ); - BOOL IsNoAlign() const { return mbNoAlign; } - void SetAlign( WindowAlign eNewAlign = WINDOWALIGN_TOP ); - WindowAlign GetAlign() const { return meAlign; } - BOOL IsHorizontal() const { return mbHorz; } + void SetNoAlign( BOOL bNoAlign ); + BOOL IsNoAlign() const { return mbNoAlign; } + void SetAlign( WindowAlign eNewAlign = WINDOWALIGN_TOP ); + WindowAlign GetAlign() const { return meAlign; } + BOOL IsHorizontal() const { return mbHorz; } - BOOL IsSplitting() const { return IsTracking(); } + BOOL IsSplitting() const { return IsTracking(); } - void SetMaxSizePixel( long nNewMaxSize ) { mnMaxSize = nNewMaxSize; } - long GetMaxSizePixel() const { return mnMaxSize; } + void SetMaxSizePixel( long nNewMaxSize ) { mnMaxSize = nNewMaxSize; } + long GetMaxSizePixel() const { return mnMaxSize; } - static Size CalcWindowSizePixel( const Size& rSize, + static Size CalcWindowSizePixel( const Size& rSize, WindowAlign eAlign, WinBits nWinStyle, BOOL bExtra = FALSE ); - Size CalcWindowSizePixel( const Size& rSize ) + Size CalcWindowSizePixel( const Size& rSize ) { return CalcWindowSizePixel( rSize, meAlign, mnWinStyle, (mbAutoHide || mbFadeOut) ); } - Size CalcLayoutSizePixel( const Size& aNewSize ); + 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; } - long GetFadeInSize() const; - BOOL IsFadeNoButtonMode() const { return mbFadeNoButtonMode; } + 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; } + long GetFadeInSize() const; + BOOL IsFadeNoButtonMode() const { return mbFadeNoButtonMode; } - void SetAutoHideState( BOOL bAutoHide ); - BOOL GetAutoHideState() const { return mbAutoHideIn; } + void SetAutoHideState( BOOL bAutoHide ); + BOOL GetAutoHideState() const { return mbAutoHideIn; } - Rectangle GetAutoHideRect() const; - Rectangle GetFadeInRect() const; - Rectangle GetFadeOutRect() const; + Rectangle GetAutoHideRect() const; + Rectangle GetFadeInRect() const; + Rectangle GetFadeOutRect() const; - void SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; } - const Link& GetStartSplitHdl() const { return maStartSplitHdl; } - void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; } - const Link& GetSplitHdl() const { return maSplitHdl; } - void SetSplitResizeHdl( const Link& rLink ) { maSplitResizeHdl = rLink; } - const Link& GetSplitResizeHdl() const { return maSplitResizeHdl; } - void SetAutoHideHdl( const Link& rLink ) { maAutoHideHdl = rLink; } - const Link& GetAutoHideHdl() const { return maAutoHideHdl; } - void SetFadeInHdl( const Link& rLink ) { maFadeInHdl = rLink; } - const Link& GetFadeInHdl() const { return maFadeInHdl; } - void SetFadeOutHdl( const Link& rLink ) { maFadeOutHdl = rLink; } - const Link& GetFadeOutHdl() const { return maFadeOutHdl; } + void SetStartSplitHdl( const Link& rLink ) { maStartSplitHdl = rLink; } + const Link& GetStartSplitHdl() const { return maStartSplitHdl; } + void SetSplitHdl( const Link& rLink ) { maSplitHdl = rLink; } + const Link& GetSplitHdl() const { return maSplitHdl; } + void SetSplitResizeHdl( const Link& rLink ) { maSplitResizeHdl = rLink; } + const Link& GetSplitResizeHdl() const { return maSplitResizeHdl; } + void SetAutoHideHdl( const Link& rLink ) { maAutoHideHdl = rLink; } + const Link& GetAutoHideHdl() const { return maAutoHideHdl; } + void SetFadeInHdl( const Link& rLink ) { maFadeInHdl = rLink; } + const Link& GetFadeInHdl() const { return maFadeInHdl; } + void SetFadeOutHdl( const Link& rLink ) { maFadeOutHdl = rLink; } + const Link& GetFadeOutHdl() const { return maFadeOutHdl; } }; -#endif // _SV_SPLITWIN_HXX +#endif // _SV_SPLITWIN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx index 7d5a9a1c9f2d..6574b6ac3c1e 100644 --- a/vcl/inc/vcl/status.hxx +++ b/vcl/inc/vcl/status.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -55,22 +55,22 @@ typedef USHORT StatusBarItemBits; // - Bits fuer StatusBarItems - // ---------------------------- -#define SIB_LEFT ((StatusBarItemBits)0x0001) -#define SIB_CENTER ((StatusBarItemBits)0x0002) -#define SIB_RIGHT ((StatusBarItemBits)0x0004) -#define SIB_IN ((StatusBarItemBits)0x0008) -#define SIB_OUT ((StatusBarItemBits)0x0010) -#define SIB_FLAT ((StatusBarItemBits)0x0020) -#define SIB_AUTOSIZE ((StatusBarItemBits)0x0040) -#define SIB_USERDRAW ((StatusBarItemBits)0x0080) +#define SIB_LEFT ((StatusBarItemBits)0x0001) +#define SIB_CENTER ((StatusBarItemBits)0x0002) +#define SIB_RIGHT ((StatusBarItemBits)0x0004) +#define SIB_IN ((StatusBarItemBits)0x0008) +#define SIB_OUT ((StatusBarItemBits)0x0010) +#define SIB_FLAT ((StatusBarItemBits)0x0020) +#define SIB_AUTOSIZE ((StatusBarItemBits)0x0040) +#define SIB_USERDRAW ((StatusBarItemBits)0x0080) // ------------------- // - StatusBar-Types - // ------------------- -#define STATUSBAR_APPEND ((USHORT)0xFFFF) -#define STATUSBAR_ITEM_NOTFOUND ((USHORT)0xFFFF) -#define STATUSBAR_OFFSET ((long)5) +#define STATUSBAR_APPEND ((USHORT)0xFFFF) +#define STATUSBAR_ITEM_NOTFOUND ((USHORT)0xFFFF) +#define STATUSBAR_OFFSET ((long)5) // ------------- // - StatusBar - @@ -82,38 +82,38 @@ class VCL_DLLPUBLIC StatusBar : public Window private: ImplStatusItemList* mpItemList; ImplData* mpImplData; - XubString maPrgsTxt; - Point maPrgsTxtPos; - Rectangle maPrgsFrameRect; - long mnPrgsSize; - long mnItemsWidth; - long mnDX; - long mnDY; - long mnCalcHeight; - long mnTextY; - long mnItemY; - USHORT mnCurItemId; - USHORT mnPercent; - USHORT mnPercentCount; - BOOL mbVisibleItems; - BOOL mbFormat; - BOOL mbProgressMode; - BOOL mbInUserDraw; - BOOL mbBottomBorder; - Link maClickHdl; - Link maDoubleClickHdl; + XubString maPrgsTxt; + Point maPrgsTxtPos; + Rectangle maPrgsFrameRect; + long mnPrgsSize; + long mnItemsWidth; + long mnDX; + long mnDY; + long mnCalcHeight; + long mnTextY; + long mnItemY; + USHORT mnCurItemId; + USHORT mnPercent; + USHORT mnPercentCount; + BOOL mbVisibleItems; + BOOL mbFormat; + BOOL mbProgressMode; + BOOL mbInUserDraw; + 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 ImplFormat(); - SAL_DLLPRIVATE BOOL ImplIsItemUpdate(); + SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInitSettings( BOOL bFont, BOOL bForeground, BOOL bBackground ); + SAL_DLLPRIVATE void ImplFormat(); + SAL_DLLPRIVATE 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, + 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 ImplCalcProgressRect(); + SAL_DLLPRIVATE void ImplCalcProgressRect(); SAL_DLLPRIVATE Rectangle ImplGetItemRectPos( USHORT nPos ) const; SAL_DLLPRIVATE USHORT ImplGetFirstVisiblePos() const; SAL_DLLPRIVATE void ImplCalcBorder(); @@ -124,104 +124,104 @@ public: StatusBar( Window* pParent, const ResId& rResId ); ~StatusBar(); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void Paint( const Rectangle& rRect ); - virtual void Move(); - virtual void Resize(); - virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void StateChanged( StateChangedType nType ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void MouseButtonDown( const MouseEvent& rMEvt ); + virtual void Paint( const Rectangle& rRect ); + virtual void Move(); + virtual void Resize(); + virtual void RequestHelp( const HelpEvent& rHEvt ); + virtual void StateChanged( StateChangedType nType ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void Click(); - virtual void DoubleClick(); - virtual void UserDraw( const UserDrawEvent& rUDEvt ); + virtual void Click(); + virtual void DoubleClick(); + virtual void UserDraw( const UserDrawEvent& rUDEvt ); - void InsertItem( USHORT nItemId, ULONG nWidth, + void InsertItem( USHORT nItemId, ULONG nWidth, StatusBarItemBits nBits = SIB_CENTER | SIB_IN, long nOffset = STATUSBAR_OFFSET, USHORT nPos = STATUSBAR_APPEND ); - void RemoveItem( USHORT nItemId ); + void RemoveItem( USHORT nItemId ); - void ShowItem( USHORT nItemId ); - void HideItem( USHORT nItemId ); - BOOL IsItemVisible( USHORT nItemId ) const; + void ShowItem( USHORT nItemId ); + void HideItem( USHORT nItemId ); + BOOL IsItemVisible( USHORT nItemId ) const; - void ShowItems(); - void HideItems(); - BOOL AreItemsVisible() const { return mbVisibleItems; } + void ShowItems(); + void HideItems(); + BOOL AreItemsVisible() const { return mbVisibleItems; } - void CopyItems( const StatusBar& rStatusBar ); - void Clear(); + 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; } + 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; } - ULONG GetItemWidth( USHORT nItemId ) const; - StatusBarItemBits GetItemBits( USHORT nItemId ) const; - long GetItemOffset( USHORT nItemId ) const; + ULONG GetItemWidth( USHORT nItemId ) const; + StatusBarItemBits GetItemBits( USHORT nItemId ) const; + long GetItemOffset( USHORT nItemId ) const; - void SetItemText( USHORT nItemId, const XubString& rText ); - const XubString& GetItemText( USHORT nItemId ) const; + void SetItemText( USHORT nItemId, const XubString& rText ); + const XubString& GetItemText( USHORT nItemId ) const; - void SetItemData( USHORT nItemId, void* pNewData ); - void* GetItemData( USHORT nItemId ) const; + void SetItemData( USHORT nItemId, void* pNewData ); + void* GetItemData( USHORT nItemId ) const; void SetItemCommand( USHORT nItemId, const XubString& rCommand ); const XubString& GetItemCommand( USHORT nItemId ); - void SetHelpText( USHORT nItemId, const XubString& rText ); - const XubString& GetHelpText( USHORT nItemId ) const; + void SetHelpText( USHORT nItemId, const XubString& rText ); + const XubString& GetHelpText( USHORT nItemId ) const; using Window::SetQuickHelpText; void SetQuickHelpText( USHORT nItemId, const XubString& rText ); using Window::GetQuickHelpText; const XubString& GetQuickHelpText( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( USHORT nItemId, ULONG nHelpId ); + ULONG GetHelpId( USHORT nItemId ) const; - void SetBottomBorder( BOOL bBottomBorder = TRUE ); - BOOL IsBottomBorder() const { return mbBottomBorder; } + void SetBottomBorder( BOOL bBottomBorder = TRUE ); + BOOL IsBottomBorder() const { return mbBottomBorder; } - void SetTopBorder( BOOL bTopBorder = TRUE ); - BOOL IsTopBorder() const; + void SetTopBorder( BOOL bTopBorder = TRUE ); + BOOL IsTopBorder() const; - void StartProgressMode( const XubString& rText ); - void SetProgressValue( USHORT nPercent ); - void EndProgressMode(); - BOOL IsProgressMode() const { return mbProgressMode; } - void ResetProgressMode(); + void StartProgressMode( const XubString& rText ); + void SetProgressValue( USHORT nPercent ); + void EndProgressMode(); + BOOL IsProgressMode() const { return mbProgressMode; } + void ResetProgressMode(); - void SetText( const XubString& rText ); + void SetText( const XubString& rText ); - void SetHelpText( const XubString& rText ) + void SetHelpText( const XubString& rText ) { Window::SetHelpText( rText ); } - const XubString& GetHelpText() const + const XubString& GetHelpText() const { return Window::GetHelpText(); } - void SetHelpId( ULONG nId ) + void SetHelpId( ULONG nId ) { Window::SetHelpId( nId ); } - ULONG GetHelpId() const + ULONG GetHelpId() const { return Window::GetHelpId(); } - Size CalcWindowSizePixel() const; + Size CalcWindowSizePixel() const; - void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } - const Link& GetClickHdl() const { return maClickHdl; } - void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } - const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } + void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } + const Link& GetClickHdl() const { return maClickHdl; } + void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } + const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } using Window::SetAccessibleName; - void SetAccessibleName( USHORT nItemId, const XubString& rName ); + void SetAccessibleName( USHORT nItemId, const XubString& rName ); using Window::GetAccessibleName; - const XubString& GetAccessibleName( USHORT nItemId ) const; + const XubString& GetAccessibleName( USHORT nItemId ) const; }; -#endif // _SV_STATUS_HXX +#endif // _SV_STATUS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/stdtext.hxx b/vcl/inc/vcl/stdtext.hxx index 96bd7ec14a1f..3d10073d455c 100644 --- a/vcl/inc/vcl/stdtext.hxx +++ b/vcl/inc/vcl/stdtext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -39,9 +39,9 @@ class Window; // - Standard-Texte - // ------------------ -#define STANDARD_TEXT_FIRST STANDARD_TEXT_SERVICE_NOT_AVAILABLE -#define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((USHORT)0) -#define STANDARD_TEXT_LAST STANDARD_TEXT_SERVICE_NOT_AVAILABLE +#define STANDARD_TEXT_FIRST STANDARD_TEXT_SERVICE_NOT_AVAILABLE +#define STANDARD_TEXT_SERVICE_NOT_AVAILABLE ((USHORT)0) +#define STANDARD_TEXT_LAST STANDARD_TEXT_SERVICE_NOT_AVAILABLE XubString VCL_DLLPUBLIC GetStandardText( USHORT nStdText ); @@ -51,6 +51,6 @@ XubString VCL_DLLPUBLIC GetStandardText( USHORT nStdText ); void VCL_DLLPUBLIC ShowServiceNotAvailableError( Window* pParent, const XubString& rServiceName, BOOL bError ); -#endif // _VCL_STDTEXT_HXX +#endif // _VCL_STDTEXT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/strhelper.hxx b/vcl/inc/vcl/strhelper.hxx index 3cb88ea14bdc..a41cd65c9a34 100644 --- a/vcl/inc/vcl/strhelper.hxx +++ b/vcl/inc/vcl/strhelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/subedit.hxx b/vcl/inc/vcl/subedit.hxx index 17b22e2b5587..310af9abbee8 100644 --- a/vcl/inc/vcl/subedit.hxx +++ b/vcl/inc/vcl/subedit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/sv.h b/vcl/inc/vcl/sv.h index 543e08caec8f..5d6527a16602 100644 --- a/vcl/inc/vcl/sv.h +++ b/vcl/inc/vcl/sv.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/svapp.hxx b/vcl/inc/vcl/svapp.hxx index e608b61d0b7f..860f41db193b 100644 --- a/vcl/inc/vcl/svapp.hxx +++ b/vcl/inc/vcl/svapp.hxx @@ -157,12 +157,12 @@ inline BOOL ApplicationAddress::IsConnectToSame( const ApplicationAddress& rAdr return FALSE; } -#define APPEVENT_PARAM_DELIMITER '\n' +#define APPEVENT_PARAM_DELIMITER '\n' -#define APPEVENT_OPEN_STRING "Open" -#define APPEVENT_PRINT_STRING "Print" -#define APPEVENT_DISKINSERT_STRING "DiskInsert" -#define APPEVENT_SAVEDOCUMENTS_STRING "SaveDocuments" +#define APPEVENT_OPEN_STRING "Open" +#define APPEVENT_PRINT_STRING "Print" +#define APPEVENT_DISKINSERT_STRING "DiskInsert" +#define APPEVENT_SAVEDOCUMENTS_STRING "SaveDocuments" class VCL_DLLPUBLIC ApplicationEvent { @@ -314,7 +314,7 @@ public: <TRUE/> if the system font is suitable for our UI <FALSE/> if the test string could not be displayed with the system font */ - static bool ValidateSystemFont(); + static bool ValidateSystemFont(); static void SetSettings( const AllSettings& rSettings ); static const AllSettings& GetSettings(); @@ -330,8 +330,8 @@ public: static ULONG PostKeyEvent( ULONG nEvent, Window *pWin, KeyEvent* pKeyEvent ); static ULONG PostMouseEvent( ULONG nEvent, Window *pWin, MouseEvent* pMouseEvent ); - static void RemoveMouseAndKeyEvents( Window *pWin ); - static BOOL IsProcessedMouseOrKeyEvent( ULONG nEventId ); + static void RemoveMouseAndKeyEvents( Window *pWin ); + static BOOL IsProcessedMouseOrKeyEvent( ULONG nEventId ); static ULONG PostUserEvent( ULONG nEvent, void* pEventData = NULL ); static ULONG PostUserEvent( const Link& rLink, void* pCaller = NULL ); @@ -378,7 +378,7 @@ public: static bool IsMultiDisplay(); static Rectangle GetScreenPosSizePixel( unsigned int nScreen ); static Rectangle GetWorkAreaPosSizePixel( unsigned int nScreen ); - static rtl::OUString GetScreenName( unsigned int nScreen ); + static rtl::OUString GetScreenName( unsigned int nScreen ); static unsigned int GetDefaultDisplayNumber(); // if IsMultiDisplay() == false the return value will be // nearest screen of the target rectangle diff --git a/vcl/inc/vcl/svcompat.hxx b/vcl/inc/vcl/svcompat.hxx index 2aa0c82ad284..2c7ef26c7af5 100644 --- a/vcl/inc/vcl/svcompat.hxx +++ b/vcl/inc/vcl/svcompat.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -36,9 +36,9 @@ // ----------- #define COMPAT_FORMAT( char1, char2, char3, char4 ) \ - ((ULONG)((((ULONG)(char)(char1)))| \ - (((ULONG)(char)(char2))<<8UL)| \ - (((ULONG)(char)(char3))<<16UL)| \ + ((ULONG)((((ULONG)(char)(char1)))| \ + (((ULONG)(char)(char2))<<8UL)| \ + (((ULONG)(char)(char3))<<16UL)| \ ((ULONG)(char)(char4))<<24UL)) diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx index 3229b6f1654d..f2d0f6e08bd2 100644 --- a/vcl/inc/vcl/svdata.hxx +++ b/vcl/inc/vcl/svdata.hxx @@ -236,7 +236,7 @@ struct ImplSVWinData 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 mbNoSaveFocus; // TRUE: menues must not save/restore focus BOOL mbNoSaveBackground; // TRUE: save background is unnecessary or even less performant }; @@ -336,9 +336,9 @@ struct ImplSVData 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 + 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 @@ -361,7 +361,7 @@ struct ImplSVData ::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; + ::vcl::SettingsConfigItem* mpSettingsConfigItem; std::list< vcl::DeleteOnDeinitBase* >* mpDeinitDeleteList; }; diff --git a/vcl/inc/vcl/svids.hrc b/vcl/inc/vcl/svids.hrc index 059ed1524b7c..1f688bc1be2e 100644 --- a/vcl/inc/vcl/svids.hrc +++ b/vcl/inc/vcl/svids.hrc @@ -1,7 +1,7 @@ /************************************************************************* * * 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 @@ -30,47 +30,47 @@ #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_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 // Achtung: Diese Id's muessen min. 10 Werte auseinanderliegen, da // je nach Style noch ein Offset aufgerechnet wird -#define SV_RESID_BITMAP_CHECK 1000 -#define SV_RESID_BITMAP_RADIO 1010 +#define SV_RESID_BITMAP_CHECK 1000 +#define SV_RESID_BITMAP_RADIO 1010 -#define SV_RESID_BITMAP_MSGBOX 1020 +#define SV_RESID_BITMAP_MSGBOX 1020 #define SV_RESID_BITMAP_MSGBOX_HC 1021 -#define SV_RESID_BITMAP_PIN 1030 +#define SV_RESID_BITMAP_PIN 1030 -#define SV_RESID_BITMAP_SPLITHPIN 1040 -#define SV_RESID_BITMAP_SPLITVPIN 1041 -#define SV_RESID_BITMAP_SPLITHARW 1042 -#define SV_RESID_BITMAP_SPLITVARW 1043 +#define SV_RESID_BITMAP_SPLITHPIN 1040 +#define SV_RESID_BITMAP_SPLITVPIN 1041 +#define SV_RESID_BITMAP_SPLITHARW 1042 +#define SV_RESID_BITMAP_SPLITVARW 1043 -#define SV_RESID_BITMAP_SCROLLMSK 1050 -#define SV_RESID_BITMAP_SCROLLBMP 1051 -#define SV_RESID_BITMAP_CLOSEDOC 1052 -#define SV_RESID_BITMAP_CLOSEDOCHC 1053 +#define SV_RESID_BITMAP_SCROLLMSK 1050 +#define SV_RESID_BITMAP_SCROLLBMP 1051 +#define SV_RESID_BITMAP_CLOSEDOC 1052 +#define SV_RESID_BITMAP_CLOSEDOCHC 1053 #define SV_DISCLOSURE_PLUS 1060 #define SV_DISCLOSURE_MINUS 1061 #define SV_DISCLOSURE_PLUS_HC 1062 #define SV_DISCLOSURE_MINUS_HC 1063 -#define SV_RESID_MENU_EDIT 2000 -#define SV_MENU_EDIT_UNDO 1 -#define SV_MENU_EDIT_CUT 2 -#define SV_MENU_EDIT_COPY 3 -#define SV_MENU_EDIT_PASTE 4 -#define SV_MENU_EDIT_DELETE 5 -#define SV_MENU_EDIT_SELECTALL 6 -#define SV_MENU_EDIT_INSERTSYMBOL 7 -#define SV_RESID_STRING_NOSELECTIONPOSSIBLE 2001 +#define SV_RESID_MENU_EDIT 2000 +#define SV_MENU_EDIT_UNDO 1 +#define SV_MENU_EDIT_CUT 2 +#define SV_MENU_EDIT_COPY 3 +#define SV_MENU_EDIT_PASTE 4 +#define SV_MENU_EDIT_DELETE 5 +#define SV_MENU_EDIT_SELECTALL 6 +#define SV_MENU_EDIT_INSERTSYMBOL 7 +#define SV_RESID_STRING_NOSELECTIONPOSSIBLE 2001 #define SV_MENU_MAC_SERVICES 2002 #define SV_MENU_MAC_HIDEAPP 2003 @@ -164,34 +164,34 @@ #define SV_PRINT_NOPRINTERWARNING 2051 #define SV_PRINT_NOCONTENT 2052 -#define SV_HELPTEXT_CLOSE 10000 -#define SV_HELPTEXT_MINIMIZE 10001 -#define SV_HELPTEXT_MAXIMIZE 10002 -#define SV_HELPTEXT_RESTORE 10003 -#define SV_HELPTEXT_ROLLDOWN 10004 -#define SV_HELPTEXT_ROLLUP 10005 -#define SV_HELPTEXT_HELP 10006 -#define SV_HELPTEXT_ALWAYSVISIBLE 10007 -#define SV_HELPTEXT_FADEIN 10008 -#define SV_HELPTEXT_FADEOUT 10009 -#define SV_HELPTEXT_SPLITFLOATING 10010 -#define SV_HELPTEXT_SPLITFIXED 10011 +#define SV_HELPTEXT_CLOSE 10000 +#define SV_HELPTEXT_MINIMIZE 10001 +#define SV_HELPTEXT_MAXIMIZE 10002 +#define SV_HELPTEXT_RESTORE 10003 +#define SV_HELPTEXT_ROLLDOWN 10004 +#define SV_HELPTEXT_ROLLUP 10005 +#define SV_HELPTEXT_HELP 10006 +#define SV_HELPTEXT_ALWAYSVISIBLE 10007 +#define SV_HELPTEXT_FADEIN 10008 +#define SV_HELPTEXT_FADEOUT 10009 +#define SV_HELPTEXT_SPLITFLOATING 10010 +#define SV_HELPTEXT_SPLITFIXED 10011 #define SV_HELPTEXT_CLOSEDOCUMENT 10012 -#define SV_BUTTONTEXT_OK 10100 -#define SV_BUTTONTEXT_CANCEL 10101 -#define SV_BUTTONTEXT_YES 10102 -#define SV_BUTTONTEXT_NO 10103 -#define SV_BUTTONTEXT_RETRY 10104 -#define SV_BUTTONTEXT_HELP 10105 -#define SV_BUTTONTEXT_CLOSE SV_HELPTEXT_CLOSE -#define SV_BUTTONTEXT_MORE 10107 -#define SV_BUTTONTEXT_IGNORE 10108 -#define SV_BUTTONTEXT_ABORT 10109 -#define SV_BUTTONTEXT_LESS 10110 +#define SV_BUTTONTEXT_OK 10100 +#define SV_BUTTONTEXT_CANCEL 10101 +#define SV_BUTTONTEXT_YES 10102 +#define SV_BUTTONTEXT_NO 10103 +#define SV_BUTTONTEXT_RETRY 10104 +#define SV_BUTTONTEXT_HELP 10105 +#define SV_BUTTONTEXT_CLOSE SV_HELPTEXT_CLOSE +#define SV_BUTTONTEXT_MORE 10107 +#define SV_BUTTONTEXT_IGNORE 10108 +#define SV_BUTTONTEXT_ABORT 10109 +#define SV_BUTTONTEXT_LESS 10110 -#define SV_STDTEXT_FIRST SV_STDTEXT_SERVICENOTAVAILABLE -#define SV_STDTEXT_SERVICENOTAVAILABLE 10200 +#define SV_STDTEXT_FIRST SV_STDTEXT_SERVICENOTAVAILABLE +#define SV_STDTEXT_SERVICENOTAVAILABLE 10200 #define SV_STDTEXT_DONTHINTAGAIN 10201 #define SV_STDTEXT_DONTASKAGAIN 10202 #define SV_STDTEXT_DONTWARNAGAIN 10203 @@ -199,20 +199,20 @@ #define SV_STDTEXT_PREFERENCES 10205 #define SV_MAC_SCREENNNAME 10206 #define SV_STDTEXT_ALLFILETYPES 10207 -#define SV_STDTEXT_LAST SV_STDTEXT_ALLFILETYPES +#define SV_STDTEXT_LAST SV_STDTEXT_ALLFILETYPES -#define SV_ACCESSERROR_FIRST SV_ACCESSERROR_WRONG_VERSION -#define SV_ACCESSERROR_WRONG_VERSION 10500 -#define SV_ACCESSERROR_BRIDGE_MSG 10501 +#define SV_ACCESSERROR_FIRST SV_ACCESSERROR_WRONG_VERSION +#define SV_ACCESSERROR_WRONG_VERSION 10500 +#define SV_ACCESSERROR_BRIDGE_MSG 10501 #define SV_ACCESSERROR_OK_CANCEL_MSG 10502 -#define SV_ACCESSERROR_MISSING_BRIDGE 10503 -#define SV_ACCESSERROR_FAULTY_JAVA 10504 -#define SV_ACCESSERROR_JAVA_MSG 10505 -#define SV_ACCESSERROR_MISSING_JAVA 10506 +#define SV_ACCESSERROR_MISSING_BRIDGE 10503 +#define SV_ACCESSERROR_FAULTY_JAVA 10504 +#define SV_ACCESSERROR_JAVA_MSG 10505 +#define SV_ACCESSERROR_MISSING_JAVA 10506 #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_LAST SV_ACCESSERROR_TURNAROUND_MSG #define SV_SHORTCUT_HELP 10600 #define SV_SHORTCUT_CONTEXTHELP 10601 @@ -258,4 +258,4 @@ #define HID_PRINTDLG HID_VCL_START -#endif // _SV_SVIDS_HRC +#endif // _SV_SVIDS_HRC diff --git a/vcl/inc/vcl/symbol.hxx b/vcl/inc/vcl/symbol.hxx index cb7074986911..7a745a433d9a 100644 --- a/vcl/inc/vcl/symbol.hxx +++ b/vcl/inc/vcl/symbol.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -37,47 +37,47 @@ // By changes you must also change: rsc/vclrsc.hxx typedef USHORT SymbolType; -#define SYMBOL_DONTKNOW ((SymbolType)0) -#define SYMBOL_IMAGE ((SymbolType)1) -#define SYMBOL_ARROW_UP ((SymbolType)2) -#define SYMBOL_ARROW_DOWN ((SymbolType)3) -#define SYMBOL_ARROW_LEFT ((SymbolType)4) -#define SYMBOL_ARROW_RIGHT ((SymbolType)5) -#define SYMBOL_SPIN_UP ((SymbolType)6) -#define SYMBOL_SPIN_DOWN ((SymbolType)7) -#define SYMBOL_SPIN_LEFT ((SymbolType)8) -#define SYMBOL_SPIN_RIGHT ((SymbolType)9) -#define SYMBOL_FIRST ((SymbolType)10) -#define SYMBOL_LAST ((SymbolType)11) -#define SYMBOL_PREV ((SymbolType)12) -#define SYMBOL_NEXT ((SymbolType)13) -#define SYMBOL_PAGEUP ((SymbolType)14) -#define SYMBOL_PAGEDOWN ((SymbolType)15) -#define SYMBOL_PLAY ((SymbolType)16) -#define SYMBOL_REVERSEPLAY ((SymbolType)17) -#define SYMBOL_RECORD ((SymbolType)18) -#define SYMBOL_STOP ((SymbolType)19) -#define SYMBOL_PAUSE ((SymbolType)20) -#define SYMBOL_WINDSTART ((SymbolType)21) -#define SYMBOL_WINDEND ((SymbolType)22) -#define SYMBOL_WINDBACKWARD ((SymbolType)23) -#define SYMBOL_WINDFORWARD ((SymbolType)24) -#define SYMBOL_CLOSE ((SymbolType)25) -#define SYMBOL_ROLLUP ((SymbolType)26) -#define SYMBOL_ROLLDOWN ((SymbolType)27) -#define SYMBOL_CHECKMARK ((SymbolType)28) -#define SYMBOL_RADIOCHECKMARK ((SymbolType)29) -#define SYMBOL_SPIN_UPDOWN ((SymbolType)30) -#define SYMBOL_FLOAT ((SymbolType)31) -#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_DONTKNOW ((SymbolType)0) +#define SYMBOL_IMAGE ((SymbolType)1) +#define SYMBOL_ARROW_UP ((SymbolType)2) +#define SYMBOL_ARROW_DOWN ((SymbolType)3) +#define SYMBOL_ARROW_LEFT ((SymbolType)4) +#define SYMBOL_ARROW_RIGHT ((SymbolType)5) +#define SYMBOL_SPIN_UP ((SymbolType)6) +#define SYMBOL_SPIN_DOWN ((SymbolType)7) +#define SYMBOL_SPIN_LEFT ((SymbolType)8) +#define SYMBOL_SPIN_RIGHT ((SymbolType)9) +#define SYMBOL_FIRST ((SymbolType)10) +#define SYMBOL_LAST ((SymbolType)11) +#define SYMBOL_PREV ((SymbolType)12) +#define SYMBOL_NEXT ((SymbolType)13) +#define SYMBOL_PAGEUP ((SymbolType)14) +#define SYMBOL_PAGEDOWN ((SymbolType)15) +#define SYMBOL_PLAY ((SymbolType)16) +#define SYMBOL_REVERSEPLAY ((SymbolType)17) +#define SYMBOL_RECORD ((SymbolType)18) +#define SYMBOL_STOP ((SymbolType)19) +#define SYMBOL_PAUSE ((SymbolType)20) +#define SYMBOL_WINDSTART ((SymbolType)21) +#define SYMBOL_WINDEND ((SymbolType)22) +#define SYMBOL_WINDBACKWARD ((SymbolType)23) +#define SYMBOL_WINDFORWARD ((SymbolType)24) +#define SYMBOL_CLOSE ((SymbolType)25) +#define SYMBOL_ROLLUP ((SymbolType)26) +#define SYMBOL_ROLLDOWN ((SymbolType)27) +#define SYMBOL_CHECKMARK ((SymbolType)28) +#define SYMBOL_RADIOCHECKMARK ((SymbolType)29) +#define SYMBOL_SPIN_UPDOWN ((SymbolType)30) +#define SYMBOL_FLOAT ((SymbolType)31) +#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) +#define SYMBOL_NOSYMBOL (SYMBOL_DONTKNOW) #endif // _SV_SYMBOL_HXX diff --git a/vcl/inc/vcl/syschild.hxx b/vcl/inc/vcl/syschild.hxx index 459f97e68abd..ba1c2e5d1cdb 100644 --- a/vcl/inc/vcl/syschild.hxx +++ b/vcl/inc/vcl/syschild.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -57,7 +57,7 @@ public: SystemChildWindow( Window* pParent, const ResId& rResId ); ~SystemChildWindow(); - const SystemEnvData* GetSystemData() const; + const SystemEnvData* GetSystemData() const; // per default systemchildwindows erase their background for better plugin support // however, this might not always be required diff --git a/vcl/inc/vcl/sysdata.hxx b/vcl/inc/vcl/sysdata.hxx index 2fd41c5df383..108371b115c4 100644 --- a/vcl/inc/vcl/sysdata.hxx +++ b/vcl/inc/vcl/sysdata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -48,23 +48,23 @@ class NSView; struct SystemEnvData { - unsigned long nSize; // size in bytes of this structure + unsigned long nSize; // size in bytes of this structure #if defined( WNT ) || defined( OS2 ) - HWND hWnd; // the window hwnd + HWND hWnd; // the window hwnd #elif defined( QUARTZ ) NSView* pView; // the cocoa (NSView *) implementing this object #elif defined( UNX ) - void* pDisplay; // the relevant display connection - long aWindow; // the window of the object - void* pSalFrame; // contains a salframe, if object has one - void* pWidget; // the corresponding widget - void* pVisual; // the visual in use - int nScreen; // the current screen of the window - int nDepth; // depth of said visual - long aColormap; // the colormap being used - void* pAppContext; // the application context in use - long aShellWindow; // the window of the frame's shell - void* pShellWidget; // the frame's shell widget + void* pDisplay; // the relevant display connection + long aWindow; // the window of the object + void* pSalFrame; // contains a salframe, if object has one + void* pWidget; // the corresponding widget + void* pVisual; // the visual in use + int nScreen; // the current screen of the window + int nDepth; // depth of said visual + long aColormap; // the colormap being used + void* pAppContext; // the application context in use + long aShellWindow; // the window of the frame's shell + void* pShellWidget; // the frame's shell widget #endif }; @@ -76,13 +76,13 @@ struct SystemEnvData struct SystemParentData { - unsigned long nSize; // size in bytes of this structure + unsigned long nSize; // size in bytes of this structure #if defined( WNT ) || defined( OS2 ) - HWND hWnd; // the window hwnd + HWND hWnd; // the window hwnd #elif defined( QUARTZ ) NSView* pView; // the cocoa (NSView *) implementing this object #elif defined( UNX ) - long aWindow; // the window of the object + long aWindow; // the window of the object bool bXEmbedSupport:1; // decides whether the object in question // should support the XEmbed protocol #endif @@ -94,13 +94,13 @@ struct SystemParentData struct SystemMenuData { - unsigned long nSize; // size in bytes of this structure + unsigned long nSize; // size in bytes of this structure #if defined( WNT ) - HMENU hMenu; // the menu handle of the menu bar + HMENU hMenu; // the menu handle of the menu bar #elif defined( QUARTZ ) //not defined #elif defined( UNX ) - long aMenu; // ??? + long aMenu; // ??? #endif }; @@ -110,19 +110,19 @@ struct SystemMenuData struct SystemGraphicsData { - unsigned long nSize; // size in bytes of this structure + unsigned long nSize; // size in bytes of this structure #if defined( WNT ) - HDC hDC; // handle to a device context + HDC hDC; // handle to a device context #elif defined( QUARTZ ) - CGContextRef rCGContext; // QUARTZ graphic context + CGContextRef rCGContext; // QUARTZ graphic context #elif defined( UNX ) - void* pDisplay; // the relevant display connection - long hDrawable; // a drawable - void* pVisual; // the visual in use - int nScreen; // the current screen of the drawable - int nDepth; // depth of said visual - long aColormap; // the colormap being used - void* pRenderFormat; // render format for drawable + void* pDisplay; // the relevant display connection + long hDrawable; // a drawable + void* pVisual; // the visual in use + int nScreen; // the current screen of the drawable + int nDepth; // depth of said visual + long aColormap; // the colormap being used + void* pXRenderFormat; // render format for drawable #endif }; @@ -133,11 +133,11 @@ struct SystemGraphicsData struct SystemWindowData { - unsigned long nSize; // size in bytes of this structure + unsigned long nSize; // size in bytes of this structure #if defined( WNT ) // meaningless on Windows #elif defined( QUARTZ ) // meaningless on Mac OS X / Quartz #elif defined( UNX ) - void* pVisual; // the visual to be used + void* pVisual; // the visual to be used #endif }; @@ -161,10 +161,10 @@ struct SystemGlyphData struct SystemFontData { - unsigned long nSize; // size in bytes of this structure + unsigned long nSize; // size in bytes of this structure #if defined( WNT ) HFONT hFont; // native font object -#elif defined( QUARTZ ) +#elif defined( QUARTZ ) void* aATSUFontID; // native font object #elif defined( UNX ) void* nFontId; // native font id @@ -175,7 +175,7 @@ struct SystemFontData bool bAntialias; // Should this font be antialiased bool bVerticalCharacterType; // Is the font using vertical character type }; - + // -------------------- // - SystemTextLayoutData - // -------------------- @@ -183,7 +183,7 @@ struct SystemFontData typedef std::vector<SystemGlyphData> SystemGlyphDataVector; struct SystemTextLayoutData { - unsigned long nSize; // size in bytes of this structure + unsigned long nSize; // size in bytes of this structure SystemGlyphDataVector rGlyphData; // glyph data int orientation; // Text orientation }; diff --git a/vcl/inc/vcl/syswin.hxx b/vcl/inc/vcl/syswin.hxx index dcc287a4e2cc..db240c18f31f 100644 --- a/vcl/inc/vcl/syswin.hxx +++ b/vcl/inc/vcl/syswin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -59,7 +59,7 @@ class TaskPaneList; #define ICON_MATH_DOCUMENT 15 #define ICON_TEMPLATE 16 #define ICON_MACROLIBRARY 17 -#define ICON_PLAYER 100 +#define ICON_PLAYER 100 #define ICON_SETUP 500 // ------------------- @@ -179,7 +179,7 @@ private: // Copy assignment is forbidden and not implemented. SystemWindow (const SystemWindow &); SystemWindow & operator= (const SystemWindow &); - + SAL_DLLPRIVATE void ImplMoveToScreen( long& io_rX, long& io_rY, long i_nWidth, long i_nHeight, Window* i_pConfigureWin ); protected: @@ -239,34 +239,34 @@ public: void SetMenuBarMode( USHORT nMode ); USHORT GetMenuBarMode() const { return mnMenuBarMode; } - TaskPaneList* GetTaskPaneList(); + TaskPaneList* GetTaskPaneList(); void GetWindowStateData( WindowStateData& rData ) const; - + /** Returns the screen number the window is on - + The screen number is counted the same way that <code>Application::GetScreenPosSizePixel</code>, <code>Application::GetWorkAreaPosSizePixel</code>, <code>Application::GetScreenName</code> and of course <code>SystemWindow::SetScreenNumber</code> are counted in. - + In case the window is positioned on multiple screens the screen number returned will be of the screen containing the upper left pixel of the frame area (that is of the client area on system decorated windows, or the frame area of undecorated resp. owner decorated windows. - + @returns the screen number - + @see SystemWindow::SetScreenNumber */ unsigned int GetScreenNumber() const; /** Move the Window to a new screen. The same rules for positioning apply as in <code>SystemWindow::GetScreenNumber</code> - + The screen number is counted the same way that <code>Application::GetScreenPosSizePixel</code>, <code>Application::GetWorkAreaPosSizePixel</code>, diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx index 25925a89b1d7..877772f284aa 100644 --- a/vcl/inc/vcl/tabctrl.hxx +++ b/vcl/inc/vcl/tabctrl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -91,10 +91,10 @@ private: SAL_DLLPRIVATE void ImplSetFirstPagePos( USHORT nPagePos ); 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 ); - + 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* ); @@ -105,7 +105,7 @@ protected: SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); - virtual void FillLayoutData() const; + virtual void FillLayoutData() const; virtual const Font& GetCanonicalFont( const StyleSettings& _rStyle ) const; virtual const Color& GetCanonicalTextColor( const StyleSettings& _rStyle ) const; SAL_DLLPRIVATE Rectangle* ImplFindPartRect( const Point& rPt ); @@ -180,7 +180,7 @@ public: void SetHelpId( USHORT nPageId, ULONG nHelpId ); ULONG GetHelpId( USHORT nPageId ) const; - + void SetPageImage( USHORT nPageId, const Image& rImage ); const Image* GetPageImage( USHORT nPageId ) const; diff --git a/vcl/inc/vcl/tabdlg.hxx b/vcl/inc/vcl/tabdlg.hxx index 51591522d8e5..ec340af68cbc 100644 --- a/vcl/inc/vcl/tabdlg.hxx +++ b/vcl/inc/vcl/tabdlg.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,13 +43,13 @@ class TabControl; class VCL_DLLPUBLIC TabDialog : public Dialog { private: - FixedLine* mpFixedLine; - Window* mpViewWindow; - WindowAlign meViewAlign; - BOOL mbPosControls; + FixedLine* mpFixedLine; + Window* mpViewWindow; + WindowAlign meViewAlign; + BOOL mbPosControls; - SAL_DLLPRIVATE void ImplInitTabDialogData(); - SAL_DLLPRIVATE void ImplPosControls(); + SAL_DLLPRIVATE void ImplInitTabDialogData(); + SAL_DLLPRIVATE void ImplPosControls(); public: TabDialog( Window* pParent, @@ -57,17 +57,17 @@ public: TabDialog( Window* pParent, const ResId& rResId ); ~TabDialog(); - virtual void Resize(); - virtual void StateChanged( StateChangedType nStateChange ); - - void AdjustLayout(); + virtual void Resize(); + virtual void StateChanged( StateChangedType nStateChange ); + + void AdjustLayout(); - void SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; } - Window* GetViewWindow() const { return mpViewWindow; } - void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; } - WindowAlign GetViewAlign() const { return meViewAlign; } + void SetViewWindow( Window* pWindow ) { mpViewWindow = pWindow; } + Window* GetViewWindow() const { return mpViewWindow; } + void SetViewAlign( WindowAlign eAlign ) { meViewAlign = eAlign; } + WindowAlign GetViewAlign() const { return meViewAlign; } }; -#endif // _SV_TABDLG_HXX +#endif // _SV_TABDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx index 442ac960a011..bececc316fa4 100644 --- a/vcl/inc/vcl/tabpage.hxx +++ b/vcl/inc/vcl/tabpage.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -41,8 +41,8 @@ class VCL_DLLPUBLIC TabPage : public Window { private: using Window::ImplInit; - SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); - SAL_DLLPRIVATE void ImplInitSettings(); + SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle ); + SAL_DLLPRIVATE void ImplInitSettings(); public: TabPage( Window* pParent, WinBits nStyle = 0 ); @@ -51,15 +51,15 @@ public: virtual void Paint( const Rectangle& rRect ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, ULONG nFlags ); - virtual void StateChanged( StateChangedType nStateChange ); - virtual void DataChanged( const DataChangedEvent& rDCEvt ); + virtual void StateChanged( StateChangedType nStateChange ); + virtual void DataChanged( const DataChangedEvent& rDCEvt ); - virtual void ActivatePage(); - virtual void DeactivatePage(); + virtual void ActivatePage(); + virtual void DeactivatePage(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible(); }; -#endif // _SV_TABPAGE_HXX +#endif // _SV_TABPAGE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/taskpanelist.hxx b/vcl/inc/vcl/taskpanelist.hxx index 0eb4f20cd97d..0331c1220858 100644 --- a/vcl/inc/vcl/taskpanelist.hxx +++ b/vcl/inc/vcl/taskpanelist.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/textlayout.hxx b/vcl/inc/vcl/textlayout.hxx index 0f593ed00e21..7f42ecafe158 100644 --- a/vcl/inc/vcl/textlayout.hxx +++ b/vcl/inc/vcl/textlayout.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/threadex.hxx b/vcl/inc/vcl/threadex.hxx index 429b43e6ac7c..1e1ab0e69b23 100644 --- a/vcl/inc/vcl/threadex.hxx +++ b/vcl/inc/vcl/threadex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -41,9 +41,9 @@ namespace vcl { class VCL_DLLPUBLIC ThreadExecutor { - oslThread m_aThread; - oslCondition m_aFinish; - long m_nReturn; + oslThread m_aThread; + oslCondition m_aFinish; + long m_nReturn; #ifdef THREADEX_IMPLEMENTATION public: @@ -60,8 +60,8 @@ namespace vcl class VCL_DLLPUBLIC SolarThreadExecutor { oslCondition m_aStart; - oslCondition m_aFinish; - long m_nReturn; + oslCondition m_aFinish; + long m_nReturn; bool m_bTimeout; DECL_DLLPRIVATE_LINK( worker, void* ); diff --git a/vcl/inc/vcl/timer.hxx b/vcl/inc/vcl/timer.hxx index ae2ca9a3ba99..4cacc5662a35 100644 --- a/vcl/inc/vcl/timer.hxx +++ b/vcl/inc/vcl/timer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -52,7 +52,7 @@ protected: public: Timer(); Timer( const Timer& rTimer ); - virtual ~Timer(); + virtual ~Timer(); virtual void Timeout(); diff --git a/vcl/inc/vcl/toolbox.h b/vcl/inc/vcl/toolbox.h index bc169c18e160..014be121b349 100644 --- a/vcl/inc/vcl/toolbox.h +++ b/vcl/inc/vcl/toolbox.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -59,28 +59,28 @@ class Window; struct ImplToolItem { - Window* mpWindow; - void* mpUserData; - Image maImage; - Image maHighImage; - long mnImageAngle; - bool mbMirrorMode; - XubString maText; - XubString maQuickHelpText; - XubString maHelpText; - String maCommandStr; - ULONG mnHelpId; - Rectangle maRect; - Rectangle maCalcRect; + Window* mpWindow; + void* mpUserData; + Image maImage; + Image maHighImage; + long mnImageAngle; + bool mbMirrorMode; + XubString maText; + XubString maQuickHelpText; + XubString maHelpText; + String maCommandStr; + ULONG mnHelpId; + Rectangle maRect; + Rectangle maCalcRect; // the overall horizontal item size, including one or more of [image size + textlength + dropdown arrow] - Size maItemSize; - long mnSepSize; + Size maItemSize; + long mnSepSize; long mnDropDownArrowWidth; - ToolBoxItemType meType; - ToolBoxItemBits mnBits; - TriState meState; - USHORT mnId; - BOOL mbEnabled:1, + ToolBoxItemType meType; + ToolBoxItemBits mnBits; + TriState meState; + USHORT mnId; + BOOL mbEnabled:1, mbVisible:1, mbEmptyBtn:1, mbShowWindow:1, @@ -104,7 +104,7 @@ 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( BOOL bHorz, 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; @@ -123,8 +123,8 @@ namespace vcl struct ToolBoxLayoutData : public ControlLayoutData { - std::vector< USHORT > m_aLineItemIds; - std::vector< USHORT > m_aLineItemPositions; + std::vector< USHORT > m_aLineItemIds; + std::vector< USHORT > m_aLineItemPositions; }; @@ -133,8 +133,8 @@ struct ToolBoxLayoutData : public ControlLayoutData struct ImplToolBoxPrivateData { - vcl::ToolBoxLayoutData* m_pLayoutData; - std::vector< ImplToolItem > m_aItems; + vcl::ToolBoxLayoutData* m_pLayoutData; + std::vector< ImplToolItem > m_aItems; ImplToolBoxPrivateData(); ~ImplToolBoxPrivateData(); @@ -143,7 +143,7 @@ struct ImplToolBoxPrivateData // called when dropdown items are clicked Link maDropdownClickHdl; - Timer maDropdownTimer; // for opening dropdown items on "long click" + Timer maDropdownTimer; // for opening dropdown items on "long click" // large or small buttons ? ToolBoxButtonSize meButtonSize; @@ -154,14 +154,14 @@ struct ImplToolBoxPrivateData ULONG mnEventId; // called when menu button is clicked and before the popup menu is executed - Link maMenuButtonHdl; + Link maMenuButtonHdl; // a dummy item representing the custom menu button ImplToolItem maMenubuttonItem; long mnMenuButtonWidth; - + Wallpaper maDisplayBackground; - + // support for highcontrast vcl::IImageListProvider* mpImageListProvider; vcl::ImageListType meImageListType; @@ -170,8 +170,8 @@ struct ImplToolBoxPrivateData mbAssumeDocked:1, // only used during calculations to override current floating/popup mode mbAssumeFloating:1, mbAssumePopupMode:1, - mbKeyInputDisabled:1, // no KEY input if all items disabled, closing/docking will be allowed though - mbIsPaintLocked:1, // don't allow paints + mbKeyInputDisabled:1, // no KEY input if all items disabled, closing/docking will be allowed though + mbIsPaintLocked:1, // don't allow paints mbMenubuttonSelected:1, // menu button is highlighted mbPageScroll:1, // determines if we scroll a page at a time mbNativeButtons:1, // system supports native toolbar buttons @@ -180,6 +180,6 @@ struct ImplToolBoxPrivateData }; -#endif // _SV_TOOLBOX_H +#endif // _SV_TOOLBOX_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index 094e831af702..e6b241729148 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -170,8 +170,8 @@ class VCL_DLLPUBLIC ToolBox : public DockingWindow friend class ImplTBDragMgr; private: - ImplToolBoxPrivateData* mpData; - VirtualDevice* mpBtnDev; // TODO: remove unused member + ImplToolBoxPrivateData* mpData; + VirtualDevice* mpBtnDev; // TODO: remove unused member ImplToolSizeArray* mpFloatSizeAry; XubString maCvtStr; XubString maNextToolBoxStr; @@ -199,7 +199,7 @@ private: long mnLastResizeDY; long mnActivateCount; USHORT mnLastFocusItemId; - USHORT mnFocusPos; + USHORT mnFocusPos; USHORT mnOutStyle; USHORT mnHighItemId; USHORT mnCurItemId; @@ -270,8 +270,8 @@ private: 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 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 ); @@ -279,8 +279,8 @@ private: SAL_DLLPRIVATE BOOL ImplActivateItem( KeyCode aKeyCode ); SAL_DLLPRIVATE void ImplShowFocus(); SAL_DLLPRIVATE void ImplHideFocus(); - SAL_DLLPRIVATE void ImplUpdateInputEnable(); - SAL_DLLPRIVATE void ImplFillLayoutData() const; + SAL_DLLPRIVATE void ImplUpdateInputEnable(); + SAL_DLLPRIVATE void ImplFillLayoutData() const; SAL_DLLPRIVATE void ImplUpdateCustomMenu(); SAL_DLLPRIVATE BOOL ImplHasClippedItems(); SAL_DLLPRIVATE Point ImplGetPopupPosition( const Rectangle& rRect, const Size& rSize ) const; @@ -410,7 +410,7 @@ public: void RecalcItems(); const ImageList& GetImageList() const { return maImageList; } - void SetImageList( const ImageList& rImageList ); + void SetImageList( const ImageList& rImageList ); void SetButtonType( ButtonType eNewType = BUTTON_SYMBOL ); ButtonType GetButtonType() const { return meButtonType; } @@ -455,7 +455,7 @@ public: USHORT GetDownItemId() const { return mnDownItemId; } USHORT GetClicks() const { return mnMouseClicks; } USHORT GetModifier() const { return mnMouseModifier; } - USHORT GetKeyModifier() const { return mnKeyModifier; } + USHORT GetKeyModifier() const { return mnKeyModifier; } void SetItemBits( USHORT nItemId, ToolBoxItemBits nBits ); ToolBoxItemBits GetItemBits( USHORT nItemId ) const; @@ -464,10 +464,10 @@ public: 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 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 ); diff --git a/vcl/inc/vcl/unobrok.hxx b/vcl/inc/vcl/unobrok.hxx index 67c83ea83952..91916f4dfebe 100644 --- a/vcl/inc/vcl/unobrok.hxx +++ b/vcl/inc/vcl/unobrok.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -37,6 +37,6 @@ namespace vcl_accept sal_Bool accept(const ::rtl::OUString & accDcp, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory> & rSMgr); } -#endif // _UNOBROK_HXX +#endif // _UNOBROK_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/unohelp.hxx b/vcl/inc/vcl/unohelp.hxx index 2126d5e77ba6..1dc6c226db22 100644 --- a/vcl/inc/vcl/unohelp.hxx +++ b/vcl/inc/vcl/unohelp.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -42,7 +42,7 @@ namespace i18n { class XCollator; } namespace lang { - class XMultiServiceFactory; + class XMultiServiceFactory; } }}} @@ -50,7 +50,7 @@ namespace com { namespace sun { namespace star { namespace accessibility { - struct AccessibleEventObject; + struct AccessibleEventObject; } }}} @@ -65,7 +65,7 @@ namespace unohelper ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XCollator > VCL_DLLPUBLIC CreateCollator(); ::rtl::OUString VCL_DLLPUBLIC CreateLibraryName( const sal_Char* pModName, sal_Bool bSUPD ); void VCL_DLLPUBLIC NotifyAccessibleStateEventGlobally( const ::com::sun::star::accessibility::AccessibleEventObject& rEventObject ); -}} // namespace vcl::unohelper +}} // namespace vcl::unohelper #endif // _VCL_UNOHELP_HXX diff --git a/vcl/inc/vcl/unohelp2.hxx b/vcl/inc/vcl/unohelp2.hxx index 5824f016c57c..0a51a5eb909e 100644 --- a/vcl/inc/vcl/unohelp2.hxx +++ b/vcl/inc/vcl/unohelp2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -46,18 +46,18 @@ namespace vcl { namespace unohelper { public ::cppu::OWeakObject { private: - String maText; + String maText; - public: + public: TextDataObject( const String& rText ); ~TextDataObject(); - String& GetString() { return maText; } + String& GetString() { return maText; } // ::com::sun::star::uno::XInterface - ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); - void SAL_CALL acquire() throw() { OWeakObject::acquire(); } - void SAL_CALL release() throw() { OWeakObject::release(); } + ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); + void SAL_CALL acquire() throw() { OWeakObject::acquire(); } + void SAL_CALL release() throw() { OWeakObject::release(); } // ::com::sun::star::datatransfer::XTransferable ::com::sun::star::uno::Any SAL_CALL getTransferData( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw(::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException); @@ -79,7 +79,7 @@ namespace vcl { namespace unohelper { ::osl::Mutex& GetMutex() { return maMutex; } }; -}} // namespace vcl::unohelper +}} // namespace vcl::unohelper #endif // _VCL_UNOHELP2_HXX diff --git a/vcl/inc/vcl/unowrap.hxx b/vcl/inc/vcl/unowrap.hxx index 3691014d7477..258b49f59cce 100644 --- a/vcl/inc/vcl/unowrap.hxx +++ b/vcl/inc/vcl/unowrap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -34,17 +34,17 @@ #include <com/sun/star/uno/Reference.h> class XWindowPeer; -class XToolkit; -class XVclToolkit; -class EventList; +class XToolkit; +class XVclToolkit; +class EventList; class Window; -class OutputDevice; +class OutputDevice; class MouseEvent; class CommandEvent; class KeyEvent; class Rectangle; class XVclComponentPeer; -class Menu; +class Menu; namespace com { namespace sun { @@ -68,27 +68,27 @@ namespace accessibility { class VCL_DLLPUBLIC UnoWrapperBase { -public: - virtual void Destroy() = 0; +public: + virtual void Destroy() = 0; // Toolkit virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XToolkit > GetVCLToolkit() = 0; // Graphics - virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > CreateGraphics( OutputDevice* pOutDev ) = 0; - virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) = 0; + virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XGraphics > CreateGraphics( OutputDevice* pOutDev ) = 0; + virtual void ReleaseAllGraphics( OutputDevice* pOutDev ) = 0; // Window virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer> GetWindowInterface( Window* pWindow, sal_Bool bCreate ) = 0; - virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0; + virtual void SetWindowInterface( Window* pWindow, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > xIFace ) = 0; - virtual void WindowDestroyed( Window* pWindow ) = 0; + virtual void WindowDestroyed( Window* pWindow ) = 0; // Accessibility virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible( Menu* pMenu, sal_Bool bIsMenuBar ) = 0; }; -#endif // _VCL_UNOWRAP_HXX +#endif // _VCL_UNOWRAP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/vclenum.hxx b/vcl/inc/vcl/vclenum.hxx index 492f2293afaf..6fac4e31c438 100644 --- a/vcl/inc/vcl/vclenum.hxx +++ b/vcl/inc/vcl/vclenum.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -67,13 +67,13 @@ enum ExtDateFieldFormat { XTDATEF_SYSTEM_SHORT, XTDATEF_SYSTEM_SHORT_YY, XTDATEF // ------------------------------------------------------------ // to avoid conflicts with enum's declared otherwise -#define GRADIENT_LINEAR GradientStyle_LINEAR -#define GRADIENT_AXIAL GradientStyle_AXIAL -#define GRADIENT_RADIAL GradientStyle_RADIAL -#define GRADIENT_ELLIPTICAL GradientStyle_ELLIPTICAL -#define GRADIENT_SQUARE GradientStyle_SQUARE -#define GRADIENT_RECT GradientStyle_RECT -#define GRADIENT_FORCE_EQUAL_SIZE GradientStyle_FORCE_EQUAL_SIZE +#define GRADIENT_LINEAR GradientStyle_LINEAR +#define GRADIENT_AXIAL GradientStyle_AXIAL +#define GRADIENT_RADIAL GradientStyle_RADIAL +#define GRADIENT_ELLIPTICAL GradientStyle_ELLIPTICAL +#define GRADIENT_SQUARE GradientStyle_SQUARE +#define GRADIENT_RECT GradientStyle_RECT +#define GRADIENT_FORCE_EQUAL_SIZE GradientStyle_FORCE_EQUAL_SIZE #ifndef ENUM_GRADIENTSTYLE_DECLARED #define ENUM_GRADIENTSTYLE_DECLARED @@ -94,10 +94,10 @@ enum GradientStyle // ------------------------------------------------------------ // to avoid conflicts with enum's declared otherwise -#define HATCH_SINGLE HatchStyle_SINGLE -#define HATCH_DOUBLE HatchStyle_DOUBLE -#define HATCH_TRIPLE HatchStyle_TRIPLE -#define HATCH_FORCE_EQUAL_SIZE HatchStyle_FORCE_EQUAL_SIZE +#define HATCH_SINGLE HatchStyle_SINGLE +#define HATCH_DOUBLE HatchStyle_DOUBLE +#define HATCH_TRIPLE HatchStyle_TRIPLE +#define HATCH_FORCE_EQUAL_SIZE HatchStyle_FORCE_EQUAL_SIZE #ifndef ENUM_HATCHSTYLE_DECLARED #define ENUM_HATCHSTYLE_DECLARED @@ -115,10 +115,10 @@ enum HatchStyle // ------------------------------------------------------------ // to avoid conflicts with enum's declared otherwise -#define LINE_NONE LineStyle_NONE -#define LINE_SOLID LineStyle_SOLID -#define LINE_DASH LineStyle_DASH -#define LINE_FORCE_EQUAL_SIZE LineStyle_FORCE_EQUAL_SIZE +#define LINE_NONE LineStyle_NONE +#define LINE_SOLID LineStyle_SOLID +#define LINE_DASH LineStyle_DASH +#define LINE_FORCE_EQUAL_SIZE LineStyle_FORCE_EQUAL_SIZE #ifndef ENUM_LINESTYLE_DECLARED #define ENUM_LINESTYLE_DECLARED @@ -241,20 +241,20 @@ enum FontStrikeout { STRIKEOUT_NONE, STRIKEOUT_SINGLE, STRIKEOUT_DOUBLE, #define ENUM_FONTEMPHASISMARK_DECLARED typedef USHORT FontEmphasisMark; -#define EMPHASISMARK_NONE ((FontEmphasisMark)0x0000) -#define EMPHASISMARK_DOT ((FontEmphasisMark)0x0001) -#define EMPHASISMARK_CIRCLE ((FontEmphasisMark)0x0002) -#define EMPHASISMARK_DISC ((FontEmphasisMark)0x0003) -#define EMPHASISMARK_ACCENT ((FontEmphasisMark)0x0004) -#define EMPHASISMARK_STYLE ((FontEmphasisMark)0x00FF) -#define EMPHASISMARK_POS_ABOVE ((FontEmphasisMark)0x1000) -#define EMPHASISMARK_POS_BELOW ((FontEmphasisMark)0x2000) +#define EMPHASISMARK_NONE ((FontEmphasisMark)0x0000) +#define EMPHASISMARK_DOT ((FontEmphasisMark)0x0001) +#define EMPHASISMARK_CIRCLE ((FontEmphasisMark)0x0002) +#define EMPHASISMARK_DISC ((FontEmphasisMark)0x0003) +#define EMPHASISMARK_ACCENT ((FontEmphasisMark)0x0004) +#define EMPHASISMARK_STYLE ((FontEmphasisMark)0x00FF) +#define EMPHASISMARK_POS_ABOVE ((FontEmphasisMark)0x1000) +#define EMPHASISMARK_POS_BELOW ((FontEmphasisMark)0x2000) // Only for kompability -#define EMPHASISMARK_DOTS_ABOVE (EMPHASISMARK_DOT | EMPHASISMARK_POS_ABOVE) -#define EMPHASISMARK_DOTS_BELOW (EMPHASISMARK_DOT | EMPHASISMARK_POS_BELOW) -#define EMPHASISMARK_SIDE_DOTS (EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE) -#define EMPHASISMARK_CIRCLE_ABOVE (EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE) +#define EMPHASISMARK_DOTS_ABOVE (EMPHASISMARK_DOT | EMPHASISMARK_POS_ABOVE) +#define EMPHASISMARK_DOTS_BELOW (EMPHASISMARK_DOT | EMPHASISMARK_POS_BELOW) +#define EMPHASISMARK_SIDE_DOTS (EMPHASISMARK_ACCENT | EMPHASISMARK_POS_ABOVE) +#define EMPHASISMARK_CIRCLE_ABOVE (EMPHASISMARK_CIRCLE | EMPHASISMARK_POS_ABOVE) #endif @@ -317,7 +317,7 @@ enum KeyFuncType { KEYFUNC_DONTKNOW, KEYFUNC_NEW, KEYFUNC_OPEN, KEYFUNC_SAVE, #endif -typedef sal_uInt32 sal_UCS4; // TODO: this should be moved to rtl +typedef sal_uInt32 sal_UCS4; // TODO: this should be moved to rtl #ifndef ENUM_OUTDEVSUPPORT_DECLARED #define ENUM_OUTDEVSUPPORT_DECLARED @@ -326,6 +326,6 @@ enum OutDevSupportType { OutDevSupport_TransparentRect, OutDevSupport_B2DClip, O #endif -#endif // _VCL_VCLENUM_HXX +#endif // _VCL_VCLENUM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/vclevent.hxx b/vcl/inc/vcl/vclevent.hxx index 42e76bc92bd8..f4cc2f5afff8 100644 --- a/vcl/inc/vcl/vclevent.hxx +++ b/vcl/inc/vcl/vclevent.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -109,14 +109,14 @@ namespace com { namespace sun { namespace star { #define VCLEVENT_LISTBOX_SCROLLED 1127 #define VCLEVENT_COMBOBOX_SCROLLED 1128 #define VCLEVENT_EDIT_SELECTIONCHANGED 1129 -#define VCLEVENT_DROPDOWN_OPEN 1130 -#define VCLEVENT_DROPDOWN_CLOSE 1131 +#define VCLEVENT_DROPDOWN_OPEN 1130 +#define VCLEVENT_DROPDOWN_CLOSE 1131 #define VCLEVENT_TOOLBOX_ITEMADDED 1132 // pData = itempos #define VCLEVENT_TOOLBOX_ITEMREMOVED 1133 // pData = itempos #define VCLEVENT_TOOLBOX_ALLITEMSCHANGED 1134 #define VCLEVENT_TOOLBOX_HIGHLIGHTOFF 1135 // pData = itempos -#define VCLEVENT_WINDOW_MENUBARADDED 1136 // pData = pMenuBar +#define VCLEVENT_WINDOW_MENUBARADDED 1136 // pData = pMenuBar #define VCLEVENT_TABPAGE_ACTIVATE 1137 // pData = pageid #define VCLEVENT_TABPAGE_DEACTIVATE 1138 // pData = pageid #define VCLEVENT_TABBAR_PAGEENABLED 1139 // pData = pageid @@ -146,8 +146,8 @@ namespace com { namespace sun { namespace star { #define VCLEVENT_STATUSBAR_HIDEITEM 1163 // pData = itemid #define VCLEVENT_STATUSBAR_SHOWALLITEMS 1164 #define VCLEVENT_STATUSBAR_HIDEALLITEMS 1165 -#define VCLEVENT_STATUSBAR_DRAWITEM 1166 // pData = itemid -#define VCLEVENT_STATUSBAR_NAMECHANGED 1167 // pData = itemid +#define VCLEVENT_STATUSBAR_DRAWITEM 1166 // pData = itemid +#define VCLEVENT_STATUSBAR_NAMECHANGED 1167 // pData = itemid #define VCLEVENT_TOOLBOX_ITEMENABLED 1168 // pData = itempos #define VCLEVENT_TOOLBOX_ITEMDISABLED 1169 // pData = itempos #define VCLEVENT_TABPAGE_PAGETEXTCHANGED 1170 // pData = pageid @@ -173,10 +173,10 @@ namespace com { namespace sun { namespace star { #define VCLEVENT_MENU_SUBMENUCHANGED 1209 #define VCLEVENT_MENU_DEHIGHLIGHT 1210 #define VCLEVENT_MENU_DISABLE 1211 -#define VCLEVENT_MENU_ITEMTEXTCHANGED 1212 -#define VCLEVENT_MENU_ITEMCHECKED 1213 -#define VCLEVENT_MENU_ITEMUNCHECKED 1214 -#define VCLEVENT_MENU_ACCESSIBLENAMECHANGED 1215 +#define VCLEVENT_MENU_ITEMTEXTCHANGED 1212 +#define VCLEVENT_MENU_ITEMCHECKED 1213 +#define VCLEVENT_MENU_ITEMUNCHECKED 1214 +#define VCLEVENT_MENU_ACCESSIBLENAMECHANGED 1215 #define VCLEVENT_MENU_SHOW 1250 #define VCLEVENT_MENU_HIDE 1251 @@ -193,7 +193,7 @@ namespace com { namespace sun { namespace star { #define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED 1223 // pData = itempos #define VCLEVENT_TABLECELL_NAMECHANGED 1224 // pData = struct(Entry, Column, oldText) -#define VCLEVENT_TABLEROW_SELECT 1225 +#define VCLEVENT_TABLEROW_SELECT 1225 class VCL_DLLPUBLIC VclSimpleEvent { @@ -279,7 +279,7 @@ class VCL_DLLPUBLIC VclEventListeners2 : public vcl::DeletionNotifier { std::list< Link >::iterator m_aIt; bool m_bWasInvalidated; - + ListenerIt(const std::list<Link>::iterator& rIt) : m_aIt(rIt) , m_bWasInvalidated( false ) @@ -287,15 +287,15 @@ class VCL_DLLPUBLIC VclEventListeners2 : public vcl::DeletionNotifier }; std::vector< ListenerIt > m_aIterators; - - + + public: VclEventListeners2(); ~VclEventListeners2(); - + void addListener( const Link& ); void removeListener( const Link& ); - + void callListeners( VclSimpleEvent* ); }; diff --git a/vcl/inc/vcl/virdev.hxx b/vcl/inc/vcl/virdev.hxx index f3e52813c486..c73713cc6788 100644 --- a/vcl/inc/vcl/virdev.hxx +++ b/vcl/inc/vcl/virdev.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -47,26 +47,26 @@ class VCL_DLLPUBLIC VirtualDevice : public OutputDevice friend class OutputDevice; private: - SalVirtualDevice* mpVirDev; - VirtualDevice* mpPrev; - VirtualDevice* mpNext; - USHORT mnBitCount; - BOOL mbScreenComp; - sal_Int8 mnAlphaDepth; - BYTE meRefDevMode; + SalVirtualDevice* mpVirDev; + VirtualDevice* mpPrev; + VirtualDevice* mpNext; + USHORT mnBitCount; + BOOL mbScreenComp; + sal_Int8 mnAlphaDepth; + BYTE 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, USHORT nBitCount, const SystemGraphicsData *pData = NULL ); + SAL_DLLPRIVATE BOOL ImplSetOutputSizePixel( const Size& rNewSize, BOOL bErase ); // Copy assignment is forbidden and not implemented. VirtualDevice (const VirtualDevice &); VirtualDevice & operator= (const VirtualDevice &); - /** Used for alpha VDev, to set areas to opaque + /** Used for alpha VDev, to set areas to opaque @since #i32109# */ - SAL_DLLPRIVATE void ImplFillOpaqueRectangle( const Rectangle& rRect ); + SAL_DLLPRIVATE void ImplFillOpaqueRectangle( const Rectangle& rRect ); // TODO: add extra member for refdev backward compatibility options #define REFDEV_FORCE_ZERO_EXTLEAD 0x80 @@ -101,10 +101,10 @@ public: */ VirtualDevice( const SystemGraphicsData *pData, USHORT nBitCount ); - virtual ~VirtualDevice(); + virtual ~VirtualDevice(); - BOOL SetOutputSizePixel( const Size& rNewSize, BOOL bErase = TRUE ); - BOOL SetOutputSize( const Size& rNewSize, BOOL bErase = TRUE ) + BOOL SetOutputSizePixel( const Size& rNewSize, BOOL bErase = TRUE ); + BOOL SetOutputSize( const Size& rNewSize, BOOL bErase = TRUE ) { return SetOutputSizePixel( LogicToPixel( rNewSize ), bErase ); } // reference device modes for different compatibility levels @@ -119,7 +119,7 @@ public: void SetReferenceDevice( RefDevMode ); void Compat_ZeroExtleadBug(); // enable workaround for #i60495# - + void SetReferenceDevice( sal_Int32 i_nDPIX, sal_Int32 i_nDPIY ); private: diff --git a/vcl/inc/vcl/waitobj.hxx b/vcl/inc/vcl/waitobj.hxx index 1bbdd04506e9..ee9874569f02 100644 --- a/vcl/inc/vcl/waitobj.hxx +++ b/vcl/inc/vcl/waitobj.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/wall.hxx b/vcl/inc/vcl/wall.hxx index 0011501392be..e69314ade2f4 100644 --- a/vcl/inc/vcl/wall.hxx +++ b/vcl/inc/vcl/wall.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -42,37 +42,37 @@ class ImplWallpaper; // - Wallpaper-Types - // ------------------- -#define WALLPAPER_NULL WallpaperStyle_NULL -#define WALLPAPER_TILE WallpaperStyle_TILE -#define WALLPAPER_CENTER WallpaperStyle_CENTER -#define WALLPAPER_SCALE WallpaperStyle_SCALE -#define WALLPAPER_TOPLEFT WallpaperStyle_TOPLEFT -#define WALLPAPER_TOP WallpaperStyle_TOP -#define WALLPAPER_TOPRIGHT WallpaperStyle_TOPRIGHT -#define WALLPAPER_LEFT WallpaperStyle_LEFT -#define WALLPAPER_RIGHT WallpaperStyle_RIGHT -#define WALLPAPER_BOTTOMLEFT WallpaperStyle_BOTTOMLEFT -#define WALLPAPER_BOTTOM WallpaperStyle_BOTTOM -#define WALLPAPER_BOTTOMRIGHT WallpaperStyle_BOTTOMRIGHT -#define WALLPAPER_APPLICATIONGRADIENT WallpaperStyle_APPLICATIONGRADIENT -#define WALLPAPER_FORCE_EQUAL_SIZE WallpaperStyle_FORCE_EQUAL_SIZE +#define WALLPAPER_NULL WallpaperStyle_NULL +#define WALLPAPER_TILE WallpaperStyle_TILE +#define WALLPAPER_CENTER WallpaperStyle_CENTER +#define WALLPAPER_SCALE WallpaperStyle_SCALE +#define WALLPAPER_TOPLEFT WallpaperStyle_TOPLEFT +#define WALLPAPER_TOP WallpaperStyle_TOP +#define WALLPAPER_TOPRIGHT WallpaperStyle_TOPRIGHT +#define WALLPAPER_LEFT WallpaperStyle_LEFT +#define WALLPAPER_RIGHT WallpaperStyle_RIGHT +#define WALLPAPER_BOTTOMLEFT WallpaperStyle_BOTTOMLEFT +#define WALLPAPER_BOTTOM WallpaperStyle_BOTTOM +#define WALLPAPER_BOTTOMRIGHT WallpaperStyle_BOTTOMRIGHT +#define WALLPAPER_APPLICATIONGRADIENT WallpaperStyle_APPLICATIONGRADIENT +#define WALLPAPER_FORCE_EQUAL_SIZE WallpaperStyle_FORCE_EQUAL_SIZE #ifndef ENUM_WALLPAPERSTYLE_DECLARED #define ENUM_WALLPAPERSTYLE_DECLARED -enum WallpaperStyle +enum WallpaperStyle { - WALLPAPER_NULL, + WALLPAPER_NULL, WALLPAPER_TILE, WALLPAPER_CENTER, WALLPAPER_SCALE, - WALLPAPER_TOPLEFT, - WALLPAPER_TOP, + WALLPAPER_TOPLEFT, + WALLPAPER_TOP, WALLPAPER_TOPRIGHT, - WALLPAPER_LEFT, + WALLPAPER_LEFT, WALLPAPER_RIGHT, - WALLPAPER_BOTTOMLEFT, - WALLPAPER_BOTTOM, + WALLPAPER_BOTTOMLEFT, + WALLPAPER_BOTTOM, WALLPAPER_BOTTOMRIGHT, WALLPAPER_APPLICATIONGRADIENT, // defines a gradient that internally covers the whole application // and uses a color derived from the face color @@ -88,9 +88,9 @@ enum WallpaperStyle class VCL_DLLPUBLIC Wallpaper { private: - ImplWallpaper* mpImplWallpaper; + ImplWallpaper* mpImplWallpaper; - SAL_DLLPRIVATE void ImplMakeUnique( BOOL bReleaseCache = TRUE ); + SAL_DLLPRIVATE void ImplMakeUnique( BOOL bReleaseCache = TRUE ); SAL_DLLPRIVATE Gradient ImplGetApplicationGradient() const; public: @@ -105,41 +105,41 @@ public: Wallpaper( const Gradient& rGradient ); ~Wallpaper(); - void SetColor( const Color& rColor ); - const Color& GetColor() const; + void SetColor( const Color& rColor ); + const Color& GetColor() const; - void SetStyle( WallpaperStyle eStyle ); - WallpaperStyle GetStyle() const; + void SetStyle( WallpaperStyle eStyle ); + WallpaperStyle GetStyle() const; - void SetBitmap( const BitmapEx& rBitmap ); - void SetBitmap(); - BitmapEx GetBitmap() const; - BOOL IsBitmap() const; + void SetBitmap( const BitmapEx& rBitmap ); + void SetBitmap(); + BitmapEx GetBitmap() const; + BOOL IsBitmap() const; - void SetGradient( const Gradient& rGradient ); - void SetGradient(); - Gradient GetGradient() const; - BOOL IsGradient() const; + void SetGradient( const Gradient& rGradient ); + void SetGradient(); + Gradient GetGradient() const; + BOOL IsGradient() const; - void SetRect( const Rectangle& rRect ); - void SetRect(); - Rectangle GetRect() const; - BOOL IsRect() const; + void SetRect( const Rectangle& rRect ); + void SetRect(); + Rectangle GetRect() const; + BOOL IsRect() const; - BOOL IsFixed() const; - BOOL IsScrollable() const; + BOOL IsFixed() const; + BOOL IsScrollable() const; - Wallpaper& operator=( const Wallpaper& rWallpaper ); - BOOL operator==( const Wallpaper& rWallpaper ) const; - BOOL operator!=( const Wallpaper& rWallpaper ) const + Wallpaper& operator=( const Wallpaper& rWallpaper ); + BOOL operator==( const Wallpaper& rWallpaper ) const; + BOOL operator!=( const Wallpaper& rWallpaper ) const { return !(Wallpaper::operator==( rWallpaper )); } - BOOL IsSameInstance( const Wallpaper& rWallpaper ) const + BOOL IsSameInstance( const Wallpaper& rWallpaper ) const { return (mpImplWallpaper == rWallpaper.mpImplWallpaper); } friend VCL_DLLPUBLIC SvStream& operator>>( SvStream& rIStm, Wallpaper& rWallpaper ); friend VCL_DLLPUBLIC SvStream& operator<<( SvStream& rOStm, const Wallpaper& rWallpaper ); }; -#endif // _SV_WALL_HXX +#endif // _SV_WALL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/wall2.hxx b/vcl/inc/vcl/wall2.hxx index 311ad3b9cf1c..df95c48e6385 100644 --- a/vcl/inc/vcl/wall2.hxx +++ b/vcl/inc/vcl/wall2.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -36,13 +36,13 @@ class ImplWallpaper friend class Wallpaper; private: - Color maColor; - BitmapEx* mpBitmap; - Gradient* mpGradient; - Rectangle* mpRect; - WallpaperStyle meStyle; - ULONG mnRefCount; - BitmapEx* mpCache; + Color maColor; + BitmapEx* mpBitmap; + Gradient* mpGradient; + Rectangle* mpRect; + WallpaperStyle meStyle; + ULONG mnRefCount; + BitmapEx* mpCache; friend SvStream& operator>>( SvStream& rIStm, ImplWallpaper& rImplWallpaper ); friend SvStream& operator<<( SvStream& rOStm, const ImplWallpaper& rImplWallpaper ); @@ -52,12 +52,12 @@ public: ImplWallpaper( const ImplWallpaper& rImplWallpaper ); ~ImplWallpaper(); - void ImplSetCachedBitmap( BitmapEx& rBmp ); - const BitmapEx* ImplGetCachedBitmap() { return mpCache; } - void ImplReleaseCachedBitmap(); + void ImplSetCachedBitmap( BitmapEx& rBmp ); + const BitmapEx* ImplGetCachedBitmap() { return mpCache; } + void ImplReleaseCachedBitmap(); }; -#endif // _SV_WALL2_HXX +#endif // _SV_WALL2_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/vcl/windata.hxx b/vcl/inc/vcl/windata.hxx index bd8815b83f77..65a8acadbb92 100644 --- a/vcl/inc/vcl/windata.hxx +++ b/vcl/inc/vcl/windata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h index d52616a1c183..8958a1e7e2a7 100644 --- a/vcl/inc/vcl/window.h +++ b/vcl/inc/vcl/window.h @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -118,7 +118,7 @@ struct ImplWinData Rectangle* mpFocusRect; Rectangle* mpTrackRect; USHORT mnTrackFlags; - USHORT mnIsTopWindow; + USHORT mnIsTopWindow; BOOL mbMouseOver; // tracks mouse over for native widget paint effect BOOL mbEnableNativeWidget; // toggle native widget rendering SmartId* mpSmartHelpId; @@ -148,7 +148,7 @@ struct ImplOverlapData struct ImplFrameData { Timer maPaintTimer; // paint timer - Timer maResizeTimer; // resize timer + Timer maResizeTimer; // resize timer InputContext maOldInputContext; // Last set Input Context Window* mpNextFrame; // next frame window Window* mpFirstOverlap; // first overlap window @@ -236,7 +236,7 @@ public: VclEventListeners maChildEventListeners; // The canvas interface for this VCL window. Is persistent after the first GetCanvas() call - ::com::sun::star::uno::WeakReference< ::com::sun::star::rendering::XCanvas > mxCanvas; + ::com::sun::star::uno::WeakReference< ::com::sun::star::rendering::XCanvas > mxCanvas; ImplDelData* mpFirstDel; void* mpUserData; diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index e6bd75afdcba..32c5621f2c59 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -317,7 +317,7 @@ typedef USHORT StateChangedType; #define DLGWINDOW_NEXT 1 #define DLGWINDOW_FIRST 2 -enum WindowSizeType { +enum WindowSizeType { WINDOWSIZE_MINIMUM, WINDOWSIZE_PREFERRED, WINDOWSIZE_MAXIMUM @@ -380,7 +380,7 @@ public: SAL_DLLPRIVATE WinBits ImplInitRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId ); SAL_DLLPRIVATE void ImplWindowRes( const ResId& rResId ); - SAL_DLLPRIVATE void ImplSetFrameParent( const Window* pParent ); + SAL_DLLPRIVATE void ImplSetFrameParent( const Window* pParent ); SAL_DLLPRIVATE void ImplInsertWindow( Window* pParent ); SAL_DLLPRIVATE void ImplRemoveWindow( BOOL bRemoveFrameData ); SAL_DLLPRIVATE Window* ImplGetWindow(); @@ -480,7 +480,7 @@ public: <TRUE/> if the font can be used as UI font <FALSE/> if the font is unsuitable as UI font */ - SAL_DLLPRIVATE bool ImplCheckUIFont( const Font& rFont ); + SAL_DLLPRIVATE bool ImplCheckUIFont( const Font& rFont ); SAL_DLLPRIVATE void ImplUpdateGlobalSettings( AllSettings& rSettings, BOOL bCallHdl = TRUE ); SAL_DLLPRIVATE void ImplAlignChilds(); SAL_DLLPRIVATE void ImplPosSizeWindow( long nX, long nY, long nWidth, long nHeight, USHORT nFlags ); @@ -545,15 +545,15 @@ public: SAL_DLLPRIVATE Rectangle ImplGetWindowExtentsRelative( Window *pRelativeWindow, BOOL bClientOnly ) const; SAL_DLLPRIVATE void ImplNotifyIconifiedState( BOOL bIconified ); - SAL_DLLPRIVATE bool ImplStopDnd(); - SAL_DLLPRIVATE void ImplStartDnd(); + 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 void ImplPaintToDevice( OutputDevice* pTargetOutDev, const Point& rPos ); SAL_DLLPRIVATE BOOL ImplIsInTaskPaneList(); SAL_DLLPRIVATE void ImplIsInTaskPaneList( BOOL mbIsInTaskList ); - SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > + SAL_DLLPRIVATE ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > ImplGetCanvas( const Size& rFullscreenSize, bool bFullscreen, bool bSpriteCanvas ) const; private: @@ -728,7 +728,7 @@ public: // 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 - void ExpandPaintClipRegion( const Region& rRegion ); + void ExpandPaintClipRegion( const Region& rRegion ); void SetParent( Window* pNewParent ); Window* GetParent() const; @@ -750,16 +750,16 @@ public: void EnableInput( BOOL bEnable, BOOL bChild, BOOL bSysWin, const Window* pExcludeWindow = NULL ); BOOL IsInputEnabled() const; - + /** Override <code>EnableInput</code>. This can be necessary due to other people using EnableInput for whole window hierarchies. - - + + <code>AlwaysEnableInput</code> and <code>AlwaysDisableInput</code> are mutually exclusive; the last setter wins. @param bAlways sets always enabled flag - + @param bChild if true children are recursively set to AlwaysEnableInput */ @@ -773,13 +773,13 @@ public: Windows with AlwaysDisableInput will not get key events even if enabled and input enabled.This can be necessary due to other people using EnableInput for whole window hierarchies. - + <code>AlwaysEnableInput</code> and <code>AlwaysDisableInput</code> are mutually exclusive; the last setter wins. - + @param bAlways sets always disable flag - + @param bChild if true children are recursively set to AlwaysDisableInput */ @@ -795,25 +795,25 @@ public: not evaluate events but still react to those events externally. In these rare cases call SetCallHandlersOnInputDisabled( true ) to have your handler called anyway. - + Currently only mouse events get this special treatment. - + Use this sparingly, chances are if you want to use it you're wroking around the real problem. - + @param bCall Enable/Disable calling event handlers for this disabled, modal or input disabled window. This call is implicity done recursively for possible child windows. */ void SetCallHandlersOnInputDisabled( bool bCall ); /** get state of SetCallHandlersOnInputDisabled - + @returns whether handlers are called regardless of input enabled state */ bool IsCallHandlersOnInputDisabled() const; /** 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 */ BOOL IsInModalMode() const; @@ -887,10 +887,10 @@ public: BOOL IsActive() const; BOOL HasActiveChildFrame(); USHORT GetGetFocusFlags() const; - void GrabFocusToDocument(); + void GrabFocusToDocument(); - /** - * Set this when you need to act as if the window has focus even if it + /** + * Set this when you need to act as if the window has focus even if it * doesn't. This is necessary for implementing tab stops inside floating * windows, but floating windows don't get focus from the system. */ @@ -928,11 +928,11 @@ public: long CalcZoom( long n ) const; virtual void SetText( const XubString& rStr ); - virtual String GetText() const; + virtual String GetText() const; // return the actual text displayed // this may have e.g. accellerators removed or portions // replaced by ellipsis - virtual String GetDisplayText() const; + virtual String GetDisplayText() const; // gets the visible background color. for transparent windows // this may be the parent's background color; for controls // this may be a child's background color (e.g. ListBox) @@ -1035,19 +1035,19 @@ public: BOOL IsAccessibilityEventsSuppressed( BOOL bTraverseParentPath = TRUE ); /// request XCanvas render interface for this window - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XCanvas > GetCanvas() const; /// request XSpriteCanvas render interface for this window - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > GetSpriteCanvas() const; /// request fullscreen XSpriteCanvas render interface for this window - ::com::sun::star::uno::Reference< + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XSpriteCanvas > GetFullscreenSpriteCanvas( const Size& rFullscreenSize ) const; /* records all DrawText operations within the passed rectangle; * a synchronous paint is sent to achieve this */ - void RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& rRect ); + void RecordLayoutData( vcl::ControlLayoutData* pLayout, const Rectangle& rRect ); // Setzen und Abfragen fuer das Toolkit VCLXWindow* GetWindowPeer() const; @@ -1057,11 +1057,11 @@ public: BOOL IsCreatedWithToolkit() const; void SetCreatedWithToolkit( BOOL b ); - Window* GetLabelFor() const; - Window* GetLabeledBy() const; - virtual Window* GetParentLabelFor( const Window* pLabel ) const; - virtual Window* GetParentLabeledBy( const Window* pLabeled ) const; - KeyEvent GetActivationKey() const; + Window* GetLabelFor() const; + Window* GetLabeledBy() const; + virtual Window* GetParentLabelFor( const Window* pLabel ) const; + virtual Window* GetParentLabeledBy( const Window* pLabeled ) const; + KeyEvent GetActivationKey() const; // Drag and Drop interfaces virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::dnd::XDropTarget > GetDropTarget(); @@ -1087,7 +1087,7 @@ public: // a helper method for a Control's Draw method void PaintToDevice( OutputDevice* pDevice, const Point& rPos, const Size& rSize ); - + /* mark Window for deletion in top of event queue */ void doLazyDelete(); diff --git a/vcl/inc/vcl/wintypes.hxx b/vcl/inc/vcl/wintypes.hxx index 55de8b4fb5be..2252ff9d2e4e 100644 --- a/vcl/inc/vcl/wintypes.hxx +++ b/vcl/inc/vcl/wintypes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/vcl/inc/vcl/wrkwin.hxx b/vcl/inc/vcl/wrkwin.hxx index 50c1cf60dbb7..c188e30cd170 100644 --- a/vcl/inc/vcl/wrkwin.hxx +++ b/vcl/inc/vcl/wrkwin.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -97,13 +97,13 @@ public: BOOL IsMinimized() const; - BOOL SetPluginParent( SystemParentData* pParent ); + BOOL SetPluginParent( SystemParentData* pParent ); void Minimize(); void Restore(); - void Maximize( BOOL bMaximize = TRUE ); - BOOL IsMaximized() const; + void Maximize( BOOL bMaximize = TRUE ); + BOOL IsMaximized() const; }; #endif // _SV_WRKWIN_HXX diff --git a/vcl/inc/vcl/xconnection.hxx b/vcl/inc/vcl/xconnection.hxx index 1c4c5dd45140..c8faa3bbb659 100644 --- a/vcl/inc/vcl/xconnection.hxx +++ b/vcl/inc/vcl/xconnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,12 +43,12 @@ namespace vcl { class DisplayConnection : public ::cppu::WeakImplHelper1< ::com::sun::star::awt::XDisplayConnection > { - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler > > m_aHandlers; ::std::list< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XEventHandler > > m_aErrorHandlers; - ::com::sun::star::uno::Any m_aAny; + ::com::sun::star::uno::Any m_aAny; public: DisplayConnection(); virtual ~DisplayConnection(); |