Kaydet (Commit) 4837353e authored tarafından Tor Lillqvist's avatar Tor Lillqvist

WaE: C4190 for extern "C" functions returning C++ type

Change-Id: Ic1ac345781782bc4333ae2634f8f819914a0ca6e
üst 306a39ec
......@@ -97,6 +97,28 @@ aImpressExtensionMap[] = {
{ NULL, NULL }
};
static OUString getUString( const char *str )
{
if( !str )
return OUString( "" );
return OStringToOUString( OString( str, strlen (str) ),
RTL_TEXTENCODING_UTF8 );
}
// Try to convert a relative URL to an absolute one
static OUString getAbsoluteURL( const char *pURL )
{
OUString aURL( getUString( pURL ) );
OUString sAbsoluteDocUrl, sWorkingDir, sDocPathUrl;
// FIXME: this would appear to kill non-file URLs.
osl_getProcessWorkingDir(&sWorkingDir.pData);
osl::FileBase::getFileURLFromSystemPath( aURL, sDocPathUrl );
osl::FileBase::getAbsoluteFileURL(sWorkingDir, sDocPathUrl, sAbsoluteDocUrl);
return sAbsoluteDocUrl;
}
extern "C" {
SAL_DLLPUBLIC_EXPORT LibreOffice *liblibreoffice_hook(void);
......@@ -151,28 +173,6 @@ static uno::Reference<css::uno::XComponentContext> xContext;
static uno::Reference<css::lang::XMultiServiceFactory> xSFactory;
static uno::Reference<css::lang::XMultiComponentFactory> xFactory;
static OUString getUString( const char *str )
{
if( !str )
return OUString( "" );
return OStringToOUString( OString( str, strlen (str) ),
RTL_TEXTENCODING_UTF8 );
}
// Try to convert a relative URL to an absolute one
static OUString getAbsoluteURL( const char *pURL )
{
OUString aURL( getUString( pURL ) );
OUString sAbsoluteDocUrl, sWorkingDir, sDocPathUrl;
// FIXME: this would appear to kill non-file URLs.
osl_getProcessWorkingDir(&sWorkingDir.pData);
osl::FileBase::getFileURLFromSystemPath( aURL, sDocPathUrl );
osl::FileBase::getAbsoluteFileURL(sWorkingDir, sDocPathUrl, sAbsoluteDocUrl);
return sAbsoluteDocUrl;
}
static LibreOfficeDocument *
lo_documentLoad( LibreOffice *pThis, const char *pURL )
{
......
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