strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

writerfilter: move these members to FieldContext

Browse source 
Change-Id: I7449c7e7bb2a54ca0fdfe2bcb67009f76fbb1d13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163055
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
This commit is contained in:
Michael Stahl 2024-02-06 14:30:58 +01:00
parent e6783f42ae
commit 94f0744648
2 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
writerfilter/source/dmapper/DomainMapper_Impl.cxx
View file

@ -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 );

8
writerfilter/source/dmapper/DomainMapper_Impl.hxx
View file

@ -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;