[Libreoffice-commits] .: 2 commits - sw/source

[Miklos Vajna]

 sw/source/core/unocore/unotext.cxx          |    4 ++--
 sw/source/filter/ww8/rtfattributeoutput.cxx |    8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit f3a91be5fcdcb70ea64fc439d2b2aa4e6a19e421
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Sun Feb 5 14:46:25 2012 +0100

    SwXText::convertToTextFrame: pSartTableNode -> pStartTableNode

diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index db82b18..00c7e09 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1603,8 +1603,8 @@ throw (lang::IllegalArgumentException, uno::RuntimeException)
         // remove the addtional paragraphs in the end
         if (pStartStartNode->GetStartNodeType() == SwTableBoxStartNode)
         {
-            SwTableNode *const pSartTableNode(pStartStartNode->FindTableNode());
-            const SwNodeIndex aTblIdx(  *pSartTableNode, -1 );
+            SwTableNode *const pStartTableNode(pStartStartNode->FindTableNode());
+            const SwNodeIndex aTblIdx(  *pStartTableNode, -1 );
             SwPosition aBefore(aTblIdx);
             bParaBeforeInserted = GetDoc()->AppendTxtNode( aBefore );
             aStartPam.DeleteMark();
commit 7b2ba001768b5edbdd738a2a38508c0a30ab1838
Author: Miklos Vajna <vmiklos at frugalware.org>
Date:   Tue Feb 7 09:33:29 2012 +0100

    RtfAttributeOutput: use the new SfxItemSet::HasItem()

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 8ae42ed..66048cc 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -648,7 +648,7 @@ void RtfAttributeOutput::TableDefaultBorders( ww8::WW8TableNodeInfoInner::Pointe
     SwWriteTableCell *pCell = pRow->GetCells( )[ pTableTextNodeInfoInner->getCell( ) ];
     const SwFrmFmt *pCellFmt = pCell->GetBox()->GetFrmFmt();
     const SfxPoolItem* pItem;
-    if (SFX_ITEM_SET == pCellFmt->GetAttrSet().GetItemState(RES_BOX, sal_True, &pItem))
+    if (pCellFmt->GetAttrSet().HasItem(RES_BOX, pItem))
     {
         const SvxBoxItem& rBox = (SvxBoxItem&)*pItem;
         static const sal_uInt16 aBorders[] =
@@ -694,8 +694,7 @@ void RtfAttributeOutput::TableBackgrounds( ww8::WW8TableNodeInfoInner::Pointer_t
     SwWriteTableCell *pCell = pRow->GetCells( )[ pTableTextNodeInfoInner->getCell( ) ];
     const SwFrmFmt *pCellFmt = pCell->GetBox()->GetFrmFmt();
     const SfxPoolItem* pItem;
-    if( SFX_ITEM_SET == pCellFmt->GetAttrSet().GetItemState(
-                RES_BACKGROUND, sal_True, &pItem ))
+    if (pCellFmt->GetAttrSet().HasItem(RES_BACKGROUND, pItem))
     {
         const SvxBrushItem& rBack = (SvxBrushItem&)*pItem;
         if( !rBack.GetColor().GetTransparency() )
@@ -778,8 +777,7 @@ void RtfAttributeOutput::TableVerticalCell( ww8::WW8TableNodeInfoInner::Pointer_
         m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CLVMRG);
 
     // vertical alignment
-    if( SFX_ITEM_SET == pCellFmt->GetAttrSet().GetItemState(
-                RES_VERT_ORIENT, sal_True, &pItem ) )
+    if (pCellFmt->GetAttrSet().HasItem(RES_VERT_ORIENT, pItem))
         switch( ((SwFmtVertOrient*)pItem)->GetVertOrient() )
         {
             case text::VertOrientation::CENTER: m_aRowDefs.append(OOO_STRING_SVTOOLS_RTF_CLVERTALC); break;