diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2010-01-06 12:22:41 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-01-06 12:22:41 +0100 |
| commit | d1bb71fa133c82868cba447e1a736db5292db39b (patch) | |
| tree | def9642c61b4d7585250eacb357e062ee3594368 /linguistic/source/dlistimp.cxx | |
| parent | 28687b22eef200c32a37f6901cd40c0328b8766d (diff) | |
| parent | 0de34b05f3c1a0409d23b63b9e69d4d7abbe1090 (diff) | |
cws tl74: merge with DEV300_m68; AND Unix LF conversion for some files!
Diffstat (limited to 'linguistic/source/dlistimp.cxx')
| -rw-r--r-- | linguistic/source/dlistimp.cxx | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 6d247a16b605..17fd29b05923 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -39,18 +39,25 @@ #include <tools/fsys.hxx> #include <tools/stream.hxx> #include <tools/urlobj.hxx> +#include <i18npool/mslangid.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/useroptions.hxx> +#include <cppuhelper/factory.hxx> // helper for factories #include <unotools/localfilehelper.hxx> -#include <unotools/processfactory.hxx> +#include <comphelper/processfactory.hxx> #include <unotools/ucbstreamhelper.hxx> -#include <vcl/svapp.hxx> - -#include <com/sun/star/ucb/XSimpleFileAccess.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/linguistic2/DictionaryEventFlags.hpp> #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/ucb/XSimpleFileAccess.hpp> + +#include "defs.hxx" +#include "dlistimp.hxx" +#include "dicimp.hxx" +#include "lngopt.hxx" #include "defs.hxx" #include "dlistimp.hxx" @@ -934,7 +941,8 @@ static BOOL IsVers2OrNewer( const String& rFileURL, USHORT& nLng, BOOL& bNeg ) if(aExt != aDIC) return FALSE; - uno::Reference< lang::XMultiServiceFactory > xServiceFactory( utl::getProcessServiceFactory() ); + // get stream to be used + uno::Reference< lang::XMultiServiceFactory > xServiceFactory( comphelper::getProcessServiceFactory() ); // get XInputStream stream uno::Reference< io::XInputStream > xStream; |