[Libreoffice-commits] core.git: 2 commits - extensions/source include/vcl sc/source sd/source svtools/source sw/source vcl/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Sat Aug 31 14:19:29 UTC 2019
extensions/source/abpilot/abspage.hxx | 7 -------
extensions/source/abpilot/abspilot.hxx | 6 ------
include/vcl/toolkit/roadmap.hxx | 2 +-
sc/source/ui/inc/RandomNumberGeneratorDialog.hxx | 3 ---
sc/source/ui/inc/SamplingDialog.hxx | 2 --
sc/source/ui/inc/StatisticsInputOutputDialog.hxx | 2 --
sc/source/ui/inc/StatisticsTwoVariableDialog.hxx | 2 --
sc/source/ui/inc/condformatdlg.hxx | 4 ----
sc/source/ui/inc/foptmgr.hxx | 4 ----
sc/source/ui/inc/namedefdlg.hxx | 3 ---
sc/source/ui/inc/namedlg.hxx | 3 ---
sc/source/ui/inc/optsolver.hxx | 2 --
sc/source/ui/inc/simpref.hxx | 1 -
sc/source/ui/inc/solvrdlg.hxx | 2 --
sc/source/ui/inc/tpcalc.hxx | 3 ---
sc/source/ui/inc/tpview.hxx | 2 --
sc/source/ui/pagedlg/scuitphfedit.cxx | 2 --
sd/source/ui/inc/tpoption.hxx | 5 -----
svtools/source/dialogs/addresstemplate.cxx | 4 +---
sw/source/ui/dbui/mmaddressblockpage.cxx | 7 +------
vcl/source/control/roadmap.cxx | 1 +
21 files changed, 4 insertions(+), 63 deletions(-)
New commits:
commit 1857ddaa18717bc778ae65571322bf4cdafdcb5a
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 31 13:13:23 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Aug 31 16:18:50 2019 +0200
no need to include hyperlabel.hxx
Change-Id: Iafa7d391c5a1b383a82b900f80c9f78f666ce340
Reviewed-on: https://gerrit.libreoffice.org/78345
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/vcl/toolkit/roadmap.hxx b/include/vcl/toolkit/roadmap.hxx
index f3811ba56812..0c08147b0784 100644
--- a/include/vcl/toolkit/roadmap.hxx
+++ b/include/vcl/toolkit/roadmap.hxx
@@ -21,7 +21,6 @@
#include <vcl/dllapi.h>
#include <vcl/ctrl.hxx>
-#include <vcl/hyperlabel.hxx>
#include <vcl/imgctrl.hxx>
#include <memory>
@@ -37,6 +36,7 @@ public:
typedef sal_Int32 ItemIndex;
};
+class HyperLabel;
class RoadmapImpl;
class RoadmapItem;
diff --git a/vcl/source/control/roadmap.cxx b/vcl/source/control/roadmap.cxx
index d171d3baf8af..133d196dcf35 100644
--- a/vcl/source/control/roadmap.cxx
+++ b/vcl/source/control/roadmap.cxx
@@ -20,6 +20,7 @@
#include <vector>
#include <algorithm>
#include <vcl/event.hxx>
+#include <vcl/hyperlabel.hxx>
#include <vcl/toolkit/roadmap.hxx>
#include <vcl/settings.hxx>
#include <tools/color.hxx>
commit ab0df4e1642d226a68c6858e87b88e9cc6fbbdf6
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Aug 31 13:02:36 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Aug 31 16:18:40 2019 +0200
drop some unnecessary includes
Change-Id: I4cbfe7e0d31217cf7790f656156a7e9a58b4e82f
Reviewed-on: https://gerrit.libreoffice.org/78344
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx
index 89f50fbd2112..e3fdce0f5077 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -24,13 +24,9 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <strings.hrc>
#include <componentmodule.hxx>
-#include <vcl/fixed.hxx>
-
namespace abp
{
-
-
class OAddressBookSourcePilot;
struct AddressSettings;
@@ -56,11 +52,8 @@ namespace abp
virtual void ActivatePage() override;
virtual void DeactivatePage() override;
};
-
-
} // namespace abp
-
#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABSPAGE_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx
index 2ad80c3cdc77..2ff045940b06 100644
--- a/extensions/source/abpilot/abspilot.hxx
+++ b/extensions/source/abpilot/abspilot.hxx
@@ -22,13 +22,10 @@
#include <vcl/roadmapwizard.hxx>
#include "addresssettings.hxx"
-#include <vcl/fixed.hxx>
#include "datasourcehandling.hxx"
-
namespace abp
{
-
typedef ::vcl::RoadmapWizardMachine OAddressBookSourcePilot_Base;
class OAddressBookSourcePilot final : public OAddressBookSourcePilot_Base
{
@@ -116,11 +113,8 @@ namespace abp
void impl_updateRoadmap( AddressSourceType _eType );
};
-
-
} // namespace abp
-
#endif // INCLUDED_EXTENSIONS_SOURCE_ABPILOT_ABSPILOT_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
index a013d25c53c6..881b0fbb0c19 100644
--- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
+++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx
@@ -15,9 +15,6 @@
#include "anyrefdg.hxx"
#include "viewdata.hxx"
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-
namespace boost { template <typename T> class optional; }
class ScRandomNumberGeneratorDialog : public ScAnyRefDlgController
diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx
index a702bdf2871c..6fa6cdcb1903 100644
--- a/sc/source/ui/inc/SamplingDialog.hxx
+++ b/sc/source/ui/inc/SamplingDialog.hxx
@@ -15,8 +15,6 @@
#include "anyrefdg.hxx"
#include "viewdata.hxx"
-#include <vcl/fixed.hxx>
-
class ScSamplingDialog : public ScAnyRefDlgController
{
public:
diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
index e7727b95071c..8bdc1fa9e019 100644
--- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
+++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
@@ -15,8 +15,6 @@
#include "anyrefdg.hxx"
#include "viewdata.hxx"
-#include <vcl/fixed.hxx>
-
class ScStatisticsInputOutputDialog : public ScAnyRefDlgController
{
public:
diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
index 430201926f86..25871ec1ea4f 100644
--- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
+++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
@@ -15,8 +15,6 @@
#include "anyrefdg.hxx"
#include "viewdata.hxx"
-#include <vcl/fixed.hxx>
-
class ScStatisticsTwoVariableDialog : public ScAnyRefDlgController
{
public:
diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx
index 39a53d408f4e..cca33ba9094f 100644
--- a/sc/source/ui/inc/condformatdlg.hxx
+++ b/sc/source/ui/inc/condformatdlg.hxx
@@ -10,10 +10,6 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_CONDFORMATDLG_HXX
#define INCLUDED_SC_SOURCE_UI_INC_CONDFORMATDLG_HXX
-#include <vcl/button.hxx>
-#include <vcl/scrbar.hxx>
-#include <vcl/fixed.hxx>
-
#include <rangelst.hxx>
#include "condformatdlgitem.hxx"
#include "condformatdlgentry.hxx"
diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx
index e5385978b45f..35143be14087 100644
--- a/sc/source/ui/inc/foptmgr.hxx
+++ b/sc/source/ui/inc/foptmgr.hxx
@@ -20,10 +20,6 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_FOPTMGR_HXX
#define INCLUDED_SC_SOURCE_UI_INC_FOPTMGR_HXX
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/button.hxx>
-
namespace formula
{
class RefButton;
diff --git a/sc/source/ui/inc/namedefdlg.hxx b/sc/source/ui/inc/namedefdlg.hxx
index 0aa08781d574..33f58b36d9c2 100644
--- a/sc/source/ui/inc/namedefdlg.hxx
+++ b/sc/source/ui/inc/namedefdlg.hxx
@@ -11,9 +11,6 @@
#define INCLUDED_SC_SOURCE_UI_INC_NAMEDEFDLG_HXX
#include "anyrefdg.hxx"
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
#include <map>
diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx
index 09effbb234af..ed3e576b5e37 100644
--- a/sc/source/ui/inc/namedlg.hxx
+++ b/sc/source/ui/inc/namedlg.hxx
@@ -20,9 +20,6 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_NAMEDLG_HXX
#define INCLUDED_SC_SOURCE_UI_INC_NAMEDLG_HXX
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
-
#include "anyrefdg.hxx"
#include "namemgrtable.hxx"
diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index 05d93362ee80..ec922823ce07 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -22,8 +22,6 @@
#include <address.hxx>
#include "anyrefdg.hxx"
-#include <vcl/fixed.hxx>
-#include <vcl/lstbox.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <vector>
diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx
index b5b4bceb4007..8c9835f586fc 100644
--- a/sc/source/ui/inc/simpref.hxx
+++ b/sc/source/ui/inc/simpref.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SC_SOURCE_UI_INC_SIMPREF_HXX
#define INCLUDED_SC_SOURCE_UI_INC_SIMPREF_HXX
-#include <vcl/fixed.hxx>
#include "anyrefdg.hxx"
class ScDocument;
diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx
index 474d202c0a2b..f6fac01c7f97 100644
--- a/sc/source/ui/inc/solvrdlg.hxx
+++ b/sc/source/ui/inc/solvrdlg.hxx
@@ -23,8 +23,6 @@
#include <address.hxx>
#include "anyrefdg.hxx"
-#include <vcl/fixed.hxx>
-
enum ScSolverErr
{
SOLVERR_NOFORMULA,
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index 53f3f3e480bd..6c878380c7c8 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -21,9 +21,6 @@
#define INCLUDED_SC_SOURCE_UI_INC_TPCALC_HXX
#include <sfx2/tabdlg.hxx>
-#include <vcl/button.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
#include "editfield.hxx"
class ScDocOptions;
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 8e2d4d51d3ec..f9f992e8be4b 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -22,8 +22,6 @@
#include <sfx2/tabdlg.hxx>
#include <svx/colorbox.hxx>
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
class ScViewOptions;
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 21dc3a474c20..033faeb02452 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -27,8 +27,6 @@
#include <osl/time.h>
#include <sfx2/tabdlg.hxx>
#include <vcl/settings.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/fixed.hxx>
#include <unotools/useroptions.hxx>
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index 316678f1e4e8..c4d17ef6c380 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -20,11 +20,6 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_TPOPTION_HXX
#define INCLUDED_SD_SOURCE_UI_INC_TPOPTION_HXX
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/field.hxx>
-#include <vcl/button.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/optgrid.hxx>
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 708a4efbea4c..a443516cd4ef 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -26,10 +26,8 @@
#include <comphelper/interaction.hxx>
#include <comphelper/string.hxx>
#include <unotools/configitem.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
#include <vcl/stdtext.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/waitobj.hxx>
#include <vcl/settings.hxx>
#include <vcl/weld.hxx>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 9f20fac6a0b6..18ddc67d2c4e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -24,14 +24,9 @@
#include <editeng/eeitem.hxx>
#include <svl/grabbagitem.hxx>
#include <svl/itemset.hxx>
-#include <vcl/fixed.hxx>
#include <vcl/weld.hxx>
+#include <vcl/transfer.hxx>
#include <vcl/txtattr.hxx>
-#include <vcl/xtextedt.hxx>
-#include <vcl/textview.hxx>
-#include <vcl/builderfactory.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/treelistentry.hxx>
#include <mmconfigitem.hxx>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
More information about the Libreoffice-commits
mailing list