[Libreoffice-commits] .: 4 commits - svtools/source toolkit/source vcl/source

[David Tardon]

 svtools/source/edit/editsyntaxhighlighter.cxx |    2 +-
 toolkit/source/awt/vclxtabcontrol.cxx         |    4 ----
 vcl/source/fontsubset/cff.cxx                 |    4 ++++
 vcl/source/window/taskpanelist.cxx            |   18 ------------------
 4 files changed, 5 insertions(+), 23 deletions(-)

New commits:
commit 44a2e28beb33697b54482f163041e2a8e1dae071
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jan 25 12:29:43 2011 +0100

    WaE: remove unused variable

diff --git a/toolkit/source/awt/vclxtabcontrol.cxx b/toolkit/source/awt/vclxtabcontrol.cxx
index d1022cd..3460661 100644
--- a/toolkit/source/awt/vclxtabcontrol.cxx
+++ b/toolkit/source/awt/vclxtabcontrol.cxx
@@ -331,7 +331,6 @@ void SAL_CALL VCLXTabControl::allocateArea (awt::Rectangle const &area)
     if (requestedSize.Height < pageBasedSize.Height)
         requestedSize.Height = pageBasedSize.Height + hc;
 
-    Size windowSize = GetWindow()->GetSizePixel();
     Window *parent = GetWindow()->GetParent();
     Size parentSize = parent->GetSizePixel();
 
@@ -344,9 +343,6 @@ void SAL_CALL VCLXTabControl::allocateArea (awt::Rectangle const &area)
     OSL_TRACE ("%s: minimum: %d, %d", __FUNCTION__, minimumSize.Width, minimumSize.Height );
     OSL_TRACE ("%s: requestedSize: %d, %d", __FUNCTION__, requestedSize.Width, requestedSize.Height );
     OSL_TRACE ("%s: pageBasedSize: %d, %d", __FUNCTION__, pageBasedSize.Width, pageBasedSize.Height );
-
-    //OSL_TRACE ("%s: parent: %d, %d", __FUNCTION__, parentSize.Width(), parentSize.Height() );
-    //OSL_TRACE ("%s: window: %d, %d", __FUNCTION__, windowSize.Width(), windowSize.Height() );
 #endif
 
     //bRealized = false;
commit 7b468b63480f565df0b13843e0ae2b9863f67a84
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jan 25 12:28:27 2011 +0100

    WaE: unused variables

diff --git a/vcl/source/window/taskpanelist.cxx b/vcl/source/window/taskpanelist.cxx
index 2745515..a65e824 100644
--- a/vcl/source/window/taskpanelist.cxx
+++ b/vcl/source/window/taskpanelist.cxx
@@ -108,26 +108,8 @@ TaskPaneList::~TaskPaneList()
 
 void TaskPaneList::AddWindow( Window *pWindow )
 {
-#if OSL_DEBUG_LEVEL > 0
-    bool bDockingWindow=false;
-    bool bToolbox=false;
-    bool bDialog=false;
-    bool bUnknown=false;
-#endif
-
     if( pWindow )
     {
-#if OSL_DEBUG_LEVEL > 0
-        if( pWindow->GetType() == RSC_DOCKINGWINDOW )
-            bDockingWindow = true;
-        else if( pWindow->GetType() == RSC_TOOLBOX )
-            bToolbox = true;
-        else if( pWindow->IsDialog() )
-            bDialog = true;
-        else
-            bUnknown = true;
-#endif
-
         ::std::vector< Window* >::iterator insertionPos = mTaskPanes.end();
         for ( ::std::vector< Window* >::iterator p = mTaskPanes.begin();
               p != mTaskPanes.end();
commit d06a2dd024d69dec873f1a59adbf7d5b372c39a1
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jan 25 12:27:20 2011 +0100

    WaE: unused variables

diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 96581da..e1d4d84 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -1751,7 +1751,9 @@ int CffSubsetterContext::getFDSelect( int nGlyphIndex) const
                 const U16 nRangeCount = (pReadPtr[0]<<8) + pReadPtr[1];
                 assert( nRangeCount > 0);
                 assert( nRangeCount <= mnCharStrCount);
+#ifndef NDEBUG
                 U16 nPrev = (pReadPtr[2]<<8) + pReadPtr[3];
+#endif
                 assert( nPrev == 0);
                 (void)nPrev;
                 pReadPtr += 4;
@@ -1763,7 +1765,9 @@ int CffSubsetterContext::getFDSelect( int nGlyphIndex) const
                     if( nGlyphIndex < nNext)
                         return nFDIdx;
                     pReadPtr += 3;
+#ifndef NDEBUG
                     nPrev = nNext;
+#endif
                 }
             } break;
         default:	// invalid FDselect format
commit 2a5464654183ffc92e69c3669550350d7e516d40
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Jan 25 12:22:07 2011 +0100

    WaE: remove unused variable

diff --git a/svtools/source/edit/editsyntaxhighlighter.cxx b/svtools/source/edit/editsyntaxhighlighter.cxx
index f515c75..e6c9dad 100644
--- a/svtools/source/edit/editsyntaxhighlighter.cxx
+++ b/svtools/source/edit/editsyntaxhighlighter.cxx
@@ -189,7 +189,7 @@ void MultiLineEditSyntaxHighlight::UpdateData()
     for (unsigned int nLine=0; nLine < GetTextEngine()->GetParagraphCount(); nLine++)
     {
         String aLine( GetTextEngine()->GetText( nLine ) );
-        Range aChanges = aHighlighter.notifyChange( nLine, 0, &aLine, 1 );
+        aHighlighter.notifyChange( nLine, 0, &aLine, 1 );
             
         GetTextEngine()->RemoveAttribs( nLine, TRUE );
         HighlightPortions aPortions;