Re: Missing Patch Of LOK in LibreOffice Core Repo

Hi Andreas, On Sun, Jul 21, 2024 at 06:46:52PM +0200, Andreas Mantke wrote: > I looked into the LibreOffice core repository about the current state of > LOK and stumbled over a patch that didn't make into the LibreOffice > master since May 2024: > https://gerrit.libreoffice.org/c/core/+/167858 >

core.git: android/source

android/source/res/values-ia/strings.xml |1 + 1 file changed, 1 insertion(+) New commits: commit 128a1332d6dc96a21dc4b00f5efa0949a5a38982 Author: Weblate AuthorDate: Sat Jul 27 20:36:51 2024 +0200 Commit: Michael Weghorn CommitDate: Mon Jul 29 08:17:56 2024 +0200 android-viewe

core.git: include/svl include/svx svl/source svx/source

include/svl/itempool.hxx| 13 +++ include/svl/poolitem.hxx|6 +++ include/svx/xit.hxx |5 +- svl/source/items/itempool.cxx | 44 svl/source/items/itemset.cxx| 17 +++-- svl/source/items/poolitem.cxx |1 svx/sou

core.git: Branch 'distro/vector/vector-24.2' - 2 commits - sw/CppunitTest_sw_htmlexport.mk sw/qa sw/source

sw/CppunitTest_sw_htmlexport.mk |4 sw/qa/extras/htmlexport/data/URLs.odt |binary sw/qa/extras/htmlexport/data/external.png |binary sw/qa/extras/htmlexport/htmlexport.cxx| 221 ++ sw/source/filter/html/css1atr.cxx |6 sw/source/fil

New Defects reported by Coverity Scan for LibreOffice

Hi, Please find the latest report on new defect(s) introduced to LibreOffice found with Coverity Scan. 2 new defect(s) introduced to LibreOffice found with Coverity Scan. 39 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent build analyzed by Coverity Scan. New defec

core.git: Branch 'feature/cib_contract49c' - sc/inc

sc/inc/globstr.hrc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 799c90cfca12a683d5cf8d204110ca294063b5bb Author: Thorsten Behrens AuthorDate: Thu Jul 25 08:28:46 2024 +0200 Commit: Thorsten Behrens CommitDate: Sun Jul 28 23:50:29 2024 +0200 related t

core.git: Changes to 'refs/tags/cib_contract49c-24.2.5.2.M2'

Tag 'cib_contract49c-24.2.5.2.M2' created by Thorsten Behrens at 2024-07-28 21:42 + cib_contract49c-24.2.5.2.M2 -BEGIN PGP SIGNATURE- iNUEABYKAH0WIQRV78SO268/dhkw1IIeB5amgXyR5gUCZqa7MF8UgAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0NTVF RkM0OEVEQkFGM0Y3NjE

core.git: Branch 'feature/cib_contract49c' - cui/source

cui/source/tabpages/numpages.cxx |9 - 1 file changed, 4 insertions(+), 5 deletions(-) New commits: commit 74fdd584866c8326678877e4ac47ab9df1a3f635 Author: Julien Nabet AuthorDate: Thu Jul 25 10:27:31 2024 +0200 Commit: Thorsten Behrens CommitDate: Sun Jul 28 23:41:29 2024 +

core.git: Branch 'libreoffice-24-2' - vcl/source

vcl/source/app/salvtables.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit a7c155dcf7c1897ebc2f87f1227d0ebd4fc64313 Author: Caolán McNamara AuthorDate: Sat Jul 27 20:25:35 2024 +0100 Commit: Adolfo Jayme Barrientos CommitDate: Sun Jul 28 23:12:34 2024 +0200 Resolv

core.git: sc/inc

sc/inc/globstr.hrc |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 46f7dcc5f499892ef093147b3f739c258bbf6b81 Author: Thorsten Behrens AuthorDate: Thu Jul 25 08:28:46 2024 +0200 Commit: Thorsten Behrens CommitDate: Sun Jul 28 23:07:17 2024 +0200 related t

core.git: vcl/qa

vcl/qa/unx/generic/generic.cxx | 32 1 file changed, 20 insertions(+), 12 deletions(-) New commits: commit d01dcab81a6a66fd5b4448ccff348f69c82c538d Author: Caolán McNamara AuthorDate: Sun Jul 28 16:17:04 2024 +0100 Commit: Caolán McNamara CommitDate: S

core.git: sw/source

sw/source/filter/xml/xmlimp.cxx |5 + 1 file changed, 5 insertions(+) New commits: commit b8fddfdde9291cdb7db9912e86b59dc11624dedb Author: Caolán McNamara AuthorDate: Sun Jul 28 14:15:26 2024 +0100 Commit: Caolán McNamara CommitDate: Sun Jul 28 20:25:14 2024 +0200 ofz: Null

core.git: dictionaries

dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 221e3fb4afe662a040479494b6789325bc9155db Author: Ilmari Lauhakangas AuthorDate: Sun Jul 28 19:53:39 2024 +0300 Commit: Gerrit Code Review CommitDate: Sun Jul 28 18:53:39 2024 +0200 Update git

dictionaries.git: en/pythonpath hu_HU/pythonpath pt_BR/Lightproof.py pt_BR/pythonpath ru_RU/pythonpath

en/pythonpath/lightproof_impl_en.py |3 ++- hu_HU/pythonpath/lightproof_impl_hu_HU.py |3 ++- pt_BR/Lightproof.py |7 --- pt_BR/pythonpath/lightproof_impl_pt_BR.py |3 ++- ru_RU/pythonpath/lightproof_impl_ru_RU.py |3 ++- 5 files changed, 12 inse

libreoffice on armhf: ‘asm’ operand has impossible constraints or there are not enough registers

[ Ccing libreoffice upstream ] Hi, see https://buildd.debian.org/status/fetch.php?pkg=libreoffice&arch=armhf&ver=4%3A24.8.0~rc2-1&stamp=1722178361&raw=1: build CXX] bridges/source/cpp_uno/gcc3_linux_arm/uno2cpp.cxx S=/<> && I=$S/instdir && W=$S/workdir && mkdir -p $W/CxxObject/bridges/source/

core.git: drawinglayer/source

drawinglayer/source/processor2d/vclprocessor2d.cxx | 20 ++-- 1 file changed, 14 insertions(+), 6 deletions(-) New commits: commit 046a3f5d879d489affdb3ae98329020db209dc6a Author: Caolán McNamara AuthorDate: Sun Jul 28 16:08:13 2024 +0100 Commit: Caolán McNamara Commit

core.git: basctl/source cppuhelper/source cui/source framework/source oox/source scripting/source sc/source sdext/source sfx2/source svx/source sw/source vcl/source xmloff/source

basctl/source/basicide/basobj2.cxx |2 +- cppuhelper/source/shlib.cxx |2 +- cui/source/dialogs/hldocntp.cxx |2 +- cui/source/options/connpoolconfig.cxx |2 +- framework/sour

core.git: desktop/source framework/inc framework/source

desktop/source/lib/init.cxx| 15 --- framework/inc/helper/statusindicatorfactory.hxx|9 - framework/source/helper/statusindicatorfactory.cxx | 11 +++ 3 files changed, 31 insertions(+), 4 deletions(-) New commits: commit b707ca9651a3

core.git: Branch 'libreoffice-24-8' - vcl/source

vcl/source/app/salvtables.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 294e206ff0651d7081ac96d6c5dfc964728d86f5 Author: Caolán McNamara AuthorDate: Sat Jul 27 20:25:35 2024 +0100 Commit: Caolán McNamara CommitDate: Sun Jul 28 17:20:36 2024 +0200 Resolves: tdf#

core.git: slideshow/source svx/source

slideshow/source/engine/shapes/mediashape.cxx |7 +-- slideshow/source/engine/shapes/viewmediashape.cxx | 17 +++-- slideshow/source/engine/shapes/viewmediashape.hxx |4 +++- slideshow/source/engine/slide/slideimpl.cxx |9 + slideshow/source/inc/slid

core.git: framework/inc framework/source

framework/inc/helper/wakeupthread.hxx|3 +++ framework/source/helper/wakeupthread.cxx | 17 + 2 files changed, 20 insertions(+) New commits: commit 78090581d246cd391d99575680b5b8f8d9de7840 Author: Caolán McNamara AuthorDate: Sun Jul 28 14:07:49 2024 +0100 Commit:

core.git: sc/source

sc/source/filter/html/htmlpars.cxx |7 --- 1 file changed, 4 insertions(+), 3 deletions(-) New commits: commit 21250dc9c5787d9274837b2bf39c32c2627e44b4 Author: Caolán McNamara AuthorDate: Sat Jul 27 20:54:18 2024 +0100 Commit: Caolán McNamara CommitDate: Sun Jul 28 16:34:48 2024

core.git: sfx2/qa solenv/bin solenv/gbuild solenv/gdb solenv/lldb sw/qa

sfx2/qa/python/check_sidebar.py |2 - solenv/bin/finish-gbuild-trace.py |2 - solenv/bin/generate-tokens.py | 15 + solenv/bin/image-sort.py|

core.git: vcl/source

vcl/source/app/salvtables.cxx |2 ++ 1 file changed, 2 insertions(+) New commits: commit 85511e27d259d6b19cc6c463fc06368c14511bb8 Author: Caolán McNamara AuthorDate: Sat Jul 27 20:25:35 2024 +0100 Commit: Caolán McNamara CommitDate: Sun Jul 28 14:58:49 2024 +0200 Resolves: tdf#

Re: Trouble with git reset in my pushtree

Thanks for your answers, but I found the root cause which was (as always) located between the chair and the keyboard. My batch file was using "./g reset --hard origin/master" instead of "git...". Reverting to the right command solved my problem. Sorry for the noise. Laurent Le 28/07/2024 à

Re: Trouble with git reset in my pushtree

Hello, If you are not on master branch, you can invoke this to get back to master: $ git checkout master If you want to get rid of some commits that you have done on top of the master branch, first you have to know what is the status. That's what I get while having 1 commit on top of master

core.git: Branch 'feature/cib_contract49c' - sw/source writerfilter/source

sw/source/filter/ww8/ww8par.cxx |2 ++ writerfilter/source/dmapper/DomainMapper.cxx |1 + writerfilter/source/filter/WriterFilter.cxx |2 ++ 3 files changed, 5 insertions(+) New commits: commit 3978dfe0fcd21b35ee3af92ea4129f66b14a2491 Author: Oliver Specht AuthorDat

core.git: sd/qa

sd/qa/uitest/impress_tests/autocorrectOptions.py |1 - sd/qa/uitest/impress_tests/customSlideShow.py| 14 ++ sd/qa/uitest/impress_tests/slideShowSettings.py |4 +--- sd/qa/uitest/impress_tests/tdf152295.py |2 +- sd/qa/uitest/impress_tests/tdf155863.py

Re: Trouble with git reset in my pushtree

On 28.7.2024 11.25, Laurent Balland wrote: Hi, I've got a push tree since several years, and it changed its behavior a few weeks ago: git reset --hard origin/master now preserve my changes. Which option should I use to discard all my changes? In the .git/config file of LibreOffice source

core.git: connectivity/source

connectivity/source/drivers/odbc/OResultSet.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fac23917fcc6b8846c5cf1e6f88c03e74e332f9e Author: Mike Kaganski AuthorDate: Sun Jul 28 11:48:36 2024 +0500 Commit: Mike Kaganski CommitDate: Sun Jul 28 10:25:55 20

Trouble with git reset in my pushtree

Hi, I've got a push tree since several years, and it changed its behavior a few weeks ago: git reset --hard origin/master now preserve my changes. Which option should I use to discard all my changes? Thanks Laurent