diff options
author | Jakub Trzebiatowski <ubap.dev@gmail.com> | 2016-03-29 15:46:18 +0200 |
---|---|---|
committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-03-31 12:47:30 +0000 |
commit | bb2fdee74fddd42914d0fa7d7b3820d0bd33237a (patch) | |
tree | 99ebcf55617ebe7c2284e406b6e9356a1a754ce5 /cui | |
parent | c8fd5210b638fca6b20f4884f00f314eeca67b56 (diff) |
tdf#98885 - hyperlink dialog - remove useless button
removed browse button and its code
Change-Id: I0b2a611760d346d5f0fff6d129676410aea30c41
Reviewed-on: https://gerrit.libreoffice.org/23599
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'cui')
-rw-r--r-- | cui/source/dialogs/hlinettp.cxx | 33 | ||||
-rw-r--r-- | cui/source/inc/hlinettp.hxx | 2 | ||||
-rw-r--r-- | cui/uiconfig/ui/hyperlinkinternetpage.ui | 14 |
3 files changed, 0 insertions, 49 deletions
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 700a58f6c77e..7c92332f36a6 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -45,19 +45,12 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent, get(m_pRbtLinktypFTP, "linktyp_ftp"); get(m_pCbbTarget, "target"); m_pCbbTarget->SetSmartProtocol(INetProtocol::Http); - get(m_pBtBrowse, "browse"); - BitmapEx aBitmap = Image(CUI_RES (RID_SVXBMP_BROWSE)).GetBitmapEx(); - aBitmap.Scale(GetDPIScaleFactor(),GetDPIScaleFactor(),BmpScaleFlag::BestQuality ); - m_pBtBrowse->SetModeImage(Image(aBitmap)); get(m_pFtLogin, "login_label"); get(m_pEdLogin, "login"); get(m_pFtPassword, "password_label"); get(m_pEdPassword, "password"); get(m_pCbAnonymous, "anonymous"); - // Disable display of bitmap names. - m_pBtBrowse->EnableTextDisplay (false); - InitStdControls(); m_pCbbTarget->Show(); @@ -68,7 +61,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent, // set defaults m_pRbtLinktypInternet->Check (); - m_pBtBrowse->Enable(); // set handlers @@ -76,7 +68,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( vcl::Window *pParent, m_pRbtLinktypInternet->SetClickHdl( aLink ); m_pRbtLinktypFTP->SetClickHdl ( aLink ); m_pCbAnonymous->SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) ); - m_pBtBrowse->SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickBrowseHdl_Impl ) ); m_pEdLogin->SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl ) ); m_pCbbTarget->SetLoseFocusHdl ( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) ); m_pCbbTarget->SetModifyHdl ( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) ); @@ -93,7 +84,6 @@ void SvxHyperlinkInternetTp::dispose() m_pRbtLinktypInternet.clear(); m_pRbtLinktypFTP.clear(); m_pCbbTarget.clear(); - m_pBtBrowse.clear(); m_pFtLogin.clear(); m_pEdLogin.clear(); m_pFtPassword.clear(); @@ -386,29 +376,6 @@ IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl, Control&, RefreshMarkWindow(); } -/************************************************************************* -|* -|* Click on imagebutton : Browse -|* -|************************************************************************/ - -IMPL_LINK_NOARG_TYPED(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, Button*, void) -{ - - // Open URL if available - - SfxStringItem aName( SID_FILE_NAME, OUString("http://") ); - SfxStringItem aRefererItem( SID_REFERER, OUString("private:user") ); - SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, true ); - SfxBoolItem aSilent( SID_SILENT, true ); - SfxBoolItem aReadOnly( SID_DOC_READONLY, true ); - - SfxBoolItem aBrowse( SID_BROWSE, true ); - - const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, nullptr }; - static_cast<SvxHpLinkDlg*>(mpDialog.get())->GetBindings()->Execute( SID_OPENDOC, ppItems, SfxCallMode::ASYNCHRON | SfxCallMode::RECORD ); -} - void SvxHyperlinkInternetTp::RefreshMarkWindow() { if ( m_pRbtLinktypInternet->IsChecked() && IsMarkWndVisible() ) diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index f70b8f7d2d74..05e2467fa2d5 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -35,7 +35,6 @@ private: VclPtr<RadioButton > m_pRbtLinktypInternet; VclPtr<RadioButton> m_pRbtLinktypFTP; VclPtr<SvxHyperURLBox> m_pCbbTarget; - VclPtr<PushButton> m_pBtBrowse; VclPtr<FixedText> m_pFtLogin; VclPtr<Edit> m_pEdLogin; VclPtr<FixedText> m_pFtPassword; @@ -49,7 +48,6 @@ private: DECL_LINK_TYPED( Click_SmartProtocol_Impl , Button*, void ); ///< Radiobutton clicked: Type HTTP or FTP DECL_LINK_TYPED( ClickAnonymousHdl_Impl , Button*, void ); ///< Checkbox : Anonymous User - DECL_LINK_TYPED( ClickBrowseHdl_Impl , Button*, void ); ///< Button : Browse DECL_LINK_TYPED( ModifiedLoginHdl_Impl , Edit&, void ); ///< Contents of editfield "Login" modified DECL_LINK_TYPED( LostFocusTargetHdl_Impl, Control&, void ); ///< Combobox "Target" lost its focus DECL_LINK_TYPED( ModifiedTargetHdl_Impl , Edit&, void ); ///< Contents of editfield "Target" modified diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui b/cui/uiconfig/ui/hyperlinkinternetpage.ui index dbc7361269de..bec8b3feff4d 100644 --- a/cui/uiconfig/ui/hyperlinkinternetpage.ui +++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui @@ -106,20 +106,6 @@ </packing> </child> <child> - <object class="GtkButton" id="browse"> - <property name="label" translatable="yes">WWW Browser</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Open web browser, copy an URL, and paste it to Target field</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> <object class="GtkLabel" id="login_label"> <property name="visible">True</property> <property name="can_focus">False</property> |