diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-04-19 11:24:35 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-04-19 11:24:35 +0300 |
commit | 1a043545906f2b272fe80ecfa992b599284b9432 (patch) | |
tree | f1b9a68d248d80b7bc74f4ac3367fd7428b1fa61 /toolkit/source/controls | |
parent | 6a579871d93c05630986f7d67bd670287ceba6de (diff) |
Move headers that are private to toolkit there, then
Change-Id: I12df9dc88960a6f78e85ab2f604782d1a4f9faf6
Diffstat (limited to 'toolkit/source/controls')
-rw-r--r-- | toolkit/source/controls/animatedimages.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/controlmodelcontainerbase.cxx | 5 | ||||
-rw-r--r-- | toolkit/source/controls/dialogcontrol.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/formattedcontrol.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/grid/gridcontrol.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/roadmapcontrol.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/tabpagecontainer.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/tabpagemodel.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/tkscrollbar.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/tkspinbutton.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/tree/treecontrol.cxx | 3 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrolcontainermodel.cxx | 2 | ||||
-rw-r--r-- | toolkit/source/controls/unocontrols.cxx | 5 |
13 files changed, 24 insertions, 16 deletions
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; |