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

[Julien Nabet (via logerrit)]

 cui/source/tabpages/tparea.cxx |7 ++-
 reportdesign/source/ui/report/ReportController.cxx |   44 ++---
 2 files changed, 28 insertions(+), 23 deletions(-)

New commits:
commit a350ecc0f048199ddbcbd78d7fc32aac279cdbdc
Author: Julien Nabet 
AuthorDate: Sun Oct 2 19:51:01 2022 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Oct 6 08:41:29 2022 +0200

tdf#151260: crash in SfxItemPool::SetDefaults 
(reportdesign/ReportController)

+ deal with the case when there's no XATTR_FILLUSESLIDEBACKGROUND (like 
here)

Change-Id: I2a480eea69aa88d45b3485d7f6d4448816e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140894
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 07aa8138db9bbaf222f2b7cea12a9f7d0a8192d7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140886
Reviewed-by: Xisco Fauli 
(cherry picked from commit df897d6f962dc869de60951c7352b22f1b405edd)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140954
Reviewed-by: Michael Stahl 
Tested-by: Samuel Mehrbrodt 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 119d6d154076..bbdb9733a02f 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -238,8 +238,11 @@ DeactivateRC SvxAreaTabPage::DeactivatePage( SfxItemSet* 
_pSet )
 {
 XFillStyleItem aStyleItem( drawing::FillStyle_NONE );
 _pSet->Put( aStyleItem );
-XFillUseSlideBackgroundItem aFillBgItem( false );
-_pSet->Put( aFillBgItem );
+if (_pSet->HasItem(XATTR_FILLUSESLIDEBACKGROUND))
+{
+XFillUseSlideBackgroundItem aFillBgItem( false );
+_pSet->Put( aFillBgItem );
+}
 }
 break;
 }
diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index 7f20a0040c6e..82edfba92403 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -150,7 +150,9 @@
 #define RPTUI_ID_START  XATTR_FILL_FIRST - 3
 #define RPTUI_ID_ENDXATTR_FILL_FIRST - 2
 #define RPTUI_ID_BRUSH  TypedWhichId(XATTR_FILL_FIRST - 1)
-#define RPTUI_ID_METRIC XATTR_FILL_LAST + 1
+/// Note that we deliberately overlap an existing item id, so that we can have 
contiguous item ids for
+/// the static defaults.
+#define RPTUI_ID_METRIC XATTR_FILL_LAST
 
 using namespace ::com::sun::star;
 using namespace uno;
@@ -2336,26 +2338,26 @@ void OReportController::openPageDialog(const 
uno::Reference& _
 { SID_PAPER_START,  true },
 { SID_PAPER_END,true },
 { SID_ATTR_BRUSH,   true },
-{ XATTR_FILLSTYLE,  true },
-{ XATTR_FILLCOLOR,  true },
-{ XATTR_FILLGRADIENT,   true },
-{ XATTR_FILLHATCH,  true },
-{ XATTR_FILLBITMAP, true },
-{ XATTR_FILLTRANSPARENCE,   true },
-{ XATTR_GRADIENTSTEPCOUNT,  true },
-{ XATTR_FILLBMP_TILE,   true },
-{ XATTR_FILLBMP_POS,true },
-{ XATTR_FILLBMP_SIZEX,  true },
-{ XATTR_FILLBMP_SIZEY,  true },
-{ XATTR_FILLFLOATTRANSPARENCE,  true },
-{ XATTR_SECONDARYFILLCOLOR, true },
-{ XATTR_FILLBMP_SIZELOG,true },
-{ XATTR_FILLBMP_TILEOFFSETX,true },
-{ XATTR_FILLBMP_TILEOFFSETY,true },
-{ XATTR_FILLBMP_STRETCH,true },
-{ XATTR_FILLBMP_POSOFFSETX, true },
-{ XATTR_FILLBMP_POSOFFSETY, true },
-{ XATTR_FILLBACKGROUND, true },
+{ 0,  true }, // XATTR_FILLSTYLE
+{ 0,  true }, // XATTR_FILLCOLOR
+{ 0,   true }, // XATTR_FILLGRADIENT
+{ 0,  true }, // XATTR_FILLHATCH
+{ 0, true }, // XATTR_FILLBITMAP
+{ 0,   true }, // XATTR_FILLTRANSPARENCE
+{ 0,  true }, // XATTR_GRADIENTSTEPCOUNT
+{ 0,   true }, // XATTR_FILLBMP_TILE
+{ 0,true }, // XATTR_FILLBMP_POS
+{ 0,  true }, // XATTR_FILLBMP_SIZEX
+{ 0,  true }, // XATTR_FILLBMP_SIZEY
+{ 0,  true }, // XATTR_FILLFLOATTRANSPARENCE
+{ 0, true }, // XATTR_SECONDARYFILLCOLOR
+{ 0,true }, // XATTR_FILLBMP_SIZELOG
+{ 0,true }, // XATTR_FILLBMP_TILEOFFSETX
+{ 0,true }, // XATTR_FILLBMP_TILEOFFSETY
+{ 0,true }, // XATTR_FILLBMP_STRETCH
+{ 0, true }, // XATTR_FILLBMP_POSOFFSETX
+{ 0, true }, // XATTR_FILLBMP_POSOFFSETY
+{ 0, true }, // XATTR_FILLBACKGROUND
 { SID_ATTR_METRIC,  true }
 };
 

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

[Rafael Lima (via logerrit)]

 svtools/source/control/tabbar.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 1045aeecb20aeefd7f6181288853f9a89305c9ba
Author: Rafael Lima 
AuthorDate: Sat Oct 1 00:38:46 2022 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Oct 6 06:45:08 2022 +0200

tdf#148938 Fix position arrows when dragging Calc tabs in dark mode

In Calc, when you drag a tab to move it, the arrows pointing to where the 
tab will be positioned are always in black, even in dark mode.

This patch fixes this issue.

Change-Id: I9079099c5ac1a8fb767eaa105cf8863e54d0ec3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140760
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/svtools/source/control/tabbar.cxx 
b/svtools/source/control/tabbar.cxx
index 700c1c37767b..1e9a9172967f 100644
--- a/svtools/source/control/tabbar.cxx
+++ b/svtools/source/control/tabbar.cxx
@@ -2331,7 +2331,8 @@ sal_uInt16 TabBar::ShowDropPos(const Point& rPos)
 }
 
 // draw drop position arrows
-Color aBlackColor(COL_BLACK);
+const StyleSettings& rStyles = 
Application::GetSettings().GetStyleSettings();
+const Color aTextColor = rStyles.GetLabelTextColor();
 tools::Long nX;
 tools::Long nY = (maWinSize.Height() / 2) - 1;
 sal_uInt16 nCurPos = GetPagePos(mnCurPageId);
@@ -2340,8 +2341,8 @@ sal_uInt16 TabBar::ShowDropPos(const Point& rPos)
 
 if (mnDropPos < nItemCount)
 {
-GetOutDev()->SetLineColor(aBlackColor);
-GetOutDev()->SetFillColor(aBlackColor);
+GetOutDev()->SetLineColor(aTextColor);
+GetOutDev()->SetFillColor(aTextColor);
 
 auto& rItem = mpImpl->maItemList[mnDropPos];
 nX = rItem.maRect.Left();
@@ -2364,8 +2365,8 @@ sal_uInt16 TabBar::ShowDropPos(const Point& rPos)
 }
 if (mnDropPos > 0 && mnDropPos < nItemCount + 1)
 {
-GetOutDev()->SetLineColor(aBlackColor);
-GetOutDev()->SetFillColor(aBlackColor);
+GetOutDev()->SetLineColor(aTextColor);
+GetOutDev()->SetFillColor(aTextColor);
 
 auto& rItem = mpImpl->maItemList[mnDropPos - 1];
 nX = rItem.maRect.Right();

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

[Caolán McNamara (via logerrit)]

 cui/source/customize/acccfg.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 80657dca762151da47bec567c0a72786a6da61f9
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 16:41:20 2022 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Oct 6 04:43:53 2022 +0200

Resolves: tdf#130529 reduce height of customize dialog

to fit in 768px height (with default UI font size)

Change-Id: I2359e39205e7c13335a7ed266dd367cf45e5dcb8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140965
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 2bfabb5178ea..080cab98164a 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -851,16 +851,16 @@ 
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(weld::Container* pPage,
 , m_xResetButton(m_xBuilder->weld_button("reset"))
 {
 Size aSize(m_xEntriesBox->get_approximate_digit_width() * 40,
-   m_xEntriesBox->get_height_rows(12));
+   m_xEntriesBox->get_height_rows(10));
 m_xEntriesBox->set_size_request(aSize.Width(), aSize.Height());
 aSize = Size(m_xEntriesBox->get_approximate_digit_width() * 19,
- m_xEntriesBox->get_height_rows(10));
+ m_xEntriesBox->get_height_rows(9));
 m_xGroupLBox->set_size_request(aSize.Width(), aSize.Height());
 aSize = Size(m_xEntriesBox->get_approximate_digit_width() * 21,
- m_xEntriesBox->get_height_rows(10));
+ m_xEntriesBox->get_height_rows(9));
 m_xFunctionBox->set_size_request(aSize.Width(), aSize.Height());
 aSize = Size(m_xEntriesBox->get_approximate_digit_width() * 20,
- m_xEntriesBox->get_height_rows(10));
+ m_xEntriesBox->get_height_rows(9));
 m_xKeyBox->set_size_request(aSize.Width(), aSize.Height());
 
 // install handler functions

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/control/dbtreelistbox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4cad7711c35091e90515c446b4cae43c07ab4d90
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 16:11:44 2022 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Oct 6 04:42:37 2022 +0200

Resolves: tdf#149277 we don't want to search the whole tree for dups

just the immediate children of the supplied parent node

Change-Id: I79595fd940257615f0d012cb9a4556aea51d7db9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140964
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx 
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 2fd21fac1318..8ad535edb185 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -199,7 +199,7 @@ std::unique_ptr 
TreeListBox::GetEntryPosByName(std::u16string_vi
 return xEntry;
 }
 }
-} while (m_xTreeView->iter_next(*xEntry));
+} while (m_xTreeView->iter_next_sibling(*xEntry));
 
 return nullptr;
 }

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/control/dbtreelistbox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 98a35a2fdbd0de9afedc48812d9821dc0305f575
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 16:11:44 2022 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Oct 6 04:42:43 2022 +0200

Resolves: tdf#149277 we don't want to search the whole tree for dups

just the immediate children of the supplied parent node

Change-Id: I79595fd940257615f0d012cb9a4556aea51d7db9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140963
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx 
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 472171142368..09ca5b466715 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -199,7 +199,7 @@ std::unique_ptr 
TreeListBox::GetEntryPosByName(std::u16string_vi
 return xEntry;
 }
 }
-} while (m_xTreeView->iter_next(*xEntry));
+} while (m_xTreeView->iter_next_sibling(*xEntry));
 
 return nullptr;
 }

[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-4+backports' - sw/qa xmloff/source

[Mike Kaganski (via logerrit)]

 sw/qa/extras/odfexport/data/tdf151100.docx |binary
 sw/qa/extras/odfexport/odfexport.cxx   |   15 +++
 xmloff/source/draw/shapeexport.cxx |   15 ---
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 140776885c14c667717918c0405744e98a893797
Author: Mike Kaganski 
AuthorDate: Wed Sep 21 11:11:47 2022 +0300
Commit: Thorsten Behrens 
CommitDate: Thu Oct 6 01:31:59 2022 +0200

tdf#151100: xText->getString() may be empty for content needing export

The check that is removed prevents collecting the table data.
Assume that it's the performance optimization, and that processing
empty text objects would be fast anyway.

This basically reverts commit 73fcb052edf1a21d785583bc53e8b4323b577bb1
  Author Christian Lippka 
  Date   Thu Nov 22 12:26:35 2001 +
#90330# only export text autostyles for shapes with text

and commit 7661bbbaef31adfdb298b1447301b24a70f85834
  Author Michael Stahl 
  Date   Fri Nov 25 22:46:34 2016 +0100
tdf#102479 ODF export: ignore exceptions when checking shape text

that becomes unnecessary after the former change is reverted.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140313
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140352
Tested-by: Jenkins
(cherry picked from commit 226b1c2006e936e4b32748b810624c5d655c4a98)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140378
Reviewed-by: Michael Stahl 
(cherry picked from commit d194474aabd699806cb3631bc8641dd0548b8026)

Change-Id: I709a7b4c5ac1cc0621d3a1b18f2eb74feb987efb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140951
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/sw/qa/extras/odfexport/data/tdf151100.docx 
b/sw/qa/extras/odfexport/data/tdf151100.docx
new file mode 100644
index ..e0341bdb9c8c
Binary files /dev/null and b/sw/qa/extras/odfexport/data/tdf151100.docx differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index dbff5a0327fc..7aec212ac157 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -99,6 +99,21 @@ public:
 }
 };
 
+CPPUNIT_TEST_FIXTURE(Test, tdf151100)
+{
+// Similar to tdf135942
+
+load(mpTestDocumentPath, "tdf151100.docx");
+reload(mpFilter, "tdf151100.docx");
+// All table autostyles should be collected, including nested, and must 
not crash.
+
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+
+xmlDocPtr pXmlDoc = parseExport("styles.xml");
+
+assertXPath(pXmlDoc, 
"/office:document-styles/office:automatic-styles/style:style[@style:family='table']",
 1);
+}
+
 DECLARE_ODFEXPORT_TEST(testMathObjectFlatExport, "2_MathType3.docx")
 {
 uno::Reference xModifiable(mxComponent, uno::UNO_QUERY);
diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 14ec1ca6f4d0..8af3de729146 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -303,22 +303,7 @@ void XMLShapeExport::collectShapeAutoStyles(const 
uno::Reference< drawing::XShap
 if( xPropSet.is() && bObjSupportsText )
 {
 uno::Reference< text::XText > xText(xShape, uno::UNO_QUERY);
-bool bSkip = false;
 if (xText.is())
-{
-try
-{
-bSkip = xText->getString().isEmpty();
-}
-catch (uno::RuntimeException const&)
-{
-// tdf#102479: SwXTextFrame that contains only a table will
-// throw, but the table must be iterated so that
-// SwXMLExport::ExportTableLines() can find its auto styles
-// so do not skip it!
-}
-}
-if (!bSkip)
 {
 uno::Reference< beans::XPropertySetInfo > xPropSetInfo( 
xPropSet->getPropertySetInfo() );
 

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

[Khaled Hosny (via logerrit)]

 vcl/qa/cppunit/pdfexport/pdfexport.cxx |   54 +
 vcl/source/gdi/CommonSalLayout.cxx |6 ---
 2 files changed, 22 insertions(+), 38 deletions(-)

New commits:
commit 09c076c3f29c28497f162d3a5b7baab040725d56
Author: Khaled Hosny 
AuthorDate: Wed Oct 5 21:00:46 2022 +0200
Commit: خالد حسني 
CommitDate: Wed Oct 5 22:08:08 2022 +0200

tdf#151350: Fix extraneous gaps before marks

After latest changes we no longer need HarfBuzz buffer level
MONOTONE_CHARACTERS (which was needed to allow us to address individual
combining marks). With the default cluster level, combining marks get
the same cluster as their base and so we need not do any thing special.

I had to update testTdf139627 because this results in using ActualText
spans in the PDF, and PDFium support for them is lacking.

Change-Id: I0011072330fdbf409c30ff781fd3beaceae400f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140994
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/vcl/qa/cppunit/pdfexport/pdfexport.cxx 
b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
index 88139dd0ecd4..b8efd4c5dc6e 100644
--- a/vcl/qa/cppunit/pdfexport/pdfexport.cxx
+++ b/vcl/qa/cppunit/pdfexport/pdfexport.cxx
@@ -3621,10 +3621,10 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testBitmapScaledown)
 CPPUNIT_ASSERT_EQUAL(2616, nWidth);
 }
 }
-} // end anonymous namespace
 
 CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf139627)
 {
+#if HAVE_MORE_FONTS
 aMediaDescriptor["FilterName"] <<= OUString("writer_pdf_Export");
 saveAsPDF(u"justified-arabic-kashida.odt");
 std::unique_ptr pPdfDocument = parseExport();
@@ -3635,20 +3635,19 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf139627)
 std::unique_ptr pPdfPage = 
pPdfDocument->openPage(/*nIndex=*/0);
 CPPUNIT_ASSERT(pPdfPage);
 
-// 7 or 8 objects, 4 text, others are path
+// 7 objects, 3 text, others are path
 int nPageObjectCount = pPdfPage->getObjectCount();
-CPPUNIT_ASSERT_GREATEREQUAL(7, nPageObjectCount);
+CPPUNIT_ASSERT_EQUAL(7, nPageObjectCount);
 
-// 4 text objects, "رم" (reh+mim), then "ِ" (kasreh), tatweel, and "ج" 
(jeh)
-OUString sText[4];
+// 3 text objects
+OUString sText[3];
 
 /* With "Noto Sans Arabic" font, these are the X ranges on Linux:
-0: ( 61.75 - 218.35)
-1: (479.70 - 520.02)
-2: (209.40 - 457.08)
-3: (447.80 - 546.62)
+0: ( 61.75 - 415.94)
+1: (479.70 - 422.40)
+2: (209.40 - 453.2)
 */
-basegfx::B2DRectangle aRect[4];
+basegfx::B2DRectangle aRect[3];
 
 std::unique_ptr pTextPage = 
pPdfPage->getTextPage();
 std::unique_ptr pPageObject;
@@ -3665,47 +3664,38 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest, testTdf139627)
 ++nTextObjectCount;
 }
 }
-CPPUNIT_ASSERT_EQUAL(4, nTextObjectCount);
+CPPUNIT_ASSERT_EQUAL(3, nTextObjectCount);
 
 // Text: جِـرم (which means "mass" in Persian)
-// Rendered as (left to right): "reh + mim" - "tatweel" - "kasreh" - "jeh"
-int rehmim = 0, kasreh = 1, tatweel = 2, jeh = 3;
-
-// Bad rendering can cause tatweel enumerated before kasreh
-// This can be the end of journey, but let's accept this for now
-if (sText[2].equals(u"ِ"))
-{
-tatweel = 1;
-kasreh = 2;
-}
+// Rendered as (left to right): "reh + mim" - "kasreh" - "jeh + tatweel"
+int rehmim = 0, kasreh = 1, jehtatweel = 2;
 
 CPPUNIT_ASSERT_EQUAL(OUString(u"رم"), sText[rehmim].trim());
-CPPUNIT_ASSERT_EQUAL(OUString(u"ِ"), sText[kasreh].trim());
-CPPUNIT_ASSERT_EQUAL(OUString(u""), sText[tatweel].trim());
-CPPUNIT_ASSERT_EQUAL(OUString(u"ج"), sText[jeh].trim());
+CPPUNIT_ASSERT_EQUAL(OUString(u""), sText[kasreh].trim());
+CPPUNIT_ASSERT_EQUAL(OUString(u""), sText[jehtatweel].trim());
 
 // "Kasreh" should be within "jeh" character
-CPPUNIT_ASSERT_GREATER(aRect[jeh].getMinX(), aRect[kasreh].getMinX());
-CPPUNIT_ASSERT_LESS(aRect[jeh].getMaxX(), aRect[kasreh].getMaxX());
+CPPUNIT_ASSERT_GREATER(aRect[jehtatweel].getMinX(), 
aRect[kasreh].getMinX());
+CPPUNIT_ASSERT_LESS(aRect[jehtatweel].getMaxX(), aRect[kasreh].getMaxX());
 
 // "Tatweel" should cover "jeh" and "reh"+"mim" to avoid gap
 // Checking right gap
-CPPUNIT_ASSERT_GREATER(aRect[jeh].getMinX(), aRect[tatweel].getMaxX());
+//CPPUNIT_ASSERT_GREATER(aRect[jehtatweel].getMinX(), 
aRect[tatweel].getMaxX());
 // Checking left gap
 // Kashida fails to reach to rehmim before the series of patches starting
 // with 3901e029bd39575f700e69a73818565d62226a23. The visible symptom is
 // a gap in the left of Kashida.
-// CPPUNIT_ASSERT_LESS(aRect[rehmim].getMaxX(), aRect[tatweel].getMinX());
+CPPUNIT_ASSERT_LESS(aRect[rehmim].getMaxX(), aRect[jehtatweel].getMinX());
 
 // Overlappings of Kashida and surrounding characters is ~9% of the width
 // of the "jeh" characte

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

[Caolán McNamara (via logerrit)]

 svx/source/svdraw/svdotextdecomposition.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7097d951e56ef241f4535514280c76ceb7f08d1e
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 19:40:07 2022 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 21:27:57 2022 +0200

I suspect the sizes are not enraged

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

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index f5955eb7d869..220a8549bbaf 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -759,7 +759,7 @@ void SdrTextObj::impDecomposeAutoFitTextPrimitive(
 rOutliner.SetMinAutoPaperSize(aNullSize);
 rOutliner.SetMaxAutoPaperSize(Size(100,100));
 
-// add one to rage sizes to get back to the old Rectangle and outliner 
measurements
+// add one to range sizes to get back to the old Rectangle and outliner 
measurements
 const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1));
 const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 
1));
 const OutlinerParaObject* pOutlinerParaObject = 
rSdrAutofitTextPrimitive.getSdrText()->GetOutlinerParaObject();
@@ -948,7 +948,7 @@ void SdrTextObj::impDecomposeBlockTextPrimitive(
 Color aOriginalBackColor(rOutliner.GetBackgroundColor());
 setSuitableOutlinerBg(rOutliner);
 
-// add one to rage sizes to get back to the old Rectangle and outliner 
measurements
+// add one to range sizes to get back to the old Rectangle and outliner 
measurements
 const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1));
 const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 
1));
 const bool 
bVerticalWriting(rSdrBlockTextPrimitive.getOutlinerParaObject().IsEffectivelyVertical());
@@ -1557,7 +1557,7 @@ void SdrTextObj::impDecomposeChainedTextPrimitive(
 rOutliner.SetMinAutoPaperSize(aNullSize);
 rOutliner.SetMaxAutoPaperSize(Size(100,100));
 
-// add one to rage sizes to get back to the old Rectangle and outliner 
measurements
+// add one to range sizes to get back to the old Rectangle and outliner 
measurements
 const sal_uInt32 nAnchorTextWidth(FRound(aAnchorTextRange.getWidth() + 1));
 const sal_uInt32 nAnchorTextHeight(FRound(aAnchorTextRange.getHeight() + 
1));
 

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

[Caolán McNamara (via logerrit)]

 cui/source/customize/acccfg.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit d23b1d0240e8ca4a33fbd4fcd368c4ece7b8866a
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 16:41:20 2022 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 20:15:16 2022 +0200

Resolves: tdf#130529 reduce height of customize dialog

to fit in 768px height (with default UI font size)

Change-Id: I2359e39205e7c13335a7ed266dd367cf45e5dcb8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140988
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 491fc7647acf..1a37964fb8c8 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -859,16 +859,16 @@ 
SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(weld::Container* pPage,
 , m_xResetButton(m_xBuilder->weld_button("reset"))
 {
 Size aSize(m_xEntriesBox->get_approximate_digit_width() * 40,
-   m_xEntriesBox->get_height_rows(12));
+   m_xEntriesBox->get_height_rows(10));
 m_xEntriesBox->set_size_request(aSize.Width(), aSize.Height());
 aSize = Size(m_xEntriesBox->get_approximate_digit_width() * 19,
- m_xEntriesBox->get_height_rows(10));
+ m_xEntriesBox->get_height_rows(9));
 m_xGroupLBox->set_size_request(aSize.Width(), aSize.Height());
 aSize = Size(m_xEntriesBox->get_approximate_digit_width() * 21,
- m_xEntriesBox->get_height_rows(10));
+ m_xEntriesBox->get_height_rows(9));
 m_xFunctionBox->set_size_request(aSize.Width(), aSize.Height());
 aSize = Size(m_xEntriesBox->get_approximate_digit_width() * 20,
- m_xEntriesBox->get_height_rows(10));
+ m_xEntriesBox->get_height_rows(9));
 m_xKeyBox->set_size_request(aSize.Width(), aSize.Height());
 
 // install handler functions

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

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/control/dbtreelistbox.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6aaeeb5a2a0cd7bc8c511c1bf7515e0943940797
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 16:11:44 2022 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 20:14:37 2022 +0200

Resolves: tdf#149277 we don't want to search the whole tree for dups

just the immediate children of the supplied parent node

Change-Id: I79595fd940257615f0d012cb9a4556aea51d7db9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140986
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx 
b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 1dd94c35ee4f..24c9a83d2190 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -200,7 +200,7 @@ std::unique_ptr 
TreeListBox::GetEntryPosByName(std::u16string_vi
 return xEntry;
 }
 }
-} while (m_xTreeView->iter_next(*xEntry));
+} while (m_xTreeView->iter_next_sibling(*xEntry));
 
 return nullptr;
 }

[Libreoffice-commits] core.git: cui/source include/svx svx/source

[Eike Rathke (via logerrit)]

 cui/source/tabpages/chardlg.cxx |   43 ---
 include/svx/langbox.hxx |2 -
 svx/source/dialog/langbox.cxx   |   63 ++--
 3 files changed, 75 insertions(+), 33 deletions(-)

New commits:
commit 1ea19958d6fed38513b1983599c2c43ad76aae61
Author: Eike Rathke 
AuthorDate: Wed Oct 5 19:21:36 2022 +0200
Commit: Eike Rathke 
CommitDate: Wed Oct 5 20:07:36 2022 +0200

Add on-the-fly language tag to proper language list Western/Asian/Complex

In which combobox wherever it was added, the correct SfxItem will
be updated and at least when switching to another dialog tab and
back it will appear in the correct list.
(shouldn't tabbing out of the combobox already trigger that?)

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

diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 226fe846ee3d..e34eca07485c 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1062,31 +1062,40 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& 
rSet, LanguageGroup eLangGrp
 case Asian : nSlot = SID_ATTR_CHAR_CJK_LANGUAGE; break;
 case Ctl : nSlot = SID_ATTR_CHAR_CTL_LANGUAGE; break;
 }
-nWhich = GetWhich( nSlot );
-pOld = GetOldItem( rSet, nSlot );
 
 // For language list boxes acting as ComboBox, check for, add and select an
 // edited entry.
-if (pLangBox == m_xWestFontLanguageLB.get())
+switch (pLangBox->GetEditedAndValid())
 {
-switch (pLangBox->GetEditedAndValid())
-{
-case SvxLanguageBox::EditedAndValid::No:
-;   // nothing to do
-break;
-case SvxLanguageBox::EditedAndValid::Valid:
+case SvxLanguageBox::EditedAndValid::No:
+;   // nothing to do
+break;
+case SvxLanguageBox::EditedAndValid::Valid:
+{
+SvxLanguageBox* ppBoxes[3]
+= {m_xWestFontLanguageLB.get(), 
m_xEastFontLanguageLB.get(), m_xCTLFontLanguageLB.get()};
+SvxLanguageBox* pBox = pLangBox->SaveEditedAsEntry(ppBoxes);
+if (pBox != pLangBox)
 {
-const int nPos = pLangBox->SaveEditedAsEntry();
-if (nPos != -1)
-pLangBox->set_active(nPos);
+// Get item from corresponding slot.
+if (pBox == m_xWestFontLanguageLB.get())
+nSlot = SID_ATTR_CHAR_LANGUAGE;
+else if (pBox == m_xEastFontLanguageLB.get())
+nSlot = SID_ATTR_CHAR_CJK_LANGUAGE;
+else if (pBox == m_xCTLFontLanguageLB.get())
+nSlot = SID_ATTR_CHAR_CTL_LANGUAGE;
+pLangBox = pBox;
 }
-break;
-case SvxLanguageBox::EditedAndValid::Invalid:
-pLangBox->set_active_id(pLangBox->get_saved_active_id());
-break;
-}
+}
+break;
+case SvxLanguageBox::EditedAndValid::Invalid:
+pLangBox->set_active_id(pLangBox->get_saved_active_id());
+break;
 }
 
+nWhich = GetWhich( nSlot );
+pOld = GetOldItem( rSet, nSlot );
+
 int nLangPos = pLangBox->get_active();
 LanguageType eLangType = pLangBox->get_active_id();
 
diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx
index a3d74adba703..7a03c522d98b 100644
--- a/include/svx/langbox.hxx
+++ b/include/svx/langbox.hxx
@@ -84,7 +84,7 @@ public:
 voidInsertLanguage(const LanguageType nLangType);
 
 EditedAndValid  GetEditedAndValid() const { return m_eEditedAndValid;}
-sal_Int32   SaveEditedAsEntry();
+SvxLanguageBox* SaveEditedAsEntry( SvxLanguageBox* ppBoxes[3] /* 
convention: Western, Asian, Complex */ );
 
 void connect_changed(const Link& rLink) { 
m_aChangeHdl = rLink; }
 void connect_focus_in(const Link& rLink) { 
m_xControl->connect_focus_in(rLink); }
diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx
index 5db46c695493..76d9b3de1fe5 100644
--- a/svx/source/dialog/langbox.cxx
+++ b/svx/source/dialog/langbox.cxx
@@ -463,40 +463,73 @@ 
SvxLanguageBox::SvxLanguageBox(std::unique_ptr pControl)
 m_xControl->connect_changed(LINK(this, SvxLanguageBox, ChangeHdl));
 }
 
