[Libreoffice-commits] core.git: include/svtools reportdesign/inc sd/inc svtools/source svx/inc vcl/inc
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Feb 6 12:12:16 UTC 2020
include/svtools/ctrlbox.hxx | 1 -
reportdesign/inc/pch/precompiled_rptui.hxx | 6 ++++--
sd/inc/pch/precompiled_sd.hxx | 6 +-----
svtools/source/control/ctrlbox.cxx | 10 +++++-----
svx/inc/pch/precompiled_svx.hxx | 3 +--
vcl/inc/pch/precompiled_vcl.hxx | 4 ++--
6 files changed, 13 insertions(+), 17 deletions(-)
New commits:
commit cad01ea74c603affcc15a5e32f75967f6dff0f87
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 5 20:48:58 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Feb 6 13:11:37 2020 +0100
drop unnecessary include
Change-Id: Ifb7e34d5648238a1cf0a893a6713671fa6881161
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88066
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 58cbea913e4c..279b514b679c 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -24,7 +24,6 @@
#include <editeng/borderline.hxx>
-#include <vcl/lstbox.hxx>
#include <vcl/combobox.hxx>
#include <vcl/metric.hxx>
#include <vcl/weld.hxx>
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index b6e188bb80b5..4c865cefd4e8 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-01-22 15:57:53 using:
+ Generated on 2020-02-05 20:46:59 using:
./bin/update_pch reportdesign rptui --cutoff=4 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -110,7 +110,6 @@
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
#include <vcl/builderpage.hxx>
-#include <vcl/button.hxx>
#include <vcl/cairo.hxx>
#include <vcl/checksum.hxx>
#include <vcl/commandevent.hxx>
@@ -193,6 +192,7 @@
#include <com/sun/star/awt/GradientStyle.hpp>
#include <com/sun/star/awt/Key.hpp>
#include <com/sun/star/awt/KeyGroup.hpp>
+#include <com/sun/star/awt/XVclWindowPeer.hpp>
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
@@ -246,6 +246,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/report/XReportComponent.hpp>
#include <com/sun/star/report/XReportDefinition.hpp>
#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/style/XStyle.hpp>
@@ -479,6 +480,7 @@
#include <ColorChanger.hxx>
#include <DesignView.hxx>
#include <EndMarker.hxx>
+#include <IReportControllerObserver.hxx>
#include <ReportController.hxx>
#include <ReportSection.hxx>
#include <ReportWindow.hxx>
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index ed4f5955bd4e..8f64e17b59a1 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-01 10:58:15 using:
+ Generated on 2020-02-05 20:47:11 using:
./bin/update_pch sd sd --cutoff=4 --exclude:system --exclude:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -93,7 +93,6 @@
#include <vcl/image.hxx>
#include <vcl/imapobj.hxx>
#include <vcl/keycod.hxx>
-#include <vcl/lstbox.hxx>
#include <vcl/menu.hxx>
#include <vcl/outdev.hxx>
#include <vcl/ptrstyle.hxx>
@@ -216,7 +215,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/genfunc.hxx>
-#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
@@ -440,7 +438,6 @@
#include <svx/xtable.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/color.hxx>
-#include <tools/date.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/fldunit.hxx>
@@ -453,7 +450,6 @@
#include <tools/ref.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx>
-#include <tools/time.hxx>
#include <tools/toolsdllapi.h>
#include <tools/urlobj.hxx>
#include <tools/weakbase.h>
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 779f22a137b5..5324c98ee964 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1366,13 +1366,13 @@ SvtLineListBox::~SvtLineListBox()
sal_Int32 SvtLineListBox::GetStylePos( sal_Int32 nListPos )
{
- sal_Int32 nPos = LISTBOX_ENTRY_NOTFOUND;
+ sal_Int32 nPos = -1;
--nListPos;
sal_Int32 n = 0;
size_t i = 0;
size_t nCount = m_vLineList.size();
- while ( nPos == LISTBOX_ENTRY_NOTFOUND && i < nCount )
+ while ( nPos == -1 && i < nCount )
{
if ( nListPos == n )
nPos = static_cast<sal_Int32>(i);
@@ -1448,7 +1448,7 @@ void SvtLineListBox::UpdateEntries()
Color SvtLineListBox::GetColorLine1( sal_Int32 nPos )
{
sal_Int32 nStyle = GetStylePos( nPos );
- if (nStyle == LISTBOX_ENTRY_NOTFOUND)
+ if (nStyle == -1)
return GetPaintColor( );
auto& pData = m_vLineList[ nStyle ];
return pData->GetColorLine1( GetColor( ) );
@@ -1457,7 +1457,7 @@ Color SvtLineListBox::GetColorLine1( sal_Int32 nPos )
Color SvtLineListBox::GetColorLine2( sal_Int32 nPos )
{
sal_Int32 nStyle = GetStylePos(nPos);
- if (nStyle == LISTBOX_ENTRY_NOTFOUND)
+ if (nStyle == -1)
return GetPaintColor( );
auto& pData = m_vLineList[ nStyle ];
return pData->GetColorLine2( GetColor( ) );
@@ -1469,7 +1469,7 @@ Color SvtLineListBox::GetColorDist( sal_Int32 nPos )
Color rResult = rSettings.GetFieldColor();
sal_Int32 nStyle = GetStylePos( nPos );
- if (nStyle == LISTBOX_ENTRY_NOTFOUND)
+ if (nStyle == -1)
return rResult;
auto& pData = m_vLineList[ nStyle ];
return pData->GetColorDist( GetColor( ), rResult );
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 2cb0154ce9b7..c82c64fd58a7 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-05 19:54:54 using:
+ Generated on 2020-02-05 20:47:16 using:
./bin/update_pch svx svx --cutoff=3 --exclude:system --exclude:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -96,7 +96,6 @@
#include <vcl/image.hxx>
#include <vcl/imap.hxx>
#include <vcl/imapobj.hxx>
-#include <vcl/lstbox.hxx>
#include <vcl/menu.hxx>
#include <vcl/metric.hxx>
#include <vcl/outdev.hxx>
diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx
index 81dc449fbafb..ff64669c1c94 100644
--- a/vcl/inc/pch/precompiled_vcl.hxx
+++ b/vcl/inc/pch/precompiled_vcl.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2020-02-01 10:59:03 using:
+ Generated on 2020-02-05 20:48:33 using:
./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -241,6 +241,7 @@
#include <TypeSerializer.hxx>
#include <bitmapwriteaccess.hxx>
#include <brdwin.hxx>
+#include <configsettings.hxx>
#include <controldata.hxx>
#include <fontattributes.hxx>
#include <impglyphitem.hxx>
@@ -271,7 +272,6 @@
#include <vcl/canvastools.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/commandinfoprovider.hxx>
-#include <configsettings.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/cursor.hxx>
#include <vcl/cvtgrf.hxx>
More information about the Libreoffice-commits
mailing list