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

[Noel Grandin (via logerrit)]

 svx/source/table/cell.cxx |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit aaa077ccf4600f582cd33b7510f0d911bf5845d6
Author: Noel Grandin 
AuthorDate: Thu Apr 13 21:26:43 2023 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 17 12:52:04 2023 +0200

tdf#154501 - Fileopen PPTX: Table with rotated text wrong

regression from

commit eec42f0dbcc79a4c9f456ce97fa1066b8031ea28
Author: Noel Grandin 
Date:   Sun Aug 15 17:35:58 2021 +0200
pass OutlinerParaObject around by value

where some of code I converted needed to be mutating the
OutlinerParaObject that something else held, rather than mutating
a local copy.

Change-Id: Ib91dddb3fc0d4190868f9fd59becb0d366af5e19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150376
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit ad97694737c99889bc0eb21efccb83768d510361)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150330
Reviewed-by: Xisco Fauli 

diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 27c928eb20f3..ba335ca27388 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -308,14 +308,13 @@ namespace sdr::properties
 rObj.SetVerticalWriting(bVertical);
 
 // Set a cell vertical property
-std::optional pParaObj = 
mxCell->CreateEditOutlinerParaObject();
-
-if( !pParaObj && mxCell->GetOutlinerParaObject() )
-pParaObj = *mxCell->GetOutlinerParaObject();
+std::optional pEditParaObj = 
mxCell->CreateEditOutlinerParaObject();
 
-if(pParaObj)
+if( !pEditParaObj && mxCell->GetOutlinerParaObject() )
 {
-pParaObj->SetVertical(bVertical);
+OutlinerParaObject* pParaObj = 
mxCell->GetOutlinerParaObject();
+if(pParaObj)
+pParaObj->SetVertical(bVertical);
 }
 }
 
@@ -324,22 +323,23 @@ namespace sdr::properties
 const SvxTextRotateItem* pRotateItem = static_cast(pNewItem);
 
 // Set a cell vertical property
-std::optional pParaObj = 
mxCell->CreateEditOutlinerParaObject();
+std::optional pEditParaObj = 
mxCell->CreateEditOutlinerParaObject();
 
-if (!pParaObj && mxCell->GetOutlinerParaObject())
-pParaObj = *mxCell->GetOutlinerParaObject();
-
-if (pParaObj)
+if (!pEditParaObj && mxCell->GetOutlinerParaObject())
 {
-if(pRotateItem->IsVertical() && 
pRotateItem->IsTopToBottom())
-pParaObj->SetRotation(TextRotation::TOPTOBOTTOM);
-else if (pRotateItem->IsVertical())
-pParaObj->SetRotation(TextRotation::BOTTOMTOTOP);
-else
-pParaObj->SetRotation(TextRotation::NONE);
+OutlinerParaObject* pParaObj = 
mxCell->GetOutlinerParaObject();
+if (pParaObj)
+{
+if(pRotateItem->IsVertical() && 
pRotateItem->IsTopToBottom())
+pParaObj->SetRotation(TextRotation::TOPTOBOTTOM);
+else if (pRotateItem->IsVertical())
+pParaObj->SetRotation(TextRotation::BOTTOMTOTOP);
+else
+pParaObj->SetRotation(TextRotation::NONE);
+}
 }
 
-   // Change autogrow direction
+// Change autogrow direction
 SdrTextObj& rObj = static_cast(GetSdrObject());
 
 // rescue object size

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

[Mike Kaganski (via logerrit)]

 sw/qa/extras/layout/data/wideBoxInFootnote.fodt |   24 +++
 sw/qa/extras/layout/layout2.cxx |   29 
 sw/source/core/text/itrform2.cxx|2 +
 3 files changed, 55 insertions(+)

New commits:
commit 16fca224a398b562d009fb562493fd5460bb3dc5
Author: Mike Kaganski 
AuthorDate: Thu Apr 13 23:50:07 2023 +0300
Commit: Xisco Fauli 
CommitDate: Mon Apr 17 13:01:45 2023 +0200

tdf#138124: do not reset IsFootnoteDone status in line layout

Similar to IsNumDone

Change-Id: I64c713148b613ca1db4a30cde13bec5a6744accc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150378
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150434
Reviewed-by: Xisco Fauli 

diff --git a/sw/qa/extras/layout/data/wideBoxInFootnote.fodt 
b/sw/qa/extras/layout/data/wideBoxInFootnote.fodt
new file mode 100644
index ..f63eaa6fa621
--- /dev/null
+++ b/sw/qa/extras/layout/data/wideBoxInFootnote.fodt
@@ -0,0 +1,24 @@
+
+
+
+ 
+  
+   
+  
+  
+   
+  
+ 
+ 
+  
+ 
+ 
+  
+   1
+ 
+  
+ 
+
+  
+ 
+
\ No newline at end of file
diff --git a/sw/qa/extras/layout/layout2.cxx b/sw/qa/extras/layout/layout2.cxx
index 1e72bd335227..bd939bc5d661 100644
--- a/sw/qa/extras/layout/layout2.cxx
+++ b/sw/qa/extras/layout/layout2.cxx
@@ -18,6 +18,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -2744,6 +2745,34 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf153136)
 // CPPUNIT_ASSERT_GREATER(large, height);
 }
 
+CPPUNIT_TEST_FIXTURE(SwLayoutWriter2, testTdf138124)
+{
+// When the only portion after the footnote number is a FlyCnt, and it 
doesn't fit into
+// the page width, it should be moved to the next line without the 
footnote number, and
+// not loop, nor OOM, nor fail assertions.
+
+createSwDoc("wideBoxInFootnote.fodt");
+Scheduler::ProcessEventsToIdle();
+
+// Without the fix in place, the layout would loop, creating new 
FootnoteNum portions
+// indefinitely, until OOM.
+// If the footnote paragraph had no orphan control, then the loop would 
finally end,
+// but an assertion in SwTextPainter::DrawTextLine would fail during paint.
+
+xmlDocUniquePtr pXml = parseLayoutDump();
+assertXPath(pXml, "/root/page", 1);
+assertXPath(pXml, "/root/page/ftncont/ftn/txt/anchored", 1);
+
+// And finally, if there were no assertion in SwTextPainter::DrawTextLine, 
it would have
+// produced multiple lines with FootnoteNum portions, failing the 
following check like
+// - Expected: 1
+// - Actual  : 49
+
+assertXPath(pXml,
+
"/root/page/ftncont/ftn/txt//SwFieldPortion[@type='PortionType::FootnoteNum']", 
1);
+assertXPath(pXml, 
"/root/page/ftncont/ftn/txt//SwLinePortion[@type='PortionType::FlyCnt']", 1);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 91f73ed87825..ea420b0a0b30 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -1914,6 +1914,7 @@ TextFrameIndex SwTextFormatter::FormatLine(TextFrameIndex 
const nStartPos)
 
 // These values must not be reset by FormatReset();
 const bool bOldNumDone = GetInfo().IsNumDone();
+const bool bOldFootnoteDone = GetInfo().IsFootnoteDone();
 const bool bOldArrowDone = GetInfo().IsArrowDone();
 const bool bOldErgoDone = GetInfo().IsErgoDone();
 
@@ -1921,6 +1922,7 @@ TextFrameIndex SwTextFormatter::FormatLine(TextFrameIndex 
const nStartPos)
 FormatReset( GetInfo() );
 
 GetInfo().SetNumDone( bOldNumDone );
+GetInfo().SetFootnoteDone(bOldFootnoteDone);
 GetInfo().SetArrowDone( bOldArrowDone );
 GetInfo().SetErgoDone( bOldErgoDone );
 

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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/textfld.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 508cc73f5301abc00d1ed75e331a22eb01a65f09
Author: Caolán McNamara 
AuthorDate: Sat Apr 15 20:44:48 2023 +0100
Commit: Xisco Fauli 
CommitDate: Mon Apr 17 13:02:11 2023 +0200

tdf#137542 don't crash at least

doesn't address the underlying issue though

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

diff --git a/sw/source/uibase/shells/textfld.cxx 
b/sw/source/uibase/shells/textfld.cxx
index 1efdf57abed0..1d32fef4934f 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -187,9 +187,9 @@ void SwTextShell::ExecField(SfxRequest )
 SwCursorShell::StartOfInputFieldAtPos( 
*(rSh.GetCursor()->Start()) ) + 1,
 SwCursorShell::EndOfInputFieldAtPos( 
*(rSh.GetCursor()->Start()) ) - 1 );
 }
-else
+else if (SwField* pCurrentField = rSh.GetCurField(true))
 {
-rSh.StartInputFieldDlg(rSh.GetCurField(true), false, 
false, GetView().GetFrameWeld());
+rSh.StartInputFieldDlg(pCurrentField, false, false, 
GetView().GetFrameWeld());
 }
 bRet = true;
 }

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

[Miklos Vajna (via logerrit)]

 include/xmloff/xmlnumfe.hxx  |   14 -
 xmloff/source/style/xmlnumfe.cxx |  282 +++
 2 files changed, 148 insertions(+), 148 deletions(-)

New commits:
commit 17071b079dcae1bb20dc7af11852ac2ffd8525d5
Author: Miklos Vajna 
AuthorDate: Mon Apr 17 08:15:09 2023 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 17 09:10:04 2023 +0200

xmloff: prefix members of SvXMLNumFmtExport

See tdf#94879 for motivation.

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

diff --git a/include/xmloff/xmlnumfe.hxx b/include/xmloff/xmlnumfe.hxx
index 61836f534245..fd0711b3a0c3 100644
--- a/include/xmloff/xmlnumfe.hxx
+++ b/include/xmloff/xmlnumfe.hxx
@@ -47,13 +47,13 @@ class SvXMLEmbeddedTextEntryArr;
 class XMLOFF_DLLPUBLIC SvXMLNumFmtExport final
 {
 private:
-SvXMLExport&rExport;
-OUStringsPrefix;
-SvNumberFormatter*  pFormatter;
-OUStringBuffer  sTextContent;
-boolbHasText;
-std::unique_ptr  pUsedList;
-std::unique_ptr  pLocaleData;
+SvXMLExport&m_rExport;
+OUStringm_sPrefix;
+SvNumberFormatter*  m_pFormatter;
+OUStringBuffer  m_sTextContent;
+boolm_bHasText;
+std::unique_ptr  m_pUsedList;
+std::unique_ptr  m_pLocaleData;
 
 SAL_DLLPRIVATE void AddCalendarAttr_Impl( const OUString& rCalendar );
 SAL_DLLPRIVATE void AddStyleAttr_Impl( bool bLong );
diff --git a/xmloff/source/style/xmlnumfe.cxx b/xmloff/source/style/xmlnumfe.cxx
index a335f79ae23a..b01c7bd8e597 100644
--- a/xmloff/source/style/xmlnumfe.cxx
+++ b/xmloff/source/style/xmlnumfe.cxx
@@ -210,60 +210,60 @@ void SvXMLNumUsedList_Impl::SetWasUsed(const 
uno::Sequence& rWasUsed)
 SvXMLNumFmtExport::SvXMLNumFmtExport(
 SvXMLExport& rExp,
 const uno::Reference< util::XNumberFormatsSupplier >& rSupp ) :
-rExport( rExp ),
-sPrefix( OUString("N") ),
-pFormatter( nullptr ),
-bHasText( false )
+m_rExport( rExp ),
+m_sPrefix( OUString("N") ),
+m_pFormatter( nullptr ),
+m_bHasText( false )
 {
 //  supplier must be SvNumberFormatsSupplierObj
 SvNumberFormatsSupplierObj* pObj =
 comphelper::getFromUnoTunnel( 
rSupp );
 if (pObj)
-pFormatter = pObj->GetNumberFormatter();
+m_pFormatter = pObj->GetNumberFormatter();
 
-if ( pFormatter )
+if ( m_pFormatter )
 {
-pLocaleData.reset( new LocaleDataWrapper( 
pFormatter->GetComponentContext(),
-pFormatter->GetLanguageTag() ) );
+m_pLocaleData.reset( new LocaleDataWrapper( 
m_pFormatter->GetComponentContext(),
+m_pFormatter->GetLanguageTag() ) );
 }
 else
 {
 LanguageTag aLanguageTag( MsLangId::getConfiguredSystemLanguage() );
 
-pLocaleData.reset( new LocaleDataWrapper( 
rExport.getComponentContext(), std::move(aLanguageTag) ) );
+m_pLocaleData.reset( new LocaleDataWrapper( 
m_rExport.getComponentContext(), std::move(aLanguageTag) ) );
 }
 
-pUsedList.reset(new SvXMLNumUsedList_Impl);
+m_pUsedList.reset(new SvXMLNumUsedList_Impl);
 }
 
 SvXMLNumFmtExport::SvXMLNumFmtExport(
SvXMLExport& rExp,
const css::uno::Reference< 
css::util::XNumberFormatsSupplier >& rSupp,
OUString aPrefix ) :
-rExport( rExp ),
-sPrefix(std::move( aPrefix )),
-pFormatter( nullptr ),
-bHasText( false )
+m_rExport( rExp ),
+m_sPrefix(std::move( aPrefix )),
+m_pFormatter( nullptr ),
+m_bHasText( false )
 {
 //  supplier must be SvNumberFormatsSupplierObj
 SvNumberFormatsSupplierObj* pObj =
 comphelper::getFromUnoTunnel( 
rSupp );
 if (pObj)
-pFormatter = pObj->GetNumberFormatter();
+m_pFormatter = pObj->GetNumberFormatter();
 
-if ( pFormatter )
+if ( m_pFormatter )
 {
-pLocaleData.reset( new LocaleDataWrapper( 
pFormatter->GetComponentContext(),
-pFormatter->GetLanguageTag() ) );
+m_pLocaleData.reset( new LocaleDataWrapper( 
m_pFormatter->GetComponentContext(),
+m_pFormatter->GetLanguageTag() ) );
 }
 else
 {
 LanguageTag aLanguageTag( MsLangId::getConfiguredSystemLanguage() );
 
-pLocaleData.reset( new LocaleDataWrapper( 
rExport.getComponentContext(), std::move(aLanguageTag) ) );
+m_pLocaleData.reset( new LocaleDataWrapper( 
m_rExport.getComponentContext(), std::move(aLanguageTag) ) );
 }
 
-pUsedList.reset(new SvXMLNumUsedList_Impl);
+m_pUsedList.reset(new SvXMLNumUsedList_Impl);
 }
 
 SvXMLNumFmtExport::~SvXMLNumFmtExport()
@@ -284,7 +284,7 @@ void 

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/stringadd.cxx  |   14 ++
 compilerplugins/clang/test/stringadd.cxx |   15 +++
 2 files changed, 25 insertions(+), 4 deletions(-)

New commits:
commit 856fc80439c23d4473930b92e201ebd33b20fc8b
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 09:09:14 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 10:48:52 2023 +0200

loplugin:stringadd: Adapt O[U]StringBuffer ctor detection for Windows

...where sal_Int32 is not int, so a literal argument like 16 actually calls 
the

  O[U]StringBuffer(T length, std::enable_if_t, int> = 
0)

overload

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

diff --git a/compilerplugins/clang/stringadd.cxx 
b/compilerplugins/clang/stringadd.cxx
index bf00ef2dc1d9..022bffa804fc 100644
--- a/compilerplugins/clang/stringadd.cxx
+++ b/compilerplugins/clang/stringadd.cxx
@@ -160,10 +160,16 @@ StringAdd::VarDeclAndSummands 
StringAdd::findAssignOrAdd(Stmt const* stmt)
 // ignore the constructor that gives the buffer a default 
size
 if (auto cxxConstructor = 
dyn_cast(varDeclLHS->getInit()))
 if (auto constructorDecl = 
cxxConstructor->getConstructor())
-if (constructorDecl->getNumParams() == 1
-&& 
loplugin::TypeCheck(constructorDecl->getParamDecl(0)->getType())
-   .Typedef("sal_Int32")
-   .GlobalNamespace())
+if ((constructorDecl->getNumParams() == 1
+ && 
loplugin::TypeCheck(constructorDecl->getParamDecl(0)->getType())
+.Typedef("sal_Int32")
+.GlobalNamespace())
+|| (constructorDecl->getNumParams() == 2
+&& 
constructorDecl->getParamDecl(0)->getType()->isIntegralType(
+   compiler.getASTContext())
+&& constructorDecl->getParamDecl(1)
+   ->getType()
+   
->isSpecificBuiltinType(BuiltinType::Int)))
 return {};
 }
 return { varDeclLHS, 
(isCompileTimeConstant(varDeclLHS->getInit())
diff --git a/compilerplugins/clang/test/stringadd.cxx 
b/compilerplugins/clang/test/stringadd.cxx
index 3ac2bb60ebe8..7c1193643303 100644
--- a/compilerplugins/clang/test/stringadd.cxx
+++ b/compilerplugins/clang/test/stringadd.cxx
@@ -297,4 +297,19 @@ void f1()
 }
 }
 
+namespace test14
+{
+void f1()
+{
+OUStringBuffer b(16);
+b.append("...");
+}
+
+void f2(long long n)
+{
+OUStringBuffer b(n);
+b.append("...");
+}
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s 
cinkeys+=0=break: */

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

[Miklos Vajna (via logerrit)]

 sw/qa/extras/ww8export/ww8export2.cxx   |   58 ++
 sw/source/filter/ww8/wrtw8nds.cxx   |   17 
 sw/source/filter/ww8/wrtww8.cxx |  112 
 sw/source/filter/ww8/ww8attributeoutput.hxx |1 
 4 files changed, 155 insertions(+), 33 deletions(-)

New commits:
commit 3cd14725b6a16d7e6cc328aef3d1d9a9a6649634
Author: Miklos Vajna 
AuthorDate: Mon Apr 17 08:14:12 2023 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 17 09:01:31 2023 +0200

sw floatable: teach the DOC export about SwFormatFlySplit

Floating tables were always written back as a shape, containing a table,
which can't split over pages, not even in Word.

Now that we have split flys, we know that floating tables are mapped to
split flys, so we can map split flys back to floating tables on export.

The following SPRMs need writing, which are more or less the equivalent
to DOCX's  attributes:

- sprmTPc: relation orient for positioning the table
- sprmTDyaFromText, sprmTDyaFromTextBottom: top/bottom margin
- sprmTDxaFromText, sprmTDxaFromTextRight: left/right margin
- sprmTDxaAbs: horizontal orientation
- sprmTDyaAbs: vertical orientation

With this, testTdf107773 passes in the SW_FORCE_FLY_SPLIT=1 case, while
previously only the import side worked.

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

diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index 4f1f6d4afd6d..8252f63504f0 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -332,42 +332,36 @@ DECLARE_WW8EXPORT_TEST(testTdf99197_defaultLTR, 
"tdf99197_defaultLTR.doc")
 text::WritingMode2::LR_TB, getProperty(getParagraph(2), 
"WritingMode") );
 }
 
-DECLARE_WW8EXPORT_TEST(testTdf107773, "tdf107773.doc")
-{
-// This was 1, multi-page table was imported as a floating one.
-CPPUNIT_ASSERT_EQUAL(0, getShapes());
-
-// tdf#80635 - transfer the float orientation to the table.
-uno::Reference xTextTablesSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY);
-uno::Reference xTable(xTables->getByIndex(0), 
uno::UNO_QUERY);
-CPPUNIT_ASSERT_EQUAL_MESSAGE("Horizontal Orientation", 
text::HoriOrientation::CENTER, getProperty(xTable, "HoriOrient"));
-}
-
-CPPUNIT_TEST_FIXTURE(Test, testTdf107773SplitFly)
+CPPUNIT_TEST_FIXTURE(Test, testTdf107773)
 {
 SwModelTestBase::FlySplitGuard aGuard;
 
+auto verify = [this]() {
+// This failed, multi-page table was imported as a non-split frame.
+SwDoc* pDoc = getSwDoc();
+SwRootFrame* pLayout = 
pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
+auto pPage1 = dynamic_cast(pLayout->Lower());
+CPPUNIT_ASSERT(pPage1);
+// pPage1 has no sorted (floating) objections.
+CPPUNIT_ASSERT(pPage1->GetSortedObjs());
+const SwSortedObjs& rPage1Objs = *pPage1->GetSortedObjs();
+CPPUNIT_ASSERT_EQUAL(static_cast(1), rPage1Objs.size());
+auto pPage1Fly = dynamic_cast(rPage1Objs[0]);
+CPPUNIT_ASSERT(pPage1Fly);
+auto pTab1 = dynamic_cast(pPage1Fly->GetLower());
+CPPUNIT_ASSERT(pTab1);
+// This failed, the split fly containing a table was exported back to 
DOC as shape+table,
+// which can't split.
+CPPUNIT_ASSERT(pTab1->HasFollow());
+
+// tdf#80635 - assert the horizontal orientation.
+const SwFormatHoriOrient& rFormatHoriOrient = 
pPage1Fly->GetFormat()->GetHoriOrient();
+CPPUNIT_ASSERT_EQUAL(css::text::HoriOrientation::CENTER, 
rFormatHoriOrient.GetHoriOrient());
+};
 createSwDoc("tdf107773.doc");
-
-// This failed, multi-page table was imported as a non-split frame.
-SwDoc* pDoc = getSwDoc();
-SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
-auto pPage1 = dynamic_cast(pLayout->Lower());
-CPPUNIT_ASSERT(pPage1);
-// pPage1 has no sorted (floating) objections.
-CPPUNIT_ASSERT(pPage1->GetSortedObjs());
-const SwSortedObjs& rPage1Objs = *pPage1->GetSortedObjs();
-CPPUNIT_ASSERT_EQUAL(static_cast(1), rPage1Objs.size());
-auto pPage1Fly = dynamic_cast(rPage1Objs[0]);
-CPPUNIT_ASSERT(pPage1Fly);
-auto pTab1 = dynamic_cast(pPage1Fly->GetLower());
-CPPUNIT_ASSERT(pTab1);
-CPPUNIT_ASSERT(pTab1->HasFollow());
-
-// tdf#80635 - assert the horizontal orientation.
-const SwFormatHoriOrient& rFormatHoriOrient = 
pPage1Fly->GetFormat()->GetHoriOrient();
-CPPUNIT_ASSERT_EQUAL(css::text::HoriOrientation::CENTER, 
rFormatHoriOrient.GetHoriOrient());
+verify();
+reload(mpFilter, "tdf107773.doc");
+verify();
 }
 
 

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

[Caolán McNamara (via logerrit)]

 sw/source/core/unocore/unofield.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d9cf8459ef49f3011de3003538b503d0be06dc17
Author: Caolán McNamara 
AuthorDate: Thu Apr 13 15:50:25 2023 +0100
Commit: Xisco Fauli 
CommitDate: Mon Apr 17 13:03:08 2023 +0200

Resolves: tdf#152619 crash inspecting uninserted XFieldMaster

Change-Id: I765dd5d7e1ed2c1749841491a50216a6afe903c1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150351
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
(cherry picked from commit 5464a1dad69c52d011b194baf7d543ce8dd27748)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150321
Reviewed-by: Michael Stahl 
(cherry picked from commit 71c7c3dddb1291e262b1f8132b75e95fc6f9fa02)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150333
Reviewed-by: Xisco Fauli 

diff --git a/sw/source/core/unocore/unofield.cxx 
b/sw/source/core/unocore/unofield.cxx
index abe754f62b4f..e6320e9d248b 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -1325,6 +1325,8 @@ SwXTextField::getTextFieldMaster()
 SolarMutexGuard aGuard;
 
 SwFieldType* pType = m_pImpl->GetFieldType();
+if (!pType && !m_pImpl->m_pDoc) // tdf#152619
+return nullptr;
 uno::Reference const xRet(
 SwXFieldMaster::CreateXFieldMaster(m_pImpl->m_pDoc, pType));
 return xRet;

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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/textfld.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit c59204ebc40950147926cc241c3292321abbf444
Author: Caolán McNamara 
AuthorDate: Sat Apr 15 20:44:48 2023 +0100
Commit: Xisco Fauli 
CommitDate: Mon Apr 17 13:18:33 2023 +0200

tdf#137542 don't crash at least

doesn't address the underlying issue though

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

diff --git a/sw/source/uibase/shells/textfld.cxx 
b/sw/source/uibase/shells/textfld.cxx
index 42ca39769015..6f9e3aadbed2 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -184,9 +184,9 @@ void SwTextShell::ExecField(SfxRequest )
 SwCursorShell::StartOfInputFieldAtPos( 
*(rSh.GetCursor()->Start()) ) + 1,
 SwCursorShell::EndOfInputFieldAtPos( 
*(rSh.GetCursor()->Start()) ) - 1 );
 }
-else
+else if (SwField* pCurrentField = rSh.GetCurField(true))
 {
-rSh.StartInputFieldDlg(rSh.GetCurField(true), false, 
false, GetView().GetFrameWeld());
+rSh.StartInputFieldDlg(pCurrentField, false, false, 
GetView().GetFrameWeld());
 }
 bRet = true;
 }

[Libreoffice-commits] core.git: 2 commits - vcl/jsdialog

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |   11 +++
 1 file changed, 11 insertions(+)

New commits:
commit e82badd95d306c4e6c16a5858b3f1f7365a20df3
Author: Pranam Lashkari 
AuthorDate: Tue Mar 21 21:19:12 2023 +0530
Commit: Pranam Lashkari 
CommitDate: Mon Apr 17 10:59:06 2023 +0200

jsdialog: enabled bullets and numbering dialog (writer)

Change-Id: I6d5ca75c7f2a91bd1716083fa9929fbeb3bd2e07
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149276
Tested-by: Szymon Kłos 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 4bd57ffda77c884ea1104755af098730f04ef178)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150090
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 9ed4b02f75e6..acb6e4fd14b3 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -52,6 +52,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"cui/ui/linetabpage.ui"
 || rUIFile == u"cui/ui/macroselectordialog.ui"
 || rUIFile == u"cui/ui/numberingformatpage.ui"
+|| rUIFile == u"cui/ui/numberingpositionpage.ui"
 || rUIFile == u"cui/ui/optlingupage.ui"
 || rUIFile == u"cui/ui/pageformatpage.ui"
 || rUIFile == u"cui/ui/paragalignpage.ui"
@@ -60,6 +61,10 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"cui/ui/password.ui"
 || rUIFile == u"cui/ui/pastespecial.ui"
 || rUIFile == u"cui/ui/patterntabpage.ui"
+|| rUIFile == u"cui/ui/pickbulletpage.ui"
+|| rUIFile == u"cui/ui/pickgraphicpage.ui"
+|| rUIFile == u"cui/ui/picknumberingpage.ui"
+|| rUIFile == u"cui/ui/pickoutlinepage.ui"
 || rUIFile == u"cui/ui/positionpage.ui"
 || rUIFile == u"cui/ui/positionsizedialog.ui"
 || rUIFile == u"cui/ui/possizetabpage.ui"
@@ -151,6 +156,7 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"modules/simpress/ui/headerfooterdialog.ui"
 || rUIFile == u"modules/simpress/ui/headerfootertab.ui"
 // swriter
+|| rUIFile == u"modules/swriter/ui/bulletsandnumbering.ui"
 || rUIFile == u"modules/swriter/ui/captionoptions.ui"
 || rUIFile == u"modules/swriter/ui/characterproperties.ui"
 || rUIFile == u"modules/swriter/ui/charurlpage.ui"
commit 84d327698e5107de23bb0d342fb0c68604461790
Author: Pranam Lashkari 
AuthorDate: Mon Mar 20 19:47:38 2023 +0530
Commit: Pranam Lashkari 
CommitDate: Mon Apr 17 10:58:53 2023 +0200

jsdialog: enable table of content dialog (writer)

Change-Id: I21af621a10e6d483af0174304e3457775068ab2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149169
Reviewed-by: Szymon Kłos 
Tested-by: Szymon Kłos 
(cherry picked from commit 6c204682d3b69bdcbb215fa10fbcd66253d0cdba)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150087
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index 95868c19963f..9ed4b02f75e6 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -180,9 +180,14 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"modules/swriter/ui/tablecolumnpage.ui"
 || rUIFile == u"modules/swriter/ui/tableproperties.ui"
 || rUIFile == u"modules/swriter/ui/tabletextflowpage.ui"
+|| rUIFile == u"modules/swriter/ui/templatedialog1.ui"
 || rUIFile == u"modules/swriter/ui/templatedialog2.ui"
 || rUIFile == u"modules/swriter/ui/templatedialog8.ui"
 || rUIFile == u"modules/swriter/ui/textgridpage.ui"
+|| rUIFile == u"modules/swriter/ui/tocdialog.ui"
+|| rUIFile == u"modules/swriter/ui/tocentriespage.ui"
+|| rUIFile == u"modules/swriter/ui/tocindexpage.ui"
+|| rUIFile == u"modules/swriter/ui/tocstylespage.ui"
 || rUIFile == u"modules/swriter/ui/translationdialog.ui"
 || rUIFile == u"modules/swriter/ui/watermarkdialog.ui"
 // sfx

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

[László Németh (via logerrit)]

 sw/qa/extras/odfexport/data/tdf150149.fodt |   79 +
 sw/qa/extras/odfexport/odfexport.cxx   |   10 +++
 sw/source/core/layout/tabfrm.cxx   |   11 +++-
 3 files changed, 98 insertions(+), 2 deletions(-)

New commits:
commit a1f63eaa6810f9f8b0402b97938989ecf937346e
Author: László Németh 
AuthorDate: Fri Apr 14 11:07:47 2023 +0200
Commit: László Németh 
CommitDate: Mon Apr 17 08:55:32 2023 +0200

tdf#150149 sw: fix table header in multi-column sections

Disabling long repeating table header on pages resulted
lost table header within multi-column sections. To fix this,
revert commit f7e071a00542c414a7e9d7bcf4434d908f225e59
for tables in sections.

Regression from commit f7e071a00542c414a7e9d7bcf4434d908f225e59
"tdf#88496 DOCX: disable long repeating table header".

Change-Id: Idb7b9ea014be5430a185489cf449463f534c1916
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150393
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit 6f868961f4e6060c1cdc27710b605c936be8685a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150324

diff --git a/sw/qa/extras/odfexport/data/tdf150149.fodt 
b/sw/qa/extras/odfexport/data/tdf150149.fodt
new file mode 100644
index ..51aea046a218
--- /dev/null
+++ b/sw/qa/extras/odfexport/data/tdf150149.fodt
@@ -0,0 +1,79 @@
+
+
+
+ 
+  
+   
+  
+  
+   
+
+
+   
+  
+ 
+ 
+  
+   
+
+ 
+ 
+ 
+  
+   A
+  
+  
+   B
+  
+  
+   C
+  
+ 
+ 
+ 
+  
+  
+  
+ 
+ 
+  
+  
+  
+ 
+ 
+  
+  
+  
+ 
+ 
+  
+  
+  
+ 
+ 
+  
+  
+  
+ 
+ 
+  
+  
+  
+ 
+ 
+  
+  
+  
+ 
+ 
+  
+  
+  
+ 
+
+
+   
+  
+ 
+
+
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index bfc75df25ad7..e34f2914af96 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -291,6 +291,16 @@ CPPUNIT_TEST_FIXTURE(Test, testTdf125877)
 CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xIndexAccess->getCount());
 }
 
+CPPUNIT_TEST_FIXTURE(Test, testTdf150149)
+{
+loadAndReload("tdf150149.fodt");
+CPPUNIT_ASSERT_EQUAL(1, getPages());
+xmlDocUniquePtr pXmlDoc = parseExport("content.xml");
+// This was 0 (lost table header in multi-column section)
+assertXPath(pXmlDoc, "//table:table-header-rows", 1);
+assertXPath(pXmlDoc, 
"//table:table-header-rows/table:table-row/table:table-cell", 3);
+}
+
 DECLARE_ODFEXPORT_TEST(testTdf103567, "tdf103567.odt")
 {
 CPPUNIT_ASSERT_EQUAL(1, getShapes());
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index b95f8ca45b25..d75a20955409 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -1097,9 +1097,16 @@ bool SwTabFrame::Split( const SwTwips nCutPos, bool 
bTryToSplit, bool bTableRowK
 // First case: One of the repeated headline does not fit to the page 
anymore.
 // tdf#88496 Disable repeated headline (like for #i44910#) to avoid 
loops and
 // to fix interoperability problems (very long tables only with 
headline)
+// tdf#150149 except in multi-column sections, where it's possible to 
enlarge
+// the height of the section frame instead of using this fallback
 OSL_ENSURE( !GetIndPrev(), "Table is supposed to be at beginning" );
-m_pTable->SetRowsToRepeat(0);
-return false;
+if ( !IsInSct() )
+{
+m_pTable->SetRowsToRepeat(0);
+return false;
+}
+else
+bKeepNextRow = true;
 }
 else if ( !GetIndPrev() && nRepeat == nRowCount )
 {

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

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/hyphen.cxx |2 +-
 sc/source/filter/xml/xmlcelli.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3fbb307b970f41605a80c6ea3cbea0c9af9eb638
Author: Caolán McNamara 
AuthorDate: Mon Apr 17 09:17:43 2023 +0100
Commit: Michael Stahl 
CommitDate: Mon Apr 17 14:19:31 2023 +0200

tdf#151560 don't crash on loading dubious fods

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

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 0d0a81ebade6..a14424edace9 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1482,7 +1482,7 @@ bool ScXMLTableRowCellContext::IsPossibleErrorString() 
const
 return false;
 else if(mbNewValueType && mbErrorValue)
 return true;
-return mbPossibleErrorCell || (mbCheckWithCompilerForError &&
+return mbPossibleErrorCell || (mbCheckWithCompilerForError && 
maStringValue &&
 GetScImport().GetFormulaErrorConstant(*maStringValue) != 
FormulaError::NONE);
 }
 
commit a6cd712ddeb1fc3a9cc5568d5e2f4eac9f8fcc2f
Author: Caolán McNamara 
AuthorDate: Sat Apr 15 20:25:36 2023 +0100
Commit: Michael Stahl 
CommitDate: Mon Apr 17 14:19:17 2023 +0200

Resolves: tdf#153958 Hyphenation crashes with -Alte...

nPos2 is 0 due to the -, so aLeft is empty, nPos is set to 0
then incremented to 1, aLeft.replaceFirst is run after its end pos
so crashes/asserts. Presumably we can do nothing meaningful here
so skip if nPos2 is 0

Change-Id: I09754c4b2567fe5c1b4c36de0b36ee99f575244d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150327
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 7584e403d57097ed4cc2d827d68895ec35cf805f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150331
Reviewed-by: Michael Stahl 

diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index ccd7de8c..259ec5d03395 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -161,7 +161,7 @@ OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl()
 // 2) remove all hyphenation positions from the start that are not 
considered by the core
 const std::u16string_view aSearchRange( aTxt.subView( 0, nPos1 ) );
 size_t nPos2 = aSearchRange.rfind( '-' );  // the '-' position the 
core will use by default
-if (nPos2 != std::u16string_view::npos )
+if (nPos2 != std::u16string_view::npos && nPos2 != 0)
 {
 OUString aLeft( aSearchRange.substr( 0, nPos2 ) );
 nPos = 0;

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

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/hyphen.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8e379477def5085743d2b024bb99eba0ebc8
Author: Caolán McNamara 
AuthorDate: Sat Apr 15 20:25:36 2023 +0100
Commit: Michael Stahl 
CommitDate: Mon Apr 17 14:19:51 2023 +0200

Resolves: tdf#153958 Hyphenation crashes with -Alte...

nPos2 is 0 due to the -, so aLeft is empty, nPos is set to 0
then incremented to 1, aLeft.replaceFirst is run after its end pos
so crashes/asserts. Presumably we can do nothing meaningful here
so skip if nPos2 is 0

Change-Id: I09754c4b2567fe5c1b4c36de0b36ee99f575244d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150327
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit 7584e403d57097ed4cc2d827d68895ec35cf805f)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150502
Reviewed-by: Xisco Fauli 
Reviewed-by: Caolán McNamara 
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index ccd7de8c..259ec5d03395 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -161,7 +161,7 @@ OUString SvxHyphenWordDialog::EraseUnusableHyphens_Impl()
 // 2) remove all hyphenation positions from the start that are not 
considered by the core
 const std::u16string_view aSearchRange( aTxt.subView( 0, nPos1 ) );
 size_t nPos2 = aSearchRange.rfind( '-' );  // the '-' position the 
core will use by default
-if (nPos2 != std::u16string_view::npos )
+if (nPos2 != std::u16string_view::npos && nPos2 != 0)
 {
 OUString aLeft( aSearchRange.substr( 0, nPos2 ) );
 nPos = 0;

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - forms/source

[Julien Nabet (via logerrit)]

 forms/source/xforms/datatypes.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0cfac0def1ec3835df63a698291b9dd0ec4a0ec2
Author: Julien Nabet 
AuthorDate: Fri Apr 14 21:05:06 2023 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 17 09:47:00 2023 +0200

tdf#154734: XML Form doc: all binded fields will be shown as fields...

with wrong content - except fields, which have wrong content

Regression of 14cfff500e93f0d6cbf8412065feea85c01ea81d (at 2021-08-05)
Pass context and resource string down to boost::locale separately
because this is often on a hot path, and we can avoid the splitting and
joining of strings like this.

Before the commit, it was:
return ( _validate( sValue ) == nullptr );

_validate methods return "TranslateId" variable which contain the reason 
why validity is wrong
so if this variable contains no reason it means everything is OK.

so just replace:
return bool(_validate( sValue ));
by:
return bool(!_validate( sValue ));

Change-Id: I76373d0825f86f9072217c96757252b6a891ecc4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150433
Reviewed-by: Julien Nabet 
Tested-by: Jenkins
(cherry picked from commit 5b7eea73b961f6518c889fee2331f290b64473ee)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150326
Reviewed-by: Noel Grandin 
Reviewed-by: Xisco Fauli 

diff --git a/forms/source/xforms/datatypes.cxx 
b/forms/source/xforms/datatypes.cxx
index 92e0c3ec781b..c372298f0e5f 100644
--- a/forms/source/xforms/datatypes.cxx
+++ b/forms/source/xforms/datatypes.cxx
@@ -156,7 +156,7 @@ namespace xforms
 
 sal_Bool OXSDDataType::validate( const OUString& sValue )
 {
-return bool(_validate( sValue ));
+return bool(!_validate( sValue ));
 }
 
 

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

[Caolán McNamara (via logerrit)]

 sw/source/uibase/shells/textfld.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5692a58cbfbd5da33b37415383f6eafb80d79177
Author: Caolán McNamara 
AuthorDate: Sat Apr 15 20:44:48 2023 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 17 10:03:47 2023 +0200

tdf#137542 don't crash at least

doesn't address the underlying issue though

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

diff --git a/sw/source/uibase/shells/textfld.cxx 
b/sw/source/uibase/shells/textfld.cxx
index e94b230a8f9d..caf5575f7031 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -188,9 +188,9 @@ void SwTextShell::ExecField(SfxRequest )
 SwCursorShell::StartOfInputFieldAtPos( 
*(rSh.GetCursor()->Start()) ) + 1,
 SwCursorShell::EndOfInputFieldAtPos( 
*(rSh.GetCursor()->Start()) ) - 1 );
 }
-else
+else if (SwField* pCurrentField = rSh.GetCurField(true))
 {
-rSh.StartInputFieldDlg(rSh.GetCurField(true), false, 
false, GetView().GetFrameWeld());
+rSh.StartInputFieldDlg(pCurrentField, false, false, 
GetView().GetFrameWeld());
 }
 bRet = true;
 }

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

[Mike Kaganski (via logerrit)]

 sw/source/core/text/porfly.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83fe224f0f5fd4a4516ce3f282d0cfb55f2ea8fe
Author: Mike Kaganski 
AuthorDate: Thu Apr 13 19:03:36 2023 +0200
Commit: Michael Stahl 
CommitDate: Mon Apr 17 14:16:12 2023 +0200

sal_uInt16 is not a good choice to store SwTwips

The latter is tools::Long, which is even 64-bit on most platforms.
Just use auto here.

Change-Id: I5b45220b79cd4798bafdb416ad7a44eb4d5d1f99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150320
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 465e66be927fa186d1cc2ffaf25ebccdfd9862d9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150494
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 9abef0c83c26..7bee98d9821a 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -109,7 +109,7 @@ bool SwFlyCntPortion::Format( SwTextFormatInfo  )
 // KerningPortions at beginning of line, e.g., for grid layout
 // must be considered.
 const SwLinePortion* pLastPor = rInf.GetLast();
-const sal_uInt16 nLeft = ( pLastPor &&
+const auto nLeft = ( pLastPor &&
 ( pLastPor->IsKernPortion() ||
   pLastPor->IsErgoSumPortion() ) ) ?
pLastPor->Width() :

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - editeng/source

[Noel Grandin (via logerrit)]

 editeng/source/uno/unotext.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ee199f149a6d7a9222a01608e4fc557be62d7ad3
Author: Noel Grandin 
AuthorDate: Fri Apr 14 13:32:53 2023 +0200
Commit: Michael Stahl 
CommitDate: Mon Apr 17 14:22:42 2023 +0200

fix check in SvxUnoTextBase::insertTextContent

looks like copy/paste error in
commit aac15b638410f181133dc15343136b4e9a1675ba
Author: Kohei Yoshida 
Date:   Mon May 7 15:22:54 2012 -0400
Set anchor to XTextContent using UNO API.

Change-Id: I516cf6e5ff23c2409585b57da34862f0ab6bdb17
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150408
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit 25d0ae95d6e7695a33cb67b1cb3626c338cf92a9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150332
Reviewed-by: Michael Stahl 

diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 8d6b2aa9ec53..87f6634ad07e 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -1863,7 +1863,7 @@ void SAL_CALL SvxUnoTextBase::insertTextContent( const 
uno::Reference< text::XTe
 GetEditSource()->UpdateData();
 
 uno::Reference xPropSetContent(xContent, 
uno::UNO_QUERY);
-if (!xContent.is())
+if (!xPropSetContent.is())
 throw lang::IllegalArgumentException();
 
 xPropSetContent->setPropertyValue(UNO_TC_PROP_ANCHOR, uno::Any(xRange));

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - svx/source

[Michael Weghorn (via logerrit)]

 svx/source/form/fmPropBrw.cxx |2 ++
 svx/source/inc/fmPropBrw.hxx  |1 +
 2 files changed, 3 insertions(+)

New commits:
commit fb6bad9d25b3c5f085e1c125fc3df7f41152414d
Author: Michael Weghorn 
AuthorDate: Wed Apr 12 16:16:05 2023 +0300
Commit: Michael Stahl 
CommitDate: Mon Apr 17 14:22:00 2023 +0200

tdf#140730 a11y: Focus form control property dlg when it starts

Make sure the dialog gets focus again when it
starts after having been welded in

commit 1efeb17837c22499f00299c033ae59ba3910f7d7
Date:   Mon Nov 4 13:06:04 2019 +

weld Property Browser

(Tested with gen, kf5 and on Windows.)

Change-Id: Ie5d28a60b459735d1f1fa4c2d5d679f3d5a27cec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150284
Tested-by: Jenkins
Reviewed-by: Michael Weghorn 
(cherry picked from commit cf9f73ae78aa9654064abde8411ea2f921c38354)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150496
Reviewed-by: Michael Stahl 

diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 2609dae2a183..e30f90cf5ecf 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -176,6 +176,7 @@ FmPropBrw::FmPropBrw(const Reference< XComponentContext >& 
_xORB, SfxBindings* _
 , m_bInitialStateChange(true)
 , m_pParent(_pParent)
 , m_nAsyncGetFocusId(nullptr)
+, m_xDialogBox(m_xBuilder->weld_box("dialog-vbox1"))
 , m_xContainer(m_xBuilder->weld_container("container"))
 , m_xORB(_xORB)
 {
@@ -393,6 +394,7 @@ void FmPropBrw::FillInfo( SfxChildWinInfo& rInfo ) const
 
 IMPL_LINK_NOARG( FmPropBrw, OnAsyncGetFocus, void*, void )
 {
+m_xDialogBox->child_grab_focus();
 m_nAsyncGetFocusId = nullptr;
 }
 
diff --git a/svx/source/inc/fmPropBrw.hxx b/svx/source/inc/fmPropBrw.hxx
index b33597b24d6c..e5b735c0eee3 100644
--- a/svx/source/inc/fmPropBrw.hxx
+++ b/svx/source/inc/fmPropBrw.hxx
@@ -45,6 +45,7 @@ class FmPropBrw final : public SfxModelessDialogController, 
public SfxController
 weld::Window*   m_pParent;
 ImplSVEvent*m_nAsyncGetFocusId;
 OUStringm_sLastActivePage;
+std::unique_ptr m_xDialogBox;
 std::unique_ptr m_xContainer;
 css::uno::Reference< css::uno::XComponentContext >
 m_xInspectorContext;

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

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/test/stringview.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5955a453165f6d8117b44e8ad37fb5ca0134add4
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 09:13:26 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 10:23:27 2023 +0200

Adapt expected diagnostics to Windows

...where std::size_t is unsigned long long

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

diff --git a/compilerplugins/clang/test/stringview.cxx 
b/compilerplugins/clang/test/stringview.cxx
index 73032c4273dd..b7284cd5ed57 100644
--- a/compilerplugins/clang/test/stringview.cxx
+++ b/compilerplugins/clang/test/stringview.cxx
@@ -164,7 +164,7 @@ void f5(char const* s1, sal_Int32 n1, char16_t const* s2, 
sal_Int32 n2, OString
 call_view(OString(l1));
 // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OString' constructed 
from a 'std::string_view' (aka 'basic_string_view'), pass a 
'std::string_view' [loplugin:stringview]}}
 call_view(OString(std::string_view("foo")));
-// expected-error-re@+1 {{instead of an {{'(rtl::)?}}OString' constructed 
from a {{'(rtl::)?StringNumber'|'OStringNumber<33>' \(aka 
'StringNumber'\)}}, pass a 'std::string_view' 
[loplugin:stringview]}}
+// expected-error-re@+1 {{instead of an {{'(rtl::)?}}OString' constructed 
from a {{'(rtl::)?StringNumber'|'OStringNumber<33>' \(aka 
'StringNumber'\)}}, pass a 'std::string_view' 
[loplugin:stringview]}}
 call_view(OString(OString::number(0)));
 // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OString' constructed 
from a 'OStringConcat<{{(rtl::)?}}OString, {{(rtl::)?}}OString>' (aka 
'StringConcat'), pass a 'std::string_view' 
via 'rtl::Concat2View' [loplugin:stringview]}}
 call_view(OString(s3 + s3));
@@ -188,7 +188,7 @@ void f5(char const* s1, sal_Int32 n1, char16_t const* s2, 
sal_Int32 n2, OString
 call_view(OUString(l2));
 // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed 
from a 'std::u16string_view' (aka 'basic_string_view'), pass a 
'std::u16string_view' [loplugin:stringview]}}
 call_view(OUString(std::u16string_view(u"foo")));
-// expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed 
from a {{'(rtl::)?StringNumber'|'OUStringNumber<33>' \(aka 
'StringNumber'\)}}, pass a 'std::u16string_view' 
[loplugin:stringview]}}
+// expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed 
from a {{'(rtl::)?StringNumber'|'OUStringNumber<33>' \(aka 
'StringNumber'\)}}, pass a 'std::u16string_view' 
[loplugin:stringview]}}
 call_view(OUString(OUString::number(0)));
 // expected-error-re@+1 {{instead of an '{{(rtl::)?}}OUString' constructed 
from a 'OUStringConcat<{{(rtl::)?}}OUString, {{(rtl::)?}}OUString>' (aka 
'StringConcat'), pass a 
'std::u16string_view' via 'rtl::Concat2View' [loplugin:stringview]}}
 call_view(OUString(s4 + s4));

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

[Pranam Lashkari (via logerrit)]

 vcl/jsdialog/enabled.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 066b23115c2a360507e306a88da572554daefab7
Author: Pranam Lashkari 
AuthorDate: Mon Mar 20 19:58:28 2023 +0530
Commit: Pranam Lashkari 
CommitDate: Mon Apr 17 10:59:22 2023 +0200

jsdialog: enabled insert index entry dialog (writer)

Change-Id: I2540620f7c4f9f640d943fb9e7b0e8661c706c7d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149170
Tested-by: Szymon Kłos 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 062f0ff0a43a6d5ce610742a73d5b18562168a00)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150088
Tested-by: Jenkins
Reviewed-by: Pranam Lashkari 

diff --git a/vcl/jsdialog/enabled.cxx b/vcl/jsdialog/enabled.cxx
index acb6e4fd14b3..0619e79785ea 100644
--- a/vcl/jsdialog/enabled.cxx
+++ b/vcl/jsdialog/enabled.cxx
@@ -173,10 +173,12 @@ bool isBuilderEnabled(std::u16string_view rUIFile, bool 
bMobile)
 || rUIFile == u"modules/swriter/ui/footnotesendnotestabpage.ui"
 || rUIFile == u"modules/swriter/ui/formattablepage.ui"
 || rUIFile == u"modules/swriter/ui/indentpage.ui"
+|| rUIFile == u"modules/swriter/ui/indexentry.ui"
 || rUIFile == u"modules/swriter/ui/insertbreak.ui"
 || rUIFile == u"modules/swriter/ui/insertcaption.ui"
 || rUIFile == u"modules/swriter/ui/insertsectiondialog.ui"
 || rUIFile == u"modules/swriter/ui/linenumbering.ui"
+|| rUIFile == u"modules/swriter/ui/newuserindexdialog.ui"
 || rUIFile == u"modules/swriter/ui/numparapage.ui"
 || rUIFile == u"modules/swriter/ui/pagenumberdlg.ui"
 || rUIFile == u"modules/swriter/ui/paradialog.ui"

[Libreoffice-commits] core.git: Branch 'distro/collabora/co-23.05' - desktop/source

[Ashod Nakashian (via logerrit)]

 desktop/source/lib/init.cxx |   18 --
 1 file changed, 16 insertions(+), 2 deletions(-)

New commits:
commit 5700349951fa4bba750836d6f4b0979b005e11c0
Author: Ashod Nakashian 
AuthorDate: Sat Mar 11 10:11:07 2023 -0500
Commit: Miklos Vajna 
CommitDate: Mon Apr 17 11:49:17 2023 +0200

lok: capture and publish the modified status in save result

This is necessary to flag to the storage whether or not
the contents of the file being uploaded has any user
modifications or not. This is typically used to optimize
the versioning and storage utilization.

We also add the time when saving started and the duration
it took. The timestamp is to figure out if there has been
subsequent activity/commands that could have modified
the document. The duration is to help Online throttle
saving if too frequent.

Signed-off-by: Ashod Nakashian 
Change-Id: Id6d8e629ef9b6e723d1d8b84d64fc7741b997bc5
(cherry picked from commit 26742677b53a33e1aaee191750f7af51e4b56844)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150380
Reviewed-by: Miklos Vajna 
Tested-by: Ashod Nakashian 

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 20cc63231cbd..918a4fe04368 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -4631,13 +4631,17 @@ namespace {
 */
 class DispatchResultListener : public 
cppu::WeakImplHelper
 {
-OString maCommand; ///< Command for which this is the 
result.
-std::shared_ptr mpCallback; ///< Callback to call.
+const OString maCommand; ///< Command for which this is the result.
+const std::shared_ptr mpCallback; ///< Callback to 
call.
+const std::chrono::steady_clock::time_point mSaveTime; //< The time we 
started saving.
+const bool mbWasModified; //< Whether or not the document was modified 
before saving.
 
 public:
 DispatchResultListener(const char* pCommand, 
std::shared_ptr pCallback)
 : maCommand(pCommand)
 , mpCallback(std::move(pCallback))
+, mSaveTime(std::chrono::steady_clock::now())
+, mbWasModified(SfxObjectShell::Current()->IsModified())
 {
 assert(mpCallback);
 }
@@ -4654,6 +4658,16 @@ public:
 }
 
 unoAnyToJson(aJson, "result", rEvent.Result);
+aJson.put("wasModified", mbWasModified);
+
+const auto saveTime = 
std::chrono::time_point_cast(mSaveTime);
+aJson.put("startUnixTimeMics",
+  static_cast(saveTime.time_since_epoch().count()));
+
+const auto saveDuration = 
std::chrono::duration_cast(
+std::chrono::steady_clock::now() - mSaveTime);
+aJson.put("saveDurationMics", 
static_cast(saveDuration.count()));
+
 mpCallback->queue(LOK_CALLBACK_UNO_COMMAND_RESULT, 
aJson.extractData());
 }
 

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

[Miklos Vajna (via logerrit)]

 sw/source/filter/ww8/ww8par.hxx   |   12 +-
 sw/source/filter/ww8/ww8par2.hxx  |4 
 sw/source/filter/ww8/ww8par6.cxx  |  194 +++---
 sw/source/filter/ww8/ww8struc.hxx |   16 +--
 4 files changed, 113 insertions(+), 113 deletions(-)

New commits:
commit cbd7ce7ea647a2608e1d12035a634a1637482672
Author: Miklos Vajna 
AuthorDate: Mon Apr 17 09:03:47 2023 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 17 13:35:29 2023 +0200

sw: improve naming of WW8_TablePos members

- Sp26 -> TDxaAbs
- Sp27 -> TDyaAbs
- LeMgn -> LeftMargin
- RiMgn -> RightMargin
- UpMgn -> UpperMargin
- LoMgn -> LowerMargin
- Sp29 -> TPc
- Sp37 -> PWr

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

diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index ad5d59c9813a..dcb6c977cc16 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -202,11 +202,11 @@ struct WW8FlyPara
 // Attention: *DO NOT* reorder, since parts will be
 // compared using memcmp
 bool bVer67;
-sal_Int16 nSp26, nSp27; // raw position
+sal_Int16 nTDxaAbs, nTDyaAbs; // raw position
 sal_Int16 nSp45, nSp28; // width / height
-sal_Int16 nLeMgn, nRiMgn, nUpMgn, nLoMgn;   // borders
-sal_uInt8 nSp29; // raw binding + alignment
-sal_uInt8 nSp37; // Wrap-Mode ( 1 / 2; 0 = no Apo ? )
+sal_Int16 nLeftMargin, nRightMargin, nUpperMargin, nLowerMargin;   
// borders
+sal_uInt8 nTPc; // raw binding + alignment
+sal_uInt8 nPWr; // Wrap-Mode ( 1 / 2; 0 = no Apo ? )
 WW8_BRCVer9_5 brc;  // borders Top, Left, Bottom, Right, Between
 bool bBorderLines;  // border lines
 bool bGrafApo;  // true: this frame is only used to position
@@ -215,9 +215,9 @@ struct WW8FlyPara
 
 WW8FlyPara(bool bIsVer67, const WW8FlyPara* pSrc = nullptr);
 bool operator==(const WW8FlyPara& rSrc) const;
-void Read(sal_uInt8 nSprm29, WW8PLCFx_Cp_FKP* pPap);
+void Read(sal_uInt8 nSprmTPc, WW8PLCFx_Cp_FKP* pPap);
 void ReadFull(sal_uInt8 nSprm29, SwWW8ImplReader* pIo);
-void Read(sal_uInt8 nSprm29, WW8RStyle const * pStyle);
+void Read(sal_uInt8 nSprmTPc, WW8RStyle const * pStyle);
 void ApplyTabPos(const WW8_TablePos *pTabPos);
 bool IsEmpty() const;
 };
diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx
index c486d1b93864..db7f70447694 100644
--- a/sw/source/filter/ww8/ww8par2.hxx
+++ b/sw/source/filter/ww8/ww8par2.hxx
@@ -49,8 +49,8 @@ private:
 public:
 // part 1: directly derived Sw attributes
 sal_Int16 nXPos, nYPos; // Position
-sal_Int16 nLeMgn, nRiMgn;   // borders
-sal_Int16 nUpMgn, nLoMgn;   // borders
+sal_Int16 nLeftMargin, nRightMargin;   // borders
+sal_Int16 nUpperMargin, nLowerMargin;   // borders
 sal_Int16 nWidth, nHeight;  // size
 sal_Int16 nNetWidth;
 
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 688f6d01fb69..45a210d8bc0d 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1640,14 +1640,14 @@ void WW8FlyPara::ApplyTabPos(const WW8_TablePos 
*pTabPos)
 {
 if (pTabPos)
 {
-nSp26 = pTabPos->nSp26;
-nSp27 = pTabPos->nSp27;
-nSp29 = pTabPos->nSp29;
-nLeMgn = pTabPos->nLeMgn;
-nRiMgn = pTabPos->nRiMgn;
-nUpMgn = pTabPos->nUpMgn;
-nLoMgn = pTabPos->nLoMgn;
-nSp37 = pTabPos->nSp37;
+nTDxaAbs = pTabPos->nTDxaAbs;
+nTDyaAbs = pTabPos->nTDyaAbs;
+nTPc = pTabPos->nTPc;
+nLeftMargin = pTabPos->nLeftMargin;
+nRightMargin = pTabPos->nRightMargin;
+nUpperMargin = pTabPos->nUpperMargin;
+nLowerMargin = pTabPos->nLowerMargin;
+nPWr = pTabPos->nPWr;
 }
 }
 
@@ -1657,16 +1657,16 @@ WW8FlyPara::WW8FlyPara(bool bIsVer67, const WW8FlyPara* 
pSrc /* = 0 */)
 memcpy( this, pSrc, sizeof( WW8FlyPara ) ); // Copy-Ctor
 else
 {
-nSp26 = 0;
-nSp27 = 0;
+nTDxaAbs = 0;
+nTDyaAbs = 0;
 nSp45 = 0;
 nSp28 = 0;
-nLeMgn = 0;
-nRiMgn = 0;
-nUpMgn = 0;
-nLoMgn = 0;
-nSp29 = 0;
-nSp37 = 2;  // Default: wrapping
+nLeftMargin = 0;
+nRightMargin = 0;
+nUpperMargin = 0;
+nLowerMargin = 0;
+nTPc = 0;
+nPWr = 2;  // Default: wrapping
 bBorderLines = false;
 bGrafApo = false;
 mbVertSet = false;
@@ -1683,53 +1683,53 @@ bool 

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

[Stephan Bergmann (via logerrit)]

 pyuno/source/loader/pyuno_loader.cxx |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1c8df0fd1ad896cbf7dfb08f2d70fa49e70c5106
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 09:20:20 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 11:42:07 2023 +0200

loplugin:stringadd

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

diff --git a/pyuno/source/loader/pyuno_loader.cxx 
b/pyuno/source/loader/pyuno_loader.cxx
index e9cbc807ebf3..27ef6abbc198 100644
--- a/pyuno/source/loader/pyuno_loader.cxx
+++ b/pyuno/source/loader/pyuno_loader.cxx
@@ -208,9 +208,7 @@ void pythonInit() {
 OUString sBrandLocation("$BRAND_BASE_DIR/program");
 rtl::Bootstrap::expandMacros(sBrandLocation);
 osl::FileBase::getSystemPathFromFileURL(sBrandLocation, sBrandLocation);
-sPath = OUStringBuffer(sPath).
-append(static_cast(SAL_PATHSEPARATOR)).
-append(sBrandLocation).makeStringAndClear();
+sPath = sPath + OUStringChar(SAL_PATHSEPARATOR) + sBrandLocation;
 osl_setEnvironment(sEnvName.pData, sPath.pData);
 #endif
 

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

[Stephan Bergmann (via logerrit)]

 bridges/source/cpp_uno/msvc_shared/except.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1f8c3839dfc7e633c74da905593821f7681e2e66
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 08:49:20 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 11:42:23 2023 +0200

loplugin:stringadd

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

diff --git a/bridges/source/cpp_uno/msvc_shared/except.cxx 
b/bridges/source/cpp_uno/msvc_shared/except.cxx
index f76533fa160e..b68dd41d6bdc 100644
--- a/bridges/source/cpp_uno/msvc_shared/except.cxx
+++ b/bridges/source/cpp_uno/msvc_shared/except.cxx
@@ -75,8 +75,7 @@ static OUString toRTTIname(OUString const& rUNOname) noexcept
 while (nPos > 0)
 {
 sal_Int32 n = rUNOname.lastIndexOf('.', nPos);
-aRet.append(rUNOname.subView(n + 1, nPos - n - 1));
-aRet.append('@');
+aRet.append(OUString::Concat(rUNOname.subView(n + 1, nPos - n - 1)) + 
"@");
 nPos = n;
 }
 aRet.append('@');

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

[Heiko Tietze (via logerrit)]

 svtools/source/config/colorcfg.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit 846e9a202b450445ede565c4f6a9a70954134438
Author: Heiko Tietze 
AuthorDate: Wed Apr 12 15:12:33 2023 +0200
Commit: Caolán McNamara 
CommitDate: Mon Apr 17 12:50:46 2023 +0200

Resolves tdf#152184 - App color follow system colors

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

diff --git a/svtools/source/config/colorcfg.cxx 
b/svtools/source/config/colorcfg.cxx
index 3fa88a3886cf..4847aeb6bd7d 100644
--- a/svtools/source/config/colorcfg.cxx
+++ b/svtools/source/config/colorcfg.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "itemholder2.hxx"
 
@@ -443,10 +444,14 @@ Color ColorConfig::GetDefaultColor(ColorConfigEntry 
eEntry)
 default:
 int nAppMod;
 switch (MiscSettings::GetAppColorMode()) {
-case 0: nAppMod = clLight; break; // UseDarkMode() ? clDark : 
clLight; break;
+default:
+if (MiscSettings::GetUseDarkMode())
+nAppMod = clDark;
+else
+nAppMod = clLight;
+break;
 case 1: nAppMod = clLight; break;
 case 2: nAppMod = clDark; break;
-default: nAppMod = clLight;
 }
 aRet = cAutoColors[eEntry][nAppMod];
 }

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-6.4-68'

[Szymon Kłos (via logerrit)]

Tag 'cp-6.4-68' created by Andras Timar  at 
2023-04-11 14:46 +

cp-6.4-68

Changes since co-6.4-68-2:
---
 0 files changed
---

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-22.05.13-1'

[Andras Timar (via logerrit)]

Tag 'cp-22.05.13-1' created by Andras Timar  at 
2023-04-12 21:31 +

cp-22.05.13-1

Changes since cp-22.05.12-3-28:
---
 0 files changed
---

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - svx/source

[Noel Grandin (via logerrit)]

 svx/source/table/cell.cxx |   36 ++--
 1 file changed, 18 insertions(+), 18 deletions(-)

New commits:
commit 0ceddcdff4a7a5d18f1ef5e6865a5f85a8553e6d
Author: Noel Grandin 
AuthorDate: Thu Apr 13 21:26:43 2023 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 17 12:58:15 2023 +0200

tdf#154501 - Fileopen PPTX: Table with rotated text wrong

regression from

commit eec42f0dbcc79a4c9f456ce97fa1066b8031ea28
Author: Noel Grandin 
Date:   Sun Aug 15 17:35:58 2021 +0200
pass OutlinerParaObject around by value

where some of code I converted needed to be mutating the
OutlinerParaObject that something else held, rather than mutating
a local copy.

Change-Id: Ib91dddb3fc0d4190868f9fd59becb0d366af5e19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150376
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit ad97694737c99889bc0eb21efccb83768d510361)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150329
Reviewed-by: Xisco Fauli 

diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 5dbc1ee1a8e5..ed062d5d7218 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -308,14 +308,13 @@ namespace sdr::properties
 rObj.SetVerticalWriting(bVertical);
 
 // Set a cell vertical property
-std::optional pParaObj = 
mxCell->CreateEditOutlinerParaObject();
-
-if( !pParaObj && mxCell->GetOutlinerParaObject() )
-pParaObj = *mxCell->GetOutlinerParaObject();
+std::optional pEditParaObj = 
mxCell->CreateEditOutlinerParaObject();
 
-if(pParaObj)
+if( !pEditParaObj && mxCell->GetOutlinerParaObject() )
 {
-pParaObj->SetVertical(bVertical);
+OutlinerParaObject* pParaObj = 
mxCell->GetOutlinerParaObject();
+if(pParaObj)
+pParaObj->SetVertical(bVertical);
 }
 }
 
@@ -324,22 +323,23 @@ namespace sdr::properties
 const SvxTextRotateItem* pRotateItem = static_cast(pNewItem);
 
 // Set a cell vertical property
-std::optional pParaObj = 
mxCell->CreateEditOutlinerParaObject();
+std::optional pEditParaObj = 
mxCell->CreateEditOutlinerParaObject();
 
-if (!pParaObj && mxCell->GetOutlinerParaObject())
-pParaObj = *mxCell->GetOutlinerParaObject();
-
-if (pParaObj)
+if (!pEditParaObj && mxCell->GetOutlinerParaObject())
 {
-if(pRotateItem->IsVertical() && 
pRotateItem->IsTopToBottom())
-pParaObj->SetRotation(TextRotation::TOPTOBOTTOM);
-else if (pRotateItem->IsVertical())
-pParaObj->SetRotation(TextRotation::BOTTOMTOTOP);
-else
-pParaObj->SetRotation(TextRotation::NONE);
+OutlinerParaObject* pParaObj = 
mxCell->GetOutlinerParaObject();
+if (pParaObj)
+{
+if(pRotateItem->IsVertical() && 
pRotateItem->IsTopToBottom())
+pParaObj->SetRotation(TextRotation::TOPTOBOTTOM);
+else if (pRotateItem->IsVertical())
+pParaObj->SetRotation(TextRotation::BOTTOMTOTOP);
+else
+pParaObj->SetRotation(TextRotation::NONE);
+}
 }
 
-   // Change autogrow direction
+// Change autogrow direction
 SdrTextObj& rObj = static_cast(GetSdrObject());
 
 // rescue object size

[Libreoffice-commits] core.git: Changes to 'refs/tags/cp-21.06.37-1'

[Szymon Kłos (via logerrit)]

Tag 'cp-21.06.37-1' created by Andras Timar  at 
2023-04-12 10:45 +

cp-21.06.37-1

Changes since co-21.06.37-1-2:
---
 0 files changed
---

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

[Stephan Bergmann (via logerrit)]

 connectivity/source/drivers/ado/Awrapado.cxx |   25 +
 connectivity/source/inc/ado/Awrapado.hxx |   12 ++--
 2 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit d88b2ec74c35cbf6adcd7bcd80243685a5a02344
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 09:16:03 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 14:59:43 2023 +0200

loplugin:stringviewparam

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

diff --git a/connectivity/source/drivers/ado/Awrapado.cxx 
b/connectivity/source/drivers/ado/Awrapado.cxx
index c25c0d6e0e7a..eebdc5d8c5a7 100644
--- a/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/connectivity/source/drivers/ado/Awrapado.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1619,7 +1620,7 @@ ADORecordset* WpADOConnection::getIndexInfo(
 
 ADORecordset* WpADOConnection::getTablePrivileges( const css::uno::Any& 
catalog,
   const OUString& 
schemaPattern,
-  const OUString& 
tableNamePattern )
+  std::u16string_view 
tableNamePattern )
 {
 SAFEARRAYBOUND rgsabound[1];
 SAFEARRAY *psa = nullptr;
@@ -1639,7 +1640,7 @@ ADORecordset* WpADOConnection::getTablePrivileges( const 
css::uno::Any& catalog,
 varCriteria[nPos].setString(schemaPattern);
 SafeArrayPutElement(psa,,[nPos]);nPos++;// TABLE_SCHEMA
 
-if(tableNamePattern.toChar() != '%')
+if(!o3tl::starts_with(tableNamePattern, u"%"))
 varCriteria[nPos].setString(tableNamePattern);
 SafeArrayPutElement(psa,,[nPos]);nPos++;// TABLE_NAME
 
@@ -1714,7 +1715,7 @@ ADORecordset* WpADOConnection::getCrossReference( const 
css::uno::Any& primaryCa
 
 ADORecordset* WpADOConnection::getProcedures( const css::uno::Any& catalog,
   const OUString& 
schemaPattern,
-  const OUString& 
procedureNamePattern )
+  std::u16string_view 
procedureNamePattern )
 {
 SAFEARRAYBOUND rgsabound[1];
 SAFEARRAY *psa = nullptr;
@@ -1734,7 +1735,7 @@ ADORecordset* WpADOConnection::getProcedures( const 
css::uno::Any& catalog,
 varCriteria[nPos].setString(schemaPattern);
 SafeArrayPutElement(psa,,[nPos]);nPos++;// TABLE_SCHEMA
 
-if(procedureNamePattern.toChar() != '%')
+if(!o3tl::starts_with(procedureNamePattern, u"%"))
 varCriteria[nPos].setString(procedureNamePattern);
 SafeArrayPutElement(psa,,[nPos]);nPos++;// TABLE_NAME
 
@@ -1753,8 +1754,8 @@ ADORecordset* WpADOConnection::getProcedures( const 
css::uno::Any& catalog,
 
 ADORecordset* WpADOConnection::getProcedureColumns( const css::uno::Any& 
catalog,
   const OUString& 
schemaPattern,
-  const OUString& 
procedureNamePattern,
-  const OUString& 
columnNamePattern )
+  std::u16string_view 
procedureNamePattern,
+  std::u16string_view 
columnNamePattern )
 {
 // Create elements used in the array
 SAFEARRAYBOUND rgsabound[1];
@@ -1775,11 +1776,11 @@ ADORecordset* WpADOConnection::getProcedureColumns( 
const css::uno::Any& catalog
 varCriteria[nPos].setString(schemaPattern);
 SafeArrayPutElement(psa,,[nPos]);nPos++;// TABLE_SCHEMA
 
-if(procedureNamePattern.toChar() != '%')
+if(!o3tl::starts_with(procedureNamePattern, u"%"))
 varCriteria[nPos].setString(procedureNamePattern);
 SafeArrayPutElement(psa,,[nPos]);nPos++;// TABLE_NAME
 
-if(columnNamePattern.toChar() != '%')
+if(!o3tl::starts_with(columnNamePattern, u"%"))
 varCriteria[nPos].setString(columnNamePattern);
 SafeArrayPutElement(psa,,[nPos]);nPos++;// COLUMN_NAME
 
@@ -1798,7 +1799,7 @@ ADORecordset* WpADOConnection::getProcedureColumns( const 
css::uno::Any& catalog
 
 ADORecordset* WpADOConnection::getTables( const css::uno::Any& catalog,
   const OUString& 
schemaPattern,
-  const OUString& 
tableNamePattern,
+  std::u16string_view 
tableNamePattern,
   const css::uno::Sequence< 
OUString >& types )
 {
 // Create elements used in the array
@@ -1815,7 +1816,7 @@ ADORecordset* WpADOConnection::getTables( const 
css::uno::Any& catalog,
 varCriteria[nPos].setString(schemaPattern);
 
 ++nPos;
-if(tableNamePattern.toChar() != '%')
+

Proposition for LibreOfiice

[Zetanos]

Greetings,
I write this mail to speak about a well known problem : the treatment of
images, and photos on LibreOffice when it takes a large file.

I had to confront this problem dealing with a thesis of 1000 pages which
uses a list of 60 photos approximately in it. Yes, it is an extreme
situation but it pointed out certain number of problems.

It is not a surprise for you to know that constituting a database of 60
photos with legend in a frame is a painstaking work by itself, but
positioning these photos in the text was very counter-intuitive (I saw
every possible tutorial on the subject) and even when it works, the
slightest change within the document makes images change their place (event
when protected) and even override the space of footnotes (some of them
being specifically large).

Moreover, when passing to a master document, compiling the result is very
problematic. Even though the formatting of the sub document is identical to
the master document (size and font of titles, margins and page format,
etc.) the images are displaced and jumps appear everywhere in pages. (Maybe
a way to "fix" everything text in a sub-document ?)
Compiling needed systematically to a double update once in the master
document navigation bar (the "red flag") and in tools->update all (or
everything) for the jumps in text to disappear.

The second serious problem working with master document is references. If
one has to make a reference to a title or a text or any element in another
sub-document, the referencing fails.

It is a petty for such a wonderful program to have these serious lacks,
because the importance of LibreOffice in academic production is not to be
disconsidered even if LaTeX and other alternatives exists. LibreOffice is
largely superior in structuring documents, TOC, footnotes than commercial
alternatives, and it is WYSIWYG. I don't think I am the only one who shares
this view.

It will be also wonderful if LaTeX is implemented within LibreMath as
co-system of its already existing mathematical coding instead of an add-on.

I am myself (an aged) student in mathematics in France, and learned some
programming languages. I don't know if I am competent enough to technically
help in these issues, but willing to learn. At least I can surely install
test variants of LibreOffice and give you feedback if necessary.

Thank you again for reading my mail.
Have a nice day.

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

[Mike Kaganski (via logerrit)]

 shell/source/win32/spsupp/res/spsuppDlg.rc |   56 ++---
 1 file changed, 28 insertions(+), 28 deletions(-)

New commits:
commit 7b55e994338ab5e7d9056f84d1aa2989534f59fb
Author: Mike Kaganski 
AuthorDate: Mon Apr 17 12:58:43 2023 +0300
Commit: Mike Kaganski 
CommitDate: Mon Apr 17 15:32:16 2023 +0200

Normalize line endings

Change-Id: I8daa44961ae7a92fc6bbc728e5387dc0b5e32f31
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150487
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/shell/source/win32/spsupp/res/spsuppDlg.rc 
b/shell/source/win32/spsupp/res/spsuppDlg.rc
index f4ce83a157fc..4c43c663c6dd 100644
--- a/shell/source/win32/spsupp/res/spsuppDlg.rc
+++ b/shell/source/win32/spsupp/res/spsuppDlg.rc
@@ -1,29 +1,29 @@
-/* -*- 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 "spsuppDlg.h"
-// We need to include windows.h to use IDI_QUESTION
-#define WIN32_LEAN_AND_MEAN
-#include 
-
-LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
-
-// Dialog
-
-IDD_EDIT_OR_RO DIALOGEX 0, 0, 309, 87
+/* -*- 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 "spsuppDlg.h"
+// We need to include windows.h to use IDI_QUESTION
+#define WIN32_LEAN_AND_MEAN
+#include 
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
+
+// Dialog
+
+IDD_EDIT_OR_RO DIALOGEX 0, 0, 309, 87
 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOPMOST
-CAPTION "Open Document"
-BEGIN
-ICONIDI_QUESTION,IDC_STATIC,7,7,21,20
-LTEXT   "Do you want to open the document to view or to 
edit?",IDC_EDIT_OR_RO,36,7,266,44
-DEFPUSHBUTTON   "View",ID_RO,91,66,77,14
-PUSHBUTTON  "Edit",ID_EDIT,171,66,77,14
-PUSHBUTTON  "Cancel",IDCANCEL,252,66,50,14
-END
+EXSTYLE WS_EX_TOPMOST
+CAPTION "Open Document"
+BEGIN
+ICONIDI_QUESTION,IDC_STATIC,7,7,21,20
+LTEXT   "Do you want to open the document to view or to 
edit?",IDC_EDIT_OR_RO,36,7,266,44
+DEFPUSHBUTTON   "View",ID_RO,91,66,77,14
+PUSHBUTTON  "Edit",ID_EDIT,171,66,77,14
+PUSHBUTTON  "Cancel",IDCANCEL,252,66,50,14
+END

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

[Armin Le Grand (allotropia) (via logerrit)]

 include/oox/export/drawingml.hxx |1 
 oox/source/export/drawingml.cxx  |  115 +++
 2 files changed, 93 insertions(+), 23 deletions(-)

New commits:
commit dbbe5d0cd721a815df5e4cbf3215f291a423f2b1
Author: Armin Le Grand (allotropia) 
AuthorDate: Fri Apr 14 16:29:18 2023 +0200
Commit: Armin Le Grand 
CommitDate: Mon Apr 17 16:10:48 2023 +0200

MCGR: 1st corrections to gradient export, transparency

Changed Alpha export from using Red component of
used BColor too use luminance, that will be more
safe if we evtl use same gradients for this in the
future.

Added evtl. needed inversion for gradient exports,
also emulation of our 'axial' type.

Change-Id: I245959bf1602174f978848e1a02444b4b105f896
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150416
Tested-by: Jenkins
Reviewed-by: Armin Le Grand 

diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index bfab16f12aff..4bd3802a7820 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -237,6 +237,7 @@ public:
 void WriteColor( const ::Color nColor, const css::uno::Sequence< 
css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT );
 void WriteColorTransformations( const css::uno::Sequence< 
css::beans::PropertyValue >& aTransformations, sal_Int32 nAlpha = MAX_PERCENT );
 void WriteGradientStop(sal_uInt16 nStop, ::Color nColor, sal_Int32 nAlpha 
= MAX_PERCENT);
+void WriteGradientStop2(double fOffset, const basegfx::BColor& rColor, 
const basegfx::BColor& rAlpha);
 void WriteLineArrow( const css::uno::Reference< css::beans::XPropertySet 
>& rXPropSet, bool bLineStart );
 void WriteConnectorConnections( sal_Int32 nStartGlueId, sal_Int32 
nEndGlueId, sal_Int32 nStartID, sal_Int32 nEndID );
 
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index d02890375514..58b2b1fbb2a7 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -657,6 +657,15 @@ bool DrawingML::WriteSchemeColor(OUString const& 
rPropertyName, const uno::Refer
 return true;
 }
 
+void DrawingML::WriteGradientStop2(double fOffset, const basegfx::BColor& 
rColor, const basegfx::BColor& rAlpha)
+{
+mpFS->startElementNS(XML_a, XML_gs, XML_pos, 
OString::number(static_cast(fOffset * 10)));
+WriteColor(
+::Color(rColor),
+static_cast((1.0 - rAlpha.luminance()) * 
oox::drawingml::MAX_PERCENT));
+mpFS->endElementNS( XML_a, XML_gs );
+}
+
 void DrawingML::WriteGradientStop(sal_uInt16 nStop, ::Color nColor, sal_Int32 
nAlpha)
 {
 mpFS->startElementNS(XML_a, XML_gs, XML_pos, OString::number(nStop * 
1000));
@@ -874,35 +883,98 @@ void DrawingML::WriteGradientFill2(
 // method (at import time) will be exported again
 basegfx::utils::synchronizeColorStops(aColorStops, aAlphaStops, 
aSingleColor, aSingleAlpha);
 
-if (aColorStops.size() == aAlphaStops.size())
+if (aColorStops.size() != aAlphaStops.size())
 {
-// export GradientStops (with alpha)
-mpFS->startElementNS(XML_a, XML_gsLst);
+// this is an error - synchronizeColorStops above *has* to create that
+// state, see description there (!)
+assert(false && "oox::WriteGradientFill: non-synchronized gradients 
(!)");
+return;
+}
 
-basegfx::ColorStops::const_iterator aCurrColor(aColorStops.begin());
-basegfx::ColorStops::const_iterator aCurrAlpha(aAlphaStops.begin());
+bool bRadialOrEllipticalOrRectOrSquare(false);
+bool bLinear(false);
+bool bAxial(false);
 
-while (aCurrColor != aColorStops.end() && aCurrAlpha != 
aAlphaStops.end())
+switch (aGradient.Style)
+{
+case awt::GradientStyle_LINEAR:
+{
+// remember being linear, nothing else to be done
+bLinear = true;
+break;
+}
+case awt::GradientStyle_AXIAL:
 {
-WriteGradientStop(
-static_cast(aCurrColor->getStopOffset() * 100.0),
-::Color(aCurrColor->getStopColor()),
-sal_Int32(::Color(aCurrAlpha->getStopColor(;
-aCurrColor++;
-aCurrAlpha++;
+// we need to 'double' the gradient to make it appear as what we 
call
+// 'axial', but also scale and mirror in doing so
+basegfx::ColorStops aNewColorStops;
+basegfx::ColorStops aNewAlphaStops;
+
+// add mirrored gadients, scaled to [0.0 .. 0.5]
+basegfx::ColorStops::const_reverse_iterator 
aRevCurrColor(aColorStops.rbegin());
+basegfx::ColorStops::const_reverse_iterator 
aRevCurrAlpha(aAlphaStops.rbegin());
+
+while (aRevCurrColor != aColorStops.rend() && aRevCurrAlpha != 
aAlphaStops.rend())
+{
+aNewColorStops.emplace_back((1.0 - 
aRevCurrColor->getStopOffset()) 

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

[Stephan Bergmann (via logerrit)]

 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 1ccb5a63cd3f16f46c3d8cb7d86374805705804d
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 09:25:05 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 16:11:59 2023 +0200

loplugin:stringadd

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

diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
index 9c671d0c21c0..bd4ef701e6ed 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx
@@ -690,8 +690,7 @@ static OUString CompatDNNSS(OUString const& rDN)
 {
 if (rDN[i] == '+' || rDN[i] == ',' || rDN[i] == ';')
 {
-buf.append('"');
-buf.append(rDN[i]);
+buf.append("\"" + OUStringChar(rDN[i]));
 state = DEFAULT;
 }
 else if (rDN[i] == '\\')

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

[Noel Grandin (via logerrit)]

 svx/source/svdraw/svdmodel.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 41741d0417a11ab3033e4dc6c899646d42871546
Author: Noel Grandin 
AuthorDate: Mon Apr 17 11:40:55 2023 +0200
Commit: Noel Grandin 
CommitDate: Mon Apr 17 14:57:01 2023 +0200

tdf#154473 remove assert

so the commit that caused this:
commit 8611f6e259b807b4f19c8dc0eab86ca648891ce3
Author: Noel Grandin 
Date:   Thu May 27 10:27:46 2021 +0200
ref-count SdrObject
did its job - we have far fewer crashes due to accessing dead SdrObjects
- but the wide variety of other, smaller leaks, means that sometimes
we have leaks of SdrObjects too.

So just remove this assert for now (but leave the warning in DBG_UTIL
mode in)

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

diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index c3716a4a3efa..7bf82ca9747f 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -224,7 +224,6 @@ SdrModel::~SdrModel()
 for (const auto & pObj : maAllIncarnatedObjects)
 SAL_WARN("svx", "leaked instance of " << typeid(*pObj).name());
 }
-assert(maAllIncarnatedObjects.empty());
 #endif
 
 m_pLayerAdmin.reset();

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

[Stephan Bergmann (via logerrit)]

 sw/qa/extras/uiwriter/uiwriter6.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 8978d12cbc475fa4c94a9a6b65d2e3f7219eb227
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 08:14:33 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 15:03:43 2023 +0200

-Werror,-Wunused-variable

Unused ever since it got introduced in 
9a62e50d72bdcc786df4ea6094b349d1b3215b56
"tdf#154771 sw: fix drag & drop moving of table columns".

(Found with an experimental Clang build supporting 
__attribute__((warn_unused))
on individual ctors rather than just whole class types, and the 
corresponding
css::uno::Reference ctor marked accordingly.)

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

diff --git a/sw/qa/extras/uiwriter/uiwriter6.cxx 
b/sw/qa/extras/uiwriter/uiwriter6.cxx
index 836dfeb26abc..7e2ddb31d1c6 100644
--- a/sw/qa/extras/uiwriter/uiwriter6.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter6.cxx
@@ -992,8 +992,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest6, 
testTdf154771_MovingMultipleColumns)
 (void)>InsertTable(TableOpt, 5, 4);
 
 uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
-uno::Reference 
xTables(xTablesSupplier->getTextTables(),
-uno::UNO_QUERY);
 uno::Reference xTableNames = 
xTablesSupplier->getTextTables();
 CPPUNIT_ASSERT(xTableNames->hasByName("Table1"));
 uno::Reference xTable1(xTableNames->getByName("Table1"), 
uno::UNO_QUERY);

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

[Mike Kaganski (via logerrit)]

 sw/qa/extras/htmlexport/htmlexport.cxx |3 ++-
 sw/source/filter/html/htmlatr.cxx  |2 ++
 sw/source/filter/html/htmltabw.cxx |   19 +--
 sw/source/filter/html/wrthtml.hxx  |1 +
 4 files changed, 6 insertions(+), 19 deletions(-)

New commits:
commit 4e89ff82d24277737653214a311702cd7c006d09
Author: Mike Kaganski 
AuthorDate: Tue Apr 11 21:24:58 2023 +0300
Commit: Xisco Fauli 
CommitDate: Mon Apr 17 16:25:15 2023 +0200

tdf#154761: each dl needs a dd to actually indent

Change-Id: Iaa75048b33ab82250d205cbf821e57425754ef5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150244
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150491

diff --git a/sw/qa/extras/htmlexport/htmlexport.cxx 
b/sw/qa/extras/htmlexport/htmlexport.cxx
index 8ed189b44bb0..6834434bf3da 100644
--- a/sw/qa/extras/htmlexport/htmlexport.cxx
+++ b/sw/qa/extras/htmlexport/htmlexport.cxx
@@ -2407,8 +2407,9 @@ CPPUNIT_TEST_FIXTURE(HtmlExportTest, testTdf153923)
 // Without the fix in place, this would fail
 CPPUNIT_ASSERT(pDoc);
 
+assertXPath(pDoc, "/html/body//dl", 3);
 // The 'dd' tag was not closed
-assertXPath(pDoc, "/html/body//dd");
+assertXPath(pDoc, "/html/body//dd", 3);
 }
 
 CPPUNIT_TEST_FIXTURE(SwHtmlDomExportTest, testTdf153923_ReqIF)
diff --git a/sw/source/filter/html/htmlatr.cxx 
b/sw/source/filter/html/htmlatr.cxx
index 1bf0a45e82e3..822718763e4d 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -136,6 +136,7 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl )
 if( m_bLFPossible )
 OutNewLine();
 HTMLOutFuncs::Out_AsciiTag( Strm(), Concat2View(GetNamespace() + 
OOO_STRING_SVTOOLS_HTML_deflist) );
+HTMLOutFuncs::Out_AsciiTag( Strm(), Concat2View(GetNamespace() + 
OOO_STRING_SVTOOLS_HTML_dd) );
 IncIndentLevel();
 m_bLFPossible = true;
 }
@@ -147,6 +148,7 @@ void SwHTMLWriter::OutAndSetDefList( sal_uInt16 nNewLvl )
 DecIndentLevel();
 if( m_bLFPossible )
 OutNewLine();
+HTMLOutFuncs::Out_AsciiTag( Strm(), Concat2View(GetNamespace() + 
OOO_STRING_SVTOOLS_HTML_dd), false );
 HTMLOutFuncs::Out_AsciiTag( Strm(), Concat2View(GetNamespace() + 
OOO_STRING_SVTOOLS_HTML_deflist), false );
 m_bLFPossible = true;
 }
diff --git a/sw/source/filter/html/htmltabw.cxx 
b/sw/source/filter/html/htmltabw.cxx
index 8c86f70c97ff..ab611724474d 100644
--- a/sw/source/filter/html/htmltabw.cxx
+++ b/sw/source/filter/html/htmltabw.cxx
@@ -1050,17 +1050,9 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & 
rNode,
 }
 }
 
-if( !pFlyFrameFormat && nNewDefListLvl != rHTMLWrt.m_nDefListLvl )
+if( !pFlyFrameFormat && !rHTMLWrt.mbReqIF && nNewDefListLvl != 
rHTMLWrt.m_nDefListLvl )
 rHTMLWrt.OutAndSetDefList( nNewDefListLvl );
 
-if( nNewDefListLvl )
-{
-if( rHTMLWrt.m_bLFPossible )
-rHTMLWrt.OutNewLine();
-HTMLOutFuncs::Out_AsciiTag( rWrt.Strm(), 
Concat2View(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_dd) );
-rHTMLWrt.IncIndentLevel();
-}
-
 // eFlyHoriOri and eTabHoriOri now only contain the values of
 // LEFT/CENTER and RIGHT!
 if( eFlyHoriOri!=text::HoriOrientation::NONE )
@@ -1185,15 +1177,6 @@ Writer& OutHTML_SwTableNode( Writer& rWrt, SwTableNode & 
rNode,
 // move Pam behind the table
 rHTMLWrt.m_pCurrentPam->GetPoint()->Assign( *rNode.EndOfSectionNode() );
 
-if (nNewDefListLvl)
-{
-rHTMLWrt.DecIndentLevel();
-if (rHTMLWrt.m_bLFPossible)
-rHTMLWrt.OutNewLine();
-// close the dd element
-HTMLOutFuncs::Out_AsciiTag(rWrt.Strm(), 
Concat2View(rHTMLWrt.GetNamespace() + OOO_STRING_SVTOOLS_HTML_dd), false);
-}
-
 if( bPreserveForm )
 {
 rHTMLWrt.m_bPreserveForm = false;
diff --git a/sw/source/filter/html/wrthtml.hxx 
b/sw/source/filter/html/wrthtml.hxx
index b62aab60af6e..c083d688acb4 100644
--- a/sw/source/filter/html/wrthtml.hxx
+++ b/sw/source/filter/html/wrthtml.hxx
@@ -472,6 +472,7 @@ public:
 
 void OutBasic(const SwHTMLWriter& rHTMLWrt);
 
+// Used to indent inner blocks using dl/dd tags
 void OutAndSetDefList( sal_uInt16 nNewLvl );
 
 void OutStyleSheet( const SwPageDesc& rPageDesc );

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

[Caolán McNamara (via logerrit)]

 chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 13a2ca25e4b16a6ac310c03ec9b543c774a0df6c
Author: Caolán McNamara 
AuthorDate: Mon Apr 17 09:38:45 2023 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 17 17:03:26 2023 +0200

Resolves: tdf#146068 don't crash when MA(central) lacks data

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

diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx 
b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
index 6236f73b398d..6726d9d78b36 100644
--- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
+++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx
@@ -84,6 +84,8 @@ void 
MovingAverageRegressionCurveCalculator::calculateValuesCentral(
 RegressionCalculationHelper::tDoubleVectorPair aValues)
 {
 const size_t aSize = aValues.first.size();
+if (aSize == 0)
+return;
 for (size_t i = mPeriod - 1; i < aSize; ++i)
 {
 double yAvg = 0.0;

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

[Stephan Bergmann (via logerrit)]

 cli_ure/source/climaker/climaker_app.cxx  |2 +-
 cli_ure/source/climaker/climaker_emit.cxx |2 +-
 cli_ure/source/climaker/climaker_share.h  |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a2166dfd4175ed1da0b59e0b618b092d62ed3401
Author: Stephan Bergmann 
AuthorDate: Fri Apr 14 08:47:02 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 15:07:57 2023 +0200

Avoid MSVC error C2039

At least with VS 2022 Preview 17.6.0 Preview 3.0 and (if that makes a 
difference
here) --with-latest-c++, the build started to fail now for me with

> cli_ure/source/climaker/climaker_app.cxx(603): error C2039: '{dtor}': is 
not a member of 'System::IDisposable'

Originally, in 4c937bbdbbfd954936fdc92c4b35d90c2233719e "#107130# new",
TypeEmitter in cli_ure/source/climaker/climaker_share.h had been defined as

> __gc class TypeEmitter : public ::System::IDisposable

with an overriding Dispose member function (and no user-declared dtor), and 
the
code in cli_ure/source/climaker/climaker_app.cxx had called

> type_emitter->Dispose();

when done.  Then, in 6fa1a74ec4bb5820d1638ff3b872476f8652efe0 "convert 
climaker
to new syntax", the definition of TypeEmitter had been changed to

> ref class TypeEmitter : public ::System::IDisposable

with a dtor instead of the overriding Dispose member function, and the code 
in
cli_ure/source/climaker/climaker_app.cxx had been changed to call

> type_emitter->~TypeEmitter();

instead.

I have no deep understanding of the Managed C++/CLI stuff at play here, but 
it
looks reasonable to avoid all this by not deriving from IDisposable (and 
relying
on GC to clean up all instances) and introducing some explicit finish()
protocol.

Change-Id: I8ebfba9d9f9c32b65a50104d200306e06dc69f73
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150387
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
Reviewed-by: Stephan Bergmann 

diff --git a/cli_ure/source/climaker/climaker_app.cxx 
b/cli_ure/source/climaker/climaker_app.cxx
index 9c596cd97017..b2ba44fef0e8 100644
--- a/cli_ure/source/climaker/climaker_app.cxx
+++ b/cli_ure/source/climaker/climaker_app.cxx
@@ -600,7 +600,7 @@ SAL_IMPLEMENT_MAIN()
 UNO_QUERY_THROW ) );
 }
 }
-type_emitter->~TypeEmitter();
+type_emitter->finish();
 
 if (g_bVerbose)
 {
diff --git a/cli_ure/source/climaker/climaker_emit.cxx 
b/cli_ure/source/climaker/climaker_emit.cxx
index e34a9b088bda..4f4dceef9fa2 100644
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -2154,7 +2154,7 @@ Emit::CustomAttributeBuilder^ 
TypeEmitter::get_exception_attribute(
 //get_type will asked the module builder for the type or otherwise all 
known assemblies.
 return get_type(sName, true);
 }
-TypeEmitter::~TypeEmitter()
+void TypeEmitter::finish()
 {
 while (true)
 {
diff --git a/cli_ure/source/climaker/climaker_share.h 
b/cli_ure/source/climaker/climaker_share.h
index ed7ab256a3ad..29c3c876426e 100644
--- a/cli_ure/source/climaker/climaker_share.h
+++ b/cli_ure/source/climaker/climaker_share.h
@@ -110,7 +110,7 @@ static ::System::Reflection::MethodAttributes 
c_ctor_method_attr =
 ::System::Reflection::MethodAttributes::Instance*/);
 
 
-ref class TypeEmitter : public ::System::IDisposable
+ref class TypeEmitter
 {
 ::System::Reflection::Emit::ModuleBuilder ^ m_module_builder;
 array< ::System::Reflection::Assembly^>^ m_extra_assemblies;
@@ -243,7 +243,7 @@ public:
 ::System::Reflection::Emit::ModuleBuilder ^ module_builder,
 array< ::System::Reflection::Assembly^>^ assemblies );
 // must be called to finish up uncompleted types
-~TypeEmitter();
+void finish();
 
 ::System::Reflection::Assembly ^ type_resolve(
 ::System::Object ^ sender, ::System::ResolveEventArgs ^ args );

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

[Caolán McNamara (via logerrit)]

 include/xmloff/txtparae.hxx   |5 +
 sc/source/filter/xml/xmlcelli.cxx |2 +-
 xmloff/source/text/txtparae.cxx   |   33 -
 3 files changed, 34 insertions(+), 6 deletions(-)

New commits:
commit 7773932ba7c4bafeed7fba0a5d87f75eed09f850
Author: Caolán McNamara 
AuthorDate: Mon Apr 17 09:17:43 2023 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 17 17:03:17 2023 +0200

tdf#151560 don't crash on loading dubious fods

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

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index dbbfccf5a5a0..c2841fa33c7f 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1493,7 +1493,7 @@ bool ScXMLTableRowCellContext::IsPossibleErrorString() 
const
 return false;
 else if(mbNewValueType && mbErrorValue)
 return true;
-return mbPossibleErrorCell || (mbCheckWithCompilerForError &&
+return mbPossibleErrorCell || (mbCheckWithCompilerForError && 
maStringValue &&
 GetScImport().GetFormulaErrorConstant(*maStringValue) != 
FormulaError::NONE);
 }
 
commit d405ddce1fca35e088d35805345571687c46ff5f
Author: Caolán McNamara 
AuthorDate: Sun Apr 16 20:44:25 2023 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 17 17:03:07 2023 +0200

crashtesting: crash on export of forum-mso-de-102589.docx to odt

recurses to death

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

diff --git a/include/xmloff/txtparae.hxx b/include/xmloff/txtparae.hxx
index 36d554be2a20..1ba8b0b1a0c8 100644
--- a/include/xmloff/txtparae.hxx
+++ b/include/xmloff/txtparae.hxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -51,6 +52,7 @@ namespace com::sun::star
 namespace beans { class XPropertySet; class XPropertyState;
   class XPropertySetInfo; }
 namespace container { class XEnumeration; class XIndexAccess; class 
XNameReplace; }
+namespace drawing { class XShape; }
 namespace text { class XTextContent; class XTextRange; class XText;
  class XFootnote; class XTextFrame; class XTextSection;
  class XTextField; }
@@ -110,6 +112,9 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public 
XMLStyleExport
 XMLTextListsHelper* mpTextListsHelper;
 ::std::vector< std::unique_ptr > 
maTextListsHelperStack;
 
+o3tl::sorted_vector> 
maFrameRecurseGuard;
+o3tl::sorted_vector> 
maShapeRecurseGuard;
+
 bool mbCollected;
 
 enum class FrameType { Text, Graphic, Embedded, Shape };
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index aaf47ddd4b71..1e02dbce341d 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -110,6 +110,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace ::com::sun::star;
@@ -3054,17 +3055,39 @@ void XMLTextParagraphExport::exportAnyTextFrame(
 if ( bExportContent )
 {
 Reference < XTextFrame > xTxtFrame( rTxtCntnt, UNO_QUERY );
-Reference < XText > xTxt(xTxtFrame->getText());
-exportFrameFrames( true, bIsProgress, xTxtFrame );
-exportText( xTxt, bAutoStyles, bIsProgress, true );
+bool bAlreadySeen = 
!maFrameRecurseGuard.insert(xTxtFrame).second;
+if (bAlreadySeen)
+{
+SAL_WARN("xmloff", "loop in frame export, ditching");
+}
+else
+{
+comphelper::ScopeGuard const g([this, xTxtFrame]() {
+maFrameRecurseGuard.erase(xTxtFrame);
+});
+Reference < XText > xTxt(xTxtFrame->getText());
+exportFrameFrames( true, bIsProgress, xTxtFrame );
+exportText( xTxt, bAutoStyles, bIsProgress, true );
+}
 }
 }
 break;
 case FrameType::Shape:
 {
 Reference < XShape > xShape( rTxtCntnt, UNO_QUERY );
-css::uno::Sequence aAutoStylePropNames = 
GetAutoStylePool().GetPropertyNames();
-GetExport().GetShapeExport()->collectShapeAutoStyles( xShape, 
aAutoStylePropNames );
+bool bAlreadySeen = !maShapeRecurseGuard.insert(xShape).second;
+if (bAlreadySeen)
+{
+SAL_WARN("xmloff", "loop in shape export, ditching");
+}
+else
+

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

[Caolán McNamara (via logerrit)]

 sc/source/filter/xml/xmlcelli.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ad3605166c91193b3dbf41ed33515e267133f90
Author: Caolán McNamara 
AuthorDate: Mon Apr 17 09:17:43 2023 +0100
Commit: Caolán McNamara 
CommitDate: Mon Apr 17 14:53:05 2023 +0200

tdf#151560 don't crash on loading dubious fods

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

diff --git a/sc/source/filter/xml/xmlcelli.cxx 
b/sc/source/filter/xml/xmlcelli.cxx
index 7ae36e35..7288c631f68c 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -1483,7 +1483,7 @@ bool ScXMLTableRowCellContext::IsPossibleErrorString() 
const
 return false;
 else if(mbNewValueType && mbErrorValue)
 return true;
-return mbPossibleErrorCell || (mbCheckWithCompilerForError &&
+return mbPossibleErrorCell || (mbCheckWithCompilerForError && 
maStringValue &&
 GetScImport().GetFormulaErrorConstant(*maStringValue) != 
FormulaError::NONE);
 }
 

[Libreoffice-commits] mso-dumper.git: msodumper/docrecord.py

[Libreoffice Gerrit user]

 msodumper/docrecord.py |   19 +++
 1 file changed, 19 insertions(+)

New commits:
commit 6890cac9f92d4e0d956dbb6bba450a2850ae5eec
Author: Miklos Vajna 
AuthorDate: Mon Apr 17 15:48:41 2023 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 17 15:49:38 2023 +0200

doc-dump: show table border colors

Seen in core.git sw/qa/extras/ww8export/data/tdf80635_pageRightRTL.doc.

Change-Id: I72ce7303bf1700670cd2ecd6623af60afd348b7e
Reviewed-on: https://gerrit.libreoffice.org/c/mso-dumper/+/150519
Tested-by: Miklos Vajna 
Reviewed-by: Miklos Vajna 

diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py
index d7df861..dea48bc 100644
--- a/msodumper/docrecord.py
+++ b/msodumper/docrecord.py
@@ -818,6 +818,23 @@ class CMajorityOperand(BinaryStream):
 print('')
 
 
+class BrcCvOperand(BinaryStream):
+"""The BrcCvOperand structure specifies border colors."""
+def __init__(self, parent):
+BinaryStream.__init__(self, parent.bytes)
+self.pos = parent.pos
+
+def dump(self):
+print('' % self.pos)
+self.printAndSet("cb", self.readuInt8())
+pos = self.pos
+print('' % (self.pos, self.cb))
+while self.pos - pos < self.cb:
+COLORREF(self).dump("cv")
+print('')
+print('')
+
+
 # The PgbApplyTo enumeration is used to specify the pages to which a page 
border applies.
 PgbApplyTo = {
 0x0: "pgbAllPages",
@@ -1596,6 +1613,8 @@ class Sprm(BinaryStream):
 self.ct = DefTableShd80Operand(self)
 elif self.sprm == 0xca47:
 self.ct = CMajorityOperand(self)
+elif self.sprm in (0xD61A, 0xD61B, 0xD61C, 0xD61D):
+self.ct = BrcCvOperand(self)
 else:
 print('' % hex(self.sprm))
 else:

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

[Stephan Bergmann (via logerrit)]

 vcl/source/opengl/OpenGLHelper.cxx |4 +--
 vcl/win/gdi/salgdi.cxx |   38 +++--
 2 files changed, 14 insertions(+), 28 deletions(-)

New commits:
commit 3b58e91c8a25917a2cf6c747f3d6ace27879f92a
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 09:23:19 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 15:45:48 2023 +0200

loplugin:stringadd

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

diff --git a/vcl/source/opengl/OpenGLHelper.cxx 
b/vcl/source/opengl/OpenGLHelper.cxx
index b04afad288f3..d63be4c3f9a7 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -180,8 +180,8 @@ namespace
 sal_uInt8 val = pData[i];
 if( val != 0 )
 bIsZero = false;
-aHexStr.append( pHexData[ val & 0xf ] );
-aHexStr.append( pHexData[ val >> 4 ] );
+aHexStr.append(
+OStringChar(pHexData[ val & 0xf ]) + OStringChar(pHexData[ val 
>> 4 ]) );
 }
 if( bIsZero )
 return OString();
diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index cb3cad6508ed..cb4b500a4a43 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -1059,23 +1059,15 @@ bool WinSalGraphics::drawEPS( tools::Long nX, 
tools::Long nY, tools::Long nWidth
 {
 RECT* pRect = &(mpClipRgnData->rdh.rcBound);
 
-aBuf.append( "\nnewpath\n" );
-aBuf.append( pRect->left );
-aBuf.append( " " );
-aBuf.append( pRect->top );
-aBuf.append( " moveto\n" );
-aBuf.append( pRect->right );
-aBuf.append( " " );
-aBuf.append( pRect->top );
-aBuf.append( " lineto\n" );
-aBuf.append( pRect->right );
-aBuf.append( " " );
-aBuf.append( pRect->bottom );
-aBuf.append( " lineto\n" );
-aBuf.append( pRect->left );
-aBuf.append( " " );
-aBuf.append( pRect->bottom );
-aBuf.append( " lineto\n"
+aBuf.append( "\nnewpath\n"
+ + OString::number(pRect->left) + " " + 
OString::number(pRect->top)
+ + " moveto\n"
+ + OString::number(pRect->right) + " " + 
OString::number(pRect->top)
+ + " lineto\n"
+ + OString::number(pRect->right) + " "
+ + OString::number(pRect->bottom) + " lineto\n"
+ + OString::number(pRect->left) + " "
+ + OString::number(pRect->bottom) + " lineto\n"
  "closepath\n"
  "clip\n"
  "newpath\n" );
@@ -1092,15 +1084,9 @@ bool WinSalGraphics::drawEPS( tools::Long nX, 
tools::Long nY, tools::Long nWidth
 double  dM22 = nHeight / (nBoundingBox[1] - nBoundingBox[3] );
 // reserve a sal_uInt16 again
 aBuf.setLength( 2 );
-aBuf.append( "\n\n[" );
-aBuf.append( dM11 );
-aBuf.append( " 0 0 " );
-aBuf.append( dM22 );
-aBuf.append( ' ' );
-aBuf.append( nX - ( dM11 * nBoundingBox[0] ) );
-aBuf.append( ' ' );
-aBuf.append( nY - ( dM22 * nBoundingBox[3] ) );
-aBuf.append( "] concat\n"
+aBuf.append( "\n\n[" + OString::number(dM11) + " 0 0 " + 
OString::number(dM22) + " "
+ + OString::number(nX - ( dM11 * nBoundingBox[0] 
)) + " "
+ + OString::number(nY - ( dM22 * nBoundingBox[3] 
)) + "] concat\n"
  "%%BeginDocument:\n" );
 *reinterpret_cast(const_cast(aBuf.getStr())) = static_cast( aBuf.getLength() - 2 );
 Escape ( getHDC(), nEscape, aBuf.getLength(), aBuf.getStr(), 
nullptr );

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

[Stephan Bergmann (via logerrit)]

 winaccessibility/source/UAccCOM/AccTextBase.cxx |3 --
 winaccessibility/source/UAccCOM/MAccessible.cxx |   31 ++--
 2 files changed, 10 insertions(+), 24 deletions(-)

New commits:
commit 1b7ced8e77910e7f44d726f48185f16bc2fb087d
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 09:24:21 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 15:45:06 2023 +0200

loplugin:stringadd

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

diff --git a/winaccessibility/source/UAccCOM/AccTextBase.cxx 
b/winaccessibility/source/UAccCOM/AccTextBase.cxx
index 40620bb5b64f..183ec3467655 100644
--- a/winaccessibility/source/UAccCOM/AccTextBase.cxx
+++ b/winaccessibility/source/UAccCOM/AccTextBase.cxx
@@ -195,8 +195,7 @@ COM_DECLSPEC_NOTHROW STDMETHODIMP 
CAccTextBase::get_attributes(long offset, long
 {
 strAttrs.append(';');
 }
-strAttrs.append(pValue.Name);
-strAttrs.append(':');
+strAttrs.append(pValue.Name + ":");
 
 if (pValue.Name == "CharBackColor" ||
 pValue.Name == "CharColor" ||
diff --git a/winaccessibility/source/UAccCOM/MAccessible.cxx 
b/winaccessibility/source/UAccCOM/MAccessible.cxx
index 7579d7ee1271..24e3bde478c2 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.cxx
+++ b/winaccessibility/source/UAccCOM/MAccessible.cxx
@@ -2551,25 +2551,17 @@ OUString CMAccessible::get_StringFromAny(Any const & 
pAny)
 OUStringBuffer buf;
 for (const css::style::TabStop& rSingleVal : val)
 {
-buf.append("Position=");
-buf.append(rSingleVal.Position);
-buf.append(",TabAlign=");
-buf.append(sal_Int32(rSingleVal.Alignment));
-buf.append(",");
-
-buf.append("DecimalChar=");
+buf.append(
+"Position=" + OUString::number(rSingleVal.Position) + 
",TabAlign="
++ OUString::number(sal_Int32(rSingleVal.Alignment)) + 
",DecimalChar=");
 if (rSingleVal.DecimalChar==';' || rSingleVal.DecimalChar 
== ':' || rSingleVal.DecimalChar == ',' ||
 rSingleVal.DecimalChar == '=' || 
rSingleVal.DecimalChar == '\\')
 buf.append('\\');
-buf.append(rSingleVal.DecimalChar);
-buf.append(",");
-
-buf.append("FillChar=");
+buf.append(OUStringChar(rSingleVal.DecimalChar) + 
",FillChar=");
 if (rSingleVal.FillChar==';' || rSingleVal.FillChar == ':' 
|| rSingleVal.FillChar == ',' ||
 rSingleVal.FillChar == '=' || rSingleVal.FillChar == 
'\\')
 buf.append('\\');
-buf.append(rSingleVal.FillChar);
-buf.append(",");
+buf.append(OUStringChar(rSingleVal.FillChar) + ",");
 }
 return buf.makeStringAndClear();
 }
@@ -2634,24 +2626,19 @@ OUString CMAccessible::get_String4Numbering(const Any& 
pAny, sal_Int16 numbering
 Any aAny = pXIndex->getByIndex(numberingLevel);
 Sequence< css::beans::PropertyValue > aProps;
 aAny >>= aProps;
-OUStringBuffer buf("Numbering:NumberingLevel=");
-buf.append(sal_Int32(numberingLevel));
-buf.append(',');
+OUStringBuffer buf("Numbering:NumberingLevel=" + 
OUString::number(numberingLevel) + ",");
 for (const css::beans::PropertyValue& rProp : aProps)
 {
 if( (rProp.Name == "BulletChar" ) ||
 (rProp.Name == "NumberingType" ))
 {
-buf.append(rProp.Name);
-buf.append('=');
+buf.append(rProp.Name + "=");
 auto const pTemp = 
CMAccessible::get_StringFromAny(rProp.Value);
-buf.append(pTemp);
-buf.append(',');
+buf.append(pTemp + ",");
 
 if (rProp.Name == "NumberingType" && !numberingPrefix.empty())
 {
-buf.append("NumberingPrefix=");
-buf.append(numberingPrefix);
+buf.append(OUString::Concat("NumberingPrefix=") + 
numberingPrefix);
 }
 }
 }

[Libreoffice-commits] core.git: include/svx oox/source sd/qa svx/source

[Sarper Akdemir (via logerrit)]

 include/svx/svddef.hxx|4 ++
 oox/source/drawingml/table/tablecell.cxx  |   38 ++
 oox/source/export/shapes.cxx  |   14 +
 sd/qa/unit/data/pptx/tcPr-vert-roundtrip.pptx |binary
 sd/qa/unit/export-tests-ooxml3.cxx|   12 
 svx/source/inc/cell.hxx   |3 ++
 svx/source/svdraw/svdattr.cxx |3 ++
 svx/source/table/cell.cxx |   21 ++
 8 files changed, 89 insertions(+), 6 deletions(-)

New commits:
commit 178832ef7139b9279a3ae0056eb11be9c476800e
Author: Sarper Akdemir 
AuthorDate: Wed Mar 29 19:44:18 2023 +0300
Commit: Sarper Akdemir 
CommitDate: Mon Apr 17 16:21:06 2023 +0200

oox: tcPr vert roundtrip, introduce interopability grab bag for table cell

To properly roundtrip all possible values of 

+ Introduce grab bag for table cell
+ on import: Store the unsupported values in the grab bag:
  + (e.g. wordArtVert, mongolianVert, wordArtVertRtl)
+ on export: if nothing is being exported from the doc
  model, export the value from the grabbag

Also adds a unit test covering this behavior.

Change-Id: I791ed2d992b0a554ef6da37200f027cffd8c5f2f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149737
Tested-by: Jenkins
Reviewed-by: Sarper Akdemir 

diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index 85a72e5b713d..84db8c4d0aa4 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -138,6 +138,7 @@ class SdrVertShearAllItem;
 class SdrVertShearOneItem;
 class SdrYesNoItem;
 class SfxBoolItem;
+class SfxGrabBagItem;
 class SfxInt16Item;
 class SfxUInt16Item;
 class SfxUInt32Item;
@@ -417,7 +418,8 @@ constexpr TypedWhichId
SDRATTR_TABLE_BORDER_INNER  (SDRATTR_T
 constexpr TypedWhichId   SDRATTR_TABLE_BORDER_TLBR   
(SDRATTR_TABLE_FIRST+2);
 constexpr TypedWhichId   SDRATTR_TABLE_BORDER_BLTR   
(SDRATTR_TABLE_FIRST+3);
 constexpr TypedWhichId SDRATTR_TABLE_TEXT_ROTATION 
(SDRATTR_TABLE_FIRST+4);
-constexpr sal_uInt16  SDRATTR_TABLE_LAST  
(SDRATTR_TABLE_TEXT_ROTATION);
+constexpr TypedWhichIdSDRATTR_TABLE_GRABBAG   
(SDRATTR_TABLE_FIRST+5);
+constexpr sal_uInt16  SDRATTR_TABLE_LAST  
(SDRATTR_TABLE_GRABBAG);
 
 constexpr sal_uInt16  SDRATTR_GLOW_FIRST 
(SDRATTR_TABLE_LAST+1);
 constexpr TypedWhichId SDRATTR_GLOW_RADIUS   
(SDRATTR_GLOW_FIRST+0);
diff --git a/oox/source/drawingml/table/tablecell.cxx 
b/oox/source/drawingml/table/tablecell.cxx
index 17b13526084d..b0849b7002f3 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -29,12 +29,15 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
 #include 
 #include 
+#include 
+#include 
 
 using namespace ::oox::core;
 using namespace ::com::sun::star;
@@ -566,6 +569,36 @@ void TableCell::pushToXCell( const 
::oox::core::XmlFilterBase& rFilterBase, cons
 {
 xPropSet->setPropertyValue("TextWritingMode", 
Any(css::text::WritingMode_TB_RL));
 }
+else if ( getVertToken() == XML_vert )
+{
+xPropSet->setPropertyValue("RotateAngle", Any(short(27000)));
+}
+else if ( getVertToken() == XML_vert270 )
+{
+xPropSet->setPropertyValue("RotateAngle", Any(short(9000)));
+}
+else if ( getVertToken() != XML_horz )
+{
+// put the vert value in the grab bag for roundtrip
+const Sequence& aTokenNameSeq = 
StaticTokenMap().getUtf8TokenName(getVertToken());
+const OUString aTokenName{ reinterpret_cast(aTokenNameSeq.getConstArray()),
+   aTokenNameSeq.getLength(), 
RTL_TEXTENCODING_UTF8 };
+
+Sequence aGrabBag;
+xPropSet->getPropertyValue("CellInteropGrabBag") >>= aGrabBag;
+PropertyValue aPropertyValue = 
comphelper::makePropertyValue("mso-tcPr-vert-value", aTokenName);
+if (aGrabBag.hasElements())
+{
+sal_Int32 nLength = aGrabBag.getLength();
+aGrabBag.realloc(nLength + 1);
+aGrabBag.getArray()[nLength] = aPropertyValue;
+}
+else
+{
+aGrabBag = { aPropertyValue };
+}
+xPropSet->setPropertyValue("CellInteropGrabBag", Any(aGrabBag));
+}
 
 getTextBody()->insertAt( rFilterBase, xText, xAt, aTextStyleProps, 
pMasterTextListStyle );
 
@@ -582,11 +615,6 @@ void TableCell::pushToXCell( const 
::oox::core::XmlFilterBase& rFilterBase, cons
 aTextCharacterProps.pushToPropSet(aPropSet, rFilterBase);
 }
 }
-
-if (getVertToken() == XML_vert)
-xPropSet->setPropertyValue("RotateAngle", Any(short(27000)));
-else if (getVertToken() == XML_vert270)
-xPropSet->setPropertyValue("RotateAngle", Any(short(9000)));
 }
 
 }
diff --git a/oox/source/export/shapes.cxx 

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

[Sarper Akdemir (via logerrit)]

 include/oox/drawingml/drawingmltypes.hxx |3 +++
 oox/source/drawingml/drawingmltypes.cxx  |   14 ++
 oox/source/export/shapes.cxx |6 ++
 3 files changed, 23 insertions(+)

New commits:
commit 77655fc3dca05d4bb2366e67ccea228e3886bfe2
Author: Sarper Akdemir 
AuthorDate: Fri Mar 24 17:35:51 2023 +0300
Commit: Sarper Akdemir 
CommitDate: Mon Apr 17 16:20:18 2023 +0200

pptx export: consider RotateAngle for tcPr on export

It appears the RotateAngle property is imported, even though
it has no effect on how table cell is displayed right now.

Let's export the property so that we are able to roundtrip
the  & 

Change-Id: Idc23f3b0677fdc5ed12fa5494f0f1823bb89683f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149545
Tested-by: Jenkins
Reviewed-by: Sarper Akdemir 

diff --git a/include/oox/drawingml/drawingmltypes.hxx 
b/include/oox/drawingml/drawingmltypes.hxx
index 239d3283e55c..fda24edb0f92 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_OOX_DRAWINGML_DRAWINGMLTYPES_HXX
 
 #include 
+#include 
 #include 
 
 #include 
@@ -149,6 +150,8 @@ OOX_DLLPUBLIC const char* GetTextVerticalAdjust( 
css::drawing::TextVerticalAdjus
 // Converts a Hatch object to an ooxml pattern.
 const char* GetHatchPattern( const css::drawing::Hatch& rHatch );
 
+/// Converts nRotate angle to TextVerticalType string appearing in ooxml
+std::optional GetTextVerticalType(sal_Int32 nRotateAngle);
 
 // CT_IndexRange
 struct IndexRange {
diff --git a/oox/source/drawingml/drawingmltypes.cxx 
b/oox/source/drawingml/drawingmltypes.cxx
index 469029f48071..ff8c46050c15 100644
--- a/oox/source/drawingml/drawingmltypes.cxx
+++ b/oox/source/drawingml/drawingmltypes.cxx
@@ -25,6 +25,7 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -376,6 +377,19 @@ const char* GetHatchPattern( const drawing::Hatch& rHatch )
 return sPattern;
 }
 
+std::optional GetTextVerticalType(sal_Int32 nRotateAngle)
+{
+switch (nRotateAngle)
+{
+  case 9000:
+  return "vert";
+  case 27000:
+  return "vert270";
+  default:
+  return {};
+}
+}
+
 namespace
 {
 // ISO/IEC-29500 Part 1 ST_Percentage, and [MS-OI29500] 2.1.1324
diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 83d308ca793f..eecd1b38512c 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -2312,7 +2312,13 @@ void ShapeExport::WriteTableCellProperties(const 
Reference< XPropertySet>& xCell
 aVerticalAlignment >>= eVerticalAlignment;
 sVerticalAlignment = GetTextVerticalAdjust(eVerticalAlignment);
 
+sal_Int32 nRotateAngle = 0;
+Any aRotateAngle = xCellPropSet->getPropertyValue("RotateAngle");
+aRotateAngle >>= nRotateAngle;
+std::optional aTextVerticalValue = 
GetTextVerticalType(nRotateAngle);
+
 mpFS->startElementNS(XML_a, XML_tcPr, XML_anchor, sVerticalAlignment,
+XML_vert, aTextVerticalValue,
 XML_marL, 
sax_fastparser::UseIf(OString::number(oox::drawingml::convertHmmToEmu(nLeftMargin)),
 nLeftMargin > 0),
 XML_marR, 
sax_fastparser::UseIf(OString::number(oox::drawingml::convertHmmToEmu(nRightMargin)),
 nRightMargin > 0));
 

Re: Proposition for LibreOfiice

[Wols Lists]

On 17/04/2023 14:15, Zetanos wrote:
It is a petty for such a wonderful program to have these serious lacks, 
because the importance of LibreOffice in academic production is not to 
be disconsidered even if LaTeX and other alternatives exists. 
LibreOffice is largely superior in structuring documents, TOC, footnotes 
than commercial alternatives, and it is WYSIWYG. I don't think I am the 
only one who shares this view.


I don't :-)

Imho WordPerfect knocks pretty much everything else into a cocked hat, 
though the Corel rewrite at v9 did a LOT of damage. v6 or v8 would be my 
preference.


But does LO not have the ability to place the image at a fixed point on 
the page? And then let the text flow round it? Coupled with a forced 
page-break to prevent text flowing too far ...


But I won't ramble any further here. This is the dev list (which is I 
suspect why you've posted here - you think it's an enhancement). I 
suspect LO actually can do what you want, it's just working out how, so 
you're probably better off posting on the user list.


Cheers,
Wol

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

[Noel Grandin (via logerrit)]

 sw/source/filter/html/htmlfld.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 09dfba6441e0365860d3f2061c05ff2e31bc7799
Author: Noel Grandin 
AuthorDate: Thu Apr 13 10:58:38 2023 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 17 15:28:54 2023 +0200

fix SwHTMLParser::InsertCommentText

which went wrong in
commit 7a504c8752bf7c5accbb9bcc33a98f79b31b8bf2
Author: Palenik Mihály 
Date:   Fri Aug 9 13:51:08 2013 +0200
Change String to OUString in SwHTMLParser class

Change-Id: I7623e5fe1f4ca07adff8de11d7c01b1cea3733d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150334
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 
(cherry picked from commit 20daf957baea858e57630207896152e740a2fd59)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150495
Reviewed-by: Michael Stahl 
Tested-by: Jenkins

diff --git a/sw/source/filter/html/htmlfld.cxx 
b/sw/source/filter/html/htmlfld.cxx
index e5c46119fcbe..305f18a10b0f 100644
--- a/sw/source/filter/html/htmlfld.cxx
+++ b/sw/source/filter/html/htmlfld.cxx
@@ -593,7 +593,7 @@ void SwHTMLParser::InsertCommentText( const char *pTag )
 m_aContents += aToken;
 if( bEmpty && pTag )
 {
-m_aContents = OUString::Concat("HTML: <") + OUStringChar(*pTag) + ">" 
+ m_aContents;
+m_aContents = OUString::Concat("HTML: <") + 
OUString::createFromAscii(pTag) + ">" + m_aContents;
 }
 }
 

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

[Stephan Bergmann (via logerrit)]

 vcl/inc/win/saldata.hxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 955b4aa7619206e2ae38127e3cfaecbf1d1d7e11
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 09:21:42 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 17:15:36 2023 +0200

loplugin:nullptr

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

diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index b5740d5670a4..80acfaabec31 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -62,11 +62,11 @@ class SkiaControlsCache;
 
 struct HDCCache
 {
-HDC mhDC = 0;
-HPALETTEmhDefPal = 0;
-HBITMAP mhDefBmp = 0;
-HBITMAP mhSelBmp = 0;
-HBITMAP mhActBmp = 0;
+HDC mhDC = nullptr;
+HPALETTEmhDefPal = nullptr;
+HBITMAP mhDefBmp = nullptr;
+HBITMAP mhSelBmp = nullptr;
+HBITMAP mhActBmp = nullptr;
 };
 
 struct SalIcon

[Libreoffice-commits] core.git: sal/osl

[Stephan Bergmann (via logerrit)]

 sal/osl/w32/backtrace.cxx |7 ++-
 sal/osl/w32/procimpl.cxx  |3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit a0c08ce6cf5e0cd88238fefb3b819305daf4005e
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 09:20:53 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 17:16:29 2023 +0200

loplugin:stringadd

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

diff --git a/sal/osl/w32/backtrace.cxx b/sal/osl/w32/backtrace.cxx
index d9231de44517..8d55c6485a12 100644
--- a/sal/osl/w32/backtrace.cxx
+++ b/sal/osl/w32/backtrace.cxx
@@ -75,12 +75,9 @@ OUString sal::backtrace_to_string(BacktraceState* 
backtraceState)
 for( int i = 0; i < nFrames; i++ )
 {
 SymFromAddr( hProcess, 
reinterpret_cast(backtraceState->buffer[ i ]), nullptr, pSymbol );
-aBuf.append( static_cast(nFrames - i - 1) );
-aBuf.append( ": " );
+aBuf.append( OUString::number(nFrames - i - 1) + ": " );
 aBuf.appendAscii( pSymbol->Name );
-aBuf.append( " - 0x" );
-aBuf.append( static_cast(pSymbol->Address), 16 );
-aBuf.append( "\n" );
+aBuf.append( " - 0x" + OUString::number(pSymbol->Address, 16) + "\n" );
 }
 
 free( pSymbol );
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx
index 5fb9a46348b2..1689d6ac6be9 100644
--- a/sal/osl/w32/procimpl.cxx
+++ b/sal/osl/w32/procimpl.cxx
@@ -422,8 +422,7 @@ oslProcessError SAL_CALL 
osl_executeProcess_WithRedirectedIO(
 if (!(Options & osl_Process_WAIT) || (Options & 
osl_Process_DETACHED))
 flags |= CREATE_NEW_CONSOLE;
 
-command_line.append(batch_processor);
-command_line.append(" /c ");
+command_line.append(batch_processor + " /c ");
 }
 else
 // should we return here in case of error?

[Libreoffice-commits] core.git: connectivity/source framework/qa oox/source sd/qa slideshow/qa sw/qa sw/source vcl/qa writerfilter/source xmloff/qa xmlsecurity/qa

[Miklos Vajna (via logerrit)]

 connectivity/source/drivers/writer/WTable.cxx  |1 -
 framework/qa/cppunit/dispatchtest.cxx  |1 -
 framework/qa/cppunit/services.cxx  |1 -
 oox/source/shape/WpsContext.cxx|2 --
 sd/qa/filter/eppt/eppt.cxx |1 -
 slideshow/qa/engine/engine.cxx |1 -
 sw/qa/core/doc/doc.cxx |3 ---
 sw/qa/core/fields/fields.cxx   |1 -
 sw/qa/core/layout/layout.cxx   |1 -
 sw/qa/core/undo/undo.cxx   |4 
 sw/qa/extras/rtfimport/rtfimport.cxx   |1 -
 sw/qa/extras/uiwriter/uiwriter2.cxx|1 -
 sw/qa/extras/uiwriter/uiwriter8.cxx|1 -
 sw/qa/uibase/shells/shells.cxx |1 -
 sw/source/core/unocore/unocontentcontrol.cxx   |1 -
 sw/source/core/unocore/unolinebreak.cxx|1 -
 sw/source/filter/ww8/rtfattributeoutput.cxx|1 -
 vcl/qa/cppunit/filter/ipdf/ipdf.cxx|2 --
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |5 -
 xmloff/qa/unit/draw.cxx|1 -
 xmlsecurity/qa/unit/signing/signing.cxx|3 ---
 21 files changed, 4 insertions(+), 30 deletions(-)

New commits:
commit 3a759a0b0c9605732c95dfac6a3315ed48ec1076
Author: Miklos Vajna 
AuthorDate: Mon Apr 17 13:41:36 2023 +0200
Commit: Miklos Vajna 
CommitDate: Mon Apr 17 19:01:11 2023 +0200

Remove some unused includes

Mostly com/sun/star/frame/Desktop.hpp is unused after inheriting from
UnoApiTest.

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

diff --git a/connectivity/source/drivers/writer/WTable.cxx 
b/connectivity/source/drivers/writer/WTable.cxx
index eb2fb2bffd3b..2f0f44855d86 100644
--- a/connectivity/source/drivers/writer/WTable.cxx
+++ b/connectivity/source/drivers/writer/WTable.cxx
@@ -30,7 +30,6 @@
 #include 
 #include 
 #include 
-#include 
 
 namespace com::sun::star::text
 {
diff --git a/framework/qa/cppunit/dispatchtest.cxx 
b/framework/qa/cppunit/dispatchtest.cxx
index fd091f42bd5a..9549ef150904 100644
--- a/framework/qa/cppunit/dispatchtest.cxx
+++ b/framework/qa/cppunit/dispatchtest.cxx
@@ -10,7 +10,6 @@
 #include 
 #include 
 
-#include 
 #include 
 #include 
 #include 
diff --git a/framework/qa/cppunit/services.cxx 
b/framework/qa/cppunit/services.cxx
index 74ef3b663a66..be6c0def70fa 100644
--- a/framework/qa/cppunit/services.cxx
+++ b/framework/qa/cppunit/services.cxx
@@ -9,7 +9,6 @@
 
 #include 
 
-#include 
 #include 
 #include 
 #include 
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index e207f185d8fc..8e0cb8b544df 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -33,9 +33,7 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sd/qa/filter/eppt/eppt.cxx b/sd/qa/filter/eppt/eppt.cxx
index 6c73ccec5c2b..32d9b330a1dc 100644
--- a/sd/qa/filter/eppt/eppt.cxx
+++ b/sd/qa/filter/eppt/eppt.cxx
@@ -12,7 +12,6 @@
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 
diff --git a/slideshow/qa/engine/engine.cxx b/slideshow/qa/engine/engine.cxx
index f2d3f12121d3..19727fe458c8 100644
--- a/slideshow/qa/engine/engine.cxx
+++ b/slideshow/qa/engine/engine.cxx
@@ -9,7 +9,6 @@
 
 #include 
 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/qa/core/doc/doc.cxx b/sw/qa/core/doc/doc.cxx
index d827221f2717..1597302a5f64 100644
--- a/sw/qa/core/doc/doc.cxx
+++ b/sw/qa/core/doc/doc.cxx
@@ -18,8 +18,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 #include 
 #include 
 
@@ -31,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/qa/core/fields/fields.cxx b/sw/qa/core/fields/fields.cxx
index 7282d2027088..f2fdd808734f 100644
--- a/sw/qa/core/fields/fields.cxx
+++ b/sw/qa/core/fields/fields.cxx
@@ -19,7 +19,6 @@
 #include 
 #include 
 #include 
-#include 
 
 namespace
 {
diff --git a/sw/qa/core/layout/layout.cxx b/sw/qa/core/layout/layout.cxx
index f8878ef77bb4..4399c01a0074 100644
--- a/sw/qa/core/layout/layout.cxx
+++ b/sw/qa/core/layout/layout.cxx
@@ -29,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/sw/qa/core/undo/undo.cxx b/sw/qa/core/undo/undo.cxx
index cefe4e4051dd..21543416dae8 100644
--- a/sw/qa/core/undo/undo.cxx
+++ b/sw/qa/core/undo/undo.cxx
@@ -10,8 +10,6 @@
 #include 
 
 #include 
-#include 
-#include 
 
 #include 
 #include 
@@ -19,8 +17,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
 
 /// Covers sw/source/core/undo/ fixes.
 class SwCoreUndoTest : public SwModelTestBase
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx 
b/sw/qa/extras/rtfimport/rtfimport.cxx
index 05bfaf66d6f7..40e31e2695f4 100644
--- 

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

[Xisco Fauli (via logerrit)]

 oox/source/export/shapes.cxx |   44 +++
 1 file changed, 20 insertions(+), 24 deletions(-)

New commits:
commit a14dcd55f266eb9daae85a43741bbb2a4840702c
Author: Xisco Fauli 
AuthorDate: Wed Apr 5 20:25:01 2023 +0200
Commit: Xisco Fauli 
CommitDate: Mon Apr 17 20:56:59 2023 +0200

oox: drop macros

Change-Id: Ic8eeb34bef91807b54823a4114acc1200bec9de9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150065
Tested-by: Jenkins
Reviewed-by: Xisco Fauli 
Signed-off-by: Xisco Fauli 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150492

diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx
index 199180862c69..a77ee85b8b92 100644
--- a/oox/source/export/shapes.cxx
+++ b/oox/source/export/shapes.cxx
@@ -321,16 +321,6 @@ uno::Reference GetOLEObjectStream(
 
 namespace oox::drawingml {
 
-#define GETA(propName) \
-GetProperty( rXPropSet, #propName)
-
-#define GETAD(propName) \
-( GetPropertyAndState( rXPropSet, rXPropState, #propName, eState ) && 
eState == beans::PropertyState_DIRECT_VALUE )
-
-#define GET(variable, propName) \
-if ( GETA(propName) ) \
-mAny >>= variable;
-
 ShapeExport::ShapeExport( sal_Int32 nXmlNamespace, FSHelperPtr pFS, 
ShapeHashMap* pShapeMap, XmlFilterBase* pFB, DocumentType eDocumentType, 
DMLTextExport* pTextExport, bool bUserShapes )
 : DrawingML( std::move(pFS), pFB, eDocumentType, pTextExport )
 , m_nEmbeddedObjects(0)
@@ -746,7 +736,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 bool bHasGeometrySeq(false);
 Sequence< PropertyValue > aGeometrySeq;
 OUString sShapeType("non-primitive"); // default in ODF
-if (GETA(CustomShapeGeometry))
+if (GetProperty(rXPropSet, "CustomShapeGeometry"))
 {
 SAL_INFO("oox.shape", "got custom shape geometry");
 if (mAny >>= aGeometrySeq)
@@ -816,7 +806,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 if (GetDocumentType() != DOCUMENT_DOCX || mbUserShapes)
 {
 bool bUseBackground = false;
-if (GETA(FillUseSlideBackground))
+if (GetProperty(rXPropSet, "FillUseSlideBackground"))
 mAny >>= bUseBackground;
 if (bUseBackground)
 mpFS->startElementNS(mnXmlNamespace, XML_sp, XML_useBgFill, "1");
@@ -824,7 +814,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 mpFS->startElementNS(mnXmlNamespace, XML_sp);
 
 bool isVisible = true ;
-if( GETA (Visible))
+if( GetProperty(rXPropSet, "Visible"))
 {
 mAny >>= isVisible;
 }
@@ -834,7 +824,7 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 OString::number(GetShapeID(xShape) == -1 ? GetNewShapeID(xShape) : 
GetShapeID(xShape)),
 XML_name, GetShapeName(xShape), XML_hidden, 
sax_fastparser::UseIf("1", !isVisible));
 
-if( GETA( URL ) )
+if( GetProperty(rXPropSet, "URL") )
 {
 OUString sURL;
 mAny >>= sURL;
@@ -850,10 +840,10 @@ ShapeExport& ShapeExport::WriteCustomShape( const 
Reference< XShape >& xShape )
 }
 
 OUString sBookmark;
-if (GETA(Bookmark))
+if (GetProperty(rXPropSet, "Bookmark"))
 mAny >>= sBookmark;
 
-if (GETA(OnClick))
+if (GetProperty(rXPropSet, "OnClick"))
 {
 OUString sPPAction;
 presentation::ClickAction eClickAction = 
presentation::ClickAction_NONE;
@@ -1687,7 +1677,8 @@ ShapeExport& ShapeExport::WriteConnectorShape( const 
Reference< XShape >& xShape
 Reference< XShape > rXShapeB;
 PropertyState eState;
 ConnectorType eConnectorType = ConnectorType_STANDARD;
-GET(eConnectorType, EdgeKind);
+if (GetProperty(rXPropSet, "EdgeKind"))
+mAny >>= eConnectorType;
 
 switch( eConnectorType ) {
 case ConnectorType_CURVE:
@@ -1703,19 +1694,24 @@ ShapeExport& ShapeExport::WriteConnectorShape( const 
Reference< XShape >& xShape
 break;
 }
 
-if( GETAD( EdgeStartPoint ) ) {
+if (GetPropertyAndState( rXPropSet, rXPropState, "EdgeStartPoint", eState 
) && eState == beans::PropertyState_DIRECT_VALUE )
+{
 mAny >>= aStartPoint;
-if( GETAD( EdgeEndPoint ) ) {
+if (GetPropertyAndState( rXPropSet, rXPropState, "EdgeEndPoint", 
eState ) && eState == beans::PropertyState_DIRECT_VALUE )
 mAny >>= aEndPoint;
-}
 }
-GET( rXShapeA, EdgeStartConnection );
-GET( rXShapeB, EdgeEndConnection );
+if (GetProperty(rXPropSet, "EdgeStartConnection"))
+mAny >>= rXShapeA;
+if (GetProperty(rXPropSet, "EdgeEndConnection"))
+mAny >>= rXShapeB;
 
-GET(nStartGlueId, StartGluePointIndex);
+if (GetProperty(rXPropSet, "StartGluePointIndex"))
+mAny >>= nStartGlueId;
 if 

[Libreoffice-commits] core.git: download.lst external/boost

[Stephan Bergmann (via logerrit)]

 download.lst |4 ++--
 external/boost/StaticLibrary_boost_locale.mk |1 +
 external/boost/boost.between.warning.patch   |8 
 external/boost/boost.fallback.encoding.patch |   16 +++-
 4 files changed, 18 insertions(+), 11 deletions(-)

New commits:
commit 8daa8eef06fa485f5271503921585a3fbef26567
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 13:27:27 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 18:59:32 2023 +0200

Upgrade external/boost to latest Boost 1.82.0

 has been 
generated (on
Fedora 38) with

> $ wget 
https://boostorg.jfrog.io/artifactory/main/release/1.82.0/source/boost_1_82_0.tar.bz2
> $ printf 
'a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6 
boost_1_82_0.tar.bz2' | sha256sum -c # cf. 

> boost_1_82_0.tar.bz2: OK
> $ external/boost/repack_tarball.sh boost_1_82_0.tar.bz2
> Unpacking boost_1_82_0.tar.bz2 ...
> Removing unnecessary files ...
> Creating boost_1_82_0.tar.xz ...
> Cleaning up ...
> e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de  
boost_1_82_0.tar.xz
> Done.

* Updating StaticLibrary_boost_locale.mk is needed to avoid
> 
workdir/UnpackedTarball/boost/libs/locale/src/boost/locale/util/locale_data.cpp:137:
 error: undefined reference to 
'boost::locale::util::normalize_encoding(std::__cxx11::basic_string, std::allocator > const&)'

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

diff --git a/download.lst b/download.lst
index 3257a3d06caa..284d73d2ff70 100644
--- a/download.lst
+++ b/download.lst
@@ -9,8 +9,8 @@ ABW_TARBALL := libabw-0.1.3.tar.xz
 # so that git cherry-pick
 # will not run into conflicts
 # please repack the tarball using external/boost/repack_tarball.sh
-BOOST_SHA256SUM := 
1deb0a5a9e33a6626fcaa1d2efd4c0e74ca2b0eea87c1559e3917f3066b633d6
-BOOST_TARBALL := boost_1_81_0.tar.xz
+BOOST_SHA256SUM := 
e48ab6953fbd68ba47234bea5173e62427e9f6a7894e152305142895cfe955de
+BOOST_TARBALL := boost_1_82_0.tar.xz
 # three static lines
 # so that git cherry-pick
 # will not run into conflicts
diff --git a/external/boost/StaticLibrary_boost_locale.mk 
b/external/boost/StaticLibrary_boost_locale.mk
index 03e3bbc76b66..1193867a6d0e 100644
--- a/external/boost/StaticLibrary_boost_locale.mk
+++ b/external/boost/StaticLibrary_boost_locale.mk
@@ -44,6 +44,7 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,boost_locale,\
UnpackedTarball/boost/libs/locale/src/boost/locale/std/std_backend \

UnpackedTarball/boost/libs/locale/src/boost/locale/util/codecvt_converter \
UnpackedTarball/boost/libs/locale/src/boost/locale/util/default_locale \
+   UnpackedTarball/boost/libs/locale/src/boost/locale/util/encoding \
UnpackedTarball/boost/libs/locale/src/boost/locale/util/gregorian \
UnpackedTarball/boost/libs/locale/src/boost/locale/util/info \
UnpackedTarball/boost/libs/locale/src/boost/locale/util/locale_data \
diff --git a/external/boost/boost.between.warning.patch 
b/external/boost/boost.between.warning.patch
index 8c9ba65a1d39..349a9065ce62 100644
--- a/external/boost/boost.between.warning.patch
+++ b/external/boost/boost.between.warning.patch
@@ -1,6 +1,14 @@
 diff -ru boost.orig/boost/libs/locale/src/encoding/codepage.cpp 
boost/boost/libs/locale/src/encoding/codepage.cpp
 --- foo/misc/boost.orig/libs/locale/src/encoding/codepage.cpp
 +++ foo/misc/boost/libs/locale/src/boost/locale/encoding/codepage.cpp
+@@ -8,6 +8,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include "boost/locale/encoding/conv.hpp"
+ #if BOOST_LOCALE_USE_WIN32_API
 @@ -58,6 +58,9 @@
  return cvt->convert(begin, end);
  #endif
diff --git a/external/boost/boost.fallback.encoding.patch 
b/external/boost/boost.fallback.encoding.patch
index 3ad39c47b638..8aa5ed6d1276 100644
--- a/external/boost/boost.fallback.encoding.patch
+++ b/external/boost/boost.fallback.encoding.patch
@@ -1,13 +1,11 @@
 --- foo/misc/boost.orig/libs/locale/src/util/locale_data.cpp.new   
2022-02-17 22:41:27.730549039 +
 +++ foo/misc/boost/libs/locale/src/boost/locale/util/locale_data.cpp
-@@ -18,8 +18,8 @@
- language = "C";
- country.clear();
- variant.clear();
--encoding = "us-ascii";
--utf8 = false;
-+encoding = "UTF-8";
-+utf8 = true;
- parse_from_lang(locale_name);
+@@ -50,6 +50,8 @@
+ bool locale_data::parse(const std::string& locale_name)
+ {
+ reset();
++encoding_ = "UTF-8";
++utf8_ = true;
+ return parse_from_lang(locale_name);
  }
  

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

[Stephan Bergmann (via logerrit)]

 editeng/source/items/frmitems.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit e7617af8b463e31faabde6e409cc347c0c648364
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 09:16:34 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Mon Apr 17 18:59:14 2023 +0200

Silence clang-cl -Werror,-Wunused-but-set-parameter

...in work-in-progress code (see the comments starting at


"editeng: split SvxLRSpaceItem into 1 class per attribute")

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

diff --git a/editeng/source/items/frmitems.cxx 
b/editeng/source/items/frmitems.cxx
index 75f48150465a..0c72c9d95d7b 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -1388,6 +1388,8 @@ bool SvxGutterRightMarginItem::QueryValue(uno::Any& 
/*rVal*/, sal_uInt8 nMemberI
 // SfxDispatchController_Impl::StateChanged calls this with 
hardcoded 0 triggering this; there used to be a MID_LR_MARGIN 0 but what type 
would it have?
 OSL_FAIL("unknown MemberId");
 }
+#else
+(void) nMemberId;
 #endif
 return bRet;
 }
@@ -1406,6 +1408,8 @@ bool SvxGutterRightMarginItem::PutValue(const uno::Any& 
/*rVal*/, sal_uInt8 nMem
 OSL_FAIL("unknown MemberId");
 return false;
 }
+#else
+(void) nMemberId;
 #endif
 return true;
 }

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

[Mike Kaganski (via logerrit)]

 starmath/source/ElementsDockingWindow.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c11463cdc5415707d05ab6da08736ff7212db4a0
Author: Mike Kaganski 
AuthorDate: Mon Apr 17 18:26:56 2023 +0300
Commit: Mike Kaganski 
CommitDate: Mon Apr 17 19:56:07 2023 +0200

tdf#154016: use ScopedVclPtr

A regression crash from commit d79c527c2a599c7821d27cf03b95cb79e2abe685
(Use IconView in SmElementsControl, 2022-06-01). Without disposeAndClear,
the VirtualDevices leak; and on Windows this quickly leads to GDI handle
10 000 limit killing the process (which is good, helping to track this
kind of issues).

Change-Id: I28e1ffbeb425fae3fdbd76b7873fef5c929b8e11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150523
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 16a22d27aa00..b2186a7ecbf9 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -527,7 +527,7 @@ namespace
 void SmElementsControl::addElement(const OUString& aElementVisual, const 
OUString& aElementSource, const OUString& aHelpText)
 {
 std::unique_ptr pNode = maParser->ParseExpression(aElementVisual);
-VclPtr pDevice(mpIconView->create_virtual_device());
+ScopedVclPtr pDevice(mpIconView->create_virtual_device());
 pDevice->SetMapMode(MapMode(SmMapUnit()));
 pDevice->SetDrawMode(DrawModeFlags::Default);
 pDevice->SetLayoutMode(vcl::text::ComplexTextLayoutFlags::Default);

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot (via logerrit)]

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

New commits:
commit 3de2980f198f4d592896f1bebae841ffbcc74c5e
Author: Olivier Hallot 
AuthorDate: Mon Apr 17 19:51:58 2023 +0200
Commit: Gerrit Code Review 
CommitDate: Mon Apr 17 19:51:58 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to 2c7b120a56135515df2a3f2a0ea74c2a5166de5b
  - Fix typo

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

diff --git a/helpcontent2 b/helpcontent2
index de94ac52fd6a..2c7b120a5613 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit de94ac52fd6aecff990f8dae6e69dc5c4363cb83
+Subproject commit 2c7b120a56135515df2a3f2a0ea74c2a5166de5b

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

[Olivier Hallot (via logerrit)]

 source/text/sbasic/shared/03/sf_calc.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c7b120a56135515df2a3f2a0ea74c2a5166de5b
Author: Olivier Hallot 
AuthorDate: Mon Apr 17 19:33:31 2023 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Mon Apr 17 19:51:58 2023 +0200

Fix typo

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

diff --git a/source/text/sbasic/shared/03/sf_calc.xhp 
b/source/text/sbasic/shared/03/sf_calc.xhp
index 098abaec35..3207437689 100644
--- a/source/text/sbasic/shared/03/sf_calc.xhp
+++ b/source/text/sbasic/shared/03/sf_calc.xhp
@@ -822,7 +822,7 @@
   
 myDoc.ClearValues("SheetX.A1:F10")
   
-  Refer to the ClearAllliteral>
 method documentation for examples on how to use the arguments 
filterformula and filterscope.
+  Refer to the ClearAll
 method documentation for examples on how to use the arguments 
filterformula and filterscope.
 
 
 

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

[Mike Kaganski (via logerrit)]

 include/vcl/vclptr.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 60022965ce3791e578468b366baf33c64338a388
Author: Mike Kaganski 
AuthorDate: Mon Apr 17 18:40:24 2023 +0300
Commit: Mike Kaganski 
CommitDate: Mon Apr 17 20:36:09 2023 +0200

Use move ctor here

Change-Id: Ic20b91ee6d674c7fe5f08f07c3f29fc9fbaf5282
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150524
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/vcl/vclptr.hxx b/include/vcl/vclptr.hxx
index 3775034ff0c6..326881edd105 100644
--- a/include/vcl/vclptr.hxx
+++ b/include/vcl/vclptr.hxx
@@ -200,8 +200,8 @@ public:
 void disposeAndClear()
 {
 // hold it alive for the lifetime of this method
-::rtl::Reference aTmp(m_rInnerRef);
-m_rInnerRef.clear(); // we should use some 'swap' method ideally ;-)
+::rtl::Reference aTmp(std::move(m_rInnerRef));
+assert(!m_rInnerRef); // the move ctor above must take care of it
 if (aTmp.get()) {
 aTmp->disposeOnce();
 }

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

[Andrea Gelmini (via logerrit)]

 oox/source/export/drawingml.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5713871497f81bd4b4196a217c9084f2db3e6614
Author: Andrea Gelmini 
AuthorDate: Mon Apr 17 18:01:41 2023 +0200
Commit: Caolán McNamara 
CommitDate: Mon Apr 17 20:39:46 2023 +0200

Fix typos

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

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 58b2b1fbb2a7..9f02652f2b04 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -910,7 +910,7 @@ void DrawingML::WriteGradientFill2(
 basegfx::ColorStops aNewColorStops;
 basegfx::ColorStops aNewAlphaStops;
 
-// add mirrored gadients, scaled to [0.0 .. 0.5]
+// add mirrored gradients, scaled to [0.0 .. 0.5]
 basegfx::ColorStops::const_reverse_iterator 
aRevCurrColor(aColorStops.rbegin());
 basegfx::ColorStops::const_reverse_iterator 
aRevCurrAlpha(aAlphaStops.rbegin());
 
@@ -947,7 +947,7 @@ void DrawingML::WriteGradientFill2(
 // case awt::GradientStyle_RECT:
 // case awt::GradientStyle_SQUARE:
 {
-// all these types need the gadiens to be mirrored
+// all these types need the gradients to be mirrored
 basegfx::utils::reverseColorStops(aColorStops);
 basegfx::utils::reverseColorStops(aAlphaStops);
 

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

[Mike Kaganski (via logerrit)]

 starmath/source/ElementsDockingWindow.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 73e4009dc2a645b1bf9f06ce34711e135c147082
Author: Mike Kaganski 
AuthorDate: Mon Apr 17 18:26:56 2023 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Apr 18 05:17:49 2023 +0200

tdf#154016: use ScopedVclPtr

A regression crash from commit d79c527c2a599c7821d27cf03b95cb79e2abe685
(Use IconView in SmElementsControl, 2022-06-01). Without disposeAndClear,
the VirtualDevices leak; and on Windows this quickly leads to GDI handle
10 000 limit killing the process (which is good, helping to track this
kind of issues).

Change-Id: I28e1ffbeb425fae3fdbd76b7873fef5c929b8e11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150523
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit c11463cdc5415707d05ab6da08736ff7212db4a0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150511
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index a52b5f85ec0f..a3a4085a7ea1 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -508,7 +508,7 @@ struct ElementData
 void SmElementsControl::addElement(const OUString& aElementVisual, const 
OUString& aElementSource, const OUString& aHelpText)
 {
 std::unique_ptr pNode = maParser->ParseExpression(aElementVisual);
-VclPtr pDevice(mpIconView->create_virtual_device());
+ScopedVclPtr pDevice(mpIconView->create_virtual_device());
 pDevice->SetTextRenderModeForResolutionIndependentLayout(true);
 pDevice->SetMapMode(MapMode(MapUnit::Map100thMM));
 pDevice->SetDrawMode(DrawModeFlags::Default);

[Libreoffice-commits] core.git: Branch 'libreoffice-7-5' - starmath/source

[Mike Kaganski (via logerrit)]

 starmath/source/ElementsDockingWindow.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 069fcbe6531ad7e22c368c1a3994528ea30c8195
Author: Mike Kaganski 
AuthorDate: Mon Apr 17 18:26:56 2023 +0300
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Apr 18 05:17:31 2023 +0200

tdf#154016: use ScopedVclPtr

A regression crash from commit d79c527c2a599c7821d27cf03b95cb79e2abe685
(Use IconView in SmElementsControl, 2022-06-01). Without disposeAndClear,
the VirtualDevices leak; and on Windows this quickly leads to GDI handle
10 000 limit killing the process (which is good, helping to track this
kind of issues).

Change-Id: I28e1ffbeb425fae3fdbd76b7873fef5c929b8e11
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150523
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit c11463cdc5415707d05ab6da08736ff7212db4a0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150510
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/starmath/source/ElementsDockingWindow.cxx 
b/starmath/source/ElementsDockingWindow.cxx
index 1ea324dc7fe7..59a02422c34c 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -527,7 +527,7 @@ namespace
 void SmElementsControl::addElement(const OUString& aElementVisual, const 
OUString& aElementSource, const OUString& aHelpText)
 {
 std::unique_ptr pNode = maParser->ParseExpression(aElementVisual);
-VclPtr pDevice(mpIconView->create_virtual_device());
+ScopedVclPtr pDevice(mpIconView->create_virtual_device());
 pDevice->SetMapMode(MapMode(SmMapUnit()));
 pDevice->SetDrawMode(DrawModeFlags::Default);
 pDevice->SetLayoutMode(vcl::text::ComplexTextLayoutFlags::Default);

[Libreoffice-commits] core.git: officecfg/registry sw/inc sw/qa sw/source sw/uiconfig sw/UIConfig_swriter.mk

[Balazs Varga (via logerrit)]

 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |8 +
 sw/UIConfig_swriter.mk |1 
 sw/inc/crsrsh.hxx  |1 
 sw/inc/editsh.hxx  |   14 ++
 sw/inc/pam.hxx |2 
 sw/inc/swcrsr.hxx  |2 
 sw/qa/extras/uiwriter/uiwriter7.cxx|2 
 sw/qa/uitest/writer_tests7/tdf130199.py|   62 +
 sw/qa/unit/data/sw-dialogs-test.txt|1 
 sw/source/core/crsr/crsrsh.cxx |   33 ++
 sw/source/core/crsr/pam.cxx|   34 +++
 sw/source/core/crsr/swcrsr.cxx |   14 ++
 sw/source/core/edit/eddel.cxx  |   17 +++
 sw/source/uibase/docvw/SidebarTxtControl.cxx   |2 
 sw/source/uibase/docvw/edtwin.cxx  |4 
 sw/source/uibase/inc/wrtsh.hxx |7 -
 sw/source/uibase/shells/textsh1.cxx|2 
 sw/source/uibase/wrtsh/delete.cxx  |9 -
 sw/source/uibase/wrtsh/wrtsh1.cxx  |   22 +++-
 sw/uiconfig/swriter/ui/warnhiddensectiondialog.ui  |   35 +++
 20 files changed, 253 insertions(+), 19 deletions(-)

New commits:
commit 6feafa2c5a2c593b1852ac44e2ea88eb9375c01d
Author: Balazs Varga 
AuthorDate: Sat Apr 8 16:05:26 2023 +0200
Commit: Balazs Varga 
CommitDate: Mon Apr 17 23:33:09 2023 +0200

tdf#130199 sw Confirm deletion of hidden sections

To enhance the existing discoverability of hidden sections
via Navigator by a confirmation box when a hidden section
is to be deleted.

Also add an option to switch on/off this warning message named
"ShowWarningHiddenSection". The default setting is on.

Change-Id: I91a1a32524f8d8d8fd0f230c142654df4367e729
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150231
Tested-by: Jenkins
Reviewed-by: Balazs Varga 

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index dcd5dc71e68f..917ea0289934 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -1084,6 +1084,14 @@
   
   false
 
+
+  
+  
+Enables the writer to prevent the display of a warning 
dialog for hidden text (sections, etc) deletion.
+Show warning dialog for hidden text deletion
+  
+  true
+
 
   
   
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 7011ed16bdc2..a371b4928ea5 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -320,6 +320,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/viewoptionspage \
sw/uiconfig/swriter/ui/warndatasourcedialog \
sw/uiconfig/swriter/ui/warnemaildialog \
+   sw/uiconfig/swriter/ui/warnhiddensectiondialog \
sw/uiconfig/swriter/ui/watermarkdialog \
sw/uiconfig/swriter/ui/wordcount \
sw/uiconfig/swriter/ui/wordcount-mobile \
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index ddb7b301beef..319911a33e65 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -486,6 +486,7 @@ public:
 // Cursor is placed in something that is protected or selection contains
 // something that is protected.
 bool HasReadonlySel(bool isReplace = false) const;
+bool HasHiddenSections() const;
 
 // Can the cursor be set to read only ranges?
 bool IsReadOnlyAvailable() const { return m_bSetCursorInReadOnly; }
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 663a0ffc35f7..8711b132c745 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -81,6 +81,7 @@ class SwLineNumberInfo;
 class SwAuthEntry;
 class SwRewriter;
 class SwView;
+class SwWrtShell;
 struct SwConversionArgs;
 struct SvxSwAutoFormatFlags;
 struct SwInsertTableOptions;
@@ -623,6 +624,19 @@ public:
 /// Apply ViewOptions with Start-/EndAction.
 virtual void ApplyViewOptions( const SwViewOption  ) override;
 
+/// Selected area has readonly content
+virtual void InfoReadOnlyDialog(bool /*bAsync*/) const
+{
+// override in SwWrtShell
+}
+
+/// Selected area has hidden content
+virtual bool WarnHiddenSectionDialog() const
+{
+// override in SwWrtShell
+return true;
+}
+
 /** Query text within selection. */
 void GetSelectedText( OUString ,
 ParaBreakType nHndlParaBreak = ParaBreakType::ToBlank 
);
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 746fa22840c0..2a7a0cdb8bd3 100644
--- a/sw/inc/pam.hxx
+++ 

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

[Bayram Çiçek (via logerrit)]

 sd/source/ui/func/futext.cxx |  104 +--
 sd/source/ui/inc/futext.hxx  |1 
 2 files changed, 22 insertions(+), 83 deletions(-)

New commits:
commit 059f1e8f291404addeba9341d2c4989976af
Author: Bayram Çiçek 
AuthorDate: Fri Apr 14 00:34:52 2023 +0300
Commit: Maxim Monastirsky 
CommitDate: Tue Apr 18 01:18:57 2023 +0200

tdf#90253: Impress: make TextBox retain its height

- [Impress] drawing a new Text Box and Vertical Text
minimize itself to the height of one line.

- This behavior has changed and inserting a
new TextBox/VerticalText does not shrink itself to
height of one line.

- Unified some common Draw and Impress codes

- removed unnecessary ImpSetAttributesFitCommon(pText)
function, as ImpSetAttributesForNewTextObject(pText)
takes care of the Text Box creations.

- SID_ATTR_CHAR (.uno:Text)
- SID_ATTR_CHAR_VERTICAL (.uno:VerticalText)

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

diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 60e36e2674b3..f01851668f76 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -509,59 +509,34 @@ bool FuText::MouseMove(const MouseEvent& rMEvt)
 
 void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
 {
-if(mpDoc->GetDocumentType() == DocumentType::Impress)
+if( nSlotId == SID_ATTR_CHAR )
 {
-if( nSlotId == SID_ATTR_CHAR )
-{
-/* Create Impress text object (rescales to line height)
-   We get the correct height during the subsequent creation of the
-   object, otherwise we draw too much */
-SfxItemSet aSet(mpViewShell->GetPool());
-aSet.Put(makeSdrTextMinFrameHeightItem(0));
-aSet.Put(makeSdrTextAutoGrowWidthItem(false));
-aSet.Put(makeSdrTextAutoGrowHeightItem(true));
-pTxtObj->SetMergedItemSet(aSet);
-pTxtObj->AdjustTextFrameWidthAndHeight();
-
aSet.Put(makeSdrTextMaxFrameHeightItem(pTxtObj->GetLogicRect().GetSize().Height()));
-pTxtObj->SetMergedItemSet(aSet);
-const SfxViewShell* pCurrentViewShell = SfxViewShell::Current();
-if (pCurrentViewShell && (pCurrentViewShell->isLOKMobilePhone() || 
pCurrentViewShell->isLOKTablet()))
-pTxtObj->SetText(SdResId(STR_PRESOBJ_TEXT_EDIT_MOBILE));
-}
-else if( nSlotId == SID_ATTR_CHAR_VERTICAL )
-{
-SfxItemSet aSet(mpViewShell->GetPool());
-aSet.Put(makeSdrTextMinFrameWidthItem(0));
-aSet.Put(makeSdrTextAutoGrowWidthItem(true));
-aSet.Put(makeSdrTextAutoGrowHeightItem(false));
-
-// Needs to be set since default is SDRTEXTHORZADJUST_BLOCK
-aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
-pTxtObj->SetMergedItemSet(aSet);
-pTxtObj->AdjustTextFrameWidthAndHeight();
-
aSet.Put(makeSdrTextMaxFrameWidthItem(pTxtObj->GetLogicRect().GetSize().Width()));
-pTxtObj->SetMergedItemSet(aSet);
-}
+SfxItemSet aSet(mpViewShell->GetPool());
+aSet.Put(makeSdrTextAutoGrowWidthItem(false));
+aSet.Put(makeSdrTextAutoGrowHeightItem(true));
+pTxtObj->SetMergedItemSet(aSet);
+pTxtObj->AdjustTextFrameWidthAndHeight();
+const SfxViewShell* pCurrentViewShell = SfxViewShell::Current();
+if (pCurrentViewShell && (pCurrentViewShell->isLOKMobilePhone() || 
pCurrentViewShell->isLOKTablet()))
+pTxtObj->SetText(SdResId(STR_PRESOBJ_TEXT_EDIT_MOBILE));
 }
-else
+else if( nSlotId == SID_ATTR_CHAR_VERTICAL )
 {
-if( nSlotId == SID_ATTR_CHAR_VERTICAL )
-{
-// draw text object, needs to be initialized when vertical text is 
used
-SfxItemSet aSet(mpViewShell->GetPool());
+// draw text object, needs to be initialized when vertical text is used
+SfxItemSet aSet(mpViewShell->GetPool());
 
-aSet.Put(makeSdrTextAutoGrowWidthItem(true));
-aSet.Put(makeSdrTextAutoGrowHeightItem(false));
+aSet.Put(makeSdrTextAutoGrowWidthItem(true));
+aSet.Put(makeSdrTextAutoGrowHeightItem(false));
 
-// Set defaults for vertical click-n'drag text object, pool 
defaults are:
-// SdrTextVertAdjustItem: SDRTEXTVERTADJUST_TOP
-// SdrTextHorzAdjustItem: SDRTEXTHORZADJUST_BLOCK
-// Analog to that:
-aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BLOCK));
-aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
+// Set defaults for vertical click-n'drag text object, pool defaults 
are:
+// SdrTextVertAdjustItem: SDRTEXTVERTADJUST_TOP
+// 

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

[Maxim Monastirsky (via logerrit)]

 sc/qa/unit/subsequent_export_test4.cxx |   13 ++
 sc/qa/unit/ucalc.cxx   |   18 
 sc/source/core/data/document.cxx   |7 -
 sc/source/core/data/drwlayer.cxx   |   59 +
 sc/source/core/data/postit.cxx |   63 --
 sc/source/core/tool/detfunc.cxx|  147 -
 sc/source/core/tool/stylehelper.cxx|1 
 7 files changed, 130 insertions(+), 178 deletions(-)

New commits:
commit 3e4b8463f288d87f91cd5bc864d30ae02d4f5579
Author: Maxim Monastirsky 
AuthorDate: Mon Apr 10 00:38:33 2023 +0300
Commit: Maxim Monastirsky 
CommitDate: Tue Apr 18 01:09:21 2023 +0200

sc drawstyles: Maintain comment formatting with styles

Up to now the look of comments was maintained with the comment
shape's DF, with the default formatting being reapplied on
import (for hidden comments), on changing Tools > Options... >
LibreOffice > AC > Notes background, and on changing the
default cell style, while keeping the user-applied DF to some
extent. However, as we attempt to support drawing styles, this
approach is no longer viable, as applying DF on top of styles
at random times makes styles useless in the context of
comments.

(One might argue, that the look of comments should ideally be
treated as an app view setting, and not as a formatting of an
individual shape. This definitely makes sense, but has compat.
implications, as both LO and Excel allow formatting individual
comments (e.g. show a comment, right click > Area...). However
we will probably do it anyway if we ever implement threaded
comments like in recent Excel [1], as the callout shape based
approach seems to not scale to it.)

One way around it could be to explicitly disable any style
interaction with comments. But this will be unfortunate, as
styles have a clear advantage of being able to consistently
maintain the same formatting for several elements, much more
that the fragile approach of mixing the default formatting and
user-applied formatting in the same formatting layer. Not to
mention the possibility to define several custom styles. In
addition there is a request in tdf#55682 to disconnect the
formatting of comments from the default cell style, having a
dedicated style instead, which I find reasonable.

So this commit introduces a comment style, and uses it for new
comments instead of DF, making it easy to format all comments at
once. And a style based formatting is never overriden with DF,
unless explicitly set by the user. Changing Tools > Options... >
LibreOffice > AC > Notes background still has an effect in two
ways: (1) Sets the default background of the comment style for new
documents, and (2) if changed while a document is open, changes
also the comment style of the current document. An undo action
is also added, in case changing the current document wasn't
deliberate. Changing the default cell style no longer has any
effect on comment formatting.

One unfortunate side effect of this change, is that newly
created and permanently visible comments will lose their
default look when opened in an older version. But there is not
much I can do here, as older versions don't support styles, and
I believe the advantage of using styles outweigh this concern.
Hidden comments are not affected by this.

[1] see 
https://support.microsoft.com/en-us/office/the-difference-between-threaded-comments-and-notes-75a51eec-4092-42ab-abf8-7669077b7be3

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

diff --git a/sc/qa/unit/subsequent_export_test4.cxx 
b/sc/qa/unit/subsequent_export_test4.cxx
index 9d6e38ef8a09..5d629e83eb4a 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1553,12 +1554,14 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testCommentStyles)
 ScPostIt* pNote = pDoc->GetNote(aPos);
 CPPUNIT_ASSERT(pNote);
 
-pNote->ShowCaption(aPos, true);
 auto pCaption = pNote->GetCaption();
 CPPUNIT_ASSERT(pCaption);
 
 auto pStyleSheet = >GetStyleSheetPool()->Make("MyStyle1", 
SfxStyleFamily::Frame);
-pCaption->SetStyleSheet(static_cast(pStyleSheet), 
true);
+auto& rSet = pStyleSheet->GetItemSet();
+rSet.Put(SvxFontHeightItem(1129, 100, EE_CHAR_FONTHEIGHT));
+
+pCaption->SetStyleSheet(static_cast(pStyleSheet), 
false);
 
 // Hidden comments use different code path on import
 pNote->ShowCaption(aPos, false);
@@ -1575,12 +1578,14 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testCommentStyles)
 ScPostIt* pNote = 

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

[Maxim Monastirsky (via logerrit)]

 sc/inc/postit.hxx   |4 +++-
 sc/qa/unit/subsequent_filters_test4.cxx |8 +++-
 sc/source/core/data/postit.cxx  |   14 ++
 sc/source/filter/xml/xmlcelli.cxx   |2 +-
 4 files changed, 21 insertions(+), 7 deletions(-)

New commits:
commit 0ee9501c0b7dc1a291715fff9c1934b1c08cb654
Author: Maxim Monastirsky 
AuthorDate: Thu Apr 13 18:57:26 2023 +0300
Commit: Maxim Monastirsky 
CommitDate: Tue Apr 18 01:57:24 2023 +0200

sc drawstyles: Assign the Note style to imported comments

... that don't have a style assignment. Typically in ods files
created by older versions or by 3rd party.

- For hidden comments this should make no difference, as we used
to apply the default comment formatting as DF underneath their
defined DF, just now we do that as a style assignment instead.

- Same for comments from xlsx and xls files.

- For visible comments from ods files created by OOo/LO, there
should be no difference either, as such files typically include
the shape formatting in them.

- For visible comments from ods files created by Excel, there
will be a difference, as Excel used to not include the full shape
formatting (known to be the case with Excel 2007 and 2016; can't
test any other version). This resulted with a weird look, e.g.
a line instead of an arrow, a default blue fill color and too
distant shadow, which clearly not how comments supposed to look.
Moreover, the comment will turn to transparent after hiding or
copying the cell, and will revert to the default look anyway
with resaving. Given that we were already enforcing the default
formatting for hidden comments and for foreign formats, I think
it's reasonable to do that for visible comments too (and in
general it's unclear to me why the ODF import treats visible
comments differently than hidden ones).

The main motivation of this change is to aid solving the shadow
issue - see the next commits.

Regarding the comment height change in the testCommentSize test:
This does *not* mean there is a change in that comment's import.
What this test does is to replace the existing comment with
a new comment, and that use the default formatting instead of
inheriting the formatting of the old one. But while the current
default formatting is whatever defined in the Note style, the old
default formatting was actually the draw pool defaults. This is
because we used to apply the comment formatting as DF, and the
relevant svx code (in SdrTextObj::NbcSetText) wasn't aware of the
fact that part of the DF was considered as default in this case.
Which means that this test was actually asserting a buggy behavior.

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

diff --git a/sc/inc/postit.hxx b/sc/inc/postit.hxx
index 7da83a9ebea0..6b458ad41763 100644
--- a/sc/inc/postit.hxx
+++ b/sc/inc/postit.hxx
@@ -193,6 +193,8 @@ public:
 The underlying ScPostIt::ScNoteData::ScCaptionPtr takes managing
 ownership of the pointer.
 
+@param bHasStyle  Is there a drawing style set for the note.
+
 @return  Pointer to the new cell note object if insertion was
 successful (i.e. the passed cell position was valid), null
 otherwise. The Calc document is the owner of the note object. The
@@ -201,7 +203,7 @@ public:
  */
 static ScPostIt*CreateNoteFromCaption(
 ScDocument& rDoc, const ScAddress& rPos,
-SdrCaptionObj* pCaption );
+SdrCaptionObj* pCaption, bool bHasStyle );
 
 /** Creates a cell note based on the passed caption object data.
 
diff --git a/sc/qa/unit/subsequent_filters_test4.cxx 
b/sc/qa/unit/subsequent_filters_test4.cxx
index 06af93de19d9..c439a02c6582 100644
--- a/sc/qa/unit/subsequent_filters_test4.cxx
+++ b/sc/qa/unit/subsequent_filters_test4.cxx
@@ -45,6 +45,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
@@ -1580,6 +1582,10 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testCommentSize)
 SdrCaptionObj* pCaption = pNote->GetCaption();
 CPPUNIT_ASSERT(pCaption);
 
+// The values below depend on particular font and char size.
+// At least assert that the corresponding style was set:
+CPPUNIT_ASSERT_EQUAL(ScResId(STR_STYLENAME_NOTE), 
pCaption->GetStyleSheet()->GetName());
+
 const tools::Rectangle& rOldRect = pCaption->GetLogicRect();
 CPPUNIT_ASSERT_EQUAL(tools::Long(2899), rOldRect.getOpenWidth());
 CPPUNIT_ASSERT_EQUAL(tools::Long(939), rOldRect.getOpenHeight());
@@ -1588,7 +1594,7 @@ CPPUNIT_TEST_FIXTURE(ScFiltersTest4, testCommentSize)
 
 const tools::Rectangle& rNewRect = 

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

[Maxim Monastirsky (via logerrit)]

 sc/qa/unit/subsequent_export_test4.cxx |   16 +++-
 sc/source/filter/excel/xlroot.cxx  |1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

New commits:
commit 86cbbbccba19ba0433693e3e5c59c67e9dc6a003
Author: Maxim Monastirsky 
AuthorDate: Fri Apr 14 02:19:44 2023 +0300
Commit: Maxim Monastirsky 
CommitDate: Tue Apr 18 01:56:31 2023 +0200

sc drawstyles: Fix xlsx export for text attributes in comments

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

diff --git a/sc/qa/unit/subsequent_export_test4.cxx 
b/sc/qa/unit/subsequent_export_test4.cxx
index 5d629e83eb4a..663767c7374f 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -1583,7 +1583,21 @@ CPPUNIT_TEST_FIXTURE(ScExportTest4, testCommentStyles)
 
 // Check that the style was imported, and survived copying
 CPPUNIT_ASSERT_EQUAL(OUString("MyStyle1"), 
pCaption->GetStyleSheet()->GetName());
-// Check that the style formatting is in effect
+}
+
+saveAndReload("Calc Office Open XML");
+
+{
+ScDocument* pDoc = getScDoc();
+
+ScAddress aPos(0, 0, 0);
+ScPostIt* pNote = pDoc->GetNote(aPos);
+CPPUNIT_ASSERT(pNote);
+
+auto pCaption = pNote->GetOrCreateCaption(aPos);
+CPPUNIT_ASSERT(pCaption);
+
+// Check that the style formatting is preserved
 CPPUNIT_ASSERT_EQUAL(sal_uInt32(1129),
  
pCaption->GetMergedItemSet().Get(EE_CHAR_FONTHEIGHT).GetHeight());
 }
diff --git a/sc/source/filter/excel/xlroot.cxx 
b/sc/source/filter/excel/xlroot.cxx
index 47f5ff7806c1..71d308d2f29c 100644
--- a/sc/source/filter/excel/xlroot.cxx
+++ b/sc/source/filter/excel/xlroot.cxx
@@ -408,6 +408,7 @@ EditEngine& XclRoot::GetDrawEditEngine() const
 {
 mrData.mxDrawEditEng = std::make_shared( 
().GetDrawLayer()->GetItemPool() );
 EditEngine& rEE = *mrData.mxDrawEditEng;
+
rEE.SetStyleSheetPool(static_cast(GetDoc().GetDrawLayer()->GetStyleSheetPool()));
 rEE.SetRefMapMode(MapMode(MapUnit::Map100thMM));
 rEE.SetUpdateLayout( false );
 rEE.EnableUndo( false );

[Libreoffice-commits] core.git: canvas/source configmgr/source forms/source sd/source sw/source vcl/source

[Stephan Bergmann (via logerrit)]

 canvas/source/vcl/canvas.cxx |   13 +
 canvas/source/vcl/canvas.hxx |8 +++-
 configmgr/source/update.cxx  |   16 +++-
 forms/source/component/imgprod.cxx   |   14 ++
 forms/source/component/imgprod.hxx   |6 ++
 sd/source/ui/presenter/PresenterHelper.cxx   |   13 +
 sd/source/ui/presenter/PresenterHelper.hxx   |6 ++
 sd/source/ui/presenter/PresenterPreviewCache.cxx |   13 +
 sd/source/ui/presenter/PresenterPreviewCache.hxx |6 ++
 sw/source/filter/ww8/rtfexportfilter.cxx |   13 +
 sw/source/filter/ww8/rtfexportfilter.hxx |8 +++-
 vcl/source/app/session.cxx   |   18 --
 12 files changed, 129 insertions(+), 5 deletions(-)

New commits:
commit 7c36c5fdfdfeab9d15ea733fe2a831cd4ff25d27
Author: Stephan Bergmann 
AuthorDate: Mon Apr 17 21:33:37 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Apr 18 07:38:29 2023 +0200

Some missing XServiceInfo implementations

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

diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx
index 7e38276e06d3..ac73acd96a8f 100644
--- a/canvas/source/vcl/canvas.cxx
+++ b/canvas/source/vcl/canvas.cxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "outdevholder.hxx"
@@ -96,6 +97,18 @@ namespace vclcanvas
 return "com.sun.star.rendering.Canvas.VCL";
 }
 
+OUString Canvas::getImplementationName() {
+return "com.sun.star.comp.rendering.Canvas.VCL";
+}
+
+sal_Bool Canvas::supportsService(OUString const & ServiceName) {
+return cppu::supportsService(this, ServiceName);
+}
+
+css::uno::Sequence Canvas::getSupportedServiceNames() {
+return {getServiceName()};
+}
+
 bool Canvas::repaint( const GraphicObjectSharedPtr& rGrf,
   const rendering::ViewState&   viewState,
   const rendering::RenderState& renderState,
diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx
index be7d7858e3ad..8bcbc1f49894 100644
--- a/canvas/source/vcl/canvas.hxx
+++ b/canvas/source/vcl/canvas.hxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -48,7 +49,8 @@ namespace vclcanvas
  css::lang::XMultiServiceFactory,
  css::util::XUpdatable,
  css::beans::XPropertySet,
- css::lang::XServiceName >
GraphicDeviceBase_Base;
+ css::lang::XServiceName,
+ css::lang::XServiceInfo >
GraphicDeviceBase_Base;
 typedef ::canvas::GraphicDeviceBase< ::canvas::BaseMutexHelper< 
GraphicDeviceBase_Base >,
DeviceHelper,
tools::LocalGuard,
@@ -96,6 +98,10 @@ namespace vclcanvas
 // XServiceName
 virtual OUString SAL_CALL getServiceName(  ) override;
 
+OUString SAL_CALL getImplementationName() override;
+sal_Bool SAL_CALL supportsService(OUString const & ServiceName) 
override;
+css::uno::Sequence SAL_CALL getSupportedServiceNames() 
override;
+
 // RepaintTarget
 virtual bool repaint( const GraphicObjectSharedPtr& 
rGrf,
   const css::rendering::ViewState&  
viewState,
diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx
index 1cc2a06fe2a2..5851a6af05a3 100644
--- a/configmgr/source/update.cxx
+++ b/configmgr/source/update.cxx
@@ -23,10 +23,12 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -50,7 +52,7 @@ std::set< OUString > seqToSet(
 }
 
 class Service:
-public cppu::WeakImplHelper< css::configuration::XUpdate >
+public cppu::WeakImplHelper< css::configuration::XUpdate, 
css::lang::XServiceInfo >
 {
 public:
 explicit Service(const css::uno::Reference< css::uno::XComponentContext >& 
context):
@@ -79,6 +81,18 @@ private:
 css::uno::Sequence< OUString > const & includedPaths,
 css::uno::Sequence< OUString > const & excludedPaths) override;
 
+OUString SAL_CALL getImplementationName() override {
+return "com.sun.star.comp.configuration.Update";
+}
+
+sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override {
+return cppu::supportsService(this, ServiceName);
+}
+
+css::uno::Sequence SAL_CALL getSupportedServiceNames() override {
+

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

[Adolfo Jayme Barrientos (via logerrit)]

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

New commits:
commit d7088d24df28bba2fdbab7d77a2e7151e3b4f0dd
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon Apr 17 22:59:12 2023 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Apr 18 07:00:17 2023 +0200

These descriptions shouldn’t be imperatives with contractions

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

diff --git a/source/text/swriter/01/05030200.xhp 
b/source/text/swriter/01/05030200.xhp
index f30faf26fd..8b7e3e0527 100644
--- a/source/text/swriter/01/05030200.xhp
+++ b/source/text/swriter/01/05030200.xhp
@@ -50,10 +50,10 @@
 Automatically inserts hyphens where they 
are needed in a paragraph.
 
 Don't hyphenate words in CAPS
-Don't insert hyphens in words written 
entirely in capital letters.
+Avoids hyphenating words written entirely 
in capital letters, such as initialisms.
 
 Don't hyphenate the last word
-Don't insert hyphens in the last word 
of paragraphs.
+Avoids hyphenating the last word of 
paragraphs. This feature can help prevent these words from being split up 
across pages, affecting readability.
 
 Characters at line end
 Enter the minimum number of characters to 
leave at the end of the line before a hyphen is inserted.

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos (via logerrit)]

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

New commits:
commit 3c4f53bc19ab90a98edb75a2dc554c917e36ab11
Author: Adolfo Jayme Barrientos 
AuthorDate: Mon Apr 17 23:00:17 2023 -0600
Commit: Gerrit Code Review 
CommitDate: Tue Apr 18 07:00:17 2023 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  to d7088d24df28bba2fdbab7d77a2e7151e3b4f0dd
  - These descriptions shouldn’t be imperatives with contractions

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

diff --git a/helpcontent2 b/helpcontent2
index 2c7b120a5613..d7088d24df28 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2c7b120a56135515df2a3f2a0ea74c2a5166de5b
+Subproject commit d7088d24df28bba2fdbab7d77a2e7151e3b4f0dd

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

[Noel Grandin (via logerrit)]

 tools/source/generic/fract.cxx |   44 -
 1 file changed, 22 insertions(+), 22 deletions(-)

New commits:
commit b1684730ccbbca83df4dcb07d4759eebebbc4d66
Author: Noel Grandin 
AuthorDate: Mon Apr 17 13:24:25 2023 +0200
Commit: Noel Grandin 
CommitDate: Tue Apr 18 07:51:38 2023 +0200

tdf#143200 assert when pasting a cell to a large-height range

The values are unfortunately genuinely outside the range that our
Fraction class can work with.
So do the least-bad thing for now, and reduce the magnitude of the
values until they fit.

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

diff --git a/tools/source/generic/fract.cxx b/tools/source/generic/fract.cxx
index 4acd46cec404..a583e75a7cac 100644
--- a/tools/source/generic/fract.cxx
+++ b/tools/source/generic/fract.cxx
@@ -49,24 +49,36 @@ static boost::rational toRational(sal_Int32 n, 
sal_Int32 d)
 return boost::rational(n, d);
 }
 
+static constexpr bool isOutOfRange(sal_Int64 nNum)
+{
+return nNum < std::numeric_limits::min()
+|| nNum > std::numeric_limits::max();
+}
+
 // Initialized by setting nNum as nominator and nDen as denominator
 // Negative values in the denominator are invalid and cause the
 // inversion of both nominator and denominator signs
 // in order to return the correct value.
 Fraction::Fraction( sal_Int64 nNum, sal_Int64 nDen ) : mnNumerator(nNum), 
mnDenominator(nDen)
 {
-assert( nNum >= std::numeric_limits::min() );
-assert( nNum <= std::numeric_limits::max( ));
-assert( nDen >= std::numeric_limits::min() );
-assert( nDen <= std::numeric_limits::max( ));
-if ( nDen == 0 )
+if ( isOutOfRange(nNum) || isOutOfRange(nDen) )
+{
+// tdf#143200
+SAL_WARN("tools.fraction", "values outside of range we can represent, 
doing reduction, which will reduce precision");
+do
+{
+mnNumerator /= 2;
+mnDenominator /= 2;
+} while (isOutOfRange(mnNumerator) || isOutOfRange(mnDenominator));
+}
+if ( mnDenominator == 0 )
 {
 mbValid = false;
 SAL_WARN( "tools.fraction", "'Fraction(" << nNum << ",0)' invalid 
fraction created" );
 return;
 }
-if ((nDen == -1 && nNum == std::numeric_limits::min()) ||
-(nNum == -1 && nDen == std::numeric_limits::min()))
+else if ((nDen == -1 && nNum == std::numeric_limits::min()) ||
+(nNum == -1 && nDen == std::numeric_limits::min()))
 {
 mbValid = false;
 SAL_WARN("tools.fraction", "'Fraction(" << nNum << "," << nDen << ")' 
invalid fraction created");
@@ -77,21 +89,9 @@ Fraction::Fraction( sal_Int64 nNum, sal_Int64 nDen ) : 
mnNumerator(nNum), mnDeno
 /**
  * only here to prevent passing of NaN
  */
-Fraction::Fraction( double nNum, double nDen ) : mnNumerator(sal_Int64(nNum)), 
mnDenominator(sal_Int64(nDen))
-{
-assert( !std::isnan(nNum) );
-assert( !std::isnan(nDen) );
-assert( nNum >= std::numeric_limits::min() );
-assert( nNum <= std::numeric_limits::max( ));
-assert( nDen >= std::numeric_limits::min() );
-assert( nDen <= std::numeric_limits::max( ));
-if ( nDen == 0 )
-{
-mbValid = false;
-SAL_WARN( "tools.fraction", "'Fraction(" << nNum << ",0)' invalid 
fraction created" );
-return;
-}
-}
+Fraction::Fraction( double nNum, double nDen )
+: Fraction(sal_Int64(nNum), sal_Int64(nDen))
+{}
 
 Fraction::Fraction( double dVal )
 {

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

[Noel Grandin (via logerrit)]

 xmloff/source/draw/shapeexport.cxx |6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 94e505b9ffbeb1695393d5dea0da84a0bf887fba
Author: Noel Grandin 
AuthorDate: Mon Apr 17 19:25:26 2023 +0200
Commit: Noel Grandin 
CommitDate: Tue Apr 18 07:51:55 2023 +0200

no need to perform lookup twice in XMLShapeExport::seekShapes

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

diff --git a/xmloff/source/draw/shapeexport.cxx 
b/xmloff/source/draw/shapeexport.cxx
index 056c3ce98267..94b7ad8e78a0 100644
--- a/xmloff/source/draw/shapeexport.cxx
+++ b/xmloff/source/draw/shapeexport.cxx
@@ -1092,11 +1092,9 @@ void XMLShapeExport::seekShapes( const uno::Reference< 
drawing::XShapes >& xShap
 maCurrentShapesIter = maShapesInfos.find( xShapes );
 if( maCurrentShapesIter == maShapesInfos.end() )
 {
-ImplXMLShapeExportInfoVector aNewInfoVector;
-aNewInfoVector.resize( 
static_cast(xShapes->getCount()) );
-maShapesInfos[ xShapes ] = aNewInfoVector;
+auto itPair = maShapesInfos.emplace( xShapes, 
ImplXMLShapeExportInfoVector( 
static_cast(xShapes->getCount()) ) );
 
-maCurrentShapesIter = maShapesInfos.find( xShapes );
+maCurrentShapesIter = itPair.first;
 
 SAL_WARN_IF( maCurrentShapesIter == maShapesInfos.end(), "xmloff", 
"XMLShapeExport::seekShapes(): insert into stl::map failed" );
 }

[Libreoffice-bugs] [Bug 154845] Crash in: XMLFontAutoStylePool::getUsedFontList()

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154845

Telesto  changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |DUPLICATE

--- Comment #1 from Telesto  ---
The issue will be resolved in LibreOffice 7.5.3. You have to wait until
released or use a pre-release:
https://dev-builds.libreoffice.org/pre-releases/win/x86_64/LibreOffice_7.5.3.1_Win_x86-64.msi

*** This bug has been marked as a duplicate of bug 154754 ***

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154754] Crash in: XMLFontAutoStylePool::getUsedFontList()

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154754

--- Comment #6 from Telesto  ---
*** Bug 154845 has been marked as a duplicate of this bug. ***

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154842] Pagebreak in a row with horizontally splitted cell will show content, which is set "middel", at "top"

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154842

Robert Großkopf  changed:

   What|Removed |Added

 Ever confirmed|0   |1
 Status|UNCONFIRMED |NEW
Version|7.4.4.2 release |5.1.5.2 release
Summary|An action on a table cell   |Pagebreak in a row with
   |(visually) changes another  |horizontally splitted cell
   |cell|will show content, which is
   ||set "middel", at "top"

--- Comment #1 from Robert Großkopf  ---
Could confirm the buggy behavior with LO 7.5.2.2 on OpenSUSE 15.4 64bit rpm
Linux. Bug will also appear with LO 5.1.5.2 (oldest version I have installed
here). So might be it is inherited from OOo. Have set the Version to LO
5.1.5.2.

Note: It will only happen when a cell in the row has been splitted horizontally
and there is a page break inside the row.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 137542] SIGSEGV on tab cycling focus to input field in a table cell

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=137542

Caolán McNamara  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #9 from Caolán McNamara  ---
lets at least no crash, done in trunk, backport to 7-5 and 7-4 in gerrit

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154842] Pagebreak in a row with horizontally splitted cell will show content, which is set "middel", at "top"

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154842

--- Comment #4 from Alexander Kurakin  ---
Created attachment 186712
  --> https://bugs.documentfoundation.org/attachment.cgi?id=186712=edit
Second case - after

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 133092] [META] Crash bugs

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=133092
Bug 133092 depends on bug 137542, which changed state.

Bug 137542 Summary: SIGSEGV on tab cycling focus to input field in a table cell
https://bugs.documentfoundation.org/show_bug.cgi?id=137542

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154766] management of ellipsis variants

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154766

Heiko Tietze  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEEDINFO
 Ever confirmed|0   |1
   Severity|normal  |enhancement

--- Comment #9 from Heiko Tietze  ---
Request is twofold, a) ellipsis as one character, b) ellipsis with larger
spacing.

Depending on the journal you want to change the type, it must not break with
lines, and should be easy to apply. For a) it was suggested to use the auto
replacement function (could be the replacement table or even auto text) but I
can also imagine to use the special character and/or search/replace function.
In case of b) I'd suggest to use a character style with larger spacing. For
example 5pt, and what you type as three consecutive dots will look like dots
with spaces.

Does this work for you? Please consider that we have to find general solutions
and while it might seem as a workaround for you this should be the approach to
make everyone happy.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-ux-advise] [Bug 154766] management of ellipsis variants

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154766

Heiko Tietze  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEEDINFO
 Ever confirmed|0   |1
   Severity|normal  |enhancement

--- Comment #9 from Heiko Tietze  ---
Request is twofold, a) ellipsis as one character, b) ellipsis with larger
spacing.

Depending on the journal you want to change the type, it must not break with
lines, and should be easy to apply. For a) it was suggested to use the auto
replacement function (could be the replacement table or even auto text) but I
can also imagine to use the special character and/or search/replace function.
In case of b) I'd suggest to use a character style with larger spacing. For
example 5pt, and what you type as three consecutive dots will look like dots
with spaces.

Does this work for you? Please consider that we have to find general solutions
and while it might seem as a workaround for you this should be the approach to
make everyone happy.

-- 
You are receiving this mail because:
You are on the CC list for the bug.

[Libreoffice-bugs] [Bug 148419] Assertion: (false), function newFromSubString, file strtmpl.hxx, line 981 (Track changes: !!br0ken!! appears in table cells)

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=148419

Caolán McNamara  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO

--- Comment #13 from Caolán McNamara  ---
is this fixed, I don't reproduce it with an up to date trunk build?

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154501] Fileopen PPTX: Table with rotated text rendering wrong again

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154501

--- Comment #6 from Commit Notification 
 ---
Noel Grandin committed a patch related to this issue.
It has been pushed to "libreoffice-7-4":

https://git.libreoffice.org/core/commit/aaa077ccf4600f582cd33b7510f0d911bf5845d6

tdf#154501 - Fileopen PPTX: Table with rotated text wrong

It will be available in 7.4.7.

The patch should be included in the daily builds available at
https://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
https://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154501] Fileopen PPTX: Table with rotated text rendering wrong again

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154501

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|target:7.6.0|target:7.6.0 target:7.4.7

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154777] FILESAVE PDF PAC tool reports only one accessible form object

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154777

Buovjaga  changed:

   What|Removed |Added

 Ever confirmed|0   |1
 Status|UNCONFIRMED |NEW
 CC||ilmari.lauhakangas@libreoff
   ||ice.org
   Keywords||accessibility

--- Comment #3 from Buovjaga  ---
Repro

Version: 7.6.0.0.alpha0+ (X86_64) / LibreOffice Community
Build ID: 96c4c0fcffc4f0a1f5a49be576646d15d613228e
CPU threads: 2; OS: Windows 10.0 Build 22621; UI render: Skia/Raster; VCL: win
Locale: en-US (en_FI); UI: en-US
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154849] [macOS] Bug Fix Submission with Swift Language (swiftlang) file(s) Guidance Request

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154849

--- Comment #2 from Alex Thurgood  ---
(In reply to zbugs from comment #0)
> If I implemented a macOS-specific bug fix, where some macOS-specific
> Objective-C file(s) were replaced with Swift language file(s), is there a
> process whereby such a submission would be accepted?
> 

The basic question I guess, aside from any other UI considerations, would be
whether stuff written in Swift, which is released under the Apache 2.0 licence,
is compatible with the dual licence conditions of the LibreOffice project?

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 137542] SIGSEGV on tab cycling focus to input field in a table cell

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=137542

Commit Notification  changed:

   What|Removed |Added

 Whiteboard|target:7.6.0|target:7.6.0 target:7.5.4

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154857] when switching between application colors, formula content does not update

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154857

--- Comment #4 from Simon Mikkelsen  ---
Created attachment 186721
  --> https://bugs.documentfoundation.org/attachment.cgi?id=186721=edit
light mode(unupdated formula)

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 123260] FILEOPEN: PPTX imported gradient fill wrong due to different fill algorithm

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=123260

Buovjaga  changed:

   What|Removed |Added

 Resolution|--- |NOTABUG
 Status|NEW |RESOLVED

--- Comment #6 from Buovjaga  ---
(In reply to Gabor Kelemen (allotropia) from comment #5)
> Created attachment 186716 [details]
> The example file in MSO 2010 and 2013
> 
> Looks like the rendering of this example has changed with MSO 2013.
> Before only the transparency was considered, since 2013 the color and the
> transparency are both considered. LO is compatible with the latter.
> 
> I think it's a NAB at this point, considering even newer MSO renders it
> differently.

I confirm office.com renders it like MSO 2013.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 36766] [META] Impress Gradient and Transparency issues

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=36766
Bug 36766 depends on bug 123260, which changed state.

Bug 123260 Summary: FILEOPEN: PPTX imported gradient fill wrong due to 
different fill algorithm
https://bugs.documentfoundation.org/show_bug.cgi?id=123260

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |NOTABUG

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154857] when switching between application colors, formula content does not update

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154857

--- Comment #5 from Simon Mikkelsen  ---
Created attachment 186722
  --> https://bugs.documentfoundation.org/attachment.cgi?id=186722=edit
light mode(updated formula)

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154499] Accept consecutive words with spaces aka phrases in spellchecker

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154499

Heiko Tietze  changed:

   What|Removed |Added

Summary|we are write two or more|Accept consecutive words
   |word local or other |with spaces aka phrases in
   |language word example(amma  |spellchecker
   |appa )in LibreOffice ignore |
   |at a time   |

--- Comment #6 from Heiko Tietze  ---
@Nehru: I struggle to translate your "we are write two or more word local or
other language word example(amma appa )in LibreOffice ignore at a time" and
think my summary is easier to understand now. I suggest to leave further
changes open to native speakers.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154835] When I insert a chart in any document and click the "Properties" button in the right side of the screen, its content shows up but instantly disappears.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154835

Julien Nabet  changed:

   What|Removed |Added

Summary|When I insert a chart in|When I insert a chart in
   |any document and click the  |any document and click the
   |"Properties" botton in the  |"Properties" button in the
   |right side of the screen,   |right side of the screen,
   |it's contents shows up but  |its content shows up but
   |instantly disappears.   |instantly disappears.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154854] New: Unable to change language, when in filter menu. LibreOffice Calc

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154854

Bug ID: 154854
   Summary: Unable to change language, when in filter menu.
LibreOffice Calc
   Product: LibreOffice
   Version: 7.3.7.2 release
  Hardware: x86-64 (AMD64)
OS: Linux (All)
Status: UNCONFIRMED
  Severity: minor
  Priority: medium
 Component: Calc
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: 1dimad...@gmail.com

Description:
When I use win+space keys in LibreOffice Calc in filter column menu, space
printed and system language doesn't change.

Steps to Reproduce:
1.cntrl+shft+l to create column filter
2. open column filter
3. press win+space

Actual Results:
opened some menu or added space

Expected Results:
system language changed


Reproducible: Always


User Profile Reset: Yes

Additional Info:
That's all

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 90229] PROPERTIES : not able to edit the author of the document field

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=90229

BogdanB  changed:

   What|Removed |Added

 Blocks||108747
 CC||buzea.bog...@libreoffice.or
   ||g


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=108747
[Bug 108747] [META] File properties/settings (meta data) bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 108747] [META] File properties/settings (meta data) bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=108747

BogdanB  changed:

   What|Removed |Added

 Depends on||90229


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=90229
[Bug 90229] PROPERTIES : not able to edit the author of the document field
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154830] Fileopen takes too long to open an existing small file.

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154830

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

 Ever confirmed|0   |1
 CC||stephane.guillou@libreoffic
   ||e.org
 Status|UNCONFIRMED |NEEDINFO

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 133923] File-Export to image only exports text and not chart

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=133923

--- Comment #13 from regis586  ---
Hi,
Bug'still alive..

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 134554] [META] Style Inspector

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=134554

Buovjaga  changed:

   What|Removed |Added

 Depends on||154776


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=154776
[Bug 154776] directly applied tab stops in para not reported in direct
formatting style inspector
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154776] directly applied tab stops in para not reported in direct formatting style inspector

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154776

Buovjaga  changed:

   What|Removed |Added

 CC||ilmari.lauhakangas@libreoff
   ||ice.org
 Ever confirmed|0   |1
 Status|UNCONFIRMED |NEW
   Severity|normal  |enhancement
 Blocks||134554

--- Comment #1 from Buovjaga  ---
Repro, but let's call this an enhancement.

Arch Linux 64-bit, X11
Version: 7.6.0.0.alpha0+ (X86_64) / LibreOffice Community
Build ID: 066b23115c2a360507e306a88da572554daefab7
CPU threads: 8; OS: Linux 6.2; UI render: default; VCL: kf5 (cairo+xcb)
Locale: fi-FI (fi_FI.UTF-8); UI: en-US
Calc: threaded
Built on 17 April 2023


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=134554
[Bug 134554] [META] Style Inspector
-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154856] when switching between application colors, formula content does not update

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154856

Stéphane Guillou (stragu)  changed:

   What|Removed |Added

 Resolution|--- |INVALID
 Status|UNCONFIRMED |RESOLVED

--- Comment #1 from Stéphane Guillou (stragu) 
 ---
Same OP created bug 154857 with more details. Closing as Invalid.

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 153985] Horrible performance scrolling up with PgUp

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=153985

Buovjaga  changed:

   What|Removed |Added

 Status|REOPENED|UNCONFIRMED
 Ever confirmed|1   |0

-- 
You are receiving this mail because:
You are the assignee for the bug.

[Libreoffice-bugs] [Bug 154840] 7.5 not connecting to printer

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=154840

Robert Großkopf  changed:

   What|Removed |Added

 CC||rob...@familiegrosskopf.de

--- Comment #1 from Robert Großkopf  ---
Please add info:
How do you connect to the printer (USB/LAN …)?
Which version of LO do you use?

Couldn't confirm any buggy behavior for Printer in Lan together with

Version: 7.5.2.2 (X86_64) / LibreOffice Community
Build ID: 53bb9681a964705cf672590721dbc85eb4d0c3a2
CPU threads: 6; OS: Linux 5.14; UI render: default; VCL: kf5 (cairo+xcb)
Locale: de-DE (de_DE.UTF-8); UI: de-DE
Calc: threaded

-- 
You are receiving this mail because:
You are the assignee for the bug.