date:20220616

 sw/qa/extras/layout/layout.cxx |  329 ++---
 1 file changed, 214 insertions(+), 115 deletions(-)

New commits:
commit 6fd91fe5ff246aba7c15c458e6440beef48f510b
Author: Miklos Vajna 
AuthorDate: Thu Jun 16 20:24:38 2022 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jun 17 08:38:23 2022 +0200

CppunitTest_sw_layoutwriter: use more SwParaPortion::dumpAsXml()

See commit feeed3e762cf077fbd9cf48f82e949365108ccc1
(CppunitTest_sw_layoutwriter: avoid some a11y-based layout testing,
2022-04-07) for motivation.

Change-Id: I0336c35df7b9b9d1704cc6611b8ffe1f111977a6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136004
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index 0ca6f1368253..2c422a617856 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -2770,19 +2770,30 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, 
testRedlineFlysAtFlys)
 
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/merged",
 "paraPropsNodeIndex", "11");
 assertXPath(pXmlDoc,
-
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
-"nType", "PortionType::Para");
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/SwParaPortion/"
+"SwLineLayout/SwParaPortion[1]",
+"type", "PortionType::Para");
 assertXPath(pXmlDoc,
-
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
-"Portion", "jqr");
-assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Special[1]", "nType",
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/SwParaPortion/"
+"SwLineLayout/SwParaPortion[1]",
+"portion", "jqr");
+assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+"SwFixPortion[1]",
+"type",
 "PortionType::Fly"); // remove???
-assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "nType",
-"PortionType::Lay");
-assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/Text[1]", "Portion",
-"abhi");
-assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "nType", 
"PortionType::Para");
-assertXPath(pXmlDoc, "/root/page[1]/body/txt[1]/Text[1]", "Portion", 
"foaz");
+assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+"SwLineLayout[1]",
+"type", "PortionType::Lay");
+assertXPath(pXmlDoc,
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/txt[1]/SwParaPortion/SwLineLayout/"
+"SwLineLayout[1]",
+"portion", "abhi");
+assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+"type", "PortionType::Para");
+assertXPath(pXmlDoc, 
"/root/page[1]/body/txt[1]/SwParaPortion/SwLineLayout/SwParaPortion[1]",
+"portion", "foaz");
 
 dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
 CPPUNIT_ASSERT(!pLayout->IsHideRedlines());
@@ -2797,67 +2808,110 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, 
testRedlineFlysAtFlys)
 }
 
 assertXPath(pXmlDoc,
-
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
-"nType", "PortionType::Text");
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/SwParaPortion/"
+"SwLineLayout/SwLinePortion[1]",
+"type", "PortionType::Text");
 assertXPath(pXmlDoc,
-
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[1]",
-"Portion", "j");
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/SwParaPortion/"
+"SwLineLayout/SwLinePortion[1]",
+"portion", "j");
 assertXPath(pXmlDoc,
-
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[2]",
-"nType", "PortionType::Text");
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/SwParaPortion/"
+"SwLineLayout/SwLinePortion[2]",
+"type", "PortionType::Text");
 assertXPath(pXmlDoc,
-
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/Text[2]",
-"Portion", "kl");
+
"/root/page[1]/body/txt[1]/anchored/fly[1]/anchored[1]/fly[1]/txt[1]/SwParaPortion/"
+"SwLineLayout/SwLinePortion[2]",
+"portion", "kl");
 assertX

Re: How to write OOXML attribute 'vert' of element to ODF?

Hi Regina,

On Thu, Jun 16, 2022 at 02:49:45PM +0200, Regina Henschel 
 wrote:
> My idea is to introduce a new loext:text-direction attribute of the
>  element, which can carry each of the values of the
> OOXML attribute 'vert'. "Each" needs to be discussed, perhaps better to
> exclude values eaVert and mongolianVert, which in fact are writing modes
> TB_RL and TB_LR. Possible values would be ("eaVert"), "horz",
> ("mongolianVert"), "vert", "vert270", "wordArtVert" and "wordArtVertRtl".

Yes, I think the idea to use 'vert' only for Writing direction and not
for rotation is a good one. Thanks for looking into this.

PS: the previous mail got back to me with:

: host mx03.t-online.de[194.25.134.73] refused to talk
to me: 554

I wonder if that's a temporary problem and if that's something on my end
or your end. :-)

Regards,

Miklos

Re: Accessing main window menus during C++ test run

Hi Colomban,

On Thu, Jun 16, 2022 at 03:09:51PM +0200, Colomban Wendling 
 wrote:
> Bingo, hooking in there do give me the accessible tree I'm hoping for, as
> with the Python UITest, thanks.

Good, that's partial success. :-)

> Unfortunately, I'm supposed to write in-process tests [1], so that wouldn't
> really be an option.  If really it's the only way I'd bring the discussion
> and see if that requirement can be lifted, but then maybe I should just
> switch to Python directly as it's probably more beginner-friendly as it's
> one of the aims of the work I'm on.  Anyway, for the moment that's not the
> option I'm hoping for :)

Sure, in-process tests are great if you can get them working, because
they are simpler (more reliable) + it's much easier to debug if they
fail.

> > Most of our cppunit tests run in-process, using --headless, so if there
> > would be any dialogs popping up, we would instantly cancel them.
> 
> OK, that's an interesting info.  However, I'm not anywhere close to dealing
> with dialogs or even popups yet, all I'm after is the accessible objects
> representing the menu items.  This shouldn't require anything to actually
> get displayed or pop up.
> I guess however that maybe in headless mode the UI is in a degraded state;
> would it be possible to trigger loading of the missing bits?  Any idea where
> to look?

Hmm, so far you tried out of process + SAL_USE_VCLPLUGIN=svp and
in-process + --headless.

Try experimenting with the in-process + SAL_USE_VCLPLUGIN=svp
combination, perhaps that would give you what you need.

Be aware that in case of in-process tests your test code is running on
the main thread, so if you depend on any idles, you need to manually
spin the main loop with Scheduler::ProcessEventsToIdle() (vs out of
process tests, where this is done for you automatically).

Regards,

Miklos

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - vcl/skia

 vcl/skia/osx/gdiimpl.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit c254bdb414ff14db3678b38298fa3cc3a8484f8d
Author: Luboš Luňák 
AuthorDate: Thu Jun 16 18:21:10 2022 +0200
Commit: Luboš Luňák 
CommitDate: Fri Jun 17 08:23:31 2022 +0200

handle GC* pixmap functions on Mac reading past pixmap (tdf#145843)

The code passes adjusted position for pixel data in order to create
a sub-rect of the pixmap without copying, but at least on Intel Mac
the GC* functions then try to read the entire pixel row even though
it shouldn't be necessary. Since that may cause reading past the
pixmap data if the last line is involved, use entire pixmap width
to avoid that.

Change-Id: Ia08059b363d39dd465b2cadde5138ee045628f59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136003
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit fca6d9111314d659e7adb417d03de656b516b528)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136029

diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx
index 0c9ac5e9c14b..f8bcdd68352e 100644
--- a/vcl/skia/osx/gdiimpl.cxx
+++ b/vcl/skia/osx/gdiimpl.cxx
@@ -139,6 +139,18 @@ void AquaSkiaSalGraphicsImpl::flushSurfaceToScreenCG()
 // This creates the bitmap context from the cropped part, 
writable_addr32() will get
 // the first pixel of mDirtyRect.topLeft(), and using pixmap.rowBytes() 
ensures the following
 // pixel lines will be read from correct positions.
+if (pixmap.bounds() != mDirtyRect && pixmap.bounds().bottom() == 
mDirtyRect.bottom())
+{
+// HACK for tdf#145843: If mDirtyRect includes the last line but not 
the first pixel of it,
+// then the rowBytes() trick would lead to the GC* functions thinking 
that even pixels after
+// the pixmap data belong to the area (since the shifted 
x()+rowBytes() points there) and
+// at least on Intel Mac they would actually read those data, even 
though I see no good reason
+// to do that, as that's beyond the x()+width() for the last line. 
That could be handled
+// by creating a subset SkImage (which as is said above copies data), 
or set the x coordinate
+// to 0, which will then make rowBytes() match the actual data.
+mDirtyRect.fLeft = 0;
+assert(mDirtyRect.width() == pixmap.bounds().width());
+}
 CGContextRef context = CGBitmapContextCreate(
 pixmap.writable_addr32(mDirtyRect.x() * mScaling, mDirtyRect.y() * 
mScaling),
 mDirtyRect.width() * mScaling, mDirtyRect.height() * mScaling, 8, 
pixmap.rowBytes(),

[Libreoffice-commits] core.git: toolkit/source

2022-06-16 Thread Ilhan Yesil (via logerrit)

 toolkit/source/awt/vclxtabpagecontainer.cxx   |2 ++
 toolkit/source/controls/controlmodelcontainerbase.cxx |4 
 toolkit/source/controls/tabpagemodel.cxx  |1 +
 3 files changed, 7 insertions(+)

New commits:
commit 0f1837306ae5c2c2e10f256b872c46b0bfba00dd
Author: Ilhan Yesil 
AuthorDate: Wed Jun 15 12:52:34 2022 +0200
Commit: Michael Weghorn 
CommitDate: Fri Jun 17 08:15:14 2022 +0200

tdf#149575 UnoControlTabPageContainer: Handle tab image

Setting a tab page's image in the tab button is done via
method 'XTabPageModel.setImageURL'.

Change-Id: Ideb096f88037dac26abe90fccae2251dcce84659
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135900
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 

diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx 
b/toolkit/source/awt/vclxtabpagecontainer.cxx
index 80124c9de868..18e12cdab488 100644
--- a/toolkit/source/awt/vclxtabpagecontainer.cxx
+++ b/toolkit/source/awt/vclxtabpagecontainer.cxx
@@ -224,6 +224,8 @@ void 
VCLXTabPageContainer::propertiesChange(const::css::uno::SequenceSetPageEnabled(nId, xTabPageModel->getEnabled());
 } else if (rEvent.PropertyName == GetPropertyName(BASEPROPERTY_TITLE)) 
{
 pTabCtrl->SetPageText(nId, xTabPageModel->getTitle());
+} else if (rEvent.PropertyName == 
GetPropertyName(BASEPROPERTY_IMAGEURL)) {
+pTabCtrl->SetPageImage(nId, 
TkResMgr::getImageFromURL(xTabPageModel->getImageURL()));
 }
 }
 }
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx 
b/toolkit/source/controls/controlmodelcontainerbase.cxx
index 677d000f9e50..9099c65cc553 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -768,6 +768,10 @@ OUString SAL_CALL ControlModelContainerBase::getImageURL()
 void SAL_CALL ControlModelContainerBase::setImageURL( const OUString& 
_imageurl )
 {
 m_sImageURL = _imageurl;
+SolarMutexGuard aGuard;
+Reference xThis(*this, UNO_QUERY);
+xThis->setPropertyValue(GetPropertyName(BASEPROPERTY_IMAGEURL), 
Any(_imageurl));
+
 }
 OUString SAL_CALL ControlModelContainerBase::getToolTip()
 {
diff --git a/toolkit/source/controls/tabpagemodel.cxx 
b/toolkit/source/controls/tabpagemodel.cxx
index c82e54e417c6..cbfbebd78c51 100644
--- a/toolkit/source/controls/tabpagemodel.cxx
+++ b/toolkit/source/controls/tabpagemodel.cxx
@@ -52,6 +52,7 @@ UnoControlTabPageModel::UnoControlTabPageModel( Reference< 
XComponentContext > c
 ImplRegisterProperty( BASEPROPERTY_SCROLLHEIGHT );
 ImplRegisterProperty( BASEPROPERTY_SCROLLTOP );
 ImplRegisterProperty( BASEPROPERTY_SCROLLLEFT );
+ImplRegisterProperty( BASEPROPERTY_IMAGEURL );
 }
 
 OUString SAL_CALL UnoControlTabPageModel::getImplementationName()

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - pyuno/source

2022-06-16 Thread Stephan Bergmann (via logerrit)

 pyuno/source/loader/pyuno_loader.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit b8ff07fd7dfcfaa344778a4a1a8ba4ff431c66c1
Author: Stephan Bergmann 
AuthorDate: Thu Jun 16 18:58:18 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jun 17 07:17:56 2022 +0200

rhbz#2097411 Avoid obsolete PyThreadState_Delete crashing Python 3.11

1fb53a637597f76bea86514b62ddfad34f60c889 "pyuno_loader::CreateInstance: 
delete
the initial PyThreadState" had added the PyThreadState_Delete for claimed
benefits but whose details appear lost to history (cf. the comment thread
starting at


"pyuno_loader::CreateInstance: delete the initial PyThreadState").  And at 
least
a recent master Linux --enable-python=fully-internal build with the bundled
Python 3.8.12 appears to succeed `make check` just fine with the
PyThreadState_Delete temporarily removed.

But on the other hand, building against upcoming Python 3.11 now started to 
make
CppunitTest_services fail with

> Fatal Python error: init_threadstate: thread state already initialized
> Python runtime state: initialized
> Thread 0x81c8b020 (most recent call first):
>   
> Fatal exception: Signal 6
> Stack:
> 
/builddir/build/BUILD/libreoffice-7.3.4.2/instdir/program/libuno_sal.so.3(+0x37c28)[0x81be7c28]
> 
/builddir/build/BUILD/libreoffice-7.3.4.2/instdir/program/libuno_sal.so.3(+0x37e40)[0x81be7e40]
> linux-vdso.so.1(__kernel_rt_sigreturn+0x0)[0x81ccb7ec]
> /lib64/libc.so.6(+0x82878)[0x81742878]
> /lib64/libc.so.6(raise+0x20)[0x816fae00]
> /lib64/libc.so.6(abort+0xe8)[0x816e72b8]
> /lib64/libpython3.11.so.1.0(+0x104e28)[0xfffee4de4e28]
> /lib64/libpython3.11.so.1.0(+0x105200)[0xfffee4de5200]
> 
/lib64/libpython3.11.so.1.0(PyThread_get_thread_native_id+0x0)[0xfffee4ed6764]
> /lib64/libpython3.11.so.1.0(PyThreadState_New+0x14)[0xfffee4ed6628]
> 
/builddir/build/BUILD/libreoffice-7.3.4.2/instdir/program/libpyuno.so(_ZN5pyuno14PyThreadAttachC2EP3_is+0x78)[0xfffee4c8c52c]
> 
/builddir/build/BUILD/libreoffice-7.3.4.2/instdir/program/libpythonloaderlo.so(pyuno_Loader_get_implementation+0x5c)[0xfffee5243060]
> 
/builddir/build/BUILD/libreoffice-7.3.4.2/instdir/program/libuno_cppuhelpergcc3.so.3(+0x544b4)[0x815544b4]

because of the PyThreadState_Delete.  (The deleted PyThreadState, while not
reused again directly, is still recorded in the state obtained from
PyInterpreterState_Head() later.)

So conservatively keep the PyThreadState_Delete of unclear benefit for older
Python versions and only drop it for 3.11 where it is known to have negative
effects now.

Change-Id: I9b99f1e947f0b165ddc95c2bfbd764858dda39db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136006
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit e7bf4f8ccf2b2d8ed512ce8817394764a93e0a37)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136024

diff --git a/pyuno/source/loader/pyuno_loader.cxx 
b/pyuno/source/loader/pyuno_loader.cxx
index c9b8248c1b25..da0467f450c6 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -229,10 +229,12 @@ void pythonInit() {
 
 PyThreadState *tstate = PyThreadState_Get();
 PyEval_ReleaseThread( tstate );
+#if PY_VERSION_HEX < 0x030B
 // This tstate is never used again, so delete it here.
 // This prevents an assertion in PyThreadState_Swap on the
 // PyThreadAttach below.
 PyThreadState_Delete(tstate);
+#endif
 }
 
 }

[Libreoffice-commits] core.git: sc/source

2022-06-16 Thread Julien Nabet (via logerrit)

 sc/source/ui/vba/vbarange.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 0cea5d817434c5f7ccc8816f7f5e29a4ba95f8f0
Author: Julien Nabet 
AuthorDate: Thu Jun 16 21:06:37 2022 +0200
Commit: Julien Nabet 
CommitDate: Fri Jun 17 07:08:00 2022 +0200

Another "One call to XCellRangeAddressable::getRangeAddress() is enough"

See 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=e44e418783d101c530c916db0b0f72c376188fdf

Change-Id: I1106d1777690c27b9e4765a3a94145bb73609005
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136005
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 99933f165c24..d94bd7b04a35 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -2657,11 +2657,8 @@ ScVbaRange::Resize( const uno::Any &RowSize, const 
uno::Any &ColumnSize )
 xCursor->collapseToSize( nColumnSize, nRowSize );
 uno::Reference< sheet::XCellRangeAddressable > 
xCellRangeAddressable(xCursor, ::uno::UNO_QUERY_THROW );
 uno::Reference< table::XCellRange > xRange( xSheetRange->getSpreadsheet(), 
::uno::UNO_QUERY_THROW );
-return new ScVbaRange( mxParent, mxContext,xRange->getCellRangeByPosition(
-
xCellRangeAddressable->getRangeAddress().StartColumn,
-
xCellRangeAddressable->getRangeAddress().StartRow,
-
xCellRangeAddressable->getRangeAddress().EndColumn,
-
xCellRangeAddressable->getRangeAddress().EndRow ) );
+const table::CellRangeAddress aRA( 
xCellRangeAddressable->getRangeAddress());
+return new ScVbaRange( mxParent, mxContext, 
xRange->getCellRangeByPosition( aRA.StartColumn, aRA.StartRow, aRA.EndColumn, 
aRA.EndRow));
 }
 
 void

[Libreoffice-commits] core.git: vcl/skia

 vcl/skia/osx/gdiimpl.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 8a5beccc19b4fdffb7b82ba5fd26f4cf316d9811
Author: Luboš Luňák 
AuthorDate: Thu Jun 16 18:21:10 2022 +0200
Commit: Luboš Luňák 
CommitDate: Fri Jun 17 06:16:28 2022 +0200

handle GC* pixmap functions on Mac reading past pixmap (tdf#145843)

The code passes adjusted position for pixel data in order to create
a sub-rect of the pixmap without copying, but at least on Intel Mac
the GC* functions then try to read the entire pixel row even though
it shouldn't be necessary. Since that may cause reading past the
pixmap data if the last line is involved, use entire pixmap width
to avoid that.

Change-Id: Ia08059b363d39dd465b2cadde5138ee045628f59
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136003
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/vcl/skia/osx/gdiimpl.cxx b/vcl/skia/osx/gdiimpl.cxx
index 0c9ac5e9c14b..f8bcdd68352e 100644
--- a/vcl/skia/osx/gdiimpl.cxx
+++ b/vcl/skia/osx/gdiimpl.cxx
@@ -139,6 +139,18 @@ void AquaSkiaSalGraphicsImpl::flushSurfaceToScreenCG()
 // This creates the bitmap context from the cropped part, 
writable_addr32() will get
 // the first pixel of mDirtyRect.topLeft(), and using pixmap.rowBytes() 
ensures the following
 // pixel lines will be read from correct positions.
+if (pixmap.bounds() != mDirtyRect && pixmap.bounds().bottom() == 
mDirtyRect.bottom())
+{
+// HACK for tdf#145843: If mDirtyRect includes the last line but not 
the first pixel of it,
+// then the rowBytes() trick would lead to the GC* functions thinking 
that even pixels after
+// the pixmap data belong to the area (since the shifted 
x()+rowBytes() points there) and
+// at least on Intel Mac they would actually read those data, even 
though I see no good reason
+// to do that, as that's beyond the x()+width() for the last line. 
That could be handled
+// by creating a subset SkImage (which as is said above copies data), 
or set the x coordinate
+// to 0, which will then make rowBytes() match the actual data.
+mDirtyRect.fLeft = 0;
+assert(mDirtyRect.width() == pixmap.bounds().width());
+}
 CGContextRef context = CGBitmapContextCreate(
 pixmap.writable_addr32(mDirtyRect.x() * mScaling, mDirtyRect.y() * 
mScaling),
 mDirtyRect.width() * mScaling, mDirtyRect.height() * mScaling, 8, 
pixmap.rowBytes(),

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b402e8c1d045590d8a814a496ab15ca51c384e76
Author: Olivier Hallot 
AuthorDate: Fri Jun 17 03:33:53 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 17 03:33:53 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-4'
  to 9c49f2a9e8140358395e423ccf1c07b7b4af1a15
  - Mute l10n

Change-Id: Icd723b9b933788c5ac9e1b2bbb9e541f241bdbe1
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136020
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit b01904aabf78c6981d4c3b3953483bea9e86c2b3)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136028
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 2823fbf593dc..9c49f2a9e814 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2823fbf593dc4f9d87f3d14731bf997cc7de7deb
+Subproject commit 9c49f2a9e8140358395e423ccf1c07b7b4af1a15

[Libreoffice-commits] help.git: Branch 'libreoffice-7-4' - source/text

 source/text/shared/01/0220.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9c49f2a9e8140358395e423ccf1c07b7b4af1a15
Author: Olivier Hallot 
AuthorDate: Thu Jun 16 21:25:34 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Jun 17 03:33:52 2022 +0200

Mute l10n

Change-Id: Icd723b9b933788c5ac9e1b2bbb9e541f241bdbe1
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136020
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit b01904aabf78c6981d4c3b3953483bea9e86c2b3)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136028
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/01/0220.xhp 
b/source/text/shared/01/0220.xhp
index 25e9464d9..b7f4622fd 100644
--- a/source/text/shared/01/0220.xhp
+++ b/source/text/shared/01/0220.xhp
@@ -36,7 +36,7 @@
 
 
 
-
+
 
 
 Resizes the object to the original size.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bad63ab71226eb768fd390dae1e78f215196f2e2
Author: Seth Chaiklin 
AuthorDate: Fri Jun 17 03:23:35 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 17 03:23:35 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-4'
  to 2823fbf593dc4f9d87f3d14731bf997cc7de7deb
  - (related)tdf#138844, (related)tdf#149018  "Type"  -> "Position and Size"

  tdf#138844 changed the "Type" tab in the Properties dialog for Image
  and Frame to be labeled "Position and Size" and tdf#149018 did the
  same change for OLE Object. This patch updates relevant help pages to
  reflect the change in the tab name.

Change-Id: Ieb8f1f6947b59638a713e583d2bb9a174b8815a2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136026
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 9827b5c7c1e4da68b704e59382a6b46d0c252136)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136027

diff --git a/helpcontent2 b/helpcontent2
index 907f876a9a0a..2823fbf593dc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 907f876a9a0ab822fe6a67ab779ca03f4134e4d5
+Subproject commit 2823fbf593dc4f9d87f3d14731bf997cc7de7deb

[Libreoffice-commits] help.git: Branch 'libreoffice-7-4' - source/text

 source/text/swriter/00/0405.xhp |8 
 source/text/swriter/01/05060100.xhp |6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 2823fbf593dc4f9d87f3d14731bf997cc7de7deb
Author: Seth Chaiklin 
AuthorDate: Fri Jun 17 00:42:38 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Jun 17 03:23:34 2022 +0200

(related)tdf#138844, (related)tdf#149018  "Type"  -> "Position and Size"

  tdf#138844 changed the "Type" tab in the Properties dialog for Image
  and Frame to be labeled "Position and Size" and tdf#149018 did the
  same change for OLE Object. This patch updates relevant help pages to
  reflect the change in the tab name.

Change-Id: Ieb8f1f6947b59638a713e583d2bb9a174b8815a2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136026
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 9827b5c7c1e4da68b704e59382a6b46d0c252136)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136027

diff --git a/source/text/swriter/00/0405.xhp 
b/source/text/swriter/00/0405.xhp
index c9dad60a6..67f47711c 100644
--- a/source/text/swriter/00/0405.xhp
+++ b/source/text/swriter/00/0405.xhp
@@ -130,10 +130,10 @@
  
   
   
- Choose Format - Image - Properties - Type 
tab.
- Choose Format - Frame and Object - Properties - 
Type tab.UFI: removed some lines with 
Format-Object, see #i64150
-Choose 
View - Styles - open context menu Modify/New - Type 
tab.
- Choose Insert - Frame - Frame - Type 
tab.
+ Choose Format - Image - Properties - Position and 
Size tab.
+ Choose Format - Frame and Object - Properties - 
Position and Size tab.UFI: removed some lines 
with Format-Object, see #i64150
+Choose 
View - Styles - Frame Styles - open context menu 
Modify/New - Type tab.
+ Choose Insert - Frame - Frame - Position and 
Size tab.
   
   
  Choose Format - Image - Properties - Wrap 
tab.
diff --git a/source/text/swriter/01/05060100.xhp 
b/source/text/swriter/01/05060100.xhp
index 465692745..098d2c9ba 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -20,7 +20,7 @@
 
 
   
-Type
+Position and Size
 /text/swriter/01/05060100.xhp
   
 
@@ -32,8 +32,8 @@
 UFI: new index entries, see i54237
 
 
-Type
-Specifies the size and the position of the selected object or frame on 
a page.
+Position and Size
+Specifies the size and the position of the selected image, frame, or 
OLE object on a page.

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9ace7e3a6c2ebb8311a8277e05564953480aa3bc
Author: Seth Chaiklin 
AuthorDate: Fri Jun 17 03:22:15 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Fri Jun 17 03:22:15 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 9f035d777141d5f039a85d6f64b627eaf73b8079
  - (related)tdf#138844, (related)tdf#149018  "Type"  -> "Position and Size"

  tdf#138844 changed the "Type" tab in the Properties dialog for Image
  and Frame to be labeled "Position and Size" and tdf#149018 did the
  same change for OLE Object. This patch updates relevant help pages to
  reflect the change in the tab name.

Change-Id: Ieb8f1f6947b59638a713e583d2bb9a174b8815a2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136026
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index b01904aabf78..9f035d777141 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit b01904aabf78c6981d4c3b3953483bea9e86c2b3
+Subproject commit 9f035d777141d5f039a85d6f64b627eaf73b8079

[Libreoffice-commits] help.git: source/text

 source/text/swriter/00/0405.xhp |8 
 source/text/swriter/01/05060100.xhp |6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 9f035d777141d5f039a85d6f64b627eaf73b8079
Author: Seth Chaiklin 
AuthorDate: Fri Jun 17 00:42:38 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Jun 17 03:22:14 2022 +0200

(related)tdf#138844, (related)tdf#149018  "Type"  -> "Position and Size"

  tdf#138844 changed the "Type" tab in the Properties dialog for Image
  and Frame to be labeled "Position and Size" and tdf#149018 did the
  same change for OLE Object. This patch updates relevant help pages to
  reflect the change in the tab name.

Change-Id: Ieb8f1f6947b59638a713e583d2bb9a174b8815a2
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136026
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/swriter/00/0405.xhp 
b/source/text/swriter/00/0405.xhp
index c9dad60a6..67f47711c 100644
--- a/source/text/swriter/00/0405.xhp
+++ b/source/text/swriter/00/0405.xhp
@@ -130,10 +130,10 @@
  
   
   
- Choose Format - Image - Properties - Type 
tab.
- Choose Format - Frame and Object - Properties - 
Type tab.UFI: removed some lines with 
Format-Object, see #i64150
-Choose 
View - Styles - open context menu Modify/New - Type 
tab.
- Choose Insert - Frame - Frame - Type 
tab.
+ Choose Format - Image - Properties - Position and 
Size tab.
+ Choose Format - Frame and Object - Properties - 
Position and Size tab.UFI: removed some lines 
with Format-Object, see #i64150
+Choose 
View - Styles - Frame Styles - open context menu 
Modify/New - Type tab.
+ Choose Insert - Frame - Frame - Position and 
Size tab.
   
   
  Choose Format - Image - Properties - Wrap 
tab.
diff --git a/source/text/swriter/01/05060100.xhp 
b/source/text/swriter/01/05060100.xhp
index 465692745..098d2c9ba 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -20,7 +20,7 @@
 
 
   
-Type
+Position and Size
 /text/swriter/01/05060100.xhp
   
 
@@ -32,8 +32,8 @@
 UFI: new index entries, see i54237
 
 
-Type
-Specifies the size and the position of the selected object or frame on 
a page.
+Position and Size
+Specifies the size and the position of the selected image, frame, or 
OLE object on a page.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/inc sc/source

 sc/inc/listenercalls.hxx  |6 --
 sc/source/ui/unoobj/listenercalls.cxx |2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b137bbe994cf5b23128c27fc65866406c32bec8b
Author: Eike Rathke 
AuthorDate: Thu Jun 16 21:44:40 2022 +0200
Commit: Eike Rathke 
CommitDate: Thu Jun 16 23:30:00 2022 +0200

Resolves: tdf#147822 ScUnoListenerEntry container must be std::list

... instead of std::vector to not get invalidated iterators when
the container is resized.

Regression from

commit f8defe59ff75df2b516ee407f1dac22b0ac72a19
CommitDate: Wed Sep 6 22:45:10 2017 +0200

Replace some lists by vectors in unoobj (sc)

which was bad for this case.

Change-Id: I8d3a001242865cadc82b359a3198906d26373a41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136007
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 7eda1a7346677fc85a6a3fd5e16adcb4590d7b03)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136022

diff --git a/sc/inc/listenercalls.hxx b/sc/inc/listenercalls.hxx
index ff835a048b1a..acb009937fa1 100644
--- a/sc/inc/listenercalls.hxx
+++ b/sc/inc/listenercalls.hxx
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include 
+#include 
 #include 
 #include 
 
@@ -48,7 +48,9 @@ struct ScUnoListenerEntry
 class ScUnoListenerCalls
 {
 private:
-::std::vector aEntries;
+// Must be list, not vector, to not invalidate iterators, see
+// ExecuteAndClear() implementation.
+::std::list aEntries;
 
 public:
 ScUnoListenerCalls();
diff --git a/sc/source/ui/unoobj/listenercalls.cxx 
b/sc/source/ui/unoobj/listenercalls.cxx
index 2d9a23083ca8..7ff7c7df0956 100644
--- a/sc/source/ui/unoobj/listenercalls.cxx
+++ b/sc/source/ui/unoobj/listenercalls.cxx
@@ -44,7 +44,7 @@ void ScUnoListenerCalls::ExecuteAndClear()
 //  During each modified() call, Add may be called again.
 //  These new calls are executed here, too.
 
-std::vector::iterator aItr(aEntries.begin());
+std::list::iterator aItr(aEntries.begin());
 while (aItr != aEntries.end())
 {
 ScUnoListenerEntry aEntry = *aItr;

[Libreoffice-commits] core.git: pyuno/source

2022-06-16 Thread Stephan Bergmann (via logerrit)

 pyuno/source/loader/pyuno_loader.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1638b4f78af70b7b97d0a081ed51390dd87bf1f9
Author: Stephan Bergmann 
AuthorDate: Thu Jun 16 18:58:18 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 16 22:40:28 2022 +0200

rhbz#2097411 Avoid obsolete PyThreadState_Delete crashing Python 3.11

1fb53a637597f76bea86514b62ddfad34f60c889 "pyuno_loader::CreateInstance: 
delete
the initial PyThreadState" had added the PyThreadState_Delete for claimed
benefits but whose details appear lost to history (cf. the comment thread
starting at


"pyuno_loader::CreateInstance: delete the initial PyThreadState").  And at 
least
a recent master Linux --enable-python=fully-internal build with the bundled
Python 3.8.12 appears to succeed `make check` just fine with the
PyThreadState_Delete temporarily removed.

But on the other hand, building against upcoming Python 3.11 now started to 
make
CppunitTest_services fail with

> Fatal Python error: init_threadstate: thread state already initialized
> Python runtime state: initialized
> Thread 0x81c8b020 (most recent call first):
>   
> Fatal exception: Signal 6
> Stack:
> 
/builddir/build/BUILD/libreoffice-7.3.4.2/instdir/program/libuno_sal.so.3(+0x37c28)[0x81be7c28]
> 
/builddir/build/BUILD/libreoffice-7.3.4.2/instdir/program/libuno_sal.so.3(+0x37e40)[0x81be7e40]
> linux-vdso.so.1(__kernel_rt_sigreturn+0x0)[0x81ccb7ec]
> /lib64/libc.so.6(+0x82878)[0x81742878]
> /lib64/libc.so.6(raise+0x20)[0x816fae00]
> /lib64/libc.so.6(abort+0xe8)[0x816e72b8]
> /lib64/libpython3.11.so.1.0(+0x104e28)[0xfffee4de4e28]
> /lib64/libpython3.11.so.1.0(+0x105200)[0xfffee4de5200]
> 
/lib64/libpython3.11.so.1.0(PyThread_get_thread_native_id+0x0)[0xfffee4ed6764]
> /lib64/libpython3.11.so.1.0(PyThreadState_New+0x14)[0xfffee4ed6628]
> 
/builddir/build/BUILD/libreoffice-7.3.4.2/instdir/program/libpyuno.so(_ZN5pyuno14PyThreadAttachC2EP3_is+0x78)[0xfffee4c8c52c]
> 
/builddir/build/BUILD/libreoffice-7.3.4.2/instdir/program/libpythonloaderlo.so(pyuno_Loader_get_implementation+0x5c)[0xfffee5243060]
> 
/builddir/build/BUILD/libreoffice-7.3.4.2/instdir/program/libuno_cppuhelpergcc3.so.3(+0x544b4)[0x815544b4]

because of the PyThreadState_Delete.  (The deleted PyThreadState, while not
reused again directly, is still recorded in the state obtained from
PyInterpreterState_Head() later.)

So conservatively keep the PyThreadState_Delete of unclear benefit for older
Python versions and only drop it for 3.11 where it is known to have negative
effects now.

Change-Id: I9b99f1e947f0b165ddc95c2bfbd764858dda39db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136006
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/pyuno/source/loader/pyuno_loader.cxx 
b/pyuno/source/loader/pyuno_loader.cxx
index c9b8248c1b25..da0467f450c6 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -229,10 +229,12 @@ void pythonInit() {
 
 PyThreadState *tstate = PyThreadState_Get();
 PyEval_ReleaseThread( tstate );
+#if PY_VERSION_HEX < 0x030B
 // This tstate is never used again, so delete it here.
 // This prevents an assertion in PyThreadState_Swap on the
 // PyThreadAttach below.
 PyThreadState_Delete(tstate);
+#endif
 }
 
 }

[Libreoffice-commits] core.git: sc/inc sc/source

 sc/inc/listenercalls.hxx  |6 --
 sc/source/ui/unoobj/listenercalls.cxx |2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 7a0a0e23b7e81c1ee0601824a4ee990a2178f98b
Author: Eike Rathke 
AuthorDate: Thu Jun 16 21:44:40 2022 +0200
Commit: Eike Rathke 
CommitDate: Thu Jun 16 22:39:38 2022 +0200

Resolves: tdf#147822 ScUnoListenerEntry container must be std::list

... instead of std::vector to not get invalidated iterators when
the container is resized.

Regression from

commit f8defe59ff75df2b516ee407f1dac22b0ac72a19
CommitDate: Wed Sep 6 22:45:10 2017 +0200

Replace some lists by vectors in unoobj (sc)

which was bad for this case.

Change-Id: I8d3a001242865cadc82b359a3198906d26373a41
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136007
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/inc/listenercalls.hxx b/sc/inc/listenercalls.hxx
index ff835a048b1a..acb009937fa1 100644
--- a/sc/inc/listenercalls.hxx
+++ b/sc/inc/listenercalls.hxx
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include 
+#include 
 #include 
 #include 
 
@@ -48,7 +48,9 @@ struct ScUnoListenerEntry
 class ScUnoListenerCalls
 {
 private:
-::std::vector aEntries;
+// Must be list, not vector, to not invalidate iterators, see
+// ExecuteAndClear() implementation.
+::std::list aEntries;
 
 public:
 ScUnoListenerCalls();
diff --git a/sc/source/ui/unoobj/listenercalls.cxx 
b/sc/source/ui/unoobj/listenercalls.cxx
index 2d9a23083ca8..7ff7c7df0956 100644
--- a/sc/source/ui/unoobj/listenercalls.cxx
+++ b/sc/source/ui/unoobj/listenercalls.cxx
@@ -44,7 +44,7 @@ void ScUnoListenerCalls::ExecuteAndClear()
 //  During each modified() call, Add may be called again.
 //  These new calls are executed here, too.
 
-std::vector::iterator aItr(aEntries.begin());
+std::list::iterator aItr(aEntries.begin());
 while (aItr != aEntries.end())
 {
 ScUnoListenerEntry aEntry = *aItr;

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e247d62ea65f269d8ec304e08d21796a1cc52c52
Author: Olivier Hallot 
AuthorDate: Thu Jun 16 21:32:09 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jun 16 21:32:09 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to b01904aabf78c6981d4c3b3953483bea9e86c2b3
  - Mute l10n

Change-Id: Icd723b9b933788c5ac9e1b2bbb9e541f241bdbe1
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136020
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 51cfc9a957ee..b01904aabf78 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 51cfc9a957eec7be595e8b667a528cbe749992a0
+Subproject commit b01904aabf78c6981d4c3b3953483bea9e86c2b3

[Libreoffice-commits] help.git: source/text

 source/text/shared/01/0220.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b01904aabf78c6981d4c3b3953483bea9e86c2b3
Author: Olivier Hallot 
AuthorDate: Thu Jun 16 21:25:34 2022 +0200
Commit: Olivier Hallot 
CommitDate: Thu Jun 16 21:32:07 2022 +0200

Mute l10n

Change-Id: Icd723b9b933788c5ac9e1b2bbb9e541f241bdbe1
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136020
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/source/text/shared/01/0220.xhp 
b/source/text/shared/01/0220.xhp
index 25e9464d9..b7f4622fd 100644
--- a/source/text/shared/01/0220.xhp
+++ b/source/text/shared/01/0220.xhp
@@ -36,7 +36,7 @@
 
 
 
-
+
 
 
 Resizes the object to the original size.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/qa sw/source

2022-06-16 Thread Mark Hung (via logerrit)

 sw/qa/extras/uiwriter/uiwriter7.cxx |   19 ++-
 sw/source/core/text/itrform2.cxx|   13 -
 2 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit b345858e92351ceb997cf8e77024d7fe573a99c6
Author: Mark Hung 
AuthorDate: Sat Jun 11 19:52:28 2022 +0800
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 21:15:29 2022 +0200

tdf#149089 snap to grid if IsSnapToChars() is false

for non-CJK scripts. Non Asian text was centered within as many cells
as required according to ODF1.2 20.301. But it also required that
text should be snapped to grid if style:layout-grid-snap-to is
true ( i.e. IsSnapToChars() is false ) per ODF1.2 20.305. That means
ODF1.2 20.301 ruled.

This patch changes the width of inserted SwKernGridPortion so that
non-CJK text aligns to the edge of text grid to make ODF1.2 20.301
rule, an provide more consistent layout result as expected.

Change-Id: Id6b4d2b965e20670eb9ddf657d36b8a49073f32a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135654
Tested-by: Jenkins
Reviewed-by: Mark Hung 
(cherry picked from commit 47eff9bf12abf963907b4d3dcb90b73e0ccc646d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135984
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx 
b/sw/qa/extras/uiwriter/uiwriter7.cxx
index 8b5a23d1a695..0ac6b0183068 100644
--- a/sw/qa/extras/uiwriter/uiwriter7.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter7.cxx
@@ -2779,11 +2779,20 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf149089)
 {
 createSwDoc(DATA_DIRECTORY, "tdf149089.odt");
 xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-sal_Int32 nTextPortionWidth = getXPath(pXmlDoc, "(//SwLinePortion)[1]", 
"width").toInt32();
-sal_Int32 nKernPortionWidth = getXPath(pXmlDoc, "(//SwLinePortion)[2]", 
"width").toInt32();
-// nKernPortionWidth was about 1/3 of nTextPortionWidth
-double nRatio = double(nKernPortionWidth) / nTextPortionWidth;
-CPPUNIT_ASSERT_LESS(0.05, nRatio);
+sal_Int32 nPorLen1 = getXPath(pXmlDoc, "(//SwLinePortion)[1]", 
"length").toInt32();
+sal_Int32 nPorLen2 = getXPath(pXmlDoc, "(//SwLinePortion)[2]", 
"length").toInt32();
+sal_Int32 nPorLen3 = getXPath(pXmlDoc, "(//SwLinePortion)[3]", 
"length").toInt32();
+// Two SwTextPortion and one SwKernPortion
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), nPorLen1); // SwTextPortion 
"一一 "
+CPPUNIT_ASSERT_EQUAL(sal_Int32(12), nPorLen2); // SwTextPortion "BUG 
"
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nPorLen3); // SwKernPortion
+
+sal_Int32 nPorWidth1 = getXPath(pXmlDoc, "(//SwLinePortion)[1]", 
"width").toInt32();
+sal_Int32 nPorWidth2 = getXPath(pXmlDoc, "(//SwLinePortion)[2]", 
"width").toInt32();
+sal_Int32 nPorWidth3 = getXPath(pXmlDoc, "(//SwLinePortion)[3]", 
"width").toInt32();
+sal_Int32 nGridWidth1 = nPorWidth1 / 3;
+sal_Int32 nGridWidth2 = (nPorWidth2 + nPorWidth3) / 7;
+CPPUNIT_ASSERT_EQUAL(nGridWidth1, nGridWidth2);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index e7bcde5983b8..563ddd5c4c02 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -686,15 +686,18 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo 
&rInf )
  0;
 const SwTwips nTmpWidth = i * nGridWidth;
 const SwTwips nKernWidth = std::min(nTmpWidth - nSumWidth, 
nRestWidth);
-const SwTwips nKernWidth_1 = nKernWidth / 2;
+const SwTwips nKernWidth_1 = pGrid->IsSnapToChars() ?
+nKernWidth / 2 : 0;
 
 OSL_ENSURE( nKernWidth <= nRestWidth,
 "Not enough space left for adjusting non-asian text in 
grid mode" );
+if (nKernWidth_1)
+{
+pGridKernPortion->Width( pGridKernPortion->Width() + 
nKernWidth_1 );
+rInf.X( rInf.X() + nKernWidth_1 );
+}
 
-pGridKernPortion->Width( pGridKernPortion->Width() + 
nKernWidth_1 );
-rInf.X( rInf.X() + nKernWidth_1 );
-
-if ( ! bFull )
+if ( ! bFull && nKernWidth - nKernWidth_1 > 0 )
 new SwKernPortion( *pPor, static_cast(nKernWidth - 
nKernWidth_1),
false, true );

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/qa sw/source

 sw/qa/extras/htmlexport/htmlexport.cxx  |   41 
 sw/source/filter/html/htmlatr.cxx   |   12 +++--
 sw/source/filter/html/htmlnumwriter.cxx |4 ++-
 sw/source/filter/html/wrthtml.hxx   |3 +-
 4 files changed, 56 insertions(+), 4 deletions(-)

New commits:
commit e1168fac4c7164454b679d4114f348a005efbcee
Author: Miklos Vajna 
AuthorDate: Thu Jun 16 15:55:23 2022 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 21:14:58 2022 +0200

sw HTML export, XHTML mode: fix lost  with a list header + item

There is a general mismatch between XHTML and Writer lists: XHTML can
only contain list items (for ordered or unordered lists), while Writer
can contain list headers and list items. List headers have no bullet or
number at the start, list items are the normal text nodes.

Commit 8c2607ae3ce143586e623532b8ae5288277ec3ac (sw HTML export, XHTML
mode: fix lost  when last list item is not numbered, 2022-02-21)
fixed the list item end side of this problem: if all text nodes in a
list are headers, then don't write ul/ol at all, otherwise end list
headers with  as well to make sure the output XML is valid.
However, this created a mis-match, the starting  for list headers in
a list which have non-header text nodes at as was not adapted.

Fix the problem by extending OutHTML_SwFormat() so list headers in a
list with non-header text nodes always have a  and , and this
condition is the same on the start/end side.

Calculating if at least one text node is non-header in a list may not be
cheap, so reuse the already calculated info from
OutHTML_NumberBulletListStart() in OutHTML_SwFormat().

Change-Id: I3817a489f16166fc5b4c33ee64e2283c41a4402c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135999
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit b2bee5a4db5552c4d408800908ca717b4ea2564a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135990
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index bc0af92e93c0..44654bdbcf5a 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -1530,6 +1530,47 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, 
testPartiallyNumberedList)
 
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:p",
 2);
 }
 
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testListHeaderAndItem)
+{
+// Given a document with a list, first para is not numbered, but the 
second is:
+loadURL("private:factory/swriter", nullptr);
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Insert("not numbered");
+SwDoc* pDoc = pWrtShell->GetDoc();
+sal_uInt16 nPos = pDoc->MakeNumRule(pDoc->GetUniqueNumRuleName());
+SwNumRule* pNumRule = pDoc->GetNumRuleTable()[nPos];
+{
+SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->nNode.GetNode();
+SwTextNode& rTextNode = *rNode.GetTextNode();
+rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName()));
+rTextNode.SetCountedInList(false);
+}
+pWrtShell->SplitNode();
+pWrtShell->Insert2("numbered");
+{
+SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->nNode.GetNode();
+SwTextNode& rTextNode = *rNode.GetTextNode();
+rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName()));
+}
+
+// When exporting to ReqIF:
+ExportToReqif();
+
+// Then make sure the output is well-formed xhtml:
+SvMemoryStream aStream;
+HtmlExportTest::wrapFragment(maTempFile, aStream);
+xmlDocUniquePtr pXmlDoc = parseXmlStream(&aStream);
+// Without the accompanying fix in place, this test would have failed:
+// Entity: line 3: parser error : Opening and ending tag mismatch: ol line 
3 and li
+// not 
numbered
+CPPUNIT_ASSERT(pXmlDoc);
+// Make sure that in case the list has a header and an item, then both are 
wrapped in an 
+// element.
+assertXPath(pXmlDoc,
+
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:p",
 2);
+}
+
 CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testBlockQuoteNoMargin)
 {
 // Given a document with some text, para style set to Quotations, no 
bottom margin:
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 1f1254c19bb3..db67572c545c 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -681,11 +681,12 @@ static void OutHTML_SwFormat( Writer& rWrt, const 
SwFormat& rFormat,
 if( nNewDefListLvl != rHWrt.m_nDefListLvl )
 rHWrt.OutAndSetDefList( nNewDefListLvl );
 
+bool bAtLeastOneNumbered = false;
 // if necessary, start a bulleted or numbered list
 if( rInfo.bInNumberBul

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/source

2022-06-16 Thread Julien Nabet (via logerrit)

 sw/source/core/frmedt/feshview.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c31d7e13c73c82dab9c784bfa4eb68f3ebd84b9f
Author: Julien Nabet 
AuthorDate: Sun Jun 12 10:09:49 2022 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 21:13:29 2022 +0200

tdf#149524: fix crash in Writer after a label has just been created

see bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=180683

Change-Id: Iba461ffe65392a7e0e779f68d1f0737a444ae724
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135675
Tested-by: Jenkins
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 
Reviewed-by: Xisco Fauli 
(cherry picked from commit d9f716c48085ed46c1af31244583d67882cc94ec)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135993

diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 464cd46412b6..8369004ac3c5 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1865,8 +1865,8 @@ bool SwFEShell::EndCreate( SdrCreateCmd eSdrCreateCmd )
 
 bool SwFEShell::ImpEndCreate()
 {
-OSL_ENSURE( Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() == 
1,
-"New object not selected." );
+if (Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() == 0)
+return false;
 
 SdrObject& rSdrObj = 
*Imp()->GetDrawView()->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sc/source

2022-06-16 Thread Caolán McNamara (via logerrit)

 sc/source/core/data/colorscale.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e259e7b6e28e08a1ac2055b5a4c9d6bc97f78d2
Author: Caolán McNamara 
AuthorDate: Thu Jun 16 13:47:31 2022 +0100
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 21:12:53 2022 +0200

tdf#149529 crash on deref deleted ScDocument*

maybe a problem since

commit 46419cd7a2d453c6f252c28dfb9dbfb08605e1c4
Date:   Tue Jun 18 15:11:30 2013 -0400

ScFormulaCell is no longer a child class of ScBaseCell.

Change-Id: Id33072f193045e2eaf51373b47dac803f9a5d52c

presumably the cloned ScColorScaleEntry should end up with
a ScFormulaCell for the destination document and not the source one

Change-Id: I451d5827be183198b61116ab8c582cfda03b2031
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135998
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 10404751bcb643605c50d530e3855ae005e60a5e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135992

diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 81944e4dd0c3..5cbf21cf8094 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -189,7 +189,7 @@ ScColorScaleEntry::ScColorScaleEntry(ScDocument* pDoc, 
const ScColorScaleEntry&
 setListener();
 if(rEntry.mpCell)
 {
-mpCell.reset(new ScFormulaCell(*rEntry.mpCell, 
rEntry.mpCell->GetDocument(), rEntry.mpCell->aPos, 
ScCloneFlags::NoMakeAbsExternal));
+mpCell.reset(new ScFormulaCell(*rEntry.mpCell, *pDoc, 
rEntry.mpCell->aPos, ScCloneFlags::NoMakeAbsExternal));
 mpCell->StartListeningTo( *pDoc );
 mpListener.reset(new ScFormulaListener(mpCell.get()));
 if (mpFormat)

[Libreoffice-commits] core.git: sc/inc sc/qa sc/source

 sc/inc/cellvalue.hxx   |6 +
 sc/qa/unit/subsequent_filters_test.cxx |4 -
 sc/source/core/data/cellvalue.cxx  |   52 -
 sc/source/core/data/column3.cxx|4 -
 sc/source/core/data/column4.cxx|2 
 sc/source/core/data/conditio.cxx   |2 
 sc/source/core/data/dociter.cxx|6 -
 sc/source/core/data/document.cxx   |2 
 sc/source/core/data/documentimport.cxx |4 -
 sc/source/core/data/queryevaluator.cxx |4 -
 sc/source/core/data/queryiter.cxx  |2 
 sc/source/core/data/table3.cxx |2 
 sc/source/core/data/table4.cxx |   36 +--
 sc/source/core/data/validat.cxx|2 
 sc/source/core/tool/cellform.cxx   |4 -
 sc/source/core/tool/chgtrack.cxx   |6 -
 sc/source/core/tool/interpr4.cxx   |   10 +--
 sc/source/filter/excel/xetable.cxx |2 
 sc/source/filter/html/htmlexp.cxx  |2 
 sc/source/filter/xcl97/XclExpChangeTrack.cxx   |2 
 sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx |2 
 sc/source/filter/xml/xmlexprt.cxx  |6 -
 sc/source/ui/docshell/externalrefmgr.cxx   |4 -
 sc/source/ui/undo/undocell.cxx |2 
 sc/source/ui/view/output2.cxx  |2 
 sc/source/ui/view/tabvwsh5.cxx |2 
 26 files changed, 87 insertions(+), 85 deletions(-)

New commits:
commit c2518134a55658218c924b43b5c87e4fbdaed1d4
Author: Noel Grandin 
AuthorDate: Thu Jun 16 16:29:18 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 16 20:39:23 2022 +0200

create getter for ScCellValue::mfValue

so we can assert that has the correct tag type

Change-Id: I0d626130cb014e19239e88a6988018c83d061f68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136001
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 942cf006cab5..9513fcfc99d5 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -38,7 +38,7 @@ private:
 CellType meType;
 public:
 union {
-double mfValue;
+double mfValue1;
 svl::SharedString* mpString;
 EditTextObject* mpEditText;
 ScFormulaCell* mpFormula;
@@ -62,6 +62,7 @@ public:
 void set( ScFormulaCell* pFormula );
 
 CellType getType() const { return meType; }
+double getDouble() const { assert(meType == CELLTYPE_VALUE); return 
mfValue1; }
 
 /**
  * Take cell value from specified position in specified document.
@@ -111,7 +112,7 @@ private:
 CellType meType;
 public:
 union {
-double mfValue;
+double mfValue1;
 const svl::SharedString* mpString;
 const EditTextObject* mpEditText;
 ScFormulaCell* mpFormula;
@@ -132,6 +133,7 @@ public:
 void clear();
 
 CellType getType() const { return meType; }
+double getDouble() const { assert(meType == CELLTYPE_VALUE); return 
mfValue1; }
 
 /**
  * Take cell value from specified position in specified document.
diff --git a/sc/qa/unit/subsequent_filters_test.cxx 
b/sc/qa/unit/subsequent_filters_test.cxx
index c1dd83f791a2..cb61bdd5a08a 100644
--- a/sc/qa/unit/subsequent_filters_test.cxx
+++ b/sc/qa/unit/subsequent_filters_test.cxx
@@ -552,7 +552,7 @@ void ScFiltersTest::testDeleteCircleInMergedCellODS()
 aMergedCell.assign(rDoc, aPosMergedCell);
 
 // The value of merged cell change to 6.
-aMergedCell.mfValue = 6;
+aMergedCell = ScRefCellValue(6);
 
 // Check that the data is valid.(True if the value = 6)
 const ScValidationData* pData = rDoc.GetValidationEntry(1);
@@ -584,7 +584,7 @@ void ScFiltersTest::testBasicCellContentODS()
 aCell.assign(rDoc, ScAddress(1,4,0)); // B5
 CPPUNIT_ASSERT_EQUAL_MESSAGE(
 "This cell must be numeric.", CELLTYPE_VALUE, aCell.getType());
-CPPUNIT_ASSERT_EQUAL(0.0, aCell.mfValue);
+CPPUNIT_ASSERT_EQUAL(0.0, aCell.getDouble());
 
 xDocSh->DoClose();
 }
diff --git a/sc/source/core/data/cellvalue.cxx 
b/sc/source/core/data/cellvalue.cxx
index c565e0a488d6..cfc879802446 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -92,7 +92,7 @@ bool equalsWithoutFormatImpl( const T& left, const T& right )
 case CELLTYPE_NONE:
 return true;
 case CELLTYPE_VALUE:
-return left.mfValue == right.mfValue;
+return left.getDouble() == right.getDouble();
 case CELLTYPE_STRING:
 {
 OUString aStr1 = getString(left);
@@ -118,7 +118,7 @@ void commitToColumn( const ScCellValue& rCell, ScCo

[Libreoffice-commits] core.git: sc/inc sc/source

 sc/inc/cellvalue.hxx  |2 +-
 sc/source/core/data/cellvalue.cxx |4 ++--
 sc/source/filter/oox/revisionfragment.cxx |2 +-
 sc/source/filter/xml/XMLTrackedChangesContext.cxx |2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7eae7e54e0c55d5896cf807c339fd0789f54d380
Author: Noel Grandin 
AuthorDate: Thu Jun 16 14:24:56 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 16 20:39:05 2022 +0200

pass EditTextObject by unique_ptr

to make the ownership passing obvious

Change-Id: Icf4b94a422b91da3082fe1ce56eff149d390a649
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136000
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/sc/inc/cellvalue.hxx b/sc/inc/cellvalue.hxx
index 5876f9584a4f..942cf006cab5 100644
--- a/sc/inc/cellvalue.hxx
+++ b/sc/inc/cellvalue.hxx
@@ -58,7 +58,7 @@ public:
 void set( double fValue );
 void set( const svl::SharedString& rStr );
 void set( const EditTextObject& rEditText );
-void set( EditTextObject* pEditText );
+void set( std::unique_ptr );
 void set( ScFormulaCell* pFormula );
 
 CellType getType() const { return meType; }
diff --git a/sc/source/core/data/cellvalue.cxx 
b/sc/source/core/data/cellvalue.cxx
index ca8c8e78c954..c565e0a488d6 100644
--- a/sc/source/core/data/cellvalue.cxx
+++ b/sc/source/core/data/cellvalue.cxx
@@ -315,11 +315,11 @@ void ScCellValue::set( const EditTextObject& rEditText )
 mpEditText = rEditText.Clone().release();
 }
 
-void ScCellValue::set( EditTextObject* pEditText )
+void ScCellValue::set( std::unique_ptr xEditText )
 {
 clear();
 meType = CELLTYPE_EDIT;
-mpEditText = pEditText;
+mpEditText = xEditText.release();
 }
 
 void ScCellValue::set( ScFormulaCell* pFormula )
diff --git a/sc/source/filter/oox/revisionfragment.cxx 
b/sc/source/filter/oox/revisionfragment.cxx
index f6fee91c4051..4a0fa785e6df 100644
--- a/sc/source/filter/oox/revisionfragment.cxx
+++ b/sc/source/filter/oox/revisionfragment.cxx
@@ -147,7 +147,7 @@ protected:
 {
 svl::SharedStringPool& rPool = 
rDoc.GetSharedStringPool();
 pTextObj->NormalizeString(rPool);
-mrCellValue.set(pTextObj.release());
+mrCellValue.set(std::move(pTextObj));
 }
 }
 }
diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx 
b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
index d478a8af0ba9..8294eb979a92 100644
--- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx
+++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx
@@ -860,7 +860,7 @@ void SAL_CALL ScXMLChangeCellContext::endFastElement( 
sal_Int32 /*nElement*/ )
 }
 
 // The cell will own the text object instance.
-mrOldCell.set(mpEditTextObj->CreateTextObject().release());
+mrOldCell.set(mpEditTextObj->CreateTextObject());
 GetScImport().GetTextImport()->ResetCursor();
 mpEditTextObj.clear();
 }

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/source

2022-06-16 Thread Caolán McNamara (via logerrit)

 sc/source/core/data/colorscale.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 12e8dd5c12918ba9c2a048a8a26e830455d1e302
Author: Caolán McNamara 
AuthorDate: Thu Jun 16 13:47:31 2022 +0100
Commit: Eike Rathke 
CommitDate: Thu Jun 16 20:13:19 2022 +0200

tdf#149529 crash on deref deleted ScDocument*

maybe a problem since

commit 46419cd7a2d453c6f252c28dfb9dbfb08605e1c4
Date:   Tue Jun 18 15:11:30 2013 -0400

ScFormulaCell is no longer a child class of ScBaseCell.

Change-Id: Id33072f193045e2eaf51373b47dac803f9a5d52c

presumably the cloned ScColorScaleEntry should end up with
a ScFormulaCell for the destination document and not the source one

Change-Id: I451d5827be183198b61116ab8c582cfda03b2031
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135998
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit 81c95dd499f50f75f84cf73d2e78964d19c8f4db)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135991

diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 75f94d3bc2ed..0a357828c61e 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -190,7 +190,7 @@ ScColorScaleEntry::ScColorScaleEntry(ScDocument* pDoc, 
const ScColorScaleEntry&
 setListener();
 if(rEntry.mpCell)
 {
-mpCell.reset(new ScFormulaCell(*rEntry.mpCell, 
rEntry.mpCell->GetDocument(), rEntry.mpCell->aPos, 
ScCloneFlags::NoMakeAbsExternal));
+mpCell.reset(new ScFormulaCell(*rEntry.mpCell, *pDoc, 
rEntry.mpCell->aPos, ScCloneFlags::NoMakeAbsExternal));
 mpCell->StartListeningTo( *pDoc );
 mpListener.reset(new ScFormulaListener(mpCell.get()));
 if (mpFormat)

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8ba4c58e83e1e005a005a3165ee63ee6ed8f9041
Author: Seth Chaiklin 
AuthorDate: Thu Jun 16 20:10:11 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jun 16 20:10:11 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-4'
  to 907f876a9a0ab822fe6a67ab779ca03f4134e4d5
  - (related) tdf#149414 change in Impress Format menu command name

Change-Id: I80d37dc341f35c89fe73d815df900178a3552c74
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136017
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 
(cherry picked from commit 51cfc9a957eec7be595e8b667a528cbe749992a0)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136018

diff --git a/helpcontent2 b/helpcontent2
index 6d0866222372..907f876a9a0a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 6d0866222372247f6792d75664ae0642798e288c
+Subproject commit 907f876a9a0ab822fe6a67ab779ca03f4134e4d5

[Libreoffice-commits] help.git: Branch 'libreoffice-7-4' - source/text

 source/text/simpress/submenu_object_shape.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 907f876a9a0ab822fe6a67ab779ca03f4134e4d5
Author: Seth Chaiklin 
AuthorDate: Thu Jun 16 19:55:55 2022 +0200
Commit: Seth Chaiklin 
CommitDate: Thu Jun 16 20:10:10 2022 +0200

(related) tdf#149414 change in Impress Format menu command name

Change-Id: I80d37dc341f35c89fe73d815df900178a3552c74
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136017
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 
(cherry picked from commit 51cfc9a957eec7be595e8b667a528cbe749992a0)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136018

diff --git a/source/text/simpress/submenu_object_shape.xhp 
b/source/text/simpress/submenu_object_shape.xhp
index fa2f0b162..cf0b7bfa2 100644
--- a/source/text/simpress/submenu_object_shape.xhp
+++ b/source/text/simpress/submenu_object_shape.xhp
@@ -10,14 +10,14 @@
 -->
 
   
-Object and Shape (Impress)
+Textbox and Shape (Impress)
 /text/simpress/submenu_object_shape.xhp
   
 
 
 
-Object 
and Shape
-Opens a submenu to edit 
the properties of the selected object or shape.
+Textbox 
and Shape
+Opens a submenu to edit 
the properties of the selected textbox or shape.

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0fe3459b05502bc62814dc1f90059653f52046f8
Author: Seth Chaiklin 
AuthorDate: Thu Jun 16 20:03:34 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jun 16 20:03:34 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 51cfc9a957eec7be595e8b667a528cbe749992a0
  - (related) tdf#149414 change in Impress Format menu command name

Change-Id: I80d37dc341f35c89fe73d815df900178a3552c74
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136017
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index c7fba791de12..51cfc9a957ee 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit c7fba791de12f34179bb355fedbc111f4112bde8
+Subproject commit 51cfc9a957eec7be595e8b667a528cbe749992a0

[Libreoffice-commits] help.git: source/text

 source/text/simpress/submenu_object_shape.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 51cfc9a957eec7be595e8b667a528cbe749992a0
Author: Seth Chaiklin 
AuthorDate: Thu Jun 16 19:55:55 2022 +0200
Commit: Seth Chaiklin 
CommitDate: Thu Jun 16 20:03:32 2022 +0200

(related) tdf#149414 change in Impress Format menu command name

Change-Id: I80d37dc341f35c89fe73d815df900178a3552c74
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136017
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/simpress/submenu_object_shape.xhp 
b/source/text/simpress/submenu_object_shape.xhp
index fa2f0b162..cf0b7bfa2 100644
--- a/source/text/simpress/submenu_object_shape.xhp
+++ b/source/text/simpress/submenu_object_shape.xhp
@@ -10,14 +10,14 @@
 -->
 
   
-Object and Shape (Impress)
+Textbox and Shape (Impress)
 /text/simpress/submenu_object_shape.xhp
   
 
 
 
-Object 
and Shape
-Opens a submenu to edit 
the properties of the selected object or shape.
+Textbox 
and Shape
+Opens a submenu to edit 
the properties of the selected textbox or shape.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 17c3bd9493dda861ccbbe6af5db2994ae1ba0287
Author: Seth Chaiklin 
AuthorDate: Thu Jun 16 19:41:39 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jun 16 19:41:39 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-4'
  to 6d0866222372247f6792d75664ae0642798e288c
  - tdf#149572 update "Left Paragraph Border" and "Right Paragraph Border

   tdf#149242 changed the Horizontal positioning labels in the
   "to" control from:
   "Left paragraph border" -> "Left of paragraph text area" and
   "Right paragraph border" -> "Right of paragraph text area"

This patch updates the option names and makes corrections to
in the description of the referent of these options.

Change-Id: I604cb4354f239d476375791fa57865d10b1d0d24
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135881
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit c7fba791de12f34179bb355fedbc111f4112bde8)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136016
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 1f35f6f69a3e..6d0866222372 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 1f35f6f69a3e250e24994af78dc64ecfb3573a26
+Subproject commit 6d0866222372247f6792d75664ae0642798e288c

[Libreoffice-commits] help.git: Branch 'libreoffice-7-4' - source/text

 source/text/swriter/01/05060100.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 6d0866222372247f6792d75664ae0642798e288c
Author: Seth Chaiklin 
AuthorDate: Wed Jun 15 10:56:12 2022 +0200
Commit: Seth Chaiklin 
CommitDate: Thu Jun 16 19:41:38 2022 +0200

tdf#149572 update "Left Paragraph Border" and "Right Paragraph Border

   tdf#149242 changed the Horizontal positioning labels in the
   "to" control from:
   "Left paragraph border" -> "Left of paragraph text area" and
   "Right paragraph border" -> "Right of paragraph text area"

This patch updates the option names and makes corrections to
in the description of the referent of these options.

Change-Id: I604cb4354f239d476375791fa57865d10b1d0d24
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135881
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit c7fba791de12f34179bb355fedbc111f4112bde8)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/136016
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/swriter/01/05060100.xhp 
b/source/text/swriter/01/05060100.xhp
index 93dd3ad2b..465692745 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -108,10 +108,10 @@
 Paragraph 
text area: the object is positioned considering the whole width 
available for text in the paragraph, excluding indent spaces.
   
   
-Left 
paragraph border: the object is positioned considering the width of the 
indent space available to the left of the paragraph.
+Left 
of paragraph text area: the object is positioned in the region from 
the left text boundary to the first character on the left edge of the anchored 
paragraph text. For multicolumn paragraphs, the 
region is defined in relation to the column where the anchor is 
located. When the anchor is not located in the first column, then 
the region starts at the left column margin.
   
   
-Right 
paragraph border: the object is positioned considering the width of the 
indent space available to the right of the paragraph.
+Right 
of paragraph text area: the object is positioned in the region from 
the last character on the right edge of anchored paragraph text to the right 
text boundary.  When 
the anchor is not located in the last column then the region ends at the right 
column margin.
   
   
 Left 
of page text area: the object is positioned in the region between 
the left edge of the page and the left margin plus any left page 
padding.

[Libreoffice-commits] core.git: sw/source

2022-06-16 Thread Michael Stahl (via logerrit)

 sw/source/core/attr/swatrset.cxx |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit 3707c0b4ff683ac6f0942a176ebcb8d824b567ee
Author: Michael Stahl 
AuthorDate: Fri Mar 18 21:30:07 2022 +0100
Commit: Michael Stahl 
CommitDate: Thu Jun 16 19:18:40 2022 +0200

tdf#134759 sw: clear items in SwAttrSet::CopyToModify()

Setting new items but not clearing existing items smells like an
obvious omission. Why would we want a union of two nodes' items?

This improves things a bit for the bugdoc, but now it ends up with a
different wrong list on the node 254.

Change-Id: I3f5db0a4f81ac6e9af56d1faaefc2cb107dff597
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131841
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index e50116d58459..de014a521d2e 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -423,6 +423,23 @@ void SwAttrSet::CopyToModify( sw::BroadcastingModify& rMod 
) const
 pFormat->SetFormatAttr( *this );
 }
 }
+if (pCNd && pCNd->HasSwAttrSet())
+{
+SfxWhichIter it(*this);
+std::vector toClear;
+for (sal_uInt16 nWhich = it.FirstWhich(); nWhich != 0; nWhich = 
it.NextWhich())
+{
+if (GetItemState(nWhich, false) != SfxItemState::SET
+&& pCNd->GetSwAttrSet().GetItemState(nWhich, false) == 
SfxItemState::SET)
+{
+toClear.emplace_back(nWhich);
+}
+}
+if (!toClear.empty())
+{
+pCNd->ResetAttr(toClear);
+}
+}
 }
 #if OSL_DEBUG_LEVEL > 0
 else

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c0c0e33c4e74f62e77d54460595bcf0b3abb01a6
Author: Seth Chaiklin 
AuthorDate: Thu Jun 16 19:12:41 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jun 16 19:12:41 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to c7fba791de12f34179bb355fedbc111f4112bde8
  - tdf#149572 update "Left Paragraph Border" and "Right Paragraph Border

   tdf#149242 changed the Horizontal positioning labels in the
   "to" control from:
   "Left paragraph border" -> "Left of paragraph text area" and
   "Right paragraph border" -> "Right of paragraph text area"

This patch updates the option names and makes corrections to
in the description of the referent of these options.

Change-Id: I604cb4354f239d476375791fa57865d10b1d0d24
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135881
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index a17fbdee73a7..c7fba791de12 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a17fbdee73a7f567637c56a1b6354c0fef3b3a10
+Subproject commit c7fba791de12f34179bb355fedbc111f4112bde8

[Libreoffice-commits] help.git: source/text

 source/text/swriter/01/05060100.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c7fba791de12f34179bb355fedbc111f4112bde8
Author: Seth Chaiklin 
AuthorDate: Wed Jun 15 10:56:12 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Jun 16 19:12:39 2022 +0200

tdf#149572 update "Left Paragraph Border" and "Right Paragraph Border

   tdf#149242 changed the Horizontal positioning labels in the
   "to" control from:
   "Left paragraph border" -> "Left of paragraph text area" and
   "Right paragraph border" -> "Right of paragraph text area"

This patch updates the option names and makes corrections to
in the description of the referent of these options.

Change-Id: I604cb4354f239d476375791fa57865d10b1d0d24
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135881
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/swriter/01/05060100.xhp 
b/source/text/swriter/01/05060100.xhp
index 93dd3ad2b..465692745 100644
--- a/source/text/swriter/01/05060100.xhp
+++ b/source/text/swriter/01/05060100.xhp
@@ -108,10 +108,10 @@
 Paragraph 
text area: the object is positioned considering the whole width 
available for text in the paragraph, excluding indent spaces.
   
   
-Left 
paragraph border: the object is positioned considering the width of the 
indent space available to the left of the paragraph.
+Left 
of paragraph text area: the object is positioned in the region from 
the left text boundary to the first character on the left edge of the anchored 
paragraph text. For multicolumn paragraphs, the 
region is defined in relation to the column where the anchor is 
located. When the anchor is not located in the first column, then 
the region starts at the left column margin.
   
   
-Right 
paragraph border: the object is positioned considering the width of the 
indent space available to the right of the paragraph.
+Right 
of paragraph text area: the object is positioned in the region from 
the last character on the right edge of anchored paragraph text to the right 
text boundary.  When 
the anchor is not located in the last column then the region ends at the right 
column margin.
   
   
 Left 
of page text area: the object is positioned in the region between 
the left edge of the page and the left margin plus any left page 
padding.

[Libreoffice-commits] core.git: offapi/com

2022-06-16 Thread Samuel Mehrbrodt (via logerrit)

 offapi/com/sun/star/drawing/FillProperties.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit df454a21c6f15404b312f06ae99620bc720258ef
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jun 16 16:13:26 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Jun 16 19:09:24 2022 +0200

Next release is 7.5

According to 27ebceb366356f65c836e7edcc3609193f6e009c

Change-Id: I0fe247ca398a3c4607840c1a190453c52204749b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135986
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/offapi/com/sun/star/drawing/FillProperties.idl 
b/offapi/com/sun/star/drawing/FillProperties.idl
index 2e6ff1927424..e96c3f57a01c 100644
--- a/offapi/com/sun/star/drawing/FillProperties.idl
+++ b/offapi/com/sun/star/drawing/FillProperties.idl
@@ -219,7 +219,7 @@ published service FillProperties
 /** If this is `TRUE`, and FillStyle is FillStyle::NONE:
 The area displays the slide background
 
-@since LibreOffice 8.0
+@since LibreOffice 7.5
 */
 [optional, property] boolean FillUseSlideBackground;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - config_host/config_skia.h.in

2022-06-16 Thread Rene Engelhard (via logerrit)

 config_host/config_skia.h.in |4 
 1 file changed, 4 deletions(-)

New commits:
commit cc3d8995fc28ca98c4ad38c5066977ea48cef9a1
Author: Rene Engelhard 
AuthorDate: Mon Jun 13 18:28:34 2022 +0200
Commit: René Engelhard 
CommitDate: Thu Jun 16 18:16:08 2022 +0200

Revert "enable Skia on big-endian too"

This reverts commit b06663135f9c7c08f5866a87a1fb0932df5af8bd.

Still/Again fails to build.
See https://lists.freedesktop.org/archives/libreoffice/2022-June/089026.html

Change-Id: I195c1584256d1da5fee3bbd1d7291a6639428acf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135771
Tested-by: Jenkins
Tested-by: René Engelhard 
Reviewed-by: René Engelhard 
(cherry picked from commit 5b5c91190c60088c6998166250acc55574d5b543)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136014

diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in
index c81e648a0d6f..b98ba14d31ec 100644
--- a/config_host/config_skia.h.in
+++ b/config_host/config_skia.h.in
@@ -62,10 +62,6 @@ are the same.
 // the default X11 visual is actually also BGRA.
 #define SK_R32_SHIFT 16
 
-// Enable skia on big-endian too. Despite the disclaimer it reportedly
-// actually works fine.
-#define I_ACKNOWLEDGE_SKIA_DOES_NOT_SUPPORT_BIG_ENDIAN 1
-
 // Enable Skia's internal checks depending on DBG_UTIL mode. ENABLE_SKIA_DEBUG
 // controls whether to build with or without optimizations (set in Makefile).
 #ifdef DBG_UTIL

[Libreoffice-commits] core.git: config_host/config_skia.h.in

2022-06-16 Thread Rene Engelhard (via logerrit)

 config_host/config_skia.h.in |4 
 1 file changed, 4 deletions(-)

New commits:
commit 26cc731adeba5ac434f7ee76a4fe5b57e42c6702
Author: Rene Engelhard 
AuthorDate: Mon Jun 13 18:28:34 2022 +0200
Commit: René Engelhard 
CommitDate: Thu Jun 16 18:14:48 2022 +0200

Revert "enable Skia on big-endian too"

This reverts commit b06663135f9c7c08f5866a87a1fb0932df5af8bd.

Still/Again fails to build.
See https://lists.freedesktop.org/archives/libreoffice/2022-June/089026.html

Change-Id: I195c1584256d1da5fee3bbd1d7291a6639428acf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135771
Tested-by: Jenkins
Tested-by: René Engelhard 
Reviewed-by: René Engelhard 

diff --git a/config_host/config_skia.h.in b/config_host/config_skia.h.in
index c81e648a0d6f..b98ba14d31ec 100644
--- a/config_host/config_skia.h.in
+++ b/config_host/config_skia.h.in
@@ -62,10 +62,6 @@ are the same.
 // the default X11 visual is actually also BGRA.
 #define SK_R32_SHIFT 16
 
-// Enable skia on big-endian too. Despite the disclaimer it reportedly
-// actually works fine.
-#define I_ACKNOWLEDGE_SKIA_DOES_NOT_SUPPORT_BIG_ENDIAN 1
-
 // Enable Skia's internal checks depending on DBG_UTIL mode. ENABLE_SKIA_DEBUG
 // controls whether to build with or without optimizations (set in Makefile).
 #ifdef DBG_UTIL

[Libreoffice-commits] core.git: configure.ac

2022-06-16 Thread Rene Engelhard (via logerrit)

 configure.ac |4 
 1 file changed, 4 insertions(+)

New commits:
commit cd35eebe4dde6e012c2a939461a87b58b2b7a497
Author: Rene Engelhard 
AuthorDate: Mon Jun 13 18:30:05 2022 +0200
Commit: René Engelhard 
CommitDate: Thu Jun 16 18:14:02 2022 +0200

fail big-endian builds with --enable-skia. Point to --disable-skia

Change-Id: I0a1e5289a36e39eeea00e0fd67fbcf1fe7c902f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135772
Tested-by: Jenkins
Reviewed-by: Michael Meeks 
Tested-by: René Engelhard 
Reviewed-by: René Engelhard 

diff --git a/configure.ac b/configure.ac
index 8c24eb84fd5e..2963f05e3326 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12078,6 +12078,10 @@ if test "$enable_skia" != "no" -a "$build_skia" = 
"yes" -a -z "$DISABLE_GUI"; th
 ENABLE_SKIA_DEBUG=
 fi
 ENABLE_SKIA=TRUE
+   if test "$ENDIANNESS" = "big" && test "$ENABLE_SKIA" = "TRUE"; then
+   AC_MSG_ERROR([skia doesn't work/isn't supported upstream on 
big-endian. Use --disable-skia])
+   fi
+
 AC_DEFINE(HAVE_FEATURE_SKIA)
 BUILD_TYPE="$BUILD_TYPE SKIA"

[Libreoffice-commits] core.git: sc/qa

2022-06-16 Thread Xisco Fauli (via logerrit)

 0 files changed

New commits:
commit b1c1a4ed4874f95683325856efe4722444a7a828
Author: Xisco Fauli 
AuthorDate: Thu Jun 16 14:27:51 2022 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 18:02:51 2022 +0200

sc: uitest: move test where it belongs

Change-Id: I59ce2a70622a6f3be112a5234a7d91d2efd372f1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135996
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_tests9/tdf130371.py 
b/sc/qa/uitest/range_name/tdf130371.py
similarity index 100%
rename from sc/qa/uitest/calc_tests9/tdf130371.py
rename to sc/qa/uitest/range_name/tdf130371.py

[Libreoffice-commits] core.git: sw/source

2022-06-16 Thread Julien Nabet (via logerrit)

 sw/source/core/frmedt/feshview.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 2332a1ce5409c1a47d4ef6265a6377a67a8b2fd2
Author: Julien Nabet 
AuthorDate: Sun Jun 12 10:09:49 2022 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 17:54:32 2022 +0200

tdf#149524: fix crash in Writer after a label has just been created

see bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=180683

Change-Id: Iba461ffe65392a7e0e779f68d1f0737a444ae724
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135675
Tested-by: Jenkins
Tested-by: Heiko Tietze 
Reviewed-by: Heiko Tietze 
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/core/frmedt/feshview.cxx 
b/sw/source/core/frmedt/feshview.cxx
index 464cd46412b6..8369004ac3c5 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1865,8 +1865,8 @@ bool SwFEShell::EndCreate( SdrCreateCmd eSdrCreateCmd )
 
 bool SwFEShell::ImpEndCreate()
 {
-OSL_ENSURE( Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() == 
1,
-"New object not selected." );
+if (Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount() == 0)
+return false;
 
 SdrObject& rSdrObj = 
*Imp()->GetDrawView()->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/source

 sc/source/ui/vba/vbarange.cxx |   27 +--
 1 file changed, 21 insertions(+), 6 deletions(-)

New commits:
commit 7c34db88f3ee99dbb495f3643ab956d7467d5e00
Author: Eike Rathke 
AuthorDate: Thu Jun 16 14:27:13 2022 +0200
Commit: Eike Rathke 
CommitDate: Thu Jun 16 17:46:34 2022 +0200

Resolves: tdf#149579 Expand Range.Sort single cell to Range.CurrentRegion

Change-Id: Ib0ab1c2d0dd45f35f43cf710f7c15791d282ad4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135997
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 350ae0a3f5e5b115070c2371a805bf7ab981d242)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135987

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 93b217f1d632..99933f165c24 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -3420,8 +3420,23 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& 
Order1, const uno::Any&
 
 ScDocument& rDoc = getScDocument();
 
-RangeHelper thisRange( mxRange );
+uno::Reference< table::XCellRange > xRangeCurrent;
+if (isSingleCellRange())
+{
+// Expand to CurrentRegion
+uno::Reference< excel::XRange > xCurrent( CurrentRegion());
+if (xCurrent.is())
+{
+const ScVbaRange* pRange = getImplementation( xCurrent );
+if (pRange)
+xRangeCurrent = pRange->mxRange;
+}
+}
+if (!xRangeCurrent.is())
+xRangeCurrent = mxRange;
+RangeHelper thisRange( xRangeCurrent );
 table::CellRangeAddress thisRangeAddress = 
thisRange.getCellRangeAddressable()->getRangeAddress();
+
 ScSortParam aSortParam;
 SCTAB nTab = thisRangeAddress.Sheet;
 rDoc.GetSortParam( aSortParam, nTab );
@@ -3435,7 +3450,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& 
Order1, const uno::Any&
 
 // 1) #TODO #FIXME need to process DataOption[1..3] not used currently
 // 2) #TODO #FIXME need to refactor this ( below ) into an IsSingleCell() 
method
-uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, 
uno::UNO_QUERY_THROW );
+uno::Reference< table::XColumnRowRange > xColumnRowRange(xRangeCurrent, 
uno::UNO_QUERY_THROW );
 
 // set up defaults
 
@@ -3548,24 +3563,24 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& 
Order1, const uno::Any&
 if ( Key3.hasValue() )
 xKey3 = processKey( Key3, mxContext, pDocShell );
 
-uno::Reference< util::XSortable > xSort( mxRange, uno::UNO_QUERY_THROW );
+uno::Reference< util::XSortable > xSort( xRangeCurrent, 
uno::UNO_QUERY_THROW );
 uno::Sequence< beans::PropertyValue > sortDescriptor = 
xSort->createSortDescriptor();
 auto psortDescriptor = sortDescriptor.getArray();
 sal_Int32 nTableSortFieldIndex = findSortPropertyIndex( sortDescriptor, 
"SortFields" );
 
 uno::Sequence< table::TableSortField > sTableFields(1);
 sal_Int32 nTableIndex = 0;
-updateTableSortField(  mxRange, xKey1, nOrder1, sTableFields.getArray()[ 
nTableIndex++ ], bIsSortColumns, bMatchCase );
+updateTableSortField(  xRangeCurrent, xKey1, nOrder1, 
sTableFields.getArray()[ nTableIndex++ ], bIsSortColumns, bMatchCase );
 
 if ( xKey2.is() )
 {
 sTableFields.realloc( sTableFields.getLength() + 1 );
-updateTableSortField(  mxRange, xKey2, nOrder2, 
sTableFields.getArray()[ nTableIndex++ ], bIsSortColumns, bMatchCase );
+updateTableSortField(  xRangeCurrent, xKey2, nOrder2, 
sTableFields.getArray()[ nTableIndex++ ], bIsSortColumns, bMatchCase );
 }
 if ( xKey3.is()  )
 {
 sTableFields.realloc( sTableFields.getLength() + 1 );
-updateTableSortField(  mxRange, xKey3, nOrder3, 
sTableFields.getArray()[ nTableIndex++ ], bIsSortColumns, bMatchCase );
+updateTableSortField(  xRangeCurrent, xKey3, nOrder3, 
sTableFields.getArray()[ nTableIndex++ ], bIsSortColumns, bMatchCase );
 }
 psortDescriptor[ nTableSortFieldIndex ].Value <<= sTableFields;

[Libreoffice-commits] core.git: sc/source

2022-06-16 Thread Caolán McNamara (via logerrit)

 sc/source/core/data/colorscale.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 10404751bcb643605c50d530e3855ae005e60a5e
Author: Caolán McNamara 
AuthorDate: Thu Jun 16 13:47:31 2022 +0100
Commit: Eike Rathke 
CommitDate: Thu Jun 16 17:44:24 2022 +0200

tdf#149529 crash on deref deleted ScDocument*

maybe a problem since

commit 46419cd7a2d453c6f252c28dfb9dbfb08605e1c4
Date:   Tue Jun 18 15:11:30 2013 -0400

ScFormulaCell is no longer a child class of ScBaseCell.

Change-Id: Id33072f193045e2eaf51373b47dac803f9a5d52c

presumably the cloned ScColorScaleEntry should end up with
a ScFormulaCell for the destination document and not the source one

Change-Id: I451d5827be183198b61116ab8c582cfda03b2031
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135998
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/sc/source/core/data/colorscale.cxx 
b/sc/source/core/data/colorscale.cxx
index 75f94d3bc2ed..0a357828c61e 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -190,7 +190,7 @@ ScColorScaleEntry::ScColorScaleEntry(ScDocument* pDoc, 
const ScColorScaleEntry&
 setListener();
 if(rEntry.mpCell)
 {
-mpCell.reset(new ScFormulaCell(*rEntry.mpCell, 
rEntry.mpCell->GetDocument(), rEntry.mpCell->aPos, 
ScCloneFlags::NoMakeAbsExternal));
+mpCell.reset(new ScFormulaCell(*rEntry.mpCell, *pDoc, 
rEntry.mpCell->aPos, ScCloneFlags::NoMakeAbsExternal));
 mpCell->StartListeningTo( *pDoc );
 mpListener.reset(new ScFormulaListener(mpCell.get()));
 if (mpFormat)

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/uiconfig

 cui/uiconfig/ui/cellalignment.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d124a955e80ecd4ecf0b28cc5f550401321ce5f0
Author: Olivier Hallot 
AuthorDate: Fri Jun 10 15:38:32 2022 -0300
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 17:29:37 2022 +0200

Add precision to text orientation in extended tip

Change-Id: I9f2c6290baa6f251dba38c3a75e61c775d87fd5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135615
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 70d9ae7b59fd26dc524e77ff991f1cd887544475)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135985
Reviewed-by: Xisco Fauli 

diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui
index 82266296f3b4..1f01eeec3d8a 100644
--- a/cui/uiconfig/ui/cellalignment.ui
+++ b/cui/uiconfig/ui/cellalignment.ui
@@ -129,7 +129,7 @@
 True
 
   
-Aligns 
text vertically.
+Text 
direction vertically.

[Libreoffice-commits] core.git: sw/qa sw/source

 sw/qa/extras/htmlexport/htmlexport.cxx  |   41 
 sw/source/filter/html/htmlatr.cxx   |   12 +++--
 sw/source/filter/html/htmlnumwriter.cxx |4 ++-
 sw/source/filter/html/wrthtml.hxx   |3 +-
 4 files changed, 56 insertions(+), 4 deletions(-)

New commits:
commit b2bee5a4db5552c4d408800908ca717b4ea2564a
Author: Miklos Vajna 
AuthorDate: Thu Jun 16 15:55:23 2022 +0200
Commit: Miklos Vajna 
CommitDate: Thu Jun 16 17:07:03 2022 +0200

sw HTML export, XHTML mode: fix lost  with a list header + item

There is a general mismatch between XHTML and Writer lists: XHTML can
only contain list items (for ordered or unordered lists), while Writer
can contain list headers and list items. List headers have no bullet or
number at the start, list items are the normal text nodes.

Commit 8c2607ae3ce143586e623532b8ae5288277ec3ac (sw HTML export, XHTML
mode: fix lost  when last list item is not numbered, 2022-02-21)
fixed the list item end side of this problem: if all text nodes in a
list are headers, then don't write ul/ol at all, otherwise end list
headers with  as well to make sure the output XML is valid.
However, this created a mis-match, the starting  for list headers in
a list which have non-header text nodes at as was not adapted.

Fix the problem by extending OutHTML_SwFormat() so list headers in a
list with non-header text nodes always have a  and , and this
condition is the same on the start/end side.

Calculating if at least one text node is non-header in a list may not be
cheap, so reuse the already calculated info from
OutHTML_NumberBulletListStart() in OutHTML_SwFormat().

Change-Id: I3817a489f16166fc5b4c33ee64e2283c41a4402c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135999
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index bc0af92e93c0..44654bdbcf5a 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -1530,6 +1530,47 @@ CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, 
testPartiallyNumberedList)
 
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:p",
 2);
 }
 
+CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testListHeaderAndItem)
+{
+// Given a document with a list, first para is not numbered, but the 
second is:
+loadURL("private:factory/swriter", nullptr);
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxComponent.get());
+SwWrtShell* pWrtShell = pTextDoc->GetDocShell()->GetWrtShell();
+pWrtShell->Insert("not numbered");
+SwDoc* pDoc = pWrtShell->GetDoc();
+sal_uInt16 nPos = pDoc->MakeNumRule(pDoc->GetUniqueNumRuleName());
+SwNumRule* pNumRule = pDoc->GetNumRuleTable()[nPos];
+{
+SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->nNode.GetNode();
+SwTextNode& rTextNode = *rNode.GetTextNode();
+rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName()));
+rTextNode.SetCountedInList(false);
+}
+pWrtShell->SplitNode();
+pWrtShell->Insert2("numbered");
+{
+SwNode& rNode = pWrtShell->GetCursor()->GetPoint()->nNode.GetNode();
+SwTextNode& rTextNode = *rNode.GetTextNode();
+rTextNode.SetAttr(SwNumRuleItem(pNumRule->GetName()));
+}
+
+// When exporting to ReqIF:
+ExportToReqif();
+
+// Then make sure the output is well-formed xhtml:
+SvMemoryStream aStream;
+HtmlExportTest::wrapFragment(maTempFile, aStream);
+xmlDocUniquePtr pXmlDoc = parseXmlStream(&aStream);
+// Without the accompanying fix in place, this test would have failed:
+// Entity: line 3: parser error : Opening and ending tag mismatch: ol line 
3 and li
+// not 
numbered
+CPPUNIT_ASSERT(pXmlDoc);
+// Make sure that in case the list has a header and an item, then both are 
wrapped in an 
+// element.
+assertXPath(pXmlDoc,
+
"/reqif-xhtml:html/reqif-xhtml:div/reqif-xhtml:ol/reqif-xhtml:li/reqif-xhtml:p",
 2);
+}
+
 CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testBlockQuoteNoMargin)
 {
 // Given a document with some text, para style set to Quotations, no 
bottom margin:
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 1f1254c19bb3..db67572c545c 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -681,11 +681,12 @@ static void OutHTML_SwFormat( Writer& rWrt, const 
SwFormat& rFormat,
 if( nNewDefListLvl != rHWrt.m_nDefListLvl )
 rHWrt.OutAndSetDefList( nNewDefListLvl );
 
+bool bAtLeastOneNumbered = false;
 // if necessary, start a bulleted or numbered list
 if( rInfo.bInNumberBulletList )
 {
 OSL_ENSURE( !rHWrt.m_nDefListLvl, "DL cannot be inside OL!" );
-OutHTML_NumberBulletListStart( rHWrt, aNumInfo );
+OutHTML_N

ESC meeting minutes: 2022-06-16


* Present:
+ Sophie, Caolan, Cloph, Heiko, Ilmari, Lubos, Olivier, Xisco, Stephan, 
Miklos, Hossein, Kendy, Eike, Michael S, Thorsten

* Completed Action Items:
  + create the ranking sheet for under-loved areas (Miklos)
  + pass on LOOL atticization proposal to board (Stephan)

* Pending Action Items:
  + None

* Release Engineering update (Cloph)
+ 7.4 status: beta1 is on the mirrors, string/UI freeze in 3 weeks
  + including Windows arm64 builds
+ fixed download filename problems
+ so that you can differentiate between arm64 vs x86_64
+ some Writer-related issues were reported (but not Calc)
  + can do a beta2 next week if wanted (not planning currently)
  + rc1 in 3 weeks
+ 7.3 status: 7.3.5 rc1 in 2 weeks
+ tinderbox for Android viewer builds was offline, now back
+ App store status? (Caolan)
  + have accounts setup, will try to upload a first binary (Cloph)
  + in progress
+ going to setup bibisect repos for master (Xisco)
  + next version? 7.5 vs 8.0?
  + some larger change always happened at the same time (Cloph)
AI:  + will ask Italo (Xisco)

* Documentation (Olivier)
+ New Help - no news
+ Helpcontent2
  + Updates and fixes (M. Kaganski, S. Chaiklin, ohallot, D. Schulten, 
Adolfo B)
  + Scriptforge Help pages (R. Lima)
+ Extended tips
  + updates from translations review (ohallot)
+ Guides
  + work in progress
+ question about extended tips
  + always get -1 from Jenkins on gerrit for core.git changes
  + how to avoid that?
  + there was a problem with master with one of the changes, reverted by 
Xisco (Cloph)
+ also some Windows boxes failing in sc_macros
+ solution is to hit "resume" on the failing platform
+ please don't override it as a habit
  + looked at what could be the root cause of sc_macros failures (Cloph)
+ multiple machines failed, but reboot helped

+ Bugzilla Documentation statistics
245(245) bugs open
+ Updates:
BZ changes   1 week   1 month   3 months   12 months
   created 10(-1)48(-5)   120(-3) 325(-9)
 commented  6(-3)   139(-8)   292(-14)   1468(-23)
  resolved  0(-1) 8(-3)57(0)  199(-9)
+ top 10 contributors:
  Seth Chaiklin made 114 changes in 1 month, and 289 changes in 1 year
  Heiko Tietze made 23 changes in 1 month, and 111 changes in 1 year
  Timur made 22 changes in 1 month, and 22 changes in 1 year
  Olivier Hallot made 20 changes in 1 month, and 445 changes in 1 year
  Kaganski, Mike made 11 changes in 1 month, and 93 changes in 1 year
  Ilmari Lauhakangas made 9 changes in 1 month, and 110 changes in 1 
year
  Rafael Lima made 8 changes in 1 month, and 312 changes in 1 year
  Henschel, Regina made 7 changes in 1 month, and 26 changes in 1 year
  McNamara, Caolán made 6 changes in 1 month, and 15 changes in 1 year
  Dieter made 6 changes in 1 month, and 98 changes in 1 year

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
273(273) (topicUI) bugs open, 76(76) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week1 month3 months   12 months
 added  3(-5)  8(-6) 28(-5)  55(-5)
 commented 32(-48)   237(-59)   659(-73)   2514(-75)
   removed  0(0)   0(-1) 12(0)   32(-3)
  resolved  8(2)  31(2)  74(-3) 344(-9)
+ top 10 contributors:
  Heiko Tietze made 133 changes in 1 month, and 1754 changes in 1 year
  Seth Chaiklin made 37 changes in 1 month, and 194 changes in 1 year
  Rafael Lima made 34 changes in 1 month, and 79 changes in 1 year
  Ilmari Lauhakangas made 27 changes in 1 month, and 268 changes in 1 
year
  Timur made 24 changes in 1 month, and 37 changes in 1 year
  Hans-Werner made 21 changes in 1 month, and 21 changes in 1 year
  Németh, László made 19 changes in 1 month, and 35 changes in 1 year
  Dieter made 18 changes in 1 month, and 228 changes in 1 year
  Henschel, Regina made 15 changes in 1 month, and 67 changes in 1 year
  Eyal Rozenberg made 13 changes in 1 month, and 94 changes in 1 year
+ [Bug 149576] Dashed bounding box/border for text not shown, when not
   selected or multiple selected (Draw, Impress,...)
+ [Bug 149341] When clicking an Insert-shape button, focus is wrong
+ [Bug 149566] picture scaling problem
 -> + [Bug 149306] Problem with decimal number selection using double click
  + have a break iterator for words, uses mostly icu internally (Eike)
+ not sure though if double-clicking something actually uses that

+ UI: Improve handling of configuring table borders in table properties
  dialog (to make it work for multiple workflows)
  + https://

[Libreoffice-commits] core.git: solenv/bin

2022-06-16 Thread Christian Lohmaier (via logerrit)

 solenv/bin/modules/installer/download.pm |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2ef1dc48597d85d02576d6b722d1dd784eabf39
Author: Christian Lohmaier 
AuthorDate: Wed Jun 15 22:06:05 2022 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jun 16 16:35:49 2022 +0200

drop special case for win 64bit download name, use x86-64 consistently

"x64" was introduced in 2013 for the 64bit windows packages in
efdad0b126abd3c151b545740d0530a0a832d482 for no apparent reason.

Change-Id: Ifae4faaeb99b4e8950cc64bb993d29c0a3ff24dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135923
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index f46dae735864..ad5f94560751 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -377,7 +377,7 @@ sub get_download_architecture
 }
 elsif ( $installer::globals::cpuname eq 'X86_64' )
 {
-$arch = $installer::globals::os eq 'WNT' ? 'x64' : 'x86-64';
+$arch = 'x86-64';
 }
 elsif ( $installer::globals::cpuname eq 'AARCH64' )
 {

[Libreoffice-commits] core.git: binaryurp/source

 binaryurp/source/binaryurp.component |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7531f027c742a601c13a7a849dfae795a148d899
Author: Noel Grandin 
AuthorDate: Wed Jun 15 14:08:33 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 16 16:30:28 2022 +0200

BridgeFactory should be a singleton

regression from
commit 9be078ae0d4cc4e4c01952bb42c9bb5943bbde86
Date:   Sat Jul 4 09:12:35 2020 +0200
binaryurp: create instances with uno constructors

Change-Id: Ib7a7316fdee4afffac35b282adaf437ff8bdd009
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135904
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/binaryurp/source/binaryurp.component 
b/binaryurp/source/binaryurp.component
index e2581c76411e..b5b0f4da102f 100644
--- a/binaryurp/source/binaryurp.component
+++ b/binaryurp/source/binaryurp.component
@@ -20,7 +20,7 @@
 http://openoffice.org/2010/uno-components";>
   
+
constructor="com_sun_star_comp_bridge_BridgeFactory_get_implementation" 
single-instance="true">

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/source

 sc/source/ui/vba/vbarange.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit e4173f2831c7147813806b192f27266d1c437018
Author: Eike Rathke 
AuthorDate: Thu Jun 16 13:14:43 2022 +0200
Commit: Eike Rathke 
CommitDate: Thu Jun 16 16:27:15 2022 +0200

One call to XCellRangeAddressable::getRangeAddress() is enough

... each needs to obtain it via ScUnoConversion::FillApiRange().

Change-Id: Ie98d5130067701f40c441d08bdb9faf7913bcdb8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135972
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 796a4c9eca7cb1172b9ab8bcbf32db30e7ef4dfc)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135982

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index b98b5471ff7b..93b217f1d632 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1140,12 +1140,9 @@ public:
 static uno::Reference< excel::XRange > createRangeFromRange( const 
uno::Reference< XHelperInterface >& xParent, const 
uno::Reference& xContext,
 const uno::Reference< table::XCellRange >& xRange, const 
uno::Reference< sheet::XCellRangeAddressable >& xCellRangeAddressable )
 {
+const table::CellRangeAddress aRA( 
xCellRangeAddressable->getRangeAddress());
 return uno::Reference< excel::XRange >( new ScVbaRange( xParent, 
xContext,
-xRange->getCellRangeByPosition(
-xCellRangeAddressable->getRangeAddress().StartColumn,
-xCellRangeAddressable->getRangeAddress().StartRow,
-xCellRangeAddressable->getRangeAddress().EndColumn,
-xCellRangeAddressable->getRangeAddress().EndRow ) ) );
+xRange->getCellRangeByPosition( aRA.StartColumn, 
aRA.StartRow, aRA.EndColumn, aRA.EndRow)));
 }
 
 };

[Libreoffice-commits] core.git: sc/source

 sc/source/ui/vba/vbarange.cxx |   27 +--
 1 file changed, 21 insertions(+), 6 deletions(-)

New commits:
commit 14ce950083cab9ca8067f36dc08ca5bfb33ae046
Author: Eike Rathke 
AuthorDate: Thu Jun 16 14:27:13 2022 +0200
Commit: Eike Rathke 
CommitDate: Thu Jun 16 16:26:29 2022 +0200

Resolves: tdf#149579 Expand Range.Sort single cell to Range.CurrentRegion

Change-Id: Ib0ab1c2d0dd45f35f43cf710f7c15791d282ad4d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135997
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index 93b217f1d632..99933f165c24 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -3420,8 +3420,23 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& 
Order1, const uno::Any&
 
 ScDocument& rDoc = getScDocument();
 
-RangeHelper thisRange( mxRange );
+uno::Reference< table::XCellRange > xRangeCurrent;
+if (isSingleCellRange())
+{
+// Expand to CurrentRegion
+uno::Reference< excel::XRange > xCurrent( CurrentRegion());
+if (xCurrent.is())
+{
+const ScVbaRange* pRange = getImplementation( xCurrent );
+if (pRange)
+xRangeCurrent = pRange->mxRange;
+}
+}
+if (!xRangeCurrent.is())
+xRangeCurrent = mxRange;
+RangeHelper thisRange( xRangeCurrent );
 table::CellRangeAddress thisRangeAddress = 
thisRange.getCellRangeAddressable()->getRangeAddress();
+
 ScSortParam aSortParam;
 SCTAB nTab = thisRangeAddress.Sheet;
 rDoc.GetSortParam( aSortParam, nTab );
@@ -3435,7 +3450,7 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& 
Order1, const uno::Any&
 
 // 1) #TODO #FIXME need to process DataOption[1..3] not used currently
 // 2) #TODO #FIXME need to refactor this ( below ) into an IsSingleCell() 
method
-uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, 
uno::UNO_QUERY_THROW );
+uno::Reference< table::XColumnRowRange > xColumnRowRange(xRangeCurrent, 
uno::UNO_QUERY_THROW );
 
 // set up defaults
 
@@ -3548,24 +3563,24 @@ ScVbaRange::Sort( const uno::Any& Key1, const uno::Any& 
Order1, const uno::Any&
 if ( Key3.hasValue() )
 xKey3 = processKey( Key3, mxContext, pDocShell );
 
-uno::Reference< util::XSortable > xSort( mxRange, uno::UNO_QUERY_THROW );
+uno::Reference< util::XSortable > xSort( xRangeCurrent, 
uno::UNO_QUERY_THROW );
 uno::Sequence< beans::PropertyValue > sortDescriptor = 
xSort->createSortDescriptor();
 auto psortDescriptor = sortDescriptor.getArray();
 sal_Int32 nTableSortFieldIndex = findSortPropertyIndex( sortDescriptor, 
"SortFields" );
 
 uno::Sequence< table::TableSortField > sTableFields(1);
 sal_Int32 nTableIndex = 0;
-updateTableSortField(  mxRange, xKey1, nOrder1, sTableFields.getArray()[ 
nTableIndex++ ], bIsSortColumns, bMatchCase );
+updateTableSortField(  xRangeCurrent, xKey1, nOrder1, 
sTableFields.getArray()[ nTableIndex++ ], bIsSortColumns, bMatchCase );
 
 if ( xKey2.is() )
 {
 sTableFields.realloc( sTableFields.getLength() + 1 );
-updateTableSortField(  mxRange, xKey2, nOrder2, 
sTableFields.getArray()[ nTableIndex++ ], bIsSortColumns, bMatchCase );
+updateTableSortField(  xRangeCurrent, xKey2, nOrder2, 
sTableFields.getArray()[ nTableIndex++ ], bIsSortColumns, bMatchCase );
 }
 if ( xKey3.is()  )
 {
 sTableFields.realloc( sTableFields.getLength() + 1 );
-updateTableSortField(  mxRange, xKey3, nOrder3, 
sTableFields.getArray()[ nTableIndex++ ], bIsSortColumns, bMatchCase );
+updateTableSortField(  xRangeCurrent, xKey3, nOrder3, 
sTableFields.getArray()[ nTableIndex++ ], bIsSortColumns, bMatchCase );
 }
 psortDescriptor[ nTableSortFieldIndex ].Value <<= sTableFields;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/sdi

 sw/sdi/_textsh.sdi |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 3ce321e4497a3e44f5e4b167d41ea6ac25fe2d31
Author: Miklos Vajna 
AuthorDate: Thu Jun 16 09:14:04 2022 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 15:53:42 2022 +0200

sw content controls: allow the properties dialog in read-only sel

Once you enter a checkbox or picture content control, the selection is
read-only to avoid loosing content the next time the content control is
updated. But this means you can't launch the properties dialog to e.g.
enable placeholder mode.

Fix this by relaxing the restriction and allow the properties dialog on
protected cursor as well, matching Word behavior.

Change-Id: Ifef9af66d077682c46c852c9ecba2df5f17234fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135965
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 9aeca50f4f0c1b2503a91eb1c7d9ed8a7231e598)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135978
Reviewed-by: Xisco Fauli 

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 55d515d944a0..fce2a4df9740 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -306,7 +306,6 @@ interface BaseText
 [
 ExecMethod = ExecInsert ;
 StateMethod = GetState ;
-DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 FN_INSERT_COLUMN_BREAK // status(final|play)
 [

[Libreoffice-commits] core.git: sc/qa

2022-06-16 Thread Xisco Fauli (via logerrit)

 sc/qa/uitest/calc_dialogs/openDialogs.py |5 -
 sc/qa/uitest/range_name/tdf148072.py |   95 +++
 2 files changed, 98 insertions(+), 2 deletions(-)

New commits:
commit ae11a7ff790e413cd4053e1db931b3c72f8259bb
Author: Xisco Fauli 
AuthorDate: Thu Jun 16 14:26:04 2022 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 15:53:04 2022 +0200

tdf#148072: sc: Add UItest

Change-Id: Ibb03fc001db63ac8ba6624ab14d046f4ee1039d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135995
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sc/qa/uitest/calc_dialogs/openDialogs.py 
b/sc/qa/uitest/calc_dialogs/openDialogs.py
index 469d56f478fe..f559ceec6a2e 100644
--- a/sc/qa/uitest/calc_dialogs/openDialogs.py
+++ b/sc/qa/uitest/calc_dialogs/openDialogs.py
@@ -67,9 +67,10 @@ dialogs = [
 {"command": ".uno:StyleNewByExample", "closeButton": "cancel"},
 {"command": ".uno:InsertCell", "closeButton": "cancel"},
 {"command": ".uno:DeleteCell", "closeButton": "cancel"},
-{"command": ".uno:Insert", "closeButton": "cancel", "skipTestOK": True},
+# {"command": ".uno:Insert", "closeButton": "cancel", "skipTestOK": True},
 # OK button tested in uitest/calc_tests/gridwin.py
-{"command": ".uno:Add", "closeButton": "cancel"},
+# {"command": ".uno:Add", "closeButton": "cancel"},
+# tested in sc/qa/uitest/range_name/tdf148072.py
 # {"command": ".uno:InsertExternalDataSource", "closeButton": "cancel"},
 # dialog opens and closes, but is not recognized as closed by 
close_dialog_through_button
 # {"command": ".uno:Delete", "closeButton": "cancel"},
diff --git a/sc/qa/uitest/range_name/tdf148072.py 
b/sc/qa/uitest/range_name/tdf148072.py
new file mode 100644
index ..a923136b8166
--- /dev/null
+++ b/sc/qa/uitest/range_name/tdf148072.py
@@ -0,0 +1,95 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from uitest.framework import UITestCase
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text, select_by_text
+from libreoffice.calc.document import get_cell_by_position
+from uitest.uihelper.calc import enter_text_to_cell
+
+class Tdf148072(UITestCase):
+
+def test_tdf148072(self):
+with self.ui_test.create_doc_in_start_center("calc") as calc_doc:
+
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "B2"}))
+
+with 
self.ui_test.execute_modeless_dialog_through_command(".uno:AddName", 
close_button="add") as xAddNameDlg:
+xEdit = xAddNameDlg.getChild("edit")
+type_text(xEdit, "testfield_1")
+
+xRange = xAddNameDlg.getChild("range")
+self.assertEqual("$Sheet1.$B$2", 
get_state_as_dict(xRange)['Text'])
+
+xScope = xAddNameDlg.getChild("scope")
+select_by_text(xScope, "Sheet1")
+
+enter_text_to_cell(gridwin, "B2", "1")
+enter_text_to_cell(gridwin, "B3", "=testfield_1")
+
+self.assertEqual("1", get_cell_by_position(calc_doc, 0, 1, 
1).getString())
+self.assertEqual("1", get_cell_by_position(calc_doc, 0, 1, 
2).getString())
+
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": 
"B2:B3"}))
+
+self.xUITest.executeCommand(".uno:Cut")
+
+# Insert a new sheet
+with self.ui_test.execute_dialog_through_command(".uno:Add") as 
xDialog:
+xName = xDialog.getChild('name_entry')
+self.assertEqual( 'Sheet2', get_state_as_dict(xName)["Text"])
+
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": 
"$Sheet2.B2"}))
+
+self.xUITest.executeCommand(".uno:Paste")
+
+self.assertEqual("", get_cell_by_position(calc_doc, 0, 1, 
1).getString())
+self.assertEqual("", get_cell_by_position(calc_doc, 0, 1, 
2).getString())
+self.assertEqual("1", get_cell_by_position(calc_doc, 1, 1, 
1).getString())
+self.assertEqual("1", get_cell_by_position(calc_doc, 1, 1, 
2).getString())
+
+with 
self.ui_test.execute_dialog_through_command(".uno:DefineName") as xDialog:
+xNamesList = xDialog.getChild('names')
+self.assertEqual(1, len(xNamesList.getChildren()))
+
+xName = xDialog.getChild('name')
+self.assertEqual( 'testfield_1', 
get_state_as_dict(xName)["Text"])
+
+xRange = xDialog.getChild("range")
+self.assertEqual("$Sheet2.$B$2", 
get_

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/uiconfig

 sw/uiconfig/swriter/ui/labeloptionspage.ui |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit f8e2a2e697c2a3e7ed9aca8d715541e6a9ca9d7e
Author: Olivier Hallot 
AuthorDate: Mon Jun 13 07:51:59 2022 -0300
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 15:45:04 2022 +0200

Fix extended tips in labeloptionspage.ui

Change-Id: Ib82fd7a19a837521afbe0d0a6c154d4c5c5f2824
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135755
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 513ae848b668647093ae4161718b2585d80fdb7a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135948
Reviewed-by: Xisco Fauli 

diff --git a/sw/uiconfig/swriter/ui/labeloptionspage.ui 
b/sw/uiconfig/swriter/ui/labeloptionspage.ui
index 02ef63e8e49b..0bdb5c4a351c 100644
--- a/sw/uiconfig/swriter/ui/labeloptionspage.ui
+++ b/sw/uiconfig/swriter/ui/labeloptionspage.ui
@@ -116,7 +116,7 @@
 True
 
   
-Enter the 
number of labels or business cards that you want to have in a row on your 
page.
+Select the 
column in which you want to place your single label or business card.
   
 
   
@@ -160,7 +160,7 @@
 True
 
   
-Enter the 
number of rows of labels or business cards that you want to have on your 
page.
+Select the row 
in which you want to place your single label or business card.

[Libreoffice-commits] core.git: cui/source cui/uiconfig include/editeng include/oox include/svx offapi/com oox/inc oox/source sd/qa sd/source svl/source svx/source sw/qa

2022-06-16 Thread Samuel Mehrbrodt (via logerrit)

 cui/source/inc/cuitabarea.hxx  |1 
 cui/source/tabpages/tparea.cxx |   36 ++---
 cui/uiconfig/ui/areatabpage.ui |   18 
 include/editeng/unoprnms.hxx   |1 
 include/oox/drawingml/shape.hxx|5 ---
 include/oox/drawingml/shapepropertymap.hxx |1 
 include/svx/strings.hrc|1 
 include/svx/unoshprp.hxx   |4 ++
 include/svx/xdef.hxx   |4 ++
 include/svx/xfilluseslidebackgrounditem.hxx|   32 ++
 offapi/com/sun/star/drawing/FillProperties.idl |7 
 oox/inc/drawingml/fillproperties.hxx   |1 
 oox/source/drawingml/fillproperties.cxx|4 ++
 oox/source/drawingml/shape.cxx |3 --
 oox/source/drawingml/shapepropertymap.cxx  |1 
 oox/source/export/drawingml.cxx|7 
 oox/source/ppt/pptshapegroupcontext.cxx|   27 +-
 oox/source/token/properties.txt|1 
 sd/qa/unit/import-tests2.cxx   |   27 ++
 sd/source/filter/eppt/pptx-epptooxml.cxx   |   11 ++-
 svl/source/items/poolitem.cxx  |1 
 svx/source/svdraw/svdattr.cxx  |1 
 svx/source/xoutdev/xattr2.cxx  |   27 ++
 svx/source/xoutdev/xpool.cxx   |2 +
 sw/qa/extras/layout/layout.cxx |8 ++---
 25 files changed, 175 insertions(+), 56 deletions(-)

New commits:
commit c4cf2e82e8d0aaef9b1daedc033d6edf647e5284
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jun 13 08:53:22 2022 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jun 16 15:44:53 2022 +0200

tdf#128150 Add OOXML import/export for "use background fill"

and allow editing this fill property in area dlg

Change-Id: Ic63ba11e9d499d4a0fb22f6739587e3e25140b8f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134406
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index aa4e07343bd2..fa22f56e040f 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -241,6 +241,7 @@ protected:
 std::unique_ptr m_xBtnHatch;
 std::unique_ptr m_xBtnBitmap;
 std::unique_ptr m_xBtnPattern;
+std::unique_ptr m_xBtnUseBackground;
 
 void SetOptimalSize(weld::DialogController* pController);
 
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index f7bbf34ef676..5a94566d83c5 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -41,7 +42,8 @@ enum FillType
 GRADIENT,
 HATCH,
 BITMAP,
-PATTERN
+PATTERN,
+USE_BACKGROUND_FILL
 };
 
 }
