Undoing changed made on fdo#63271 because of complains.

Change-Id: I504676db3e692072f9c4d6a265877133ae97f288
Please enter the commit message for your changes. Lines starting
Reviewed-on: https://gerrit.libreoffice.org/8376
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

6 files changed, 16 insertions, 18 deletions

diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index e93ce96c5f4c..1c7bccbef05e 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -131,7 +131,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
     GetOKButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_APPLYBUT) );
     GetCancelButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_CLOSEBUT) );
 
-    GetOKButton().SetClickHdl    ( LINK ( this, SvxHpLinkDlg, ClickOkHdl_Impl ) );
+    GetOKButton().SetClickHdl    ( LINK ( this, SvxHpLinkDlg, ClickApplyHdl_Impl ) );
     GetCancelButton().SetClickHdl( LINK ( this, SvxHpLinkDlg, ClickCloseHdl_Impl ) );
 }
 
@@ -213,11 +213,11 @@ void SvxHpLinkDlg::Move()
 
 /*************************************************************************
 |*
-|* Click on Ok-button
+|* Click on Apply-button
 |*
 |************************************************************************/
 
-IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl)
+IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl)
 {
     SfxItemSet aItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK,
                          SID_HYPERLINK_SETLINK );
@@ -231,16 +231,14 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl)
 
         SvxHyperlinkItem *aItem = (SvxHyperlinkItem *)
                                   aItemSet.GetItem (SID_HYPERLINK_SETLINK);
-
-        if ( !aItem->GetURL().isEmpty() )
+        OUString aStrEmpty;
+        if ( aItem->GetURL() != aStrEmpty )
             GetDispatcher()->Execute( SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON |
                                       SFX_CALLMODE_RECORD, aItem, 0L);
 
         ( (SvxHyperlinkTabPageBase*)GetTabPage ( GetCurPageId() ) )->DoApply();
     }
 
-    Close();
-
     return( 0L );
 }
 
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index babcd575ed45..32db4205e34c 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -121,7 +121,7 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect )
 
 SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
 :   ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ),
-    maBtOk( this, CUI_RES (BT_OK) ),
+    maBtApply( this, CUI_RES (BT_APPLY) ),
     maBtClose( this, CUI_RES (BT_CLOSE) ),
     maLbTree ( this, CUI_RES (TLB_MARK) ),
     mbUserMoved ( sal_False ),
@@ -130,9 +130,9 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
 {
     FreeResource();
 
-    maBtOk.SetClickHdl          ( LINK ( this, SvxHlinkDlgMarkWnd, ClickOkHdl_Impl ) );
+    maBtApply.SetClickHdl          ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) );
     maBtClose.SetClickHdl       ( LINK ( this, SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl ) );
-    maLbTree.SetDoubleClickHdl  ( LINK ( this, SvxHlinkDlgMarkWnd, ClickOkHdl_Impl ) );
+    maLbTree.SetDoubleClickHdl  ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) );
 
     // add lines to the Tree-ListBox
     maLbTree.SetStyle( maLbTree.GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
@@ -532,11 +532,11 @@ bool SvxHlinkDlgMarkWnd::SelectEntry(OUString aStrMark)
 
 /*************************************************************************
 |*
-|* Click on Ok-Button / Doubleclick on item in tree
+|* Click on Apply-Button / Doubleclick on item in tree
 |*
 |************************************************************************/
 
-IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickOkHdl_Impl)
+IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl)
 {
     SvTreeListEntry* pEntry = maLbTree.GetCurEntry();
 
diff --git a/cui/source/dialogs/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc
index f9379814b2b1..2c4b6ac22cf7 100644
--- a/cui/source/dialogs/hlmarkwn.hrc
+++ b/cui/source/dialogs/hlmarkwn.hrc
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#define BT_OK       1
+#define BT_APPLY    1
 #define BT_CLOSE    2
 #define TLB_MARK    3
 #define STR_MARK_TREE   5000
diff --git a/cui/source/dialogs/hlmarkwn.src b/cui/source/dialogs/hlmarkwn.src
index c035163467dd..10fc781c7c47 100644
--- a/cui/source/dialogs/hlmarkwn.src
+++ b/cui/source/dialogs/hlmarkwn.src
@@ -33,14 +33,14 @@ ModalDialog RID_SVXFLOAT_HYPERLINK_MARKWND
     SVLook = TRUE ;
     Size = MAP_APPFONT ( 109 , 185 ) ;
     Text [ en-US ] = "Target in Document" ;
-    PushButton BT_OK
+    PushButton BT_APPLY
     {
         HelpId = HID_HYPERLINK_MARKWND_APPLY;
         Pos = MAP_APPFONT ( 3 , 168 ) ;
         Size = MAP_APPFONT ( 50 , 14 ) ;
         TabStop = TRUE ;
         DefButton = TRUE ;
-        Text [ en-US ] = "Ok" ;
+        Text [ en-US ] = "Apply" ;
     };
     PushButton BT_CLOSE
     {
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index ecc351a297b6..051ead52ed17 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -68,7 +68,7 @@ private:
     sal_Bool            mbReadOnly  : 1;
     sal_Bool            mbIsHTMLDoc : 1;
 
-    DECL_LINK (ClickOkHdl_Impl, void * );
+    DECL_LINK (ClickApplyHdl_Impl, void * );
     DECL_LINK (ClickCloseHdl_Impl, void * );
 
 protected:
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 413baf06635e..4e7652a8ef6b 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -58,7 +58,7 @@ class SvxHlinkDlgMarkWnd : public ModalDialog //FloatingWindow
 private:
     friend class SvxHlmarkTreeLBox;
 
-    PushButton      maBtOk;
+    PushButton      maBtApply;
     PushButton      maBtClose;
     SvxHlmarkTreeLBox maLbTree;
 
@@ -80,7 +80,7 @@ protected:
 
     virtual void Move ();
 
-    DECL_LINK (ClickOkHdl_Impl, void * );
+    DECL_LINK (ClickApplyHdl_Impl, void * );
     DECL_LINK (ClickCloseHdl_Impl, void * );
 
 public: