cui/source/inc/optpath.hxx | 2 -- editeng/source/misc/hangulhanja.cxx | 2 -- include/sfx2/printopt.hxx | 6 +----- sc/source/ui/inc/PivotLayoutDialog.hxx | 1 - sc/source/ui/inc/areasdlg.hxx | 1 - sd/source/ui/inc/prntopts.hxx | 2 -- sd/source/ui/view/drviews5.cxx | 2 +- solenv/clang-format/blacklist | 2 +- svx/source/dialog/imapdlg.cxx | 2 -- sw/source/ui/fldui/fldpage.cxx | 13 +++++-------- sw/source/uibase/misc/redlndlg.cxx | 3 +-- vcl/inc/hyperlabel.hxx | 2 +- vcl/source/control/hyperlabel.cxx | 2 +- vcl/source/control/roadmap.cxx | 2 +- 14 files changed, 12 insertions(+), 30 deletions(-)
New commits: commit 53046ce16303824a231f106c2a747a02f7bb3bcf Author: Caolán McNamara <[email protected]> AuthorDate: Sat Aug 31 13:41:14 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Aug 31 16:19:21 2019 +0200 drop some unnecessary includes Change-Id: I1abef2c2318e83aa8045d2b4763e74f45b4755e5 Reviewed-on: https://gerrit.libreoffice.org/78347 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx index 40ceb1156805..1082f1354f85 100644 --- a/cui/source/inc/optpath.hxx +++ b/cui/source/inc/optpath.hxx @@ -21,8 +21,6 @@ #include <memory> #include <sfx2/tabdlg.hxx> -#include <svtools/simptabl.hxx> -#include <vcl/button.hxx> #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <svtools/dialogclosedlistener.hxx> diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index da40ec6c103a..50130a24ae2b 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -18,7 +18,6 @@ */ #include <editeng/hangulhanja.hxx> -#include <vcl/button.hxx> #include <unotools/lingucfg.hxx> #include <unotools/linguprops.hxx> @@ -33,7 +32,6 @@ #include <com/sun/star/i18n/TextConversionType.hpp> #include <com/sun/star/i18n/TextConversionOption.hpp> #include <com/sun/star/i18n/WordType.hpp> -#include <vcl/stdtext.hxx> #include <vcl/weld.hxx> #include <unotools/charclass.hxx> #include <sal/log.hxx> diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 87a8638174d0..a30fba19b292 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -22,14 +22,10 @@ #include <sal/config.h> #include <sfx2/dllapi.h> +#include <sfx2/tabdlg.hxx> #include <sal/types.h> -#include <vcl/button.hxx> -#include <vcl/field.hxx> -#include <vcl/lstbox.hxx> #include <vcl/print.hxx> -#include <sfx2/tabdlg.hxx> - class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage : public SfxTabPage { diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index ca78e004bb74..7397972a7ada 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -11,7 +11,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_PIVOTLAYOUTDIALOG_HXX #define INCLUDED_SC_SOURCE_UI_INC_PIVOTLAYOUTDIALOG_HXX -#include <vcl/lstbox.hxx> #include "anyrefdg.hxx" #include <dpobject.hxx> #include "viewdata.hxx" diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index a421049e28a4..a685120ab14b 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -21,7 +21,6 @@ #include <address.hxx> -#include <vcl/lstbox.hxx> #include "anyrefdg.hxx" class ScDocument; diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 9e71b6637647..46077ef749a1 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_PRNTOPTS_HXX #define INCLUDED_SD_SOURCE_UI_INC_PRNTOPTS_HXX -#include <vcl/button.hxx> -#include <vcl/layout.hxx> #include <sfx2/tabdlg.hxx> class SdPrintOptions : public SfxTabPage diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 3edf0bdab4c0..38e0d38ffe54 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -24,8 +24,8 @@ #include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdpagv.hxx> -#include <vcl/scrbar.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include <sdcommands.h> #include <sal/log.hxx> diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index cdd3508c87c3..ab0de72dfd88 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -36,8 +36,6 @@ #include <sfx2/objsh.hxx> #include <sfx2/docfile.hxx> #include <unotools/localedatawrapper.hxx> -#include <vcl/layout.hxx> -#include <vcl/lstbox.hxx> #include <vcl/weld.hxx> #include <svx/imapdlg.hxx> #include <svx/dialmgr.hxx> diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index e65a0a186a58..30521244396a 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/lstbox.hxx> #include <svl/stritem.hxx> #include <sfx2/request.hxx> #include <sfx2/htmlmode.hxx> @@ -49,8 +48,8 @@ SwFieldPage::SwFieldPage(TabPageParent pParent, const OUString& rUIXMLDescriptio : SfxTabPage(pParent, rUIXMLDescription, rID, pAttrSet) , m_pCurField(nullptr) , m_pWrtShell(nullptr) - , m_nTypeSel(LISTBOX_ENTRY_NOTFOUND) - , m_nSelectionSel(LISTBOX_ENTRY_NOTFOUND) + , m_nTypeSel(-1) + , m_nSelectionSel(-1) , m_bFieldEdit(false) , m_bInsert(true) , m_bFieldDlgHtmlMode(false) @@ -107,11 +106,9 @@ void SwFieldPage::ActivatePage() // complete reset; edit new field void SwFieldPage::EditNewField( bool bOnlyActivate ) { - if( !bOnlyActivate ) - { - m_nTypeSel = LISTBOX_ENTRY_NOTFOUND; - } - m_nSelectionSel = LISTBOX_ENTRY_NOTFOUND; + if (!bOnlyActivate) + m_nTypeSel = -1; + m_nSelectionSel = -1; m_bRefresh = true; Reset(nullptr); m_bRefresh = false; diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index 18636c8761d3..7d203def841a 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -26,7 +26,6 @@ #include <svx/ctredlin.hxx> #include <svx/postattr.hxx> #include <vcl/commandevent.hxx> -#include <vcl/lstbox.hxx> #include <swtypes.hxx> #include <wrtsh.hxx> #include <view.hxx> @@ -272,7 +271,7 @@ void SwRedlineAcceptDlg::InitAuthors() for (auto const & i: aStrings) pFilterPage->InsertAuthor(i); - if (pFilterPage->SelectAuthor(sOldAuthor) == LISTBOX_ENTRY_NOTFOUND && !aStrings.empty()) + if (pFilterPage->SelectAuthor(sOldAuthor) == -1 && !aStrings.empty()) pFilterPage->SelectAuthor(aStrings[0]); weld::TreeView& rTreeView = m_pTable->GetWidget(); commit 8e0bcc9beb36628df2bf239e82dede15464f6556 Author: Caolán McNamara <[email protected]> AuthorDate: Sat Aug 31 13:15:49 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sat Aug 31 16:19:08 2019 +0200 hyperlabel.hxx can be a private header now Change-Id: I52d01723ad4c4ece59f859726145d75aaa29321e Reviewed-on: https://gerrit.libreoffice.org/78346 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 a4c01d637fce..bc936b6c5bd3 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7819,7 +7819,6 @@ include/vcl/graphictools.hxx include/vcl/hatch.hxx include/vcl/headbar.hxx include/vcl/help.hxx -include/vcl/hyperlabel.hxx include/vcl/i18nhelp.hxx include/vcl/idle.hxx include/vcl/image.hxx @@ -17279,6 +17278,7 @@ vcl/inc/headless/svpinst.hxx vcl/inc/headless/svpprn.hxx vcl/inc/headless/svpvd.hxx vcl/inc/helpwin.hxx +vcl/inc/hyperlabel.hxx vcl/inc/image.h vcl/inc/impanmvw.hxx vcl/inc/impdel.hxx diff --git a/include/vcl/hyperlabel.hxx b/vcl/inc/hyperlabel.hxx similarity index 97% rename from include/vcl/hyperlabel.hxx rename to vcl/inc/hyperlabel.hxx index 864c9888f2b6..c7ab4124e7d7 100644 --- a/include/vcl/hyperlabel.hxx +++ b/vcl/inc/hyperlabel.hxx @@ -29,7 +29,7 @@ namespace vcl { class HyperLabelImpl; - class VCL_DLLPUBLIC HyperLabel final : public FixedText + class HyperLabel final : public FixedText { std::unique_ptr<HyperLabelImpl> m_pImpl; Link<HyperLabel*,void> maClickHdl; diff --git a/vcl/source/control/hyperlabel.cxx b/vcl/source/control/hyperlabel.cxx index ff0de4c8dd06..f42debe51ee2 100644 --- a/vcl/source/control/hyperlabel.cxx +++ b/vcl/source/control/hyperlabel.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/hyperlabel.hxx> #include <tools/color.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/ptrstyle.hxx> +#include <hyperlabel.hxx> namespace vcl { diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx index 133d196dcf35..6233edf47f7e 100644 --- a/vcl/source/control/roadmap.cxx +++ b/vcl/source/control/roadmap.cxx @@ -20,9 +20,9 @@ #include <vector> #include <algorithm> #include <vcl/event.hxx> -#include <vcl/hyperlabel.hxx> #include <vcl/toolkit/roadmap.hxx> #include <vcl/settings.hxx> +#include <hyperlabel.hxx> #include <tools/color.hxx> #include <rtl/ustring.hxx> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
