[Libreoffice-commits] .: 3 commits - basic/source idl/source sfx2/inc svx/inc
Thomas Arnhold
tarnhold at kemper.freedesktop.org
Tue Feb 15 14:18:47 PST 2011
basic/source/sbx/sbxbase.cxx | 7 -------
basic/source/sbx/sbxdate.cxx | 8 --------
idl/source/cmptools/hash.cxx | 6 ------
idl/source/cmptools/lex.cxx | 9 ---------
idl/source/prj/globals.cxx | 10 ----------
sfx2/inc/sfx2/docfile.hxx | 4 ----
svx/inc/svx/xbitmap.hxx | 10 ----------
7 files changed, 54 deletions(-)
New commits:
commit da03b5cb7b368f2a5950b3bdef3722e37955fc98
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 21:08:40 2011 +0100
Remove SINIX
diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index e1a1057..35f392d 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -164,11 +164,7 @@ public:
void ReOpen();
void CompleteReOpen();
const String& GetName() const {return aLogicName;}
-#if defined SINIX && defined GCC && defined C272
- const INetURLObject& GetURLObject();
-#else
const INetURLObject& GetURLObject() const;
-#endif
void CheckFileDate( const ::com::sun::star::util::DateTime& aInitDate );
sal_Bool DocNeedsFileDateCheck();
diff --git a/svx/inc/svx/xbitmap.hxx b/svx/inc/svx/xbitmap.hxx
index 66172a1..97fad00 100644
--- a/svx/inc/svx/xbitmap.hxx
+++ b/svx/inc/svx/xbitmap.hxx
@@ -39,10 +39,6 @@
// class XOBitmap
//---------------
-#if defined SINIX
-static Size aXOBitmapDefaultSize( 8, 8 );
-#endif
-
class SVX_DLLPUBLIC XOBitmap
{
protected:
@@ -59,15 +55,9 @@ public:
XOBitmap();
XOBitmap( const GraphicObject& rGraphicObject, XBitmapStyle eStyle = XBITMAP_TILE );
XOBitmap( const Bitmap& rBitmap, XBitmapStyle eStyle = XBITMAP_TILE );
-#if defined SINIX
- XOBitmap( const USHORT* pArray, const Color& aPixelColor,
- const Color& aBckgrColor, const Size& rSize = aXOBitmapDefaultSize,
- XBitmapStyle eStyle = XBITMAP_TILE );
-#else
XOBitmap( const USHORT* pArray, const Color& aPixelColor,
const Color& aBckgrColor, const Size& rSize = Size( 8, 8 ),
XBitmapStyle eStyle = XBITMAP_TILE );
-#endif
XOBitmap( const XOBitmap& rXBmp );
~XOBitmap();
commit 0c91aaa52af9c7ad7323723602d338b33f68689e
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 19:19:42 2011 +0100
Remove DOS
diff --git a/basic/source/sbx/sbxbase.cxx b/basic/source/sbx/sbxbase.cxx
index f96c397..c1cda87 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 3638b49..5f9bcae 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 80f052a..25feb28 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 425a35d..76179a9 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 )
commit cb086ef99e7c6963aaa2422ec9200489982b5074
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Tue Feb 15 19:14:31 2011 +0100
Remove DOS_NIE
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index 197999a..bded3d1 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -50,12 +50,6 @@ SvHashTable::SvHashTable( UINT32 nMaxEntries )
SvHashTable::~SvHashTable()
{
-#ifdef DOS_NIE
- printf( "Maximum: %ld, Fllung: %ld\n", (ULONG)nMax, (ULONG)nFill );
- printf( "Anfragen: %ld, Versuche: %ld", (ULONG)lAsk, (ULONG)lTry );
- if( lTry != 0 )
- printf( ", V/E = %ld\n", lTry / lAsk );
-#endif
}
BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert,
More information about the Libreoffice-commits
mailing list