diff options
Diffstat (limited to 'vcl/aqua/source')
85 files changed, 289 insertions, 937 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..4ce39da6c2bf 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> 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..1330424df739 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; 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..d4c27812de63 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> 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..ce2db7745c30 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> 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..f1a4fc1213c7 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; diff --git a/vcl/aqua/source/app/salnstimer.mm b/vcl/aqua/source/app/salnstimer.mm index 73e49fd99c61..2f1f0158cc05 100755 --- a/vcl/aqua/source/app/salnstimer.mm +++ b/vcl/aqua/source/app/salnstimer.mm @@ -28,12 +28,12 @@ // 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 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..f79414457452 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" diff --git a/vcl/aqua/source/dtrans/DragSource.cxx b/vcl/aqua/source/dtrans/DragSource.cxx index 62b153176893..1db6a3a848e1 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> 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 222b5cf40e04..9af69045888d 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 038f366b584c..ce3d6a9d3d98 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" diff --git a/vcl/aqua/source/gdi/aquaprintview.mm b/vcl/aqua/source/gdi/aquaprintview.mm index 11b4b9088591..947906ce4172 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 { 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..1b505abd60d9 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> // ======================================================================= 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..00ae72b4fa9e 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" // ======================================================================= 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 7a3a2a76f173..6275cfbcef1d 100644 --- a/vcl/aqua/source/gdi/salgdi.cxx +++ b/vcl/aqua/source/gdi/salgdi.cxx @@ -28,20 +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 "osl/file.hxx" #include "osl/process.h" @@ -54,7 +40,23 @@ #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 "sallayout.hxx" +#include "sft.hxx" + using namespace vcl; diff --git a/vcl/aqua/source/gdi/salgdiutils.cxx b/vcl/aqua/source/gdi/salgdiutils.cxx index 9bafb50d19fc..8daa456a03c2 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" // ---------------------------------------------------------------------- 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..b06bf753e54f 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" diff --git a/vcl/aqua/source/gdi/salprn.cxx b/vcl/aqua/source/gdi/salprn.cxx index 0df146eef8fa..04098f68de67 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" diff --git a/vcl/aqua/source/gdi/salvd.cxx b/vcl/aqua/source/gdi/salvd.cxx index b40f5e602ebe..6e71fa482b21 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, 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..7521dd7cc253 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; diff --git a/vcl/aqua/source/window/salframeview.mm b/vcl/aqua/source/window/salframeview.mm index 783d203c76fd..1d5a50315adc 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 ) diff --git a/vcl/aqua/source/window/salmenu.cxx b/vcl/aqua/source/window/salmenu.cxx index fa045776c448..fa5026abb245 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; diff --git a/vcl/aqua/source/window/salnsmenu.mm b/vcl/aqua/source/window/salnsmenu.mm index 015c43aed70f..cd6f7e1e2f28 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" diff --git a/vcl/aqua/source/window/salobj.cxx b/vcl/aqua/source/window/salobj.cxx index 3df1347e3b10..bbbb85cd1351 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" // ======================================================================= |