From 8e2ae4afca72cda9aab8cfe4a5852c4202eed5a7 Mon Sep 17 00:00:00 2001 From: "J. Graeme Lingard" Date: Tue, 5 Oct 2010 22:17:11 +0100 Subject: Remove redundant #include directives & comments --- idl/inc/object.hxx | 1 - 1 file changed, 1 deletion(-) (limited to 'idl/inc') diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 377c5bf0a959..592c122cd798 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -29,7 +29,6 @@ #define _OBJECT_HXX #define _SVSTDARR_ULONGS -//#include #include #include -- cgit From 8694d2bc19ea6b531e85ac8135de34dc99956bca Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Tue, 12 Oct 2010 15:53:47 +0200 Subject: Add vim/emacs modelines to all source files Fixes #fdo30794 Based on bin/add-modelines script (originally posted in mail 1286706307.1871.1399280959@webmail.messagingengine.com) Signed-off-by: Sebastian Spaeth --- idl/inc/pch/precompiled_idl.cxx | 2 ++ 1 file changed, 2 insertions(+) (limited to 'idl/inc') diff --git a/idl/inc/pch/precompiled_idl.cxx b/idl/inc/pch/precompiled_idl.cxx index 7ab1f99c4750..7515c4ededbc 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: */ -- cgit From 758c8774fbbd09c4202c0744c06945e3cf7e1a99 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 27 Oct 2010 13:11:31 +0100 Subject: add modelines to .hxx files as well --- idl/inc/attrib.hxx | 2 ++ idl/inc/basobj.hxx | 2 ++ idl/inc/bastype.hxx | 2 ++ idl/inc/char.hxx | 3 +++ idl/inc/command.hxx | 2 ++ idl/inc/database.hxx | 2 ++ idl/inc/globals.hxx | 2 ++ idl/inc/hash.hxx | 3 +++ idl/inc/lex.hxx | 2 ++ idl/inc/module.hxx | 2 ++ idl/inc/object.hxx | 2 ++ idl/inc/pch/precompiled_idl.hxx | 2 ++ idl/inc/slot.hxx | 3 +++ idl/inc/types.hxx | 2 ++ 14 files changed, 31 insertions(+) (limited to 'idl/inc') diff --git a/idl/inc/attrib.hxx b/idl/inc/attrib.hxx index 1dfbaea7f4bb..ca7399304f0e 100644 --- a/idl/inc/attrib.hxx +++ b/idl/inc/attrib.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. @@ -75,3 +76,4 @@ public: #endif // IDL_COMPILER #endif // _ATTRIB_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index f6705dae8be6..134c62880234 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. @@ -292,3 +293,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 99d14ac93432..bc9c8867377e 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 fc8045f0ba54..f27eb1028965 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 53512f4854d8..44c221ff4e22 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. @@ -76,3 +77,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 0f207b64aef8..1127ed60b7e5 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 c3e841df05d6..525c2a9e27e2 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 2749181d5966..340b00c63522 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. @@ -123,3 +124,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 b42a7ce4b0f2..a2553e063316 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 d35ed24affc2..fb9cff7e3b74 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. @@ -115,3 +116,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 592c122cd798..129f888c35b6 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. @@ -167,3 +168,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.hxx b/idl/inc/pch/precompiled_idl.hxx index 3f2ba013434e..977fd5d3b09e 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 e44df5bd5af6..d185b8acfbea 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 5393981a7a4f..d4539ae47c70 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: */ -- cgit From cdd425de05e1a6098a732115014b258e2a69a076 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Tue, 28 Dec 2010 07:16:01 -0800 Subject: Remove DECLARE_LIST(SvAttributeListImpl,SvAttribute*) --- idl/inc/attrib.hxx | 79 ------------------------------------------------------ idl/inc/basobj.hxx | 28 ++----------------- 2 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 idl/inc/attrib.hxx (limited to 'idl/inc') diff --git a/idl/inc/attrib.hxx b/idl/inc/attrib.hxx deleted file mode 100644 index ca7399304f0e..000000000000 --- a/idl/inc/attrib.hxx +++ /dev/null @@ -1,79 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _ATTRIB_HXX -#define _ATTRIB_HXX - -#ifdef IDL_COMPILER -#include -#include - -/******************** class SvAttribute **********************************/ -class SvAttribute -{ - SvStringHashEntryRef aName; - CreateMetaObjectType pCreateMethod; - SvMetaObjectRef aTmpClass; -public: - SvAttribute( SvStringHashEntry * pAttribName, - CreateMetaObjectType pMethod ) - : aName( pAttribName ), - pCreateMethod( pMethod ) {} - - SvMetaObjectRef CreateClass() - { - if( aTmpClass.Is() ) - { - SvMetaObjectRef aTmp( aTmpClass ); - aTmpClass.Clear(); - return aTmp; - } - return pCreateMethod(); - } -}; - -#define SV_ATTRIBUTE( AttributeName, PostfixClassName ) \ - SvAttribute( SvHash_##AttributeName(), \ - SvMeta##PostfixClassName::Create ) - -/******************** class SvAttributeList ******************************/ -DECLARE_LIST(SvAttributeListImpl,SvAttribute*) -class SvAttributeList : public SvAttributeListImpl -{ -public: - SvAttributeList() : SvAttributeListImpl() {} - - void Append( SvAttribute * pObj ) - { Insert( pObj, LIST_APPEND ); } -}; - - -#endif // IDL_COMPILER -#endif // _ATTRIB_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index 134c62880234..f029b71b4cc8 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -60,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 { @@ -121,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 *) -- cgit From 2e2bcb6cb9310e8c995f0b03ce1bf990dd03292f Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Tue, 28 Dec 2010 18:02:06 -0800 Subject: Remove DECLARE_LIST( StringList, String * ) --- idl/inc/command.hxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'idl/inc') diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx index 44c221ff4e22..c2d6adfc60a9 100644 --- a/idl/inc/command.hxx +++ b/idl/inc/command.hxx @@ -32,10 +32,11 @@ #include #include +#include #ifndef STRING_LIST #define STRING_LIST -DECLARE_LIST( StringList, String * ) +typedef ::std::vector< String* > StringList; #endif DECLARE_LIST( ByteStringList, ByteString* ) -- cgit From 3d23bcf8ae7645cd9752cbb66fb046e4b0913107 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Tue, 28 Dec 2010 18:25:01 -0800 Subject: Remove DECLARE_LIST( ByteStringList, ByteString* ) I also removed some commented out code. --- idl/inc/command.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'idl/inc') diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx index c2d6adfc60a9..8332569453c7 100644 --- a/idl/inc/command.hxx +++ b/idl/inc/command.hxx @@ -39,7 +39,7 @@ typedef ::std::vector< String* > StringList; #endif -DECLARE_LIST( ByteStringList, ByteString* ) +typedef ::std::vector< ByteString* > ByteStringList; /******************** class SvCommand ************************************/ class SvCommand -- cgit From 0e5c03764b8433cc0454aaa0058eef5e1e063031 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Tue, 28 Dec 2010 21:50:36 -0800 Subject: Remove DECLARE_LIST(SvStringHashList,SvStringHashEntry *) --- idl/inc/hash.hxx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx index 340b00c63522..8f13536265ce 100644 --- a/idl/inc/hash.hxx +++ b/idl/inc/hash.hxx @@ -29,10 +29,9 @@ #ifndef _HASH_HXX #define _HASH_HXX - - #include #include +#include /****************** H a s h - T a b l e **********************************/ class SvHashTable @@ -99,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; -- cgit From 4c9bf4e47b00861b74ccc12497f925da2a5f7c41 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Wed, 29 Dec 2010 08:15:59 -0800 Subject: Remove DECLARE_LIST( SvNamePosList, SvNamePos *) --- idl/inc/module.hxx | 2 -- 1 file changed, 2 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index fb9cff7e3b74..1bea395d41be 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -40,7 +40,6 @@ struct SvNamePos : aUUId( rName ) , nStmPos( nPos ) {} }; -DECLARE_LIST( SvNamePosList, SvNamePos *) /******************** class SvMetaModule *********************************/ class SvMetaModule : public SvMetaExtern @@ -97,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 ); -- cgit From 20f160082c72176f0771694fc0cbb89b78b1e1fb Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Thu, 30 Dec 2010 07:02:52 -0800 Subject: Remove DECLARE_LIST( SvMetaClassList, SvMetaClass* ) --- idl/inc/object.hxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 129f888c35b6..ee8d88a2c418 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -32,6 +32,7 @@ #define _SVSTDARR_ULONGS #include #include +#include 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 -- cgit From ab7324559877ca1fd18178e1a41f821d0dfe4be3 Mon Sep 17 00:00:00 2001 From: Michael Münch Date: Sun, 13 Feb 2011 18:06:10 +0100 Subject: Easy hack: idl removed and translated comments --- idl/inc/basobj.hxx | 7 +------ idl/inc/bastype.hxx | 15 +-------------- idl/inc/char.hxx | 1 - idl/inc/command.hxx | 1 - idl/inc/database.hxx | 10 +++------- idl/inc/hash.hxx | 7 ++----- idl/inc/lex.hxx | 26 +++++++------------------- idl/inc/module.hxx | 3 +-- idl/inc/object.hxx | 2 -- idl/inc/slot.hxx | 13 +++---------- idl/inc/types.hxx | 20 +++----------------- 11 files changed, 21 insertions(+), 84 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index f029b71b4cc8..2db45be5f523 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -59,7 +59,6 @@ enum }; typedef int WriteAttribute; -/******************** Meta Factory **************************************/ #define SV_DECL_META_FACTORY( Class, CLASS_ID ) \ SV_DECL_PERSIST( Class, CLASS_ID ) @@ -74,7 +73,6 @@ typedef int WriteAttribute; #define SV_IMPL_META_FACTORY1( Class, Super1 ) \ SV_IMPL_PERSIST1( Class, Super1 ) -/******************** class SvMetaObject ********************************/ class SvMetaObject : public SvPersistBase { public: @@ -128,7 +126,6 @@ public: } }; -/******************** class SvMetaName **********************************/ class SvMetaName : public SvMetaObject { SvString aName; @@ -180,7 +177,6 @@ SV_DECL_IMPL_REF(SvMetaName) SV_DECL_IMPL_PERSIST_LIST(SvMetaName,SvMetaName *) -/******************** class SvMetaReference *****************************/ SV_DECL_REF(SvMetaReference) class SvMetaReference : public SvMetaName { @@ -229,11 +225,10 @@ SV_IMPL_REF(SvMetaReference) SV_DECL_IMPL_PERSIST_LIST(SvMetaReference,SvMetaReference *) -/******************** class SvMetaExtern *********************************/ class SvMetaModule; class SvMetaExtern : public SvMetaReference { - SvMetaModule * pModule; // in welchem Modul enthalten + SvMetaModule * pModule; // included in which module SvUUId aUUId; SvVersion aVersion; diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx index bc9c8867377e..79290a46c39b 100644 --- a/idl/inc/bastype.hxx +++ b/idl/inc/bastype.hxx @@ -40,7 +40,6 @@ class SvStringHashEntry; class SvIdlDataBase; class SvTokenStream; -/******************** class SvUINT32 **********************************/ class SvUINT32 { UINT32 nVal; @@ -61,7 +60,6 @@ public: }; -/******************** class SvINT16 **********************************/ class SvINT16 { short nVal; @@ -79,7 +77,6 @@ public: }; -/******************** class SvUINT16 **********************************/ class SvUINT16 { USHORT nVal; @@ -97,7 +94,6 @@ public: }; -/******************** class SvINT32 **********************************/ class SvINT32 { INT32 nVal; @@ -115,7 +111,6 @@ public: }; -/******************** class Svint **********************************/ class Svint { int nVal; @@ -136,7 +131,6 @@ public: }; -/******************** class SvBOOL **********************************/ class SvBOOL { BOOL nVal:1, @@ -165,7 +159,6 @@ public: }; -/******************** class SvIdentifier **********************************/ class SvIdentifier : public ByteString { public: @@ -184,11 +177,10 @@ public: }; -/******************** class SvIdentifier **********************************/ class SvNumberIdentifier : public SvIdentifier { UINT32 nValue; - // darf nicht benutzt werden + // must not be used BOOL ReadSvIdl( SvStringHashEntry * pName, SvTokenStream & rInStm ); public: SvNumberIdentifier() : nValue( 0 ) {}; @@ -209,7 +201,6 @@ public: }; -/******************** class SvString **********************************/ class SvString : public ByteString { public: @@ -228,7 +219,6 @@ public: }; -/******************** class SvHelpText **********************************/ class SvHelpText : public SvString { public: @@ -241,12 +231,10 @@ public: }; -/******************** class SvHelpContext *******************************/ class SvHelpContext : public SvNumberIdentifier { }; -/******************** class SvUUId *************************************/ class SvUUId : public SvGlobalName { public: @@ -258,7 +246,6 @@ public: }; -/******************** class SvVersion **********************************/ class SvVersion { USHORT nMajorVersion; diff --git a/idl/inc/char.hxx b/idl/inc/char.hxx index f27eb1028965..0c0528d08a98 100644 --- a/idl/inc/char.hxx +++ b/idl/inc/char.hxx @@ -31,7 +31,6 @@ #include -/******************* T y p e s *******************************************/ class SvChar { public: diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx index 8332569453c7..3162bcc126b2 100644 --- a/idl/inc/command.hxx +++ b/idl/inc/command.hxx @@ -41,7 +41,6 @@ typedef ::std::vector< String* > StringList; typedef ::std::vector< ByteString* > ByteStringList; -/******************** class SvCommand ************************************/ class SvCommand { public: diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx index 1127ed60b7e5..8d28bb0ce349 100644 --- a/idl/inc/database.hxx +++ b/idl/inc/database.hxx @@ -34,13 +34,10 @@ #include #include -/************************************************************************* -*************************************************************************/ - class SvCommand; #ifdef IDL_COMPILER -/******************** class SvIdlError ***********************************/ + class SvIdlError { ByteString aText; @@ -64,7 +61,6 @@ public: }; #endif -/******************** class SvIdlDataBase ********************************/ class SvIdlDataBase { BOOL bExport; @@ -82,7 +78,7 @@ class SvIdlDataBase SvMetaClassMemberList aClassList; SvMetaModuleMemberList aModuleList; SvMetaAttributeMemberList aAttrList; - SvMetaTypeMemberList aTmpTypeList; // nicht Persistent + SvMetaTypeMemberList aTmpTypeList; // not persistent protected: #ifdef IDL_COMPILER @@ -111,7 +107,7 @@ public: SvMetaModuleMemberList & GetModuleList() { return aModuleList; } SvMetaModule * GetModule( const ByteString & rName ); - // Liste der benutzten Typen beim Schreiben + // list of used types while writing SvMetaTypeMemberList aUsedTypes; ByteString aIFaceName; SvNumberIdentifier aStructSlotId; diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx index 8f13536265ce..41ee6db65c65 100644 --- a/idl/inc/hash.hxx +++ b/idl/inc/hash.hxx @@ -33,13 +33,12 @@ #include #include -/****************** H a s h - T a b l e **********************************/ class SvHashTable { UINT32 nMax; // size of hash-tabel UINT32 nFill; // elements in hash-tabel - UINT32 lAsk; // Anzahl der Anfragen - UINT32 lTry; // Anzahl der Versuche + UINT32 lAsk; // number of requests + UINT32 lTry; // number of tries protected: BOOL Test_Insert( const void *, BOOL bInsert, UINT32 * pInsertPos ); @@ -56,7 +55,6 @@ public: virtual BOOL IsEntry( UINT32 ) const = 0; }; -/************** S t r i n g H a s h T a b l e E n t r y ******************/ class SvStringHashTable; class SvStringHashEntry : public SvRefBase { @@ -97,7 +95,6 @@ public: SV_DECL_IMPL_REF(SvStringHashEntry) -/****************** S t r i n g H a s h T a b l e ************************/ typedef ::std::vector< SvStringHashEntry* > SvStringHashList; class SvStringHashTable : public SvHashTable diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx index a2553e063316..6578bf2ba03d 100644 --- a/idl/inc/lex.hxx +++ b/idl/inc/lex.hxx @@ -33,14 +33,12 @@ #include #include -/******************** enum ***********************************************/ enum SVTOKEN_ENUM { SVTOKEN_EMPTY, SVTOKEN_COMMENT, SVTOKEN_INTEGER, SVTOKEN_STRING, SVTOKEN_BOOL, SVTOKEN_IDENTIFIER, SVTOKEN_CHAR, SVTOKEN_RTTIBASE, SVTOKEN_EOF, SVTOKEN_HASHID }; -/******************** class SvToken **************************************/ class BigInt; class SvToken { @@ -53,7 +51,6 @@ friend class SvTokenStream; ULONG nLong; BOOL bBool; char cChar; -// SvRttiBase * pComplexObj; SvStringHashEntry * pHash; }; public: @@ -63,7 +60,6 @@ public: SvToken( SVTOKEN_ENUM nTypeP, BOOL b ); SvToken( char c ); SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr ); -// SvToken( SvRttiBase * pComplexObj ); SvToken( SVTOKEN_ENUM nTypeP ); SvToken & operator = ( const SvToken & rObj ); @@ -102,7 +98,6 @@ public: ULONG GetNumber() const { return nLong; } BOOL GetBool() const { return bBool; } char GetChar() const { return cChar; } -// SvRttiBase *GetObject() const { return pComplexObj; } void SetHash( SvStringHashEntry * pHashP ) { pHash = pHashP; nType = SVTOKEN_HASHID; } @@ -128,26 +123,19 @@ inline SvToken::SvToken( char c ) inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr ) : nType( nTypeP ), aString( rStr ) {} -/* -inline SvToken::SvToken( SvRttiBase * pObj ) - : nType( SVTOKEN_RTTIBASE ), pComplexObj( pObj ) - { pObj->AddRef(); } -*/ - inline SvToken::SvToken( SVTOKEN_ENUM nTypeP ) : nType( nTypeP ) {} DECLARE_LIST( SvTokenList, SvToken * ) -/******************** class SvTokenStream ********************************/ class SvTokenStream { ULONG nLine, nColumn; int nBufPos; - int c; // naechstes Zeichen + int c; // next character CharSet nCharSet; - char * pCharTab; // Zeiger auf die Konverierungstabelle - USHORT nTabSize; // Tabulator Laenge + char * pCharTab; // pointer to conversion table + USHORT nTabSize; // length of tabulator ByteString aStrTrue; ByteString aStrFalse; ULONG nMaxPos; @@ -179,7 +167,7 @@ class SvTokenStream } void CalcColumn() { - // wenn Zeilenende berechnung sparen + // if end of line spare calculation if( 0 != c ) { USHORT n = 0; @@ -207,7 +195,7 @@ public: { SvToken * pRetToken = pCurToken; if( NULL == (pCurToken = aTokList.Prev()) ) - // Current Zeiger nie Null + // current pointer never null pCurToken = pRetToken; return pRetToken; @@ -216,14 +204,14 @@ public: { SvToken * pRetToken = pCurToken; if( NULL == (pCurToken = aTokList.Next()) ) - // Current Zeiger nie Null + // current pointer never null pCurToken = pRetToken; SetMax(); return pRetToken; } SvToken * GetToken_Next() { - // Kommentare werden initial entfernt + // comments get removed initially return GetToken_NextAll(); } SvToken * GetToken() const { return pCurToken; } diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx index 1bea395d41be..5d206e0f4794 100644 --- a/idl/inc/module.hxx +++ b/idl/inc/module.hxx @@ -41,13 +41,12 @@ struct SvNamePos , nStmPos( nPos ) {} }; -/******************** class SvMetaModule *********************************/ class SvMetaModule : public SvMetaExtern { SvMetaClassMemberList aClassList; SvMetaTypeMemberList aTypeList; SvMetaAttributeMemberList aAttrList; -// Browser +// browser String aIdlFileName; SvString aHelpFileName; SvString aSlotIdFile; diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index ee8d88a2c418..5b454dc37d6e 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -56,7 +56,6 @@ public: ULONG GetObject( ULONG nPos ){ return (ULONG) List::GetObject( nPos ); } }; -/******************** class SvClassElement *******************************/ SV_DECL_REF(SvMetaClass) class SvClassElement : public SvPersistBase { @@ -86,7 +85,6 @@ public: SV_DECL_IMPL_REF(SvClassElement) SV_DECL_IMPL_PERSIST_LIST(SvClassElement,SvClassElement *) -/******************** class SvMetaClass *********************************/ class SvMetaModule; SV_DECL_PERSIST_LIST(SvMetaClass,SvMetaClass *) class SvMetaClass : public SvMetaType diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index d185b8acfbea..bc8832a60f0b 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -32,8 +32,6 @@ #include #include -/******************** class SvMetaSlot **********************************/ -//class SbxObject; class SvMetaSlotMemberList; class SvMetaSlot : public SvMetaAttribute { @@ -49,15 +47,15 @@ class SvMetaSlot : public SvMetaAttribute SvBOOL aGet; SvBOOL aSet; - SvBOOL aCachable; // exclusiv + SvBOOL aCachable; // exclusive SvBOOL aVolatile; SvBOOL aToggle; SvBOOL aAutoUpdate; - SvBOOL aSynchron; // exclusiv + SvBOOL aSynchron; // exclusive SvBOOL aAsynchron; - SvBOOL aRecordPerItem;// exclusiv + SvBOOL aRecordPerItem;// exclusive SvBOOL aRecordPerSet; SvBOOL aRecordManual; SvBOOL aNoRecord; @@ -202,10 +200,6 @@ public: const ByteString & GetDefault() const; const ByteString & GetDisableFlags() const; BOOL GetPseudoSlots() const; - /* - BOOL GetGet() const; - BOOL GetSet() const; - */ BOOL GetCachable() const; BOOL GetVolatile() const; BOOL GetToggle() const; @@ -242,7 +236,6 @@ public: void ResetSlotPointer() { pNextSlot = pLinkedSlot = 0; } -// void FillSbxObject( SvIdlDataBase & rBase, SbxObject *, BOOL bProp ); #ifdef IDL_COMPILER SvMetaEnumValue* GetEnumValue() const { return pEnumValue; } diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index d4539ae47c70..8c064cd35305 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -35,7 +35,6 @@ class SvSlotElementList; struct SvSlotElement; -/******************** class SvMetaAttribute *****************************/ SV_DECL_REF(SvMetaType) SV_DECL_REF(SvMetaAttribute) SV_DECL_PERSIST_LIST(SvMetaAttribute,SvMetaAttribute *) @@ -105,8 +104,6 @@ public: virtual BOOL IsVariable() const; virtual ByteString GetMangleName( BOOL bVariable ) const; -// void FillSbxObject( SbxInfo * pInfo, USHORT nSbxFlags = 0 ); -// virtual void FillSbxObject( SvIdlDataBase & rBase, SbxObject * pObj, BOOL bVariable ); #ifdef IDL_COMPILER virtual BOOL Test( SvIdlDataBase &, SvTokenStream & rInStm ); @@ -135,14 +132,13 @@ SV_IMPL_REF(SvMetaAttribute) SV_IMPL_PERSIST_LIST(SvMetaAttribute,SvMetaAttribute *) -/******************** class SvType *********************************/ enum { CALL_VALUE, CALL_POINTER, CALL_REFERENCE }; enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM, TYPE_UNION, TYPE_CLASS, TYPE_POINTER }; class SvMetaType : public SvMetaExtern { - SvBOOL aIn; // Eingangsparameter - SvBOOL aOut; // Returnparameter + SvBOOL aIn; // input parameter + SvBOOL aOut; // return parameter Svint aCall0, aCall1; Svint aSbxDataType; SvIdentifier aSvName; @@ -186,7 +182,7 @@ public: SvMetaType( const ByteString & rTypeName, const ByteString & rSbxName, const ByteString & rOdlName, char cParserChar, const ByteString & rCName, const ByteString & rBasicName, - const ByteString & rBasicPostfix/*, SbxDataType nT = SbxEMPTY */); + const ByteString & rBasicPostfix ); SvMetaAttributeMemberList & GetAttrList() const; ULONG GetAttrCount() const @@ -205,10 +201,6 @@ public: BOOL IsItem() const { return bIsItem; } BOOL IsShell() const { return bIsShell; } -// void SetSbxDataType( SbxDataType nT ) -// { aSbxDataType = (int)nT; } -// SbxDataType GetSbxDataType() const; - void SetIn( BOOL b ) { aIn = b; } BOOL GetIn() const; @@ -234,7 +226,6 @@ public: virtual BOOL SetName( const ByteString & rName, SvIdlDataBase * = NULL ); -// void FillSbxObject( SbxVariable * pObj, BOOL bVariable ); #ifdef IDL_COMPILER virtual BOOL ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm ); @@ -249,7 +240,6 @@ public: ULONG MakeSfx( ByteString * pAtrrArray ); virtual void WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm ); - //BOOL ReadTypePrefix( SvIdlDataBase &, SvTokenStream & rInStm ); BOOL ReadMethodArgs( SvIdlDataBase & rBase, SvTokenStream & rInStm ); void WriteTypePrefix( SvIdlDataBase & rBase, SvStream & rOutStm, USHORT nTab, WriteType ); @@ -265,7 +255,6 @@ DECLARE_LIST(SvMetaTypeList,SvMetaType *) SV_DECL_IMPL_PERSIST_LIST(SvMetaType,SvMetaType *) -/******************** class SvTypeString *********************************/ class SvMetaTypeString : public SvMetaType { public: @@ -276,7 +265,6 @@ SV_DECL_IMPL_REF(SvMetaTypeString) SV_DECL_IMPL_PERSIST_LIST(SvMetaTypeString,SvMetaTypeString *) -/******************** class SvMetaEnumValue **********************************/ class SvMetaEnumValue : public SvMetaName { ByteString aEnumValue; @@ -295,7 +283,6 @@ SV_DECL_IMPL_REF(SvMetaEnumValue) SV_DECL_IMPL_PERSIST_LIST(SvMetaEnumValue,SvMetaEnumValue *) -/******************** class SvTypeEnum *********************************/ class SvMetaTypeEnum : public SvMetaType { SvMetaEnumValueMemberList aEnumValueList; @@ -331,7 +318,6 @@ SV_DECL_IMPL_REF(SvMetaTypeEnum) SV_DECL_IMPL_PERSIST_LIST(SvMetaTypeEnum,SvMetaTypeEnum *) -/******************** class SvTypeVoid ***********************************/ class SvMetaTypevoid : public SvMetaType { public: -- cgit From d8369857bbbb75417e4b044fe77a6c87709e7ac0 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Fri, 18 Feb 2011 20:57:55 -0800 Subject: Remove some #include "tools/list.hxx" Plus some trailing whitespace cleanup --- idl/inc/command.hxx | 2 -- 1 file changed, 2 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx index 3162bcc126b2..2882ba07a226 100644 --- a/idl/inc/command.hxx +++ b/idl/inc/command.hxx @@ -29,8 +29,6 @@ #ifndef _COMMAND_HXX #define _COMMAND_HXX - -#include #include #include -- cgit From 62a7aaa25fa8052f80f3bfdd95347104ed69166c Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Fri, 18 Feb 2011 21:14:16 -0800 Subject: Add some #include backing This files still use the DECLARE_LIST() macro. I didn't catch them because they are only compiled during make distclean. --- idl/inc/lex.hxx | 1 + idl/inc/object.hxx | 1 + idl/inc/types.hxx | 1 + 3 files changed, 3 insertions(+) (limited to 'idl/inc') diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx index 6578bf2ba03d..749d109bbf95 100644 --- a/idl/inc/lex.hxx +++ b/idl/inc/lex.hxx @@ -32,6 +32,7 @@ #include #include #include +#include enum SVTOKEN_ENUM { SVTOKEN_EMPTY, SVTOKEN_COMMENT, SVTOKEN_INTEGER, SVTOKEN_STRING, diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 5b454dc37d6e..84965e1cc768 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -33,6 +33,7 @@ #include #include #include +#include struct SvSlotElement { diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 8c064cd35305..d716ac520f62 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -29,6 +29,7 @@ #ifndef _TYPES_HXX #define _TYPES_HXX +#include #include #include -- cgit From b091c9f867b87d085c0353f61b8f03fa7e6cbd2b Mon Sep 17 00:00:00 2001 From: Rafael Dominguez Date: Sun, 27 Feb 2011 21:35:16 -0800 Subject: PATCH 1/2] Remove SvULongs and replace it with std::vector --- idl/inc/object.hxx | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 84965e1cc768..417885184dfb 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -49,14 +49,6 @@ DECLARE_LIST( SvSlotElementList, SvSlotElement* ) class SvMetaClass; typedef ::std::vector< SvMetaClass* > SvMetaClassList; -class SvULongs : public List -{ -public: - void Insert( ULONG& rId, ULONG nPos ) { ULONG nId(rId ); List::Insert( (void*) nId, nPos ); } - void Remove( ULONG& rId ){ ULONG nId(rId ); List::Remove( (void*) nId ); } - ULONG GetObject( ULONG nPos ){ return (ULONG) List::GetObject( nPos ); } -}; - SV_DECL_REF(SvMetaClass) class SvClassElement : public SvPersistBase { @@ -111,7 +103,7 @@ class SvMetaClass : public SvMetaType SvIdlDataBase & rBase, SvStream & rOutStm ); - void InsertSlots( SvSlotElementList& rList, SvULongs& rSuperList, + void InsertSlots( SvSlotElementList& rList, std::vector& rSuperList, SvMetaClassList & rClassList, const ByteString & rPrefix, SvIdlDataBase& rBase ); -- cgit From 632771cc6964a64bb57ed3c5b045012ed80291b9 Mon Sep 17 00:00:00 2001 From: Rafael Dominguez Date: Fri, 4 Mar 2011 07:08:34 -0800 Subject: Remove of DECLARE_LIST. --- idl/inc/types.hxx | 2 -- 1 file changed, 2 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index d716ac520f62..46882af1f85e 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -29,7 +29,6 @@ #ifndef _TYPES_HXX #define _TYPES_HXX -#include #include #include @@ -252,7 +251,6 @@ public: #endif }; SV_IMPL_REF(SvMetaType) -DECLARE_LIST(SvMetaTypeList,SvMetaType *) SV_DECL_IMPL_PERSIST_LIST(SvMetaType,SvMetaType *) -- cgit From 8ca3d48fc6c8167e75f0c19dd67207d5e5ff75c5 Mon Sep 17 00:00:00 2001 From: Rafael Dominguez Date: Fri, 25 Mar 2011 16:58:09 -0430 Subject: Remove DECLARE_LIST( SvSlotElementList, SvSlotElement* ) --- idl/inc/object.hxx | 3 --- idl/inc/slot.hxx | 2 ++ idl/inc/types.hxx | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index d4483da3f6c9..3cbd75081aba 100755 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -29,11 +29,9 @@ #ifndef _OBJECT_HXX #define _OBJECT_HXX -#define _SVSTDARR_ULONGS #include #include #include -#include struct SvSlotElement { @@ -44,7 +42,6 @@ struct SvSlotElement , aPrefix( rPrefix ) {} }; -DECLARE_LIST( SvSlotElementList, SvSlotElement* ) class SvMetaClass; typedef ::std::vector< SvMetaClass* > SvMetaClassList; diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 8363b19db5cd..9b3c2d425557 100755 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -82,6 +82,7 @@ class SvMetaSlot : public SvMetaAttribute void WriteSlot( const ByteString & rShellName, sal_uInt16 nCount, const ByteString & rSlotId, SvSlotElementList &rList, + SvSlotElementList::iterator pCurSlot, const ByteString & rPrefix, SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void Write( SvIdlDataBase & rBase, @@ -255,6 +256,7 @@ public: sal_uInt16 WriteSlotMap( const ByteString & rShellName, sal_uInt16 nCount, SvSlotElementList&, + SvSlotElementList::iterator pCurSlot, const ByteString &, SvIdlDataBase & rBase, SvStream & rOutStm ); diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 4913c21c4870..b37cfd1242c0 100755 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -32,8 +32,8 @@ #include #include -class SvSlotElementList; struct SvSlotElement; +typedef std::vector SvSlotElementList; SV_DECL_REF(SvMetaType) SV_DECL_REF(SvMetaAttribute) -- cgit From 8f19f128bf9221e87e97b82fdab59429d8954633 Mon Sep 17 00:00:00 2001 From: Jan Holesovsky Date: Tue, 29 Mar 2011 18:12:25 +0200 Subject: Revert "Remove DECLARE_LIST( SvSlotElementList, SvSlotElement* )" This reverts commit a06dbfc4d1252d453b737cde32bad2ecc56e56b1. --- idl/inc/object.hxx | 3 +++ idl/inc/slot.hxx | 2 -- idl/inc/types.hxx | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index 3cbd75081aba..d4483da3f6c9 100755 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -29,9 +29,11 @@ #ifndef _OBJECT_HXX #define _OBJECT_HXX +#define _SVSTDARR_ULONGS #include #include #include +#include struct SvSlotElement { @@ -42,6 +44,7 @@ struct SvSlotElement , aPrefix( rPrefix ) {} }; +DECLARE_LIST( SvSlotElementList, SvSlotElement* ) class SvMetaClass; typedef ::std::vector< SvMetaClass* > SvMetaClassList; diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 9b3c2d425557..8363b19db5cd 100755 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -82,7 +82,6 @@ class SvMetaSlot : public SvMetaAttribute void WriteSlot( const ByteString & rShellName, sal_uInt16 nCount, const ByteString & rSlotId, SvSlotElementList &rList, - SvSlotElementList::iterator pCurSlot, const ByteString & rPrefix, SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void Write( SvIdlDataBase & rBase, @@ -256,7 +255,6 @@ public: sal_uInt16 WriteSlotMap( const ByteString & rShellName, sal_uInt16 nCount, SvSlotElementList&, - SvSlotElementList::iterator pCurSlot, const ByteString &, SvIdlDataBase & rBase, SvStream & rOutStm ); diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index b37cfd1242c0..4913c21c4870 100755 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -32,8 +32,8 @@ #include #include +class SvSlotElementList; struct SvSlotElement; -typedef std::vector SvSlotElementList; SV_DECL_REF(SvMetaType) SV_DECL_REF(SvMetaAttribute) -- cgit From e60d365c86b164a4a6940a39377b0b580c9e918d Mon Sep 17 00:00:00 2001 From: Francisco Saito Date: Tue, 29 Mar 2011 21:38:39 +0100 Subject: drop bogus executable flag from [ch]xx/bas/asm files --- idl/inc/basobj.hxx | 0 idl/inc/bastype.hxx | 0 idl/inc/char.hxx | 0 idl/inc/command.hxx | 0 idl/inc/database.hxx | 0 idl/inc/globals.hxx | 0 idl/inc/hash.hxx | 0 idl/inc/lex.hxx | 0 idl/inc/module.hxx | 0 idl/inc/object.hxx | 0 idl/inc/pch/precompiled_idl.cxx | 0 idl/inc/pch/precompiled_idl.hxx | 0 idl/inc/slot.hxx | 0 idl/inc/types.hxx | 0 14 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 idl/inc/basobj.hxx mode change 100755 => 100644 idl/inc/bastype.hxx mode change 100755 => 100644 idl/inc/char.hxx mode change 100755 => 100644 idl/inc/command.hxx mode change 100755 => 100644 idl/inc/database.hxx mode change 100755 => 100644 idl/inc/globals.hxx mode change 100755 => 100644 idl/inc/hash.hxx mode change 100755 => 100644 idl/inc/lex.hxx mode change 100755 => 100644 idl/inc/module.hxx mode change 100755 => 100644 idl/inc/object.hxx mode change 100755 => 100644 idl/inc/pch/precompiled_idl.cxx mode change 100755 => 100644 idl/inc/pch/precompiled_idl.hxx mode change 100755 => 100644 idl/inc/slot.hxx mode change 100755 => 100644 idl/inc/types.hxx (limited to 'idl/inc') diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx old mode 100755 new mode 100644 diff --git a/idl/inc/bastype.hxx b/idl/inc/bastype.hxx old mode 100755 new mode 100644 diff --git a/idl/inc/char.hxx b/idl/inc/char.hxx old mode 100755 new mode 100644 diff --git a/idl/inc/command.hxx b/idl/inc/command.hxx old mode 100755 new mode 100644 diff --git a/idl/inc/database.hxx b/idl/inc/database.hxx old mode 100755 new mode 100644 diff --git a/idl/inc/globals.hxx b/idl/inc/globals.hxx old mode 100755 new mode 100644 diff --git a/idl/inc/hash.hxx b/idl/inc/hash.hxx old mode 100755 new mode 100644 diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx old mode 100755 new mode 100644 diff --git a/idl/inc/module.hxx b/idl/inc/module.hxx old mode 100755 new mode 100644 diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx old mode 100755 new mode 100644 diff --git a/idl/inc/pch/precompiled_idl.cxx b/idl/inc/pch/precompiled_idl.cxx old mode 100755 new mode 100644 diff --git a/idl/inc/pch/precompiled_idl.hxx b/idl/inc/pch/precompiled_idl.hxx old mode 100755 new mode 100644 diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx old mode 100755 new mode 100644 diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx old mode 100755 new mode 100644 -- cgit From e67f849928a00062f4ad0897101c18b89f66985e Mon Sep 17 00:00:00 2001 From: Rafael Dominguez Date: Fri, 25 Mar 2011 15:52:55 -0430 Subject: Remove DECLARE_LIST( SvTokenList, SvToken * ) --- idl/inc/lex.hxx | 102 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 58 insertions(+), 44 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/lex.hxx b/idl/inc/lex.hxx index 253083d7e9e8..3aa22139a4dd 100644 --- a/idl/inc/lex.hxx +++ b/idl/inc/lex.hxx @@ -29,10 +29,11 @@ #ifndef _LEX_HXX #define _LEX_HXX +#include + #include #include #include -#include enum SVTOKEN_ENUM { SVTOKEN_EMPTY, SVTOKEN_COMMENT, SVTOKEN_INTEGER, SVTOKEN_STRING, @@ -127,8 +128,6 @@ inline SvToken::SvToken( SVTOKEN_ENUM nTypeP, const ByteString & rStr ) inline SvToken::SvToken( SVTOKEN_ENUM nTypeP ) : nType( nTypeP ) {} -DECLARE_LIST( SvTokenList, SvToken * ) - class SvTokenStream { sal_uLong nLine, nColumn; @@ -144,8 +143,8 @@ class SvTokenStream SvFileStream * pInStream; SvStream & rInStream; String aFileName; - SvTokenList aTokList; - SvToken * pCurToken; + boost::ptr_vector aTokList; + boost::ptr_vector::iterator pCurToken; void InitCtor(); @@ -192,30 +191,37 @@ public: { nTabSize = nTabSizeP; } sal_uInt16 GetTabSize() const { return nTabSize; } - SvToken * GetToken_PrevAll() - { - SvToken * pRetToken = pCurToken; - if( NULL == (pCurToken = aTokList.Prev()) ) - // current pointer never null - pCurToken = pRetToken; + SvToken* GetToken_PrevAll() + { + boost::ptr_vector::iterator pRetToken = pCurToken; + + // current iterator always valid + if(pCurToken != aTokList.begin()) + --pCurToken; + + return &(*pRetToken); + } + + SvToken* GetToken_NextAll() + { + boost::ptr_vector::iterator pRetToken = pCurToken++; + + if (pCurToken == aTokList.end()) + pCurToken = pRetToken; + + SetMax(); + + return &(*pRetToken); + } + + SvToken* GetToken_Next() + { + // comments get removed initially + return GetToken_NextAll(); + } + + SvToken* GetToken() const { return &(*pCurToken); } - return pRetToken; - } - SvToken * GetToken_NextAll() - { - SvToken * pRetToken = pCurToken; - if( NULL == (pCurToken = aTokList.Next()) ) - // current pointer never null - pCurToken = pRetToken; - SetMax(); - return pRetToken; - } - SvToken * GetToken_Next() - { - // comments get removed initially - return GetToken_NextAll(); - } - SvToken * GetToken() const { return pCurToken; } sal_Bool Read( char cChar ) { if( pCurToken->IsChar() @@ -227,6 +233,7 @@ public: else return sal_False; } + void ReadDelemiter() { if( pCurToken->IsChar() @@ -237,22 +244,29 @@ public: } } - sal_uInt32 Tell() const - { return aTokList.GetCurPos(); } - void Seek( sal_uInt32 nPos ) - { - pCurToken = aTokList.Seek( nPos ); - SetMax(); - } - void SeekRel( sal_Int32 nRelPos ) - { - pCurToken = aTokList.Seek( Tell() + nRelPos ); - SetMax(); - } - void SeekEnd() - { - pCurToken = aTokList.Seek( nMaxPos ); - } + sal_uInt32 Tell() const { return pCurToken-aTokList.begin(); } + + void Seek( sal_uInt32 nPos ) + { + pCurToken = aTokList.begin() + nPos; + SetMax(); + } + + void SeekRel( sal_uInt32 nRelPos ) + { + sal_uInt32 relIdx = Tell() + nRelPos; + + if ( relIdx < aTokList.size()) + { + pCurToken = aTokList.begin()+ (Tell() + nRelPos ); + SetMax(); + } + } + + void SeekEnd() + { + pCurToken = aTokList.begin()+nMaxPos; + } }; -- cgit From ad103b9a90d064f69df03a3a515acc266c267a9e Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Wed, 20 Apr 2011 20:59:37 -0700 Subject: Remove DECLARE_LIST( SvSlotElementList, SvSlotElement* ) Passed: make distclean && make && make check --- idl/inc/object.hxx | 2 +- idl/inc/slot.hxx | 2 ++ idl/inc/types.hxx | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 'idl/inc') diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index d4483da3f6c9..ad169f5e5bf9 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -44,7 +44,7 @@ struct SvSlotElement , aPrefix( rPrefix ) {} }; -DECLARE_LIST( SvSlotElementList, SvSlotElement* ) +typedef std::vector< SvSlotElement* > SvSlotElementList; class SvMetaClass; typedef ::std::vector< SvMetaClass* > SvMetaClassList; diff --git a/idl/inc/slot.hxx b/idl/inc/slot.hxx index 8363b19db5cd..b4036ea2ff2d 100644 --- a/idl/inc/slot.hxx +++ b/idl/inc/slot.hxx @@ -82,6 +82,7 @@ class SvMetaSlot : public SvMetaAttribute void WriteSlot( const ByteString & rShellName, sal_uInt16 nCount, const ByteString & rSlotId, SvSlotElementList &rList, + size_t nStart, const ByteString & rPrefix, SvIdlDataBase & rBase, SvStream & rOutStm ); virtual void Write( SvIdlDataBase & rBase, @@ -255,6 +256,7 @@ public: sal_uInt16 WriteSlotMap( const ByteString & rShellName, sal_uInt16 nCount, SvSlotElementList&, + size_t nStart, const ByteString &, SvIdlDataBase & rBase, SvStream & rOutStm ); diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx index 4913c21c4870..e4f405d9e693 100644 --- a/idl/inc/types.hxx +++ b/idl/inc/types.hxx @@ -32,8 +32,8 @@ #include #include -class SvSlotElementList; struct SvSlotElement; +typedef std::vector< SvSlotElement* > SvSlotElementList; SV_DECL_REF(SvMetaType) SV_DECL_REF(SvMetaAttribute) -- cgit From ce6738ec7b674dc0ab6202d6f8ae252cfdd8c328 Mon Sep 17 00:00:00 2001 From: Joseph Powers Date: Sat, 30 Apr 2011 08:03:30 -0700 Subject: Remove unneed include of --- idl/inc/object.hxx | 1 - 1 file changed, 1 deletion(-) (limited to 'idl/inc') diff --git a/idl/inc/object.hxx b/idl/inc/object.hxx index ad169f5e5bf9..a39c7e917d60 100644 --- a/idl/inc/object.hxx +++ b/idl/inc/object.hxx @@ -33,7 +33,6 @@ #include #include #include -#include struct SvSlotElement { -- cgit