svx/source/inc/InterimItemWindow.hxx | 35 ---------------------
svx/source/sidebar/paragraph/ParaSpacingWindow.cxx | 1
svx/source/sidebar/paragraph/ParaSpacingWindow.hxx | 2 -
svx/source/tbxctrls/tbunocontroller.cxx | 2 -
4 files changed, 3 insertions(+), 37 deletions(-)
New commits:
commit 0c6d6819508056fed1e2dbd5a579405c3281fcef
Author: Szymon Kłos <eszka...@gmail.com>
AuthorDate: Fri Jun 5 12:48:57 2020 +0200
Commit: Szymon Kłos <eszka...@gmail.com>
CommitDate: Fri Jun 5 12:49:47 2020 +0200
remove duplicated InterimItemWindow header
Change-Id: I9baa91fa5a5b7d5676e7fa923ffdf533adf33fbb
diff --git a/svx/source/inc/InterimItemWindow.hxx
b/svx/source/inc/InterimItemWindow.hxx
deleted file mode 100644
index 715cf41fc020..000000000000
--- a/svx/source/inc/InterimItemWindow.hxx
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
-/*
- * 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/.
- */
-
-#pragma once
-
-#include <vcl/layout.hxx>
-
-class InterimItemWindow : public Control
-{
-public:
- virtual ~InterimItemWindow() override;
- virtual void dispose() override;
-
- virtual void Resize() override;
- virtual Size GetOptimalSize() const override;
-
-protected:
- InterimItemWindow(vcl::Window* pParent, const OUString& rUIXMLDescription,
const OString& rID);
-
- // pass keystrokes from our child window through this to handle focus
changes correctly
- // returns true if keystroke is consumed
- bool ChildKeyInput(const KeyEvent& rKEvt);
-
- std::unique_ptr<weld::Builder> m_xBuilder;
- VclPtr<vcl::Window> m_xVclContentArea;
- std::unique_ptr<weld::Container> m_xContainer;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s
cinkeys+=0=break: */
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
index 3f0e05060fd5..d6bf95f83a00 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx
@@ -25,6 +25,7 @@
#include <svl/itempool.hxx>
#include <svl/intitem.hxx>
#include <vcl/builderfactory.hxx>
+#include <vcl/layout.hxx>
using namespace svx;
diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
index 138a7c3c4e78..9196a4a9f3d7 100644
--- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
+++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx
@@ -24,7 +24,7 @@
#include <editeng/lrspitem.hxx>
#include <vcl/EnumContext.hxx>
#include <svx/relfld.hxx>
-#include <InterimItemWindow.hxx>
+#include <vcl/InterimItemWindow.hxx>
using namespace com::sun::star;
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx
b/svx/source/tbxctrls/tbunocontroller.cxx
index 7f648766bc12..b87d313a9ad4 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -41,7 +41,7 @@
#include <sfx2/sidebar/SidebarToolBox.hxx>
#include <boost/property_tree/ptree.hpp>
-#include <InterimItemWindow.hxx>
+#include <vcl/InterimItemWindow.hxx>
using namespace ::com::sun::star;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
