[Libreoffice-commits] .: 3 commits - vcl/inc vcl/source

Thorsten Behrens thorsten at kemper.freedesktop.org
Thu Dec 9 15:47:08 PST 2010


 vcl/inc/vcl/tabpage.hxx       |    2 
 vcl/inc/vcl/window.hxx        |    1 
 vcl/source/gdi/outmap.cxx     |   87 ------------------------------------------
 vcl/source/window/tabpage.cxx |    9 ----
 vcl/source/window/window.cxx  |   11 -----
 5 files changed, 110 deletions(-)

New commits:
commit 7bf47170db1b9b4451a23d1e0c8a52391ef5886f
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Dec 9 23:01:09 2010 +0100

    Cleanup: removed unused method

diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx
index 32c5621..e85e6dc 100644
--- a/vcl/inc/vcl/window.hxx
+++ b/vcl/inc/vcl/window.hxx
@@ -700,7 +700,6 @@ public:
     void                SetZoomedPointFont( const Font& rFont );
     long                GetDrawPixel( OutputDevice* pDev, long nPixels ) const;
     Font                GetDrawPixelFont( OutputDevice* pDev ) const;
-    void                GetFontResolution( sal_Int32& nDPIX, sal_Int32& nDPIY ) const;
 
     void                SetControlFont();
     void                SetControlFont( const Font& rFont );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 1ecd97d..82665be 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -5977,17 +5977,6 @@ Font Window::GetPointFont() const
 
 // -----------------------------------------------------------------------
 
-// TODO: remove in next incompatible build
-void Window::GetFontResolution( sal_Int32& nDPIX, sal_Int32& nDPIY ) const
-{
-    DBG_CHKTHIS( Window, ImplDbgCheckWindow );
-
-    nDPIX = mpWindowImpl->mpFrameData->mnDPIX;
-    nDPIY = mpWindowImpl->mpFrameData->mnDPIY;
-}
-
-// -----------------------------------------------------------------------
-
 void Window::SetParentClipMode( USHORT nMode )
 {
     DBG_CHKTHIS( Window, ImplDbgCheckWindow );
commit c5bcf5b7fdd7cf1c2d398b234b2e0064bbb52bad
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Dec 9 22:59:28 2010 +0100

    Cleanup: removed no-op virtual function

diff --git a/vcl/inc/vcl/tabpage.hxx b/vcl/inc/vcl/tabpage.hxx
index bececc3..c68ec51 100644
--- a/vcl/inc/vcl/tabpage.hxx
+++ b/vcl/inc/vcl/tabpage.hxx
@@ -56,8 +56,6 @@ public:
 
     virtual void	ActivatePage();
     virtual void	DeactivatePage();
-
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible();
 };
 
 #endif	// _SV_TABPAGE_HXX
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 9319f1b..aa4effd 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -205,13 +205,4 @@ void TabPage::DeactivatePage()
 {
 }
 
-// -----------------------------------------------------------------------
-
-::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > TabPage::CreateAccessible()
-{
-    // TODO: remove this method (incompatible)
-
-    return Window::CreateAccessible();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit edb301cf7c211c5dcc03d5461ade0e322ebba37d
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Dec 9 22:46:47 2010 +0100

    Removed dead code - old BigInt-based MapMode

diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index 41ce5e1..210cac2 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.cxx
@@ -52,8 +52,6 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 
-#define USE_64BIT_INTS
-
 // =======================================================================
 
 DBG_NAMEEX( OutputDevice )
@@ -174,12 +172,10 @@ static void ImplCalcBigIntThreshold( long nDPIX, long nDPIY,
             rThresRes.mnThresPixToLogY = (long)(((ULONG)LONG_MAX + (ULONG)(-nProductY/2)) / nDenomY);
     }
 
-#ifdef USE_64BIT_INTS
     rThresRes.mnThresLogToPixX /= 2;
     rThresRes.mnThresLogToPixY /= 2;
     rThresRes.mnThresPixToLogX /= 2;
     rThresRes.mnThresPixToLogY /= 2;
-#endif
 }
 
 // -----------------------------------------------------------------------
@@ -383,7 +379,6 @@ static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom,
 {
     // To "use" it...
     (void) nThres;
-#ifdef USE_64BIT_INTS
 #if (SAL_TYPES_SIZEOFLONG < 8)
     if( (+n < nThres) && (-n < nThres) )
     {
@@ -411,34 +406,6 @@ static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom,
        }
     }
     return n;
-#else // USE_64BIT_INTS
-    if ( Abs( n ) < nThres )
-    {
-        n *= nDPI * nMapNum;
-        n += n >= 0 ? nMapDenom/2 : -((nMapDenom-1)/2);
-                return (n / nMapDenom);
-    }
-    else
-    {
-        BigInt aTemp( n );
-        aTemp *= BigInt( nDPI );
-        aTemp *= BigInt( nMapNum );
-
-        if ( aTemp.IsNeg() )
-        {
-            BigInt aMapScDenom2( (nMapDenom-1)/2 );
-            aTemp -= aMapScDenom2;
-        }
-        else
-        {
-            BigInt aMapScDenom2( nMapDenom/2 );
-            aTemp += aMapScDenom2;
-        }
-
-        aTemp /= BigInt( nMapDenom );
-        return (long)aTemp;
-    }
-#endif
 }
 
 // -----------------------------------------------------------------------
@@ -448,7 +415,6 @@ static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom,
 {
     // To "use" it...
    (void) nThres;
-#ifdef USE_64BIT_INTS
 #if (SAL_TYPES_SIZEOFLONG < 8)
     if( (+n < nThres) && (-n < nThres) )
         n = (2 * n * nMapDenom) / (nDPI * nMapNum);
@@ -462,59 +428,6 @@ static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom,
     }
     if( n < 0 ) --n; else ++n;
     return (n / 2);
-#else // USE_64BIT_INTS
-    if ( Abs( n ) < nThres )
-    {
-        long nDenom  = nDPI * nMapNum;
-        long nNum    = n * nMapDenom;
-        if( (nNum ^ nDenom) >= 0 )
-            nNum += nDenom/2;
-        else
-            nNum -= nDenom/2;
-        return (nNum / nDenom);
-    }
-    else
-    {
-        BigInt aDenom( nDPI );
-        aDenom *= BigInt( nMapNum );
-
-        BigInt aNum( n );
-        aNum *= BigInt( nMapDenom );
-
-        BigInt aDenom2( aDenom );
-        if ( aNum.IsNeg() )
-        {
-            if ( aDenom.IsNeg() )
-            {
-                aDenom2 /= BigInt(2);
-                aNum += aDenom2;
-            }
-            else
-            {
-                aDenom2 -= 1;
-                aDenom2 /= BigInt(2);
-                aNum -= aDenom2;
-            }
-        }
-        else
-        {
-            if ( aDenom.IsNeg() )
-            {
-                aDenom2 += 1;
-                aDenom2 /= BigInt(2);
-                aNum -= aDenom2;
-            }
-            else
-            {
-                aDenom2 /= BigInt(2);
-                aNum += aDenom2;
-            }
-        }
-
-        aNum  /= aDenom;
-        return (long)aNum;
-    }
-#endif
 }
 
 // -----------------------------------------------------------------------


More information about the Libreoffice-commits mailing list