[Libreoffice-commits] .: sc/inc sc/source

[François Tigeot]

 sc/inc/rangelst.hxx                 |    5 -----
 sc/inc/rangenam.hxx                 |    5 -----
 sc/source/core/tool/rangelst.cxx    |    4 ----
 sc/source/ui/app/inputwin.cxx       |    5 -----
 sc/source/ui/navipi/navipi.cxx      |    9 ---------
 sc/source/ui/vba/vbaapplication.cxx |    2 +-
 sc/source/ui/view/printfun.cxx      |   13 -------------
 7 files changed, 1 insertion(+), 42 deletions(-)

New commits:
commit b3f3435f6f12985ccb73c4cf988d04ee217133bd
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Mon Apr 25 08:15:30 2011 +0200

    Remove OS/2 support

diff --git a/sc/inc/rangelst.hxx b/sc/inc/rangelst.hxx
index ae5f056..6465416 100644
--- a/sc/inc/rangelst.hxx
+++ b/sc/inc/rangelst.hxx
@@ -135,11 +135,6 @@ __cdecl
 #endif
 ScRangePairList_QsortNameCompare( const void*, const void* );
 
-#if defined( ICC ) && defined( SC_RANGELST_CXX ) && defined( OS2 )
-    static int _Optlink ICCQsortRPairCompare( const void* a, const void* b)
-                    { return ScRangePairList_QsortNameCompare(a,b); }
-#endif
-
 
 #endif
 
diff --git a/sc/inc/rangenam.hxx b/sc/inc/rangenam.hxx
index e06f208..ea58085 100644
--- a/sc/inc/rangenam.hxx
+++ b/sc/inc/rangenam.hxx
@@ -169,11 +169,6 @@ inline sal_Bool ScRangeData::HasType( RangeType nType ) const
 
 extern "C" int SAL_CALL ScRangeData_QsortNameCompare( const void*, const void* );
 
-#if defined( ICC ) && defined( OS2 )
-    static int _Optlink	 ICCQsortNameCompare( const void* a, const void* b)
-                            { return ScRangeData_QsortNameCompare(a,b); }
-#endif
-
 bool operator< (const ScRangeData& left, const ScRangeData& right);
 
 class ScRangeName
diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx
index 0a92d63..0d57c75 100644
--- a/sc/source/core/tool/rangelst.cxx
+++ b/sc/source/core/tool/rangelst.cxx
@@ -906,11 +906,7 @@ ScRangePair** ScRangePairList::CreateNameSortedArray( size_t& nListCount,
         pSortArray[j].pPair = maPairs[ j ];
         pSortArray[j].pDoc = pDoc;
     }
-#if !(defined(ICC ) && defined(OS2))
     qsort( (void*)pSortArray, nListCount, sizeof(ScRangePairNameSort), &ScRangePairList_QsortNameCompare );
-#else
-    qsort( (void*)pSortArray, nListCount, sizeof(ScRangePairNameSort), ICCQsortRPairCompare );
-#endif
     // ScRangePair Pointer aufruecken
     ScRangePair** ppSortArray = (ScRangePair**)pSortArray;
     for ( j=0; j < nListCount; j++ )
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index ce7d9a2..5e753f3 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -134,13 +134,8 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const
 //==================================================================
 
 ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) :
-#ifdef OS2
-// ohne WB_CLIPCHILDREN wg. os/2 Paintproblem
-        ToolBox         ( pParent, WinBits(WB_BORDER|WB_3DLOOK) ),
-#else
 // mit WB_CLIPCHILDREN, sonst Flicker
         ToolBox         ( pParent, WinBits(WB_BORDER|WB_3DLOOK|WB_CLIPCHILDREN) ),
-#endif
         aWndPos         ( this ),
         aTextWindow     ( this ),
         pInputHdl		( NULL ),
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 56f011a..191156c 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -154,11 +154,6 @@ void ColumnEdit::Up()
 {
     nCol++;
 
-#ifdef OS2
-    if ( nCol > SCNAV_MAXCOL )
-        nCol = 1;
-#endif
-
     if ( nCol <= SCNAV_MAXCOL )
         SetCol( nCol );
     else
@@ -171,10 +166,6 @@ void ColumnEdit::Down()
 {
     if ( nCol>1 )
         SetCol( nCol-1 );
-#ifdef OS2
-    else
-        SetCol( SCNAV_MAXCOL );
-#endif
 }
 
 //------------------------------------------------------------------------
diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx
index 4c4dd44..02078b5 100644
--- a/sc/source/ui/vba/vbaapplication.cxx
+++ b/sc/source/ui/vba/vbaapplication.cxx
@@ -131,7 +131,7 @@ using ::com::sun::star::uno::UNO_QUERY;
 using ::rtl::OUString;
 
 // #TODO is this defined somewhere else?
-#if ( defined UNX ) || ( defined OS2 ) //unix
+#if ( defined UNX ) //unix
 #define FILE_PATH_SEPERATOR "/"
 #else // windows
 #define FILE_PATH_SEPERATOR "\\"
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 7fd44dc..fe90f8e 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -617,19 +617,6 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr
         pDev->SetMapMode(aMode);
 
     aOutputData.DrawBackground();
-
-#ifdef OS2
-    if (bMetaFile && !bDoGrid)
-    {
-                    // unter OS2 fuer Metafiles gesamte Flaeche benutzen,
-                    // weil sonst die Groesse nicht erkannt wird
-        pDev->SetLineColor();
-        pDev->SetFillColor();
-        pDev->DrawRect( Rectangle( nScrX,nScrY,
-                        nScrX+aOutputData.GetScrW(), nScrY+aOutputData.GetScrH() ) );
-    }
-#endif
-
     aOutputData.DrawShadow();
     aOutputData.DrawFrame();
     aOutputData.DrawStrings();