diff options
| author | Sven Jacobi <sj@openoffice.org> | 2000-12-19 12:38:59 +0000 |
|---|---|---|
| committer | Sven Jacobi <sj@openoffice.org> | 2000-12-19 12:38:59 +0000 |
| commit | 0b6815c29c9c843293c81e8e711ba75d951bbe96 (patch) | |
| tree | 4a01c7f0352ed8ece1ef1d52ea0abb3f314fe034 /svx/source/dialog/impgrf.cxx | |
| parent | #82301#: don't reopen streams in Transfer_Impl: locking violations (diff) | |
| download | core-0b6815c29c9c843293c81e8e711ba75d951bbe96.tar.gz core-0b6815c29c9c843293c81e8e711ba75d951bbe96.zip | |
#79986# MultiConfigString is now using physical filenames instead of urls of type INET_PROT_FILE
Diffstat (limited to 'svx/source/dialog/impgrf.cxx')
| -rw-r--r-- | svx/source/dialog/impgrf.cxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx index dd52dd036bc6..92a772e6c7e4 100644 --- a/svx/source/dialog/impgrf.cxx +++ b/svx/source/dialog/impgrf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impgrf.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: sj $ $Date: 2000-12-19 09:26:29 $ + * last change: $Author: sj $ $Date: 2000-12-19 13:38:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -96,6 +96,7 @@ #pragma hdrstop #include <ucbhelper/content.hxx> +#include <osl/file.hxx> #ifndef _COM_SUN_STAR_UCB_COMMANDABORTEDEXCEPTION_HPP_ #include <com/sun/star/ucb/CommandAbortedException.hpp> @@ -211,14 +212,17 @@ USHORT FillFilter( GraphicFilter& rFilter ) for ( xub_StrLen i = 0, nCount = aModulesPath.GetTokenCount(); i < nCount; i++ ) { - String aToken( aModulesPath.GetToken( i ) ); - INetURLObject aTokenUrl( aToken ); - if ( aTokenUrl.HasError() ) - aTokenUrl = INetURLObject( aToken, INET_PROT_FILE ); - aTokenUrl.insertName( DEFINE_CONST_UNICODE( IMPGRF_GRAPHIC_FILTER_FILE ) ); + String aToken( aModulesPath.GetToken( i ) ); + ::rtl::OUString aDest; + ::osl::FileBase::normalizePath( aToken, aDest ); + aDest += ::rtl::OUString( sal_Unicode( '/' ) ); + aDest += ::rtl::OUString( DEFINE_CONST_UNICODE(IMPGRF_GRAPHIC_FILTER_FILE) ); + if ( aFullConfigPath.Len() ) aFullConfigPath += sal_Unicode(';'); - aFullConfigPath += aTokenUrl.GetMainURL(); + ::rtl::OUString aNormalizedPath; + ::osl::FileBase::getSystemPathFromNormalizedPath( aDest, aNormalizedPath ); + aFullConfigPath.Append( String( aNormalizedPath ) ); } rFilter.SetConfigPath( aFullConfigPath ); rFilter.SetFilterPath( aPathOpt.GetFilterPath() ); |