[Libreoffice-commits] core.git: include/vcl solenv/clang-format vcl/inc vcl/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Mon Jun 22 08:13:42 UTC 2020
solenv/clang-format/blacklist | 2 +-
vcl/inc/calendar.hxx | 34 +++++++++++++++++-----------------
vcl/source/app/salvtables.cxx | 2 +-
vcl/source/control/calendar.cxx | 2 +-
vcl/source/window/builder.cxx | 2 +-
5 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 586f106bbec37c81804c63969fd3ad0c1d3da054
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Jun 21 17:48:19 2020 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Jun 22 10:13:07 2020 +0200
vcl/calendar.hxx no longer used outside vcl
Change-Id: Ia990b30d66f8fb71b4bb49c68e0855de643d1a34
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96818
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 1103444e7a18..3ee9a641de25 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7330,7 +7330,6 @@ include/vcl/builder.hxx
include/vcl/builderfactory.hxx
include/vcl/button.hxx
include/vcl/cairo.hxx
-include/vcl/calendar.hxx
include/vcl/canvastools.hxx
include/vcl/checksum.hxx
include/vcl/commandevent.hxx
@@ -16562,6 +16561,7 @@ vcl/inc/accmgr.hxx
vcl/inc/android/androidinst.hxx
vcl/inc/bmpfast.hxx
vcl/inc/brdwin.hxx
+vcl/inc/calendar.hxx
vcl/inc/canvasbitmap.hxx
vcl/inc/configsettings.hxx
vcl/inc/controldata.hxx
diff --git a/include/vcl/calendar.hxx b/vcl/inc/calendar.hxx
similarity index 87%
rename from include/vcl/calendar.hxx
rename to vcl/inc/calendar.hxx
index aef21d674100..68078b70775a 100644
--- a/include/vcl/calendar.hxx
+++ b/vcl/inc/calendar.hxx
@@ -115,7 +115,7 @@ calls or by ending a selection.
typedef std::set<sal_Int32> IntDateSet;
-class VCL_DLLPUBLIC Calendar final : public Control
+class Calendar final : public Control
{
std::unique_ptr<IntDateSet> mpSelectTable;
std::unique_ptr<IntDateSet> mpOldSelectTable;
@@ -163,29 +163,29 @@ class VCL_DLLPUBLIC Calendar final : public Control
using Control::ImplInitSettings;
using Window::ImplInit;
- VCL_DLLPRIVATE void ImplInit( WinBits nWinStyle );
- VCL_DLLPRIVATE void ImplInitSettings();
+ void ImplInit( WinBits nWinStyle );
+ void ImplInitSettings();
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
- VCL_DLLPRIVATE void ImplFormat();
+ void ImplFormat();
using Window::ImplHitTest;
- VCL_DLLPRIVATE sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const;
- VCL_DLLPRIVATE void ImplDrawSpin(vcl::RenderContext& rRenderContext);
- VCL_DLLPRIVATE void ImplDrawDate(vcl::RenderContext& rRenderContext, long nX, long nY,
+ sal_uInt16 ImplHitTest( const Point& rPos, Date& rDate ) const;
+ void ImplDrawSpin(vcl::RenderContext& rRenderContext);
+ void ImplDrawDate(vcl::RenderContext& rRenderContext, long nX, long nY,
sal_uInt16 nDay, sal_uInt16 nMonth, sal_Int16 nYear,
bool bOther, sal_Int32 nToday);
- VCL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext);
- VCL_DLLPRIVATE void ImplUpdateDate( const Date& rDate );
- VCL_DLLPRIVATE void ImplUpdateSelection( IntDateSet* pOld );
- VCL_DLLPRIVATE void ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest );
- VCL_DLLPRIVATE void ImplUpdate( bool bCalcNew = false );
+ void ImplDraw(vcl::RenderContext& rRenderContext);
+ void ImplUpdateDate( const Date& rDate );
+ void ImplUpdateSelection( IntDateSet* pOld );
+ void ImplMouseSelect( const Date& rDate, sal_uInt16 nHitTest );
+ void ImplUpdate( bool bCalcNew = false );
using Window::ImplScroll;
- VCL_DLLPRIVATE void ImplScroll( bool bPrev );
- VCL_DLLPRIVATE void ImplShowMenu( const Point& rPos, const Date& rDate );
- VCL_DLLPRIVATE void ImplTracking( const Point& rPos, bool bRepeat );
- VCL_DLLPRIVATE void ImplEndTracking( bool bCancel );
- VCL_DLLPRIVATE DayOfWeek ImplGetWeekStart() const;
+ void ImplScroll( bool bPrev );
+ void ImplShowMenu( const Point& rPos, const Date& rDate );
+ void ImplTracking( const Point& rPos, bool bRepeat );
+ void ImplEndTracking( bool bCancel );
+ DayOfWeek ImplGetWeekStart() const;
virtual Size GetOptimalSize() const override;
public:
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 1759a1e83860..116c974d1d6a 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -44,7 +44,6 @@
#include <tools/helpers.hxx>
#include <vcl/abstdlg.hxx>
#include <vcl/builder.hxx>
-#include <vcl/calendar.hxx>
#include <vcl/toolkit/combobox.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/fixed.hxx>
@@ -70,6 +69,7 @@
#include <vcl/viewdataentry.hxx>
#include <vcl/virdev.hxx>
#include <bitmaps.hlst>
+#include <calendar.hxx>
#include <wizdlg.hxx>
#include <vcl/salvtables.hxx>
diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx
index 585e4868ca12..35a6f79462dc 100644
--- a/vcl/source/control/calendar.cxx
+++ b/vcl/source/control/calendar.cxx
@@ -30,7 +30,7 @@
#include <com/sun/star/i18n/CalendarFieldIndex.hpp>
#include <sal/log.hxx>
-#include <vcl/calendar.hxx>
+#include <calendar.hxx>
#include <svdata.hxx>
#include <strings.hrc>
#include <memory>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 76e287ecd240..e6e2d7415933 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -23,7 +23,6 @@
#include <unotools/resmgr.hxx>
#include <vcl/builder.hxx>
#include <vcl/toolkit/button.hxx>
-#include <vcl/calendar.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/edit.hxx>
#include <vcl/toolkit/field.hxx>
@@ -62,6 +61,7 @@
#include <window.h>
#include <xmlreader/xmlreader.hxx>
#include <desktop/crashreport.hxx>
+#include <calendar.hxx>
#include <salinst.hxx>
#include <strings.hrc>
#include <treeglue.hxx>
More information about the Libreoffice-commits
mailing list