summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2011-02-11 20:55:19 -0600
committerNorbert Thiebaud <nthiebaud@gmail.com>2011-02-11 20:55:19 -0600
commit7ba4039b217358c49076a58e0f79fb6f661e6a1b (patch)
tree55266a5603d2df66fecb6a01b2f1636327e5f345
parent722e27f05c29f2831bb8decc239da5243c6088f7 (diff)
merge non-conflicting changes in idl
-rw-r--r--idl/inc/basobj.hxx30
-rw-r--r--idl/inc/bastype.hxx2
-rw-r--r--idl/inc/char.hxx3
-rw-r--r--idl/inc/command.hxx7
-rw-r--r--idl/inc/database.hxx2
-rw-r--r--idl/inc/globals.hxx2
-rw-r--r--idl/inc/hash.hxx10
-rw-r--r--idl/inc/lex.hxx2
-rw-r--r--idl/inc/module.hxx4
-rw-r--r--idl/inc/object.hxx11
-rw-r--r--idl/inc/pch/precompiled_idl.cxx2
-rw-r--r--idl/inc/pch/precompiled_idl.hxx2
-rw-r--r--idl/inc/slot.hxx3
-rw-r--r--idl/inc/types.hxx2
-rw-r--r--idl/source/cmptools/char.cxx9
-rw-r--r--idl/source/cmptools/hash.cxx17
-rw-r--r--idl/source/cmptools/lex.cxx8
-rw-r--r--idl/source/objects/basobj.cxx8
-rw-r--r--idl/source/objects/bastype.cxx54
-rw-r--r--idl/source/objects/module.cxx62
-rw-r--r--idl/source/objects/object.cxx233
-rw-r--r--idl/source/objects/slot.cxx29
-rw-r--r--idl/source/objects/types.cxx206
-rw-r--r--idl/source/prj/command.cxx41
-rw-r--r--idl/source/prj/database.cxx85
-rw-r--r--idl/source/prj/globals.cxx6
-rw-r--r--idl/source/prj/svidl.cxx78
-rw-r--r--idl/util/idlpch.cxx2
28 files changed, 135 insertions, 785 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx
index 91219b5751..964f908c85 100644
--- a/idl/inc/basobj.hxx
+++ b/idl/inc/basobj.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -59,43 +60,20 @@ enum
typedef int WriteAttribute;
/******************** Meta Factory **************************************/
-#ifdef IDL_COMPILER
-
-#define PRV_SV_DECL_META_FACTORY( Class ) \
- static SvAttributeList * pAttribList; \
- static SvMetaObject * Create() { return new Class; } \
- static const char * GetClassName() { return #Class; }
-
-#define PRV_SV_IMPL_META_FACTORY( Class ) \
- SvAttributeList * Class::pAttribList = NULL;
-
-#else
-
-#define PRV_SV_DECL_META_FACTORY( Class )
-
-#define PRV_SV_IMPL_META_FACTORY( Class )
-
-#endif // IDL_COMPILER
-
#define SV_DECL_META_FACTORY( Class, CLASS_ID ) \
- SV_DECL_PERSIST( Class, CLASS_ID ) \
- PRV_SV_DECL_META_FACTORY( Class )
+ SV_DECL_PERSIST( Class, CLASS_ID )
#define SV_DECL_META_FACTORY1( Class, Super1, CLASS_ID ) \
- SV_DECL_PERSIST1( Class, Super1, CLASS_ID ) \
- PRV_SV_DECL_META_FACTORY( Class )
+ SV_DECL_PERSIST1( Class, Super1, CLASS_ID )
#define SV_IMPL_META_FACTORY( Class ) \
- PRV_SV_IMPL_META_FACTORY( Class ) \
SV_IMPL_PERSIST( Class )
#define SV_IMPL_META_FACTORY1( Class, Super1 ) \
- PRV_SV_IMPL_META_FACTORY( Class ) \
SV_IMPL_PERSIST1( Class, Super1 )
-
/******************** class SvMetaObject ********************************/
class SvMetaObject : public SvPersistBase
{
@@ -120,7 +98,6 @@ public:
#endif
};
SV_DECL_IMPL_REF(SvMetaObject)
-//SV_DECL_IMPL_PERSIST_LIST(SvMetaObject,SvMetaObject *)
SV_DECL_PERSIST_LIST(SvMetaObject,SvMetaObject *)
SV_IMPL_PERSIST_LIST(SvMetaObject,SvMetaObject *)
@@ -292,3 +269,4 @@ SV_DECL_IMPL_PERSIST_LIST(SvMetaExtern,SvMetaExtern *)
#endif // _BASOBJ_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx
index 377597893f..9cdb38c25d 100644
--- a/idl/inc/bastype.hxx
+++ b/idl/inc/bastype.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -288,3 +289,4 @@ public:
#endif // _BASTYPE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/char.hxx b/idl/inc/char.hxx
index 41a62badb5..d0a4825449 100644
--- a/idl/inc/char.hxx
+++ b/idl/inc/char.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,3 +40,5 @@ public:
#endif // _CHAR_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx
index 7dc41e903f..0b20c96422 100644
--- a/idl/inc/command.hxx
+++ b/idl/inc/command.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,13 +32,14 @@
#include <tools/list.hxx>
#include <tools/string.hxx>
+#include <vector>
#ifndef STRING_LIST
#define STRING_LIST
-DECLARE_LIST( StringList, String * )
+typedef ::std::vector< String* > StringList;
#endif
-DECLARE_LIST( ByteStringList, ByteString* )
+typedef ::std::vector< ByteString* > ByteStringList;
/******************** class SvCommand ************************************/
class SvCommand
@@ -76,3 +78,4 @@ void DeInit();
#endif // _COMMAND_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx
index 6521796197..0b41dad297 100644
--- a/idl/inc/database.hxx
+++ b/idl/inc/database.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -180,3 +181,4 @@ public:
#endif // _DATABASE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx
index fe61702c41..16f71e54b0 100644
--- a/idl/inc/globals.hxx
+++ b/idl/inc/globals.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -240,3 +241,4 @@ HASH_INLINE(UnoName)
#endif // IDL_COMPILER
#endif // _GLOBALS_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx
index 3c2921750e..1518e6f172 100644
--- a/idl/inc/hash.hxx
+++ b/idl/inc/hash.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,10 +29,9 @@
#ifndef _HASH_HXX
#define _HASH_HXX
-
-
#include <tools/ref.hxx>
#include <tools/string.hxx>
+#include <vector>
/****************** H a s h - T a b l e **********************************/
class SvHashTable
@@ -98,11 +98,11 @@ public:
SV_DECL_IMPL_REF(SvStringHashEntry)
/****************** S t r i n g H a s h T a b l e ************************/
-DECLARE_LIST(SvStringHashList,SvStringHashEntry *)
+typedef ::std::vector< SvStringHashEntry* > SvStringHashList;
class SvStringHashTable : public SvHashTable
{
- SvStringHashEntry * pEntries;
+ SvStringHashEntry* pEntries;
protected:
virtual UINT32 HashFunc( const void * pElement ) const;
virtual StringCompare Compare( const void * pElement, UINT32 nIndex ) const;
@@ -123,3 +123,5 @@ public:
};
#endif // _RSCHASH_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx
index 89c67fee2d..fe8d29eaa2 100644
--- a/idl/inc/lex.hxx
+++ b/idl/inc/lex.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -269,3 +270,4 @@ public:
#endif // _LEX_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx
index 42a675f79f..a12bf6ecc7 100644
--- a/idl/inc/module.hxx
+++ b/idl/inc/module.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -39,7 +40,6 @@ struct SvNamePos
: aUUId( rName )
, nStmPos( nPos ) {}
};
-DECLARE_LIST( SvNamePosList, SvNamePos *)
/******************** class SvMetaModule *********************************/
class SvMetaModule : public SvMetaExtern
@@ -96,7 +96,6 @@ public:
virtual void WriteAttributes( SvIdlDataBase & rBase,
SvStream & rOutStm, USHORT nTab,
WriteType, WriteAttribute = 0 );
-// virtual void WriteSbx( SvIdlDataBase & rBase, SvStream & rOutStm, SvNamePosList & rList );
virtual void Write( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab,
WriteType, WriteAttribute = 0 );
virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm );
@@ -115,3 +114,4 @@ SV_DECL_IMPL_PERSIST_LIST(SvMetaModule,SvMetaModule *)
#endif // _MODULE_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx
index 8b112fbb0e..4b21a9b45d 100644
--- a/idl/inc/object.hxx
+++ b/idl/inc/object.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29,9 +30,9 @@
#define _OBJECT_HXX
#define _SVSTDARR_ULONGS
-//#include <svtools/svstdarr.hxx>
#include <types.hxx>
#include <slot.hxx>
+#include <vector>
struct SvSlotElement
{
@@ -43,8 +44,9 @@ struct SvSlotElement
{}
};
DECLARE_LIST( SvSlotElementList, SvSlotElement* )
+
class SvMetaClass;
-DECLARE_LIST( SvMetaClassList, SvMetaClass* )
+typedef ::std::vector< SvMetaClass* > SvMetaClassList;
class SvULongs : public List
{
@@ -95,9 +97,6 @@ class SvMetaClass : public SvMetaType
SvBOOL aAutomation;
SvMetaClassRef xAutomationInterface;
-// void FillSbxMemberObject( SvIdlDataBase & rBase,
-// SbxObject *, StringList &,
-// BOOL bVariable );
BOOL TestAttribute( SvIdlDataBase & rBase, SvTokenStream & rInStm,
SvMetaAttribute & rAttr ) const;
#ifdef IDL_COMPILER
@@ -141,7 +140,6 @@ public:
{ return aSuperClass; }
void FillClasses( SvMetaClassList & rList );
-// virtual void FillSbxObject( SvIdlDataBase & rBase, SbxObject * );
const SvClassElementMemberList&
GetClassList() const
@@ -168,3 +166,4 @@ SV_IMPL_PERSIST_LIST(SvMetaClass,SvMetaClass *)
#endif // _OBJECT_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/pch/precompiled_idl.cxx b/idl/inc/pch/precompiled_idl.cxx
index e5c867abbb..3c215bea8f 100644
--- a/idl/inc/pch/precompiled_idl.cxx
+++ b/idl/inc/pch/precompiled_idl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -27,3 +28,4 @@
#include "precompiled_idl.hxx"
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/pch/precompiled_idl.hxx b/idl/inc/pch/precompiled_idl.hxx
index 95f3ef59a1..f3a3a3bddb 100644
--- a/idl/inc/pch/precompiled_idl.hxx
+++ b/idl/inc/pch/precompiled_idl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -30,3 +31,4 @@
#ifdef PRECOMPILED_HEADERS
#endif
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx
index b6770b62f7..2747f1bf24 100644
--- a/idl/inc/slot.hxx
+++ b/idl/inc/slot.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -277,3 +278,5 @@ SV_DECL_IMPL_REF(SvMetaSlot)
SV_DECL_IMPL_PERSIST_LIST(SvMetaSlot,SvMetaSlot *)
#endif // _SLOT_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index e2c641b526..d5c27d7342 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -343,3 +344,4 @@ SV_DECL_IMPL_PERSIST_LIST(SvMetaTypevoid,SvMetaTypevoid *)
#endif // _TYPES_HXX
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/cmptools/char.cxx b/idl/source/cmptools/char.cxx
index 176a0197fa..e568c90e39 100644
--- a/idl/source/cmptools/char.cxx
+++ b/idl/source/cmptools/char.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -32,9 +33,7 @@
#include <ctype.h>
#include <string.h>
-#ifndef _TABLE_HXX //autogen
#include <tools/table.hxx>
-#endif
#include <char.hxx>
@@ -72,10 +71,6 @@ static unsigned char EqualTab[ 256 ] = {
|*
|* RscChar::GetTable()
|*
-|* Beschreibung
-|* Ersterstellung MM 08.08.91
-|* Letzte Aenderung MM 08.08.91
-|*
*************************************************************************/
Table * pCharTable = NULL;
unsigned char * pChange = EqualTab;
@@ -105,3 +100,5 @@ char * SvChar::GetTable( CharSet nSource , CharSet nDest )
return (char *)pSet;
};
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/cmptools/hash.cxx b/idl/source/cmptools/hash.cxx
index ac6fe446ad..ed285a0a0b 100644
--- a/idl/source/cmptools/hash.cxx
+++ b/idl/source/cmptools/hash.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -100,9 +101,6 @@ BOOL SvHashTable::Test_Insert( const void * pElement, BOOL bInsert,
nHash = HashFunc( pElement );
nIndex = nHash % nMax;
-// const char* s = ((ByteString*) pElement)->GetStr();
-// fprintf(stderr,"### Hash: %lu , Name: %s\n",nIndex,s );
-
nLoop = 0; // divide to range
while( (nMax != nLoop) && IsEntry( nIndex ) )
{ // is place occupied
@@ -163,11 +161,11 @@ SvStringHashTable::SvStringHashTable( UINT32 nMaxEntries )
*************************************************************************/
SvStringHashTable::~SvStringHashTable()
{
+#ifdef DBG_UTIL
// RefCount auf eins setzen
SvStringHashEntry * pPos, *pEnd;
pPos = pEntries;
pEnd = pEntries + GetMax();
-#ifdef DBG_UTIL
while( pPos != pEnd )
{
DBG_ASSERT( pPos->GetRefCount() == 1, "Reference count != 1" );
@@ -175,14 +173,7 @@ SvStringHashTable::~SvStringHashTable()
}
#endif
-#ifdef MPW
- // der MPW-Compiler ruft sonst keine Dtoren!
- for ( USHORT n = 0; n < GetMax(); ++n )
- (pEntries+n)->SvStringHashEntry::~SvStringHashEntry();
- delete (void*) pEntries;
-#else
delete [] pEntries;
-#endif
}
/*************************************************************************
@@ -321,7 +312,9 @@ void SvStringHashTable::FillHashList( SvStringHashList * pList ) const
for( UINT32 n = 0; n < GetMax(); n++ )
{
if( IsEntry( n ) )
- pList->Insert( Get( n ), LIST_APPEND );
+ pList->push_back( Get( n ) );
}
// Hash Reihenfolge, jetzt sortieren
}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/cmptools/lex.cxx b/idl/source/cmptools/lex.cxx
index 65df6d529d..722b15cd9b 100644
--- a/idl/source/cmptools/lex.cxx
+++ b/idl/source/cmptools/lex.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -329,9 +330,6 @@ ULONG SvTokenStream::GetNumber()
*************************************************************************/
BOOL SvTokenStream::MakeToken( SvToken & rToken )
{
- int c1;
- USHORT i;
-
do
{
if( 0 == c )
@@ -352,7 +350,7 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
{
// Zeit Optimierung, keine Kommentare
//ByteString aComment( (char)c );
- c1 = c;
+ int c1 = c;
c = GetFastNextChar();
if( '/' == c )
{
@@ -404,7 +402,6 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
else if( c == '"' )
{
ByteString aStr;
- i = 0;
BOOL bDone = FALSE;
while( !bDone && !IsEof() && c )
{
@@ -501,3 +498,4 @@ BOOL SvTokenStream::MakeToken( SvToken & rToken )
return rInStream.GetError() == SVSTREAM_OK;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/objects/basobj.cxx b/idl/source/objects/basobj.cxx
index 8e89143ed2..e2f1028066 100644
--- a/idl/source/objects/basobj.cxx
+++ b/idl/source/objects/basobj.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,6 @@
#include <tools/debug.hxx>
-#include <attrib.hxx>
#include <basobj.hxx>
#include <module.hxx>
#include <globals.hxx>
@@ -232,11 +232,6 @@ void SvMetaName::Save( SvPersistStream & rStm )
if( nMask & 0x10 ) rStm << aDescription;
}
-/*************************************************************************
-|*
-|*
-|* Beschreibung
-*************************************************************************/
BOOL SvMetaName::SetName( const ByteString & rName, SvIdlDataBase * )
{
aName = rName;
@@ -784,3 +779,4 @@ void SvMetaExtern::WriteAttributes( SvIdlDataBase & rBase, SvStream & rOutStm,
#endif // IDL_COMPILER
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 63e09db0aa..fff80ccade 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -76,10 +77,6 @@ static BOOL ReadRangeSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm,
|* SvUINT32::Read()
|* SvUINT32::Write()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
UINT32 SvUINT32::Read( SvStream & rStm )
{
@@ -96,10 +93,6 @@ void SvUINT32::Write( SvStream & rStm, UINT32 nVal )
|* SvStream& operator << ( SvBOOL )
|* SvStream& operator >> ( SvBOOL )
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
SvStream& operator << (SvStream & rStm, const SvBOOL & rb )
{
@@ -128,10 +121,6 @@ SvStream& operator >> (SvStream & rStm, SvBOOL & rb )
|* SvStream& operator << ( SvVersion )
|* SvStream& operator >> ( SvVersion )
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
SvStream& operator << (SvStream & rStm, const SvVersion & r )
{
@@ -179,10 +168,6 @@ SvStream& operator >> (SvStream & rStm, SvVersion & r )
|*
|* SvBOOL::ReadSvIdl()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
BOOL SvBOOL::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
{
@@ -386,10 +371,6 @@ BOOL SvNumberIdentifier::ReadSvIdl( SvIdlDataBase & rBase,
|* SvStream& operator << ( SvNumberIdentifier )
|* SvStream& operator >> ( SvNumberIdentifier )
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
SvStream& operator << (SvStream & rStm, const SvNumberIdentifier & r )
{
@@ -411,10 +392,6 @@ SvStream& operator >> (SvStream & rStm, SvNumberIdentifier & r )
|*
|* SvString::ReadSvIdl()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
BOOL SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
{
@@ -447,10 +424,6 @@ BOOL SvString::ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm )
|*
|* SvString::WriteSvIdl()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
BOOL SvString::WriteSvIdl( SvStringHashEntry * pName, SvStream & rOutStm,
USHORT /*nTab */ )
@@ -477,10 +450,6 @@ SvStream& operator >> (SvStream & rStm, SvString & r )
|*
|* SvHelpText::ReadSvIdl()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
BOOL SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
{
@@ -491,10 +460,6 @@ BOOL SvHelpText::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
|*
|* SvHelpText::WriteSvIdl()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
BOOL SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, USHORT nTab )
{
@@ -506,10 +471,6 @@ BOOL SvHelpText::WriteSvIdl( SvIdlDataBase &, SvStream & rOutStm, USHORT nTab )
|*
|* SvUUId::ReadSvIdl()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
BOOL SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
{
@@ -542,10 +503,6 @@ BOOL SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
|*
|* SvMetaObject::WriteSvIdl()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
BOOL SvUUId::WriteSvIdl( SvStream & rOutStm )
{
@@ -561,10 +518,6 @@ BOOL SvUUId::WriteSvIdl( SvStream & rOutStm )
|*
|* SvVersion::ReadSvIdl()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
BOOL SvVersion::ReadSvIdl( SvTokenStream & rInStm )
{
@@ -594,10 +547,6 @@ BOOL SvVersion::ReadSvIdl( SvTokenStream & rInStm )
|*
|* SvVersion::WriteSvIdl()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
BOOL SvVersion::WriteSvIdl( SvStream & rOutStm )
{
@@ -609,3 +558,4 @@ BOOL SvVersion::WriteSvIdl( SvStream & rOutStm )
#endif //IDL_COMPILER
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx
index ea690126f0..59c2d58246 100644
--- a/idl/source/objects/module.cxx
+++ b/idl/source/objects/module.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,6 @@
#include <ctype.h>
#include <stdio.h>
-#include <attrib.hxx>
#include <module.hxx>
#include <globals.hxx>
#include <database.hxx>
@@ -45,10 +45,6 @@ SV_IMPL_META_FACTORY1( SvMetaModule, SvMetaExtern );
|*
|* SvMetaModule::SvMetaModule()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
SvMetaModule::SvMetaModule()
#ifdef IDL_COMPILER
@@ -70,10 +66,6 @@ SvMetaModule::SvMetaModule( const String & rIdlFileName, BOOL bImp )
|*
|* SvMetaModule::Load()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
#define MODULE_VER 0x0001
void SvMetaModule::Load( SvPersistStream & rStm )
@@ -113,10 +105,6 @@ void SvMetaModule::Load( SvPersistStream & rStm )
|*
|* SvMetaModule::Save()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
void SvMetaModule::Save( SvPersistStream & rStm )
{
@@ -153,10 +141,6 @@ void SvMetaModule::Save( SvPersistStream & rStm )
|*
|* SvMetaModule::SetName()
|*
-|* Beschreibung
-|* Ersterstellung MM 12.12.94
-|* Letzte Aenderung MM 12.12.94
-|*
*************************************************************************/
BOOL SvMetaModule::SetName( const ByteString & rName, SvIdlDataBase * pBase )
{
@@ -500,28 +484,6 @@ void SvMetaModule::WriteAttributes( SvIdlDataBase & rBase,
}
/*************************************************************************
-|* SvMetaModule::WriteSbx()
-*************************************************************************/
-/*
-void SvMetaModule::WriteSbx( SvIdlDataBase & rBase, SvStream & rOutStm,
- SvNamePosList & rList )
-{
- for( ULONG n = 0; n < aClassList.Count(); n++ )
- {
- SvMetaClass * pClass = aClassList.GetObject( n );
- if( !pClass->IsShell() && pClass->GetAutomation() )
- {
- rList.Insert( new SvNamePos( pClass->GetUUId(), rOutStm.Tell() ),
- LIST_APPEND );
- SbxObjectRef xSbxObj = new SbxObject( pClass->GetName() );
- pClass->FillSbxObject( rBase, xSbxObj );
- xSbxObj->Store( rOutStm );
- }
- }
-}
- */
-
-/*************************************************************************
|* SvMetaModule::Write()
*************************************************************************/
void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
@@ -546,27 +508,6 @@ void SvMetaModule::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
WriteTab( rOutStm, nTab );
rOutStm << "importlib(\"STDOLE.TLB\");" << endl;
- /*
- for( ULONG n = 0; n < aTypeList.Count(); n++ )
- {
- SvMetaType * pType = aTypeList.GetObject( n );
- if( !pType ->Write( rBase, rOutStm, nTab +1, nT, nA ) )
- return FALSE;
- }
- */
- /*
- for( ULONG n = 0; n < rBase.GetModuleList().Count(); n++ )
- {
- SvMetaModule * pModule = rBase.GetModuleList().GetObject( n );
- const SvMetaTypeMemberList &rTypeList = pModule->GetTypeList();
- for( ULONG n = 0; n < rTypeList.Count(); n++ )
- {
- SvMetaType * pType = rTypeList.GetObject( n );
- pType->Write( rBase, rOutStm, nTab +1, nT, nA );
- }
- }
- */
-
for( ULONG n = 0; n < aClassList.Count(); n++ )
{
SvMetaClass * pClass = aClassList.GetObject( n );
@@ -686,3 +627,4 @@ void SvMetaModule::WriteCxx( SvIdlDataBase & rBase, SvStream & rOutStm,
#endif // IDL_COMPILER
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index a5bf99008b..56de6f3420 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,6 @@
#include <tools/debug.hxx>
-#include <attrib.hxx>
#include <object.hxx>
#include <globals.hxx>
#include <database.hxx>
@@ -167,73 +167,6 @@ void SvMetaClass::Save( SvPersistStream & rStm )
if( nMask & 0x10 ) rStm << aAutomation;
}
-/*************************************************************************
-|* SvMetaClass::FillSbxObject()
-|*
-|* Beschreibung
-*************************************************************************/
-/*
-void SvMetaClass::FillSbxMemberObject( SvIdlDataBase & rBase,
- SbxObject * pObj,
- StringList & rSuperList,
- BOOL bVariable )
-{
- // alle Attribute der Klasse schreiben
- ULONG n ;
- for( n = 0; n < aAttrList.Count(); n++ )
- {
- SvMetaAttribute * pAttr = aAttrList.GetObject( n );
-
- ByteString aMangleName = pAttr->GetMangleName( bVariable );
- ByteString * pS = SvIdlDataBase::FindName( aMangleName, rSuperList );
-
- if( !pS && pAttr->GetExport() )
- {
- // nicht doppelt
- if( bVariable && pAttr->IsVariable() )
- {
- rSuperList.Insert( new ByteString( aMangleName ), LIST_APPEND );
- pAttr->FillSbxObject( rBase, pObj, bVariable );
- }
- else if( !bVariable && pAttr->IsMethod() )
- {
- rSuperList.Insert( new ByteString( aMangleName ), LIST_APPEND );
- pAttr->FillSbxObject( rBase, pObj, bVariable );
- }
- }
- }
- // alle Attribute der importierten Klassen schreiben
- for( n = 0; n < aClassList.Count(); n++ )
- {
- SvClassElement * pEle = aClassList.GetObject( n );
- SvMetaClass * pClass = pEle->GetClass();
- pClass->FillSbxMemberObject( rBase, pObj, rSuperList, bVariable );
- }
- // alle Attribute der Superklassen schreiben
- if( aSuperClass.Is() )
- aSuperClass->FillSbxMemberObject( rBase, pObj, rSuperList, bVariable );
-}
-*/
-/*************************************************************************
-|* SvMetaClass::FillSbxObject()
-|*
-|* Beschreibung
-*************************************************************************/
-/*
-void SvMetaClass::FillSbxObject( SvIdlDataBase & rBase, SbxObject * pObj )
-{
- StringList aSuperList;
- FillSbxMemberObject( rBase, pObj, aSuperList, TRUE );
- FillSbxMemberObject( rBase, pObj, aSuperList, FALSE );
-
- ByteString * pStr = aSuperList.First();
- while( pStr )
- {
- delete pStr;
- pStr = aSuperList.Next();
- }
-}
- */
#ifdef IDL_COMPILER
/*************************************************************************
|* SvMetaClass::ReadAttributesSvIdl()
@@ -524,63 +457,6 @@ void SvMetaClass::WriteSvIdl( SvIdlDataBase & rBase, SvStream & rOutStm,
}
/*************************************************************************
-|* SvMetaClass::WriteOdlMember()
-|*
-|* Beschreibung
-*************************************************************************/
-/*
-void SvMetaClass::WriteOdlMembers( ByteStringList & rSuperList,
- BOOL bVariable, BOOL bWriteTab,
- SvIdlDataBase & rBase,
- SvStream & rOutStm, USHORT nTab )
-{
- // alle Attribute schreiben
- ULONG n;
- for( n = 0; n < aAttrList.Count(); n++ )
- {
- SvMetaAttribute * pAttr = aAttrList.GetObject( n );
-
- ByteString aMangleName = pAttr->GetMangleName( bVariable );
- ByteString * pS = rBase.FindName( aMangleName, rSuperList );
-
- if( !pS && pAttr->GetExport() )
- {
- // nicht doppelt
- if( bVariable && pAttr->IsVariable() )
- {
- rSuperList.Insert( new ByteString( aMangleName ), LIST_APPEND );
- pAttr->Write( rBase, rOutStm, nTab +1, WRITE_ODL,
- WA_VARIABLE );
- rOutStm << ';' << endl;
- }
- else if( !bVariable && pAttr->IsMethod() )
- {
- rSuperList.Insert( new ByteString( aMangleName ), LIST_APPEND );
- pAttr->Write( rBase, rOutStm, nTab +1, WRITE_ODL,
- WA_METHOD );
- rOutStm << ';' << endl;
- }
- }
- else
- continue;
- }
- // alle Attribute der importierten Klassen schreiben
- for( n = 0; n < aClassList.Count(); n++ )
- {
- SvClassElement * pEle = aClassList.GetObject( n );
- SvMetaClass * pCl = pEle->GetClass();
- pCl->WriteOdlMembers( rSuperList, bVariable, bWriteTab,
- rBase, rOutStm, nTab );
- }
- // alle Attribute der Superklassen schreiben
- SvMetaClass * pSC = aSuperClass;
- if( pSC )
- pSC->WriteOdlMembers( rSuperList, bVariable, bWriteTab,
- rBase, rOutStm, nTab );
-}
- */
-
-/*************************************************************************
|* SvMetaClass::Write()
|*
|* Beschreibung
@@ -595,53 +471,12 @@ void SvMetaClass::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
case WRITE_ODL:
{
DBG_ERROR( "Not supported anymore!" );
-/*
- // Schreibt die Attribute
- SvMetaName::Write( rBase, rOutStm, nTab, nT, nA );
-
- WriteTab( rOutStm, nTab );
- rOutStm << "dispinterface " << GetName().GetBuffer() << endl;
- WriteTab( rOutStm, nTab );
- rOutStm << '{' << endl;
-
- WriteTab( rOutStm, nTab );
- rOutStm << "properties:";
- rOutStm << endl;
-
- StringList aSuperList;
- WriteOdlMembers( aSuperList, TRUE, TRUE, rBase, rOutStm, nTab );
-
- WriteTab( rOutStm, nTab );
- rOutStm << "methods:";
- rOutStm << endl;
-
- WriteOdlMembers( aSuperList, FALSE, TRUE, rBase, rOutStm, nTab );
-
- ByteString * pStr = aSuperList.First();
- while( pStr )
- {
- delete pStr;
- pStr = aSuperList.Next();
- }
-
- WriteTab( rOutStm, 1 );
- rOutStm << '}' << endl;
- */
break;
}
case WRITE_C_SOURCE:
case WRITE_C_HEADER:
{
DBG_ERROR( "Not supported anymore!" );
-/*
- StringList aSuperList;
- if( nT == WRITE_C_SOURCE )
- {
- rOutStm << "#pragma code_seg (\"" << GetName().GetBuffer()
- << "\",\"CODE\")" << endl;
- }
- WriteCFunctions( aSuperList, rBase, rOutStm, nTab, nT );
- */
break;
}
case WRITE_DOCU:
@@ -730,10 +565,11 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, SvULongs& rSuperList,
const ByteString & rPrefix, SvIdlDataBase& rBase)
{
// Wurde diese Klasse schon geschrieben ?
- if ( rClassList.GetPos(this) != LIST_ENTRY_NOTFOUND )
- return;
+ for ( size_t i = 0, n = rClassList.size(); i < n ; ++i )
+ if ( rClassList[ i ] == this )
+ return;
- rClassList.Insert(this, LIST_APPEND);
+ rClassList.push_back( this );
// alle direkten Attribute schreiben
ULONG n;
@@ -795,22 +631,23 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, SvULongs& rSuperList,
void SvMetaClass::FillClasses( SvMetaClassList & rList )
{
// Bin ich noch nicht drin ?
- if ( rList.GetPos(this) == LIST_ENTRY_NOTFOUND )
- {
- rList.Insert(this, LIST_APPEND);
+ for ( size_t i = 0, n = rList.size(); i < n; ++i )
+ if ( rList[ i ] == this )
+ return;
- // Meine Imports
- for( ULONG n = 0; n < aClassList.Count(); n++ )
- {
- SvClassElement * pEle = aClassList.GetObject( n );
- SvMetaClass * pCl = pEle->GetClass();
- pCl->FillClasses( rList );
- }
+ rList.push_back( this );
- // Meine Superklasse
- if( aSuperClass.Is() )
- aSuperClass->FillClasses( rList );
+ // Meine Imports
+ for( ULONG n = 0; n < aClassList.Count(); n++ )
+ {
+ SvClassElement * pEle = aClassList.GetObject( n );
+ SvMetaClass * pCl = pEle->GetClass();
+ pCl->FillClasses( rList );
}
+
+ // Meine Superklasse
+ if( aSuperClass.Is() )
+ aSuperClass->FillClasses( rList );
}
@@ -847,20 +684,6 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
rOutStm << "#undef " << GetName().GetBuffer() << endl;
rOutStm << "#define ShellClass " << GetName().GetBuffer() << endl;
-// rOutStm << "SFX_TYPELIB(" << GetName().GetBuffer() << ',' << endl
-// << "\t/* library type */"
-// << '"' << ByteString( GetModule()->GetUUId().GetHexName(), RTL_TEXTENCODING_UTF8 ).GetBuffer() << "\"," << endl
-// << "\t\"" << GetModule()->GetTypeLibFileName().GetBuffer() << "\","
-// << ByteString::CreateFromInt32( GetModule()->GetVersion().GetMajorVersion() ).GetBuffer() << ','
-// << ByteString::CreateFromInt32( GetModule()->GetVersion().GetMinorVersion() ).GetBuffer() << ',' << endl
-// << "\t/* shell type */"
-// << '"';
-// if( xAutomationInterface.Is() )
-// rOutStm << ByteString( xAutomationInterface->GetUUId().GetHexName(), RTL_TEXTENCODING_UTF8 ).GetBuffer();
-// else
-// rOutStm << ByteString( GetUUId().GetHexName(), RTL_TEXTENCODING_UTF8 ).GetBuffer();
-// rOutStm << "\");" << endl << endl;
-
// Fuer Interfaces werden kein Slotmaps geschrieben
if( !IsShell() )
{
@@ -868,7 +691,6 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
return;
}
// Parameter Array schreiben
- //rOutStm << "SfxArgList " << GetName().GetBuffer() << "ArgMap[] = {" << endl;
rOutStm << "SFX_ARGUMENTMAP(" << GetName().GetBuffer() << ')' << endl
<< '{' << endl;
@@ -876,8 +698,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
SvMetaClassList classList;
SvSlotElementList aSlotList;
InsertSlots(aSlotList, aSuperList, classList, ByteString(), rBase);
- ULONG n;
- for ( n=0; n<aSlotList.Count(); n++ )
+ for (ULONG n=0; n<aSlotList.Count(); n++ )
{
SvSlotElement *pEle = aSlotList.GetObject( n );
SvMetaSlot *pSlot = pEle->xSlot;
@@ -900,12 +721,9 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
ByteStringList aStringList;
WriteSlotStubs( GetName(), aSlotList, aStringList, rOutStm );
- ByteString * pStr = aStringList.First();
- while( pStr )
- {
- delete pStr;
- pStr = aStringList.Next();
- }
+ for ( size_t i = 0, n = aStringList.size(); i < n; ++i )
+ delete aStringList[ i ];
+ aStringList.clear();
rOutStm << endl;
@@ -929,7 +747,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
}
rOutStm << endl << "};" << endl << "#endif" << endl << endl;
- for( n=0; n<aSlotList.Count(); n++ )
+ for( ULONG n=0; n<aSlotList.Count(); n++ )
{
aSlotList.Seek(n);
SvSlotElement* pEle = aSlotList.GetCurObject();
@@ -937,7 +755,7 @@ void SvMetaClass::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
pAttr->ResetSlotPointer();
}
- for ( n=0; n<aSlotList.Count(); n++ )
+ for ( ULONG n=0; n<aSlotList.Count(); n++ )
delete aSlotList.GetObject(n);
}
@@ -1045,3 +863,4 @@ void SvMetaClass::WriteCxx( SvIdlDataBase &, SvStream & rOutStm, USHORT )
#endif // IDL_COMPILER
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index deded0e842..4b87567b45 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -31,7 +32,6 @@
#include <ctype.h>
#include <stdio.h>
#include <tools/debug.hxx>
-#include <attrib.hxx>
#include <slot.hxx>
#include <globals.hxx>
#include <database.hxx>
@@ -41,7 +41,7 @@ SV_IMPL_META_FACTORY1( SvMetaSlot, SvMetaAttribute );
SvMetaObject *SvMetaSlot::MakeClone() const
{
- return new SvMetaSlot( *this );
+ return new SvMetaSlot( *this );
}
/*************************************************************************
@@ -1197,18 +1197,6 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
ByteStringList & rList,
SvStream & rOutStm )
{
-/*
- ByteString aName = GetName();
- SvMetaAttribute * pAttr = rAttrList.First();
- while( pAttr )
- {
- if( pAttr->GetName() == aName )
- break;
- pAttr = rAttrList.Next();
- }
- if( pAttr )
- return;
-*/
if ( !GetExport() && !GetHidden() )
return;
@@ -1216,9 +1204,9 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
if ( aMethodName.Len() && aMethodName != "NoExec" )
{
BOOL bIn = FALSE;
- for( USHORT n = 0; n < rList.Count(); n++ )
+ for( size_t n = 0; n < rList.size(); n++ )
{
- if( *(rList.GetObject(n)) == aMethodName )
+ if( *(rList[ n ]) == aMethodName )
{
bIn=TRUE;
break;
@@ -1227,7 +1215,7 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
if ( !bIn )
{
- rList.Insert( new ByteString(aMethodName), LIST_APPEND );
+ rList.push_back( new ByteString(aMethodName) );
rOutStm << "SFX_EXEC_STUB("
<< rShellName.GetBuffer()
<< ','
@@ -1240,9 +1228,9 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
if ( aMethodName.Len() && aMethodName != "NoState" )
{
BOOL bIn = FALSE;
- for ( USHORT n=0; n < rList.Count(); n++ )
+ for ( size_t n=0; n < rList.size(); n++ )
{
- if ( *(rList.GetObject(n)) == aMethodName )
+ if ( *(rList[ n ]) == aMethodName )
{
bIn=TRUE;
break;
@@ -1251,7 +1239,7 @@ void SvMetaSlot::WriteSlotStubs( const ByteString & rShellName,
if ( !bIn )
{
- rList.Insert( new ByteString(aMethodName), LIST_APPEND );
+ rList.push_back( new ByteString(aMethodName) );
rOutStm << "SFX_STATE_STUB("
<< rShellName.GetBuffer()
<< ','
@@ -1818,3 +1806,4 @@ void SvMetaSlot::WriteCSV( SvIdlDataBase& rBase, SvStream& rStrm )
#endif // IDL_COMPILER
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index a57d4bf554..2c4811a536 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -33,7 +34,6 @@
#include <tools/debug.hxx>
-#include <attrib.hxx>
#include <types.hxx>
#include <globals.hxx>
#include <database.hxx>
@@ -241,99 +241,6 @@ ByteString SvMetaAttribute::GetMangleName( BOOL ) const
return GetName();
}
-/*************************************************************************
-|* SvMetaAttribute::FillSbxObject()
-|*
-|* Beschreibung
-*************************************************************************/
-/*
-void SvMetaAttribute::FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags )
-{
- SvMetaType * pType = GetType();
- DBG_ASSERT( pType, "no type for attribute" );
- if( !nSbxFlags )
- { // Flags koennen vom Aufrufer ueberschrieben werden
- if( pType->GetOut() )
- {
- nSbxFlags |= SBX_WRITE;
- if( pType->GetIn() )
- nSbxFlags |= SBX_READ;
- }
- else
- nSbxFlags |= SBX_READ;
- }
- SvMetaType * pBaseType = pType->GetBaseType();
- DBG_ASSERT( pBaseType, "no base type for attribute" );
- if( pBaseType->GetType() == TYPE_STRUCT )
- {
- const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
- ULONG nCount = rList.Count();
- for( ULONG i = 0; i < nCount; i++ )
- rList.GetObject( i )->FillSbxObject( pInfo, nSbxFlags );
- }
- else
- //MI: pInfo->AddParam( GetName(), pBaseType->GetSbxDataType(), nSbxFlags );
- pInfo->AddParam( GetName(), SbxVARIANT, nSbxFlags );
-}
-*/
-
-/*************************************************************************
-|* SvMetaAttribute::FillSbxObject()
-|*
-|* Beschreibung
-*************************************************************************/
-/*
-void SvMetaAttribute::FillSbxObject( SvIdlDataBase & rBase,
- SbxObject * pObj, BOOL bVariable )
-{
- // keine Attribut fuer Automation
- if( !GetAutomation() || !GetExport() )
- return;
-
- if( bVariable && IsVariable() )
- {
- SvMetaType * pType = GetType();
- DBG_ASSERT( pType, "no type for attribute" );
- SvMetaType * pBaseType = pType->GetBaseType();
- DBG_ASSERT( pBaseType, "no base type for attribute" );
-
- if( pBaseType->GetType() == TYPE_STRUCT )
- {
- SvNumberIdentifier aSlotId = rBase.aStructSlotId;
- if ( GetSlotId().Len() )
- rBase.aStructSlotId = GetSlotId();
- const SvMetaAttributeMemberList & rList = pBaseType->GetAttrList();
- ULONG nCount = rList.Count();
- for( ULONG i = 0; i < nCount; i++ )
- rList.GetObject( i )->FillSbxObject( rBase, pObj, bVariable );
- rBase.aStructSlotId = aSlotId;
- }
- else
- {
- SbxPropertyRef xProp = new SbxProperty( GetName(), SbxVARIANT );
- //MI: pBaseType->GetSbxDataType() );
- if ( GetReadonly() || IsMethod() )
- xProp->ResetFlag( SBX_WRITE );
- xProp->SetUserData( MakeSlotValue( rBase, TRUE ) );
- pType->FillSbxObject( xProp, bVariable );
-
- pObj->Insert( &xProp );
- }
- }
- else if( !bVariable && IsMethod() )
- {
- SvMetaType * pType = GetType();
- SvMetaType * pRetBaseType = GetType()->GetReturnType()->GetBaseType();
- SbxMethodRef xMeth = new SbxMethod( GetName(),
- pRetBaseType->GetSbxDataType() );
- xMeth->ResetFlag( SBX_WRITE );
- xMeth->SetUserData( MakeSlotValue( rBase, FALSE ) );
- pType->FillSbxObject( xMeth, bVariable );
-
- pObj->Insert( &xMeth );
- }
-}
-*/
#ifdef IDL_COMPILER
/*************************************************************************
|* SvMetaAttribute::Test()
@@ -350,14 +257,6 @@ BOOL SvMetaAttribute::Test( SvIdlDataBase & rBase,
rBase.WriteError( rInStm );
bOk = FALSE;
}
- /*
- if( !GetType()->IsItem() && GetSlotId().IsSet() )
- {
- rBase.SetError( "slot without item declared", rInStm.GetToken() );
- rBase.WriteError( rInStm );
- bOk = FALSE;
- }
- */
return bOk;
}
@@ -569,14 +468,6 @@ void SvMetaAttribute::WriteParam( SvIdlDataBase & rBase,
}
}
}
-/*
- else if( nT == WRITE_C_HEADER || nT == WRITE_C_SOURCE )
- {
- pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT );
- rOutStm << ' ';
- rOutStm << GetName().GetBuffer();
- }
-*/
}
/*************************************************************************
@@ -661,10 +552,6 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
// Methoden/Funktions-Body ausgeben
rOutStm << '{' << endl;
WriteTab( rOutStm, 1 );
-// rOutStm << "if( SvIPCIsConnected() )" << endl;
-// WriteTab( rOutStm, 1 );
-// rOutStm << '{' << endl;
-// WriteTab( rOutStm, 2 );
if( !bVoid )
{
@@ -723,13 +610,6 @@ void SvMetaAttribute::WriteCSource( SvIdlDataBase & rBase, SvStream & rOutStm,
}
rOutStm << " );" << endl;
-// WriteTab( rOutStm, 1 );
-// rOutStm << '}' << endl;
-// if( !bVoid )
-// {
-// WriteTab( rOutStm, 1 );
-// rOutStm << "return 0;" << endl;
-// }
rOutStm << '}' << endl;
}
@@ -862,9 +742,6 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
// Zuweisung
WriteTab( rOutStm, nTab );
rOutStm << "void ";
-// rOutStm << "SYSCALL ";
-// if ( rBase.GetActModulePrefix().Len() )
-// rOutStm << rBase.GetActModulePrefix().GetBuffer();
rOutStm << rBase.aIFaceName.GetBuffer()
<< "Set" << name.GetBuffer() << "( " << C_PREF
<< "Object h" << rBase.aIFaceName.GetBuffer() << ", " << endl;
@@ -881,9 +758,6 @@ void SvMetaAttribute::Write( SvIdlDataBase & rBase, SvStream & rOutStm,
WriteTab( rOutStm, nTab );
pBaseType->WriteTypePrefix( rBase, rOutStm, nTab, nT );
rOutStm << ' ';
-// rOutStm << "SYSCALL ";
-// if ( rBase.GetActModulePrefix().Len() )
-// rOutStm << rBase.GetActModulePrefix().GetBuffer();
rOutStm << rBase.aIFaceName.GetBuffer()
<< "Get" << name.GetBuffer() << "( " << C_PREF
<< "Object h" << rBase.aIFaceName.GetBuffer() << " )";
@@ -1223,14 +1097,6 @@ ByteString SvMetaType::GetBasicPostfix() const
ByteString aRet;
// MBN und Co wollen immer "As xxx"
-/*
- if( aBasicPostfix.IsSet() || !GetRef() )
- aRet = aBasicPostfix;
- else
- aRet = ((SvMetaType*)GetRef())->GetBasicPostfix();
-
- if ( !aRet.Len() && GetBasicName().Len() )
-*/
{
aRet = " As ";
@@ -1401,34 +1267,6 @@ BOOL SvMetaType::SetName( const ByteString & rName, SvIdlDataBase * pBase )
return SvMetaReference::SetName( rName, pBase );
}
-/*************************************************************************
-|* SvMetaType::FillSbxObject()
-|*
-|* Beschreibung
-*************************************************************************/
-/*
-void SvMetaType::FillSbxObject( SbxVariable * pObj, BOOL bVariable )
-{
- if( PTR_CAST( SbxMethod, pObj ) )
- {
- if( GetType() == TYPE_METHOD )
- {
- ULONG nCount = GetAttrCount();
- if( nCount )
- {
- SbxInfoRef xInfo = pObj->GetInfo();
- if( !xInfo.Is() )
- {
- xInfo = new SbxInfo();
- pObj->SetInfo( xInfo );
- }
- for( ULONG n = nCount; n > 0; n-- )
- pAttrList->GetObject( n -1 )->FillSbxObject( xInfo );
- }
- }
- }
-}
-*/
#ifdef IDL_COMPILER
/*************************************************************************
|* SvMetaType::GetString()
@@ -1690,27 +1528,7 @@ BOOL SvMetaType::ReadNamesSvIdl( SvIdlDataBase & rBase,
SvTokenStream & rInStm )
{
BOOL bOk = ReadNameSvIdl( rBase, rInStm );
-/*
- if( bOk )
- {
- UINT32 nTokPos = rInStm.Tell();
- SvToken * pTok = rInStm.GetToken_Next();
- if( pTok->IsIdentifier() )
- {
- aSbxName = pTok->GetString();
-
- nTokPos = rInStm.Tell();
- pTok = rInStm.GetToken_Next();
- if( pTok->IsIdentifier() )
- {
- aItemName = pTok->GetString();
- nTokPos = rInStm.Tell();
- }
- }
- rInStm.Seek( nTokPos );
- }
-*/
return bOk;
}
@@ -2444,27 +2262,6 @@ void SvMetaTypeEnum::Save( SvPersistStream & rStm )
if( nMask & 0x02 ) rStm.WriteByteString( aPrefix );
}
-/*************************************************************************
-|*
-|* SvMetaTypeEnum::GetMaxValue()
-|*
-|* Beschreibung
-|*
-*************************************************************************/
-/*
-USHORT SvMetaTypeEnum::GetMaxValue() const
-{
- USHORT nMax = 0;
- for( ULONG n = 0; n < aEnumValueList.Count(); n++ )
- {
- SvMetaEnumValue * pObj = aEnumValueList.GetObject( n );
- if( nMax < pObj->GetValue() )
- nMax = pObj->GetValue();
- }
- return nMax;
-}
-*/
-
#ifdef IDL_COMPILER
/*************************************************************************
|*
@@ -2697,3 +2494,4 @@ void SvMetaAttribute::WriteCSV( SvIdlDataBase&, SvStream& rStrm )
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index d2e8b88a68..deabd12fa4 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -137,10 +138,6 @@ char CommandLineSyntax[] =
|*
|* Init()
|*
-|* Beschreibung
-|* Ersterstellung MM 15.12.94
-|* Letzte Aenderung MM 15.12.94
-|*
*************************************************************************/
void Init()
{
@@ -171,9 +168,9 @@ void DeInit()
*************************************************************************/
BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
{
- for( USHORT n = 0; n < rCommand.aInFileList.Count(); n++ )
+ for( size_t n = 0; n < rCommand.aInFileList.size(); ++n )
{
- String aFileName ( *rCommand.aInFileList.GetObject( n ) );
+ String aFileName ( *rCommand.aInFileList[ n ] );
SvFileStream aStm( aFileName, STREAM_STD_READ | STREAM_NOCREATE );
if( aStm.GetError() == SVSTREAM_OK )
{
@@ -221,7 +218,7 @@ BOOL ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
static BOOL ResponseFile( StringList * pList, int argc, char ** argv )
{
// Programmname
- pList->Insert( new String( String::CreateFromAscii(*argv) ), LIST_APPEND );
+ pList->push_back( new String( String::CreateFromAscii(*argv) ) );
for( int i = 1; i < argc; i++ )
{
if( '@' == **(argv +i) )
@@ -243,12 +240,12 @@ static BOOL ResponseFile( StringList * pList, int argc, char ** argv )
while( aStr.GetChar(n) && !isspace( aStr.GetChar(n) ) )
n++;
if( n != nPos )
- pList->Insert( new String( String::CreateFromAscii( aStr.Copy( nPos, n - nPos ).GetBuffer() ) ), LIST_APPEND );
+ pList->push_back( new String( String::CreateFromAscii( aStr.Copy( nPos, n - nPos ).GetBuffer() ) ) );
}
}
}
else if( argv[ i ] )
- pList->Insert( new String( String::CreateFromAscii( argv[ i ] ) ), LIST_APPEND );
+ pList->push_back( new String( String::CreateFromAscii( argv[ i ] ) ) );
}
return TRUE;
}
@@ -264,9 +261,9 @@ SvCommand::SvCommand( int argc, char ** argv )
StringList aList;
if( ResponseFile( &aList, argc, argv ) )
- for( ULONG i = 1; i < aList.Count(); i++ )
+ for( size_t i = 1; i < aList.size(); i++ )
{
- String aParam( *aList.GetObject( i ) );
+ String aParam( *aList[ i ] );
sal_Unicode aFirstChar( aParam.GetChar(0) );
if( '-' == aFirstChar )
{
@@ -377,9 +374,9 @@ SvCommand::SvCommand( int argc, char ** argv )
}
else if( aParam.EqualsIgnoreCaseAscii( "rsc", 0, 3 ) )
{ // erste Zeile im *.srs File
- if( aList.GetObject( i +1 ) )
+ if( aList[ i + 1 ] )
{
- aSrsLine = ByteString( *aList.GetObject( i +1 ), RTL_TEXTENCODING_UTF8 );
+ aSrsLine = ByteString( *aList[ i +1 ], RTL_TEXTENCODING_UTF8 );
i++;
}
}
@@ -395,7 +392,7 @@ SvCommand::SvCommand( int argc, char ** argv )
}
else
{
- aInFileList.Insert( new String( aParam ), LIST_APPEND );
+ aInFileList.push_back( new String( aParam ) );
}
}
else
@@ -403,12 +400,9 @@ SvCommand::SvCommand( int argc, char ** argv )
printf( "%s", CommandLineSyntax );
}
- String * pStr = aList.First();
- while( pStr )
- {
- delete pStr;
- pStr = aList.Next();
- }
+ for ( size_t i = 0, n = aList.size(); i < n; ++i )
+ delete aList[ i ];
+ aList.clear();
ByteString aInc( getenv( "INCLUDE" ) );
// Include Environmentvariable anhaengen
@@ -430,8 +424,9 @@ SvCommand::SvCommand( int argc, char ** argv )
SvCommand::~SvCommand()
{
// ByteString Liste freigeben
- String * pStr;
- while( NULL != (pStr = aInFileList.Remove()) )
- delete pStr;
+ for ( size_t i = 0, n = aInFileList.size(); i < n; ++i )
+ delete aInFileList[ i ];
+ aInFileList.clear();
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index cc4e5d48c0..9c2be5f932 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -42,19 +43,6 @@
|*
|* Beschreibung
*************************************************************************/
-/*
-void PrimeNumber(){
- USHORT i, n;
- for( i = 5001; i < 5500; i += 2 ){
- for( n = 2; n < i && ((i % n) != 0); n++ );
- if( n == i ){
- printf( "\nPrimzahl: %d\n", i );
- return;
- }
- }
-}
-*/
-
SvIdlDataBase::SvIdlDataBase( const SvCommand& rCmd )
: bExport( FALSE )
, nUniqueId( 0 )
@@ -63,7 +51,6 @@ SvIdlDataBase::SvIdlDataBase( const SvCommand& rCmd )
, aPersStream( *IDLAPP->pClassMgr, NULL )
, pIdTable( NULL )
{
- //PrimeNumber();
}
/*************************************************************************
@@ -73,12 +60,10 @@ SvIdlDataBase::SvIdlDataBase( const SvCommand& rCmd )
*************************************************************************/
SvIdlDataBase::~SvIdlDataBase()
{
- String * pStr = aIdFileList.First();
- while( pStr )
- {
- delete pStr;
- pStr = aIdFileList.Next();
- }
+ for ( size_t i = 0, n = aIdFileList.size(); i < n; ++i )
+ delete aIdFileList[ i ];
+ aIdFileList.clear();
+
delete pIdTable;
}
@@ -131,10 +116,6 @@ SvMetaTypeMemberList & SvIdlDataBase::GetTypeList()
|*
|* SvIdlDataBase::GetModuleInfo()
|*
-|* Beschreibung
-|* Ersterstellung MM 13.12.94
-|* Letzte Aenderung MM 13.12.94
-|*
*************************************************************************/
SvMetaModule * SvIdlDataBase::GetModule( const ByteString & rName )
{
@@ -319,15 +300,11 @@ BOOL SvIdlDataBase::ReadIdFile( const String & rFileName )
DirEntry aFullName( rFileName );
aFullName.Find( GetPath() );
- String * pIdFile = aIdFileList.First();
- while( pIdFile )
- {
- if( *pIdFile == rFileName )
- return TRUE; // schon eingelesen
- pIdFile = aIdFileList.Next();
- }
+ for ( size_t i = 0, n = aIdFileList.size(); i < n; ++i )
+ if ( *aIdFileList[ i ] == rFileName )
+ return TRUE;
- aIdFileList.Insert( new String( rFileName ), LIST_APPEND );
+ aIdFileList.push_back( new String( rFileName ) );
SvTokenStream aTokStm( aFullName.GetFull() );
if( aTokStm.GetStream().GetError() == SVSTREAM_OK )
@@ -518,10 +495,7 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
}
}
}
-/*
- SvMetaTypeList aTmpTypeList;
- if( FillTypeList( aTmpTypeList, pTok ) )
-*/
+
if( pTok->IsIdentifier() )
{
ByteString aName = pTok->GetString();
@@ -553,21 +527,7 @@ SvMetaType * SvIdlDataBase::ReadKnownType( SvTokenStream & rInStm )
bSet = TRUE;
}
}
- /*
- SvMetaType * pMetaType = aTmpTypeList.First();
- while( pMetaType )
- {
- if( pMetaType->GetIn() == bIn
- && pMetaType->GetOut() == bOut
- && pMetaType->GetCall0() == nCall0
- && pMetaType->GetCall1() == nCall1 )
- {
- return pMetaType;
- }
- pMetaType = aTmpTypeList.Next();
- }
- */
- //SvMetaType * pType = aTmpTypeList.First();
+
if( !bSet )
// Ist genau dieser Typ
return pType;
@@ -607,22 +567,7 @@ SvMetaAttribute * SvIdlDataBase::ReadKnownAttr
if( !pType )
pType = ReadKnownType( rInStm );
- if( pType )
- {
- // Wenn wir Slots auf die Wiese stellen, d"urfen wir nicht voraussetzen,
- // da\s jeder Slot einen anderen Namen hat!
-/*
- SvToken * pTok = rInStm.GetToken_Next();
- if( pTok->IsIdentifier() )
- for( ULONG n = 0; n < aAttrList.Count(); n++ )
- {
- SvMetaAttribute * pAttr = aAttrList.GetObject( n );
- if( pAttr->GetName() == pTok->GetString() )
- return pAttr;
- }
-*/
- }
- else
+ if( !pType )
{
// sonst SlotId?
SvToken * pTok = rInStm.GetToken_Next();
@@ -897,15 +842,14 @@ BOOL SvIdlWorkingBase::WriteSvIdl( SvStream & rOutStm )
if( GetIdTable() )
{
GetIdTable()->FillHashList( &aList );
- SvStringHashEntry * pEntry = aList.First();
- while( pEntry )
+ for ( size_t i = 0, n = aList.size(); i < n; ++i )
{
+ SvStringHashEntry* pEntry = aList[ i ];
rOutStm << "#define " << pEntry->GetName().GetBuffer()
<< '\t'
<< ByteString::CreateFromInt64(
pEntry->GetValue() ).GetBuffer()
<< endl;
- pEntry = aList.Next();
}
}
@@ -1036,3 +980,4 @@ BOOL SvIdlWorkingBase::WriteDocumentation( SvStream & rOutStm )
#endif // IDL_COMPILER
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index f28b403253..b774046965 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -86,10 +87,6 @@ IdlDll::~IdlDll()
|*
|* SvGlobalHashNames::SvGlobalHashNames()
|*
-|* Beschreibung
-|* Ersterstellung MM 08.08.91
-|* Letzte Aenderung MM 08.08.91
-|*
*************************************************************************/
inline SvStringHashEntry * INS( const ByteString & rName )
{
@@ -187,3 +184,4 @@ SvGlobalHashNames::SvGlobalHashNames()
A_ENTRY(UnoName)
{}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index caa90f0818..70c6cd3e96 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -84,13 +85,6 @@ BOOL FileMove_Impl( const String & rFile1, const String & rFile2, BOOL bImmerVer
aF2.Kill();
return FALSE;
}
-/*
- else
- {
- printf( "%s to %s moved\n",
- rFile2.GetStr(), rFile1.GetStr() );
- }
-*/
return TRUE;
}
return 0 == aF2.Kill();
@@ -109,15 +103,6 @@ int cdecl main ( int argc, char ** argv)
{
#endif
-/*
- pStr = ::ResponseFile( &aCmdLine, argv, argc );
- if( pStr )
- {
- printf( "Cannot open response file <%s>\n", pStr );
- return( 1 );
- };
-*/
-
String aTmpListFile;
String aTmpSlotMapFile;
String aTmpSfxItemFile;
@@ -246,66 +231,6 @@ int cdecl main ( int argc, char ** argv)
fprintf( stderr, "%s\n", aStr.GetBuffer() );
}
}
-/*
- if( nExit == 0 && aCommand.aCallingFile.Len() )
- {
- DirEntry aDE( aCommand.aCallingFile );
- aDE.ToAbs();
- aTmpCallingFile = aDE.GetPath().TempName().GetFull();
- SvFileStream aOutStm( aTmpCallingFile, STREAM_READWRITE | STREAM_TRUNC );
- pDataBase->WriteSbx( aOutStm );
- //pDataBase->Save( aOutStm, aCommand.nFlags | IDL_WRITE_CALLING );
- if( aOutStm.GetError() != SVSTREAM_OK )
- {
- nExit = -1;
- ByteString aStr = "cannot write calling file: ";
- aStr += aCommand.aCallingFile;
- fprintf( stderr, "%s\n", aStr.GetStr() );
- }
- }
- if( nExit == 0 && aCommand.aCxxFile.Len() )
- {
- DirEntry aDE( aCommand.aCxxFile );
- aDE.ToAbs();
- aTmpCxxFile = aDE.GetPath().TempName().GetFull();
- SvFileStream aOutStm( aTmpCxxFile, STREAM_READWRITE | STREAM_TRUNC );
-
- aOutStm << "#pragma hdrstop" << endl;
- aOutStm << "#include <";
- if( aCommand.aHxxFile.Len() )
- aOutStm << DirEntry(aCommand.aHxxFile).GetName().GetBuffer();
- else
- {
- DirEntry aDE( aCommand.aCxxFile );
- aDE.SetExtension( "hxx" );
- aOutStm << aDE.GetName().GetBuffer);
- }
- aOutStm << '>' << endl;
- if( !pDataBase->WriteCxx( aOutStm ) )
- {
- nExit = -1;
- ByteString aStr = "cannot write cxx file: ";
- aStr += ByteString( aCommand.aCxxFile, RTL_TEXTENCODING_UTF8 );
- fprintf( stderr, "%s\n", aStr.GetBuffer() );
- }
- }
- if( nExit == 0 && aCommand.aHxxFile.Len() )
- {
- DirEntry aDE( aCommand.aHxxFile );
- aDE.ToAbs();
- aTmpHxxFile = aDE.GetPath().TempName().GetFull();
- SvFileStream aOutStm( aTmpHxxFile, STREAM_READWRITE | STREAM_TRUNC );
-
- aOutStm << "#include <somisc.hxx>" << endl;
- if( !pDataBase->WriteHxx( aOutStm ) )
- {
- nExit = -1;
- ByteString aStr = "cannot write cxx file: ";
- aStr += ByteString( aCommand.aHxxFile, RTL_TEXTENCODING_UTF8 );
- fprintf( stderr, "%s\n", aStr.GetBuffer() );
- }
- }
- */
}
else
nExit = -1;
@@ -445,3 +370,4 @@ int cdecl main ( int argc, char ** argv)
return nExit;
}
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/idl/util/idlpch.cxx b/idl/util/idlpch.cxx
index e9a5f75fe8..4df0e9a073 100644
--- a/idl/util/idlpch.cxx
+++ b/idl/util/idlpch.cxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -47,3 +48,4 @@
#include <module.hxx>
#include <database.hxx>
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */