From f9ac035b81ca21695e94e5ced831dca83cd5a1ec Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Wed, 1 Apr 2015 23:08:31 +0200 Subject: Fix "unknown factory" log, declare and use FACTORYNAME_BASIC MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also use FACTORYNAME_STARTMODULE in SvtModuleOptions::ClassifyFactoryByServiceName Change-Id: I1ab87f13a9a1d071bf6abaae137fc6470101d711 Reviewed-on: https://gerrit.libreoffice.org/15113 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- unotools/source/config/moduleoptions.cxx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'unotools') diff --git a/unotools/source/config/moduleoptions.cxx b/unotools/source/config/moduleoptions.cxx index 679e01a9c6a6..24df404e6fc8 100644 --- a/unotools/source/config/moduleoptions.cxx +++ b/unotools/source/config/moduleoptions.cxx @@ -80,8 +80,9 @@ #define FACTORYNAME_CHART "com.sun.star.chart2.ChartDocument" #define FACTORYNAME_DATABASE "com.sun.star.sdb.OfficeDatabaseDocument" #define FACTORYNAME_STARTMODULE "com.sun.star.frame.StartModule" +#define FACTORYNAME_BASIC "com.sun.star.script.BasicIDE" -#define FACTORYCOUNT 10 +#define FACTORYCOUNT 11 /*-************************************************************************************************************ @descr This struct hold information about one factory. We declare a complete array which can hold infos @@ -788,6 +789,12 @@ bool SvtModuleOptions_Impl::ClassifyFactoryByName( const OUString& sName, SvtMod eFactory = SvtModuleOptions::E_STARTMODULE; bState = ( sName == FACTORYNAME_STARTMODULE); } + // no else! + if( !bState ) + { + eFactory = SvtModuleOptions::E_BASIC; + bState = ( sName == FACTORYNAME_BASIC); + } return bState; } @@ -1135,6 +1142,10 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const return E_CHART; if (sName == FACTORYNAME_DATABASE) return E_DATABASE; + if (sName == FACTORYNAME_STARTMODULE) + return E_STARTMODULE; + if (sName == FACTORYNAME_BASIC) + return E_BASIC; return E_UNKNOWN_FACTORY; } -- cgit