diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2024-02-06 14:30:58 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2024-02-06 15:33:29 +0100 |
| commit | 94f0744648539f1dc4efd42ea55a1e533364ff07 (patch) | |
| tree | 546952b6d25e14b35162ae7fcca60ff8c895fb40 /writerfilter/source/dmapper/DomainMapper_Impl.cxx | |
| parent | e6783f42ae706da76fd347790c15ac3397ce4530 (diff) | |
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.stahl@allotropia.de>
Diffstat (limited to 'writerfilter/source/dmapper/DomainMapper_Impl.cxx')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 23 |
1 files changed, 10 insertions, 13 deletions
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 ); |