diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-23 10:38:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-23 11:17:14 +0100 |
| commit | 847174d769be66f4defa1b8a664c89af0aa89a88 (patch) | |
| tree | e658b218e29243b4f835eb1230442698b8a37937 /sd | |
| parent | 98a5f3929af349beee2866e558922f9a3fb19923 (diff) | |
mysterious and missing 4077 resource used in sd
this would have been
String RID_WEBWIZARDDIALOG_START +77
from
wizards/source/formwizard/dbwizres.src
which is now gone (very reasonably) since...
commit 82d863b4a410fa78120d2efc41bd2b3b61f21cee
Date: Sat Feb 18 14:02:30 2017 +0100
Related tdf#99967: Cleanup after Web Wizard drop
There are still webwizard*.xhp in help/source/text/shared/autopi/
Change-Id: If54d7bfc093c8c0765fd881eeb14f62bc3517194
Reviewed-on: https://gerrit.libreoffice.org/34402
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
the original complicated reuse of another modules translation
was in
commit 660c23c4c1c624b9db626be8f01166a154021e0d
Date: Fri Jan 28 14:38:37 2005 +0000
INTEGRATION: CWS impress30 (1.18.40); FILE MERGED
2005/01/20 13:44:50 cl 1.18.40.1: #b4752338# give warning when overwriting files
Change-Id: I80ff0a545bbf08bcea142bb8bd41c547713ee11b
(cherry picked from commit 476c50943864e70a4758ccf01e2567067bc7c44f)
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) |