mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Undoing changed made on fdo#63271 because of complains.

Browse Source 
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>
This commit is contained in:
pje335_NL
2014-02-26 11:48:56 +01:00
committed by Caolán McNamara
parent 9fd15d9e37
commit 65453d5aeb
6 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cui/source/dialogs/cuihyperdlg.cxx
View File

@@ -131,7 +131,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
GetOKButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_APPLYBUT) ); GetOKButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_APPLYBUT) );
GetCancelButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_CLOSEBUT) ); 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 ) ); 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, SfxItemSet aItemSet( SFX_APP()->GetPool(), SID_HYPERLINK_GETLINK,
SID_HYPERLINK_SETLINK ); SID_HYPERLINK_SETLINK );
@@ -231,16 +231,14 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl)
SvxHyperlinkItem *aItem = (SvxHyperlinkItem *) SvxHyperlinkItem *aItem = (SvxHyperlinkItem *)
aItemSet.GetItem (SID_HYPERLINK_SETLINK); aItemSet.GetItem (SID_HYPERLINK_SETLINK);
OUString aStrEmpty;
if ( !aItem->GetURL().isEmpty() ) if ( aItem->GetURL() != aStrEmpty )
GetDispatcher()->Execute( SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON | GetDispatcher()->Execute( SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON |
SFX_CALLMODE_RECORD, aItem, 0L); SFX_CALLMODE_RECORD, aItem, 0L);
( (SvxHyperlinkTabPageBase*)GetTabPage ( GetCurPageId() ) )->DoApply(); ( (SvxHyperlinkTabPageBase*)GetTabPage ( GetCurPageId() ) )->DoApply();
} }
Close();
return( 0L ); return( 0L );
} }

10
cui/source/dialogs/hlmarkwn.cxx
View File

@@ -121,7 +121,7 @@ void SvxHlmarkTreeLBox::Paint( const Rectangle& rRect )
SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent ) SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
: ModalDialog( (Window*)pParent, CUI_RES ( RID_SVXFLOAT_HYPERLINK_MARKWND ) ), : 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) ), maBtClose( this, CUI_RES (BT_CLOSE) ),
maLbTree ( this, CUI_RES (TLB_MARK) ), maLbTree ( this, CUI_RES (TLB_MARK) ),
mbUserMoved ( sal_False ), mbUserMoved ( sal_False ),
@@ -130,9 +130,9 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
{ {
FreeResource(); FreeResource();
maBtOk.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickOkHdl_Impl ) ); maBtApply.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickApplyHdl_Impl ) );
maBtClose.SetClickHdl ( LINK ( this, SvxHlinkDlgMarkWnd, ClickCloseHdl_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 // add lines to the Tree-ListBox
maLbTree.SetStyle( maLbTree.GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES | 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(); SvTreeListEntry* pEntry = maLbTree.GetCurEntry();

2
cui/source/dialogs/hlmarkwn.hrc
View File

@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#define BT_OK 1 #define BT_APPLY 1
#define BT_CLOSE 2 #define BT_CLOSE 2
#define TLB_MARK 3 #define TLB_MARK 3
#define STR_MARK_TREE 5000 #define STR_MARK_TREE 5000

4
cui/source/dialogs/hlmarkwn.src
View File

@@ -33,14 +33,14 @@ ModalDialog RID_SVXFLOAT_HYPERLINK_MARKWND
SVLook = TRUE ; SVLook = TRUE ;
Size = MAP_APPFONT ( 109 , 185 ) ; Size = MAP_APPFONT ( 109 , 185 ) ;
Text [ en-US ] = "Target in Document" ; Text [ en-US ] = "Target in Document" ;
PushButton BT_OK PushButton BT_APPLY
{ {
HelpId = HID_HYPERLINK_MARKWND_APPLY; HelpId = HID_HYPERLINK_MARKWND_APPLY;
Pos = MAP_APPFONT ( 3 , 168 ) ; Pos = MAP_APPFONT ( 3 , 168 ) ;
Size = MAP_APPFONT ( 50 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ;
TabStop = TRUE ; TabStop = TRUE ;
DefButton = TRUE ; DefButton = TRUE ;
Text [ en-US ] = "Ok" ; Text [ en-US ] = "Apply" ;
}; };
PushButton BT_CLOSE PushButton BT_CLOSE
{ {

2
cui/source/inc/cuihyperdlg.hxx
View File

@@ -68,7 +68,7 @@ private:
sal_Bool mbReadOnly : 1; sal_Bool mbReadOnly : 1;
sal_Bool mbIsHTMLDoc : 1; sal_Bool mbIsHTMLDoc : 1;
DECL_LINK (ClickOkHdl_Impl, void * ); DECL_LINK (ClickApplyHdl_Impl, void * );
DECL_LINK (ClickCloseHdl_Impl, void * ); DECL_LINK (ClickCloseHdl_Impl, void * );
protected: protected:

4
cui/source/inc/hlmarkwn.hxx
View File

@@ -58,7 +58,7 @@ class SvxHlinkDlgMarkWnd : public ModalDialog //FloatingWindow
private: private:
friend class SvxHlmarkTreeLBox; friend class SvxHlmarkTreeLBox;
PushButton maBtOk; PushButton maBtApply;
PushButton maBtClose; PushButton maBtClose;
SvxHlmarkTreeLBox maLbTree; SvxHlmarkTreeLBox maLbTree;
@@ -80,7 +80,7 @@ protected:
virtual void Move (); virtual void Move ();
DECL_LINK (ClickOkHdl_Impl, void * ); DECL_LINK (ClickApplyHdl_Impl, void * );
DECL_LINK (ClickCloseHdl_Impl, void * ); DECL_LINK (ClickCloseHdl_Impl, void * );
public: public: