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

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

New commits:
commit 1947a80a7503e476089c6ab02fef0eec68ff12e3
Author: Miklos Vajna 
AuthorDate: Thu May 4 09:25:35 2023 +0200
Commit: Miklos Vajna 
CommitDate: Fri May 5 13:19:39 2023 +0200

writerfilter: fix crash in DomainMapper_Impl::handleIndex()

Crashreport signature:

program/libwriterfilterlo.so
  
writerfilter::dmapper::DomainMapper_Impl::handleIndex(tools::SvRef
 const&, rtl::OUString const&)
  writerfilter/source/dmapper/DomainMapper_Impl.cxx:6116
program/libwriterfilterlo.so
  writerfilter::dmapper::DomainMapper_Impl::CloseFieldCommand()
  include/rtl/ustring.hxx:527
program/libwriterfilterlo.so
  writerfilter::dmapper::DomainMapper::lcl_text(unsigned char const*, 
unsigned long)
  writerfilter/source/dmapper/DomainMapper.cxx:3735
program/libwriterfilterlo.so
  writerfilter::rtftok::RTFDocumentImpl::singleChar(unsigned char, bool)
  writerfilter/source/rtftok/rtfdocumentimpl.hxx:718

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index e2c2475ecf9f..aeccd6ab1ab1 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -6119,7 +6119,10 @@ void DomainMapper_Impl::handleIndex
 {
 sValue = sValue.replaceAll("\"", "");
 uno::Reference xTextColumns;
-xTOC->getPropertyValue(getPropertyName( PROP_TEXT_COLUMNS )) >>= 
xTextColumns;
+if (xTOC.is())
+{
+xTOC->getPropertyValue(getPropertyName( PROP_TEXT_COLUMNS )) >>= 
xTextColumns;
+}
 if (xTextColumns.is())
 {
 xTextColumns->setColumnCount( sValue.toInt32() );

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

2023-05-04 Thread Jaume Pujantell (via logerrit) 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 08e111b488c7cddfcacbd66560cf40b060ec4b75
Author: Jaume Pujantell 
AuthorDate: Thu Apr 27 14:54:55 2023 +0200
Commit: Andras Timar 
CommitDate: Thu May 4 09:27:04 2023 +0200

tdf#154478 fix comments empy after ToC

TOC creation entered a malformed state where it interfered with
the creation of other elements (e.g. annotations and textboxes).
This change is also a fix to tdf#154481, so the patch from
94de79e7d3c98 can be removed.

Change-Id: I423f9d048b8c5b89fd38229c4f3ad41213d5ab67
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151103
Tested-by: Jenkins
Reviewed-by: Ashod Nakashian 
(cherry picked from commit 5431b756d45bebe74beaba2026704552ee6891f0)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151282
Tested-by: Andras Timar 
Reviewed-by: Andras Timar 

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 8b8bff35e40e..e2c2475ecf9f 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -6030,7 +6030,13 @@ uno::Reference 
DomainMapper_Impl::createSectionForRange(
 if (stepLeft)
 xCursor->goLeft(1, true);
 uno::Reference< text::XTextContent > xSection( 
m_xTextFactory->createInstance(sObjectType), uno::UNO_QUERY_THROW );
-xSection->attach( uno::Reference< text::XTextRange >( xCursor, 
uno::UNO_QUERY_THROW) );
+try
+{
+xSection->attach( uno::Reference< text::XTextRange >( xCursor, 
uno::UNO_QUERY_THROW) );
+}
+catch(const uno::Exception&)
+{
+}
 xRet.set(xSection, uno::UNO_QUERY );
 }
 catch(const uno::Exception&)

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

2022-12-19 Thread Miklos Vajna (via logerrit) 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 604f8c233c6543940d0c794223e24ac5d0749679
Author: Miklos Vajna 
AuthorDate: Fri Dec 16 10:43:07 2022 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 19 09:28:46 2022 +

writerfilter: fix crash in DomainMapper_Impl::convertFieldFormula()

Crashreport signature:

program/libwriterfilterlo.so
writerfilter::dmapper::SettingsTable::GetListSeparator() const
writerfilter/source/dmapper/SettingsTable.cxx:489
program/libwriterfilterlo.so

writerfilter::dmapper::DomainMapper_Impl::convertFieldFormula(rtl::OUString 
const&)
include/rtl/ustring.hxx:226
program/libwriterfilterlo.so

writerfilter::dmapper::DomainMapper_Impl::handleFieldFormula(tools::SvRef
 const&, com::sun::star::uno::Reference 
const&)
include/rtl/ustring.hxx:527
program/libwriterfilterlo.so
writerfilter::dmapper::DomainMapper_Impl::CloseFieldCommand()
writerfilter/source/dmapper/DomainMapper_Impl.cxx:6458

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

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2f7fda4b1388..a3fba36fc39c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -5300,6 +5300,11 @@ void DomainMapper_Impl::handleFieldAsk
  */
 OUString DomainMapper_Impl::convertFieldFormula(const OUString& input) {
 
+if (!m_pSettingsTable)
+{
+return input;
+}
+
 OUString listSeparator = m_pSettingsTable->GetListSeparator();
 
 /* Replace logical condition functions with LO equivalent operators */

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

2022-11-23 Thread Justin Luth (via logerrit) 
 writerfilter/source/dmapper/SdtHelper.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 8221008b602cadb139bf927d7e5c76777632a7b0
Author: Justin Luth 
AuthorDate: Thu Nov 17 06:20:14 2022 -0500
Commit: Miklos Vajna 
CommitDate: Wed Nov 23 15:09:47 2022 +0100

sw content controls: fix SdtHelper missing clear() items

Found during a code read, while attempting to add another property.

(cherry picked from commit e960d3fea28fe4c180dc5612ce00682e432e9772)

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

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index 789bf893251e..540969b1e933 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -455,6 +455,10 @@ void SdtHelper::clear()
 m_bChecked = false;
 m_aCheckedState.clear();
 m_aUncheckedState.clear();
+m_aPlaceholderDocPart.clear();
+m_aColor.clear();
+m_aAlias.clear();
+m_aTag.clear();
 }
 
 void SdtHelper::SetPlaceholderDocPart(const OUString& rPlaceholderDocPart)