include/vcl/salnativewidgets.hxx | 22 --------------
vcl/inc/toolbarvalue.hxx | 52 ++++++++++++++++++++++++++++++++++
vcl/source/gdi/salgdilayout.cxx | 1
vcl/source/outdev/nativecontrols.cxx | 1
vcl/source/window/dockingarea.cxx | 1
vcl/source/window/toolbox.cxx | 1
vcl/win/gdi/salnativewidgets-luna.cxx | 1
7 files changed, 57 insertions(+), 22 deletions(-)
New commits:
commit ed007423eb4b6d1560d81317b20f291d81bced28
Author: VaibhavMalik4187 <vaibhavmalik2...@gmail.com>
AuthorDate: Wed Apr 20 00:10:15 2022 +0200
Commit: Hossein <hoss...@libreoffice.org>
CommitDate: Wed Apr 20 01:36:42 2022 +0200
tdf#97228 Move ToolbarValue class to separate include file
The ToolbarValue class defined in include/vcl/salnativewidgets.hxx
was used only by vcl. Therefore, it is now moved to a seperate include
file named toolbarvalue.hxx which is inside vcl/inc folder.
This header file only contains the definition of the the ToolbarValue
class. All the files that references the ToolbarValue class now
include toolbarvalue.hxx.
Change-Id: I78fe3ceb09892c5d3f720ee3d66111bdcdf48db2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131321
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 75c25d3f0fe0..057e05aac151 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -446,28 +446,6 @@ class SAL_DLLPUBLIC_RTTI SpinbuttonValue final : public
ImplControlValue
SpinbuttonValue & operator =(SpinbuttonValue &&) = delete; // due to
ImplControlValue
};
-/* Toolbarvalue:
- *
- * Value container for toolbars detailing the grip position
- */
-class ToolbarValue final : public ImplControlValue
-{
-public:
- ToolbarValue() : ImplControlValue( ControlType::Toolbar, 0 )
- { mbIsTopDockingArea = false; }
- virtual ~ToolbarValue() override;
- virtual ToolbarValue* clone() const override;
-
- ToolbarValue(ToolbarValue const &) = default;
- ToolbarValue(ToolbarValue &&) = default;
- ToolbarValue & operator =(ToolbarValue const &) = delete; // due to
ImplControlValue
- ToolbarValue & operator =(ToolbarValue &&) = delete; // due to
ImplControlValue
-
- tools::Rectangle maGripRect;
- bool mbIsTopDockingArea; // indicates that this is the top
aligned dockingarea
- // adjacent to the menubar, only
used on Windows
-};
-
/* MenubarValue:
*
* Value container for menubars specifying height of adjacent docking area
diff --git a/vcl/inc/toolbarvalue.hxx b/vcl/inc/toolbarvalue.hxx
new file mode 100644
index 000000000000..b2c2d6dcb162
--- /dev/null
+++ b/vcl/inc/toolbarvalue.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_VCL_INC_TOOLBARVALUE_HXX
+#define INCLUDED_VCL_INC_TOOLBARVALUE_HXX
+
+#include <tools/gen.hxx>
+#include <vcl/salnativewidgets.hxx>
+
+/* Toolbarvalue:
+ *
+ * Value container for toolbars detailing the grip position
+ */
+class ToolbarValue final : public ImplControlValue
+{
+public:
+ ToolbarValue()
+ : ImplControlValue(ControlType::Toolbar, 0)
+ {
+ mbIsTopDockingArea = false;
+ }
+ virtual ~ToolbarValue() override;
+ virtual ToolbarValue* clone() const override;
+ ToolbarValue(ToolbarValue const&) = default;
+ ToolbarValue(ToolbarValue&&) = default;
+ ToolbarValue& operator=(ToolbarValue const&) = delete; // due to
ImplControlValue
+ ToolbarValue& operator=(ToolbarValue&&) = delete; // due to
ImplControlValue
+ tools::Rectangle maGripRect;
+ // indicates that this is the top aligned dockingarea
+ // adjacent to the menubar, only used on Windows
+ bool mbIsTopDockingArea;
+};
+
+#endif // INCLUDED_VCL_INC_TOOLBARVALUE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/gdi/salgdilayout.cxx b/vcl/source/gdi/salgdilayout.cxx
index 34f54a8ce870..89f9d0321daf 100644
--- a/vcl/source/gdi/salgdilayout.cxx
+++ b/vcl/source/gdi/salgdilayout.cxx
@@ -32,6 +32,7 @@
#include <FileDefinitionWidgetDraw.hxx>
#include <rtl/math.hxx>
#include <comphelper/lok.hxx>
+#include <toolbarvalue.hxx>
// The only common SalFrame method
diff --git a/vcl/source/outdev/nativecontrols.cxx
b/vcl/source/outdev/nativecontrols.cxx
index 48ea73db4bf9..a8557259adc7 100644
--- a/vcl/source/outdev/nativecontrols.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -23,6 +23,7 @@
#include <vcl/virdev.hxx>
#include <vcl/window.hxx>
#include <sal/log.hxx>
+#include <toolbarvalue.hxx>
#include <vcl/salnativewidgets.hxx>
#include <vcl/pdfextoutdevdata.hxx>
diff --git a/vcl/source/window/dockingarea.cxx
b/vcl/source/window/dockingarea.cxx
index dc16eb702bf8..be3f6ef99e45 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -22,6 +22,7 @@
#include <vcl/menu.hxx>
#include <vcl/settings.hxx>
#include <vcl/event.hxx>
+#include <toolbarvalue.hxx>
#include <svdata.hxx>
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index e41c1288fbeb..64879c682d2c 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -32,6 +32,7 @@
#include <vclstatuslistener.hxx>
#include <vcl/ptrstyle.hxx>
#include <bitmaps.hlst>
+#include <toolbarvalue.hxx>
#include <tools/poly.hxx>
#include <svl/imageitm.hxx>
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx
b/vcl/win/gdi/salnativewidgets-luna.cxx
index f23ddc03eb0b..fe7aabdc0405 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -40,6 +40,7 @@
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
+#include <toolbarvalue.hxx>
#include <win/svsys.h>
#include <win/salgdi.h>
