[Libreoffice-commits] .: svl/source vcl/source

[Caolán McNamara]

 svl/source/items/nranges.cxx |   58 -------------------------------------------
 vcl/source/window/window.cxx |   42 -------------------------------
 2 files changed, 100 deletions(-)

New commits:
commit b7082555914ecfdc4b6bd65ab4d7bda8347518e2
Author: Anders Jonsson <anders.jonsson at norsjonet.se>
Date:   Sat Jan 8 13:52:57 2011 +0100

    Remove unused code

diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx
index 9a086ce..c3f19a0 100644
--- a/svl/source/items/nranges.cxx
+++ b/svl/source/items/nranges.cxx
@@ -595,64 +595,6 @@ SfxNumRanges& SfxNumRanges::operator -=
 
     delete [] pTarget;
     return *this;
-
-    /* untested code from MI commented out (MDA, 28.01.97)
-    do
-    {
-        // 1st range is smaller than 2nd range?
-        if ( pRange1[1] < pRange2[0] )
-            // => keep 1st range
-            pRange1 += 2;
-
-        // 2nd range is smaller than 1st range?
-        else if ( pRange2[1] < pRange1[0] )
-            // => skip 2nd range
-            pRange2 += 2;
-
-        // 2nd range totally overlaps the 1st range?
-        else if ( pRange2[0] <= pRange1[0] && pRange2[1] >= pRange1[1] )
-            // => remove 1st range
-            memmove( pRange1, pRange1+2, sizeof(NUMTYPE) * (pEndOfTarget-pRange1+2) );
-
-        // 2nd range overlaps only the beginning of 1st range?
-        else if ( pRange2[0] <= pRange1[0] && pRange2[1] < pRange1[1] )
-        {
-            // => cut the beginning of 1st range and goto next 2nd range
-            pRange1[0] = pRange2[1] + 1;
-            pRange2 += 2;
-        }
-
-        // 2nd range overlaps only the end of 1st range?
-        else if ( pRange2[0] > pRange1[0] && pRange2[1] >= pRange1[0] )
-            // => cut the beginning of 1st range
-            pRange1[0] = pRange2[1]+1;
-
-        // 2nd range is a real subset of 1st range
-        else
-        {
-            // => split 1st range and goto next 2nd range
-            memmove( pRange1+3, pRange1+1, sizeof(NUMTYPE) * (pEndOfTarget-pRange1-1) );
-            pRange1[1] = pRange2[0] - 1;
-            pRange1[2] = pRange2[1] + 1;
-            pRange1 += 2;
-            pRange2 += 2;
-        }
-    }
-    while ( *pRange1 && *pRange2 );
-
-    // assign the differentiated ranges
-    delete[] _pRanges;
-    NUMTYPE nUShorts = Count_Impl(pTarget) + 1;
-    if ( 1 != nUShorts )
-    {
-        _pRanges = new NUMTYPE[ nUShorts ];
-        memcpy( _pRanges, pTarget, nUShorts * sizeof(NUMTYPE) );
-        _pRanges[ nUShorts-1 ] = 0;
-    }
-    else
-        _pRanges = 0;
-    return *this;
-    */
 }
 
 //------------------------------------------------------------------------
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 7461c95..bd893bf 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -5099,48 +5099,6 @@ long Window::PreNotify( NotifyEvent& rNEvt )
         // #82968# mouse and key events will be notified after processing ( in ImplNotifyKeyMouseCommandEventListeners() )!
         //    see also ImplHandleMouseEvent(), ImplHandleKey()
 
-        /*
-        else if( rNEvt.GetType() == EVENT_MOUSEMOVE )
-        {
-            if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
-            {
-                if ( rNEvt.GetWindow() == this )
-                    ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEMOVE, (void*)rNEvt.GetMouseEvent() );
-                else
-                    ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEMOVE, &ImplTranslateMouseEvent( *rNEvt.GetMouseEvent(), rNEvt.GetWindow(), this ) );
-            }
-        }
-        else if( rNEvt.GetType() == EVENT_MOUSEBUTTONUP )
-        {
-            if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
-            {
-                if ( rNEvt.GetWindow() == this )
-                    ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONUP, (void*)rNEvt.GetMouseEvent() );
-                else
-                    ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONUP, &ImplTranslateMouseEvent( *rNEvt.GetMouseEvent(), rNEvt.GetWindow(), this ) );
-            }
-        }
-        else if( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN )
-        {
-            if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
-            {
-                if ( rNEvt.GetWindow() == this )
-                    ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, (void*)rNEvt.GetMouseEvent() );
-                else
-                    ImplCallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, &ImplTranslateMouseEvent( *rNEvt.GetMouseEvent(), rNEvt.GetWindow(), this ) );
-            }
-        }
-        else if( rNEvt.GetType() == EVENT_KEYINPUT )
-        {
-            if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
-                ImplCallEventListeners( VCLEVENT_WINDOW_KEYINPUT, (void*)rNEvt.GetKeyEvent() );
-        }
-        else if( rNEvt.GetType() == EVENT_KEYUP )
-        {
-            if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) )
-                ImplCallEventListeners( VCLEVENT_WINDOW_KEYUP, (void*)rNEvt.GetKeyEvent() );
-        }
-        */
     }
 
     return bDone;