diff options
28 files changed, 46 insertions, 29 deletions
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 0fca5542278c..a8fbeb50eb87 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -25,6 +25,7 @@ $(eval $(call gb_Library_use_external,tk,boost_headers)) $(eval $(call gb_Library_set_include,tk,\ $$(INCLUDE) \ + -I$(SRCDIR)/toolkit/inc \ -I$(SRCDIR)/toolkit/source \ )) diff --git a/include/toolkit/helper/accessibilityclient.hxx b/toolkit/inc/helper/accessibilityclient.hxx index 26d6f56df8a3..26d6f56df8a3 100644 --- a/include/toolkit/helper/accessibilityclient.hxx +++ b/toolkit/inc/helper/accessibilityclient.hxx diff --git a/include/toolkit/helper/imagealign.hxx b/toolkit/inc/helper/imagealign.hxx index 7b063c9a14d5..7b063c9a14d5 100644 --- a/include/toolkit/helper/imagealign.hxx +++ b/toolkit/inc/helper/imagealign.hxx diff --git a/include/toolkit/helper/tkresmgr.hxx b/toolkit/inc/helper/tkresmgr.hxx index 668a1bdaf186..668a1bdaf186 100644 --- a/include/toolkit/helper/tkresmgr.hxx +++ b/toolkit/inc/helper/tkresmgr.hxx diff --git a/include/toolkit/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx index 12ee104a1338..12ee104a1338 100644 --- a/include/toolkit/helper/unopropertyarrayhelper.hxx +++ b/toolkit/inc/helper/unopropertyarrayhelper.hxx diff --git a/include/toolkit/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx index b5aaa282ded0..e62075d4f7cf 100644 --- a/include/toolkit/helper/unowrapper.hxx +++ b/toolkit/inc/helper/unowrapper.hxx @@ -24,11 +24,11 @@ #include <com/sun/star/awt/XGraphics.hpp> #include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> -#include <toolkit/helper/accessibilityclient.hxx> #include <vcl/unowrap.hxx> #include <vcl/window.hxx> +#include "helper/accessibilityclient.hxx" // class UnoWrapper diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 9894fbcc3b75..a876693fa31b 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -26,9 +26,10 @@ #include <vcl/svapp.hxx> #include <toolkit/helper/property.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <toolkit/helper/tkresmgr.hxx> #include <cppuhelper/typeprovider.hxx> +#include "helper/tkresmgr.hxx" + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index c7bf2257924b..054ef9432b48 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -79,7 +79,6 @@ using org::libreoffice::touch::ByteBufferWrapper; #include <toolkit/awt/vclxtopwindow.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <toolkit/helper/unowrapper.hxx> #include <toolkit/helper/servicenames.hxx> #include <toolkit/helper/macros.hxx> @@ -123,6 +122,8 @@ using org::libreoffice::touch::ByteBufferWrapper; #include <comphelper/processfactory.hxx> #include <toolkit/awt/scrollabledialog.hxx> +#include "helper/unowrapper.hxx" + #define VCLWINDOW_FRAMEWINDOW 0x1000 #define VCLWINDOW_SYSTEMCHILDWINDOW 0x1001 diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index f12e9ec4daa3..6afa075485ba 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -41,7 +41,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/accessibilityclient.hxx> #include <cppuhelper/typeprovider.hxx> #include <rtl/uuid.h> #include <rtl/ustrbuf.hxx> @@ -57,11 +56,13 @@ #include <comphelper/flagguard.hxx> #include "stylesettings.hxx" #include <tools/urlobj.hxx> -#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <boost/bind.hpp> #include <boost/noncopyable.hpp> +#include "helper/accessibilityclient.hxx" +#include "helper/unopropertyarrayhelper.hxx" + using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index da62c96108f3..cb174ffe1fe9 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -26,9 +26,6 @@ #include <toolkit/helper/macros.hxx> #include <toolkit/helper/property.hxx> #include <toolkit/helper/convert.hxx> -#include <toolkit/helper/imagealign.hxx> -#include <toolkit/helper/accessibilityclient.hxx> -#include <toolkit/helper/tkresmgr.hxx> #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/awt/VisualEffect.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -60,6 +57,11 @@ #include <boost/function.hpp> #include <vcl/group.hxx> + +#include "helper/accessibilityclient.hxx" +#include "helper/imagealign.hxx" +#include "helper/tkresmgr.hxx" + using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::makeAny; diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index 34706ae4bf3d..a79743149e71 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -20,7 +20,6 @@ #include <toolkit/controls/animatedimages.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/awt/VisualEffect.hpp> @@ -40,6 +39,8 @@ #include <boost/scoped_ptr.hpp> +#include "helper/unopropertyarrayhelper.hxx" + using namespace css::awt; using namespace css::container; using namespace css::lang; diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 5787a9476a7f..b1426faaa8d7 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -24,7 +24,6 @@ #include <vcl/wall.hxx> #include <osl/mutex.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/controls/geometrycontrolmodel.hxx> #include <toolkit/controls/unocontrols.hxx> #include "toolkit/controls/formattedcontrol.hxx" @@ -45,7 +44,6 @@ #include <comphelper/types.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <toolkit/helper/tkresmgr.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/graph.hxx> #include <vcl/image.hxx> @@ -63,6 +61,9 @@ #include "osl/file.hxx" #include "toolkit/controls/dialogcontrol.hxx" +#include "helper/tkresmgr.hxx" +#include "helper/unopropertyarrayhelper.hxx" + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx index 37c2353424f7..b9ae11fc3ce2 100644 --- a/toolkit/source/controls/dialogcontrol.cxx +++ b/toolkit/source/controls/dialogcontrol.cxx @@ -25,7 +25,6 @@ #include <toolkit/controls/dialogcontrol.hxx> #include <toolkit/controls/geometrycontrolmodel.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/controls/stdtabcontroller.hxx> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> @@ -52,6 +51,8 @@ #include <toolkit/awt/vclxwindows.hxx> #include "toolkit/controls/unocontrols.hxx" +#include "helper/unopropertyarrayhelper.hxx" + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; diff --git a/toolkit/source/controls/formattedcontrol.cxx b/toolkit/source/controls/formattedcontrol.cxx index 28aa22cf505e..b678384ae362 100644 --- a/toolkit/source/controls/formattedcontrol.cxx +++ b/toolkit/source/controls/formattedcontrol.cxx @@ -18,7 +18,6 @@ */ #include <toolkit/controls/formattedcontrol.hxx> -#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/helper/property.hxx> #include <com/sun/star/awt/XVclWindowPeer.hpp> @@ -29,6 +28,7 @@ #include <comphelper/processfactory.hxx> #include <osl/diagnose.h> +#include "helper/unopropertyarrayhelper.hxx" namespace toolkit { diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 1801ba5fbd14..0500ee4b385e 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/awt/grid/DefaultGridDataModel.hpp> #include <com/sun/star/awt/grid/SortableGridDataModel.hpp> #include <com/sun/star/awt/grid/DefaultGridColumnModel.hpp> -#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/helper/property.hxx> #include <tools/diagnose_ex.h> #include <tools/color.hxx> @@ -39,6 +38,8 @@ #include <boost/scoped_ptr.hpp> +#include "helper/unopropertyarrayhelper.hxx" + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; diff --git a/toolkit/source/controls/roadmapcontrol.cxx b/toolkit/source/controls/roadmapcontrol.cxx index f7a09455bcf4..f326c7cf8c55 100644 --- a/toolkit/source/controls/roadmapcontrol.cxx +++ b/toolkit/source/controls/roadmapcontrol.cxx @@ -19,11 +19,11 @@ #include <toolkit/controls/roadmapcontrol.hxx> -#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/helper/property.hxx> #include <com/sun/star/awt/XVclWindowPeer.hpp> #include <osl/diagnose.h> +#include "helper/unopropertyarrayhelper.hxx" namespace toolkit { diff --git a/toolkit/source/controls/tabpagecontainer.cxx b/toolkit/source/controls/tabpagecontainer.cxx index 93cf0cce4955..f841478eef85 100644 --- a/toolkit/source/controls/tabpagecontainer.cxx +++ b/toolkit/source/controls/tabpagecontainer.cxx @@ -22,7 +22,6 @@ #include <toolkit/controls/tabpagecontainer.hxx> #include <toolkit/controls/tabpagemodel.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <com/sun/star/awt/XControlModel.hpp> #include <com/sun/star/awt/XVclWindowPeer.hpp> @@ -32,6 +31,8 @@ #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> +#include "helper/unopropertyarrayhelper.hxx" + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index be844d1fd8f9..eed81b0c0763 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -23,7 +23,6 @@ #include <vcl/window.hxx> #include <vcl/wall.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/controls/stdtabcontroller.hxx> #include <com/sun/star/awt/UnoControlDialogModelProvider.hpp> #include <com/sun/star/awt/tab/XTabPage.hpp> @@ -45,6 +44,8 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase2.hxx> +#include "helper/unopropertyarrayhelper.hxx" + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; diff --git a/toolkit/source/controls/tkscrollbar.cxx b/toolkit/source/controls/tkscrollbar.cxx index e90af2661625..f0b627e15e6d 100644 --- a/toolkit/source/controls/tkscrollbar.cxx +++ b/toolkit/source/controls/tkscrollbar.cxx @@ -19,12 +19,11 @@ #include "toolkit/controls/tkscrollbar.hxx" #include "toolkit/helper/property.hxx" -#include "toolkit/helper/unopropertyarrayhelper.hxx" #include <cppuhelper/typeprovider.hxx> -// for introspection #include <toolkit/awt/vclxwindows.hxx> +#include "helper/unopropertyarrayhelper.hxx" namespace toolkit { diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index c9deabce214f..b1baacd6ab4c 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -28,7 +28,8 @@ #include <toolkit/controls/unocontrolbase.hxx> #include <toolkit/helper/macros.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/unopropertyarrayhelper.hxx> + +#include "helper/unopropertyarrayhelper.hxx" using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index bf32a0b79bd1..8cb01de1fe9f 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -23,10 +23,11 @@ #include <com/sun/star/awt/tree/XTreeControl.hpp> #include <com/sun/star/awt/tree/XTreeDataModel.hpp> #include <com/sun/star/view/SelectionType.hpp> -#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/helper/property.hxx> #include <osl/diagnose.h> +#include "helper/unopropertyarrayhelper.hxx" + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::awt; diff --git a/toolkit/source/controls/unocontrolcontainermodel.cxx b/toolkit/source/controls/unocontrolcontainermodel.cxx index f3a0f171eebf..09b6d31e6972 100644 --- a/toolkit/source/controls/unocontrolcontainermodel.cxx +++ b/toolkit/source/controls/unocontrolcontainermodel.cxx @@ -21,8 +21,8 @@ #include <toolkit/controls/unocontrolcontainermodel.hxx> #include <toolkit/helper/property.hxx> #include <toolkit/helper/servicenames.hxx> -#include <toolkit/helper/unopropertyarrayhelper.hxx> +#include "helper/unopropertyarrayhelper.hxx" // class UnoControlContainerModel diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx index bf4f64ba9b52..38598c0ed177 100644 --- a/toolkit/source/controls/unocontrols.cxx +++ b/toolkit/source/controls/unocontrols.cxx @@ -35,10 +35,8 @@ #include <toolkit/controls/unocontrols.hxx> #include <toolkit/controls/stdtabcontroller.hxx> #include <toolkit/helper/property.hxx> -#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/helper/servicenames.hxx> #include <toolkit/helper/macros.hxx> -#include <toolkit/helper/imagealign.hxx> // for introspection #include <toolkit/awt/vclxwindows.hxx> @@ -60,6 +58,9 @@ #include <algorithm> #include <functional> +#include "helper/imagealign.hxx" +#include "helper/unopropertyarrayhelper.hxx" + using namespace css; using namespace css::awt; using namespace css::lang; diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index 3db9a72a1b38..41ad0a28b0e4 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -23,12 +23,13 @@ #include <boost/noncopyable.hpp> -#include <toolkit/helper/accessibilityclient.hxx> #include <toolkit/helper/accessiblefactory.hxx> #include <osl/module.h> #include <osl/diagnose.h> #include <tools/solar.h> +#include "helper/accessibilityclient.hxx" + namespace toolkit { using namespace ::com::sun::star::uno; diff --git a/toolkit/source/helper/imagealign.cxx b/toolkit/source/helper/imagealign.cxx index 5201d27ef900..75440a2e8e96 100644 --- a/toolkit/source/helper/imagealign.cxx +++ b/toolkit/source/helper/imagealign.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/helper/imagealign.hxx> #include <com/sun/star/awt/ImagePosition.hpp> #include <com/sun/star/awt/ImageAlign.hpp> +#include "helper/imagealign.hxx" namespace toolkit { diff --git a/toolkit/source/helper/tkresmgr.cxx b/toolkit/source/helper/tkresmgr.cxx index 06d14c83c185..d289cd669255 100644 --- a/toolkit/source/helper/tkresmgr.cxx +++ b/toolkit/source/helper/tkresmgr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <toolkit/helper/tkresmgr.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/namedvaluecollection.hxx> #include <com/sun/star/graphic/GraphicProvider.hpp> @@ -26,6 +25,8 @@ #include <vcl/image.hxx> +#include "helper/tkresmgr.hxx" + using ::com::sun::star::uno::Reference; using ::com::sun::star::graphic::XGraphic; using ::com::sun::star::graphic::XGraphicProvider; diff --git a/toolkit/source/helper/unopropertyarrayhelper.cxx b/toolkit/source/helper/unopropertyarrayhelper.cxx index 3db66c940f5a..14b7dec3189c 100644 --- a/toolkit/source/helper/unopropertyarrayhelper.cxx +++ b/toolkit/source/helper/unopropertyarrayhelper.cxx @@ -18,10 +18,10 @@ */ -#include <toolkit/helper/unopropertyarrayhelper.hxx> #include <toolkit/helper/property.hxx> #include <map> +#include "helper/unopropertyarrayhelper.hxx" // class UnoPropertyArrayHelper diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx index f0a2f1cbec61..60cc8d1658c3 100644 --- a/toolkit/source/helper/unowrapper.cxx +++ b/toolkit/source/helper/unowrapper.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/awt/WindowEvent.hpp> #include <comphelper/processfactory.hxx> -#include <toolkit/helper/unowrapper.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> #include <toolkit/awt/vclxwindow.hxx> @@ -36,6 +35,8 @@ #include <tools/debug.hxx> +#include "helper/unowrapper.hxx" + using namespace ::com::sun::star; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > CreateXWindow( Window* pWindow ) |