@@ -89,6 +91,7 @@ SvxAreaTabPage::SvxAreaTabPage(weld::Container* pPage, 
weld::DialogController* p
 , m_xBtnHatch(m_xBuilder->weld_toggle_button("btnhatch"))
 , m_xBtnBitmap(m_xBuilder->weld_toggle_button("btnbitmap"))
 , m_xBtnPattern(m_xBuilder->weld_toggle_button("btnpattern"))
+, m_xBtnUseBackground(m_xBuilder->weld_toggle_button("btnusebackground"))
 {
 maBox.AddButton(m_xBtnNone.get());
 maBox.AddButton(m_xBtnColor.get());
@@ -96,6 +99,7 @@ SvxAreaTabPage::SvxAreaTabPage(weld::Container* pPage, 
weld::DialogController* p
 maBox.AddButton(m_xBtnHatch.get());
 maBox.AddButton(m_xBtnBitmap.get());
 maBox.AddButton(m_xBtnPattern.get());
+maBox.AddButton(m_xBtnUseBackground.get());
 Link aLink = LINK(this, SvxAreaTabPage, 
SelectFillTypeHdl_Impl);
 m_xBtnNone->connect_toggled(aLink);
 m_xBtnColor->connect_toggled(aLink);
@@ -103,6 +107,7 @@ SvxAreaTabPage::SvxAreaTabPage(weld::Container* pPage, 
weld::DialogController* p
 m_xBtnHatch->connect_toggled(aLink);
 m_xBtnBitmap->connect_toggled(aLink);
 m_xBtnPattern->connect_toggled(aLink);
+m_xBtnUseBackground->connect_toggled(aLink);
 
 SetExchangeSupport();
 }
@@ -166,7 +171,11 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
 default:
 case drawing::FillStyle_NONE:
 {
-SelectFillType(*m_xBtnNone);
+XFillUseSlideBackgroundItem aBckItem( 
rSet.Get(XATTR_FILLUSESLIDEBACKGROUND));
+if (aBckItem.GetValue())
+SelectFillType(*m_xBtnUseBackground);
+else
+SelectFillType(*m_xBtnNone);
 break;
 }
 case drawing::FillStyle_SOLID:
@@ -184,7 +193,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
 case drawing::FillStyle_HATCH:
 {
 m_rXFSet.Put( rSet.Get(XATTR_FILLHATCH) );
-m_rXFSet.Put( rSet.Get(XATTR_FILLBACKGROUND) );
+m_rXFSet.Put( rSet.Get(XATTR_FILLUSESLIDEBACKGROUND) );

[Libreoffice-commits] core.git: sc/inc sc/qa sc/source

 sc/inc/cellvalue.hxx   |9 +++
 sc/inc/dociter.hxx |2 
 sc/qa/unit/subsequent_export_test.cxx  |6 +-
 sc/qa/unit/subsequent_filters_test.cxx |2 
 sc/qa/unit/ucalc.cxx   |8 +--
 sc/qa/unit/ucalc_sharedformula.cxx |2 
 sc/source/core/data/attarray.cxx   |2 
 sc/source/core/data/cellvalue.cxx  |   22 
 sc/source/core/data/clipcontext.cxx|2 
 sc/source/core/data/column.cxx |   17 +-
 sc/source/core/data/column2.cxx|   14 ++---
 sc/source/core/data/column3.cxx|   12 ++--
 sc/source/core/data/column4.cxx|4 -
 sc/source/core/data/conditio.cxx   |6 +-
 sc/source/core/data/dociter.cxx|   21 +++-
 sc/source/core/data/documen8.cxx   |8 +--
 sc/source/core/data/document.cxx   |2 
 sc/source/core/data/documentimport.cxx |4 -
 sc/source/core/data/fillinfo.cxx   |2 
 sc/source/core/data/queryevaluator.cxx |   17 +++---
 sc/source/core/data/queryiter.cxx  |4 -
 sc/source/core/data/table2.cxx |4 -
 sc/source/core/data/table3.cxx |6 +-
 sc/source/core/data/table4.cxx |   44 -
 sc/source/core/data/table5.cxx |4 -
 sc/source/core/data/table6.cxx |2 
 sc/source/core/data/validat.cxx|8 +--
 sc/source/core/tool/cellform.cxx   |6 +-
 sc/source/core/tool/chartarr.cxx   |2 
 sc/source/core/tool/chgtrack.cxx   |   29 +--
 sc/source/core/tool/detfunc.cxx|6 +-
 sc/source/core/tool/interpr1.cxx   |   26 +-
 sc/source/core/tool/interpr4.cxx   |   26 +-
 sc/source/core/tool/interpr5.cxx   |6 +-
 sc/source/core/tool/interpr6.cxx   |2 
 sc/source/core/tool/rangeseq.cxx   |2 
 sc/source/filter/dif/difexp.cxx|2 
 sc/source/filter/excel/xetable.cxx |2 
 sc/source/filter/excel/xicontent.cxx   |4 -
 sc/source/filter/html/htmlexp.cxx  |6 +-
 sc/source/filter/oox/worksheethelper.cxx   |2 
 sc/source/filter/rtf/rtfexp.cxx|2 
 sc/source/filter/xcl97/XclExpChangeTrack.cxx   |4 -
 sc/source/filter/xcl97/XclImpChangeTrack.cxx   |   15 +
 sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx |   12 ++--
 sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx |8 +--
 sc/source/filter/xml/XMLExportIterator.cxx |4 -
 sc/source/filter/xml/XMLTrackedChangesContext.cxx  |9 +--
 sc/source/filter/xml/xmlcelli.cxx  |6 +-
 sc/source/filter/xml/xmlexprt.cxx  |   10 +--
 sc/source/ui/Accessibility/AccessibleCell.cxx  |2 
 sc/source/ui/app/transobj.cxx  |2 
 sc/source/ui/docshell/docsh.cxx|4 -
 sc/source/ui/docshell/docsh3.cxx   |2 
 sc/source/ui/docshell/docsh8.cxx   |4 -
 sc/source/ui/docshell/externalrefmgr.cxx   |6 +-
 sc/source/ui/docshell/impex.cxx|4 -
 sc/source/ui/undo/undocell.cxx |2 
 sc/source/ui/unoobj/cellsuno.cxx   |   14 ++---
 sc/source/ui/unoobj/chart2uno.cxx  |2 
 sc/source/ui/unoobj/textuno.cxx|2 
 sc/source/ui/view/cellsh1.cxx  |2 
 sc/source/ui/view/gridwin.cxx  |   16 +++---
 sc/source/ui/view/output.cxx   |4 -
 sc/source/ui/view/output2.cxx  |   30 +--
 sc/source/ui/view/spellcheckcontext.cxx|8 +--
 sc/source/ui/view/spelleng.cxx |2 
 sc/source/ui/view/tabvwsh.cxx  |2 
 sc/source/ui/view/tabvwsh5.cxx |2 
 sc/source/ui/view/tabvwsha.cxx |6 +-
 sc/source/ui/view/viewfun2.cxx |2 
 sc/source/ui/view/viewfun4.cxx |6 +-
 sc/source/ui/view/viewfunc.cxx |2 
 73 files changed, 269 insertions(+), 282 deletions(-)

New commits:
commit 3d2e26d8b7a99d0a622741ef4327e8cbc93bbe02
Author: Noel Grandin 
AuthorDate

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sc/source

 sc/source/core/data/table7.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b2b8cfe9c8d035be6ba86e5e13f295059c105384
Author: Luboš Luňák 
AuthorDate: Wed Jun 15 09:29:20 2022 +0200
Commit: Luboš Luňák 
CommitDate: Thu Jun 16 15:14:50 2022 +0200

allocate column in ScTable::DeleteBeforeCopyFromClip() (tdf#149554)

Change-Id: I22607f1dd0ec1c083f6a52a2ecccb976fc133687
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135864
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 
(cherry picked from commit e445eac863ac616fb99c9d6bf5510b965fd15957)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135949

diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index f7576361c8a1..9af01cba748e 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -115,7 +115,7 @@ void ScTable::DeleteBeforeCopyFromClip(
 if (nClipCol > aClipRange.aEnd.Col())
 nClipCol = aClipRange.aStart.Col(); // loop through columns.
 
-const ScColumn& rClipCol = rClipTab.aCol[nClipCol];
+const ScColumn& rClipCol = 
const_cast(rClipTab).CreateColumnIfNotExists(nClipCol);
 aCol[nCol].DeleteBeforeCopyFromClip(rCxt, rClipCol, 
rBroadcastSpans);
 }
 }

[Libreoffice-commits] core.git: sc/inc sc/source

 sc/inc/document.hxx|5 +-
 sc/inc/interpretercontext.hxx  |4 --
 sc/inc/rangecache.hxx  |5 --
 sc/source/core/data/documen2.cxx   |   49 +++--
 sc/source/core/tool/interpretercontext.cxx |   12 ---
 sc/source/core/tool/rangecache.cxx |4 --
 6 files changed, 33 insertions(+), 46 deletions(-)

New commits:
commit 1ac3b4ae83856eebe6bc329b7a92575b6b1d84be
Author: Luboš Luňák 
AuthorDate: Mon Jun 13 20:46:08 2022 +0200
Commit: Luboš Luňák 
CommitDate: Thu Jun 16 15:12:42 2022 +0200

share ScSortedRangeCache between threads

It's the same data for all threads, they access it as read-only,
so it doesn't make sense for each thread to build its own copy.

Change-Id: Ia1559c61d976bcce78661cae7e030bb8430aed7c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135794
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 7bd27c6b95fa..294d7deadecc 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -48,7 +48,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -471,7 +471,8 @@ private:
 
 mutable ScInterpreterContext maInterpreterContext;
 
-std::mutex mScLookupMutex; // protection for thread-unsafe parts of 
handling ScLookup
+std::shared_mutex mScLookupMutex; // protection for thread-unsafe parts of 
handling ScLookup
+std::unique_ptr mxScSortedRangeCache; // cache for 
unsorted lookups
 
 static const sal_uInt16 nSrcVer;// file version 
(load/save)
 sal_uInt16  nFormulaTrackCount;
diff --git a/sc/inc/interpretercontext.hxx b/sc/inc/interpretercontext.hxx
index 9f424b1a4f42..4ecb1ed9de1a 100644
--- a/sc/inc/interpretercontext.hxx
+++ b/sc/inc/interpretercontext.hxx
@@ -23,7 +23,6 @@ class FormulaToken;
 class ScDocument;
 class SvNumberFormatter;
 struct ScLookupCacheMap;
-struct ScSortedRangeCacheMap;
 class ScInterpreter;
 enum class SvNumFormatType : sal_Int16;
 
@@ -58,7 +57,6 @@ struct ScInterpreterContext
 std::vector maTokens;
 std::vector maDelayedSetNumberFormat;
 std::unique_ptr mxScLookupCache; // cache for lookups 
like VLOOKUP and MATCH
-std::unique_ptr mxScSortedRangeCache; // cache for 
unsorted lookups
 // Allocation cache for "aConditions" array in 
ScInterpreter::IterateParameterIfs()
 // This is populated/used only when formula-group threading is enabled.
 std::vector maConditions;
@@ -85,7 +83,6 @@ private:
 void SetDocAndFormatter(const ScDocument& rDoc, SvNumberFormatter* 
pFormatter);
 void Cleanup();
 void ClearLookupCache();
-void ClearSortedRangeCache();
 void initFormatTable();
 SvNumberFormatter* mpFormatter;
 mutable NFIndexAndFmtType maNFTypeCache;
@@ -139,7 +136,6 @@ class ScInterpreterContextPool
 public:
 // Only to be used to clear lookup cache in all pool elements
 static void ClearLookupCaches();
-static void ClearSortedRangeCaches();
 };
 
 class ScThreadedInterpreterContextGetterGuard
diff --git a/sc/inc/rangecache.hxx b/sc/inc/rangecache.hxx
index fd5b12cbd8de..048d9b9ba046 100644
--- a/sc/inc/rangecache.hxx
+++ b/sc/inc/rangecache.hxx
@@ -45,7 +45,7 @@ class ScSortedRangeCache final : public SvtListener
 public:
 /// MUST be new'd because Notify() deletes.
 ScSortedRangeCache(ScDocument* pDoc, const ScRange& rRange, const 
ScQueryParam& param,
-   ScSortedRangeCacheMap& cacheMap, ScInterpreterContext* 
context);
+   ScInterpreterContext* context);
 
 /// Remove from document structure and delete (!) cache on modify hint.
 virtual void Notify(const SfxHint& rHint) override;
@@ -53,8 +53,6 @@ public:
 const ScRange& getRange() const { return maRange; }
 bool isDescending() const { return mDescending; }
 
-ScSortedRangeCacheMap& getCacheMap() const { return mCacheMap; }
-
 enum class ValueType
 {
 Values,
@@ -102,7 +100,6 @@ private:
 std::vector mRowToIndex; // indexed by 'SCROW - 
maRange.aStart.Row()'
 ScRange maRange;
 ScDocument* mpDoc;
-ScSortedRangeCacheMap& mCacheMap;
 bool mDescending;
 ValueType mValues;
 
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index bcdbd9b586e9..ed090885ed3b 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -137,6 +137,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, 
SfxObjectShell* pDocShell ) :
 nMacroInterpretLevel(0),
 nInterpreterTableOpLevel(0),
 maInterpreterContext( *this, nullptr ),
+mxScSortedRangeCache(new ScSortedRangeCacheMap),
 nFormulaTrackCount(0),
 eHardRecalcState(HardRecalcState::OFF),
 nVisibleTab( 0 ),
@@ -1198,25 +1199,31 @@ ScLookupCache & ScDocument::GetLookupCache( const 
ScRange & rRange, ScInter

Re: Accessing main window menus during C++ test run

2022-06-16 Thread Colomban Wendling

Hello Miklos, thanks for your message.

Le 16/06/2022 à 12:13, Miklos Vajna a écrit :

I think the root of the difference is that UITests are out of process:
they start a soffice.bin process (with SAL_USE_VCLPLUGIN=svp, so it's
not visible) and then remote-control it.

[…]

Perhaps you can look at CppunitTest_smoketest, which seems to be a
cppunit test that actually spawns a soffice process?

Bingo, hooking in there do give me the accessible tree I'm hoping for,
as with the Python UITest, thanks.

Unfortunately, I'm supposed to write in-process tests [1], so that
wouldn't really be an option. If really it's the only way I'd bring the
discussion and see if that requirement can be lifted, but then maybe I
should just switch to Python directly as it's probably more
beginner-friendly as it's one of the aims of the work I'm on. Anyway,
for the moment that's not the option I'm hoping for :)

Most of our cppunit tests run in-process, using --headless, so if there
would be any dialogs popping up, we would instantly cancel them.

OK, that's an interesting info. However, I'm not anywhere close to
dealing with dialogs or even popups yet, all I'm after is the accessible
objects representing the menu items. This shouldn't require anything to
actually get displayed or pop up.
I guess however that maybe in headless mode the UI is in a degraded
state; would it be possible to trigger loading of the missing bits? Any
idea where to look?

Regards,
Colomban

[1]
https://blog.documentfoundation.org/blog/2021/10/13/tender-to-implement-c-accessibility-tests-202110-01/

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/source vcl/jsdialog

2022-06-16 Thread rash419 (via logerrit)

 sw/source/ui/misc/contentcontroldlg.cxx |5 -
 vcl/jsdialog/enabled.cxx|4 +++-
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 8c53583faa493abf6cd7b2e56b5df7343e922133
Author: rash419 
AuthorDate: Wed Jun 15 17:23:44 2022 +0530
Commit: Miklos Vajna 
CommitDate: Thu Jun 16 15:02:13 2022 +0200

sw: jsdialog: enable contentcontrol and contentcontrollistitem dialogs

contentcontrol: fix: modify, remove, move up/down buttons doesnot work even 
if item is selected in jsdialog

Signed-off-by: rash419 
Change-Id: Ib038ce2a3ff6f92ab7314b18f36a038991a35f3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135902
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/ui/misc/contentcontroldlg.cxx 
b/sw/source/ui/misc/contentcontroldlg.cxx
index 95c86120e497..5e4347e62afb 100644
--- a/sw/source/ui/misc/contentcontroldlg.cxx
+++ b/sw/source/ui/misc/contentcontroldlg.cxx
@@ -374,11 +374,6 @@ IMPL_LINK_NOARG(SwContentControlDlg, MoveDownHdl, 
weld::Button&, void)
 
 IMPL_LINK_NOARG(SwContentControlDlg, SelectionChangedHdl, weld::TreeView&, 
void)
 {
-if (!m_xListItems->has_focus())
-{
-return;
-}
-
 int nRow = m_xListItems->get_selected_index();
 if (nRow < 0)
 {
diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index f7849bb9e3e4..7984dab3d6f8 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -58,7 +58,9 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"xmlsec/ui/viewcertdialog.ui" || rUIFile == 
u"xmlsec/ui/certgeneral.ui"
 || rUIFile == u"xmlsec/ui/certpage.ui" || rUIFile == 
u"svx/ui/accessibilitycheckdialog.ui"
 || rUIFile == u"svx/ui/accessibilitycheckentry.ui"
-|| rUIFile == u"cui/ui/widgettestdialog.ui")
+|| rUIFile == u"cui/ui/widgettestdialog.ui"
+|| rUIFile == u"modules/swriter/ui/contentcontroldlg.ui"
+|| rUIFile == u"modules/swriter/ui/contentcontrollistitemdlg.ui")
 {
 return true;
 }

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - svl/source

 svl/source/numbers/numfmuno.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit e5f403b7e6a5d2d99a01a2111224b5277beba0d5
Author: Eike Rathke 
AuthorDate: Wed Jun 15 12:23:11 2022 +0200
Commit: Eike Rathke 
CommitDate: Thu Jun 16 14:54:12 2022 +0200

Related: tdf#149325 tdf#52602 SvNumberFormatsObj::addNew accept differing

... resulting format code of an existing format as not attempting
to add a duplicate. It makes no sense to insist on strictness if
the client can't know the rules..

Change-Id: I0c8ca215984bf84487036ccf2b570128b1694d54
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135898
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit d19083198f96c75e80904aaa26066e91c9eeacba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135979

diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx
index 4c3d4abda553..b1e9adef8fc7 100644
--- a/svl/source/numbers/numfmuno.cxx
+++ b/svl/source/numbers/numfmuno.cxx
@@ -484,6 +484,14 @@ sal_Int32 SAL_CALL SvNumberFormatsObj::addNew( const 
OUString& aFormat,
 {
 throw util::MalformedNumberFormatException(); // Invalid Format
 }
+else if (aFormStr != aFormat)
+{
+// The format exists but with a different format code string, and if it
+// was only uppercase vs lowercase keywords; but also syntax extensions
+// are possible like resulting embedded LCIDs and what not the client
+// doesn't know about. Silently accept instead of throwing an error.
+nRet = nKey;
+}
 else
 throw uno::RuntimeException(); // Other error (e.g. already added)

How to write OOXML attribute 'vert' of element to ODF?

2022-06-16 Thread Regina Henschel


Hi all,

Currently the "vert" attribute of  element is connected to 
TextPreRotateAngle property. vert="vert" produces TextPreRotateAngle=-90 
and vert="vert270" produces TextPreRotateAngle=-270. When converting it 
to ODF it produces draw:text-rotate-angle="-90" and 
draw:text-rotate-angle="-270".


That approach does not work, because the ODF attribute 
draw:text-rotate-angle produces a rotation of the text area rectangle, 
same as the 'rot' attribute of element  in OOXML. Try with 
attached file the export to ODF and reload to see the problem.


For using draw:text-rotate-angle attribute it would be necessary to 
change the values of the draw:text-areas attribute in addition. But this 
requires introducing additional equations and it conflicts with the 
definitions of the predefined shapes of the presets.


My idea is to introduce a new loext:text-direction attribute of the 
 element, which can carry each of the values of 
the OOXML attribute 'vert'. "Each" needs to be discussed, perhaps better 
to exclude values eaVert and mongolianVert, which in fact are writing 
modes TB_RL and TB_LR. Possible values would be ("eaVert"), "horz", 
("mongolianVert"), "vert", "vert270", "wordArtVert" and "wordArtVertRtl".


The CustomShapeGeometry property, which is a sequence, would get a new 
property "TextDirection". Import from OOXML or from ODF-extended would 
put the value into it without any rotate-angle calculations. Evaluation 
of the attribute would be at rendering time in 
ViewContactOfSdrObjCustomShape::createViewIndependentPrimitive2DSequence().
The current used attribute TextPreRotateAngle would be removed. 
Currently it can be used in the CustomShapeGeometry sequence via macro, 
but is not published in the API and has no UI.


Currently we have a confusion of attribute 'vert' and attribute 'rot' 
resulting in bug 124437 (assigning the angle of the 'rot' attribute to 
TextPreRotateAngle, which produces sheared text) and bug 127457 (value 
of attribute 'vert' overwrites value of 'rot'). Therefore I prefer an 
enum (or constants in API or string?) so that such errors cannot happen.


What do you think?

Kind regards,
Regina


vert270.pptx
Description: Binary data

[Libreoffice-commits] core.git: cui/uiconfig

 cui/uiconfig/ui/cellalignment.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 70d9ae7b59fd26dc524e77ff991f1cd887544475
Author: Olivier Hallot 
AuthorDate: Fri Jun 10 15:38:32 2022 -0300
Commit: Olivier Hallot 
CommitDate: Thu Jun 16 14:48:14 2022 +0200

Add precision to text orientation in extended tip

Change-Id: I9f2c6290baa6f251dba38c3a75e61c775d87fd5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135615
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 

diff --git a/cui/uiconfig/ui/cellalignment.ui b/cui/uiconfig/ui/cellalignment.ui
index a4867cbd42b3..448df0afb543 100644
--- a/cui/uiconfig/ui/cellalignment.ui
+++ b/cui/uiconfig/ui/cellalignment.ui
@@ -129,7 +129,7 @@
 True
 
   
-Aligns 
text vertically.
+Text 
direction vertically.

Minutes from the UX/design meeting 2022-Jun-16

2022-06-16 Thread Heiko Tietze


Present: Heiko
Comments: Regina

Tickets/Topics

 * Basic-IDE - Missing feature to export COLORIZED basic code
   in a WRITER document + Workaround
   + https://bugs.documentfoundation.org/show_bug.cgi?id=138380
   + prefer a macro solution for such special request (Heiko)
   => realize per extension

 * Lines and Shadows in Shapes are positioned outside their selected
   region (to Entire Paragraph area or Paragraph Text area)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=149460
   + Writer images are treated as frames and not as shapes (Regina)
   + bug 90070 asks to not shrinks the size when adding a border
 and spacing (but not yet shadows) (Regina)
   => keep open and comment on 90070

 * Problem with decimal number selection using double click
   + https://bugs.documentfoundation.org/show_bug.cgi?id=149306
   + select all if a word is a currency like 1.234,56$
   + should be possible using a regex algorithm
   => do it

 * Can't insert/embed office-documents as icons
   + https://bugs.documentfoundation.org/show_bug.cgi?id=50991
   + insert OLE object from file as icon works well
   + but with drag 'n drop the document is linked into a section
   + sections have some advantage over OLE objects
   + attaching binary files might be a security issue
   + change behavior carefully and insert as OLE object in case of
 drag 'n drop plus accelerator key (eg. Ctrl)
   => do it

 * UI: Improve handling of configuring table borders in table properties
   dialog (to make it work for multiple workflows)
   + https://bugs.documentfoundation.org/show_bug.cgi?id=143249
   + mockup revised, no further comment
   => implement this

 * Add the ability to bookmark or comment spelling/grammar mistakes
   in text from spellcheck dialog
   + https://bugs.documentfoundation.org/show_bug.cgi?id=93073
   + mockup provided to automatically add a bookmark for this
   + idea was appreciated and received no further comments
   => implement it


OpenPGP_signature
Description: OpenPGP digital signature

[Libreoffice-commits] core.git: sw/qa sw/source

2022-06-16 Thread Mark Hung (via logerrit)

 sw/qa/extras/uiwriter/uiwriter7.cxx |   19 ++-
 sw/source/core/text/itrform2.cxx|   13 -
 2 files changed, 22 insertions(+), 10 deletions(-)

New commits:
commit 47eff9bf12abf963907b4d3dcb90b73e0ccc646d
Author: Mark Hung 
AuthorDate: Sat Jun 11 19:52:28 2022 +0800
Commit: Mark Hung 
CommitDate: Thu Jun 16 14:40:05 2022 +0200

tdf#149089 snap to grid if IsSnapToChars() is false

for non-CJK scripts. Non Asian text was centered within as many cells
as required according to ODF1.2 20.301. But it also required that
text should be snapped to grid if style:layout-grid-snap-to is
true ( i.e. IsSnapToChars() is false ) per ODF1.2 20.305. That means
ODF1.2 20.301 ruled.

This patch changes the width of inserted SwKernGridPortion so that
non-CJK text aligns to the edge of text grid to make ODF1.2 20.301
rule, an provide more consistent layout result as expected.

Change-Id: Id6b4d2b965e20670eb9ddf657d36b8a49073f32a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135654
Tested-by: Jenkins
Reviewed-by: Mark Hung 

diff --git a/sw/qa/extras/uiwriter/uiwriter7.cxx 
b/sw/qa/extras/uiwriter/uiwriter7.cxx
index 8b5a23d1a695..0ac6b0183068 100644
--- a/sw/qa/extras/uiwriter/uiwriter7.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter7.cxx
@@ -2779,11 +2779,20 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest7, testTdf149089)
 {
 createSwDoc(DATA_DIRECTORY, "tdf149089.odt");
 xmlDocUniquePtr pXmlDoc = parseLayoutDump();
-sal_Int32 nTextPortionWidth = getXPath(pXmlDoc, "(//SwLinePortion)[1]", 
"width").toInt32();
-sal_Int32 nKernPortionWidth = getXPath(pXmlDoc, "(//SwLinePortion)[2]", 
"width").toInt32();
-// nKernPortionWidth was about 1/3 of nTextPortionWidth
-double nRatio = double(nKernPortionWidth) / nTextPortionWidth;
-CPPUNIT_ASSERT_LESS(0.05, nRatio);
+sal_Int32 nPorLen1 = getXPath(pXmlDoc, "(//SwLinePortion)[1]", 
"length").toInt32();
+sal_Int32 nPorLen2 = getXPath(pXmlDoc, "(//SwLinePortion)[2]", 
"length").toInt32();
+sal_Int32 nPorLen3 = getXPath(pXmlDoc, "(//SwLinePortion)[3]", 
"length").toInt32();
+// Two SwTextPortion and one SwKernPortion
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), nPorLen1); // SwTextPortion 
"一一 "
+CPPUNIT_ASSERT_EQUAL(sal_Int32(12), nPorLen2); // SwTextPortion "BUG 
"
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nPorLen3); // SwKernPortion
+
+sal_Int32 nPorWidth1 = getXPath(pXmlDoc, "(//SwLinePortion)[1]", 
"width").toInt32();
+sal_Int32 nPorWidth2 = getXPath(pXmlDoc, "(//SwLinePortion)[2]", 
"width").toInt32();
+sal_Int32 nPorWidth3 = getXPath(pXmlDoc, "(//SwLinePortion)[3]", 
"width").toInt32();
+sal_Int32 nGridWidth1 = nPorWidth1 / 3;
+sal_Int32 nGridWidth2 = (nPorWidth2 + nPorWidth3) / 7;
+CPPUNIT_ASSERT_EQUAL(nGridWidth1, nGridWidth2);
 }
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index e7bcde5983b8..563ddd5c4c02 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -686,15 +686,18 @@ void SwTextFormatter::BuildPortions( SwTextFormatInfo 
&rInf )
  0;
 const SwTwips nTmpWidth = i * nGridWidth;
 const SwTwips nKernWidth = std::min(nTmpWidth - nSumWidth, 
nRestWidth);
-const SwTwips nKernWidth_1 = nKernWidth / 2;
+const SwTwips nKernWidth_1 = pGrid->IsSnapToChars() ?
+nKernWidth / 2 : 0;
 
 OSL_ENSURE( nKernWidth <= nRestWidth,
 "Not enough space left for adjusting non-asian text in 
grid mode" );
+if (nKernWidth_1)
+{
+pGridKernPortion->Width( pGridKernPortion->Width() + 
nKernWidth_1 );
+rInf.X( rInf.X() + nKernWidth_1 );
+}
 
-pGridKernPortion->Width( pGridKernPortion->Width() + 
nKernWidth_1 );
-rInf.X( rInf.X() + nKernWidth_1 );
-
-if ( ! bFull )
+if ( ! bFull && nKernWidth - nKernWidth_1 > 0 )
 new SwKernPortion( *pPor, static_cast(nKernWidth - 
nKernWidth_1),
false, true );

[Libreoffice-commits] core.git: sc/source

 sc/source/ui/vba/vbarange.cxx |7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

New commits:
commit e44e418783d101c530c916db0b0f72c376188fdf
Author: Eike Rathke 
AuthorDate: Thu Jun 16 13:14:43 2022 +0200
Commit: Eike Rathke 
CommitDate: Thu Jun 16 14:24:14 2022 +0200

One call to XCellRangeAddressable::getRangeAddress() is enough

... each needs to obtain it via ScUnoConversion::FillApiRange().

Change-Id: Ie98d5130067701f40c441d08bdb9faf7913bcdb8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135972
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index b98b5471ff7b..93b217f1d632 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1140,12 +1140,9 @@ public:
 static uno::Reference< excel::XRange > createRangeFromRange( const 
uno::Reference< XHelperInterface >& xParent, const 
uno::Reference& xContext,
 const uno::Reference< table::XCellRange >& xRange, const 
uno::Reference< sheet::XCellRangeAddressable >& xCellRangeAddressable )
 {
+const table::CellRangeAddress aRA( 
xCellRangeAddressable->getRangeAddress());
 return uno::Reference< excel::XRange >( new ScVbaRange( xParent, 
xContext,
-xRange->getCellRangeByPosition(
-xCellRangeAddressable->getRangeAddress().StartColumn,
-xCellRangeAddressable->getRangeAddress().StartRow,
-xCellRangeAddressable->getRangeAddress().EndColumn,
-xCellRangeAddressable->getRangeAddress().EndRow ) ) );
+xRange->getCellRangeByPosition( aRA.StartColumn, 
aRA.StartRow, aRA.EndColumn, aRA.EndRow)));
 }
 
 };

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - oox/source

2022-06-16 Thread Mike Kaganski (via logerrit)

 oox/source/drawingml/drawingmltypes.cxx |   21 +
 1 file changed, 17 insertions(+), 4 deletions(-)

New commits:
commit 48a5127bb37b9a95ee9101cad73c0c8c9c82a26d
Author: Mike Kaganski 
AuthorDate: Wed Jun 15 15:04:07 2022 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 14:23:42 2022 +0200

Correct parsing of ST_Percentage

Change-Id: I227b2abd493d3a4ce6f4e4dcd256aa29653fdce0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135886
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit cbbb67e05709e89bca60ae241342d6647ea64f79)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135951
Reviewed-by: Xisco Fauli 

diff --git a/oox/source/drawingml/drawingmltypes.cxx 
b/oox/source/drawingml/drawingmltypes.cxx
index 6ce901ab1ef9..fc2f28d902b7 100644
--- a/oox/source/drawingml/drawingmltypes.cxx
+++ b/oox/source/drawingml/drawingmltypes.cxx
@@ -23,6 +23,8 @@
 #include 
 #include 
 #include 
+
+#include 
 #include 
 #include 
 #include 
@@ -374,15 +376,26 @@ const char* GetHatchPattern( const drawing::Hatch& rHatch 
)
 return sPattern;
 }
 
+namespace
+{
+// ISO/IEC-29500 Part 1 ST_Percentage, and [MS-OI29500] 2.1.1324
+sal_Int32 GetST_Percentage(std::u16string_view s)
+{
+if (o3tl::ends_with(s, u"%"))
+return std::round(o3tl::toDouble(s) * 1000);
+return o3tl::toInt32(s);
+}
+}
+
 /** converts the attributes from a CT_RelativeRect to an IntegerRectangle2D */
 IntegerRectangle2D GetRelativeRect( const Reference< XFastAttributeList >& 
xAttribs )
 {
 IntegerRectangle2D r;
 
-r.X1 = xAttribs->getOptionalValue( XML_l ).toInt32();
-r.Y1 = xAttribs->getOptionalValue( XML_t ).toInt32();
-r.X2 = xAttribs->getOptionalValue( XML_r ).toInt32();
-r.Y2 = xAttribs->getOptionalValue( XML_b ).toInt32();
+r.X1 = GetST_Percentage(xAttribs->getOptionalValue( XML_l ));
+r.Y1 = GetST_Percentage(xAttribs->getOptionalValue( XML_t ));
+r.X2 = GetST_Percentage(xAttribs->getOptionalValue( XML_r ));
+r.Y2 = GetST_Percentage(xAttribs->getOptionalValue( XML_b ));
 
 return r;
 }

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/elementary officecfg/registry sw/uiconfig sw/UIConfig_swriter.mk

2022-06-16 Thread Maxim Monastirsky (via logerrit)

 icon-themes/colibre/links.txt  |   43 
++
 icon-themes/elementary/links.txt   |   43 
++
 officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu|  158 
++
 officecfg/registry/data/org/openoffice/Office/UI/WriterWindowState.xcu |   88 
+
 sw/UIConfig_swriter.mk |   11 
 sw/uiconfig/swriter/toolbar/singlemode-annotation.xml  |   34 
++
 sw/uiconfig/swriter/toolbar/singlemode-draw.xml|   64 

 sw/uiconfig/swriter/toolbar/singlemode-drawtext.xml|   52 
+++
 sw/uiconfig/swriter/toolbar/singlemode-form.xml|   50 
+++
 sw/uiconfig/swriter/toolbar/singlemode-frame.xml   |   49 
+++
 sw/uiconfig/swriter/toolbar/singlemode-graphic.xml |   52 
+++
 sw/uiconfig/swriter/toolbar/singlemode-media.xml   |   39 
++
 sw/uiconfig/swriter/toolbar/singlemode-ole.xml |   47 
++
 sw/uiconfig/swriter/toolbar/singlemode-printpreview.xml|   40 
++
 sw/uiconfig/swriter/toolbar/singlemode-table.xml   |   98 
++
 sw/uiconfig/swriter/toolbar/singlemode-text.xml|   98 
++
 sw/uiconfig/swriter/toolbar/singlemode.xml |   76 

 17 files changed, 974 insertions(+), 68 deletions(-)

New commits:
commit 0930096c4c5ed14f46a79f03b29f21cc915d7203
Author: Maxim Monastirsky 
AuthorDate: Wed Jun 15 22:32:54 2022 +0300
Commit: Maxim Monastirsky 
CommitDate: Thu Jun 16 14:03:33 2022 +0200

tdf#125040 Recreate Contextual Single for Writer

Change-Id: I791631aedb9efbb7bbdc41234ee39e1d3c834ce1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135959
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 74ad1112d9f7..eecb932abacb 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -2719,3 +2719,46 @@ cmd/sc_redactionpreviewexport.png 
cmd/sc_exportdirecttopdf.png
 # Extension Dialog
 cmd/sc_stars-full.png sc/res/icon-set-stars-full.png
 cmd/sc_stars-empty.png sc/res/icon-set-stars-empty.png
+
+# Contextual Single Toolbar
+cmd/32/zoom-more.png cmd/32/optionstreedialog.png
+cmd/32/accepttrackedchanges-more.png cmd/32/optionstreedialog.png
+cmd/32/fontdialog-more.png cmd/32/optionstreedialog.png
+cmd/32/paragraphdialog-more.png cmd/32/optionstreedialog.png
+cmd/32/tabledialog-more.png cmd/32/optionstreedialog.png
+cmd/32/transformdialog-more.png cmd/32/optionstreedialog.png
+cmd/32/graphicdialog-more.png cmd/32/optionstreedialog.png
+cmd/32/framedialog-more.png cmd/32/optionstreedialog.png
+cmd/32/objectdialog-more.png cmd/32/optionstreedialog.png
+cmd/32/borderdialog-more.png cmd/32/optionstreedialog.png
+cmd/32/textwrap-more.png cmd/32/optionstreedialog.png
+cmd/32/formatarea-more.png cmd/32/optionstreedialog.png
+cmd/32/formatline-more.png cmd/32/optionstreedialog.png
+
+cmd/lc_zoom-more.png cmd/lc_optionstreedialog.png
+cmd/lc_accepttrackedchanges-more.png cmd/lc_optionstreedialog.png
+cmd/lc_fontdialog-more.png cmd/lc_optionstreedialog.png
+cmd/lc_paragraphdialog-more.png cmd/lc_optionstreedialog.png
+cmd/lc_tabledialog-more.png cmd/lc_optionstreedialog.png
+cmd/lc_transformdialog-more.png cmd/lc_optionstreedialog.png
+cmd/lc_graphicdialog-more.png cmd/lc_optionstreedialog.png
+cmd/lc_framedialog-more.png cmd/lc_optionstreedialog.png
+cmd/lc_objectdialog-more.png cmd/lc_optionstreedialog.png
+cmd/lc_borderdialog-more.png cmd/lc_optionstreedialog.png
+cmd/lc_textwrap-more.png cmd/lc_optionstreedialog.png
+cmd/lc_formatarea-more.png cmd/lc_optionstreedialog.png
+cmd/lc_formatline-more.png cmd/lc_optionstreedialog.png
+
+cmd/sc_zoom-more.png sfx2/res/symphony/open_more.png
+cmd/sc_accepttrackedchanges-more.png sfx2/res/symphony/open_more.png
+cmd/sc_fontdialog-more.png sfx2/res/symphony/open_more.png
+cmd/sc_paragraphdialog-more.png sfx2/res/symphony/open_more.png
+cmd/sc_tabledialog-more.png sfx2/res/symphony/open_more.png
+cmd/sc_transformdialog-more.png sfx2/res/symphony/open_more.png
+cmd/sc_graphicdialog-more.png sfx2/res/symphony/open_more.png
+cmd/sc_framedialog-more.png sfx2/res/symphony/open_more.png
+cmd/sc_objectdialog-more.png sfx2/res/symphony/open_more.png
+cmd/sc_borderdialog-more.png sfx2/res/symphony/open_more.png
+cmd/sc_textwrap-more.png sfx2/res/symphony/open_more.png
+cmd/sc_formatarea-more.png sfx2/res/symphony/open_more.png
+cmd/sc_formatline-more.png sfx2/res/symphony/open_more.png
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index da4436c53178..03d70a8a2cb6 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -2671,3 +2671,46 @@ cmd/sc_stars-empty.png sc/res/icon-set-stars-empty.png
 cmd/32/redactionpr

