diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-07-15 11:54:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-07-15 15:02:27 +0200 |
| commit | c8fed68b953e5c1b3101758413fac4809ff3380e (patch) | |
| tree | c288041f51e02ed9f2d03255a2dc9e7c3a14c871 /include | |
| parent | db9d871b2dc89ac1a09e17ec08a1570dae546025 (diff) | |
move SVTXDateField to toolkit
and svtools CalendarField to vcl
Change-Id: I6f3e9a71f21ac7ca70f8172d4f8be4804f3b1c7f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98818
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/toolkit/awt/vclxwindows.hxx | 13 | ||||
| -rw-r--r-- | include/vcl/calendar.hxx (renamed from include/svtools/calendar.hxx) | 9 |
2 files changed, 16 insertions, 6 deletions
diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 42d3bf95f9f2..af85219b7ef6 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -1401,6 +1401,19 @@ public: virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override; }; +class SVTXDateField : public VCLXDateField +{ +public: + SVTXDateField(); + virtual ~SVTXDateField() override; + + // css::awt::VclWindowPeer + void SAL_CALL setProperty( const OUString& PropertyName, const css::uno::Any& Value ) override; + + static void ImplGetPropertyIds( std::vector< sal_uInt16 > &aIds ); + virtual void GetPropertyIds( std::vector< sal_uInt16 > &aIds ) override { return ImplGetPropertyIds( aIds ); } +}; + #endif // INCLUDED_TOOLKIT_AWT_VCLXWINDOWS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/svtools/calendar.hxx b/include/vcl/calendar.hxx index a547fb450221..a88105e29e59 100644 --- a/include/svtools/calendar.hxx +++ b/include/vcl/calendar.hxx @@ -17,11 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVTOOLS_CALENDAR_HXX -#define INCLUDED_SVTOOLS_CALENDAR_HXX +#pragma once #include <config_options.h> -#include <svtools/svtdllapi.h> +#include <vcl/dllapi.h> #include <vcl/field.hxx> #include <vcl/weld.hxx> @@ -65,7 +64,7 @@ method in CalendarField and create an own calendar there ourselves. *************************************************************************/ -class UNLESS_MERGELIBS(SVT_DLLPUBLIC) CalendarField final : public DateField +class VCL_DLLPUBLIC CalendarField final : public DateField { private: VclPtr<ImplCFieldFloatWin> mpFloatWin; @@ -92,6 +91,4 @@ private: virtual void StateChanged( StateChangedType nStateChange ) override; }; -#endif // INCLUDED_SVTOOLS_CALENDAR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |