diff options
| author | Sven Jacobi <sj@openoffice.org> | 2001-01-23 15:19:22 +0000 |
|---|---|---|
| committer | Sven Jacobi <sj@openoffice.org> | 2001-01-23 15:19:22 +0000 |
| commit | 8bf0951ca43961b667cd85c48a14a9d0b5ebd1b1 (patch) | |
| tree | 9c55cca2d03781d448611367b5ea7c31fdbf2f67 /svx/source/dialog/impgrf.cxx | |
| parent | changed the display text for the navigation bar (diff) | |
| download | core-8bf0951ca43961b667cd85c48a14a9d0b5ebd1b1.tar.gz core-8bf0951ca43961b667cd85c48a14a9d0b5ebd1b1.zip | |
#83082# ModulesPath was changed from url to systempath
Diffstat (limited to 'svx/source/dialog/impgrf.cxx')
| -rw-r--r-- | svx/source/dialog/impgrf.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/svx/source/dialog/impgrf.cxx b/svx/source/dialog/impgrf.cxx index 92a772e6c7e4..bdd54504f482 100644 --- a/svx/source/dialog/impgrf.cxx +++ b/svx/source/dialog/impgrf.cxx @@ -2,9 +2,9 @@ * * $RCSfile: impgrf.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: sj $ $Date: 2000-12-19 13:38:59 $ + * last change: $Author: sj $ $Date: 2001-01-23 16:19:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -225,12 +225,17 @@ USHORT FillFilter( GraphicFilter& rFilter ) aFullConfigPath.Append( String( aNormalizedPath ) ); } rFilter.SetConfigPath( aFullConfigPath ); + + INetURLObject aFilterPathUrl( aPathOpt.GetFilterPath() ); + if ( aFilterPathUrl.HasError() ) + aFilterPathUrl = INetURLObject( aPathOpt.GetFilterPath(), INET_PROT_FILE ); rFilter.SetFilterPath( aPathOpt.GetFilterPath() ); - INetURLObject aFltOptFile( aPathOpt.GetUserConfigPath() ); - if ( aFltOptFile.HasError() ) - aFltOptFile = INetURLObject( aPathOpt.GetUserConfigPath(), INET_PROT_FILE ); - aFltOptFile.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( IMPGRF_GRAPHIC_OPTIONS_FILE ) ) ); - rFilter.SetOptionsConfigPath( aFltOptFile ); + + INetURLObject aUserConfigPathUrl( aPathOpt.GetUserConfigPath() ); + if ( aUserConfigPathUrl.HasError() ) + aUserConfigPathUrl = INetURLObject( aPathOpt.GetUserConfigPath(), INET_PROT_FILE ); + aUserConfigPathUrl.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( IMPGRF_GRAPHIC_OPTIONS_FILE ) ) ); + rFilter.SetOptionsConfigPath( aUserConfigPathUrl ); return rFilter.GetImportFormatCount(); } |