writerfilter/source/dmapper/DomainMapper_Impl.cxx | 23 +++++++++-------------
writerfilter/source/dmapper/DomainMapper_Impl.hxx | 8 ++++---
2 files changed, 15 insertions(+), 16 deletions(-)
New commits:
commit 94f0744648539f1dc4efd42ea55a1e533364ff07
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Tue Feb 6 14:30:58 2024 +0100
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Tue Feb 6 15:33:29 2024 +0100
writerfilter: move these members to FieldContext
Change-Id: I7449c7e7bb2a54ca0fdfe2bcb67009f76fbb1d13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163055
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index bb5472f43174..9f56d17c2ec6 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -336,9 +336,6 @@ DomainMapper_Impl::DomainMapper_Impl(
m_xComponentContext(std::move( xContext )),
m_bForceGenericFields(officecfg::Office::Common::Filter::Microsoft::Import::ForceImportWWFieldsAsGenericFields::get()),
m_bIsDecimalComma( false ),
- m_bSetUserFieldContent( false ),
- m_bSetCitation( false ),
- m_bSetDateValue( false ),
m_bIsFirstSection( true ),
m_bStartTOC(false),
m_bStartTOCHeaderFooter(false),
@@ -7393,9 +7390,9 @@ void DomainMapper_Impl::CloseFieldCommand()
if( !pContext )
return;
- m_bSetUserFieldContent = false;
- m_bSetCitation = false;
- m_bSetDateValue = false;
+ pContext->m_bSetUserFieldContent = false;
+ pContext->m_bSetCitation = false;
+ pContext->m_bSetDateValue = false;
// tdf#124472: If the normal command line is not empty, use it,
// otherwise, the last active row is evaluated.
if (!pContext->GetCommandIsEmpty(false))
@@ -7559,7 +7556,7 @@ void DomainMapper_Impl::CloseFieldCommand()
xFieldProperties->setPropertyValue(
getPropertyName(PROP_IS_FIXED),
uno::Any( true ));
- m_bSetDateValue = true;
+ pContext->m_bSetDateValue = true;
}
else
xFieldProperties->setPropertyValue(
@@ -7616,7 +7613,7 @@ void DomainMapper_Impl::CloseFieldCommand()
uno::Reference<text::XDependentTextField>
xDependentField(
xFieldInterface, uno::UNO_QUERY_THROW);
xDependentField->attachTextFieldMaster(xMaster);
- m_bSetUserFieldContent = true;
+ pContext->m_bSetUserFieldContent = true;
}
}
break;
@@ -8137,7 +8134,7 @@ void DomainMapper_Impl::CloseFieldCommand()
xFieldProperties->setPropertyValue(
getPropertyName(PROP_IS_FIXED),
uno::Any( true ));
- m_bSetDateValue = true;
+ pContext->m_bSetDateValue = true;
}
SetNumberFormat( pContext->GetCommand(), xFieldProperties
);
}
@@ -8231,7 +8228,7 @@ void DomainMapper_Impl::CloseFieldCommand()
uno::Sequence<beans::PropertyValue> aValues
=
m_aFieldStack.back()->getProperties()->GetPropertyValues();
appendTextContent(xToInsert, aValues);
- m_bSetCitation = true;
+ pContext->m_bSetCitation = true;
}
break;
@@ -8427,7 +8424,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const&
rResult)
{
try
{
- if( m_bSetUserFieldContent )
+ if (pContext->m_bSetUserFieldContent)
{
// user field content has to be set at the field master
uno::Reference< text::XDependentTextField >
xDependentField( xTextField, uno::UNO_QUERY_THROW );
@@ -8435,7 +8432,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const&
rResult)
getPropertyName(PROP_CONTENT),
uno::Any( rResult ));
}
- else if ( m_bSetCitation )
+ else if (pContext->m_bSetCitation)
{
uno::Reference< beans::XPropertySet > xFieldProperties(
xTextField, uno::UNO_QUERY_THROW);
@@ -8479,7 +8476,7 @@ void DomainMapper_Impl::SetFieldResult(OUString const&
rResult)
uno::Any(aValues));
}
}
- else if ( m_bSetDateValue )
+ else if (pContext->m_bSetDateValue)
{
uno::Reference< util::XNumberFormatsSupplier >
xNumberSupplier( m_xTextDocument, uno::UNO_QUERY_THROW );
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 34b178853060..bd6358a6a7e1 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -286,6 +286,11 @@ class FieldContext : public virtual SvRefBase
bool m_bFieldLocked;
// Current command line type: normal or deleted
bool m_bCommandType;
+public:
+ bool m_bSetUserFieldContent = false;
+ bool m_bSetCitation = false;
+ bool m_bSetDateValue = false;
+private:
css::uno::Reference<css::text::XTextField> m_xTextField;
css::uno::Reference<css::text::XFormField> m_xFormField;
@@ -549,9 +554,6 @@ private:
bool m_bForceGenericFields;
/// Type of decimal symbol associated to the document language in Writer
locale definition
bool
m_bIsDecimalComma;
- bool
m_bSetUserFieldContent;
- bool
m_bSetCitation;
- bool
m_bSetDateValue;
bool
m_bIsFirstSection;
bool
m_bStartTOC;
bool
m_bStartTOCHeaderFooter;
