cui/source/tabpages/tpbitmap.cxx | 5 +---- helpcontent2 | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-)
New commits: commit f7f274d5a7afc619b18a9ad0da52a1478dae5fa6 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Aug 12 08:44:50 2013 +0100 help has no entry for HID_WARN_NAME_DUPLICATE Change-Id: I03c168f61adaae6ff98fab40923f64e5c8f9cc00 diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 5f6550b..4c3f968 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -503,7 +503,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickAddHdl_Impl) pWarnBox = new MessageDialog( GetParentDialog() ,"DuplicateNameDialog" ,"cui/ui/queryduplicatedialog.ui"); -// pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } if( pWarnBox->Execute() != RET_OK ) @@ -573,10 +572,9 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl) if( !aDlg.Execute() ) { Graphic aGraphic; - int nError = 1; EnterWait(); - nError = aDlg.GetGraphic( aGraphic ); + int nError = aDlg.GetGraphic( aGraphic ); LeaveWait(); if( !nError ) @@ -614,7 +612,6 @@ IMPL_LINK_NOARG(SvxBitmapTabPage, ClickImportHdl_Impl) pWarnBox = new MessageDialog( GetParentDialog() ,"DuplicateNameDialog" ,"cui/ui/queryduplicatedialog.ui"); -// pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } if( pWarnBox->Execute() != RET_OK ) commit 89deacaa20c322361559ba78d5c4712d30bfefca Author: Caolán McNamara <caol...@redhat.com> Date: Mon Aug 12 08:43:25 2013 +0100 Updated core Project: help 5d8fffd9a0be28b779f57d4da787f44c15bc90c8 diff --git a/helpcontent2 b/helpcontent2 index aaad966..5d8fffd 160000 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit aaad966643ede466a50bf8901028ead903a1e329 +Subproject commit 5d8fffd9a0be28b779f57d4da787f44c15bc90c8
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits