Kaydet (Commit) b1166d7b authored tarafından Caolán McNamara's avatar Caolán McNamara

de-trainwreck if statement

 if( 0 != (pINetFmt = static_cast<const SwFmtINetFmt*>(rDoc.GetAttrPool().GetItem2(
     RES_TXTATR_INETFMT, n ) ) ) &&
     0 != ( pTxtAttr = pINetFmt->GetTxtINetFmt()) &&
     0 != ( pTxtNd = pTxtAttr->GetpTxtNode() ) &&
     pTxtNd->GetNodes().IsDocNodes() )

Change-Id: I3420be28c5c6d92b9532dbfaa1e0d1afa297bd87
üst 44b352c8
...@@ -1992,11 +1992,10 @@ static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, sal_Int32 nR ...@@ -1992,11 +1992,10 @@ static sal_uInt16 lcl_TCFlags(SwDoc &rDoc, const SwTableBox * pBox, sal_Int32 nR
{ {
SfxItemSet aCoreSet(rDoc.GetAttrPool(), RES_CHRATR_ROTATE, RES_CHRATR_ROTATE); SfxItemSet aCoreSet(rDoc.GetAttrPool(), RES_CHRATR_ROTATE, RES_CHRATR_ROTATE);
static_cast<const SwTxtNode*>(pCNd)->GetAttr( aCoreSet, 0, static_cast<const SwTxtNode*>(pCNd)->GetTxt().getLength()); static_cast<const SwTxtNode*>(pCNd)->GetAttr( aCoreSet, 0, static_cast<const SwTxtNode*>(pCNd)->GetTxt().getLength());
const SvxCharRotateItem * pRotate = NULL;
const SfxPoolItem * pRotItem; const SfxPoolItem * pRotItem;
if ( SfxItemState::SET == aCoreSet.GetItemState(RES_CHRATR_ROTATE, true, &pRotItem)) if ( SfxItemState::SET == aCoreSet.GetItemState(RES_CHRATR_ROTATE, true, &pRotItem))
{ {
pRotate = static_cast<const SvxCharRotateItem*>(pRotItem); const SvxCharRotateItem * pRotate = static_cast<const SvxCharRotateItem*>(pRotItem);
if(pRotate && pRotate->GetValue() == 900) if(pRotate && pRotate->GetValue() == 900)
{ {
nFlags = nFlags | 0x0004 | 0x0008; nFlags = nFlags | 0x0004 | 0x0008;
...@@ -2941,43 +2940,45 @@ void MSWordExportBase::AddLinkTarget(const OUString& rURL) ...@@ -2941,43 +2940,45 @@ void MSWordExportBase::AddLinkTarget(const OUString& rURL)
void MSWordExportBase::CollectOutlineBookmarks(const SwDoc &rDoc) void MSWordExportBase::CollectOutlineBookmarks(const SwDoc &rDoc)
{ {
const SwFmtINetFmt* pINetFmt; sal_uInt32 nMaxItems = rDoc.GetAttrPool().GetItemCount2(RES_TXTATR_INETFMT);
const SwTxtINetFmt* pTxtAttr; for (sal_uInt32 n = 0; n < nMaxItems; ++n)
const SwTxtNode* pTxtNd;
sal_uInt32 n, nMaxItems = rDoc.GetAttrPool().GetItemCount2( RES_TXTATR_INETFMT );
for( n = 0; n < nMaxItems; ++n )
{ {
if( 0 != (pINetFmt = static_cast<const SwFmtINetFmt*>(rDoc.GetAttrPool().GetItem2( const SwFmtINetFmt* pINetFmt = static_cast<const SwFmtINetFmt*>(rDoc.GetAttrPool().GetItem2(RES_TXTATR_INETFMT, n));
RES_TXTATR_INETFMT, n ) ) ) && if (!pINetFmt)
0 != ( pTxtAttr = pINetFmt->GetTxtINetFmt()) && continue;
0 != ( pTxtNd = pTxtAttr->GetpTxtNode() ) &&
pTxtNd->GetNodes().IsDocNodes() ) const SwTxtINetFmt* pTxtAttr = pINetFmt->GetTxtINetFmt();
{ if (!pTxtAttr)
AddLinkTarget( pINetFmt->GetValue() ); continue;
}
const SwTxtNode* pTxtNd = pTxtAttr->GetpTxtNode();
if (!pTxtNd)
continue;
if (!pTxtNd->GetNodes().IsDocNodes())
continue;
AddLinkTarget( pINetFmt->GetValue() );
} }
const SwFmtURL *pURL;
nMaxItems = rDoc.GetAttrPool().GetItemCount2( RES_URL ); nMaxItems = rDoc.GetAttrPool().GetItemCount2( RES_URL );
for( n = 0; n < nMaxItems; ++n ) for (sal_uInt32 n = 0; n < nMaxItems; ++n)
{ {
if( 0 != (pURL = static_cast<const SwFmtURL*>(rDoc.GetAttrPool().GetItem2( const SwFmtURL *pURL = static_cast<const SwFmtURL*>(rDoc.GetAttrPool().GetItem2(RES_URL, n));
RES_URL, n ) ) ) ) if (!pURL)
continue;
AddLinkTarget(pURL->GetURL());
const ImageMap *pIMap = pURL->GetMap();
if (!pIMap)
continue;
for (sal_uInt16 i=0; i < pIMap->GetIMapObjectCount(); ++i)
{ {
AddLinkTarget( pURL->GetURL() ); const IMapObject* pObj = pIMap->GetIMapObject(i);
const ImageMap *pIMap = pURL->GetMap(); if (!pObj)
if( pIMap ) continue;
{ AddLinkTarget( pObj->GetURL() );
for( sal_uInt16 i=0; i<pIMap->GetIMapObjectCount(); i++ )
{
const IMapObject* pObj = pIMap->GetIMapObject( i );
if( pObj )
{
AddLinkTarget( pObj->GetURL() );
}
}
}
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment