[Libreoffice-commits] core.git: include/toolkit toolkit/inc toolkit/source
include/toolkit/awt/vclxwindows.hxx | 109 +
toolkit/inc/awt/vclxcontainer.hxx| 17
toolkit/inc/awt/vclxsystemdependentwindow.hxx| 15
toolkit/inc/awt/vclxtopwindow.hxx| 19 -
toolkit/inc/awt/vclxwindows.hxx | 169 +
toolkit/source/awt/vclxcontainer.cxx | 26 -
toolkit/source/awt/vclxsystemdependentwindow.cxx | 24 -
toolkit/source/awt/vclxtopwindow.cxx | 24 -
toolkit/source/awt/vclxwindows.cxx | 429 ---
9 files changed, 54 insertions(+), 778 deletions(-)
New commits:
commit 4e26dbf214df8a9f76791dd3fc3b52f146e5f12e
Author: Stephan Bergmann
AuthorDate: Thu Dec 1 13:59:43 2022 +0100
Commit: Stephan Bergmann
CommitDate: Thu Dec 1 15:40:25 2022 +0100
Use cppuhelper::ImplInheritanceHelper for toolkit VCLX window classes
Change-Id: I102b49608b62b351d6a458b3fd56167b136b24e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143525
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann
diff --git a/include/toolkit/awt/vclxwindows.hxx
b/include/toolkit/awt/vclxwindows.hxx
index e67f6b619a15..677186367a87 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -37,7 +37,6 @@
#include
#include
#include
-#include
#include
#include
@@ -131,9 +130,10 @@ public:
// class VCLXCheckBox
-class TOOLKIT_DLLPUBLIC VCLXCheckBox final : public css::awt::XCheckBox,
-public css::awt::XButton,
-public VCLXGraphicControl
+class TOOLKIT_DLLPUBLIC VCLXCheckBox final : public
cppu::ImplInheritanceHelper<
+VCLXGraphicControl,
+css::awt::XCheckBox,
+css::awt::XButton>
{
private:
ActionListenerMultiplexer maActionListeners;
@@ -146,15 +146,6 @@ private:
public:
VCLXCheckBox();
-// css::uno::XInterface
-css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
-voidSAL_CALL acquire() noexcept
override { OWeakObject::acquire(); }
-voidSAL_CALL release() noexcept
override { OWeakObject::release(); }
-
-// css::lang::XTypeProvider
-css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
-css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId() override;
-
// css::lang::XComponent
void SAL_CALL dispose( ) override;
@@ -188,9 +179,10 @@ public:
// class VCLXRadioButton
-class TOOLKIT_DLLPUBLIC VCLXRadioButton final : public css::awt::XRadioButton,
-public css::awt::XButton,
-public VCLXGraphicControl
+class TOOLKIT_DLLPUBLIC VCLXRadioButton final : public
cppu::ImplInheritanceHelper<
+VCLXGraphicControl,
+css::awt::XRadioButton,
+css::awt::XButton>
{
private:
ItemListenerMultiplexer maItemListeners;
@@ -204,15 +196,6 @@ private:
public:
VCLXRadioButton();
-// css::uno::XInterface
-css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
-voidSAL_CALL acquire() noexcept
override { OWeakObject::acquire(); }
-voidSAL_CALL release() noexcept
override { OWeakObject::release(); }
-
-// css::lang::XTypeProvider
-css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
-css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId() override;
-
// css::lang::XComponent
void SAL_CALL dispose( ) override;
@@ -244,8 +227,7 @@ public:
// class VCLXFixedHyperlink
class VCLXFixedHyperlink final :
-public css::awt::XFixedHyperlink,
-public VCLXWindow
+public cppu::ImplInheritanceHelper
{
private:
ActionListenerMultiplexer maActionListeners;
@@ -259,18 +241,9 @@ public:
VCLXFixedHyperlink();
virtual ~VCLXFixedHyperlink() override;
-// css::uno::XInterface
-css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
-voidSAL_CALL acquire() noexcept
override { OWeakObject::acquire(); }
-voidSAL_CALL release() noexcept
override { OWeakObject::release(); }
-
// css::lang::XComponent
void SAL_CALL dispose( ) override;
-// css::lang::XTypeProvider
-css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
-css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId() override;
-
// css::awt::XFixedHyperlink
void SAL_CALL setText( const OUString& Text ) override;
OUString SAL_CAL
[Libreoffice-commits] core.git: include/toolkit toolkit/inc
include/toolkit/awt/vclxwindows.hxx | 118
toolkit/inc/awt/vclxwindows.hxx | 116 ---
2 files changed, 118 insertions(+), 116 deletions(-)
New commits:
commit 9ceb47ce712157019ca06ee11c66515ea7cc16ec
Author: Michael Weghorn
AuthorDate: Wed Jul 28 09:27:23 2021 +0200
Commit: Michael Weghorn
CommitDate: Wed Jul 28 15:44:38 2021 +0200
Move SVTXNumericField and parents to public toolkit header
This is in preparation for the creation of a new accessibility
class for 'SVTXNumericField'.
Change-Id: I41e04c71b951832e4e264a271a3d66be7b6d6ce7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119589
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/include/toolkit/awt/vclxwindows.hxx
b/include/toolkit/awt/vclxwindows.hxx
index 38c3a1a4a268..99f8fea450fa 100644
--- a/include/toolkit/awt/vclxwindows.hxx
+++ b/include/toolkit/awt/vclxwindows.hxx
@@ -23,6 +23,7 @@
#include
#include
+#include
#include
#include
#include
@@ -38,6 +39,7 @@
#include
#include
+#include
#include
#include
@@ -460,6 +462,122 @@ public:
};
+// class VCLXSpinField
+class VCLXSpinField : public css::awt::XSpinField, public VCLXEdit
+{
+private:
+SpinListenerMultiplexer maSpinListeners;
+
+protected:
+voidProcessWindowEvent( const VclWindowEvent& rVclWindowEvent
) override;
+
+public:
+VCLXSpinField();
+
+// css::uno::XInterface
+css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
+voidSAL_CALL acquire() noexcept
override { OWeakObject::acquire(); }
+voidSAL_CALL release() noexcept
override { OWeakObject::release(); }
+
+// css::lang::XTypeProvider
+css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+css::uno::Sequence< sal_Int8 > SAL_CALL
getImplementationId() override;
+
+
+// css::awt::XSpinField
+void SAL_CALL addSpinListener( const css::uno::Reference<
css::awt::XSpinListener >& l ) override;
+void SAL_CALL removeSpinListener( const css::uno::Reference<
css::awt::XSpinListener >& l ) override;
+void SAL_CALL up( ) override;
+void SAL_CALL down( ) override;
+void SAL_CALL first( ) override;
+void SAL_CALL last( ) override;
+void SAL_CALL enableRepeat( sal_Bool bRepeat ) override;
+
+static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+virtual voidGetPropertyIds( std::vector< sal_uInt16 > &aIds ) override
{ return ImplGetPropertyIds( aIds ); }
+};
+
+class SVTXFormattedField : public VCLXSpinField
+{
+protected:
+rtl::Reference m_xCurrentSupplier;
+boolbIsStandardSupplier;
+
+sal_Int32 nKeyToSetDelayed;
+
+public:
+SVTXFormattedField();
+virtual ~SVTXFormattedField() override;
+
+// css::awt::XVclWindowPeer
+void SAL_CALL setProperty( const OUString& PropertyName, const
css::uno::Any& Value ) override;
+css::uno::Any SAL_CALL getProperty( const OUString& PropertyName )
override;
+
+protected:
+voidsetFormatsSupplier(const css::uno::Reference<
css::util::XNumberFormatsSupplier > & xSupplier);
+sal_Int32 getFormatKey() const;
+voidsetFormatKey(sal_Int32 nKey);
+
+voidSetValue(const css::uno::Any& rValue);
+css::uno::Any GetValue() const;
+
+voidSetTreatAsNumber(bool bSet);
+boolGetTreatAsNumber() const;
+
+voidSetDefaultValue(const css::uno::Any& rValue);
+css::uno::Any GetDefaultValue() const;
+
+voidSetMinValue(const css::uno::Any& rValue);
+css::uno::Any GetMinValue() const;
+
+voidSetMaxValue(const css::uno::Any& rValue);
+css::uno::Any GetMaxValue() const;
+
+voidNotifyTextListeners();
+css::uno::Any convertEffectiveValue(const css::uno::Any& rValue);
+
+virtual voidSetWindow( const VclPtr< vcl::Window > &_pWindow) override;
+
+static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds );
+virtual voidGetPropertyIds( std::vector< sal_uInt16 > &aIds ) override
{ return ImplGetPropertyIds( aIds ); }
+};
+
+class SVTXNumericField final : public css::awt::XNumericField, public
SVTXFormattedField
+{
+public:
+SVTXNumericField();
+virtual ~SVTXNumericField() override;
+
+// css::uno::XInterface
+css::uno::Any SAL_CALL queryInterface( const
css::uno::Type & rType ) override;
+void SAL_CALL acquire() noexcept override {
SVTXFormattedField::acquire(); }
+void SAL_CALL release() noexcept override {
SVTXFormattedField::release(); }
+
+// css::lang::XTypeProvider
+css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override;
+css::uno:
[Libreoffice-commits] core.git: include/toolkit toolkit/inc toolkit/source
include/toolkit/controls/unocontrol.hxx |2 +-
toolkit/inc/awt/vclxtabpagecontainer.hxx |5 +
toolkit/inc/controls/tabpagecontainer.hxx|3 +++
toolkit/source/awt/vclxtabpagecontainer.cxx | 23 +++
toolkit/source/controls/tabpagecontainer.cxx |9 +
5 files changed, 41 insertions(+), 1 deletion(-)
New commits:
commit 92289c5f121499959b6f5edf859e5f34b5b96a78
Author: Michael Weghorn
AuthorDate: Mon May 18 10:51:14 2020 +0200
Commit: Michael Weghorn
CommitDate: Mon May 18 16:28:22 2020 +0200
tdf#133142 UnoControlTabPageContainer: Handle tab property changes
In the model, changing a tab page's title or enabled/disabled
status is done via methods 'XTabPageModel.setTitle' and
'XTabPageModel.setEnabled'.
Changes to the title and enabled/disabled status are
propagated to the tab page container containing the
tab page (s.a. 25c692c2a94ab83c2c859ac5ab334b62ac8b825e
("ControlModelContainerBase: Use property for enabled status",
2020-05-15)).
Make 'VCLXTabPageContainer' derive from 'XPropertiesChangeListener'
and implement the 'propertiesChange' method defined in that
interface to handle property changes for the tab pages and have
'UnoControlTabPageContainer' forward 'PropertyChangeEvent's
to its peer so they can be handled there.
This way, changes for those tab page properties via UNO
are now properly updated in the UI as well.
Change-Id: I6fa1fadf781575c4ad1d066aed9c3a651b10869d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94402
Tested-by: Jenkins
Reviewed-by: Michael Weghorn
diff --git a/include/toolkit/controls/unocontrol.hxx
b/include/toolkit/controls/unocontrol.hxx
index cc83a6b7a934..a406a22bc5e8 100644
--- a/include/toolkit/controls/unocontrol.hxx
+++ b/include/toolkit/controls/unocontrol.hxx
@@ -218,7 +218,7 @@ public:
// XStyleSettingsSupplier
virtual css::uno::Reference< css::awt::XStyleSettings > SAL_CALL
getStyleSettings() override;
-private:
+protected:
// css::beans::XPropertiesChangeListener
void SAL_CALL propertiesChange( const css::uno::Sequence<
css::beans::PropertyChangeEvent >& evt ) override;
};
diff --git a/toolkit/inc/awt/vclxtabpagecontainer.hxx
b/toolkit/inc/awt/vclxtabpagecontainer.hxx
index fee096cc04ba..54fe0e0503aa 100644
--- a/toolkit/inc/awt/vclxtabpagecontainer.hxx
+++ b/toolkit/inc/awt/vclxtabpagecontainer.hxx
@@ -20,6 +20,7 @@
#pragma once
#include
+#include
#include
#include
#include
@@ -28,6 +29,7 @@
typedef cppu::ImplInheritanceHelper< VCLXContainer,
css::awt::tab::XTabPageContainer,
+ css::beans::XPropertiesChangeListener,
css::container::XContainerListener
> VCLXTabPageContainer_Base;
class VCLXTabPageContainer final : public VCLXTabPageContainer_Base
@@ -56,6 +58,9 @@ public:
virtual void SAL_CALL elementRemoved( const
css::container::ContainerEvent& Event ) override;
virtual void SAL_CALL elementReplaced( const
css::container::ContainerEvent& Event ) override;
+// css::beans::XPropertiesChangeListener
+virtual void SAL_CALL propertiesChange( const ::css::uno::Sequence<
::css::beans::PropertyChangeEvent >& aEvent ) override;
+
// css::awt::XVclWindowPeer
void SAL_CALL setProperty( const OUString& PropertyName, const
css::uno::Any& Value ) override;
private:
diff --git a/toolkit/inc/controls/tabpagecontainer.hxx
b/toolkit/inc/controls/tabpagecontainer.hxx
index 9873ad3272b1..e00c0bd89e58 100644
--- a/toolkit/inc/controls/tabpagecontainer.hxx
+++ b/toolkit/inc/controls/tabpagecontainer.hxx
@@ -111,6 +111,9 @@ public:
virtual void SAL_CALL addTabPageContainerListener( const
css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener )
override;
virtual void SAL_CALL removeTabPageContainerListener( const
css::uno::Reference< css::awt::tab::XTabPageContainerListener >& listener )
override;
+// css::beans::XPropertiesChangeListener
+virtual void SAL_CALL propertiesChange( const ::css::uno::Sequence<
::css::beans::PropertyChangeEvent >& aEvent ) override;
+
virtual void SAL_CALL addControl( const OUString& Name, const
css::uno::Reference< css::awt::XControl >& Control ) override;
// css::lang::XServiceInfo
DECLIMPL_SERVICEINFO_DERIVED( UnoControlTabPageContainer, UnoControlBase,
"com.sun.star.awt.tab.UnoControlTabPageContainer" )
diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 0bfacc695136..bc5d19964d2e 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -21,6 +21,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -208,4 +209,26 @@ void SAL_CALL VCLXTabPageContainer::el
[Libreoffice-commits] core.git: include/toolkit toolkit/inc toolkit/source
include/toolkit/controls/eventcontainer.hxx |2 +-
toolkit/inc/helper/msgbox.hxx|2 +-
toolkit/source/awt/asynccallback.cxx |2 +-
toolkit/source/awt/stylesettings.cxx |2 +-
toolkit/source/awt/vclxtoolkit.cxx | 10 +-
toolkit/source/awt/vclxwindow.cxx|2 +-
toolkit/source/controls/geometrycontrolmodel.cxx |2 +-
toolkit/source/controls/unocontrol.cxx |2 +-
toolkit/source/controls/unocontrolcontainer.cxx |2 +-
toolkit/source/helper/vclunohelper.cxx |6 +++---
10 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 175834ce6a3ba707a6d34aa8de7351574381f481
Author: Noel Grandin
AuthorDate: Wed Sep 26 13:52:39 2018 +0200
Commit: Noel Grandin
CommitDate: Thu Sep 27 08:30:01 2018 +0200
loplugin:constfields in toolkit
Change-Id: I26254acc84b1bfe71e4addbde51cb6a9ed52c981
Reviewed-on: https://gerrit.libreoffice.org/60990
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/toolkit/controls/eventcontainer.hxx
b/include/toolkit/controls/eventcontainer.hxx
index 65d0418bdc27..cc1d20493e4c 100644
--- a/include/toolkit/controls/eventcontainer.hxx
+++ b/include/toolkit/controls/eventcontainer.hxx
@@ -38,7 +38,7 @@ class ScriptEventContainer : public ::cppu::WeakImplHelper<
{
std::unordered_map< OUString, css::uno::Any>
mHashMap;
-css::uno::Type mType;
+css::uno::Type const mType;
ContainerListenerMultiplexer maContainerListeners;
diff --git a/toolkit/inc/helper/msgbox.hxx b/toolkit/inc/helper/msgbox.hxx
index 0fc7631d93de..f353b2ff9d57 100644
--- a/toolkit/inc/helper/msgbox.hxx
+++ b/toolkit/inc/helper/msgbox.hxx
@@ -50,7 +50,7 @@ class MessBox : public ButtonDialog
VclPtr mpFixedImage;
Image maImage;
bool mbHelpBtn;
-MessBoxStyle mnMessBoxStyle;
+MessBoxStyle const mnMessBoxStyle;
protected:
OUString maMessText;
diff --git a/toolkit/source/awt/asynccallback.cxx
b/toolkit/source/awt/asynccallback.cxx
index e9cc75f5f462..c37b20930a71 100644
--- a/toolkit/source/awt/asynccallback.cxx
+++ b/toolkit/source/awt/asynccallback.cxx
@@ -57,7 +57,7 @@ private:
xCallback( rCallback ), aData( rAny ) {}
css::uno::Reference< css::awt::XCallback > xCallback;
-css::uno::Any aData;
+css::uno::Any constaData;
};
DECL_STATIC_LINK( AsyncCallback, Notify_Impl, void*, void );
diff --git a/toolkit/source/awt/stylesettings.cxx
b/toolkit/source/awt/stylesettings.cxx
index 556fa8040371..22cce1247cc6 100644
--- a/toolkit/source/awt/stylesettings.cxx
+++ b/toolkit/source/awt/stylesettings.cxx
@@ -87,7 +87,7 @@ namespace toolkit
}
private:
-SolarMutexGuard m_aGuard;
+SolarMutexGuard const m_aGuard;
};
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 5e7c9e823c39..737bdc529554 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -415,7 +415,7 @@ public:
delete this;
}
-sal_Int32 m_nPauseMilliseconds;
+sal_Int32 const m_nPauseMilliseconds;
};
class VCLXToolkitMutexHelper
@@ -439,8 +439,8 @@ class VCLXToolkit : public VCLXToolkitMutexHelper,
::comphelper::OInterfaceContainerHelper2 m_aTopWindowListeners;
::comphelper::OInterfaceContainerHelper2 m_aKeyHandlers;
::comphelper::OInterfaceContainerHelper2 m_aFocusListeners;
-::Link m_aEventListenerLink;
-::Link m_aKeyListenerLink;
+::Link const m_aEventListenerLink;
+::Link const m_aKeyListenerLink;
bool m_bEventListener;
bool m_bKeyListener;
@@ -801,9 +801,9 @@ WindowType ImplGetComponentType( const OUString&
rServiceName )
struct MessageBoxTypeInfo
{
-css::awt::MessageBoxType eType;
+css::awt::MessageBoxType const eType;
const sal_Char *pName;
-sal_Int32nLen;
+sal_Int32 const nLen;
};
static const MessageBoxTypeInfo aMessageBoxTypeInfo[] =
diff --git a/toolkit/source/awt/vclxwindow.cxx
b/toolkit/source/awt/vclxwindow.cxx
index 9edf3ed9086c..eb3df832c972 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -118,7 +118,7 @@ public:
boolmbDisposing : 1;
boolmbDesignMode: 1;
boolmbSynthesizingVCLEvent : 1;
-boolmbWithDefaultProps : 1;
+bool const mbWithDefaultProps : 1;
sal_uLong mnListenerLockLevel;
sal_Int16 mnWritingMode;
diff --git a/toolkit/source/controls/geometrycontrolmodel.cxx
b/toolkit/source/controls/geometrycontrolmodel.cxx
index d8f9045668fc.
[Libreoffice-commits] core.git: include/toolkit toolkit/inc toolkit/Library_tk.mk toolkit/source
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 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 #include #include -#include #include #include +#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 #include #include -#include #include +#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 #include #include -#include #inclu