[Libreoffice-commits] core.git: framework/source

2022-06-16 Thread Maxim Monastirsky (via logerrit)

 framework/source/uielement/toolbarwrapper.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 48ca2336251d62ac2e90300cd9945fb84b1cddd8
Author: Maxim Monastirsky 
AuthorDate: Thu Jun 16 01:07:31 2022 +0300
Commit: Maxim Monastirsky 
CommitDate: Thu Jun 16 14:00:12 2022 +0200

tdf#125040 Avoid flickering on context change

Change-Id: I442fada34e10fe13e68987abba34969a8ab50bc5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135958
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/framework/source/uielement/toolbarwrapper.cxx 
b/framework/source/uielement/toolbarwrapper.cxx
index 146cddf2867d..9acbe7ca7b55 100644
--- a/framework/source/uielement/toolbarwrapper.cxx
+++ b/framework/source/uielement/toolbarwrapper.cxx
@@ -130,6 +130,8 @@ void SAL_CALL ToolBarWrapper::initialize( const Sequence< 
Any >& aArguments )
 catch( const Exception& )
 {
 }
+// Avoid flickering on context change
+bPopupMode = true;
 }
 
 // Create VCL based toolbar which will be filled with settings data

[Libreoffice-commits] core.git: bin/crashreportScraper.py

2022-06-16 Thread Xisco Fauli (via logerrit)

 bin/crashreportScraper.py |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 970f03cb9ed68d249fe04cff7d4aa15b0f2c6c35
Author: Xisco Fauli 
AuthorDate: Thu Jun 16 13:16:13 2022 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 13:26:36 2022 +0200

crashreportScraper: use argparse to parse the arguments

Change-Id: Idc1d32683c5113042fe4e7ec97357b6d76c5217e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135973
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/bin/crashreportScraper.py b/bin/crashreportScraper.py
index aec3e5e9cffb..513f5ec7b75d 100755
--- a/bin/crashreportScraper.py
+++ b/bin/crashreportScraper.py
@@ -8,8 +8,9 @@
 
 # Use this script to retrieve information from 
https://crashreport.libreoffice.org
 # about a specific version of LibreOffice
-# Usage sample: ./crashreportScraper.py 7.2.0.4
+# Usage sample: ./crashreportScraper.py --version 7.2.0.4 --repository 
/path/to/libreoffice/repository/
 
+import argparse
 import requests
 from bs4 import BeautifulSoup
 import sys
@@ -160,17 +161,20 @@ def parse_details_and_get_info(url, gitRepo):
 
 if __name__ == '__main__':
 
-version = sys.argv[1]
+parser = argparse.ArgumentParser()
 
-crashes = parse_version_url(
-"https://crashreport.libreoffice.org/stats/version/"; + version + 
"?limit=1000&days=30")
+parser.add_argument('--version', action='store', dest="version", 
required=True)
+parser.add_argument('--repository', action="store", dest="repository", 
required=True)
+
+args = parser.parse_args()
 
-gitRepo = os.path.dirname(os.path.realpath(__file__)) + "/../"
+crashes = parse_version_url(
+"https://crashreport.libreoffice.org/stats/version/"; + 
args.version + "?limit=1000&days=30")
 
-print(str(len(crashes)) + " crash reports in version " + version)
+print(str(len(crashes)) + " crash reports in version " + args.version)
 
 crashesInFile = []
-fileName = "crashes_" + version.replace(".", "_") + ".csv"
+fileName = "crashes_" + args.version.replace(".", "_") + ".csv"
 print("Using " + fileName)
 
 bInsertHeader = False
@@ -196,7 +200,7 @@ if __name__ == '__main__':
 crashCount, crashID, crashVersion, crashOS = 
parse_reports_and_get_most_recent_report_from_last_page(
 
"https://crashreport.libreoffice.org/stats/signature/"; + k)
 crashReason, crashStack, codeLine = 
parse_details_and_get_info(
-
"https://crashreport.libreoffice.org/stats/crash_details/"; + crashID, gitRepo)
+
"https://crashreport.libreoffice.org/stats/crash_details/"; + crashID, 
args.repository)
 line = '\t'.join([k, str(crashCount), lDate[1], lDate[2],
 crashID, crashVersion, crashReason, crashOS, 
crashStack, codeLine, '\n'])
 f.write(line)

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/uiconfig

 sw/uiconfig/swriter/ui/tocentriespage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6cb26b3fe8b11df989a3b45424171cfda0ad5d30
Author: Olivier Hallot 
AuthorDate: Mon Jun 13 13:04:54 2022 -0300
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 13:20:03 2022 +0200

Add precision on tocentriespage.ui

Change-Id: Ibdaa15e1d573f34e3098bf00b883752ce4df40c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135767
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135966

diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui 
b/sw/uiconfig/swriter/ui/tocentriespage.ui
index 5d522dfb51ec..929257803c0d 100644
--- a/sw/uiconfig/swriter/ui/tocentriespage.ui
+++ b/sw/uiconfig/swriter/ui/tocentriespage.ui
@@ -751,7 +751,7 @@
 True
 
   
-Positions 
the tab stop relative to the "indent from left" value defined in the paragraph 
style selected on the Styles tab. Otherwise the tab stop is positioned relative 
to the left text margin.
+Positions 
the tab stop relative to the "before the text" indent  value defined in the 
paragraph style selected on the Styles tab. Otherwise the tab stop is 
positioned relative to the left text margin.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - oox/source

 oox/source/drawingml/fillproperties.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 38002ccf6c6a8dd776153cfa993fc69f218ca6f8
Author: Miklos Vajna 
AuthorDate: Wed Jun 15 15:52:18 2022 +0200
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 13:19:49 2022 +0200

oox: fix div by zero in lclCalculateCropPercentage()

Similar to what oox::vml::ShapeType::getAbsRectangle() already does.

Crashreport signature:

Fatal signal received: SIGFPE code: 1 for address: 0x7fcd55eeff59

program/libooxlo.so
oox::drawingml::GraphicProperties::pushToPropMap(oox::PropertyMap&, 
oox::GraphicHelper const&, bool, bool) const
oox/source/drawingml/fillproperties.cxx:103

Change-Id: I0f82cbc955d9e60bad103682638b07153a5589e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135910
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 2859ec288f2c1323ea3123d82cb1684b349ff598)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135943
Reviewed-by: Xisco Fauli 

diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 98b9e2f93e73..7d6c41a81fc6 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -99,7 +99,15 @@ void 
lclCalculateCropPercentage(uno::Reference const & xGraph
 sal_Int32 nScaledHeight = aBitmapEx.GetSizePixel().Height();
 
 sal_Int32 nOrigWidth = (nScaledWidth * (10 - aFillRect.X1 - 
aFillRect.X2)) / 10;
+if (nOrigWidth == 0)
+{
+nOrigWidth = 1;
+}
 sal_Int32 nOrigHeight = (nScaledHeight * (10 - aFillRect.Y1 - 
aFillRect.Y2)) / 10;
+if (nOrigHeight == 0)
+{
+nOrigHeight = 1;
+}
 
 sal_Int32 nLeftPercentage = nScaledWidth * aFillRect.X1 / nOrigWidth;
 sal_Int32 nRightPercentage = nScaledWidth * aFillRect.X2 / nOrigWidth;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - svx/uiconfig

 svx/uiconfig/ui/optgridpage.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d4873ebbd0c03bb563fa434c8be310ab28ccd042
Author: Olivier Hallot 
AuthorDate: Sat Jun 11 15:42:41 2022 -0300
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 13:17:20 2022 +0200

Fix definition

Change-Id: I4dbe6fcd04aebc25a17263f160b7683cbf01ac30
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135671
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 839584cc3ab9583c1eaf2b513b38783e313052c4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135977
Reviewed-by: Xisco Fauli 

diff --git a/svx/uiconfig/ui/optgridpage.ui b/svx/uiconfig/ui/optgridpage.ui
index c7bf2fe399a8..b7ccd7ea9346 100644
--- a/svx/uiconfig/ui/optgridpage.ui
+++ b/svx/uiconfig/ui/optgridpage.ui
@@ -173,7 +173,7 @@
 True
 
   
-Defines the grid points 
spacing in the desired unit of measurement on the Y-axis.
+Defines the grid points 
spacing in the currently selected unit of measurement on the Y-axis.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - svx/uiconfig

 svx/uiconfig/ui/datanavigator.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 79652e00df4771254611ee4799212734f2a9add7
Author: Olivier Hallot 
AuthorDate: Sat Jun 11 15:24:00 2022 -0300
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 13:14:54 2022 +0200

Fix English

Change-Id: I45615f217120d90cb255ce1a3e9e1f710603770e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135663
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 641c95231ac0ca7e107da6cd931e92a870beb770)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135976
Reviewed-by: Xisco Fauli 

diff --git a/svx/uiconfig/ui/datanavigator.ui b/svx/uiconfig/ui/datanavigator.ui
index 9889e6a73a29..87cc66e0104f 100644
--- a/svx/uiconfig/ui/datanavigator.ui
+++ b/svx/uiconfig/ui/datanavigator.ui
@@ -88,7 +88,7 @@
 True
 
   
-Renames the 
selected Xform model.
+Renames the 
selected XForms model.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/uiconfig

 sw/uiconfig/swriter/ui/autoformattable.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 53e29deaff524dcdfae5a4c5072063e11f161f65
Author: Olivier Hallot 
AuthorDate: Fri Jun 10 15:57:25 2022 -0300
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 13:07:55 2022 +0200

Fix English in extended tip

Change-Id: Ice84ca4c1c6eed9e21e3d5916f47e686b61c79b5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135621
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit ada38e5fc7c230e7861a00a6f3433dd5a11b5d3e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135975
Reviewed-by: Xisco Fauli 

diff --git a/sw/uiconfig/swriter/ui/autoformattable.ui 
b/sw/uiconfig/swriter/ui/autoformattable.ui
index 658cee042f63..986cce5ebd77 100644
--- a/sw/uiconfig/swriter/ui/autoformattable.ui
+++ b/sw/uiconfig/swriter/ui/autoformattable.ui
@@ -295,7 +295,7 @@
 True
 
   
-Includes 
numbering formats in the selected table style.
+Includes 
number formats in the selected table style.

[Libreoffice-commits] core.git: offapi/com

 offapi/com/sun/star/ucb/MissingPropertiesException.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fcdfd309345afaf88fac587e837e51e741c60400
Author: Andrea Gelmini 
AuthorDate: Tue Jun 14 11:58:18 2022 +0200
Commit: Julien Nabet 
CommitDate: Thu Jun 16 13:01:48 2022 +0200

Fix typo

