basctl/source/basicide/ObjectCatalog.cxx | 2 +-
basctl/source/basicide/baside2b.cxx | 4 ++--
basctl/source/basicide/bastypes.cxx | 10 ++--------
basctl/source/inc/bastypes.hxx | 5 ++---
4 files changed, 7 insertions(+), 14 deletions(-)
New commits:
commit dc7b76796faf82fe8fdf5fa5bff266dcb46e23f9
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Feb 18 21:25:04 2020 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Feb 19 09:53:47 2020 +0100
remove and replace newly unused ctor
Change-Id: I67e0dc6fe419ad0cac04105cb2e89435dd3fc107
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88990
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/basctl/source/basicide/ObjectCatalog.cxx
b/basctl/source/basicide/ObjectCatalog.cxx
index 3c06ddb5201e..72c66dea0b75 100644
--- a/basctl/source/basicide/ObjectCatalog.cxx
+++ b/basctl/source/basicide/ObjectCatalog.cxx
@@ -30,7 +30,7 @@
namespace basctl
{
ObjectCatalog::ObjectCatalog(vcl::Window* pParent)
- : DockingWindow(pParent, "DockingWindow", "sfx/ui/dockingwindow.ui")
+ : DockingWindow(pParent)
{
m_xVclContentArea = VclPtr<VclVBox>::Create(this);
m_xVclContentArea->Show();
diff --git a/basctl/source/basicide/baside2b.cxx
b/basctl/source/basicide/baside2b.cxx
index cf5b0aec42d0..d3b7e9563e29 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1584,7 +1584,7 @@ struct WatchItem
}
WatchWindow::WatchWindow(Layout* pParent)
- : DockingWindow(pParent, "DockingWindow", "sfx/ui/dockingwindow.ui")
+ : DockingWindow(pParent)
, m_nUpdateWatchesId(nullptr)
{
m_xVclContentArea = VclPtr<VclVBox>::Create(this);
@@ -1797,7 +1797,7 @@ IMPL_LINK(WatchWindow, KeyInputHdl, const KeyEvent&,
rKEvt, bool)
// StackWindow
StackWindow::StackWindow(Layout* pParent)
- : DockingWindow(pParent, "DockingWindow", "sfx/ui/dockingwindow.ui")
+ : DockingWindow(pParent)
{
m_xVclContentArea = VclPtr<VclVBox>::Create(this);
m_xVclContentArea->Show();
diff --git a/basctl/source/basicide/bastypes.cxx
b/basctl/source/basicide/bastypes.cxx
index 0d7deb290ab7..1fef74fb7812 100644
--- a/basctl/source/basicide/bastypes.cxx
+++ b/basctl/source/basicide/bastypes.cxx
@@ -255,14 +255,8 @@ WinBits const DockingWindow::StyleBits =
WB_BORDER | WB_3DLOOK | WB_CLIPCHILDREN |
WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_DOCKABLE;
-DockingWindow::DockingWindow (vcl::Window* pParent) :
- ::DockingWindow(pParent, StyleBits),
- pLayout(nullptr),
- nShowCount(0)
-{ }
-
-DockingWindow::DockingWindow(vcl::Window* pParent, const OString& rID, const
OUString& rUIXMLDescription) :
- ::DockingWindow(pParent, rID, rUIXMLDescription),
+DockingWindow::DockingWindow(vcl::Window* pParent) :
+ ::DockingWindow(pParent, "DockingWindow", "sfx/ui/dockingwindow.ui"),
pLayout(nullptr),
nShowCount(0)
{ }
diff --git a/basctl/source/inc/bastypes.hxx b/basctl/source/inc/bastypes.hxx
index 58e007bf6268..c4bf5bb3f227 100644
--- a/basctl/source/inc/bastypes.hxx
+++ b/basctl/source/inc/bastypes.hxx
@@ -80,9 +80,8 @@ struct BasicStatus
class DockingWindow : public ::DockingWindow
{
public:
- DockingWindow (vcl::Window* pParent);
- DockingWindow(vcl::Window* pParent, const OString& rID, const OUString&
rUIXMLDescription);
- DockingWindow (Layout* pParent);
+ DockingWindow(vcl::Window* pParent);
+ DockingWindow(Layout* pParent);
virtual ~DockingWindow() override;
virtual void dispose() override;
void ResizeIfDocking (Point const&, Size const&);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
