diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-07-04 16:54:42 +0200 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-07-04 16:54:42 +0200 |
| commit | 5795edb20e642dad04f572b4fb2c0e86a7d8b6e7 (patch) | |
| tree | 1555df0c320a7e948f7faee69a41f7677056bc90 | |
| parent | c7e4264bed4e77daccf2f72063e5e00f1008c3cf (diff) | |
Fixed bad cherry-pick conflict handling in writerfilter
Change-Id: I4771e198872bbc797df6388af395d7bc14cb2d76
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 871b0cfaf84a..bd9ace150f70 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -3231,11 +3231,11 @@ void DomainMapper_Impl::CloseFieldCommand() uno::Reference< text::XDependentTextField > xDependentField( xFieldInterface, uno::UNO_QUERY_THROW ); xDependentField->attachTextFieldMaster( xMaster ); - rtl::OUString sFormula = sIdentifier + "+1"; + rtl::OUString sFormula = sSeqName + "+1"; rtl::OUString sValue; if( lcl_FindInCommand( pContext->GetCommand(), 'c', sValue )) { - sFormula = sIdentifier; + sFormula = sSeqName; } else if( lcl_FindInCommand( pContext->GetCommand(), 'r', sValue )) { |