summaryrefslogtreecommitdiff
path: root/sfx2/source/doc/guisaveas.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2009-03-16 12:32:05 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2009-03-16 12:32:05 +0000
commit6f3ab3578580bb4050d487498d08f5c7dc810d23 (patch)
tree2ffa378ef8de0886f6e8154615a4412c40f1cb22 /sfx2/source/doc/guisaveas.cxx
parent60fd827d609b85387d28b010bf08f0eee91f8f4d (diff)
CWS-TOOLING: integrate CWS mav48
2009-03-09 12:55:54 +0100 mav r269080 : #i99918# provide decoded version of the name 2009-03-09 10:14:59 +0100 mav r269064 : #99967# let readonly files be correctly recognized 2009-03-09 07:04:09 +0100 mav r269056 : #i99922# fix the typo 2009-03-06 14:10:29 +0100 mav r269005 : #i99922# convert system path correctly 2009-03-06 13:53:45 +0100 mav r269001 : #i99922# Prevent the problem for the case that the configuration contains wrong URL 2009-03-06 13:16:56 +0100 mav r268999 : #i99919# handle SID_OPENHYPERLINK correctly in slide-show
Diffstat (limited to 'sfx2/source/doc/guisaveas.cxx')
-rw-r--r--sfx2/source/doc/guisaveas.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 12f0c4ef96..4b6812bb8b 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -921,7 +921,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode,
// get the path from the dialog
INetURLObject aURL( pFileDlg->GetPath() );
// the path should be provided outside since it might be used for further calls to the dialog
- aSuggestedName = aURL.GetName();
+ aSuggestedName = aURL.GetName( INetURLObject::DECODE_WITH_CHARSET );
// old filter options should be cleared in case different filter is used
@@ -1081,8 +1081,8 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
else
{
// pb: set graphic path if context == SD_EXPORT or SI_EXPORT else work path
- aReccomendedDir = ( aCtxt != sfx2::FileDialogHelper::UNKNOWN_CONTEXT )
- ? SvtPathOptions().GetGraphicPath() : SvtPathOptions().GetWorkPath();
+ ::rtl::OUString aConfigSuggestion( ( aCtxt != sfx2::FileDialogHelper::UNKNOWN_CONTEXT ) ? SvtPathOptions().GetGraphicPath() : SvtPathOptions().GetWorkPath() );
+ aReccomendedDir = INetURLObject( aConfigSuggestion ).GetMainURL( INetURLObject::NO_DECODE );
}
return aReccomendedDir;
@@ -1098,7 +1098,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
aReccomendedName = aSuggestedName;
else
{
- aReccomendedName = INetURLObject( GetStorable()->getLocation() ).GetName();
+ aReccomendedName = INetURLObject( GetStorable()->getLocation() ).GetName( INetURLObject::DECODE_WITH_CHARSET );
if ( !aReccomendedName.getLength() )
{
try {
@@ -1128,7 +1128,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog()
aObj.SetExtension( aExtensions[0] );
}
- aReccomendedName = aObj.GetName();
+ aReccomendedName = aObj.GetName( INetURLObject::DECODE_WITH_CHARSET );
}
}
}