Forbid old-style services/singletons inheriting new-style services

...does not make sense.  Adapted some old-style services accordingly, where the
inherited service had been changed to new-style after the fact.

Change-Id: I5f3e4ddf99160778a319062a6c84f83529ff177b

1 files changed, 9 insertions, 0 deletions

diff --git a/idlc/inc/idlc/astservice.hxx b/idlc/inc/idlc/astservice.hxx
index 6760462a4c22..d3e0b643b5d9 100644
--- a/idlc/inc/idlc/astservice.hxx
+++ b/idlc/inc/idlc/astservice.hxx
@@ -29,22 +29,31 @@ public:
     AstService(const ::rtl::OString& name, AstScope* pScope)
         : AstDeclaration(NT_service, name, pScope)
         , AstScope(NT_service)
+        , m_singleInterfaceBasedService(false)
         , m_defaultConstructor(false)
         {}
     AstService(const NodeType type, const ::rtl::OString& name, AstScope* pScope)
         : AstDeclaration(type, name, pScope)
         , AstScope(type)
+        , m_singleInterfaceBasedService(false)
         , m_defaultConstructor(false)
         {}
     virtual ~AstService() {}
 
     virtual sal_Bool dump(RegistryKey& rKey);
 
+    void setSingleInterfaceBasedService()
+    { m_singleInterfaceBasedService = true; }
+
     void setDefaultConstructor(bool b) { m_defaultConstructor = b; }
 
+    bool isSingleInterfaceBasedService() const
+    { return m_singleInterfaceBasedService; }
+
     bool checkLastConstructor() const;
 
 private:
+    bool m_singleInterfaceBasedService;
     bool m_defaultConstructor;
 };