[Libreoffice-commits] core.git: sw/source

[Julien Nabet]

 sw/source/core/text/txtfld.cxx |   17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

New commits:
commit 79102024ccbc054c8b76dbc2cd3c9e253e9f3d9e
Author: Julien Nabet <serval2...@yahoo.fr>
Date:   Wed Aug 14 23:51:19 2013 +0200

    Remove bINet and related part
    
    This variable has been always false since the initial import
    
    Change-Id: I7cf61046628aae83bed22f8ba43f999de1e82207

diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index ce50b44..4f65c69 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -79,8 +79,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( 
SwTxtFormatInfo &rInf,
     const sal_Bool bName = rInf.GetOpt().IsFldName();
 
     SwCharFmt* pChFmt = 0;
-    bool bNewFlyPor = false,
-         bINet = false;
+    bool bNewFlyPor = false;
 
     // set language
     ((SwTxtFormatter*)this)->SeekAndChg( rInf );
@@ -257,19 +256,7 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( 
SwTxtFormatInfo &rInf,
         if( !bName )
         {
             pTmpFnt = new SwFont( *pFnt );
-            if( bINet )
-            {
-                SwAttrPool* pPool = pChFmt->GetAttrSet().GetPool();
-                SfxItemSet aSet( *pPool, RES_CHRATR_BEGIN, RES_CHRATR_END );
-                SfxItemSet aTmpSet( aSet );
-                
pFrm->GetTxtNode()->GetAttr(aSet,rInf.GetIdx(),rInf.GetIdx()+1);
-                aTmpSet.Set( pChFmt->GetAttrSet() );
-                aTmpSet.Differentiate( aSet );
-                if( aTmpSet.Count() )
-                    pTmpFnt->SetDiffFnt( &aTmpSet, 
pFrm->GetTxtNode()->getIDocumentSettingAccess() );
-            }
-            else
-                pTmpFnt->SetDiffFnt( &pChFmt->GetAttrSet(), 
pFrm->GetTxtNode()->getIDocumentSettingAccess() );
+            pTmpFnt->SetDiffFnt( &pChFmt->GetAttrSet(), 
pFrm->GetTxtNode()->getIDocumentSettingAccess() );
         }
         {
             String const str( (bName)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits