dos2unix on svlibrary.cxx

This commit is contained in:
Jan Holesovsky
2010-10-14 17:01:56 +02:00
parent cc97aa6b2c
commit 01dc333871

View File

@@ -1,129 +1,129 @@
/************************************************************************* /*************************************************************************
* *
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* Copyright 2000, 2010 Oracle and/or its affiliates. * Copyright 2000, 2010 Oracle and/or its affiliates.
* *
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* This file is part of OpenOffice.org. * This file is part of OpenOffice.org.
* *
* OpenOffice.org is free software: you can redistribute it and/or modify * OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3 * it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation. * only, as published by the Free Software Foundation.
* *
* OpenOffice.org is distributed in the hope that it will be useful, * OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details * GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code). * (a copy is included in the LICENSE file that accompanied this code).
* *
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see * version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html> * <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License. * for a copy of the LGPLv3 License.
* *
************************************************************************/ ************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove // MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_tools.hxx" #include "precompiled_tools.hxx"
#include <tools/svlibrary.hxx> #include <tools/svlibrary.hxx>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XMacroExpander.hpp> #include <com/sun/star/util/XMacroExpander.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include <comphelper/processfactory.hxx> #include <comphelper/processfactory.hxx>
#include <tools/string.hxx> #include <tools/string.hxx>
#include <rtl/uri.hxx> #include <rtl/uri.hxx>
using namespace com::sun::star; using namespace com::sun::star;
static uno::Sequence< rtl::OUString > GetMultiPaths_Impl() static uno::Sequence< rtl::OUString > GetMultiPaths_Impl()
{ {
uno::Sequence< rtl::OUString > aRes; uno::Sequence< rtl::OUString > aRes;
uno::Sequence< rtl::OUString > aInternalPaths; uno::Sequence< rtl::OUString > aInternalPaths;
uno::Sequence< rtl::OUString > aUserPaths; uno::Sequence< rtl::OUString > aUserPaths;
bool bSuccess = true; bool bSuccess = true;
uno::Reference< lang::XMultiServiceFactory > xMgr( comphelper::getProcessServiceFactory() ); uno::Reference< lang::XMultiServiceFactory > xMgr( comphelper::getProcessServiceFactory() );
if (xMgr.is()) if (xMgr.is())
{ {
try try
{ {
String aInternal; String aInternal;
aInternal.AppendAscii("Libraries"); aInternal.AppendAscii("Libraries");
String aUser; String aUser;
aUser.AppendAscii("Libraries"); aUser.AppendAscii("Libraries");
aInternal .AppendAscii( "_internal" ); aInternal .AppendAscii( "_internal" );
aUser .AppendAscii( "_user" ); aUser .AppendAscii( "_user" );
uno::Reference< beans::XPropertySet > xPathSettings( xMgr->createInstance( uno::Reference< beans::XPropertySet > xPathSettings( xMgr->createInstance(
rtl::OUString::createFromAscii( "com.sun.star.util.PathSettings" ) ), uno::UNO_QUERY_THROW ); rtl::OUString::createFromAscii( "com.sun.star.util.PathSettings" ) ), uno::UNO_QUERY_THROW );
xPathSettings->getPropertyValue( aInternal ) >>= aInternalPaths; xPathSettings->getPropertyValue( aInternal ) >>= aInternalPaths;
xPathSettings->getPropertyValue( aUser ) >>= aUserPaths; xPathSettings->getPropertyValue( aUser ) >>= aUserPaths;
} }
catch (uno::Exception &) catch (uno::Exception &)
{ {
bSuccess = false; bSuccess = false;
} }
} }
if (bSuccess) if (bSuccess)
{ {
sal_Int32 nMaxEntries = aInternalPaths.getLength() + aUserPaths.getLength(); sal_Int32 nMaxEntries = aInternalPaths.getLength() + aUserPaths.getLength();
aRes.realloc( nMaxEntries ); aRes.realloc( nMaxEntries );
rtl::OUString *pRes = aRes.getArray(); rtl::OUString *pRes = aRes.getArray();
sal_Int32 nCount = 0; // number of actually added entries sal_Int32 nCount = 0; // number of actually added entries
for (int i = 0; i < 2; ++i) for (int i = 0; i < 2; ++i)
{ {
const uno::Sequence< rtl::OUString > &rPathSeq = i == 0 ? aUserPaths : aInternalPaths; const uno::Sequence< rtl::OUString > &rPathSeq = i == 0 ? aUserPaths : aInternalPaths;
const rtl::OUString *pPathSeq = rPathSeq.getConstArray(); const rtl::OUString *pPathSeq = rPathSeq.getConstArray();
for (sal_Int32 k = 0; k < rPathSeq.getLength(); ++k) for (sal_Int32 k = 0; k < rPathSeq.getLength(); ++k)
{ {
const bool bAddUser = (&rPathSeq == &aUserPaths); const bool bAddUser = (&rPathSeq == &aUserPaths);
const bool bAddInternal = (&rPathSeq == &aInternalPaths); const bool bAddInternal = (&rPathSeq == &aInternalPaths);
if ((bAddUser || bAddInternal) && pPathSeq[k].getLength() > 0) if ((bAddUser || bAddInternal) && pPathSeq[k].getLength() > 0)
pRes[ nCount++ ] = pPathSeq[k]; pRes[ nCount++ ] = pPathSeq[k];
} }
} }
aRes.realloc( nCount ); aRes.realloc( nCount );
} }
return aRes; return aRes;
} }
bool SvLibrary::LoadModule( osl::Module& rModule, const rtl::OUString& rLibName, ::oslGenericFunction baseModule, ::sal_Int32 mode ) bool SvLibrary::LoadModule( osl::Module& rModule, const rtl::OUString& rLibName, ::oslGenericFunction baseModule, ::sal_Int32 mode )
{ {
static uno::Sequence < rtl::OUString > aPaths = GetMultiPaths_Impl(); static uno::Sequence < rtl::OUString > aPaths = GetMultiPaths_Impl();
bool bLoaded = false; bool bLoaded = false;
for (sal_Int32 n=0; n<aPaths.getLength(); n++) for (sal_Int32 n=0; n<aPaths.getLength(); n++)
{ {
rtl::OUString aMod = aPaths[n]; rtl::OUString aMod = aPaths[n];
if ( aPaths[n].indexOfAsciiL("vnd.sun.star.expand",19) == 0) if ( aPaths[n].indexOfAsciiL("vnd.sun.star.expand",19) == 0)
{ {
uno::Reference< uno::XComponentContext > xComponentContext = comphelper::getProcessComponentContext(); uno::Reference< uno::XComponentContext > xComponentContext = comphelper::getProcessComponentContext();
uno::Reference< util::XMacroExpander > xMacroExpander; uno::Reference< util::XMacroExpander > xMacroExpander;
xComponentContext->getValueByName( xComponentContext->getValueByName(
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.util.theMacroExpander") ) ) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("/singletons/com.sun.star.util.theMacroExpander") ) )
>>= xMacroExpander; >>= xMacroExpander;
aMod = aMod.copy( sizeof("vnd.sun.star.expand:") -1 ); aMod = aMod.copy( sizeof("vnd.sun.star.expand:") -1 );
aMod = ::rtl::Uri::decode( aMod, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 ); aMod = ::rtl::Uri::decode( aMod, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
aMod = xMacroExpander->expandMacros( aMod ); aMod = xMacroExpander->expandMacros( aMod );
} }
aMod += ::rtl::OUString( sal_Unicode('/') ); aMod += ::rtl::OUString( sal_Unicode('/') );
aMod += rLibName; aMod += rLibName;
bLoaded = rModule.load( aMod, mode ); bLoaded = rModule.load( aMod, mode );
if ( bLoaded ) if ( bLoaded )
break; break;
} }
if (!bLoaded ) if (!bLoaded )
bLoaded = rModule.loadRelative( baseModule, rLibName, mode ); bLoaded = rModule.loadRelative( baseModule, rLibName, mode );
return bLoaded; return bLoaded;
} }