Kaydet (Commit) f9ac035b authored tarafından Julien Nabet's avatar Julien Nabet Kaydeden (comit) Caolán McNamara

Fix "unknown factory" log, declare and use FACTORYNAME_BASIC

Also use FACTORYNAME_STARTMODULE in SvtModuleOptions::ClassifyFactoryByServiceName

Change-Id: I1ab87f13a9a1d071bf6abaae137fc6470101d711
Reviewed-on: https://gerrit.libreoffice.org/15113Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst b7bc6e54
...@@ -80,8 +80,9 @@ ...@@ -80,8 +80,9 @@
#define FACTORYNAME_CHART "com.sun.star.chart2.ChartDocument" #define FACTORYNAME_CHART "com.sun.star.chart2.ChartDocument"
#define FACTORYNAME_DATABASE "com.sun.star.sdb.OfficeDatabaseDocument" #define FACTORYNAME_DATABASE "com.sun.star.sdb.OfficeDatabaseDocument"
#define FACTORYNAME_STARTMODULE "com.sun.star.frame.StartModule" #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 @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 ...@@ -788,6 +789,12 @@ bool SvtModuleOptions_Impl::ClassifyFactoryByName( const OUString& sName, SvtMod
eFactory = SvtModuleOptions::E_STARTMODULE; eFactory = SvtModuleOptions::E_STARTMODULE;
bState = ( sName == FACTORYNAME_STARTMODULE); bState = ( sName == FACTORYNAME_STARTMODULE);
} }
// no else!
if( !bState )
{
eFactory = SvtModuleOptions::E_BASIC;
bState = ( sName == FACTORYNAME_BASIC);
}
return bState; return bState;
} }
...@@ -1135,6 +1142,10 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const ...@@ -1135,6 +1142,10 @@ SvtModuleOptions::EFactory SvtModuleOptions::ClassifyFactoryByServiceName(const
return E_CHART; return E_CHART;
if (sName == FACTORYNAME_DATABASE) if (sName == FACTORYNAME_DATABASE)
return E_DATABASE; return E_DATABASE;
if (sName == FACTORYNAME_STARTMODULE)
return E_STARTMODULE;
if (sName == FACTORYNAME_BASIC)
return E_BASIC;
return E_UNKNOWN_FACTORY; return E_UNKNOWN_FACTORY;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment