diff options
| author | Olivier Hallot <olivier.hallot@edx.srv.br> | 2013-08-11 21:46:48 -0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-12 07:41:46 +0000 |
| commit | e3ed1be22214b7ec4039f485c6d2abd4bf5f5ad0 (patch) | |
| tree | d7016b6992fd8eccd5b710e65e2b24c4a1f0d543 /cui | |
| parent | 9dd40c656feda2ccadb07d618a95b9ff63ab61ff (diff) | |
Replace read data error dialog with new UI
Change-Id: I1466730309351371943073548403bf7a24cc8b76
Reviewed-on: https://gerrit.libreoffice.org/5354
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/cuires.hrc | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/strings.src | 4 | ||||
| -rw-r--r-- | cui/source/tabpages/tpbitmap.cxx | 11 |
3 files changed, 5 insertions, 11 deletions
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index cc1eec8091a9..dacb2764fbe2 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -97,7 +97,6 @@ #define RID_SVXSTR_ASK_CHANGE_COLOR (RID_SVX_START + 218) #define RID_SVXSTR_TABLE (RID_SVX_START + 220) -#define RID_SVXSTR_READ_DATA_ERROR (RID_SVX_START + 230) #define RID_SVXSTR_WARN_TABLE_OVERWRITE (RID_SVX_START + 231) #define RID_SVXSTR_WARN_NAME_DUPLICATE (RID_SVX_START + 236) #define RID_SVXSTR_CHARNAME_TRANSPARENT (RID_SVX_START + 237) diff --git a/cui/source/tabpages/strings.src b/cui/source/tabpages/strings.src index c027c06902d3..4ef7c13399f7 100644 --- a/cui/source/tabpages/strings.src +++ b/cui/source/tabpages/strings.src @@ -91,10 +91,6 @@ String RID_SVXSTR_TABLE { Text [ en-US ] = "Table" ; }; -String RID_SVXSTR_READ_DATA_ERROR -{ - Text [ en-US ] = "The file could not be loaded!" ; -}; String RID_SVXSTR_WARN_TABLE_OVERWRITE { Text [ en-US ] = "The list was modified without saving. Would you like to save the list now?" ; diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index d5de83064669..d918b5922c60 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -468,7 +468,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl) { aName = aNewName; aName += sal_Unicode(' '); - aName += OUString::valueOf( j++ ); + aName += OUString::number( j++ ); bDifferent = sal_True; for( long i = 0; i < nCount && bDifferent; i++ ) @@ -641,9 +641,9 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl) } else // graphic couldn't be loaded - ErrorBox( GetParentDialog(), - WinBits( WB_OK ), - String( ResId( RID_SVXSTR_READ_DATA_ERROR, rMgr ) ) ).Execute(); + MessageDialog( GetParentDialog() + ,"NoLoadedFileDialog" + ,"cui/ui/querynoloadedfiledialog.ui").Execute(); } return 0L; @@ -841,8 +841,7 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickLoadHdl_Impl) IMPL_LINK_NOARG(SvxBitmapTabPage, ClickSaveHdl_Impl) { - ::sfx2::FileDialogHelper aDlg( - com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); + ::sfx2::FileDialogHelper aDlg( com::sun::star::ui::dialogs::TemplateDescription::FILESAVE_SIMPLE, 0 ); String aStrFilterType( "*.sob" ); aDlg.AddFilter( aStrFilterType, aStrFilterType ); |