diff options
| -rw-r--r-- | sw/inc/shellres.hxx | 3 | ||||
| -rw-r--r-- | sw/source/core/draw/dpage.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/docvw/SidebarTxtControl.cxx | 6 | ||||
| -rw-r--r-- | sw/source/ui/docvw/edtwin2.cxx | 8 | ||||
| -rw-r--r-- | sw/source/ui/utlui/initui.cxx | 5 | ||||
| -rw-r--r-- | sw/source/ui/utlui/initui.hrc | 7 | ||||
| -rw-r--r-- | sw/source/ui/utlui/initui.src | 9 |
7 files changed, 25 insertions, 19 deletions
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx index 85d5d95b7971..0538045b6ebe 100644 --- a/sw/inc/shellres.hxx +++ b/sw/inc/shellres.hxx @@ -64,7 +64,8 @@ struct SW_DLLPUBLIC ShellResource : public Resource OUString aTOXTablesName; OUString aTOXAuthoritiesName; - OUString aHyperlinkClick; + OUString aLinkCtrlClick; + OUString aLinkClick; std::vector<OUString> aDocInfoLst; diff --git a/sw/source/core/draw/dpage.cxx b/sw/source/core/draw/dpage.cxx index 9f18b52f45f4..5e73e87e7650 100644 --- a/sw/source/core/draw/dpage.cxx +++ b/sw/source/core/draw/dpage.cxx @@ -182,9 +182,9 @@ sal_Bool SwDPage::RequestHelp( Window* pWindow, SdrView* pView, bExecHyperlinks = !aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK ); if ( !bExecHyperlinks ) - { - sTxt = ViewShell::GetShellRes()->aHyperlinkClick + ": " + sTxt; - } + sTxt = ViewShell::GetShellRes()->aLinkCtrlClick + ": " + sTxt; + else + sTxt = ViewShell::GetShellRes()->aLinkClick + ": " + sTxt; } diff --git a/sw/source/ui/docvw/SidebarTxtControl.cxx b/sw/source/ui/docvw/SidebarTxtControl.cxx index ffed69a12354..27bc2462eed5 100644 --- a/sw/source/ui/docvw/SidebarTxtControl.cxx +++ b/sw/source/ui/docvw/SidebarTxtControl.cxx @@ -241,9 +241,9 @@ void SidebarTxtControl::MouseMove( const MouseEvent& rMEvt ) OUString sURL( pURL->GetURL() ); SvtSecurityOptions aSecOpts; if ( aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK) ) - { - sURL = ViewShell::GetShellRes()->aHyperlinkClick + ": " + sURL; - } + sURL = ViewShell::GetShellRes()->aLinkCtrlClick + ": " + sURL; + else + sURL = ViewShell::GetShellRes()->aLinkClick + ": " + sURL; Help::ShowQuickHelp( this,PixelToLogic(Rectangle(GetPosPixel(),Size(50,10))),sURL); } } diff --git a/sw/source/ui/docvw/edtwin2.cxx b/sw/source/ui/docvw/edtwin2.cxx index b6e7d23e194b..879d1aff0a04 100644 --- a/sw/source/ui/docvw/edtwin2.cxx +++ b/sw/source/ui/docvw/edtwin2.cxx @@ -217,11 +217,11 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt) SvtSecurityOptions aSecOpts; bExecHyperlinks = !aSecOpts.IsOptionSet( SvtSecurityOptions::E_CTRLCLICK_HYPERLINK ); + sTxt = ": " + sTxt; if ( !bExecHyperlinks ) - { - sTxt = ": " + sTxt; - sTxt = ViewShell::GetShellRes()->aHyperlinkClick + sTxt; - } + sTxt = ViewShell::GetShellRes()->aLinkCtrlClick + sTxt; + else + sTxt = ViewShell::GetShellRes()->aLinkClick + sTxt; } break; } diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx index d3f3f9697d01..78312ff0a9b5 100644 --- a/sw/source/ui/utlui/initui.cxx +++ b/sw/source/ui/utlui/initui.cxx @@ -204,7 +204,8 @@ ShellResource::ShellResource() aTOXObjectsName( SW_RES(STR_TOX_OBJ)), aTOXTablesName( SW_RES(STR_TOX_TBL)), aTOXAuthoritiesName( SW_RES(STR_TOX_AUTH)), - aHyperlinkClick(SW_RESSTR(STR_HYPERLINK_CLICK)), + aLinkCtrlClick(SW_RESSTR(STR_LINK_CTRL_CLICK)), + aLinkClick(SW_RESSTR(STR_LINK_CLICK)), pAutoFmtNameLst(0), sPageDescFirstName( SW_RES(STR_PAGEDESC_FIRSTNAME)), sPageDescFollowName( SW_RES(STR_PAGEDESC_FOLLOWNAME)), @@ -217,7 +218,7 @@ ShellResource::ShellResource() OUString aModStr( aModifiedCode.GetName() ); aModStr = aModStr.replaceFirst(aCode.GetName(), OUString()); aModStr = aModStr.replaceAll("+", OUString()); - aHyperlinkClick = aHyperlinkClick.replaceAll("%s", aModStr); + aLinkCtrlClick = aLinkCtrlClick.replaceAll("%s", aModStr); for(sal_uInt16 i = 0; i < nCount; ++i) aDocInfoLst.push_back(OUString(SW_RESSTR(FLD_DOCINFO_BEGIN + i))); diff --git a/sw/source/ui/utlui/initui.hrc b/sw/source/ui/utlui/initui.hrc index 902ca3bd8f39..6df29075cf65 100644 --- a/sw/source/ui/utlui/initui.hrc +++ b/sw/source/ui/utlui/initui.hrc @@ -48,9 +48,10 @@ #define STR_PAGEDESC_NAME 25 #define STR_PAGEDESC_FIRSTNAME 26 #define STR_PAGEDESC_FOLLOWNAME 27 -#define STR_HYPERLINK_CLICK 28 -#define STR_GETREFFLD_REFITEMNOTFOUND 29 -#define STR_DURATION_FORMAT 30 +#define STR_LINK_CTRL_CLICK 28 +#define STR_LINK_CLICK 29 +#define STR_GETREFFLD_REFITEMNOTFOUND 30 +#define STR_DURATION_FORMAT 31 #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/utlui/initui.src b/sw/source/ui/utlui/initui.src index e2fdbffac7b2..c1663fe5dcfa 100644 --- a/sw/source/ui/utlui/initui.src +++ b/sw/source/ui/utlui/initui.src @@ -133,11 +133,14 @@ Resource RID_SW_SHELLRES { Text [ en-US ] = "Illustration Index"; }; - String STR_HYPERLINK_CLICK + String STR_LINK_CTRL_CLICK { - Text [ en-US ] = "%s-click to open hyperlink"; + Text [ en-US ] = "%s-Click to follow link"; + }; + String STR_LINK_CLICK + { + Text [ en-US ] = "Click to follow link"; }; - // SubType DocInfo // |