writerfilter/source/dmapper/NumberingManager.cxx | 51 +++++++++++++----------
1 file changed, 30 insertions(+), 21 deletions(-)
New commits:
commit 469430a7d36fc1e860b4b68137261ec0833386c0
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Feb 6 21:12:48 2018 +0000
rtf: null-deref
Change-Id: I9c4510cb91e2572a3ab2b62497dc4dd9fd1119c8
Reviewed-on: https://gerrit.libreoffice.org/49319
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx
b/writerfilter/source/dmapper/NumberingManager.cxx
index 2e5794c31495..b406c44a6152 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -863,6 +863,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
}
break;
case NS_ooxml::LN_CT_Lvl_lvlPicBulletId:
+ if (ListLevel::Pointer pCurrentLevel =
m_pCurrentDefinition->GetCurrentLevel())
{
uno::Reference<drawing::XShape> xShape;
for (std::vector<NumPicBullet::Pointer>::iterator it =
m_aNumPicBullets.begin(); it != m_aNumPicBullets.end(); ++it)
@@ -879,15 +880,15 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
try
{
uno::Any aAny =
xPropertySet->getPropertyValue("GraphicURL");
- if (aAny.has<OUString>())
-
m_pCurrentDefinition->GetCurrentLevel()->SetGraphicURL(aAny.get<OUString>());
+ if (aAny.has<OUString>() && pCurrentLevel)
+ pCurrentLevel->SetGraphicURL(aAny.get<OUString>());
} catch(const beans::UnknownPropertyException&)
{}
try
{
uno::Reference< graphic::XGraphic > gr;
xPropertySet->getPropertyValue("Bitmap") >>= gr;
-
m_pCurrentDefinition->GetCurrentLevel()->SetGraphicBitmap( gr );
+ pCurrentLevel->SetGraphicBitmap( gr );
} catch(const beans::UnknownPropertyException&)
{}
@@ -902,12 +903,12 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
int nWidth = (nHeight * aPrefSize.Width) /
aPrefSize.Height;
awt::Size aSize( convertMm100ToTwip(nWidth),
convertMm100ToTwip(nHeight) );
-
m_pCurrentDefinition->GetCurrentLevel()->SetGraphicSize( aSize );
+ pCurrentLevel->SetGraphicSize( aSize );
}
else
{
awt::Size aSize( convertMm100ToTwip(aPrefSize.Width),
convertMm100ToTwip(aPrefSize.Height) );
-
m_pCurrentDefinition->GetCurrentLevel()->SetGraphicSize( aSize );
+ pCurrentLevel->SetGraphicSize( aSize );
}
}
}
@@ -938,26 +939,26 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
}
break;
case NS_ooxml::LN_CT_Lvl_start:
- if (m_pCurrentDefinition->GetCurrentLevel().get())
- m_pCurrentDefinition->GetCurrentLevel( )->SetValue(
nSprmId, nIntValue );
+ if (ListLevel::Pointer pCurrentLevel =
m_pCurrentDefinition->GetCurrentLevel())
+ pCurrentLevel->SetValue( nSprmId, nIntValue );
bIsStartVisited = true;
break;
case NS_ooxml::LN_CT_Lvl_numFmt:
case NS_ooxml::LN_CT_Lvl_isLgl:
case NS_ooxml::LN_CT_Lvl_legacy:
- if (m_pCurrentDefinition->GetCurrentLevel().get())
+ if (ListLevel::Pointer pCurrentLevel =
m_pCurrentDefinition->GetCurrentLevel())
{
- m_pCurrentDefinition->GetCurrentLevel( )->SetValue(
nSprmId, nIntValue );
+ pCurrentLevel->SetValue( nSprmId, nIntValue );
if( !bIsStartVisited )
{
- m_pCurrentDefinition->GetCurrentLevel( )->SetValue(
NS_ooxml::LN_CT_Lvl_start, 0 );
+ pCurrentLevel->SetValue( NS_ooxml::LN_CT_Lvl_start, 0
);
bIsStartVisited = true;
}
}
break;
case NS_ooxml::LN_CT_Lvl_suff:
{
- if (m_pCurrentDefinition->GetCurrentLevel().get())
+ if (ListLevel::Pointer pCurrentLevel =
m_pCurrentDefinition->GetCurrentLevel())
{
SvxNumberFormat::LabelFollowedBy value =
SvxNumberFormat::LISTTAB;
if( rSprm.getValue()->getString() == "tab" )
@@ -969,7 +970,7 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
else
SAL_WARN( "writerfilter", "Unknown ST_LevelSuffix
value "
<< rSprm.getValue()->getString());
- m_pCurrentDefinition->GetCurrentLevel()->SetValue(
nSprmId, value );
+ pCurrentLevel->SetValue( nSprmId, value );
}
}
break;
@@ -1006,11 +1007,15 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
nValue = text::HoriOrientation::RIGHT;
break;
}
+
if (nValue != text::HoriOrientation::NONE)
{
- m_pCurrentDefinition->GetCurrentLevel( )->Insert(
- PROP_ADJUST, uno::makeAny( nValue ) );
- writerfilter::Reference<Properties>::Pointer_t
pProperties = rSprm.getProps();
+ if (ListLevel::Pointer pLevel =
m_pCurrentDefinition->GetCurrentLevel())
+ {
+ pLevel->Insert(
+ PROP_ADJUST, uno::makeAny( nValue ) );
+ writerfilter::Reference<Properties>::Pointer_t
pProperties = rSprm.getProps();
+ }
}
}
break;
@@ -1034,10 +1039,12 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
case NS_ooxml::LN_CT_Lvl_pStyle:
{
OUString sStyleName = rSprm.getValue( )->getString( );
- ListLevel::Pointer pLevel =
m_pCurrentDefinition->GetCurrentLevel( );
- StyleSheetTablePtr pStylesTable =
m_rDMapper.GetStyleSheetTable( );
- const StyleSheetEntryPtr pStyle =
pStylesTable->FindStyleSheetByISTD( sStyleName );
- pLevel->SetParaStyle( pStyle );
+ if (ListLevel::Pointer pLevel =
m_pCurrentDefinition->GetCurrentLevel())
+ {
+ StyleSheetTablePtr pStylesTable =
m_rDMapper.GetStyleSheetTable( );
+ const StyleSheetEntryPtr pStyle =
pStylesTable->FindStyleSheetByISTD( sStyleName );
+ pLevel->SetParaStyle( pStyle );
+ }
}
break;
case NS_ooxml::LN_CT_Num_lvlOverride:
@@ -1052,9 +1059,11 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
if(m_pCurrentDefinition)
{
if (ListLevel::Pointer pCurrentLevel =
m_pCurrentDefinition->GetCurrentLevel())
+ {
// <w:num> -> <w:lvlOverride> -> <w:startOverride> is
the non-abstract equivalent of
// <w:abstractNum> -> <w:lvl> -> <w:start>
pCurrentLevel->SetValue(NS_ooxml::LN_CT_Lvl_start,
nIntValue);
+ }
}
}
break;
@@ -1072,9 +1081,9 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
case NS_ooxml::LN_EG_RPrBase_eastAsianLayout:
//no break!
default:
- if( m_pCurrentDefinition->GetCurrentLevel( ).get())
+ if (ListLevel::Pointer pCurrentLevel =
m_pCurrentDefinition->GetCurrentLevel())
{
- m_rDMapper.PushListProperties(
m_pCurrentDefinition->GetCurrentLevel( ) );
+ m_rDMapper.PushListProperties(pCurrentLevel);
m_rDMapper.sprm( rSprm );
m_rDMapper.PopListProperties();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
