[Libreoffice-commits] .: cui/source
Andras Timar
timar at kemper.freedesktop.org
Thu Jun 16 03:17:34 PDT 2011
cui/source/dialogs/cuihyperdlg.cxx | 1 -
cui/source/dialogs/hlinettp.cxx | 21 +++------------------
cui/source/dialogs/hltpbase.cxx | 4 ----
cui/source/dialogs/hyperdlg.hrc | 1 -
cui/source/dialogs/hyperdlg.src | 9 +--------
cui/source/inc/hlinettp.hxx | 7 +++----
cui/source/inc/hltpbase.hxx | 2 --
7 files changed, 7 insertions(+), 38 deletions(-)
New commits:
commit 8e92cfae4c351bdeca6cad3f3756882f02c602fe
Author: Andras Timar <atimar at suse.com>
Date: Thu Jun 16 11:00:08 2011 +0200
remove Telnet option from Insert Hyperlink dialog
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 64be609..1e15f89 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -290,7 +290,6 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
{
case INET_PROT_HTTP :
case INET_PROT_FTP :
- case INET_PROT_TELNET :
nPageId = RID_SVXPAGE_HYPERLINK_INTERNET;
break;
case INET_PROT_FILE :
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index a887388..2e2b58d 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -41,7 +41,6 @@ sal_Char const sAnonymous[] = "anonymous";
sal_Char const sHTTPScheme[] = INET_HTTP_SCHEME;
sal_Char const sHTTPSScheme[] = INET_HTTPS_SCHEME;
sal_Char const sFTPScheme[] = INET_FTP_SCHEME;
-sal_Char const sTelnetScheme[] = INET_TELNET_SCHEME;
/*************************************************************************
|*
@@ -56,7 +55,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
maGrpLinkTyp ( this, CUI_RES (GRP_LINKTYPE) ),
maRbtLinktypInternet ( this, CUI_RES (RB_LINKTYP_INTERNET) ),
maRbtLinktypFTP ( this, CUI_RES (RB_LINKTYP_FTP) ),
- maRbtLinktypTelnet ( this, CUI_RES (RB_LINKTYP_TELNET) ),
maFtTarget ( this, CUI_RES (FT_TARGET_HTML) ),
maCbbTarget ( this, INET_PROT_HTTP ),
maBtBrowse ( this, CUI_RES (BTN_BROWSE) ),
@@ -112,7 +110,6 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
Link aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) );
maRbtLinktypInternet.SetClickHdl( aLink );
maRbtLinktypFTP.SetClickHdl ( aLink );
- maRbtLinktypTelnet.SetClickHdl ( aLink );
maCbAnonymous.SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) );
maBtBrowse.SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickBrowseHdl_Impl ) );
maBtTarget.SetClickHdl ( LINK ( this, SvxHyperlinkInternetTp, ClickTargetHdl_Impl ) );
@@ -308,14 +305,10 @@ void SvxHyperlinkInternetTp::SetScheme( const String& aScheme )
//if aScheme is empty or unknown the default beaviour is like it where HTTP
sal_Bool bFTP = aScheme.SearchAscii( sFTPScheme ) == 0;
- sal_Bool bTelnet = sal_False;
- if( !bFTP )
- bTelnet = aScheme.SearchAscii( sTelnetScheme ) == 0;
- sal_Bool bInternet = !(bFTP || bTelnet);
+ sal_Bool bInternet = !(bFTP);
//update protocol button selection:
maRbtLinktypFTP.Check(bFTP);
- maRbtLinktypTelnet.Check(bTelnet);
maRbtLinktypInternet.Check(bInternet);
//update target:
@@ -338,7 +331,7 @@ void SvxHyperlinkInternetTp::SetScheme( const String& aScheme )
}
else
{
- //disable for https, ftp and telnet
+ //disable for https and ftp
maBtTarget.Disable();
if ( mbMarkWndOpen )
HideMarkWnd ();
@@ -371,10 +364,6 @@ String SvxHyperlinkInternetTp::GetSchemeFromButtons() const
{
return String::CreateFromAscii( INET_FTP_SCHEME );
}
- else if( maRbtLinktypTelnet.IsChecked() )
- {
- return String::CreateFromAscii( INET_TELNET_SCHEME );
- }
return String::CreateFromAscii( INET_HTTP_SCHEME );
}
@@ -384,16 +373,12 @@ INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const
{
return INET_PROT_FTP;
}
- else if( maRbtLinktypTelnet.IsChecked() )
- {
- return INET_PROT_TELNET;
- }
return INET_PROT_HTTP;
}
/*************************************************************************
|*
-|* Click on Radiobutton : Internet, FTP or Telnet
+|* Click on Radiobutton : Internet or FTP
|*
|************************************************************************/
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 846c112..963bb2a 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -578,10 +578,6 @@ String SvxHyperlinkTabPageBase::GetSchemeFromURL( String aStrURL )
{
aStrScheme = String::CreateFromAscii( INET_NEWS_SCHEME );
}
- else if ( aStrURL.EqualsIgnoreCaseAscii( INET_TELNET_SCHEME, 0, 9 ) )
- {
- aStrScheme = String::CreateFromAscii( INET_TELNET_SCHEME );
- }
}
else
aStrScheme = INetURLObject::GetScheme( aProtocol );
diff --git a/cui/source/dialogs/hyperdlg.hrc b/cui/source/dialogs/hyperdlg.hrc
index 9fed557..7c2c081 100644
--- a/cui/source/dialogs/hyperdlg.hrc
+++ b/cui/source/dialogs/hyperdlg.hrc
@@ -30,7 +30,6 @@
#define GRP_LINKTYPE 1
#define RB_LINKTYP_INTERNET 2
#define RB_LINKTYP_FTP 3
-#define RB_LINKTYP_TELNET 4
#define FT_TARGET_HTML 5
#define CB_TARGET_HTML 6
#define FT_LOGIN 7
diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src
index 47b11b3..d986593 100644
--- a/cui/source/dialogs/hyperdlg.src
+++ b/cui/source/dialogs/hyperdlg.src
@@ -68,13 +68,6 @@ TabPage RID_SVXPAGE_HYPERLINK_INTERNET
Size = MAP_APPFONT( 56 - COL_DIFF, 10 );
Text [ en-US ] = "~FTP";
};
- RadioButton RB_LINKTYP_TELNET
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET";
- Pos = MAP_APPFONT( 173, 13 );
- Size = MAP_APPFONT( 56, 10 );
- Text [ en-US ] = "~Telnet";
- };
FixedText FT_TARGET_HTML
{
Pos = MAP_APPFONT ( 12 , 26 ) ;
@@ -783,7 +776,7 @@ String RID_SVXSTR_HYPERDLG_HLINETTP
};
String RID_SVXSTR_HYPERDLG_HLINETTP_HELP
{
- Text [ en-US ] = "This is where you create a hyperlink to a Web page, FTP server or Telnet connection." ;
+ Text [ en-US ] = "This is where you create a hyperlink to a Web page or FTP server connection." ;
};
String RID_SVXSTR_HYPERDLG_HLMAILTP
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index 1f3efbf..73f99df 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -44,7 +44,6 @@ private:
FixedLine maGrpLinkTyp;
RadioButton maRbtLinktypInternet;
RadioButton maRbtLinktypFTP;
- RadioButton maRbtLinktypTelnet;
FixedText maFtTarget;
SvxHyperURLBox maCbbTarget;
ImageButton maBtBrowse;
@@ -62,10 +61,10 @@ private:
String maStrStdDocURL;
- DECL_LINK (Click_SmartProtocol_Impl , void * ); // Radiobutton clicked: Type Internet, FTP or Telnet
- DECL_LINK (ClickAnonymousHdl_Impl , void * ); // Checkbox : Anonymer Benutzer
+ DECL_LINK (Click_SmartProtocol_Impl , void * ); // Radiobutton clicked: Type HTTP or FTP
+ DECL_LINK (ClickAnonymousHdl_Impl , void * ); // Checkbox : Anonymous User
DECL_LINK (ClickBrowseHdl_Impl , void * ); // Button : Browse
- DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Ziel
+ DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Target
DECL_LINK (ModifiedLoginHdl_Impl , void * ); // Contens of editfield "Login" modified
DECL_LINK (LostFocusTargetHdl_Impl , void * ); // Combobox "Target" lost its focus
DECL_LINK (ModifiedTargetHdl_Impl , void * ); // Contens of editfield "Target" modified
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 97aa974..e90ba14 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -28,8 +28,6 @@
#ifndef _SVX_TABBASE_HYPERLINK_HXX
#define _SVX_TABBASE_HYPERLINK_HXX
-#define INET_TELNET_SCHEME "telnet://"
-
#include <sfx2/app.hxx>
#include <sfx2/tabdlg.hxx>
#include <vcl/group.hxx>
More information about the Libreoffice-commits
mailing list