diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-21 13:08:56 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-21 13:08:56 +0100 |
| commit | 1ca84c4108c009dc2b5a0cf0face9ec5439f6686 (patch) | |
| tree | 7e25b360a6acb2b5d67e6d195c9956061801f494 | |
| parent | d979e17ce7cf8fd8cf934305cc36ac64df43438a (diff) | |
| parent | 8a8205b575e8fda5aa30fa2352a28fb57c1e0f47 (diff) | |
removetooltypes01: #i112600# Merge changes
55 files changed, 434 insertions, 434 deletions
diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx index 54d68c31d846..94e2ce5950a4 100644 --- a/tools/source/fsys/unx.cxx +++ b/tools/source/fsys/unx.cxx @@ -95,14 +95,14 @@ struct mymnttab #if defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) -BOOL GetMountEntry(dev_t /* dev */, struct mymnttab * /* mytab */ ) +sal_Bool GetMountEntry(dev_t /* dev */, struct mymnttab * /* mytab */ ) { DBG_WARNING( "Sorry, not implemented: GetMountEntry" ); return sal_False; } #elif defined AIX -BOOL GetMountEntry(dev_t dev, struct mymnttab *mytab) +sal_Bool GetMountEntry(dev_t dev, struct mymnttab *mytab) { int bufsize; if (mntctl (MCTL_QUERY, sizeof bufsize, (char*) &bufsize)) diff --git a/vcl/aqua/inc/aqua11yfactory.h b/vcl/aqua/inc/aqua11yfactory.h index 1982093f8bba..30f355dd502c 100644 --- a/vcl/aqua/inc/aqua11yfactory.h +++ b/vcl/aqua/inc/aqua11yfactory.h @@ -38,8 +38,8 @@ +(void)insertIntoWrapperRepository: (NSView *) viewElement forAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext; +(AquaA11yWrapper *)wrapperForAccessible: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessible >) rxAccessible; +(AquaA11yWrapper *)wrapperForAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext; -+(AquaA11yWrapper *)wrapperForAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext createIfNotExists:(MacOSBOOL) bCreate; -+(AquaA11yWrapper *)wrapperForAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext createIfNotExists:(MacOSBOOL) bCreate asRadioGroup:(MacOSBOOL) asRadioGroup; ++(AquaA11yWrapper *)wrapperForAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate; ++(AquaA11yWrapper *)wrapperForAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate asRadioGroup:(BOOL) asRadioGroup; +(void)removeFromWrapperRepositoryFor: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext; +(void)registerView: (NSView *) theView; +(void)revokeView: (NSView *) theViewt; diff --git a/vcl/aqua/inc/aqua11ywrapper.h b/vcl/aqua/inc/aqua11ywrapper.h index 079dcfe7f112..44640966d760 100644 --- a/vcl/aqua/inc/aqua11ywrapper.h +++ b/vcl/aqua/inc/aqua11ywrapper.h @@ -62,16 +62,16 @@ struct ReferenceWrapper ReferenceWrapper * mpReferenceWrapper; NSString * mpDefaultFontname; float mDefaultFontsize; - MacOSBOOL mActsAsRadioGroup; - MacOSBOOL mIsTableCell; + BOOL mActsAsRadioGroup; + BOOL mIsTableCell; } // NSAccessibility Protocol -(id)accessibilityAttributeValue:(NSString *)attribute; --(MacOSBOOL)accessibilityIsIgnored; +-(BOOL)accessibilityIsIgnored; -(NSArray *)accessibilityAttributeNames; --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute; +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute; -(NSArray *)accessibilityParameterizedAttributeNames; --(MacOSBOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute; +-(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute; -(void)accessibilitySetValue:(id)value forAttribute:(NSString *)attribute; -(id)accessibilityAttributeValue:(NSString *)attribute forParameter:(id)parameter; -(id)accessibilityFocusedUIElement; @@ -92,8 +92,8 @@ struct ReferenceWrapper -(id)orientationAttribute; -(id)windowAttribute; // Wrapper-specific --(void)setActsAsRadioGroup:(MacOSBOOL)actsAsRadioGroup; --(MacOSBOOL)actsAsRadioGroup; +-(void)setActsAsRadioGroup:(BOOL)actsAsRadioGroup; +-(BOOL)actsAsRadioGroup; -(NSView *)viewElementForParent; -(id)initWithAccessibleContext: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) anAccessibleContext; -(void) setDefaults: (::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >) rxAccessibleContext; @@ -102,7 +102,7 @@ struct ReferenceWrapper -(NSString *)defaultFontname; -(void)setDefaultFontsize:(float)fontsize; -(float)defaultFontsize; -+(void)setPopupMenuOpen:(MacOSBOOL)popupMenuOpen; ++(void)setPopupMenuOpen:(BOOL)popupMenuOpen; -(::com::sun::star::accessibility::XAccessibleAction *)accessibleAction; -(::com::sun::star::accessibility::XAccessibleContext *)accessibleContext; -(::com::sun::star::accessibility::XAccessibleComponent *)accessibleComponent; diff --git a/vcl/aqua/inc/aquaprintview.h b/vcl/aqua/inc/aquaprintview.h index 84d9dd54d6aa..391a9546f63a 100755 --- a/vcl/aqua/inc/aquaprintview.h +++ b/vcl/aqua/inc/aquaprintview.h @@ -51,7 +51,7 @@ struct PrintAccessoryViewState AquaSalInfoPrinter* mpInfoPrinter; } -(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter; --(MacOSBOOL)knowsPageRange: (NSRangePointer)range; +-(BOOL)knowsPageRange: (NSRangePointer)range; -(NSRect)rectForPage: (int)page; -(NSPoint)locationOfPrintRect: (NSRect)aRect; -(void)drawRect: (NSRect)rect; diff --git a/vcl/aqua/inc/salbmp.h b/vcl/aqua/inc/salbmp.h index 1c427cce0cd5..c95c326f1548 100644 --- a/vcl/aqua/inc/salbmp.h +++ b/vcl/aqua/inc/salbmp.h @@ -70,15 +70,15 @@ public: public: // SalBitmap methods - bool Create( const Size& rSize, USHORT nBitCount, const BitmapPalette& rPal ); + bool Create( const Size& rSize, sal_uInt16 nBitCount, const BitmapPalette& rPal ); bool Create( const SalBitmap& rSalBmp ); bool Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ); - bool Create( const SalBitmap& rSalBmp, USHORT nNewBitCount ); + bool Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ); void Destroy(); Size GetSize() const; - USHORT GetBitCount() const; + sal_uInt16 GetBitCount() const; BitmapBuffer *AcquireBuffer( bool bReadOnly ); void ReleaseBuffer( BitmapBuffer* pBuffer, bool bReadOnly ); diff --git a/vcl/aqua/inc/saldata.hxx b/vcl/aqua/inc/saldata.hxx index fb7c8cddd6d4..dd5df5751973 100644 --- a/vcl/aqua/inc/saldata.hxx +++ b/vcl/aqua/inc/saldata.hxx @@ -131,7 +131,7 @@ inline SalData *GetAppSalData() { return (SalData*)ImplGetAppSVData()->mpSalData // --- Prototypes --- -BOOL ImplSalYieldMutexTryToAcquire(); +sal_Bool ImplSalYieldMutexTryToAcquire(); void ImplSalYieldMutexAcquire(); void ImplSalYieldMutexRelease(); diff --git a/vcl/aqua/inc/salframe.h b/vcl/aqua/inc/salframe.h index c2ded3267f45..06ca66f8803f 100644 --- a/vcl/aqua/inc/salframe.h +++ b/vcl/aqua/inc/salframe.h @@ -79,10 +79,10 @@ public: bool mbSized:1; bool mbPresentation:1; - ULONG mnStyle; + sal_uLong mnStyle; unsigned int mnStyleMask; // our style mask from NSWindow creation - ULONG mnLastEventTime; + sal_uLong mnLastEventTime; unsigned int mnLastModifierFlags; AquaSalMenu* mpMenu; @@ -99,7 +99,7 @@ public: Rectangle maInvalidRect; - ULONG mnICOptions; + sal_uLong mnICOptions; boost::shared_ptr< Timer > mpActivityTimer; // Timer to prevent system sleep during presentation public: @@ -109,43 +109,43 @@ public: @throws std::runtime_error in case window creation fails */ - AquaSalFrame( SalFrame* pParent, ULONG salFrameStyle ); + AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ); virtual ~AquaSalFrame(); virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual BOOL PostEvent( void* pData ); + virtual sal_Bool PostEvent( void* pData ); virtual void SetTitle( const XubString& rTitle ); - virtual void SetIcon( USHORT nIcon ); + virtual void SetIcon( sal_uInt16 nIcon ); virtual void SetRepresentedURL( const rtl::OUString& ); virtual void SetMenu( SalMenu* pSalMenu ); virtual void DrawMenuBar(); - virtual void Show( BOOL bVisible, BOOL bNoActivate = FALSE ); - virtual void Enable( BOOL bEnable ); + virtual void Show( sal_Bool bVisible, sal_Bool bNoActivate = sal_False ); + virtual void Enable( sal_Bool bEnable ); virtual void SetMinClientSize( long nWidth, long nHeight ); virtual void SetMaxClientSize( long nWidth, long nHeight ); - virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, USHORT nFlags ); + virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags ); virtual void GetClientSize( long& rWidth, long& rHeight ); virtual void GetWorkArea( Rectangle& rRect ); virtual SalFrame* GetParent() const; virtual void SetWindowState( const SalFrameState* pState ); - virtual BOOL GetWindowState( SalFrameState* pState ); - virtual void ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay ); - virtual void StartPresentation( BOOL bStart ); - virtual void SetAlwaysOnTop( BOOL bOnTop ); - virtual void ToTop( USHORT nFlags ); + virtual sal_Bool GetWindowState( SalFrameState* pState ); + virtual void ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ); + virtual void StartPresentation( sal_Bool bStart ); + virtual void SetAlwaysOnTop( sal_Bool bOnTop ); + virtual void ToTop( sal_uInt16 nFlags ); virtual void SetPointer( PointerStyle ePointerStyle ); - virtual void CaptureMouse( BOOL bMouse ); + virtual void CaptureMouse( sal_Bool bMouse ); virtual void SetPointerPos( long nX, long nY ); virtual void Flush( void ); virtual void Flush( const Rectangle& ); virtual void Sync(); virtual void SetInputContext( SalInputContext* pContext ); - virtual void EndExtTextInput( USHORT nFlags ); - virtual String GetKeyName( USHORT nKeyCode ); - virtual String GetSymbolKeyName( const XubString& rFontName, USHORT nKeyCode ); - virtual BOOL MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); + virtual void EndExtTextInput( sal_uInt16 nFlags ); + virtual String GetKeyName( sal_uInt16 nKeyCode ); + virtual String GetSymbolKeyName( const XubString& rFontName, sal_uInt16 nKeyCode ); + virtual sal_Bool MapUnicodeToKeyCode( sal_Unicode aUnicode, LanguageType aLangType, KeyCode& rKeyCode ); virtual LanguageType GetInputLanguage(); virtual SalBitmap* SnapShot(); virtual void UpdateSettings( AllSettings& rSettings ); @@ -162,7 +162,7 @@ public: // set clip region to none (-> rectangular windows, normal state) virtual void ResetClipRegion(); // start setting the clipregion consisting of nRects rectangles - virtual void BeginSetClipRegion( ULONG nRects ); + virtual void BeginSetClipRegion( sal_uLong nRects ); // add a rectangle to the clip region virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); // done setting up the clipregion diff --git a/vcl/aqua/inc/salframeview.h b/vcl/aqua/inc/salframeview.h index e7d9a14b52aa..5e93839719b5 100755 --- a/vcl/aqua/inc/salframeview.h +++ b/vcl/aqua/inc/salframeview.h @@ -36,7 +36,7 @@ id mDraggingDestinationHandler; } -(id)initWithSalFrame: (AquaSalFrame*)pFrame; --(MacOSBOOL)canBecomeKeyWindow; +-(BOOL)canBecomeKeyWindow; -(void)displayIfNeeded; -(void)windowDidBecomeKey: (NSNotification*)pNotification; -(void)windowDidResignKey: (NSNotification*)pNotification; @@ -45,10 +45,10 @@ -(void)windowDidResize: (NSNotification*)pNotification; -(void)windowDidMiniaturize: (NSNotification*)pNotification; -(void)windowDidDeminiaturize: (NSNotification*)pNotification; --(MacOSBOOL)windowShouldClose: (NSNotification*)pNotification; +-(BOOL)windowShouldClose: (NSNotification*)pNotification; -(void)dockMenuItemTriggered: (id)sender; -(AquaSalFrame*)getSalFrame; --(MacOSBOOL)containsMouse; +-(BOOL)containsMouse; -(::com::sun::star::uno::Reference < ::com::sun::star::accessibility::XAccessibleContext >)accessibleContext; /* NSDraggingDestination protocol methods @@ -56,8 +56,8 @@ -(NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender; -(NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender; -(void)draggingExited:(id <NSDraggingInfo>)sender; --(MacOSBOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender; --(MacOSBOOL)performDragOperation:(id <NSDraggingInfo>)sender; +-(BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender; +-(BOOL)performDragOperation:(id <NSDraggingInfo>)sender; -(void)concludeDragOperation:(id <NSDraggingInfo>)sender; -(void)registerDraggingDestinationHandler:(id)theHandler; @@ -85,9 +85,9 @@ } +(void)unsetMouseFrame: (AquaSalFrame*)pFrame; -(id)initWithSalFrame: (AquaSalFrame*)pFrame; --(MacOSBOOL)acceptsFirstResponder; --(MacOSBOOL)acceptsFirstMouse: (NSEvent *)pEvent; --(MacOSBOOL)isOpaque; +-(BOOL)acceptsFirstResponder; +-(BOOL)acceptsFirstMouse: (NSEvent *)pEvent; +-(BOOL)isOpaque; -(void)drawRect: (NSRect)aRect; -(void)mouseDown: (NSEvent*)pEvent; -(void)mouseDragged: (NSEvent*)pEvent; @@ -107,12 +107,12 @@ -(void)swipeWithEvent: (NSEvent*)pEvent; -(void)keyDown: (NSEvent*)pEvent; -(void)flagsChanged: (NSEvent*)pEvent; --(void)sendMouseEventToFrame:(NSEvent*)pEvent button:(USHORT)nButton eventtype:(USHORT)nEvent; --(MacOSBOOL)sendKeyInputAndReleaseToFrame: (USHORT)nKeyCode character: (sal_Unicode)aChar; --(MacOSBOOL)sendKeyInputAndReleaseToFrame: (USHORT)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod; --(MacOSBOOL)sendKeyToFrameDirect: (USHORT)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod; --(MacOSBOOL)sendSingleCharacter:(NSEvent*)pEvent; --(MacOSBOOL)handleKeyDownException:(NSEvent*)pEvent; +-(void)sendMouseEventToFrame:(NSEvent*)pEvent button:(sal_uInt16)nButton eventtype:(sal_uInt16)nEvent; +-(BOOL)sendKeyInputAndReleaseToFrame: (sal_uInt16)nKeyCode character: (sal_Unicode)aChar; +-(BOOL)sendKeyInputAndReleaseToFrame: (sal_uInt16)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod; +-(BOOL)sendKeyToFrameDirect: (sal_uInt16)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod; +-(BOOL)sendSingleCharacter:(NSEvent*)pEvent; +-(BOOL)handleKeyDownException:(NSEvent*)pEvent; -(void)clearLastEvent; /* text action methods @@ -201,8 +201,8 @@ -(NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender; -(NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender; -(void)draggingExited:(id <NSDraggingInfo>)sender; --(MacOSBOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender; --(MacOSBOOL)performDragOperation:(id <NSDraggingInfo>)sender; +-(BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender; +-(BOOL)performDragOperation:(id <NSDraggingInfo>)sender; -(void)concludeDragOperation:(id <NSDraggingInfo>)sender; -(void)registerDraggingDestinationHandler:(id)theHandler; diff --git a/vcl/aqua/inc/salgdi.h b/vcl/aqua/inc/salgdi.h index 17c4aa7acd44..8043f38defad 100644 --- a/vcl/aqua/inc/salgdi.h +++ b/vcl/aqua/inc/salgdi.h @@ -176,7 +176,7 @@ public: // InvalidateContext does an UnsetState and sets mrContext to 0 void InvalidateContext(); - virtual BOOL unionClipRegion( long nX, long nY, long nWidth, long nHeight ); + virtual sal_Bool unionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual bool unionClipRegion( const ::basegfx::B2DPolyPolygon& ); // draw --> LineColor and FillColor and RasterOp and ClipRegion @@ -184,18 +184,18 @@ public: virtual void drawPixel( long nX, long nY, SalColor nSalColor ); virtual void drawLine( long nX1, long nY1, long nX2, long nY2 ); virtual void drawRect( long nX, long nY, long nWidth, long nHeight ); - virtual void drawPolyLine( ULONG nPoints, const SalPoint* pPtAry ); - virtual void drawPolygon( ULONG nPoints, const SalPoint* pPtAry ); - virtual void drawPolyPolygon( ULONG nPoly, const ULONG* pPoints, PCONSTSALPOINT* pPtAry ); + virtual void drawPolyLine( sal_uLong nPoints, const SalPoint* pPtAry ); + virtual void drawPolygon( sal_uLong nPoints, const SalPoint* pPtAry ); + virtual void drawPolyPolygon( sal_uLong nPoly, const sal_uLong* pPoints, PCONSTSALPOINT* pPtAry ); virtual bool drawPolyPolygon( const ::basegfx::B2DPolyPolygon&, double fTransparency ); - virtual sal_Bool drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ); - virtual sal_Bool drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ); - virtual sal_Bool drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints, const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ); + virtual sal_Bool drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); + virtual sal_Bool drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ); + virtual sal_Bool drawPolyPolygonBezier( sal_uLong nPoly, const sal_uLong* pPoints, const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ); virtual bool drawPolyLine( const ::basegfx::B2DPolygon&, double fTransparency, const ::basegfx::B2DVector& rLineWidths, basegfx::B2DLineJoin ); // CopyArea --> No RasterOp, but ClipRegion virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, - long nSrcHeight, USHORT nFlags ); + long nSrcHeight, sal_uInt16 nFlags ); // CopyBits and DrawBitmap --> RasterOp and ClipRegion // CopyBits() --> pSrcGraphics == NULL, then CopyBits on same Graphics @@ -216,9 +216,9 @@ public: // invert --> ClipRegion (only Windows or VirDevs) virtual void invert( long nX, long nY, long nWidth, long nHeight, SalInvert nFlags); - virtual void invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nFlags ); + virtual void invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nFlags ); - virtual BOOL drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, ULONG nSize ); + virtual sal_Bool drawEPS( long nX, long nY, long nWidth, long nHeight, void* pPtr, sal_uLong nSize ); virtual bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rSourceBitmap, @@ -227,24 +227,24 @@ public: virtual bool drawAlphaRect( long nX, long nY, long nWidth, long nHeight, sal_uInt8 nTransparency ); - CGPoint* makeCGptArray(ULONG nPoints, const SalPoint* pPtAry); + CGPoint* makeCGptArray(sal_uLong nPoints, const SalPoint* pPtAry); // native widget rendering methods that require mirroring - virtual BOOL hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - const Point& aPos, BOOL& rIsInside ); - virtual BOOL drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual sal_Bool hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + const Point& aPos, sal_Bool& rIsInside ); + virtual sal_Bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& aCaption ); - virtual BOOL drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + virtual sal_Bool drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& aCaption ); - virtual BOOL getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, + virtual sal_Bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ); // get device resolution virtual void GetResolution( long& rDPIX, long& rDPIY ); // get the depth of the device - virtual USHORT GetBitCount(); + virtual sal_uInt16 GetBitCount(); // get the width of the device virtual long GetGraphicsWidth() const; @@ -252,7 +252,7 @@ public: virtual void ResetClipRegion(); // begin setting the clip region, add rectangles to the // region with the UnionClipRegion call - virtual void BeginSetClipRegion( ULONG nCount ); + virtual void BeginSetClipRegion( sal_uLong nCount ); // all rectangles were added and the clip region should be set now virtual void EndSetClipRegion(); @@ -274,12 +274,12 @@ public: // set the text color to a specific color virtual void SetTextColor( SalColor nSalColor ); // set the font - virtual USHORT SetFont( ImplFontSelectData*, int nFallbackLevel ); + virtual sal_uInt16 SetFont( ImplFontSelectData*, int nFallbackLevel ); // get the current font's etrics virtual void GetFontMetric( ImplFontMetricData*, int nFallbackLevel ); // get kernign pairs of the current font // return only PairCount if (pKernPairs == NULL) - virtual ULONG GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ); + virtual sal_uLong GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ); // get the repertoire of the current font virtual const ImplFontCharMap* GetImplFontCharMap() const; // graphics must fill supplied font list @@ -300,7 +300,7 @@ public: // rInfo: additional outgoing information // implementation note: encoding 0 with glyph id 0 should be added implicitly // as "undefined character" - virtual BOOL CreateFontSubset( const rtl::OUString& rToFile, + virtual sal_Bool CreateFontSubset( const rtl::OUString& rToFile, const ImplFontData* pFont, long* pGlyphIDs, sal_uInt8* pEncoding, @@ -338,15 +338,15 @@ public: Int32Vector& rWidths, Ucs2UIntMap& rUnicodeEnc ); - virtual BOOL GetGlyphBoundRect( long nIndex, Rectangle& ); - virtual BOOL GetGlyphOutline( long nIndex, basegfx::B2DPolyPolygon& ); + virtual sal_Bool GetGlyphBoundRect( long nIndex, Rectangle& ); + virtual sal_Bool GetGlyphOutline( long nIndex, basegfx::B2DPolyPolygon& ); virtual SalLayout* GetTextLayout( ImplLayoutArgs&, int nFallbackLevel ); virtual void DrawServerFontLayout( const ServerFontLayout& ); virtual bool supportsOperation( OutDevSupportType ) const; // Query the platform layer for control support - virtual BOOL IsNativeControlSupported( ControlType nType, ControlPart nPart ); + virtual sal_Bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); virtual SystemGraphicsData GetGraphicsData() const; virtual SystemFontData GetSysFontData( int /* nFallbacklevel */ ) const; @@ -381,8 +381,8 @@ private: CGContextRef mxTargetContext; CGContextRef mxMaskContext; CGContextRef mxTempContext; - ULONG* mpMaskBuffer; - ULONG* mpTempBuffer; + sal_uLong* mpMaskBuffer; + sal_uLong* mpTempBuffer; int mnBufferLongs; bool mbIsEnabled; }; diff --git a/vcl/aqua/inc/salinst.h b/vcl/aqua/inc/salinst.h index 4b0385844eed..514876b0e1f4 100644 --- a/vcl/aqua/inc/salinst.h +++ b/vcl/aqua/inc/salinst.h @@ -48,7 +48,7 @@ class Image; class SalYieldMutex : public vos::OMutex { - ULONG mnCount; + sal_uLong mnCount; vos::OThread::TThreadIdentifier mnThreadId; public: @@ -56,7 +56,7 @@ public: virtual void acquire(); virtual void release(); virtual sal_Bool tryToAcquire(); - ULONG GetAcquireCount() const { return mnCount; } + sal_uLong GetAcquireCount() const { return mnCount; } vos::OThread::TThreadIdentifier GetThreadId() const { return mnThreadId; } }; @@ -82,9 +82,9 @@ class AquaSalInstance : public SalInstance { AquaSalFrame* mpFrame; void* mpData; - USHORT mnType; + sal_uInt16 mnType; - SalUserEvent( AquaSalFrame* pFrame, void* pData, USHORT nType ) : + SalUserEvent( AquaSalFrame* pFrame, void* pData, sal_uInt16 nType ) : mpFrame( pFrame ), mpData( pData ), mnType( nType ) {} }; @@ -108,14 +108,14 @@ public: virtual SalSystem* CreateSystem(); virtual void DestroySystem(SalSystem*); - virtual SalFrame* CreateChildFrame( SystemParentData* pParent, ULONG nStyle ); - virtual SalFrame* CreateFrame( SalFrame* pParent, ULONG nStyle ); + virtual SalFrame* CreateChildFrame( SystemParentData* pParent, sal_uLong nStyle ); + virtual SalFrame* CreateFrame( SalFrame* pParent, sal_uLong nStyle ); virtual void DestroyFrame( SalFrame* pFrame ); - virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, BOOL bShow = TRUE ); + virtual SalObject* CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, sal_Bool bShow = sal_True ); virtual void DestroyObject( SalObject* pObject ); virtual SalVirtualDevice* CreateVirtualDevice( SalGraphics* pGraphics, long nDX, long nDY, - USHORT nBitCount, const SystemGraphicsData *pData ); + sal_uInt16 nBitCount, const SystemGraphicsData *pData ); virtual void DestroyVirtualDevice( SalVirtualDevice* pDevice ); virtual SalInfoPrinter* CreateInfoPrinter( SalPrinterQueueInfo* pQueueInfo, @@ -132,12 +132,12 @@ public: virtual SalSystem* CreateSalSystem(); virtual SalBitmap* CreateSalBitmap(); virtual vos::IMutex* GetYieldMutex(); - virtual ULONG ReleaseYieldMutex(); - virtual void AcquireYieldMutex( ULONG nCount ); + virtual sal_uLong ReleaseYieldMutex(); + virtual void AcquireYieldMutex( sal_uLong nCount ); virtual bool CheckYieldMutex(); virtual void Yield( bool bWait, bool bHandleAllCurrentEvents ); - virtual bool AnyInput( USHORT nType ); - virtual SalMenu* CreateMenu( BOOL bMenuBar, Menu* pVCLMenu ); + virtual bool AnyInput( sal_uInt16 nType ); + virtual SalMenu* CreateMenu( sal_Bool bMenuBar, Menu* pVCLMenu ); virtual void DestroyMenu( SalMenu* ); virtual SalMenuItem* CreateMenuItem( const SalItemParams* pItemData ); virtual void DestroyMenuItem( SalMenuItem* ); @@ -164,7 +164,7 @@ public: public: friend class AquaSalFrame; - void PostUserEvent( AquaSalFrame* pFrame, USHORT nType, void* pData ); + void PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, void* pData ); void delayedSettingsChanged( bool bInvalidate ); bool isNSAppThread() const; @@ -185,7 +185,7 @@ public: // helper class: inverted solar guard class YieldMutexReleaser { - ULONG mnCount; + sal_uLong mnCount; public: YieldMutexReleaser(); ~YieldMutexReleaser(); diff --git a/vcl/aqua/inc/salmenu.h b/vcl/aqua/inc/salmenu.h index 100e8c22972c..63dfb6c48a91 100644 --- a/vcl/aqua/inc/salmenu.h +++ b/vcl/aqua/inc/salmenu.h @@ -58,32 +58,32 @@ public: // for OOStatusView private: std::vector< MenuBarButtonEntry > maButtons; - MenuBarButtonEntry* findButtonItem( USHORT i_nItemId ); + MenuBarButtonEntry* findButtonItem( sal_uInt16 i_nItemId ); void releaseButtonEntry( MenuBarButtonEntry& i_rEntry ); static void statusLayout(); public: AquaSalMenu( bool bMenuBar ); virtual ~AquaSalMenu(); - virtual BOOL VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars + virtual sal_Bool VisibleMenuBar(); // must return TRUE to actually DISPLAY native menu bars // otherwise only menu messages are processed (eg, OLE on Windows) virtual void InsertItem( SalMenuItem* pSalMenuItem, unsigned nPos ); virtual void RemoveItem( unsigned nPos ); virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ); virtual void SetFrame( const SalFrame* pFrame ); - virtual void CheckItem( unsigned nPos, BOOL bCheck ); - virtual void EnableItem( unsigned nPos, BOOL bEnable ); + virtual void CheckItem( unsigned nPos, sal_Bool bCheck ); + virtual void EnableItem( unsigned nPos, sal_Bool bEnable ); virtual void SetItemText( unsigned nPos, SalMenuItem* pSalMenuItem, const XubString& rText ); virtual void SetItemImage( unsigned nPos, SalMenuItem* pSalMenuItem, const Image& rImage); virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName ); virtual void GetSystemMenuData( SystemMenuData* pData ); - virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, ULONG nFlags); + virtual bool ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags); virtual bool AddMenuBarButton( const SalMenuButtonItem& ); - virtual void RemoveMenuBarButton( USHORT nId ); - virtual Rectangle GetMenuBarButtonRectPixel( USHORT i_nItemId, SalFrame* i_pReferenceFrame ); + virtual void RemoveMenuBarButton( sal_uInt16 nId ); + virtual Rectangle GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ); - int getItemIndexByPos( USHORT nPos ) const; + int getItemIndexByPos( sal_uInt16 nPos ) const; const AquaSalFrame* getFrame() const; void setMainMenu(); @@ -111,7 +111,7 @@ public: AquaSalMenuItem( const SalItemParams* ); virtual ~AquaSalMenuItem(); - USHORT mnId; // Item ID + sal_uInt16 mnId; // Item ID Menu* mpVCLMenu; // VCL Menu into which this MenuItem is inserted AquaSalMenu* mpParentMenu; // The menu in which this menu item is inserted AquaSalMenu* mpSubMenu; // Sub menu of this item (if defined) diff --git a/vcl/aqua/inc/salobj.h b/vcl/aqua/inc/salobj.h index 56b07cea4262..c411287a4686 100644 --- a/vcl/aqua/inc/salobj.h +++ b/vcl/aqua/inc/salobj.h @@ -70,13 +70,13 @@ public: virtual ~AquaSalObject(); virtual void ResetClipRegion(); - virtual USHORT GetClipRegionType(); - virtual void BeginSetClipRegion( ULONG nRects ); + virtual sal_uInt16 GetClipRegionType(); + virtual void BeginSetClipRegion( sal_uLong nRects ); virtual void UnionClipRegion( long nX, long nY, long nWidth, long nHeight ); virtual void EndSetClipRegion(); virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ); - virtual void Show( BOOL bVisible ); - virtual void Enable( BOOL nEnable ); + virtual void Show( sal_Bool bVisible ); + virtual void Enable( sal_Bool nEnable ); virtual void GrabFocus(); virtual void SetBackground(); virtual void SetBackground( SalColor nSalColor ); diff --git a/vcl/aqua/inc/salprn.h b/vcl/aqua/inc/salprn.h index 6bcafa2ee2e3..5458a5b51bd6 100644 --- a/vcl/aqua/inc/salprn.h +++ b/vcl/aqua/inc/salprn.h @@ -81,16 +81,16 @@ class AquaSalInfoPrinter : public SalInfoPrinter virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* i_pGraphics ); - virtual BOOL Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData ); - virtual BOOL SetPrinterData( ImplJobSetup* pSetupData ); - virtual BOOL SetData( ULONG i_nFlags, ImplJobSetup* i_pSetupData ); + virtual sal_Bool Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData ); + virtual sal_Bool SetPrinterData( ImplJobSetup* pSetupData ); + virtual sal_Bool SetData( sal_uLong i_nFlags, ImplJobSetup* i_pSetupData ); virtual void GetPageInfo( const ImplJobSetup* i_pSetupData, long& o_rOutWidth, long& o_rOutHeight, long& o_rPageOffX, long& o_rPageOffY, long& o_rPageWidth, long& o_rPageHeight ); - virtual ULONG GetCapabilities( const ImplJobSetup* i_pSetupData, USHORT i_nType ); - virtual ULONG GetPaperBinCount( const ImplJobSetup* i_pSetupData ); - virtual String GetPaperBinName( const ImplJobSetup* i_pSetupData, ULONG i_nPaperBin ); + virtual sal_uLong GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType ); + virtual sal_uLong GetPaperBinCount( const ImplJobSetup* i_pSetupData ); + virtual String GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ); virtual void InitPaperFormats( const ImplJobSetup* i_pSetupData ); virtual int GetLandscapeAngle( const ImplJobSetup* i_pSetupData ); @@ -99,16 +99,16 @@ class AquaSalInfoPrinter : public SalInfoPrinter // so let's make AquaSalPrinter just a forwarder to AquaSalInfoPrinter // and concentrate the real work in one class // implement pull model print system - BOOL StartJob( const String* i_pFileName, + sal_Bool StartJob( const String* i_pFileName, const String& rJobName, const String& i_rAppName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ); - BOOL EndJob(); - BOOL AbortJob(); - SalGraphics* StartPage( ImplJobSetup* i_pSetupData, BOOL i_bNewJobData ); - BOOL EndPage(); - ULONG GetErrorCode() const; + sal_Bool EndJob(); + sal_Bool AbortJob(); + SalGraphics* StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_bNewJobData ); + sal_Bool EndPage(); + sal_uLong GetErrorCode() const; NSPrintInfo* getPrintInfo() const { return mpPrintInfo; } void setStartPageOffset( int nOffsetX, int nOffsetY ) { mnStartPageOffsetX = nOffsetX; mnStartPageOffsetY = nOffsetY; } @@ -135,25 +135,25 @@ class AquaSalPrinter : public SalPrinter AquaSalPrinter( AquaSalInfoPrinter* i_pInfoPrinter ); virtual ~AquaSalPrinter(); - virtual BOOL StartJob( const XubString* i_pFileName, + virtual sal_Bool StartJob( const XubString* i_pFileName, const XubString& i_rJobName, const XubString& i_rAppName, - ULONG i_nCopies, + sal_uLong i_nCopies, bool i_bCollate, bool i_bDirect, ImplJobSetup* i_pSetupData ); // implement pull model print system - virtual BOOL StartJob( const String* i_pFileName, + virtual sal_Bool StartJob( const String* i_pFileName, const String& rJobName, const String& i_rAppName, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rListener ); - virtual BOOL EndJob(); - virtual BOOL AbortJob(); - virtual SalGraphics* StartPage( ImplJobSetup* i_pSetupData, BOOL i_bNewJobData ); - virtual BOOL EndPage(); - virtual ULONG GetErrorCode(); + virtual sal_Bool EndJob(); + virtual sal_Bool AbortJob(); + virtual SalGraphics* StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_bNewJobData ); + virtual sal_Bool EndPage(); + virtual sal_uLong GetErrorCode(); private: AquaSalPrinter( const AquaSalPrinter& ); diff --git a/vcl/aqua/inc/saltimer.h b/vcl/aqua/inc/saltimer.h index 374b9c5a45c5..dacb9b09de39 100644 --- a/vcl/aqua/inc/saltimer.h +++ b/vcl/aqua/inc/saltimer.h @@ -41,7 +41,7 @@ class AquaSalTimer : public SalTimer AquaSalTimer(); virtual ~AquaSalTimer(); - void Start( ULONG nMS ); + void Start( sal_uLong nMS ); void Stop(); static void handleStartTimerEvent( NSEvent* pEvent ); diff --git a/vcl/aqua/inc/salvd.h b/vcl/aqua/inc/salvd.h index 865cb7b5b766..949ad70d5b36 100644 --- a/vcl/aqua/inc/salvd.h +++ b/vcl/aqua/inc/salvd.h @@ -80,12 +80,12 @@ private: void Destroy(); public: - AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, USHORT nBitCount, const SystemGraphicsData *pData ); + AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData ); virtual ~AquaSalVirtualDevice(); virtual SalGraphics* GetGraphics(); virtual void ReleaseGraphics( SalGraphics* pGraphics ); - virtual BOOL SetSize( long nNewDX, long nNewDY ); + virtual sal_Bool SetSize( long nNewDX, long nNewDY ); virtual void GetSize( long& rWidth, long& rHeight ); }; diff --git a/vcl/aqua/inc/vclnsapp.h b/vcl/aqua/inc/vclnsapp.h index 59b070b421ea..f25593d335a7 100755 --- a/vcl/aqua/inc/vclnsapp.h +++ b/vcl/aqua/inc/vclnsapp.h @@ -47,10 +47,10 @@ class AquaSalFrame; -(void)sendEvent:(NSEvent*)pEvent; -(void)sendSuperEvent:(NSEvent*)pEvent; -(NSMenu*)applicationDockMenu:(NSApplication *)sender; --(MacOSBOOL)application: (NSApplication*) app openFile: (NSString*)file; +-(BOOL)application: (NSApplication*) app openFile: (NSString*)file; -(void)application: (NSApplication*) app openFiles: (NSArray*)files; --(MacOSBOOL)application: (NSApplication*) app printFile: (NSString*)file; --(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(MacOSBOOL)bShowPrintPanels; +-(BOOL)application: (NSApplication*) app printFile: (NSString*)file; +-(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels; -(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app; -(void)systemColorsChanged: (NSNotification*) pNotification; -(void)screenParametersChanged: (NSNotification*) pNotification; @@ -61,7 +61,7 @@ class AquaSalFrame; -(void)addDockMenuItem: (NSMenuItem*)pNewItem; -(void)applicationWillBecomeActive: (NSNotification *)pNotification; -(void)applicationWillResignActive: (NSNotification *)pNotification; --(MacOSBOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (MacOSBOOL)bWinVisible; +-(BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL)bWinVisible; -(void)setDockIconClickHandler: (NSObject*)pHandler; -(void)cycleFrameForward: (AquaSalFrame*)pCurFrame; -(void)cycleFrameBackward: (AquaSalFrame*)pCurFrame; diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h index c1806054e253..6d44f62b5611 100644 --- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h +++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h @@ -38,7 +38,7 @@ +(id)positionAttributeForElement:(AquaA11yWrapper *)wrapper; +(id)descriptionAttributeForElement:(AquaA11yWrapper *)wrapper; +(void)addAttributeNamesTo:(NSMutableArray *)attributeNames; -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; +(void)setFocusedAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value; @end diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm index a700b0b89ae9..c66e7c3d8515 100644 --- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.mm @@ -75,8 +75,8 @@ using namespace ::com::sun::star::uno; [ pool release ]; } -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { - MacOSBOOL isSettable = NO; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { + BOOL isSettable = NO; NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ]; if ( [ attribute isEqualToString: NSAccessibilityFocusedAttribute ] && ! [ [ AquaA11yRoleHelper getNativeRoleFrom: [ wrapper accessibleContext ] ] isEqualToString: NSAccessibilityScrollBarRole ] diff --git a/vcl/aqua/source/a11y/aqua11yfactory.mm b/vcl/aqua/source/a11y/aqua11yfactory.mm index 7732ce202cd2..5dcdf4bb9f61 100644 --- a/vcl/aqua/source/a11y/aqua11yfactory.mm +++ b/vcl/aqua/source/a11y/aqua11yfactory.mm @@ -95,11 +95,11 @@ static bool enabled = false; return [ AquaA11yFactory wrapperForAccessibleContext: rxAccessibleContext createIfNotExists: YES asRadioGroup: NO ]; } -+(AquaA11yWrapper *)wrapperForAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext createIfNotExists:(MacOSBOOL) bCreate { ++(AquaA11yWrapper *)wrapperForAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate { return [ AquaA11yFactory wrapperForAccessibleContext: rxAccessibleContext createIfNotExists: bCreate asRadioGroup: NO ]; } -+(AquaA11yWrapper *)wrapperForAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext createIfNotExists:(MacOSBOOL) bCreate asRadioGroup:(MacOSBOOL) asRadioGroup{ ++(AquaA11yWrapper *)wrapperForAccessibleContext: (Reference < XAccessibleContext >) rxAccessibleContext createIfNotExists:(BOOL) bCreate asRadioGroup:(BOOL) asRadioGroup{ NSMutableDictionary * dAllWrapper = [ AquaA11yFactory allWrapper ]; NSValue * nKey = nil; if ( asRadioGroup ) { diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h index a88e6c71c04b..bf290990faa2 100644 --- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h +++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h @@ -36,7 +36,7 @@ } +(id)selectedChildrenAttributeForElement:(AquaA11yWrapper *)wrapper; +(void)addAttributeNamesTo:(NSMutableArray *)attributeNames; -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; +(void)setSelectedChildrenAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value; @end diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm index 804cf108dba8..9368c599d131 100644 --- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm @@ -65,7 +65,7 @@ using namespace ::com::sun::star::uno; [ attributeNames addObject: NSAccessibilitySelectedChildrenAttribute ]; } -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { if ( [ attribute isEqualToString: NSAccessibilitySelectedChildrenAttribute ] ) { diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm index 6577cebf295e..60b12c762b25 100644 --- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm @@ -77,8 +77,8 @@ using namespace ::rtl; return italicStyle; } -+(MacOSBOOL)isStrikethrough:(PropertyValue)property { - MacOSBOOL strikethrough = NO; ++(BOOL)isStrikethrough:(PropertyValue)property { + BOOL strikethrough = NO; sal_Int16 value = 0; property.Value >>= value; if ( value != FontStrikeout::NONE @@ -88,8 +88,8 @@ using namespace ::rtl; return strikethrough; } -+(MacOSBOOL)convertBoolean:(PropertyValue)property { - MacOSBOOL myBoolean = NO; ++(BOOL)convertBoolean:(PropertyValue)property { + BOOL myBoolean = NO; bool value = sal_False; property.Value >>= value; if ( value ) { @@ -149,7 +149,7 @@ using namespace ::rtl; int fonttraits = 0; float fontsize = 0.0; sal_Int32 underlineColor = 0; - MacOSBOOL underlineHasColor = NO; + BOOL underlineHasColor = NO; // add attributes to string for ( int attrIndex = 0; attrIndex < attributes.getLength(); attrIndex++ ) { PropertyValue property = attributes [ attrIndex ]; diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h index dfdab349bafe..b132bdd0f12a 100644 --- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h @@ -54,7 +54,7 @@ +(void)addParameterizedAttributeNamesTo:(NSMutableArray *)attributeNames; +(NSArray *)specialAttributeNames; +(NSArray *)specialParameterizedAttributeNames; -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; +(void)setVisibleCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value; +(void)setSelectedTextRangeAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value; +(void)setSelectedTextAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value; diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm index 2033135564d8..89c164e5e0b9 100644 --- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm @@ -273,8 +273,8 @@ using namespace ::rtl; return rtfData; } -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { - MacOSBOOL isSettable = NO; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { + BOOL isSettable = NO; if ( [ attribute isEqualToString: NSAccessibilityValueAttribute ] || [ attribute isEqualToString: NSAccessibilitySelectedTextAttribute ] || [ attribute isEqualToString: NSAccessibilitySelectedTextRangeAttribute ] diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h index d3afebf7f828..1dbafe33baea 100644 --- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h +++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h @@ -39,7 +39,7 @@ +(id)minValueAttributeForElement:(AquaA11yWrapper *)wrapper; +(id)maxValueAttributeForElement:(AquaA11yWrapper *)wrapper; +(void)addAttributeNamesTo:(NSMutableArray *)attributeNames; -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper; +(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value; @end diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm b/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm index 85ef0041da95..fb257921b13e 100644 --- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm +++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.mm @@ -82,8 +82,8 @@ using namespace ::com::sun::star::uno; [ attributeNames addObject: NSAccessibilityValueAttribute ]; } -+(MacOSBOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { - MacOSBOOL isSettable = NO; ++(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { + BOOL isSettable = NO; if ( [ wrapper accessibleValue ] != nil && [ attribute isEqualToString: NSAccessibilityValueAttribute ] && ! [ wrapper isKindOfClass: [ AquaA11yWrapperStaticText class ] ] ) { diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm index e86676e725f2..c2724a372f9f 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm @@ -63,7 +63,7 @@ using namespace ::com::sun::star::uno; -(Reference<XAccessibleContext>)accessibleContext; @end -static MacOSBOOL isPopupMenuOpen = NO; +static BOOL isPopupMenuOpen = NO; @implementation AquaA11yWrapper : NSView @@ -154,7 +154,7 @@ static MacOSBOOL isPopupMenuOpen = NO; // (getter without parameter) attributeNameHereAttribute // (getter with parameter) attributeNameHereAttributeForParameter: // (setter) setAttributeNameHereAttributeForElement:to: --(SEL)selectorForAttribute:(NSString *)attribute asGetter:(MacOSBOOL)asGetter withGetterParameter:(MacOSBOOL)withGetterParameter { +-(SEL)selectorForAttribute:(NSString *)attribute asGetter:(BOOL)asGetter withGetterParameter:(BOOL)withGetterParameter { SEL selector = nil; NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ]; @try { @@ -197,7 +197,7 @@ static MacOSBOOL isPopupMenuOpen = NO; return Reference < XAccessible > (); } --(MacOSBOOL)isFirstRadioButtonInGroup { +-(BOOL)isFirstRadioButtonInGroup { Reference < XAccessible > rFirstMateAccessible = [ self getFirstRadioButtonInGroup ]; if ( rFirstMateAccessible.is() && rFirstMateAccessible -> getAccessibleContext().get() == [ self accessibleContext ] ) { return YES; @@ -693,12 +693,12 @@ static MacOSBOOL isPopupMenuOpen = NO; return value; } --(MacOSBOOL)accessibilityIsIgnored { +-(BOOL)accessibilityIsIgnored { // #i90575# guard NSAccessibility protocol against unwanted access if ( isPopupMenuOpen ) { return nil; } - MacOSBOOL ignored = NO; + BOOL ignored = NO; sal_Int16 nRole = [ self accessibleContext ] -> getAccessibleRole(); switch ( nRole ) { case AccessibleRole::PANEL: @@ -796,8 +796,8 @@ static MacOSBOOL isPopupMenuOpen = NO; } } --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute { - MacOSBOOL isSettable = NO; +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute { + BOOL isSettable = NO; if ( [ self accessibleText ] != nil ) { isSettable = [ AquaA11yTextWrapper isAttributeSettable: attribute forElement: self ]; } @@ -830,7 +830,7 @@ static MacOSBOOL isPopupMenuOpen = NO; return nil; // TODO: to be completed } --(MacOSBOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute { +-(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute { return NO; // TODO } @@ -904,7 +904,7 @@ static MacOSBOOL isPopupMenuOpen = NO; // get some information NSString * role = (NSString *) [ self accessibilityAttributeValue: NSAccessibilityRoleAttribute ]; id enabledAttr = [ self enabledAttribute ]; - MacOSBOOL enabled = [ enabledAttr boolValue ]; + BOOL enabled = [ enabledAttr boolValue ]; NSView * parent = (NSView *) [ self accessibilityAttributeValue: NSAccessibilityParentAttribute ]; AquaA11yWrapper * parentAsWrapper = nil; if ( [ parent isKindOfClass: [ AquaA11yWrapper class ] ] ) { @@ -947,8 +947,8 @@ static MacOSBOOL isPopupMenuOpen = NO; #pragma mark - #pragma mark Hit Test --(MacOSBOOL)isViewElement:(NSObject *)viewElement hitByPoint:(NSPoint)point { - MacOSBOOL hit = NO; +-(BOOL)isViewElement:(NSObject *)viewElement hitByPoint:(NSPoint)point { + BOOL hit = NO; NSAutoreleasePool * pool = [ [ NSAutoreleasePool alloc ] init ]; NSValue * position = [ viewElement accessibilityAttributeValue: NSAccessibilityPositionAttribute ]; NSValue * size = [ viewElement accessibilityAttributeValue: NSAccessibilitySizeAttribute ]; @@ -1127,15 +1127,15 @@ Reference < XAccessibleContext > hitTestRunner ( com::sun::star::awt::Point poin return mDefaultFontsize; } --(void)setActsAsRadioGroup:(MacOSBOOL)actsAsRadioGroup { +-(void)setActsAsRadioGroup:(BOOL)actsAsRadioGroup { mActsAsRadioGroup = actsAsRadioGroup; } --(MacOSBOOL)actsAsRadioGroup { +-(BOOL)actsAsRadioGroup { return mActsAsRadioGroup; } -+(void)setPopupMenuOpen:(MacOSBOOL)popupMenuOpen { ++(void)setPopupMenuOpen:(BOOL)popupMenuOpen { isPopupMenuOpen = popupMenuOpen; } diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h index 95fee9a3ec4b..b1c5fc751e52 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h +++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h @@ -34,7 +34,7 @@ { } -(id)valueAttribute; --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute; +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute; -(NSArray *)accessibilityAttributeNames; @end diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm index c4ac34dc5bce..25f012e1163f 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm @@ -44,7 +44,7 @@ return [ NSNumber numberWithInt: 0 ]; } --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute { +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute { if ( [ attribute isEqualToString: NSAccessibilityValueAttribute ] ) { return NO; } diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h index 7ed76d607176..e18da11dd0ad 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h +++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h @@ -42,7 +42,7 @@ -(id)selectedTextRangeAttribute; -(id)visibleCharacterRangeAttribute; // Accessibility Protocol --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute; +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute; -(void)accessibilitySetValue:(id)value forAttribute:(NSString *)attribute; -(NSArray *)accessibilityAttributeNames; @end diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm index 85aed320e470..16fa1372fe4e 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm @@ -117,7 +117,7 @@ using namespace ::com::sun::star::uno; #pragma mark - #pragma mark Accessibility Protocol --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute { +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute { if ( [ self textArea ] != nil && ( [ attribute isEqualToString: NSAccessibilitySelectedTextAttribute ] || [ attribute isEqualToString: NSAccessibilitySelectedTextRangeAttribute ] diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h index 13ceee6f826f..3fc6558c633c 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h @@ -34,7 +34,7 @@ { } -(id)valueAttribute; --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute; +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute; -(NSArray *)accessibilityAttributeNames; @end diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm index 54d6edac619a..930f940c4971 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm @@ -44,7 +44,7 @@ return [ NSNumber numberWithInt: 0 ]; } --(MacOSBOOL)accessibilityIsAttributeSettable:(NSString *)attribute { +-(BOOL)accessibilityIsAttributeSettable:(NSString *)attribute { if ( [ attribute isEqualToString: NSAccessibilityValueAttribute ] ) { return NO; } diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 5d2fc3f00741..352396a7fb2b 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -71,9 +71,9 @@ using namespace std; using namespace ::com::sun::star; -extern BOOL ImplSVMain(); +extern sal_Bool ImplSVMain(); -static BOOL* gpbInit = 0; +static sal_Bool* gpbInit = 0; static NSMenu* pDockMenu = nil; static bool bNoSVMain = true; static bool bLeftMain = false; @@ -207,7 +207,7 @@ static void initNSApp() [NSApp activateIgnoringOtherApps: YES]; } -BOOL ImplSVMainHook( BOOL * pbInit ) +sal_Bool ImplSVMainHook( sal_Bool * pbInit ) { gpbInit = pbInit; @@ -402,7 +402,7 @@ sal_Bool SalYieldMutex::tryToAcquire() // some convenience functions regarding the yield mutex, aka solar mutex -BOOL ImplSalYieldMutexTryToAcquire() +sal_Bool ImplSalYieldMutexTryToAcquire() { AquaSalInstance* pInst = (AquaSalInstance*) GetSalData()->mpFirstInstance; if ( pInst ) @@ -513,7 +513,7 @@ void AquaSalInstance::wakeupYield() // ----------------------------------------------------------------------- -void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, USHORT nType, void* pData ) +void AquaSalInstance::PostUserEvent( AquaSalFrame* pFrame, sal_uInt16 nType, void* pData ) { osl_acquireMutex( maUserEventListMutex ); maUserEvents.push_back( SalUserEvent( pFrame, pData, nType ) ); @@ -532,14 +532,14 @@ vos::IMutex* AquaSalInstance::GetYieldMutex() // ----------------------------------------------------------------------- -ULONG AquaSalInstance::ReleaseYieldMutex() +sal_uLong AquaSalInstance::ReleaseYieldMutex() { SalYieldMutex* pYieldMutex = mpSalYieldMutex; if ( pYieldMutex->GetThreadId() == vos::OThread::getCurrentIdentifier() ) { - ULONG nCount = pYieldMutex->GetAcquireCount(); - ULONG n = nCount; + sal_uLong nCount = pYieldMutex->GetAcquireCount(); + sal_uLong n = nCount; while ( n ) { pYieldMutex->release(); @@ -554,7 +554,7 @@ ULONG AquaSalInstance::ReleaseYieldMutex() // ----------------------------------------------------------------------- -void AquaSalInstance::AcquireYieldMutex( ULONG nCount ) +void AquaSalInstance::AcquireYieldMutex( sal_uLong nCount ) { SalYieldMutex* pYieldMutex = mpSalYieldMutex; while ( nCount ) @@ -601,7 +601,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) break; case AppExecuteSVMain: { - BOOL bResult = ImplSVMain(); + sal_Bool bResult = ImplSVMain(); if( gpbInit ) *gpbInit = bResult; [NSApp stop: NSApp]; @@ -711,7 +711,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) bool bDispatchUser = true; while( bDispatchUser ) { - ULONG nCount = ReleaseYieldMutex(); + sal_uLong nCount = ReleaseYieldMutex(); // get one user event osl_acquireMutex( maUserEventListMutex ); @@ -752,7 +752,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) bool bHadEvent = false; do { - ULONG nCount = ReleaseYieldMutex(); + sal_uLong nCount = ReleaseYieldMutex(); pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask untilDate: nil inMode: NSDefaultRunLoopMode dequeue: YES]; @@ -769,7 +769,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) // if we had no event yet, wait for one if requested if( bWait && ! bHadEvent ) { - ULONG nCount = ReleaseYieldMutex(); + sal_uLong nCount = ReleaseYieldMutex(); NSDate* pDt = AquaSalTimer::pRunningTimer ? [AquaSalTimer::pRunningTimer fireDate] : [NSDate distantFuture]; pEvent = [NSApp nextEventMatchingMask: NSAnyEventMask untilDate: pDt @@ -813,7 +813,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) // has dispatched an event, cop out at 200 ms osl_resetCondition( maWaitingYieldCond ); TimeValue aVal = { 0, 200000000 }; - ULONG nCount = ReleaseYieldMutex(); + sal_uLong nCount = ReleaseYieldMutex(); osl_waitCondition( maWaitingYieldCond, &aVal ); AcquireYieldMutex( nCount ); } @@ -844,7 +844,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents ) // ----------------------------------------------------------------------- -bool AquaSalInstance::AnyInput( USHORT nType ) +bool AquaSalInstance::AnyInput( sal_uInt16 nType ) { if( nType & INPUT_APPEVENT ) { @@ -890,14 +890,14 @@ bool AquaSalInstance::AnyInput( USHORT nType ) // ----------------------------------------------------------------------- -SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, ULONG nSalFrameStyle ) +SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle ) { return NULL; } // ----------------------------------------------------------------------- -SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, ULONG nSalFrameStyle ) +SalFrame* AquaSalInstance::CreateFrame( SalFrame* pParent, sal_uLong nSalFrameStyle ) { SalData::ensureThreadAutoreleasePool(); @@ -914,7 +914,7 @@ void AquaSalInstance::DestroyFrame( SalFrame* pFrame ) // ----------------------------------------------------------------------- -SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /* pWindowData */, BOOL /* bShow */ ) +SalObject* AquaSalInstance::CreateObject( SalFrame* pParent, SystemWindowData* /* pWindowData */, sal_Bool /* bShow */ ) { // SystemWindowData is meaningless on Mac OS X AquaSalObject *pObject = NULL; diff --git a/vcl/aqua/source/app/saltimer.cxx b/vcl/aqua/source/app/saltimer.cxx index 724857e92a0c..9abcc18bf6af 100644 --- a/vcl/aqua/source/app/saltimer.cxx +++ b/vcl/aqua/source/app/saltimer.cxx @@ -40,7 +40,7 @@ NSTimer* AquaSalTimer::pRunningTimer = nil; bool AquaSalTimer::bDispatchTimer = false; -void ImplSalStartTimer( ULONG nMS ) +void ImplSalStartTimer( sal_uLong nMS ) { SalData* pSalData = GetSalData(); if( pSalData->mpFirstInstance->isNSAppThread() ) @@ -108,7 +108,7 @@ void AquaSalTimer::handleStartTimerEvent( NSEvent* pEvent ) // timer already elapsed since event posted pSVData->mpSalTimer->CallCallback(); } - ImplSalStartTimer( ULONG( [pEvent data1] ) ); + ImplSalStartTimer( sal_uLong( [pEvent data1] ) ); } } @@ -122,7 +122,7 @@ AquaSalTimer::~AquaSalTimer() ImplSalStopTimer(); } -void AquaSalTimer::Start( ULONG nMS ) +void AquaSalTimer::Start( sal_uLong nMS ) { ImplSalStartTimer( nMS ); } diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm index 06af0358c52b..7d6e1839fc17 100755 --- a/vcl/aqua/source/app/vclnsapp.mm +++ b/vcl/aqua/source/app/vclnsapp.mm @@ -287,7 +287,7 @@ return AquaSalInstance::GetDynamicDockMenu(); } --(MacOSBOOL)application: (NSApplication*)app openFile: (NSString*)pFile +-(BOOL)application: (NSApplication*)app openFile: (NSString*)pFile { const rtl::OUString aFile( GetOUString( pFile ) ); if( ! AquaSalInstance::isOnCommandLine( aFile ) ) @@ -328,7 +328,7 @@ } } --(MacOSBOOL)application: (NSApplication*)app printFile: (NSString*)pFile +-(BOOL)application: (NSApplication*)app printFile: (NSString*)pFile { const rtl::OUString aFile( GetOUString( pFile ) ); const ApplicationEvent* pAppEvent = new ApplicationEvent( String(), ApplicationAddress(), @@ -336,7 +336,7 @@ AquaSalInstance::aAppEventList.push_back( pAppEvent ); return YES; } --(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(MacOSBOOL)bShowPrintPanels +-(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels { // currently ignores print settings an bShowPrintPanels rtl::OUStringBuffer aFileList( 256 ); @@ -507,7 +507,7 @@ } } -- (MacOSBOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (MacOSBOOL) bWinVisible +- (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible { NSObject* pHdl = GetSalData()->mpDockIconClickHandler; if( pHdl && [pHdl respondsToSelector: @selector(dockIconClicked:)] ) diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx index 1a8f950e50d4..62b153176893 100644 --- a/vcl/aqua/source/dtrans/DragSource.cxx +++ b/vcl/aqua/source/dtrans/DragSource.cxx @@ -105,7 +105,7 @@ Sequence<OUString> dragSource_getSupportedServiceNames() } --(unsigned int)draggingSourceOperationMaskForLocal: (MacOSBOOL)isLocal +-(unsigned int)draggingSourceOperationMaskForLocal: (BOOL)isLocal { return mDragSource->getSupportedDragOperations(isLocal); } diff --git a/vcl/aqua/source/dtrans/DragSource.hxx b/vcl/aqua/source/dtrans/DragSource.hxx index f8f55176a308..017ca047b679 100644 --- a/vcl/aqua/source/dtrans/DragSource.hxx +++ b/vcl/aqua/source/dtrans/DragSource.hxx @@ -72,7 +72,7 @@ class AquaSalFrame; -(void)mouseDown: (NSEvent*)theEvent; -(void)mouseDragged: (NSEvent*)theEvent; --(unsigned int)draggingSourceOperationMaskForLocal:(MacOSBOOL)isLocal; +-(unsigned int)draggingSourceOperationMaskForLocal:(BOOL)isLocal; -(void)draggedImage:(NSImage*)anImage beganAt:(NSPoint)aPoint; -(void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation; -(void)draggedImage:(NSImage *)draggedImage movedTo:(NSPoint)screenPoint; diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx index c928d66e156d..01a58b171b02 100644 --- a/vcl/aqua/source/dtrans/DropTarget.cxx +++ b/vcl/aqua/source/dtrans/DropTarget.cxx @@ -126,13 +126,13 @@ namespace /* private */ } --(MacOSBOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender +-(BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender { return mDropTarget->prepareForDragOperation(sender); } --(MacOSBOOL)performDragOperation:(id <NSDraggingInfo>)sender +-(BOOL)performDragOperation:(id <NSDraggingInfo>)sender { return mDropTarget->performDragOperation(sender); } @@ -321,13 +321,13 @@ NSDragOperation DropTarget::draggingUpdated(id sender) } - MacOSBOOL DropTarget::prepareForDragOperation(id sender) + BOOL DropTarget::prepareForDragOperation(id sender) { return 1; } -MacOSBOOL DropTarget::performDragOperation(id sender) +BOOL DropTarget::performDragOperation(id sender) { bool bSuccess = false; diff --git a/vcl/aqua/source/dtrans/DropTarget.hxx b/vcl/aqua/source/dtrans/DropTarget.hxx index 6baa8bb69d01..231df7fd5157 100644 --- a/vcl/aqua/source/dtrans/DropTarget.hxx +++ b/vcl/aqua/source/dtrans/DropTarget.hxx @@ -76,8 +76,8 @@ class DropTarget; -(NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender; -(NSDragOperation)draggingUpdated:(id <NSDraggingInfo>)sender; -(void)draggingExited:(id <NSDraggingInfo>)sender; --(MacOSBOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender; --(MacOSBOOL)performDragOperation:(id <NSDraggingInfo>)sender; +-(BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender; +-(BOOL)performDragOperation:(id <NSDraggingInfo>)sender; -(void)concludeDragOperation:(id <NSDraggingInfo>)sender; @end @@ -135,8 +135,8 @@ public: virtual NSDragOperation draggingEntered(id sender); virtual NSDragOperation draggingUpdated(id sender); virtual void draggingExited(id sender); - virtual MacOSBOOL prepareForDragOperation(id sender); - virtual MacOSBOOL performDragOperation(id sender); + virtual BOOL prepareForDragOperation(id sender); + virtual BOOL performDragOperation(id sender); virtual void concludeDragOperation(id sender); /* If multiple actions are supported by the drag source and diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm index d19290d8320a..8082ccb43f76 100644 --- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm +++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm @@ -296,7 +296,7 @@ class ControllerProperties std::map< int, rtl::OUString >::const_iterator name_it = maTagToPropertyName.find( nTag ); if( name_it != maTagToPropertyName.end() && ! name_it->second.equalsAscii( "PrintContent" ) ) { - MacOSBOOL bEnabled = mpController->isUIOptionEnabled( name_it->second ) ? YES : NO; + BOOL bEnabled = mpController->isUIOptionEnabled( name_it->second ) ? YES : NO; if( pCtrl ) { [pCtrl setEnabled: bEnabled]; diff --git a/vcl/aqua/source/gdi/aquaprintview.mm b/vcl/aqua/source/gdi/aquaprintview.mm index ae42c5c09e8d..11b4b9088591 100755 --- a/vcl/aqua/source/gdi/aquaprintview.mm +++ b/vcl/aqua/source/gdi/aquaprintview.mm @@ -44,7 +44,7 @@ return self; } --(MacOSBOOL)knowsPageRange: (NSRangePointer)range +-(BOOL)knowsPageRange: (NSRangePointer)range { range->location = 1; range->length = mpInfoPrinter->getCurPageRangeCount(); diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx index a355ff86d00e..9626e2fcbdce 100755 --- a/vcl/aqua/source/gdi/salatslayout.cxx +++ b/vcl/aqua/source/gdi/salatslayout.cxx @@ -266,7 +266,7 @@ bool ATSLayout::LayoutText( ImplLayoutArgs& rArgs ) if( (rArgs.mnFlags & SAL_LAYOUT_BIDI_STRONG) != 0 ) { // control BiDi defaults - MacOSBOOL nLineDirTag = kATSULeftToRightBaseDirection; + BOOL nLineDirTag = kATSULeftToRightBaseDirection; if( (rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL) != 0 ) nLineDirTag = kATSURightToLeftBaseDirection; aTagAttrs[0] = kATSULineDirectionTag; diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx index 0e58c35b5fad..e54c7edd6fe5 100644 --- a/vcl/aqua/source/gdi/salbmp.cxx +++ b/vcl/aqua/source/gdi/salbmp.cxx @@ -104,7 +104,7 @@ bool AquaSalBitmap::Create( CGLayerRef xLayer, int nBitmapBits, // ------------------------------------------------------------------ -bool AquaSalBitmap::Create( const Size& rSize, USHORT nBits, const BitmapPalette& rBitmapPalette ) +bool AquaSalBitmap::Create( const Size& rSize, sal_uInt16 nBits, const BitmapPalette& rBitmapPalette ) { if( !isValidBitCount( nBits ) ) return false; @@ -131,7 +131,7 @@ bool AquaSalBitmap::Create( const SalBitmap& rSalBmp, SalGraphics* pGraphics ) // ------------------------------------------------------------------ -bool AquaSalBitmap::Create( const SalBitmap& rSalBmp, USHORT nNewBitCount ) +bool AquaSalBitmap::Create( const SalBitmap& rSalBmp, sal_uInt16 nNewBitCount ) { const AquaSalBitmap& rSourceBitmap = static_cast<const AquaSalBitmap&>(rSalBmp); @@ -560,7 +560,7 @@ Size AquaSalBitmap::GetSize() const // ------------------------------------------------------------------ -USHORT AquaSalBitmap::GetBitCount() const +sal_uInt16 AquaSalBitmap::GetBitCount() const { return mnBits; } @@ -569,9 +569,9 @@ USHORT AquaSalBitmap::GetBitCount() const static struct pal_entry { - BYTE mnRed; - BYTE mnGreen; - BYTE mnBlue; + sal_uInt8 mnRed; + sal_uInt8 mnGreen; + sal_uInt8 mnBlue; } const aImplSalSysPalEntryAry[ 16 ] = { @@ -626,9 +626,9 @@ const BitmapPalette& GetDefaultPalette( int mnBits, bool bMonochrome ) // own palette (6/6/6) const int DITHER_PAL_STEPS = 6; - const BYTE DITHER_PAL_DELTA = 51; + const sal_uInt8 DITHER_PAL_DELTA = 51; int nB, nG, nR; - BYTE nRed, nGreen, nBlue; + sal_uInt8 nRed, nGreen, nBlue; for( nB=0, nBlue=0; nB < DITHER_PAL_STEPS; nB++, nBlue += DITHER_PAL_DELTA ) { for( nG=0, nGreen=0; nG < DITHER_PAL_STEPS; nG++, nGreen += DITHER_PAL_DELTA ) diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index e1daf649f6da..10a0c93c8abf 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -58,7 +58,7 @@ using namespace vcl; -typedef unsigned char Boolean; // copied from MacTypes.h, should be properly included +//typedef unsigned char Boolean; // copied from MacTypes.h, should be properly included typedef std::vector<unsigned char> ByteVector; @@ -453,9 +453,9 @@ void AquaSalGraphics::copyResolution( AquaSalGraphics& rGraphics ) // ----------------------------------------------------------------------- -USHORT AquaSalGraphics::GetBitCount() +sal_uInt16 AquaSalGraphics::GetBitCount() { - USHORT nBits = mnBitmapDepth ? mnBitmapDepth : 32;//24; + sal_uInt16 nBits = mnBitmapDepth ? mnBitmapDepth : 32;//24; return nBits; } @@ -562,7 +562,7 @@ void AquaSalGraphics::ResetClipRegion() // ----------------------------------------------------------------------- -void AquaSalGraphics::BeginSetClipRegion( ULONG nRectCount ) +void AquaSalGraphics::BeginSetClipRegion( sal_uLong nRectCount ) { // release old clip path if( mxClipPath ) @@ -574,16 +574,16 @@ void AquaSalGraphics::BeginSetClipRegion( ULONG nRectCount ) // ----------------------------------------------------------------------- -BOOL AquaSalGraphics::unionClipRegion( long nX, long nY, long nWidth, long nHeight ) +sal_Bool AquaSalGraphics::unionClipRegion( long nX, long nY, long nWidth, long nHeight ) { if( (nWidth <= 0) || (nHeight <= 0) ) - return TRUE; + return sal_True; if( !mxClipPath ) mxClipPath = CGPathCreateMutable(); const CGRect aClipRect = {{nX,nY},{nWidth,nHeight}}; CGPathAddRect( mxClipPath, NULL, aClipRect ); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- @@ -747,13 +747,13 @@ void AquaSalGraphics::drawRect( long nX, long nY, long nWidth, long nHeight ) // ----------------------------------------------------------------------- -static void getBoundRect( ULONG nPoints, const SalPoint *pPtAry, long &rX, long& rY, long& rWidth, long& rHeight ) +static void getBoundRect( sal_uLong nPoints, const SalPoint *pPtAry, long &rX, long& rY, long& rWidth, long& rHeight ) { long nX1 = pPtAry->mnX; long nX2 = nX1; long nY1 = pPtAry->mnY; long nY2 = nY1; - for( ULONG n = 1; n < nPoints; n++ ) + for( sal_uLong n = 1; n < nPoints; n++ ) { if( pPtAry[n].mnX < nX1 ) nX1 = pPtAry[n].mnX; @@ -777,7 +777,7 @@ static inline void alignLinePoint( const SalPoint* i_pIn, float& o_fX, float& o_ o_fY = static_cast<float>(i_pIn->mnY ) + 0.5; } -void AquaSalGraphics::drawPolyLine( ULONG nPoints, const SalPoint *pPtAry ) +void AquaSalGraphics::drawPolyLine( sal_uLong nPoints, const SalPoint *pPtAry ) { if( nPoints < 1 ) return; @@ -793,7 +793,7 @@ void AquaSalGraphics::drawPolyLine( ULONG nPoints, const SalPoint *pPtAry ) alignLinePoint( pPtAry, fX, fY ); CGContextMoveToPoint( mrContext, fX, fY ); pPtAry++; - for( ULONG nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) + for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) { alignLinePoint( pPtAry, fX, fY ); CGContextAddLineToPoint( mrContext, fX, fY ); @@ -805,7 +805,7 @@ void AquaSalGraphics::drawPolyLine( ULONG nPoints, const SalPoint *pPtAry ) // ----------------------------------------------------------------------- -void AquaSalGraphics::drawPolygon( ULONG nPoints, const SalPoint *pPtAry ) +void AquaSalGraphics::drawPolygon( sal_uLong nPoints, const SalPoint *pPtAry ) { if( nPoints <= 1 ) return; @@ -833,7 +833,7 @@ void AquaSalGraphics::drawPolygon( ULONG nPoints, const SalPoint *pPtAry ) alignLinePoint( pPtAry, fX, fY ); CGContextMoveToPoint( mrContext, fX, fY ); pPtAry++; - for( ULONG nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) + for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) { alignLinePoint( pPtAry, fX, fY ); CGContextAddLineToPoint( mrContext, fX, fY ); @@ -843,7 +843,7 @@ void AquaSalGraphics::drawPolygon( ULONG nPoints, const SalPoint *pPtAry ) { CGContextMoveToPoint( mrContext, pPtAry->mnX, pPtAry->mnY ); pPtAry++; - for( ULONG nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) + for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) CGContextAddLineToPoint( mrContext, pPtAry->mnX, pPtAry->mnY ); } @@ -853,7 +853,7 @@ void AquaSalGraphics::drawPolygon( ULONG nPoints, const SalPoint *pPtAry ) // ----------------------------------------------------------------------- -void AquaSalGraphics::drawPolyPolygon( ULONG nPolyCount, const ULONG *pPoints, PCONSTSALPOINT *ppPtAry ) +void AquaSalGraphics::drawPolyPolygon( sal_uLong nPolyCount, const sal_uLong *pPoints, PCONSTSALPOINT *ppPtAry ) { if( nPolyCount <= 0 ) return; @@ -863,7 +863,7 @@ void AquaSalGraphics::drawPolyPolygon( ULONG nPolyCount, const ULONG *pPoints, P // find bound rect long leftX = 0, topY = 0, maxWidth = 0, maxHeight = 0; getBoundRect( pPoints[0], ppPtAry[0], leftX, topY, maxWidth, maxHeight ); - for( ULONG n = 1; n < nPolyCount; n++ ) + for( sal_uLong n = 1; n < nPolyCount; n++ ) { long nX = leftX, nY = topY, nW = maxWidth, nH = maxHeight; getBoundRect( pPoints[n], ppPtAry[n], nX, nY, nW, nH ); @@ -898,9 +898,9 @@ void AquaSalGraphics::drawPolyPolygon( ULONG nPolyCount, const ULONG *pPoints, P CGContextBeginPath( mrContext ); if( IsPenVisible() ) { - for( ULONG nPoly = 0; nPoly < nPolyCount; nPoly++ ) + for( sal_uLong nPoly = 0; nPoly < nPolyCount; nPoly++ ) { - const ULONG nPoints = pPoints[nPoly]; + const sal_uLong nPoints = pPoints[nPoly]; if( nPoints > 1 ) { const SalPoint *pPtAry = ppPtAry[nPoly]; @@ -908,7 +908,7 @@ void AquaSalGraphics::drawPolyPolygon( ULONG nPolyCount, const ULONG *pPoints, P alignLinePoint( pPtAry, fX, fY ); CGContextMoveToPoint( mrContext, fX, fY ); pPtAry++; - for( ULONG nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) + for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) { alignLinePoint( pPtAry, fX, fY ); CGContextAddLineToPoint( mrContext, fX, fY ); @@ -919,15 +919,15 @@ void AquaSalGraphics::drawPolyPolygon( ULONG nPolyCount, const ULONG *pPoints, P } else { - for( ULONG nPoly = 0; nPoly < nPolyCount; nPoly++ ) + for( sal_uLong nPoly = 0; nPoly < nPolyCount; nPoly++ ) { - const ULONG nPoints = pPoints[nPoly]; + const sal_uLong nPoints = pPoints[nPoly]; if( nPoints > 1 ) { const SalPoint *pPtAry = ppPtAry[nPoly]; CGContextMoveToPoint( mrContext, pPtAry->mnX, pPtAry->mnY ); pPtAry++; - for( ULONG nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) + for( sal_uLong nPoint = 1; nPoint < nPoints; nPoint++, pPtAry++ ) CGContextAddLineToPoint( mrContext, pPtAry->mnX, pPtAry->mnY ); CGContextClosePath(mrContext); } @@ -1052,22 +1052,22 @@ bool AquaSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon& rPolyLine, // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::drawPolyLineBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) +sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { return sal_False; } // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::drawPolygonBezier( ULONG nPoints, const SalPoint* pPtAry, const BYTE* pFlgAry ) +sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) { return sal_False; } // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::drawPolyPolygonBezier( ULONG nPoly, const ULONG* pPoints, - const SalPoint* const* pPtAry, const BYTE* const* pFlgAry ) +sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong nPoly, const sal_uLong* pPoints, + const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) { return sal_False; } @@ -1153,7 +1153,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect *pPosAry, SalGraphics *pSrcGrap // ----------------------------------------------------------------------- -void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, USHORT nFlags ) +void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 nFlags ) { ApplyXorContext(); @@ -1397,7 +1397,7 @@ void AquaSalGraphics::invert( long nX, long nY, long nWidth, long nHeight, SalIn // ----------------------------------------------------------------------- -void AquaSalGraphics::invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert nSalFlags ) +void AquaSalGraphics::invert( sal_uLong nPoints, const SalPoint* pPtAry, SalInvert nSalFlags ) { CGPoint* CGpoints ; if ( CheckContext() ) @@ -1434,8 +1434,8 @@ void AquaSalGraphics::invert( ULONG nPoints, const SalPoint* pPtAry, SalInvert // ----------------------------------------------------------------------- -BOOL AquaSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, - void* pEpsData, ULONG nByteCount ) +sal_Bool AquaSalGraphics::drawEPS( long nX, long nY, long nWidth, long nHeight, + void* pEpsData, sal_uLong nByteCount ) { // convert the raw data to an NSImageRef NSData* xNSData = [NSData dataWithBytes:(void*)pEpsData length:(int)nByteCount]; @@ -1604,7 +1604,7 @@ void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackL // ----------------------------------------------------------------------- -ULONG AquaSalGraphics::GetKernPairs( ULONG nPairs, ImplKernPairData* pKernPairs ) +sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ) { return 0; } @@ -1785,7 +1785,7 @@ static OSStatus GgoMoveToProc( const Float32Point* pPoint, void* pData ) return eStatus; } -BOOL AquaSalGraphics::GetGlyphOutline( long nGlyphId, basegfx::B2DPolyPolygon& rPolyPoly ) +sal_Bool AquaSalGraphics::GetGlyphOutline( long nGlyphId, basegfx::B2DPolyPolygon& rPolyPoly ) { GgoData aGgoData; aGgoData.mpPolyPoly = &rPolyPoly; @@ -1827,7 +1827,7 @@ long AquaSalGraphics::GetGraphicsWidth() const // ----------------------------------------------------------------------- -BOOL AquaSalGraphics::GetGlyphBoundRect( long nGlyphId, Rectangle& rRect ) +sal_Bool AquaSalGraphics::GetGlyphBoundRect( long nGlyphId, Rectangle& rRect ) { ATSUStyle rATSUStyle = maATSUStyle; // TODO: handle glyph fallback GlyphID aGlyphId = nGlyphId; @@ -1860,7 +1860,7 @@ void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& ) // ----------------------------------------------------------------------- -USHORT AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int nFallbackLevel ) +sal_uInt16 AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int nFallbackLevel ) { if( !pReqFont ) { @@ -2177,10 +2177,10 @@ static bool GetRawFontData( const ImplFontData* pFontData, DBG_ASSERT( (nOfs==nTotalLen), "AquaSalGraphics::CreateFontSubset (nOfs!=nTotalLen)"); - return true; + return sal_True; } -BOOL AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, +sal_Bool AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, const ImplFontData* pFontData, long* pGlyphIDs, sal_uInt8* pEncoding, sal_Int32* pGlyphWidths, int nGlyphCount, FontSubsetInfo& rInfo ) { @@ -2189,7 +2189,7 @@ BOOL AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, // prepare the requested file name for writing the font-subset file rtl::OUString aSysPath; if( osl_File_E_None != osl_getSystemPathFromFileURL( rToFile.pData, &aSysPath.pData ) ) - return FALSE; + return sal_False; const rtl_TextEncoding aThreadEncoding = osl_getThreadTextEncoding(); const ByteString aToFile( rtl::OUStringToOString( aSysPath, aThreadEncoding ) ); @@ -2250,7 +2250,7 @@ BOOL AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, // subset glyphs and get their properties // take care that subset fonts require the NotDef glyph in pos 0 int nOrigCount = nGlyphCount; - USHORT aShortIDs[ 256 ]; + sal_uInt16 aShortIDs[ 256 ]; sal_uInt8 aTempEncs[ 256 ]; int nNotDef = -1; @@ -2270,7 +2270,7 @@ BOOL AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, nGlyphIdx = ::MapChar( pSftFont, static_cast<sal_uInt16>(nGlyphIdx), bVertical ); } } - aShortIDs[i] = static_cast<USHORT>( nGlyphIdx ); + aShortIDs[i] = static_cast<sal_uInt16>( nGlyphIdx ); if( !nGlyphIdx ) if( nNotDef < 0 ) nNotDef = i; // first NotDef glyph found @@ -2298,7 +2298,7 @@ BOOL AquaSalGraphics::CreateFontSubset( const rtl::OUString& rToFile, TTSimpleGlyphMetrics* pGlyphMetrics = ::GetTTSimpleGlyphMetrics( pSftFont, aShortIDs, nGlyphCount, bVertical ); if( !pGlyphMetrics ) - return FALSE; + return sal_False; sal_uInt16 nNotDefAdv = pGlyphMetrics[0].adv; pGlyphMetrics[0].adv = pGlyphMetrics[nNotDef].adv; pGlyphMetrics[nNotDef].adv = nNotDefAdv; @@ -2600,24 +2600,24 @@ void XorEmulation::SetTarget( int nWidth, int nHeight, int nTargetDepth, nBytesPerRow = 1; } nBytesPerRow *= nWidth; - mnBufferLongs = (nHeight * nBytesPerRow + sizeof(ULONG)-1) / sizeof(ULONG); + mnBufferLongs = (nHeight * nBytesPerRow + sizeof(sal_uLong)-1) / sizeof(sal_uLong); // create a XorMask context - mpMaskBuffer = new ULONG[ mnBufferLongs ]; + mpMaskBuffer = new sal_uLong[ mnBufferLongs ]; mxMaskContext = ::CGBitmapContextCreate( mpMaskBuffer, nWidth, nHeight, nBitsPerComponent, nBytesPerRow, aCGColorSpace, aCGBmpInfo ); // reset the XOR mask to black - memset( mpMaskBuffer, 0, mnBufferLongs * sizeof(ULONG) ); + memset( mpMaskBuffer, 0, mnBufferLongs * sizeof(sal_uLong) ); // a bitmap context will be needed for manual XORing // create one unless the target context is a bitmap context if( nTargetDepth ) - mpTempBuffer = (ULONG*)CGBitmapContextGetData( mxTargetContext ); + mpTempBuffer = (sal_uLong*)CGBitmapContextGetData( mxTargetContext ); if( !mpTempBuffer ) { // create a bitmap context matching to the target context - mpTempBuffer = new ULONG[ mnBufferLongs ]; + mpTempBuffer = new sal_uLong[ mnBufferLongs ]; mxTempContext = ::CGBitmapContextCreate( mpTempBuffer, nWidth, nHeight, nBitsPerComponent, nBytesPerRow, aCGColorSpace, aCGBmpInfo ); @@ -2657,8 +2657,8 @@ bool XorEmulation::UpdateTarget() // do a manual XOR with the XorMask // this approach suffices for simple color manipulations // and also the complex-clipping-XOR-trick used in metafiles - const ULONG* pSrc = mpMaskBuffer; - ULONG* pDst = mpTempBuffer; + const sal_uLong* pSrc = mpMaskBuffer; + sal_uLong* pDst = mpTempBuffer; for( int i = mnBufferLongs; --i >= 0;) *(pDst++) ^= *(pSrc++); @@ -2676,7 +2676,7 @@ bool XorEmulation::UpdateTarget() // reset the XorMask to black again // TODO: not needed for last update - memset( mpMaskBuffer, 0, mnBufferLongs * sizeof(ULONG) ); + memset( mpMaskBuffer, 0, mnBufferLongs * sizeof(sal_uLong) ); // TODO: return FALSE if target was not changed return true; diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx index f7c234d2c4c4..9bafb50d19fc 100755 --- a/vcl/aqua/source/gdi/salgdiutils.cxx +++ b/vcl/aqua/source/gdi/salgdiutils.cxx @@ -253,12 +253,12 @@ void AquaSalGraphics::RefreshRect(float lX, float lY, float lWidth, float lHeigh } } -CGPoint* AquaSalGraphics::makeCGptArray(ULONG nPoints, const SalPoint* pPtAry) +CGPoint* AquaSalGraphics::makeCGptArray(sal_uLong nPoints, const SalPoint* pPtAry) { CGPoint *CGpoints = new (CGPoint[nPoints]); if ( CGpoints ) { - for(ULONG i=0;i<nPoints;i++) + for(sal_uLong i=0;i<nPoints;i++) { CGpoints[i].x = (float)(pPtAry[i].mnX); CGpoints[i].y = (float)(pPtAry[i].mnY); diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx index 9ce2b8a5a518..d2763411e039 100644 --- a/vcl/aqua/source/gdi/salnativewidgets.cxx +++ b/vcl/aqua/source/gdi/salnativewidgets.cxx @@ -236,13 +236,13 @@ static bool AquaGetScrollRect( /* TODO: int nScreen, */ ControlPart nPart, /* * IsNativeControlSupported() * -------------------------- - * Returns TRUE if the platform supports native + * Returns sal_True if the platform supports native * drawing of the control defined by nPart. * */ -BOOL AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) +sal_Bool AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart nPart ) { - bool bOk = FALSE; + bool bOk = sal_False; // Native controls are now defaults // If you want to disable experimental native controls code, @@ -375,18 +375,18 @@ BOOL AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart n /* * HitTestNativeControl() * - * If the return value is TRUE, bIsInside contains information whether + * If the return value is sal_True, bIsInside contains information whether * aPos was or was not inside the native widget specified by the * nType/nPart combination. */ -BOOL AquaSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - const Point& rPos, BOOL& rIsInside ) +sal_Bool AquaSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, + const Point& rPos, sal_Bool& rIsInside ) { if ( nType == CTRL_SCROLLBAR ) { Rectangle aRect; bool bValid = AquaGetScrollRect( /* TODO: m_nScreen */ nPart, rControlRegion, aRect ); - rIsInside = bValid ? aRect.IsInside( rPos ) : FALSE; + rIsInside = bValid ? aRect.IsInside( rPos ) : sal_False; if( GetSalData()->mbIsScrollbarDoubleMax ) { // in double max mode the actual trough is a little smaller than the track @@ -397,20 +397,20 @@ BOOL AquaSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart { // the left 4 pixels are not hit sensitive if( rPos.X() - aRect.Left() < 4 ) - rIsInside = FALSE; + rIsInside = sal_False; } else if( nPart == PART_TRACK_VERT_AREA ) { // the top 4 pixels are not hit sensitive if( rPos.Y() - aRect.Top() < 4 ) - rIsInside = FALSE; + rIsInside = sal_False; } } } return bValid; } // CTRL_SCROLLBAR - return FALSE; + return sal_False; } /* @@ -470,14 +470,14 @@ UInt32 AquaSalGraphics::getTrackState( ControlState nState ) * aValue: An optional value (tristate/numerical/string) * aCaption: A caption or title string (like button text etc) */ -BOOL AquaSalGraphics::drawNativeControl(ControlType nType, +sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& aCaption ) { - BOOL bOK = FALSE; + sal_Bool bOK = sal_False; if( ! CheckContext() ) return false; @@ -1151,7 +1151,7 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType, case CTRL_FRAME: { - USHORT nStyle = aValue.getNumericVal(); + sal_uInt16 nStyle = aValue.getNumericVal(); if( nPart == PART_BORDER ) { if(!( nStyle & FRAME_DRAW_MENU ) && !(nStyle & FRAME_DRAW_WINDOWBORDER) ) { @@ -1228,18 +1228,18 @@ BOOL AquaSalGraphics::drawNativeControl(ControlType nType, * aValue: An optional value (tristate/numerical/string) * aCaption: A caption or title string (like button text etc) */ -BOOL AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, +sal_Bool AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& aCaption ) { - return( FALSE ); + return( sal_False ); } /* * GetNativeControlRegion() * - * If the return value is TRUE, rNativeBoundingRegion + * If the return value is sal_True, rNativeBoundingRegion * contains the true bounding region covered by the control * including any adornment, while rNativeContentRegion contains the area * within the control that can be safely drawn into without drawing over @@ -1249,12 +1249,12 @@ BOOL AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart nPar * aValue: An optional value (tristate/numerical/string) * aCaption: A caption or title string (like button text etc) */ -BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, +sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const rtl::OUString& aCaption, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { - BOOL toReturn = FALSE; + sal_Bool toReturn = sal_False; Rectangle aCtrlBoundRect( rControlRegion ); short x = aCtrlBoundRect.Left(); @@ -1289,7 +1289,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa Rectangle aRect; if( AquaGetScrollRect( /* m_nScreen */ nPart, aCtrlBoundRect, aRect ) ) { - toReturn = TRUE; + toReturn = sal_True; rNativeBoundingRegion = aRect; rNativeContentRegion = aRect; } @@ -1319,7 +1319,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h + nBorderCleanup) ); rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h ) ); - toReturn = TRUE; + toReturn = sal_True; } break; case CTRL_PROGRESS: @@ -1331,7 +1331,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa aRect.Bottom() = aRect.Top() + 15; // values taken from HIG for large progress rNativeBoundingRegion = aRect; rNativeContentRegion = aRect; - toReturn = TRUE; + toReturn = sal_True; } break; @@ -1341,7 +1341,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa aRect.Bottom() = aRect.Top() + INTRO_PROGRESS_HEIGHT; // values taken from HIG for medium progress rNativeBoundingRegion = aRect; rNativeContentRegion = aRect; - toReturn = TRUE; + toReturn = sal_True; } break; @@ -1357,7 +1357,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h ) ); rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h ) ); - toReturn = TRUE; + toReturn = sal_True; break; @@ -1373,7 +1373,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa rNativeContentRegion = Rectangle( Point( x+FOCUS_RING_WIDTH, y+FOCUS_RING_WIDTH ), Size( w-2*(FOCUS_RING_WIDTH+1), h-2*(FOCUS_RING_WIDTH+1) ) ); rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h ) ); - toReturn = TRUE; + toReturn = sal_True; } break; case CTRL_LISTBOX: @@ -1387,7 +1387,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa rNativeContentRegion = Rectangle( Point( x+FOCUS_RING_WIDTH, y+FOCUS_RING_WIDTH ), Size( w-2*FOCUS_RING_WIDTH, h ) ); rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h+2*FOCUS_RING_WIDTH ) ); - toReturn = TRUE; + toReturn = sal_True; } else if( nPart == PART_BUTTON_DOWN ) { @@ -1436,7 +1436,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa rNativeContentRegion = Rectangle( Point( x+FOCUS_RING_WIDTH, y ), Size( w-2*FOCUS_RING_WIDTH, h ) ); rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h+2*FOCUS_RING_WIDTH ) ); - toReturn = TRUE; + toReturn = sal_True; } else if( nPart == PART_SUB_EDIT ) { w = aCtrlBoundRect.GetWidth() - SPIN_BUTTON_SPACE - SPIN_BUTTON_WIDTH; @@ -1449,7 +1449,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa rNativeContentRegion = Rectangle( Point( x + FOCUS_RING_WIDTH, y + FOCUS_RING_WIDTH ), Size( w - 2* FOCUS_RING_WIDTH, h ) ); rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h+2*FOCUS_RING_WIDTH ) ); - toReturn = TRUE; + toReturn = sal_True; } else if( nPart == PART_BUTTON_UP ) { //aCtrlBoundRect.GetWidth() contains the width of the full control @@ -1463,7 +1463,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h ) ); rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h ) ); - toReturn = TRUE; + toReturn = sal_True; } else if( nPart == PART_BUTTON_DOWN ) { x += aCtrlBoundRect.GetWidth() - SPIN_BUTTON_WIDTH - SPIN_BUTTON_SPACE - CLIP_FUZZ; @@ -1474,12 +1474,12 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h ) ); rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h ) ); - toReturn = TRUE; + toReturn = sal_True; } break; case CTRL_FRAME: { - USHORT nStyle = aValue.getNumericVal(); + sal_uInt16 nStyle = aValue.getNumericVal(); if( ( nPart == PART_BORDER ) && !( nStyle & (FRAME_DRAW_MENU | FRAME_DRAW_WINDOWBORDER | FRAME_DRAW_BORDERWINDOWBORDER) ) ) { @@ -1502,7 +1502,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa rNativeContentRegion = aRect; rNativeBoundingRegion = aRect; - toReturn = TRUE; + toReturn = sal_True; } } break; @@ -1518,7 +1518,7 @@ BOOL AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPa rNativeContentRegion = Rectangle( Point( x, y ), Size( w, h ) ); rNativeBoundingRegion = Rectangle( Point( x, y ), Size( w, h ) ); - toReturn = TRUE; + toReturn = sal_True; } } break; diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index c79add81d791..0df146eef8fa 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -176,9 +176,9 @@ void AquaSalInfoPrinter::ReleaseGraphics( SalGraphics* ) // ----------------------------------------------------------------------- -BOOL AquaSalInfoPrinter::Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData ) +sal_Bool AquaSalInfoPrinter::Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData ) { - return FALSE; + return sal_False; } // ----------------------------------------------------------------------- @@ -251,14 +251,14 @@ static Paper recognizePaper( double i_fWidth, double i_fHeight ) return aPaper; } -BOOL AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData ) +sal_Bool AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData ) { // FIXME: implement driver data if( io_pSetupData && io_pSetupData->mpDriverData ) return SetData( ~0, io_pSetupData ); - BOOL bSuccess = TRUE; + sal_Bool bSuccess = sal_True; // set system type io_pSetupData->mnSystem = JOBSETUP_SYSTEM_MAC; @@ -285,11 +285,11 @@ BOOL AquaSalInfoPrinter::SetPrinterData( ImplJobSetup* io_pSetupData ) io_pSetupData->meOrientation = mePageOrientation; io_pSetupData->mnPaperBin = 0; - io_pSetupData->mpDriverData = reinterpret_cast<BYTE*>(rtl_allocateMemory( 4 )); + io_pSetupData->mpDriverData = reinterpret_cast<sal_uInt8*>(rtl_allocateMemory( 4 )); io_pSetupData->mnDriverDataLen = 4; } else - bSuccess = FALSE; + bSuccess = sal_False; return bSuccess; @@ -319,10 +319,10 @@ void AquaSalInfoPrinter::setPaperSize( long i_nWidth, long i_nHeight, Orientatio // ----------------------------------------------------------------------- -BOOL AquaSalInfoPrinter::SetData( ULONG i_nFlags, ImplJobSetup* io_pSetupData ) +sal_Bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetupData ) { if( ! io_pSetupData || io_pSetupData->mnSystem != JOBSETUP_SYSTEM_MAC ) - return FALSE; + return sal_False; if( mpPrintInfo ) @@ -360,14 +360,14 @@ BOOL AquaSalInfoPrinter::SetData( ULONG i_nFlags, ImplJobSetup* io_pSetupData ) // ----------------------------------------------------------------------- -ULONG AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* i_pSetupData ) +sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* i_pSetupData ) { return 0; } // ----------------------------------------------------------------------- -XubString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup* i_pSetupData, ULONG i_nPaperBin ) +XubString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ) { return XubString(); } @@ -436,7 +436,7 @@ static bool getUseNativeDialog() return bNative; } -ULONG AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup* i_pSetupData, USHORT i_nType ) +sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType ) { switch( i_nType ) { @@ -518,7 +518,7 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag return aPageSize; } -BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName, +sal_Bool AquaSalInfoPrinter::StartJob( const String* i_pFileName, const String& i_rJobName, const String& i_rAppName, ImplJobSetup* i_pSetupData, @@ -526,9 +526,9 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName, ) { if( mbJob ) - return FALSE; + return sal_False; - BOOL bSuccess = FALSE; + sal_Bool bSuccess = sal_False; bool bWasAborted = false; AquaSalInstance* pInst = GetSalData()->mpFirstInstance; PrintAccessoryViewState aAccViewState; @@ -663,7 +663,7 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName, if( bShowPanel && mnCurPageRangeStart == 0 && nCurJob == 0) // only the first range of pages (in the first job) gets the accesory view pReleaseAfterUse = [AquaPrintAccessoryView setupPrinterPanel: pPrintOperation withController: &i_rController withState: &aAccViewState]; - bSuccess = TRUE; + bSuccess = sal_True; mbJob = true; pInst->startedPrintJob(); [pPrintOperation runOperation]; @@ -681,7 +681,7 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName, // inform application that it can release its data // this is awkward, but the XRenderable interface has no method for this, - // so we need to call XRenderadble::render one last time with IsLastPage = TRUE + // so we need to call XRenderadble::render one last time with IsLastPage = sal_True i_rController.setLastPage( sal_True ); GDIMetaFile aPageFile; if( mrContext ) @@ -699,26 +699,26 @@ BOOL AquaSalInfoPrinter::StartJob( const String* i_pFileName, // ----------------------------------------------------------------------- -BOOL AquaSalInfoPrinter::EndJob() +sal_Bool AquaSalInfoPrinter::EndJob() { mnStartPageOffsetX = mnStartPageOffsetY = 0; mbJob = false; - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- -BOOL AquaSalInfoPrinter::AbortJob() +sal_Bool AquaSalInfoPrinter::AbortJob() { mbJob = false; // FIXME: implementation - return FALSE; + return sal_False; } // ----------------------------------------------------------------------- -SalGraphics* AquaSalInfoPrinter::StartPage( ImplJobSetup* i_pSetupData, BOOL i_bNewJobData ) +SalGraphics* AquaSalInfoPrinter::StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_bNewJobData ) { if( i_bNewJobData && i_pSetupData ) SetPrinterData( i_pSetupData ); @@ -732,15 +732,15 @@ SalGraphics* AquaSalInfoPrinter::StartPage( ImplJobSetup* i_pSetupData, BOOL i_b // ----------------------------------------------------------------------- -BOOL AquaSalInfoPrinter::EndPage() +sal_Bool AquaSalInfoPrinter::EndPage() { mpGraphics->InvalidateContext(); - return TRUE; + return sal_True; } // ----------------------------------------------------------------------- -ULONG AquaSalInfoPrinter::GetErrorCode() const +sal_uLong AquaSalInfoPrinter::GetErrorCode() const { return 0; } @@ -760,7 +760,7 @@ AquaSalPrinter::~AquaSalPrinter() // ----------------------------------------------------------------------- -BOOL AquaSalPrinter::StartJob( const String* i_pFileName, +sal_Bool AquaSalPrinter::StartJob( const String* i_pFileName, const String& i_rJobName, const String& i_rAppName, ImplJobSetup* i_pSetupData, @@ -771,49 +771,49 @@ BOOL AquaSalPrinter::StartJob( const String* i_pFileName, // ----------------------------------------------------------------------- -BOOL AquaSalPrinter::StartJob( const XubString* i_pFileName, +sal_Bool AquaSalPrinter::StartJob( const XubString* i_pFileName, const XubString& i_rJobName, const XubString& i_rAppName, - ULONG i_nCopies, + sal_uLong i_nCopies, bool i_bCollate, bool i_bDirect, ImplJobSetup* i_pSetupData ) { DBG_ERROR( "should never be called" ); - return FALSE; + return sal_False; } // ----------------------------------------------------------------------- -BOOL AquaSalPrinter::EndJob() +sal_Bool AquaSalPrinter::EndJob() { return mpInfoPrinter->EndJob(); } // ----------------------------------------------------------------------- -BOOL AquaSalPrinter::AbortJob() +sal_Bool AquaSalPrinter::AbortJob() { return mpInfoPrinter->AbortJob(); } // ----------------------------------------------------------------------- -SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, BOOL i_bNewJobData ) +SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_bNewJobData ) { return mpInfoPrinter->StartPage( i_pSetupData, i_bNewJobData ); } // ----------------------------------------------------------------------- -BOOL AquaSalPrinter::EndPage() +sal_Bool AquaSalPrinter::EndPage() { return mpInfoPrinter->EndPage(); } // ----------------------------------------------------------------------- -ULONG AquaSalPrinter::GetErrorCode() +sal_uLong AquaSalPrinter::GetErrorCode() { return mpInfoPrinter->GetErrorCode(); } diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx index eb09a44f5edd..be64b9f23dfc 100644 --- a/vcl/aqua/source/gdi/salvd.cxx +++ b/vcl/aqua/source/gdi/salvd.cxx @@ -39,7 +39,7 @@ // ----------------------------------------------------------------------- SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics, - long nDX, long nDY, USHORT nBitCount, const SystemGraphicsData *pData ) + long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData ) { // #i92075# can be called first in a thread SalData::ensureThreadAutoreleasePool(); @@ -56,7 +56,7 @@ void AquaSalInstance::DestroyVirtualDevice( SalVirtualDevice* pDevice ) // ======================================================================= -AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, USHORT nBitCount, const SystemGraphicsData *pData ) +AquaSalVirtualDevice::AquaSalVirtualDevice( AquaSalGraphics* pGraphic, long nDX, long nDY, sal_uInt16 nBitCount, const SystemGraphicsData *pData ) : mbGraphicsUsed( false ) , mxBitmapContext( NULL ) , mnBitmapDepth( 0 ) @@ -155,7 +155,7 @@ void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics *pGraphics ) // ----------------------------------------------------------------------- -BOOL AquaSalVirtualDevice::SetSize( long nDX, long nDY ) +sal_Bool AquaSalVirtualDevice::SetSize( long nDX, long nDY ) { if( mbForeignContext ) { diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 4530778c5775..d45840b54667 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -61,7 +61,7 @@ AquaSalFrame* AquaSalFrame::s_pCaptureFrame = NULL; // ======================================================================= -AquaSalFrame::AquaSalFrame( SalFrame* pParent, ULONG salFrameStyle ) : +AquaSalFrame::AquaSalFrame( SalFrame* pParent, sal_uLong salFrameStyle ) : mpWindow(nil), mpView(nil), mpDockMenuEntry(nil), @@ -282,7 +282,7 @@ void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics ) // ----------------------------------------------------------------------- -BOOL AquaSalFrame::PostEvent( void *pData ) +sal_Bool AquaSalFrame::PostEvent( void *pData ) { GetSalData()->mpFirstInstance->PostUserEvent( this, SALEVENT_USEREVENT, pData ); return TRUE; @@ -298,7 +298,7 @@ void AquaSalFrame::SetTitle(const XubString& rTitle) [mpWindow setTitle: pTitle]; // create an entry in the dock menu - const ULONG nAppWindowStyle = (SAL_FRAME_STYLE_CLOSEABLE | SAL_FRAME_STYLE_MOVEABLE); + const sal_uLong nAppWindowStyle = (SAL_FRAME_STYLE_CLOSEABLE | SAL_FRAME_STYLE_MOVEABLE); if( mpParent == NULL && (mnStyle & nAppWindowStyle) == nAppWindowStyle ) { @@ -324,7 +324,7 @@ void AquaSalFrame::SetTitle(const XubString& rTitle) // ----------------------------------------------------------------------- -void AquaSalFrame::SetIcon( USHORT ) +void AquaSalFrame::SetIcon( sal_uInt16 ) { } @@ -403,7 +403,7 @@ void AquaSalFrame::SendPaintEvent( const Rectangle* pRect ) // ----------------------------------------------------------------------- -void AquaSalFrame::Show(BOOL bVisible, BOOL bNoActivate) +void AquaSalFrame::Show(sal_Bool bVisible, sal_Bool bNoActivate) { // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); @@ -463,7 +463,7 @@ void AquaSalFrame::Show(BOOL bVisible, BOOL bNoActivate) // ----------------------------------------------------------------------- -void AquaSalFrame::Enable( BOOL bEnable ) +void AquaSalFrame::Enable( sal_Bool bEnable ) { } @@ -603,7 +603,7 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState ) // get new geometry UpdateFrameGeometry(); - USHORT nEvent = 0; + sal_uInt16 nEvent = 0; if( pState->mnMask & (SAL_FRAMESTATE_MASK_X | SAL_FRAMESTATE_MASK_X) ) { mbPositioned = true; @@ -631,7 +631,7 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState ) // ----------------------------------------------------------------------- -BOOL AquaSalFrame::GetWindowState( SalFrameState* pState ) +sal_Bool AquaSalFrame::GetWindowState( SalFrameState* pState ) { // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); @@ -702,7 +702,7 @@ void AquaSalFrame::SetScreenNumber(unsigned int nScreen) // ----------------------------------------------------------------------- -void AquaSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay ) +void AquaSalFrame::ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay ) { // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); @@ -812,7 +812,7 @@ public: } }; -void AquaSalFrame::StartPresentation( BOOL bStart ) +void AquaSalFrame::StartPresentation( sal_Bool bStart ) { // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); @@ -833,13 +833,13 @@ void AquaSalFrame::StartPresentation( BOOL bStart ) // ----------------------------------------------------------------------- -void AquaSalFrame::SetAlwaysOnTop( BOOL bOnTop ) +void AquaSalFrame::SetAlwaysOnTop( sal_Bool bOnTop ) { } // ----------------------------------------------------------------------- -void AquaSalFrame::ToTop(USHORT nFlags) +void AquaSalFrame::ToTop(sal_uInt16 nFlags) { // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); @@ -999,18 +999,18 @@ void AquaSalFrame::SetInputContext( SalInputContext* pContext ) // ----------------------------------------------------------------------- -void AquaSalFrame::EndExtTextInput( USHORT nFlags ) +void AquaSalFrame::EndExtTextInput( sal_uInt16 nFlags ) { } // ----------------------------------------------------------------------- -XubString AquaSalFrame::GetKeyName( USHORT nKeyCode ) +XubString AquaSalFrame::GetKeyName( sal_uInt16 nKeyCode ) { - static std::map< USHORT, rtl::OUString > aKeyMap; + static std::map< sal_uInt16, rtl::OUString > aKeyMap; if( aKeyMap.empty() ) { - USHORT i; + sal_uInt16 i; for( i = KEY_A; i <= KEY_Z; i++ ) aKeyMap[ i ] = rtl::OUString( sal_Unicode( 'A' + (i - KEY_A) ) ); for( i = KEY_0; i <= KEY_9; i++ ) @@ -1071,8 +1071,8 @@ XubString AquaSalFrame::GetKeyName( USHORT nKeyCode ) rtl::OUStringBuffer aResult( 16 ); - USHORT nUnmodifiedCode = (nKeyCode & KEY_CODE); - std::map< USHORT, rtl::OUString >::const_iterator it = aKeyMap.find( nUnmodifiedCode ); + sal_uInt16 nUnmodifiedCode = (nKeyCode & KEY_CODE); + std::map< sal_uInt16, rtl::OUString >::const_iterator it = aKeyMap.find( nUnmodifiedCode ); if( it != aKeyMap.end() ) { if( (nKeyCode & KEY_SHIFT) != 0 ) @@ -1092,7 +1092,7 @@ XubString AquaSalFrame::GetKeyName( USHORT nKeyCode ) // ----------------------------------------------------------------------- -XubString AquaSalFrame::GetSymbolKeyName( const XubString&, USHORT nKeyCode ) +XubString AquaSalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 nKeyCode ) { return GetKeyName( nKeyCode ); } @@ -1310,12 +1310,12 @@ void AquaSalFrame::Beep( SoundType eSoundType ) // ----------------------------------------------------------------------- -void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, USHORT nFlags) +void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags) { // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); - USHORT nEvent = 0; + sal_uInt16 nEvent = 0; if( [mpWindow isMiniaturized] ) [mpWindow deminiaturize: NSApp]; // expand the window @@ -1507,7 +1507,7 @@ bool AquaSalFrame::SetPluginParent( SystemParentData* pNewParent ) return sal_False; } -BOOL AquaSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) +sal_Bool AquaSalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) { // not supported yet return FALSE; @@ -1615,7 +1615,7 @@ void AquaSalFrame::UpdateFrameGeometry() // ----------------------------------------------------------------------- -void AquaSalFrame::CaptureMouse( BOOL bCapture ) +void AquaSalFrame::CaptureMouse( sal_Bool bCapture ) { /* Remark: we'll try to use a pidgin version of capture mouse @@ -1660,7 +1660,7 @@ void AquaSalFrame::ResetClipRegion() } } -void AquaSalFrame::BeginSetClipRegion( ULONG nRects ) +void AquaSalFrame::BeginSetClipRegion( sal_uLong nRects ) { // #i113170# may not be the main thread if called from UNO API SalData::ensureThreadAutoreleasePool(); diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index 240a915e4e12..2a23eefcb5fe 100755 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -40,9 +40,9 @@ #define WHEEL_EVENT_FACTOR 1.5 -static USHORT ImplGetModifierMask( unsigned int nMask ) +static sal_uInt16 ImplGetModifierMask( unsigned int nMask ) { - USHORT nRet = 0; + sal_uInt16 nRet = 0; if( (nMask & NSShiftKeyMask) != 0 ) nRet |= KEY_SHIFT; if( (nMask & NSControlKeyMask) != 0 ) @@ -54,9 +54,9 @@ static USHORT ImplGetModifierMask( unsigned int nMask ) return nRet; } -static USHORT ImplMapCharCode( sal_Unicode aCode ) +static sal_uInt16 ImplMapCharCode( sal_Unicode aCode ) { - static USHORT aKeyCodeMap[ 128 ] = + static sal_uInt16 aKeyCodeMap[ 128 ] = { 0, 0, 0, 0, 0, 0, 0, 0, KEY_BACKSPACE, KEY_TAB, KEY_RETURN, 0, 0, KEY_RETURN, 0, 0, @@ -84,7 +84,7 @@ static USHORT ImplMapCharCode( sal_Unicode aCode ) // tab alone is reported as 0x09 (as expected) but shift-tab is // reported as 0x19 (end of medium) - static USHORT aFunctionKeyCodeMap[ 128 ] = + static sal_uInt16 aFunctionKeyCodeMap[ 128 ] = { KEY_UP, KEY_DOWN, KEY_LEFT, KEY_RIGHT, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12, @@ -104,7 +104,7 @@ static USHORT ImplMapCharCode( sal_Unicode aCode ) 0, 0, 0, 0, 0, 0, 0, 0 }; - USHORT nKeyCode = 0; + sal_uInt16 nKeyCode = 0; if( aCode < sizeof( aKeyCodeMap) / sizeof( aKeyCodeMap[0] ) ) nKeyCode = aKeyCodeMap[ aCode ]; else if( aCode >= 0xf700 && aCode < 0xf780 ) @@ -116,12 +116,12 @@ static USHORT ImplMapCharCode( sal_Unicode aCode ) static AquaSalFrame* s_pMouseFrame = NULL; // store the last pressed button for enter/exit events // which lack that information -static USHORT s_nLastButton = 0; +static sal_uInt16 s_nLastButton = 0; // combinations of keys we need to handle ourselves static const struct ExceptionalKey { - const USHORT nKeyCode; + const sal_uInt16 nKeyCode; const unsigned int nModifierMask; } aExceptionalKeys[] = { @@ -176,16 +176,16 @@ static AquaSalFrame* getMouseContainerFrame() } } --(MacOSBOOL)containsMouse +-(BOOL)containsMouse { // is this event actually inside that NSWindow ? NSPoint aPt = [NSEvent mouseLocation]; NSRect aFrameRect = [self frame]; - MacOSBOOL bInRect = NSPointInRect( aPt, aFrameRect ); + BOOL bInRect = NSPointInRect( aPt, aFrameRect ); return bInRect; } --(MacOSBOOL)canBecomeKeyWindow +-(BOOL)canBecomeKeyWindow { if( (mpFrame->mnStyle & ( SAL_FRAME_STYLE_FLOAT | @@ -208,7 +208,7 @@ static AquaSalFrame* getMouseContainerFrame() if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) { - static const ULONG nGuessDocument = SAL_FRAME_STYLE_MOVEABLE| + static const sal_uLong nGuessDocument = SAL_FRAME_STYLE_MOVEABLE| SAL_FRAME_STYLE_SIZEABLE| SAL_FRAME_STYLE_CLOSEABLE; @@ -298,11 +298,11 @@ static AquaSalFrame* getMouseContainerFrame() } } --(MacOSBOOL)windowShouldClose: (NSNotification*)pNotification +-(BOOL)windowShouldClose: (NSNotification*)pNotification { YIELD_GUARD; - MacOSBOOL bRet = YES; + BOOL bRet = YES; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) { // #i84461# end possible input @@ -345,12 +345,12 @@ static AquaSalFrame* getMouseContainerFrame() [mDraggingDestinationHandler draggingExited: sender]; } --(MacOSBOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender +-(BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender { return [mDraggingDestinationHandler prepareForDragOperation: sender]; } --(MacOSBOOL)performDragOperation:(id <NSDraggingInfo>)sender +-(BOOL)performDragOperation:(id <NSDraggingInfo>)sender { return [mDraggingDestinationHandler performDragOperation: sender]; } @@ -406,17 +406,17 @@ static AquaSalFrame* getMouseContainerFrame() } } --(MacOSBOOL)acceptsFirstResponder +-(BOOL)acceptsFirstResponder { return YES; } --(MacOSBOOL)acceptsFirstMouse: (NSEvent*)pEvent +-(BOOL)acceptsFirstMouse: (NSEvent*)pEvent { return YES; } --(MacOSBOOL)isOpaque +-(BOOL)isOpaque { return mpFrame ? (mpFrame->getClipPath() != 0 ? NO : YES) : YES; } @@ -464,7 +464,7 @@ private: } } --(void)sendMouseEventToFrame: (NSEvent*)pEvent button:(USHORT)nButton eventtype:(USHORT)nEvent +-(void)sendMouseEventToFrame: (NSEvent*)pEvent button:(sal_uInt16)nButton eventtype:(sal_uInt16)nEvent { YIELD_GUARD; @@ -520,13 +520,13 @@ private: if( pDispatchFrame && AquaSalFrame::isAlive( pDispatchFrame ) ) { - pDispatchFrame->mnLastEventTime = static_cast<ULONG>( [pEvent timestamp] * 1000.0 ); + pDispatchFrame->mnLastEventTime = static_cast<sal_uLong>( [pEvent timestamp] * 1000.0 ); pDispatchFrame->mnLastModifierFlags = [pEvent modifierFlags]; NSPoint aPt = [NSEvent mouseLocation]; pDispatchFrame->CocoaToVCL( aPt ); - USHORT nModMask = ImplGetModifierMask( [pEvent modifierFlags] ); + sal_uInt16 nModMask = ImplGetModifierMask( [pEvent modifierFlags] ); // #i82284# emulate ctrl left if( nModMask == KEY_MOD3 && nButton == MOUSE_LEFT ) { @@ -660,7 +660,7 @@ private: if( AquaSalFrame::isAlive( mpFrame ) ) { const NSTimeInterval fMagnifyTime = [pEvent timestamp]; - mpFrame->mnLastEventTime = static_cast<ULONG>( fMagnifyTime * 1000.0 ); + mpFrame->mnLastEventTime = static_cast<sal_uLong>( fMagnifyTime * 1000.0 ); mpFrame->mnLastModifierFlags = [pEvent modifierFlags]; // check if this is a new series of magnify events @@ -731,7 +731,7 @@ private: if( AquaSalFrame::isAlive( mpFrame ) ) { - mpFrame->mnLastEventTime = static_cast<ULONG>( [pEvent timestamp] * 1000.0 ); + mpFrame->mnLastEventTime = static_cast<sal_uLong>( [pEvent timestamp] * 1000.0 ); mpFrame->mnLastModifierFlags = [pEvent modifierFlags]; // merge pending scroll wheel events @@ -791,7 +791,7 @@ private: if( AquaSalFrame::isAlive( mpFrame ) ) { - mpFrame->mnLastEventTime = static_cast<ULONG>( [pEvent timestamp] * 1000.0 ); + mpFrame->mnLastEventTime = static_cast<sal_uLong>( [pEvent timestamp] * 1000.0 ); mpFrame->mnLastModifierFlags = [pEvent modifierFlags]; // merge pending scroll wheel events @@ -863,7 +863,7 @@ private: mbNeedSpecialKeyHandle = false; mbKeyHandled = false; - mpFrame->mnLastEventTime = static_cast<ULONG>( [pEvent timestamp] * 1000.0 ); + mpFrame->mnLastEventTime = static_cast<sal_uLong>( [pEvent timestamp] * 1000.0 ); mpFrame->mnLastModifierFlags = [pEvent modifierFlags]; if( ! [self handleKeyDownException: pEvent] ) @@ -876,7 +876,7 @@ private: } } --(MacOSBOOL)handleKeyDownException:(NSEvent*)pEvent +-(BOOL)handleKeyDownException:(NSEvent*)pEvent { // check for a very special set of modified characters NSString* pUnmodifiedString = [pEvent charactersIgnoringModifiers]; @@ -894,7 +894,7 @@ private: return YES; } unichar keyChar = [pUnmodifiedString characterAtIndex: 0]; - USHORT nKeyCode = ImplMapCharCode( keyChar ); + sal_uInt16 nKeyCode = ImplMapCharCode( keyChar ); // Caution: should the table grow to more than 5 or 6 entries, // we must consider moving it to a kind of hash map @@ -920,7 +920,7 @@ private: if( AquaSalFrame::isAlive( mpFrame ) ) { - mpFrame->mnLastEventTime = static_cast<ULONG>( [pEvent timestamp] * 1000.0 ); + mpFrame->mnLastEventTime = static_cast<sal_uLong>( [pEvent timestamp] * 1000.0 ); mpFrame->mnLastModifierFlags = [pEvent modifierFlags]; } } @@ -950,7 +950,7 @@ private: ! [self hasMarkedText ] ) { - USHORT nKeyCode = ImplMapCharCode( aCharCode ); + sal_uInt16 nKeyCode = ImplMapCharCode( aCharCode ); unsigned int nLastModifiers = mpFrame->mnLastModifierFlags; // #i99567# @@ -1326,18 +1326,18 @@ private: } } --(MacOSBOOL)sendKeyInputAndReleaseToFrame: (USHORT)nKeyCode character: (sal_Unicode)aChar +-(BOOL)sendKeyInputAndReleaseToFrame: (sal_uInt16)nKeyCode character: (sal_Unicode)aChar { return [self sendKeyInputAndReleaseToFrame: nKeyCode character: aChar modifiers: mpFrame->mnLastModifierFlags]; } --(MacOSBOOL)sendKeyInputAndReleaseToFrame: (USHORT)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod +-(BOOL)sendKeyInputAndReleaseToFrame: (sal_uInt16)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod { return [self sendKeyToFrameDirect: nKeyCode character: aChar modifiers: nMod] || [self sendSingleCharacter: mpLastEvent]; } --(MacOSBOOL)sendKeyToFrameDirect: (USHORT)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod +-(BOOL)sendKeyToFrameDirect: (sal_uInt16)nKeyCode character: (sal_Unicode)aChar modifiers: (unsigned int)nMod { YIELD_GUARD; @@ -1360,20 +1360,20 @@ private: } --(MacOSBOOL)sendSingleCharacter: (NSEvent *)pEvent +-(BOOL)sendSingleCharacter: (NSEvent *)pEvent { NSString* pUnmodifiedString = [pEvent charactersIgnoringModifiers]; if( pUnmodifiedString && [pUnmodifiedString length] == 1 ) { unichar keyChar = [pUnmodifiedString characterAtIndex: 0]; - USHORT nKeyCode = ImplMapCharCode( keyChar ); + sal_uInt16 nKeyCode = ImplMapCharCode( keyChar ); if( nKeyCode != 0 ) { // don't send unicodes in the private use area if( keyChar >= 0xf700 && keyChar < 0xf780 ) keyChar = 0; - MacOSBOOL bRet = [self sendKeyToFrameDirect: nKeyCode character: keyChar modifiers: mpFrame->mnLastModifierFlags]; + BOOL bRet = [self sendKeyToFrameDirect: nKeyCode character: keyChar modifiers: mpFrame->mnLastModifierFlags]; mbInKeyInput = false; return bRet; @@ -1389,9 +1389,9 @@ private: return [NSArray arrayWithObjects:NSUnderlineStyleAttributeName, nil]; } -- (MacOSBOOL)hasMarkedText +- (BOOL)hasMarkedText { - MacOSBOOL bHasMarkedText; + BOOL bHasMarkedText; bHasMarkedText = ( mMarkedRange.location != NSNotFound ) && ( mMarkedRange.length != 0 ); @@ -1458,7 +1458,7 @@ private: if( len > 0 ) { NSString *pString = [aString string]; OUString aInsertString( GetOUString( pString ) ); - std::vector<USHORT> aInputFlags = std::vector<USHORT>( std::max( 1, len ), 0 ); + std::vector<sal_uInt16> aInputFlags = std::vector<sal_uInt16>( std::max( 1, len ), 0 ); for ( int i = 0; i < len; i++ ) { unsigned int nUnderlineValue; @@ -1617,12 +1617,12 @@ private: [mDraggingDestinationHandler draggingExited: sender]; } --(MacOSBOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender +-(BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender { return [mDraggingDestinationHandler prepareForDragOperation: sender]; } --(MacOSBOOL)performDragOperation:(id <NSDraggingInfo>)sender +-(BOOL)performDragOperation:(id <NSDraggingInfo>)sender { return [mDraggingDestinationHandler performDragOperation: sender]; } diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index 82102f2e7095..fa045776c448 100644 --- a/vcl/aqua/source/window/salmenu.cxx +++ b/vcl/aqua/source/window/salmenu.cxx @@ -207,7 +207,7 @@ static void initAppMenu() // ======================================================================= -SalMenu* AquaSalInstance::CreateMenu( BOOL bMenuBar, Menu* pVCLMenu ) +SalMenu* AquaSalInstance::CreateMenu( sal_Bool bMenuBar, Menu* pVCLMenu ) { initAppMenu(); @@ -339,9 +339,9 @@ sal_Int32 removeUnusedItemsRunner(NSMenu * pMenu) return drawnItems; } -bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, ULONG nFlags) +bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags) { - // do not use native popup menu when AQUA_NATIVE_MENUS is set to FALSE + // do not use native popup menu when AQUA_NATIVE_MENUS is set to sal_False if( ! VisibleMenuBar() ) { return false; } @@ -369,7 +369,7 @@ bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rR // do the same strange semantics as vcl popup windows to arrive at a frame geometry // in mirrored UI case; best done by actually executing the same code - USHORT nArrangeIndex; + sal_uInt16 nArrangeIndex; pWin->SetPosPixel( pWin->ImplCalcPos( pWin, rRect, nFlags, nArrangeIndex ) ); displayPopupFrame.origin.x = pWin->ImplGetFrame()->maGeometry.nX - pParentAquaSalFrame->maGeometry.nX + offset; displayPopupFrame.origin.y = pWin->ImplGetFrame()->maGeometry.nY - pParentAquaSalFrame->maGeometry.nY + offset; @@ -393,7 +393,7 @@ bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rR return true; } -int AquaSalMenu::getItemIndexByPos( USHORT nPos ) const +int AquaSalMenu::getItemIndexByPos( sal_uInt16 nPos ) const { int nIndex = 0; if( nPos == MENU_APPEND ) @@ -519,7 +519,7 @@ void AquaSalMenu::removeFallbackMenuItem( NSMenuItem* pOldItem ) } } -BOOL AquaSalMenu::VisibleMenuBar() +sal_Bool AquaSalMenu::VisibleMenuBar() { // Enable/disable experimental native menus code? // @@ -528,11 +528,11 @@ BOOL AquaSalMenu::VisibleMenuBar() static const char *pExperimental = getenv ("AQUA_NATIVE_MENUS"); if ( ImplGetSVData()->mbIsTestTool || (pExperimental && !strcasecmp(pExperimental, "FALSE")) ) - return FALSE; + return sal_False; // End of experimental code enable/disable part - return TRUE; + return sal_True; } void AquaSalMenu::SetFrame( const SalFrame *pFrame ) @@ -631,7 +631,7 @@ void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsi } } -void AquaSalMenu::CheckItem( unsigned nPos, BOOL bCheck ) +void AquaSalMenu::CheckItem( unsigned nPos, sal_Bool bCheck ) { if( nPos < maItems.size() ) { @@ -640,7 +640,7 @@ void AquaSalMenu::CheckItem( unsigned nPos, BOOL bCheck ) } } -void AquaSalMenu::EnableItem( unsigned nPos, BOOL bEnable ) +void AquaSalMenu::EnableItem( unsigned nPos, sal_Bool bEnable ) { if( nPos < maItems.size() ) { @@ -701,10 +701,10 @@ void AquaSalMenu::SetItemText( unsigned i_nPos, SalMenuItem* i_pSalMenuItem, con void AquaSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName ) { - USHORT nModifier; + sal_uInt16 nModifier; sal_Unicode nCommandKey = 0; - USHORT nKeyCode=rKeyCode.GetCode(); + sal_uInt16 nKeyCode=rKeyCode.GetCode(); if( nKeyCode ) { if ((nKeyCode>=KEY_A) && (nKeyCode<=KEY_Z)) // letter A..Z @@ -786,7 +786,7 @@ void AquaSalMenu::GetSystemMenuData( SystemMenuData* pData ) { } -AquaSalMenu::MenuBarButtonEntry* AquaSalMenu::findButtonItem( USHORT i_nItemId ) +AquaSalMenu::MenuBarButtonEntry* AquaSalMenu::findButtonItem( sal_uInt16 i_nItemId ) { for( size_t i = 0; i < maButtons.size(); ++i ) { @@ -852,7 +852,7 @@ bool AquaSalMenu::AddMenuBarButton( const SalMenuButtonItem& i_rNewItem ) return true; } -void AquaSalMenu::RemoveMenuBarButton( USHORT i_nId ) +void AquaSalMenu::RemoveMenuBarButton( sal_uInt16 i_nId ) { MenuBarButtonEntry* pEntry = findButtonItem( i_nId ); if( pEntry ) @@ -866,7 +866,7 @@ void AquaSalMenu::RemoveMenuBarButton( USHORT i_nId ) statusLayout(); } -Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( USHORT i_nItemId, SalFrame* i_pReferenceFrame ) +Rectangle AquaSalMenu::GetMenuBarButtonRectPixel( sal_uInt16 i_nItemId, SalFrame* i_pReferenceFrame ) { if( GetSalData()->mnSystemVersion < VER_LEOPARD ) return Rectangle( Point( -1, -1 ), Size( 1, 1 ) ); diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx index f300929f04fe..3df1347e3b10 100644 --- a/vcl/aqua/source/window/salobj.cxx +++ b/vcl/aqua/source/window/salobj.cxx @@ -107,14 +107,14 @@ void AquaSalObject::ResetClipRegion() // ----------------------------------------------------------------------- -USHORT AquaSalObject::GetClipRegionType() +sal_uInt16 AquaSalObject::GetClipRegionType() { return SAL_OBJECT_CLIP_INCLUDERECTS; } // ----------------------------------------------------------------------- -void AquaSalObject::BeginSetClipRegion( ULONG nRectCount ) +void AquaSalObject::BeginSetClipRegion( sal_uLong nRectCount ) { mbClip = false; } @@ -200,7 +200,7 @@ void AquaSalObject::setClippedPosSize() // ----------------------------------------------------------------------- -void AquaSalObject::Show( BOOL bVisible ) +void AquaSalObject::Show( sal_Bool bVisible ) { if( mpClipView ) [mpClipView setHidden: (bVisible ? NO : YES)]; @@ -208,7 +208,7 @@ void AquaSalObject::Show( BOOL bVisible ) // ----------------------------------------------------------------------- -void AquaSalObject::Enable( BOOL bEnable ) +void AquaSalObject::Enable( sal_Bool bEnable ) { } diff --git a/vcl/unx/source/gdi/cdeint.cxx b/vcl/unx/source/gdi/cdeint.cxx index caa4867af874..ee0054814761 100644 --- a/vcl/unx/source/gdi/cdeint.cxx +++ b/vcl/unx/source/gdi/cdeint.cxx @@ -231,9 +231,9 @@ void CDEIntegrator::GetSystemLook( AllSettings& rSettings ) { // calculate Checked color Color aColor2 = aStyleSettings.GetLightColor(); - BYTE nRed = (BYTE)(((USHORT)aColors[1].GetRed() + (USHORT)aColor2.GetRed())/2); - BYTE nGreen = (BYTE)(((USHORT)aColors[1].GetGreen() + (USHORT)aColor2.GetGreen())/2); - BYTE nBlue = (BYTE)(((USHORT)aColors[1].GetBlue() + (USHORT)aColor2.GetBlue())/2); + sal_uInt8 nRed = (sal_uInt8)(((sal_uInt16)aColors[1].GetRed() + (sal_uInt16)aColor2.GetRed())/2); + sal_uInt8 nGreen = (sal_uInt8)(((sal_uInt16)aColors[1].GetGreen() + (sal_uInt16)aColor2.GetGreen())/2); + sal_uInt8 nBlue = (sal_uInt8)(((sal_uInt16)aColors[1].GetBlue() + (sal_uInt16)aColor2.GetBlue())/2); aStyleSettings.SetCheckedColor( Color( nRed, nGreen, nBlue ) ); } } diff --git a/vcl/unx/source/window/salframe.cxx b/vcl/unx/source/window/salframe.cxx index f456ccc8d628..816265296660 100644 --- a/vcl/unx/source/window/salframe.cxx +++ b/vcl/unx/source/window/salframe.cxx @@ -956,7 +956,7 @@ void X11SalFrame::updateGraphics( bool bClear ) // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalFrame::Enable( BOOL /*bEnable*/ ) +void X11SalFrame::Enable( sal_Bool /*bEnable*/ ) { // NYI: enable/disable frame } @@ -1065,7 +1065,7 @@ void X11SalFrame::SetIcon( sal_uInt16 nIcon ) } pHints = &Hints; - BOOL bOk = SelectAppIconPixmap( GetDisplay(), m_nScreen, + sal_Bool bOk = SelectAppIconPixmap( GetDisplay(), m_nScreen, nIcon, iconSize, pHints->icon_pixmap, pHints->icon_mask ); if ( !bOk ) @@ -1138,7 +1138,7 @@ void X11SalFrame::SetMinClientSize( long nWidth, long nHeight ) // Show + Pos (x,y,z) + Size (width,height) // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalFrame::Show( BOOL bVisible, BOOL bNoActivate ) +void X11SalFrame::Show( sal_Bool bVisible, sal_Bool bNoActivate ) { if( ( bVisible && bMapped_ ) || ( !bVisible && !bMapped_ ) ) @@ -1631,7 +1631,7 @@ void X11SalFrame::SetPosSize( long nX, long nY, long nWidth, long nHeight, sal_u } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalFrame::SetAlwaysOnTop( BOOL bOnTop ) +void X11SalFrame::SetAlwaysOnTop( sal_Bool bOnTop ) { if( ! IsOverrideRedirect() ) { @@ -1812,7 +1812,7 @@ void X11SalFrame::SetWindowState( const SalFrameState *pState ) } // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -BOOL X11SalFrame::GetWindowState( SalFrameState* pState ) +sal_Bool X11SalFrame::GetWindowState( SalFrameState* pState ) { if( SHOWSTATE_MINIMIZED == nShowState_ ) pState->mnState = SAL_FRAMESTATE_MINIMIZED; @@ -2192,7 +2192,7 @@ void X11SalFrame::SetScreenNumber( unsigned int nNewScreen ) // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -void X11SalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nScreen ) +void X11SalFrame::ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nScreen ) { if( GetDisplay()->IsXinerama() && GetDisplay()->GetXineramaScreens().size() > 1 ) { @@ -2362,7 +2362,7 @@ void X11SalFrame::StartPresentation( sal_Bool bStart ) static bool DPMSExtensionAvailable = #ifndef SOLARIS (DPMSQueryExtension(GetXDisplay(), &dummy, &dummy) != 0); - static BOOL DPMSEnabled = false; + static sal_Bool DPMSEnabled = false; #else false; bool DPMSEnabled = false; @@ -2541,7 +2541,7 @@ X11SalFrame::HandleExtTextEvent (XClientMessageEvent *pEvent) // PostEvent // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= -BOOL X11SalFrame::PostEvent( void *pData ) +sal_Bool X11SalFrame::PostEvent( void *pData ) { GetDisplay()->SendInternalEvent( this, pData ); return sal_True; @@ -2634,7 +2634,7 @@ XubString X11SalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 nKeyCode ) return GetKeyName( nKeyCode ); } -BOOL X11SalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) +sal_Bool X11SalFrame::MapUnicodeToKeyCode( sal_Unicode , LanguageType , KeyCode& ) { // not supported yet return sal_False; @@ -2665,7 +2665,7 @@ void X11SalFrame::UpdateSettings( AllSettings& rSettings ) pIntegrator->GetSystemLook( rSettings ); } -void X11SalFrame::CaptureMouse( BOOL bCapture ) +void X11SalFrame::CaptureMouse( sal_Bool bCapture ) { nCaptured_ = pDisplay_->CaptureMouse( bCapture ? this : NULL ); } @@ -3814,9 +3814,9 @@ long X11SalFrame::HandleReparentEvent( XReparentEvent *pEvent ) XLIB_Window hWM_Parent; XLIB_Window hRoot, *Children, hDummy; unsigned int nChildren; - BOOL bNone = pDisplay_->GetProperties() + sal_Bool bNone = pDisplay_->GetProperties() & PROPERTY_SUPPORT_WM_Parent_Pixmap_None; - BOOL bAccessParentWindow = ! (pDisplay_->GetProperties() + sal_Bool bAccessParentWindow = ! (pDisplay_->GetProperties() & PROPERTY_FEATURE_TrustedSolaris); static const char* pDisableStackingCheck = getenv( "SAL_DISABLE_STACKING_CHECK" ); |