-sal_Int32 SvxLanguageBox::SaveEditedAsEntry()
+SvxLanguageBox* SvxLanguageBox::SaveEditedAsEntry(SvxLanguageBox* ppBoxes[3])
 {
 if (m_eEditedAndValid != EditedAndValid::Valid)
-return -1;
+return this;
 
 LanguageTag aLanguageTag(m_xControl->get_active_text());
 LanguageType nLang = aLanguageTag.getLanguageType();
 if (nLang == LANGUAGE_DONTKNOW)
 {
-SAL_WARN( "svx.dialog", "SvxLangu

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

[Xisco Fauli (via logerrit)]

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

New commits:
commit 0a4775332ee62c8b8c728998bbde10d3b0d2b817
Author: Xisco Fauli 
AuthorDate: Wed Oct 5 19:53:29 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Oct 5 19:53:29 2022 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-4-2'
  to 7642e6dab65b2338a39834ab42c91970163539b2
  - update translations for 7.4.2 rc2

Change-Id: I10b515f5e154576169c6d6cfa1f8745f6818e52c
Reviewed-on: https://gerrit.libreoffice.org/c/translations/+/140989
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 
(cherry picked from commit 15aa88bdb1c9fca742b900568deea65bc2445040)
Reviewed-on: https://gerrit.libreoffice.org/c/translations/+/140966

diff --git a/translations b/translations
index 0abf95d0ff36..7642e6dab65b 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 0abf95d0ff36afa188a530411b0acdb8c2267188
+Subproject commit 7642e6dab65b2338a39834ab42c91970163539b2

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-4-2' - source/ast source/ca source/de source/dsb source/el source/es source/eu source/fi source/fr source/gug source/hsb source/hu source/

[Xisco Fauli (via logerrit)]

 source/ast/fpicker/messages.po |   
 4 
 source/ast/helpcontent2/source/auxiliary.po|   
12 
 source/ast/helpcontent2/source/text/sbasic/shared.po   |   
14 
 source/ast/helpcontent2/source/text/sbasic/shared/03.po|   
16 
 source/ast/helpcontent2/source/text/scalc/01.po|   
 8 
 source/ast/helpcontent2/source/text/schart.po  |   
 4 
 source/ast/helpcontent2/source/text/shared/01.po   |   
 6 
 source/ast/helpcontent2/source/text/shared/guide.po|   
 4 
 source/ast/helpcontent2/source/text/shared/optionen.po |   
 4 
 source/ast/helpcontent2/source/text/swriter/01.po  |   
10 
 source/ast/sc/messages.po  |   
 6 
 source/ca/fpicker/messages.po  |   
 8 
 source/ca/helpcontent2/source/auxiliary.po |   
 6 
 source/ca/helpcontent2/source/text/sbasic/shared.po|   
23 
 source/ca/helpcontent2/source/text/sbasic/shared/03.po |   
14 
 source/ca/helpcontent2/source/text/scalc/01.po |   
16 
 source/ca/helpcontent2/source/text/scalc/guide.po  |   
 6 
 source/ca/helpcontent2/source/text/schart.po   |   
 6 
 source/ca/helpcontent2/source/text/schart/01.po|   
 6 
 source/ca/helpcontent2/source/text/shared/00.po|   
 4 
 source/ca/helpcontent2/source/text/shared/01.po|   
18 
 source/ca/helpcontent2/source/text/shared/02.po|   
 4 
 source/ca/helpcontent2/source/text/shared/06.po|   
10 
 source/ca/helpcontent2/source/text/shared/guide.po |   
 4 
 source/ca/helpcontent2/source/text/swriter.po  |   
 6 
 source/ca/helpcontent2/source/text/swriter/01.po   |   
 9 
 source/ca/officecfg/registry/data/org/openoffice/Office.po |   
 8 
 source/ca/sc/messages.po   |   
 6 
 source/ca/sd/messages.po   |   
10 
 source/ca/svtools/messages.po  |   
 6 
 source/ca/sw/messages.po   |   
 4 
 source/de/basctl/messages.po   |   
14 
 source/de/basic/messages.po|   
10 
 source/de/chart2/messages.po   |   
12 
 source/de/cui/messages.po  |  
168 
 source/de/desktop/messages.po  |   
10 
 source/de/extensions/messages.po   |   
 6 
 source/de/helpcontent2/source/auxiliary.po |   
10 
 source/de/helpcontent2/source/text/sbasic/guide.po |   
18 
 source/de/helpcontent2/source/text/sbasic/python.po|   
56 
 source/de/helpcontent2/source/text/sbasic/shared/02.po |   
 8 
 source/de/helpcontent2/source/text/scalc.po|   
10 
 source/de/helpcontent2/source/text/scalc/01.po |   
 6 
 source/de/helpcontent2/source/text/scalc/guide.po  |   
10 
 source/de/helpcontent2/source/text/schart/01.po|   
10 
 source/de/helpcontent2/source/text/sdraw/04.po |   
30 
 source/de/helpcontent2/source/text/shared.po   |   
20 
 source/de/helpcontent2/source/text/shared/02.po|   
 8 
 source/de/helpcontent2/source/text/shared/04.po|   
34 
 source/de/helpcontent2/source/text/shared/05.po|   
14 
 source/de/helpcontent2/source/text/shared/optionen.po  |   
10 
 source/de/helpcontent2/source/text/simpress/01.po  |   
 8 
 source/de/helpcontent2/source/text/simpress/04.po  |   
26 
 source/de/helpcontent2/source/text/swriter.po  |   
10 
 source/de/helpcontent2/source/text/swriter/01.po   |   
16 
 source/de/helpcontent2/source/text/swriter/02.po   |   
46 
 source/de/helpcontent2/source/text/swriter/04.po   |   
30 
 source/de/helpcontent2/source/text/swriter/guide.po|   
14 
 source/de/helpcontent2/source/text/swriter/librelogo.po 

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

[Xisco Fauli (via logerrit)]

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

New commits:
commit bdc2eed38f533649b4ad65a3453b1a2614725578
Author: Xisco Fauli 
AuthorDate: Wed Oct 5 19:49:07 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Oct 5 19:49:07 2022 +0200

Update git submodules

* Update translations from branch 'libreoffice-7-4'
  to 4015ebc81b125b4b0aebe9e688b56c2fd27fbaad
  - update translations for 7.4.2 rc2

Change-Id: I10b515f5e154576169c6d6cfa1f8745f6818e52c
Reviewed-on: https://gerrit.libreoffice.org/c/translations/+/140989
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/translations b/translations
index 63fc89f66c6f..4015ebc81b12 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 63fc89f66c6f7849fda89ef96f90d9676b086db3
+Subproject commit 4015ebc81b125b4b0aebe9e688b56c2fd27fbaad

[Libreoffice-commits] translations.git: Branch 'libreoffice-7-4' - source/ast source/ca source/de source/dsb source/el source/es source/eu source/fi source/fr source/gug source/hsb source/hu source/id

[Xisco Fauli (via logerrit)]

 source/ast/fpicker/messages.po |   
 4 
 source/ast/helpcontent2/source/auxiliary.po|   
12 
 source/ast/helpcontent2/source/text/sbasic/shared.po   |   
14 
 source/ast/helpcontent2/source/text/sbasic/shared/03.po|   
16 
 source/ast/helpcontent2/source/text/scalc/01.po|   
 8 
 source/ast/helpcontent2/source/text/schart.po  |   
 4 
 source/ast/helpcontent2/source/text/shared/01.po   |   
 6 
 source/ast/helpcontent2/source/text/shared/guide.po|   
 4 
 source/ast/helpcontent2/source/text/shared/optionen.po |   
 4 
 source/ast/helpcontent2/source/text/swriter/01.po  |   
10 
 source/ast/sc/messages.po  |   
 6 
 source/ca/fpicker/messages.po  |   
 8 
 source/ca/helpcontent2/source/auxiliary.po |   
 6 
 source/ca/helpcontent2/source/text/sbasic/shared.po|   
23 
 source/ca/helpcontent2/source/text/sbasic/shared/03.po |   
14 
 source/ca/helpcontent2/source/text/scalc/01.po |   
16 
 source/ca/helpcontent2/source/text/scalc/guide.po  |   
 6 
 source/ca/helpcontent2/source/text/schart.po   |   
 6 
 source/ca/helpcontent2/source/text/schart/01.po|   
 6 
 source/ca/helpcontent2/source/text/shared/00.po|   
 4 
 source/ca/helpcontent2/source/text/shared/01.po|   
18 
 source/ca/helpcontent2/source/text/shared/02.po|   
 4 
 source/ca/helpcontent2/source/text/shared/06.po|   
10 
 source/ca/helpcontent2/source/text/shared/guide.po |   
 4 
 source/ca/helpcontent2/source/text/swriter.po  |   
 6 
 source/ca/helpcontent2/source/text/swriter/01.po   |   
 9 
 source/ca/officecfg/registry/data/org/openoffice/Office.po |   
 8 
 source/ca/sc/messages.po   |   
 6 
 source/ca/sd/messages.po   |   
10 
 source/ca/svtools/messages.po  |   
 6 
 source/ca/sw/messages.po   |   
 4 
 source/de/basctl/messages.po   |   
14 
 source/de/basic/messages.po|   
10 
 source/de/chart2/messages.po   |   
12 
 source/de/cui/messages.po  |  
168 
 source/de/desktop/messages.po  |   
10 
 source/de/extensions/messages.po   |   
 6 
 source/de/helpcontent2/source/auxiliary.po |   
10 
 source/de/helpcontent2/source/text/sbasic/guide.po |   
18 
 source/de/helpcontent2/source/text/sbasic/python.po|   
56 
 source/de/helpcontent2/source/text/sbasic/shared/02.po |   
 8 
 source/de/helpcontent2/source/text/scalc.po|   
10 
 source/de/helpcontent2/source/text/scalc/01.po |   
 6 
 source/de/helpcontent2/source/text/scalc/guide.po  |   
10 
 source/de/helpcontent2/source/text/schart/01.po|   
10 
 source/de/helpcontent2/source/text/sdraw/04.po |   
30 
 source/de/helpcontent2/source/text/shared.po   |   
20 
 source/de/helpcontent2/source/text/shared/02.po|   
 8 
 source/de/helpcontent2/source/text/shared/04.po|   
34 
 source/de/helpcontent2/source/text/shared/05.po|   
14 
 source/de/helpcontent2/source/text/shared/optionen.po  |   
10 
 source/de/helpcontent2/source/text/simpress/01.po  |   
 8 
 source/de/helpcontent2/source/text/simpress/04.po  |   
26 
 source/de/helpcontent2/source/text/swriter.po  |   
10 
 source/de/helpcontent2/source/text/swriter/01.po   |   
16 
 source/de/helpcontent2/source/text/swriter/02.po   |   
46 
 source/de/helpcontent2/source/text/swriter/04.po   |   
30 
 source/de/helpcontent2/source/text/swriter/guide.po|   
14 
 source/de/helpcontent2/source/text/swriter/librelogo.po 

[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - readlicense_oo/license

[Xisco Fauli (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 4188 ++--
 1 file changed, 2104 insertions(+), 2084 deletions(-)

New commits:
commit 722a3892d4545738aac9ebfdfe8d28ffe4a2543b
Author: Xisco Fauli 
AuthorDate: Wed Oct 5 19:34:08 2022 +0200
Commit: Xisco Fauli 
CommitDate: Wed Oct 5 19:47:23 2022 +0200

update credits

Change-Id: I101b0ffc043adae377c6ae4ef8741c015e5433d3
Signed-off-by: Xisco Fauli 

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index dee82e9cb7bf..3f9134d35c41 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -348,58 +348,58 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -408,16 +408,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
+  
+  
+   
   
   

@@ -426,110 +429,151 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
-  
-   
+  
+   
   
   

+  
+  
+   

   
-  
+  


   
-  
-   
-  
-  
-   
-  
-  
+  

   
-  
+  

   
-  
+  


   
-  
+  


   
-  
+  


   
-  
+  


   
-  
+  


   
+  
+   
+  
   
-   
+   
   
   
+   
+  
+  

   
-  
+  

+   
   
-  
-   
+  
+   
   
-  
-  
-   
+  
+   
   
-  
-   
+  
+   
   
   
+   
+  
+  

+   
   
-  
-  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  

+   
   
-  
-  
+  
+   
+  
+  

+   
+  
+  
+   
   
-  
-  
+  

+   
   
-  
-  
+  
+   
+  
+  
+   
+  
+  

+   
   
-  
-  
+  

+   
+  
+  
+   
   
   

@@ -552,134 +596,70 @@

   
   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-  
-  

-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+

   
-  
+  

-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+

   
-  
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-  
-  
+  

 

@@ -711,69 +691,69 @@
 

   
-  
-   
+  
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
+   
   
-  
-   
+  
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
+   
   
   

@@ -1081,10 +1061,21 @@
 


-Credits
-1788 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2022-09-09 19:59:37.
-* marks developers whose first contributions 
happened after 2010-09-28.
-Developers 
committing code since 2010-09-28
+Credits
+
+ 
+  Wiki 
Contributors (scroll down) 
+ 
+ 
+  Pictures, Website & 
Images Credits (scroll down) 
+ 
+ 
+  https://wiki.documentfoundation.org/Language/Contributors"; 
office:target-frame-name="_blank" xlink:show="new" 
text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link">Translators 
(those using weblate - opens in new window) 
+ 
+
+1793 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2022-10-05 16:48:10.
+* marks developers whose first contributions 
happened after 2010-09-28.
+Developers committing 
code since 2010-09-28
 
  
  
@@ -1095,7 +1086,7 @@
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 33507Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 33603Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ -1112,10 +1103,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 19994Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 20022Joined: 
2000-1

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4-2' - readlicense_oo/license

[Xisco Fauli (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 4188 ++--
 1 file changed, 2104 insertions(+), 2084 deletions(-)

New commits:
commit 7a9370ef892a3dd32f258a18986abb770775bbc0
Author: Xisco Fauli 
AuthorDate: Wed Oct 5 19:34:08 2022 +0200
Commit: Xisco Fauli 
CommitDate: Wed Oct 5 19:46:22 2022 +0200

update credits

Change-Id: I101b0ffc043adae377c6ae4ef8741c015e5433d3
Signed-off-by: Xisco Fauli 

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index dee82e9cb7bf..3f9134d35c41 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -348,58 +348,58 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -408,16 +408,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
+  
+  
+   
   
   

@@ -426,110 +429,151 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
-  
-   
+  
+   
   
   

+  
+  
+   

   
-  
+  


   
-  
-   
-  
-  
-   
-  
-  
+  

   
-  
+  

   
-  
+  


   
-  
+  


   
-  
+  


   
-  
+  


   
-  
+  


   
+  
+   
+  
   
-   
+   
   
   
+   
+  
+  

   
-  
+  

+   
   
-  
-   
+  
+   
   
-  
-  
-   
+  
+   
   
-  
-   
+  
+   
   
   
+   
+  
+  

+   
   
-  
-  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  

+   
   
-  
-  
+  
+   
+  
+  

+   
+  
+  
+   
   
-  
-  
+  

+   
   
-  
-  
+  
+   
+  
+  
+   
+  
+  

+   
   
-  
-  
+  

+   
+  
+  
+   
   
   

@@ -552,134 +596,70 @@

   
   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-  
-  

-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+

   
-  
+  

-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+

   
-  
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-  
-  
+  

 

@@ -711,69 +691,69 @@
 

   
-  
-   
+  
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
+   
   
-  
-   
+  
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
+   
   
   

@@ -1081,10 +1061,21 @@
 


-Credits
-1788 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2022-09-09 19:59:37.
-* marks developers whose first contributions 
happened after 2010-09-28.
-Developers 
committing code since 2010-09-28
+Credits
+
+ 
+  Wiki 
Contributors (scroll down) 
+ 
+ 
+  Pictures, Website & 
Images Credits (scroll down) 
+ 
+ 
+  https://wiki.documentfoundation.org/Language/Contributors"; 
office:target-frame-name="_blank" xlink:show="new" 
text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link">Translators 
(those using weblate - opens in new window) 
+ 
+
+1793 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2022-10-05 16:48:10.
+* marks developers whose first contributions 
happened after 2010-09-28.
+Developers committing 
code since 2010-09-28
 
  
  
@@ -1095,7 +1086,7 @@
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 33507Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 33603Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ -1112,10 +1103,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 19994Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 20022Joined: 
2000-1

[Libreoffice-commits] core.git: Branch 'libreoffice-7-4' - readlicense_oo/license

[Xisco Fauli (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 4188 ++--
 1 file changed, 2104 insertions(+), 2084 deletions(-)

New commits:
commit 78a0e8e794e4a1ae52520854eff5c9f33581e378
Author: Xisco Fauli 
AuthorDate: Wed Oct 5 19:34:08 2022 +0200
Commit: Xisco Fauli 
CommitDate: Wed Oct 5 19:44:46 2022 +0200

update credits

Change-Id: I101b0ffc043adae377c6ae4ef8741c015e5433d3
Signed-off-by: Xisco Fauli 

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index dee82e9cb7bf..3f9134d35c41 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -348,58 +348,58 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -408,16 +408,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
+  
+  
+   
   
   

@@ -426,110 +429,151 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
-  
-   
+  
+   
   
   

+  
+  
+   

   
-  
+  


   
-  
-   
-  
-  
-   
-  
-  
+  

   
-  
+  

   
-  
+  


   
-  
+  


   
-  
+  


   
-  
+  


   
-  
+  


   
+  
+   
+  
   
-   
+   
   
   
+   
+  
+  

   
-  
+  

+   
   
-  
-   
+  
+   
   
-  
-  
-   
+  
+   
   
-  
-   
+  
+   
   
   
+   
+  
+  

+   
   
-  
-  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  

+   
   
-  
-  
+  
+   
+  
+  

+   
+  
+  
+   
   
-  
-  
+  

+   
   
-  
-  
+  
+   
+  
+  
+   
+  
+  

+   
   
-  
-  
+  

+   
+  
+  
+   
   
   

@@ -552,134 +596,70 @@

   
   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-  
-  

-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+

   
-  
+  

-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+

   
-  
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-  
-  
+  

 

@@ -711,69 +691,69 @@
 

   
-  
-   
+  
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
+   
   
-  
-   
+  
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
+   
   
   

@@ -1081,10 +1061,21 @@
 


-Credits
-1788 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2022-09-09 19:59:37.
-* marks developers whose first contributions 
happened after 2010-09-28.
-Developers 
committing code since 2010-09-28
+Credits
+
+ 
+  Wiki 
Contributors (scroll down) 
+ 
+ 
+  Pictures, Website & 
Images Credits (scroll down) 
+ 
+ 
+  https://wiki.documentfoundation.org/Language/Contributors"; 
office:target-frame-name="_blank" xlink:show="new" 
text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link">Translators 
(those using weblate - opens in new window) 
+ 
+
+1793 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2022-10-05 16:48:10.
+* marks developers whose first contributions 
happened after 2010-09-28.
+Developers committing 
code since 2010-09-28
 
  
  
@@ -1095,7 +1086,7 @@
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 33507Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 33603Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ -1112,10 +1103,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 19994Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 20022Joined: 
2000-1

[Libreoffice-commits] core.git: readlicense_oo/license

[Xisco Fauli (via logerrit)]

 readlicense_oo/license/CREDITS.fodt | 4188 ++--
 1 file changed, 2104 insertions(+), 2084 deletions(-)

New commits:
commit 667d61f98765dd9c5d1d8b5603c75a62dba3f795
Author: Xisco Fauli 
AuthorDate: Wed Oct 5 19:34:08 2022 +0200
Commit: Xisco Fauli 
CommitDate: Wed Oct 5 19:40:31 2022 +0200

update credits

Change-Id: I101b0ffc043adae377c6ae4ef8741c015e5433d3

diff --git a/readlicense_oo/license/CREDITS.fodt 
b/readlicense_oo/license/CREDITS.fodt
index dee82e9cb7bf..3f9134d35c41 100644
--- a/readlicense_oo/license/CREDITS.fodt
+++ b/readlicense_oo/license/CREDITS.fodt
@@ -348,58 +348,58 @@
  
  
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
-  
+  

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

@@ -408,16 +408,19 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
+  
+  
+   
   
   

@@ -426,110 +429,151 @@

   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   
-   
+   
   
   

   
+  
+   
+  
   

   
-  
-   
+  
+   
   
   

+  
+  
+   

   
-  
+  


   
-  
-   
-  
-  
-   
-  
-  
+  

   
-  
+  

   
-  
+  


   
-  
+  


   
-  
+  


   
-  
+  


   
-  
+  


   
+  
+   
+  
   
-   
+   
   
   
+   
+  
+  

   
-  
+  

+   
   
-  
-   
+  
+   
   
-  
-  
-   
+  
+   
   
-  
-   
+  
+   
   
   
+   
+  
+  

+   
   
-  
-  
+  
+   
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  
+   
+  
+  

+   
   
-  
-  
+  
+   
+  
+  

+   
+  
+  
+   
   
-  
-  
+  

+   
   
-  
-  
+  
+   
+  
+  
+   
+  
+  

+   
   
-  
-  
+  

+   
+  
+  
+   
   
   

@@ -552,134 +596,70 @@

   
   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-  
-  

-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+

   
-  
+  

-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+


-
+

   
-  
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-   
-
-   
-  
-  
+  

 

@@ -711,69 +691,69 @@
 

   
-  
-   
+  
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
+   
   
-  
-   
+  
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
-   
+   
+   
 
-   
+   
   
   

@@ -1081,10 +1061,21 @@
 


-Credits
-1788 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2022-09-09 19:59:37.
-* marks developers whose first contributions 
happened after 2010-09-28.
-Developers 
committing code since 2010-09-28
+Credits
+
+ 
+  Wiki 
Contributors (scroll down) 
+ 
+ 
+  Pictures, Website & 
Images Credits (scroll down) 
+ 
+ 
+  https://wiki.documentfoundation.org/Language/Contributors"; 
office:target-frame-name="_blank" xlink:show="new" 
text:style-name="Internet_20_link" 
text:visited-style-name="Visited_20_Internet_20_Link">Translators 
(those using weblate - opens in new window) 
+ 
+
+1793 individuals contributed to 
OpenOffice.org (and whose contributions were imported into LibreOffice) or 
LibreOffice until 2022-10-05 16:48:10.
+* marks developers whose first contributions 
happened after 2010-09-28.
+Developers committing 
code since 2010-09-28
 
  
  
@@ -1095,7 +1086,7 @@
Ruediger 
TimmCommits: 82464Joined: 
2000-10-10
   
   
-   Caolán 
McNamaraCommits: 33507Joined: 
2000-10-10
+   Caolán 
McNamaraCommits: 33603Joined: 
2000-10-10
   
   
Kurt 
ZenkerCommits: 31752Joined: 
2000-09-25
@@ -1112,10 +1103,10 @@
Vladimir 
GlazunovCommits: 25434Joined: 
2000-12-04
   
   
-   Stephan 
BergmannCommits: 19994Joined: 
2000-10-04
+   Stephan 
BergmannCommits: 20022Joined: 
2000-10-04
   
   
-   *No

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

[Caolán McNamara (via logerrit)]

 sfx2/source/control/charwin.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8b7df7b9ecf839584c74518456e5f01101eb9b5c
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 15:48:10 2022 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 17:45:19 2022 +0200

tdf#115634 recent/favorite widgets not hidpi scaled

Change-Id: I65c74bd443b91827f62d46968ce8fda948fc6c26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140984
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx
index 567f365e6b32..39f473ce47b9 100644
--- a/sfx2/source/control/charwin.cxx
+++ b/sfx2/source/control/charwin.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -43,9 +44,9 @@ void SvxCharView::SetDrawingArea(weld::DrawingArea* 
pDrawingArea)
 const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
 vcl::Font aFont = rStyleSettings.GetLabelFont();
 const Size aFontSize = aFont.GetFontSize();
-aFont.SetFontSize(Size(aFontSize.Width() * 2.5, aFontSize.Height() * 2.5));
+aFont.SetFontSize(Size(aFontSize.Width() * 2, aFontSize.Height() * 2));
 mxVirDev->Push(PUSH_ALLFONT);
-mxVirDev->SetFont(aFont);
+weld::SetPointFont(*mxVirDev, aFont);
 pDrawingArea->set_size_request(mxVirDev->approximate_digit_width() * 2,
mxVirDev->GetTextHeight());
 mxVirDev->Pop();

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

[Justin Luth (via logerrit)]

 sw/source/filter/ww8/ww8graf.cxx |   10 --
 1 file changed, 10 deletions(-)

New commits:
commit d02962cb2ca4e691634abb1bf6ff30b9b366d2e3
Author: Justin Luth 
AuthorDate: Tue Oct 4 10:39:38 2022 -0400
Commit: Miklos Vajna 
CommitDate: Wed Oct 5 17:38:25 2022 +0200

tdf#148806 doc import: remove 2003 SetObjectShell(nullptr) hack

This was preventing doc event-macros from round-tripping.
Its original purpose was to "fix" doc->sxw export.
We no longer export to sxw, and the OOo bug doc exports fine to ODT.

Change-Id: I3a22db1b3bf9eaa2d64ac963f0c41892ba604e8d

--- https://bz.apache.org/ooo/show_bug.cgi?id=20540 ---
caolanm 2003-10-20 14:43:31 UTC
Setting a target for this bug, fixed for 2.0 in
portlaoisefilterteam16, and for 1.1.1 in droghedafilterteam15

MIB->CMC:
The document contains a Draw 4.0 OLE object, and the problem is the
import of that object in the Word filter.

During the import, the object's storage is copied into the document
storage (in SvxMSDffManager::CreateSdrOLEFromStorage, msdffimp.cxx,
5117). It now is contained in the document storage in the 3.o format,
but it is not in the child list of SvPersist.
Some time later, SvxMSDffManager::ImportGraphic calls a
SdrOLE2Obj::SetModel, that again calls SdrOLE2Obj::Connect. This
method notices that the object is not in the persist child list, and
for that reasdon call SvPersist::Move to add it to the list
(svdoole2.cxx, 374). Move converts the object into the OOo 1.0 format.
The destination storage is the object's storage, so the 1.0 format is
added to the existing 3.0 format, and the object storage remains an
OLE strorage and does not get a package. This situation is not
permitted and cannot be saved in the SXW format.

Change-Id: I24e55e5d47c3a7d10d6609ddbf9cc2374a47a37b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140950
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx
index e3482a290a2f..d803e5619614 100644
--- a/sw/source/filter/ww8/ww8graf.cxx
+++ b/sw/source/filter/ww8/ww8graf.cxx
@@ -2563,19 +2563,9 @@ SwFrameFormat* SwWW8ImplReader::Read_GrafLayer( 
tools::Long nGrafAnchorCp )
 tools::Rectangle aRect(aFSFA.nXaLeft, aFSFA.nYaTop, aFSFA.nXaRight, 
aFSFA.nYaBottom);
 SvxMSDffImportData aData( aRect );
 
-/*
-#i20540#
-The SdrOle2Obj will try and manage any ole objects it finds, causing all
-sorts of trouble later on
-*/
-SwDocShell* pPersist = m_rDoc.GetDocShell();
-m_rDoc.SetDocShell(nullptr); // #i20540# Persist guard
-
 rtl::Reference pObject;
 bool bOk = (m_xMSDffManager->GetShape(aFSFA.nSpId, pObject, aData) && 
pObject);
 
-m_rDoc.SetDocShell(pPersist);  // #i20540# Persist guard
-
 if (!bOk)
 {
 OSL_ENSURE( false, "Where is the Shape ?" );

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

[Andreas Heinisch (via logerrit)]

 sc/qa/uitest/autofilter/autofilter.py |   39 ++
 sc/source/ui/view/viewfunc.cxx|   28 +++-
 2 files changed, 66 insertions(+), 1 deletion(-)

New commits:
commit 3394e8746c505a8dae112f555cb2bb3e4596cbba
Author: Andreas Heinisch 
AuthorDate: Tue Sep 13 22:18:09 2022 +0200
Commit: Eike Rathke 
CommitDate: Wed Oct 5 17:30:46 2022 +0200

tdf#36383 - sc AutoFilter: fix changing row height

Changing row height showed the rows hidden
by AutoFilter, removing the result of the filtering.

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

diff --git a/sc/qa/uitest/autofilter/autofilter.py 
b/sc/qa/uitest/autofilter/autofilter.py
index 8f6db292230e..f792c0fdad33 100644
--- a/sc/qa/uitest/autofilter/autofilter.py
+++ b/sc/qa/uitest/autofilter/autofilter.py
@@ -376,6 +376,45 @@ class AutofilterTest(UITestCase):
 self.assertFalse(is_row_hidden(doc, 6))
 self.assertFalse(is_row_hidden(doc, 7))
 
+def test_tdf36383_row_height(self):
+with self.ui_test.create_doc_in_start_center("calc") as document:
+calcDoc = self.xUITest.getTopFocusWindow()
+gridwin = calcDoc.getChild("grid_window")
+
+enter_text_to_cell(gridwin, "A1", "A")
+enter_text_to_cell(gridwin, "A2", "1")
+enter_text_to_cell(gridwin, "A3", "2")
+enter_text_to_cell(gridwin, "A4", "3")
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": 
"A1:A4"}))
+
+self.xUITest.executeCommand(".uno:DataFilterAutoFilter")
+gridwin.executeAction("LAUNCH", mkPropertyValues({"AUTOFILTER": 
"", "COL": "0", "ROW": "0"}))
+xFloatWindow = self.xUITest.getFloatWindow()
+xCheckListMenu = xFloatWindow.getChild("FilterDropDown")
+xTreeList = xCheckListMenu.getChild("check_list_box")
+xEntry = xTreeList.getChild("1")
+xEntry.executeAction("CLICK", tuple())
+
+xOkButton = xFloatWindow.getChild("ok")
+xOkButton.executeAction("CLICK", tuple())
+
+self.assertTrue(is_row_hidden(document, 2))
+
+# row height
+with self.ui_test.execute_dialog_through_command(".uno:RowHeight") 
as xDialog:
+xvalue = xDialog.getChild("value")
+xvalue.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"CTRL+A"}))
+xvalue.executeAction("TYPE", 
mkPropertyValues({"KEYCODE":"BACKSPACE"}))
+xvalue.executeAction("TYPE", mkPropertyValues({"TEXT":"1 cm"}))
+
+self.assertTrue(is_row_hidden(document, 2))
+
+# optimal row height
+with 
self.ui_test.execute_dialog_through_command(".uno:SetOptimalRowHeight"):
+pass
+
+self.assertTrue(is_row_hidden(document, 2))
+
 def test_tdf142350(self):
 with self.ui_test.create_doc_in_start_center("calc") as document:
 calcDoc = self.xUITest.getTopFocusWindow()
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index c5341aadfa65..423c66abef2b 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -80,6 +80,19 @@
 
 #include 
 
+static void ShowFilteredRows(ScDocument& rDoc, SCTAB nTab, SCCOLROW nStartNo, 
SCCOLROW nEndNo,
+ bool bShow)
+{
+SCROW nFirstRow = nStartNo;
+SCROW nLastRow = nStartNo;
+do
+{
+if (!rDoc.RowFiltered(nFirstRow, nTab, nullptr, &nLastRow))
+rDoc.ShowRows(nFirstRow, nLastRow < nEndNo ? nLastRow : nEndNo, 
nTab, bShow);
+nFirstRow = nLastRow + 1;
+} while (nFirstRow <= nEndNo);
+}
+
 static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, 
ScDocShell *pDocSh )
 {
 if( pCondFmt )
@@ -2202,6 +2215,7 @@ void ScViewFunc::SetWidthOrHeight(
 if ( eMode==SC_SIZE_OPTIMAL || eMode==SC_SIZE_VISOPT )
 {
 bool bAll = ( eMode==SC_SIZE_OPTIMAL );
+bool bFiltered = false;
 if (!bAll)
 {
 //  delete CRFlags::ManualSize for all in range,
@@ -2220,6 +2234,14 @@ void ScViewFunc::SetWidthOrHeight(
 rDoc.SetRowFlags(nRow, nTab, nOld & 
~CRFlags::ManualSize);
 }
 }
+else
+{
+SCROW nLastRow = nStartNo;
+if (rDoc.RowFiltered(nStartNo, nTab, nullptr, 
&nLastRow)
+|| nLastRow < nEndNo)
+bFiltered = true;
+}
+
 
 double nPPTX = GetViewData().GetPPTX();
 double nPPTY = GetViewData().GetPPTY();
@@ -2239,6 +2261,9 @

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

[Eike Rathke (via logerrit)]

 i18nlangtag/qa/cppunit/test_languagetag.cxx |3 +++
 i18nlangtag/source/isolang/isolang.cxx  |3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 5aa2002644d89ca452b96e664e4d28b191153538
Author: Eike Rathke 
AuthorDate: Wed Oct 5 15:53:41 2022 +0200
Commit: Eike Rathke 
CommitDate: Wed Oct 5 17:01:26 2022 +0200

More zh-* legacy

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

diff --git a/i18nlangtag/qa/cppunit/test_languagetag.cxx 
b/i18nlangtag/qa/cppunit/test_languagetag.cxx
index f7864d6104fd..c64a3baa61d6 100644
--- a/i18nlangtag/qa/cppunit/test_languagetag.cxx
+++ b/i18nlangtag/qa/cppunit/test_languagetag.cxx
@@ -755,6 +755,9 @@ bool checkMapping( std::u16string_view rStr1, 
std::u16string_view rStr2 )
 if (rStr1 == u"oc-ES"   ) return rStr2 == u"oc-ES-aranes";
 if (rStr1 == u"zh-Hans-CN"  ) return rStr2 == u"zh-CN";
 if (rStr1 == u"zh-Hant-TW"  ) return rStr2 == u"zh-TW";
+if (rStr1 == u"zh-Hans-SG"  ) return rStr2 == u"zh-SG";
+if (rStr1 == u"zh-Hant-HK"  ) return rStr2 == u"zh-HK";
+if (rStr1 == u"zh-Hant-MO"  ) return rStr2 == u"zh-MO";
 return rStr1 == rStr2;
 }
 
diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 4287fe247cb4..5204b212d86b 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -756,6 +756,9 @@ IsoLanguageScriptCountryEntry const 
aImplIsoLangScriptEntries[] =
 { LANGUAGE_CHINESE_TRADITIONAL_LSO, "zh-Hant", ""  , k0},
 { LANGUAGE_CHINESE_SIMPLIFIED,  "zh-Hans", "CN", kSAME },  
 // canonical, but prefer legacy zh-CN
 { LANGUAGE_CHINESE_TRADITIONAL, "zh-Hant", "TW", kSAME },  
 // canonical, but prefer legacy zh-TW
+{ LANGUAGE_CHINESE_SINGAPORE,   "zh-Hans", "SG", kSAME },  
 // canonical, but prefer legacy zh-SG
+{ LANGUAGE_CHINESE_HONGKONG,"zh-Hant", "HK", kSAME },  
 // canonical, but prefer legacy zh-HK
+{ LANGUAGE_CHINESE_MACAU,   "zh-Hant", "MO", kSAME },  
 // canonical, but prefer legacy zh-MO
 { LANGUAGE_USER_MANINKAKAN_EASTERN_LATIN,  "emk-Latn", "GN", k0},
 { LANGUAGE_USER_CREE_PLAINS_LATIN, "crk-Latn", "CA", k0},
 { LANGUAGE_USER_CREE_PLAINS_SYLLABICS, "crk-Cans", "CA", k0},

[Libreoffice-commits] core.git: offapi/com sw/inc sw/qa sw/source writerfilter/qa writerfilter/source

[Miklos Vajna (via logerrit)]

 offapi/com/sun/star/text/ContentControl.idl  |6 ++
 sw/inc/formatcontentcontrol.hxx  |7 ++
 sw/inc/unoprnms.hxx  |1 
 sw/qa/core/unocore/unocore.cxx   |2 
 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx   |2 
 sw/source/core/txtnode/attrcontentcontrol.cxx|1 
 sw/source/core/unocore/unocontentcontrol.cxx |   28 
++
 sw/source/core/unocore/unomap1.cxx   |1 
 sw/source/filter/ww8/docxattributeoutput.cxx |6 ++
 writerfilter/qa/cppunittests/dmapper/SdtHelper.cxx   |4 +
 writerfilter/qa/cppunittests/dmapper/data/sdt-run-rich-text.docx |binary
 writerfilter/source/dmapper/DomainMapper.cxx |   15 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|6 ++
 writerfilter/source/dmapper/SdtHelper.cxx|4 +
 writerfilter/source/dmapper/SdtHelper.hxx|6 ++
 15 files changed, 89 insertions(+)

New commits:
commit 5262aab9d220675f616579720b4bb43ee03cccfb
Author: Miklos Vajna 
AuthorDate: Wed Oct 5 15:18:53 2022 +0200
Commit: Miklos Vajna 
CommitDate: Wed Oct 5 16:05:19 2022 +0200

sw content controls: preserve tag

This is similar to  to preserve .

Resolves

.

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

diff --git a/offapi/com/sun/star/text/ContentControl.idl 
b/offapi/com/sun/star/text/ContentControl.idl
index d07dbfc49256..8f390665c2b3 100644
--- a/offapi/com/sun/star/text/ContentControl.idl
+++ b/offapi/com/sun/star/text/ContentControl.idl
@@ -105,6 +105,12 @@ service ContentControl
 @since LibreOffice 7.5
 */
 [optional, property] string Alias;
+
+/** The tag: just remembered.
+
+@since LibreOffice 7.5
+*/
+[optional, property] string Tag;
 };
 
 
diff --git a/sw/inc/formatcontentcontrol.hxx b/sw/inc/formatcontentcontrol.hxx
index 6462bf49cd06..8cfa71dd04ba 100644
--- a/sw/inc/formatcontentcontrol.hxx
+++ b/sw/inc/formatcontentcontrol.hxx
@@ -169,6 +169,9 @@ class SW_DLLPUBLIC SwContentControl : public 
sw::BroadcastingModify
 /// The alias: just remembered.
 OUString m_aAlias;
 
+/// The tag: just remembered.
+OUString m_aTag;
+
 /// Stores a list item index, in case the doc model is not yet updated.
 std::optional m_oSelectedListItem;
 
@@ -329,6 +332,10 @@ public:
 
 const OUString& GetAlias() const { return m_aAlias; }
 
+void SetTag(const OUString& rTag) { m_aTag = rTag; }
+
+const OUString& GetTag() const { return m_aTag; }
+
 void SetReadWrite(bool bReadWrite) { m_bReadWrite = bReadWrite; }
 
 bool GetReadWrite() const { return m_bReadWrite; }
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 850a789900df..0a21fd182690 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -891,6 +891,7 @@
 #define UNO_NAME_DATA_BINDING_STORE_ITEM_ID "DataBindingStoreItemID"
 #define UNO_NAME_COLOR "Color"
 #define UNO_NAME_ALIAS "Alias"
+#define UNO_NAME_TAG "Tag"
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx
index 23811a497566..ee1592110157 100644
--- a/sw/qa/core/unocore/unocore.cxx
+++ b/sw/qa/core/unocore/unocore.cxx
@@ -625,6 +625,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, 
testContentControlDate)
 "DataBindingStoreItemID", 
uno::Any(OUString("{241A8A02-7FFD-488D-8827-63FBE74E8BC9}")));
 xContentControlProps->setPropertyValue("Color", 
uno::Any(OUString("008000")));
 xContentControlProps->setPropertyValue("Alias", 
uno::Any(OUString("myalias")));
+xContentControlProps->setPropertyValue("Tag", uno::Any(OUString("mytag")));
 xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true);
 
 // Then make sure that the specified properties are set:
@@ -649,6 +650,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, 
testContentControlDate)
  pContentControl->GetDataBindingStoreItemID());
 CPPUNIT_ASSERT_EQUAL(OUString("008000"), pContentControl->GetColor());
 CPPUNIT_ASSERT_EQUAL(OUString("myalias"), pContentControl->GetAlias());
