Hi all,
not much happened this week.
I've add some more prefixes and created list of libraries we use in
all components (writer, calc, draw, impress, base).
Caolán suggested we don't have to have all
component_getImplementationEnvironment functions doing the same.
So, I'm sending small patch and maybe then we could just remove them ?
(if they don't do something special)
And next week on Wednesday I will have final exams at school, so I
have to learn something in next two days.
Kind regards,
Matus
diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 1fb136a..495ba47 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -270,7 +270,7 @@ static OUString makeComponentPath(
}
//==============================================================================
-static OUString getLibEnv(OUString const & aModulePath,
+static OUString getLibEnv(OUString,
oslModule lib,
uno::Environment * pEnv,
OUString * pSourceEnv_name,
@@ -278,8 +278,6 @@ static OUString getLibEnv(OUString const & aModulePath,
OUString const & cImplName = OUString(),
OUString const & rPrefix = OUString())
{
- OUString aExcMsg;
-
sal_Char const * pEnvTypeName = NULL;
OUString aGetEnvNameExt = rPrefix + OUSTR(COMPONENT_GETENVEXT);
@@ -299,14 +297,8 @@ static OUString getLibEnv(OUString const & aModulePath,
lib, aGetEnvName.pData );
if (pGetImplEnv)
pGetImplEnv(&pEnvTypeName, (uno_Environment **)pEnv);
-
else
- {
- aExcMsg = aModulePath;
- aExcMsg += OUSTR(": cannot get symbol: ");
- aExcMsg += aGetEnvName;
- aExcMsg += OUSTR("- nor: ");
- }
+ pEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
if (!pEnv->is() && pEnvTypeName)
@@ -331,7 +323,7 @@ static OUString getLibEnv(OUString const & aModulePath,
}
- return aExcMsg;
+ return OUString();
}
extern "C" {static void s_getFactory(va_list * pParam)
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
