include/vcl/salnativewidgets.hxx | 18 ------------
vcl/inc/menubarvalue.hxx | 49 ++++++++++++++++++++++++++++++++++
vcl/source/outdev/nativecontrols.cxx | 1
vcl/source/window/menubarwindow.cxx | 1
vcl/win/gdi/salnativewidgets-luna.cxx | 1
5 files changed, 52 insertions(+), 18 deletions(-)
New commits:
commit 35845a056e332c1d78d536b613aeb3183af09a91
Author: anfanite396 <dipamt1...@gmail.com>
AuthorDate: Fri Mar 17 21:00:19 2023 +0530
Commit: Hossein <hoss...@libreoffice.org>
CommitDate: Thu May 11 10:35:53 2023 +0200
tdf#97228 Move MenubarValue class to separate include file
Change-Id: I5da4bb1765f91d1f9d78e27221d243d5c2ef92e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149076
Tested-by: Jenkins
Reviewed-by: Hossein <hoss...@libreoffice.org>
diff --git a/include/vcl/salnativewidgets.hxx b/include/vcl/salnativewidgets.hxx
index 21c852b6acbd..907c3b618f88 100644
--- a/include/vcl/salnativewidgets.hxx
+++ b/include/vcl/salnativewidgets.hxx
@@ -446,24 +446,6 @@ class SAL_DLLPUBLIC_RTTI SpinbuttonValue final : public
ImplControlValue
SpinbuttonValue & operator =(SpinbuttonValue &&) = delete; // due to
ImplControlValue
};
-/* MenubarValue:
- *
- * Value container for menubars specifying height of adjacent docking area
- */
-class MenubarValue final : public ImplControlValue
-{
-public:
- MenubarValue() : ImplControlValue( ControlType::Menubar, 0 )
- { maTopDockingAreaHeight=0; }
- virtual ~MenubarValue() override;
- virtual MenubarValue* clone() const override;
- MenubarValue(MenubarValue const &) = default;
- MenubarValue(MenubarValue &&) = default;
- MenubarValue & operator =(MenubarValue const &) = delete; // due to
ImplControlValue
- MenubarValue & operator =(MenubarValue &&) = delete; // due to
ImplControlValue
- int maTopDockingAreaHeight;
-};
-
/* MenupopupValue:
*
* Value container for menu items; specifies the rectangle for the whole item
which
diff --git a/vcl/inc/menubarvalue.hxx b/vcl/inc/menubarvalue.hxx
new file mode 100644
index 000000000000..0185037ba326
--- /dev/null
+++ b/vcl/inc/menubarvalue.hxx
@@ -0,0 +1,49 @@
+/* -*- 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_MENUBARVALUE_HXX
+#define INCLUDED_VCL_INC_MENUBARVALUE_HXX
+
+#include <tools/gen.hxx>
+#include <vcl/salnativewidgets.hxx>
+
+/* MenubarValue:
+ *
+ * Value container for menubars specifying height of adjacent docking area
+ */
+class MenubarValue final : public ImplControlValue
+{
+public:
+ MenubarValue()
+ : ImplControlValue(ControlType::Menubar, 0)
+ {
+ maTopDockingAreaHeight = 0;
+ }
+ virtual ~MenubarValue() override;
+ virtual MenubarValue* clone() const override;
+ MenubarValue(MenubarValue const&) = default;
+ MenubarValue(MenubarValue&&) = default;
+ MenubarValue& operator=(MenubarValue const&) = delete; // due to
ImplControlValue
+ MenubarValue& operator=(MenubarValue&&) = delete; // due to
ImplControlValue
+ int maTopDockingAreaHeight;
+};
+
+#endif // INCLUDED_VCL_INC_MENUBARVALUE_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/outdev/nativecontrols.cxx
b/vcl/source/outdev/nativecontrols.cxx
index cee9408d6cfb..1b035c72bd2d 100644
--- a/vcl/source/outdev/nativecontrols.cxx
+++ b/vcl/source/outdev/nativecontrols.cxx
@@ -26,6 +26,7 @@
#include <salgdi.hxx>
#include <toolbarvalue.hxx>
+#include <menubarvalue.hxx>
#include <cassert>
diff --git a/vcl/source/window/menubarwindow.cxx
b/vcl/source/window/menubarwindow.cxx
index 0109bb559503..89e6b9246148 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -33,6 +33,7 @@
#include <bitmaps.hlst>
#include <window.h>
#include "bufferdevice.hxx"
+#include <menubarvalue.hxx>
// document closing button
#define IID_DOCUMENTCLOSE 1
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx
b/vcl/win/gdi/salnativewidgets-luna.cxx
index c837cb7a1c82..0dd5b2dd7442 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 <menubarvalue.hxx>
#include <win/svsys.h>
#include <win/salgdi.h>