+CPPUNIT_ASSERT_EQUAL(OUString("mytag"), pContentControl->GetTag());
 }
 
 CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testListIdState)
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
index 5246edc2a1e7..a487e86d3269 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
@@ -427,6 +427,7 @@ CPPUNIT_TEST_FIXTUR

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

[Caolán McNamara (via logerrit)]

 sfx2/source/dialog/backingwindow.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 1490923bea9c3ec763488a73912ff0a143329a24
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 12:43:30 2022 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 15:53:44 2022 +0200

Related: tdf#151351 don't use stack/highlight bg for buttons

in favor of reworked flat button default rendering

Change-Id: Id1d4b773aa0bf91be0386bd9db3bb212d422f216
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140980
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index ba55b7a6569d..d7889dd87913 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -597,9 +597,7 @@ IMPL_LINK( BackingWindow, ToggleHdl, weld::Toggleable&, 
rButton, void )
 mxAllRecentThumbnails->Show();
 mxAllRecentThumbnails->GrabFocus();
 mxRecentButton->set_active(true);
-mxRecentButton->set_highlight_background();
 mxTemplateButton->set_active(false);
-mxTemplateButton->set_stack_background();
 mxActions->set_sensitive(true);
 }
 else
@@ -610,9 +608,7 @@ IMPL_LINK( BackingWindow, ToggleHdl, weld::Toggleable&, 
rButton, void )
 mxLocalView->reload();
 mxLocalView->GrabFocus();
 mxRecentButton->set_active(false);
-mxRecentButton->set_stack_background();
 mxTemplateButton->set_active(true);
-mxTemplateButton->set_highlight_background();
 mxActions->set_sensitive(false);
 }
 applyFilter();

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

[Caolán McNamara (via logerrit)]

 vcl/source/control/button.cxx  |6 +++-
 vcl/source/window/decoview.cxx |   53 +++--
 2 files changed, 34 insertions(+), 25 deletions(-)

New commits:
commit f61b6a3a23303aff75051bc704375db92ae8f345
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 12:47:33 2022 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 15:53:08 2022 +0200

Resolves: tdf#151351 rework flat button rendering

Change-Id: Idf98c5bb96e5646e25b1ccd70b3774c7de479d18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140979
Tested-by: Caolán McNamara 
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 0edb9d9002d1..f9d9408fa3ca 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -976,6 +976,9 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& 
rRenderContext)
 if (mbPressed || mbIsActive)
 nButtonStyle |= DrawButtonFlags::Pressed;
 
+if (GetStyle() & WB_FLATBUTTON)
+nButtonStyle |= DrawButtonFlags::Flat;
+
 // TODO: move this to Window class or make it a member !!!
 ControlType aCtrlType = ControlType::Generic;
 switch(GetParent()->GetType())
@@ -1151,8 +1154,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& 
rRenderContext)
 if (GetStyle() & WB_FLATBUTTON)
 {
 tools::Rectangle aTempRect(aInRect);
-if (bRollOver)
-ImplDrawPushButtonFrame(rRenderContext, aTempRect, nButtonStyle);
+ImplDrawPushButtonFrame(rRenderContext, aTempRect, nButtonStyle);
 aInRect.AdjustLeft(2 );
 aInRect.AdjustTop(2 );
 aInRect.AdjustRight( -2 );
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 62c60f4e1336..d6bbd2d61982 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -23,11 +23,6 @@
 #include 
 #include 
 
-constexpr auto BUTTON_DRAW_FLATTEST = DrawButtonFlags::Flat |
- DrawButtonFlags::Pressed |
- DrawButtonFlags::Checked |
- DrawButtonFlags::Highlight;
-
 namespace {
 
 tools::Long AdjustRectToSquare( tools::Rectangle &rRect )
@@ -481,6 +476,9 @@ void ImplDrawButton( OutputDevice *const pDev, 
tools::Rectangle aFillRect,
 }
 else
 {
+const bool bFlat(nStyle & DrawButtonFlags::Flat);
+const bool bDepressed(nStyle & (DrawButtonFlags::Pressed | 
DrawButtonFlags::Checked));
+
 if ( nStyle & DrawButtonFlags::Default )
 {
 const Color aDefBtnColor = rStyleSettings.GetDarkShadowColor();
@@ -495,30 +493,28 @@ void ImplDrawButton( OutputDevice *const pDev, 
tools::Rectangle aFillRect,
 aFillRect.AdjustLeft( 1 );
 }
 
+bool bNoFace = false;
 Color aColor1;
 Color aColor2;
-if ( nStyle & (DrawButtonFlags::Pressed | DrawButtonFlags::Checked) )
+if (!bFlat)
 {
-aColor1 = rStyleSettings.GetDarkShadowColor();
-aColor2 = rStyleSettings.GetLightColor();
-}
-else
-{
-if ( nStyle & DrawButtonFlags::NoLightBorder )
-aColor1 = rStyleSettings.GetLightBorderColor();
-else
-aColor1 = rStyleSettings.GetLightColor();
-if ( (nStyle & BUTTON_DRAW_FLATTEST) == DrawButtonFlags::Flat )
-aColor2 = rStyleSettings.GetShadowColor();
+if (bDepressed)
+{
+aColor1 = rStyleSettings.GetDarkShadowColor();
+aColor2 = rStyleSettings.GetLightColor();
+}
 else
+{
+if ( nStyle & DrawButtonFlags::NoLightBorder )
+aColor1 = rStyleSettings.GetLightBorderColor();
+else
+aColor1 = rStyleSettings.GetLightColor();
 aColor2 = rStyleSettings.GetDarkShadowColor();
-}
+}
 
-ImplDraw2ColorFrame( pDev, aFillRect, aColor1, aColor2 );
+ImplDraw2ColorFrame( pDev, aFillRect, aColor1, aColor2 );
 
-if ( (nStyle & BUTTON_DRAW_FLATTEST) != DrawButtonFlags::Flat )
-{
-if ( nStyle & (DrawButtonFlags::Pressed | 
DrawButtonFlags::Checked) )
+if (bDepressed)
 {
 aColor1 = rStyleSettings.GetShadowColor();
 aColor2 = rStyleSettings.GetLightBorderColor();
@@ -533,11 +529,22 @@ void ImplDrawButton( OutputDevice *const pDev, 
tools::Rectangle aFillRect,
 }
 ImplDraw2ColorFrame( pDev, aFillRect, aColor1, aColor2 );
 }
+else // flat buttons
+{
+// draw a border if the flat button is highlighted
+if (nStyle & DrawButtonFlags::Highlight)
+{
+aColor1 = rStyleSettings.GetShadowColor();
+ImplDraw2ColorFrame(pDev, aFillRect, aColor1, aCo

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

[Caolán McNamara (via logerrit)]

 vcl/source/control/button.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4006b855cc94fbd817f9c19d7361b5d6a06d152e
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 13:02:23 2022 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 15:50:59 2022 +0200

Related: tdf#151351 kf5 pressed flat toggle buttons not visually depressed

Change-Id: I3ab2ec91f3317dbd5a7e011e5b81d0a5141b1348
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140978
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 86eae5be89c4..0edb9d9002d1 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1124,7 +1124,7 @@ void PushButton::ImplDrawPushButton(vcl::RenderContext& 
rRenderContext)
 Size aInRectSize(rRenderContext.LogicToPixel(Size(aInRect.GetWidth(), 
aInRect.GetHeight(;
 aControlValue.mbSingleLine = (aInRectSize.Height() < 2 * 
aFontSize.Height());
 
-if ((nState & ControlState::ROLLOVER) || !(GetStyle() & WB_FLATBUTTON)
+if (!aControlValue.m_bFlatButton || (nState & ControlState::ROLLOVER) 
|| (nState & ControlState::PRESSED)
 || (HasFocus() && mpWindowImpl->mbUseNativeFocus
 && !IsNativeControlSupported(ControlType::Pushbutton, 
ControlPart::Focus)))
 {

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

[Andreas Heinisch (via logerrit)]

 forms/source/component/FormComponent.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7c1a8152889fe38d961f8f605713c44293920a28
Author: Andreas Heinisch 
AuthorDate: Wed Sep 28 16:30:01 2022 +0200
Commit: Andreas Heinisch 
CommitDate: Wed Oct 5 15:31:51 2022 +0200

tdf#122319 - Don't allow nullable form components if input is required

Change-Id: I676aab37df7a98192680b87f0143a27d2a5fd3ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140713
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 

diff --git a/forms/source/component/FormComponent.cxx 
b/forms/source/component/FormComponent.cxx
index 9b5558eed5e6..7b6dd36c5e75 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1960,7 +1960,8 @@ void OBoundControlModel::connectToField(const 
Reference& rForm)
 m_xColumn.set( m_xField, UNO_QUERY );
 sal_Int32 nNullableFlag = ColumnValue::NO_NULLS;
 m_xField->getPropertyValue(PROPERTY_ISNULLABLE) >>= 
nNullableFlag;
-m_bRequired = (ColumnValue::NO_NULLS == nNullableFlag);
+// tdf#122319 - don't allow nullable form components if input 
is required
+m_bRequired = (ColumnValue::NO_NULLS == nNullableFlag || 
m_bInputRequired);
 // we're optimistic: in case of ColumnValue_NULLABLE_UNKNOWN 
we assume nullability...
 }
 else

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

[Caolán McNamara (via logerrit)]

 sfx2/source/dialog/backingwindow.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 24f231563133ceca55cfca8f7b704db98cd2a923
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 12:41:30 2022 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 14:54:31 2022 +0200

toggle state regardless of which toggle was used

Change-Id: I43c295e2cc39497dba8812f1c9e296068d07a224
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140977
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index e34e02ec2d40..ba55b7a6569d 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -602,7 +602,7 @@ IMPL_LINK( BackingWindow, ToggleHdl, weld::Toggleable&, 
rButton, void )
 mxTemplateButton->set_stack_background();
 mxActions->set_sensitive(true);
 }
-else if( &rButton == mxTemplateButton.get() )
+else
 {
 mxAllRecentThumbnails->Hide();
 initializeLocalView();

[Libreoffice-commits] core.git: offapi/com sw/inc sw/qa sw/source writerfilter/qa writerfilter/source

[Miklos Vajna (via logerrit)]

 offapi/com/sun/star/text/ContentControl.idl  |6 ++
 sw/inc/formatcontentcontrol.hxx  |7 ++
 sw/inc/unoprnms.hxx  |1 
 sw/qa/core/unocore/unocore.cxx   |2 
 sw/qa/extras/ooxmlexport/ooxmlexport17.cxx   |2 
 sw/source/core/txtnode/attrcontentcontrol.cxx|2 
 sw/source/core/unocore/unocontentcontrol.cxx |   28 
++
 sw/source/core/unocore/unomap1.cxx   |1 
 sw/source/filter/ww8/docxattributeoutput.cxx |6 ++
 writerfilter/qa/cppunittests/dmapper/SdtHelper.cxx   |5 +
 writerfilter/qa/cppunittests/dmapper/data/sdt-run-rich-text.docx |binary
 writerfilter/source/dmapper/DomainMapper.cxx |6 ++
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|6 ++
 writerfilter/source/dmapper/SdtHelper.cxx|4 +
 writerfilter/source/dmapper/SdtHelper.hxx|6 ++
 15 files changed, 82 insertions(+)

New commits:
commit 481a082469802ffce08cd8c110e715260015eb97
Author: Miklos Vajna 
AuthorDate: Wed Oct 5 08:22:19 2022 +0200
Commit: Miklos Vajna 
CommitDate: Wed Oct 5 14:53:03 2022 +0200

sw content controls: preserve alias

This is similar to  to preserve .

Related to

.

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

diff --git a/offapi/com/sun/star/text/ContentControl.idl 
b/offapi/com/sun/star/text/ContentControl.idl
index af5be9ac251e..d07dbfc49256 100644
--- a/offapi/com/sun/star/text/ContentControl.idl
+++ b/offapi/com/sun/star/text/ContentControl.idl
@@ -99,6 +99,12 @@ service ContentControl
 @since LibreOffice 7.5
 */
 [optional, property] boolean ComboBox;
+
+/** The alias: just remembered.
+
+@since LibreOffice 7.5
+*/
+[optional, property] string Alias;
 };
 
 
diff --git a/sw/inc/formatcontentcontrol.hxx b/sw/inc/formatcontentcontrol.hxx
index 41d35fd10fb8..6462bf49cd06 100644
--- a/sw/inc/formatcontentcontrol.hxx
+++ b/sw/inc/formatcontentcontrol.hxx
@@ -166,6 +166,9 @@ class SW_DLLPUBLIC SwContentControl : public 
sw::BroadcastingModify
 /// The color: just remembered.
 OUString m_aColor;
 
+/// The alias: just remembered.
+OUString m_aAlias;
+
 /// Stores a list item index, in case the doc model is not yet updated.
 std::optional m_oSelectedListItem;
 
@@ -322,6 +325,10 @@ public:
 
 const OUString& GetColor() const { return m_aColor; }
 
+void SetAlias(const OUString& rAlias) { m_aAlias = rAlias; }
+
+const OUString& GetAlias() const { return m_aAlias; }
+
 void SetReadWrite(bool bReadWrite) { m_bReadWrite = bReadWrite; }
 
 bool GetReadWrite() const { return m_bReadWrite; }
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index bb82bf3a1eef..850a789900df 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -890,6 +890,7 @@
 #define UNO_NAME_DATA_BINDING_XPATH "DataBindingXpath"
 #define UNO_NAME_DATA_BINDING_STORE_ITEM_ID "DataBindingStoreItemID"
 #define UNO_NAME_COLOR "Color"
+#define UNO_NAME_ALIAS "Alias"
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/core/unocore/unocore.cxx b/sw/qa/core/unocore/unocore.cxx
index 83efc0f9e5c2..23811a497566 100644
--- a/sw/qa/core/unocore/unocore.cxx
+++ b/sw/qa/core/unocore/unocore.cxx
@@ -624,6 +624,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, 
testContentControlDate)
 xContentControlProps->setPropertyValue(
 "DataBindingStoreItemID", 
uno::Any(OUString("{241A8A02-7FFD-488D-8827-63FBE74E8BC9}")));
 xContentControlProps->setPropertyValue("Color", 
uno::Any(OUString("008000")));
+xContentControlProps->setPropertyValue("Alias", 
uno::Any(OUString("myalias")));
 xText->insertTextContent(xCursor, xContentControl, /*bAbsorb=*/true);
 
 // Then make sure that the specified properties are set:
@@ -647,6 +648,7 @@ CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, 
testContentControlDate)
 CPPUNIT_ASSERT_EQUAL(OUString("{241A8A02-7FFD-488D-8827-63FBE74E8BC9}"),
  pContentControl->GetDataBindingStoreItemID());
 CPPUNIT_ASSERT_EQUAL(OUString("008000"), pContentControl->GetColor());
+CPPUNIT_ASSERT_EQUAL(OUString("myalias"), pContentControl->GetAlias());
 }
 
 CPPUNIT_TEST_FIXTURE(SwCoreUnocoreTest, testListIdState)
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
index d6488db0326e..5246edc2a1e7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport17.cxx
@@ -426,6 +426,7 @@

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

[Caolán McNamara (via logerrit)]

 sw/source/ui/misc/pggrid.cxx |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 713b19bde2dcd0a65e04bb99681e35cbfd2f25e9
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 09:49:17 2022 +0100
Commit: Xisco Fauli 
CommitDate: Wed Oct 5 14:04:52 2022 +0200

tdf#151316 recalc what dependencies should be sensitive

Change-Id: I40f78ec151c3d5901209b8587f6152ab76d04e88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140960
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
(cherry picked from commit 17612ee10f89a6bf5447a324a02eb0a73d7b27e1)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140961

diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 46f78140a927..e59e4112f439 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -460,15 +460,18 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, 
weld::MetricSpinButton&, rField, v
 
 IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::Toggleable&, rButton, void)
 {
-bool bEnable = m_xNoGridRB.get() != &rButton;
-m_xLayoutFL->set_sensitive(bEnable);
-m_xDisplayFL->set_sensitive(bEnable);
+if (!rButton.get_active())
+return;
+
+const bool bNoGrid = m_xNoGridRB.get() == &rButton;
+m_xLayoutFL->set_sensitive(!bNoGrid);
+m_xDisplayFL->set_sensitive(!bNoGrid);
 
 //one special case
-if (bEnable)
+if (!bNoGrid)
 DisplayGridHdl(*m_xDisplayCB);
 
-bEnable = m_xCharsGridRB.get() == &rButton;
+bool bEnable = m_xCharsGridRB.get() == &rButton;
 m_xSnapToCharsCB->set_sensitive(bEnable);
 
 bEnable = m_xLinesGridRB.get() == &rButton;
@@ -481,6 +484,10 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::Toggleable&, 
rButton, void)
 m_xCharWidthMF->set_sensitive(false);
 }
 
+//recalc which dependencies are sensitive
+if (!bNoGrid)
+TextSizeChangedHdl(*m_xTextSizeMF);
+
 GridModifyHdl();
 }
 

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

[Eike Rathke (via logerrit)]

 svtools/source/misc/langtab.cxx |   54 ++--
 1 file changed, 47 insertions(+), 7 deletions(-)

New commits:
commit a10d712f7020c00a49085d55b8905caa66729d1c
Author: Eike Rathke 
AuthorDate: Wed Oct 5 01:39:22 2022 +0200
Commit: Eike Rathke 
CommitDate: Wed Oct 5 13:23:23 2022 +0200

Use SvtLanguageTableImpl::AddEntry() to determine on-the-fly ScriptType

With a LanguageTag::ScriptType a language tag appears in the
corresponding Western/Asian/Complex language list.

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

diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx
index c3f1da4705d3..18099a828f27 100644
--- a/svtools/source/misc/langtab.cxx
+++ b/svtools/source/misc/langtab.cxx
@@ -23,6 +23,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -31,6 +32,8 @@
 #include 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
@@ -50,6 +53,11 @@ class SvtLanguageTableImpl
 {
 private:
 std::vector> m_aStrings;
+voidAddItem(const OUString& rLanguage, const LanguageType 
eType)
+{
+m_aStrings.emplace_back(rLanguage, eType);
+}
+
 public:
 
 SvtLanguageTableImpl();
@@ -59,10 +67,6 @@ public:
 LanguageTypeGetType( std::u16string_view rStr ) const;
 sal_uInt32  GetEntryCount() const;
 LanguageTypeGetTypeAtIndex( sal_uInt32 nIndex ) const;
-voidAddItem(const OUString& rLanguage, const LanguageType 
eType)
-{
-m_aStrings.emplace_back(rLanguage, eType);
-}
 LanguageTypeGetValue(sal_uInt32 nIndex) const
 {
 return (nIndex < m_aStrings.size()) ? m_aStrings[nIndex].second : 
LANGUAGE_DONTKNOW;
@@ -77,6 +81,7 @@ public:
 }
 return RESARRAY_INDEX_NOTFOUND;
 }
+voidAddEntry( const OUString& rString, const LanguageType 
eType);
 };
 
 struct theLanguageTable : public rtl::Static< SvtLanguageTableImpl, 
theLanguageTable > {};
@@ -204,7 +209,7 @@ SvtLanguageTableImpl::SvtLanguageTableImpl()
 aLang.setScriptType(LanguageTag::ScriptType(nType));
 sal_uInt32 nPos = FindIndex(nLangType);
 if (nPos == RESARRAY_INDEX_NOTFOUND)
-AddItem((aName.isEmpty() ? lcl_getDescription(aLang) : aName), 
nLangType);
+AddEntry( (aName.isEmpty() ? lcl_getDescription(aLang) : 
aName), nLangType);
 }
 }
 }
@@ -241,7 +246,7 @@ OUString SvtLanguageTableImpl::GetString( const 
LanguageType eType ) const
 // And add it to the table if it is an on-the-fly-id, which it usually is,
 // so it is available in all subsequent language boxes.
 if (LanguageTag::isOnTheFlyID( nLang))
-const_cast(this)->AddItem( sLangTag, nLang);
+const_cast(this)->AddEntry( sLangTag, nLang);
 
 return sLangTag;
 }
@@ -296,10 +301,45 @@ LanguageType SvtLanguageTable::GetLanguageTypeAtIndex( 
sal_uInt32 nIndex )
 return theLanguageTable::get().GetTypeAtIndex( nIndex);
 }
 
