diff options
Diffstat (limited to 'vcl/aqua/source')
88 files changed, 529 insertions, 1054 deletions
diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.h b/vcl/aqua/source/a11y/aqua11yactionwrapper.h index 3a7f13f8a545..94388a98e3c3 100644 --- a/vcl/aqua/source/a11y/aqua11yactionwrapper.h +++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.h @@ -28,8 +28,8 @@ #ifndef _SV_AQUA11ACTIONWRAPPER_H #define _SV_AQUA11ACTIONWRAPPER_H -#include "aquavcltypes.h" -#include "aqua11ywrapper.h" +#include "aqua/aquavcltypes.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yActionWrapper : NSObject { diff --git a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm b/vcl/aqua/source/a11y/aqua11yactionwrapper.mm index fcd49fd67ff4..e49ad251faad 100644 --- a/vcl/aqua/source/a11y/aqua11yactionwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11yactionwrapper.mm @@ -28,7 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11yactionwrapper.h" // Wrapper for XAccessibleAction diff --git a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h index 6d44f62b5611..a1a3fbab5ce3 100644 --- a/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h +++ b/vcl/aqua/source/a11y/aqua11ycomponentwrapper.h @@ -28,8 +28,8 @@ #ifndef _SV_AQUA11COMPONENTWRAPPER_H #define _SV_AQUA11COMPONENTWRAPPER_H -#include "aquavcltypes.h" -#include "aqua11ywrapper.h" +#include "aqua/aquavcltypes.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yComponentWrapper : NSObject { diff --git a/vcl/aqua/source/a11y/aqua11yfactory.mm b/vcl/aqua/source/a11y/aqua11yfactory.mm index 5dcdf4bb9f61..41b66d19e578 100644 --- a/vcl/aqua/source/a11y/aqua11yfactory.mm +++ b/vcl/aqua/source/a11y/aqua11yfactory.mm @@ -28,10 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" -#include "aqua11yfactory.h" +#include "aqua/salinst.h" +#include "aqua/aqua11yfactory.h" +#include "aqua/aqua11yfocustracker.hxx" + #include "aqua11yfocuslistener.hxx" -#include "aqua11yfocustracker.hxx" #include "aqua11yrolehelper.h" #include "aqua11ywrapperbutton.h" #include "aqua11ywrapperstatictext.h" @@ -49,6 +50,7 @@ #include "aqua11ywrappertabgroup.h" #include "aqua11ywrappertoolbar.h" #include "aqua11ytablewrapper.h" + #include <com/sun/star/accessibility/AccessibleStateType.hpp> using namespace ::com::sun::star::accessibility; diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx index 9ac9401abd62..1a7c72eac9ec 100644 --- a/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx +++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.cxx @@ -28,12 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "aqua11yfocuslistener.hxx" -#include "aqua11yfocustracker.hxx" -#include "aqua11yfactory.h" - #include <salhelper/refobj.hxx> +#include "aqua/aqua11yfocustracker.hxx" +#include "aqua/aqua11yfactory.h" + +#include "aqua11yfocuslistener.hxx" + using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; diff --git a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx index 1fdd340c698e..db114be14771 100644 --- a/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx +++ b/vcl/aqua/source/a11y/aqua11yfocuslistener.hxx @@ -30,8 +30,8 @@ #include <salhelper/refobj.hxx> -#include "keyboardfocuslistener.hxx" -#include "aquavcltypes.h" +#include "aqua/keyboardfocuslistener.hxx" +#include "aqua/aquavcltypes.h" // #include <com/sun/star/accessibility/XAccessibleContext.hpp> diff --git a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx index 2a8ebb39bd80..c901eea915a6 100644 --- a/vcl/aqua/source/a11y/aqua11yfocustracker.cxx +++ b/vcl/aqua/source/a11y/aqua11yfocustracker.cxx @@ -28,7 +28,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "aqua11yfocustracker.hxx" +#include "vcl/svapp.hxx" +#include "vcl/window.hxx" +#include "vcl/toolbox.hxx" +#include "vcl/menu.hxx" + +#include "aqua/aqua11yfocustracker.hxx" + #include "documentfocuslistener.hxx" #include <com/sun/star/accessibility/XAccessibleContext.hpp> @@ -37,11 +43,6 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> -#include "vcl/svapp.hxx" -#include "vcl/window.hxx" -#include "vcl/toolbox.hxx" -#include "vcl/menu.hxx" - using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::uno; diff --git a/vcl/aqua/source/a11y/aqua11ylistener.cxx b/vcl/aqua/source/a11y/aqua11ylistener.cxx index 7f680f43b3a6..36e2c7ab2220 100644 --- a/vcl/aqua/source/a11y/aqua11ylistener.cxx +++ b/vcl/aqua/source/a11y/aqua11ylistener.cxx @@ -25,12 +25,13 @@ * ************************************************************************/ -#include "aqua11ylistener.hxx" -#include "aqua11yfactory.h" -#include "aqua11yfocustracker.hxx" +#include "aqua/salinst.h" +#include "aqua/aqua11ylistener.hxx" +#include "aqua/aqua11yfactory.h" +#include "aqua/aqua11yfocustracker.hxx" +#include "aqua/aqua11ywrapper.h" + #include "aqua11ytextwrapper.h" -#include "aqua11ywrapper.h" -#include "salinst.h" #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> @@ -74,7 +75,7 @@ AquaA11yEventListener::~AquaA11yEventListener() //------------------------------------------------------------------------------ void SAL_CALL -AquaA11yEventListener::disposing( const EventObject& Source ) throw( RuntimeException ) +AquaA11yEventListener::disposing( const EventObject& ) throw( RuntimeException ) { [ AquaA11yFactory removeFromWrapperRepositoryFor: [ (AquaA11yWrapper *) m_wrapperObject accessibleContext ] ]; } diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.h b/vcl/aqua/source/a11y/aqua11yrolehelper.h index f847eb3f41c3..c15c39903432 100644 --- a/vcl/aqua/source/a11y/aqua11yrolehelper.h +++ b/vcl/aqua/source/a11y/aqua11yrolehelper.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11ROLEHELPER_H #define _SV_AQUA11ROLEHELPER_H -#include "salinst.h" +#include "aqua/salinst.h" #include <com/sun/star/accessibility/XAccessibleContext.hpp> @interface AquaA11yRoleHelper : NSObject diff --git a/vcl/aqua/source/a11y/aqua11yrolehelper.mm b/vcl/aqua/source/a11y/aqua11yrolehelper.mm index b8ebdb08c3df..cfc052e96beb 100644 --- a/vcl/aqua/source/a11y/aqua11yrolehelper.mm +++ b/vcl/aqua/source/a11y/aqua11yrolehelper.mm @@ -28,8 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include "aqua/aqua11yfactory.h" + #include "aqua11yrolehelper.h" -#include "aqua11yfactory.h" + #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h index bf290990faa2..20bb99938ef0 100644 --- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.h +++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.h @@ -28,8 +28,8 @@ #ifndef _SV_AQUA11SELECTIONWRAPPER_H #define _SV_AQUA11SELECTIONWRAPPER_H -#include "aquavcltypes.h" -#include "aqua11ywrapper.h" +#include "aqua/aquavcltypes.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11ySelectionWrapper : NSObject { diff --git a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm index 9368c599d131..a215bf913cf1 100644 --- a/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11yselectionwrapper.mm @@ -28,8 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" -#include "aqua11yfactory.h" +#include "aqua/salinst.h" +#include "aqua/aqua11yfactory.h" + #include "aqua11yselectionwrapper.h" using namespace ::com::sun::star::accessibility; @@ -67,6 +68,7 @@ using namespace ::com::sun::star::uno; +(BOOL)isAttributeSettable:(NSString *)attribute forElement:(AquaA11yWrapper *)wrapper { + (void)wrapper; if ( [ attribute isEqualToString: NSAccessibilitySelectedChildrenAttribute ] ) { return YES; diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.h b/vcl/aqua/source/a11y/aqua11ytablewrapper.h index 7bf3e44a2945..ed70ed219b6e 100644 --- a/vcl/aqua/source/a11y/aqua11ytablewrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11TABLEWRAPPER_H #define _SV_AQUA11TABLEWRAPPER_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" #define MAXIMUM_ACCESSIBLE_TABLE_CELLS 1000 diff --git a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm b/vcl/aqua/source/a11y/aqua11ytablewrapper.mm index 98454ab8d57b..110cb42ffee7 100644 --- a/vcl/aqua/source/a11y/aqua11ytablewrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytablewrapper.mm @@ -28,8 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include "aqua/aqua11yfactory.h" + #include "aqua11ytablewrapper.h" -#include "aqua11yfactory.h" using namespace ::com::sun::star::accessibility; using namespace ::com::sun::star::awt; diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h index fcf185ca5478..0aa271a7f1e2 100644 --- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.h @@ -28,8 +28,7 @@ #ifndef _SV_AQUA11TEXTATTRIBUTESWRAPPER_H #define _SV_AQUA11TEXTATTRIBUTESWRAPPER_H -#include <com/sun/star/uno/Sequence.hxx> -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yTextAttributesWrapper : NSObject { diff --git a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm index 60b12c762b25..948e0dfa95aa 100644 --- a/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytextattributeswrapper.mm @@ -28,8 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" +#include "aqua/salinst.h" + #include "aqua11ytextattributeswrapper.h" -#include "salinst.h" + #include <com/sun/star/accessibility/AccessibleTextType.hpp> #include <com/sun/star/awt/FontUnderline.hpp> #include <com/sun/star/awt/FontWeight.hpp> diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.h b/vcl/aqua/source/a11y/aqua11ytextwrapper.h index b132bdd0f12a..34ba1611b7b3 100644 --- a/vcl/aqua/source/a11y/aqua11ytextwrapper.h +++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.h @@ -28,8 +28,8 @@ #ifndef _SV_AQUA11TEXTWRAPPER_H #define _SV_AQUA11TEXTWRAPPER_H -#include "aquavcltypes.h" -#include "aqua11ywrapper.h" +#include "aqua/aquavcltypes.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yTextWrapper : NSObject { diff --git a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm index 89c164e5e0b9..d956d2beb0b7 100644 --- a/vcl/aqua/source/a11y/aqua11ytextwrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ytextwrapper.mm @@ -28,10 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ytextwrapper.h" #include "aqua11ytextattributeswrapper.h" #include "aqua11yutil.h" + #include <com/sun/star/accessibility/AccessibleTextType.hpp> #include <com/sun/star/awt/Rectangle.hpp> @@ -49,8 +51,11 @@ using namespace ::rtl; return CreateNSString ( [ wrapper accessibleText ] -> getText() ); } -+(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value { ++(void)setValueAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value +{ // TODO + (void)wrapper; + (void)value; } +(id)numberOfCharactersAttributeForElement:(AquaA11yWrapper *)wrapper { @@ -103,15 +108,22 @@ using namespace ::rtl; return [ NSValue valueWithRange: NSMakeRange ( 0, [ wrapper accessibleText ] -> getCharacterCount() ) ]; } -+(void)setVisibleCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value { ++(void)setVisibleCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper to:(id)value +{ // do nothing + (void)wrapper; + (void)value; } -+(id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper *)wrapper { ++(id)sharedTextUIElementsAttributeForElement:(AquaA11yWrapper *)wrapper +{ + (void)wrapper; return [ [ NSArray alloc ] init ]; // unsupported } -+(id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper { ++(id)sharedCharacterRangeAttributeForElement:(AquaA11yWrapper *)wrapper +{ + (void)wrapper; return [ NSValue valueWithRange: NSMakeRange ( 0, 0 ) ]; // unsupported } diff --git a/vcl/aqua/source/a11y/aqua11yutil.mm b/vcl/aqua/source/a11y/aqua11yutil.mm index 4749a3b40822..74de0a19aa41 100644 --- a/vcl/aqua/source/a11y/aqua11yutil.mm +++ b/vcl/aqua/source/a11y/aqua11yutil.mm @@ -28,7 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "aquavcltypes.h" +#include "aqua/aquavcltypes.h" + #include "aqua11yutil.h" using namespace ::com::sun::star::awt; diff --git a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h index 1dbafe33baea..35573f855549 100644 --- a/vcl/aqua/source/a11y/aqua11yvaluewrapper.h +++ b/vcl/aqua/source/a11y/aqua11yvaluewrapper.h @@ -28,9 +28,9 @@ #ifndef _SV_AQUA11VALUEWRAPPER_H #define _SV_AQUA11VALUEWRAPPER_H -#include "salinst.h" -#include "aquavcltypes.h" -#include "aqua11ywrapper.h" +#include "aqua/salinst.h" +#include "aqua/aquavcltypes.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yValueWrapper : NSObject { diff --git a/vcl/aqua/source/a11y/aqua11ywrapper.mm b/vcl/aqua/source/a11y/aqua11ywrapper.mm index c2724a372f9f..bf8de98c3318 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapper.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapper.mm @@ -28,20 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" -#include "saldata.hxx" +#include "aqua/salinst.h" +#include "aqua/saldata.hxx" -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" +#include "aqua/aqua11ylistener.hxx" +#include "aqua/aqua11yfactory.h" +#include "aqua/aqua11yfocustracker.hxx" + +#include "aqua11yfocuslistener.hxx" #include "aqua11yactionwrapper.h" #include "aqua11ycomponentwrapper.h" -#include "aqua11ylistener.hxx" #include "aqua11yselectionwrapper.h" #include "aqua11ytablewrapper.h" #include "aqua11ytextwrapper.h" #include "aqua11yvaluewrapper.h" -#include "aqua11yfactory.h" -#include "aqua11yfocuslistener.hxx" -#include "aqua11yfocustracker.hxx" #include "aqua11yrolehelper.h" #include <com/sun/star/accessibility/AccessibleRole.hpp> @@ -163,7 +164,8 @@ static BOOL isPopupMenuOpen = NO; if ( ! asGetter ) { [ methodName appendString: @"set" ]; } - NSString * firstChar = [ attribute substringWithRange: NSMakeRange ( 2, 1 ) ]; // drop leading "AX" and get first char + NSRange aRange = { 2, 1 }; + NSString * firstChar = [ attribute substringWithRange: aRange ]; // drop leading "AX" and get first char if ( asGetter ) { [ methodName appendString: [ firstChar lowercaseString ] ]; } else { @@ -830,7 +832,10 @@ static BOOL isPopupMenuOpen = NO; return nil; // TODO: to be completed } --(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute { +-(BOOL)accessibilitySetOverrideValue:(id)value forAttribute:(NSString *)attribute +{ + (void)value; + (void)attribute; return NO; // TODO } diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h index aa35062d15c4..78c54e2c35ea 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERBUTTON_H #define _SV_AQUA11WRAPPERBUTTON_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperButton : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm b/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm index 48f1804c58a2..e51ceff14af9 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperbutton.mm @@ -28,7 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ywrapperbutton.h" #include "aqua11ytextwrapper.h" diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h index b1c5fc751e52..e1016a6fe551 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h +++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERCHECKBOX_H #define _SV_AQUA11WRAPPERCHECKBOX_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperCheckBox : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm index 25f012e1163f..6bf2aa2f8340 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappercheckbox.mm @@ -28,7 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ywrappercheckbox.h" #include "aqua11yvaluewrapper.h" #include "aqua11ytextwrapper.h" diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h index e18da11dd0ad..c9b71585aea3 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.h +++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERCOMBOBOX_H #define _SV_AQUA11WRAPPERCOMBOBOX_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" #include <com/sun/star/accessibility/XAccessibleContext.hpp> @interface AquaA11yWrapperComboBox : AquaA11yWrapper diff --git a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm index 16fa1372fe4e..6f8e9d05d112 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappercombobox.mm @@ -28,9 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ywrappercombobox.h" #include "aqua11yrolehelper.h" + #include <com/sun/star/accessibility/AccessibleStateType.hpp> using namespace ::com::sun::star::accessibility; diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.h b/vcl/aqua/source/a11y/aqua11ywrappergroup.h index 7757e067ee22..bdbfb6e6b264 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappergroup.h +++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERGROUP_H #define _SV_AQUA11WRAPPERGROUP_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperGroup : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm b/vcl/aqua/source/a11y/aqua11ywrappergroup.mm index 42298f9c745b..536cc9bba8eb 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappergroup.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappergroup.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrappergroup.h" // Wrapper for AXGroup role diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.h b/vcl/aqua/source/a11y/aqua11ywrapperlist.h index 95df8323467b..db9bf7511af6 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperlist.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERLIST_H #define _SV_AQUA11WRAPPERLIST_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperList : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm b/vcl/aqua/source/a11y/aqua11ywrapperlist.mm index eeb210d70e65..d70679ed6966 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperlist.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperlist.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrapperlist.h" using namespace ::com::sun::star::accessibility; diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h index 3fc6558c633c..276f1c162e8c 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERRADIOBUTTON_H #define _SV_AQUA11WRAPPERRADIOBUTTON_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperRadioButton : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm index 930f940c4971..4c1e9047d65e 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiobutton.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrapperradiobutton.h" #include "aqua11ytextwrapper.h" #include "aqua11yvaluewrapper.h" diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h index 544b709223b3..4c138372e27e 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERRADIOGROUP_H #define _SV_AQUA11WRAPPERRADIOGROUP_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperRadioGroup : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm index f89ac78b044c..52e71620ceed 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperradiogroup.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrapperradiogroup.h" #include "aqua11ytextwrapper.h" diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.h b/vcl/aqua/source/a11y/aqua11ywrapperrow.h index 252af6f5987f..deaa4f07248f 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperrow.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERROW_H #define _SV_AQUA11WRAPPERROW_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperRow : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm b/vcl/aqua/source/a11y/aqua11ywrapperrow.mm index d49e229218bf..0fd65fd01365 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperrow.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperrow.mm @@ -28,7 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ywrapperrow.h" #include "aqua11ytextwrapper.h" diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h index 2c206fd0904b..e1e37a45d36e 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERSCROLLAREA_H #define _SV_AQUA11WRAPPERSCROLLAREA_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperScrollArea : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm index f375e5ce788d..8a481b64926d 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollarea.mm @@ -28,7 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ywrapperscrollarea.h" #include "aqua11ywrapperscrollbar.h" #include "aqua11yrolehelper.h" diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h index 1070c682cd5e..df57418803fa 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERSCROLLBAR_H #define _SV_AQUA11WRAPPERSCROLLBAR_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperScrollBar : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm index 826da647055b..42b67b739602 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperscrollbar.mm @@ -28,8 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" + #include "aqua11ywrapperscrollbar.h" + #include <com/sun/star/accessibility/AccessibleStateType.hpp> using namespace ::com::sun::star::accessibility; diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h index 084a72ea7a18..a114e6fb7a74 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.h +++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERSPLITTER_H #define _SV_AQUA11WRAPPERSPLITTER_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperSplitter : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm b/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm index 4dc645c006c8..37821f25e423 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappersplitter.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrappersplitter.h" using namespace ::com::sun::star::accessibility; diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h index c21e5573d125..aef2957557d4 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h +++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERSTATICTEXT_H #define _SV_AQUA11WRAPPERSTATICTEXT_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperStaticText : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm index 7192e64b2e7c..d5afe0962904 100644 --- a/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm +++ b/vcl/aqua/source/a11y/aqua11ywrapperstatictext.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrapperstatictext.h" // Wrapper for AXStaticText role diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h index be72b9e27396..7fda77789015 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h +++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERTABGROUP_H #define _SV_AQUA11WRAPPERTABGROUP_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperTabGroup : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm index 708ae5440c4f..fb4e66ad9b90 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappertabgroup.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrappertabgroup.h" // Wrapper for AXTabGroup role diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h index 724f85994053..e47795d976b3 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.h +++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERTEXTAREA_H #define _SV_AQUA11WRAPPERTEXTAREA_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperTextArea : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm b/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm index 9a425eb2b893..a90fe7ae28aa 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappertextarea.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrappertextarea.h" // Wrapper for AXTextArea role diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h index e7ac0a25acec..4ab947484cc4 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h +++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.h @@ -28,7 +28,7 @@ #ifndef _SV_AQUA11WRAPPERTOOLBAR_H #define _SV_AQUA11WRAPPERTOOLBAR_H -#include "aqua11ywrapper.h" +#include "aqua/aqua11ywrapper.h" @interface AquaA11yWrapperToolbar : AquaA11yWrapper { diff --git a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm index 28990355af55..29ddaf540266 100644 --- a/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm +++ b/vcl/aqua/source/a11y/aqua11ywrappertoolbar.mm @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" +#include "aqua/salinst.h" #include "aqua11ywrappertoolbar.h" // Wrapper for AXToolbar role diff --git a/vcl/aqua/source/a11y/documentfocuslistener.hxx b/vcl/aqua/source/a11y/documentfocuslistener.hxx index 863bc59d173f..3f02d3fc0ada 100644 --- a/vcl/aqua/source/a11y/documentfocuslistener.hxx +++ b/vcl/aqua/source/a11y/documentfocuslistener.hxx @@ -28,15 +28,12 @@ #ifndef _DOCUMENTFOCUSLISTENER_HXX_ #define _DOCUMENTFOCUSLISTENER_HXX_ -#ifndef _COM_SUN_STAR_ACCESSIBILITY_XACCESSIBLEEVENTLISTENER_HPP_ #include <com/sun/star/accessibility/XAccessibleEventListener.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#include "aqua11yfocustracker.hxx" +#include "aqua/aqua11yfocustracker.hxx" + #include <set> // ------------------------- diff --git a/vcl/aqua/source/a11y/makefile.mk b/vcl/aqua/source/a11y/makefile.mk deleted file mode 100644 index 0a16281e5a69..000000000000 --- a/vcl/aqua/source/a11y/makefile.mk +++ /dev/null @@ -1,88 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=sala11y -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="aqua" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="aqua" - -SLOFILES= \ - $(SLO)$/aqua11ywrapper.obj \ - $(SLO)$/aqua11yfactory.obj \ - $(SLO)$/aqua11yfocuslistener.obj \ - $(SLO)$/aqua11yfocustracker.obj \ - $(SLO)$/aqua11ylistener.obj \ - $(SLO)$/aqua11yrolehelper.obj \ - $(SLO)$/aqua11yactionwrapper.obj \ - $(SLO)$/aqua11ycomponentwrapper.obj \ - $(SLO)$/aqua11yselectionwrapper.obj \ - $(SLO)$/aqua11ytablewrapper.obj \ - $(SLO)$/aqua11ytextattributeswrapper.obj \ - $(SLO)$/aqua11ytextwrapper.obj \ - $(SLO)$/aqua11yutil.obj \ - $(SLO)$/aqua11yvaluewrapper.obj \ - $(SLO)$/aqua11ywrapperbutton.obj \ - $(SLO)$/aqua11ywrappercheckbox.obj \ - $(SLO)$/aqua11ywrappercombobox.obj \ - $(SLO)$/aqua11ywrappergroup.obj \ - $(SLO)$/aqua11ywrapperlist.obj \ - $(SLO)$/aqua11ywrapperradiobutton.obj \ - $(SLO)$/aqua11ywrapperradiogroup.obj \ - $(SLO)$/aqua11ywrapperrow.obj \ - $(SLO)$/aqua11ywrapperscrollarea.obj \ - $(SLO)$/aqua11ywrapperscrollbar.obj \ - $(SLO)$/aqua11ywrappersplitter.obj \ - $(SLO)$/aqua11ywrapperstatictext.obj \ - $(SLO)$/aqua11ywrappertabgroup.obj \ - $(SLO)$/aqua11ywrappertextarea.obj \ - $(SLO)$/aqua11ywrappertoolbar.obj \ - $(SLO)$/documentfocuslistener.obj - -.ENDIF # "$(GUIBASE)"!="aqua" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/aqua/source/app/makefile.mk b/vcl/aqua/source/app/makefile.mk deleted file mode 100644 index a0ddcbc02226..000000000000 --- a/vcl/aqua/source/app/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salapp -.INCLUDE : $(PRJ)$/util$/makefile.pmk -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="aqua" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="aqua" - -SLOFILES= $(SLO)$/salinst.obj \ - $(SLO)$/saldata.obj \ - $(SLO)$/vclnsapp.obj \ - $(SLO)$/saltimer.obj \ - $(SLO)$/salnstimer.obj \ - $(SLO)$/salsys.obj - -.ENDIF # "$(GUIBASE)"!="aqua" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/vcl/aqua/source/app/saldata.cxx b/vcl/aqua/source/app/saldata.cxx index 3cb878636ad3..7b8174e16703 100644 --- a/vcl/aqua/source/app/saldata.cxx +++ b/vcl/aqua/source/app/saldata.cxx @@ -28,9 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "saldata.hxx" -#include "salnsmenu.h" -#include "salinst.h" +#include "aqua/saldata.hxx" +#include "aqua/salnsmenu.h" +#include "aqua/salinst.h" + #import "apple_remote/RemoteMainController.h" oslThreadKey SalData::s_aAutoReleaseKey = 0; diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx index 352396a7fb2b..7a07718efaac 100644 --- a/vcl/aqua/source/app/salinst.cxx +++ b/vcl/aqua/source/app/salinst.cxx @@ -32,25 +32,30 @@ #include "tools/fsys.hxx" #include "tools/getprocessworkingdir.hxx" +#include <tools/solarmutex.hxx> + #include "osl/process.h" + #include "rtl/ustrbuf.hxx" + #include "vcl/svapp.hxx" -#include "vcl/print.h" -#include "vcl/salimestatus.hxx" #include "vcl/window.hxx" #include "vcl/timer.hxx" -#include "vcl/impbmp.hxx" - -#include "saldata.hxx" -#include "salinst.h" -#include "salframe.h" -#include "salobj.h" -#include "salsys.h" -#include "salvd.h" -#include "salbmp.h" -#include "salprn.h" -#include "saltimer.h" -#include "vclnsapp.h" + +#include "aqua/saldata.hxx" +#include "aqua/salinst.h" +#include "aqua/salframe.h" +#include "aqua/salobj.h" +#include "aqua/salsys.h" +#include "aqua/salvd.h" +#include "aqua/salbmp.h" +#include "aqua/salprn.h" +#include "aqua/saltimer.h" +#include "aqua/vclnsapp.h" + +#include "print.h" +#include "impbmp.hxx" +#include "salimestatus.hxx" #include <comphelper/processfactory.hxx> @@ -66,7 +71,6 @@ #import "apple_remote/RemoteMainController.h" #include "apple_remote/RemoteControl.h" #include "postmac.h" -#include <tools/solarmutex.hxx> using namespace std; using namespace ::com::sun::star; @@ -890,7 +894,7 @@ bool AquaSalInstance::AnyInput( sal_uInt16 nType ) // ----------------------------------------------------------------------- -SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData* pSystemParentData, sal_uLong nSalFrameStyle ) +SalFrame* AquaSalInstance::CreateChildFrame( SystemParentData*, sal_uLong /*nSalFrameStyle*/ ) { return NULL; } @@ -976,7 +980,7 @@ void AquaSalInstance::GetPrinterQueueInfo( ImplPrnQueueList* pList ) // ----------------------------------------------------------------------- -void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* pInfo ) +void AquaSalInstance::GetPrinterQueueState( SalPrinterQueueInfo* ) { } @@ -1058,13 +1062,13 @@ void AquaSalInstance::DestroySystem( SalSystem* pSystem ) // ----------------------------------------------------------------------- -void AquaSalInstance::SetEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) ) +void AquaSalInstance::SetEventCallback( void*, bool(*)(void*,void*,int) ) { } // ----------------------------------------------------------------------- -void AquaSalInstance::SetErrorEventCallback( void* pInstance, bool(*pCallback)(void*,void*,int) ) +void AquaSalInstance::SetErrorEventCallback( void*, bool(*)(void*,void*,int) ) { } diff --git a/vcl/aqua/source/app/salnstimer.mm b/vcl/aqua/source/app/salnstimer.mm index 73e49fd99c61..f44c3d698f73 100755 --- a/vcl/aqua/source/app/salnstimer.mm +++ b/vcl/aqua/source/app/salnstimer.mm @@ -28,16 +28,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "saltimer.h" -#include "salnstimer.h" -#include "salinst.h" -#include "saldata.hxx" +#include "aqua/saltimer.h" +#include "aqua/salnstimer.h" +#include "aqua/salinst.h" +#include "aqua/saldata.hxx" -#include "vcl/svdata.hxx" +#include "svdata.hxx" @implementation TimerCallbackCaller -(void)timerElapsed:(NSTimer*)pTimer { + (void)pTimer; ImplSVData* pSVData = ImplGetSVData(); if( AquaSalTimer::bDispatchTimer ) { diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx index cf5cf00b7fe4..21da319b42b7 100644 --- a/vcl/aqua/source/app/salsys.cxx +++ b/vcl/aqua/source/app/salsys.cxx @@ -29,14 +29,17 @@ #include "precompiled_vcl.hxx" #include "tools/rc.hxx" -#include "vcl/svids.hrc" -#include "vcl/button.hxx" -#include "salsys.h" -#include "saldata.hxx" -#include "salinst.h" #include "rtl/ustrbuf.hxx" +#include "vcl/button.hxx" + +#include "aqua/salsys.h" +#include "aqua/saldata.hxx" +#include "aqua/salinst.h" + +#include "svids.hrc" + using namespace rtl; // ======================================================================= diff --git a/vcl/aqua/source/app/saltimer.cxx b/vcl/aqua/source/app/saltimer.cxx index 9abcc18bf6af..b482453704af 100644 --- a/vcl/aqua/source/app/saltimer.cxx +++ b/vcl/aqua/source/app/saltimer.cxx @@ -28,11 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "saltimer.h" -#include "salnstimer.h" -#include "saldata.hxx" -#include "salframe.h" -#include "salinst.h" +#include "aqua/saltimer.h" +#include "aqua/salnstimer.h" +#include "aqua/saldata.hxx" +#include "aqua/salframe.h" +#include "aqua/salinst.h" // ======================================================================= diff --git a/vcl/aqua/source/app/vclnsapp.mm b/vcl/aqua/source/app/vclnsapp.mm index 455e7c64c6a4..cfb4d5e62454 100755 --- a/vcl/aqua/source/app/vclnsapp.mm +++ b/vcl/aqua/source/app/vclnsapp.mm @@ -28,18 +28,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "vclnsapp.h" -#include "salinst.h" -#include "saldata.hxx" -#include "salframe.h" -#include "salframeview.h" +#include "rtl/ustrbuf.hxx" #include "vcl/window.hxx" #include "vcl/svapp.hxx" #include "vcl/cmdevt.hxx" -#include "rtl/ustrbuf.hxx" -#include "vcl/impimagetree.hxx" +#include "aqua/vclnsapp.h" +#include "aqua/salinst.h" +#include "aqua/saldata.hxx" +#include "aqua/salframe.h" +#include "aqua/salframeview.h" + +#include "impimagetree.hxx" #include "premac.h" #import "Carbon/Carbon.h" @@ -52,6 +53,7 @@ { // do nothing, this is just to start an NSThread and therefore put // Cocoa into multithread mode + (void)param; } @end @@ -284,11 +286,13 @@ -(NSMenu*)applicationDockMenu:(NSApplication *)sender { + (void)sender; return AquaSalInstance::GetDynamicDockMenu(); } -(BOOL)application: (NSApplication*)app openFile: (NSString*)pFile { + (void)app; const rtl::OUString aFile( GetOUString( pFile ) ); if( ! AquaSalInstance::isOnCommandLine( aFile ) ) { @@ -301,6 +305,7 @@ -(void)application: (NSApplication*) app openFiles: (NSArray*)files { + (void)app; rtl::OUStringBuffer aFileList( 256 ); NSEnumerator* it = [files objectEnumerator]; @@ -330,6 +335,7 @@ -(BOOL)application: (NSApplication*)app printFile: (NSString*)pFile { + (void)app; const rtl::OUString aFile( GetOUString( pFile ) ); const ApplicationEvent* pAppEvent = new ApplicationEvent( String(), ApplicationAddress(), APPEVENT_PRINT_STRING, aFile ); @@ -338,6 +344,9 @@ } -(NSApplicationPrintReply)application: (NSApplication *) app printFiles:(NSArray *)files withSettings: (NSDictionary *)printSettings showPrintPanels:(BOOL)bShowPrintPanels { + (void)app; + (void)printSettings; + (void)bShowPrintPanels; // currently ignores print settings an bShowPrintPanels rtl::OUStringBuffer aFileList( 256 ); @@ -360,6 +369,7 @@ -(NSApplicationTerminateReply)applicationShouldTerminate: (NSApplication *) app { + (void)app; NSApplicationTerminateReply aReply = NSTerminateNow; { YIELD_GUARD; @@ -387,6 +397,7 @@ -(void)systemColorsChanged: (NSNotification*) pNotification { + (void)pNotification; YIELD_GUARD; const SalData* pSalData = GetSalData(); @@ -396,6 +407,7 @@ -(void)screenParametersChanged: (NSNotification*) pNotification { + (void)pNotification; YIELD_GUARD; SalData* pSalData = GetSalData(); @@ -408,11 +420,13 @@ -(void)scrollbarVariantChanged: (NSNotification*) pNotification { + (void)pNotification; GetSalData()->mpFirstInstance->delayedSettingsChanged( true ); } -(void)scrollbarSettingsChanged: (NSNotification*) pNotification { + (void)pNotification; GetSalData()->mpFirstInstance->delayedSettingsChanged( false ); } @@ -436,7 +450,9 @@ #pragma mark - #pragma mark NSApplication Delegates -- (void)applicationWillBecomeActive:(NSNotification *)aNotification { +- (void)applicationWillBecomeActive:(NSNotification *)pNotification +{ + (void)pNotification; if (GetSalData()->mpMainController->remoteControl) { // [remoteControl startListening: self]; @@ -452,7 +468,9 @@ } } -- (void)applicationWillResignActive:(NSNotification *)aNotification { +- (void)applicationWillResignActive:(NSNotification *)pNotification +{ + (void)pNotification; if (GetSalData()->mpMainController->remoteControl) { // [remoteControl stopListening: self]; @@ -470,6 +488,8 @@ - (BOOL)applicationShouldHandleReopen: (NSApplication*)pApp hasVisibleWindows: (BOOL) bWinVisible { + (void)pApp; + (void)bWinVisible; NSObject* pHdl = GetSalData()->mpDockIconClickHandler; if( pHdl && [pHdl respondsToSelector: @selector(dockIconClicked:)] ) { diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx index 01f989cbc1c1..98cbdcc7c5e2 100644 --- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx +++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx @@ -619,7 +619,7 @@ DataProviderPtr_t DataFlavorMapper::getDataProvider(NSString* systemFlavor, Refe return dp; } -DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* systemFlavor, NSArray* systemData) const +DataProviderPtr_t DataFlavorMapper::getDataProvider(const NSString* /*systemFlavor*/, NSArray* systemData) const { return DataProviderPtr_t(new FileListDataProvider(systemData)); } diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx index dab882e75716..f3e73b765c94 100644 --- a/vcl/aqua/source/dtrans/DragSource.cxx +++ b/vcl/aqua/source/dtrans/DragSource.cxx @@ -27,10 +27,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" + #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/awt/MouseButton.hpp> -#include <rtl/unload.h> + +#include "rtl/unload.h" +#include "rtl/ustring.hxx" #include "comphelper/makesequence.hxx" @@ -38,9 +41,9 @@ #include "DragSourceContext.hxx" #include "aqua_clipboard.hxx" #include "DragActionConversion.hxx" -#include "salframe.h" -#include <rtl/ustring.h> +#include "aqua/salframe.h" + #include <memory> @@ -114,44 +117,50 @@ Sequence<OUString> dragSource_getSupportedServiceNames() -(void)draggedImage:(NSImage*)anImage beganAt:(NSPoint)aPoint { - DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource), - new DragSourceContext(mDragSource), - mDragSource, - DNDConstants::ACTION_COPY, - DNDConstants::ACTION_COPY); - - mDragSource->mXDragSrcListener->dragEnter(dsde); + (void)anImage; + (void)aPoint; + DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource), + new DragSourceContext(mDragSource), + mDragSource, + DNDConstants::ACTION_COPY, + DNDConstants::ACTION_COPY); + + mDragSource->mXDragSrcListener->dragEnter(dsde); } -(void)draggedImage:(NSImage *)anImage endedAt:(NSPoint)aPoint operation:(NSDragOperation)operation { - // an internal drop can accept the drop but fail with dropComplete( false ) - // this is different than the Cocoa API - bool bDropSuccess = operation != NSDragOperationNone; - if( DragSource::g_DropSuccessSet ) - bDropSuccess = DragSource::g_DropSuccess; - - DragSourceDropEvent dsde(static_cast<OWeakObject*>(mDragSource), - new DragSourceContext(mDragSource), - static_cast< XDragSource* >(mDragSource), - SystemToOfficeDragActions(operation), - bDropSuccess ); - - mDragSource->mXDragSrcListener->dragDropEnd(dsde); - mDragSource->mXDragSrcListener = uno::Reference<XDragSourceListener>(); + (void)anImage; + (void)aPoint; + // an internal drop can accept the drop but fail with dropComplete( false ) + // this is different than the Cocoa API + bool bDropSuccess = operation != NSDragOperationNone; + if( DragSource::g_DropSuccessSet ) + bDropSuccess = DragSource::g_DropSuccess; + + DragSourceDropEvent dsde(static_cast<OWeakObject*>(mDragSource), + new DragSourceContext(mDragSource), + static_cast< XDragSource* >(mDragSource), + SystemToOfficeDragActions(operation), + bDropSuccess ); + + mDragSource->mXDragSrcListener->dragDropEnd(dsde); + mDragSource->mXDragSrcListener = uno::Reference<XDragSourceListener>(); } -(void)draggedImage:(NSImage *)draggedImage movedTo:(NSPoint)screenPoint { - DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource), - new DragSourceContext(mDragSource), - mDragSource, - DNDConstants::ACTION_COPY, - DNDConstants::ACTION_COPY); - - mDragSource->mXDragSrcListener->dragOver(dsde); + (void)draggedImage; + (void)screenPoint; + DragSourceDragEvent dsde(static_cast<OWeakObject*>(mDragSource), + new DragSourceContext(mDragSource), + mDragSource, + DNDConstants::ACTION_COPY, + DNDConstants::ACTION_COPY); + + mDragSource->mXDragSrcListener->dragOver(dsde); } @end @@ -241,8 +250,8 @@ sal_Int32 SAL_CALL DragSource::getDefaultCursor( sal_Int8 /*dragAction*/ ) void SAL_CALL DragSource::startDrag(const DragGestureEvent& trigger, sal_Int8 sourceActions, - sal_Int32 cursor, - sal_Int32 image, + sal_Int32 /*cursor*/, + sal_Int32 /*image*/, const uno::Reference<XTransferable >& transferable, const uno::Reference<XDragSourceListener >& listener ) throw( RuntimeException) diff --git a/vcl/aqua/source/dtrans/DropTarget.cxx b/vcl/aqua/source/dtrans/DropTarget.cxx index 103b6dc47d44..b55a70872372 100644 --- a/vcl/aqua/source/dtrans/DropTarget.cxx +++ b/vcl/aqua/source/dtrans/DropTarget.cxx @@ -50,8 +50,8 @@ #include <Carbon/Carbon.h> #include <postmac.h> -#include <salframe.h> -#include <salframeview.h> +#include <aqua/salframe.h> +#include <aqua/salframeview.h> using namespace rtl; using namespace cppu; @@ -317,20 +317,20 @@ NSDragOperation DropTarget::draggingUpdated(id sender) } - void DropTarget::draggingExited(id sender) - { +void DropTarget::draggingExited(id /*sender*/) +{ DropTargetEvent dte(static_cast<OWeakObject*>(this), 0); fire_dragExit(dte); mDragSourceSupportedActions = DNDConstants::ACTION_NONE; mSelectedDropAction = DNDConstants::ACTION_NONE; SetThemeCursor(kThemeArrowCursor); - } +} - BOOL DropTarget::prepareForDragOperation(id sender) - { +BOOL DropTarget::prepareForDragOperation(id /*sender*/) +{ return 1; - } +} BOOL DropTarget::performDragOperation(id sender) @@ -372,13 +372,13 @@ BOOL DropTarget::performDragOperation(id sender) } - void DropTarget::concludeDragOperation(id sender) - { +void DropTarget::concludeDragOperation(id /*sender*/) +{ mDragSourceSupportedActions = DNDConstants::ACTION_NONE; mSelectedDropAction = DNDConstants::ACTION_NONE; mXCurrentDragClipboard = uno::Reference<XClipboard>(); SetThemeCursor(kThemeArrowCursor); - } +} // called from WeakComponentImplHelperX::dispose diff --git a/vcl/aqua/source/dtrans/aqua_clipboard.cxx b/vcl/aqua/source/dtrans/aqua_clipboard.cxx index abffeebcb6c1..657211be5dc8 100644 --- a/vcl/aqua/source/dtrans/aqua_clipboard.cxx +++ b/vcl/aqua/source/dtrans/aqua_clipboard.cxx @@ -254,7 +254,7 @@ void SAL_CALL AquaClipboard::removeClipboardListener(const Reference< XClipboard } -void AquaClipboard::applicationDidBecomeActive(NSNotification* aNotification) +void AquaClipboard::applicationDidBecomeActive(NSNotification*) { ClearableMutexGuard aGuard(m_aMutex); @@ -378,7 +378,7 @@ OUString SAL_CALL AquaClipboard::getImplementationName() throw( RuntimeException } -sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& ServiceName ) throw( RuntimeException ) +sal_Bool SAL_CALL AquaClipboard::supportsService( const OUString& /*ServiceName*/ ) throw( RuntimeException ) { return sal_False; } diff --git a/vcl/aqua/source/dtrans/aqua_service.cxx b/vcl/aqua/source/dtrans/aqua_service.cxx deleted file mode 100644 index 57ef1f11175c..000000000000 --- a/vcl/aqua/source/dtrans/aqua_service.cxx +++ /dev/null @@ -1,86 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_vcl.hxx" -#include "aqua_clipboard.hxx" -#include <cppuhelper/factory.hxx> -#include <com/sun/star/container/XSet.hpp> -#include <osl/diagnose.h> - -using namespace rtl; -using namespace com::sun::star::uno; -using namespace com::sun::star::registry; -using namespace cppu; -using namespace com::sun::star::lang; -using namespace com::sun::star::datatransfer::clipboard; -using namespace aqua; - -namespace aqua { - -Reference< XInterface > SAL_CALL createInstance( const Reference< XMultiServiceFactory >& rServiceManager ) -{ - return Reference< XInterface >( static_cast< XClipboard* >( new AquaClipboard(rServiceManager) ) ); -} - -} // namespace aqua - -extern "C" -{ - -void SAL_CALL component_getImplementationEnvironment( - const sal_Char ** ppEnvTypeName, uno_Environment ** ppEnv ) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - -void* SAL_CALL component_getFactory( const sal_Char* pImplName, uno_Interface* pSrvManager, uno_Interface* pRegistryKey ) -{ - void* pRet = 0; - - if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, AQUA_CLIPBOARD_IMPL_NAME ) ) ) - { - Sequence< OUString > aSNS( 1 ); - aSNS.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( AQUA_CLIPBOARD_SERVICE_NAME ) ); - - //OUString( RTL_CONSTASCII_USTRINGPARAM( FPS_IMPL_NAME ) ) - Reference< XSingleServiceFactory > xFactory ( createOneInstanceFactory( - reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ), - OUString::createFromAscii( pImplName ), - createInstance, - aSNS ) ); - if ( xFactory.is() ) - { - xFactory->acquire(); - pRet = xFactory.get(); - } - } - - return pRet; -} - -} // extern "C" diff --git a/vcl/aqua/source/dtrans/makefile.mk b/vcl/aqua/source/dtrans/makefile.mk deleted file mode 100644 index 369799c9a260..000000000000 --- a/vcl/aqua/source/dtrans/makefile.mk +++ /dev/null @@ -1,68 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=dtransaqua -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk - -# ------------------------------------------------------------------ - -.IF "$(OS)"!="MACOSX" -dummy: - @echo "Nothing to build for this platform" -.ELSE # "$(OS)"!="MACOSX" -.IF "$(GUIBASE)"!="aqua" -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" -.ELSE - -CFLAGSCXX+=-fconstant-cfstrings -x objective-c++ -fobjc-exceptions - -SLOFILES= \ - $(SLO)$/aqua_clipboard.obj \ - $(SLO)$/DataFlavorMapping.obj \ - $(SLO)$/OSXTransferable.obj \ - $(SLO)$/HtmlFmtFlt.obj \ - $(SLO)$/PictToBmpFlt.obj \ - $(SLO)$/DropTarget.obj \ - $(SLO)$/DragSource.obj \ - $(SLO)$/service_entry.obj \ - $(SLO)$/DragSourceContext.obj \ - $(SLO)$/DragActionConversion.obj - -# --- Targets ------------------------------------------------------ -.INCLUDE : target.mk - -.ENDIF # "$(GUIBASE)"!="aqua" -.ENDIF # "$(OS)"!="MACOSX" - diff --git a/vcl/aqua/source/dtrans/service_entry.cxx b/vcl/aqua/source/dtrans/service_entry.cxx index ca207c23bdee..327fba900508 100644 --- a/vcl/aqua/source/dtrans/service_entry.cxx +++ b/vcl/aqua/source/dtrans/service_entry.cxx @@ -28,13 +28,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "saldata.hxx" -#include "salinst.h" +#include "osl/diagnose.h" + +#include "vcl/svapp.hxx" + +#include "aqua/saldata.hxx" +#include "aqua/salinst.h" + #include "DragSource.hxx" #include "DropTarget.hxx" #include "aqua_clipboard.hxx" -#include "osl/diagnose.h" -#include "vcl/svapp.hxx" using namespace ::osl; using namespace ::rtl; diff --git a/vcl/aqua/source/dtrans/test_aquacb.cxx b/vcl/aqua/source/dtrans/test_aquacb.cxx deleted file mode 100644 index 85c87c6b9ba9..000000000000 --- a/vcl/aqua/source/dtrans/test_aquacb.cxx +++ /dev/null @@ -1,208 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_vcl.hxx" - -#include "aqua_clipboard.hxx" -#include <cppuhelper/servicefactory.hxx> -#include <com/sun/star/datatransfer/XTransferable.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboardEx.hpp> -#include <com/sun/star/lang/XComponent.hpp> - -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ -#include <cppuhelper/implbase2.hxx> -#endif -#include <rtl/ustring.hxx> -#include <sal/types.h> -#include <osl/diagnose.h> - -#include <stdio.h> - -using namespace ::rtl; -using namespace ::std; -using namespace ::cppu; -using namespace ::com::sun::star::datatransfer; -using namespace ::com::sun::star::datatransfer::clipboard; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::io; -using namespace ::com::sun::star::lang; - -Reference< XTransferable > rXTransfRead; - -class TestTransferable : public WeakImplHelper2< XClipboardOwner, XTransferable > -{ -public: - TestTransferable(); - virtual Any SAL_CALL getTransferData( const DataFlavor& aFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException); - virtual Sequence< DataFlavor > SAL_CALL getTransferDataFlavors() throw(RuntimeException); - virtual sal_Bool SAL_CALL isDataFlavorSupported( const DataFlavor& aFlavor ) throw(RuntimeException); - virtual void SAL_CALL lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) throw(RuntimeException); - -private: - Sequence< DataFlavor > m_seqDFlv; - OUString m_Data; -}; - -TestTransferable::TestTransferable() : - m_seqDFlv( 1 ), - m_Data( RTL_CONSTASCII_USTRINGPARAM( "This is a test string" ) ) -{ - DataFlavor df; - - df.MimeType = OUString::createFromAscii( "text/html" ); - df.DataType = getCppuType( ( Sequence< sal_Int8 >* )0 ); - - m_seqDFlv[0] = df; -} - -Any SAL_CALL TestTransferable::getTransferData( const DataFlavor& aFlavor ) - throw(UnsupportedFlavorException, IOException, RuntimeException) -{ - Any anyData; - - if ( aFlavor.MimeType == m_seqDFlv[0].MimeType ) - { - OString aStr( m_Data.getStr(), m_Data.getLength(), 1252 ); - Sequence< sal_Int8 > sOfChars( aStr.getLength() ); - sal_Int32 lenStr = aStr.getLength(); - - for ( sal_Int32 i = 0; i < lenStr; ++i ) - sOfChars[i] = aStr[i]; - - anyData = makeAny( sOfChars ); - } - - return anyData; -} - -Sequence< DataFlavor > SAL_CALL TestTransferable::getTransferDataFlavors() - throw(RuntimeException) -{ - return m_seqDFlv; -} - -sal_Bool SAL_CALL TestTransferable::isDataFlavorSupported( const DataFlavor& aFlavor ) - throw(RuntimeException) -{ - sal_Int32 nLength = m_seqDFlv.getLength(); - sal_Bool bRet = sal_False; - - for ( sal_Int32 i = 0; i < nLength; ++i ) - { - if ( m_seqDFlv[i].MimeType == aFlavor.MimeType ) - { - bRet = sal_True; - break; - } - } - - return bRet; -} - -void SAL_CALL TestTransferable::lostOwnership( const Reference< XClipboard >& xClipboard, const Reference< XTransferable >& xTrans ) - throw(RuntimeException) -{ -} - -int SAL_CALL main( int argc, char** argv ) -{ - if(argc != 2) - { - fprintf( stderr, "usage: %s <my rdb file>\n", argv[0] ); - return 1; - } - - //------------------------------------------------- - // get the global service-manager - //------------------------------------------------- - OUString rdbName = OUString::createFromAscii( argv[1] ); - Reference< XMultiServiceFactory > g_xFactory( createRegistryServiceFactory( rdbName ) ); - - // Print a message if an error occured. - if ( !g_xFactory.is() ) - { - OSL_ENSURE(sal_False, "Can't create RegistryServiceFactory"); - return(-1); - } - - //------------------------------------------------- - // try to get an Interface to a XFilePicker Service - //------------------------------------------------- - - Reference< XTransferable > rXTransf( static_cast< XTransferable* >( new TestTransferable ) ); - - Reference< XClipboard > xClipboard( g_xFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( AQUA_CLIPBOARD_SERVICE_NAME ) ) ), UNO_QUERY ); - if ( !xClipboard.is() ) - { - OSL_ENSURE( sal_False, "Error creating FolderPicker Service" ); - return(-1); - } - - Reference< XTypeProvider > rXTypProv( xClipboard, UNO_QUERY ); - - if ( rXTypProv.is() ) - { - Sequence< Type > seqType = rXTypProv->getTypes(); - sal_Int32 nLen = seqType.getLength(); - for ( sal_Int32 i = 0; i < nLen; i++ ) - { - Type nxtType = seqType[i]; - } - - Sequence< sal_Int8 > seqInt8 = rXTypProv->getImplementationId(); - } - - xClipboard->setContents( rXTransf, Reference< XClipboardOwner >( rXTransf, UNO_QUERY ) ); - - rXTransfRead = xClipboard->getContents(); - - // destroy the transferable explicitly - rXTransfRead = Reference< XTransferable>(); - - // destroy the clipboard - xClipboard = Reference< XClipboard >(); - - //-------------------------------------------------- - // shutdown the service manager - //-------------------------------------------------- - - // Cast factory to XComponent - Reference< XComponent > xComponent( g_xFactory, UNO_QUERY ); - - if ( !xComponent.is() ) - OSL_ENSURE(sal_False, "Error shuting down"); - - // Dispose and clear factory - xComponent->dispose(); - g_xFactory.clear(); - g_xFactory = Reference< XMultiServiceFactory >(); - - return 0; -} diff --git a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm index 82119fb9c50a..8786ed7d0013 100644 --- a/vcl/aqua/source/gdi/aquaprintaccessoryview.mm +++ b/vcl/aqua/source/gdi/aquaprintaccessoryview.mm @@ -28,18 +28,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "aquaprintview.h" -#include "salinst.h" +#include "tools/resary.hxx" + #include "vcl/print.hxx" #include "vcl/image.hxx" #include "vcl/virdev.hxx" -#include "vcl/svdata.hxx" #include "vcl/svapp.hxx" #include "vcl/unohelp.hxx" -#include "vcl/svids.hrc" +#include "aqua/aquaprintview.h" +#include "aqua/salinst.h" -#include "tools/resary.hxx" +#include "svdata.hxx" +#include "svids.hrc" #include "com/sun/star/i18n/XBreakIterator.hpp" #include "com/sun/star/i18n/WordType.hpp" @@ -918,7 +919,7 @@ static void addRadio( NSView* pCurParent, long& rCurX, long& rCurY, long nAttach [pProto release]; } -static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long nAttachOffset, +static void addList( NSView* pCurParent, long& rCurX, long& rCurY, long /*nAttachOffset*/, const rtl::OUString& rText, const rtl::OUString& rProperty, const Sequence< rtl::OUString > rChoices, sal_Int32 nSelectValue, std::vector<ColumnItem >& rLeftColumn, diff --git a/vcl/aqua/source/gdi/aquaprintview.mm b/vcl/aqua/source/gdi/aquaprintview.mm index 11b4b9088591..692435fc00f0 100755 --- a/vcl/aqua/source/gdi/aquaprintview.mm +++ b/vcl/aqua/source/gdi/aquaprintview.mm @@ -28,10 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "aquaprintview.h" -#include "salprn.h" #include "vcl/print.hxx" +#include "aqua/aquaprintview.h" +#include "aqua/salprn.h" + @implementation AquaPrintView -(id)initWithController: (vcl::PrinterController*)pController withInfoPrinter: (AquaSalInfoPrinter*)pInfoPrinter { @@ -64,6 +65,7 @@ -(NSPoint)locationOfPrintRect: (NSRect)aRect { + (void)aRect; NSPoint aPoint = { 0, 0 }; return aPoint; } diff --git a/vcl/aqua/source/gdi/makefile.mk b/vcl/aqua/source/gdi/makefile.mk deleted file mode 100644 index 2aea58e49250..000000000000 --- a/vcl/aqua/source/gdi/makefile.mk +++ /dev/null @@ -1,74 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salgdi -ENABLE_EXCEPTIONS=TRUE - -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="aqua" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="aqua" - -SLOFILES= $(SLO)$/salmathutils.obj \ - $(SLO)$/salcolorutils.obj \ - $(SLO)$/salgdiutils.obj \ - $(SLO)$/salnativewidgets.obj \ - $(SLO)$/salatsuifontutils.obj \ - $(SLO)$/salatslayout.obj \ - $(SLO)$/salgdi.obj \ - $(SLO)$/salvd.obj \ - $(SLO)$/salprn.obj \ - $(SLO)$/aquaprintview.obj \ - $(SLO)$/aquaprintaccessoryview.obj \ - $(SLO)$/salbmp.obj - -.IF "$(ENABLE_CAIRO)" == "TRUE" -CDEFS+= -DCAIRO -.ENDIF - -.ENDIF # "$(GUIBASE)"!="aqua" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk - diff --git a/vcl/aqua/source/gdi/salatslayout.cxx b/vcl/aqua/source/gdi/salatslayout.cxx index 9626e2fcbdce..62e783522a88 100755 --- a/vcl/aqua/source/gdi/salatslayout.cxx +++ b/vcl/aqua/source/gdi/salatslayout.cxx @@ -25,13 +25,15 @@ * ************************************************************************/ -#include "vcl/salgdi.hxx" -#include "saldata.hxx" -#include "salgdi.h" -#include "vcl/sallayout.hxx" -#include "salatsuifontutils.hxx" #include "tools/debug.hxx" +#include "aqua/saldata.hxx" +#include "aqua/salgdi.h" +#include "aqua/salatsuifontutils.hxx" + +#include "sallayout.hxx" +#include "salgdi.hxx" + #include <math.h> // ======================================================================= @@ -1203,7 +1205,7 @@ void PolyArgs::ClosePolygon() // glyph fallback is supported directly by Aqua // so methods used only by MultiSalLayout can be dummy implementated -bool ATSLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& rPPV ) const { return false; } +bool ATSLayout::GetGlyphOutlines( SalGraphics&, PolyPolyVector& ) const { return false; } void ATSLayout::InitFont() {} void ATSLayout::MoveGlyph( int /*nStart*/, long /*nNewXPos*/ ) {} void ATSLayout::DropGlyph( int /*nStart*/ ) {} @@ -1255,7 +1257,7 @@ const ImplFontData* FallbackInfo::GetFallbackFontData( int nFallbackLevel ) cons // ======================================================================= -SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs& rArgs, int nFallbackLevel ) +SalLayout* AquaSalGraphics::GetTextLayout( ImplLayoutArgs&, int /*nFallbackLevel*/ ) { ATSLayout* pATSLayout = new ATSLayout( maATSUStyle, mfFontScale ); return pATSLayout; diff --git a/vcl/aqua/source/gdi/salatsuifontutils.cxx b/vcl/aqua/source/gdi/salatsuifontutils.cxx index 8281c41ceeab..61fcd78586b3 100644 --- a/vcl/aqua/source/gdi/salatsuifontutils.cxx +++ b/vcl/aqua/source/gdi/salatsuifontutils.cxx @@ -32,10 +32,11 @@ #include <vector> #include <set> -#include "salgdi.h" -#include "saldata.hxx" #include "vcl/svapp.hxx" -#include "salatsuifontutils.hxx" + +#include "aqua/salgdi.h" +#include "aqua/saldata.hxx" +#include "aqua/salatsuifontutils.hxx" // we have to get the font attributes from the name table // since neither head's macStyle nor OS/2's panose are easily available diff --git a/vcl/aqua/source/gdi/salbmp.cxx b/vcl/aqua/source/gdi/salbmp.cxx index e54c7edd6fe5..d73b3eb25511 100644 --- a/vcl/aqua/source/gdi/salbmp.cxx +++ b/vcl/aqua/source/gdi/salbmp.cxx @@ -28,19 +28,22 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "tools/color.hxx" -#include "salbmp.h" -#include "vcl/bitmap.hxx" // for BitmapSystemData -#include "vcl/salbtype.hxx" -#include "vcl/bmpfast.hxx" +#include <boost/bind.hpp> #include "basebmp/scanlineformats.hxx" #include "basebmp/color.hxx" + #include "basegfx/vector/b2ivector.hxx" -#include <boost/bind.hpp> +#include "tools/color.hxx" + +#include "vcl/bitmap.hxx" // for BitmapSystemData +#include "vcl/salbtype.hxx" + +#include "aqua/salbmp.h" +#include "aqua/salinst.h" -#include "salinst.h" +#include "bmpfast.hxx" // ======================================================================= @@ -655,7 +658,7 @@ const BitmapPalette& GetDefaultPalette( int mnBits, bool bMonochrome ) return aEmptyPalette; } -BitmapBuffer* AquaSalBitmap::AcquireBuffer( bool bReadOnly ) +BitmapBuffer* AquaSalBitmap::AcquireBuffer( bool /*bReadOnly*/ ) { if( !maUserBuffer.get() ) // || maContextBuffer.get() && (maUserBuffer.get() != maContextBuffer.get()) ) diff --git a/vcl/aqua/source/gdi/salcolorutils.cxx b/vcl/aqua/source/gdi/salcolorutils.cxx index ec33b2dd8f8d..37b6ec65a108 100755 --- a/vcl/aqua/source/gdi/salcolorutils.cxx +++ b/vcl/aqua/source/gdi/salcolorutils.cxx @@ -28,9 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salcolorutils.hxx" #include "vcl/salbtype.hxx" +#include "aqua/salcolorutils.hxx" + // ======================================================================= SalColor GetSalColor( const float* pQuartzColor ) diff --git a/vcl/aqua/source/gdi/salgdi.cxx b/vcl/aqua/source/gdi/salgdi.cxx index 62906a5df268..3c228ffcfa40 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -28,21 +28,6 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salconst.h" -#include "salgdi.h" -#include "salbmp.h" -#include "salframe.h" -#include "salcolorutils.hxx" -#include "sft.hxx" -#include "salatsuifontutils.hxx" - -#include "vcl/impfont.hxx" -#include "vcl/fontsubset.hxx" -#include "vcl/sysdata.hxx" -#include "vcl/sallayout.hxx" -#include "vcl/svapp.hxx" -#include "vcl/region.h" - #include "osl/file.hxx" #include "osl/process.h" @@ -55,7 +40,24 @@ #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/polygon/b2dpolygontools.hxx" #include "basegfx/matrix/b2dhommatrix.hxx" -#include <basegfx/matrix/b2dhommatrixtools.hxx> +#include "basegfx/matrix/b2dhommatrixtools.hxx" + +#include "vcl/sysdata.hxx" +#include "vcl/svapp.hxx" + +#include "aqua/salconst.h" +#include "aqua/salgdi.h" +#include "aqua/salbmp.h" +#include "aqua/salframe.h" +#include "aqua/salcolorutils.hxx" +#include "aqua/salatsuifontutils.hxx" + +#include "fontsubset.hxx" +#include "impfont.hxx" +#include "region.h" +#include "sallayout.hxx" +#include "sft.hxx" + using namespace vcl; @@ -344,7 +346,7 @@ void AquaSalGraphics::updateResolution() initResolution( (mbWindow && mpFrame) ? mpFrame->mpWindow : nil ); } -void AquaSalGraphics::initResolution( NSWindow* pWin ) +void AquaSalGraphics::initResolution( NSWindow* ) { // #i100617# read DPI only once; there is some kind of weird caching going on // if the main screen changes @@ -1045,22 +1047,22 @@ bool AquaSalGraphics::drawPolyLine( const ::basegfx::B2DPolygon& rPolyLine, // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool AquaSalGraphics::drawPolyLineBezier( sal_uLong, const SalPoint*, const sal_uInt8* ) { return sal_False; } // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong nPoints, const SalPoint* pPtAry, const sal_uInt8* pFlgAry ) +sal_Bool AquaSalGraphics::drawPolygonBezier( sal_uLong, const SalPoint*, const sal_uInt8* ) { return sal_False; } // ----------------------------------------------------------------------- -sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong nPoly, const sal_uLong* pPoints, - const SalPoint* const* pPtAry, const sal_uInt8* const* pFlgAry ) +sal_Bool AquaSalGraphics::drawPolyPolygonBezier( sal_uLong, const sal_uLong*, + const SalPoint* const*, const sal_uInt8* const* ) { return sal_False; } @@ -1146,7 +1148,7 @@ void AquaSalGraphics::copyBits( const SalTwoRect *pPosAry, SalGraphics *pSrcGrap // ----------------------------------------------------------------------- -void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 nFlags ) +void AquaSalGraphics::copyArea( long nDstX, long nDstY,long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, sal_uInt16 /*nFlags*/ ) { ApplyXorContext(); @@ -1228,7 +1230,7 @@ void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rS // ----------------------------------------------------------------------- -void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor nTransparentColor ) +void AquaSalGraphics::drawBitmap( const SalTwoRect* pPosAry, const SalBitmap& rSalBitmap,SalColor ) { DBG_ERROR("not implemented for color masking!"); drawBitmap( pPosAry, rSalBitmap ); @@ -1330,7 +1332,7 @@ SalColor AquaSalGraphics::getPixel( long nX, long nY ) // ----------------------------------------------------------------------- -static void DrawPattern50( void* info, CGContextRef rContext ) +static void DrawPattern50( void*, CGContextRef rContext ) { static const CGRect aRects[2] = { { {0,0}, { 2, 2 } }, { { 2, 2 }, { 2, 2 } } }; CGContextAddRects( rContext, aRects, 2 ); @@ -1597,7 +1599,7 @@ void AquaSalGraphics::GetFontMetric( ImplFontMetricData* pMetric, int nFallbackL // ----------------------------------------------------------------------- -sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong nPairs, ImplKernPairData* pKernPairs ) +sal_uLong AquaSalGraphics::GetKernPairs( sal_uLong, ImplKernPairData* ) { return 0; } @@ -1694,8 +1696,8 @@ void AquaSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) // ----------------------------------------------------------------------- -bool AquaSalGraphics::AddTempDevFont( ImplDevFontList* pFontList, - const String& rFontFileURL, const String& rFontName ) +bool AquaSalGraphics::AddTempDevFont( ImplDevFontList*, + const String& rFontFileURL, const String& /*rFontName*/ ) { ::rtl::OUString aUSytemPath; OSL_VERIFY( !osl::FileBase::getSystemPathFromFileURL( rFontFileURL, aUSytemPath ) ); @@ -1853,7 +1855,7 @@ void AquaSalGraphics::DrawServerFontLayout( const ServerFontLayout& ) // ----------------------------------------------------------------------- -sal_uInt16 AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int nFallbackLevel ) +sal_uInt16 AquaSalGraphics::SetFont( ImplFontSelectData* pReqFont, int /*nFallbackLevel*/ ) { if( !pReqFont ) { @@ -2393,28 +2395,29 @@ void AquaSalGraphics::GetGlyphWidths( const ImplFontData* pFontData, bool bVerti // ----------------------------------------------------------------------- const Ucs2SIntMap* AquaSalGraphics::GetFontEncodingVector( - const ImplFontData* pFontData, const Ucs2OStrMap** ppNonEncoded ) + const ImplFontData*, const Ucs2OStrMap** /*ppNonEncoded*/ ) { return NULL; } // ----------------------------------------------------------------------- -const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData* pFontData, - const sal_Ucs* pUnicodes, - sal_Int32* pWidths, - FontSubsetInfo& rInfo, - long* pDataLen ) +const void* AquaSalGraphics::GetEmbedFontData( const ImplFontData*, + const sal_Ucs* /*pUnicodes*/, + sal_Int32* /*pWidths*/, + FontSubsetInfo&, + long* /*pDataLen*/ ) { return NULL; } // ----------------------------------------------------------------------- -void AquaSalGraphics::FreeEmbedFontData( const void* pData, long nDataLen ) +void AquaSalGraphics::FreeEmbedFontData( const void* pData, long /*nDataLen*/ ) { // TODO: implementing this only makes sense when the implementation of // AquaSalGraphics::GetEmbedFontData() returns non-NULL + (void)pData; DBG_ASSERT( (pData!=NULL), "AquaSalGraphics::FreeEmbedFontData() is not implemented\n"); } diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx index 9bafb50d19fc..1652dadfbdfb 100755 --- a/vcl/aqua/source/gdi/salgdiutils.cxx +++ b/vcl/aqua/source/gdi/salgdiutils.cxx @@ -28,20 +28,22 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salgdi.h" -#include "salframe.h" +#include <boost/bind.hpp> #include "basebmp/scanlineformats.hxx" #include "basebmp/color.hxx" + #include "basegfx/range/b2drectangle.hxx" #include "basegfx/range/b2irange.hxx" #include "basegfx/vector/b2ivector.hxx" #include "basegfx/polygon/b2dpolygon.hxx" #include "basegfx/polygon/b2dpolygontools.hxx" -#include <boost/bind.hpp> #include "vcl/svapp.hxx" -#include "saldata.hxx" + +#include "aqua/salgdi.h" +#include "aqua/salframe.h" +#include "aqua/saldata.hxx" // ---------------------------------------------------------------------- @@ -269,7 +271,7 @@ CGPoint* AquaSalGraphics::makeCGptArray(sal_uLong nPoints, const SalPoint* pPtA // ----------------------------------------------------------------------- -void AquaSalGraphics::UpdateWindow( NSRect& rRect ) +void AquaSalGraphics::UpdateWindow( NSRect& ) { if( !mpFrame ) return; diff --git a/vcl/aqua/source/gdi/salmathutils.cxx b/vcl/aqua/source/gdi/salmathutils.cxx index 8df44acbf730..1a0011068194 100755 --- a/vcl/aqua/source/gdi/salmathutils.cxx +++ b/vcl/aqua/source/gdi/salmathutils.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salmathutils.hxx" +#include "aqua/salmathutils.hxx" #include <stdlib.h> diff --git a/vcl/aqua/source/gdi/salnativewidgets.cxx b/vcl/aqua/source/gdi/salnativewidgets.cxx index d2763411e039..f66c7aa2b32d 100644 --- a/vcl/aqua/source/gdi/salnativewidgets.cxx +++ b/vcl/aqua/source/gdi/salnativewidgets.cxx @@ -25,17 +25,17 @@ * ************************************************************************/ -#include "salconst.h" -#include "salgdi.h" -#include "salnativewidgets.h" -#include "saldata.hxx" -#include "salframe.h" - #include "vcl/salnativewidgets.hxx" #include "vcl/decoview.hxx" #include "vcl/svapp.hxx" #include "vcl/timer.hxx" +#include "aqua/salconst.h" +#include "aqua/salgdi.h" +#include "aqua/salnativewidgets.h" +#include "aqua/saldata.hxx" +#include "aqua/salframe.h" + #include "premac.h" #include <Carbon/Carbon.h> #include "postmac.h" @@ -475,7 +475,7 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ) + const rtl::OUString& ) { sal_Bool bOK = sal_False; @@ -1228,9 +1228,9 @@ sal_Bool AquaSalGraphics::drawNativeControl(ControlType nType, * aValue: An optional value (tristate/numerical/string) * aCaption: A caption or title string (like button text etc) */ -sal_Bool AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, - ControlState nState, const ImplControlValue& aValue, - const rtl::OUString& aCaption ) +sal_Bool AquaSalGraphics::drawNativeControlText( ControlType /*nType*/, ControlPart /*nPart*/, const Rectangle& /*rControlRegion*/, + ControlState /*nState*/, const ImplControlValue& /*aValue*/, + const rtl::OUString& ) { return( sal_False ); } @@ -1249,8 +1249,8 @@ sal_Bool AquaSalGraphics::drawNativeControlText( ControlType nType, ControlPart * aValue: An optional value (tristate/numerical/string) * aCaption: A caption or title string (like button text etc) */ -sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, - const ImplControlValue& aValue, const rtl::OUString& aCaption, +sal_Bool AquaSalGraphics::getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState /*nState*/, + const ImplControlValue& aValue, const rtl::OUString&, Rectangle &rNativeBoundingRegion, Rectangle &rNativeContentRegion ) { diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index ed80110cacc6..92a4e92f6849 100644 --- a/vcl/aqua/source/gdi/salprn.cxx +++ b/vcl/aqua/source/gdi/salprn.cxx @@ -28,17 +28,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" -#include "salprn.h" -#include "aquaprintview.h" -#include "salgdi.h" -#include "saldata.hxx" -#include "vcl/jobset.h" -#include "vcl/salptype.hxx" +#include <boost/bind.hpp> + #include "vcl/print.hxx" #include "vcl/unohelp.hxx" -#include <boost/bind.hpp> +#include "aqua/salinst.h" +#include "aqua/salprn.h" +#include "aqua/aquaprintview.h" +#include "aqua/salgdi.h" +#include "aqua/saldata.hxx" + +#include "jobset.h" +#include "salptype.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/container/XNameAccess.hpp" @@ -176,7 +178,7 @@ void AquaSalInfoPrinter::ReleaseGraphics( SalGraphics* ) // ----------------------------------------------------------------------- -sal_Bool AquaSalInfoPrinter::Setup( SalFrame* i_pFrame, ImplJobSetup* i_pSetupData ) +sal_Bool AquaSalInfoPrinter::Setup( SalFrame*, ImplJobSetup* ) { return sal_False; } @@ -360,14 +362,14 @@ sal_Bool AquaSalInfoPrinter::SetData( sal_uLong i_nFlags, ImplJobSetup* io_pSetu // ----------------------------------------------------------------------- -sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* i_pSetupData ) +sal_uLong AquaSalInfoPrinter::GetPaperBinCount( const ImplJobSetup* ) { return 0; } // ----------------------------------------------------------------------- -XubString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup* i_pSetupData, sal_uLong i_nPaperBin ) +XubString AquaSalInfoPrinter::GetPaperBinName( const ImplJobSetup*, sal_uLong ) { return XubString(); } @@ -436,7 +438,7 @@ static bool getUseNativeDialog() return bNative; } -sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup* i_pSetupData, sal_uInt16 i_nType ) +sal_uLong AquaSalInfoPrinter::GetCapabilities( const ImplJobSetup*, sal_uInt16 i_nType ) { switch( i_nType ) { @@ -520,7 +522,7 @@ static Size getPageSize( vcl::PrinterController& i_rController, sal_Int32 i_nPag sal_Bool AquaSalInfoPrinter::StartJob( const String* i_pFileName, const String& i_rJobName, - const String& i_rAppName, + const String& /*i_rAppName*/, ImplJobSetup* i_pSetupData, vcl::PrinterController& i_rController ) @@ -771,13 +773,13 @@ sal_Bool AquaSalPrinter::StartJob( const String* i_pFileName, // ----------------------------------------------------------------------- -sal_Bool AquaSalPrinter::StartJob( const XubString* i_pFileName, - const XubString& i_rJobName, - const XubString& i_rAppName, - sal_uLong i_nCopies, - bool i_bCollate, - bool i_bDirect, - ImplJobSetup* i_pSetupData ) +sal_Bool AquaSalPrinter::StartJob( const XubString* /*i_pFileName*/, + const XubString& /*i_rJobName*/, + const XubString& /*i_rAppName*/, + sal_uLong /*i_nCopies*/, + bool /*i_bCollate*/, + bool /*i_bDirect*/, + ImplJobSetup* ) { DBG_ERROR( "should never be called" ); return sal_False; @@ -818,7 +820,7 @@ sal_uLong AquaSalPrinter::GetErrorCode() return mpInfoPrinter->GetErrorCode(); } -void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* i_pSetupData ) +void AquaSalInfoPrinter::InitPaperFormats( const ImplJobSetup* ) { m_aPaperFormats.clear(); m_bPapersInit = true; @@ -883,7 +885,7 @@ const PaperInfo* AquaSalInfoPrinter::matchPaper( long i_nWidth, long i_nHeight, return pMatch; } -int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* i_pSetupData ) +int AquaSalInfoPrinter::GetLandscapeAngle( const ImplJobSetup* ) { return 900; } diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx index b40f5e602ebe..8e77c67c7854 100644 --- a/vcl/aqua/source/gdi/salvd.cxx +++ b/vcl/aqua/source/gdi/salvd.cxx @@ -28,15 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salvd.h" -#include "salinst.h" -#include "salgdi.h" -#include "saldata.hxx" -#include "salframe.h" -#include <vcl/svapp.hxx> - +#include "vcl/svapp.hxx" #include "vcl/sysdata.hxx" +#include "aqua/salvd.h" +#include "aqua/salinst.h" +#include "aqua/salgdi.h" +#include "aqua/saldata.hxx" +#include "aqua/salframe.h" + // ----------------------------------------------------------------------- SalVirtualDevice* AquaSalInstance::CreateVirtualDevice( SalGraphics* pGraphics, @@ -149,7 +149,7 @@ SalGraphics* AquaSalVirtualDevice::GetGraphics() // ----------------------------------------------------------------------- -void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics *pGraphics ) +void AquaSalVirtualDevice::ReleaseGraphics( SalGraphics* ) { mbGraphicsUsed = false; } diff --git a/vcl/aqua/source/res/makefile.mk b/vcl/aqua/source/res/makefile.mk deleted file mode 100644 index 2043504450e7..000000000000 --- a/vcl/aqua/source/res/makefile.mk +++ /dev/null @@ -1,54 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. -TARGET=aquares - -# --- Settings ------------------------------------------------- - -.INCLUDE : settings.mk - -# --- Files ---------------------------------------------------- - -.IF "$(OS)"!="MACOSX" - -dummy: - @echo "Nothing to build for OS $(OS)" - -.ELSE # "$(OS)"!="MACOSX" - -ZIPFLAGS = -r -ZIP1TARGET = osxres -#ZIP1DIR = -ZIP1LIST = MainMenu.nib/*.nib cursors/*.png - -# --- Targets -------------------------------------------------- - -.INCLUDE : target.mk - -.ENDIF # "$(OS)"!="MACOSX" - diff --git a/vcl/aqua/source/window/makefile.mk b/vcl/aqua/source/window/makefile.mk deleted file mode 100644 index 7afbce885e4a..000000000000 --- a/vcl/aqua/source/window/makefile.mk +++ /dev/null @@ -1,63 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# This file is part of OpenOffice.org. -# -# OpenOffice.org is free software: you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License version 3 -# only, as published by the Free Software Foundation. -# -# OpenOffice.org is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Lesser General Public License version 3 for more details -# (a copy is included in the LICENSE file that accompanied this code). -# -# You should have received a copy of the GNU Lesser General Public License -# version 3 along with OpenOffice.org. If not, see -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=..$/..$/.. - -PRJNAME=vcl -TARGET=salwin -.INCLUDE : $(PRJ)$/util$/makefile.pmk - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ----------------------------------------------------- - -.INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/makefile2.pmk - -# --- Files -------------------------------------------------------- - -.IF "$(GUIBASE)"!="aqua" - -dummy: - @echo "Nothing to build for GUIBASE $(GUIBASE)" - -.ELSE # "$(GUIBASE)"!="aqua" - -SLOFILES= \ - $(SLO)/salframe.obj \ - $(SLO)/salframeview.obj \ - $(SLO)/salmenu.obj \ - $(SLO)/salnsmenu.obj \ - $(SLO)/salobj.obj - -.ENDIF # "$(GUIBASE)"!="aqua" - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -.INCLUDE : $(PRJ)$/util$/target.pmk diff --git a/vcl/aqua/source/window/salframe.cxx b/vcl/aqua/source/window/salframe.cxx index 676014be2277..8749774459d3 100644 --- a/vcl/aqua/source/window/salframe.cxx +++ b/vcl/aqua/source/window/salframe.cxx @@ -30,28 +30,31 @@ #include <string> -#include "saldata.hxx" -#include "salgdi.h" -#include "salframe.h" -#include "salmenu.h" -#include "saltimer.h" -#include "salinst.h" -#include "salframeview.h" -#include "aqua11yfactory.h" -#include "vcl/salwtype.hxx" +#include "rtl/ustrbuf.hxx" + +#include "osl/file.h" + +#include "vcl/svapp.hxx" #include "vcl/window.hxx" #include "vcl/timer.hxx" +#include "aqua/saldata.hxx" +#include "aqua/salgdi.h" +#include "aqua/salframe.h" +#include "aqua/salmenu.h" +#include "aqua/saltimer.h" +#include "aqua/salinst.h" +#include "aqua/salframeview.h" +#include "aqua/aqua11yfactory.h" + +#include "salwtype.hxx" + #include "premac.h" // needed for theming // FIXME: move theming code to salnativewidgets.cxx #include <Carbon/Carbon.h> #include "postmac.h" -#include "boost/assert.hpp" -#include "vcl/svapp.hxx" -#include "rtl/ustrbuf.hxx" -#include "osl/file.h" using namespace std; @@ -285,6 +288,7 @@ SalGraphics* AquaSalFrame::GetGraphics() void AquaSalFrame::ReleaseGraphics( SalGraphics *pGraphics ) { + (void)pGraphics; DBG_ASSERT( pGraphics == mpGraphics, "graphics released on wrong frame" ); mbGraphics = FALSE; } @@ -478,7 +482,7 @@ void AquaSalFrame::Show(sal_Bool bVisible, sal_Bool bNoActivate) // ----------------------------------------------------------------------- -void AquaSalFrame::Enable( sal_Bool bEnable ) +void AquaSalFrame::Enable( sal_Bool ) { } @@ -863,7 +867,7 @@ void AquaSalFrame::StartPresentation( sal_Bool bStart ) // ----------------------------------------------------------------------- -void AquaSalFrame::SetAlwaysOnTop( sal_Bool bOnTop ) +void AquaSalFrame::SetAlwaysOnTop( sal_Bool ) { } @@ -1035,7 +1039,7 @@ void AquaSalFrame::SetInputContext( SalInputContext* pContext ) // ----------------------------------------------------------------------- -void AquaSalFrame::EndExtTextInput( sal_uInt16 nFlags ) +void AquaSalFrame::EndExtTextInput( sal_uInt16 ) { } @@ -1543,7 +1547,7 @@ SalPointerState AquaSalFrame::GetPointerState() return state; } -bool AquaSalFrame::SetPluginParent( SystemParentData* pNewParent ) +bool AquaSalFrame::SetPluginParent( SystemParentData* ) { // plugin parent may be killed unexpectedly by // plugging process; diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index ba8751307c70..dd2deefdeeaa 100755 --- a/vcl/aqua/source/window/salframeview.mm +++ b/vcl/aqua/source/window/salframeview.mm @@ -28,16 +28,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" -#include "salgdi.h" -#include "salframe.h" -#include "salframeview.h" -#include "aqua11yfactory.h" #include <sal/alloca.h> -#include "vcl/window.hxx" +#include "vcl/window.hxx" #include "vcl/svapp.hxx" +#include "aqua/salinst.h" +#include "aqua/salgdi.h" +#include "aqua/salframe.h" +#include "aqua/salframeview.h" +#include "aqua/aqua11yfactory.h" + #define WHEEL_EVENT_FACTOR 1.5 static sal_uInt16 ImplGetModifierMask( unsigned int nMask ) @@ -206,6 +207,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidBecomeKey: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -236,6 +238,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidResignKey: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -247,6 +250,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidChangeScreen: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -255,6 +259,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidMove: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -266,6 +271,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidResize: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -278,6 +284,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidMiniaturize: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -290,6 +297,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)windowDidDeminiaturize: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -302,6 +310,7 @@ static AquaSalFrame* getMouseContainerFrame() -(BOOL)windowShouldClose: (NSNotification*)pNotification { + (void)pNotification; YIELD_GUARD; BOOL bRet = YES; @@ -321,6 +330,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)dockMenuItemTriggered: (id)sender { + (void)sender; YIELD_GUARD; if( mpFrame && AquaSalFrame::isAlive( mpFrame ) ) @@ -369,6 +379,7 @@ static AquaSalFrame* getMouseContainerFrame() -(void)unregisterDraggingDestinationHandler:(id)theHandler { + (void)theHandler; mDraggingDestinationHandler = nil; } @@ -420,6 +431,7 @@ static AquaSalFrame* getMouseContainerFrame() -(BOOL)acceptsFirstMouse: (NSEvent*)pEvent { + (void)pEvent; return YES; } @@ -730,6 +742,7 @@ private: { //Rotation : -(float)rotation; // TODO: create new CommandType so rotation is available to the applications + (void)pEvent; } - (void)swipeWithEvent: (NSEvent*)pEvent @@ -1025,294 +1038,352 @@ private: -(void)insertTab: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_TAB character: '\t' modifiers: 0]; } -(void)insertBacktab: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: (KEY_TAB | KEY_SHIFT) character: '\t' modifiers: 0]; } -(void)moveLeft: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_LEFT character: 0 modifiers: 0]; } -(void)moveLeftAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_LEFT character: 0 modifiers: NSShiftKeyMask]; } -(void)moveBackwardAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_BACKWARD character: 0 modifiers: 0]; } -(void)moveRight: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_RIGHT character: 0 modifiers: 0]; } -(void)moveRightAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_RIGHT character: 0 modifiers: NSShiftKeyMask]; } -(void)moveForwardAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_FORWARD character: 0 modifiers: 0]; } -(void)moveWordLeft: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)moveWordBackward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)moveWordBackwardAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)moveWordLeftAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)moveWordRight: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0]; } -(void)moveWordForward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_WORD_FORWARD character: 0 modifiers: 0]; } -(void)moveWordForwardAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0]; } -(void)moveWordRightAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD_FORWARD character: 0 modifiers: 0]; } -(void)moveToEndOfLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)moveToRightEndOfLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)moveToEndOfLineAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)moveToRightEndOfLineAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)moveToBeginningOfLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)moveToLeftEndOfLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)moveToBeginningOfLineAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)moveToLeftEndOfLineAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)moveToEndOfParagraph: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveToEndOfParagraphAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveParagraphForward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveParagraphForwardAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveToBeginningOfParagraph: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveParagraphBackward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveToBeginningOfParagraphAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveParagraphBackwardAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)moveToEndOfDocument: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)scrollToEndOfDocument: (id)aSender { + (void)aSender; // this is not exactly what we should do, but it makes "End" and "Shift-End" behave consistent [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_END_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)moveToEndOfDocumentAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_END_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)moveToBeginningOfDocument: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)scrollToBeginningOfDocument: (id)aSender { + (void)aSender; // this is not exactly what we should do, but it makes "Home" and "Shift-Home" behave consistent [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::MOVE_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)moveToBeginningOfDocumentAndModifySelection: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_TO_BEGIN_OF_DOCUMENT character: 0 modifiers: 0]; } -(void)moveUp: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_UP character: 0 modifiers: 0]; } -(void)moveDown: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_DOWN character: 0 modifiers: 0]; } -(void)insertNewline: (id)aSender { + (void)aSender; // #i91267# make enter and shift-enter work by evaluating the modifiers [self sendKeyInputAndReleaseToFrame: KEY_RETURN character: '\n' modifiers: mpFrame->mnLastModifierFlags]; } -(void)deleteBackward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_BACKSPACE character: '\b' modifiers: 0]; } -(void)deleteForward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_DELETE character: 0x7f modifiers: 0]; } -(void)deleteBackwardByDecomposingPreviousCharacter: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_BACKSPACE character: '\b' modifiers: 0]; } -(void)deleteWordBackward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_WORD_BACKWARD character: 0 modifiers: 0]; } -(void)deleteWordForward: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_WORD_FORWARD character: 0 modifiers: 0]; } -(void)deleteToBeginningOfLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_LINE character: 0 modifiers: 0]; } -(void)deleteToEndOfLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_END_OF_LINE character: 0 modifiers: 0]; } -(void)deleteToBeginningOfParagraph: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_BEGIN_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)deleteToEndOfParagraph: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::DELETE_TO_END_OF_PARAGRAPH character: 0 modifiers: 0]; } -(void)insertLineBreak: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::INSERT_LINEBREAK character: 0 modifiers: 0]; } -(void)insertParagraphSeparator: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::INSERT_PARAGRAPH character: 0 modifiers: 0]; } -(void)selectWord: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_WORD character: 0 modifiers: 0]; } -(void)selectLine: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_LINE character: 0 modifiers: 0]; } -(void)selectParagraph: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_PARAGRAPH character: 0 modifiers: 0]; } -(void)selectAll: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: com::sun::star::awt::Key::SELECT_ALL character: 0 modifiers: 0]; } -(void)cancelOperation: (id)aSender { + (void)aSender; [self sendKeyInputAndReleaseToFrame: KEY_ESCAPE character: 0x1b modifiers: 0]; } -(void)noop: (id)aSender { + (void)aSender; if( ! mbKeyHandled ) { if( ! [self sendSingleCharacter:mpLastEvent] ) @@ -1512,12 +1583,14 @@ private: - (NSAttributedString *)attributedSubstringFromRange:(NSRange)theRange { + (void)theRange; // FIXME return nil; } - (unsigned int)characterIndexForPoint:(NSPoint)thePoint { + (void)thePoint; // FIXME return 0; } @@ -1561,6 +1634,7 @@ private: - (NSRect)firstRectForCharacterRange:(NSRange)theRange { + (void)theRange; SalExtTextInputPosEvent aPosEvent; mpFrame->CallCallback( SALEVENT_EXTTEXTINPUTPOS, (void *)&aPosEvent ); @@ -1606,7 +1680,8 @@ private: -(void)unregisterMouseEventListener: (id)theListener { - mpMouseEventListener = nil; + (void)theListener; + mpMouseEventListener = nil; } -(NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender @@ -1646,7 +1721,8 @@ private: -(void)unregisterDraggingDestinationHandler:(id)theHandler { - mDraggingDestinationHandler = nil; + (void)theHandler; + mDraggingDestinationHandler = nil; } @end diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index fa045776c448..c237b10f1512 100644 --- a/vcl/aqua/source/window/salmenu.cxx +++ b/vcl/aqua/source/window/salmenu.cxx @@ -25,21 +25,23 @@ * ************************************************************************/ -#include "saldata.hxx" -#include "salinst.h" -#include "salmenu.h" -#include "salnsmenu.h" -#include "salframe.h" -#include "salbmp.h" -#include "vcl/svids.hrc" +#include "rtl/ustrbuf.hxx" + #include "vcl/cmdevt.hxx" #include "vcl/floatwin.hxx" -#include "vcl/window.h" #include "vcl/window.hxx" #include "vcl/svapp.hxx" -#include "rtl/ustrbuf.hxx" -#include "aqua11ywrapper.h" +#include "aqua/saldata.hxx" +#include "aqua/salinst.h" +#include "aqua/salmenu.h" +#include "aqua/salnsmenu.h" +#include "aqua/salframe.h" +#include "aqua/salbmp.h" +#include "aqua/aqua11ywrapper.h" + +#include "svids.hrc" +#include "window.h" const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL; @@ -79,12 +81,14 @@ const AquaSalMenu* AquaSalMenu::pCurrentMenuBar = NULL; -(void)showPreferences: (id) sender { + (void)sender; YIELD_GUARD; [self showDialog: SHOWDIALOG_ID_PREFERENCES]; } -(void)showAbout: (id) sender { + (void)sender; YIELD_GUARD; [self showDialog: SHOWDIALOG_ID_ABOUT]; @@ -591,7 +595,7 @@ void AquaSalMenu::RemoveItem( unsigned nPos ) [mpMenu removeItemAtIndex: getItemIndexByPos(nPos)]; } -void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) +void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned /*nPos*/ ) { AquaSalMenuItem *pAquaSalMenuItem = static_cast<AquaSalMenuItem*>(pSalMenuItem); AquaSalMenu *subAquaSalMenu = static_cast<AquaSalMenu*>(pSubMenu); @@ -649,7 +653,7 @@ void AquaSalMenu::EnableItem( unsigned nPos, sal_Bool bEnable ) } } -void AquaSalMenu::SetItemImage( unsigned nPos, SalMenuItem* pSMI, const Image& rImage ) +void AquaSalMenu::SetItemImage( unsigned /*nPos*/, SalMenuItem* pSMI, const Image& rImage ) { AquaSalMenuItem* pSalMenuItem = static_cast<AquaSalMenuItem*>( pSMI ); if( ! pSalMenuItem || ! pSalMenuItem->mpMenuItem ) @@ -662,7 +666,7 @@ void AquaSalMenu::SetItemImage( unsigned nPos, SalMenuItem* pSMI, const Image& r [pImage release]; } -void AquaSalMenu::SetItemText( unsigned i_nPos, SalMenuItem* i_pSalMenuItem, const XubString& i_rText ) +void AquaSalMenu::SetItemText( unsigned /*i_nPos*/, SalMenuItem* i_pSalMenuItem, const XubString& i_rText ) { if (!i_pSalMenuItem) return; @@ -699,7 +703,7 @@ void AquaSalMenu::SetItemText( unsigned i_nPos, SalMenuItem* i_pSalMenuItem, con } } -void AquaSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& rKeyName ) +void AquaSalMenu::SetAccelerator( unsigned /*nPos*/, SalMenuItem* pSalMenuItem, const KeyCode& rKeyCode, const XubString& /*rKeyName*/ ) { sal_uInt16 nModifier; sal_Unicode nCommandKey = 0; @@ -782,7 +786,7 @@ void AquaSalMenu::SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, cons [pString release]; } -void AquaSalMenu::GetSystemMenuData( SystemMenuData* pData ) +void AquaSalMenu::GetSystemMenuData( SystemMenuData* ) { } diff --git a/vcl/aqua/source/window/salnsmenu.mm b/vcl/aqua/source/window/salnsmenu.mm index 015c43aed70f..fcc2392a01a9 100755 --- a/vcl/aqua/source/window/salnsmenu.mm +++ b/vcl/aqua/source/window/salnsmenu.mm @@ -28,11 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_vcl.hxx" -#include "salinst.h" -#include "saldata.hxx" -#include "salframe.h" -#include "salmenu.h" -#include "salnsmenu.h" +#include "aqua/salinst.h" +#include "aqua/saldata.hxx" +#include "aqua/salframe.h" +#include "aqua/salmenu.h" +#include "aqua/salnsmenu.h" #include "vcl/window.hxx" @@ -45,6 +45,7 @@ -(void)menuNeedsUpdate: (NSMenu*)pMenu { + (void)pMenu; YIELD_GUARD; if( mpMenu ) @@ -84,6 +85,7 @@ } -(void)menuItemTriggered: (id)aSender { + (void)aSender; YIELD_GUARD; const AquaSalFrame* pFrame = mpMenuItem->mpParentMenu ? mpMenuItem->mpParentMenu->getFrame() : NULL; diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx index 3df1347e3b10..6b5952bee8a1 100644 --- a/vcl/aqua/source/window/salobj.cxx +++ b/vcl/aqua/source/window/salobj.cxx @@ -30,9 +30,9 @@ #include <string.h> -#include "saldata.hxx" -#include "salobj.h" -#include "salframe.h" +#include "aqua/saldata.hxx" +#include "aqua/salobj.h" +#include "aqua/salframe.h" // ======================================================================= @@ -114,7 +114,7 @@ sal_uInt16 AquaSalObject::GetClipRegionType() // ----------------------------------------------------------------------- -void AquaSalObject::BeginSetClipRegion( sal_uLong nRectCount ) +void AquaSalObject::BeginSetClipRegion( sal_uLong ) { mbClip = false; } @@ -208,7 +208,7 @@ void AquaSalObject::Show( sal_Bool bVisible ) // ----------------------------------------------------------------------- -void AquaSalObject::Enable( sal_Bool bEnable ) +void AquaSalObject::Enable( sal_Bool ) { } @@ -226,7 +226,7 @@ void AquaSalObject::SetBackground() // ----------------------------------------------------------------------- -void AquaSalObject::SetBackground( SalColor nSalColor ) +void AquaSalObject::SetBackground( SalColor ) { } |