basctl/source/basicide/bastype2.cxx | 3 --- solenv/clang-format/blacklist | 2 +- vcl/source/treelist/iconview.cxx | 2 +- vcl/source/treelist/iconviewimpl.cxx | 2 +- vcl/source/treelist/iconviewimpl.hxx | 2 +- 5 files changed, 4 insertions(+), 7 deletions(-)
New commits: commit ddd5e2575e869729fb056b29f06cbbaca9f8b05e Author: Caolán McNamara <[email protected]> AuthorDate: Tue Oct 29 13:19:47 2019 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Oct 29 20:57:15 2019 +0100 can move iconviewimpl.hxx beside iconviewimpl.cxx Change-Id: I48d5df7d6ebf8e22a265e163caaf759ac703f616 Reviewed-on: https://gerrit.libreoffice.org/81681 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 4dce7973c601..b12f71769717 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -17249,7 +17249,6 @@ vcl/inc/headless/svpvd.hxx vcl/inc/helpwin.hxx vcl/inc/hyperlabel.hxx vcl/inc/iconview.hxx -vcl/inc/iconviewimpl.hxx vcl/inc/image.h vcl/inc/impanmvw.hxx vcl/inc/impdel.hxx @@ -17915,6 +17914,7 @@ vcl/source/toolkit/morebtn.cxx vcl/source/treelist/headbar.cxx vcl/source/treelist/iconview.cxx vcl/source/treelist/iconviewimpl.cxx +vcl/source/treelist/iconviewimpl.hxx vcl/source/treelist/imap.cxx vcl/source/treelist/imap2.cxx vcl/source/treelist/imap3.cxx diff --git a/vcl/source/treelist/iconview.cxx b/vcl/source/treelist/iconview.cxx index 5c2e5b2ffed5..45740a38cde5 100644 --- a/vcl/source/treelist/iconview.cxx +++ b/vcl/source/treelist/iconview.cxx @@ -20,7 +20,7 @@ #include <vcl/treelistentry.hxx> #include <vcl/viewdataentry.hxx> #include <iconview.hxx> -#include <iconviewimpl.hxx> +#include "iconviewimpl.hxx" IconView::IconView( vcl::Window* pParent, WinBits nBits ) : SvTreeListBox( pParent, nBits ) diff --git a/vcl/source/treelist/iconviewimpl.cxx b/vcl/source/treelist/iconviewimpl.cxx index 9014220d4820..c9c5e530592f 100644 --- a/vcl/source/treelist/iconviewimpl.cxx +++ b/vcl/source/treelist/iconviewimpl.cxx @@ -20,7 +20,7 @@ #include <vcl/svapp.hxx> #include <tools/debug.hxx> #include <iconview.hxx> -#include <iconviewimpl.hxx> +#include "iconviewimpl.hxx" IconViewImpl::IconViewImpl( SvTreeListBox* pTreeListBox, SvTreeList* pTreeList, WinBits nWinStyle ) : SvImpLBox( pTreeListBox, pTreeList, nWinStyle ) diff --git a/vcl/inc/iconviewimpl.hxx b/vcl/source/treelist/iconviewimpl.hxx similarity index 98% rename from vcl/inc/iconviewimpl.hxx rename to vcl/source/treelist/iconviewimpl.hxx index a2f1aef16c37..5f8d4d89956e 100644 --- a/vcl/inc/iconviewimpl.hxx +++ b/vcl/source/treelist/iconviewimpl.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_SOURCE_INC_ICONVIEWIMPL_HXX #define INCLUDED_VCL_SOURCE_INC_ICONVIEWIMPL_HXX -#include "svimpbox.hxx" +#include <svimpbox.hxx> class SvTreeListBox; class Point; commit 951c7cdbe22cee286e0930db849038e1c872782f Author: Caolán McNamara <[email protected]> AuthorDate: Tue Oct 29 13:12:52 2019 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Oct 29 20:56:53 2019 +0100 TreeListBox doesn't need a factory anymore Change-Id: Ice5891e39b0fe4e8d2e5d0f26f0e06069494a785 Reviewed-on: https://gerrit.libreoffice.org/81680 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 4807996a3c75..e450c04a0425 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -33,7 +33,6 @@ #include <comphelper/processfactory.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/sfxsids.hrc> -#include <vcl/builderfactory.hxx> #include <vcl/event.hxx> #include <initializer_list> @@ -167,8 +166,6 @@ TreeListBox::TreeListBox (vcl::Window* pParent, WinBits nStyle) SetSelectionMode( SelectionMode::Single ); } -VCL_BUILDER_FACTORY_CONSTRUCTOR(TreeListBox, WB_TABSTOP) - TreeListBox::~TreeListBox () { disposeOnce(); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
