[Libreoffice-commits] .: automation/source basctl/source bean/native cui/source lingucomponent/source
Tor Lillqvist
tml at kemper.freedesktop.org
Sat May 21 07:07:35 PDT 2011
automation/source/testtool/makefile.mk | 2
automation/source/testtool/objtest.cxx | 21 ----------
basctl/source/dlged/dlged.cxx | 9 ----
bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c | 1
bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c | 1
bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c | 1
bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c | 1
cui/source/dialogs/iconcdlg.cxx | 4 -
cui/source/options/optinet2.hxx | 4 -
cui/source/options/optmemory.cxx | 4 -
cui/source/tabpages/page.cxx | 5 --
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 4 -
lingucomponent/source/thesaurus/libnth/makefile.mk | 3 -
13 files changed, 4 insertions(+), 56 deletions(-)
New commits:
commit b21cac7d4f40c33ba1d17c52bc209a92724692eb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Sat May 21 15:49:48 2011 +0300
Drop OS2
diff --git a/automation/source/testtool/makefile.mk b/automation/source/testtool/makefile.mk
index ee885e1..d23069e 100644
--- a/automation/source/testtool/makefile.mk
+++ b/automation/source/testtool/makefile.mk
@@ -93,7 +93,7 @@ $(MISC)$/xfilter.pl : filter.pl
.IF "$(GUI)"=="UNX"
INIFILESUFFIX=rc
BRANDPATH=none
-.ELIF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.ELIF "$(GUI)"=="WNT"
INIFILESUFFIX=.ini
BRANDPATH=..
.END
diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx
index 44a8604..5f7d3de 100644
--- a/automation/source/testtool/objtest.cxx
+++ b/automation/source/testtool/objtest.cxx
@@ -29,11 +29,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_automation.hxx"
-#ifdef OS2
-#define INCL_DOS
-#include <svpm.h>
-#endif
-
#include "sysdir_win.hxx"
#include "registry_win.hxx"
#include "sttresid.hxx"
@@ -445,8 +440,6 @@ void TestToolObj::LoadIniFile() // Laden der IniEinstellungen, die durch den
abGP.Append( "15" ); // Linux x86-64
#elif defined LINUX && defined SPARC
abGP.Append( "16" ); // Linux SPARC
-#elif defined OS2
- abGP.Append( "17" );
#elif defined LINUX && defined MIPS
abGP.Append( "18" ); // Linux MIPS
#elif defined LINUX && defined ARM
@@ -1142,9 +1135,6 @@ void TestToolObj::WaitForAnswer ()
while ( !bReturnOK && aTimer.IsActive() && pCommunicationManager->IsCommunicationRunning()
&& aRun.IsValid() && aRun.IsRun() )
{
- #ifdef OS2
- DosSleep(100);
- #endif
GetpApp()->Yield();
if ( BasicRuntimeAccess::HasRuntime() )
aRun = BasicRuntimeAccess::GetRuntime();
@@ -1296,9 +1286,6 @@ void TestToolObj::EndBlock()
aTimer.Start();
while ( aTimer.IsActive() && pCommunicationManager->IsCommunicationRunning() )
{
- #ifdef OS2
- DosSleep(100);
- #endif
GetpApp()->Yield();
}
}
@@ -2306,14 +2293,6 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&,
osl::FileBase::getSystemPathFromFileURL( aUrl, aPath );
pVar->PutString( String( aPath ) );
}
-#elif defined OS2
- {
- char* etc = getenv("ETC");
- if (etc)
- pVar->PutString( CUniString( etc ) );
- else
- pVar->PutString( CUniString( "/etc" ) );
- }
#else
#if UNX
pVar->PutString( CUniString( "/etc" ) );
diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx
index b56bb1b..8b4e95a 100644
--- a/basctl/source/dlged/dlged.cxx
+++ b/basctl/source/dlged/dlged.cxx
@@ -1268,15 +1268,6 @@ void DlgEditor::Print( Printer* pPrinter, const String& rTitle ) // not working
lcl_PrintHeader( pPrinter, rTitle );
Bitmap aDlg;
-#ifdef OS2
- Bitmap* pDlg = new Bitmap;
- SvMemoryStream* pStrm = new SvMemoryStream;
- *pStrm << *pDlg;
- delete pDlg;
- pStrm->Seek(0);
- *pStrm >> aDlg;
- delete pStrm;
-#endif
Size aBmpSz( pPrinter->PixelToLogic( aDlg.GetSizePixel() ) );
double nPaperSzWidth = aPaperSz.Width();
double nPaperSzHeight = aPaperSz.Height();
diff --git a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
index 3e8e736..21facbb 100644
--- a/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_beans_LocalOfficeWindow.c
@@ -52,7 +52,6 @@
#define SYSTEM_WIN32 1
#define SYSTEM_WIN16 2
#define SYSTEM_JAVA 3
-#define SYSTEM_OS2 4
#define SYSTEM_MAC 5
#define SYSTEM_XWINDOW 6
diff --git a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
index eb7111b..3458fce 100644
--- a/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/unix/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -44,7 +44,6 @@
#define SYSTEM_WIN32 1
#define SYSTEM_WIN16 2
#define SYSTEM_JAVA 3
-#define SYSTEM_OS2 4
#define SYSTEM_MAC 5
#define SYSTEM_XWINDOW 6
diff --git a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
index 65f40b2..26074c5 100644
--- a/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_beans_LocalOfficeWindow.c
@@ -54,7 +54,6 @@
#define SYSTEM_WIN32 1
#define SYSTEM_WIN16 2
#define SYSTEM_JAVA 3
-#define SYSTEM_OS2 4
#define SYSTEM_MAC 5
#define SYSTEM_XWINDOW 6
diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index e453c77..0f7b0d8 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -47,7 +47,6 @@
#define SYSTEM_WIN32 1
#define SYSTEM_WIN16 2
#define SYSTEM_JAVA 3
-#define SYSTEM_OS2 4
#define SYSTEM_MAC 5
#define SYSTEM_XWINDOW 6
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 3c06796..6b20547 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -48,12 +48,8 @@ using ::std::vector;
#ifdef WNT
int __cdecl IconcDlgCmpUS_Impl( const void* p1, const void* p2 )
#else
-#if defined(OS2) && defined(ICC)
-int _Optlink IconcDlgCmpUS_Impl( const void* p1, const void* p2 )
-#else
int IconcDlgCmpUS_Impl( const void* p1, const void* p2 )
#endif
-#endif
{
return *(sal_uInt16*)p1 - *(sal_uInt16*)p2;
}
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 1f5a0f8..ff9d67b 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -53,11 +53,7 @@ class SvtInetOptions;
#define CACHE_CONTROLS 20
#define INET_SEARCH 19
-#if defined(OS2)
-#define TYPE_CONTROLS 20
-#else
#define TYPE_CONTROLS 18
-#endif
namespace svx {
class SecurityOptionsDialog;
diff --git a/cui/source/options/optmemory.cxx b/cui/source/options/optmemory.cxx
index 0479ea2..9fdc7f5 100644
--- a/cui/source/options/optmemory.cxx
+++ b/cui/source/options/optmemory.cxx
@@ -149,8 +149,8 @@ OfaMemoryOptionsPage::OfaMemoryOptionsPage(Window* pParent, const SfxItemSet& rS
#endif
FreeResource();
- //quick launch only available in Win and OS/2
-#if !defined(WNT) && !defined(OS2) && !defined(ENABLE_GTK)
+ //quick launch only available in Win
+#if !defined(WNT) && !defined(ENABLE_GTK)
aQuickLaunchFL.Hide();
aQuickLaunchCB.Hide();
#endif
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 52db5d6..d087aa2 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -560,11 +560,6 @@ void SvxPageDescPage::Reset( const SfxItemSet& rSet )
bool bOrientationSupport =
pImpl->mpDefPrinter->HasSupport( SUPPORT_SET_ORIENTATION );
-#ifdef OS2
- // unter OS/2 wird bei HasSupport() immer sal_True returned
- // aber nur als Dummy, deshalb FALSE
- bOrientationSupport = sal_False;
-#endif
if ( !bOrientationSupport &&
aPaperSize.Width() > aPaperSize.Height() )
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
index bc5d1ae..c09723d 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
@@ -32,9 +32,7 @@ TARGET = hyphen_lib
ENABLE_EXCEPTIONS=TRUE
USE_DEFFILE=TRUE
-.IF "$(GUI)"=="OS2"
-HNJLIB=hyphen.lib
-.ELIF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
+.IF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
HNJLIB=-lhyphen
.ELSE
HNJLIB=hyphen.lib
diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomponent/source/thesaurus/libnth/makefile.mk
index d204fb2..1cbecd3 100644
--- a/lingucomponent/source/thesaurus/libnth/makefile.mk
+++ b/lingucomponent/source/thesaurus/libnth/makefile.mk
@@ -37,9 +37,6 @@ USE_DEFFILE=TRUE
.IF "$(GUI)"=="UNX"
MYTHESLIB=-lmythes
.ENDIF # unx
-.IF "$(GUI)"=="OS2"
-MYTHESLIB=$(SLB)\libmythes.lib
-.ENDIF # os2
.IF "$(GUI)"=="WNT"
MYTHESLIB=libmythes.lib
.ENDIF # wnt
More information about the Libreoffice-commits
mailing list