diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-03-15 08:14:04 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-03-15 08:14:04 +0000 |
| commit | 5134565fcbc299c7a0dd4b73a2d902f2e4d34678 (patch) | |
| tree | a2de45b6bfb860d8ce4cf8dfc0a3b4bf877f8330 /codemaker | |
| parent | f14849d7800f2d481f0b86b4bf99680083db3746 (diff) | |
INTEGRATION: CWS jsc3 (1.8.14); FILE MERGED
2006/02/17 16:44:57 jsc 1.8.14.4: #i56247# exchange forward declaration with include
2006/02/17 15:58:18 jsc 1.8.14.3: #62183# re- declare ambiguous base interface methods
2006/01/20 13:39:08 jsc 1.8.14.2: RESYNC: (1.8-1.9); FILE MERGED
2006/01/20 13:01:46 jsc 1.8.14.1: #i53950# refactor translateIdentifier to translateUnoToCppIdentifer
Diffstat (limited to 'codemaker')
| -rw-r--r-- | codemaker/source/cppumaker/cpputype.hxx | 34 |
1 files changed, 25 insertions, 9 deletions
diff --git a/codemaker/source/cppumaker/cpputype.hxx b/codemaker/source/cppumaker/cpputype.hxx index b3b0fa8812ee..2b7be1d204a5 100644 --- a/codemaker/source/cppumaker/cpputype.hxx +++ b/codemaker/source/cppumaker/cpputype.hxx @@ -4,9 +4,9 @@ * * $RCSfile: cpputype.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2006-01-10 15:46:47 $ + * last change: $Author: vg $ $Date: 2006-03-15 09:14:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -33,16 +33,30 @@ * ************************************************************************/ -#ifndef _CPPUMAKER_CPPUTYPE_HXX_ -#define _CPPUMAKER_CPPUTYPE_HXX_ +#ifndef INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_CPPUTYPE_HXX +#define INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_CPPUTYPE_HXX +#ifndef INCLUDED_CODEMAKER_DEPENDENCIES_HXX #include "codemaker/dependencies.hxx" +#endif +#ifndef INCLUDED_CODEMAKER_OPTIONS_HXX #include "codemaker/options.hxx" +#endif +#ifndef INCLUDED_CODEMAKER_TYPEMANAGER_HXX #include "codemaker/typemanager.hxx" - +#endif +#ifndef INCLUDED_CODEMAKER_COMMONCPP_HXX +#include "codemaker/commoncpp.hxx" +#endif +#ifndef INCLUDED_regisry_reader_hxx #include "registry/reader.hxx" +#endif +#ifndef INCLUDED_registry_types_h #include "registry/types.h" +#endif +#ifndef _RTL_STRING_HXX_ #include "rtl/string.hxx" +#endif namespace rtl { class OUString; } namespace codemaker { @@ -115,7 +129,7 @@ protected: ::rtl::OString checkRealBaseType(const ::rtl::OString& type, sal_Bool bResolveTypeOnly = sal_False) const; void dumpCppuGetTypeMemberDecl(FileStream& o, CppuTypeDecl eDeclFlag); - bool isGlobal() const; + codemaker::cpp::IdentifierTranslationMode isGlobal() const; virtual void addSpecialDependencies() {} @@ -176,6 +190,8 @@ public: sal_Bool dumpHFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); sal_Bool dumpHxxFile(FileStream& o, codemaker::cppumaker::Includes & includes) throw( CannotDumpException ); + void InterfaceType::dumpAmbiguousBaseInterfaces(FileStream& o); + void dumpAttributes(FileStream& o); void dumpMethods(FileStream& o); void dumpNormalGetCppuType(FileStream& o); @@ -408,8 +424,8 @@ bool produceType(RegistryKey& typeName, bool bIsExtraType, * scoping of this type, e.g. com:.sun::star::uno::XInterface. If the scope of * the type is equal scope, the relativ name will be used. */ -::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type, - sal_Bool bNoNameSpace=sal_False); +// ::rtl::OString scopedName(const ::rtl::OString& scope, const ::rtl::OString& type, +// sal_Bool bNoNameSpace=sal_False); -#endif // _CPPUMAKER_CPPUTYPE_HXX_ +#endif // INCLUDED_CODEMAKER_SOURCE_CPPUMAKER_CPPUTYPE_HXX |