Change-Id: I7ff6efac1edd171f65ebd901d8f03f38364496b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135927
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/offapi/com/sun/star/ucb/MissingPropertiesException.idl 
b/offapi/com/sun/star/ucb/MissingPropertiesException.idl
index a4f55c1903b0..a56193d407da 100644
--- a/offapi/com/sun/star/ucb/MissingPropertiesException.idl
+++ b/offapi/com/sun/star/ucb/MissingPropertiesException.idl
@@ -22,7 +22,7 @@ module com { module sun { module star { module ucb {
 
 /** This exception is used to indicate that there are properties missing.
 
-For example, to create a new resource, usually one ore more property
+For example, to create a new resource, usually one or more property
 values must be set prior to executing the command "insert", which makes
 the new resource persistent.

[Libreoffice-commits] core.git: offapi/com

 offapi/com/sun/star/form/binding/ListEntrySource.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 965bad9abb9b07245cce525694bc0b52c08c05fa
Author: Andrea Gelmini 
AuthorDate: Tue Jun 14 11:59:05 2022 +0200
Commit: Julien Nabet 
CommitDate: Thu Jun 16 13:01:22 2022 +0200

Fix typo

Change-Id: I0ccce1c6e143b819dbb78d6fb74ccde8ce737f84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135928
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/offapi/com/sun/star/form/binding/ListEntrySource.idl 
b/offapi/com/sun/star/form/binding/ListEntrySource.idl
index ebad2c15e166..4da8e751ef02 100644
--- a/offapi/com/sun/star/form/binding/ListEntrySource.idl
+++ b/offapi/com/sun/star/form/binding/ListEntrySource.idl
@@ -31,7 +31,7 @@ service ListEntrySource
 
 /** allows life time control for the component
 
-An ListEntrySource will be known to one ore more components
+An ListEntrySource will be known to one or more components
 supporting the XListEntrySink interface, which all work with
 this source. However, they will not own the ListEntrySource.
 The ownership is with another instance, which may also decide to 
obsolete

[Libreoffice-commits] core.git: compilerplugins/clang

 compilerplugins/clang/pluginhandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cb958c4ff88da1d8edab756592e3c6483e1b8b28
Author: Andrea Gelmini 
AuthorDate: Tue Jun 14 11:55:22 2022 +0200
Commit: Julien Nabet 
CommitDate: Thu Jun 16 13:00:54 2022 +0200

Fix typo

Change-Id: I9b29e51e550ea9f13497e1f46cf4cdc11cf8faa6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135925
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/compilerplugins/clang/pluginhandler.cxx 
b/compilerplugins/clang/pluginhandler.cxx
index 7cfa19eb9c35..ffa4e3668def 100644
--- a/compilerplugins/clang/pluginhandler.cxx
+++ b/compilerplugins/clang/pluginhandler.cxx
@@ -231,7 +231,7 @@ bool PluginHandler::ignoreLocation(SourceLocation loc) {
 bool PluginHandler::checkIgnoreLocation(SourceLocation loc)
 {
 // The tree-wide analysis plugins (like unusedmethods) don't want
-// this logic, they only want to ignore externl code
+// this logic, they only want to ignore external code
 if (!treeWideAnalysisMode)
 {
 // If a location comes from a PCH, it is not necessary to check it

[Libreoffice-commits] core.git: chart2/source

 chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1bd2c6391f28b9d3bb94d1b8ef58cdedacf858ba
Author: Andrea Gelmini 
AuthorDate: Tue Jun 14 11:54:51 2022 +0200
Commit: Michael Stahl 
CommitDate: Thu Jun 16 12:56:14 2022 +0200

Fix typo in code

Change-Id: Ic2c07abd89361aaef0f216ee71d0fa8ce8529233
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135924
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git 
a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx 
b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index aaa00be91246..6f2855dc8b7a 100644
--- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -43,7 +43,7 @@ class WrappedStockProperty : public WrappedProperty
 {
 public:
 explicit WrappedStockProperty( const OUString& rOuterName
-, css::uno::Any aDefaulValue
+, css::uno::Any aDefaultValue
 , std::shared_ptr spChart2ModelContact );
 
 void setPropertyValue( const css::uno::Any& rOuterValue, const 
css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const 
override;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - solenv/bin

2022-06-16 Thread Christian Lohmaier (via logerrit)

 solenv/bin/modules/installer/download.pm  |   13 +
 solenv/bin/modules/installer/globals.pm   |1 -
 solenv/bin/modules/installer/parameter.pm |   11 +--
 3 files changed, 2 insertions(+), 23 deletions(-)

New commits:
commit 9f3ea92c070636cca77064eabf1baf01ccb72436
Author: Christian Lohmaier 
AuthorDate: Wed Jun 15 22:04:14 2022 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jun 16 12:48:27 2022 +0200

fix download-filename for Windows aarch64 builds

was incorrectly using x64

Change-Id: Ieb7c90c6b1ed3abd73315a15c59490ea639954c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135936
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index ca270fe563a9..f46dae735864 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -363,17 +363,6 @@ sub get_download_architecture
 {
 $arch = "x86";
 }
-elsif ( $installer::globals::iswindowsbuild )
-{
-if ( $installer::globals::iswin64build )
-{
-$arch = "x64";
-}
-else
-{
-$arch = "x86";
-}
-}
 elsif ( $installer::globals::cpuname eq 'INTEL' )
 {
 $arch = "x86";
@@ -388,7 +377,7 @@ sub get_download_architecture
 }
 elsif ( $installer::globals::cpuname eq 'X86_64' )
 {
-$arch = "x86-64";
+$arch = $installer::globals::os eq 'WNT' ? 'x64' : 'x86-64';
 }
 elsif ( $installer::globals::cpuname eq 'AARCH64' )
 {
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index 11442ef202a8..5bbaef309145 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -46,7 +46,6 @@ BEGIN
 $languages_defined_in_productlist = 0;
 $setupscript_defined_in_productlist = 0;
 $iswindowsbuild = 0;
-$iswin64build = 0;
 $islinuxbuild = 0;
 $isrpmbuild = 0;
 $isdebbuild = 0;
diff --git a/solenv/bin/modules/installer/parameter.pm 
b/solenv/bin/modules/installer/parameter.pm
index 8f259c3e9a32..befed72024a0 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -241,16 +241,7 @@ sub setglobalvariables
 
 if ( $installer::globals::os eq 'WNT' )
 {
-if ( $installer::globals::cpuname eq 'INTEL')
-{
-$installer::globals::iswindowsbuild = 1;
-$installer::globals::iswin64build = 0;
-}
-else
-{
-$installer::globals::iswindowsbuild = 1;
-$installer::globals::iswin64build = 1;
-}
+$installer::globals::iswindowsbuild = 1;
 }
 
 if ( $installer::globals::os eq 'SOLARIS')

[Libreoffice-commits] core.git: solenv/bin

2022-06-16 Thread Christian Lohmaier (via logerrit)

 solenv/bin/modules/installer/download.pm  |   13 +
 solenv/bin/modules/installer/globals.pm   |1 -
 solenv/bin/modules/installer/parameter.pm |   11 +--
 3 files changed, 2 insertions(+), 23 deletions(-)

New commits:
commit c7f971c23b908335ab5cfb3117bb4d6fe544a664
Author: Christian Lohmaier 
AuthorDate: Wed Jun 15 22:04:14 2022 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jun 16 12:47:27 2022 +0200

fix download-filename for Windows aarch64 builds

was incorrectly using x64

Change-Id: Ieb7c90c6b1ed3abd73315a15c59490ea639954c8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135922
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index ca270fe563a9..f46dae735864 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -363,17 +363,6 @@ sub get_download_architecture
 {
 $arch = "x86";
 }
-elsif ( $installer::globals::iswindowsbuild )
-{
-if ( $installer::globals::iswin64build )
-{
-$arch = "x64";
-}
-else
-{
-$arch = "x86";
-}
-}
 elsif ( $installer::globals::cpuname eq 'INTEL' )
 {
 $arch = "x86";
@@ -388,7 +377,7 @@ sub get_download_architecture
 }
 elsif ( $installer::globals::cpuname eq 'X86_64' )
 {
-$arch = "x86-64";
+$arch = $installer::globals::os eq 'WNT' ? 'x64' : 'x86-64';
 }
 elsif ( $installer::globals::cpuname eq 'AARCH64' )
 {
diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index 11442ef202a8..5bbaef309145 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -46,7 +46,6 @@ BEGIN
 $languages_defined_in_productlist = 0;
 $setupscript_defined_in_productlist = 0;
 $iswindowsbuild = 0;
-$iswin64build = 0;
 $islinuxbuild = 0;
 $isrpmbuild = 0;
 $isdebbuild = 0;
diff --git a/solenv/bin/modules/installer/parameter.pm 
b/solenv/bin/modules/installer/parameter.pm
index 8f259c3e9a32..befed72024a0 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -241,16 +241,7 @@ sub setglobalvariables
 
 if ( $installer::globals::os eq 'WNT' )
 {
-if ( $installer::globals::cpuname eq 'INTEL')
-{
-$installer::globals::iswindowsbuild = 1;
-$installer::globals::iswin64build = 0;
-}
-else
-{
-$installer::globals::iswindowsbuild = 1;
-$installer::globals::iswin64build = 1;
-}
+$installer::globals::iswindowsbuild = 1;
 }
 
 if ( $installer::globals::os eq 'SOLARIS')

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6b278bbc2df661bc14143b587d7802f35cbf792e
Author: Seth Chaiklin 
AuthorDate: Thu Jun 16 12:41:29 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jun 16 12:41:29 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'libreoffice-7-4'
  to 1f35f6f69a3e250e24994af78dc64ecfb3573a26
  - tdf#149353 positioning objects in multipage and multicolumn paragraphs

Presented as  in "to paragraph" (shared/01/05260200.xhp),
while only the text is embedded as a paragraph in "to character"
(shared/01/05260300.xhp) because there is already a  on that
page, without much other text.

 added to swriter/guide/anchor_object.xhp that positioning
is only on the page where the anchor is located.

Change-Id: I8173050620fbeb8fc78d747ad05d8ab1f74f1346
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135169
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 
(cherry picked from commit 47bbc1f86ff89ea5b7f6908fc7b1a1b63cb48ca1)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135980

diff --git a/helpcontent2 b/helpcontent2
index 09132b82a4ff..1f35f6f69a3e 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 09132b82a4ff1fc63c275b90b18986e843d745d1
+Subproject commit 1f35f6f69a3e250e24994af78dc64ecfb3573a26

[Libreoffice-commits] help.git: Branch 'libreoffice-7-4' - source/text

 source/text/shared/01/05260200.xhp  |1 +
 source/text/shared/01/05260300.xhp  |1 +
 source/text/swriter/guide/anchor_object.xhp |2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1f35f6f69a3e250e24994af78dc64ecfb3573a26
Author: Seth Chaiklin 
AuthorDate: Wed Jun 1 02:57:41 2022 +0200
Commit: Seth Chaiklin 
CommitDate: Thu Jun 16 12:41:28 2022 +0200

tdf#149353 positioning objects in multipage and multicolumn paragraphs

Presented as  in "to paragraph" (shared/01/05260200.xhp),
while only the text is embedded as a paragraph in "to character"
(shared/01/05260300.xhp) because there is already a  on that
page, without much other text.

 added to swriter/guide/anchor_object.xhp that positioning
is only on the page where the anchor is located.

Change-Id: I8173050620fbeb8fc78d747ad05d8ab1f74f1346
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135169
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 
(cherry picked from commit 47bbc1f86ff89ea5b7f6908fc7b1a1b63cb48ca1)
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135980

diff --git a/source/text/shared/01/05260200.xhp 
b/source/text/shared/01/05260200.xhp
index bebdae88b..ef2b1429b 100644
--- a/source/text/shared/01/05260200.xhp
+++ b/source/text/shared/01/05260200.xhp
@@ -38,6 +38,7 @@
 
   Objects with this 
anchor can be positioned in relation to the page or its text area, as well as 
the paragraph or its text area.
   The anchor 
icon is displayed at the left page margin at the beginning of the 
paragraph.
+When a paragraph 
is used for positioning and the paragraph extends over more than one page or 
column, then positioning options that refer to a paragraph 
area or paragraph text area are applied only to 
the portion of the paragraph in the page or column where the anchor is 
located.
 
 
 
diff --git a/source/text/shared/01/05260300.xhp 
b/source/text/shared/01/05260300.xhp
index 81cc1398e..ca836d1ff 100644
--- a/source/text/shared/01/05260300.xhp
+++ b/source/text/shared/01/05260300.xhp
@@ -36,6 +36,7 @@
 
 
 The character 
immediately before the anchor position is used for positioning in relation to 
the Character region and the Line of 
text reference line.
+
 To align an image, frame, or OLE 
object relative to the anchored character, right-click the object, and choose 
Properties. Click the Position and 
Size tab, and in the Position area, select 
Character in the to boxes.
 
 
diff --git a/source/text/swriter/guide/anchor_object.xhp 
b/source/text/swriter/guide/anchor_object.xhp
index b63866fdd..5bf0970ae 100644
--- a/source/text/swriter/guide/anchor_object.xhp
+++ b/source/text/swriter/guide/anchor_object.xhp
@@ -95,7 +95,7 @@
 
   
 
-
+ Objects can only be positioned on the page 
where their anchor is located.
 
 Moving an Anchor

[Libreoffice-commits] core.git: helpcontent2

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9e0ac0c85fc0fb6011d2b0fc28f3c430bc10317f
Author: Seth Chaiklin 
AuthorDate: Thu Jun 16 12:38:13 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Thu Jun 16 12:38:13 2022 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to a17fbdee73a7f567637c56a1b6354c0fef3b3a10
  - tdf#149353 positioning objects in multipage and multicolumn paragraphs

Presented as  in "to paragraph" (shared/01/05260200.xhp),
while only the text is embedded as a paragraph in "to character"
(shared/01/05260300.xhp) because there is already a  on that
page, without much other text.

 added to swriter/guide/anchor_object.xhp that positioning
is only on the page where the anchor is located.

Change-Id: I8173050620fbeb8fc78d747ad05d8ab1f74f1346
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135169
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 70653442aed4..a17fbdee73a7 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 70653442aed4591284e2f543d74e5309f510ab87
+Subproject commit a17fbdee73a7f567637c56a1b6354c0fef3b3a10

[Libreoffice-commits] help.git: source/text

 source/text/shared/01/05260200.xhp  |1 +
 source/text/shared/01/05260300.xhp  |1 +
 source/text/swriter/guide/anchor_object.xhp |2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit a17fbdee73a7f567637c56a1b6354c0fef3b3a10
Author: Seth Chaiklin 
AuthorDate: Wed Jun 1 02:57:41 2022 +0200
Commit: Seth Chaiklin 
CommitDate: Thu Jun 16 12:38:11 2022 +0200

tdf#149353 positioning objects in multipage and multicolumn paragraphs

Presented as  in "to paragraph" (shared/01/05260200.xhp),
while only the text is embedded as a paragraph in "to character"
(shared/01/05260300.xhp) because there is already a  on that
page, without much other text.

 added to swriter/guide/anchor_object.xhp that positioning
is only on the page where the anchor is located.

Change-Id: I8173050620fbeb8fc78d747ad05d8ab1f74f1346
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/135169
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/shared/01/05260200.xhp 
b/source/text/shared/01/05260200.xhp
index bebdae88b..ef2b1429b 100644
--- a/source/text/shared/01/05260200.xhp
+++ b/source/text/shared/01/05260200.xhp
@@ -38,6 +38,7 @@
 
   Objects with this 
anchor can be positioned in relation to the page or its text area, as well as 
the paragraph or its text area.
   The anchor 
icon is displayed at the left page margin at the beginning of the 
paragraph.
+When a paragraph 
is used for positioning and the paragraph extends over more than one page or 
column, then positioning options that refer to a paragraph 
area or paragraph text area are applied only to 
the portion of the paragraph in the page or column where the anchor is 
located.
 
 
 
diff --git a/source/text/shared/01/05260300.xhp 
b/source/text/shared/01/05260300.xhp
index 81cc1398e..ca836d1ff 100644
--- a/source/text/shared/01/05260300.xhp
+++ b/source/text/shared/01/05260300.xhp
@@ -36,6 +36,7 @@
 
 
 The character 
immediately before the anchor position is used for positioning in relation to 
the Character region and the Line of 
text reference line.
+
 To align an image, frame, or OLE 
object relative to the anchored character, right-click the object, and choose 
Properties. Click the Position and 
Size tab, and in the Position area, select 
Character in the to boxes.
 
 
diff --git a/source/text/swriter/guide/anchor_object.xhp 
b/source/text/swriter/guide/anchor_object.xhp
index b63866fdd..5bf0970ae 100644
--- a/source/text/swriter/guide/anchor_object.xhp
+++ b/source/text/swriter/guide/anchor_object.xhp
@@ -95,7 +95,7 @@
 
   
 
-
+ Objects can only be positioned on the page 
where their anchor is located.
 
 Moving an Anchor

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - 2 commits - sd/uiconfig sw/uiconfig

 sd/uiconfig/simpress/ui/customslideshows.ui |2 +-
 sw/uiconfig/swriter/ui/envformatpage.ui |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aff7d0d0085ce88f01f6e63c6ab066e5f4ac735e
Author: Olivier Hallot 
AuthorDate: Sat Jun 11 15:17:21 2022 -0300
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 12:37:21 2022 +0200

Fix English

Change-Id: I040c8052a4cf0b4a29b967483ec5d77968f80976
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135659
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 
(cherry picked from commit 9c0f9b5eb7c908bb7fa5069e681a2ff5dd7257eb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135953
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sw/uiconfig/swriter/ui/envformatpage.ui 
b/sw/uiconfig/swriter/ui/envformatpage.ui
index bb585cfa67f0..08534a490164 100644
--- a/sw/uiconfig/swriter/ui/envformatpage.ui
+++ b/sw/uiconfig/swriter/ui/envformatpage.ui
@@ -605,7 +605,7 @@
 False
 
   
-Select the 
envelope size that want, or select "User Defined", and then enter the width and 
the height of the custom size.
+Select the 
envelope size that you want, or select "User Defined", and then enter the width 
and the height of the custom size.
   
 
   
commit e629b9b6ec6fe3174794fb4e9ea58f56fef1bfb9
Author: Olivier Hallot 
AuthorDate: Fri Jun 10 15:32:58 2022 -0300
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 12:37:13 2022 +0200

Fix customslideshows.ui extended tip

Change-Id: I72b861144e2634d074e7b6f7f91e27e4875304a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135613
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 
(cherry picked from commit 18408e3405d34e039a642f2039ca8e52a1d7c469)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135952
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 

diff --git a/sd/uiconfig/simpress/ui/customslideshows.ui 
b/sd/uiconfig/simpress/ui/customslideshows.ui
index f2ca42650068..c4f9792ca5c6 100644
--- a/sd/uiconfig/simpress/ui/customslideshows.ui
+++ b/sd/uiconfig/simpress/ui/customslideshows.ui
@@ -51,7 +51,7 @@
 True
 
   
-Runs the 
slide show. Ensure that Use Custom Slide Show is selected if you want to run a 
custom presentation.
+Runs the 
slide show. Ensure that a custom slide show is selected if you want to run a 
custom presentation.

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - cui/uiconfig

 cui/uiconfig/ui/javastartparametersdialog.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fc630f647dc06da5f9d7341db7f3ab3e35015cab
Author: Olivier Hallot 
AuthorDate: Fri Jun 10 16:01:01 2022 -0300
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 12:36:41 2022 +0200

Fix English in extended tip

Change-Id: I753fe8c17a572c734bb4f865c0b9920285849ca3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135623
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit 8e27e5b010d4d98400c97e5575ad77844848d7c7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135974
Reviewed-by: Xisco Fauli 

diff --git a/cui/uiconfig/ui/javastartparametersdialog.ui 
b/cui/uiconfig/ui/javastartparametersdialog.ui
index ec6b490b1f6a..303e67624713 100644
--- a/cui/uiconfig/ui/javastartparametersdialog.ui
+++ b/cui/uiconfig/ui/javastartparametersdialog.ui
@@ -121,7 +121,7 @@
 True
 
   
-Enter a start 
parameter for a JRE as you would on a command line. Click Assign to add the 
parameter to the list of available start parameters.
+Enter a start 
parameter for a JRE as you would on a command line. Click Add to include the 
parameter to the list of available start parameters.

[Libreoffice-commits] core.git: udkapi/com

 udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 68c3a6e8ebcac50aa4f8f403958a42cb8db75355
Author: Andrea Gelmini 
AuthorDate: Tue Jun 14 11:58:05 2022 +0200
Commit: Julien Nabet 
CommitDate: Thu Jun 16 12:33:52 2022 +0200

Fix typo

Change-Id: I92524505c8e7c82bf7c1263afc257f8e6d632ea9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135926
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl 
b/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl
index d5b3ecca4214..0c31c4b53d9c 100644
--- a/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl
+++ b/udkapi/com/sun/star/beans/XTolerantMultiPropertySet.idl
@@ -113,7 +113,7 @@ published interface XTolerantMultiPropertySet : 
com::sun::star::uno::XInterface
 @returns
 a sequence of type
 com::sun::star::beans::GetDirectPropertyTolerantResult
-but only for those properties supplied whoms state is
+but only for those properties supplied whose state is
 com::sun::star::beans::PropertyState::DIRECT_VALUE.
  */
 sequence< com::sun::star::beans::GetDirectPropertyTolerantResult > 
getDirectPropertyValuesTolerant(

[Libreoffice-commits] core.git: offapi/com

 offapi/com/sun/star/awt/MouseEvent.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7c4481e3c41547773db3fa1f53391430cff8d3cb
Author: Andrea Gelmini 
AuthorDate: Tue Jun 14 11:59:47 2022 +0200
Commit: Julien Nabet 
CommitDate: Thu Jun 16 12:33:18 2022 +0200

Fix typo

Change-Id: Ic6252987b61d0f55a96193bdc5da5fecc1a36171
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135930
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/offapi/com/sun/star/awt/MouseEvent.idl 
b/offapi/com/sun/star/awt/MouseEvent.idl
index c0dc2816ffd1..1bac81bc55a0 100644
--- a/offapi/com/sun/star/awt/MouseEvent.idl
+++ b/offapi/com/sun/star/awt/MouseEvent.idl
@@ -36,7 +36,7 @@ published struct MouseEvent: com::sun::star::awt::InputEvent
 
 /** contains the pressed mouse buttons.
 
-Zero ore more constants from the
+Zero or more constants from the
 com::sun::star::awt::MouseButton group.
  */
 short Buttons;

[Libreoffice-commits] core.git: offapi/com

 offapi/com/sun/star/form/binding/ValueBinding.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81d14fa410079bd55397754b1b9af3645df3e100
Author: Andrea Gelmini 
AuthorDate: Tue Jun 14 11:59:25 2022 +0200
Commit: Julien Nabet 
CommitDate: Thu Jun 16 12:18:20 2022 +0200

Fix typo

Change-Id: I38f2e4011f348574d1d2adb7eb34cac6b2df43da
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135929
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/offapi/com/sun/star/form/binding/ValueBinding.idl 
b/offapi/com/sun/star/form/binding/ValueBinding.idl
index 5010ba1f20b4..3562e6d23240 100644
--- a/offapi/com/sun/star/form/binding/ValueBinding.idl
+++ b/offapi/com/sun/star/form/binding/ValueBinding.idl
@@ -77,7 +77,7 @@ service ValueBinding
 
 /** allows life time control for the component
 
-An ValueBinding may be known to one ore more components
+A ValueBinding may be known to one or more components
 supporting the XBindableValue interface, which all work with
 this binding. However, they will not own the ValueBinding.
 The ownership is with another instance, which may also decide to 
obsolete

Re: Accessing main window menus during C++ test run

Hi Colomban,

On Thu, Jun 16, 2022 at 11:55:47AM +0200, Colomban Wendling 
 wrote:
> While as mentioned previously the article didn't really help, I just went
> ahead and tried to exercise the UITest setup for accessing the accessibility
> tree.
> 
> And a little unexpectedly, I there could access all UI elements through the
> accessibility interfaces just as I was trying to in C++.  Does anybody know
> why this works there, and not in my CppUnit tests? Anything I should set up
> differently, await, or else?
> 
> Attached is a small UITest that shows there is everything, and especially
> all menu items.  Now my goal is to get comparable results in CppUnit.

I think the root of the difference is that UITests are out of process:
they start a soffice.bin process (with SAL_USE_VCLPLUGIN=svp, so it's
not visible) and then remote-control it.

Most of our cppunit tests run in-process, using --headless, so if there
would be any dialogs popping up, we would instantly cancel them.

Perhaps you can look at CppunitTest_smoketest, which seems to be a
cppunit test that actually spawns a soffice process?

Regards,

Miklos

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/sdi

 sw/sdi/_textsh.sdi |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 23f506196c616312528cc39620b6267043b76098
Author: Miklos Vajna 
AuthorDate: Thu Jun 16 09:14:04 2022 +0200
Commit: Miklos Vajna 
CommitDate: Thu Jun 16 12:01:32 2022 +0200

sw content controls: allow the properties dialog in read-only sel

Once you enter a checkbox or picture content control, the selection is
read-only to avoid loosing content the next time the content control is
updated. But this means you can't launch the properties dialog to e.g.
enable placeholder mode.

Fix this by relaxing the restriction and allow the properties dialog on
protected cursor as well, matching Word behavior.

(cherry picked from commit 9aeca50f4f0c1b2503a91eb1c7d9ed8a7231e598)

Change-Id: Ifef9af66d077682c46c852c9ecba2df5f17234fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135967
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Miklos Vajna 

diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index d23dedcf9885..84750b937715 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -306,7 +306,6 @@ interface BaseText
 [
 ExecMethod = ExecInsert ;
 StateMethod = GetState ;
-DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 FN_INSERT_COLUMN_BREAK // status(final|play)
 [

Need help with ScLookupCache

2022-06-16 Thread Winfried Donkers


Hi,

I am implementing Excel function XLOOKUP in Calc (at a slow pace), and 
need some help with ScLookupCache.


Am I correct when stating that ScLookupCache currently cannot cope with 
the combinations

 eOp SC_GREATER_EQUAL and sorted in ascending order
and
 eOp SC_LESSER_EQUAL and sorted in descending order?

And if so, can anyone help me in making this possible?

Winfried

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/qa sw/source

2022-06-16 Thread Michael Stahl (via logerrit)

 sw/qa/extras/uiwriter/uiwriter2.cxx |   95 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |4 
 sw/source/core/doc/docedt.cxx   |7 +
 sw/source/core/inc/UndoRedline.hxx  |8 +
 sw/source/core/inc/mvsave.hxx   |2 
 sw/source/core/undo/unredln.cxx |   32 +
 6 files changed, 142 insertions(+), 6 deletions(-)

New commits:
commit 767237c7eace6537098de69083035dd5c322c1e5
Author: Michael Stahl 
AuthorDate: Wed Jun 15 15:08:16 2022 +0200
Commit: Michael Stahl 
CommitDate: Thu Jun 16 11:56:00 2022 +0200

tdf#135976 sw: preserve flys on backspace/delete with redlining enabled

This is a continuation of commit 85376a02348810812d515ee72140dbf56f2b6040
for the case when redlining is turned on.

Also try to restore the anchors in SwUndoRedlineDelete.

(regression from commit 3345feb67f2c49a1b76639965b56968e1c5f03ee)

Change-Id: I4199f5755398d469a606618c037ad9756cb7aeba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135909
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 4b7210b16ce6a817e154de5589a7651cbaf473c9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135935

diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index e62532c0a20d..0ff16f74e59d 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1081,6 +1082,100 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf139982)
 CPPUNIT_ASSERT_EQUAL(size_t(1), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf135976)
+{
+SwDoc* const pDoc = createSwDoc();
+SwWrtShell* const pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+pWrtShell->Insert("foobar");
+
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 2, 
/*bBasicCall=*/false);
+SwFormatAnchor anchor(RndStdIds::FLY_AT_CHAR);
+anchor.SetAnchor(pWrtShell->GetCursor()->GetPoint());
+SfxItemSet flySet(pDoc->GetAttrPool(), svl::Items);
+flySet.Put(anchor);
+SwFrameFormat const* pFly = pWrtShell->NewFlyFrame(flySet, 
/*bAnchValid=*/true);
+CPPUNIT_ASSERT(pFly != nullptr);
+
+// turn on redlining and show changes
+pDoc->getIDocumentRedlineAccess().SetRedlineFlags(RedlineFlags::On | 
RedlineFlags::ShowDelete
+  | 
RedlineFlags::ShowInsert);
+dispatchCommand(mxComponent, ".uno:ShowTrackedChanges", {});
+CPPUNIT_ASSERT_MESSAGE("redlining should be on",
+   pDoc->getIDocumentRedlineAccess().IsRedlineOn());
+CPPUNIT_ASSERT_MESSAGE(
+"redlines should be visible",
+
IDocumentRedlineAccess::IsShowChanges(pDoc->getIDocumentRedlineAccess().GetRedlineFlags()));
+CPPUNIT_ASSERT(pWrtShell->GetLayout()->IsHideRedlines());
+
+CPPUNIT_ASSERT_EQUAL(size_t(1), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
+CPPUNIT_ASSERT_EQUAL(size_t(1), 
pWrtShell->GetLayout()->GetLastPage()->GetSortedObjs()->size());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), 
pFly->GetAnchor().GetContentAnchor()->nContent.GetIndex());
+
+pWrtShell->UnSelectFrame();
+pWrtShell->SttEndDoc(/*bStart=*/false);
+pWrtShell->Left(CRSR_SKIP_CHARS, /*bSelect=*/false, 1, 
/*bBasicCall=*/false);
+
+pWrtShell->DelLeft();
+pWrtShell->DelLeft();
+
+CPPUNIT_ASSERT_EQUAL(size_t(1), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
+// the problem was that the fly was deleted from the layout
+CPPUNIT_ASSERT_EQUAL(size_t(1), 
pWrtShell->GetLayout()->GetLastPage()->GetSortedObjs()->size());
+// check that the anchor was moved outside the redline
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), 
pFly->GetAnchor().GetContentAnchor()->nContent.GetIndex());
+
+pWrtShell->Undo(2);
+
+CPPUNIT_ASSERT_EQUAL(size_t(1), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
+CPPUNIT_ASSERT_EQUAL(size_t(1), 
pWrtShell->GetLayout()->GetLastPage()->GetSortedObjs()->size());
+// check that the anchor was restored
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), 
pFly->GetAnchor().GetContentAnchor()->nContent.GetIndex());
+
+pWrtShell->Redo(2);
+
+CPPUNIT_ASSERT_EQUAL(size_t(1), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
+CPPUNIT_ASSERT_EQUAL(size_t(1), 
pWrtShell->GetLayout()->GetLastPage()->GetSortedObjs()->size());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), 
pFly->GetAnchor().GetContentAnchor()->nContent.GetIndex());
+
+pWrtShell->Undo(2);
+
+CPPUNIT_ASSERT_EQUAL(size_t(1), pWrtShell->GetFlyCount(FLYCNTTYPE_FRM));
+CPPUNIT_ASSERT_EQUAL(size_t(1), 
pWrtShell->GetLayout()->GetLastPage()->GetSortedObjs()->size());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4), 
pFly->GetAnchor().GetContentAnchor()->nContent.GetIndex());
+
+// now again in the other directio

Re: Accessing main window menus during C++ test run

2022-06-16 Thread Colomban Wendling


Hello,

Le 26/05/2022 à 10:11, Xisco Fauli a écrit :
The UItest framework [1] uses UNO commands to interact with the UI. 
However, Markus also evaluated the accessibility approach when he 
implemented it. You can read more in 
https://mmohrhard.wordpress.com/2016/09/07/ui-testing-in-libreoffice/. I 
hope it helps.


While as mentioned previously the article didn't really help, I just 
went ahead and tried to exercise the UITest setup for accessing the 
accessibility tree.


And a little unexpectedly, I there could access all UI elements through 
the accessibility interfaces just as I was trying to in C++.  Does 
anybody know why this works there, and not in my CppUnit tests? 
Anything I should set up differently, await, or else?


Attached is a small UITest that shows there is everything, and 
especially all menu items.  Now my goal is to get comparable results in 
CppUnit.


Thanks in advance,
Colomban# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
#
# This file is part of the LibreOffice project.
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#

from uitest.framework import UITestCase

from com.sun.star.accessibility import AccessibleRole


def getRoleName(role):
''' Map an AccessibleRole value to its name '''
for name in dir(AccessibleRole):
if getattr(AccessibleRole, name) == role:
return name
return None

class TestAccessibleTree(UITestCase):
def testTree(self):
with self.ui_test.create_doc_in_start_center("writer") as component:
w = component.getCurrentController().getFrame().getContainerWindow()
w.toFront()

def rec(o, d=0):
print("% *s%s" % (d * 2, '', getRoleName(o.getAccessibleRole(
for i in range(0, o.getAccessibleChildCount()):
c = o.getAccessibleChild(i)
rec(c.getAccessibleContext(), d + 1)

ctx = w.getAccessibleContext()

rec(ctx)
# check the menu (ctx[0]) has children
self.assertGreaterEqual(ctx.getAccessibleChild(0).getAccessibleContext().getAccessibleChildCount(), 1)

# vim: set shiftwidth=4 softtabstop=4 expandtab:

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/source

2022-06-16 Thread Michael Stahl (via logerrit)

 sw/source/core/doc/DocumentRedlineManager.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 5e0443c29daaf31d41cd162544b601b9753b8199
Author: Michael Stahl 
AuthorDate: Tue Jun 14 17:19:23 2022 +0200
Commit: Michael Stahl 
CommitDate: Thu Jun 16 11:55:14 2022 +0200

sw_redlinehide: skip unnecessary updates when undoing redlined delete

When reproducing tdf#135976 and then Undo, an UAF crash happens here:

  assert(!pFrame->GetDrawObjs() || !pObjs->Contains(*pObj));

The pObjs was actually deleted and then re-created, because the pObj was
removed from the frame and added again to the same frame.

This is a bit unexpected, so prevent it by taking a shortcut in the
caller UpdateFramesForRemoveDeleteRedline() to insert a check that had
been removed in commit 14e87a4b15d31a34e6053f6194688f3aa23af991.

If the rPam is inside a single node, the sw::RedlineUnDelText hint that
was sent to the SwTextFrame should be sufficient to update it and the
rest of the code in the loop that deals with newly split paragraph can
be skipped.

Change-Id: I5f36eb91bc20003887ee0bad03ea4a6e67135de9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135907
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 8334d280a3e250fc7f327d3638f40a330ea3944c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135891

diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx 
b/sw/source/core/doc/DocumentRedlineManager.cxx
index c2ddb046ef8b..8a9a70ae2bb9 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -309,6 +309,12 @@ void UpdateFramesForRemoveDeleteRedline(SwDoc & rDoc, 
SwPaM const& rPam)
 break;
 }
 
+// no nodes can be unmerged by this - skip MakeFrames() etc.
+if (rPam.GetPoint()->nNode == rPam.GetMark()->nNode)
+{
+break; // continue with AppendAllObjs()
+}
+
 // first, call CheckParaRedlineMerge on the first paragraph,
 // to init flag on new merge range (if any) + 1st node post the 
merge
 auto eMode(sw::FrameMode::Existing);

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - sw/uiconfig

 sw/uiconfig/swriter/ui/splittable.ui |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ef827552d4fd48bdc6911222ed0f262091a4ffb
Author: Olivier Hallot 
AuthorDate: Mon Jun 13 12:37:10 2022 -0300
Commit: Xisco Fauli 
CommitDate: Thu Jun 16 11:46:51 2022 +0200

Improve extended tip in splittable.ui

Change-Id: Ie29092ed3a37cfd6bd0c95148a3edc5559ac260f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135763
Tested-by: Jenkins
Reviewed-by: Olivier Hallot 
(cherry picked from commit e726dcccabf0be4b880c6ddfaf0130dfd86aeb9f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135888
Reviewed-by: Xisco Fauli 

diff --git a/sw/uiconfig/swriter/ui/splittable.ui 
b/sw/uiconfig/swriter/ui/splittable.ui
index 97d2c1766d8c..839dab9e7560 100644
--- a/sw/uiconfig/swriter/ui/splittable.ui
+++ b/sw/uiconfig/swriter/ui/splittable.ui
@@ -138,7 +138,7 @@
 copyheading
 
   
-Inserts an 
additional blank row in the second table.
+Inserts an 
additional header row in the second table.

[Libreoffice-commits] core.git: sw/CppunitTest_sw_ww8export.mk

2022-06-16 Thread Stephan Bergmann (via logerrit)

 sw/CppunitTest_sw_ww8export.mk |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 4b46eb79c2f242e97249ace16b1fc57335574c95
Author: Stephan Bergmann 
AuthorDate: Thu Jun 16 08:59:26 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Jun 16 11:27:22 2022 +0200

Missing test dependencies

> warn:vcl.builder:4159485:4159485:vcl/source/window/builder.cxx:479: 
DBG_UNHANDLED_EXCEPTION in VclBuilder
> when: Unable to read .ui file exception: 
com.sun.star.container.NoSuchElementException message: 
"file:///.../instdir/share/config/soffice.cfg/svt/ui/editcontrol.ui"
> warn:vcl.builder:4159485:4159485:vcl/source/window/builder.cxx:479: 
DBG_UNHANDLED_EXCEPTION in VclBuilder
> when: Unable to read .ui file exception: 
com.sun.star.container.NoSuchElementException message: 
"file:///.../instdir/share/config/soffice.cfg/modules/swriter/ui/annotation.ui"

and

> warn:vcl.builder:4164787:4164787:vcl/source/window/builder.cxx:479: 
DBG_UNHANDLED_EXCEPTION in VclBuilder
> when: Unable to read .ui file exception: 
com.sun.star.container.NoSuchElementException message: 
"file:///.../instdir/share/config/soffice.cfg/sfx/ui/tabbar.ui"

when building CppunitTest_sw_ww8export
CPPUNIT_TEST_NAME=testCommentExport::Load_Verify_Reload_Verify from scratch

Change-Id: I36eedd31c8ee55f2992cb1aec3b26cfdbc4e2a27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135964
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/sw/CppunitTest_sw_ww8export.mk b/sw/CppunitTest_sw_ww8export.mk
index 81e8eac2273d..306337889cc9 100644
--- a/sw/CppunitTest_sw_ww8export.mk
+++ b/sw/CppunitTest_sw_ww8export.mk
@@ -12,4 +12,10 @@
 # empty second argument (i.e. no 1)
 $(eval $(call sw_ww8export_test,))
 
+$(eval $(call gb_CppunitTest_use_uiconfigs,sw_ww8export, \
+modules/swriter \
+sfx \
+svt \
+))
+
 # vim: set noet sw=4 ts=4:

[Libreoffice-commits] core.git: svl/source