[Libreoffice-commits] .: 3 commits - svx/source ucb/source

[Caolán McNamara]

 svx/source/dialog/fntctrl.cxx   |    2 +-
 svx/source/tbxctrls/layctrl.cxx |    4 ++--
 ucb/source/ucp/gio/ucpgio.xml   |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 76fe041eba05363ce0bbf02ba5941a6ef1ca9d1e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 24 12:18:03 2010 +0000

    xmllint: bad entity name

diff --git a/ucb/source/ucp/gio/ucpgio.xml b/ucb/source/ucp/gio/ucpgio.xml
index 421d5e5..dc3cf2b 100644
--- a/ucb/source/ucp/gio/ucpgio.xml
+++ b/ucb/source/ucp/gio/ucpgio.xml
@@ -8,7 +8,7 @@
 
     <component-description>
         <author>
-            Caolán McNamara &;amp; Jan Navrati
+            Caolán McNamara &amp; Jan Navrati
         </author>
         <name>
             com.sun.star.comp.ucb.GIOContentProvider
commit b6c9d165924a4ed1db9c529216d1e750395dbec1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 24 11:42:54 2010 +0000

    cppcheck: The scope of these variables can be reduced

diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index e5a5ec7..390a5cd 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -515,8 +515,6 @@ void ColumnsWindow::MouseMove( const MouseEvent& rMEvt )
 void ColumnsWindow::UpdateSize_Impl( long nNewCol )
 {
     Size    aWinSize = GetOutputSizePixel();
-    long    nMinCol = 0;
-    long    nMaxCol = 0;
     Point   aWinPos;// = GetPosPixel();
 
     if ( nWidth <= nNewCol )
@@ -547,6 +545,8 @@ void ColumnsWindow::UpdateSize_Impl( long nNewCol )
         Invalidate( Rectangle( 0, aWinSize.Height()-nTextHeight+2,
                                aWinSize.Width(), aWinSize.Height() ) );
 
+        long nMinCol = 0, nMaxCol = 0;
+
         if ( nNewCol < nCol )
         {
             nMinCol = nNewCol;
commit 8fd524c62000e30d52a358de652ddf373eb8c352
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Nov 24 11:39:55 2010 +0000

    cppcheck: Member variable not initialized in the constructor

diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index b22ba53..8aa54ea 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -147,7 +147,7 @@ class FontPrevWin_Impl
 public:
     inline FontPrevWin_Impl() :
         pPrinter( NULL ), bDelPrinter( FALSE ),
-        pColor( NULL ), pBackColor( 0 ), 
+        pColor( NULL ), pBackColor( 0 ), nAscent( 0 ),
         cStartBracket( 0 ), cEndBracket( 0 ), nFontWidthScale( 100 ),
         bSelection( FALSE ), bGetSelection( FALSE ), bUseResText( FALSE ),
         bTwoLines( FALSE ),