[Libreoffice-commits] core.git: include/toolkit toolkit/inc toolkit/Library_tk.mk toolkit/source

Tor Lillqvist tml at collabora.com
Sat Apr 19 01:25:32 PDT 2014 

 include/toolkit/helper/accessibilityclient.hxx        |   57 -----------
 include/toolkit/helper/imagealign.hxx                 |   53 -----------
 include/toolkit/helper/tkresmgr.hxx                   |   35 -------
 include/toolkit/helper/unopropertyarrayhelper.hxx     |   57 -----------
 include/toolkit/helper/unowrapper.hxx                 |   86 ------------------
 toolkit/Library_tk.mk                                 |    1 
 toolkit/inc/helper/accessibilityclient.hxx            |   57 +++++++++++
 toolkit/inc/helper/imagealign.hxx                     |   53 +++++++++++
 toolkit/inc/helper/tkresmgr.hxx                       |   35 +++++++
 toolkit/inc/helper/unopropertyarrayhelper.hxx         |   57 +++++++++++
 toolkit/inc/helper/unowrapper.hxx                     |   86 ++++++++++++++++++
 toolkit/source/awt/vclxtabpagecontainer.cxx           |    3 
 toolkit/source/awt/vclxtoolkit.cxx                    |    3 
 toolkit/source/awt/vclxwindow.cxx                     |    5 -
 toolkit/source/awt/vclxwindows.cxx                    |    8 +
 toolkit/source/controls/animatedimages.cxx            |    3 
 toolkit/source/controls/controlmodelcontainerbase.cxx |    5 -
 toolkit/source/controls/dialogcontrol.cxx             |    3 
 toolkit/source/controls/formattedcontrol.cxx          |    2 
 toolkit/source/controls/grid/gridcontrol.cxx          |    3 
 toolkit/source/controls/roadmapcontrol.cxx            |    2 
 toolkit/source/controls/tabpagecontainer.cxx          |    3 
 toolkit/source/controls/tabpagemodel.cxx              |    3 
 toolkit/source/controls/tkscrollbar.cxx               |    3 
 toolkit/source/controls/tkspinbutton.cxx              |    3 
 toolkit/source/controls/tree/treecontrol.cxx          |    3 
 toolkit/source/controls/unocontrolcontainermodel.cxx  |    2 
 toolkit/source/controls/unocontrols.cxx               |    5 -
 toolkit/source/helper/accessibilityclient.cxx         |    3 
 toolkit/source/helper/imagealign.cxx                  |    2 
 toolkit/source/helper/tkresmgr.cxx                    |    3 
 toolkit/source/helper/unopropertyarrayhelper.cxx      |    2 
 toolkit/source/helper/unowrapper.cxx                  |    3 
 33 files changed, 333 insertions(+), 316 deletions(-)

New commits:
commit 1a043545906f2b272fe80ecfa992b599284b9432
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sat Apr 19 11:24:35 2014 +0300

    Move headers that are private to toolkit there, then
    
    Change-Id: I12df9dc88960a6f78e85ab2f604782d1a4f9faf6

diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 0fca554..a8fbeb5 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
similarity index 100%
rename from include/toolkit/helper/accessibilityclient.hxx
rename to toolkit/inc/helper/accessibilityclient.hxx
diff --git a/include/toolkit/helper/imagealign.hxx b/toolkit/inc/helper/imagealign.hxx
similarity index 100%
rename from include/toolkit/helper/imagealign.hxx
rename to toolkit/inc/helper/imagealign.hxx
diff --git a/include/toolkit/helper/tkresmgr.hxx b/toolkit/inc/helper/tkresmgr.hxx
similarity index 100%
rename from include/toolkit/helper/tkresmgr.hxx
rename to toolkit/inc/helper/tkresmgr.hxx
diff --git a/include/toolkit/helper/unopropertyarrayhelper.hxx b/toolkit/inc/helper/unopropertyarrayhelper.hxx
similarity index 100%
rename from include/toolkit/helper/unopropertyarrayhelper.hxx
rename to toolkit/inc/helper/unopropertyarrayhelper.hxx
diff --git a/include/toolkit/helper/unowrapper.hxx b/toolkit/inc/helper/unowrapper.hxx
similarity index 98%
rename from include/toolkit/helper/unowrapper.hxx
rename to toolkit/inc/helper/unowrapper.hxx
index b5aaa28..e62075d 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 9894fbc..a876693 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 c7bf225..054ef94 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 f12e9ec..6afa075 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 da62c96..cb174ff 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 34706ae..a797431 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 5787a94..b1426fa 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 37c2353..b9ae11f 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 28aa22c..b678384 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 1801ba5..0500ee4 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 f7a0945..f326c7c 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 93cf0cc..f841478 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 be844d1..eed81b0 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 e90af26..f0b627e 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 c9deabc..b1baacd 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 bf32a0b..8cb01de 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 f3a0f17..09b6d31 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 bf4f64b..38598c0 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 3db9a72..41ad0a2 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 5201d27..75440a2 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 06d14c8..d289cd6 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 3db66c9..14b7dec 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 f0a2f1c..60cc8d1 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 )

More information about the Libreoffice-commits mailing list