diff --git a/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk
index 33df554c3d48..17f60623c959 100644
--- a/codemaker/Module_codemaker.mk
+++ b/codemaker/Module_codemaker.mk
@@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,codemaker,\
 endif
 
 $(eval $(call gb_Module_add_check_targets,codemaker,\
-    PythonTest_codemaker_python \
+    Test_codemaker \
 ))
 
 # vim:set noet sw=4 ts=4:
diff --git a/codemaker/PythonTest_codemaker_python.mk b/codemaker/PythonTest_codemaker_python.mk
deleted file mode 100644
index be453aa5eedf..000000000000
--- a/codemaker/PythonTest_codemaker_python.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_PythonTest_PythonTest,codemaker_python))
-$(eval $(call gb_PythonTest_add_modules,codemaker_python,$(SRCDIR)/codemaker/tests/pythonmaker,\
-	test_pythonmaker \
-))
-
-$(call gb_PythonTest_get_target,codemaker_python): $(call gb_Executable_get_target,pythonmaker)
-
-# vim: set noet sw=4 ts=4:
diff --git a/codemaker/Test_codemaker.mk b/codemaker/Test_codemaker.mk
new file mode 100644
index 000000000000..bc4a7cf69fb7
--- /dev/null
+++ b/codemaker/Test_codemaker.mk
@@ -0,0 +1,20 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+# Golden-file tests for both cppumaker and pythonmaker (see README.md there)
+$(eval $(call gb_PythonTest_PythonTest,codemaker))
+$(eval $(call gb_PythonTest_add_modules,codemaker,$(SRCDIR)/codemaker/tests,\
+	codemakertests \
+))
+
+$(call gb_PythonTest_get_target,codemaker): \
+	$(call gb_Executable_get_target,cppumaker) \
+	$(call gb_Executable_get_target,pythonmaker)
+
+# vim: set noet sw=4 ts=4:
diff --git a/codemaker/tests/Readme.md b/codemaker/tests/Readme.md
new file mode 100644
index 000000000000..e473616c87f6
--- /dev/null
+++ b/codemaker/tests/Readme.md
@@ -0,0 +1,94 @@
+# Codemaker Test Suite
+
+This directory contains the integration test suite for the UNO code generators `cppumaker` and `pythonmaker`. The suite ensures that:
+
+- `cppumaker` correctly generates C++ headers (`.hpp` and `.hdl`), and
+- `pythonmaker` correctly generates Python stub files (`.pyi`)
+
+from the same UNO IDL definitions. It verifies the syntactic correctness of the output and protects against future regressions.
+
+The tests are automatically executed as part of the `make check` command for the `codemaker` module. They can also be run on their own with:
+
+```bash
+make codemaker.check
+```
+
+## Testing Philosophy
+
+The test suite follows a "Golden File" testing methodology. This is a standard and robust approach for testing compilers and code generators. The process is as follows:
+
+1.  **Source IDL:** A single comprehensive test IDL file (`tests.idl`) serves as the source of truth for all UNO constructs that the generators are expected to handle. Both tools are fed the same file.
+2.  **Generate Output:** During the test run, this IDL is compiled into a temporary `.rdb` file with `unoidl-write`, and each tool (`cppumaker`, `pythonmaker`) is executed to generate its output in its own temporary directory.
+3.  **Compare Against "Golden" Files:** The newly generated output is recursively compared against a set of manually verified, correct "golden" files:
+    - `expected_cppumaker_stubs/` for `cppumaker`
+    - `expected_pythonmaker_stubs/` for `pythonmaker`
+4.  **Pass/Fail:** A test passes only if the generated output is an exact match to the golden files. Any difference (missing files, extra files, or content mismatches) causes the test to fail.
+
+This approach ensures that any change to a generator that alters its output is immediately detected.
+
+## Directory Structure
+
+- `tests.idl`: The master IDL file containing all test cases. This includes enums, constants, typedefs, structs (plain, inherited, and polymorphic), exceptions, interfaces, services, and singletons. It also includes edge cases like the use of keywords as identifiers. All types live in the tool-neutral module `test::codemaker::codemakertests`, so the generated paths and namespaces (e.g. `test/codemaker/codemakertests/...`) are the same for both tools.
+- `expected_cppumaker_stubs/`: The "golden" `.hpp` and `.hdl` file structure that `cppumaker` is expected to generate from `tests.idl`. This is the reference standard for correctness of `cppumaker`.
+- `expected_pythonmaker_stubs/`: The "golden" `.pyi` file structure that `pythonmaker` is expected to generate from `tests.idl`. This is the reference standard for correctness of `pythonmaker`.
+- `codemakertests.py`: The Python script that orchestrates the tests. It is executed by the build system and, for each tool, compiles the IDL, runs the tool, and compares the output directory with the matching golden directory. It contains one test class per tool (`TestCppuMaker`, `TestPythonMaker`) sharing a common implementation.
+- `README.md`: This file.
+
+The gbuild makefile that integrates the script into `make check` is `codemaker/Test_codemaker.mk`, registered in `codemaker/Module_codemaker.mk`. It depends on both the `cppumaker` and `pythonmaker` executables.
+
+---
+
+## How to Modify or Extend the Test Suite
+
+Future developers may need to modify these tests when fixing a bug or adding a new feature to either tool. Here is the standard workflow.
+
+### Regenerating the Golden Files
+
+Both golden directories are regenerated from `tests.idl` with the freshly built tools. Run the following from `instdir/program` (the tools need the libraries located there):
+
+```bash
+mkdir -p ../../workdir/golden_tmp
+
+# 1. Compile the shared IDL to an .rdb
+../sdk/bin/unoidl-write.exe ../../workdir/UnoApiTarget/udkapi.rdb ../../codemaker/tests/tests.idl ../../workdir/golden_tmp/tests.rdb
+
+# 2. Clear the old golden files
+rm -rf ../../codemaker/tests/expected_cppumaker_stubs ../../codemaker/tests/expected_pythonmaker_stubs
+mkdir -p ../../codemaker/tests/expected_cppumaker_stubs ../../codemaker/tests/expected_pythonmaker_stubs
+
+# 3. Generate the stubs straight into the golden directories
+../sdk/bin/cppumaker.exe -O ../../codemaker/tests/expected_cppumaker_stubs ../../workdir/golden_tmp/tests.rdb -X ../../workdir/UnoApiTarget/udkapi.rdb
+../sdk/bin/pythonmaker.exe -O ../../codemaker/tests/expected_pythonmaker_stubs ../../workdir/golden_tmp/tests.rdb -X ../../workdir/UnoApiTarget/udkapi.rdb
+
+# 4. Remove leftovers (the test ignores *.tmp files of pythonmaker)
+find ../../codemaker/tests/expected_pythonmaker_stubs -name '*.tmp' -delete
+rm -rf ../../workdir/golden_tmp
+```
+
+(On Linux/macOS, drop the `.exe` suffix; the SDK tools are in `instdir/sdk/bin`, or in the `LibreOffice*_SDK/bin` directory of the installation.) Only one of the two tools has to be regenerated if only one is affected; the other directory is left untouched. Always review the result with `git diff` before committing.
+
+### Scenario 1: Fixing a Bug in a Generator
+
+If you have fixed a bug that was causing a tool to generate incorrect output, the corresponding test should now fail because the new, correct output will not match the old, incorrect golden files.
+
+1.  **Verify the Fix:** After fixing the C++ code of the tool, run `make codemaker.check` to confirm that the test fails as expected. The error output lists the differing files and shows the first difference.
+2.  **Regenerate the Golden Files:** Follow the steps in "Regenerating the Golden Files" above.
+3.  **Review the Changes:** Use `git diff` to confirm that only the intended differences appear in the golden files.
+4.  **Validate:**
+    - For `cppumaker`: ensure the new generated headers are syntactically correct and type-safe (often verified simply by checking that a full LibreOffice build succeeds with your new `cppumaker`).
+    - For `pythonmaker`: run `mypy --strict codemaker/tests/expected_pythonmaker_stubs/` to ensure the new golden files are syntactically correct and type-safe.
+5.  **Commit:** Commit the changes to the tool's C++ source code **along with** the updated golden files in your patch. The commit message should explain that the golden files were updated to reflect the bug fix.
+
+### Scenario 2: Adding a New Feature to a Generator
+
+If you add support for a new IDL feature (e.g., a new type or an annotation), you should add a test case for it.
+
+1.  **Add a Test Case to the IDL:**
+    - Open `codemaker/tests/tests.idl`.
+    - Add a new, simple example of the feature you've implemented. For example, add a new `interface` with a specific attribute you are now supporting.
+2.  **Generate and Verify the New Golden Files:**
+    - Since you've added a new type, new output files will be generated. Regenerate the golden files as described above. Note that the IDL is shared, so a change to `tests.idl` may also change the output of the _other_ tool; review the golden files of both tools.
+    - Locate the newly generated files for your new test case.
+    - **Manually inspect these new files** to ensure they are 100% correct (valid C++ for `cppumaker`; run `mypy --strict` on them for `pythonmaker`).
+3.  **Run the Full Test Suite:** Run `make codemaker.check`. The tests should now pass, as the newly generated output will match your newly added golden files.
+4.  **Commit:** Commit the changes to the tool's source code, the updated `tests.idl`, and the new golden files together in your patch.
diff --git a/codemaker/tests/codemakertests.py b/codemaker/tests/codemakertests.py
new file mode 100644
index 000000000000..d93ba3a8b119
--- /dev/null
+++ b/codemaker/tests/codemakertests.py
@@ -0,0 +1,274 @@
+#! /usr/bin/env python
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+"""Golden-file tests for the codemaker tools (cppumaker and pythonmaker).
+
+Both tools are fed the same IDL (tests.idl).  The IDL is compiled to a
+temporary .rdb with unoidl-write, each tool is run on it, and the generated
+output is compared byte-for-byte with the golden files stored next to this
+script:
+
+    expected_cppumaker_stubs/     <- golden output of cppumaker
+    expected_pythonmaker_stubs/   <- golden output of pythonmaker
+"""
+import filecmp
+import difflib
+import glob
+import os
+import shutil
+import subprocess
+import unittest
+
+from typing import TYPE_CHECKING, List, Optional, Set
+
+HERE: str = os.path.dirname(os.path.abspath(__file__))
+
+if TYPE_CHECKING:
+    # For the type checker the mixin is a TestCase (so self.fail() etc. are
+    # known); at run time it stays a plain mixin, so unittest does not collect
+    # the shared base class as a test of its own.
+    _MixinBase = unittest.TestCase
+else:
+    _MixinBase = object
+
+
+class CodemakerGoldenTestMixin(_MixinBase):
+    """Shared logic for golden-file comparison of a codemaker tool.
+
+    Subclasses must also derive from unittest.TestCase and set:
+      TOOL_NAME    - executable name in the SDK (without suffix)
+      GOLDEN_DIRNAME - directory (next to this script) with the golden files
+      IS_OUTPUT_FILE - predicate deciding which generated files are compared
+    """
+
+    TOOL_NAME: str = ""
+    GOLDEN_DIRNAME: str = ""
+
+    @staticmethod
+    def IS_OUTPUT_FILE(name: str) -> bool:  # pragma: no cover - overridden
+        raise NotImplementedError
+
+    def setUp(self) -> None:
+        # Build environment
+        self.srcdir: str = os.environ.get("SRCDIR", os.getcwd())
+        self.builddir: str = os.environ.get("BUILDDIR", os.getcwd())
+        self.instdir: str = os.environ.get(
+            "INSTDIR", os.path.join(self.builddir, "instdir")
+        )
+        self.workdir: str = os.environ.get(
+            "WORKDIR", os.path.join(self.builddir, "workdir")
+        )
+
+        # SDK tools
+        self.unoidl_write: Optional[str] = None
+        self.tool: Optional[str] = None
+
+        sdk_patterns: List[str] = [
+            os.path.join(self.instdir, "sdk", "bin"),
+            os.path.join(self.instdir, "LibreOffice*_SDK", "bin"),
+        ]
+        exe_suffix: str = ".exe" if os.name == "nt" else ""
+
+        for pattern in sdk_patterns:
+            for sdk_dir in glob.glob(pattern):
+                unoidl_path = os.path.join(sdk_dir, "unoidl-write" + exe_suffix)
+                tool_path = os.path.join(sdk_dir, self.TOOL_NAME + exe_suffix)
+                if os.path.exists(unoidl_path) and os.path.exists(tool_path):
+                    self.unoidl_write = unoidl_path
+                    self.tool = tool_path
+                    break
+            if self.unoidl_write and self.tool:
+                break
+
+        # Test paths
+        self.golden_dir: str = os.path.join(HERE, self.GOLDEN_DIRNAME)
+        self.idl_file: str = os.path.join(HERE, "tests.idl")
+
+        self.test_workdir: str = os.path.join(
+            self.workdir, self.TOOL_NAME + "_test"
+        )
+        os.makedirs(self.test_workdir, exist_ok=True)
+
+        self.types_rdb: str = os.path.join(
+            self.workdir, "UnoApiTarget", "udkapi.rdb"
+        )
+        self.temp_rdb: str = os.path.join(self.test_workdir, "temptest.rdb")
+        self.output_dir: str = os.path.join(self.test_workdir, "generated_stubs")
+
+    def tearDown(self) -> None:
+        if os.path.exists(self.test_workdir):
+            shutil.rmtree(self.test_workdir, ignore_errors=True)
+
+    # test
+
+    def test_golden_comparison(self) -> None:
+        self.assertIsNotNone(
+            self.unoidl_write, "unoidl-write or %s not found in SDK" % self.TOOL_NAME
+        )
+        self.assertIsNotNone(self.tool, "%s not found in SDK" % self.TOOL_NAME)
+
+        assert self.unoidl_write is not None
+        assert self.tool is not None
+
+        self.assertTrue(
+            os.path.exists(self.types_rdb),
+            "udkapi.rdb not found at: " + self.types_rdb,
+        )
+        self.assertTrue(
+            os.path.exists(self.idl_file),
+            "IDL file not found at: " + self.idl_file,
+        )
+
+        self._convert_idl_to_rdb()
+        self._generate_stubs()
+        self._compare_with_expected_files()
+
+    # helpers
+
+    def _run(self, cmd: List[str], what: str) -> None:
+        try:
+            subprocess.run(
+                cmd,
+                cwd=self.test_workdir,
+                capture_output=True,
+                text=True,
+                check=True,
+            )
+        except subprocess.CalledProcessError as e:
+            self.fail(
+                "Failed to %s:\n%s\nCommand: %s"
+                % (what, e.stderr or "", " ".join(cmd))
+            )
+
+    def _convert_idl_to_rdb(self) -> None:
+        assert self.unoidl_write is not None
+        self._run(
+            [self.unoidl_write, self.types_rdb, self.idl_file, self.temp_rdb],
+            "convert IDL to RDB",
+        )
+        self.assertTrue(
+            os.path.exists(self.temp_rdb),
+            "RDB file was not created by unoidl-write",
+        )
+
+    def _generate_stubs(self) -> None:
+        assert self.tool is not None
+        os.makedirs(self.output_dir, exist_ok=True)
+        self._run(
+            [self.tool, "-O", self.output_dir, self.temp_rdb, "-X", self.types_rdb],
+            "generate stubs with " + self.TOOL_NAME,
+        )
+        self.assertGreater(
+            len(self._list_files(self.output_dir)),
+            0,
+            self.TOOL_NAME + " produced no output files",
+        )
+
+    def _list_files(self, base: str) -> List[str]:
+        """Relative paths of all relevant files below base."""
+        result: List[str] = []
+        for root, _, files in os.walk(base):
+            for name in files:
+                if self.IS_OUTPUT_FILE(name):
+                    result.append(os.path.relpath(os.path.join(root, name), base))
+        return result
+
+    def _compare_with_expected_files(self) -> None:
+        if not os.path.exists(self.golden_dir):
+            self.fail("Expected directory does not exist: " + self.golden_dir)
+
+        expected_files: List[str] = self._list_files(self.golden_dir)
+        generated_files: List[str] = self._list_files(self.output_dir)
+
+        expected_set: Set[str] = set(expected_files)
+        generated_set: Set[str] = set(generated_files)
+
+        missing: Set[str] = expected_set - generated_set
+        extra: Set[str] = generated_set - expected_set
+
+        if missing:
+            self.fail(
+                "Missing generated files (%d):\n  %s"
+                % (len(missing), "\n  ".join(sorted(missing)))
+            )
+        if extra:
+            self.fail(
+                "Unexpected generated files (%d):\n  %s"
+                % (len(extra), "\n  ".join(sorted(extra)))
+            )
+
+        differences: List[str] = [
+            rel
+            for rel in sorted(expected_files)
+            if not filecmp.cmp(
+                os.path.join(self.golden_dir, rel),
+                os.path.join(self.output_dir, rel),
+                shallow=False,
+            )
+        ]
+
+        if differences:
+            self.fail(
+                "File content differences found (%d):\n  %s\n\n%s"
+                % (
+                    len(differences),
+                    "\n  ".join(differences),
+                    self._diff_excerpt(differences[0]),
+                )
+            )
+
+    def _diff_excerpt(self, rel_path: str, max_lines: int = 40) -> str:
+        """Short unified diff of the first differing file, to ease debugging."""
+
+        def read(path: str) -> List[str]:
+            with open(path, encoding="utf-8", errors="replace") as f:
+                return f.readlines()
+
+        diff = list(
+            difflib.unified_diff(
+                read(os.path.join(self.golden_dir, rel_path)),
+                read(os.path.join(self.output_dir, rel_path)),
+                fromfile="expected/" + rel_path,
+                tofile="generated/" + rel_path,
+            )
+        )
+        text = "".join(diff[:max_lines])
+        if len(diff) > max_lines:
+            text += "... (%d more diff lines)\n" % (len(diff) - max_lines)
+        return "First difference:\n" + text
+
+
+class TestCppuMaker(CodemakerGoldenTestMixin, unittest.TestCase):
+    """cppumaker must generate exactly the golden .hpp/.hdl headers."""
+
+    TOOL_NAME = "cppumaker"
+    GOLDEN_DIRNAME = "expected_cppumaker_stubs"
+
+    @staticmethod
+    def IS_OUTPUT_FILE(name: str) -> bool:
+        return name.lower().endswith((".hpp", ".hdl"))
+
+
+class TestPythonMaker(CodemakerGoldenTestMixin, unittest.TestCase):
+    """pythonmaker must generate exactly the golden .pyi stubs."""
+
+    TOOL_NAME = "pythonmaker"
+    GOLDEN_DIRNAME = "expected_pythonmaker_stubs"
+
+    @staticmethod
+    def IS_OUTPUT_FILE(name: str) -> bool:
+        # pythonmaker may leave temporary files behind; ignore them
+        return not name.lower().endswith(".tmp")
+
+
+if __name__ == "__main__":
+    unittest.main()
+
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Any.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Any.hdl
new file mode 100644
index 000000000000..bd7f8886ab1e
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Any.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Any.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Any Any;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Any.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Any.hpp
new file mode 100644
index 000000000000..eb1c28945d45
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Any.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Any.hdl"
+
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Boolean.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Boolean.hdl
new file mode 100644
index 000000000000..8ac7f43a4471
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Boolean.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::sal_Bool Boolean;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Boolean.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Boolean.hpp
new file mode 100644
index 000000000000..daff2d14b62d
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Boolean.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Boolean.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "sal/types.h"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Byte.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Byte.hdl
new file mode 100644
index 000000000000..1ac733e9e22e
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Byte.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::sal_Int8 Byte;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Byte.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Byte.hpp
new file mode 100644
index 000000000000..3d491b72ce7f
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Byte.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Byte.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "sal/types.h"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Char.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Char.hdl
new file mode 100644
index 000000000000..0d65c7263d4e
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Char.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::sal_Unicode Char;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Char.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Char.hpp
new file mode 100644
index 000000000000..51ff5e88999c
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Char.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Char.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "sal/types.h"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Double.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Double.hdl
new file mode 100644
index 000000000000..80586ed2d964
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Double.hdl
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef double Double;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Double.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Double.hpp
new file mode 100644
index 000000000000..2d9dd4625db2
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Double.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Double.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum.hdl
new file mode 100644
index 000000000000..205bd9adeb3e
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Enum2.hdl"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::test::codemaker::codemakertests::Enum2 Enum;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum.hpp
new file mode 100644
index 000000000000..8e837cae4335
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Enum.hdl"
+
+#include "test/codemaker/codemakertests/Enum2.hpp"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum1.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum1.hdl
new file mode 100644
index 000000000000..78bc2a19444d
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum1.hdl
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+
+namespace com { namespace sun { namespace star { namespace uno { class Type; } } } }
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+#if defined LIBO_INTERNAL_ONLY
+
+#if defined __GNUC__
+
+enum class Enum1
+{
+
+#else
+
+enum class SAL_DLLPUBLIC_RTTI Enum1
+{
+
+#endif
+
+#else
+
+enum SAL_DLLPUBLIC_RTTI Enum1
+{
+
+#endif
+    Enum1_VALUE_NEG = -1,
+    Enum1_VALUE_ZERO = 0,
+    Enum1_VALUE_POS = 1,
+    Enum1_MAKE_FIXED_SIZE = SAL_MAX_ENUM
+};
+
+#if defined LIBO_INTERNAL_ONLY
+constexpr auto Enum1_VALUE_NEG = Enum1::Enum1_VALUE_NEG;
+constexpr auto Enum1_VALUE_ZERO = Enum1::Enum1_VALUE_ZERO;
+constexpr auto Enum1_VALUE_POS = Enum1::Enum1_VALUE_POS;
+#endif
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Enum1 const *);
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(const ::test::codemaker::codemakertests::Enum1 *);
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum1.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum1.hpp
new file mode 100644
index 000000000000..e4bf4b2962f3
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum1.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Enum1.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Enum1 const *) {
+    static typelib_TypeDescriptionReference * the_type = 0;
+    if ( !the_type )
+    {
+        typelib_static_enum_type_init( &the_type,
+                                       "test.codemaker.codemakertests.Enum1",
+                                       ::test::codemaker::codemakertests::Enum1_VALUE_NEG );
+    }
+    return * reinterpret_cast< ::css::uno::Type * >( &the_type );
+}
+
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Enum1 const *) {
+    return ::cppu::UnoType< ::test::codemaker::codemakertests::Enum1 >::get();
+}
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum2.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum2.hdl
new file mode 100644
index 000000000000..0b313b299bef
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum2.hdl
@@ -0,0 +1,51 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+
+namespace com { namespace sun { namespace star { namespace uno { class Type; } } } }
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+#if defined LIBO_INTERNAL_ONLY
+
+#if defined __GNUC__
+
+enum class Enum2
+{
+
+#else
+
+enum class SAL_DLLPUBLIC_RTTI Enum2
+{
+
+#endif
+
+#else
+
+enum SAL_DLLPUBLIC_RTTI Enum2
+{
+
+#endif
+    Enum2_FLAG_NONE = 0,
+    Enum2_FLAG_READ = 1,
+    Enum2_FLAG_WRITE = 2,
+    Enum2_FLAG_EXEC = 4,
+    Enum2_FLAG_ALL = 7,
+    Enum2_MAKE_FIXED_SIZE = SAL_MAX_ENUM
+};
+
+#if defined LIBO_INTERNAL_ONLY
+constexpr auto Enum2_FLAG_NONE = Enum2::Enum2_FLAG_NONE;
+constexpr auto Enum2_FLAG_READ = Enum2::Enum2_FLAG_READ;
+constexpr auto Enum2_FLAG_WRITE = Enum2::Enum2_FLAG_WRITE;
+constexpr auto Enum2_FLAG_EXEC = Enum2::Enum2_FLAG_EXEC;
+constexpr auto Enum2_FLAG_ALL = Enum2::Enum2_FLAG_ALL;
+#endif
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Enum2 const *);
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(const ::test::codemaker::codemakertests::Enum2 *);
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum2.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum2.hpp
new file mode 100644
index 000000000000..d12380e2d09e
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum2.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Enum2.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Enum2 const *) {
+    static typelib_TypeDescriptionReference * the_type = 0;
+    if ( !the_type )
+    {
+        typelib_static_enum_type_init( &the_type,
+                                       "test.codemaker.codemakertests.Enum2",
+                                       ::test::codemaker::codemakertests::Enum2_FLAG_NONE );
+    }
+    return * reinterpret_cast< ::css::uno::Type * >( &the_type );
+}
+
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Enum2 const *) {
+    return ::cppu::UnoType< ::test::codemaker::codemakertests::Enum2 >::get();
+}
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum3.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum3.hdl
new file mode 100644
index 000000000000..43c8cef71d5d
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum3.hdl
@@ -0,0 +1,49 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+
+namespace com { namespace sun { namespace star { namespace uno { class Type; } } } }
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+#if defined LIBO_INTERNAL_ONLY
+
+#if defined __GNUC__
+
+enum class Enum3
+{
+
+#else
+
+enum class SAL_DLLPUBLIC_RTTI Enum3
+{
+
+#endif
+
+#else
+
+enum SAL_DLLPUBLIC_RTTI Enum3
+{
+
+#endif
+    Enum3_FIRST = 10,
+    Enum3_SECOND = 20,
+    Enum3_THIRD = 100,
+    Enum3_FOURTH = 255,
+    Enum3_MAKE_FIXED_SIZE = SAL_MAX_ENUM
+};
+
+#if defined LIBO_INTERNAL_ONLY
+constexpr auto Enum3_FIRST = Enum3::Enum3_FIRST;
+constexpr auto Enum3_SECOND = Enum3::Enum3_SECOND;
+constexpr auto Enum3_THIRD = Enum3::Enum3_THIRD;
+constexpr auto Enum3_FOURTH = Enum3::Enum3_FOURTH;
+#endif
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Enum3 const *);
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(const ::test::codemaker::codemakertests::Enum3 *);
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum3.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum3.hpp
new file mode 100644
index 000000000000..3c553373f7d3
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum3.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Enum3.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Enum3 const *) {
+    static typelib_TypeDescriptionReference * the_type = 0;
+    if ( !the_type )
+    {
+        typelib_static_enum_type_init( &the_type,
+                                       "test.codemaker.codemakertests.Enum3",
+                                       ::test::codemaker::codemakertests::Enum3_FIRST );
+    }
+    return * reinterpret_cast< ::css::uno::Type * >( &the_type );
+}
+
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Enum3 const *) {
+    return ::cppu::UnoType< ::test::codemaker::codemakertests::Enum3 >::get();
+}
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum4.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum4.hdl
new file mode 100644
index 000000000000..c04cccaa7f41
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum4.hdl
@@ -0,0 +1,47 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+
+namespace com { namespace sun { namespace star { namespace uno { class Type; } } } }
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+#if defined LIBO_INTERNAL_ONLY
+
+#if defined __GNUC__
+
+enum class Enum4
+{
+
+#else
+
+enum class SAL_DLLPUBLIC_RTTI Enum4
+{
+
+#endif
+
+#else
+
+enum SAL_DLLPUBLIC_RTTI Enum4
+{
+
+#endif
+    Enum4_AUTO_A = 0,
+    Enum4_AUTO_B = 1,
+    Enum4_AUTO_C = 2,
+    Enum4_MAKE_FIXED_SIZE = SAL_MAX_ENUM
+};
+
+#if defined LIBO_INTERNAL_ONLY
+constexpr auto Enum4_AUTO_A = Enum4::Enum4_AUTO_A;
+constexpr auto Enum4_AUTO_B = Enum4::Enum4_AUTO_B;
+constexpr auto Enum4_AUTO_C = Enum4::Enum4_AUTO_C;
+#endif
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Enum4 const *);
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(const ::test::codemaker::codemakertests::Enum4 *);
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum4.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum4.hpp
new file mode 100644
index 000000000000..a37ec7e470ca
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Enum4.hpp
@@ -0,0 +1,27 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Enum4.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Enum4 const *) {
+    static typelib_TypeDescriptionReference * the_type = 0;
+    if ( !the_type )
+    {
+        typelib_static_enum_type_init( &the_type,
+                                       "test.codemaker.codemakertests.Enum4",
+                                       ::test::codemaker::codemakertests::Enum4_AUTO_A );
+    }
+    return * reinterpret_cast< ::css::uno::Type * >( &the_type );
+}
+
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Enum4 const *) {
+    return ::cppu::UnoType< ::test::codemaker::codemakertests::Enum4 >::get();
+}
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Float.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Float.hdl
new file mode 100644
index 000000000000..e70505cc71a1
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Float.hdl
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef float Float;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Float.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Float.hpp
new file mode 100644
index 000000000000..09b1c2af417e
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Float.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Float.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Hyper.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Hyper.hdl
new file mode 100644
index 000000000000..38639d2fcab2
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Hyper.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::sal_Int64 Hyper;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Hyper.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Hyper.hpp
new file mode 100644
index 000000000000..a3bebb2c3118
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Hyper.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Hyper.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "sal/types.h"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Long.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Long.hdl
new file mode 100644
index 000000000000..4f8c3a8e8c4c
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Long.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::sal_Int32 Long;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Long.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Long.hpp
new file mode 100644
index 000000000000..3d5a811bee4e
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Long.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Long.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "sal/types.h"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/PolyStruct.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/PolyStruct.hdl
new file mode 100644
index 000000000000..cf366e755312
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/PolyStruct.hdl
@@ -0,0 +1,32 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star { namespace uno { class Type; } } } }
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+#ifdef _WIN32
+#   pragma pack(push, 8)
+#endif
+
+template< typename typeparam_if, typename typeparam_else > struct SAL_DLLPUBLIC_RTTI PolyStruct {
+    inline PolyStruct();
+
+    inline PolyStruct(typeparam_if const & member1_, const ::sal_Int32& member2_);
+
+    typeparam_if member1;
+    ::sal_Int32 member2;
+};
+
+#ifdef _WIN32
+#   pragma pack(pop)
+#endif
+
+} } }
+
+template< typename typeparam_if, typename typeparam_else > SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(const ::test::codemaker::codemakertests::PolyStruct< typeparam_if, typeparam_else > *);
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/PolyStruct.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/PolyStruct.hpp
new file mode 100644
index 000000000000..fba705a98807
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/PolyStruct.hpp
@@ -0,0 +1,80 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/PolyStruct.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/strbuf.hxx"
+#include "rtl/textenc.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+template< typename typeparam_if, typename typeparam_else > inline PolyStruct< typeparam_if, typeparam_else >::PolyStruct()
+    : member1()
+    , member2(0)
+{
+}
+
+template< typename typeparam_if, typename typeparam_else > inline PolyStruct< typeparam_if, typeparam_else >::PolyStruct(typeparam_if const & member1_, const ::sal_Int32& member2_)
+    : member1(member1_)
+    , member2(member2_)
+{
+}
+
+template< typename typeparam_if, typename typeparam_else > 
+inline PolyStruct< typeparam_if, typeparam_else >
+make_PolyStruct(typeparam_if const & member1_, const ::sal_Int32& member2_)
+{
+    return PolyStruct< typeparam_if, typeparam_else >(member1_, member2_);
+}
+
+template< typename typeparam_if, typename typeparam_else >  inline bool operator==(const PolyStruct< typeparam_if, typeparam_else >& the_lhs, const PolyStruct< typeparam_if, typeparam_else >& the_rhs)
+{
+    return the_lhs.member1 == the_rhs.member1
+        && the_lhs.member2 == the_rhs.member2;
+}
+template< typename typeparam_if, typename typeparam_else >  inline bool operator!=(const PolyStruct< typeparam_if, typeparam_else >& the_lhs, const PolyStruct< typeparam_if, typeparam_else >& the_rhs)
+{
+return !operator==(the_lhs, the_rhs);
+}
+} } }
+
+namespace cppu {
+
+template< typename typeparam_if, typename typeparam_else > class UnoType< ::test::codemaker::codemakertests::PolyStruct< typeparam_if, typeparam_else > > {
+public:
+    static inline ::css::uno::Type const & get() {
+        //TODO: On certain platforms with weak memory models, the following code can result in some threads observing that the_type points to garbage
+        static ::typelib_TypeDescriptionReference * the_type = 0;
+        if (the_type == 0) {
+            ::rtl::OStringBuffer the_buffer("test.codemaker.codemakertests.PolyStruct<");
+            the_buffer.append(::rtl::OUStringToOString(::cppu::getTypeFavourChar(static_cast< typeparam_if * >(0)).getTypeName(), RTL_TEXTENCODING_UTF8));
+            the_buffer.append(',');
+            the_buffer.append(::rtl::OUStringToOString(::cppu::getTypeFavourChar(static_cast< typeparam_else * >(0)).getTypeName(), RTL_TEXTENCODING_UTF8));
+            the_buffer.append('>');
+            ::typelib_TypeDescriptionReference * the_members[] = {
+                ::cppu::getTypeFavourChar(static_cast< typeparam_if * >(0)).getTypeLibType(),
+                ::cppu::UnoType< ::sal_Int32 >::get().getTypeLibType() };
+            static ::sal_Bool const the_parameterizedTypes[] = { true, false };
+            ::typelib_static_struct_type_init(&the_type, the_buffer.getStr(), 0, 2, the_members, the_parameterizedTypes);
+        }
+        return *reinterpret_cast< ::css::uno::Type * >(&the_type);
+    }
+
+private:
+    UnoType(UnoType &); // not defined
+    ~UnoType(); // not defined
+    void operator =(UnoType); // not defined
+};
+
+}
+
+template< typename typeparam_if, typename typeparam_else > SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::PolyStruct< typeparam_if, typeparam_else > const *) {
+        return ::cppu::UnoType< ::test::codemaker::codemakertests::PolyStruct< typeparam_if, typeparam_else > >::get();
+    }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/S1.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/S1.hpp
new file mode 100644
index 000000000000..43d0de005c1e
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/S1.hpp
@@ -0,0 +1,301 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/lang/ClassNotFoundException.hpp"
+#include "com/sun/star/lang/IllegalAccessException.hpp"
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "test/codemaker/codemakertests/Any.hpp"
+#include "test/codemaker/codemakertests/Boolean.hpp"
+#include "test/codemaker/codemakertests/Byte.hpp"
+#include "test/codemaker/codemakertests/Char.hpp"
+#include "test/codemaker/codemakertests/Double.hpp"
+#include "test/codemaker/codemakertests/Enum.hpp"
+#include "test/codemaker/codemakertests/Enum2.hpp"
+#include "test/codemaker/codemakertests/Float.hpp"
+#include "test/codemaker/codemakertests/Hyper.hpp"
+#include "test/codemaker/codemakertests/Long.hpp"
+#include "test/codemaker/codemakertests/SequenceAny.hpp"
+#include "test/codemaker/codemakertests/SequenceBoolean.hpp"
+#include "test/codemaker/codemakertests/SequenceByte.hpp"
+#include "test/codemaker/codemakertests/SequenceChar.hpp"
+#include "test/codemaker/codemakertests/SequenceDouble.hpp"
+#include "test/codemaker/codemakertests/SequenceEnum.hpp"
+#include "test/codemaker/codemakertests/SequenceFloat.hpp"
+#include "test/codemaker/codemakertests/SequenceHyper.hpp"
+#include "test/codemaker/codemakertests/SequenceLong.hpp"
+#include "test/codemaker/codemakertests/SequenceShort.hpp"
+#include "test/codemaker/codemakertests/SequenceString.hpp"
+#include "test/codemaker/codemakertests/SequenceStruct.hpp"
+#include "test/codemaker/codemakertests/SequenceType.hpp"
+#include "test/codemaker/codemakertests/SequenceUnsignedHyper.hpp"
+#include "test/codemaker/codemakertests/SequenceUnsignedLong.hpp"
+#include "test/codemaker/codemakertests/SequenceUnsignedShort.hpp"
+#include "test/codemaker/codemakertests/SequenceXInterface.hpp"
+#include "test/codemaker/codemakertests/SequenceXNamingService.hpp"
+#include "test/codemaker/codemakertests/Short.hpp"
+#include "test/codemaker/codemakertests/String.hpp"
+#include "test/codemaker/codemakertests/Struct.hpp"
+#include "test/codemaker/codemakertests/Struct1.hpp"
+#include "test/codemaker/codemakertests/Type.hpp"
+#include "test/codemaker/codemakertests/UnsignedHyper.hpp"
+#include "test/codemaker/codemakertests/UnsignedLong.hpp"
+#include "test/codemaker/codemakertests/UnsignedShort.hpp"
+#include "test/codemaker/codemakertests/XInterface.hpp"
+#include "test/codemaker/codemakertests/XNamingService.hpp"
+#include "test/codemaker/codemakertests/XTest.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S1 && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S1) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S1
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S1(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class S1 {
+public:
+    static ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > create1(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S1 && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S1) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S1
+            the_instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S1)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(::css::uno::Sequence< ::css::uno::Any >());
+            }
+#else
+            the_instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.S1", ::css::uno::Sequence< ::css::uno::Any >(), the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.S1" + " of type " + "test.codemaker.codemakertests.XTest" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.S1" + " of type " + "test.codemaker.codemakertests.XTest", the_context);
+        }
+        return the_instance;
+    }
+
+    static ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > create2(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, const ::css::uno::Sequence< ::css::uno::Any >& create2) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > the_instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S1 && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S1) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S1
+        the_instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S1)(the_context.get(), create2)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+        ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+        if (init.is()) {
+            init->initialize(the_arguments);
+        }
+#else
+        the_instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.S1", create2, the_context), ::css::uno::UNO_QUERY);
+#endif
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.S1" + " of type " + "test.codemaker.codemakertests.XTest", the_context);
+        }
+        return the_instance;
+    }
+
+    static ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > create3(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, const ::css::uno::Sequence< ::css::uno::Any >& S1) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= S1;
+        ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S1 && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S1) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S1
+            the_instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S1)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.S1", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::lang::ClassNotFoundException &) {
+            throw;
+        } catch (const ::css::lang::IllegalAccessException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.S1" + " of type " + "test.codemaker.codemakertests.XTest" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.S1" + " of type " + "test.codemaker.codemakertests.XTest", the_context);
+        }
+        return the_instance;
+    }
+
+    static ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > create4(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 javamaker, ::sal_Int32 S1, ::sal_Int32 create4) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(3);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= javamaker;
+        the_arguments_array[1] <<= S1;
+        the_arguments_array[2] <<= create4;
+        ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S1 && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S1) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S1
+            the_instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S1)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.S1", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.S1" + " of type " + "test.codemaker.codemakertests.XTest" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.S1" + " of type " + "test.codemaker.codemakertests.XTest", the_context);
+        }
+        return the_instance;
+    }
+
+    static ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > create5(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Bool p1, ::sal_Int8 p2, ::sal_Int16 p3, ::sal_uInt16 p4, ::sal_Int32 p5, ::sal_uInt32 p6, ::sal_Int64 p7, ::sal_uInt64 p8, float p9, double p10, ::sal_Unicode p11, const ::rtl::OUString& p12, const ::css::uno::Type& p13, const ::css::uno::Any& p14, ::test::codemaker::codemakertests::Enum2 p15, const ::test::codemaker::codemakertests::Struct1& p16, const ::css::uno::Reference< ::css::uno::XInterface >& p17, const ::css::uno::Reference< ::css::uno::XNamingService >& p18, ::sal_Bool t1, ::sal_Int8 t2, ::sal_Int16 t3, ::sal_uInt16 t4, ::sal_Int32 t5, ::sal_uInt32 t6, ::sal_Int64 t7, ::sal_uInt64 t8, float t9, double t10, ::sal_Unicode t11, const ::rtl::OUString& t12, const ::css::uno::Type& t13, const ::css::uno::Any& t14, ::test::codemaker::codemakertests::Enum2 t15, const ::test::codemaker::codemakertests::Struct1& t16, const ::css::uno::Reference< ::css::uno::XInterface >& t17, const ::css::uno::Reference< ::css::uno::XNamingService >& t18, const ::css::uno::Sequence< ::sal_Bool >& a1, const ::css::uno::Sequence< ::sal_Int8 >& a2, const ::css::uno::Sequence< ::sal_Int16 >& a3, const ::css::uno::Sequence< ::sal_uInt16 >& a4, const ::css::uno::Sequence< ::sal_Int32 >& a5, const ::css::uno::Sequence< ::sal_uInt32 >& a6, const ::css::uno::Sequence< ::sal_Int64 >& a7, const ::css::uno::Sequence< ::sal_uInt64 >& a8, const ::css::uno::Sequence< float >& a9, const ::css::uno::Sequence< double >& a10, const ::css::uno::Sequence< ::sal_Unicode >& a11, const ::css::uno::Sequence< ::rtl::OUString >& a12, const ::css::uno::Sequence< ::css::uno::Type >& a13, const ::css::uno::Sequence< ::css::uno::Any >& a14, const ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 >& a15, const ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 >& a16, const ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > >& a17, const ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > >& a18, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Bool > >& aa1, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int8 > >& aa2, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int16 > >& aa3, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt16 > >& aa4, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int32 > >& aa5, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt32 > >& aa6, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int64 > >& aa7, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt64 > >& aa8, const ::css::uno::Sequence< ::css::uno::Sequence< float > >& aa9, const ::css::uno::Sequence< ::css::uno::Sequence< double > >& aa10, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Unicode > >& aa11, const ::css::uno::Sequence< ::css::uno::Sequence< ::rtl::OUString > >& aa12, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Type > >& aa13, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Any > >& aa14, const ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 > >& aa15, const ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 > >& aa16, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > >& aa17, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > > >& aa18, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Bool > >& at1, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int8 > >& at2, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int16 > >& at3, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt16 > >& at4, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int32 > >& at5, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt32 > >& at6, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int64 > >& at7, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt64 > >& at8, const ::css::uno::Sequence< ::css::uno::Sequence< float > >& at9, const ::css::uno::Sequence< ::css::uno::Sequence< double > >& at10, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Unicode > >& at11, const ::css::uno::Sequence< ::css::uno::Sequence< ::rtl::OUString > >& at12, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Type > >& at13, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Any > >& at14, const ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 > >& at15, const ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 > >& at16, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > >& at17, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > > >& at18) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(90);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= p1;
+        the_arguments_array[1] <<= p2;
+        the_arguments_array[2] <<= p3;
+        the_arguments_array[3] <<= p4;
+        the_arguments_array[4] <<= p5;
+        the_arguments_array[5] <<= p6;
+        the_arguments_array[6] <<= p7;
+        the_arguments_array[7] <<= p8;
+        the_arguments_array[8] <<= p9;
+        the_arguments_array[9] <<= p10;
+        the_arguments_array[10] = ::css::uno::Any(&p11, ::cppu::UnoType< ::cppu::UnoCharType >::get());
+        the_arguments_array[11] <<= p12;
+        the_arguments_array[12] <<= p13;
+        the_arguments_array[13] = p14;
+        the_arguments_array[14] <<= p15;
+        the_arguments_array[15] <<= p16;
+        the_arguments_array[16] <<= p17;
+        the_arguments_array[17] <<= p18;
+        the_arguments_array[18] <<= t1;
+        the_arguments_array[19] <<= t2;
+        the_arguments_array[20] <<= t3;
+        the_arguments_array[21] <<= t4;
+        the_arguments_array[22] <<= t5;
+        the_arguments_array[23] <<= t6;
+        the_arguments_array[24] <<= t7;
+        the_arguments_array[25] <<= t8;
+        the_arguments_array[26] <<= t9;
+        the_arguments_array[27] <<= t10;
+        the_arguments_array[28] <<= t11;
+        the_arguments_array[29] <<= t12;
+        the_arguments_array[30] <<= t13;
+        the_arguments_array[31] = t14;
+        the_arguments_array[32] <<= t15;
+        the_arguments_array[33] <<= t16;
+        the_arguments_array[34] <<= t17;
+        the_arguments_array[35] <<= t18;
+        the_arguments_array[36] <<= a1;
+        the_arguments_array[37] <<= a2;
+        the_arguments_array[38] <<= a3;
+        the_arguments_array[39] <<= a4;
+        the_arguments_array[40] <<= a5;
+        the_arguments_array[41] <<= a6;
+        the_arguments_array[42] <<= a7;
+        the_arguments_array[43] <<= a8;
+        the_arguments_array[44] <<= a9;
+        the_arguments_array[45] <<= a10;
+        the_arguments_array[46] = ::css::uno::Any(&a11, ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoCharType > >::get());
+        the_arguments_array[47] <<= a12;
+        the_arguments_array[48] <<= a13;
+        the_arguments_array[49] <<= a14;
+        the_arguments_array[50] <<= a15;
+        the_arguments_array[51] <<= a16;
+        the_arguments_array[52] <<= a17;
+        the_arguments_array[53] <<= a18;
+        the_arguments_array[54] <<= aa1;
+        the_arguments_array[55] <<= aa2;
+        the_arguments_array[56] <<= aa3;
+        the_arguments_array[57] <<= aa4;
+        the_arguments_array[58] <<= aa5;
+        the_arguments_array[59] <<= aa6;
+        the_arguments_array[60] <<= aa7;
+        the_arguments_array[61] <<= aa8;
+        the_arguments_array[62] <<= aa9;
+        the_arguments_array[63] <<= aa10;
+        the_arguments_array[64] = ::css::uno::Any(&aa11, ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::cppu::UnoCharType > > >::get());
+        the_arguments_array[65] <<= aa12;
+        the_arguments_array[66] <<= aa13;
+        the_arguments_array[67] <<= aa14;
+        the_arguments_array[68] <<= aa15;
+        the_arguments_array[69] <<= aa16;
+        the_arguments_array[70] <<= aa17;
+        the_arguments_array[71] <<= aa18;
+        the_arguments_array[72] <<= at1;
+        the_arguments_array[73] <<= at2;
+        the_arguments_array[74] <<= at3;
+        the_arguments_array[75] <<= at4;
+        the_arguments_array[76] <<= at5;
+        the_arguments_array[77] <<= at6;
+        the_arguments_array[78] <<= at7;
+        the_arguments_array[79] <<= at8;
+        the_arguments_array[80] <<= at9;
+        the_arguments_array[81] <<= at10;
+        the_arguments_array[82] <<= at11;
+        the_arguments_array[83] <<= at12;
+        the_arguments_array[84] <<= at13;
+        the_arguments_array[85] <<= at14;
+        the_arguments_array[86] <<= at15;
+        the_arguments_array[87] <<= at16;
+        the_arguments_array[88] <<= at17;
+        the_arguments_array[89] <<= at18;
+        ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S1 && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S1) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S1
+            the_instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S1)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.S1", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.S1" + " of type " + "test.codemaker.codemakertests.XTest" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.S1" + " of type " + "test.codemaker.codemakertests.XTest", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    S1(); // not implemented
+    S1(S1 &); // not implemented
+    ~S1(); // not implemented
+    void operator =(S1); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/S2.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/S2.hpp
new file mode 100644
index 000000000000..6073fa705dc4
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/S2.hpp
@@ -0,0 +1,57 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "test/codemaker/codemakertests/XTest.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S2 && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S2) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S2
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S2(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class S2 {
+public:
+    static ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > create(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S2 && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S2) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S2
+            the_instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S2)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+            the_instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(the_context->getServiceManager()->createInstanceWithContext( "test.codemaker.codemakertests.S2", the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.S2" + " of type " + "test.codemaker.codemakertests.XTest" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.S2" + " of type " + "test.codemaker.codemakertests.XTest", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    S2(); // not implemented
+    S2(S2 &); // not implemented
+    ~S2(); // not implemented
+    void operator =(S2); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/S4.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/S4.hpp
new file mode 100644
index 000000000000..6b75cde8a04a
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/S4.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "test/codemaker/codemakertests/XTest.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S4 && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S4) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S4
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S4(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class S4 {
+public:
+    static ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S4 && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_S4) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S4
+        instance = ::css::uno::Reference< ::test::codemaker::codemakertests::XTest >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_S4)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.S4" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.S4 of type test.codemaker.codemakertests.XTest" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    S4(); // not implemented
+    S4(S4 &); // not implemented
+    ~S4(); // not implemented
+    void operator =(S4); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceAny.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceAny.hdl
new file mode 100644
index 000000000000..98b332338162
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceAny.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Any.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::css::uno::Any > SequenceAny;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceAny.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceAny.hpp
new file mode 100644
index 000000000000..60af83adb14e
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceAny.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceAny.hdl"
+
+#include "test/codemaker/codemakertests/Any.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceBoolean.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceBoolean.hdl
new file mode 100644
index 000000000000..e9c9ba90563f
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceBoolean.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Boolean.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::sal_Bool > SequenceBoolean;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceBoolean.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceBoolean.hpp
new file mode 100644
index 000000000000..e5835183f7f0
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceBoolean.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceBoolean.hdl"
+
+#include "test/codemaker/codemakertests/Boolean.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceByte.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceByte.hdl
new file mode 100644
index 000000000000..ef2087b3fe58
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceByte.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Byte.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::sal_Int8 > SequenceByte;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceByte.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceByte.hpp
new file mode 100644
index 000000000000..d68226604f8c
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceByte.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceByte.hdl"
+
+#include "test/codemaker/codemakertests/Byte.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceChar.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceChar.hdl
new file mode 100644
index 000000000000..6359e2a5c186
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceChar.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Char.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::sal_Unicode > SequenceChar;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceChar.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceChar.hpp
new file mode 100644
index 000000000000..9ba4f38cc749
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceChar.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceChar.hdl"
+
+#include "test/codemaker/codemakertests/Char.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceDouble.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceDouble.hdl
new file mode 100644
index 000000000000..a0e8a842c1b4
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceDouble.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Double.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< double > SequenceDouble;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceDouble.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceDouble.hpp
new file mode 100644
index 000000000000..86b56f4d3704
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceDouble.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceDouble.hdl"
+
+#include "test/codemaker/codemakertests/Double.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceEnum.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceEnum.hdl
new file mode 100644
index 000000000000..8103464b4709
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceEnum.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Enum.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 > SequenceEnum;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceEnum.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceEnum.hpp
new file mode 100644
index 000000000000..d80d416cc4cf
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceEnum.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceEnum.hdl"
+
+#include "test/codemaker/codemakertests/Enum.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceFloat.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceFloat.hdl
new file mode 100644
index 000000000000..c79d816747c6
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceFloat.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Float.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< float > SequenceFloat;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceFloat.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceFloat.hpp
new file mode 100644
index 000000000000..df5c36b636e0
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceFloat.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceFloat.hdl"
+
+#include "test/codemaker/codemakertests/Float.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceHyper.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceHyper.hdl
new file mode 100644
index 000000000000..f0053217cc40
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceHyper.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Hyper.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::sal_Int64 > SequenceHyper;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceHyper.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceHyper.hpp
new file mode 100644
index 000000000000..fc9f06d9e3d9
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceHyper.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceHyper.hdl"
+
+#include "test/codemaker/codemakertests/Hyper.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceLong.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceLong.hdl
new file mode 100644
index 000000000000..413f62ea2219
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceLong.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Long.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::sal_Int32 > SequenceLong;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceLong.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceLong.hpp
new file mode 100644
index 000000000000..34b718c722ec
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceLong.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceLong.hdl"
+
+#include "test/codemaker/codemakertests/Long.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceShort.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceShort.hdl
new file mode 100644
index 000000000000..3355c8906038
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceShort.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Short.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::sal_Int16 > SequenceShort;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceShort.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceShort.hpp
new file mode 100644
index 000000000000..c3ad5e4b90cf
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceShort.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceShort.hdl"
+
+#include "test/codemaker/codemakertests/Short.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceString.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceString.hdl
new file mode 100644
index 000000000000..d012e803cb4d
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceString.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/String.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::rtl::OUString > SequenceString;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceString.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceString.hpp
new file mode 100644
index 000000000000..7d6f2c491da3
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceString.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceString.hdl"
+
+#include "test/codemaker/codemakertests/String.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceStruct.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceStruct.hdl
new file mode 100644
index 000000000000..96317ff98711
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceStruct.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Struct.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 > SequenceStruct;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceStruct.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceStruct.hpp
new file mode 100644
index 000000000000..da68e13ff91a
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceStruct.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceStruct.hdl"
+
+#include "test/codemaker/codemakertests/Struct.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceType.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceType.hdl
new file mode 100644
index 000000000000..f6046ae760ac
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceType.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Type.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::css::uno::Type > SequenceType;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceType.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceType.hpp
new file mode 100644
index 000000000000..8a456ea779bb
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceType.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceType.hdl"
+
+#include "test/codemaker/codemakertests/Type.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedHyper.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedHyper.hdl
new file mode 100644
index 000000000000..bf8d4f67b311
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedHyper.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/UnsignedHyper.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::sal_uInt64 > SequenceUnsignedHyper;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedHyper.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedHyper.hpp
new file mode 100644
index 000000000000..bef888295f3b
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedHyper.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceUnsignedHyper.hdl"
+
+#include "test/codemaker/codemakertests/UnsignedHyper.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedLong.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedLong.hdl
new file mode 100644
index 000000000000..dc61c6943c7f
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedLong.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/UnsignedLong.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::sal_uInt32 > SequenceUnsignedLong;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedLong.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedLong.hpp
new file mode 100644
index 000000000000..085605f36fc0
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedLong.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceUnsignedLong.hdl"
+
+#include "test/codemaker/codemakertests/UnsignedLong.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedShort.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedShort.hdl
new file mode 100644
index 000000000000..3cebbd75f23b
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedShort.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/UnsignedShort.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::sal_uInt16 > SequenceUnsignedShort;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedShort.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedShort.hpp
new file mode 100644
index 000000000000..9a92f6972737
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceUnsignedShort.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceUnsignedShort.hdl"
+
+#include "test/codemaker/codemakertests/UnsignedShort.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceXInterface.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceXInterface.hdl
new file mode 100644
index 000000000000..c7869b9c7403
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceXInterface.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/XInterface.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > SequenceXInterface;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceXInterface.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceXInterface.hpp
new file mode 100644
index 000000000000..eed68e38bc89
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceXInterface.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceXInterface.hdl"
+
+#include "test/codemaker/codemakertests/XInterface.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceXNamingService.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceXNamingService.hdl
new file mode 100644
index 000000000000..8fab9b7abdce
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceXNamingService.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/XNamingService.hdl"
+#include "com/sun/star/uno/Sequence.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > > SequenceXNamingService;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceXNamingService.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceXNamingService.hpp
new file mode 100644
index 000000000000..8aa9c7caec7a
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/SequenceXNamingService.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/SequenceXNamingService.hdl"
+
+#include "test/codemaker/codemakertests/XNamingService.hpp"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Service.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Service.hpp
new file mode 100644
index 000000000000..389a9db20627
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Service.hpp
@@ -0,0 +1,63 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_Service && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_Service) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_Service
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_Service(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class Service {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > create(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, const ::css::uno::Sequence< ::css::uno::Any >& args) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_Service && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_Service) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_Service
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_Service)(the_context.get(), args)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.Service", args, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.Service" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.Service" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    Service(); // not implemented
+    Service(Service &); // not implemented
+    ~Service(); // not implemented
+    void operator =(Service); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Short.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Short.hdl
new file mode 100644
index 000000000000..626dadc4282b
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Short.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::sal_Int16 Short;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Short.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Short.hpp
new file mode 100644
index 000000000000..b4f7a25b7d36
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Short.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Short.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "sal/types.h"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/String.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/String.hdl
new file mode 100644
index 000000000000..f9ec9e033516
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/String.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "rtl/ustring.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::rtl::OUString String;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/String.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/String.hpp
new file mode 100644
index 000000000000..de94d4ac48c2
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/String.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/String.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct.hdl
new file mode 100644
index 000000000000..19f145b49b6a
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Struct1.hdl"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::test::codemaker::codemakertests::Struct1 Struct;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct.hpp
new file mode 100644
index 000000000000..615a0068f305
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Struct.hdl"
+
+#include "test/codemaker/codemakertests/Struct1.hpp"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct1.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct1.hdl
new file mode 100644
index 000000000000..4cd6b1a40a77
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct1.hdl
@@ -0,0 +1,33 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star { namespace uno { class Type; } } } }
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+#ifdef _WIN32
+#   pragma pack(push, 8)
+#endif
+
+struct SAL_DLLPUBLIC_RTTI SAL_WARN_UNUSED Struct1 {
+    inline Struct1();
+
+    inline Struct1(const ::sal_Int32& member1_);
+
+    ::sal_Int32 member1;
+};
+
+#ifdef _WIN32
+#   pragma pack(pop)
+#endif
+
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Struct1 const *);
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(const ::test::codemaker::codemakertests::Struct1 *);
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct1.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct1.hpp
new file mode 100644
index 000000000000..d40182ecd521
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct1.hpp
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Struct1.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "sal/types.h"
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+inline Struct1::Struct1()
+    : member1(0)
+{
+}
+
+inline Struct1::Struct1(const ::sal_Int32& member1_)
+    : member1(member1_)
+{
+}
+
+
+inline bool operator==(const Struct1& the_lhs, const Struct1& the_rhs)
+{
+    return the_lhs.member1 == the_rhs.member1;
+}
+
+inline bool operator!=(const Struct1& the_lhs, const Struct1& the_rhs)
+{
+return !operator==(the_lhs, the_rhs);
+}
+} } }
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Struct1 const *) {
+    //TODO: On certain platforms with weak memory models, the following code can result in some threads observing that the_type points to garbage
+    static ::typelib_TypeDescriptionReference * the_type = 0;
+    if (the_type == 0) {
+        ::typelib_TypeDescriptionReference * the_members[] = {
+            ::cppu::UnoType< ::sal_Int32 >::get().getTypeLibType() };
+        ::typelib_static_struct_type_init(&the_type, "test.codemaker.codemakertests.Struct1", 0, 1, the_members, 0);
+    }
+    return *reinterpret_cast< ::css::uno::Type * >(&the_type);
+}
+
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Struct1 const *) {
+    return ::cppu::UnoType< ::test::codemaker::codemakertests::Struct1 >::get();
+}
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct2.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct2.hdl
new file mode 100644
index 000000000000..a633fc0c384f
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct2.hdl
@@ -0,0 +1,167 @@
+#pragma once
+
+#include "sal/config.h"
+
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+namespace com { namespace sun { namespace star { namespace uno { class XNamingService; } } } }
+#include "test/codemaker/codemakertests/Any.hdl"
+#include "test/codemaker/codemakertests/Boolean.hdl"
+#include "test/codemaker/codemakertests/Byte.hdl"
+#include "test/codemaker/codemakertests/Char.hdl"
+#include "test/codemaker/codemakertests/Double.hdl"
+#include "test/codemaker/codemakertests/Enum.hdl"
+#include "test/codemaker/codemakertests/Enum2.hdl"
+#include "test/codemaker/codemakertests/Float.hdl"
+#include "test/codemaker/codemakertests/Hyper.hdl"
+#include "test/codemaker/codemakertests/Long.hdl"
+#include "test/codemaker/codemakertests/SequenceAny.hdl"
+#include "test/codemaker/codemakertests/SequenceBoolean.hdl"
+#include "test/codemaker/codemakertests/SequenceByte.hdl"
+#include "test/codemaker/codemakertests/SequenceChar.hdl"
+#include "test/codemaker/codemakertests/SequenceDouble.hdl"
+#include "test/codemaker/codemakertests/SequenceEnum.hdl"
+#include "test/codemaker/codemakertests/SequenceFloat.hdl"
+#include "test/codemaker/codemakertests/SequenceHyper.hdl"
+#include "test/codemaker/codemakertests/SequenceLong.hdl"
+#include "test/codemaker/codemakertests/SequenceShort.hdl"
+#include "test/codemaker/codemakertests/SequenceString.hdl"
+#include "test/codemaker/codemakertests/SequenceStruct.hdl"
+#include "test/codemaker/codemakertests/SequenceType.hdl"
+#include "test/codemaker/codemakertests/SequenceUnsignedHyper.hdl"
+#include "test/codemaker/codemakertests/SequenceUnsignedLong.hdl"
+#include "test/codemaker/codemakertests/SequenceUnsignedShort.hdl"
+#include "test/codemaker/codemakertests/SequenceXInterface.hdl"
+#include "test/codemaker/codemakertests/SequenceXNamingService.hdl"
+#include "test/codemaker/codemakertests/Short.hdl"
+#include "test/codemaker/codemakertests/String.hdl"
+#include "test/codemaker/codemakertests/Struct.hdl"
+#include "test/codemaker/codemakertests/Struct1.hdl"
+#include "test/codemaker/codemakertests/Type.hdl"
+#include "test/codemaker/codemakertests/UnsignedHyper.hdl"
+#include "test/codemaker/codemakertests/UnsignedLong.hdl"
+#include "test/codemaker/codemakertests/UnsignedShort.hdl"
+#include "test/codemaker/codemakertests/XInterface.hdl"
+#include "test/codemaker/codemakertests/XNamingService.hdl"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Reference.h"
+#include "com/sun/star/uno/Sequence.h"
+#include "com/sun/star/uno/Type.h"
+#include "cppu/macros.hxx"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star { namespace uno { class Type; } } } }
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+#ifdef _WIN32
+#   pragma pack(push, 8)
+#endif
+
+struct SAL_DLLPUBLIC_RTTI Struct2 {
+    inline Struct2();
+
+    inline Struct2(const ::sal_Bool& p1_, const ::sal_Int8& p2_, const ::sal_Int16& p3_, const ::sal_uInt16& p4_, const ::sal_Int32& p5_, const ::sal_uInt32& p6_, const ::sal_Int64& p7_, const ::sal_uInt64& p8_, const float& p9_, const double& p10_, const ::sal_Unicode& p11_, const ::rtl::OUString& p12_, const ::css::uno::Type& p13_, const ::css::uno::Any& p14_, const ::test::codemaker::codemakertests::Enum2& p15_, const ::test::codemaker::codemakertests::Struct1& p16_, const ::css::uno::Reference< ::css::uno::XInterface >& p17_, const ::css::uno::Reference< ::css::uno::XNamingService >& p18_, const ::sal_Bool& t1_, const ::sal_Int8& t2_, const ::sal_Int16& t3_, const ::sal_uInt16& t4_, const ::sal_Int32& t5_, const ::sal_uInt32& t6_, const ::sal_Int64& t7_, const ::sal_uInt64& t8_, const float& t9_, const double& t10_, const ::sal_Unicode& t11_, const ::rtl::OUString& t12_, const ::css::uno::Type& t13_, const ::css::uno::Any& t14_, const ::test::codemaker::codemakertests::Enum2& t15_, const ::test::codemaker::codemakertests::Struct1& t16_, const ::css::uno::Reference< ::css::uno::XInterface >& t17_, const ::css::uno::Reference< ::css::uno::XNamingService >& t18_, const ::css::uno::Sequence< ::sal_Bool >& a1_, const ::css::uno::Sequence< ::sal_Int8 >& a2_, const ::css::uno::Sequence< ::sal_Int16 >& a3_, const ::css::uno::Sequence< ::sal_uInt16 >& a4_, const ::css::uno::Sequence< ::sal_Int32 >& a5_, const ::css::uno::Sequence< ::sal_uInt32 >& a6_, const ::css::uno::Sequence< ::sal_Int64 >& a7_, const ::css::uno::Sequence< ::sal_uInt64 >& a8_, const ::css::uno::Sequence< float >& a9_, const ::css::uno::Sequence< double >& a10_, const ::css::uno::Sequence< ::sal_Unicode >& a11_, const ::css::uno::Sequence< ::rtl::OUString >& a12_, const ::css::uno::Sequence< ::css::uno::Type >& a13_, const ::css::uno::Sequence< ::css::uno::Any >& a14_, const ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 >& a15_, const ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 >& a16_, const ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > >& a17_, const ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > >& a18_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Bool > >& aa1_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int8 > >& aa2_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int16 > >& aa3_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt16 > >& aa4_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int32 > >& aa5_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt32 > >& aa6_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int64 > >& aa7_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt64 > >& aa8_, const ::css::uno::Sequence< ::css::uno::Sequence< float > >& aa9_, const ::css::uno::Sequence< ::css::uno::Sequence< double > >& aa10_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Unicode > >& aa11_, const ::css::uno::Sequence< ::css::uno::Sequence< ::rtl::OUString > >& aa12_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Type > >& aa13_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Any > >& aa14_, const ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 > >& aa15_, const ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 > >& aa16_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > >& aa17_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > > >& aa18_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Bool > >& at1_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int8 > >& at2_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int16 > >& at3_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt16 > >& at4_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int32 > >& at5_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt32 > >& at6_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int64 > >& at7_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt64 > >& at8_, const ::css::uno::Sequence< ::css::uno::Sequence< float > >& at9_, const ::css::uno::Sequence< ::css::uno::Sequence< double > >& at10_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Unicode > >& at11_, const ::css::uno::Sequence< ::css::uno::Sequence< ::rtl::OUString > >& at12_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Type > >& at13_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Any > >& at14_, const ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 > >& at15_, const ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 > >& at16_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > >& at17_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > > >& at18_);
+
+    ::sal_Bool p1;
+    ::sal_Int8 p2;
+    ::sal_Int16 p3;
+    ::sal_uInt16 p4;
+    ::sal_Int32 p5;
+    ::sal_uInt32 p6;
+    ::sal_Int64 p7;
+    ::sal_uInt64 p8;
+    float p9;
+    double p10;
+    ::sal_Unicode p11;
+    ::rtl::OUString p12;
+    ::css::uno::Type p13;
+    ::css::uno::Any p14;
+    ::test::codemaker::codemakertests::Enum2 p15;
+    ::test::codemaker::codemakertests::Struct1 p16;
+    ::css::uno::Reference< ::css::uno::XInterface > p17;
+    ::css::uno::Reference< ::css::uno::XNamingService > p18;
+    ::sal_Bool t1;
+    ::sal_Int8 t2;
+    ::sal_Int16 t3;
+    ::sal_uInt16 t4;
+    ::sal_Int32 t5;
+    ::sal_uInt32 t6;
+    ::sal_Int64 t7;
+    ::sal_uInt64 t8;
+    float t9;
+    double t10;
+    ::sal_Unicode t11;
+    ::rtl::OUString t12;
+    ::css::uno::Type t13;
+    ::css::uno::Any t14;
+    ::test::codemaker::codemakertests::Enum2 t15;
+    ::test::codemaker::codemakertests::Struct1 t16;
+    ::css::uno::Reference< ::css::uno::XInterface > t17;
+    ::css::uno::Reference< ::css::uno::XNamingService > t18;
+    ::css::uno::Sequence< ::sal_Bool > a1;
+    ::css::uno::Sequence< ::sal_Int8 > a2;
+    ::css::uno::Sequence< ::sal_Int16 > a3;
+    ::css::uno::Sequence< ::sal_uInt16 > a4;
+    ::css::uno::Sequence< ::sal_Int32 > a5;
+    ::css::uno::Sequence< ::sal_uInt32 > a6;
+    ::css::uno::Sequence< ::sal_Int64 > a7;
+    ::css::uno::Sequence< ::sal_uInt64 > a8;
+    ::css::uno::Sequence< float > a9;
+    ::css::uno::Sequence< double > a10;
+    ::css::uno::Sequence< ::sal_Unicode > a11;
+    ::css::uno::Sequence< ::rtl::OUString > a12;
+    ::css::uno::Sequence< ::css::uno::Type > a13;
+    ::css::uno::Sequence< ::css::uno::Any > a14;
+    ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 > a15;
+    ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 > a16;
+    ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > a17;
+    ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > > a18;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Bool > > aa1;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int8 > > aa2;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int16 > > aa3;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt16 > > aa4;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int32 > > aa5;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt32 > > aa6;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int64 > > aa7;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt64 > > aa8;
+    ::css::uno::Sequence< ::css::uno::Sequence< float > > aa9;
+    ::css::uno::Sequence< ::css::uno::Sequence< double > > aa10;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Unicode > > aa11;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::rtl::OUString > > aa12;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Type > > aa13;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Any > > aa14;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 > > aa15;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 > > aa16;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > > aa17;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > > > aa18;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Bool > > at1;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int8 > > at2;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int16 > > at3;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt16 > > at4;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int32 > > at5;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt32 > > at6;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int64 > > at7;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt64 > > at8;
+    ::css::uno::Sequence< ::css::uno::Sequence< float > > at9;
+    ::css::uno::Sequence< ::css::uno::Sequence< double > > at10;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Unicode > > at11;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::rtl::OUString > > at12;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Type > > at13;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Any > > at14;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 > > at15;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 > > at16;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > > at17;
+    ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > > > at18;
+};
+
+#ifdef _WIN32
+#   pragma pack(pop)
+#endif
+
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Struct2 const *);
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(const ::test::codemaker::codemakertests::Struct2 *);
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct2.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct2.hpp
new file mode 100644
index 000000000000..a2b79afd3ff3
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Struct2.hpp
@@ -0,0 +1,454 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Struct2.hdl"
+
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "test/codemaker/codemakertests/Any.hpp"
+#include "test/codemaker/codemakertests/Boolean.hpp"
+#include "test/codemaker/codemakertests/Byte.hpp"
+#include "test/codemaker/codemakertests/Char.hpp"
+#include "test/codemaker/codemakertests/Double.hpp"
+#include "test/codemaker/codemakertests/Enum.hpp"
+#include "test/codemaker/codemakertests/Enum2.hpp"
+#include "test/codemaker/codemakertests/Float.hpp"
+#include "test/codemaker/codemakertests/Hyper.hpp"
+#include "test/codemaker/codemakertests/Long.hpp"
+#include "test/codemaker/codemakertests/SequenceAny.hpp"
+#include "test/codemaker/codemakertests/SequenceBoolean.hpp"
+#include "test/codemaker/codemakertests/SequenceByte.hpp"
+#include "test/codemaker/codemakertests/SequenceChar.hpp"
+#include "test/codemaker/codemakertests/SequenceDouble.hpp"
+#include "test/codemaker/codemakertests/SequenceEnum.hpp"
+#include "test/codemaker/codemakertests/SequenceFloat.hpp"
+#include "test/codemaker/codemakertests/SequenceHyper.hpp"
+#include "test/codemaker/codemakertests/SequenceLong.hpp"
+#include "test/codemaker/codemakertests/SequenceShort.hpp"
+#include "test/codemaker/codemakertests/SequenceString.hpp"
+#include "test/codemaker/codemakertests/SequenceStruct.hpp"
+#include "test/codemaker/codemakertests/SequenceType.hpp"
+#include "test/codemaker/codemakertests/SequenceUnsignedHyper.hpp"
+#include "test/codemaker/codemakertests/SequenceUnsignedLong.hpp"
+#include "test/codemaker/codemakertests/SequenceUnsignedShort.hpp"
+#include "test/codemaker/codemakertests/SequenceXInterface.hpp"
+#include "test/codemaker/codemakertests/SequenceXNamingService.hpp"
+#include "test/codemaker/codemakertests/Short.hpp"
+#include "test/codemaker/codemakertests/String.hpp"
+#include "test/codemaker/codemakertests/Struct.hpp"
+#include "test/codemaker/codemakertests/Struct1.hpp"
+#include "test/codemaker/codemakertests/Type.hpp"
+#include "test/codemaker/codemakertests/UnsignedHyper.hpp"
+#include "test/codemaker/codemakertests/UnsignedLong.hpp"
+#include "test/codemaker/codemakertests/UnsignedShort.hpp"
+#include "test/codemaker/codemakertests/XInterface.hpp"
+#include "test/codemaker/codemakertests/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+inline Struct2::Struct2()
+    : p1(false)
+    , p2(0)
+    , p3(0)
+    , p4(0)
+    , p5(0)
+    , p6(0)
+    , p7(0)
+    , p8(0)
+    , p9(0)
+    , p10(0)
+    , p11(0)
+    , p12()
+    , p13()
+    , p14()
+    , p15(::test::codemaker::codemakertests::Enum2_FLAG_NONE)
+    , p16()
+    , p17()
+    , p18()
+    , t1(false)
+    , t2(0)
+    , t3(0)
+    , t4(0)
+    , t5(0)
+    , t6(0)
+    , t7(0)
+    , t8(0)
+    , t9(0)
+    , t10(0)
+    , t11(0)
+    , t12()
+    , t13()
+    , t14()
+    , t15(::test::codemaker::codemakertests::Enum2_FLAG_NONE)
+    , t16()
+    , t17()
+    , t18()
+    , a1()
+    , a2()
+    , a3()
+    , a4()
+    , a5()
+    , a6()
+    , a7()
+    , a8()
+    , a9()
+    , a10()
+    , a11()
+    , a12()
+    , a13()
+    , a14()
+    , a15()
+    , a16()
+    , a17()
+    , a18()
+    , aa1()
+    , aa2()
+    , aa3()
+    , aa4()
+    , aa5()
+    , aa6()
+    , aa7()
+    , aa8()
+    , aa9()
+    , aa10()
+    , aa11()
+    , aa12()
+    , aa13()
+    , aa14()
+    , aa15()
+    , aa16()
+    , aa17()
+    , aa18()
+    , at1()
+    , at2()
+    , at3()
+    , at4()
+    , at5()
+    , at6()
+    , at7()
+    , at8()
+    , at9()
+    , at10()
+    , at11()
+    , at12()
+    , at13()
+    , at14()
+    , at15()
+    , at16()
+    , at17()
+    , at18()
+{
+}
+
+inline Struct2::Struct2(const ::sal_Bool& p1_, const ::sal_Int8& p2_, const ::sal_Int16& p3_, const ::sal_uInt16& p4_, const ::sal_Int32& p5_, const ::sal_uInt32& p6_, const ::sal_Int64& p7_, const ::sal_uInt64& p8_, const float& p9_, const double& p10_, const ::sal_Unicode& p11_, const ::rtl::OUString& p12_, const ::css::uno::Type& p13_, const ::css::uno::Any& p14_, const ::test::codemaker::codemakertests::Enum2& p15_, const ::test::codemaker::codemakertests::Struct1& p16_, const ::css::uno::Reference< ::css::uno::XInterface >& p17_, const ::css::uno::Reference< ::css::uno::XNamingService >& p18_, const ::sal_Bool& t1_, const ::sal_Int8& t2_, const ::sal_Int16& t3_, const ::sal_uInt16& t4_, const ::sal_Int32& t5_, const ::sal_uInt32& t6_, const ::sal_Int64& t7_, const ::sal_uInt64& t8_, const float& t9_, const double& t10_, const ::sal_Unicode& t11_, const ::rtl::OUString& t12_, const ::css::uno::Type& t13_, const ::css::uno::Any& t14_, const ::test::codemaker::codemakertests::Enum2& t15_, const ::test::codemaker::codemakertests::Struct1& t16_, const ::css::uno::Reference< ::css::uno::XInterface >& t17_, const ::css::uno::Reference< ::css::uno::XNamingService >& t18_, const ::css::uno::Sequence< ::sal_Bool >& a1_, const ::css::uno::Sequence< ::sal_Int8 >& a2_, const ::css::uno::Sequence< ::sal_Int16 >& a3_, const ::css::uno::Sequence< ::sal_uInt16 >& a4_, const ::css::uno::Sequence< ::sal_Int32 >& a5_, const ::css::uno::Sequence< ::sal_uInt32 >& a6_, const ::css::uno::Sequence< ::sal_Int64 >& a7_, const ::css::uno::Sequence< ::sal_uInt64 >& a8_, const ::css::uno::Sequence< float >& a9_, const ::css::uno::Sequence< double >& a10_, const ::css::uno::Sequence< ::sal_Unicode >& a11_, const ::css::uno::Sequence< ::rtl::OUString >& a12_, const ::css::uno::Sequence< ::css::uno::Type >& a13_, const ::css::uno::Sequence< ::css::uno::Any >& a14_, const ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 >& a15_, const ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 >& a16_, const ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > >& a17_, const ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > >& a18_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Bool > >& aa1_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int8 > >& aa2_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int16 > >& aa3_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt16 > >& aa4_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int32 > >& aa5_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt32 > >& aa6_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int64 > >& aa7_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt64 > >& aa8_, const ::css::uno::Sequence< ::css::uno::Sequence< float > >& aa9_, const ::css::uno::Sequence< ::css::uno::Sequence< double > >& aa10_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Unicode > >& aa11_, const ::css::uno::Sequence< ::css::uno::Sequence< ::rtl::OUString > >& aa12_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Type > >& aa13_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Any > >& aa14_, const ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 > >& aa15_, const ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 > >& aa16_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > >& aa17_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > > >& aa18_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Bool > >& at1_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int8 > >& at2_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int16 > >& at3_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt16 > >& at4_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int32 > >& at5_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt32 > >& at6_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Int64 > >& at7_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_uInt64 > >& at8_, const ::css::uno::Sequence< ::css::uno::Sequence< float > >& at9_, const ::css::uno::Sequence< ::css::uno::Sequence< double > >& at10_, const ::css::uno::Sequence< ::css::uno::Sequence< ::sal_Unicode > >& at11_, const ::css::uno::Sequence< ::css::uno::Sequence< ::rtl::OUString > >& at12_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Type > >& at13_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Any > >& at14_, const ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Enum2 > >& at15_, const ::css::uno::Sequence< ::css::uno::Sequence< ::test::codemaker::codemakertests::Struct1 > >& at16_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XInterface > > >& at17_, const ::css::uno::Sequence< ::css::uno::Sequence< ::css::uno::Reference< ::css::uno::XNamingService > > >& at18_)
+    : p1(p1_)
+    , p2(p2_)
+    , p3(p3_)
+    , p4(p4_)
+    , p5(p5_)
+    , p6(p6_)
+    , p7(p7_)
+    , p8(p8_)
+    , p9(p9_)
+    , p10(p10_)
+    , p11(p11_)
+    , p12(p12_)
+    , p13(p13_)
+    , p14(p14_)
+    , p15(p15_)
+    , p16(p16_)
+    , p17(p17_)
+    , p18(p18_)
+    , t1(t1_)
+    , t2(t2_)
+    , t3(t3_)
+    , t4(t4_)
+    , t5(t5_)
+    , t6(t6_)
+    , t7(t7_)
+    , t8(t8_)
+    , t9(t9_)
+    , t10(t10_)
+    , t11(t11_)
+    , t12(t12_)
+    , t13(t13_)
+    , t14(t14_)
+    , t15(t15_)
+    , t16(t16_)
+    , t17(t17_)
+    , t18(t18_)
+    , a1(a1_)
+    , a2(a2_)
+    , a3(a3_)
+    , a4(a4_)
+    , a5(a5_)
+    , a6(a6_)
+    , a7(a7_)
+    , a8(a8_)
+    , a9(a9_)
+    , a10(a10_)
+    , a11(a11_)
+    , a12(a12_)
+    , a13(a13_)
+    , a14(a14_)
+    , a15(a15_)
+    , a16(a16_)
+    , a17(a17_)
+    , a18(a18_)
+    , aa1(aa1_)
+    , aa2(aa2_)
+    , aa3(aa3_)
+    , aa4(aa4_)
+    , aa5(aa5_)
+    , aa6(aa6_)
+    , aa7(aa7_)
+    , aa8(aa8_)
+    , aa9(aa9_)
+    , aa10(aa10_)
+    , aa11(aa11_)
+    , aa12(aa12_)
+    , aa13(aa13_)
+    , aa14(aa14_)
+    , aa15(aa15_)
+    , aa16(aa16_)
+    , aa17(aa17_)
+    , aa18(aa18_)
+    , at1(at1_)
+    , at2(at2_)
+    , at3(at3_)
+    , at4(at4_)
+    , at5(at5_)
+    , at6(at6_)
+    , at7(at7_)
+    , at8(at8_)
+    , at9(at9_)
+    , at10(at10_)
+    , at11(at11_)
+    , at12(at12_)
+    , at13(at13_)
+    , at14(at14_)
+    , at15(at15_)
+    , at16(at16_)
+    , at17(at17_)
+    , at18(at18_)
+{
+}
+
+
+inline bool operator==(const Struct2& the_lhs, const Struct2& the_rhs)
+{
+    return the_lhs.p1 == the_rhs.p1
+        && the_lhs.p2 == the_rhs.p2
+        && the_lhs.p3 == the_rhs.p3
+        && the_lhs.p4 == the_rhs.p4
+        && the_lhs.p5 == the_rhs.p5
+        && the_lhs.p6 == the_rhs.p6
+        && the_lhs.p7 == the_rhs.p7
+        && the_lhs.p8 == the_rhs.p8
+        && the_lhs.p9 == the_rhs.p9
+        && the_lhs.p10 == the_rhs.p10
+        && the_lhs.p11 == the_rhs.p11
+        && the_lhs.p12 == the_rhs.p12
+        && the_lhs.p13 == the_rhs.p13
+        && the_lhs.p14 == the_rhs.p14
+        && the_lhs.p15 == the_rhs.p15
+        && the_lhs.p16 == the_rhs.p16
+        && the_lhs.p17 == the_rhs.p17
+        && the_lhs.p18 == the_rhs.p18
+        && the_lhs.t1 == the_rhs.t1
+        && the_lhs.t2 == the_rhs.t2
+        && the_lhs.t3 == the_rhs.t3
+        && the_lhs.t4 == the_rhs.t4
+        && the_lhs.t5 == the_rhs.t5
+        && the_lhs.t6 == the_rhs.t6
+        && the_lhs.t7 == the_rhs.t7
+        && the_lhs.t8 == the_rhs.t8
+        && the_lhs.t9 == the_rhs.t9
+        && the_lhs.t10 == the_rhs.t10
+        && the_lhs.t11 == the_rhs.t11
+        && the_lhs.t12 == the_rhs.t12
+        && the_lhs.t13 == the_rhs.t13
+        && the_lhs.t14 == the_rhs.t14
+        && the_lhs.t15 == the_rhs.t15
+        && the_lhs.t16 == the_rhs.t16
+        && the_lhs.t17 == the_rhs.t17
+        && the_lhs.t18 == the_rhs.t18
+        && the_lhs.a1 == the_rhs.a1
+        && the_lhs.a2 == the_rhs.a2
+        && the_lhs.a3 == the_rhs.a3
+        && the_lhs.a4 == the_rhs.a4
+        && the_lhs.a5 == the_rhs.a5
+        && the_lhs.a6 == the_rhs.a6
+        && the_lhs.a7 == the_rhs.a7
+        && the_lhs.a8 == the_rhs.a8
+        && the_lhs.a9 == the_rhs.a9
+        && the_lhs.a10 == the_rhs.a10
+        && the_lhs.a11 == the_rhs.a11
+        && the_lhs.a12 == the_rhs.a12
+        && the_lhs.a13 == the_rhs.a13
+        && the_lhs.a14 == the_rhs.a14
+        && the_lhs.a15 == the_rhs.a15
+        && the_lhs.a16 == the_rhs.a16
+        && the_lhs.a17 == the_rhs.a17
+        && the_lhs.a18 == the_rhs.a18
+        && the_lhs.aa1 == the_rhs.aa1
+        && the_lhs.aa2 == the_rhs.aa2
+        && the_lhs.aa3 == the_rhs.aa3
+        && the_lhs.aa4 == the_rhs.aa4
+        && the_lhs.aa5 == the_rhs.aa5
+        && the_lhs.aa6 == the_rhs.aa6
+        && the_lhs.aa7 == the_rhs.aa7
+        && the_lhs.aa8 == the_rhs.aa8
+        && the_lhs.aa9 == the_rhs.aa9
+        && the_lhs.aa10 == the_rhs.aa10
+        && the_lhs.aa11 == the_rhs.aa11
+        && the_lhs.aa12 == the_rhs.aa12
+        && the_lhs.aa13 == the_rhs.aa13
+        && the_lhs.aa14 == the_rhs.aa14
+        && the_lhs.aa15 == the_rhs.aa15
+        && the_lhs.aa16 == the_rhs.aa16
+        && the_lhs.aa17 == the_rhs.aa17
+        && the_lhs.aa18 == the_rhs.aa18
+        && the_lhs.at1 == the_rhs.at1
+        && the_lhs.at2 == the_rhs.at2
+        && the_lhs.at3 == the_rhs.at3
+        && the_lhs.at4 == the_rhs.at4
+        && the_lhs.at5 == the_rhs.at5
+        && the_lhs.at6 == the_rhs.at6
+        && the_lhs.at7 == the_rhs.at7
+        && the_lhs.at8 == the_rhs.at8
+        && the_lhs.at9 == the_rhs.at9
+        && the_lhs.at10 == the_rhs.at10
+        && the_lhs.at11 == the_rhs.at11
+        && the_lhs.at12 == the_rhs.at12
+        && the_lhs.at13 == the_rhs.at13
+        && the_lhs.at14 == the_rhs.at14
+        && the_lhs.at15 == the_rhs.at15
+        && the_lhs.at16 == the_rhs.at16
+        && the_lhs.at17 == the_rhs.at17
+        && the_lhs.at18 == the_rhs.at18;
+}
+
+inline bool operator!=(const Struct2& the_lhs, const Struct2& the_rhs)
+{
+return !operator==(the_lhs, the_rhs);
+}
+} } }
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Struct2 const *) {
+    //TODO: On certain platforms with weak memory models, the following code can result in some threads observing that the_type points to garbage
+    static ::typelib_TypeDescriptionReference * the_type = 0;
+    if (the_type == 0) {
+        ::typelib_TypeDescriptionReference * the_members[] = {
+            ::cppu::UnoType< ::sal_Bool >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_Int8 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_Int16 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_Int32 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_uInt32 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_Int64 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_uInt64 >::get().getTypeLibType(),
+            ::cppu::UnoType< float >::get().getTypeLibType(),
+            ::cppu::UnoType< double >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoCharType >::get().getTypeLibType(),
+            ::cppu::UnoType< ::rtl::OUString >::get().getTypeLibType(),
+            ::cppu::UnoType< ::css::uno::Type >::get().getTypeLibType(),
+            ::cppu::UnoType< ::css::uno::Any >::get().getTypeLibType(),
+            ::cppu::UnoType< ::test::codemaker::codemakertests::Enum2 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::test::codemaker::codemakertests::Struct1 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::css::uno::Reference< ::css::uno::XInterface > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::css::uno::Reference< ::css::uno::XNamingService > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_Bool >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_Int8 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_Int16 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoUnsignedShortType >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_Int32 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_uInt32 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_Int64 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::sal_uInt64 >::get().getTypeLibType(),
+            ::cppu::UnoType< float >::get().getTypeLibType(),
+            ::cppu::UnoType< double >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoCharType >::get().getTypeLibType(),
+            ::cppu::UnoType< ::rtl::OUString >::get().getTypeLibType(),
+            ::cppu::UnoType< ::css::uno::Type >::get().getTypeLibType(),
+            ::cppu::UnoType< ::css::uno::Any >::get().getTypeLibType(),
+            ::cppu::UnoType< ::test::codemaker::codemakertests::Enum2 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::test::codemaker::codemakertests::Struct1 >::get().getTypeLibType(),
+            ::cppu::UnoType< ::css::uno::Reference< ::css::uno::XInterface > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::css::uno::Reference< ::css::uno::XNamingService > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::sal_Bool > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::sal_Int8 > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::sal_Int16 > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::sal_Int32 > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::sal_uInt32 > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::sal_Int64 > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::sal_uInt64 > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< float > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< double > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoCharType > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::rtl::OUString > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::css::uno::Type > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::css::uno::Any > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::test::codemaker::codemakertests::Enum2 > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::test::codemaker::codemakertests::Struct1 > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::css::uno::Reference< ::css::uno::XInterface > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::css::uno::Reference< ::css::uno::XNamingService > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_Bool > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_Int8 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_Int16 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_Int32 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_uInt32 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_Int64 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_uInt64 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< float > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< double > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::cppu::UnoCharType > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::rtl::OUString > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::css::uno::Type > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::css::uno::Any > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::test::codemaker::codemakertests::Enum2 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::test::codemaker::codemakertests::Struct1 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::css::uno::Reference< ::css::uno::XInterface > > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::css::uno::Reference< ::css::uno::XNamingService > > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_Bool > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_Int8 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_Int16 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::cppu::UnoUnsignedShortType > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_Int32 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_uInt32 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_Int64 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::sal_uInt64 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< float > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< double > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::cppu::UnoCharType > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::rtl::OUString > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::css::uno::Type > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::css::uno::Any > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::test::codemaker::codemakertests::Enum2 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::test::codemaker::codemakertests::Struct1 > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::css::uno::Reference< ::css::uno::XInterface > > > >::get().getTypeLibType(),
+            ::cppu::UnoType< ::cppu::UnoSequenceType< ::cppu::UnoSequenceType< ::css::uno::Reference< ::css::uno::XNamingService > > > >::get().getTypeLibType() };
+        ::typelib_static_struct_type_init(&the_type, "test.codemaker.codemakertests.Struct2", 0, 90, the_members, 0);
+    }
+    return *reinterpret_cast< ::css::uno::Type * >(&the_type);
+}
+
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::Struct2 const *) {
+    return ::cppu::UnoType< ::test::codemaker::codemakertests::Struct2 >::get();
+}
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/TestConstantsBasic.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/TestConstantsBasic.hdl
new file mode 100644
index 000000000000..332ab7603299
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/TestConstantsBasic.hdl
@@ -0,0 +1,22 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace test { namespace codemaker { namespace codemakertests { namespace TestConstantsBasic {
+
+static const ::sal_Bool BOOL_FALSE = sal_False;
+static const ::sal_Bool BOOL_TRUE = sal_True;
+static const ::sal_Int64 HYPER_MAX = (sal_Int64) SAL_CONST_INT64(9223372036854775807);
+static const ::sal_Int64 HYPER_MIN = SAL_MIN_INT64;
+static const ::sal_Int32 LONG_HEX = (sal_Int32)2147483647;
+static const ::sal_Int32 LONG_MAX = (sal_Int32)2147483647;
+static const ::sal_Int32 LONG_MIN = SAL_MIN_INT32;
+static const ::sal_Int16 SHORT_MAX = (sal_Int16)32767;
+static const ::sal_Int16 SHORT_MIN = (sal_Int16)-32768;
+static const ::sal_uInt32 ULONG_MAX = (sal_uInt32)4294967295U;
+static const ::sal_uInt16 USHORT_MAX = (sal_uInt16)65535;
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/TestConstantsBasic.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/TestConstantsBasic.hpp
new file mode 100644
index 000000000000..63aae64a2f3c
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/TestConstantsBasic.hpp
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "test/codemaker/codemakertests/TestConstantsBasic.hdl"
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Type.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Type.hdl
new file mode 100644
index 000000000000..d8516ce00693
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Type.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Type.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Type Type;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Type.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Type.hpp
new file mode 100644
index 000000000000..17ce82f69d30
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/Type.hpp
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/Type.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedHyper.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedHyper.hdl
new file mode 100644
index 000000000000..27ff48af6441
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedHyper.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::sal_uInt64 UnsignedHyper;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedHyper.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedHyper.hpp
new file mode 100644
index 000000000000..5dcc616ecb57
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedHyper.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/UnsignedHyper.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "sal/types.h"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedLong.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedLong.hdl
new file mode 100644
index 000000000000..bc9536672e02
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedLong.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::sal_uInt32 UnsignedLong;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedLong.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedLong.hpp
new file mode 100644
index 000000000000..64081d134992
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedLong.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/UnsignedLong.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "sal/types.h"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedShort.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedShort.hdl
new file mode 100644
index 000000000000..f28935c98453
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedShort.hdl
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::sal_uInt16 UnsignedShort;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedShort.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedShort.hpp
new file mode 100644
index 000000000000..db6796a83954
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/UnsignedShort.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/UnsignedShort.hdl"
+
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "sal/types.h"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XIfc.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XIfc.hdl
new file mode 100644
index 000000000000..d76f1e224e15
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XIfc.hdl
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/XInterface.hdl"
+#include "test/codemaker/codemakertests/PolyStruct.hdl"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Reference.h"
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star { namespace uno { class Type; } } } }
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class SAL_NO_VTABLE SAL_DLLPUBLIC_RTTI XIfc : public ::css::uno::XInterface
+{
+public:
+#if defined LIBO_INTERNAL_ONLY
+    XIfc() = default;
+    XIfc(XIfc const &) = default;
+    XIfc(XIfc &&) = default;
+    XIfc & operator =(XIfc const &) = default;
+    XIfc & operator =(XIfc &&) = default;
+#endif
+
+
+    // Methods
+    virtual void SAL_CALL f1( const ::test::codemaker::codemakertests::PolyStruct< ::sal_Int32, ::sal_Int32 >& arg ) = 0;
+    virtual void SAL_CALL f2( const ::test::codemaker::codemakertests::PolyStruct< ::css::uno::Any, ::css::uno::Reference< ::css::uno::XInterface > >& arg ) = 0;
+
+    static inline ::css::uno::Type const & SAL_CALL static_type(void * = 0);
+
+protected:
+    ~XIfc() SAL_NOEXCEPT {} // avoid warnings about virtual members and non-virtual dtor
+};
+
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::XIfc const *);
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(const ::css::uno::Reference< ::test::codemaker::codemakertests::XIfc > *);
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XIfc.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XIfc.hpp
new file mode 100644
index 000000000000..e1ebcb8068a7
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XIfc.hpp
@@ -0,0 +1,45 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/XIfc.hdl"
+
+#include "com/sun/star/uno/XInterface.hpp"
+#include "test/codemaker/codemakertests/PolyStruct.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "sal/types.h"
+
+#if defined LIBO_INTERNAL_ONLY
+#include <type_traits>
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::XIfc const *) {
+    static typelib_TypeDescriptionReference * the_type = 0;
+    if ( !the_type )
+    {
+        typelib_static_mi_interface_type_init( &the_type, "test.codemaker.codemakertests.XIfc", 0, 0 );
+    }
+    return * reinterpret_cast< ::css::uno::Type * >( &the_type );
+}
+
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(SAL_UNUSED_PARAMETER ::css::uno::Reference< ::test::codemaker::codemakertests::XIfc > const *) {
+    return ::cppu::UnoType< ::css::uno::Reference< ::test::codemaker::codemakertests::XIfc > >::get();
+}
+
+::css::uno::Type const & ::test::codemaker::codemakertests::XIfc::static_type(SAL_UNUSED_PARAMETER void *) {
+    return ::cppu::UnoType< ::test::codemaker::codemakertests::XIfc >::get();
+}
+
+#if defined LIBO_INTERNAL_ONLY
+namespace cppu::detail {
+template<> struct IsUnoInterfaceType<::test::codemaker::codemakertests::XIfc>: ::std::true_type {};
+}
+#endif
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XInterface.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XInterface.hdl
new file mode 100644
index 000000000000..70c736395bff
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XInterface.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } }
+#include "com/sun/star/uno/Reference.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Reference< ::css::uno::XInterface > XInterface;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XInterface.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XInterface.hpp
new file mode 100644
index 000000000000..ded0aaf41655
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XInterface.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/XInterface.hdl"
+
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XNamingService.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XNamingService.hdl
new file mode 100644
index 000000000000..713af2fa44e6
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XNamingService.hdl
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "sal/config.h"
+
+namespace com { namespace sun { namespace star { namespace uno { class XNamingService; } } } }
+#include "com/sun/star/uno/Reference.h"
+#include "cppu/macros.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+typedef ::css::uno::Reference< ::css::uno::XNamingService > XNamingService;
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XNamingService.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XNamingService.hpp
new file mode 100644
index 000000000000..5c22fbf3bc3c
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XNamingService.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/XNamingService.hdl"
+
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XTest.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XTest.hdl
new file mode 100644
index 000000000000..e2ca4701052c
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XTest.hdl
@@ -0,0 +1,48 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/XInterface.hdl"
+#include "com/sun/star/uno/Reference.h"
+#include "cppu/macros.hxx"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star { namespace uno { class Type; } } } }
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class SAL_NO_VTABLE SAL_DLLPUBLIC_RTTI XTest : public ::css::uno::XInterface
+{
+public:
+#if defined LIBO_INTERNAL_ONLY
+    XTest() = default;
+    XTest(XTest const &) = default;
+    XTest(XTest &&) = default;
+    XTest & operator =(XTest const &) = default;
+    XTest & operator =(XTest &&) = default;
+#endif
+
+
+    // Attributes
+    virtual ::sal_Int32 SAL_CALL getA1() = 0;
+    virtual void SAL_CALL setA1( ::sal_Int32 _a1 ) = 0;
+    virtual ::sal_Int32 SAL_CALL getA2() = 0;
+    virtual ::sal_Int32 SAL_CALL getA3() = 0;
+    virtual void SAL_CALL setA3( ::sal_Int32 _a3 ) = 0;
+    virtual ::sal_Int32 SAL_CALL getA4() = 0;
+
+    // Methods
+    virtual ::sal_Bool SAL_CALL test() = 0;
+
+    static inline ::css::uno::Type const & SAL_CALL static_type(void * = 0);
+
+protected:
+    ~XTest() SAL_NOEXCEPT {} // avoid warnings about virtual members and non-virtual dtor
+};
+
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::XTest const *);
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(const ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > *);
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XTest.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XTest.hpp
new file mode 100644
index 000000000000..f7d2c66d416c
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/XTest.hpp
@@ -0,0 +1,43 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/XTest.hdl"
+
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "sal/types.h"
+
+#if defined LIBO_INTERNAL_ONLY
+#include <type_traits>
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::XTest const *) {
+    static typelib_TypeDescriptionReference * the_type = 0;
+    if ( !the_type )
+    {
+        typelib_static_mi_interface_type_init( &the_type, "test.codemaker.codemakertests.XTest", 0, 0 );
+    }
+    return * reinterpret_cast< ::css::uno::Type * >( &the_type );
+}
+
+} } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(SAL_UNUSED_PARAMETER ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > const *) {
+    return ::cppu::UnoType< ::css::uno::Reference< ::test::codemaker::codemakertests::XTest > >::get();
+}
+
+::css::uno::Type const & ::test::codemaker::codemakertests::XTest::static_type(SAL_UNUSED_PARAMETER void *) {
+    return ::cppu::UnoType< ::test::codemaker::codemakertests::XTest >::get();
+}
+
+#if defined LIBO_INTERNAL_ONLY
+namespace cppu::detail {
+template<> struct IsUnoInterfaceType<::test::codemaker::codemakertests::XTest>: ::std::true_type {};
+}
+#endif
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/abstract.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/abstract.hpp
new file mode 100644
index 000000000000..21893cf1feb4
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/abstract.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_abstract && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_abstract) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_abstract
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_abstract(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class abstract {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_abstract && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_abstract) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_abstract
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_abstract)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.abstract" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.abstract of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    abstract(); // not implemented
+    abstract(abstract &); // not implemented
+    ~abstract(); // not implemented
+    void operator =(abstract); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/assert.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/assert.hpp
new file mode 100644
index 000000000000..c85e484e9558
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/assert.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_assert && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_assert) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_assert
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_assert(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_assert {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_assert && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_assert) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_assert
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_assert)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.assert" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.assert of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_assert(); // not implemented
+    singleton_assert(singleton_assert &); // not implemented
+    ~singleton_assert(); // not implemented
+    void operator =(singleton_assert); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/break.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/break.hpp
new file mode 100644
index 000000000000..005d9a787f14
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/break.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_break && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_break) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_break
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_break(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_break {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_break && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_break) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_break
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_break)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.break" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.break of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_break(); // not implemented
+    singleton_break(singleton_break &); // not implemented
+    ~singleton_break(); // not implemented
+    void operator =(singleton_break); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/catch.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/catch.hpp
new file mode 100644
index 000000000000..3caeb2139b30
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/catch.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_catch && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_catch) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_catch
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_catch(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_catch {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_catch && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_catch) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_catch
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_catch)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.catch" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.catch of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_catch(); // not implemented
+    singleton_catch(singleton_catch &); // not implemented
+    ~singleton_catch(); // not implemented
+    void operator =(singleton_catch); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/class.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/class.hpp
new file mode 100644
index 000000000000..ce1e9473a17a
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/class.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_class && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_class) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_class
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_class(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_class {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_class && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_class) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_class
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_class)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.class" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.class of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_class(); // not implemented
+    singleton_class(singleton_class &); // not implemented
+    ~singleton_class(); // not implemented
+    void operator =(singleton_class); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/continue.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/continue.hpp
new file mode 100644
index 000000000000..0df5128d1992
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/continue.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_continue && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_continue) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_continue
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_continue(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_continue {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_continue && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_continue) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_continue
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_continue)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.continue" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.continue of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_continue(); // not implemented
+    singleton_continue(singleton_continue &); // not implemented
+    ~singleton_continue(); // not implemented
+    void operator =(singleton_continue); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/do.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/do.hpp
new file mode 100644
index 000000000000..d3161063c599
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/do.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_do && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_do) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_do
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_do(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_do {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_do && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_do) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_do
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_do)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.do" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.do of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_do(); // not implemented
+    singleton_do(singleton_do &); // not implemented
+    ~singleton_do(); // not implemented
+    void operator =(singleton_do); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/else.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/else.hpp
new file mode 100644
index 000000000000..524848708cb3
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/else.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_else && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_else) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_else
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_else(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_else {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_else && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_else) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_else
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_else)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.else" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.else of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_else(); // not implemented
+    singleton_else(singleton_else &); // not implemented
+    ~singleton_else(); // not implemented
+    void operator =(singleton_else); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/exceptions/MyBaseError.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/exceptions/MyBaseError.hdl
new file mode 100644
index 000000000000..183aeaf624e8
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/exceptions/MyBaseError.hdl
@@ -0,0 +1,46 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Exception.hdl"
+#include "cppu/macros.hxx"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+namespace com { namespace sun { namespace star { namespace uno { class Type; } } } }
+
+namespace test { namespace codemaker { namespace codemakertests { namespace exceptions {
+
+class CPPU_GCC_DLLPUBLIC_EXPORT SAL_WARN_UNUSED MyBaseError : public ::css::uno::Exception
+{
+public:
+    inline CPPU_GCC_DLLPRIVATE MyBaseError(
+#if defined LIBO_USE_SOURCE_LOCATION
+        o3tl::source_location location = o3tl::source_location::current()
+#endif
+    );
+
+    inline CPPU_GCC_DLLPRIVATE MyBaseError(const ::rtl::OUString& Message_, const ::css::uno::Reference< ::css::uno::XInterface >& Context_, const ::sal_Int32& ErrorCode_, const ::rtl::OUString& Details_
+#if defined LIBO_USE_SOURCE_LOCATION
+        , o3tl::source_location location = o3tl::source_location::current()
+#endif
+    );
+
+#if !defined LIBO_INTERNAL_ONLY
+    inline CPPU_GCC_DLLPRIVATE MyBaseError(MyBaseError const &);
+
+    inline CPPU_GCC_DLLPRIVATE ~MyBaseError();
+
+    inline CPPU_GCC_DLLPRIVATE MyBaseError & operator =(MyBaseError const &);
+#endif
+
+    ::sal_Int32 ErrorCode CPPU_GCC3_ALIGN( ::css::uno::Exception );
+    ::rtl::OUString Details;
+};
+
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::exceptions::MyBaseError const *);
+} } } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(const ::test::codemaker::codemakertests::exceptions::MyBaseError *);
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/exceptions/MyBaseError.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/exceptions/MyBaseError.hpp
new file mode 100644
index 000000000000..15806cc48220
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/exceptions/MyBaseError.hpp
@@ -0,0 +1,80 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/exceptions/MyBaseError.hdl"
+
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+namespace test { namespace codemaker { namespace codemakertests { namespace exceptions {
+
+inline MyBaseError::MyBaseError(
+#if defined LIBO_USE_SOURCE_LOCATION
+    o3tl::source_location location
+#endif
+)
+    : ::css::uno::Exception(
+#if defined LIBO_USE_SOURCE_LOCATION
+    location
+#endif
+)
+    , ErrorCode(0)
+    , Details()
+{ }
+
+inline MyBaseError::MyBaseError(const ::rtl::OUString& Message_, const ::css::uno::Reference< ::css::uno::XInterface >& Context_, const ::sal_Int32& ErrorCode_, const ::rtl::OUString& Details_
+#if defined LIBO_USE_SOURCE_LOCATION
+    , o3tl::source_location location
+#endif
+)
+    : ::css::uno::Exception(Message_, Context_
+#if defined LIBO_USE_SOURCE_LOCATION
+    , location
+#endif
+)
+    , ErrorCode(ErrorCode_)
+    , Details(Details_)
+{ }
+
+#if !defined LIBO_INTERNAL_ONLY
+MyBaseError::MyBaseError(MyBaseError const & the_other): ::css::uno::Exception(the_other), ErrorCode(the_other.ErrorCode), Details(the_other.Details) {}
+
+MyBaseError::~MyBaseError() {}
+
+MyBaseError & MyBaseError::operator =(MyBaseError const & the_other) {
+    //TODO: Just like its implicitly-defined counterpart, this function definition is not exception-safe
+    ::css::uno::Exception::operator =(the_other);
+    ErrorCode = the_other.ErrorCode;
+    Details = the_other.Details;
+    return *this;
+}
+#endif
+
+} } } }
+
+namespace test { namespace codemaker { namespace codemakertests { namespace exceptions {
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::exceptions::MyBaseError const *) {
+    static typelib_TypeDescriptionReference * the_type = 0;
+    if ( !the_type )
+    {
+        typelib_TypeDescriptionReference * aMemberRefs[2];
+        const ::css::uno::Type& rMemberType_long = ::cppu::UnoType< ::sal_Int32 >::get();
+        aMemberRefs[0] = rMemberType_long.getTypeLibType();
+        const ::css::uno::Type& rMemberType_string = ::cppu::UnoType< ::rtl::OUString >::get();
+        aMemberRefs[1] = rMemberType_string.getTypeLibType();
+
+        typelib_static_compound_type_init( &the_type, typelib_TypeClass_EXCEPTION, "test.codemaker.codemakertests.exceptions.MyBaseError", * ::typelib_static_type_getByTypeClass( typelib_TypeClass_EXCEPTION ), 2,  aMemberRefs );
+    }
+    return * reinterpret_cast< const ::css::uno::Type * >( &the_type );
+}
+
+} } } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::exceptions::MyBaseError const *) {
+    return ::cppu::UnoType< ::test::codemaker::codemakertests::exceptions::MyBaseError >::get();
+}
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/exceptions/SimpleError.hdl b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/exceptions/SimpleError.hdl
new file mode 100644
index 000000000000..827373c83b72
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/exceptions/SimpleError.hdl
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "com/sun/star/uno/Exception.hdl"
+#include "cppu/macros.hxx"
+
+namespace com { namespace sun { namespace star { namespace uno { class Type; } } } }
+
+namespace test { namespace codemaker { namespace codemakertests { namespace exceptions {
+
+class CPPU_GCC_DLLPUBLIC_EXPORT SAL_WARN_UNUSED SimpleError : public ::css::uno::Exception
+{
+public:
+    inline CPPU_GCC_DLLPRIVATE SimpleError(
+#if defined LIBO_USE_SOURCE_LOCATION
+        o3tl::source_location location = o3tl::source_location::current()
+#endif
+    );
+
+    inline CPPU_GCC_DLLPRIVATE SimpleError(const ::rtl::OUString& Message_, const ::css::uno::Reference< ::css::uno::XInterface >& Context_ = ::css::uno::Reference< ::css::uno::XInterface >()
+#if defined LIBO_USE_SOURCE_LOCATION
+        , o3tl::source_location location = o3tl::source_location::current()
+#endif
+    );
+
+#if !defined LIBO_INTERNAL_ONLY
+    inline CPPU_GCC_DLLPRIVATE SimpleError(SimpleError const &);
+
+    inline CPPU_GCC_DLLPRIVATE ~SimpleError();
+
+    inline CPPU_GCC_DLLPRIVATE SimpleError & operator =(SimpleError const &);
+#endif
+
+};
+
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::exceptions::SimpleError const *);
+} } } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(const ::test::codemaker::codemakertests::exceptions::SimpleError *);
+
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/exceptions/SimpleError.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/exceptions/SimpleError.hpp
new file mode 100644
index 000000000000..2f0440752d8e
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/exceptions/SimpleError.hpp
@@ -0,0 +1,66 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include "test/codemaker/codemakertests/exceptions/SimpleError.hdl"
+
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/Type.hxx"
+#include "cppu/unotype.hxx"
+
+namespace test { namespace codemaker { namespace codemakertests { namespace exceptions {
+
+inline SimpleError::SimpleError(
+#if defined LIBO_USE_SOURCE_LOCATION
+    o3tl::source_location location
+#endif
+)
+    : ::css::uno::Exception(
+#if defined LIBO_USE_SOURCE_LOCATION
+    location
+#endif
+)
+{ }
+
+inline SimpleError::SimpleError(const ::rtl::OUString& Message_, const ::css::uno::Reference< ::css::uno::XInterface >& Context_
+#if defined LIBO_USE_SOURCE_LOCATION
+    , o3tl::source_location location
+#endif
+)
+    : ::css::uno::Exception(Message_, Context_
+#if defined LIBO_USE_SOURCE_LOCATION
+    , location
+#endif
+)
+{ }
+
+#if !defined LIBO_INTERNAL_ONLY
+SimpleError::SimpleError(SimpleError const & the_other): ::css::uno::Exception(the_other) {}
+
+SimpleError::~SimpleError() {}
+
+SimpleError & SimpleError::operator =(SimpleError const & the_other) {
+    //TODO: Just like its implicitly-defined counterpart, this function definition is not exception-safe
+    ::css::uno::Exception::operator =(the_other);
+    return *this;
+}
+#endif
+
+} } } }
+
+namespace test { namespace codemaker { namespace codemakertests { namespace exceptions {
+
+inline ::css::uno::Type const & cppu_detail_getUnoType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::exceptions::SimpleError const *) {
+    static typelib_TypeDescriptionReference * the_type = 0;
+    if ( !the_type )
+    {
+        typelib_static_compound_type_init( &the_type, typelib_TypeClass_EXCEPTION, "test.codemaker.codemakertests.exceptions.SimpleError", * ::typelib_static_type_getByTypeClass( typelib_TypeClass_EXCEPTION ), 0,  0 );
+    }
+    return * reinterpret_cast< const ::css::uno::Type * >( &the_type );
+}
+
+} } } }
+
+SAL_DEPRECATED("use cppu::UnoType") inline ::css::uno::Type const & SAL_CALL getCppuType(SAL_UNUSED_PARAMETER ::test::codemaker::codemakertests::exceptions::SimpleError const *) {
+    return ::cppu::UnoType< ::test::codemaker::codemakertests::exceptions::SimpleError >::get();
+}
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/extends.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/extends.hpp
new file mode 100644
index 000000000000..075b8e6e8f1f
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/extends.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_extends && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_extends) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_extends
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_extends(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class extends {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_extends && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_extends) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_extends
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_extends)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.extends" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.extends of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    extends(); // not implemented
+    extends(extends &); // not implemented
+    ~extends(); // not implemented
+    void operator =(extends); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/final.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/final.hpp
new file mode 100644
index 000000000000..4b45f4b57549
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/final.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_final && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_final) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_final
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_final(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class final {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_final && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_final) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_final
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_final)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.final" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.final of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    final(); // not implemented
+    final(final &); // not implemented
+    ~final(); // not implemented
+    void operator =(final); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/finally.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/finally.hpp
new file mode 100644
index 000000000000..c9a19d9589c2
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/finally.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_finally && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_finally) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_finally
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_finally(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class finally {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_finally && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_finally) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_finally
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_finally)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.finally" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.finally of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    finally(); // not implemented
+    finally(finally &); // not implemented
+    ~finally(); // not implemented
+    void operator =(finally); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/for.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/for.hpp
new file mode 100644
index 000000000000..090f325bc137
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/for.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_for && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_for) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_for
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_for(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_for {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_for && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_for) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_for
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_for)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.for" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.for of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_for(); // not implemented
+    singleton_for(singleton_for &); // not implemented
+    ~singleton_for(); // not implemented
+    void operator =(singleton_for); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/goto.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/goto.hpp
new file mode 100644
index 000000000000..942f6e3f953f
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/goto.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_goto && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_goto) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_goto
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_goto(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_goto {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_goto && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_goto) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_goto
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_goto)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.goto" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.goto of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_goto(); // not implemented
+    singleton_goto(singleton_goto &); // not implemented
+    ~singleton_goto(); // not implemented
+    void operator =(singleton_goto); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/if.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/if.hpp
new file mode 100644
index 000000000000..fb0b221b386c
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/if.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_if && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_if) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_if
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_if(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_if {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_if && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_if) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_if
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_if)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.if" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.if of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_if(); // not implemented
+    singleton_if(singleton_if &); // not implemented
+    ~singleton_if(); // not implemented
+    void operator =(singleton_if); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/implements.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/implements.hpp
new file mode 100644
index 000000000000..4b1906be3e8a
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/implements.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_implements && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_implements) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_implements
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_implements(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class implements {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_implements && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_implements) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_implements
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_implements)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.implements" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.implements of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    implements(); // not implemented
+    implements(implements &); // not implemented
+    ~implements(); // not implemented
+    void operator =(implements); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/import.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/import.hpp
new file mode 100644
index 000000000000..d834638b54db
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/import.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_import && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_import) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_import
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_import(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class import {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_import && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_import) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_import
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_import)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.import" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.import of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    import(); // not implemented
+    import(import &); // not implemented
+    ~import(); // not implemented
+    void operator =(import); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/instanceof.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/instanceof.hpp
new file mode 100644
index 000000000000..f70d06f3a82f
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/instanceof.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_instanceof && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_instanceof) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_instanceof
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_instanceof(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class instanceof {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_instanceof && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_instanceof) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_instanceof
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_instanceof)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.instanceof" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.instanceof of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    instanceof(); // not implemented
+    instanceof(instanceof &); // not implemented
+    ~instanceof(); // not implemented
+    void operator =(instanceof); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/int.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/int.hpp
new file mode 100644
index 000000000000..13c3d252b793
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/int.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_int && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_int) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_int
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_int(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_int {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_int && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_int) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_int
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_int)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.int" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.int of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_int(); // not implemented
+    singleton_int(singleton_int &); // not implemented
+    ~singleton_int(); // not implemented
+    void operator =(singleton_int); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/native.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/native.hpp
new file mode 100644
index 000000000000..33e894ddfb0a
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/native.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_native && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_native) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_native
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_native(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class native {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_native && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_native) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_native
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_native)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.native" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.native of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    native(); // not implemented
+    native(native &); // not implemented
+    ~native(); // not implemented
+    void operator =(native); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/new.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/new.hpp
new file mode 100644
index 000000000000..166cfcd2d305
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/new.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_new && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_new) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_new
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_new(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_new {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_new && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_new) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_new
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_new)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.new" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.new of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_new(); // not implemented
+    singleton_new(singleton_new &); // not implemented
+    ~singleton_new(); // not implemented
+    void operator =(singleton_new); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/package.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/package.hpp
new file mode 100644
index 000000000000..513483c423bf
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/package.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_package && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_package) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_package
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_package(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class package {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_package && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_package) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_package
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_package)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.package" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.package of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    package(); // not implemented
+    package(package &); // not implemented
+    ~package(); // not implemented
+    void operator =(package); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/private.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/private.hpp
new file mode 100644
index 000000000000..c7e3b574a2bb
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/private.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_private && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_private) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_private
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_private(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_private {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_private && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_private) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_private
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_private)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.private" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.private of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_private(); // not implemented
+    singleton_private(singleton_private &); // not implemented
+    ~singleton_private(); // not implemented
+    void operator =(singleton_private); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/protected.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/protected.hpp
new file mode 100644
index 000000000000..f1a4d848cdf0
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/protected.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_protected && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_protected) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_protected
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_protected(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_protected {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_protected && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_protected) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_protected
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_protected)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.protected" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.protected of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_protected(); // not implemented
+    singleton_protected(singleton_protected &); // not implemented
+    ~singleton_protected(); // not implemented
+    void operator =(singleton_protected); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/public.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/public.hpp
new file mode 100644
index 000000000000..f32c890048f7
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/public.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_public && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_public) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_public
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_public(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_public {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_public && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_public) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_public
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_public)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.public" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.public of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_public(); // not implemented
+    singleton_public(singleton_public &); // not implemented
+    ~singleton_public(); // not implemented
+    void operator =(singleton_public); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/return.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/return.hpp
new file mode 100644
index 000000000000..a73e66377de3
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/return.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_return && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_return) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_return
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_return(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_return {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_return && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_return) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_return
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_return)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.return" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.return of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_return(); // not implemented
+    singleton_return(singleton_return &); // not implemented
+    ~singleton_return(); // not implemented
+    void operator =(singleton_return); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/abstract.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/abstract.hpp
new file mode 100644
index 000000000000..52a45fac6f26
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/abstract.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_abstract && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_abstract) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_abstract
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_abstract(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class abstract {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_abstract(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 abstract) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= abstract;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_abstract && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_abstract) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_abstract
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_abstract)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.abstract", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.abstract" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.abstract" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    abstract(); // not implemented
+    abstract(abstract &); // not implemented
+    ~abstract(); // not implemented
+    void operator =(abstract); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/assert.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/assert.hpp
new file mode 100644
index 000000000000..40c5ffc1126b
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/assert.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_assert && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_assert) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_assert
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_assert(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_assert {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_assert(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_assert) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_assert;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_assert && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_assert) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_assert
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_assert)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.assert", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.assert" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.assert" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_assert(); // not implemented
+    service_assert(service_assert &); // not implemented
+    ~service_assert(); // not implemented
+    void operator =(service_assert); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/break.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/break.hpp
new file mode 100644
index 000000000000..4f2bd0327782
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/break.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_break && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_break) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_break
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_break(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_break {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_break(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_break) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_break;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_break && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_break) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_break
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_break)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.break", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.break" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.break" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_break(); // not implemented
+    service_break(service_break &); // not implemented
+    ~service_break(); // not implemented
+    void operator =(service_break); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/catch.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/catch.hpp
new file mode 100644
index 000000000000..329312745d78
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/catch.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_catch && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_catch) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_catch
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_catch(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_catch {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_catch(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_catch) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_catch;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_catch && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_catch) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_catch
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_catch)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.catch", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.catch" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.catch" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_catch(); // not implemented
+    service_catch(service_catch &); // not implemented
+    ~service_catch(); // not implemented
+    void operator =(service_catch); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/class.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/class.hpp
new file mode 100644
index 000000000000..9bf5df291223
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/class.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_class && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_class) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_class
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_class(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_class {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_class(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_class) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_class;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_class && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_class) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_class
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_class)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.class", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.class" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.class" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_class(); // not implemented
+    service_class(service_class &); // not implemented
+    ~service_class(); // not implemented
+    void operator =(service_class); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/continue.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/continue.hpp
new file mode 100644
index 000000000000..4de444b4ae03
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/continue.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_continue && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_continue) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_continue
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_continue(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_continue {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_continue(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_continue) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_continue;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_continue && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_continue) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_continue
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_continue)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.continue", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.continue" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.continue" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_continue(); // not implemented
+    service_continue(service_continue &); // not implemented
+    ~service_continue(); // not implemented
+    void operator =(service_continue); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/do.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/do.hpp
new file mode 100644
index 000000000000..b503d6b1aeb1
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/do.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_do && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_do) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_do
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_do(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_do {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_do(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_do) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_do;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_do && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_do) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_do
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_do)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.do", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.do" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.do" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_do(); // not implemented
+    service_do(service_do &); // not implemented
+    ~service_do(); // not implemented
+    void operator =(service_do); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/else.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/else.hpp
new file mode 100644
index 000000000000..83c7c284877b
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/else.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_else && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_else) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_else
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_else(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_else {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_else(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_else) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_else;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_else && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_else) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_else)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.else", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.else" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.else" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_else(); // not implemented
+    service_else(service_else &); // not implemented
+    ~service_else(); // not implemented
+    void operator =(service_else); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/extends.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/extends.hpp
new file mode 100644
index 000000000000..664d58a105cb
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/extends.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_extends && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_extends) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_extends
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_extends(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class extends {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_extends(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 extends) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= extends;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_extends && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_extends) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_extends
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_extends)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.extends", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.extends" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.extends" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    extends(); // not implemented
+    extends(extends &); // not implemented
+    ~extends(); // not implemented
+    void operator =(extends); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/final.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/final.hpp
new file mode 100644
index 000000000000..c2b93f80cc7d
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/final.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_final && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_final) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_final
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_final(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class final {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_final(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 final) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= final;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_final && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_final) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_final
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_final)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.final", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.final" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.final" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    final(); // not implemented
+    final(final &); // not implemented
+    ~final(); // not implemented
+    void operator =(final); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/finally.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/finally.hpp
new file mode 100644
index 000000000000..db87297cf7c4
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/finally.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_finally && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_finally) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_finally
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_finally(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class finally {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_finally(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 finally) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= finally;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_finally && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_finally) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_finally
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_finally)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.finally", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.finally" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.finally" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    finally(); // not implemented
+    finally(finally &); // not implemented
+    ~finally(); // not implemented
+    void operator =(finally); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/for.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/for.hpp
new file mode 100644
index 000000000000..3be6616b7f05
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/for.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_for && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_for) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_for
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_for(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_for {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_for(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_for) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_for;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_for && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_for) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_for
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_for)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.for", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.for" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.for" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_for(); // not implemented
+    service_for(service_for &); // not implemented
+    ~service_for(); // not implemented
+    void operator =(service_for); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/goto.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/goto.hpp
new file mode 100644
index 000000000000..fc95d9d1d5d1
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/goto.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_goto && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_goto) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_goto
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_goto(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_goto {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_goto(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_goto) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_goto;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_goto && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_goto) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_goto
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_goto)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.goto", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.goto" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.goto" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_goto(); // not implemented
+    service_goto(service_goto &); // not implemented
+    ~service_goto(); // not implemented
+    void operator =(service_goto); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/if.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/if.hpp
new file mode 100644
index 000000000000..dcc2f942eda2
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/if.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_if && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_if) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_if
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_if(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_if {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_if(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_if) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_if;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_if && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_if) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_if
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_if)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.if", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.if" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.if" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_if(); // not implemented
+    service_if(service_if &); // not implemented
+    ~service_if(); // not implemented
+    void operator =(service_if); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/implements.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/implements.hpp
new file mode 100644
index 000000000000..83c324c08abb
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/implements.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_implements && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_implements) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_implements
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_implements(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class implements {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_implements(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 implements) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= implements;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_implements && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_implements) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_implements
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_implements)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.implements", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.implements" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.implements" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    implements(); // not implemented
+    implements(implements &); // not implemented
+    ~implements(); // not implemented
+    void operator =(implements); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/import.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/import.hpp
new file mode 100644
index 000000000000..cdb438ebcdc1
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/import.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_import && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_import) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_import
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_import(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class import {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_import(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 import) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= import;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_import && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_import) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_import
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_import)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.import", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.import" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.import" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    import(); // not implemented
+    import(import &); // not implemented
+    ~import(); // not implemented
+    void operator =(import); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/instanceof.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/instanceof.hpp
new file mode 100644
index 000000000000..a46d76cf9277
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/instanceof.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_instanceof && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_instanceof) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_instanceof
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_instanceof(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class instanceof {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_instanceof(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 instanceof) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= instanceof;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_instanceof && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_instanceof) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_instanceof
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_instanceof)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.instanceof", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.instanceof" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.instanceof" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    instanceof(); // not implemented
+    instanceof(instanceof &); // not implemented
+    ~instanceof(); // not implemented
+    void operator =(instanceof); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/int.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/int.hpp
new file mode 100644
index 000000000000..e8a7d4759741
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/int.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_int && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_int) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_int
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_int(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_int {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_int(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_int) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_int;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_int && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_int) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_int
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_int)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.int", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.int" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.int" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_int(); // not implemented
+    service_int(service_int &); // not implemented
+    ~service_int(); // not implemented
+    void operator =(service_int); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/native.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/native.hpp
new file mode 100644
index 000000000000..41c0b5309ee7
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/native.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_native && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_native) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_native
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_native(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class native {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_native(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 native) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= native;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_native && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_native) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_native
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_native)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.native", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.native" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.native" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    native(); // not implemented
+    native(native &); // not implemented
+    ~native(); // not implemented
+    void operator =(native); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/new.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/new.hpp
new file mode 100644
index 000000000000..5a1b88551720
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/new.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_new && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_new) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_new
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_new(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_new {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_new(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_new) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_new;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_new && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_new) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_new
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_new)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.new", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.new" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.new" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_new(); // not implemented
+    service_new(service_new &); // not implemented
+    ~service_new(); // not implemented
+    void operator =(service_new); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/package.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/package.hpp
new file mode 100644
index 000000000000..2c4cc58a1bce
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/package.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_package && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_package) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_package
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_package(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class package {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_package(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 package) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= package;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_package && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_package) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_package
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_package)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.package", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.package" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.package" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    package(); // not implemented
+    package(package &); // not implemented
+    ~package(); // not implemented
+    void operator =(package); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/private.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/private.hpp
new file mode 100644
index 000000000000..2e3a2d3c98d2
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/private.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_private && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_private) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_private
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_private(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_private {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_private(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_private) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_private;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_private && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_private) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_private
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_private)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.private", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.private" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.private" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_private(); // not implemented
+    service_private(service_private &); // not implemented
+    ~service_private(); // not implemented
+    void operator =(service_private); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/protected.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/protected.hpp
new file mode 100644
index 000000000000..25215cb30920
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/protected.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_protected && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_protected) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_protected
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_protected(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_protected {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_protected(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_protected) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_protected;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_protected && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_protected) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_protected
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_protected)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.protected", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.protected" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.protected" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_protected(); // not implemented
+    service_protected(service_protected &); // not implemented
+    ~service_protected(); // not implemented
+    void operator =(service_protected); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/public.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/public.hpp
new file mode 100644
index 000000000000..608a94e99ee4
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/public.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_public && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_public) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_public
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_public(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_public {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_public(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_public) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_public;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_public && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_public) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_public
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_public)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.public", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.public" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.public" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_public(); // not implemented
+    service_public(service_public &); // not implemented
+    ~service_public(); // not implemented
+    void operator =(service_public); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/return.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/return.hpp
new file mode 100644
index 000000000000..9d5ffe600e98
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/return.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_return && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_return) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_return
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_return(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_return {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_return(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_return) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_return;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_return && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_return) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_return
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_return)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.return", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.return" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.return" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_return(); // not implemented
+    service_return(service_return &); // not implemented
+    ~service_return(); // not implemented
+    void operator =(service_return); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/static.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/static.hpp
new file mode 100644
index 000000000000..8c81df978818
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/static.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_static && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_static) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_static
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_static(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_static {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_static(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_static) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_static;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_static && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_static) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_static
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_static)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.static", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.static" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.static" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_static(); // not implemented
+    service_static(service_static &); // not implemented
+    ~service_static(); // not implemented
+    void operator =(service_static); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/strictfp.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/strictfp.hpp
new file mode 100644
index 000000000000..6d77ac9c423c
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/strictfp.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_strictfp && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_strictfp) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_strictfp
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_strictfp(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class strictfp {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_strictfp(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 strictfp) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= strictfp;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_strictfp && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_strictfp) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_strictfp
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_strictfp)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.strictfp", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.strictfp" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.strictfp" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    strictfp(); // not implemented
+    strictfp(strictfp &); // not implemented
+    ~strictfp(); // not implemented
+    void operator =(strictfp); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/super.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/super.hpp
new file mode 100644
index 000000000000..4f4d0fbf0014
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/super.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_super && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_super) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_super
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_super(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class super {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_super(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 super) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= super;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_super && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_super) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_super
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_super)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.super", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.super" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.super" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    super(); // not implemented
+    super(super &); // not implemented
+    ~super(); // not implemented
+    void operator =(super); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/synchronized.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/synchronized.hpp
new file mode 100644
index 000000000000..b6d7b468a9b8
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/synchronized.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_synchronized && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_synchronized) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_synchronized
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_synchronized(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class synchronized {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_synchronized(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 synchronized) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= synchronized;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_synchronized && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_synchronized) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_synchronized
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_synchronized)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.synchronized", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.synchronized" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.synchronized" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    synchronized(); // not implemented
+    synchronized(synchronized &); // not implemented
+    ~synchronized(); // not implemented
+    void operator =(synchronized); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/this.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/this.hpp
new file mode 100644
index 000000000000..59634daff52b
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/this.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_this && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_this) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_this
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_this(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_this {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_this(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_this) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_this;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_this && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_this) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_this
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_this)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.this", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.this" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.this" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_this(); // not implemented
+    service_this(service_this &); // not implemented
+    ~service_this(); // not implemented
+    void operator =(service_this); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/throw.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/throw.hpp
new file mode 100644
index 000000000000..36ba6182ca32
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/throw.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_throw && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_throw) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_throw
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_throw(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_throw {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_throw(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_throw) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_throw;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_throw && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_throw) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_throw
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_throw)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.throw", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.throw" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.throw" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_throw(); // not implemented
+    service_throw(service_throw &); // not implemented
+    ~service_throw(); // not implemented
+    void operator =(service_throw); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/throws.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/throws.hpp
new file mode 100644
index 000000000000..00b13c7ff02d
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/throws.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_throws && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_throws) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_throws
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_throws(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class throws {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_throws(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 throws) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= throws;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_throws && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_throws) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_throws
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_throws)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.throws", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.throws" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.throws" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    throws(); // not implemented
+    throws(throws &); // not implemented
+    ~throws(); // not implemented
+    void operator =(throws); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/try.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/try.hpp
new file mode 100644
index 000000000000..babe6976384b
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/try.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_try && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_try) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_try
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_try(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_try {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_try(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_try) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_try;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_try && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_try) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_try
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_try)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.try", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.try" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.try" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_try(); // not implemented
+    service_try(service_try &); // not implemented
+    ~service_try(); // not implemented
+    void operator =(service_try); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/volatile.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/volatile.hpp
new file mode 100644
index 000000000000..a397bed603cc
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/volatile.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_volatile && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_volatile) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_volatile
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_volatile(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_volatile {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_volatile(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_volatile) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_volatile;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_volatile && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_volatile) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_volatile
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_volatile)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.volatile", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.volatile" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.volatile" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_volatile(); // not implemented
+    service_volatile(service_volatile &); // not implemented
+    ~service_volatile(); // not implemented
+    void operator =(service_volatile); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/while.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/while.hpp
new file mode 100644
index 000000000000..85475b11038e
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/services/while.hpp
@@ -0,0 +1,67 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/Exception.hpp"
+#include "com/sun/star/uno/RuntimeException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XInterface.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "com/sun/star/uno/Sequence.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+#include "sal/types.h"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_while && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_while) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_while
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_while(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests { namespace services {
+
+class service_while {
+public:
+    static ::css::uno::Reference< ::css::uno::XInterface > method_while(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context, ::sal_Int32 param_while) {
+        assert(the_context.is());
+        ::css::uno::Sequence< ::css::uno::Any > the_arguments(1);
+        ::css::uno::Any* the_arguments_array = the_arguments.getArray();
+        the_arguments_array[0] <<= param_while;
+        ::css::uno::Reference< ::css::uno::XInterface > the_instance;
+        try {
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_while && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_services_dot_while) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_while
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_services_dot_while)(the_context.get(), the_arguments)), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+            ::css::uno::Reference< ::css::lang::XInitialization > init(the_instance, ::css::uno::UNO_QUERY);
+            if (init.is()) {
+                init->initialize(the_arguments);
+            }
+#else
+            the_instance = ::css::uno::Reference< ::css::uno::XInterface >(the_context->getServiceManager()->createInstanceWithArgumentsAndContext( "test.codemaker.codemakertests.services.while", the_arguments, the_context), ::css::uno::UNO_QUERY);
+#endif
+        } catch (const ::css::uno::RuntimeException &) {
+            throw;
+        } catch (const ::css::uno::Exception & the_exception) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.while" + " of type " + "com.sun.star.uno.XInterface" + ": " + the_exception.Message, the_context);
+        }
+        if (!the_instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString("component context fails to supply service ") + "test.codemaker.codemakertests.services.while" + " of type " + "com.sun.star.uno.XInterface", the_context);
+        }
+        return the_instance;
+    }
+
+private:
+    service_while(); // not implemented
+    service_while(service_while &); // not implemented
+    ~service_while(); // not implemented
+    void operator =(service_while); // not implemented
+};
+
+} } } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/static.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/static.hpp
new file mode 100644
index 000000000000..b6d303af98c5
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/static.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_static && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_static) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_static
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_static(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_static {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_static && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_static) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_static
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_static)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.static" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.static of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_static(); // not implemented
+    singleton_static(singleton_static &); // not implemented
+    ~singleton_static(); // not implemented
+    void operator =(singleton_static); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/strictfp.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/strictfp.hpp
new file mode 100644
index 000000000000..292c962b931b
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/strictfp.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_strictfp && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_strictfp) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_strictfp
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_strictfp(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class strictfp {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_strictfp && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_strictfp) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_strictfp
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_strictfp)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.strictfp" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.strictfp of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    strictfp(); // not implemented
+    strictfp(strictfp &); // not implemented
+    ~strictfp(); // not implemented
+    void operator =(strictfp); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/super.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/super.hpp
new file mode 100644
index 000000000000..2671761cf876
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/super.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_super && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_super) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_super
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_super(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class super {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_super && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_super) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_super
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_super)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.super" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.super of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    super(); // not implemented
+    super(super &); // not implemented
+    ~super(); // not implemented
+    void operator =(super); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/synchronized.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/synchronized.hpp
new file mode 100644
index 000000000000..8249308a5159
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/synchronized.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_synchronized && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_synchronized) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_synchronized
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_synchronized(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class synchronized {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_synchronized && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_synchronized) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_synchronized
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_synchronized)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.synchronized" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.synchronized of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    synchronized(); // not implemented
+    synchronized(synchronized &); // not implemented
+    ~synchronized(); // not implemented
+    void operator =(synchronized); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/this.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/this.hpp
new file mode 100644
index 000000000000..74dedcae29e3
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/this.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_this && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_this) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_this
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_this(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_this {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_this && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_this) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_this
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_this)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.this" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.this of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_this(); // not implemented
+    singleton_this(singleton_this &); // not implemented
+    ~singleton_this(); // not implemented
+    void operator =(singleton_this); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/throw.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/throw.hpp
new file mode 100644
index 000000000000..e54e17bfe445
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/throw.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_throw && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_throw) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_throw
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_throw(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_throw {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_throw && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_throw) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_throw
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_throw)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.throw" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.throw of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_throw(); // not implemented
+    singleton_throw(singleton_throw &); // not implemented
+    ~singleton_throw(); // not implemented
+    void operator =(singleton_throw); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/throws.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/throws.hpp
new file mode 100644
index 000000000000..011fe31f6c32
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/throws.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_throws && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_throws) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_throws
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_throws(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class throws {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_throws && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_throws) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_throws
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_throws)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.throws" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.throws of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    throws(); // not implemented
+    throws(throws &); // not implemented
+    ~throws(); // not implemented
+    void operator =(throws); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/try.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/try.hpp
new file mode 100644
index 000000000000..e401ed2cf78e
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/try.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_try && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_try) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_try
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_try(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_try {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_try && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_try) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_try
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_try)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.try" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.try of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_try(); // not implemented
+    singleton_try(singleton_try &); // not implemented
+    ~singleton_try(); // not implemented
+    void operator =(singleton_try); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/volatile.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/volatile.hpp
new file mode 100644
index 000000000000..63e32c2a1dc5
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/volatile.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_volatile && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_volatile) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_volatile
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_volatile(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_volatile {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_volatile && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_volatile) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_volatile
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_volatile)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.volatile" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.volatile of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_volatile(); // not implemented
+    singleton_volatile(singleton_volatile &); // not implemented
+    ~singleton_volatile(); // not implemented
+    void operator =(singleton_volatile); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/while.hpp b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/while.hpp
new file mode 100644
index 000000000000..d7adda81b8db
--- /dev/null
+++ b/codemaker/tests/expected_cppumaker_stubs/test/codemaker/codemakertests/while.hpp
@@ -0,0 +1,50 @@
+#pragma once
+
+#include "sal/config.h"
+
+#include <cassert>
+
+#include "com/sun/star/uno/DeploymentException.hpp"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include "com/sun/star/uno/XNamingService.hpp"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Reference.hxx"
+#include "cppu/unotype.hxx"
+#include "rtl/ustring.h"
+#include "rtl/ustring.hxx"
+
+#if defined ANDROID || defined IOS //TODO
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <osl/detail/component-defines.h>
+#endif
+
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_while && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_while) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_while
+extern "C" ::css::uno::XInterface * SAL_CALL LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_while(::css::uno::XComponentContext *, ::css::uno::Sequence< ::css::uno::Any > const &);
+#endif
+
+namespace test { namespace codemaker { namespace codemakertests {
+
+class singleton_while {
+public:
+    static ::css::uno::Reference< ::css::uno::XNamingService > get(::css::uno::Reference< ::css::uno::XComponentContext > const & the_context) {
+        assert(the_context.is());
+        ::css::uno::Reference< ::css::uno::XNamingService > instance;
+#if defined LO_URE_CURRENT_ENV && defined LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_while && (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_test_dot_codemaker_dot_codemakertests_dot_while) && defined LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_while
+        instance = ::css::uno::Reference< ::css::uno::XNamingService >(::css::uno::Reference< ::css::uno::XInterface >(static_cast< ::css::uno::XInterface * >((*LO_URE_CTOR_FUN_test_dot_codemaker_dot_codemakertests_dot_while)(the_context.get(), ::css::uno::Sequence< ::css::uno::Any >())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);
+#else
+        the_context->getValueByName(::rtl::OUString( "/singletons/test.codemaker.codemakertests.while" )) >>= instance;
+#endif
+        if (!instance.is()) {
+            throw ::css::uno::DeploymentException(::rtl::OUString( "component context fails to supply singleton test.codemaker.codemakertests.while of type com.sun.star.uno.XNamingService" ), the_context);
+        }
+        return instance;
+    }
+
+private:
+    singleton_while(); // not implemented
+    singleton_while(singleton_while &); // not implemented
+    ~singleton_while(); // not implemented
+    void operator =(singleton_while); // not implemented
+};
+
+} } }
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/__init__.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/__init__.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/__init__.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/__init__.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/__init__.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/__init__.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/__init__.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/__init__.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Any.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Any.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Any.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Any.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Boolean.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Boolean.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Boolean.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Boolean.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Byte.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Byte.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Byte.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Byte.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Char.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Char.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Char.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Char.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Double.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Double.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Double.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Double.pyi
diff --git a/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Enum.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Enum.pyi
new file mode 100644
index 000000000000..050fef5751c9
--- /dev/null
+++ b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Enum.pyi
@@ -0,0 +1,6 @@
+# Auto-generated by pythonmaker - DO NOT EDIT.
+from __future__ import annotations
+
+from test.codemaker.codemakertests.Enum2 import Enum2 as test_codemaker_codemakertests_Enum2_
+
+Enum = test_codemaker_codemakertests_Enum2_
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Enum1.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Enum1.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Enum1.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Enum1.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Enum2.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Enum2.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Enum2.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Enum2.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Enum3.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Enum3.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Enum3.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Enum3.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Enum4.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Enum4.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Enum4.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Enum4.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Float.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Float.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Float.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Float.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Hyper.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Hyper.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Hyper.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Hyper.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Long.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Long.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Long.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Long.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/PolyStruct.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/PolyStruct.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/PolyStruct.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/PolyStruct.pyi
diff --git a/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/S1.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/S1.pyi
new file mode 100644
index 000000000000..b2e4a2844e44
--- /dev/null
+++ b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/S1.pyi
@@ -0,0 +1,52 @@
+# Auto-generated by pythonmaker - DO NOT EDIT.
+from __future__ import annotations
+
+from com.sun.star.lang.ClassNotFoundException import ClassNotFoundException as com_sun_star_lang_ClassNotFoundException_
+from com.sun.star.lang.IllegalAccessException import IllegalAccessException as com_sun_star_lang_IllegalAccessException_
+from com.sun.star.uno.DeploymentException import DeploymentException as com_sun_star_uno_DeploymentException_
+from com.sun.star.uno.Exception import Exception as com_sun_star_uno_Exception_
+from com.sun.star.uno.RuntimeException import RuntimeException as com_sun_star_uno_RuntimeException_
+from com.sun.star.uno.XComponentContext import XComponentContext as com_sun_star_uno_XComponentContext_
+from com.sun.star.uno.XInterface import XInterface as com_sun_star_uno_XInterface_
+from com.sun.star.uno.XNamingService import XNamingService as com_sun_star_uno_XNamingService_
+from test.codemaker.codemakertests.Enum2 import Enum2 as test_codemaker_codemakertests_Enum2_
+from test.codemaker.codemakertests.Struct1 import Struct1 as test_codemaker_codemakertests_Struct1_
+from test.codemaker.codemakertests.XTest import XTest as test_codemaker_codemakertests_XTest_
+from typing import Any
+from typing import List
+from typing import Type
+
+class S1:
+    @staticmethod
+    def create1(ctx: com_sun_star_uno_XComponentContext_) -> test_codemaker_codemakertests_XTest_:
+        ...
+
+    @staticmethod
+    def create2(ctx: com_sun_star_uno_XComponentContext_, *args: Any) -> test_codemaker_codemakertests_XTest_:
+        """Raises:
+            com_sun_star_uno_RuntimeException_
+            com_sun_star_lang_ClassNotFoundException_
+            com_sun_star_uno_Exception_
+            com_sun_star_lang_IllegalAccessException_
+            com_sun_star_uno_DeploymentException_
+        """
+        ...
+
+    @staticmethod
+    def create3(ctx: com_sun_star_uno_XComponentContext_, S1: List[Any]) -> test_codemaker_codemakertests_XTest_:
+        """Raises:
+            com_sun_star_uno_RuntimeException_
+            com_sun_star_lang_ClassNotFoundException_
+            com_sun_star_lang_IllegalAccessException_
+            com_sun_star_uno_DeploymentException_
+        """
+        ...
+
+    @staticmethod
+    def create4(ctx: com_sun_star_uno_XComponentContext_, javamaker: int, S1: int, create4: int) -> test_codemaker_codemakertests_XTest_:
+        ...
+
+    @staticmethod
+    def create5(ctx: com_sun_star_uno_XComponentContext_, p1: bool, p2: int, p3: int, p4: int, p5: int, p6: int, p7: int, p8: int, p9: float, p10: float, p11: str, p12: str, p13: Type[Any], p14: Any, p15: test_codemaker_codemakertests_Enum2_, p16: test_codemaker_codemakertests_Struct1_, p17: com_sun_star_uno_XInterface_, p18: com_sun_star_uno_XNamingService_, t1: bool, t2: int, t3: int, t4: int, t5: int, t6: int, t7: int, t8: int, t9: float, t10: float, t11: str, t12: str, t13: Type[Any], t14: Any, t15: test_codemaker_codemakertests_Enum2_, t16: test_codemaker_codemakertests_Struct1_, t17: com_sun_star_uno_XInterface_, t18: com_sun_star_uno_XNamingService_, a1: List[bool], a2: List[int], a3: List[int], a4: List[int], a5: List[int], a6: List[int], a7: List[int], a8: List[int], a9: List[float], a10: List[float], a11: List[str], a12: List[str], a13: List[Type[Any]], a14: List[Any], a15: List[test_codemaker_codemakertests_Enum2_], a16: List[test_codemaker_codemakertests_Struct1_], a17: List[com_sun_star_uno_XInterface_], a18: List[com_sun_star_uno_XNamingService_], aa1: List[List[bool]], aa2: List[List[int]], aa3: List[List[int]], aa4: List[List[int]], aa5: List[List[int]], aa6: List[List[int]], aa7: List[List[int]], aa8: List[List[int]], aa9: List[List[float]], aa10: List[List[float]], aa11: List[List[str]], aa12: List[List[str]], aa13: List[List[Type[Any]]], aa14: List[List[Any]], aa15: List[List[test_codemaker_codemakertests_Enum2_]], aa16: List[List[test_codemaker_codemakertests_Struct1_]], aa17: List[List[com_sun_star_uno_XInterface_]], aa18: List[List[com_sun_star_uno_XNamingService_]], at1: List[List[bool]], at2: List[List[int]], at3: List[List[int]], at4: List[List[int]], at5: List[List[int]], at6: List[List[int]], at7: List[List[int]], at8: List[List[int]], at9: List[List[float]], at10: List[List[float]], at11: List[List[str]], at12: List[List[str]], at13: List[List[Type[Any]]], at14: List[List[Any]], at15: List[List[test_codemaker_codemakertests_Enum2_]], at16: List[List[test_codemaker_codemakertests_Struct1_]], at17: List[List[com_sun_star_uno_XInterface_]], at18: List[List[com_sun_star_uno_XNamingService_]]) -> test_codemaker_codemakertests_XTest_:
+        ...
+
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/S2.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/S2.pyi
similarity index 69%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/S2.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/S2.pyi
index 32fcfaecd2a2..16b62f38bcf5 100644
--- a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/S2.pyi
+++ b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/S2.pyi
@@ -2,10 +2,10 @@
 from __future__ import annotations
 
 from com.sun.star.uno.XComponentContext import XComponentContext as com_sun_star_uno_XComponentContext_
-from test.codemaker.pythonmaker.XTest import XTest as test_codemaker_pythonmaker_XTest_
+from test.codemaker.codemakertests.XTest import XTest as test_codemaker_codemakertests_XTest_
 
 class S2:
     @staticmethod
-    def create(ctx: com_sun_star_uno_XComponentContext_) -> test_codemaker_pythonmaker_XTest_:
+    def create(ctx: com_sun_star_uno_XComponentContext_) -> test_codemaker_codemakertests_XTest_:
         ...
 
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/S4.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/S4.pyi
similarity index 79%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/S4.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/S4.pyi
index 1ee119510671..bbf1b90cdd76 100644
--- a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/S4.pyi
+++ b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/S4.pyi
@@ -3,11 +3,11 @@ from __future__ import annotations
 
 from com.sun.star.uno.DeploymentException import DeploymentException as com_sun_star_uno_DeploymentException_
 from com.sun.star.uno.XComponentContext import XComponentContext as com_sun_star_uno_XComponentContext_
-from test.codemaker.pythonmaker.XTest import XTest as test_codemaker_pythonmaker_XTest_
+from test.codemaker.codemakertests.XTest import XTest as test_codemaker_codemakertests_XTest_
 
 class S4:
     @staticmethod
-    def get(ctx: com_sun_star_uno_XComponentContext_) -> test_codemaker_pythonmaker_XTest_:
+    def get(ctx: com_sun_star_uno_XComponentContext_) -> test_codemaker_codemakertests_XTest_:
         """Raises:
             com_sun_star_uno_DeploymentException_
         """
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceAny.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceAny.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceAny.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceAny.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceBoolean.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceBoolean.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceBoolean.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceBoolean.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceByte.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceByte.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceByte.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceByte.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceChar.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceChar.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceChar.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceChar.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceDouble.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceDouble.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceDouble.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceDouble.pyi
diff --git a/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceEnum.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceEnum.pyi
new file mode 100644
index 000000000000..e11335ffb1be
--- /dev/null
+++ b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceEnum.pyi
@@ -0,0 +1,7 @@
+# Auto-generated by pythonmaker - DO NOT EDIT.
+from __future__ import annotations
+
+from test.codemaker.codemakertests.Enum2 import Enum2 as test_codemaker_codemakertests_Enum2_
+from typing import List
+
+SequenceEnum = List[test_codemaker_codemakertests_Enum2_]
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceFloat.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceFloat.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceFloat.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceFloat.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceHyper.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceHyper.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceHyper.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceHyper.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceLong.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceLong.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceLong.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceLong.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceShort.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceShort.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceShort.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceShort.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceString.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceString.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceString.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceString.pyi
diff --git a/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceStruct.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceStruct.pyi
new file mode 100644
index 000000000000..11befb7343a3
--- /dev/null
+++ b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceStruct.pyi
@@ -0,0 +1,7 @@
+# Auto-generated by pythonmaker - DO NOT EDIT.
+from __future__ import annotations
+
+from test.codemaker.codemakertests.Struct1 import Struct1 as test_codemaker_codemakertests_Struct1_
+from typing import List
+
+SequenceStruct = List[test_codemaker_codemakertests_Struct1_]
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceType.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceType.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceType.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceType.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceUnsignedHyper.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceUnsignedHyper.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceUnsignedHyper.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceUnsignedHyper.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceUnsignedLong.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceUnsignedLong.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceUnsignedLong.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceUnsignedLong.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceUnsignedShort.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceUnsignedShort.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceUnsignedShort.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceUnsignedShort.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceXInterface.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceXInterface.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceXInterface.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceXInterface.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceXNamingService.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceXNamingService.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceXNamingService.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/SequenceXNamingService.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Service.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Service.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Service.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Service.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Short.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Short.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Short.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Short.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/String.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/String.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/String.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/String.pyi
diff --git a/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Struct.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Struct.pyi
new file mode 100644
index 000000000000..14be27f4049e
--- /dev/null
+++ b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Struct.pyi
@@ -0,0 +1,6 @@
+# Auto-generated by pythonmaker - DO NOT EDIT.
+from __future__ import annotations
+
+from test.codemaker.codemakertests.Struct1 import Struct1 as test_codemaker_codemakertests_Struct1_
+
+Struct = test_codemaker_codemakertests_Struct1_
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Struct1.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Struct1.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Struct1.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Struct1.pyi
diff --git a/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Struct2.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Struct2.pyi
new file mode 100644
index 000000000000..6b6ee650e878
--- /dev/null
+++ b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Struct2.pyi
@@ -0,0 +1,105 @@
+# Auto-generated by pythonmaker - DO NOT EDIT.
+from __future__ import annotations
+
+from com.sun.star.uno.XInterface import XInterface as com_sun_star_uno_XInterface_
+from com.sun.star.uno.XNamingService import XNamingService as com_sun_star_uno_XNamingService_
+from test.codemaker.codemakertests.Enum2 import Enum2 as test_codemaker_codemakertests_Enum2_
+from test.codemaker.codemakertests.Struct1 import Struct1 as test_codemaker_codemakertests_Struct1_
+from typing import Any
+from typing import List
+from typing import Type
+
+class Struct2(object):
+    def __init__(self, p1: bool | None = ..., p2: int | None = ..., p3: int | None = ..., p4: int | None = ..., p5: int | None = ..., p6: int | None = ..., p7: int | None = ..., p8: int | None = ..., p9: float | None = ..., p10: float | None = ..., p11: str | None = ..., p12: str | None = ..., p13: Type[Any] | None = ..., p14: Any | None = ..., p15: test_codemaker_codemakertests_Enum2_ | None = ..., p16: test_codemaker_codemakertests_Struct1_ | None = ..., p17: com_sun_star_uno_XInterface_ | None = ..., p18: com_sun_star_uno_XNamingService_ | None = ..., t1: bool | None = ..., t2: int | None = ..., t3: int | None = ..., t4: int | None = ..., t5: int | None = ..., t6: int | None = ..., t7: int | None = ..., t8: int | None = ..., t9: float | None = ..., t10: float | None = ..., t11: str | None = ..., t12: str | None = ..., t13: Type[Any] | None = ..., t14: Any | None = ..., t15: test_codemaker_codemakertests_Enum2_ | None = ..., t16: test_codemaker_codemakertests_Struct1_ | None = ..., t17: com_sun_star_uno_XInterface_ | None = ..., t18: com_sun_star_uno_XNamingService_ | None = ..., a1: List[bool] | None = ..., a2: List[int] | None = ..., a3: List[int] | None = ..., a4: List[int] | None = ..., a5: List[int] | None = ..., a6: List[int] | None = ..., a7: List[int] | None = ..., a8: List[int] | None = ..., a9: List[float] | None = ..., a10: List[float] | None = ..., a11: List[str] | None = ..., a12: List[str] | None = ..., a13: List[Type[Any]] | None = ..., a14: List[Any] | None = ..., a15: List[test_codemaker_codemakertests_Enum2_] | None = ..., a16: List[test_codemaker_codemakertests_Struct1_] | None = ..., a17: List[com_sun_star_uno_XInterface_] | None = ..., a18: List[com_sun_star_uno_XNamingService_] | None = ..., aa1: List[List[bool]] | None = ..., aa2: List[List[int]] | None = ..., aa3: List[List[int]] | None = ..., aa4: List[List[int]] | None = ..., aa5: List[List[int]] | None = ..., aa6: List[List[int]] | None = ..., aa7: List[List[int]] | None = ..., aa8: List[List[int]] | None = ..., aa9: List[List[float]] | None = ..., aa10: List[List[float]] | None = ..., aa11: List[List[str]] | None = ..., aa12: List[List[str]] | None = ..., aa13: List[List[Type[Any]]] | None = ..., aa14: List[List[Any]] | None = ..., aa15: List[List[test_codemaker_codemakertests_Enum2_]] | None = ..., aa16: List[List[test_codemaker_codemakertests_Struct1_]] | None = ..., aa17: List[List[com_sun_star_uno_XInterface_]] | None = ..., aa18: List[List[com_sun_star_uno_XNamingService_]] | None = ..., at1: List[List[bool]] | None = ..., at2: List[List[int]] | None = ..., at3: List[List[int]] | None = ..., at4: List[List[int]] | None = ..., at5: List[List[int]] | None = ..., at6: List[List[int]] | None = ..., at7: List[List[int]] | None = ..., at8: List[List[int]] | None = ..., at9: List[List[float]] | None = ..., at10: List[List[float]] | None = ..., at11: List[List[str]] | None = ..., at12: List[List[str]] | None = ..., at13: List[List[Type[Any]]] | None = ..., at14: List[List[Any]] | None = ..., at15: List[List[test_codemaker_codemakertests_Enum2_]] | None = ..., at16: List[List[test_codemaker_codemakertests_Struct1_]] | None = ..., at17: List[List[com_sun_star_uno_XInterface_]] | None = ..., at18: List[List[com_sun_star_uno_XNamingService_]] | None = ...) -> None:
+        ...
+
+    p1: bool
+    p2: int
+    p3: int
+    p4: int
+    p5: int
+    p6: int
+    p7: int
+    p8: int
+    p9: float
+    p10: float
+    p11: str
+    p12: str
+    p13: Type[Any]
+    p14: Any
+    p15: test_codemaker_codemakertests_Enum2_
+    p16: test_codemaker_codemakertests_Struct1_
+    p17: com_sun_star_uno_XInterface_
+    p18: com_sun_star_uno_XNamingService_
+    t1: bool
+    t2: int
+    t3: int
+    t4: int
+    t5: int
+    t6: int
+    t7: int
+    t8: int
+    t9: float
+    t10: float
+    t11: str
+    t12: str
+    t13: Type[Any]
+    t14: Any
+    t15: test_codemaker_codemakertests_Enum2_
+    t16: test_codemaker_codemakertests_Struct1_
+    t17: com_sun_star_uno_XInterface_
+    t18: com_sun_star_uno_XNamingService_
+    a1: List[bool]
+    a2: List[int]
+    a3: List[int]
+    a4: List[int]
+    a5: List[int]
+    a6: List[int]
+    a7: List[int]
+    a8: List[int]
+    a9: List[float]
+    a10: List[float]
+    a11: List[str]
+    a12: List[str]
+    a13: List[Type[Any]]
+    a14: List[Any]
+    a15: List[test_codemaker_codemakertests_Enum2_]
+    a16: List[test_codemaker_codemakertests_Struct1_]
+    a17: List[com_sun_star_uno_XInterface_]
+    a18: List[com_sun_star_uno_XNamingService_]
+    aa1: List[List[bool]]
+    aa2: List[List[int]]
+    aa3: List[List[int]]
+    aa4: List[List[int]]
+    aa5: List[List[int]]
+    aa6: List[List[int]]
+    aa7: List[List[int]]
+    aa8: List[List[int]]
+    aa9: List[List[float]]
+    aa10: List[List[float]]
+    aa11: List[List[str]]
+    aa12: List[List[str]]
+    aa13: List[List[Type[Any]]]
+    aa14: List[List[Any]]
+    aa15: List[List[test_codemaker_codemakertests_Enum2_]]
+    aa16: List[List[test_codemaker_codemakertests_Struct1_]]
+    aa17: List[List[com_sun_star_uno_XInterface_]]
+    aa18: List[List[com_sun_star_uno_XNamingService_]]
+    at1: List[List[bool]]
+    at2: List[List[int]]
+    at3: List[List[int]]
+    at4: List[List[int]]
+    at5: List[List[int]]
+    at6: List[List[int]]
+    at7: List[List[int]]
+    at8: List[List[int]]
+    at9: List[List[float]]
+    at10: List[List[float]]
+    at11: List[List[str]]
+    at12: List[List[str]]
+    at13: List[List[Type[Any]]]
+    at14: List[List[Any]]
+    at15: List[List[test_codemaker_codemakertests_Enum2_]]
+    at16: List[List[test_codemaker_codemakertests_Struct1_]]
+    at17: List[List[com_sun_star_uno_XInterface_]]
+    at18: List[List[com_sun_star_uno_XNamingService_]]
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/TestConstantsBasic.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/TestConstantsBasic.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/TestConstantsBasic.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/TestConstantsBasic.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Type.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Type.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Type.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/Type.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/UnsignedHyper.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/UnsignedHyper.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/UnsignedHyper.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/UnsignedHyper.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/UnsignedLong.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/UnsignedLong.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/UnsignedLong.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/UnsignedLong.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/UnsignedShort.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/UnsignedShort.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/UnsignedShort.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/UnsignedShort.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/XIfc.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/XIfc.pyi
similarity index 52%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/XIfc.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/XIfc.pyi
index 87940d5ea949..5a38044491db 100644
--- a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/XIfc.pyi
+++ b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/XIfc.pyi
@@ -3,15 +3,15 @@ from __future__ import annotations
 
 from abc import abstractmethod
 from com.sun.star.uno.XInterface import XInterface as com_sun_star_uno_XInterface_
-from test.codemaker.pythonmaker.PolyStruct import PolyStruct as test_codemaker_pythonmaker_PolyStruct_
+from test.codemaker.codemakertests.PolyStruct import PolyStruct as test_codemaker_codemakertests_PolyStruct_
 from typing import Any
 
 class XIfc(com_sun_star_uno_XInterface_):
     @abstractmethod
-    def f1(self, arg: test_codemaker_pythonmaker_PolyStruct_[int, int]) -> None:
+    def f1(self, arg: test_codemaker_codemakertests_PolyStruct_[int, int]) -> None:
         ...
 
     @abstractmethod
-    def f2(self, arg: test_codemaker_pythonmaker_PolyStruct_[Any, com_sun_star_uno_XInterface_]) -> None:
+    def f2(self, arg: test_codemaker_codemakertests_PolyStruct_[Any, com_sun_star_uno_XInterface_]) -> None:
         ...
 
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/XInterface.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/XInterface.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/XInterface.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/XInterface.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/XNamingService.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/XNamingService.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/XNamingService.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/XNamingService.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/XTest.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/XTest.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/XTest.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/XTest.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/__init__.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/__init__.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/__init__.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/__init__.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/abstract.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/abstract.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/abstract.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/abstract.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/assert.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/assert.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/assert.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/assert.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/break.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/break.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/break.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/break.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/catch.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/catch.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/catch.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/catch.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/class.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/class.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/class.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/class.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/continue.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/continue.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/continue.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/continue.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/do.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/do.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/do.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/do.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/else.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/else.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/else.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/else.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/exceptions/MyBaseError.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/exceptions/MyBaseError.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/exceptions/MyBaseError.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/exceptions/MyBaseError.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/exceptions/SimpleError.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/exceptions/SimpleError.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/exceptions/SimpleError.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/exceptions/SimpleError.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/exceptions/__init__.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/exceptions/__init__.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/exceptions/__init__.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/exceptions/__init__.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/extends.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/extends.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/extends.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/extends.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/final.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/final.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/final.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/final.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/finally.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/finally.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/finally.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/finally.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/for.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/for.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/for.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/for.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/goto.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/goto.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/goto.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/goto.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/if.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/if.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/if.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/if.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/implements.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/implements.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/implements.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/implements.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/import.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/import.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/import.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/import.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/instanceof.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/instanceof.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/instanceof.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/instanceof.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/int.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/int.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/int.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/int.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/native.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/native.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/native.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/native.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/new.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/new.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/new.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/new.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/package.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/package.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/package.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/package.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/private.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/private.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/private.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/private.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/protected.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/protected.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/protected.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/protected.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/public.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/public.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/public.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/public.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/return.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/return.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/return.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/return.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/__init__.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/__init__.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/__init__.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/__init__.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/abstract.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/abstract.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/abstract.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/abstract.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/assert.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/assert.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/assert.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/assert.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/break.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/break.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/break.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/break.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/catch.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/catch.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/catch.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/catch.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/class.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/class.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/class.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/class.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/continue.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/continue.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/continue.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/continue.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/do.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/do.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/do.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/do.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/else.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/else.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/else.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/else.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/extends.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/extends.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/extends.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/extends.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/final.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/final.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/final.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/final.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/finally.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/finally.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/finally.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/finally.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/for.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/for.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/for.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/for.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/goto.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/goto.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/goto.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/goto.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/if.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/if.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/if.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/if.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/implements.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/implements.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/implements.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/implements.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/import.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/import.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/import.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/import.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/instanceof.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/instanceof.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/instanceof.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/instanceof.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/int.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/int.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/int.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/int.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/native.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/native.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/native.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/native.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/new.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/new.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/new.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/new.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/package.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/package.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/package.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/package.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/private.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/private.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/private.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/private.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/protected.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/protected.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/protected.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/protected.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/public.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/public.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/public.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/public.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/return.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/return.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/return.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/return.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/static.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/static.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/static.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/static.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/strictfp.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/strictfp.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/strictfp.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/strictfp.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/super.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/super.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/super.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/super.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/synchronized.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/synchronized.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/synchronized.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/synchronized.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/this.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/this.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/this.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/this.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/throw.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/throw.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/throw.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/throw.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/throws.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/throws.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/throws.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/throws.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/try.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/try.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/try.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/try.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/volatile.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/volatile.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/volatile.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/volatile.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/while.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/while.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/services/while.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/services/while.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/static.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/static.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/static.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/static.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/strictfp.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/strictfp.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/strictfp.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/strictfp.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/super.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/super.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/super.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/super.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/synchronized.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/synchronized.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/synchronized.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/synchronized.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/this.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/this.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/this.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/this.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/throw.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/throw.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/throw.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/throw.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/throws.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/throws.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/throws.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/throws.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/try.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/try.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/try.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/try.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/volatile.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/volatile.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/volatile.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/volatile.pyi
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/while.pyi b/codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/while.pyi
similarity index 100%
rename from codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/while.pyi
rename to codemaker/tests/expected_pythonmaker_stubs/test/codemaker/codemakertests/while.pyi
diff --git a/codemaker/tests/pythonmaker/README.md b/codemaker/tests/pythonmaker/README.md
deleted file mode 100644
index 19ba0b183ac3..000000000000
--- a/codemaker/tests/pythonmaker/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# Pythonmaker Test Suite
-
-This directory contains the integration test suite for the `pythonmaker` tool. The purpose of this suite is to ensure that `pythonmaker` correctly generates Python stub files (`.pyi`) from UNO IDL definitions. It verifies the syntactic correctness of the output and protects against future regressions.
-
-The test is automatically executed as part of the `make check` command for the `codemaker` module.
-
-## Testing Philosophy
-
-The test suite follows a "Golden File" testing methodology. This is a standard and robust approach for testing compilers and code generators. The process is as follows:
-
-1.  **Source IDL:** A comprehensive test IDL file (`idl/pythontypes.idl`) serves as the single source of truth for all UNO constructs that `pythonmaker` is expected to handle.
-2.  **Generate Output:** During the test run, this IDL is compiled into an `.rdb` file, and `pythonmaker` is executed to generate a complete set of `.pyi` stubs in a temporary directory.
-3.  **Compare Against "Golden" Files:** The newly generated stubs are recursively compared against a set of manually verified, correct "golden" stub files located in the `expected_pyi_stubs/` directory.
-4.  **Pass/Fail:** The test passes only if the generated output is an exact match to the golden files. Any difference—missing files, extra files, or content mismatches—will cause the test to fail.
-
-This approach ensures that any change to `pythonmaker` that alters its output is immediately detected.
-
-## Directory Structure
-
--   `idl/pythontypes.idl`: The master IDL file containing all test cases. This includes enums, constants, typedefs, structs (plain, inherited, and polymorphic), exceptions, interfaces, services, and singletons. It also includes edge cases like the use of keywords as identifiers.
--   `expected_pyi_stubs/`: Contains the "golden" `.pyi` file structure that `pythonmaker` is expected to generate from `pythontypes.idl`. This is the reference standard for correctness.
--   `test_pythonmaker.py`: The Python script that orchestrates the entire test. It is executed by the build system and is responsible for compiling the IDL, running `pythonmaker`, and performing the directory comparison.
--   `makefile.mk`: The gbuild makefile that integrates the Python test script into the LibreOffice `make check` process.
-
----
-
-## How to Modify or Extend the Test Suite
-
-Future developers may need to modify these tests when fixing a bug or adding a new feature to `pythonmaker`. Here is the standard workflow.
-
-### Scenario 1: Fixing a Bug in `pythonmaker`
-
-If you have fixed a bug that was causing `pythonmaker` to generate incorrect `.pyi` files, the test suite should now fail because the new, correct output will not match the old, incorrect golden files.
-
-**To update the tests:**
-
-1.  **Verify the Fix:** After fixing the C++ code in `pythonmaker`, run the test to confirm that it fails as expected. The `diff` error will show you the difference between the new output and the old golden files.
-2.  **Regenerate the Golden Files:**
-    a. First, delete the old golden files to ensure a clean slate.
-       ```bash
-       rm -rf codemaker/tests/pythonmaker/expected_pyi_stubs/*
-       ```
-    b. Run your updated `pythonmaker` manually to generate the new, correct stubs into a temporary directory. You can find the exact command to run from the test script's log output during a `make check` run. A typical command would be:
-       ```bash
-       # Run from .../libreoffice/instdir/program/
-       ./pathToPythonmaker.exe -O /path/to/new_golden_output /path/to/test.rdb
-       ```
-3.  **Replace the Golden Files:** Copy the entire generated output into the `expected_pyi_stubs/` directory.
-    ```bash
-    cp -r /path/to/new_golden_output/* codemaker/tests/pythonmaker/expected_pyi_stubs/
-    ```
-4.  **Validate:** Run `mypy --strict codemaker/tests/pythonmaker/expected_pyi_stubs/` to ensure the new golden files are syntactically correct and type-safe.
-5.  **Commit:** Commit the changes to `pythonmaker`'s C++ code **along with** the updated golden files in your patch. The commit message should explain that the golden files were updated to reflect the bug fix.
-
-### Scenario 2: Adding a New Feature to `pythonmaker`
-
-If you add support for a new IDL feature (e.g., a new type or an annotation), you should add a test case for it.
-
-1.  **Add a Test Case to the IDL:**
-    *   Open `codemaker/tests/pythonmaker/idl/pythontypes.idl`.
-    *   Add a new, simple example of the feature you've implemented. For example, add a new `interface` with a specific attribute you are now supporting.
-2.  **Generate and Verify the New Golden File:**
-    *   Since you've added a new type, a new `.pyi` file will be generated. Run `pythonmaker` manually as described above.
-    *   Locate the newly generated `.pyi` file for your new test case.
-    *   **Manually inspect this new file** to ensure it is 100% correct.
-    *   Run `mypy --strict` on this individual file.
-    *   Once verified, place this new golden file in the correct subdirectory within `expected_pyi_stubs/`.
-3.  **Run the Full Test Suite:** Run `make check` for the module. The test should now pass, as the newly generated output will match your newly added golden file.
-4.  **Commit:** Commit the changes to `pythonmaker`'s C++ code, the updated `pythontypes.idl`, and the new golden `.pyi` file(s) together in your patch.
-
-By following this workflow, the test suite remains a reliable and comprehensive measure of `pythonmaker`'s correctness.
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Enum.pyi b/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Enum.pyi
deleted file mode 100644
index d2c2bc3bb3a5..000000000000
--- a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Enum.pyi
+++ /dev/null
@@ -1,6 +0,0 @@
-# Auto-generated by pythonmaker - DO NOT EDIT.
-from __future__ import annotations
-
-from test.codemaker.pythonmaker.Enum2 import Enum2 as test_codemaker_pythonmaker_Enum2_
-
-Enum = test_codemaker_pythonmaker_Enum2_
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/S1.pyi b/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/S1.pyi
deleted file mode 100644
index 275d4be7f698..000000000000
--- a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/S1.pyi
+++ /dev/null
@@ -1,52 +0,0 @@
-# Auto-generated by pythonmaker - DO NOT EDIT.
-from __future__ import annotations
-
-from com.sun.star.lang.ClassNotFoundException import ClassNotFoundException as com_sun_star_lang_ClassNotFoundException_
-from com.sun.star.lang.IllegalAccessException import IllegalAccessException as com_sun_star_lang_IllegalAccessException_
-from com.sun.star.uno.DeploymentException import DeploymentException as com_sun_star_uno_DeploymentException_
-from com.sun.star.uno.Exception import Exception as com_sun_star_uno_Exception_
-from com.sun.star.uno.RuntimeException import RuntimeException as com_sun_star_uno_RuntimeException_
-from com.sun.star.uno.XComponentContext import XComponentContext as com_sun_star_uno_XComponentContext_
-from com.sun.star.uno.XInterface import XInterface as com_sun_star_uno_XInterface_
-from com.sun.star.uno.XNamingService import XNamingService as com_sun_star_uno_XNamingService_
-from test.codemaker.pythonmaker.Enum2 import Enum2 as test_codemaker_pythonmaker_Enum2_
-from test.codemaker.pythonmaker.Struct1 import Struct1 as test_codemaker_pythonmaker_Struct1_
-from test.codemaker.pythonmaker.XTest import XTest as test_codemaker_pythonmaker_XTest_
-from typing import Any
-from typing import List
-from typing import Type
-
-class S1:
-    @staticmethod
-    def create1(ctx: com_sun_star_uno_XComponentContext_) -> test_codemaker_pythonmaker_XTest_:
-        ...
-
-    @staticmethod
-    def create2(ctx: com_sun_star_uno_XComponentContext_, *args: Any) -> test_codemaker_pythonmaker_XTest_:
-        """Raises:
-            com_sun_star_uno_RuntimeException_
-            com_sun_star_lang_ClassNotFoundException_
-            com_sun_star_uno_Exception_
-            com_sun_star_lang_IllegalAccessException_
-            com_sun_star_uno_DeploymentException_
-        """
-        ...
-
-    @staticmethod
-    def create3(ctx: com_sun_star_uno_XComponentContext_, S1: List[Any]) -> test_codemaker_pythonmaker_XTest_:
-        """Raises:
-            com_sun_star_uno_RuntimeException_
-            com_sun_star_lang_ClassNotFoundException_
-            com_sun_star_lang_IllegalAccessException_
-            com_sun_star_uno_DeploymentException_
-        """
-        ...
-
-    @staticmethod
-    def create4(ctx: com_sun_star_uno_XComponentContext_, javamaker: int, S1: int, create4: int) -> test_codemaker_pythonmaker_XTest_:
-        ...
-
-    @staticmethod
-    def create5(ctx: com_sun_star_uno_XComponentContext_, p1: bool, p2: int, p3: int, p4: int, p5: int, p6: int, p7: int, p8: int, p9: float, p10: float, p11: str, p12: str, p13: Type[Any], p14: Any, p15: test_codemaker_pythonmaker_Enum2_, p16: test_codemaker_pythonmaker_Struct1_, p17: com_sun_star_uno_XInterface_, p18: com_sun_star_uno_XNamingService_, t1: bool, t2: int, t3: int, t4: int, t5: int, t6: int, t7: int, t8: int, t9: float, t10: float, t11: str, t12: str, t13: Type[Any], t14: Any, t15: test_codemaker_pythonmaker_Enum2_, t16: test_codemaker_pythonmaker_Struct1_, t17: com_sun_star_uno_XInterface_, t18: com_sun_star_uno_XNamingService_, a1: List[bool], a2: List[int], a3: List[int], a4: List[int], a5: List[int], a6: List[int], a7: List[int], a8: List[int], a9: List[float], a10: List[float], a11: List[str], a12: List[str], a13: List[Type[Any]], a14: List[Any], a15: List[test_codemaker_pythonmaker_Enum2_], a16: List[test_codemaker_pythonmaker_Struct1_], a17: List[com_sun_star_uno_XInterface_], a18: List[com_sun_star_uno_XNamingService_], aa1: List[List[bool]], aa2: List[List[int]], aa3: List[List[int]], aa4: List[List[int]], aa5: List[List[int]], aa6: List[List[int]], aa7: List[List[int]], aa8: List[List[int]], aa9: List[List[float]], aa10: List[List[float]], aa11: List[List[str]], aa12: List[List[str]], aa13: List[List[Type[Any]]], aa14: List[List[Any]], aa15: List[List[test_codemaker_pythonmaker_Enum2_]], aa16: List[List[test_codemaker_pythonmaker_Struct1_]], aa17: List[List[com_sun_star_uno_XInterface_]], aa18: List[List[com_sun_star_uno_XNamingService_]], at1: List[List[bool]], at2: List[List[int]], at3: List[List[int]], at4: List[List[int]], at5: List[List[int]], at6: List[List[int]], at7: List[List[int]], at8: List[List[int]], at9: List[List[float]], at10: List[List[float]], at11: List[List[str]], at12: List[List[str]], at13: List[List[Type[Any]]], at14: List[List[Any]], at15: List[List[test_codemaker_pythonmaker_Enum2_]], at16: List[List[test_codemaker_pythonmaker_Struct1_]], at17: List[List[com_sun_star_uno_XInterface_]], at18: List[List[com_sun_star_uno_XNamingService_]]) -> test_codemaker_pythonmaker_XTest_:
-        ...
-
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceEnum.pyi b/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceEnum.pyi
deleted file mode 100644
index c0eae23cc497..000000000000
--- a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceEnum.pyi
+++ /dev/null
@@ -1,7 +0,0 @@
-# Auto-generated by pythonmaker - DO NOT EDIT.
-from __future__ import annotations
-
-from test.codemaker.pythonmaker.Enum2 import Enum2 as test_codemaker_pythonmaker_Enum2_
-from typing import List
-
-SequenceEnum = List[test_codemaker_pythonmaker_Enum2_]
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceStruct.pyi b/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceStruct.pyi
deleted file mode 100644
index d607af826208..000000000000
--- a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/SequenceStruct.pyi
+++ /dev/null
@@ -1,7 +0,0 @@
-# Auto-generated by pythonmaker - DO NOT EDIT.
-from __future__ import annotations
-
-from test.codemaker.pythonmaker.Struct1 import Struct1 as test_codemaker_pythonmaker_Struct1_
-from typing import List
-
-SequenceStruct = List[test_codemaker_pythonmaker_Struct1_]
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Struct.pyi b/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Struct.pyi
deleted file mode 100644
index e9127de5dbeb..000000000000
--- a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Struct.pyi
+++ /dev/null
@@ -1,6 +0,0 @@
-# Auto-generated by pythonmaker - DO NOT EDIT.
-from __future__ import annotations
-
-from test.codemaker.pythonmaker.Struct1 import Struct1 as test_codemaker_pythonmaker_Struct1_
-
-Struct = test_codemaker_pythonmaker_Struct1_
diff --git a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Struct2.pyi b/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Struct2.pyi
deleted file mode 100644
index 7136529440d3..000000000000
--- a/codemaker/tests/pythonmaker/expected_pyi_stubs/test/codemaker/pythonmaker/Struct2.pyi
+++ /dev/null
@@ -1,105 +0,0 @@
-# Auto-generated by pythonmaker - DO NOT EDIT.
-from __future__ import annotations
-
-from com.sun.star.uno.XInterface import XInterface as com_sun_star_uno_XInterface_
-from com.sun.star.uno.XNamingService import XNamingService as com_sun_star_uno_XNamingService_
-from test.codemaker.pythonmaker.Enum2 import Enum2 as test_codemaker_pythonmaker_Enum2_
-from test.codemaker.pythonmaker.Struct1 import Struct1 as test_codemaker_pythonmaker_Struct1_
-from typing import Any
-from typing import List
-from typing import Type
-
-class Struct2(object):
-    def __init__(self, p1: bool | None = ..., p2: int | None = ..., p3: int | None = ..., p4: int | None = ..., p5: int | None = ..., p6: int | None = ..., p7: int | None = ..., p8: int | None = ..., p9: float | None = ..., p10: float | None = ..., p11: str | None = ..., p12: str | None = ..., p13: Type[Any] | None = ..., p14: Any | None = ..., p15: test_codemaker_pythonmaker_Enum2_ | None = ..., p16: test_codemaker_pythonmaker_Struct1_ | None = ..., p17: com_sun_star_uno_XInterface_ | None = ..., p18: com_sun_star_uno_XNamingService_ | None = ..., t1: bool | None = ..., t2: int | None = ..., t3: int | None = ..., t4: int | None = ..., t5: int | None = ..., t6: int | None = ..., t7: int | None = ..., t8: int | None = ..., t9: float | None = ..., t10: float | None = ..., t11: str | None = ..., t12: str | None = ..., t13: Type[Any] | None = ..., t14: Any | None = ..., t15: test_codemaker_pythonmaker_Enum2_ | None = ..., t16: test_codemaker_pythonmaker_Struct1_ | None = ..., t17: com_sun_star_uno_XInterface_ | None = ..., t18: com_sun_star_uno_XNamingService_ | None = ..., a1: List[bool] | None = ..., a2: List[int] | None = ..., a3: List[int] | None = ..., a4: List[int] | None = ..., a5: List[int] | None = ..., a6: List[int] | None = ..., a7: List[int] | None = ..., a8: List[int] | None = ..., a9: List[float] | None = ..., a10: List[float] | None = ..., a11: List[str] | None = ..., a12: List[str] | None = ..., a13: List[Type[Any]] | None = ..., a14: List[Any] | None = ..., a15: List[test_codemaker_pythonmaker_Enum2_] | None = ..., a16: List[test_codemaker_pythonmaker_Struct1_] | None = ..., a17: List[com_sun_star_uno_XInterface_] | None = ..., a18: List[com_sun_star_uno_XNamingService_] | None = ..., aa1: List[List[bool]] | None = ..., aa2: List[List[int]] | None = ..., aa3: List[List[int]] | None = ..., aa4: List[List[int]] | None = ..., aa5: List[List[int]] | None = ..., aa6: List[List[int]] | None = ..., aa7: List[List[int]] | None = ..., aa8: List[List[int]] | None = ..., aa9: List[List[float]] | None = ..., aa10: List[List[float]] | None = ..., aa11: List[List[str]] | None = ..., aa12: List[List[str]] | None = ..., aa13: List[List[Type[Any]]] | None = ..., aa14: List[List[Any]] | None = ..., aa15: List[List[test_codemaker_pythonmaker_Enum2_]] | None = ..., aa16: List[List[test_codemaker_pythonmaker_Struct1_]] | None = ..., aa17: List[List[com_sun_star_uno_XInterface_]] | None = ..., aa18: List[List[com_sun_star_uno_XNamingService_]] | None = ..., at1: List[List[bool]] | None = ..., at2: List[List[int]] | None = ..., at3: List[List[int]] | None = ..., at4: List[List[int]] | None = ..., at5: List[List[int]] | None = ..., at6: List[List[int]] | None = ..., at7: List[List[int]] | None = ..., at8: List[List[int]] | None = ..., at9: List[List[float]] | None = ..., at10: List[List[float]] | None = ..., at11: List[List[str]] | None = ..., at12: List[List[str]] | None = ..., at13: List[List[Type[Any]]] | None = ..., at14: List[List[Any]] | None = ..., at15: List[List[test_codemaker_pythonmaker_Enum2_]] | None = ..., at16: List[List[test_codemaker_pythonmaker_Struct1_]] | None = ..., at17: List[List[com_sun_star_uno_XInterface_]] | None = ..., at18: List[List[com_sun_star_uno_XNamingService_]] | None = ...) -> None:
-        ...
-
-    p1: bool
-    p2: int
-    p3: int
-    p4: int
-    p5: int
-    p6: int
-    p7: int
-    p8: int
-    p9: float
-    p10: float
-    p11: str
-    p12: str
-    p13: Type[Any]
-    p14: Any
-    p15: test_codemaker_pythonmaker_Enum2_
-    p16: test_codemaker_pythonmaker_Struct1_
-    p17: com_sun_star_uno_XInterface_
-    p18: com_sun_star_uno_XNamingService_
-    t1: bool
-    t2: int
-    t3: int
-    t4: int
-    t5: int
-    t6: int
-    t7: int
-    t8: int
-    t9: float
-    t10: float
-    t11: str
-    t12: str
-    t13: Type[Any]
-    t14: Any
-    t15: test_codemaker_pythonmaker_Enum2_
-    t16: test_codemaker_pythonmaker_Struct1_
-    t17: com_sun_star_uno_XInterface_
-    t18: com_sun_star_uno_XNamingService_
-    a1: List[bool]
-    a2: List[int]
-    a3: List[int]
-    a4: List[int]
-    a5: List[int]
-    a6: List[int]
-    a7: List[int]
-    a8: List[int]
-    a9: List[float]
-    a10: List[float]
-    a11: List[str]
-    a12: List[str]
-    a13: List[Type[Any]]
-    a14: List[Any]
-    a15: List[test_codemaker_pythonmaker_Enum2_]
-    a16: List[test_codemaker_pythonmaker_Struct1_]
-    a17: List[com_sun_star_uno_XInterface_]
-    a18: List[com_sun_star_uno_XNamingService_]
-    aa1: List[List[bool]]
-    aa2: List[List[int]]
-    aa3: List[List[int]]
-    aa4: List[List[int]]
-    aa5: List[List[int]]
-    aa6: List[List[int]]
-    aa7: List[List[int]]
-    aa8: List[List[int]]
-    aa9: List[List[float]]
-    aa10: List[List[float]]
-    aa11: List[List[str]]
-    aa12: List[List[str]]
-    aa13: List[List[Type[Any]]]
-    aa14: List[List[Any]]
-    aa15: List[List[test_codemaker_pythonmaker_Enum2_]]
-    aa16: List[List[test_codemaker_pythonmaker_Struct1_]]
-    aa17: List[List[com_sun_star_uno_XInterface_]]
-    aa18: List[List[com_sun_star_uno_XNamingService_]]
-    at1: List[List[bool]]
-    at2: List[List[int]]
-    at3: List[List[int]]
-    at4: List[List[int]]
-    at5: List[List[int]]
-    at6: List[List[int]]
-    at7: List[List[int]]
-    at8: List[List[int]]
-    at9: List[List[float]]
-    at10: List[List[float]]
-    at11: List[List[str]]
-    at12: List[List[str]]
-    at13: List[List[Type[Any]]]
-    at14: List[List[Any]]
-    at15: List[List[test_codemaker_pythonmaker_Enum2_]]
-    at16: List[List[test_codemaker_pythonmaker_Struct1_]]
-    at17: List[List[com_sun_star_uno_XInterface_]]
-    at18: List[List[com_sun_star_uno_XNamingService_]]
diff --git a/codemaker/tests/pythonmaker/test_pythonmaker.py b/codemaker/tests/pythonmaker/test_pythonmaker.py
deleted file mode 100644
index e455cef2d224..000000000000
--- a/codemaker/tests/pythonmaker/test_pythonmaker.py
+++ /dev/null
@@ -1,246 +0,0 @@
-#! /usr/bin/env python
-# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-import unittest
-import os
-import subprocess
-import shutil
-import filecmp
-import glob
-import sys
-
-from typing import Optional, List, Set
-
-
-class TestPythonMaker(unittest.TestCase):
-    """Test pythonmaker tool by comparing generated stubs with expected files"""
-
-    def setUp(self) -> None:
-        # Build environment
-        self.srcdir: str = os.environ.get("SRCDIR", os.getcwd())
-        self.builddir: str = os.environ.get("BUILDDIR", os.getcwd())
-        self.instdir: str = os.environ.get(
-            "INSTDIR", os.path.join(self.builddir, "instdir")
-        )
-        self.workdir: str = os.environ.get(
-            "WORKDIR", os.path.join(self.builddir, "workdir")
-        )
-
-        # SDK tools
-        self.unoidl_write: Optional[str] = None
-        self.pythonmaker: Optional[str] = None
-
-        sdk_patterns: List[str] = [
-            os.path.join(self.instdir, "sdk", "bin"),
-            os.path.join(self.instdir, "LibreOffice*_SDK", "bin"),
-        ]
-
-        exe_suffix: str = ".exe" if os.name == "nt" else ""
-
-        for pattern in sdk_patterns:
-            for sdk_dir in glob.glob(pattern):
-                unoidl_path = os.path.join(sdk_dir, "unoidl-write" + exe_suffix)
-                pythonmaker_path = os.path.join(sdk_dir, "pythonmaker" + exe_suffix)
-
-                if os.path.exists(unoidl_path) and os.path.exists(pythonmaker_path):
-                    self.unoidl_write = unoidl_path
-                    self.pythonmaker = pythonmaker_path
-                    break
-
-            if self.unoidl_write and self.pythonmaker:
-                break
-
-        # Program directory
-        self.program_dir: Optional[str]
-
-        if sys.platform == "darwin":
-            self.program_dir = None
-            app_patterns: List[str] = [
-                os.path.join(
-                    self.instdir,
-                    "LibreOfficeDev.app",
-                    "Contents",
-                    "Resources",
-                ),
-                os.path.join(
-                    self.instdir,
-                    "LibreOffice.app",
-                    "Contents",
-                    "Resources",
-                ),
-            ]
-            for pattern in app_patterns:
-                if os.path.exists(pattern):
-                    self.program_dir = pattern
-                    break
-        else:
-            self.program_dir = os.path.join(self.instdir, "program")
-
-        # Test paths
-        self.golden_dir: str = os.path.join(
-            self.srcdir,
-            "codemaker",
-            "tests",
-            "pythonmaker",
-            "expected_pyi_stubs",
-        )
-
-        self.idl_file: str = os.path.join(
-            self.srcdir,
-            "codemaker",
-            "tests",
-            "pythonmaker",
-            "idl",
-            "pythontypes.idl",
-        )
-
-        self.test_workdir: str = os.path.join(self.workdir, "pythonmaker_test")
-        os.makedirs(self.test_workdir, exist_ok=True)
-
-        self.types_rdb: str = os.path.join(
-            self.workdir, "UnoApiTarget", "udkapi.rdb"
-        )
-
-        self.temp_rdb: str = os.path.join(self.test_workdir, "temptest.rdb")
-        self.output_dir: str = os.path.join(self.test_workdir, "generated_stubs")
-
-    def tearDown(self) -> None:
-        if os.path.exists(self.test_workdir):
-            shutil.rmtree(self.test_workdir, ignore_errors=True)
-
-    def test_pythonmaker_golden_comparison(self) -> None:
-        self.assertIsNotNone(self.unoidl_write)
-        self.assertIsNotNone(self.pythonmaker)
-        self.assertIsNotNone(self.program_dir)
-
-        assert self.unoidl_write is not None
-        assert self.pythonmaker is not None
-
-        self.assertTrue(os.path.exists(self.unoidl_write))
-        self.assertTrue(os.path.exists(self.pythonmaker))
-        self.assertTrue(os.path.exists(self.types_rdb))
-
-        self._convert_idl_to_rdb()
-        self._generate_python_stubs()
-        self._compare_with_expected_files()
-
-    def _convert_idl_to_rdb(self) -> None:
-        assert self.unoidl_write is not None
-
-        cmd: List[str] = [
-            self.unoidl_write,
-            self.types_rdb,
-            self.idl_file,
-            self.temp_rdb,
-        ]
-
-        try:
-            subprocess.run(
-                cmd,
-                cwd=self.test_workdir,
-                capture_output=True,
-                text=True,
-                check=True,
-            )
-            self.assertTrue(os.path.exists(self.temp_rdb))
-        except subprocess.CalledProcessError as e:
-            self.fail(
-                "Failed to convert IDL to RDB:\n"
-                + (e.stderr or "")
-                + "\nCommand: "
-                + " ".join(cmd)
-            )
-
-    def _generate_python_stubs(self) -> None:
-        assert self.pythonmaker is not None
-
-        os.makedirs(self.output_dir, exist_ok=True)
-
-        cmd: List[str] = [
-            self.pythonmaker,
-            "-O",
-            self.output_dir,
-            self.temp_rdb,
-            "-X",
-            self.types_rdb,
-        ]
-
-        try:
-            subprocess.run(
-                cmd,
-                cwd=self.test_workdir,
-                capture_output=True,
-                text=True,
-                check=True,
-            )
-
-            generated_files: List[str] = []
-            for _, _, files in os.walk(self.output_dir):
-                for name in files:
-                    if not name.lower().endswith(".tmp"):
-                        generated_files.append(name)
-
-            self.assertGreater(len(generated_files), 0)
-
-        except subprocess.CalledProcessError as e:
-            self.fail(
-                "Failed to generate Python stubs:\n"
-                + (e.stderr or "")
-                + "\nCommand: "
-                + " ".join(cmd)
-            )
-
-    def _compare_with_expected_files(self) -> None:
-        if not os.path.exists(self.golden_dir):
-            self.fail("Expected directory does not exist: " + self.golden_dir)
-
-        expected_files: List[str] = []
-        for root, _, files in os.walk(self.golden_dir):
-            for name in files:
-                expected_files.append(
-                    os.path.relpath(os.path.join(root, name), self.golden_dir)
-                )
-
-        generated_files: List[str] = []
-        for root, _, files in os.walk(self.output_dir):
-            for name in files:
-                if not name.lower().endswith(".tmp"):
-                    generated_files.append(
-                        os.path.relpath(os.path.join(root, name), self.output_dir)
-                    )
-
-        expected_set: Set[str] = set(expected_files)
-        generated_set: Set[str] = set(generated_files)
-
-        missing = expected_set - generated_set
-        extra = generated_set - expected_set
-
-        if missing:
-            self.fail("Missing generated files: " + str(missing))
-        if extra:
-            self.fail("Unexpected generated files: " + str(extra))
-
-        differences: List[str] = []
-        for rel_path in expected_files:
-            if not filecmp.cmp(
-                os.path.join(self.golden_dir, rel_path),
-                os.path.join(self.output_dir, rel_path),
-                shallow=False,
-            ):
-                differences.append(rel_path)
-
-        if differences:
-            self.fail("File content differences found in: " + str(differences))
-
-
-if __name__ == "__main__":
-    unittest.main()
-
-# vim: set shiftwidth=4 softtabstop=4 expandtab:
\ No newline at end of file
diff --git a/codemaker/tests/pythonmaker/idl/pythontypes.idl b/codemaker/tests/tests.idl
similarity index 99%
rename from codemaker/tests/pythonmaker/idl/pythontypes.idl
rename to codemaker/tests/tests.idl
index c8215efd1dc8..0994eb3a3d08 100644
--- a/codemaker/tests/pythonmaker/idl/pythontypes.idl
+++ b/codemaker/tests/tests.idl
@@ -1,9 +1,8 @@
-
 module test
 {
     module codemaker
     {
-        module pythonmaker
+        module codemakertests
         {
             // --- ENUMS ---
             // Simple enum with negative and positive values
@@ -230,7 +229,7 @@ module test
                     get raises(com::sun::star::uno::DeploymentException);
                 };
             };
-            service S1 : test::codemaker::pythonmaker::XTest
+            service S1 : test::codemaker::codemakertests::XTest
             {
                 create1();
                 create2([in] any... create2) raises(com::sun::star::uno::RuntimeException,
@@ -452,4 +451,4 @@ module test
             //TODO: singleton void: com::sun::star::uno::XNamingService;
             singleton volatile : com::sun::star::uno::XNamingService;
             singleton while : com::sun::star::uno::XNamingService;
-        };};};
\ No newline at end of file
+        };};};