core.git: sc/source
sc/source/ui/view/prevwsh.cxx | 19 --- 1 file changed, 8 insertions(+), 11 deletions(-) New commits: commit 78e0626bc7bf37d1eda2e3151dd1a44056f92032 Author: Rafał Dobrakowski AuthorDate: Thu May 9 18:18:43 2024 +0200 Commit: Ilmari Lauhakangas CommitDate: Mon May 13 10:41:43 2024 +0200 tdf#45705 Integrate zoom UI commands into Calc This patch uses basegfx::zoomtools to zoom in and out, making it smoother. Similar to commit c96e1ec61835bc01e2969ec97fce9a1674fbf6d7 done for Writer view shell, this patch makes zoom in and zoom out commands functional for Calc the preview shell. Change-Id: I1612f51d39c507d192237bf2361b91e6e5723c4c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167389 Tested-by: Jenkins Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 9d33bdaf626a..a0dd401b97b2 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -668,19 +668,16 @@ void ScPreviewShell::Execute( SfxRequest& rReq ) } break; case SID_ZOOM_IN: -{ -sal_uInt16 nNew = pPreview->GetZoom() + 20 ; -nNew -= nNew % 20; -pPreview->SetZoom( nNew ); -eZoom = SvxZoomType::PERCENT; -rReq.Done(); -} -break; case SID_ZOOM_OUT: { -sal_uInt16 nNew = pPreview->GetZoom() - 1; -nNew -= nNew % 20; -pPreview->SetZoom( nNew ); +sal_uInt16 nNewZoom; +const sal_uInt16 nOldZoom {pPreview->GetZoom()}; +if(SID_ZOOM_OUT == nSlot) +nNewZoom = basegfx::zoomtools::zoomOut(nOldZoom); +else +nNewZoom = basegfx::zoomtools::zoomIn(nOldZoom); + +pPreview->SetZoom(nNewZoom); eZoom = SvxZoomType::PERCENT; rReq.Done(); }
core.git: sc/inc sc/source
sc/inc/document.hxx |5 +++-- sc/inc/table.hxx |7 --- sc/source/core/data/documen3.cxx |7 --- sc/source/core/data/table1.cxx |3 ++- sc/source/filter/ftools/fprogressbar.cxx |4 ++-- sc/source/ui/docshell/docsh6.cxx |2 +- sc/source/ui/inc/undotab.hxx |2 +- 7 files changed, 17 insertions(+), 13 deletions(-) New commits: commit 97af15c86ccd4f780d7cf8e79cd49cd2e9aef5f6 Author: Rafał Dobrakowski AuthorDate: Mon Mar 18 00:05:44 2024 +0100 Commit: Hossein CommitDate: Wed Apr 10 13:55:11 2024 +0200 tdf#114441 Convert sal_uLong to better integer types This patch changes the usage of type sal_uLong in sc module to sal_Int32. Looking into ScRefreshTimer constructor in sc/inc/refreshtimer.hxx, it becomes clear that sal_Int32 is a good choice. The usage is for communicating the refresh delay, measured in seconds. The reason to use signed variables is to follow the convention in ScRefreshTimer class. Change-Id: Ib565fd50ec4e6a46e95e9db06b7798a0b4a38d4b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164957 Tested-by: Hossein Reviewed-by: Hossein diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 593f3f404d42..d9c3f1866947 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -24,6 +24,7 @@ #include #include #include "patattr.hxx" +#include #include "scdllapi.h" #include "interpretercontext.hxx" #include "rangelst.hxx" @@ -1027,10 +1028,10 @@ public: OUStringGetLinkFlt( SCTAB nTab ) const; OUStringGetLinkOpt( SCTAB nTab ) const; SC_DLLPUBLIC OUString GetLinkTab( SCTAB nTab ) const; -sal_uLong GetLinkRefreshDelay( SCTAB nTab ) const; +sal_Int32 GetLinkRefreshDelay( SCTAB nTab ) const; voidSetLink( SCTAB nTab, ScLinkMode nMode, const OUString& rDoc, const OUString& rFilter, const OUString& rOptions, - const OUString& rTabName, sal_uLong nRefreshDelay ); + const OUString& rTabName, sal_Int32 nRefreshDelay ); boolHasLink( std::u16string_view rDoc, std::u16string_view rFilter, std::u16string_view rOptions ) const; SC_DLLPUBLIC bool LinkExternalTab( SCTAB& nTab, const OUString& aDocTab, diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx index f578926535ae..08f2fbce3015 100644 --- a/sc/inc/table.hxx +++ b/sc/inc/table.hxx @@ -24,6 +24,7 @@ #include "attarray.hxx" #include "column.hxx" #include "colcontainer.hxx" +#include #include "sortparam.hxx" #include "types.hxx" #include @@ -169,7 +170,7 @@ private: OUStringaLinkFlt; OUStringaLinkOpt; OUStringaLinkTab; -sal_uLong nLinkRefreshDelay; +sal_Int32 nLinkRefreshDelay; ScLinkMode nLinkMode; // page style template @@ -377,10 +378,10 @@ public: const OUString& GetLinkFlt() const { return aLinkFlt; } const OUString& GetLinkOpt() const { return aLinkOpt; } const OUString& GetLinkTab() const { return aLinkTab; } -sal_uLong GetLinkRefreshDelay() const { return nLinkRefreshDelay; } +sal_Int32 GetLinkRefreshDelay() const { return nLinkRefreshDelay; } voidSetLink( ScLinkMode nMode, const OUString& rDoc, const OUString& rFlt, -const OUString& rOpt, const OUString& rTab, sal_uLong nRefreshDelay ); +const OUString& rOpt, const OUString& rTab, sal_Int32 nRefreshDelay ); sal_Int64 GetHashCode () const; diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index 7c847fe12254..e31c111a3786 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include #include #include #include @@ -536,7 +537,7 @@ OUString ScDocument::GetLinkTab( SCTAB nTab ) const return OUString(); } -sal_uLong ScDocument::GetLinkRefreshDelay( SCTAB nTab ) const +sal_Int32 ScDocument::GetLinkRefreshDelay( SCTAB nTab ) const { if (const ScTable* pTable = FetchTable(nTab)) return pTable->GetLinkRefreshDelay(); @@ -545,7 +546,7 @@ sal_uLong ScDocument::GetLinkRefreshDelay( SC
dev-tools.git: scripts/regression-hotspots.py
scripts/regression-hotspots.py | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) New commits: commit 70ce608fbfd5193f59b16b72b6a0e22fa60b3613 Author: Rafał Dobrakowski AuthorDate: Sun Apr 7 00:35:14 2024 +0200 Commit: Ilmari Lauhakangas CommitDate: Sun Apr 7 16:44:35 2024 +0200 Addition of https address opening - without certificates Change-Id: I80760b6fdea58cc7591197f1d407552d07e631d1 Reviewed-on: https://gerrit.libreoffice.org/c/dev-tools/+/165862 Tested-by: Ilmari Lauhakangas Reviewed-by: Ilmari Lauhakangas diff --git a/scripts/regression-hotspots.py b/scripts/regression-hotspots.py index cec27816..6ea80ba6 100755 --- a/scripts/regression-hotspots.py +++ b/scripts/regression-hotspots.py @@ -12,19 +12,28 @@ import sys import re import git +import ssl + from urllib.request import urlopen, URLError from io import BytesIO + def get_fixed_regression_bugs(): url = 'https://bugs.documentfoundation.org/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=RESOLVED&bug_status=VERIFIED&bug_status=CLOSED&bug_status=NEEDINFO&bug_status=PLEASETEST&columnlist=&keywords=regression%2C%20&keywords_type=allwords&limit=0&list_id=354018&product=LibreOffice&query_format=advanced&resolution=FIXED&ctype=csv&human=0' + +ctx = ssl.create_default_context() +ctx.check_hostname = False +ctx.verify_mode = ssl.CERT_NONE + try: -resp = urlopen(url) +resp = urlopen(url, context=ctx) except URLError: -sys.stderr.write('Error fetching {}'.format(url)) +sys.stderr.write('Error fetching {} -> {} '.format(url, URLError.errno)) sys.exit(1) bug_ids=[] for line in [raw.decode('utf-8').strip(' ') for raw in BytesIO(resp.read())][1:]: bug_ids.append(int(line)) return bug_ids + def get_dir_counts(file_counts, level): dir_counts = {} for (filename, count) in file_counts.items(): @@ -36,15 +45,18 @@ def get_dir_counts(file_counts, level): else: dir_counts[dirpart]=count return dir_counts + def print_counts(counts): printorder = reversed(sorted((count, name) for (name, count) in counts.items())) for count in printorder: print('%5d %s' % (count[0], count[1])) + if __name__ == '__main__': file_counts = {} excluderegex = re.compile(r'qa/|icon-themes/|extras/source/gallery/|extras/source/palettes/|extras/source/templates/|extras/source/truetype/|helpcontent2|dictionaries|translations|download\.lst|\.png|\.patch') fixed_regression_ids = get_fixed_regression_bugs() sys.stderr.write('found %d fixed regressions: %s ' % (len(fixed_regression_ids), fixed_regression_ids)) + for bug_id in fixed_regression_ids: sys.stderr.write('working on bug %d ' % bug_id) lognames = git.Git('.').execute(['git', 'log', '--grep=[fdo|tdf]#'+str(bug_id), '--pretty=tformat:', '--name-only']) @@ -56,6 +68,7 @@ if __name__ == '__main__': file_counts[filename]+=1 else: file_counts[filename]=1 + print('=== files === ') print_counts(file_counts) print(' === fourth level dirs === ')
core.git: sc/inc sc/IwyuFilter_sc.yaml sc/qa sc/source
sc/IwyuFilter_sc.yaml |3 +++ sc/inc/ChartTools.hxx |1 - sc/inc/SolverSettings.hxx |5 ++--- sc/inc/SparklineAttributes.hxx |2 -- sc/inc/SparklineGroup.hxx |2 -- sc/inc/afmtuno.hxx |1 - sc/inc/attarray.hxx|1 - sc/inc/cellsuno.hxx|1 - sc/inc/chartpos.hxx|1 - sc/inc/datauno.hxx |1 - sc/inc/fielduno.hxx|2 -- sc/inc/fmtuno.hxx |1 - sc/inc/matrixoperators.hxx |1 - sc/inc/miscuno.hxx |2 -- sc/inc/poolcach.hxx|1 - sc/inc/progress.hxx|1 - sc/inc/queryiter.hxx |3 --- sc/inc/sheetdata.hxx |2 +- sc/inc/sortparam.hxx |2 +- sc/inc/srchuno.hxx |1 - sc/inc/styleuno.hxx|1 - sc/inc/table.hxx |2 ++ sc/qa/unit/helper/debughelper.hxx |3 --- sc/qa/unit/ucalc_range.cxx |1 - sc/qa/unit/ucalc_rangelst.cxx |1 - sc/qa/unit/ucalc_sparkline.cxx |3 --- sc/source/core/data/attarray.cxx |1 - sc/source/core/data/bcaslot.cxx|1 - sc/source/core/data/clipcontext.cxx|1 - sc/source/core/data/column.cxx |1 - sc/source/core/data/column3.cxx|3 --- sc/source/core/data/column4.cxx|2 -- sc/source/core/data/columnspanset.cxx |1 - sc/source/core/data/dociter.cxx|2 -- sc/source/core/data/docpool.cxx|2 -- sc/source/core/data/documen2.cxx |2 -- sc/source/core/data/documen3.cxx |1 - sc/source/core/data/documen5.cxx |1 - sc/source/core/data/documen8.cxx |2 -- sc/source/core/data/documen9.cxx |1 - sc/source/core/data/document.cxx |4 sc/source/core/data/dptabsrc.cxx |1 - sc/source/core/data/drwlayer.cxx |3 +-- sc/source/core/data/patattr.cxx|1 - sc/source/core/data/postit.cxx | 15 --- sc/source/core/data/queryevaluator.cxx |5 + sc/source/core/data/queryiter.cxx | 17 + sc/source/core/data/stlpool.cxx|1 - sc/source/core/data/table3.cxx |2 +- sc/source/core/data/table5.cxx |1 - sc/source/core/data/validat.cxx|2 -- sc/source/core/opencl/op_addin.cxx |1 - sc/source/core/opencl/op_array.cxx |1 - sc/source/core/opencl/op_financial.cxx |1 - sc/source/core/opencl/op_logical.cxx |1 - sc/source/core/opencl/op_statistical.cxx |1 - sc/source/core/opencl/utils.cxx|1 - sc/source/core/tool/arraysumSSE2.cxx |1 - sc/source/filter/ftools/fprogressbar.cxx |1 + sc/source/ui/drawfunc/drawsh.cxx |3 --- sc/source/ui/drawfunc/drawsh2.cxx |1 - sc/source/ui/drawfunc/fuconcustomshape.cxx |1 - sc/source/ui/drawfunc/fuconrec.cxx |8 sc/source/ui/drawfunc/fuconstr.cxx |1 - sc/source/ui/drawfunc/fusel.cxx|1 - sc/source/ui/formdlg/dwfunctr.cxx |2 -- sc/source/ui/miscdlgs/sharedocdlg.cxx |1 - sc/source/ui/navipi/content.cxx|2 -- sc/source/ui/optdlg/tpview.cxx |1 - sc/source/ui/theme/ThemeColorChanger.cxx |2 -- sc/source/ui/undo/UndoDeleteSparkline.cxx |1 - sc/source/ui/undo/UndoEditSparkline.cxx|1 - sc/source/ui/undo/UndoEditSparklineGroup.cxx |1 - sc/source/ui/undo/UndoGroupSparklines.cxx |1 - sc/source/ui/undo/UndoThemeChange.cxx |1 - sc/source/ui/undo/UndoUngroupSparklines.cxx|1 - sc/source/ui/undo/undobase.cxx |1 - sc/source/ui/undo/undocell.cxx |3 +-- sc/source/ui/undo/undostyl.cxx |1 - sc/source/ui/unoobj/PivotTableDataProvider.cxx |1 - sc/source/ui/unoobj/PivotTableDataSequence.cxx |1 - sc/source/ui/unoobj/cellsuno.cxx |1 - sc/source/ui/unoobj/chart2uno.cxx |1 - sc/source/ui/unoobj/cursuno.cxx|1 - sc/source/ui/unoobj/dapiuno.cxx|1 - sc/source/ui/vba/vbarange.cxx |2 -- sc/source/ui/v
core.git: xmlsecurity/inc xmlsecurity/source
xmlsecurity/inc/xmlsignaturehelper.hxx |1 - xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |1 - xmlsecurity/source/helper/xsecparser.hxx|2 ++ xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx |4 xmlsecurity/source/xmlsec/nss/nssinitializer.cxx|1 - xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx |1 - xmlsecurity/source/xmlsec/xmlsec_init.cxx |2 -- 7 files changed, 2 insertions(+), 10 deletions(-) New commits: commit a0c53ab43840d1c84d7d246b2cbc73c3a8862155 Author: Rafał Dobrakowski AuthorDate: Sun Mar 10 22:31:43 2024 +0100 Commit: Gabor Kelemen CommitDate: Tue Apr 2 17:30:55 2024 +0200 tdf#146619 Remove unused #includes from C/C++ files the 'xmlsecurity' module was cleaned Change-Id: If8fae797ed5586888022ecb09bab690d68ae7bd9 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165593 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/xmlsecurity/inc/xmlsignaturehelper.hxx b/xmlsecurity/inc/xmlsignaturehelper.hxx index 8572c73a327e..d3c5479e4b61 100644 --- a/xmlsecurity/inc/xmlsignaturehelper.hxx +++ b/xmlsecurity/inc/xmlsignaturehelper.hxx @@ -24,7 +24,6 @@ #include #include #include "xmlsecuritydllapi.h" -#include "xmlsignaturehelper.hxx" #include "xsecctl.hxx" #include diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 50621fa77797..cfe6845cee34 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -52,7 +52,6 @@ #include #include #include -#include #ifdef _WIN32 #include diff --git a/xmlsecurity/source/helper/xsecparser.hxx b/xmlsecurity/source/helper/xsecparser.hxx index 6279d65439e1..91e84222491e 100644 --- a/xmlsecurity/source/helper/xsecparser.hxx +++ b/xmlsecurity/source/helper/xsecparser.hxx @@ -20,7 +20,9 @@ #pragma once #include +#include #include +#include #include diff --git a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx index 182ba5e5af16..19f93f37bc98 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/seinitializer_mscryptimpl.hxx @@ -21,14 +21,10 @@ #include #include -#include #include -#include #include #include -#include - class SEInitializer_MSCryptImpl : public cppu::WeakImplHelper < css::xml::crypto::XSEInitializer, diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index df0414c83df7..6bffc8ed2800 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -21,7 +21,6 @@ #include #include #include -#include #include #include diff --git a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx index 93ce721f0b3f..200c19b3567d 100644 --- a/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx @@ -24,7 +24,6 @@ #include #include -#include class XMLElementWrapper_XmlSecImpl : public cppu::WeakImplHelper < diff --git a/xmlsecurity/source/xmlsec/xmlsec_init.cxx b/xmlsecurity/source/xmlsec/xmlsec_init.cxx index df09f5700aa0..84a7c9c6c368 100644 --- a/xmlsecurity/source/xmlsec/xmlsec_init.cxx +++ b/xmlsecurity/source/xmlsec/xmlsec_init.cxx @@ -12,8 +12,6 @@ #include #include - -#include #include #ifdef XMLSEC_CRYPTO_MSCRYPTO #include
core.git: desktop/IwyuFilter_desktop.yaml desktop/qa desktop/source
desktop/IwyuFilter_desktop.yaml |6 ++ desktop/qa/desktop_lib/test_desktop_lib.cxx |7 +-- desktop/source/app/app.cxx|2 -- desktop/source/app/appinit.cxx|1 - desktop/source/app/dispatchwatcher.cxx|1 - desktop/source/app/sofficemain.cxx|1 - desktop/source/deployment/gui/dp_gui_dialog2.cxx |1 - desktop/source/deployment/inc/dp_version.hxx |2 +- desktop/source/deployment/manager/dp_commandenvironments.cxx |2 -- desktop/source/deployment/manager/dp_extensionmanager.cxx |3 --- desktop/source/deployment/misc/dp_misc.cxx|1 - desktop/source/deployment/misc/dp_platform.cxx|1 - desktop/source/deployment/misc/dp_version.cxx |1 - desktop/source/deployment/registry/configuration/dp_configuration.cxx |1 - desktop/source/deployment/registry/script/dp_lib_container.cxx|1 - desktop/source/lib/init.cxx | 10 -- desktop/source/migration/services/oo3extensionmigration.cxx |1 - desktop/source/splash/splash.cxx |2 -- 18 files changed, 8 insertions(+), 36 deletions(-) New commits: commit 75706c003c3e224047e2f5b079aebde4e3d40d74 Author: Rafał Dobrakowski AuthorDate: Tue Apr 2 02:11:44 2024 +0200 Commit: Gabor Kelemen CommitDate: Tue Apr 2 17:27:27 2024 +0200 tdf#146619 Remove unused #includes from C/C++ files the 'desktop' module was cleaned Change-Id: Ia7dcb77a42ca7f9be67e30d10cd54697bf93b6d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165663 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/desktop/IwyuFilter_desktop.yaml b/desktop/IwyuFilter_desktop.yaml index cfe94e22cc28..76a0c31ad2d5 100644 --- a/desktop/IwyuFilter_desktop.yaml +++ b/desktop/IwyuFilter_desktop.yaml @@ -94,3 +94,9 @@ excludelist: desktop/source/splash/splash.cxx: # Needed for rtl::math::round - rtl/math.hxx +desktop/source/lib/lokandroid.cxx: +# Needed for osl_getThreadTextEncoding +- osl/thread.hxx +desktop/source/deployment/misc/dp_misc.cxx: +# Needed for osl_getThreadTextEncoding +- osl/thread.hxx diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 298e5a5d7a9b..4310e64f25dd 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -11,7 +11,6 @@ #include #include -#include #include #include #include @@ -31,8 +30,6 @@ #include #include #include -#include -#include #include #include #include @@ -45,14 +42,11 @@ #include #include #include -#include -#include #include #include #include #include #include -#include #include #include #include @@ -2343,6 +2337,7 @@ void DesktopLOKTest::testPaintPartTileDifferentSchemes() } #if HAVE_MORE_FONTS +#include void DesktopLOKTest::testGetFontSubset() { LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 0a893b9adc28..d02041c220a2 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -60,7 +60,6 @@ #include #include #include -#include #include #include #include @@ -118,7 +117,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 76bd04347ad6..887b717d43ad 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -24,7 +24,6 @@ #include #include "cmdlineargs.hxx" #include -#include #include #include #include diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 863d246951e9..af26ef9eaab9 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 0b02155f59fb..448977684b9a 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -30,7 +30,6 @@ #include #include -#include #include #include #include diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 03885b161941..d5af09441405 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -38,7 +38,6 @@ #include #include -#include #include #include d
core.git: xmlsecurity/inc
xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 39 ++-- xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 57 +++- 2 files changed, 33 insertions(+), 63 deletions(-) New commits: commit 68c7d719cdfcdd2136b27d0cbfcc54190e95649e Author: Rafał Dobrakowski AuthorDate: Tue Mar 19 21:44:44 2024 +0100 Commit: Gabor Kelemen CommitDate: Thu Mar 28 21:05:03 2024 +0100 update PCHs in xmlsecurity Change-Id: I198af12fd6dbe3b218239e3532862cb70b571853 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165040 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index bf9c9025a702..e040d7f674a3 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.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 2021-04-11 19:48:55 using: + Generated on 2024-03-19 14:24:39 using: ./bin/update_pch xmlsecurity xmlsecurity --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -23,6 +23,7 @@ #include #if PCH_LEVEL >= 1 #include +#include #include #include #include @@ -39,6 +40,8 @@ #include #include #include +#include +#include #include #include #include @@ -60,12 +63,13 @@ #include #include #include -#include #include +#include #include #include #include #include +#include #include #include #include @@ -85,13 +89,13 @@ #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include @@ -100,18 +104,24 @@ #include #include #include +#include #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include #include +#include #include #include #include #include #include +#include #include #include #include +#include +#include +#include #include #include #include @@ -119,12 +129,11 @@ #include #include #include +#include #include #include #include -#include -#include -#include +#include #include #include #include @@ -146,11 +155,9 @@ #include #include #include -#include #include -#include -#include #include +#include #include #include #include @@ -158,16 +165,17 @@ #include #include #include -#include #include #include #include +#include +#include #include #include #include +#include #include #include -#include #include #include #include @@ -175,10 +183,14 @@ #include #include #include +#include +#include #include #include #include -#include +#include +#include +#include #include #include #include @@ -187,13 +199,10 @@ #include #include #include -#include #include #include #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 -#include -#include #include #endif // PCH_LEVEL >= 4 diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index 5e3d1f0b40be..c7a66a113034 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.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 2021-04-08 13:57:49 using: + Generated on 2024-03-19 14:25:26 using: ./bin/update_pch xmlsecurity xsec_xmlsec --cutoff=2 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -22,23 +22,14 @@ #include #if PCH_LEVEL >= 1 -#include +#include #include -#include #include #include +#include #include -#include -#include -#include #include -#include -#ifdef XMLSEC_CRYPTO_NSS -#include -#endif #include -#include -#include #include #include #include @@ -47,93 +38,63 @@ #if PCH_LEVEL >= 2 #include #include -#include -#include #include #include #include #include -#include -#include #include -#include -#include #include #include -#include #include #include -#include -#include -#include #include #include #include #include #include #include -#include +#include #include #include #include #include #include -#include -#include #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 -#include -#include #include #include -#include #include -#include -#include #include -#include #include #include #include -#include #include -#include -#include #include #include -#include #include #include +#include #include #include -#include +#include +#include #include #include #in
core.git: xmlsecurity/inc xmlsecurity/qa xmlsecurity/source
xmlsecurity/inc/certificatechooser.hxx|1 xmlsecurity/inc/digitalsignaturesdialog.hxx |4 -- xmlsecurity/inc/framework/saxeventkeeperimpl.hxx |1 xmlsecurity/inc/framework/securityengine.hxx |2 - xmlsecurity/inc/framework/signatureengine.hxx |4 -- xmlsecurity/inc/framework/signatureverifierimpl.hxx |1 xmlsecurity/inc/xmlsec/errorcallback.hxx |2 - xmlsecurity/inc/xmlsec/saxhelper.hxx |4 -- xmlsecurity/inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx |2 - xmlsecurity/inc/xmlsec/xmlstreamio.hxx|2 - xmlsecurity/qa/unit/signing/signing2.cxx |7 xmlsecurity/source/component/documentdigitalsignatures.cxx|8 - xmlsecurity/source/dialogs/certificatechooser.cxx |3 - xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx| 16 -- xmlsecurity/source/dialogs/macrosecurity.cxx |3 - xmlsecurity/source/gpg/CertificateImpl.cxx|3 - xmlsecurity/source/gpg/SecurityEnvironment.cxx|4 +- xmlsecurity/source/gpg/xmlsignature_gpgimpl.cxx |6 ++- xmlsecurity/source/helper/UriBindingHelper.cxx|1 xmlsecurity/source/helper/ooxmlsecparser.cxx |2 - xmlsecurity/source/helper/xmlsignaturehelper.cxx |1 xmlsecurity/source/helper/xsecparser.cxx |2 - xmlsecurity/source/xmlsec/biginteger.cxx |2 + xmlsecurity/source/xmlsec/errorcallback.cxx |2 + xmlsecurity/source/xmlsec/nss/nssinitializer.cxx |5 +-- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.cxx |8 +++-- xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx |1 xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx |1 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |2 - xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.cxx|2 - xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx|3 - xmlsecurity/source/xmlsec/xmlstreamio.cxx |1 32 files changed, 29 insertions(+), 77 deletions(-) New commits: commit 03b00e03c2cecdc6358e663be7b564c4ccec76f9 Author: Rafał Dobrakowski AuthorDate: Mon Mar 11 00:48:26 2024 +0100 Commit: Gabor Kelemen CommitDate: Thu Mar 28 12:50:41 2024 +0100 tdf#146619 Remove unused #includes from C/C++ files 'xmlsecurity' module was cleaned. Add some headers from xmlsec-wrapper.h in preparation for its removal Change-Id: Id66e6d40d4d5d980626832c0e2f6255fc31b4bcf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164639 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/xmlsecurity/inc/certificatechooser.hxx b/xmlsecurity/inc/certificatechooser.hxx index ef81678ffcc0..494ea40de1e4 100644 --- a/xmlsecurity/inc/certificatechooser.hxx +++ b/xmlsecurity/inc/certificatechooser.hxx @@ -22,7 +22,6 @@ #include #include #include -#include #include namespace com::sun::star { diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx index 08db226fb8a8..3f515a36706d 100644 --- a/xmlsecurity/inc/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx @@ -20,14 +20,10 @@ #pragma once #include -#include #include "documentsignaturehelper.hxx" -#include "xmlsignaturehelper.hxx" #include "documentsignaturemanager.hxx" -#include - namespace com::sun::star { namespace lang { class XMultiServiceFactory; } namespace io { class XStream; } diff --git a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx index 161b9a93619e..a0428174fc7f 100644 --- a/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx +++ b/xmlsecurity/inc/framework/saxeventkeeperimpl.hxx @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/xmlsecurity/inc/framework/securityengine.hxx b/xmlsecurity/inc/framework/securityengine.hxx index bebf07306b63..17a3b5294094 100644 --- a/xmlsecurity/inc/framework/securityengine.hxx +++ b/xmlsecurity/inc/framework/securityengine.hxx @@ -28,8 +28,6 @@ #include -#include - class SAL_DLLPUBLIC_RTTI SecurityEngine : public cppu::WeakImplHelper < css::xml::crypto::sax::XReferenceResolvedListener, diff --git a/xmlsecurity/inc/framework/signatureengine.hxx b/xmlsecurity/inc/framework/signatureengine.hxx index 6446c2f36729..3a41943e2839 100644 --- a/xmlsecurity/inc/framework/signatureengine.hxx +++ b/xmlsecurity/inc/framework/signatureengine.hxx @@ -19,15 +19,11 @@ #pragma once -#include #include -#include -#include #include #include -#include #include #inc
core.git: chart2/inc chart2/IwyuFilter_chart2.yaml chart2/qa chart2/source
chart2/IwyuFilter_chart2.yaml | 13 --- chart2/inc/ChartTypeManager.hxx | 3 - chart2/qa/extras/chart2export.cxx | 1 chart2/qa/extras/chart2export3.cxx | 8 chart2/qa/extras/chart2geometry.cxx | 2 - chart2/qa/extras/chart2import.cxx | 1 chart2/qa/extras/uichart.cxx| 1 chart2/source/controller/accessibility/AccessibleBase.cxx | 3 - chart2/source/controller/accessibility/AccessibleChartElement.cxx | 6 --- chart2/source/controller/accessibility/AccessibleChartView.cxx | 3 - chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx | 3 - chart2/source/controller/chartapiwrapper/GridWrapper.cxx| 1 chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx | 1 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx | 1 chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx | 1 chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx| 1 chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx| 1 chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx | 1 chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx | 1 chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx| 1 chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx | 1 chart2/source/controller/dialogs/ChartTypeDialogController.cxx | 1 chart2/source/controller/dialogs/DataBrowserModel.cxx | 1 chart2/source/controller/dialogs/DialogModel.cxx| 1 chart2/source/controller/dialogs/DialogModel.hxx| 2 - chart2/source/controller/dialogs/ObjectNameProvider.cxx | 3 - chart2/source/controller/dialogs/TitleDialogData.cxx| 1 chart2/source/controller/dialogs/dlg_DataEditor.cxx | 1 chart2/source/controller/dialogs/dlg_DataSource.cxx | 1 chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx| 4 -- chart2/source/controller/dialogs/res_LegendPosition.cxx | 1 chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx | 1 chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx| 1 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx| 1 chart2/source/controller/dialogs/tp_ChartType.cxx | 2 - chart2/source/controller/dialogs/tp_DataSource.cxx | 1 chart2/source/controller/dialogs/tp_LegendPosition.hxx | 1 chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx | 1 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 1 chart2/source/controller/drawinglayer/ViewElementListProvider.cxx | 1 chart2/source/controller/inc/AccessibleBase.hxx | 1 chart2/source/controller/inc/AccessibleTextHelper.hxx | 1 chart2/source/controller/inc/TabPageNotifiable.hxx | 2 + chart2/source/controller/inc/TitleDialogData.hxx| 1 chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx | 1 chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx | 3 - chart2/source/controller/itemsetwrapper/DataTableItemConverter.cxx | 17 -- chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx | 1 chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx | 2 - chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx | 3 - chart2/source/controller/main/ChartController.cxx | 8 chart2/source/controller/main/ChartController_Insert.cxx| 2 - chart2/source/controller/main/ChartController_Position.cxx | 2 - chart2/source/controller/main/ChartController_Properties.cxx| 4 -- chart2/source/controller/main/ChartController_TextEdit.cxx | 1 chart2/source/controller/main/ChartController_Tools.cxx | 2 - chart2/source/controller/main/ChartController_Window.cxx| 2 - chart2/source/controller/main/ChartModelClone.cx
core.git: sc/qa
sc/qa/extras/accessibility/basics.cxx|2 -- sc/qa/extras/htmlexporttest.cxx |7 --- sc/qa/extras/macros-test.cxx |4 sc/qa/extras/scannotationobj.cxx |1 - sc/qa/extras/scannotationshapeobj.cxx|1 - sc/qa/extras/scannotationsobj.cxx|1 - sc/qa/extras/scarealinkobj.cxx |1 - sc/qa/extras/scarealinksobj.cxx |1 - sc/qa/extras/scautoformatobj.cxx |1 - sc/qa/extras/scautoformatsobj.cxx|1 - sc/qa/extras/sccellfieldsobj.cxx |1 - sc/qa/extras/sccellformatsenumeration.cxx|1 - sc/qa/extras/sccellformatsobj.cxx|1 - sc/qa/extras/sccellobj.cxx |1 - sc/qa/extras/sccellsearchobj.cxx |1 - sc/qa/extras/sccellsenumeration.cxx |1 - sc/qa/extras/sccellsobj.cxx |1 - sc/qa/extras/scchartobj.cxx |1 - sc/qa/extras/scchartsobj.cxx |1 - sc/qa/extras/scconsolidationdescriptorobj.cxx|1 - sc/qa/extras/scdatabaserangesobj.cxx |1 - sc/qa/extras/scdatapilotfieldgroupitemobj.cxx|1 - sc/qa/extras/scdatapilotfieldgroupobj.cxx|1 - sc/qa/extras/scdatapilotfieldgroupsobj.cxx |1 - sc/qa/extras/scdatapilotfieldobj.cxx |1 - sc/qa/extras/scdatapilotfieldsobj.cxx|1 - sc/qa/extras/scdatapilotitemsobj.cxx |1 - sc/qa/extras/scdatapilottableobj.cxx |1 - sc/qa/extras/scdatapilottablesobj.cxx|1 - sc/qa/extras/scddelinkobj.cxx|1 - sc/qa/extras/scddelinksobj.cxx |1 - sc/qa/extras/scdocumentconfigurationobj.cxx |1 - sc/qa/extras/scdrawpageobj.cxx |1 - sc/qa/extras/scdrawpagesobj.cxx |1 - sc/qa/extras/scfilterdescriptorbase.cxx |1 - sc/qa/extras/scfunctiondescriptionobj.cxx|1 - sc/qa/extras/scfunctionlistobj.cxx |1 - sc/qa/extras/scheaderfieldsobj.cxx |1 - sc/qa/extras/scheaderfootercontentobj.cxx|1 - sc/qa/extras/scimportdescriptorbaseobj.cxx |1 - sc/qa/extras/scindexenumeration_cellannotationsenumeration.cxx |1 - sc/qa/extras/scindexenumeration_cellarealinksenumeration.cxx |1 - sc/qa/extras/scindexenumeration_databaserangesenumeration.cxx|1 - sc/qa/extras/scindexenumeration_datapilotfieldsenumeration.cxx |1 - sc/qa/extras/scindexenumeration_datapilotitemsenumeration.cxx|1 - sc/qa/extras/scindexenumeration_datapilottablesenumeration.cxx |1 - sc/qa/extras/scindexenumeration_ddelinksenumeration.cxx |1 - sc/qa/extras/scindexenumeration_functiondescriptionenumeration.cxx |1 - sc/qa/extras/scindexenumeration_labelrangesenumeration.cxx |1 - sc/qa/extras/scindexenumeration_namedrangesenumeration.cxx |1 - sc/qa/extras/scindexenumeration_scenariosenumeration.cxx |1 - sc/qa/extras/scindexenumeration_sheetcellrangesenumeration.cxx |1 - sc/qa/extras/scindexenumeration_sheetlinksenumeration.cxx|1 - sc/qa/extras/scindexenumeration_spreadsheetsenumeration.cxx |1 - sc/qa/extras/scindexenumeration_spreadsheetviewpanesenumeration.cxx |1 - sc/qa/extras/scindexenumeration_subtotalfieldsenumeration.cxx|1 - sc/qa/extras/scindexenumeration_tableautoformatenumeration.cxx |1 - sc/qa/extras/scindexenumeration_tablechartsenumeration.cxx |1 - sc/qa/extras/scindexenumeration_tablecolumnsenumeration.cxx |1 - sc/qa/extras/scindexenumeration_tableconditionalentryenumeration.cxx |1 - sc/qa/extras/scindexenumeration_tablerowsenumeration.cxx |1 - sc/qa/extras/scindexenumeration_textfieldenumeration.cxx |1 - sc/qa/extras/sclabelrangeobj.cxx |1 - sc/qa/ext
core.git: canvas/source lotuswordpro/qa oox/qa sc/qa sd/qa sw/qa vcl/qa xmloff/qa
canvas/source/vcl/spritehelper.cxx |2 - lotuswordpro/qa/cppunit/import_test.cxx |4 +-- oox/qa/unit/drawingml.cxx|2 - oox/qa/unit/shape.cxx| 14 -- oox/qa/unit/wpc_drawing_canvas.cxx |5 ++- sc/qa/extras/macros-test.cxx |4 +-- sc/qa/unit/SparklineImportExportTest.cxx |4 +-- sc/qa/unit/screenshots/screenshots.cxx |2 - sc/qa/unit/subsequent_filters_test2.cxx |8 +++--- sc/qa/unit/subsequent_filters_test3.cxx |8 +++--- sc/qa/unit/subsequent_filters_test4.cxx |8 +++--- sd/qa/unit/activex-controls-tests.cxx| 30 +++ sd/qa/unit/export-tests-ooxml1.cxx | 16 ++-- sd/qa/unit/export-tests-ooxml2.cxx |2 - sd/qa/unit/export-tests-ooxml3.cxx |2 - sd/qa/unit/export-tests-ooxml4.cxx |2 - sd/qa/unit/import-tests.cxx | 10 +++ sd/qa/unit/import-tests2.cxx | 14 +- sd/qa/unit/misc-tests.cxx|8 +++--- sd/qa/unit/uiimpress.cxx |6 ++-- sw/qa/core/draw/draw.cxx |2 - sw/qa/extras/globalfilter/globalfilter.cxx |4 +-- sw/qa/extras/htmlexport/htmlexport.cxx |4 +-- sw/qa/extras/odfexport/odfexport.cxx |8 +++--- sw/qa/extras/odfimport/odfimport.cxx |4 +-- sw/qa/extras/ooxmlexport/ooxmlexport.cxx |2 - sw/qa/extras/ooxmlexport/ooxmlexport11.cxx |2 - sw/qa/extras/ooxmlexport/ooxmlexport2.cxx|8 +++--- sw/qa/extras/ooxmlexport/ooxmlexport3.cxx|2 - sw/qa/extras/ooxmlexport/ooxmlexport6.cxx|4 +-- sw/qa/extras/ooxmlexport/ooxmlexport8.cxx|3 -- sw/qa/extras/ooxmlexport/ooxmlexport9.cxx| 10 +++ sw/qa/extras/rtfexport/rtfexport3.cxx|4 +-- sw/qa/extras/rtfexport/rtfexport5.cxx|4 +-- sw/qa/extras/uiwriter/uiwriter4.cxx |4 +-- sw/qa/extras/uiwriter/uiwriter7.cxx |2 - vcl/qa/cppunit/BackendTest.cxx |4 +-- vcl/qa/cppunit/BitmapExTest.cxx |6 ++-- vcl/qa/cppunit/GraphicTest.cxx |4 +-- vcl/qa/cppunit/bitmapcolor.cxx |2 - vcl/qa/cppunit/bitmaprender/BitmapRenderTest.cxx |4 +-- vcl/qa/cppunit/gen/gen.cxx |2 - vcl/qa/cppunit/outdev.cxx|7 +++-- xmloff/qa/unit/style.cxx |8 +++--- 44 files changed, 127 insertions(+), 128 deletions(-) New commits: commit c8b8a2c2cb34a1ae0b0aeee0564b39260258f184 Author: Rafał Dobrakowski AuthorDate: Thu Feb 15 21:07:59 2024 +0100 Commit: Tomaž Vajngerl CommitDate: Thu Mar 14 02:33:03 2024 +0100 tdf#141908 - CppUnittests: replace usage of sal_Int32 with colors Conversion of hex/dec colour notation (example entry Color( 255, 255, 255), Color(0xFF) - COL_WHITE) For the other available colour definitions. Change-Id: I9eed0cd64adcbc8d25e1c22143a000906a457586 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163729 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index f188526930a0..7b3384c934e7 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -166,7 +166,7 @@ namespace vclcanvas if( mbShowSpriteBounds ) { // Paint green sprite clip area -rTargetSurface.SetLineColor( Color( 0,255,0 ) ); +rTargetSurface.SetLineColor( COL_LIGHTGREEN ); rTargetSurface.SetFillColor(); rTargetSurface.DrawPolyPolygon(::tools::PolyPolygon(aClipPoly)); // #i76339# diff --git a/lotuswordpro/qa/cppunit/import_test.cxx b/lotuswordpro/qa/cppunit/import_test.cxx index 08d4c1bd39c1..9514395a02df 100644 --- a/lotuswordpro/qa/cppunit/import_test.cxx +++ b/lotuswordpro/qa/cppunit/import_test.cxx @@ -221,7 +221,7 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::Reference xPropertySet7(xParagraph7, uno::UNO_QUERY); Color nParaBackColor; xPropertySet7->getPropertyValue("ParaBackColor") >>= nParaBackColor; -CPPUNIT_ASSERT_EQUAL(Color(0xff), nParaBackColor); +CPPUNIT_ASSERT_EQUAL(COL_LIGHTRED, nParaBackColor); table::BorderLine2 aTopBorder; xPropertySet7->getPropertyValue("TopBorder") >>= aTopBorder; @@ -295,7 +295,7 @@ CPPUNIT_TEST_FIXTURE(LotusWordProTest, paragraphProperties) uno::Reference xPropertySet13(xParagraph13, uno::UNO_QUERY); Color nCharColor; xPropertySet13->getPropertyValue("CharColor") >>= nCharColor;
core.git: vcl/backendtest vcl/headless vcl/jsdialog
vcl/backendtest/VisualBackendTest.cxx |3 --- vcl/backendtest/outputdevice/polyline.cxx |3 --- vcl/headless/BitmapHelper.cxx |3 ++- vcl/headless/CairoCommon.cxx |8 +--- vcl/headless/SvpGraphicsBackend.cxx |6 -- vcl/headless/svpbmp.cxx |7 +-- vcl/headless/svpdummies.cxx |2 -- vcl/headless/svpframe.cxx |2 -- vcl/headless/svpgdi.cxx |5 - vcl/headless/svpinst.cxx |4 vcl/headless/svpprn.cxx |4 vcl/headless/svptext.cxx |5 + vcl/headless/svpvd.cxx|2 -- vcl/jsdialog/jsdialogbuilder.cxx |7 --- 14 files changed, 9 insertions(+), 52 deletions(-) New commits: commit 7eebe680068f68d2e4081c2f4d9b290a4524d40a Author: Rafał Dobrakowski AuthorDate: Sun Mar 10 22:31:43 2024 +0100 Commit: Gabor Kelemen CommitDate: Wed Mar 13 09:31:09 2024 +0100 tdf#146619 Remove unused #includes from C/C++ files the 'vcl' module was cleaned. Change-Id: I3bc7470d08bd5eae46344975293a1f6ae30b30f5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164637 Tested-by: Jenkins Reviewed-by: Gabor Kelemen diff --git a/vcl/backendtest/VisualBackendTest.cxx b/vcl/backendtest/VisualBackendTest.cxx index cbcf881bc788..221f18254389 100644 --- a/vcl/backendtest/VisualBackendTest.cxx +++ b/vcl/backendtest/VisualBackendTest.cxx @@ -7,12 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include #include #include #include -#include #include #include @@ -28,7 +26,6 @@ #include #include -#include #include #include diff --git a/vcl/backendtest/outputdevice/polyline.cxx b/vcl/backendtest/outputdevice/polyline.cxx index d187d4addd3b..3deed34ca76a 100644 --- a/vcl/backendtest/outputdevice/polyline.cxx +++ b/vcl/backendtest/outputdevice/polyline.cxx @@ -10,9 +10,6 @@ #include -#include -#include - namespace vcl::test { namespace diff --git a/vcl/headless/BitmapHelper.cxx b/vcl/headless/BitmapHelper.cxx index 43f529979c7b..312123b7cf3d 100644 --- a/vcl/headless/BitmapHelper.cxx +++ b/vcl/headless/BitmapHelper.cxx @@ -18,7 +18,8 @@ */ #include -#include +#include +#include #include BitmapHelper::BitmapHelper(const SalBitmap& rSourceBitmap, const bool bForceARGB32) diff --git a/vcl/headless/CairoCommon.cxx b/vcl/headless/CairoCommon.cxx index 51a937d623ee..182a44b9aaf2 100644 --- a/vcl/headless/CairoCommon.cxx +++ b/vcl/headless/CairoCommon.cxx @@ -17,16 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include +#include #include #include -#include +#ifdef ANDROID +#include // for correct compilation in only android +#endif #include #include -#include #include #include #include -#include #include #include #include diff --git a/vcl/headless/SvpGraphicsBackend.cxx b/vcl/headless/SvpGraphicsBackend.cxx index e8d582b98fcc..ead5936276d3 100644 --- a/vcl/headless/SvpGraphicsBackend.cxx +++ b/vcl/headless/SvpGraphicsBackend.cxx @@ -19,12 +19,6 @@ #include -#include -#include -#include -#include -#include - SvpGraphicsBackend::SvpGraphicsBackend(CairoCommon& rCairoCommon) : m_rCairoCommon(rCairoCommon) { diff --git a/vcl/headless/svpbmp.cxx b/vcl/headless/svpbmp.cxx index 328822f78c77..23a0d094d009 100644 --- a/vcl/headless/svpbmp.cxx +++ b/vcl/headless/svpbmp.cxx @@ -21,13 +21,8 @@ #include #include - +#include #include -#include -#include - -#include -#include #include #include #include diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx index 944d494976ca..b0dd9c9438d4 100644 --- a/vcl/headless/svpdummies.cxx +++ b/vcl/headless/svpdummies.cxx @@ -17,9 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include -#include SvpSalObject::~SvpSalObject() { diff --git a/vcl/headless/svpframe.cxx b/vcl/headless/svpframe.cxx index e0971f85b9ac..c31ae5e89970 100644 --- a/vcl/headless/svpframe.cxx +++ b/vcl/headless/svpframe.cxx @@ -18,8 +18,6 @@ */ #include -#include -#include #include #include diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx index c9edd7e9a19c..81a35471dcc7 100644 --- a/vcl/headless/svpgdi.cxx +++ b/vcl/headless/svpgdi.cxx @@ -17,11 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include - -#include -#include - #include #include diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 19eef8997689..472ba6357f12 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -17,17 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include #include #include -#include #include -#include #include #include @@ -51,7 +48,6 @@
core.git: sc/qa sd/qa sw/qa vcl/qa xmloff/qa
sc/qa/unit/subsequent_filters_test4.cxx |2 +- sd/qa/unit/activex-controls-tests.cxx |5 +++-- sd/qa/unit/export-tests-ooxml1.cxx |5 +++-- sd/qa/unit/export-tests-ooxml4.cxx |5 +++-- sd/qa/unit/import-tests.cxx | 13 +++-- sd/qa/unit/import-tests2.cxx|3 ++- sw/qa/extras/odfexport/odfexport.cxx|3 ++- sw/qa/extras/rtfexport/rtfexport.cxx|2 +- vcl/qa/cppunit/bitmapcolor.cxx |3 ++- vcl/qa/cppunit/gen/gen.cxx |3 ++- xmloff/qa/unit/style.cxx|3 ++- 11 files changed, 28 insertions(+), 19 deletions(-) New commits: commit 72f1800ad2f3717192287ae2678e8209e66e35d1 Author: Rafał Dobrakowski AuthorDate: Thu Feb 15 20:08:38 2024 +0100 Commit: Tomaž Vajngerl CommitDate: Wed Mar 13 07:19:03 2024 +0100 tdf#141908 - CppUnittests: replace usage of sal_Int32 with colors Conversion of only one colour, Color(0, 0, 0), Color(0x00) - COL_BLACK Change-Id: I4ba2412929522532d32304734b0269c70d75e5ae Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163460 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl diff --git a/sc/qa/unit/subsequent_filters_test4.cxx b/sc/qa/unit/subsequent_filters_test4.cxx index d82267c9feca..91f1a43c1186 100644 --- a/sc/qa/unit/subsequent_filters_test4.cxx +++ b/sc/qa/unit/subsequent_filters_test4.cxx @@ -1123,7 +1123,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testOrcusODSStyleInterface) pStyleSheet->GetItemSet().HasItem(ATTR_BORDER, &pItem)); pBoxItem = static_cast(pItem); -CPPUNIT_ASSERT_EQUAL(Color(0, 0, 0), pBoxItem->GetLeft()->GetColor()); +CPPUNIT_ASSERT_EQUAL(COL_BLACK, pBoxItem->GetLeft()->GetColor()); CPPUNIT_ASSERT_EQUAL(Color(255, 0, 0), pBoxItem->GetRight()->GetColor()); CPPUNIT_ASSERT_EQUAL(SvxBorderLineStyle::SOLID, pBoxItem->GetLeft()->GetBorderLineStyle()); CPPUNIT_ASSERT_EQUAL(SvxBorderLineStyle::DOTTED, pBoxItem->GetRight()->GetBorderLineStyle()); diff --git a/sd/qa/unit/activex-controls-tests.cxx b/sd/qa/unit/activex-controls-tests.cxx index ec40a5981f80..44e4257cd5b5 100644 --- a/sd/qa/unit/activex-controls-tests.cxx +++ b/sd/qa/unit/activex-controls-tests.cxx @@ -8,6 +8,7 @@ */ #include "sdmodeltestbase.hxx" +#include #include #include @@ -90,12 +91,12 @@ void SdActiveXControlsTest::testBackgroundColor() 0xECE9D8, // Button Face 0xACA899, // Button Shadow 0xACA899, // Disabled Text -0x00, // Button Text +COL_BLACK, // Button Text 0xD8E4F8, // Inactive Title Bar Text 0xFF, // Button Highlight 0x716F64, // Button Dark Shadow 0xF1EFE2, // Button Light Shadow -0x00, // Tooltip Text +COL_BLACK, // Tooltip Text 0xE1, // Tooltip 0xFF, // Custom red color }; diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index 99b78e468d72..895623514c3c 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -9,6 +9,7 @@ #include #include "sdmodeltestbase.hxx" +#include #include #include #include @@ -1246,9 +1247,9 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest1, testTdf94238) // was incorrect. CPPUNIT_ASSERT_EQUAL(size_t(3), aColorStops.size()); CPPUNIT_ASSERT(basegfx::fTools::equal(aColorStops[0].getStopOffset(), 0.0)); -CPPUNIT_ASSERT_EQUAL(Color(0x00), Color(aColorStops[0].getStopColor())); +CPPUNIT_ASSERT_EQUAL(COL_BLACK, Color(aColorStops[0].getStopColor())); CPPUNIT_ASSERT(basegfx::fTools::equal(aColorStops[1].getStopOffset(), 0.39001)); -CPPUNIT_ASSERT_EQUAL(Color(0x00), Color(aColorStops[1].getStopColor())); +CPPUNIT_ASSERT_EQUAL(COL_BLACK, Color(aColorStops[1].getStopColor())); CPPUNIT_ASSERT(basegfx::fTools::equal(aColorStops[2].getStopOffset(), 1.0)); CPPUNIT_ASSERT_EQUAL(Color(0x8b8b8b), Color(aColorStops[2].getStopColor())); } diff --git a/sd/qa/unit/export-tests-ooxml4.cxx b/sd/qa/unit/export-tests-ooxml4.cxx index 4c1e2ad1bccd..50146d6b5e19 100644 --- a/sd/qa/unit/export-tests-ooxml4.cxx +++ b/sd/qa/unit/export-tests-ooxml4.cxx @@ -8,6 +8,7 @@ */ #include "sdmodeltestbase.hxx" +#include #include #include #include @@ -315,9 +316,9 @@ CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest4, testTdf127372) CPPUNIT_ASSERT_EQUAL(size_t(2), aColorStops.size()); CPPUNIT_ASSERT(basegfx::fTools::equal(aColorStops[0].getStopOffset(), 0.0)); -CPPUNIT_ASSERT_EQUAL(Color(0x00), Color(aColorStops[0].getStopColor())); +CPPUNIT_ASSERT_EQUAL(COL_BLACK, Color(aColorStops[0].getStopColor())); CPPUNIT_ASSERT(basegfx::fTools::equal(aColorStops[1].getStopOffset(), 1.0)); -CPPUNIT_ASSERT_EQUAL(Color(0x00), Color(aColorStops[1].getStopColor())); +CPPUNIT_ASSERT_EQUAL(COL_BLACK, Color(aColorStops[1].getStopColor())); } CPPUNIT
core.git: include/tools include/vcl
include/tools/color.hxx |9 - include/vcl/wall.hxx|2 -- 2 files changed, 11 deletions(-) New commits: commit 3d2134c0116bc563d366f8cf23aae51de1e53938 Author: Rafał Dobrakowski AuthorDate: Thu Feb 8 01:24:46 2024 +0100 Commit: Mike Kaganski CommitDate: Fri Feb 9 04:11:01 2024 +0100 tdf#157664 Drop operator !=, where respective operator == is defined Found when working on 'tdf#141908' Change-Id: I33aae153b448c4c6bf0a17810a16c34f8e400774 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163104 Tested-by: Jenkins Reviewed-by: Mike Kaganski diff --git a/include/tools/color.hxx b/include/tools/color.hxx index 898524ac14a4..0520df6d3c68 100644 --- a/include/tools/color.hxx +++ b/include/tools/color.hxx @@ -258,15 +258,6 @@ public: return mValue == rColor.mValue; } -/** Check if the color value is unequal than rColor. - * @param rColor - * @return is unequal - */ -bool operator!=(const Color& rColor) const -{ -return mValue != rColor.mValue; -} - /** Gets the color error compared to another. * It describes how different they are. * It takes the abs of differences in parameters. diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx index 474d2afe500c..b756d447c5ed 100644 --- a/include/vcl/wall.hxx +++ b/include/vcl/wall.hxx @@ -92,8 +92,6 @@ public: Wallpaper& operator=( Wallpaper&& rWallpaper ); booloperator==( const Wallpaper& rWallpaper ) const; -booloperator!=( const Wallpaper& rWallpaper ) const -{ return !(Wallpaper::operator==( rWallpaper )); } boolIsEmpty() const {