[Libreoffice-commits] core.git: 3 commits - sw/inc sw/source sysui/desktop

Caolán McNamara caolanm at redhat.com
Thu Oct 24 02:43:23 PDT 2013


 sw/inc/shellres.hxx                      |    3 ++-
 sw/source/core/draw/dpage.cxx            |    6 +++---
 sw/source/ui/docvw/SidebarTxtControl.cxx |    6 +++---
 sw/source/ui/docvw/edtwin.cxx            |    2 +-
 sw/source/ui/docvw/edtwin2.cxx           |    8 ++++----
 sw/source/ui/utlui/initui.cxx            |    5 +++--
 sw/source/ui/utlui/initui.hrc            |    7 ++++---
 sw/source/ui/utlui/initui.src            |    9 ++++++---
 sysui/desktop/menus/base.desktop         |    2 +-
 sysui/desktop/menus/calc.desktop         |    2 +-
 sysui/desktop/menus/draw.desktop         |    2 +-
 sysui/desktop/menus/impress.desktop      |    2 +-
 sysui/desktop/menus/math.desktop         |    2 +-
 sysui/desktop/menus/writer.desktop       |    2 +-
 14 files changed, 32 insertions(+), 26 deletions(-)

New commits:
commit f3167bd7d33fbc1e93f0728ab06b6d67fc1956bd
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 24 10:34:13 2013 +0100

    Related: fdo#70571 say [ctrl+]click to follow link
    
    as opposed to "hyperlink". Be more generic and consistent
    across both ctrl+click and click modes.
    
    Change-Id: I673ed59fc9f3408a0c4534c6490d9bbc3598bc08

diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 85d5d95..0538045 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 9f18b52..5e73e87 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 ffed69a..27bc246 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 b6e7d23..879d1af 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 d3f3f96..78312ff 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 902ca3b..6df2907 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 e2fdbff..c1663fe 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
      //
commit ef16fa914bc33b64bafb67637e6983ddc310c415
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 24 10:23:44 2013 +0100

    replace libreoffice with UNIXBASISROOTNAME
    
    Change-Id: Idf0fee94ef2c360ce509b34a2828022a8daf04d0

diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 848e110..2f3005c 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -35,5 +35,5 @@ StartupWMClass=libreoffice-base
 X-KDE-Protocols=file,http,smb,ftp,webdav
 [X-New Shortcut Group]
 UnityQuicklist=New Database
-Exec=libreoffice --base %%FILE%%
+Exec=${UNIXBASISROOTNAME} --base %%FILE%%
 TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index bbea04e..1c3f955 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -35,5 +35,5 @@ StartupWMClass=libreoffice-calc
 X-KDE-Protocols=file,http,smb,ftp,webdav
 [X-New Shortcut Group]
 UnityQuicklist=New Spreadsheet
-Exec=libreoffice --calc %%FILE%%
+Exec=${UNIXBASISROOTNAME} --calc %%FILE%%
 TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 4558bf0..9691841 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -35,5 +35,5 @@ StartupWMClass=libreoffice-draw
 X-KDE-Protocols=file,http,smb,ftp,webdav
 [X-New Shortcut Group]
 UnityQuicklist=New Drawing
-Exec=libreoffice --draw %%FILE%%
+Exec=${UNIXBASISROOTNAME} --draw %%FILE%%
 TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop
index fa284d3..082b2f6 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -35,5 +35,5 @@ StartupWMClass=libreoffice-impress
 X-KDE-Protocols=file,http,smb,ftp,webdav
 [X-New Shortcut Group]
 UnityQuicklist=New Presentation
-Exec=libreoffice --impress %%FILE%%
+Exec=${UNIXBASISROOTNAME} --impress %%FILE%%
 TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 6804624..132c5c3 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -36,5 +36,5 @@ StartupWMClass=libreoffice-math
 X-KDE-Protocols=file,http,smb,ftp,webdav
 [X-New Shortcut Group]
 UnityQuicklist=New Formula
-Exec=libreoffice --math %%FILE%%
+Exec=${UNIXBASISROOTNAME} --math %%FILE%%
 TargetEnvironment=Unity
diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop
index 450dbdc..bb32187 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -35,5 +35,5 @@ StartupWMClass=libreoffice-writer
 X-KDE-Protocols=file,http,smb,ftp,webdav
 [X-New Shortcut Group]
 UnityQuicklist=New Document
-Exec=libreoffice --writer %%FILE%%
+Exec=${UNIXBASISROOTNAME} --writer %%FILE%%
 TargetEnvironment=Unity
commit e9ce405103036b2fa0ae26d331a6cfc3465de10b
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 24 10:19:36 2013 +0100

    Resolves: fdo#70571 don't crash when clicking link in toc
    
    when link is in a toc, and Cursor in protected areas is
    disabled, causing the cursor to leap before the toc
    before trying to see what's under the cursor in order
    to jump to it
    
    Change-Id: Iaf348e3621df02628b4d2ac8c1165df7082237ed

diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index b4d38ec..31e4b70 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4506,7 +4506,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
                             }
                             else
                             {
-                                if ( bExecHyperlinks )
+                                if ( bExecHyperlinks && aCntntAtPos.aFnd.pAttr )
                                     rSh.ClickToINetAttr( *(SwFmtINetFmt*)aCntntAtPos.aFnd.pAttr, nFilter );
                             }
 


More information about the Libreoffice-commits mailing list