diff options
| -rw-r--r-- | basic/source/sbx/sbxbase.cxx | 7 | ||||
| -rw-r--r-- | basic/source/sbx/sbxdate.cxx | 8 | ||||
| -rw-r--r-- | idl/source/cmptools/lex.cxx | 8 | ||||
| -rw-r--r-- | idl/source/prj/globals.cxx | 10 | ||||
| -rw-r--r-- | svx/inc/svx/svdmodel.hxx | 2 |
5 files changed, 1 insertions, 34 deletions
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index b1815228cd99..60bb9fe505e7 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -48,18 +48,11 @@ TYPEINIT0(SbxBase) SbxAppData* GetSbxData_Impl() { -#ifndef DOS SbxAppData** ppData = (SbxAppData**) ::GetAppData( SHL_SBX ); SbxAppData* p = *ppData; if( !p ) p = *ppData = new SbxAppData; return p; -#else - SbxAppData** ppData; - SbxAppData* p; - p = *ppData = new SbxAppData; - return p; -#endif } SbxAppData::~SbxAppData() diff --git a/basic/source/sbx/sbxdate.cxx b/basic/source/sbx/sbxdate.cxx index ce532fed0482..8dffb2758749 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -90,7 +90,6 @@ double ImpGetDate( const SbxValues* p ) nRes = 0; else { -#ifndef DOS LanguageType eLangType = GetpApp()->GetSettings().GetLanguage(); SvNumberFormatter* pFormatter; @@ -141,9 +140,6 @@ double ImpGetDate( const SbxValues* p ) } delete pFormatter; -#else - SbxBase::SetError( SbxERR_CONVERSION ); nRes = 0; -#endif } break; case SbxOBJECT: @@ -246,7 +242,6 @@ start: case SbxBYREF | SbxSTRING: case SbxSTRING: case SbxLPSTR: -#ifndef DOS { if( !p->pString ) p->pString = new XubString; @@ -301,11 +296,8 @@ start: eLangType ); pFormatter->GetOutputString( n, nIndex, *p->pString, &pColor ); delete pFormatter; -#endif break; -#ifndef DOS } -#endif case SbxOBJECT: { SbxValue* pVal = PTR_CAST(SbxValue,p->pObj); diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx index 38b8d8260bb2..579c81a5ec16 100644 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -146,11 +146,7 @@ SvToken & SvToken::operator = ( const SvToken & rObj ) *************************************************************************/ void SvTokenStream::InitCtor() { -#ifdef DOS - SetCharSet( CHARSET_ANSI ); -#else SetCharSet( gsl_getSystemTextEncoding() ); -#endif aStrTrue = "TRUE"; aStrFalse = "FALSE"; nLine = nColumn = 0; @@ -251,11 +247,7 @@ void SvTokenStream::SetCharSet( CharSet nSet ) { nCharSet = nSet; -#ifdef DOS - pCharTab = SvChar::GetTable( nSet, CHARSET_ANSI ); -#else pCharTab = SvChar::GetTable( nSet, gsl_getSystemTextEncoding() ); -#endif } /************************************************************************* diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index 83a730e404ad..4956cc9392a0 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -35,15 +35,6 @@ #include <database.hxx> /****************** G L O B A L S ****************************************/ -#ifdef DOS -static IdlDll * pApp = NULL; -IdlDll * GetIdlApp() -{ - if( !pApp ) - pApp = new IdlDll(); - return pApp; -} -#else IdlDll * GetIdlApp() { if( !(*(IdlDll**)GetAppData(SHL_IDL)) ) @@ -55,7 +46,6 @@ IdlDll * GetIdlApp() } return (*(IdlDll**)GetAppData(SHL_IDL)); } -#endif IdlDll::IdlDll() : pHashTable( NULL ) diff --git a/svx/inc/svx/svdmodel.hxx b/svx/inc/svx/svdmodel.hxx index 61edcd5c7fe7..2da51b798fa7 100644 --- a/svx/inc/svx/svdmodel.hxx +++ b/svx/inc/svx/svdmodel.hxx @@ -57,7 +57,7 @@ class OutputDevice; #define DEGREE_CHAR ((sal_Unicode)176) /* 0xB0 = Ansi */ #endif -#if defined(DOS) || defined(OS2) +#if defined(OS2) #define DEGREE_CHAR ((sal_Unicode)248) /* 0xF8 = IBM PC (Erw. ASCII) */ #endif |