[ooo-build-commit] .: sw/source
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Sep 14 04:13:05 PDT 2010
sw/source/filter/ww8/wrtw8nds.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 10c10ffa04a952c81e0a85e0606b46e2433705c3
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Tue Sep 14 13:12:33 2010 +0200
win32-vs2005-compat.diff: Fix build with Visual Studio 2005
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index d22decd..81a2bac 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -762,14 +762,14 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, const SwFmtRuby& rRu
/*Get defaults if no formatting on ruby text*/
const SfxItemPool *pPool = rNode.GetSwAttrSet().GetPool();
- const SfxItemPool &rPool = pPool ? *pPool : m_rWW8Export.pDoc->GetAttrPool();
+ pPool = pPool ? pPool : &m_rWW8Export.pDoc->GetAttrPool();
- const SvxFontItem &rFont = DefaultItemGet< SvxFontItem >( rPool,
+ const SvxFontItem &rFont = DefaultItemGet< SvxFontItem >( *pPool,
GetWhichOfScript( RES_CHRATR_FONT,nRubyScript ) );
sFamilyName = rFont.GetFamilyName();
const SvxFontHeightItem &rHeight = DefaultItemGet< SvxFontHeightItem >
- ( rPool, GetWhichOfScript( RES_CHRATR_FONTSIZE, nRubyScript ) );
+ ( *pPool, GetWhichOfScript( RES_CHRATR_FONTSIZE, nRubyScript ) );
nHeight = rHeight.GetHeight();
}
nHeight = (nHeight + 5)/10;
More information about the ooo-build-commit
mailing list