diff options
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/filter/html/htmlex.cxx | 26 | ||||
| -rw-r--r-- | sd/source/ui/app/strings.src | 5 | ||||
| -rw-r--r-- | sd/source/ui/inc/strings.hrc | 1 |
3 files changed, 13 insertions, 19 deletions
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index 06babc1c576b..161d8fa6afce 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -3097,25 +3097,13 @@ bool HtmlExport::checkForExistingFiles() if( bFound ) { - ResMgr *pResMgr = ResMgr::CreateResMgr( "dbw" ); - if( pResMgr ) - { - ResId aResId( 4077, *pResMgr ); - OUString aMsg( aResId ); - - OUString aSystemPath; - osl::FileBase::getSystemPathFromFileURL( maExportPath, aSystemPath ); - aMsg = aMsg.replaceFirst( "%FILENAME", aSystemPath ); - ScopedVclPtrInstance< WarningBox > aWarning( nullptr, WB_YES_NO | WB_DEF_YES, aMsg ); - aWarning->SetImage( WarningBox::GetStandardImage() ); - bFound = ( RET_NO == aWarning->Execute() ); - - delete pResMgr; - } - else - { - bFound = false; - } + OUString aSystemPath; + osl::FileBase::getSystemPathFromFileURL( maExportPath, aSystemPath ); + OUString aMsg(SdResId(STR_OVERWRITE_WARNING)); + aMsg = aMsg.replaceFirst( "%FILENAME", aSystemPath ); + ScopedVclPtrInstance< WarningBox > aWarning( nullptr, WB_YES_NO | WB_DEF_YES, aMsg ); + aWarning->SetImage( WarningBox::GetStandardImage() ); + bFound = ( RET_NO == aWarning->Execute() ); } } catch( Exception& ) diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 7dd87b46059e..89b9b00dd9bb 100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -1127,4 +1127,9 @@ String STR_OBJECTS_TREE Text [ en-US ] = "Page Tree"; }; +String STR_OVERWRITE_WARNING +{ + Text [ en-US ] = "The local target directory '%FILENAME' is not empty. Some files might be overwritten. Do you want to continue?"; +}; + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/strings.hrc b/sd/source/ui/inc/strings.hrc index 7d0b1217af58..500ad5012010 100644 --- a/sd/source/ui/inc/strings.hrc +++ b/sd/source/ui/inc/strings.hrc @@ -163,6 +163,7 @@ #define STR_UNDO_INSERT_TEXTFRAME (RID_APP_START+275) #define STR_ACTION_NOTPOSSIBLE (RID_APP_START+278) #define STR_DLG_INSERT_PAGES_FROM_FILE (RID_APP_START+279) +#define STR_OVERWRITE_WARNING (RID_APP_START+280) #define STR_SCALE_OBJECTS (RID_APP_START+281) #define STR_CREATE_PAGES (RID_APP_START+282) |