mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Werror=uninitialized

Browse Source 
Change-Id: I3ad9cad8a19eceec1b6a86a0210f4a6d0fa9bf0b
This commit is contained in:
Miklos Vajna
2013-12-05 09:16:22 +01:00
parent eb45c69b64
commit e82f6024f3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sw/source/filter/ww8/wrtw8nds.cxx
View File

@@ -393,7 +393,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
const SvxFontItem &rParentFont = ItemGet<SvxFontItem>( const SvxFontItem &rParentFont = ItemGet<SvxFontItem>(
(const SwTxtFmtColl&)rNd.GetAnyFmtColl(), nFontId); (const SwTxtFmtColl&)rNd.GetAnyFmtColl(), nFontId);
const SvxFontItem *pFont = &rParentFont; const SvxFontItem *pFont = &rParentFont;
const SfxPoolItem *aGrabBag; const SfxPoolItem *pGrabBag = 0;
SfxItemSet aExportSet(*rNd.GetSwAttrSet().GetPool(), SfxItemSet aExportSet(*rNd.GetSwAttrSet().GetPool(),
RES_CHRATR_BEGIN, RES_TXTATR_END - 1); RES_CHRATR_BEGIN, RES_TXTATR_END - 1);
@@ -438,7 +438,7 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
if (nWhichId == nFontId) if (nWhichId == nFontId)
pFont = &(item_cast<SvxFontItem>(*pItem)); pFont = &(item_cast<SvxFontItem>(*pItem));
else if (nWhichId == RES_CHRATR_GRABBAG) else if (nWhichId == RES_CHRATR_GRABBAG)
aGrabBag = pItem; pGrabBag = pItem;
else else
aRangeItems[nWhichId] = pItem; aRangeItems[nWhichId] = pItem;
} }
@@ -515,7 +515,8 @@ void SwWW8AttrIter::OutAttr( sal_Int32 nSwPos, bool bRuby )
} }
// Output grab bag attributes // Output grab bag attributes
m_rExport.AttrOutput().OutputItem( *aGrabBag ); if (pGrabBag)
m_rExport.AttrOutput().OutputItem( *pGrabBag );
} }
void SwWW8AttrIter::OutFlys(sal_Int32 nSwPos) void SwWW8AttrIter::OutFlys(sal_Int32 nSwPos)