diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-07-13 10:56:39 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-07-13 10:56:39 +0000 |
| commit | de79507c39ef49e5e98a7025bbfb7d278fba2136 (patch) | |
| tree | 89a0a1ea315cf99f887ba5057d5ebc0a8fd9988e /unodevtools | |
| parent | 0279df38f1c93586382c22c8e0d645155cfa427b (diff) | |
INTEGRATION: CWS jsc8 (1.5.2); FILE MERGED
2006/07/07 14:57:33 jsc 1.5.2.4: #i66419# correct cfg package
2006/07/07 09:48:30 jsc 1.5.2.3: RESYNC: (1.5-1.6); FILE MERGED
2006/06/30 12:57:56 jsc 1.5.2.2: #i66419# adapt config node name
2006/06/23 06:52:25 jsc 1.5.2.1: #i66419# ensure to select correct addin service
Diffstat (limited to 'unodevtools')
| -rw-r--r-- | unodevtools/source/skeletonmaker/cppcompskeleton.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx index 5af7d6879bd0..c4874245db60 100644 --- a/unodevtools/source/skeletonmaker/cppcompskeleton.cxx +++ b/unodevtools/source/skeletonmaker/cppcompskeleton.cxx @@ -4,9 +4,9 @@ * * $RCSfile: cppcompskeleton.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2006-06-20 00:50:10 $ + * last change: $Author: obo $ $Date: 2006-07-13 11:56:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -445,7 +445,7 @@ void generateAddinConstructorAndHelper(std::ostream& o, " \"com.sun.star.configuration.ConfigurationAccess\"));\n\n"; o << " ::rtl::OUStringBuffer sPath(::rtl::OUString::createFromAscii(\n" - " \"/org.openoffice.Office.Sheet.CalcAddIns/AddInInfo/\"));\n" + " \"/org.openoffice.Office.CalcAddIns/AddInInfo/\"));\n" " sPath.appendAscii(sADDIN_SERVICENAME);\n" " sPath.appendAscii(\"/AddInFunctions\");\n\n" " // create arguments: nodepath\n" @@ -1019,7 +1019,11 @@ void generateCalcAddin(ProgramOptions const & options, } // get the one and only add-in service for later use - OString sAddinService = (*services.begin()).replace('/', '.'); + std::hash_set< OString, OStringHash >::const_iterator iter2 = services.begin(); + OString sAddinService = (*iter2).replace('/', '.'); + if (sAddinService.equals("com.sun.star.sheet.AddIn")) { + sAddinService = (*(++iter2)).replace('/', '.'); + } // add AddIn in suported service list, this service is currently necessary // to identify all calc add-ins and to support the necessary add-in helper |