diff options
| author | Petr Mladek <pmladek@suse.cz> | 2011-04-06 19:31:35 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2011-04-06 19:31:35 +0200 |
| commit | 524a90293f4cb9beb8331b4e7cf5f738fcdf37c3 (patch) | |
| tree | 09b8622fc0ddd98a304727742063de54b402ccbd /forms/source/misc | |
| parent | 025001a71a2b632825154b2f72359c183675e223 (diff) | |
| parent | 41c2684da62aa2bf4bdbc473e7263b18dcfac8e9 (diff) | |
Merge remote-tracking branch 'origin/libreoffice-3-4'
Conflicts:
cui/source/options/optchart.cxx
Diffstat (limited to 'forms/source/misc')
| -rw-r--r-- | forms/source/misc/services.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index 5c089c4c018d..25cb3f797e39 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -343,7 +343,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplN sal_Int32 nClasses = s_aClassImplementationNames.getLength(); OSL_ENSURE((s_aClassServiceNames.getLength() == nClasses) && (s_aFactories.getLength() == nClasses), - "forms::component_writeInfo : invalid class infos !"); + "forms::component_getFactory : invalid class infos !"); // loop through the sequences and register the service providers const ::rtl::OUString* pClasses = s_aClassImplementationNames.getConstArray(); |