rebase to DEV300_m100

37 files changed, 286 insertions, 286 deletions

diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h
index cdb85445e0d7..a1a3fbab5ce3 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 7436403131c7..41b66d19e578 100644
--- a/vcl/aqua/source/a11y/aqua11yfactory.mm
+++ b/vcl/aqua/source/a11y/aqua11yfactory.mm
@@ -97,11 +97,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 9be55e83ad86..20bb99938ef0 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 5ba013b67380..1330424df739 100644
--- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm
@@ -66,7 +66,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 aa938d88c8fb..948e0dfa95aa 100644
--- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm
@@ -79,8 +79,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
@@ -90,8 +90,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 ) {
@@ -151,7 +151,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 c872ebc097ce..34ba1611b7b3 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 6b6e6aac004d..d4c27812de63 100644
--- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm
@@ -275,8 +275,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 e65d3c4e4917..35573f855549 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 1f6f2d53cf81..ce2db7745c30 100644
--- a/vcl/aqua/source/a11y/aqua11ywrapper.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm
@@ -64,7 +64,7 @@ using namespace ::com::sun::star::uno;
 -(Reference<XAccessibleContext>)accessibleContext;
 @end
 
-static MacOSBOOL isPopupMenuOpen = NO;
+static BOOL isPopupMenuOpen = NO;
 
 @implementation AquaA11yWrapper : NSView
 
@@ -155,7 +155,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 {
@@ -198,7 +198,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;
@@ -694,12 +694,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:
@@ -797,8 +797,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 ];
     }
@@ -831,7 +831,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
 }
 
@@ -905,7 +905,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 ] ] ) {
@@ -948,8 +948,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 ];
@@ -1128,15 +1128,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 09f311755d57..e1016a6fe551 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 395dbb19682d..6bf2aa2f8340 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm
@@ -45,7 +45,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 6ad6b0e71514..c9b71585aea3 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 d981f813beae..6f8e9d05d112 100644
--- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
+++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm
@@ -119,7 +119,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 9969f46e398b..276f1c162e8c 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 e87470317934..4c1e9047d65e 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 cc2546ccad85..f1a4fc1213c7 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -75,9 +75,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;
@@ -211,7 +211,7 @@ static void initNSApp()
         [NSApp activateIgnoringOtherApps: YES];
 }
 
-BOOL ImplSVMainHook( BOOL * pbInit )
+sal_Bool ImplSVMainHook( sal_Bool * pbInit )
 {
     gpbInit = pbInit;
 
@@ -406,7 +406,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 )
@@ -517,7 +517,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 ) );
@@ -536,14 +536,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();
@@ -558,7 +558,7 @@ ULONG AquaSalInstance::ReleaseYieldMutex()
 
 // -----------------------------------------------------------------------
 
-void AquaSalInstance::AcquireYieldMutex( ULONG nCount )
+void AquaSalInstance::AcquireYieldMutex( sal_uLong nCount )
 {
     SalYieldMutex* pYieldMutex = mpSalYieldMutex;
     while ( nCount )
@@ -605,7 +605,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent )
         break;
     case AppExecuteSVMain:
     {
-        BOOL bResult = ImplSVMain();
+        sal_Bool bResult = ImplSVMain();
         if( gpbInit )
             *gpbInit = bResult;
         [NSApp stop: NSApp];
@@ -715,7 +715,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 );
@@ -756,7 +756,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];
@@ -773,7 +773,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
@@ -817,7 +817,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 );
     }
@@ -848,7 +848,7 @@ void AquaSalInstance::Yield( bool bWait, bool bHandleAllCurrentEvents )
 
 // -----------------------------------------------------------------------
 
-bool AquaSalInstance::AnyInput( USHORT nType )
+bool AquaSalInstance::AnyInput( sal_uInt16 nType )
 {
     if( nType & INPUT_APPEVENT )
     {
@@ -894,14 +894,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();
 
@@ -918,7 +918,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 4204519deed6..b482453704af 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 861ab6ee0947..f79414457452 100755
--- a/vcl/aqua/source/app/vclnsapp.mm
+++ b/vcl/aqua/source/app/vclnsapp.mm
@@ -288,7 +288,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 ) )
@@ -329,7 +329,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(),
@@ -337,7 +337,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 );
@@ -469,7 +469,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 6d7fdada99ad..1db6a3a848e1 100644
--- a/vcl/aqua/source/dtrans/DragSource.cxx
+++ b/vcl/aqua/source/dtrans/DragSource.cxx
@@ -108,7 +108,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 1b045c20a282..ce3d6a9d3d98 100644
--- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
+++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm
@@ -297,7 +297,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 de5047b7faf6..947906ce4172 100755
--- a/vcl/aqua/source/gdi/aquaprintview.mm
+++ b/vcl/aqua/source/gdi/aquaprintview.mm
@@ -45,7 +45,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 f0c33b550a04..1b505abd60d9 100755
--- a/vcl/aqua/source/gdi/salatslayout.cxx
+++ b/vcl/aqua/source/gdi/salatslayout.cxx
@@ -268,7 +268,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 c1e7b7145914..00ae72b4fa9e 100644
--- a/vcl/aqua/source/gdi/salbmp.cxx
+++ b/vcl/aqua/source/gdi/salbmp.cxx
@@ -107,7 +107,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;
@@ -134,7 +134,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);
 
@@ -563,7 +563,7 @@ Size AquaSalBitmap::GetSize() const
 
 // ------------------------------------------------------------------
 
-USHORT AquaSalBitmap::GetBitCount() const
+sal_uInt16 AquaSalBitmap::GetBitCount() const
 {
     return mnBits;
 }
@@ -572,9 +572,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 ] =
 {
@@ -629,9 +629,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 934e3d14f967..6275cfbcef1d 100644
--- a/vcl/aqua/source/gdi/salgdi.cxx
+++ b/vcl/aqua/source/gdi/salgdi.cxx
@@ -60,7 +60,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;
 
 
@@ -455,9 +455,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;
 }
 
@@ -564,7 +564,7 @@ void AquaSalGraphics::ResetClipRegion()
 
 // -----------------------------------------------------------------------
 
-void AquaSalGraphics::BeginSetClipRegion( ULONG nRectCount )
+void AquaSalGraphics::BeginSetClipRegion( sal_uLong nRectCount )
 {
     // release old clip path
     if( mxClipPath )
@@ -576,16 +576,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;
 }
 
 // -----------------------------------------------------------------------
@@ -749,13 +749,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;
@@ -779,7 +779,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;
@@ -795,7 +795,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 );
@@ -807,7 +807,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;
@@ -835,7 +835,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 );
@@ -845,7 +845,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 );
     }
 
@@ -855,7 +855,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;
@@ -865,7 +865,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 );
@@ -900,9 +900,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];
@@ -910,7 +910,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 );
@@ -921,15 +921,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);
             }
@@ -1054,22 +1054,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;
 }
@@ -1155,7 +1155,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();
 
@@ -1399,7 +1399,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() )
@@ -1436,8 +1436,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];
@@ -1606,7 +1606,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;
 }
@@ -1787,7 +1787,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;
@@ -1829,7 +1829,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;
@@ -1862,7 +1862,7 @@ void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& )
 
 // -----------------------------------------------------------------------
 
-USHORT AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int nFallbackLevel )
+sal_uInt16 AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int nFallbackLevel )
 {
     if( !pReqFont )
     {
@@ -2179,10 +2179,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 )
 {
@@ -2191,7 +2191,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 ) );
 
@@ -2252,7 +2252,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;
@@ -2272,7 +2272,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
@@ -2300,7 +2300,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;
@@ -2604,24 +2604,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 );
@@ -2661,8 +2661,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++);
 
@@ -2680,7 +2680,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 bba3c795f6e3..8daa456a03c2 100755
--- a/vcl/aqua/source/gdi/salgdiutils.cxx
+++ b/vcl/aqua/source/gdi/salgdiutils.cxx
@@ -255,12 +255,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 55a4ccc16c3e..b06bf753e54f 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 b40c82c77de3..04098f68de67 100644
--- a/vcl/aqua/source/gdi/salprn.cxx
+++ b/vcl/aqua/source/gdi/salprn.cxx
@@ -178,9 +178,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;
 }
 
 // -----------------------------------------------------------------------
@@ -253,14 +253,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;
@@ -287,11 +287,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;
@@ -321,10 +321,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 )
@@ -362,14 +362,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();
 }
@@ -438,7 +438,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 )
     {
@@ -520,7 +520,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,
@@ -528,9 +528,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;
@@ -665,7 +665,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];
@@ -683,7 +683,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 )
@@ -701,26 +701,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 );
@@ -734,15 +734,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;
 }
@@ -762,7 +762,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,
@@ -773,49 +773,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 9c2b3631fa3d..6e71fa482b21 100644
--- a/vcl/aqua/source/gdi/salvd.cxx
+++ b/vcl/aqua/source/gdi/salvd.cxx
@@ -40,7 +40,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();
@@ -57,7 +57,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 )
@@ -156,7 +156,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 1e20448fad7a..7521dd7cc253 100644
--- a/vcl/aqua/source/window/salframe.cxx
+++ b/vcl/aqua/source/window/salframe.cxx
@@ -64,7 +64,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),
@@ -294,7 +294,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;
@@ -313,7 +313,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 )
     {
@@ -339,7 +339,7 @@ void AquaSalFrame::SetTitle(const XubString& rTitle)
 
 // -----------------------------------------------------------------------
 
-void AquaSalFrame::SetIcon( USHORT )
+void AquaSalFrame::SetIcon( sal_uInt16 )
 {
 }
 
@@ -418,7 +418,7 @@ void AquaSalFrame::SendPaintEvent( const Rectangle* pRect )
 
 // -----------------------------------------------------------------------
 
-void AquaSalFrame::Show(BOOL bVisible, BOOL bNoActivate)
+void AquaSalFrame::Show(sal_Bool bVisible, sal_Bool bNoActivate)
 {
     if ( !mpWindow )
         return;
@@ -481,7 +481,7 @@ void AquaSalFrame::Show(BOOL bVisible, BOOL bNoActivate)
 
 // -----------------------------------------------------------------------
 
-void AquaSalFrame::Enable( BOOL bEnable )
+void AquaSalFrame::Enable( sal_Bool bEnable )
 {
 }
 
@@ -624,7 +624,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;
@@ -652,7 +652,7 @@ void AquaSalFrame::SetWindowState( const SalFrameState* pState )
 
 // -----------------------------------------------------------------------
 
-BOOL AquaSalFrame::GetWindowState( SalFrameState* pState )
+sal_Bool AquaSalFrame::GetWindowState( SalFrameState* pState )
 {
     if ( !mpWindow )
         return FALSE;
@@ -729,7 +729,7 @@ void AquaSalFrame::SetScreenNumber(unsigned int nScreen)
 
 // -----------------------------------------------------------------------
 
-void AquaSalFrame::ShowFullScreen( BOOL bFullScreen, sal_Int32 nDisplay )
+void AquaSalFrame::ShowFullScreen( sal_Bool bFullScreen, sal_Int32 nDisplay )
 {
     if ( !mpWindow )
         return;
@@ -842,7 +842,7 @@ public:
     }
 };
 
-void AquaSalFrame::StartPresentation( BOOL bStart )
+void AquaSalFrame::StartPresentation( sal_Bool bStart )
 {
     if ( !mpWindow )
         return;
@@ -866,13 +866,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)
 {
     if ( !mpWindow )
         return;
@@ -1038,18 +1038,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++ )
@@ -1110,8 +1110,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 )
@@ -1131,7 +1131,7 @@ XubString AquaSalFrame::GetKeyName( USHORT nKeyCode )
 
 // -----------------------------------------------------------------------
 
-XubString AquaSalFrame::GetSymbolKeyName( const XubString&, USHORT nKeyCode )
+XubString AquaSalFrame::GetSymbolKeyName( const XubString&, sal_uInt16 nKeyCode )
 {
     return GetKeyName( nKeyCode );
 }
@@ -1352,7 +1352,7 @@ 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)
 {
     if ( !mpWindow )
         return;
@@ -1360,7 +1360,7 @@ void AquaSalFrame::SetPosSize(long nX, long nY, long nWidth, long nHeight, USHOR
     // #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
@@ -1555,7 +1555,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;
@@ -1672,7 +1672,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
@@ -1722,7 +1722,7 @@ void AquaSalFrame::ResetClipRegion()
     }
 }
 
-void AquaSalFrame::BeginSetClipRegion( ULONG nRects )
+void AquaSalFrame::BeginSetClipRegion( sal_uLong nRects )
 {
     if ( !mpWindow )
     {
diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm
index bfcc047c812a..1d5a50315adc 100755
--- a/vcl/aqua/source/window/salframeview.mm
+++ b/vcl/aqua/source/window/salframeview.mm
@@ -41,9 +41,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 )
@@ -55,9 +55,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,
@@ -85,7 +85,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,
@@ -105,7 +105,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 )
@@ -117,12 +117,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[] =
 {
@@ -179,16 +179,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                 |
@@ -211,7 +211,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;
         
@@ -301,11 +301,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
@@ -348,12 +348,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];
 }
@@ -409,17 +409,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;
 }
@@ -467,7 +467,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;
 
@@ -523,13 +523,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 )
         {
@@ -663,7 +663,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
@@ -734,7 +734,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
@@ -794,7 +794,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
@@ -866,7 +866,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] )
@@ -879,7 +879,7 @@ private:
     }
 }
 
--(MacOSBOOL)handleKeyDownException:(NSEvent*)pEvent
+-(BOOL)handleKeyDownException:(NSEvent*)pEvent
 {
     // check for a very special set of modified characters
     NSString* pUnmodifiedString = [pEvent charactersIgnoringModifiers]; 
@@ -897,7 +897,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
@@ -923,7 +923,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];
     }
 }
@@ -953,7 +953,7 @@ private:
 				! [self hasMarkedText ]
                 )
             {
-                USHORT nKeyCode = ImplMapCharCode( aCharCode );
+                sal_uInt16 nKeyCode = ImplMapCharCode( aCharCode );
                 unsigned int nLastModifiers = mpFrame->mnLastModifierFlags;
 
                 // #i99567#
@@ -1329,18 +1329,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;
     
@@ -1363,20 +1363,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;
@@ -1392,9 +1392,9 @@ private:
     return [NSArray arrayWithObjects:NSUnderlineStyleAttributeName, nil];
 }
 
-- (MacOSBOOL)hasMarkedText
+- (BOOL)hasMarkedText
 {
-    MacOSBOOL bHasMarkedText;
+    BOOL bHasMarkedText;
 
     bHasMarkedText = ( mMarkedRange.location != NSNotFound ) &&
                      ( mMarkedRange.length != 0 );
@@ -1461,7 +1461,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;
@@ -1620,12 +1620,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 08c1f9310529..fa5026abb245 100644
--- a/vcl/aqua/source/window/salmenu.cxx
+++ b/vcl/aqua/source/window/salmenu.cxx
@@ -209,7 +209,7 @@ static void initAppMenu()
 
 // =======================================================================
 
-SalMenu* AquaSalInstance::CreateMenu( BOOL bMenuBar, Menu* pVCLMenu )
+SalMenu* AquaSalInstance::CreateMenu( sal_Bool bMenuBar, Menu* pVCLMenu )
 {
     initAppMenu();
 
@@ -341,9 +341,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;
     }
@@ -371,7 +371,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;
@@ -395,7 +395,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 )
@@ -521,7 +521,7 @@ void AquaSalMenu::removeFallbackMenuItem( NSMenuItem* pOldItem )
     }
 }
 
-BOOL AquaSalMenu::VisibleMenuBar()
+sal_Bool AquaSalMenu::VisibleMenuBar()
 {
     // Enable/disable experimental native menus code?
     //
@@ -530,11 +530,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 )
@@ -633,7 +633,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() )
     {
@@ -642,7 +642,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() )
     {
@@ -703,10 +703,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
@@ -788,7 +788,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 )
     {
@@ -854,7 +854,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 )
@@ -868,7 +868,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 642c5e5d9637..bbbb85cd1351 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 )
 {
 }