unodevtools/Executable_uno-skeletonmaker.mk | 2 --
unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 10 +++++-----
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit fdc1a42db0423e36bd512c7048a0be1fdd09f611
Author: Stephan Bergmann <stephan.bergm...@allotropia.de>
AuthorDate: Fri Dec 22 09:51:05 2023 +0100
Commit: Stephan Bergmann <stephan.bergm...@allotropia.de>
CommitDate: Fri Dec 22 11:17:45 2023 +0100
Don't use boost in code generated by uno-skeletonmaker
This had originally used a non-standard std::hash_map in
db4b02eea5b81b7be05fa8b1f18c9f423302a977 "INTEGRATION: CWS jsc3 (1.4.2);
FILE
MERGED", then switched to boost::unordered_map in
639825975e7657c7b3f4eeef208112780e71e545 "move sdk repo to boost unordered
containters". (And Executable_uno-skeletonmaker doesn't need boost during
the
build at all, so clean that up here, too.)
Change-Id: I80661d70a54ec5d69b8f124c12d5cb0d6f369887
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161147
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
diff --git a/unodevtools/Executable_uno-skeletonmaker.mk
b/unodevtools/Executable_uno-skeletonmaker.mk
index 87f8d3ca9b17..0bee9985434d 100644
--- a/unodevtools/Executable_uno-skeletonmaker.mk
+++ b/unodevtools/Executable_uno-skeletonmaker.mk
@@ -9,8 +9,6 @@
$(eval $(call gb_Executable_Executable,uno-skeletonmaker))
-$(eval $(call gb_Executable_use_external,uno-skeletonmaker,boost_headers))
-
$(eval $(call gb_Executable_set_include,uno-skeletonmaker,\
-I$(SRCDIR)/unodevtools/inc \
$$(INCLUDE) \
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
index 8fbb96c19452..0942d7cde694 100644
--- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
+++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx
@@ -689,10 +689,10 @@ static OString generateClassDefinition(std::ostream& o,
" virtual ~" << classname << "() {}
";
if (options.componenttype == 2) {
- o << " typedef boost::unordered_map< ::sal_Int32, OUString, "
- "boost::hash<::sal_Int32> > ParamMap;
"
- " typedef boost::unordered_map< OUString, ParamMap, "
- "OUStringHash > FunctionMap;
"
+ o << " typedef std::map< ::sal_Int32, OUString "
+ "> ParamMap;
"
+ " typedef std::map< OUString, ParamMap "
+ "> FunctionMap;
"
" OUString SAL_CALL getAddinProperty(const OUString & "
"funcName, const OUString & paramName, const char * propName) "
"throw (css::uno::RuntimeException);
";
@@ -1146,7 +1146,7 @@ void generateCalcAddin(ProgramOptions const & options,
"#include \"com/sun/star/container/XNameAccess.hpp\"
"
"#include \"com/sun/star/container/XHierarchicalNameAccess.hpp\"
"
"#include \"rtl/ustrbuf.hxx\"
"
- "#include <boost/unordered_map.hpp>
"
+ "#include <map>
"
"#include <set>
";
// namespace
