diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2011-11-21 00:03:42 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2011-11-21 00:16:41 +0100 |
| commit | 3ece03f3d4b139bbe8e153111a0ff38781d27922 (patch) | |
| tree | 63b7a4fa88e5e8f710703de6bc6117ee8ef2308e /writerfilter | |
| parent | 25ade2f357f1cedf76919f61ae8d81fda7bdf88d (diff) | |
Related: i#93039 fix RTF import of MACROBUTTON fields
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index df4785815c7b..1c99ce2c7ad5 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -2678,11 +2678,12 @@ void DomainMapper_Impl::CloseFieldCommand() //extract macro name sal_Int32 nIndex = sizeof(" MACROBUTTON "); ::rtl::OUString sMacro = pContext->GetCommand().getToken( 0, ' ', nIndex); - xFieldProperties->setPropertyValue( - rPropNameSupplier.GetName(PROP_MACRO_NAME), uno::makeAny( sMacro )); + if (xFieldProperties.is()) + xFieldProperties->setPropertyValue( + rPropNameSupplier.GetName(PROP_MACRO_NAME), uno::makeAny( sMacro )); //extract quick help text - if( pContext->GetCommand().getLength() > nIndex + 1) + if(xFieldProperties.is() && pContext->GetCommand().getLength() > nIndex + 1) { xFieldProperties->setPropertyValue( rPropNameSupplier.GetName(PROP_HINT), |