+void SvtLanguageTableImpl::AddEntry( const OUString& rString, const 
LanguageType eType )
+{
+if (LanguageTag::isOnTheFlyID(eType)
+&& LanguageTag::getOnTheFlyScriptType(eType) == 
LanguageTag::ScriptType::UNKNOWN)
+{
+// Classify the script type to distribute the entry into the proper
+// language list later.
+LanguageTag aLanguageTag(eType);
+const sal_Int16 nScriptClass = unicode::getScriptClassFromLanguageTag( 
aLanguageTag);
+LanguageTag::ScriptType eScriptType;
+switch (nScriptClass)
+{
+default:
+eScriptType = LanguageTag::ScriptType::WESTERN;
+assert(!"unexpected ScriptType");
+break;
+case css::i18n::ScriptType::WEAK:
+case css::i18n::ScriptType::LATIN:
+eScriptType = LanguageTag::ScriptType::WESTERN;
+break;
+case css::i18n::ScriptType::ASIAN:
+eScriptType = LanguageTag::ScriptType::CJK;
+break;
+case css::i18n::ScriptType::COMPLEX:
+/* TODO: determine if it would be LanguageTag::ScriptType::RTL
+ * instead; could that be done by
+ * getScriptClassFromLanguageTag() as well by asking Unicode
+ * properties? */
+eScriptType = LanguageTag::ScriptType::CTL;
+break;
+}
+aLanguageTag.setScriptType( eScriptType);
+}
+AddItem( rString, eType);
+}
 
 void SvtLanguageTable::AddLanguageTag( const LanguageTag& rLanguageTag )
 {
-theLanguageTable::get().AddItem( lcl_getDescription(rLanguageTag), 
rLanguageTag.getLanguageType());
+theLanguageTable::get().AddEntry( lcl_getDescription(rLanguageTag), 
rLanguageTag.getLanguageType());
 }
 
 /* vim:set shiftwidth=4 softtab

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

[Caolán McNamara (via logerrit)]

 sw/source/ui/misc/pggrid.cxx |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 159a117c2e6d7fe768c9f76be0bc9f792ace96eb
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 09:49:17 2022 +0100
Commit: Xisco Fauli 
CommitDate: Wed Oct 5 13:22:31 2022 +0200

tdf#151316 recalc what dependencies should be sensitive

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

diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 7f9b10cd447a..db3ade6edb6b 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -458,15 +458,18 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, 
weld::MetricSpinButton&, rField, v
 
 IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::Toggleable&, rButton, void)
 {
-bool bEnable = m_xNoGridRB.get() != &rButton;
-m_xLayoutFL->set_sensitive(bEnable);
-m_xDisplayFL->set_sensitive(bEnable);
+if (!rButton.get_active())
+return;
+
+const bool bNoGrid = m_xNoGridRB.get() == &rButton;
+m_xLayoutFL->set_sensitive(!bNoGrid);
+m_xDisplayFL->set_sensitive(!bNoGrid);
 
 //one special case
-if (bEnable)
+if (!bNoGrid)
 DisplayGridHdl(*m_xDisplayCB);
 
-bEnable = m_xCharsGridRB.get() == &rButton;
+bool bEnable = m_xCharsGridRB.get() == &rButton;
 m_xSnapToCharsCB->set_sensitive(bEnable);
 
 bEnable = m_xLinesGridRB.get() == &rButton;
@@ -479,6 +482,10 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::Toggleable&, 
rButton, void)
 m_xCharWidthMF->set_sensitive(false);
 }
 
+//recalc which dependencies are sensitive
+if (!bNoGrid)
+TextSizeChangedHdl(*m_xTextSizeMF);
+
 GridModifyHdl();
 }
 

[Libreoffice-commits] core.git: i18nutil/source include/i18nutil

[Eike Rathke (via logerrit)]

 i18nutil/source/utility/unicode.cxx |   32 
 include/i18nutil/unicode.hxx|9 +
 2 files changed, 41 insertions(+)

New commits:
commit ecc30ac20f559e47fc4a183942d73913d615ff3f
Author: Eike Rathke 
AuthorDate: Wed Oct 5 01:29:02 2022 +0200
Commit: Eike Rathke 
CommitDate: Wed Oct 5 12:05:01 2022 +0200

Introduce unicode::getScriptClassFromLanguageTag()

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

diff --git a/i18nutil/source/utility/unicode.cxx 
b/i18nutil/source/utility/unicode.cxx
index 5e479989eae9..33f1ca2f190e 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "unicode_data.h"
 #include 
 #include 
@@ -190,6 +191,37 @@ sal_Int16 
unicode::getScriptClassFromUScriptCode(UScriptCode eScript)
 return nRet;
 }
 
+sal_Int16 unicode::getScriptClassFromLanguageTag( const LanguageTag& 
rLanguageTag )
+{
+static UScriptCode nMaxScript = 
static_cast(u_getIntPropertyMaxValue(UCHAR_SCRIPT));
+constexpr int32_t nBuf = 42;
+UScriptCode aBuf[nBuf];
+if (rLanguageTag.hasScript())
+{
+aBuf[0] = static_cast(u_getPropertyValueEnum( 
UCHAR_SCRIPT,
+OUStringToOString( rLanguageTag.getScript(), 
RTL_TEXTENCODING_ASCII_US).getStr()));
+}
+else
+{
+OUString aName;
+if (rLanguageTag.getCountry().isEmpty())
+aName = rLanguageTag.getLanguage();
+else
+aName = rLanguageTag.getLanguage() + "-" + 
rLanguageTag.getCountry();
+UErrorCode status = U_ZERO_ERROR;
+const int32_t nScripts = uscript_getCode(
+OUStringToOString( aName, RTL_TEXTENCODING_ASCII_US).getStr(),
+aBuf, nBuf, &status);
+// U_BUFFER_OVERFLOW_ERROR would be set with too many scripts for 
buffer
+// and required capacity returned, but really..
+if (nScripts == 0 || !U_SUCCESS(status))
+return css::i18n::ScriptType::LATIN;
+}
+if (aBuf[0] > nMaxScript)
+return css::i18n::ScriptType::COMPLEX;
+return getScriptClassFromUScriptCode( aBuf[0]);
+}
+
 OString unicode::getExemplarLanguageForUScriptCode(UScriptCode eScript)
 {
 OString sRet;
diff --git a/include/i18nutil/unicode.hxx b/include/i18nutil/unicode.hxx
index 0ca14290981e..ebe50ce90384 100644
--- a/include/i18nutil/unicode.hxx
+++ b/include/i18nutil/unicode.hxx
@@ -82,6 +82,15 @@ public:
 //Format a number as a percentage according to the rules of the given
 //language, e.g. 100 -> "100%" for en-US vs "100 %" for de-DE
 static OUString formatPercent(double dNumber, const LanguageTag& rLangTag);
+
+/** Map a LanguageTag's language ISO 639 code or script ISO 15924 code or
+language-script or locale to Latin/Asian/Complex/Weak. If more than one
+script is used with a language(-country) tag then the first (default)
+script is mapped for that language.
+
+@return a css::i18n::ScriptType value.
+ */
+static sal_Int16 getScriptClassFromLanguageTag(const LanguageTag& 
rLanguageTag);
 };
 
 /*

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

[Caolán McNamara (via logerrit)]

 sw/source/ui/misc/pggrid.cxx |   17 -
 1 file changed, 12 insertions(+), 5 deletions(-)

New commits:
commit 384167ab8501ba5912068c0a9673864552d119f1
Author: Caolán McNamara 
AuthorDate: Wed Oct 5 09:49:17 2022 +0100
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 11:53:42 2022 +0200

tdf#151316 recalc what dependencies should be sensitive

Change-Id: I40f78ec151c3d5901209b8587f6152ab76d04e88
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140976
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 7f9b10cd447a..db3ade6edb6b 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -458,15 +458,18 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, 
weld::MetricSpinButton&, rField, v
 
 IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::Toggleable&, rButton, void)
 {
-bool bEnable = m_xNoGridRB.get() != &rButton;
-m_xLayoutFL->set_sensitive(bEnable);
-m_xDisplayFL->set_sensitive(bEnable);
+if (!rButton.get_active())
+return;
+
+const bool bNoGrid = m_xNoGridRB.get() == &rButton;
+m_xLayoutFL->set_sensitive(!bNoGrid);
+m_xDisplayFL->set_sensitive(!bNoGrid);
 
 //one special case
-if (bEnable)
+if (!bNoGrid)
 DisplayGridHdl(*m_xDisplayCB);
 
-bEnable = m_xCharsGridRB.get() == &rButton;
+bool bEnable = m_xCharsGridRB.get() == &rButton;
 m_xSnapToCharsCB->set_sensitive(bEnable);
 
 bEnable = m_xLinesGridRB.get() == &rButton;
@@ -479,6 +482,10 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::Toggleable&, 
rButton, void)
 m_xCharWidthMF->set_sensitive(false);
 }
 
+//recalc which dependencies are sensitive
+if (!bNoGrid)
+TextSizeChangedHdl(*m_xTextSizeMF);
+
 GridModifyHdl();
 }
 

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

[Nalini Prasad Dash (via logerrit)]

 writerperfect/source/writer/EBookImportFilter.hxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 837d52dbc296526f65e16b458152414059abd782
Author: Nalini Prasad Dash 
AuthorDate: Tue Oct 4 20:54:26 2022 +0530
Commit: Ilmari Lauhakangas 
CommitDate: Wed Oct 5 11:48:40 2022 +0200

tdf#143148 Use pragma once instead of include guards

Change-Id: Ib3b4a98560c278965a1e671171e1a84f600f09bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140948
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/writerperfect/source/writer/EBookImportFilter.hxx 
b/writerperfect/source/writer/EBookImportFilter.hxx
index 9ebdc9234a88..13307321b029 100644
--- a/writerperfect/source/writer/EBookImportFilter.hxx
+++ b/writerperfect/source/writer/EBookImportFilter.hxx
@@ -6,9 +6,7 @@
  * 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/.
  */
