summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Glazunov <vg@openoffice.org>2010-11-12 10:40:36 +0100
committerVladimir Glazunov <vg@openoffice.org>2010-11-12 10:40:36 +0100
commit6508f9b1af9b253ed6b9a6e28817a856f423c21f (patch)
treeb87fb57bdc77221379e3636075f74699bf9c8f99
parentc6d8a6a5f3464789da530c7ba752c2f52ca6280d (diff)
#i10000# some additional fixes for CWS vmiklos01ooo/DEV300_m93
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx2
-rw-r--r--sw/source/filter/ww8/rtfexport.cxx28
-rw-r--r--sw/source/filter/ww8/wrtw8sty.cxx4
3 files changed, 17 insertions, 17 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index e46083b4b6..09b2bbabcd 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -1388,7 +1388,7 @@ void RtfAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField /*eTyp
m_aRunText.append(m_rExport.OutString(rFldCmd, m_rExport.eCurrentEncoding));
m_aRunText.append("}{" OOO_STRING_SVTOOLS_RTF_FLDRSLT " ");
if (pFld)
- m_aRunText.append(m_rExport.OutString(pFld->GetCntnt(), m_rExport.eDefaultEncoding));
+ m_aRunText.append(m_rExport.OutString(pFld->ExpandField(true), m_rExport.eDefaultEncoding));
m_aRunText.append("}}");
}
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index f4196f98ee..b6192e1027 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -525,10 +525,10 @@ void RtfExport::ExportDocument_Impl()
// protected section in the document.
{
const SfxItemPool& rPool = pDoc->GetAttrPool();
- USHORT nMaxItem = rPool.GetItemCount(RES_PROTECT);
+ USHORT nMaxItem = rPool.GetItemCount2(RES_PROTECT);
for( USHORT n = 0; n < nMaxItem; ++n )
{
- const SvxProtectItem* pProtect = (const SvxProtectItem*)rPool.GetItem(RES_PROTECT, n);
+ const SvxProtectItem* pProtect = (const SvxProtectItem*)rPool.GetItem2(RES_PROTECT, n);
if (pProtect && pProtect->IsCntntProtected())
{
Strm() << OOO_STRING_SVTOOLS_RTF_FORMPROT;
@@ -1008,30 +1008,30 @@ void RtfExport::OutColorTable()
if( 0 != ( pCol = (const SvxColorItem*)rPool.GetPoolDefaultItem(
RES_CHRATR_COLOR ) ))
InsColor( pCol->GetValue() );
- nMaxItem = rPool.GetItemCount(RES_CHRATR_COLOR);
+ nMaxItem = rPool.GetItemCount2(RES_CHRATR_COLOR);
for( n = 0; n < nMaxItem; ++n )
{
- if( 0 != (pCol = (const SvxColorItem*)rPool.GetItem(
+ if( 0 != (pCol = (const SvxColorItem*)rPool.GetItem2(
RES_CHRATR_COLOR, n ) ) )
InsColor( pCol->GetValue() );
}
const SvxUnderlineItem* pUnder = (const SvxUnderlineItem*)GetDfltAttr( RES_CHRATR_UNDERLINE );
InsColor( pUnder->GetColor() );
- nMaxItem = rPool.GetItemCount(RES_CHRATR_UNDERLINE);
+ nMaxItem = rPool.GetItemCount2(RES_CHRATR_UNDERLINE);
for( n = 0; n < nMaxItem;n++)
{
- if( 0 != (pUnder = (const SvxUnderlineItem*)rPool.GetItem( RES_CHRATR_UNDERLINE, n ) ) )
+ if( 0 != (pUnder = (const SvxUnderlineItem*)rPool.GetItem2( RES_CHRATR_UNDERLINE, n ) ) )
InsColor( pUnder->GetColor() );
}
const SvxOverlineItem* pOver = (const SvxOverlineItem*)GetDfltAttr( RES_CHRATR_OVERLINE );
InsColor( pOver->GetColor() );
- nMaxItem = rPool.GetItemCount(RES_CHRATR_OVERLINE);
+ nMaxItem = rPool.GetItemCount2(RES_CHRATR_OVERLINE);
for( n = 0; n < nMaxItem;n++)
{
- if( 0 != (pOver = (const SvxOverlineItem*)rPool.GetItem( RES_CHRATR_OVERLINE, n ) ) )
+ if( 0 != (pOver = (const SvxOverlineItem*)rPool.GetItem2( RES_CHRATR_OVERLINE, n ) ) )
InsColor( pOver->GetColor() );
}
@@ -1051,9 +1051,9 @@ void RtfExport::OutColorTable()
{
InsColor( pBkgrd->GetColor() );
}
- nMaxItem = rPool.GetItemCount( *pIds );
+ nMaxItem = rPool.GetItemCount2( *pIds );
for( n = 0; n < nMaxItem; ++n )
- if( 0 != (pBkgrd = (const SvxBrushItem*)rPool.GetItem(
+ if( 0 != (pBkgrd = (const SvxBrushItem*)rPool.GetItem2(
*pIds , n ) ))
{
InsColor( pBkgrd->GetColor() );
@@ -1070,9 +1070,9 @@ void RtfExport::OutColorTable()
{
InsColor( pShadow->GetColor() );
}
- nMaxItem = rPool.GetItemCount(RES_SHADOW);
+ nMaxItem = rPool.GetItemCount2(RES_SHADOW);
for( n = 0; n < nMaxItem; ++n )
- if( 0 != (pShadow = (const SvxShadowItem*)rPool.GetItem(
+ if( 0 != (pShadow = (const SvxShadowItem*)rPool.GetItem2(
RES_SHADOW, n ) ) )
{
InsColor( pShadow->GetColor() );
@@ -1085,9 +1085,9 @@ void RtfExport::OutColorTable()
if( 0 != ( pBox = (const SvxBoxItem*)rPool.GetPoolDefaultItem(
RES_BOX ) ))
InsColorLine( *pBox );
- nMaxItem = rPool.GetItemCount(RES_BOX);
+ nMaxItem = rPool.GetItemCount2(RES_BOX);
for( n = 0; n < nMaxItem; ++n )
- if( 0 != (pBox = (const SvxBoxItem*)rPool.GetItem( RES_BOX, n ) ))
+ if( 0 != (pBox = (const SvxBoxItem*)rPool.GetItem2( RES_BOX, n ) ))
InsColorLine( *pBox );
}
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index 5d0cc8db0a..8a8b12ceb6 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -784,9 +784,9 @@ void wwFontHelper::InitFontTable(bool bWrtWW8,const SwDoc& rDoc)
const USHORT aTypes[] = { RES_CHRATR_FONT, RES_CHRATR_CJK_FONT, RES_CHRATR_CTL_FONT, 0 };
for (const USHORT* pId = aTypes; *pId; ++pId)
{
- USHORT nMaxItem = rPool.GetItemCount( *pId );
+ USHORT nMaxItem = rPool.GetItemCount2( *pId );
for( USHORT nGet = 0; nGet < nMaxItem; ++nGet )
- if( 0 != (pFont = (const SvxFontItem*)rPool.GetItem(
+ if( 0 != (pFont = (const SvxFontItem*)rPool.GetItem2(
*pId, nGet )) )
{
GetId(wwFont(pFont->GetFamilyName(), pFont->GetPitch(),