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

[Caolán McNamara]

 sw/source/filter/html/htmltab.cxx |    1 +
 sw/source/filter/ww8/ww8par6.cxx  |   21 ---------------------
 sw/source/ui/fldui/flddok.cxx     |    2 --
 3 files changed, 1 insertion(+), 23 deletions(-)

New commits:
commit cce783997724920d993537bf3be5d7a4ce827a1f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 2 15:02:01 2011 +0000

    Related: rhbz#673952 uninitialized variable

diff --git a/sw/source/filter/html/htmltab.cxx b/sw/source/filter/html/htmltab.cxx
index faf2d5e..2a68d8e 100644
--- a/sw/source/filter/html/htmltab.cxx
+++ b/sw/source/filter/html/htmltab.cxx
@@ -764,6 +764,7 @@ HTMLTableCell::HTMLTableCell():
     bRelWidth( sal_False ),
     bHasNumFmt(sal_False),
     bHasValue(sal_False),
+    bNoWrap(sal_False),
     mbCovered(sal_False)
 {}
 
commit 03d1a6554b09f2608b4cf4f66ab4a4b77329c101
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 2 11:29:28 2011 +0000

    WaE: throw out some warnings

diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index c6cfb15..317c39f 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -4163,10 +4163,6 @@ void SwWW8ImplReader::Read_LineSpace( USHORT, const BYTE* pData, short nLen )
 // bei proportional betraegt er min( 0cm, FontSize*(nFach-1) ) sowohl "vor"
 // wie auch "nach"
 
-    USHORT nWwPre = 0;
-    USHORT nWwPost = 0;
-    USHORT nSwPre = 0;
-    USHORT nSwPost = 0;
     USHORT nSpaceTw = 0;
 
     SvxLineSpacingItem aLSpc( LINE_SPACE_DEFAULT_HEIGHT, RES_PARATR_LINESPACING );
@@ -4181,10 +4177,6 @@ void SwWW8ImplReader::Read_LineSpace( USHORT, const BYTE* pData, short nLen )
         const SvxFontHeightItem* pH = (const SvxFontHeightItem*)
             GetFmtAttr( RES_CHRATR_FONTSIZE );
         nSpaceTw = (USHORT)( n * pH->GetHeight() / 100 );
-
-        if( n > 100 )
-            nWwPost = nSwPre = nSwPost = (USHORT)( ( n - 100 )
-                                                    * pH->GetHeight() / 100 );
     }
     else                            // Fixed / Minimum
     {
@@ -4192,19 +4184,6 @@ void SwWW8ImplReader::Read_LineSpace( USHORT, const BYTE* pData, short nLen )
         nSpaceTw = (USHORT)nSpace;
         aLSpc.SetLineHeight( nSpaceTw );
         aLSpc.GetLineSpaceRule() = eLnSpc;
-        nSwPre = nSpace;
-
-        if( SVX_LINE_SPACE_FIX == eLnSpc )                  // Genau
-        {
-            nWwPre = (USHORT)( 8L * nSpace / 10 );
-            nWwPost = (USHORT)( 2L * nSpace / 10 );
-            nSwPre = nSpace;
-        }
-        else                                                // Minimum
-        {
-            nWwPre = (USHORT)( 129L * nSpace / 100 - 95 );// erst bei groesseren
-                                                          // Zeilenabstaenden
-        }
     }
     NewAttr( aLSpc );
     if( pSFlyPara )
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 2685348..6e80ae7 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -555,7 +555,6 @@ IMPL_LINK( SwFldDokPage, FormatHdl, ListBox *, EMPTYARG )
 
 BOOL SwFldDokPage::FillItemSet(SfxItemSet& )
 {
-    BOOL bPage = FALSE;
     USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
 
     if (nTypeId == USHRT_MAX)
@@ -564,7 +563,6 @@ BOOL SwFldDokPage::FillItemSet(SfxItemSet& )
         if(nPos == LISTBOX_ENTRY_NOTFOUND)
             nPos = 0;
         nTypeId = (USHORT)(ULONG)aSelectionLB.GetEntryData(nPos);
-        bPage = TRUE;
     }
 
     String aVal(aValueED.GetText());