[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - writerfilter/source

2023-11-30 Thread Michael Stahl (via logerrit) 
 writerfilter/source/dmapper/DomainMapper.cxx |   17 +
 1 file changed, 5 insertions(+), 12 deletions(-)

New commits:
commit 950464e95723d153e571c657cbceb15a77373075
Author: Michael Stahl 
AuthorDate: Wed Nov 15 19:41:49 2023 +0100
Commit: Xisco Fauli 
CommitDate: Thu Nov 30 10:21:58 2023 +0100

writerfilter: remove DomainMapper::text() handling of paragraph break

Convert all remaining callers to utext().

Change-Id: Ie1fdf22e9e474289df2c72eadc236ec6b270df4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159485
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 15f54c82d136e6fee3a65494f3b5271857b5d6b8)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159564
Reviewed-by: Xisco Fauli 

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index cdb2212a0a38..f1be653f7af1 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2434,8 +2434,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 lcl_startParagraphGroup();
 m_pImpl->GetTopContext()->Insert(PROP_BREAK_TYPE, 
uno::Any(style::BreakType_PAGE_BEFORE));
 lcl_startCharacterGroup();
-sal_uInt8 const sBreak[] = { 0xd };
-lcl_text(sBreak, 1);
+sal_Unicode const sBreak[] = { 0x0d };
+lcl_utext(reinterpret_cast(sBreak), 1);
 lcl_endCharacterGroup();
 lcl_endParagraphGroup();
 }
@@ -3625,8 +3625,8 @@ void DomainMapper::lcl_endSectionGroup()
 // style, so force a dummy paragraph.
 lcl_startParagraphGroup();
 lcl_startCharacterGroup();
-sal_uInt8 const sBreak[] = { 0xd };
-lcl_text(sBreak, 1);
+sal_Unicode const sBreak[] = { 0x0d };
+lcl_utext(reinterpret_cast(sBreak), 1);
 lcl_endCharacterGroup();
 lcl_endParagraphGroup();
 }
@@ -3917,14 +3917,7 @@ void DomainMapper::lcl_text(const sal_uInt8 * data_, 
size_t len)
 return;
 case 0x0d:
 {
-PropertyMapPtr pContext = 
m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH);
-if (pContext && m_pImpl->isBreakDeferred(COLUMN_BREAK))
-{
-pContext->Insert(PROP_BREAK_TYPE, 
uno::Any(style::BreakType_COLUMN_BEFORE));
-m_pImpl->clearDeferredBreak(COLUMN_BREAK);
-}
-ResetStyleProperties();
-finishParagraph();
+assert(!"paragraph break is handled by utext() now");
 return;
 }
 case cFieldStart:

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - writerfilter/source

2023-10-27 Thread Miklos Vajna (via logerrit) 
 writerfilter/source/dmapper/TableManager.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 98a69f2a002079f4d0c75441659d54ea6597e4b2
Author: Miklos Vajna 
AuthorDate: Thu Oct 26 16:16:04 2023 +0200
Commit: Xisco Fauli 
CommitDate: Fri Oct 27 10:41:05 2023 +0200

sw floattable: fix nullptr deref in TableManager::endLevel()

This is never an empty reference in the interesting use-case, so just
make sure we don't crash.

Reported to be a regression from
2d43c34333076fad092f0cdc0f60f81580acdbee (Related: tdf#55160 sw
floattable, nested DOCX imp: fix inner tbl at cell start, 2023-09-15).

See

,
e.g.

.

Change-Id: I4cd9c35ae3813a67d13d9b9e60f0dd6058f510c6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158508
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 8ad82fc115a337604c064d37adfffcc81440248e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158530
Reviewed-by: Xisco Fauli 

diff --git a/writerfilter/source/dmapper/TableManager.cxx 
b/writerfilter/source/dmapper/TableManager.cxx
index d0f90bd20729..5554a93d9fcf 100644
--- a/writerfilter/source/dmapper/TableManager.cxx
+++ b/writerfilter/source/dmapper/TableManager.cxx
@@ -444,7 +444,10 @@ void TableManager::endLevel()
 {
 xCursor = 
xCellStart->getText()->createTextCursorByRange(
 xCellStart->getStart());
-xCursor->goLeft(1, false);
+if (xCursor.is())
+{
+xCursor->goLeft(1, false);
+}
 }
 catch (const uno::RuntimeException&)
 {

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - writerfilter/source

2023-06-23 Thread Tomaž Vajngerl (via logerrit) 
 writerfilter/source/dmapper/PropertyIds.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1b5cee822e0bc15ddbdfc86926678ca35ab3e082
Author: Tomaž Vajngerl 
AuthorDate: Sun Jun 18 23:35:36 2023 +0900
Commit: Xisco Fauli 
CommitDate: Fri Jun 23 13:19:39 2023 +0200

use frozen::make_unordered_map so no need to specify the count

Change-Id: I08057846e735028fb4634fad8b210c707905e096
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153233
Tested-by: Jenkins
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 
(cherry picked from commit d7bc610a359ca7e95b3a600c03da6a0b9e6f439c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153515
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index d294a3ad082c..11ef07230fad 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -26,7 +26,7 @@ namespace writerfilter::dmapper{
 
 namespace
 {
-constexpr frozen::unordered_map 
constPropertyMap
+constexpr auto constPropertyMap = frozen::make_unordered_map(
 {
 { PROP_CHAR_WEIGHT, u"CharWeight"},
 { PROP_CHAR_POSTURE, u"CharPosture"},
@@ -378,7 +378,7 @@ namespace
 { PROP_CURSOR_NOT_IGNORE_TABLES_IN_HF, u"CursorNotIgnoreTables"},
 { PROP_PARA_CONNECT_BORDERS, u"ParaIsConnectBorder"},
 { PROP_DECORATIVE, u"Decorative"},
-};
+});
 } // end anonymous ns
 
 OUString getPropertyName( PropertyIds eId )

[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - writerfilter/source

2023-06-12 Thread Tomaž Vajngerl (via logerrit) 
 writerfilter/source/ooxml/model.xml |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f60e889c95cc894eaae06ea2199e2b2d107d54a0
Author: Tomaž Vajngerl 
AuthorDate: Sat Jun 10 22:22:17 2023 +0900
Commit: Xisco Fauli 
CommitDate: Mon Jun 12 17:53:36 2023 +0200

oox: fix theme data in model.xml to use a correct types

Change-Id: Ifaa725d8a3e6c4cfefc92a6c5fcdb581610d3ce6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152832
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 
(cherry picked from commit 3a6d360b5e585b8e92cc0d58d5fbc497448e11fb)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152887
Reviewed-by: Xisco Fauli 

diff --git a/writerfilter/source/ooxml/model.xml 
b/writerfilter/source/ooxml/model.xml
index 888ffeba173c..526fbc223c16 100644
--- a/writerfilter/source/ooxml/model.xml
+++ b/writerfilter/source/ooxml/model.xml
@@ -10997,13 +10997,13 @@
   
 
 
-  
+  
 
 
-  
+  
 
 
-  
+  
 
   
   
@@ -12591,13 +12591,13 @@
   
 
 
-  
+  
 
 
-  
+  
 
 
-  
+