writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 5795edb20e642dad04f572b4fb2c0e86a7d8b6e7
Author: Cédric Bosdonnat <cedric.bosdon...@free.fr>
Date: Thu Jul 4 16:54:42 2013 +0200
Fixed bad cherry-pick conflict handling in writerfilter
Change-Id: I4771e198872bbc797df6388af395d7bc14cb2d76
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 871b0cf..bd9ace1 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 ))
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