-
-#ifndef EBOOKIMPORTFILTER_HXX
-#define EBOOKIMPORTFILTER_HXX
+#pragma once
 
 #include 
 
@@ -39,6 +37,4 @@ private:
   utl::MediaDescriptor& rDescriptor) override;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: unotools/CppunitTest_unotools_fontcvt.mk unotools/Module_unotools.mk unotools/qa

[Chris Sherlock (via logerrit)]

 unotools/CppunitTest_unotools_fontcvt.mk |   30 
 unotools/Module_unotools.mk  |1 
 unotools/qa/unit/testRecodeString.cxx|   45 +++
 3 files changed, 76 insertions(+)

New commits:
commit 379ea0bb9e4836b212e004fd93abfc8067ec8929
Author: Chris Sherlock 
AuthorDate: Tue Oct 4 19:56:52 2022 +1100
Commit: Michael Stahl 
CommitDate: Wed Oct 5 11:18:36 2022 +0200

unotools: test ConvertChar::RecodeString()

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

diff --git a/unotools/CppunitTest_unotools_fontcvt.mk 
b/unotools/CppunitTest_unotools_fontcvt.mk
new file mode 100644
index ..16236c16c5d1
--- /dev/null
+++ b/unotools/CppunitTest_unotools_fontcvt.mk
@@ -0,0 +1,30 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_CppunitTest_CppunitTest,unotools_fontcvt))
+
+$(eval $(call gb_CppunitTest_use_external,unotools_fontcvt,boost_headers))
+
+$(eval $(call gb_CppunitTest_use_sdk_api,unotools_fontcvt))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,unotools_fontcvt, \
+unotools/qa/unit/testRecodeString \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,unotools_fontcvt, \
+   comphelper \
+   cppu \
+   cppuhelper \
+   tl \
+   sal \
+   svt \
+   utl \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/unotools/Module_unotools.mk b/unotools/Module_unotools.mk
index e069960530c3..d2e13a8520d8 100644
--- a/unotools/Module_unotools.mk
+++ b/unotools/Module_unotools.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,unotools,\
 $(eval $(call gb_Module_add_check_targets,unotools,\
 CppunitTest_unotools_configpaths \
 CppunitTest_unotools_fontdefs \
+CppunitTest_unotools_fontcvt \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/unotools/qa/unit/testRecodeString.cxx 
b/unotools/qa/unit/testRecodeString.cxx
new file mode 100644
index ..31e26257b96f
--- /dev/null
+++ b/unotools/qa/unit/testRecodeString.cxx
@@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-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/.
+ *
+ */
+
+#include 
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+class Test : public CppUnit::TestFixture
+{
+public:
+void testRecodeString();
+
+CPPUNIT_TEST_SUITE(Test);
+CPPUNIT_TEST(testRecodeString);
+
+CPPUNIT_TEST_SUITE_END();
+};
+
+void Test::testRecodeString()
+{
+// note, the below won't work with mergelibs as the class is not visible to 
the linker
+#if !ENABLE_MERGELIBS
+ConvertChar const* pConversion = ConvertChar::GetRecodeData(u"starbats", 
u"opensymbol");
+OUString aStr(u"u");
+pConversion->RecodeString(aStr, 0, 1);
+CPPUNIT_ASSERT_EQUAL(OUString(u""), aStr);
+#endif
+}
+
+CPPUNIT_TEST_SUITE_REGISTRATION(Test);
+CPPUNIT_PLUGIN_IMPLEMENT();
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

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

[Eike Rathke (via logerrit)]

 svl/source/numbers/zforfind.cxx |   16 +---
 1 file changed, 9 insertions(+), 7 deletions(-)

New commits:
commit e8934a94b44e5ceee790fe5eef86f7a4568a8ed0
Author: Eike Rathke 
AuthorDate: Mon Sep 26 22:52:02 2022 +0200
Commit: Michael Stahl 
CommitDate: Wed Oct 5 10:35:33 2022 +0200

Prevent erroneous fraction detection of not yet accepted date

May had happened if the locale's date separator is not '/' but a
preset format uses it (for example DD/MM/) and the locale's
date acceptance patterns do not contain D/M/Y so the first '/' did
not already lead to a possible date before a match against the
format is to be tried.

Change-Id: I7f91130da52564496a2b1369741328236dde10e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140632
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 0d3dd0aa54ad792f91d0905f3d46c13df3512d89)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140885
Reviewed-by: Michael Stahl 

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 081b3079a2bf..8bf00b3e196b 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -2605,15 +2605,17 @@ bool ImpSvNumberInputScan::ScanMidString( const 
OUString& rString, sal_uInt16 nS
 if (SkipChar('/', rString, nPos))   // fraction?
 {
 if ( eScannedType != SvNumFormatType::UNDEFINED &&  // already another 
type
- eScannedType != SvNumFormatType::DATE)   // except date
+ eScannedType != SvNumFormatType::DATE) // except date
 {
-return MatchedReturn(); // => jan/31/1994
+return MatchedReturn(); // => jan/31/1994
 }
-else if (eScannedType != SvNumFormatType::DATE &&// analyzed no 
date until now
- ( eSetType == SvNumFormatType::FRACTION ||  // and preset was 
fraction
-   (nNumericsCnt == 3 && // or 3 numbers
-(nStringPos == 3 ||  // and 3rd string 
particle
- (nStringPos == 4 && nSign)  // or 4th  if signed
+else if (eScannedType != SvNumFormatType::DATE &&   // analyzed no 
date until now
+ (eSetType == SvNumFormatType::FRACTION ||  // and preset was 
fraction
+  (nNumericsCnt == 3 && // or 3 numbers
+   (nStringPos == 3 ||  // and 4th string 
particle
+(nStringPos == 4 && nSign)) &&  // or 5th if signed
+   sStrArray[nStringPos-2].indexOf('/') == -1)))  // and not 
23/11/1999
+  // that was 
not accepted as date yet
 {
 SkipBlanks(rString, nPos);
 if (nPos == rString.getLength())

[Libreoffice-commits] core.git: Branch 'feature/cib_contract6721c' - dictionaries

[Gabor Kelemen (via logerrit)]

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

New commits:
commit 50924ca766203654b40fe0923a0ea2c217e463b5
Author: Gabor Kelemen 
AuthorDate: Wed Oct 5 10:08:34 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Oct 5 10:08:34 2022 +0200

Update git submodules

* Update dictionaries from branch 'feature/cib_contract6721c'
  to 3388c93f35a0adc16552415080c01b5225153ef8
  - Extend --enable-mpl-subset options effect to some dictionaries

Change-Id: I09919a3dde90f986998d211fb84380497553a322
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/140936
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/dictionaries b/dictionaries
index 447a883184ea..3388c93f35a0 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 447a883184eaa8643fd6ae9a85ca64ef1d912d35
+Subproject commit 3388c93f35a0adc16552415080c01b5225153ef8

[Libreoffice-commits] dictionaries.git: Changes to 'feature/cib_contract6721c'

[Gabor Kelemen (via logerrit)]

New branch 'feature/cib_contract6721c' available with the following commits:
commit 3388c93f35a0adc16552415080c01b5225153ef8
Author: Gabor Kelemen 
Date:   Tue Oct 4 01:53:58 2022 +0200

Extend --enable-mpl-subset options effect to some dictionaries

Change-Id: I09919a3dde90f986998d211fb84380497553a322
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/140936
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

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

[Xisco Fauli (via logerrit)]

 reportdesign/source/ui/misc/UITools.cxx |   40 
 1 file changed, 20 insertions(+), 20 deletions(-)

New commits:
commit bf3df0fc73fc3757d3abb94465d5bcb2106c355f
Author: Xisco Fauli 
AuthorDate: Tue Oct 4 11:25:17 2022 +0200
Commit: Xisco Fauli 
CommitDate: Wed Oct 5 10:01:14 2022 +0200

reportdesign: keep the constant values in a comment

Similar to 07aa8138db9bbaf222f2b7cea12a9f7d0a8192d7
"tdf#151260: crash in SfxItemPool::SetDefaults
(reportdesign/ReportController)"

Since 9a444884c3b221c9bd7b0aa4476c160921c7fc35
"tdf#150222 reporbuilder, set font for a text box crashes"

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

diff --git a/reportdesign/source/ui/misc/UITools.cxx 
b/reportdesign/source/ui/misc/UITools.cxx
index 57b4c32a7a7b..99f79ff217d7 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -557,26 +557,26 @@ bool openCharDialog( const 
uno::Reference& _rxRep
 // UNO->ItemSet
 static SfxItemInfo aItemInfos[] =
 {
-{ 0,  true },
-{ 0,  true },
-{ 0,   true },
-{ 0,  true },
-{ 0, true },
-{ 0,   true },
-{ 0,  true },
-{ 0,   true },
-{ 0,true },
-{ 0,  true },
-{ 0,  true },
-{ 0,  true },
-{ 0, true },
-{ 0,true },
-{ 0,true },
-{ 0,true },
-{ 0,true },
-{ 0, true },
-{ 0, true },
-{ 0, true },
+{ 0,  true }, // XATTR_FILLSTYLE
+{ 0,  true }, // XATTR_FILLCOLOR
+{ 0,   true }, // XATTR_FILLGRADIENT
+{ 0,  true }, // XATTR_FILLHATCH
+{ 0, true }, // XATTR_FILLBITMAP
+{ 0,   true }, // XATTR_FILLTRANSPARENCE
+{ 0,  true }, // XATTR_GRADIENTSTEPCOUNT
+{ 0,   true }, // XATTR_FILLBMP_TILE
+{ 0,true }, // XATTR_FILLBMP_POS
+{ 0,  true }, // XATTR_FILLBMP_SIZEX
+{ 0,  true }, // XATTR_FILLBMP_SIZEY
+{ 0,  true }, // XATTR_FILLFLOATTRANSPARENCE
+{ 0, true }, // XATTR_SECONDARYFILLCOLOR
+{ 0,true }, // XATTR_FILLBMP_SIZELOG
+{ 0,true }, // XATTR_FILLBMP_TILEOFFSETX
+{ 0,true }, // XATTR_FILLBMP_TILEOFFSETY
+{ 0,true }, // XATTR_FILLBMP_STRETCH
+{ 0, true }, // XATTR_FILLBMP_POSOFFSETX
+{ 0, true }, // XATTR_FILLBMP_POSOFFSETY
+{ 0, true }, // XATTR_FILLBACKGROUND
 
 { SID_ATTR_CHAR_FONT, true },
 { SID_ATTR_CHAR_FONTHEIGHT, true },

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

[Miklos Vajna (via logerrit)]

 sw/inc/charfmt.hxx|3 ++-
 sw/inc/fmtcol.hxx |2 +-
 sw/qa/core/doc/doc.cxx|   30 ++
 sw/source/core/doc/fmtcol.cxx |   15 ++-
 sw/source/core/txtnode/chrfmt.cxx |   19 ++-
 sw/source/uibase/app/docstyle.cxx |4 ++--
 6 files changed, 67 insertions(+), 6 deletions(-)

New commits:
commit 6bbb7140c938d8f494ce75be5b5c7a3ae440ca87
Author: Miklos Vajna 
AuthorDate: Mon Oct 3 23:04:41 2022 +0200
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 09:54:48 2022 +0200

tdf#151094 ODT export: fix crash when linked paragraph style is deleted

If a document contains a linked paragraph-character style pair and the
paragraph style gets deleted, we crash on save.

Commit 3227975c0f42ff23d528f5ab94b4538c8af764c (sw: paragraph styles:
add doc model & UNO API for a linked character style, 2021-09-24) added
support for linked para/char styles, but it failed to get the lifecycle
correctly when it comes to deleting these styles.

Fix the dangling para/char style references by explicitly looking what
styles may refer to us and clear their references.

An alternative would be to clear the "link" pointer of our own "link"
pointer only, but broken documents may e.g. link multiple paragraph
styles to a single character style, so this is probably not enough.

Change-Id: I9465d43e90cf54c3c02bffda3e7c75b52c543a65
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140930
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140937
(cherry picked from commit 7746f532a1e89bb946b40b5c111acc27e78ab812)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140955
Reviewed-by: Michael Stahl 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/inc/charfmt.hxx b/sw/inc/charfmt.hxx
index e08d2f5f3a3f..84571d26263a 100644
--- a/sw/inc/charfmt.hxx
+++ b/sw/inc/charfmt.hxx
@@ -36,10 +36,11 @@ class SW_DLLPUBLIC SwCharFormat final : public SwFormat
 {}
 
 public:
+~SwCharFormat();
 
 void dumpAsXml(xmlTextWriterPtr pWriter) const;
 
-void SetLinkedParaFormat(SwTextFormatColl& rLink);
+void SetLinkedParaFormat(SwTextFormatColl* pLink);
 
 const SwTextFormatColl* GetLinkedParaFormat() const;
 };
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx
index 1b1bd7d2e46d..be547df3d840 100644
--- a/sw/inc/fmtcol.hxx
+++ b/sw/inc/fmtcol.hxx
@@ -103,7 +103,7 @@ public:
 inline void SetNextTextFormatColl(SwTextFormatColl& rNext);
 SwTextFormatColl& GetNextTextFormatColl() const { return 
*mpNextTextFormatColl; }
 
-void SetLinkedCharFormat(SwCharFormat& rLink);
+void SetLinkedCharFormat(SwCharFormat* pLink);
 
 const SwCharFormat* GetLinkedCharFormat() const;
 
diff --git a/sw/qa/core/doc/doc.cxx b/sw/qa/core/doc/doc.cxx
index 520041f44562..c13e7a8d6a55 100644
--- a/sw/qa/core/doc/doc.cxx
+++ b/sw/qa/core/doc/doc.cxx
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -255,6 +256,35 @@ CPPUNIT_TEST_FIXTURE(SwCoreDocTest, 
testContentControlDelete)
 CPPUNIT_ASSERT_EQUAL(OUString("\x0001test\x0001"), pTextNode->GetText());
 }
 
+CPPUNIT_TEST_FIXTURE(SwCoreDocTest, testLinkedStyleDelete)
+{
+// Given a document with linked styles: myparastyle is linked to 
mycharstyle and vica versa:
+createSwDoc();
+uno::Reference xFactory(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xParaStyle(
+xFactory->createInstance("com.sun.star.style.ParagraphStyle"), 
uno::UNO_QUERY);
+uno::Reference xCharStyle(
+xFactory->createInstance("com.sun.star.style.CharacterStyle"), 
uno::UNO_QUERY);
+uno::Reference 
xParaStyles(getStyles("ParagraphStyles"),
+  uno::UNO_QUERY);
+xParaStyles->insertByName("myparastyle", uno::Any(xParaStyle));
+uno::Reference 
xCharStyles(getStyles("CharacterStyles"),
+  uno::UNO_QUERY);
+xCharStyles->insertByName("mycharstyle", uno::Any(xCharStyle));
+xParaStyle->setPropertyValue("LinkStyle", 
uno::Any(OUString("mycharstyle")));
+xCharStyle->setPropertyValue("LinkStyle", 
uno::Any(OUString("myparastyle")));
+
+// When deleting the paragraph style (and only that):
+xParaStyles->removeByName("myparastyle");
+
+// Then make sure we don't crash on save:
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+uno::Sequence aArgs = {
+comphelper::makePropertyValue("FilterName", OUString("writer8")),
+};
+xStorable->storeAsURL(maTempFile.GetURL(), aArgs);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 9cc951b52a0c..e020aab191f4 100644
---

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

[Michael Stahl (via logerrit)]

 sw/inc/unoredline.hxx |3 +++
 sw/source/core/unocore/unoredline.cxx |5 +
 2 files changed, 8 insertions(+)

New commits:
commit 5b418bd88c1f5b04490d33308ff84852753fb4ab
Author: Michael Stahl 
AuthorDate: Fri Sep 23 18:11:56 2022 +0200
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 09:54:03 2022 +0200

rhbz#2122948 sw: fix ODF import of fieldmark in redline

The problem is that SwXText::compareRegionStarts() calls
SwXText::CreateCursor() which creates a cursor on the last node in the
body text, but it's actually a redline.

Override SwXRedlineText::CreateCursor() to create a cursor in the
redline text.

Complete mystery why SwXText has 2 virtual functions to create
cursors in the first place.

(regression from commit 463178fef5c22f1a04d10e54491852d56e2038b0)

Change-Id: I0f3bcf4eda25f1ac7e1c1b0cf47a920f8302d2b7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140504
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit c80a3ef9f434230ae3d5ffec902edc19f34f75f7)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140595
Reviewed-by: Xisco Fauli 
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Caolán McNamara 

diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index a73ede766af6..3a7273a199d7 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -39,6 +39,9 @@ class SwXRedlineText final :
 SwNodeIndex m_aNodeIndex;
 virtual const SwStartNode *GetStartNode() const override;
 
+virtual css::uno::Reference< css::text::XTextCursor >
+CreateCursor() override;
+
 public:
 SwXRedlineText(SwDoc* pDoc, const SwNodeIndex& aNodeIndex);
 
diff --git a/sw/source/core/unocore/unoredline.cxx 
b/sw/source/core/unocore/unoredline.cxx
index 197a5542b072..942243e0cd0f 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -90,6 +90,11 @@ uno::Sequence SwXRedlineText::getImplementationId()
 return css::uno::Sequence();
 }
 
+uno::Reference SwXRedlineText::CreateCursor()
+{
+return createTextCursor();
+}
+
 uno::Reference SwXRedlineText::createTextCursor()
 {
 SolarMutexGuard aGuard;

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

[Eike Rathke (via logerrit)]

 sc/source/ui/app/inputhdl.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 1ea5633c8ca31fad574ea9fd98ddb20425054b48
Author: Eike Rathke 
AuthorDate: Thu Sep 22 18:32:13 2022 +0200
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 09:52:58 2022 +0200

Fix string length assertion and handle parentheses in multi-line formula

soffice.bin: include/rtl/ustring.hxx:842: sal_Unicode 
rtl::OUString::operator[](sal_Int32) const: Assert ion `index >= 0 && 
static_cast(index) < static_cast(getLength())' failed.

when editing a paragraph (line) longer than the first, because the
string was always obtained from the first paragraph but the
position from the current selection.

Also match parentheses in the current paragraph, not somewhere
else in the first paragraph.. still we're matching only within one
paragraph.

Change-Id: I955fd371c1e248ce58735a5b61603bbce6c997db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140446
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 1df910dac84b4690371f2fc84299e3a918529484)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140387
Reviewed-by: Michael Stahl 
Reviewed-by: Xisco Fauli 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index b837cb2d089b..dd1f9f61958a 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -2171,10 +2171,11 @@ void ScInputHandler::UpdateParenthesis()
 {
 // Examine character left to the cursor
 sal_Int32 nPos = aSel.nStartPos - 1;
-OUString aFormula = mpEditEngine->GetText(0);
+OUString aFormula = mpEditEngine->GetText(aSel.nStartPara);
 sal_Unicode c = aFormula[nPos];
 if ( c == '(' || c == ')' )
 {
+// Note this matches only within one paragraph.
 sal_Int32 nOther = lcl_MatchParenthesis( aFormula, nPos );
 if ( nOther != -1 )
 {
@@ -2190,9 +2191,9 @@ void ScInputHandler::UpdateParenthesis()
 mpEditEngine->RemoveCharAttribs( i, 
EE_CHAR_WEIGHT );
 }
 
-ESelection aSelThis( 0,nPos, 0,nPos+1 );
+ESelection aSelThis( aSel.nStartPara, nPos, 
aSel.nStartPara, nPos+1);
 mpEditEngine->QuickSetAttribs( aSet, aSelThis );
-ESelection aSelOther( 0,nOther, 0,nOther+1 );
+ESelection aSelOther( aSel.nStartPara, nOther, 
aSel.nStartPara, nOther+1);
 mpEditEngine->QuickSetAttribs( aSet, aSelOther );
 
 // Dummy InsertText for Update and Paint (selection is 
empty)

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

[Luboš Luňák (via logerrit)]

 include/svl/sharedstringpool.hxx |3 +
 sc/qa/unit/ucalc.cxx |   29 ---
 svl/qa/unit/svl.cxx  |   67 +--
 svl/source/misc/sharedstringpool.cxx |3 +
 4 files changed, 69 insertions(+), 33 deletions(-)

New commits:
commit 97715aacd8aa32bbd0fd4e0a3fa0bdb8e7fbeaa5
Author: Luboš Luňák 
AuthorDate: Thu Sep 22 10:34:04 2022 +0200
Commit: Caolán McNamara 
CommitDate: Wed Oct 5 09:52:25 2022 +0200

make sure SharedString::EMPTY_STRING is interned in pools (tdf#150647)

Without this, it may not actually be there, so interning "" would
use a different string instance, and then comparing with
SharedString::getEmptyString() would actually compare non-equal.

Change-Id: I22660f63aa321e3a8f72cfb96df1db56e08fbb84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140402
Tested-by: Jenkins
Reviewed-by: Eike Rathke 
(cherry picked from commit e47e0cb0ad1dc3554e9b57f8562a217cf785edbf)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140497
Reviewed-by: Xisco Fauli 
(cherry picked from commit 84dae47863f3367308cf1c5f80d45a43c3ef)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140601
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/svl/sharedstringpool.hxx b/include/svl/sharedstringpool.hxx
index ff270eef5aa6..6880fec2a101 100644
--- a/include/svl/sharedstringpool.hxx
+++ b/include/svl/sharedstringpool.hxx
@@ -53,8 +53,9 @@ public:
  */
 void purge();
 
+// For unit tests. Note that an "empty" pool may contain some internal 
items,
+// such as SharedString::getEmptyString().
 size_t getCount() const;
-
 size_t getCountIgnoreCase() const;
 };
 }
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index db371c46ddc8..df937c50f2d3 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -380,6 +380,10 @@ void Test::testSharedStringPool()
 {
 m_pDoc->InsertTab(0, "foo");
 
+svl::SharedStringPool& rPool = m_pDoc->GetSharedStringPool();
+size_t extraCount = rPool.getCount(); // internal items such as 
SharedString::getEmptyString()
+size_t extraCountIgnoreCase = rPool.getCountIgnoreCase();
+
 // Strings that are identical.
 m_pDoc->SetString(ScAddress(0,0,0), "Andy");  // A1
 m_pDoc->SetString(ScAddress(0,1,0), "Andy");  // A2
@@ -417,40 +421,39 @@ void Test::testSharedStringPool()
 }
 
 // Check the string counts after purging. Purging shouldn't remove any 
strings in this case.
-svl::SharedStringPool& rPool = m_pDoc->GetSharedStringPool();
 rPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(5), rPool.getCount());
-CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCountIgnoreCase());
+CPPUNIT_ASSERT_EQUAL(5+extraCount, rPool.getCount());
+CPPUNIT_ASSERT_EQUAL(2+extraCountIgnoreCase, rPool.getCountIgnoreCase());
 
 // Clear A1 and purge again.
 clearRange(m_pDoc, ScAddress(0,0,0));
 rPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(5), rPool.getCount());
-CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCountIgnoreCase());
+CPPUNIT_ASSERT_EQUAL(5+extraCount, rPool.getCount());
+CPPUNIT_ASSERT_EQUAL(2+extraCountIgnoreCase, rPool.getCountIgnoreCase());
 
 // Clear A2 and purge again.
 clearRange(m_pDoc, ScAddress(0,1,0));
 rPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(4), rPool.getCount());
-CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCountIgnoreCase());
+CPPUNIT_ASSERT_EQUAL(4+extraCount, rPool.getCount());
+CPPUNIT_ASSERT_EQUAL(2+extraCountIgnoreCase, rPool.getCountIgnoreCase());
 
 // Clear A3 and purge again.
 clearRange(m_pDoc, ScAddress(0,2,0));
 rPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(3), rPool.getCount());
-CPPUNIT_ASSERT_EQUAL(static_cast(2), rPool.getCountIgnoreCase());
+CPPUNIT_ASSERT_EQUAL(3+extraCount, rPool.getCount());
+CPPUNIT_ASSERT_EQUAL(2+extraCountIgnoreCase, rPool.getCountIgnoreCase());
 
 // Clear A4 and purge again.
 clearRange(m_pDoc, ScAddress(0,3,0));
 rPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(1), rPool.getCount());
-CPPUNIT_ASSERT_EQUAL(static_cast(1), rPool.getCountIgnoreCase());
+CPPUNIT_ASSERT_EQUAL(1+extraCount, rPool.getCount());
+CPPUNIT_ASSERT_EQUAL(1+extraCountIgnoreCase, rPool.getCountIgnoreCase());
 
 // Clear A5 and the pool should be completely empty.
 clearRange(m_pDoc, ScAddress(0,4,0));
 rPool.purge();
-CPPUNIT_ASSERT_EQUAL(static_cast(0), rPool.getCount());
-CPPUNIT_ASSERT_EQUAL(static_cast(0), rPool.getCountIgnoreCase());
+CPPUNIT_ASSERT_EQUAL(extraCount, rPool.getCount());
+CPPUNIT_ASSERT_EQUAL(extraCountIgnoreCase, rPool.getCountIgnoreCase());
 
 // Now, compare string and edit text cells.
 m_pDoc->SetString(ScAddress(0,0,0), "Andy and Bruce"); // A1
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index f125305783c5..19a8c2b

[Libreoffice-commits] core.git: dictionaries

[Gabor Kelemen (via logerrit)]

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

New commits:
commit ca1fd7535770139044f7c1a9f7e59a082d710b6d
Author: Gabor Kelemen 
AuthorDate: Wed Oct 5 09:14:13 2022 +0200
Commit: Gerrit Code Review 
CommitDate: Wed Oct 5 09:14:13 2022 +0200

Update git submodules

* Update dictionaries from branch 'master'
  to 0416c229fe3a2a6bc9d661a077e77264cd9d6929
  - Extend --enable-mpl-subset options effect to some dictionaries

Change-Id: I09919a3dde90f986998d211fb84380497553a322
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/140936
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/dictionaries b/dictionaries
index 9e27d044d98e..0416c229fe3a 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 9e27d044d98e65f89af8c86df722a77be827bdc8
+Subproject commit 0416c229fe3a2a6bc9d661a077e77264cd9d6929

[Libreoffice-commits] dictionaries.git: Module_dictionaries.mk

[Gabor Kelemen (via logerrit)]

 Module_dictionaries.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0416c229fe3a2a6bc9d661a077e77264cd9d6929
Author: Gabor Kelemen 
AuthorDate: Tue Oct 4 01:53:58 2022 +0200
Commit: Gabor Kelemen 
CommitDate: Wed Oct 5 09:14:09 2022 +0200

Extend --enable-mpl-subset options effect to some dictionaries

Change-Id: I09919a3dde90f986998d211fb84380497553a322
Reviewed-on: https://gerrit.libreoffice.org/c/dictionaries/+/140936
Tested-by: Gabor Kelemen 
Reviewed-by: Gabor Kelemen 

diff --git a/Module_dictionaries.mk b/Module_dictionaries.mk
index b565e7a..1115c52 100644
--- a/Module_dictionaries.mk
+++ b/Module_dictionaries.mk
@@ -30,9 +30,9 @@ $(eval $(call gb_Module_add_l10n_targets,dictionaries,\
Dictionary_ckb \
Dictionary_cs \
Dictionary_da \
-   Dictionary_de \
+   $(if $(MPL_SUBSET),,Dictionary_de) \
Dictionary_el \
-   Dictionary_en \
+   $(if $(MPL_SUBSET),,Dictionary_en) \
Dictionary_eo \
Dictionary_es \
Dictionary_et \
@@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_l10n_targets,dictionaries,\
Dictionary_hu \
Dictionary_id \
Dictionary_is \
-   Dictionary_it \
+   $(if $(MPL_SUBSET),,Dictionary_it) \
Dictionary_kmr-Latn \
Dictionary_ko-KR \
Dictionary_lo \

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

[Khaled Hosny (via logerrit)]

 sw/source/core/doc/DocumentStylePoolManager.cxx |   15 ---
 1 file changed, 15 deletions(-)

New commits:
commit 7199097b1602f057129a12b3771220c1bc23fd1e
Author: Khaled Hosny 
AuthorDate: Mon Oct 3 13:06:19 2022 +0200
Commit: خالد حسني 
CommitDate: Wed Oct 5 09:13:08 2022 +0200

tdf#126657, tdf#145104: Don’t set language to none on defined styles

Language is used for more things than spell checking (localized digits,
accessibility, OpenType layout, and probably more).

A better way is needed to disable spell checking for parts of the
document by default while keeping the language alone, but right now I’m
reverting these changes because they are workarounds for essentially
cosmetic issues.

This reverts the following commits:

commit ca91beb9d983754a5cba9e3df1bf18295e6640a0
Author: Vladimir Glazounov 
Date:   Wed Jun 4 08:50:40 2008 +

INTEGRATION: CWS sw30bf04 (1.51.2); FILE MERGED
2008/05/13 07:20:17 fme 1.51.2.1: #i40133# rail: Set internet link 
style language to none to prevent spell checking

commit 137a1d5380e310a43d36932c643e1331a94fd70d
Author: Heiko Tietze 
Date:   Mon Jul 19 16:40:50 2021 +0200

Resolves tdf#143066 - Language set to None for indices

Change-Id: Idc9455f3f04e661bd00a9829dd0f0916844dc8eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140902
Tested-by: Jenkins
Reviewed-by: خالد حسني 
(cherry picked from commit 2cca160f8bfc4597cf0ad3aaaf0017a5210ea0ec)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140958

diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx 
b/sw/source/core/doc/DocumentStylePoolManager.cxx
index a37365186330..cba46902bbb8 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -823,14 +823,6 @@ SwTextFormatColl* 
DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
 aSet.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
 aSet.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) );
 }
-// tdf#143066 : set language to 'none' to prevent spell 
checking for indices
-if (nId == RES_POOLCOLL_REGISTER_BASE)
-{
-aSet.Put( SvxLanguageItem( LANGUAGE_NONE, 
RES_CHRATR_LANGUAGE ) );
-aSet.Put( SvxLanguageItem( LANGUAGE_NONE, 
RES_CHRATR_CJK_LANGUAGE ) );
-aSet.Put( SvxLanguageItem( LANGUAGE_NONE, 
RES_CHRATR_CTL_LANGUAGE ) );
-}
-break;
 }
 break;
 
@@ -1559,19 +1551,12 @@ SwFormat* DocumentStylePoolManager::GetFormatFromPool( 
sal_uInt16 nId )
 {
 aSet.Put( SvxColorItem( COL_BLUE, RES_CHRATR_COLOR ) );
 aSet.Put( SvxUnderlineItem( LINESTYLE_SINGLE, RES_CHRATR_UNDERLINE 
) );
-// i40133: patch submitted by rail: set language to 'none' to 
prevent spell checking:
-aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) );
-aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CJK_LANGUAGE 
) );
-aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CTL_LANGUAGE 
) );
 }
 break;
 case RES_POOLCHR_INET_VISIT:
 {
 aSet.Put( SvxColorItem( COL_RED, RES_CHRATR_COLOR ) );
 aSet.Put( SvxUnderlineItem( LINESTYLE_SINGLE, RES_CHRATR_UNDERLINE 
) );
-aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_LANGUAGE ) );
-aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CJK_LANGUAGE 
) );
-aSet.Put( SvxLanguageItem( LANGUAGE_NONE, RES_CHRATR_CTL_LANGUAGE 
) );
 }
 break;
 case RES_POOLCHR_JUMPEDIT: