diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-02-15 19:19:42 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-02-15 23:18:51 +0100 |
commit | 30e2c2dfea72b532c5123012ea72dc156da70a04 (patch) | |
tree | dc765adc61b11de4cba332a753895eb9777354fc | |
parent | 2b8f676617fb787fb1391a27ec3583bbc249a73b (diff) |
Remove DOS
-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 | 9 | ||||
-rw-r--r-- | idl/source/prj/globals.cxx | 10 |
4 files changed, 0 insertions, 34 deletions
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx index 62c822af1ea7..6683fbdc56ee 100644 --- a/basic/source/sbx/sbxbase.cxx +++ b/basic/source/sbx/sbxbase.cxx @@ -49,18 +49,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 ee4c18996846..282409f081d2 100644 --- a/basic/source/sbx/sbxdate.cxx +++ b/basic/source/sbx/sbxdate.cxx @@ -87,7 +87,6 @@ double ImpGetDate( const SbxValues* p ) nRes = 0; else { -#ifndef DOS LanguageType eLangType = GetpApp()->GetSettings().GetLanguage(); SvNumberFormatter* pFormatter; @@ -138,9 +137,6 @@ double ImpGetDate( const SbxValues* p ) } delete pFormatter; -#else - SbxBase::SetError( SbxERR_CONVERSION ); nRes = 0; -#endif } break; case SbxOBJECT: @@ -235,7 +231,6 @@ start: case SbxBYREF | SbxSTRING: case SbxSTRING: case SbxLPSTR: -#ifndef DOS { if( !p->pOUString ) p->pOUString = new ::rtl::OUString; @@ -292,11 +287,8 @@ start: pFormatter->GetOutputString( n, nIndex, aTmpString, &pColor ); *p->pOUString = aTmpString; 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 494091cb6246..fd8265513694 100644 --- a/idl/source/cmptools/lex.cxx +++ b/idl/source/cmptools/lex.cxx @@ -99,11 +99,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; @@ -178,12 +174,7 @@ void SvTokenStream::FillTokenList() void SvTokenStream::SetCharSet( CharSet nSet ) { nCharSet = nSet; - -#ifdef DOS - pCharTab = SvChar::GetTable( nSet, CHARSET_ANSI ); -#else pCharTab = SvChar::GetTable( nSet, gsl_getSystemTextEncoding() ); -#endif } int SvTokenStream::GetNextChar() diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx index de1f5256271a..f5162c6e03c7 100644 --- a/idl/source/prj/globals.cxx +++ b/idl/source/prj/globals.cxx @@ -34,15 +34,6 @@ #include <globals.hxx> #include <database.hxx> -#ifdef DOS -static IdlDll * pApp = NULL; -IdlDll * GetIdlApp() -{ - if( !pApp ) - pApp = new IdlDll(); - return pApp; -} -#else IdlDll * GetIdlApp() { if( !(*(IdlDll**)GetAppData(SHL_IDL)) ) @@ -51,7 +42,6 @@ IdlDll * GetIdlApp() } return (*(IdlDll**)GetAppData(SHL_IDL)); } -#endif IdlDll::IdlDll() : pHashTable( NULL ) |