Hi,
I realise this change contains quite a few patches. Please let me know if there
is a more efficient way of doing this.
I created one patch per git repository as I think you can't have one patch
across repositories (or at least I don't know how to do it).
Happy to make any changes to the patch(es) that would make your life easier.
Cheers,
Alfonso
----- Forwarded Message ----
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
To: LibreOffice List <libreoffice@lists.freedesktop.org>
Sent: Thu, 10 February, 2011 8:38:33
Subject: [PATCH] Remove obsolete Hyperlink Bar - final patches
Hi,
Please find attached a set of patches that remove the Hyperlink Bar from the
core modules.
These changes are made available under LGPLv3+/MPL.
Patches were rebased with origin/master as of yesterday, compiled and tested
before
submission.
With these patches the hyperlink bar option is now missing from the
application's menu.
The code implementing the bar has been removed as well.
I've noticed that you can still find sections of the help system that describe
this option. If you look for "hyperlink" and select "insert" you'll see the text
that describes how to activate the bar.
This text refers to the Hyperlink dialogue (still available through the icon in
the Standard bar) so I think it should be reviewed to describe only that option.
These patches have been created after the set of patches I sent yesterday, which
remove the references to the bar from the apps.
Regards,
Alfonso
From 27d01cd9aadd514074585688a275da214fe0acdd Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:20:15 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar form filters
Removed all hyperlink bar related code from filters.
---
binfilter/bf_sch/source/ui/app/sch_menu.src | 4 ---
binfilter/bf_sfx2/source/appl/sfx2_app.src | 5 ----
binfilter/bf_sw/source/ui/inc/swmn.hrc | 4 ---
binfilter/inc/bf_sfx2/sfxsids.hrc | 1 -
binfilter/inc/bf_svx/globlmn.hrc | 33 ---------------------------
5 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/binfilter/bf_sch/source/ui/app/sch_menu.src
b/binfilter/bf_sch/source/ui/app/sch_menu.src
index 8e823a9..a5f6287 100644
--- a/binfilter/bf_sch/source/ui/app/sch_menu.src
+++ b/binfilter/bf_sch/source/ui/app/sch_menu.src
@@ -486,10 +486,6 @@ Menu RID_MENU
};
MenuItem
{
- ITEM_INSERT_HYPERLINK_INSERT
- };
- MenuItem
- {
Separator = TRUE ;
};
MenuItem
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_app.src b/binfilter/bf_sfx2/source/appl/sfx2_app.src
index a73e37c..17142ed 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_app.src
+++ b/binfilter/bf_sfx2/source/appl/sfx2_app.src
@@ -2196,11 +2196,6 @@ ToolBox RID_ENVTOOLBOX
};
ToolBoxItem
{
- Identifier = SID_HYPERLINK_INSERT ;
- Hide = TRUE;
- };
- ToolBoxItem
- {
Identifier = SID_WIN_FULLSCREEN ;
Hide = TRUE;
};
diff --git a/binfilter/bf_sw/source/ui/inc/swmn.hrc b/binfilter/bf_sw/source/ui/inc/swmn.hrc
index 2b9041c..28a768f 100644
--- a/binfilter/bf_sw/source/ui/inc/swmn.hrc
+++ b/binfilter/bf_sw/source/ui/inc/swmn.hrc
@@ -4505,10 +4505,6 @@ MenuItem _MN_VIEW
};
MenuItem
{
- ITEM_INSERT_HYPERLINK_INSERT
- };
- MenuItem
- {
Identifier = FN_EDIT_FORMULA ;
HelpID = FN_EDIT_FORMULA ;
Text [ de ] = "~Rechenleiste" ;
diff --git a/binfilter/inc/bf_sfx2/sfxsids.hrc b/binfilter/inc/bf_sfx2/sfxsids.hrc
index a6ae4f5..0119d64 100644
--- a/binfilter/inc/bf_sfx2/sfxsids.hrc
+++ b/binfilter/inc/bf_sfx2/sfxsids.hrc
@@ -1103,7 +1103,6 @@
// SlotIds f"ur Hyperlink-Dialog --------------------------------------------
#define SID_SVX_START (SID_LIB_START + 0)
-#define SID_HYPERLINK_INSERT (SID_SVX_START + 360)
#define SID_HYPERLINK_GETLINK (SID_SVX_START + 361)
#define SID_HYPERLINK_SETLINK (SID_SVX_START + 362)
diff --git a/binfilter/inc/bf_svx/globlmn.hrc b/binfilter/inc/bf_svx/globlmn.hrc
index e20dc57..6edca72 100644
--- a/binfilter/inc/bf_svx/globlmn.hrc
+++ b/binfilter/inc/bf_svx/globlmn.hrc
@@ -3150,39 +3150,6 @@
Text[ he ] = "â®×¡××רâ¬";\
-#define ITEM_INSERT_HYPERLINK_INSERT \
- Identifier = SID_HYPERLINK_INSERT ; \
- Command = ".uno:InsertHyperlink" ; \
- HelpID = SID_HYPERLINK_INSERT ; \
- Text [ de ] = "H~yperlinkleiste" ; \
- Text [ en-US ] = "~Hyperlink Bar" ; \
- Text [ x-comment ] = " "; \
- Text[ pt ] = "Barra de ~hiperligações";\
- Text[ ru ] = "ÐÐ°Ð½ÐµÐ»Ñ Ð³Ð¸Ð¿ÐµÑÑÑÑлки";\
- Text[ el ] = "ÎÏαμμή Ï
ÏεÏ-~ÏÏνδεÏηÏ";\
- Text[ nl ] = "H~yperlinkbalk";\
- Text[ fr ] = "Barre d'~hyperliens";\
- Text[ es ] = "Barra de h~iperenlaces";\
- Text[ fi ] = "~Hyperlinkkirivi";\
- Text[ ca ] = "Barra d'h~iperenllaços";\
- Text[ it ] = "Barra degli h~yperlink";\
- Text[ cs ] = "Hyperlinkový panel";\
- Text[ sk ] = "~Hyperlinkový panel";\
- Text[ da ] = "H~yperlinklinje";\
- Text[ sv ] = "H~yperlänklist";\
- Text[ pl ] = "Pasek ~hiperÅÄ
czy";\
- Text[ pt-BR ] = "Barra de ~Hiperlinks";\
- Text[ th ] = "à¹à¸à¸à¹~à¸à¸·à¹à¸à¸¡à¹à¸¢à¸à¸«à¸¥à¸²à¸¢à¸¡à¸´à¸à¸´";\
- Text[ ja ] = "ãã¤ãã¼ãªã³ã¯ãã¼(~H)";\
- Text[ ko ] = "íì´í¼ë§í¬ ë구 모ì(~H)";\
- Text[ zh-CN ] = "è¶
é¾æ¥å°åæ (~H)";\
- Text[ zh-TW ] = "è¶
é£çµä½åæ¬(~H)";\
- Text[ tr ] = "Hiperlink çubuÄu";\
- Text[ hi-IN ] = "~हाà¤à¤ªà¤°à¤²à¤¿à¤à¤ पà¤à¥à¤à¥";\
- Text[ ar ] = "شرÙØ· اÙارتباطات اÙتشعبÙØ©";\
- Text[ he ] = "â®×¡×¨×× Hyperlinkâ¬";\
-
-
#define ITEM_INSERT_INSERT_GRAPHIC \
Identifier = SID_INSERT_GRAPHIC ; \
Command = ".uno:InsertGraphic" ; \
--
1.7.1
From f47a8f220607b021d9395f989a3bdf36e57de732 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:21:30 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar from help
Removed all stuff related to hyperlink bar from help.
---
helpcontent2/helpers/help_hid.lst | 1 -
helpcontent2/helpers/hid.lst | 1 -
helpcontent2/helpers/longnames_commands.csv | 1 -
helpcontent2/helpers/uno-commands.csv | 1 -
helpcontent2/helpers/uno_hid.lst | 1 -
helpcontent2/helpers/unocmds.txt | 1 -
helpcontent2/source/text/shared/01/04110000.xhp | 57 -----------------------
helpcontent2/source/text/shared/01/makefile.mk | 1 -
helpcontent2/util/sbasic/makefile.mk | 1 -
helpcontent2/util/scalc/makefile.mk | 1 -
helpcontent2/util/schart/makefile.mk | 1 -
helpcontent2/util/sdatabase/makefile.mk | 1 -
helpcontent2/util/sdraw/makefile.mk | 1 -
helpcontent2/util/simpress/makefile.mk | 1 -
helpcontent2/util/smath/makefile.mk | 1 -
helpcontent2/util/swriter/makefile.mk | 1 -
16 files changed, 0 insertions(+), 72 deletions(-)
delete mode 100644 helpcontent2/source/text/shared/01/04110000.xhp
diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 40b8dce..db2145a 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -5393,7 +5393,6 @@ SID_HORIZONTAL,27035,.uno:MirrorHorz
SID_HTML_MODE,10414,.uno:HtmlMode
SID_HYPERLINK_DIALOG,5678,.uno:HyperlinkDialog
SID_HYPERLINK_GETLINK,10361,.uno:Hyperlink
-SID_HYPERLINK_INSERT,10360,.uno:InsertHyperlink
SID_HYPERLINK_SETLINK,10362,.uno:SetHyperlink
SID_HYPHENATION,27340,.uno:Hyphenation
SID_H_ALIGNCELL,26380,.uno:HorizontalAlignment
diff --git a/helpcontent2/helpers/hid.lst b/helpcontent2/helpers/hid.lst
index 68b0245..965c775 100644
--- a/helpcontent2/helpers/hid.lst
+++ b/helpcontent2/helpers/hid.lst
@@ -5321,7 +5321,6 @@ SID_HORIZONTAL 27035
SID_HTML_MODE 10414
SID_HYPERLINK_DIALOG 5678
SID_HYPERLINK_GETLINK 10361
-SID_HYPERLINK_INSERT 10360
SID_HYPERLINK_SETLINK 10362
SID_HYPHENATION 27340
SID_H_ALIGNCELL 26380
diff --git a/helpcontent2/helpers/longnames_commands.csv
b/helpcontent2/helpers/longnames_commands.csv
index 8ac7a5d..ee2fa46 100644
--- a/helpcontent2/helpers/longnames_commands.csv
+++ b/helpcontent2/helpers/longnames_commands.csv
@@ -1255,7 +1255,6 @@ SID_HORIZONTAL,.uno:MirrorHorz
SID_HTML_MODE,.uno:HtmlMode
SID_HYPERLINK_DIALOG,.uno:HyperlinkDialog
SID_HYPERLINK_GETLINK,.uno:Hyperlink
-SID_HYPERLINK_INSERT,.uno:InsertHyperlink
SID_HYPERLINK_SETLINK,.uno:SetHyperlink
SID_HYPHENATION,.uno:Hyphenation
SID_H_ALIGNCELL,.uno:HorizontalAlignment
diff --git a/helpcontent2/helpers/uno-commands.csv b/helpcontent2/helpers/uno-commands.csv
index 301b1c8..24f4b30 100644
--- a/helpcontent2/helpers/uno-commands.csv
+++ b/helpcontent2/helpers/uno-commands.csv
@@ -955,7 +955,6 @@
.uno:InsertGrids
.uno:InsertHardHyphen
.uno:InsertHeader
-.uno:InsertHyperlink
.uno:InsertHyperlinkDlg
.uno:InsertImage
.uno:InsertImageControl
diff --git a/helpcontent2/helpers/uno_hid.lst b/helpcontent2/helpers/uno_hid.lst
index 8101299..7fdde5c 100644
--- a/helpcontent2/helpers/uno_hid.lst
+++ b/helpcontent2/helpers/uno_hid.lst
@@ -1253,7 +1253,6 @@ SID_HORIZONTAL,27035,.uno:MirrorHorz
SID_HTML_MODE,10414,.uno:HtmlMode
SID_HYPERLINK_DIALOG,5678,.uno:HyperlinkDialog
SID_HYPERLINK_GETLINK,10361,.uno:Hyperlink
-SID_HYPERLINK_INSERT,10360,.uno:InsertHyperlink
SID_HYPERLINK_SETLINK,10362,.uno:SetHyperlink
SID_HYPHENATION,27340,.uno:Hyphenation
SID_H_ALIGNCELL,26380,.uno:HorizontalAlignment
diff --git a/helpcontent2/helpers/unocmds.txt b/helpcontent2/helpers/unocmds.txt
index 00374d0..e6a0a37 100644
--- a/helpcontent2/helpers/unocmds.txt
+++ b/helpcontent2/helpers/unocmds.txt
@@ -568,7 +568,6 @@
.uno:InsertGraphic;shared/01/04140000.xhp
.uno:InsertGraphicRuler;swriter/01/04210000.xhp
.uno:InsertGrids;schart/01/04070000.xhp
-.uno:InsertHyperlink;shared/01/04110000.xhp
.uno:InsertHyperlinkDlg;shared/01/05020400.xhp
.uno:InsertImageControl;sbasic/shared/02/20000000.xhp
.uno:InsertIndexesEntry;swriter/01/04120100.xhp
diff --git a/helpcontent2/source/text/shared/01/04110000.xhp
b/helpcontent2/source/text/shared/01/04110000.xhp
deleted file mode 100644
index 720fdef..0000000
--- a/helpcontent2/source/text/shared/01/04110000.xhp
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0104110000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Hyperlink Bar</title>
-<filename>/text/shared/01/04110000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-24T13:20:42">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="hyperlink">
-<bookmark xml-lang="en-US" branch="hid/SID_HYPERLINK_INSERT" id="bm_id9199631"
localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertHyperlink" id="bm_id3155577" localize="false"/>
-<paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="1" l10n="U" oldref="1"><link
href="text/shared/01/04110000.xhp" name="Hyperlink Bar">Hyperlink Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="U" oldref="2"><ahelp
hid=".uno:InsertHyperlink">Shows or hides the<emph> Hyperlink Bar, </emph>where you can insert and
edit URLs or search the Internet using keywords.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000404.xhp#hyper"/>
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="C"><link
href="text/shared/main0209.xhp" name="Hyperlink bar">Hyperlink bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3093440" xml-lang="en-US" l10n="C"><link
href="text/shared/02/09030000.xhp" name="Inserting hyperlinks">Inserting
hyperlinks</link></paragraph>
-<paragraph role="paragraph" id="par_id3154927" xml-lang="en-US" l10n="C"><link
href="text/shared/00/00000002.xhp#url" name="URL">URL</link></paragraph>
-</section></body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/makefile.mk
b/helpcontent2/source/text/shared/01/makefile.mk
index e3ba673..0ce2092 100644
--- a/helpcontent2/source/text/shared/01/makefile.mk
+++ b/helpcontent2/source/text/shared/01/makefile.mk
@@ -132,7 +132,6 @@ XHPFILES = \
04060100.xhp \
04060200.xhp \
04100000.xhp \
- 04110000.xhp \
04140000.xhp \
04150000.xhp \
04150100.xhp \
diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk
index b79cb6b..47ed9c4 100644
--- a/helpcontent2/util/sbasic/makefile.mk
+++ b/helpcontent2/util/sbasic/makefile.mk
@@ -489,7 +489,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk
index c5d9b0c..30f56b4 100644
--- a/helpcontent2/util/scalc/makefile.mk
+++ b/helpcontent2/util/scalc/makefile.mk
@@ -502,7 +502,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk
index 0eb859a..1021d3c 100644
--- a/helpcontent2/util/schart/makefile.mk
+++ b/helpcontent2/util/schart/makefile.mk
@@ -190,7 +190,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk
index 3af9db8..b4cfd83 100644
--- a/helpcontent2/util/sdatabase/makefile.mk
+++ b/helpcontent2/util/sdatabase/makefile.mk
@@ -188,7 +188,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk
index ea99a87..8b21ec6 100644
--- a/helpcontent2/util/sdraw/makefile.mk
+++ b/helpcontent2/util/sdraw/makefile.mk
@@ -423,7 +423,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk
index e1cb5db..6374a93 100644
--- a/helpcontent2/util/simpress/makefile.mk
+++ b/helpcontent2/util/simpress/makefile.mk
@@ -425,7 +425,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk
index de5ede8..1a4527d 100644
--- a/helpcontent2/util/smath/makefile.mk
+++ b/helpcontent2/util/smath/makefile.mk
@@ -268,7 +268,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk
index 6e89183..adb14cf 100644
--- a/helpcontent2/util/swriter/makefile.mk
+++ b/helpcontent2/util/swriter/makefile.mk
@@ -581,7 +581,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
--
1.7.1
From dc895f1aab9961ba644a6efa37492e3411d2c9e7 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:22:13 +0000
Subject: [PATCH] Remove final elements from Hyperlink Bar from impress_draw
Removed some includes left in impress and draw.
---
sd/source/ui/app/menuportal_tmpl.src | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/sd/source/ui/app/menuportal_tmpl.src b/sd/source/ui/app/menuportal_tmpl.src
index cdc1a70..1ada913 100644
--- a/sd/source/ui/app/menuportal_tmpl.src
+++ b/sd/source/ui/app/menuportal_tmpl.src
@@ -137,7 +137,6 @@ Menu SD_MENU_PORTAL
MI ( ITEM_VIEW_TOGGLEFUNCTIONBAR )
MI ( ITEM_VIEW_TOGGLEOBJECTBAR )
MN_TOGGLETOOLBAR
- MI ( ITEM_INSERT_HYPERLINK_INSERT )
MN_TOGGLEOPTIONBAR
#if SD_MENU_PORTAL == RID_DRAW_PORTALMENU
MN_TOGGLECOMMONTASKBAR
--
1.7.1
From b271c3aec9b47b5a9005a01498c13f1e5c6ce58b Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:23:22 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar from libs-core
Removed all code related to hyperlink bar from libs-core repo.
---
configmgr/qa/unit/data.xcd | 8 -
.../source/uielement/toolbarsmenucontroller.cxx | 2 -
.../org/openoffice/Office/UI/GenericCommands.xcu | 8 -
scripting/workben/bindings/calcmenubar.xml | 1 -
scripting/workben/bindings/drawmenubar.xml | 1 -
scripting/workben/bindings/impressmenubar.xml | 1 -
scripting/workben/bindings/writermenubar.xml | 1 -
sfx2/inc/sfx2/sfxsids.hrc | 1 -
sfx2/sdi/frmslots.sdi | 5 -
sfx2/sdi/sfx.sdi | 27 -
sfx2/source/appl/app.src | 5 -
svx/inc/globlmn_tmpl.hrc | 7 -
svx/inc/svx/svxids.hrc | 1 -
svx/prj/d.lst | 1 -
svx/source/dialog/hyprdlg.hxx | 141 ---
svx/source/dialog/hyprlink.cxx | 947 --------------------
svx/source/dialog/hyprlink.hrc | 58 --
svx/source/dialog/hyprlink.hxx | 45 -
svx/source/dialog/hyprlink.src | 167 ----
svx/source/dialog/makefile.mk | 2 -
20 files changed, 0 insertions(+), 1429 deletions(-)
delete mode 100644 svx/source/dialog/hyprdlg.hxx
delete mode 100644 svx/source/dialog/hyprlink.cxx
delete mode 100644 svx/source/dialog/hyprlink.hrc
delete mode 100644 svx/source/dialog/hyprlink.hxx
delete mode 100644 svx/source/dialog/hyprlink.src
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index 506a829..027aa59 100644
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -3475,14 +3475,6 @@
<value xml:lang="x-no-translate"></value><value xml:lang="en-US">To Document
Begin</value>
</prop>
</node>
- <node oor:name=".uno:InsertHyperlink" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Hyperlink Bar</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:GoToEndOfRow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="x-no-translate"></value><value xml:lang="en-US">To Document End</value>
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx
b/framework/source/uielement/toolbarsmenucontroller.cxx
index 3bca816..3aa25e7 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -94,7 +94,6 @@ using namespace ::com::sun::star::ui;
static const char CONFIGURE_TOOLBARS_CMD[] = "ConfigureDialog";
static const char CONFIGURE_TOOLBARS[] = ".uno:ConfigureDialog";
static const char CMD_COLORBAR[] = ".uno:ColorControl";
-static const char CMD_HYPERLINKBAR[] = ".uno:InsertHyperlink";
static const char CMD_FORMULABAR[] = ".uno:InsertFormula";
static const char CMD_INPUTLINEBAR[] = ".uno:InputLineVisible";
static const char CMD_RESTOREVISIBILITY[] = ".cmd:RestoreVisibility";
@@ -506,7 +505,6 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.presentation.PresentationDocument" ) ) ||
m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.sheet.SpreadsheetDocument" ) ))
{
- addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR
)), 10360, aEmptyString );
if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.drawing.DrawingDocument" ) ) ||
m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.presentation.PresentationDocument" ) ))
addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR
)), 10417, aEmptyString );
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 42ca952..281500a 100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3440,14 +3440,6 @@
<value xml:lang="en-US">To Document Begin</value>
</prop>
</node>
- <node oor:name=".uno:InsertHyperlink" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Hyperlink Bar</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:GoToEndOfRow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">To Document End</value>
diff --git a/scripting/workben/bindings/calcmenubar.xml b/scripting/workben/bindings/calcmenubar.xml
index 21f6404..26b884c 100644
--- a/scripting/workben/bindings/calcmenubar.xml
+++ b/scripting/workben/bindings/calcmenubar.xml
@@ -112,7 +112,6 @@
<menu:menuitem menu:id="slot:5910" menu:helpid="5910" menu:label="~Function Bar"/>
<menu:menuitem menu:id="slot:5905" menu:helpid="5905" menu:label="~Object Bar"/>
<menu:menuitem menu:id="slot:5909" menu:helpid="5909" menu:label="Main ~Toolbar"/>
- <menu:menuitem menu:id="slot:10360" menu:helpid="10360" menu:label="~Hyperlink Bar"/>
<menu:menuitem menu:id="slot:26241" menu:helpid="26241" menu:label="For~mula Bar"/>
<menu:menuseparator/>
<menu:menuitem menu:id="slot:5908" menu:helpid="5908" menu:label="Customi~ze..."/>
diff --git a/scripting/workben/bindings/drawmenubar.xml b/scripting/workben/bindings/drawmenubar.xml
index c1c644f..2fbfe54 100644
--- a/scripting/workben/bindings/drawmenubar.xml
+++ b/scripting/workben/bindings/drawmenubar.xml
@@ -87,7 +87,6 @@
<menu:menuitem menu:id="slot:5910" menu:helpid="5910" menu:label="~Function Bar"/>
<menu:menuitem menu:id="slot:5905" menu:helpid="5905" menu:label="~Object Bar"/>
<menu:menuitem menu:id="slot:5909" menu:helpid="5909" menu:label="Main ~Toolbar"/>
- <menu:menuitem menu:id="slot:10360" menu:helpid="10360" menu:label="~Hyperlink Bar"/>
<menu:menuitem menu:id="slot:5911" menu:helpid="5911" menu:label="Optio~n Bar"/>
<menu:menuitem menu:id="slot:10417" menu:helpid="10417" menu:label="~Color Bar"/>
<menu:menuseparator/>
diff --git a/scripting/workben/bindings/impressmenubar.xml
b/scripting/workben/bindings/impressmenubar.xml
index ec51390..627fd16 100644
--- a/scripting/workben/bindings/impressmenubar.xml
+++ b/scripting/workben/bindings/impressmenubar.xml
@@ -86,7 +86,6 @@
<menu:menuitem menu:id="slot:5910" menu:helpid="5910" menu:label="~Function Bar"/>
<menu:menuitem menu:id="slot:5905" menu:helpid="5905" menu:label="~Object Bar"/>
<menu:menuitem menu:id="slot:5909" menu:helpid="5909" menu:label="Main ~Toolbar"/>
- <menu:menuitem menu:id="slot:10360" menu:helpid="10360" menu:label="~Hyperlink Bar"/>
<menu:menuitem menu:id="slot:5911" menu:helpid="5911" menu:label="Optio~n Bar"/>
<menu:menuitem menu:id="slot:5928" menu:helpid="5928" menu:label="~Presentation"/>
<menu:menuitem menu:id="slot:10417" menu:helpid="10417" menu:label="~Color Bar"/>
diff --git a/scripting/workben/bindings/writermenubar.xml
b/scripting/workben/bindings/writermenubar.xml
index 0865204..d2d6d88 100644
--- a/scripting/workben/bindings/writermenubar.xml
+++ b/scripting/workben/bindings/writermenubar.xml
@@ -104,7 +104,6 @@
<menu:menuitem menu:id="slot:5910" menu:helpid="5910" menu:label="~Function Bar"/>
<menu:menuitem menu:id="slot:5905" menu:helpid="5905" menu:label="~Object Bar"/>
<menu:menuitem menu:id="slot:5909" menu:helpid="5909" menu:label="Main ~Toolbar"/>
- <menu:menuitem menu:id="slot:10360" menu:helpid="10360" menu:label="~Hyperlink Bar"/>
<menu:menuitem menu:id="slot:20128" menu:helpid="20128" menu:label="Fo~rmula Bar"/>
<menu:menuseparator/>
<menu:menuitem menu:id="slot:5908" menu:helpid="5908" menu:label="Customi~ze..."/>
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index c823aaa..b69d251 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -873,7 +873,6 @@
#define SID_ZOOM (SID_SVX_START + 289)
#define SID_SEARCH_ITEM (SID_SVX_START + 291)
#define SID_ATTR_CHAR_FONTWIDTH (SID_SVX_START + 303)
-#define SID_HYPERLINK_INSERT (SID_SVX_START + 360)
#define SID_HYPERLINK_GETLINK (SID_SVX_START + 361)
#define SID_HYPERLINK_SETLINK (SID_SVX_START + 362)
#define SID_NAVIGATOR (SID_SVX_START + 366)
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index e58d95e..7f66212 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -30,11 +30,6 @@ interface Window
Automation = FALSE ;
]
{
- SID_HYPERLINK_INSERT
- [
- ExecMethod = ChildWindowExecute ;
- StateMethod = ChildWindowState ;
- ]
SID_HYPERLINK_DIALOG
[
ExecMethod = ChildWindowExecute ;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 7e9b5cc..bce76f2 100755
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -2953,33 +2953,6 @@ SfxBoolItem InsertDoc SID_INSERTDOC
]
//--------------------------------------------------------------------------
-SfxBoolItem InsertHyperlink SID_HYPERLINK_INSERT
-
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
SfxVoidItem InsertObjectFloatingFrame SID_INSERT_FLOATINGFRAME
(
SfxStringItem Name FN_PARAM_1,
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index ac05749..9e6b9d0 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -748,11 +748,6 @@ ToolBox RID_ENVTOOLBOX
};
ToolBoxItem
{
- Identifier = SID_HYPERLINK_INSERT ;
- Hide = TRUE;
- };
- ToolBoxItem
- {
Identifier = SID_WIN_FULLSCREEN ;
Hide = TRUE;
};
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index d76a647..6d4309e 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -606,14 +606,7 @@
Command = ".uno:Beamer" ; \
HelpID = SID_BROWSER ; \
Text [ en-US ] = "~Beamer" ; \
-
-#define ITEM_INSERT_HYPERLINK_INSERT \
- Identifier = SID_HYPERLINK_INSERT ; \
- Command = ".uno:InsertHyperlink" ; \
- HelpID = SID_HYPERLINK_INSERT ; \
- Text [ en-US ] = "~Hyperlink Bar" ; \
-
#define ITEM_INSERT_INSERT_GRAPHIC \
Identifier = SID_INSERT_GRAPHIC ; \
Command = ".uno:InsertGraphic" ; \
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 82e8a2f..01323c3 100755
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -701,7 +701,6 @@
#define SID_BMPMASK_PIPETTE ( SID_SVX_START + 351 )
#define SID_BMPMASK_BMPSELECT ( SID_SVX_START + 352 )
#define SID_BMPMASK_EXEC ( SID_SVX_START + 353 )
-//#define SID_HYPERLINK_INSERT ( SID_SVX_START + 360 ) -> sfxsids.hrc
//#define SID_HYPERLINK_GETLINK ( SID_SVX_START + 361 ) -> sfxsids.hrc
//#define SID_HYPERLINK_SETLINK ( SID_SVX_START + 362 ) -> sfxsids.hrc
#define SID_NO_GRAPHICS ( SID_SVX_START + 364 )
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index d79e421..3d6092f 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -32,7 +32,6 @@ mkdir: %_DEST%\inc%_EXT%\svx
..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx
..\%__SRC%\inc\globlmn.hrc %_DEST%\inc%_EXT%\svx\globlmn.hrc
..\source\inc\fmresids.hrc %_DEST%\inc%_EXT%\svx\fmresids.hrc
-..\source\dialog\hyprlink.hxx %_DEST%\inc%_EXT%\svx\hyprlink.hxx
../source/customshapes/EnhancedCustomShapeTypeNames.hxx
%_DEST%\inc%_EXT%\svx\EnhancedCustomShapeTypeNames.hxx
../source/customshapes/EnhancedCustomShapeGeometry.hxx
%_DEST%\inc%_EXT%\svx\EnhancedCustomShapeGeometry.hxx
diff --git a/svx/source/dialog/hyprdlg.hxx b/svx/source/dialog/hyprdlg.hxx
deleted file mode 100644
index d0db4fc..0000000
--- a/svx/source/dialog/hyprdlg.hxx
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_DLG_HYPERDLG_HXX
-#define _SVX_DLG_HYPERDLG_HXX
-
-#include <vcl/combobox.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/menu.hxx>
-#include <svtools/stdctrl.hxx>
-#include <sfx2/ctrlitem.hxx>
-#include <svl/srchcfg.hxx>
-#include <sfx2/tbxctrl.hxx>
-
-class SvxHyperlinkDlg;
-class SfxViewFrame;
-
-class HyperCombo : public ComboBox
-{
- SvxHyperlinkDlg *pDlg;
- long nMaxWidth;
- long nMinWidth;
- long nRatio;
-
- virtual long Notify( NotifyEvent& rNEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
-
-public:
- HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId );
-
- inline void SetRatio( long nR ) { nRatio = nR; }
- inline long GetRatio() { return nRatio; }
- long CalcResizeWidth( long nW );
- inline long GetResizeWidth() { return (nMaxWidth - nMinWidth); }
- void DoResize( long nW );
-};
-
-class HyperFixedText : public FixedInfo
-{
- SvxHyperlinkDlg *pDlg;
-
-public:
- HyperFixedText( SvxHyperlinkDlg* pDialog, const ResId& rResId );
-
-};
-
-/*--------------------------------------------------------------------
- Beschreibung: Dialog zum Einfgen/ndern eines Hyperlink
- --------------------------------------------------------------------*/
-
-class SvxHyperlinkDlg : public ToolBox, public SfxControllerItem
-{
- friend class HyperCombo;
- friend class HyperFixedText;
- using ToolBox::StateChanged;
-
-private:
- SfxStatusForwarder aForwarder;
- SfxStatusForwarder aHyperlinkDlgForward;
- HyperCombo aNameCB;
- HyperFixedText aUrlFT;
- HyperCombo aUrlCB;
-
- SvxSearchConfig aSearchConfig;
-
- String sAddress;
- String sExplorer;
- String sOldName;
- String sSearchTitle;
- PopupMenu aLinkPopup;
- PopupMenu *pTargetMenu;
- BOOL bNoDoc;
- BOOL bSend;
- BOOL bHasOldName;
- long nMaxWidth;
- long nMinWidth;
- long nMaxHeight;
- BOOL bHtmlMode;
-
- SfxImageManager* mpManager;
-
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
-
- // DockingWindow
- virtual void Resize();
- virtual void Resizing(Size& rSize);
-
- // Drag&Drop
- BOOL GetDragData(USHORT nItem, ULONG nDDFormatId, String& rBuffer);
-
- DECL_LINK(TBClickHdl, ToolBox *);
- DECL_LINK(TBSelectHdl, ToolBox *);
- DECL_LINK(DropdownClick, ToolBox * );
- DECL_LINK(LinkPopupSelectHdl, Menu *);
- DECL_LINK(SearchPopupSelectHdl, Menu *);
- DECL_LINK(ComboSelectHdl, ComboBox *);
- DECL_LINK(ComboModifyHdl, ComboBox *);
- DECL_LINK(BookmarkFoundHdl, String *);
-
- void OpenDoc( const String& rURL, SfxViewFrame* pViewFrame );
- void EnableLink();
- void SendToApp(USHORT nType);
- void AddToHistory(const String& rName, const String& rURL);
- void TargetMenu(const String& rSelEntry, BOOL bExecute);
- String GetSelTarget();
-
- void SetImages();
-public:
- SvxHyperlinkDlg(SfxBindings *pBindings, Window* pWindow);
- ~SvxHyperlinkDlg();
-};
-
-
-#endif // _SVX_DLG_HYPERDLG_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
deleted file mode 100644
index bd66b25..0000000
--- a/svx/source/dialog/hyprlink.cxx
+++ /dev/null
@@ -1,947 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <tools/urlobj.hxx>
-#include <vcl/msgbox.hxx>
-#include <unotools/configitem.hxx>
-#include <unotools/cmdoptions.hxx>
-#include <svtools/inetimg.hxx>
-#include <svl/urlbmk.hxx>
-#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/imgmgr.hxx>
-#include <sfx2/dispatch.hxx>
-#include <svl/urihelper.hxx>
-#include <sfx2/objsh.hxx>
-#include <comphelper/processfactory.hxx>
-
-#include "hlnkitem.hxx"
-#include <svx/dialogs.hrc>
-#include "hyprlink.hrc"
-#include <svx/dialmgr.hxx>
-#include "hyprlink.hxx"
-#include "hyprdlg.hxx"
-
-using namespace ::rtl;
-using namespace ::com::sun::star;
-
-// -----------------------------------------------------------------------
-
-class SearchDefaultConfigItem_Impl : public ::utl::ConfigItem
-{
- OUString sDefaultEngine;
-public:
- SearchDefaultConfigItem_Impl();
- ~SearchDefaultConfigItem_Impl();
-
- const OUString& GetDefaultSearchEngine(){ return sDefaultEngine;}
- virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >&
aPropertyNames );
- virtual void Commit();
-};
-
-SearchDefaultConfigItem_Impl::SearchDefaultConfigItem_Impl() :
- ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Inet/DefaultSearchEngine")))
-{
- uno::Sequence<OUString> aNames(1);
- aNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
- uno::Sequence< uno::Any > aValues = GetProperties(aNames);
- aValues.getConstArray()[0] >>= sDefaultEngine;
-}
-
-SearchDefaultConfigItem_Impl::~SearchDefaultConfigItem_Impl()
-{
-}
-
-void SearchDefaultConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
-{
-}
-
-void SearchDefaultConfigItem_Impl::Commit()
-{
-}
-
-/*************************************************************************
-|*
-|* Dialog zum Einf"ugen/"Andern eines Hyperlink
-|*
-\************************************************************************/
-
-SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) :
-
- ToolBox ( pParent, SVX_RES( RID_SVXDLG_HYPERLINK ) ),
- SfxControllerItem ( SID_HYPERLINK_SETLINK, *_pBindings ),
-
- aForwarder ( SID_HYPERLINK_GETLINK, *this ),
- aHyperlinkDlgForward( SID_HYPERLINK_DIALOG , *this),
-
- aNameCB ( this, SVX_RES( CB_NAME ) ),
- aUrlFT ( this, SVX_RES( FT_URL ) ),
- aUrlCB ( this, SVX_RES( CB_URL ) ),
- aSearchConfig (sal_True),
- sAddress ( SVX_RES( STR_ADDRESS ) ),
- sExplorer ( SVX_RES( STR_EXPLORER ) ),
- sSearchTitle ( SVX_RES( STR_BOOKMARK_SEARCH ) ),
- aLinkPopup ( SVX_RES( RID_SVXMN_HYPERLINK ) ),
- pTargetMenu ( NULL ),
-
- bNoDoc ( TRUE ),
- bSend ( FALSE ),
- bHasOldName ( FALSE ),
- bHtmlMode ( FALSE )
-
-{
- FreeResource();
-
- mpManager = SfxImageManager::GetImageManager( 0 );
- mpManager->RegisterToolBox( this );
-
- SetImages();
-
- // save initial size
- nMaxWidth = GetSizePixel().Width();
- nMaxHeight = GetSizePixel().Height();
-
-
- InsertSeparator( 0 );
- InsertWindow( CB_URL, &aUrlCB, 0, 0 );
- // we need an item text for accessibility
- String sItemText = aUrlCB.GetText();
- if ( sItemText.Len() == 0 )
- sItemText = aUrlCB.GetQuickHelpText();
- if ( sItemText.Len() > 0 )
- {
- SetItemText( CB_URL, sItemText );
- sItemText.Erase();
- }
- InsertWindow( FT_URL, &aUrlFT, 0, 0 );
- InsertSeparator( 0 );
- InsertWindow( CB_NAME, &aNameCB, 0, 0 );
- sItemText = aNameCB.GetText();
- if ( sItemText.Len() == 0 )
- sItemText = aNameCB.GetQuickHelpText();
- if ( sItemText.Len() > 0 )
- SetItemText( CB_NAME, sItemText );
-
- SetSizePixel(CalcWindowSizePixel()); // Groesse initialisieren
-
- nMaxHeight = GetSizePixel().Height(); // Hoehe nochmal merken, da sie veraendert wurde
- // SetSizePixel ruft Resize-Handler!
-
- Show();
- Resize();
-
- long nUrlWidth = aUrlCB.GetResizeWidth();
- long nNameWidth = aNameCB.GetResizeWidth();
- long nSum = nUrlWidth + nNameWidth;
-
- aUrlCB.SetRatio((nUrlWidth * 100L) / nSum);
- aNameCB.SetRatio((nNameWidth * 100L) / nSum);
-
- SetClickHdl( LINK( this, SvxHyperlinkDlg, TBClickHdl ) );
- SetSelectHdl( LINK( this, SvxHyperlinkDlg, TBSelectHdl ) );
- SetDropdownClickHdl( LINK( this, SvxHyperlinkDlg, DropdownClick ) );
-
- SetItemBits( BTN_TARGET, GetItemBits( BTN_TARGET ) | TIB_DROPDOWNONLY );
- SetItemBits( BTN_INET_SEARCH, GetItemBits( BTN_INET_SEARCH ) | TIB_DROPDOWN );
- SetItemBits( BTN_INET_SEARCH, GetItemBits( BTN_TARGET ) | TIB_DROPDOWNONLY );
-
- aLinkPopup.SetSelectHdl(LINK(this, SvxHyperlinkDlg, LinkPopupSelectHdl));
-
- Link aLk = LINK(this, SvxHyperlinkDlg, ComboSelectHdl);
- aNameCB.SetSelectHdl(aLk);
- aUrlCB.SetSelectHdl(aLk);
-
- aLk = LINK(this, SvxHyperlinkDlg, ComboModifyHdl);
- aNameCB.SetModifyHdl(aLk);
- aUrlCB.SetModifyHdl(aLk);
-
- // Accessibility: Set the quick help text as accessible name for the
- // drop down lists.
- aNameCB.SetAccessibleName (aNameCB.GetQuickHelpText());
- aUrlCB.SetAccessibleName (aUrlCB.GetQuickHelpText());
-
- // Hide button according to config item.
- SvtCommandOptions aCmdOpts;
- if ( aCmdOpts.Lookup( SvtCommandOptions::CMDOPTION_DISABLED,
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "InternetSearch" ) ) ) )
- HideItem( BTN_INET_SEARCH );
-}
-
-SvxHyperlinkDlg::~SvxHyperlinkDlg()
-{
- SfxImageManager::GetImageManager( 0 )->ReleaseToolBox(this);
-
- if (pTargetMenu != NULL)
- delete pTargetMenu;
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Leiste so resizen, dass die Comboboxen automatisch mit
- verkleinert werden
- --------------------------------------------------------------------*/
-
-void SvxHyperlinkDlg::Resize()
-{
- long nWidth = GetSizePixel().Width();
-
- ToolBox::Resize();
-
- if (nWidth) // nWidth ist manchmal 0
- {
- long nDeltaW = nMaxWidth - nWidth + aUrlCB.LogicToPixel(Size(3, 1)).Width() + 1;
-
- long nNewUrlWidth = aUrlCB.CalcResizeWidth(nDeltaW);
- long nNewNameWidth = aNameCB.CalcResizeWidth(nDeltaW);
-
- if (nNewUrlWidth && nNewNameWidth) // Flackern reduzieren
- {
- SetUpdateMode(FALSE);
-
- // Comboboxen resizen
- aUrlCB.DoResize(nNewUrlWidth);
- aNameCB.DoResize(nNewNameWidth);
- RecalcItems(); // Alle Elemente neu anordnen
-
- SetUpdateMode(TRUE);
- }
- }
-}
-
-void SvxHyperlinkDlg::Resizing(Size& rSize)
-{
- if (rSize.Height() > nMaxHeight)
- rSize.Height() = nMaxHeight;
-
- if (rSize.Width() > nMaxWidth)
- rSize.Width() = nMaxWidth;
-
- ToolBox::Resizing(rSize);
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Im Dokument selektierten Hyperlink in Leiste anzeigen
- --------------------------------------------------------------------*/
-
-void SvxHyperlinkDlg::StateChanged( USHORT nSID, SfxItemState eState,
- const SfxPoolItem* pState )
-{
- if ( nSID == SID_HYPERLINK_DIALOG )
- {
- if( eState != SFX_ITEM_DISABLED)
- {
- EnableItem( BTN_OPENDIALOG, TRUE );
-
- BOOL bItem = FALSE;
- if ( pState && eState == SFX_ITEM_AVAILABLE )
- bItem = ((SfxBoolItem*)pState)->GetValue();
- SetItemState ( BTN_OPENDIALOG, bItem ? STATE_CHECK : STATE_NOCHECK );
- }
- else
- {
- SetItemState ( BTN_OPENDIALOG, STATE_NOCHECK );
- EnableItem( BTN_OPENDIALOG, FALSE );
- }
- }
-
- if (nSID == SID_HYPERLINK_SETLINK)
- {
- if (eState == SFX_ITEM_DISABLED)
- bNoDoc = TRUE;
- else
- bNoDoc = FALSE;
- EnableItem(BTN_TARGET, !bNoDoc);
- EnableLink();
- }
-
- if (nSID == SID_HYPERLINK_GETLINK)
- {
- if (eState == SFX_ITEM_AVAILABLE)
- {
- const SvxHyperlinkItem& rHLnkItem = *((const SvxHyperlinkItem*)pState);
-
- USHORT nNamePos = aNameCB.GetEntryPos(aNameCB.GetText());
- USHORT nUrlPos = aUrlCB.GetEntryPos(aUrlCB.GetText());
- USHORT nNotFound = COMBOBOX_ENTRY_NOTFOUND;
-
- if (!bHasOldName &&
- (nNamePos == nNotFound || nUrlPos == nNotFound))
- {
- sOldName = aNameCB.GetText();
- bHasOldName = TRUE;
- }
- if (rHLnkItem.GetName().Len())
- {
- aNameCB.SetText(rHLnkItem.GetName());
- ComboModifyHdl(&aNameCB);
- }
- if (rHLnkItem.GetURL().Len() || rHLnkItem.GetName().Len())
- {
- String sUrl = INetURLObject(rHLnkItem.GetURL()).GetURLNoPass();
- aUrlCB.SetText(sUrl);
- }
- else if (aUrlCB.GetEntryCount())
- { // Letzten Eintrag wieder selektieren
- aNameCB.SetText(aNameCB.GetEntry(0));
- aUrlCB.SetText(aUrlCB.GetEntry(0));
- }
-
- TargetMenu(rHLnkItem.GetTargetFrame(), FALSE);
- bHtmlMode = (rHLnkItem.GetInsertMode() & HLINK_HTMLMODE) != 0;
- }
- else
- return;
-
- ComboModifyHdl(&aUrlCB);
- }
-}
-
-IMPL_LINK( SvxHyperlinkDlg, TBClickHdl, ToolBox *, pBox )
-{
- switch (pBox->GetCurItemId())
- {
- case BTN_LINK:
- {
- if (!bSend) // Link ins Dokument einfuegen
- SendToApp(HLINK_DEFAULT);
- }
- break;
-
- case BTN_OPENDIALOG:
- {
- GetBindings().GetDispatcher()->Execute( SID_HYPERLINK_DIALOG );
- }
- break;
- }
-
- return TRUE;
-}
-
-IMPL_LINK( SvxHyperlinkDlg, TBSelectHdl, ToolBox *, pBox )
-{
- switch (pBox->GetCurItemId())
- {
- // Link als Bookmark im Explorer eintragen
- // Soll erst im Loslassen der Maus gerufen werden, daher im Select-Hdl
- case BTN_INSERT_BOOKMARK:
- {
- String sName = aNameCB.GetText();
- if ( !sName.Len() )
- sName = aUrlCB.GetText();
-
- String aBase =
GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL();
- SfxStringItem aName( SID_BOOKMARK_TITLE, sName );
- SfxStringItem aURL( SID_BOOKMARK_URL,
- URIHelper::SmartRel2Abs( INetURLObject(aBase), aUrlCB.GetText(),
URIHelper::GetMaybeFileHdl(), true, false,
- INetURLObject::WAS_ENCODED,
- INetURLObject::DECODE_UNAMBIGUOUS ) );
- GetBindings().GetDispatcher()->Execute(
- SID_CREATELINK, SFX_CALLMODE_ASYNCHRON, &aName, &aURL, 0L );
- }
- break;
- }
-
- return TRUE;
-}
-
-IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox )
-{
- switch (pBox->GetCurItemId())
- {
- case BTN_LINK:
- {
- // Link-Popup anstossen
- EndSelection(); // Vor dem Execute, damit Popup den Focus bekommt
- aLinkPopup.EnableItem(MN_BUTTON, !bHtmlMode);
- aLinkPopup.Execute( this, GetItemRect( BTN_LINK ), FLOATWIN_POPUPMODE_DOWN );
- }
- break;
-
- case BTN_INET_SEARCH:
- {
- // Search-Engines per Popup auswaehlen
- PopupMenu *pMenu = new PopupMenu;
- pMenu->SetSelectHdl(LINK(this, SvxHyperlinkDlg, SearchPopupSelectHdl));
- SearchDefaultConfigItem_Impl aDefaultEngine;
- String sDefault(aDefaultEngine.GetDefaultSearchEngine());
- sDefault.ToLowerAscii();
- const bool bHasDefault = sDefault.Len() > 0;
-
- sal_uInt16 nCount = aSearchConfig.Count();
- String sFound;
- for (USHORT i = 0; i < nCount; i++)
- {
- const SvxSearchEngineData& rData = aSearchConfig.GetData(i);
- //check if it's the configured default search engine
- String sTest(rData.sEngineName);
- sTest.ToLowerAscii();
- bool bIsDefaultEngine = bHasDefault && STRING_NOTFOUND != sTest.Search( sDefault );
- //then put it at the top
- if(i && bIsDefaultEngine)
- {
- pMenu->InsertItem( i + 1, rData.sEngineName, 0, 0);
- pMenu->InsertSeparator(1);
- }
- else
- {
- if (i)
- pMenu->InsertSeparator();
- pMenu->InsertItem( i + 1, rData.sEngineName);
- }
- }
- pBox->SetItemDown(BTN_INET_SEARCH, TRUE, TRUE);
- pMenu->Execute( this, GetItemRect( BTN_INET_SEARCH ), FLOATWIN_POPUPMODE_DOWN );
- pBox->SetItemDown(BTN_INET_SEARCH, FALSE, TRUE);
- EndSelection();
- delete pMenu;
- }
- break;
-
- case BTN_TARGET:
- {
- // Target Frame einstellen
- TargetMenu(GetSelTarget(), TRUE);
- EndSelection();
- }
- break;
- }
-
- return TRUE;
-}
-
-void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
-{
- if (pTargetMenu && !bExecute)
- {
- for (USHORT i = 1; i <= pTargetMenu->GetItemCount(); i++)
- {
- if (pTargetMenu->GetItemText(i) == rSelEntry)
- {
- pTargetMenu->CheckItem(i);
- return;
- }
- }
- }
-
- SfxViewFrame* pVwFrm = SfxViewFrame::Current();
-
- if (pVwFrm) // Alle moeglichen Target Frames zusammensammeln und anzeigen
- {
- TargetList aList;
- pVwFrm->GetTopFrame().GetTargetList(aList);
-
- if ( !aList.empty() )
- {
- size_t nCount = aList.size();
- BOOL bChecked = FALSE;
-
- if (pTargetMenu != NULL)
- delete pTargetMenu;
-
- pTargetMenu = new PopupMenu;
- pTargetMenu->SetMenuFlags( pTargetMenu->GetMenuFlags() |
- MENU_FLAG_NOAUTOMNEMONICS );
-
- for ( size_t i = 0; i < nCount; i++ )
- {
- String sEntry( *aList[ i ] );
- pTargetMenu->InsertItem(i + 1, sEntry, MIB_RADIOCHECK|MIB_AUTOCHECK);
-
- if (sEntry == rSelEntry)
- {
- pTargetMenu->CheckItem(i + 1);
- bChecked = TRUE;
- }
- }
- for ( size_t i = nCount; i; )
- delete aList[ --i ];
-
- if (!bChecked)
- pTargetMenu->CheckItem(1);
-
- if (bExecute)
- {
- USHORT nEntry = pTargetMenu->Execute(
- this, GetItemRect( BTN_TARGET ), FLOATWIN_POPUPMODE_DOWN );
- if ( nEntry )
- pTargetMenu->CheckItem( nEntry );
- }
- }
- }
-}
-
-IMPL_LINK( SvxHyperlinkDlg, LinkPopupSelectHdl, Menu *, pMenu )
-{
- switch (pMenu->GetCurItemId())
- {
- case MN_FIELD: // URL als Hyperlink ins Dok einfuegen
- SendToApp(HLINK_FIELD);
- break;
- case MN_BUTTON: // URL als Button ins Dok einfuegen
- SendToApp(HLINK_BUTTON);
- break;
- }
-
- return TRUE;
-}
-
-IMPL_LINK( SvxHyperlinkDlg, SearchPopupSelectHdl, Menu *, pMenu )
-{
- const SvxSearchEngineData& rData = aSearchConfig.GetData(pMenu->GetCurItemId() - 1);
- String sText(aNameCB.GetText());
- sText.EraseLeadingChars().EraseTrailingChars();
-
- rtl::OUString sPrefix;
- rtl::OUString sSuffix;
- rtl::OUString sSeparator;
- sal_Int32 nCaseMatch;
- sal_Unicode cToken = 0;
-
- if (sText.Search(' ') != STRING_NOTFOUND)
- {
- sPrefix = rData.sExactPrefix;
- sSuffix = rData.sExactSuffix;
- sSeparator = rData.sExactSeparator;
- nCaseMatch = rData.nExactCaseMatch;
- cToken = ' ';
- }
- else if (sText.Search('+') != STRING_NOTFOUND)
- {
- sPrefix = rData.sAndPrefix;
- sSuffix = rData.sAndSuffix;
- sSeparator = rData.sAndSeparator;
- nCaseMatch = rData.nAndCaseMatch;
- cToken = '+';
- }
- else if (sText.Search(',') != STRING_NOTFOUND)
- {
- sPrefix = rData.sOrPrefix;
- sSuffix = rData.sOrSuffix;
- sSeparator = rData.sOrSeparator;
- nCaseMatch = rData.nOrCaseMatch;
- cToken = ',';
- }
- else
- {
- sPrefix = rData.sExactPrefix;
- sSuffix = rData.sExactSuffix;
- nCaseMatch = rData.nExactCaseMatch;
- cToken = 0;
- }
-
- String sURL = sPrefix;
- xub_StrLen nTok;
-
- if(1 == nCaseMatch)
- sText.ToUpperAscii();
- else if(2 == nCaseMatch)
- sText.ToLowerAscii();
-
- if ((nTok = sText.GetTokenCount(cToken)) > 1)
- {
- for (USHORT i = 0; i < nTok; i++)
- {
- sURL += sText.GetToken(i, cToken);
- if(i < nTok -1)
- sURL += (String)sSeparator;
- }
- sURL += (String)sSuffix;
- }
- else
- {
- sURL += sText;
- sURL += (String)sSuffix;
- }
- sURL.EraseAllChars(); // remove all spaces
- SfxViewFrame* pViewFrame = SfxViewFrame::Current();
- if ( pViewFrame )
- pViewFrame = pViewFrame->GetTopViewFrame();
- OpenDoc( sURL, pViewFrame );
-
- return TRUE;
-}
-
-IMPL_LINK( SvxHyperlinkDlg, BookmarkFoundHdl, String *, pUrl )
-{
- if (pUrl && pUrl->Len())
- {
- aUrlCB.SetText(*pUrl);
- ComboModifyHdl(&aUrlCB);
- }
-
- return TRUE;
-}
-/*--------------------------------------------------------------------
- Beschreibung: Link-Button enablen/disablen
- --------------------------------------------------------------------*/
-
-void SvxHyperlinkDlg::EnableLink()
-{
- BOOL bEnable = aUrlCB.GetText().Len() != 0;
-
- EnableItem(BTN_LINK, (!bNoDoc) & bEnable);
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: URL im Dokument einfuegen
- --------------------------------------------------------------------*/
-
-void SvxHyperlinkDlg::SendToApp(USHORT nType)
-{
- BOOL bIsFile = FALSE;
- bSend = TRUE;
- String sURL( aUrlCB.GetText() );
-
- if ( !sURL.Len() )
- return;
-
- String aBase =
GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL();
- INetURLObject aObj( URIHelper::SmartRel2Abs( INetURLObject(aBase), sURL,
URIHelper::GetMaybeFileHdl(), true, false,
- INetURLObject::WAS_ENCODED,
- INetURLObject::DECODE_UNAMBIGUOUS ) );
- sURL = aObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( aObj.GetProtocol() == INET_PROT_FILE )
- bIsFile = TRUE;
-
- if ( bIsFile )
- {
- EnterWait();
- SfxMedium aMedium( sURL, STREAM_STD_READ, TRUE );
- if ( aMedium.Exists( FALSE ) == FALSE )
- {
- LeaveWait();
- QueryBox aBox( this, SVX_RES( RID_SVXQB_DONTEXIST ) );
- if ( aBox.Execute() == RET_NO )
- return;
- }
- else
- LeaveWait();
- }
-
- SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK );
-
- if (aNameCB.GetText().Len())
- aItem.SetName( aNameCB.GetText() );
- else
- aItem.SetName( sURL );
-
- sOldName = aNameCB.GetText();
-
- aItem.SetURL(sURL);
- aItem.SetInsertMode( (SvxLinkInsertMode)nType );
- aItem.SetTargetFrame( GetSelTarget() );
-
- GetBindings().GetDispatcher()->Execute(
- SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
-
- AddToHistory( aNameCB.GetText(), sURL );
-
- if ( sURL != aUrlCB.GetText() )
- aUrlCB.SetText( sURL );
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Selektierten Target Frame Eintrag im Popup ermitteln
- --------------------------------------------------------------------*/
-
-String SvxHyperlinkDlg::GetSelTarget()
-{
- String sTarget;
-
- if (pTargetMenu != NULL)
- {
- for (USHORT i = 1; i <= pTargetMenu->GetItemCount(); i++)
- {
- if (pTargetMenu->IsItemChecked(i))
- {
- sTarget = pTargetMenu->GetItemText(i);
- break;
- }
- }
- }
-
- return sTarget;
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: URL in History der Leiste aufnehmen
- --------------------------------------------------------------------*/
-
-void SvxHyperlinkDlg::AddToHistory(const String& rName, const String& rURL)
-{
- String sName(rName);
-
- if (bHasOldName && sOldName.Len())
- {
- sName = sOldName;
- bHasOldName = FALSE;
- }
-
- if (!sName.Len())
- sName = rURL;
-
- if (rURL.Len())
- {
- USHORT nNamePos = aNameCB.GetEntryPos(sName);
- USHORT nUrlPos = aUrlCB.GetEntryPos(rURL);
- USHORT nPos = COMBOBOX_ENTRY_NOTFOUND;
-
- if (nNamePos != COMBOBOX_ENTRY_NOTFOUND)
- nPos = nNamePos;
- else
- nPos = nUrlPos;
-
- // Alten Eintrag durch neuen Eintrag ersetzen
- if (nPos != COMBOBOX_ENTRY_NOTFOUND)
- {
- aNameCB.RemoveEntry(nPos);
- aUrlCB.RemoveEntry(nPos);
- aNameCB.SetText(rName);
- aUrlCB.SetText(rURL);
- }
-
- aNameCB.InsertEntry(sName, 0);
- aUrlCB.InsertEntry(rURL, 0);
- }
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Bookmark und Search-Button enablen/disablen
- --------------------------------------------------------------------*/
-
-IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo )
-{
- USHORT nPos = pCombo->GetEntryPos(pCombo->GetText());
-
- if (nPos != COMBOBOX_ENTRY_NOTFOUND)
- {
- aNameCB.SetText(aNameCB.GetEntry(nPos));
- aUrlCB.SetText(aUrlCB.GetEntry(nPos));
-
- EnableLink();
- EnableItem(BTN_INSERT_BOOKMARK, TRUE);
- EnableItem(BTN_INET_SEARCH, TRUE);
- }
- return TRUE;
-}
-
-IMPL_LINK( SvxHyperlinkDlg, ComboModifyHdl, ComboBox *, pCombo )
-{
- BOOL bEnable = TRUE;
-
- if (!pCombo->GetText().Len())
- bEnable = FALSE;
-
- if (pCombo == &aNameCB)
- {
- if (IsItemEnabled(BTN_INET_SEARCH) != bEnable)
- EnableItem(BTN_INET_SEARCH, bEnable);
- }
-
- EnableLink();
-
- if (aUrlCB.GetText().Len())
- bEnable = TRUE;
- else
- bEnable = FALSE;
-
- if (IsItemEnabled(BTN_INSERT_BOOKMARK) != bEnable)
- EnableItem(BTN_INSERT_BOOKMARK, bEnable);
-
- return TRUE;
-}
-
-// --------------------------------------------------------------------
-
-void SvxHyperlinkDlg::DataChanged( const DataChangedEvent& rDCEvt )
-{
- ToolBox::DataChanged( rDCEvt );
-
- if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE))
- SetImages();
-}
-
-// --------------------------------------------------------------------
-
-void SvxHyperlinkDlg::SetImages()
-{
- SetItemImage( BTN_LINK, mpManager->GetImage( BTN_LINK ) );
- SetItemImage( BTN_INSERT_BOOKMARK, mpManager->GetImage( BTN_INSERT_BOOKMARK ) );
- SetItemImage( BTN_INET_SEARCH, mpManager->GetImage( BTN_INET_SEARCH ) );
- SetItemImage( BTN_TARGET, mpManager->GetImage( BTN_TARGET ) );
- SetItemImage( BTN_OPENDIALOG, mpManager->GetImage( BTN_OPENDIALOG ) );
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Comboboxen
- --------------------------------------------------------------------*/
-
-HyperCombo::HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId ) :
- ComboBox( (Window *)pDialog, rResId )
-{
- nRatio = 0;
- pDlg = pDialog;
-
- nMaxWidth = GetSizePixel().Width();
- if (this == &pDlg->aUrlCB)
- nMinWidth = GetTextWidth(String::CreateFromAscii("http://www.stardiv.dewww";));
- else
- nMinWidth = GetTextWidth(String::CreateFromAscii("StarDivision GmbHwww"));
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Comboboxen KeyInput
- --------------------------------------------------------------------*/
-
-long HyperCombo::Notify( NotifyEvent& rNEvt )
-{
- long nHandled = 0;
- static BOOL bLocked = FALSE;
-
- if (bLocked) // Keine weiteren RETURNs annehmen (nicht Reentrant!)
- return nHandled;
-
- bLocked = TRUE;
-
- if ( rNEvt.GetType() == EVENT_KEYINPUT )
- {
- const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
- const KeyCode aKeyCode = pKEvt->GetKeyCode();
-
- if (aKeyCode.GetCode() == KEY_RETURN)
- {
- pDlg->SendToApp(HLINK_DEFAULT);
- nHandled = 1;
- }
- }
- if (this == &pDlg->aNameCB)
- pDlg->sOldName = GetText();
-
- if (!nHandled)
- nHandled = ComboBox::Notify( rNEvt );
-
- bLocked = FALSE;
-
- return nHandled;
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Drag&Drop vor dem Combo-Edit abfangen und weiterleiten
- --------------------------------------------------------------------*/
-
-long HyperCombo::PreNotify( NotifyEvent& rNEvt )
-{
- long nHandled = 0;
-
- nHandled = ComboBox::PreNotify( rNEvt );
-
- return nHandled;
-}
-
-long HyperCombo::CalcResizeWidth( long nW )
-{
- long nNewWidth = Max(nMaxWidth - nW * GetRatio() / 100L, nMinWidth);
-
- if (nNewWidth > nMaxWidth)
- nNewWidth = nMaxWidth;
-
- if (nNewWidth != GetSizePixel().Width())
- return nNewWidth;
- else
- return 0; // Kein Resize notwendig
-}
-
-void HyperCombo::DoResize( long nNewWidth )
-{
- SetSizePixel(Size(nNewWidth, GetSizePixel().Height()));
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: FixedText
- --------------------------------------------------------------------*/
-
-HyperFixedText::HyperFixedText( SvxHyperlinkDlg* pDialog, const ResId& rResId ) :
- FixedInfo( (Window *)pDialog, rResId )
-{
- pDlg = pDialog;
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Webseite der Search-Engine mit Suchergebnissen anzeigen
- --------------------------------------------------------------------*/
-void SvxHyperlinkDlg::OpenDoc( const String& rURL, SfxViewFrame* pViewFrame )
-{
- SfxStringItem aName( SID_FILE_NAME, rURL );
- SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii("private:user") );
- SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, TRUE );
- SfxBoolItem aSilent( SID_SILENT, TRUE );
- SfxBoolItem aReadOnly( SID_DOC_READONLY, TRUE );
- SfxBoolItem aExternal( SID_BROWSE, TRUE );
- SfxDispatcher* pDisp = SfxViewFrame::Current() ? SfxViewFrame::Current()->GetDispatcher() :
NULL;
-
- if ( pViewFrame )
- {
- SfxFrameItem aView( SID_DOCFRAME, pViewFrame ? &pViewFrame->GetFrame() : NULL );
- if ( pDisp )
- pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
- &aName, &aView, &aNewView, &aSilent, &aReadOnly, &aReferer,
&aExternal, 0L );
- }
- else if ( pDisp )
- pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
- &aName, &aNewView, &aSilent, &aReadOnly, &aReferer, 0L );
-}
-// class SvxHyperlinkDialogWrapper ------------------------------------------
-
-SFX_IMPL_CHILDWINDOW(SvxHyperlinkDlgWrapper, SID_HYPERLINK_INSERT)
-
-/*--------------------------------------------------------------------
- Beschreibung: Wrapper fuer Hyperlinkleiste
- --------------------------------------------------------------------*/
-
-SvxHyperlinkDlgWrapper::SvxHyperlinkDlgWrapper( Window* _pParent, USHORT nId,
- SfxBindings* _pBindings, SfxChildWinInfo*
/*pInfo*/ ) :
-
- SfxChildWindow( _pParent, nId )
-
-{
- pWindow = new SvxHyperlinkDlg( _pBindings, _pParent );
- eChildAlignment = SFX_ALIGN_TOP;
-}
-
-SfxChildWinInfo SvxHyperlinkDlgWrapper::GetInfo() const
-{
- SfxChildWinInfo aInfo = SfxChildWindow::GetInfo();
- return aInfo;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/hyprlink.hrc b/svx/source/dialog/hyprlink.hrc
deleted file mode 100644
index 87f7c9f..0000000
--- a/svx/source/dialog/hyprlink.hrc
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_HYPERLINK_HRC
-#define _SVX_HYPERLINK_HRC
-
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-
-#ifndef _SFXSIDS_HRC
-#include <sfx2/sfxsids.hrc>
-#endif
-
-// defines ------------------------------------------------------------------
-
-#define CB_NAME 1
-#define FT_URL 2
-#define CB_URL 3
-#define BTN_LINK SID_HLINKBAR_LINK
-#define BTN_INSERT_BOOKMARK SID_HLINKBAR_BOOKMARK
-#define BTN_INET_SEARCH SID_HLINKBAR_SEARCH
-#define TB 7
-#define MN_FIELD 8
-#define MN_BUTTON 9
-#define BTN_TARGET SID_HLINKBAR_TARGET
-#define STR_ADDRESS 11
-#define STR_EXPLORER 12
-#define STR_BOOKMARK_SEARCH 13
-
-#define BTN_OPENDIALOG SID_HYPERLINK_DIALOG
-
-
-#endif
-
diff --git a/svx/source/dialog/hyprlink.hxx b/svx/source/dialog/hyprlink.hxx
deleted file mode 100644
index b37c2cf..0000000
--- a/svx/source/dialog/hyprlink.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_DLG_HYPERLINK_HXX
-#define _SVX_DLG_HYPERLINK_HXX
-
-#include <sfx2/childwin.hxx>
-#include "svx/svxdllapi.h"
-
-// class SvxHyperlinkDialogWrapper ---------------------------------------
-class SVX_DLLPUBLIC SvxHyperlinkDlgWrapper : public SfxChildWindow
-{
-public:
- SvxHyperlinkDlgWrapper( Window*pParent, USHORT nId,
- SfxBindings* pBindings, SfxChildWinInfo* pInfo );
- SFX_DECL_CHILDWINDOW(SvxHyperlinkDlgWrapper);
-};
-#endif // _SVX_DLG_HYPERLINK_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src
deleted file mode 100644
index 75d6775..0000000
--- a/svx/source/dialog/hyprlink.src
+++ /dev/null
@@ -1,167 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- // include ------------------------------------------------------------------
-#include <svx/dialogs.hrc>
-#include "hyprlink.hrc"
-#include "helpid.hrc"
-#include <svx/svxids.hrc>
-
- // pragma -------------------------------------------------------------------
-
- // RID_SVXDLG_HYPERLINK ------------------------------------------------------
-ToolBox RID_SVXDLG_HYPERLINK
-{
- OutputSize = TRUE ;
- Hide = TRUE;
-
- // Dockable = TRUE ;
- // Closeable = TRUE ;
- // Moveable = TRUE ;
- // Sizeable = TRUE ;
- // EnableResizing = TRUE ;
-
- SVLook = TRUE ;
- Border = TRUE ;
- Size = MAP_APPFONT ( 410 , 17 ) ;
- Scroll = TRUE ;
- HelpID = HID_OFA_HYPERLINK_DLG ;
-
- Text [ en-US ] = "Insert Hyperlink" ;
-
- ComboBox CB_NAME
- {
- HelpID = HID_OFA_HYPERLINK_NAME ;
- Pos = MAP_APPFONT ( 2 , 3 ) ;
- Size = MAP_APPFONT ( 100 , 60 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- AutoSize = TRUE ;
- AutoHScroll = TRUE ;
- DDExtraWidth = TRUE ;
- QuickHelpText [ en-US ] = "URL Name" ;
- };
- FixedText FT_URL
- {
- HelpID = HID_OFA_HYPERLINK_URL_TXT ;
- Pos = MAP_APPFONT ( 105 , 5 ) ;
- Size = MAP_APPFONT ( 16 , 10 ) ;
- Text [ en-US ] = "URL:" ;
- };
- ComboBox CB_URL
- {
- HelpID = HID_OFA_HYPERLINK_URL ;
- Pos = MAP_APPFONT ( 121 , 3 ) ;
- Size = MAP_APPFONT ( 204 , 60 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- AutoSize = TRUE ;
- AutoHScroll = TRUE ;
- DDExtraWidth = TRUE ;
- QuickHelpText [ en-US ] = "Internet URLs" ;
- };
- ItemList =
- {
- ToolBoxItem
- {
- HelpID = HID_OFA_HYPERLINK_TARGET ;
- Identifier = BTN_TARGET ;
- DropDown = TRUE ;
- Text [ en-US ] = "Target Frame" ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- HelpID = SID_HYPERLINK_SETLINK ;
- Identifier = BTN_LINK ;
- Disable = TRUE ;
- DropDown = TRUE ;
- Text [ en-US ] = "Hyperlink" ;
- };
- ToolBoxItem
- {
- HelpID = SID_CREATELINK ;
- Identifier = BTN_INSERT_BOOKMARK ;
- Disable = TRUE ;
- Hide = TRUE;
- Text [ en-US ] = "Link" ;
- };
- ToolBoxItem
- {
- HelpID = HID_OFA_HYPERLINK_SEARCH ;
- Identifier = BTN_INET_SEARCH ;
- Disable = TRUE ;
- DropDown = TRUE ;
- Text [ en-US ] = "Find" ;
- };
- };
- String STR_ADDRESS
- {
- Text [ en-US ] = "Address Book" ;
- };
- String STR_EXPLORER
- {
- Text [ en-US ] = "Bookmark folder" ;
- };
- String STR_BOOKMARK_SEARCH
- {
- Text [ en-US ] = "Search in bookmarks";
- };
-};
- // PopupMenu -------------------------------------------------------------
-Menu RID_SVXMN_HYPERLINK
-{
- ItemList =
- {
- MenuItem
- {
- Identifier = MN_FIELD ;
- Text [ en-US ] = "As Text" ;
- };
- MenuItem
- {
- Identifier = MN_BUTTON ;
- Text [ en-US ] = "As Button" ;
- };
- };
-};
-QueryBox RID_SVXQB_DONTEXIST
-{
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_YES ;
- Message [ en-US ] = "This URL does not exist.\nInsert anyway?" ;
-};
-
-
-
-
-
-
-
-
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index 3805de9..2f1d36c 100644
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/makefile.mk
@@ -52,7 +52,6 @@ SRC1FILES = \
fontwork.src \
frmsel.src \
hdft.src \
- hyprlink.src \
imapdlg.src \
langbox.src \
language.src \
@@ -106,7 +105,6 @@ LIB2OBJFILES= \
$(SLO)$/grfflt.obj \
$(SLO)$/hdft.obj \
$(SLO)$/hyperdlg.obj \
- $(SLO)$/hyprlink.obj \
$(SLO)$/imapdlg.obj \
$(SLO)$/imapwnd.obj \
$(SLO)$/linkwarn.obj \
--
1.7.1
From a0dc8343fe9a60b9d34b31d9621e1bb878869f86 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:24:32 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar from libs-gui
Removed all code related to hyperlink bar from libs-gui repo.
---
toolkit/src2xml/src.lst | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/toolkit/src2xml/src.lst b/toolkit/src2xml/src.lst
index 58316eb..9811eb7 100644
--- a/toolkit/src2xml/src.lst
+++ b/toolkit/src2xml/src.lst
@@ -336,7 +336,6 @@
../../svx/source/dialog/macropg.src
../../svx/source/dialog/fontsubs.src
../../svx/source/dialog/align.src
-../../svx/source/dialog/hyprlink.src
../../svx/source/dialog/imapdlg.src
../../svx/source/dialog/dlgctrl.src
../../svx/source/dialog/tabstpge.src
--
1.7.1
From 87d7c7ba064aa803550784e38acb92bc043b1e56 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:25:35 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar from sdk
Removed code related to hyperlink bar from sdk repo.
---
odk/examples/OLE/activex/SOActiveX.cpp | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/odk/examples/OLE/activex/SOActiveX.cpp b/odk/examples/OLE/activex/SOActiveX.cpp
index ef9a2ef..cfadfca 100644
--- a/odk/examples/OLE/activex/SOActiveX.cpp
+++ b/odk/examples/OLE/activex/SOActiveX.cpp
@@ -49,14 +49,12 @@ OLECHAR* pSlotUrl[BARS_NUMBER] =
{L"slot:5910" // SID_TOGGLEFUNCTIONBAR
,L"slot:5920" // SID_TOGGLESTATUSBAR
,L"slot:6661" // SID_TOGGLE_MENUBAR
-// ,L"slot:10603" // SID_HYPERLINK_INSERT
};
OLECHAR* pSlotName[BARS_NUMBER] =
{L"FunctionBarVisible" // SID_TOGGLEFUNCTIONBAR
,L"StatusBarVisible" // SID_TOGGLESTATUSBAR
,L"MenuBarVisible" // SID_TOGGLE_MENUBAR
-// ,L"InsertHyperlink" //
SID_HYPERLINK_INSERT
};
--
1.7.1
From 12062acc41da0ee71ae43beca5ab19f38e711b03 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:26:26 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar from testing
Removed code related to hyperlink bar from sdk repo.
---
testautomation/global/sid/all.sid | 1 -
testautomation/global/sid/bars.sid | 2 --
testautomation/global/sid/e_all.sid | 2 --
testautomation/global/win/bars.win | 2 --
4 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid
index 5ee1c15..d4e7bfa 100644
--- a/testautomation/global/sid/all.sid
+++ b/testautomation/global/sid/all.sid
@@ -154,7 +154,6 @@ BearbeitenDiagrammdaten SID_DIAGRAM_DATA
' **** Alle
AnsichtMassstab SID_ATTR_ZOOM
AnsichtBrowser SID_BROWSER
-AnsichtHyperlinkleiste SID_HYPERLINK_INSERT
AnsichtStatusleiste SID_TOGGLESTATUSBAR SID_TOGGLESTATUSBAR
AnsichtGanzerBildschirm SID_WIN_FULLSCREEN SID_FULLSCREEN
diff --git a/testautomation/global/sid/bars.sid b/testautomation/global/sid/bars.sid
index 2c26b9c..1afbd55 100755
--- a/testautomation/global/sid/bars.sid
+++ b/testautomation/global/sid/bars.sid
@@ -354,7 +354,6 @@ WL_WRITER_AutomatischePruefung SID_AUTOSPELL_CHECK
WL_WRITER_SuchenUndErsetzen SID_SEARCH_DLG
WL_WRITER_SteuerzeichenEinAus FN_VIEW_META_CHARS
WL_WRITER_GrafikenAusschalten FN_VIEW_GRAPHIC
-WL_WRITER_Hyperlink SID_HYPERLINK_INSERT
WL_WRITER_OnlineLayout SID_BROWSER_MODE
WL_WRITER_SchattencursorEinschalten FN_SHADOWCURSOR
@@ -431,7 +430,6 @@ WL_WEB_Kontrollfelder SID_CHOOSE_CONTROLS
WL_WEB_SuchenUndErsetzen SID_SEARCH_DLG
WL_WEB_SteuerzeichenEinAus FN_VIEW_META_CHARS
WL_WEB_GrafikenAusschalten FN_VIEW_GRAPHIC
-WL_WEB_Hyperlink SID_HYPERLINK_INSERT
WL_WEB_OnlineLayout SID_BROWSER_MODE
WL_WEB_SchattencursorEinschalten FN_SHADOWCURSOR
WL_WEB_DruckLayout FN_PRINT_LAYOUT
diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid
index d7215aa..c270d0d 100644
--- a/testautomation/global/sid/e_all.sid
+++ b/testautomation/global/sid/e_all.sid
@@ -153,7 +153,6 @@ EditDataRanges .uno:DataRanges
ViewZoom SID_ATTR_ZOOM
ViewBeamer SID_BROWSER
ViewDataSources .uno:ViewDataSourceBrowser
-ViewToolbarsHyperlinkbar .uno:InsertHyperlink
ViewToolbarsConfigure .uno:ConfigureDialog
ViewToolbarsStatusbar SID_TOGGLESTATUSBAR
ViewFullScreen SID_WIN_FULLSCREEN
@@ -200,7 +199,6 @@ ViewToolbarsTable .uno:AvailableToolbars?Toolbar:string=tableobjectbar
ViewToolbarsTextFormatting .uno:AvailableToolbars?Toolbar:string=textobjectbar
ViewToolbarsTextObject .uno:AvailableToolbars?Toolbar:string=drawtextobjectbar
ViewToolbarsTools .uno:AvailableToolbars?Toolbar:string=toolbar
-ViewToolbarsInsertHyperlink .uno:InsertHyperlink
ViewToolbarsInsertFormula .uno:InsertFormula
ViewToolbarsCustomize .uno:ConfigureDialog
ViewToolbarsPreviewbar .uno:AvailableToolbars?Toolbar:string=previewbar
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index 964027c..1c60984 100755
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -1044,7 +1044,6 @@ GalleryButton .uno:Gallery
Gesamtbild SID_WIN_FULLSCREEN
GestalterButton SID_STYLE_DESIGNER
HyperlinkDialog .uno:HyperlinkDialog
-HyperlinkLeisteButton SID_HYPERLINK_INSERT
Kopieren .uno:Copy
NavigatorButton .uno:Navigator
Neu .uno:AddDirect
@@ -1252,7 +1251,6 @@ Hinunterschieben SID_OUTLINE_DOWN
Hinunterstufen SID_OUTLINE_RIGHT
Hochschieben SID_OUTLINE_UP
Hochstufen SID_OUTLINE_LEFT
-Hyperlink .uno:InsertHyperlink
Insert .uno:InsertToolbox
InsertGraphic .uno:InsertGraphic
Interaktion .uno:AnimationObjects
--
1.7.1
From 27d01cd9aadd514074585688a275da214fe0acdd Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:20:15 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar form filters
Removed all hyperlink bar related code from filters.
---
binfilter/bf_sch/source/ui/app/sch_menu.src | 4 ---
binfilter/bf_sfx2/source/appl/sfx2_app.src | 5 ----
binfilter/bf_sw/source/ui/inc/swmn.hrc | 4 ---
binfilter/inc/bf_sfx2/sfxsids.hrc | 1 -
binfilter/inc/bf_svx/globlmn.hrc | 33 ---------------------------
5 files changed, 0 insertions(+), 47 deletions(-)
diff --git a/binfilter/bf_sch/source/ui/app/sch_menu.src
b/binfilter/bf_sch/source/ui/app/sch_menu.src
index 8e823a9..a5f6287 100644
--- a/binfilter/bf_sch/source/ui/app/sch_menu.src
+++ b/binfilter/bf_sch/source/ui/app/sch_menu.src
@@ -486,10 +486,6 @@ Menu RID_MENU
};
MenuItem
{
- ITEM_INSERT_HYPERLINK_INSERT
- };
- MenuItem
- {
Separator = TRUE ;
};
MenuItem
diff --git a/binfilter/bf_sfx2/source/appl/sfx2_app.src b/binfilter/bf_sfx2/source/appl/sfx2_app.src
index a73e37c..17142ed 100644
--- a/binfilter/bf_sfx2/source/appl/sfx2_app.src
+++ b/binfilter/bf_sfx2/source/appl/sfx2_app.src
@@ -2196,11 +2196,6 @@ ToolBox RID_ENVTOOLBOX
};
ToolBoxItem
{
- Identifier = SID_HYPERLINK_INSERT ;
- Hide = TRUE;
- };
- ToolBoxItem
- {
Identifier = SID_WIN_FULLSCREEN ;
Hide = TRUE;
};
diff --git a/binfilter/bf_sw/source/ui/inc/swmn.hrc b/binfilter/bf_sw/source/ui/inc/swmn.hrc
index 2b9041c..28a768f 100644
--- a/binfilter/bf_sw/source/ui/inc/swmn.hrc
+++ b/binfilter/bf_sw/source/ui/inc/swmn.hrc
@@ -4505,10 +4505,6 @@ MenuItem _MN_VIEW
};
MenuItem
{
- ITEM_INSERT_HYPERLINK_INSERT
- };
- MenuItem
- {
Identifier = FN_EDIT_FORMULA ;
HelpID = FN_EDIT_FORMULA ;
Text [ de ] = "~Rechenleiste" ;
diff --git a/binfilter/inc/bf_sfx2/sfxsids.hrc b/binfilter/inc/bf_sfx2/sfxsids.hrc
index a6ae4f5..0119d64 100644
--- a/binfilter/inc/bf_sfx2/sfxsids.hrc
+++ b/binfilter/inc/bf_sfx2/sfxsids.hrc
@@ -1103,7 +1103,6 @@
// SlotIds f"ur Hyperlink-Dialog --------------------------------------------
#define SID_SVX_START (SID_LIB_START + 0)
-#define SID_HYPERLINK_INSERT (SID_SVX_START + 360)
#define SID_HYPERLINK_GETLINK (SID_SVX_START + 361)
#define SID_HYPERLINK_SETLINK (SID_SVX_START + 362)
diff --git a/binfilter/inc/bf_svx/globlmn.hrc b/binfilter/inc/bf_svx/globlmn.hrc
index e20dc57..6edca72 100644
--- a/binfilter/inc/bf_svx/globlmn.hrc
+++ b/binfilter/inc/bf_svx/globlmn.hrc
@@ -3150,39 +3150,6 @@
Text[ he ] = "â®×¡××רâ¬";\
-#define ITEM_INSERT_HYPERLINK_INSERT \
- Identifier = SID_HYPERLINK_INSERT ; \
- Command = ".uno:InsertHyperlink" ; \
- HelpID = SID_HYPERLINK_INSERT ; \
- Text [ de ] = "H~yperlinkleiste" ; \
- Text [ en-US ] = "~Hyperlink Bar" ; \
- Text [ x-comment ] = " "; \
- Text[ pt ] = "Barra de ~hiperligações";\
- Text[ ru ] = "ÐÐ°Ð½ÐµÐ»Ñ Ð³Ð¸Ð¿ÐµÑÑÑÑлки";\
- Text[ el ] = "ÎÏαμμή Ï
ÏεÏ-~ÏÏνδεÏηÏ";\
- Text[ nl ] = "H~yperlinkbalk";\
- Text[ fr ] = "Barre d'~hyperliens";\
- Text[ es ] = "Barra de h~iperenlaces";\
- Text[ fi ] = "~Hyperlinkkirivi";\
- Text[ ca ] = "Barra d'h~iperenllaços";\
- Text[ it ] = "Barra degli h~yperlink";\
- Text[ cs ] = "Hyperlinkový panel";\
- Text[ sk ] = "~Hyperlinkový panel";\
- Text[ da ] = "H~yperlinklinje";\
- Text[ sv ] = "H~yperlänklist";\
- Text[ pl ] = "Pasek ~hiperÅÄ
czy";\
- Text[ pt-BR ] = "Barra de ~Hiperlinks";\
- Text[ th ] = "à¹à¸à¸à¹~à¸à¸·à¹à¸à¸¡à¹à¸¢à¸à¸«à¸¥à¸²à¸¢à¸¡à¸´à¸à¸´";\
- Text[ ja ] = "ãã¤ãã¼ãªã³ã¯ãã¼(~H)";\
- Text[ ko ] = "íì´í¼ë§í¬ ë구 모ì(~H)";\
- Text[ zh-CN ] = "è¶
é¾æ¥å°åæ (~H)";\
- Text[ zh-TW ] = "è¶
é£çµä½åæ¬(~H)";\
- Text[ tr ] = "Hiperlink çubuÄu";\
- Text[ hi-IN ] = "~हाà¤à¤ªà¤°à¤²à¤¿à¤à¤ पà¤à¥à¤à¥";\
- Text[ ar ] = "شرÙØ· اÙارتباطات اÙتشعبÙØ©";\
- Text[ he ] = "â®×¡×¨×× Hyperlinkâ¬";\
-
-
#define ITEM_INSERT_INSERT_GRAPHIC \
Identifier = SID_INSERT_GRAPHIC ; \
Command = ".uno:InsertGraphic" ; \
--
1.7.1
From f47a8f220607b021d9395f989a3bdf36e57de732 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:21:30 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar from help
Removed all stuff related to hyperlink bar from help.
---
helpcontent2/helpers/help_hid.lst | 1 -
helpcontent2/helpers/hid.lst | 1 -
helpcontent2/helpers/longnames_commands.csv | 1 -
helpcontent2/helpers/uno-commands.csv | 1 -
helpcontent2/helpers/uno_hid.lst | 1 -
helpcontent2/helpers/unocmds.txt | 1 -
helpcontent2/source/text/shared/01/04110000.xhp | 57 -----------------------
helpcontent2/source/text/shared/01/makefile.mk | 1 -
helpcontent2/util/sbasic/makefile.mk | 1 -
helpcontent2/util/scalc/makefile.mk | 1 -
helpcontent2/util/schart/makefile.mk | 1 -
helpcontent2/util/sdatabase/makefile.mk | 1 -
helpcontent2/util/sdraw/makefile.mk | 1 -
helpcontent2/util/simpress/makefile.mk | 1 -
helpcontent2/util/smath/makefile.mk | 1 -
helpcontent2/util/swriter/makefile.mk | 1 -
16 files changed, 0 insertions(+), 72 deletions(-)
delete mode 100644 helpcontent2/source/text/shared/01/04110000.xhp
diff --git a/helpcontent2/helpers/help_hid.lst b/helpcontent2/helpers/help_hid.lst
index 40b8dce..db2145a 100644
--- a/helpcontent2/helpers/help_hid.lst
+++ b/helpcontent2/helpers/help_hid.lst
@@ -5393,7 +5393,6 @@ SID_HORIZONTAL,27035,.uno:MirrorHorz
SID_HTML_MODE,10414,.uno:HtmlMode
SID_HYPERLINK_DIALOG,5678,.uno:HyperlinkDialog
SID_HYPERLINK_GETLINK,10361,.uno:Hyperlink
-SID_HYPERLINK_INSERT,10360,.uno:InsertHyperlink
SID_HYPERLINK_SETLINK,10362,.uno:SetHyperlink
SID_HYPHENATION,27340,.uno:Hyphenation
SID_H_ALIGNCELL,26380,.uno:HorizontalAlignment
diff --git a/helpcontent2/helpers/hid.lst b/helpcontent2/helpers/hid.lst
index 68b0245..965c775 100644
--- a/helpcontent2/helpers/hid.lst
+++ b/helpcontent2/helpers/hid.lst
@@ -5321,7 +5321,6 @@ SID_HORIZONTAL 27035
SID_HTML_MODE 10414
SID_HYPERLINK_DIALOG 5678
SID_HYPERLINK_GETLINK 10361
-SID_HYPERLINK_INSERT 10360
SID_HYPERLINK_SETLINK 10362
SID_HYPHENATION 27340
SID_H_ALIGNCELL 26380
diff --git a/helpcontent2/helpers/longnames_commands.csv
b/helpcontent2/helpers/longnames_commands.csv
index 8ac7a5d..ee2fa46 100644
--- a/helpcontent2/helpers/longnames_commands.csv
+++ b/helpcontent2/helpers/longnames_commands.csv
@@ -1255,7 +1255,6 @@ SID_HORIZONTAL,.uno:MirrorHorz
SID_HTML_MODE,.uno:HtmlMode
SID_HYPERLINK_DIALOG,.uno:HyperlinkDialog
SID_HYPERLINK_GETLINK,.uno:Hyperlink
-SID_HYPERLINK_INSERT,.uno:InsertHyperlink
SID_HYPERLINK_SETLINK,.uno:SetHyperlink
SID_HYPHENATION,.uno:Hyphenation
SID_H_ALIGNCELL,.uno:HorizontalAlignment
diff --git a/helpcontent2/helpers/uno-commands.csv b/helpcontent2/helpers/uno-commands.csv
index 301b1c8..24f4b30 100644
--- a/helpcontent2/helpers/uno-commands.csv
+++ b/helpcontent2/helpers/uno-commands.csv
@@ -955,7 +955,6 @@
.uno:InsertGrids
.uno:InsertHardHyphen
.uno:InsertHeader
-.uno:InsertHyperlink
.uno:InsertHyperlinkDlg
.uno:InsertImage
.uno:InsertImageControl
diff --git a/helpcontent2/helpers/uno_hid.lst b/helpcontent2/helpers/uno_hid.lst
index 8101299..7fdde5c 100644
--- a/helpcontent2/helpers/uno_hid.lst
+++ b/helpcontent2/helpers/uno_hid.lst
@@ -1253,7 +1253,6 @@ SID_HORIZONTAL,27035,.uno:MirrorHorz
SID_HTML_MODE,10414,.uno:HtmlMode
SID_HYPERLINK_DIALOG,5678,.uno:HyperlinkDialog
SID_HYPERLINK_GETLINK,10361,.uno:Hyperlink
-SID_HYPERLINK_INSERT,10360,.uno:InsertHyperlink
SID_HYPERLINK_SETLINK,10362,.uno:SetHyperlink
SID_HYPHENATION,27340,.uno:Hyphenation
SID_H_ALIGNCELL,26380,.uno:HorizontalAlignment
diff --git a/helpcontent2/helpers/unocmds.txt b/helpcontent2/helpers/unocmds.txt
index 00374d0..e6a0a37 100644
--- a/helpcontent2/helpers/unocmds.txt
+++ b/helpcontent2/helpers/unocmds.txt
@@ -568,7 +568,6 @@
.uno:InsertGraphic;shared/01/04140000.xhp
.uno:InsertGraphicRuler;swriter/01/04210000.xhp
.uno:InsertGrids;schart/01/04070000.xhp
-.uno:InsertHyperlink;shared/01/04110000.xhp
.uno:InsertHyperlinkDlg;shared/01/05020400.xhp
.uno:InsertImageControl;sbasic/shared/02/20000000.xhp
.uno:InsertIndexesEntry;swriter/01/04120100.xhp
diff --git a/helpcontent2/source/text/shared/01/04110000.xhp
b/helpcontent2/source/text/shared/01/04110000.xhp
deleted file mode 100644
index 720fdef..0000000
--- a/helpcontent2/source/text/shared/01/04110000.xhp
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-
-<!--***********************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************-->
-
-<helpdocument version="1.0">
-<meta>
-<topic id="textshared0104110000xml" indexer="include" status="PUBLISH">
-<title id="tit" xml-lang="en-US">Hyperlink Bar</title>
-<filename>/text/shared/01/04110000.xhp</filename>
-</topic>
-<history>
-<created date="2003-10-31T00:00:00">Sun Microsystems, Inc.</created>
-<lastedited date="2004-05-24T13:20:42">converted from old format - fpe</lastedited>
-</history>
-</meta>
-<body>
-<section id="hyperlink">
-<bookmark xml-lang="en-US" branch="hid/SID_HYPERLINK_INSERT" id="bm_id9199631"
localize="false"/><!-- HID added by script -->
-<bookmark xml-lang="en-US" branch="hid/.uno:InsertHyperlink" id="bm_id3155577" localize="false"/>
-<paragraph role="heading" id="hd_id3143272" xml-lang="en-US" level="1" l10n="U" oldref="1"><link
href="text/shared/01/04110000.xhp" name="Hyperlink Bar">Hyperlink Bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3150838" xml-lang="en-US" l10n="U" oldref="2"><ahelp
hid=".uno:InsertHyperlink">Shows or hides the<emph> Hyperlink Bar, </emph>where you can insert and
edit URLs or search the Internet using keywords.</ahelp></paragraph>
-</section>
-<section id="howtoget">
- <embed href="text/shared/00/00000404.xhp#hyper"/>
-</section>
-<section id="relatedtopics">
-<paragraph role="paragraph" id="par_id3149511" xml-lang="en-US" l10n="C"><link
href="text/shared/main0209.xhp" name="Hyperlink bar">Hyperlink bar</link></paragraph>
-<paragraph role="paragraph" id="par_id3093440" xml-lang="en-US" l10n="C"><link
href="text/shared/02/09030000.xhp" name="Inserting hyperlinks">Inserting
hyperlinks</link></paragraph>
-<paragraph role="paragraph" id="par_id3154927" xml-lang="en-US" l10n="C"><link
href="text/shared/00/00000002.xhp#url" name="URL">URL</link></paragraph>
-</section></body>
-</helpdocument>
diff --git a/helpcontent2/source/text/shared/01/makefile.mk
b/helpcontent2/source/text/shared/01/makefile.mk
index e3ba673..0ce2092 100644
--- a/helpcontent2/source/text/shared/01/makefile.mk
+++ b/helpcontent2/source/text/shared/01/makefile.mk
@@ -132,7 +132,6 @@ XHPFILES = \
04060100.xhp \
04060200.xhp \
04100000.xhp \
- 04110000.xhp \
04140000.xhp \
04150000.xhp \
04150100.xhp \
diff --git a/helpcontent2/util/sbasic/makefile.mk b/helpcontent2/util/sbasic/makefile.mk
index b79cb6b..47ed9c4 100644
--- a/helpcontent2/util/sbasic/makefile.mk
+++ b/helpcontent2/util/sbasic/makefile.mk
@@ -489,7 +489,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/scalc/makefile.mk b/helpcontent2/util/scalc/makefile.mk
index c5d9b0c..30f56b4 100644
--- a/helpcontent2/util/scalc/makefile.mk
+++ b/helpcontent2/util/scalc/makefile.mk
@@ -502,7 +502,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/schart/makefile.mk b/helpcontent2/util/schart/makefile.mk
index 0eb859a..1021d3c 100644
--- a/helpcontent2/util/schart/makefile.mk
+++ b/helpcontent2/util/schart/makefile.mk
@@ -190,7 +190,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/sdatabase/makefile.mk b/helpcontent2/util/sdatabase/makefile.mk
index 3af9db8..b4cfd83 100644
--- a/helpcontent2/util/sdatabase/makefile.mk
+++ b/helpcontent2/util/sdatabase/makefile.mk
@@ -188,7 +188,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/sdraw/makefile.mk b/helpcontent2/util/sdraw/makefile.mk
index ea99a87..8b21ec6 100644
--- a/helpcontent2/util/sdraw/makefile.mk
+++ b/helpcontent2/util/sdraw/makefile.mk
@@ -423,7 +423,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/simpress/makefile.mk b/helpcontent2/util/simpress/makefile.mk
index e1cb5db..6374a93 100644
--- a/helpcontent2/util/simpress/makefile.mk
+++ b/helpcontent2/util/simpress/makefile.mk
@@ -425,7 +425,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/smath/makefile.mk b/helpcontent2/util/smath/makefile.mk
index de5ede8..1a4527d 100644
--- a/helpcontent2/util/smath/makefile.mk
+++ b/helpcontent2/util/smath/makefile.mk
@@ -268,7 +268,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
diff --git a/helpcontent2/util/swriter/makefile.mk b/helpcontent2/util/swriter/makefile.mk
index 6e89183..adb14cf 100644
--- a/helpcontent2/util/swriter/makefile.mk
+++ b/helpcontent2/util/swriter/makefile.mk
@@ -581,7 +581,6 @@ LINKLINKFILES= \
text$/shared$/01$/04060100.xhp \
text$/shared$/01$/04060200.xhp \
text$/shared$/01$/04100000.xhp \
- text$/shared$/01$/04110000.xhp \
text$/shared$/01$/04140000.xhp \
text$/shared$/01$/04150000.xhp \
text$/shared$/01$/04150100.xhp \
--
1.7.1
From dc895f1aab9961ba644a6efa37492e3411d2c9e7 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:22:13 +0000
Subject: [PATCH] Remove final elements from Hyperlink Bar from impress_draw
Removed some includes left in impress and draw.
---
sd/source/ui/app/menuportal_tmpl.src | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/sd/source/ui/app/menuportal_tmpl.src b/sd/source/ui/app/menuportal_tmpl.src
index cdc1a70..1ada913 100644
--- a/sd/source/ui/app/menuportal_tmpl.src
+++ b/sd/source/ui/app/menuportal_tmpl.src
@@ -137,7 +137,6 @@ Menu SD_MENU_PORTAL
MI ( ITEM_VIEW_TOGGLEFUNCTIONBAR )
MI ( ITEM_VIEW_TOGGLEOBJECTBAR )
MN_TOGGLETOOLBAR
- MI ( ITEM_INSERT_HYPERLINK_INSERT )
MN_TOGGLEOPTIONBAR
#if SD_MENU_PORTAL == RID_DRAW_PORTALMENU
MN_TOGGLECOMMONTASKBAR
--
1.7.1
From b271c3aec9b47b5a9005a01498c13f1e5c6ce58b Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:23:22 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar from libs-core
Removed all code related to hyperlink bar from libs-core repo.
---
configmgr/qa/unit/data.xcd | 8 -
.../source/uielement/toolbarsmenucontroller.cxx | 2 -
.../org/openoffice/Office/UI/GenericCommands.xcu | 8 -
scripting/workben/bindings/calcmenubar.xml | 1 -
scripting/workben/bindings/drawmenubar.xml | 1 -
scripting/workben/bindings/impressmenubar.xml | 1 -
scripting/workben/bindings/writermenubar.xml | 1 -
sfx2/inc/sfx2/sfxsids.hrc | 1 -
sfx2/sdi/frmslots.sdi | 5 -
sfx2/sdi/sfx.sdi | 27 -
sfx2/source/appl/app.src | 5 -
svx/inc/globlmn_tmpl.hrc | 7 -
svx/inc/svx/svxids.hrc | 1 -
svx/prj/d.lst | 1 -
svx/source/dialog/hyprdlg.hxx | 141 ---
svx/source/dialog/hyprlink.cxx | 947 --------------------
svx/source/dialog/hyprlink.hrc | 58 --
svx/source/dialog/hyprlink.hxx | 45 -
svx/source/dialog/hyprlink.src | 167 ----
svx/source/dialog/makefile.mk | 2 -
20 files changed, 0 insertions(+), 1429 deletions(-)
delete mode 100644 svx/source/dialog/hyprdlg.hxx
delete mode 100644 svx/source/dialog/hyprlink.cxx
delete mode 100644 svx/source/dialog/hyprlink.hrc
delete mode 100644 svx/source/dialog/hyprlink.hxx
delete mode 100644 svx/source/dialog/hyprlink.src
diff --git a/configmgr/qa/unit/data.xcd b/configmgr/qa/unit/data.xcd
index 506a829..027aa59 100644
--- a/configmgr/qa/unit/data.xcd
+++ b/configmgr/qa/unit/data.xcd
@@ -3475,14 +3475,6 @@
<value xml:lang="x-no-translate"></value><value xml:lang="en-US">To Document
Begin</value>
</prop>
</node>
- <node oor:name=".uno:InsertHyperlink" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="x-no-translate"></value><value xml:lang="en-US">~Hyperlink Bar</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:GoToEndOfRow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="x-no-translate"></value><value xml:lang="en-US">To Document End</value>
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx
b/framework/source/uielement/toolbarsmenucontroller.cxx
index 3bca816..3aa25e7 100644
--- a/framework/source/uielement/toolbarsmenucontroller.cxx
+++ b/framework/source/uielement/toolbarsmenucontroller.cxx
@@ -94,7 +94,6 @@ using namespace ::com::sun::star::ui;
static const char CONFIGURE_TOOLBARS_CMD[] = "ConfigureDialog";
static const char CONFIGURE_TOOLBARS[] = ".uno:ConfigureDialog";
static const char CMD_COLORBAR[] = ".uno:ColorControl";
-static const char CMD_HYPERLINKBAR[] = ".uno:InsertHyperlink";
static const char CMD_FORMULABAR[] = ".uno:InsertFormula";
static const char CMD_INPUTLINEBAR[] = ".uno:InputLineVisible";
static const char CMD_RESTOREVISIBILITY[] = ".cmd:RestoreVisibility";
@@ -506,7 +505,6 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r
m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.presentation.PresentationDocument" ) ) ||
m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.sheet.SpreadsheetDocument" ) ))
{
- addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR
)), 10360, aEmptyString );
if ( m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.drawing.DrawingDocument" ) ) ||
m_aModuleIdentifier.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM(
"com.sun.star.presentation.PresentationDocument" ) ))
addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR
)), 10417, aEmptyString );
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 42ca952..281500a 100755
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -3440,14 +3440,6 @@
<value xml:lang="en-US">To Document Begin</value>
</prop>
</node>
- <node oor:name=".uno:InsertHyperlink" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">~Hyperlink Bar</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:GoToEndOfRow" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">To Document End</value>
diff --git a/scripting/workben/bindings/calcmenubar.xml b/scripting/workben/bindings/calcmenubar.xml
index 21f6404..26b884c 100644
--- a/scripting/workben/bindings/calcmenubar.xml
+++ b/scripting/workben/bindings/calcmenubar.xml
@@ -112,7 +112,6 @@
<menu:menuitem menu:id="slot:5910" menu:helpid="5910" menu:label="~Function Bar"/>
<menu:menuitem menu:id="slot:5905" menu:helpid="5905" menu:label="~Object Bar"/>
<menu:menuitem menu:id="slot:5909" menu:helpid="5909" menu:label="Main ~Toolbar"/>
- <menu:menuitem menu:id="slot:10360" menu:helpid="10360" menu:label="~Hyperlink Bar"/>
<menu:menuitem menu:id="slot:26241" menu:helpid="26241" menu:label="For~mula Bar"/>
<menu:menuseparator/>
<menu:menuitem menu:id="slot:5908" menu:helpid="5908" menu:label="Customi~ze..."/>
diff --git a/scripting/workben/bindings/drawmenubar.xml b/scripting/workben/bindings/drawmenubar.xml
index c1c644f..2fbfe54 100644
--- a/scripting/workben/bindings/drawmenubar.xml
+++ b/scripting/workben/bindings/drawmenubar.xml
@@ -87,7 +87,6 @@
<menu:menuitem menu:id="slot:5910" menu:helpid="5910" menu:label="~Function Bar"/>
<menu:menuitem menu:id="slot:5905" menu:helpid="5905" menu:label="~Object Bar"/>
<menu:menuitem menu:id="slot:5909" menu:helpid="5909" menu:label="Main ~Toolbar"/>
- <menu:menuitem menu:id="slot:10360" menu:helpid="10360" menu:label="~Hyperlink Bar"/>
<menu:menuitem menu:id="slot:5911" menu:helpid="5911" menu:label="Optio~n Bar"/>
<menu:menuitem menu:id="slot:10417" menu:helpid="10417" menu:label="~Color Bar"/>
<menu:menuseparator/>
diff --git a/scripting/workben/bindings/impressmenubar.xml
b/scripting/workben/bindings/impressmenubar.xml
index ec51390..627fd16 100644
--- a/scripting/workben/bindings/impressmenubar.xml
+++ b/scripting/workben/bindings/impressmenubar.xml
@@ -86,7 +86,6 @@
<menu:menuitem menu:id="slot:5910" menu:helpid="5910" menu:label="~Function Bar"/>
<menu:menuitem menu:id="slot:5905" menu:helpid="5905" menu:label="~Object Bar"/>
<menu:menuitem menu:id="slot:5909" menu:helpid="5909" menu:label="Main ~Toolbar"/>
- <menu:menuitem menu:id="slot:10360" menu:helpid="10360" menu:label="~Hyperlink Bar"/>
<menu:menuitem menu:id="slot:5911" menu:helpid="5911" menu:label="Optio~n Bar"/>
<menu:menuitem menu:id="slot:5928" menu:helpid="5928" menu:label="~Presentation"/>
<menu:menuitem menu:id="slot:10417" menu:helpid="10417" menu:label="~Color Bar"/>
diff --git a/scripting/workben/bindings/writermenubar.xml
b/scripting/workben/bindings/writermenubar.xml
index 0865204..d2d6d88 100644
--- a/scripting/workben/bindings/writermenubar.xml
+++ b/scripting/workben/bindings/writermenubar.xml
@@ -104,7 +104,6 @@
<menu:menuitem menu:id="slot:5910" menu:helpid="5910" menu:label="~Function Bar"/>
<menu:menuitem menu:id="slot:5905" menu:helpid="5905" menu:label="~Object Bar"/>
<menu:menuitem menu:id="slot:5909" menu:helpid="5909" menu:label="Main ~Toolbar"/>
- <menu:menuitem menu:id="slot:10360" menu:helpid="10360" menu:label="~Hyperlink Bar"/>
<menu:menuitem menu:id="slot:20128" menu:helpid="20128" menu:label="Fo~rmula Bar"/>
<menu:menuseparator/>
<menu:menuitem menu:id="slot:5908" menu:helpid="5908" menu:label="Customi~ze..."/>
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index c823aaa..b69d251 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -873,7 +873,6 @@
#define SID_ZOOM (SID_SVX_START + 289)
#define SID_SEARCH_ITEM (SID_SVX_START + 291)
#define SID_ATTR_CHAR_FONTWIDTH (SID_SVX_START + 303)
-#define SID_HYPERLINK_INSERT (SID_SVX_START + 360)
#define SID_HYPERLINK_GETLINK (SID_SVX_START + 361)
#define SID_HYPERLINK_SETLINK (SID_SVX_START + 362)
#define SID_NAVIGATOR (SID_SVX_START + 366)
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index e58d95e..7f66212 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -30,11 +30,6 @@ interface Window
Automation = FALSE ;
]
{
- SID_HYPERLINK_INSERT
- [
- ExecMethod = ChildWindowExecute ;
- StateMethod = ChildWindowState ;
- ]
SID_HYPERLINK_DIALOG
[
ExecMethod = ChildWindowExecute ;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 7e9b5cc..bce76f2 100755
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -2953,33 +2953,6 @@ SfxBoolItem InsertDoc SID_INSERTDOC
]
//--------------------------------------------------------------------------
-SfxBoolItem InsertHyperlink SID_HYPERLINK_INSERT
-
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
SfxVoidItem InsertObjectFloatingFrame SID_INSERT_FLOATINGFRAME
(
SfxStringItem Name FN_PARAM_1,
diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src
index ac05749..9e6b9d0 100644
--- a/sfx2/source/appl/app.src
+++ b/sfx2/source/appl/app.src
@@ -748,11 +748,6 @@ ToolBox RID_ENVTOOLBOX
};
ToolBoxItem
{
- Identifier = SID_HYPERLINK_INSERT ;
- Hide = TRUE;
- };
- ToolBoxItem
- {
Identifier = SID_WIN_FULLSCREEN ;
Hide = TRUE;
};
diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc
index d76a647..6d4309e 100644
--- a/svx/inc/globlmn_tmpl.hrc
+++ b/svx/inc/globlmn_tmpl.hrc
@@ -606,14 +606,7 @@
Command = ".uno:Beamer" ; \
HelpID = SID_BROWSER ; \
Text [ en-US ] = "~Beamer" ; \
-
-#define ITEM_INSERT_HYPERLINK_INSERT \
- Identifier = SID_HYPERLINK_INSERT ; \
- Command = ".uno:InsertHyperlink" ; \
- HelpID = SID_HYPERLINK_INSERT ; \
- Text [ en-US ] = "~Hyperlink Bar" ; \
-
#define ITEM_INSERT_INSERT_GRAPHIC \
Identifier = SID_INSERT_GRAPHIC ; \
Command = ".uno:InsertGraphic" ; \
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index 82e8a2f..01323c3 100755
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -701,7 +701,6 @@
#define SID_BMPMASK_PIPETTE ( SID_SVX_START + 351 )
#define SID_BMPMASK_BMPSELECT ( SID_SVX_START + 352 )
#define SID_BMPMASK_EXEC ( SID_SVX_START + 353 )
-//#define SID_HYPERLINK_INSERT ( SID_SVX_START + 360 ) -> sfxsids.hrc
//#define SID_HYPERLINK_GETLINK ( SID_SVX_START + 361 ) -> sfxsids.hrc
//#define SID_HYPERLINK_SETLINK ( SID_SVX_START + 362 ) -> sfxsids.hrc
#define SID_NO_GRAPHICS ( SID_SVX_START + 364 )
diff --git a/svx/prj/d.lst b/svx/prj/d.lst
index d79e421..3d6092f 100644
--- a/svx/prj/d.lst
+++ b/svx/prj/d.lst
@@ -32,7 +32,6 @@ mkdir: %_DEST%\inc%_EXT%\svx
..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx
..\%__SRC%\inc\globlmn.hrc %_DEST%\inc%_EXT%\svx\globlmn.hrc
..\source\inc\fmresids.hrc %_DEST%\inc%_EXT%\svx\fmresids.hrc
-..\source\dialog\hyprlink.hxx %_DEST%\inc%_EXT%\svx\hyprlink.hxx
../source/customshapes/EnhancedCustomShapeTypeNames.hxx
%_DEST%\inc%_EXT%\svx\EnhancedCustomShapeTypeNames.hxx
../source/customshapes/EnhancedCustomShapeGeometry.hxx
%_DEST%\inc%_EXT%\svx\EnhancedCustomShapeGeometry.hxx
diff --git a/svx/source/dialog/hyprdlg.hxx b/svx/source/dialog/hyprdlg.hxx
deleted file mode 100644
index d0db4fc..0000000
--- a/svx/source/dialog/hyprdlg.hxx
+++ /dev/null
@@ -1,141 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_DLG_HYPERDLG_HXX
-#define _SVX_DLG_HYPERDLG_HXX
-
-#include <vcl/combobox.hxx>
-#include <vcl/toolbox.hxx>
-#include <vcl/menu.hxx>
-#include <svtools/stdctrl.hxx>
-#include <sfx2/ctrlitem.hxx>
-#include <svl/srchcfg.hxx>
-#include <sfx2/tbxctrl.hxx>
-
-class SvxHyperlinkDlg;
-class SfxViewFrame;
-
-class HyperCombo : public ComboBox
-{
- SvxHyperlinkDlg *pDlg;
- long nMaxWidth;
- long nMinWidth;
- long nRatio;
-
- virtual long Notify( NotifyEvent& rNEvt );
- virtual long PreNotify( NotifyEvent& rNEvt );
-
-public:
- HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId );
-
- inline void SetRatio( long nR ) { nRatio = nR; }
- inline long GetRatio() { return nRatio; }
- long CalcResizeWidth( long nW );
- inline long GetResizeWidth() { return (nMaxWidth - nMinWidth); }
- void DoResize( long nW );
-};
-
-class HyperFixedText : public FixedInfo
-{
- SvxHyperlinkDlg *pDlg;
-
-public:
- HyperFixedText( SvxHyperlinkDlg* pDialog, const ResId& rResId );
-
-};
-
-/*--------------------------------------------------------------------
- Beschreibung: Dialog zum Einfgen/ndern eines Hyperlink
- --------------------------------------------------------------------*/
-
-class SvxHyperlinkDlg : public ToolBox, public SfxControllerItem
-{
- friend class HyperCombo;
- friend class HyperFixedText;
- using ToolBox::StateChanged;
-
-private:
- SfxStatusForwarder aForwarder;
- SfxStatusForwarder aHyperlinkDlgForward;
- HyperCombo aNameCB;
- HyperFixedText aUrlFT;
- HyperCombo aUrlCB;
-
- SvxSearchConfig aSearchConfig;
-
- String sAddress;
- String sExplorer;
- String sOldName;
- String sSearchTitle;
- PopupMenu aLinkPopup;
- PopupMenu *pTargetMenu;
- BOOL bNoDoc;
- BOOL bSend;
- BOOL bHasOldName;
- long nMaxWidth;
- long nMinWidth;
- long nMaxHeight;
- BOOL bHtmlMode;
-
- SfxImageManager* mpManager;
-
- virtual void StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
- virtual void DataChanged( const DataChangedEvent& rDCEvt );
-
- // DockingWindow
- virtual void Resize();
- virtual void Resizing(Size& rSize);
-
- // Drag&Drop
- BOOL GetDragData(USHORT nItem, ULONG nDDFormatId, String& rBuffer);
-
- DECL_LINK(TBClickHdl, ToolBox *);
- DECL_LINK(TBSelectHdl, ToolBox *);
- DECL_LINK(DropdownClick, ToolBox * );
- DECL_LINK(LinkPopupSelectHdl, Menu *);
- DECL_LINK(SearchPopupSelectHdl, Menu *);
- DECL_LINK(ComboSelectHdl, ComboBox *);
- DECL_LINK(ComboModifyHdl, ComboBox *);
- DECL_LINK(BookmarkFoundHdl, String *);
-
- void OpenDoc( const String& rURL, SfxViewFrame* pViewFrame );
- void EnableLink();
- void SendToApp(USHORT nType);
- void AddToHistory(const String& rName, const String& rURL);
- void TargetMenu(const String& rSelEntry, BOOL bExecute);
- String GetSelTarget();
-
- void SetImages();
-public:
- SvxHyperlinkDlg(SfxBindings *pBindings, Window* pWindow);
- ~SvxHyperlinkDlg();
-};
-
-
-#endif // _SVX_DLG_HYPERDLG_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx
deleted file mode 100644
index bd66b25..0000000
--- a/svx/source/dialog/hyprlink.cxx
+++ /dev/null
@@ -1,947 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svx.hxx"
-#include <tools/urlobj.hxx>
-#include <vcl/msgbox.hxx>
-#include <unotools/configitem.hxx>
-#include <unotools/cmdoptions.hxx>
-#include <svtools/inetimg.hxx>
-#include <svl/urlbmk.hxx>
-#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/docfile.hxx>
-#include <sfx2/imgmgr.hxx>
-#include <sfx2/dispatch.hxx>
-#include <svl/urihelper.hxx>
-#include <sfx2/objsh.hxx>
-#include <comphelper/processfactory.hxx>
-
-#include "hlnkitem.hxx"
-#include <svx/dialogs.hrc>
-#include "hyprlink.hrc"
-#include <svx/dialmgr.hxx>
-#include "hyprlink.hxx"
-#include "hyprdlg.hxx"
-
-using namespace ::rtl;
-using namespace ::com::sun::star;
-
-// -----------------------------------------------------------------------
-
-class SearchDefaultConfigItem_Impl : public ::utl::ConfigItem
-{
- OUString sDefaultEngine;
-public:
- SearchDefaultConfigItem_Impl();
- ~SearchDefaultConfigItem_Impl();
-
- const OUString& GetDefaultSearchEngine(){ return sDefaultEngine;}
- virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >&
aPropertyNames );
- virtual void Commit();
-};
-
-SearchDefaultConfigItem_Impl::SearchDefaultConfigItem_Impl() :
- ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Inet/DefaultSearchEngine")))
-{
- uno::Sequence<OUString> aNames(1);
- aNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
- uno::Sequence< uno::Any > aValues = GetProperties(aNames);
- aValues.getConstArray()[0] >>= sDefaultEngine;
-}
-
-SearchDefaultConfigItem_Impl::~SearchDefaultConfigItem_Impl()
-{
-}
-
-void SearchDefaultConfigItem_Impl::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
-{
-}
-
-void SearchDefaultConfigItem_Impl::Commit()
-{
-}
-
-/*************************************************************************
-|*
-|* Dialog zum Einf"ugen/"Andern eines Hyperlink
-|*
-\************************************************************************/
-
-SvxHyperlinkDlg::SvxHyperlinkDlg( SfxBindings *_pBindings, Window* pParent) :
-
- ToolBox ( pParent, SVX_RES( RID_SVXDLG_HYPERLINK ) ),
- SfxControllerItem ( SID_HYPERLINK_SETLINK, *_pBindings ),
-
- aForwarder ( SID_HYPERLINK_GETLINK, *this ),
- aHyperlinkDlgForward( SID_HYPERLINK_DIALOG , *this),
-
- aNameCB ( this, SVX_RES( CB_NAME ) ),
- aUrlFT ( this, SVX_RES( FT_URL ) ),
- aUrlCB ( this, SVX_RES( CB_URL ) ),
- aSearchConfig (sal_True),
- sAddress ( SVX_RES( STR_ADDRESS ) ),
- sExplorer ( SVX_RES( STR_EXPLORER ) ),
- sSearchTitle ( SVX_RES( STR_BOOKMARK_SEARCH ) ),
- aLinkPopup ( SVX_RES( RID_SVXMN_HYPERLINK ) ),
- pTargetMenu ( NULL ),
-
- bNoDoc ( TRUE ),
- bSend ( FALSE ),
- bHasOldName ( FALSE ),
- bHtmlMode ( FALSE )
-
-{
- FreeResource();
-
- mpManager = SfxImageManager::GetImageManager( 0 );
- mpManager->RegisterToolBox( this );
-
- SetImages();
-
- // save initial size
- nMaxWidth = GetSizePixel().Width();
- nMaxHeight = GetSizePixel().Height();
-
-
- InsertSeparator( 0 );
- InsertWindow( CB_URL, &aUrlCB, 0, 0 );
- // we need an item text for accessibility
- String sItemText = aUrlCB.GetText();
- if ( sItemText.Len() == 0 )
- sItemText = aUrlCB.GetQuickHelpText();
- if ( sItemText.Len() > 0 )
- {
- SetItemText( CB_URL, sItemText );
- sItemText.Erase();
- }
- InsertWindow( FT_URL, &aUrlFT, 0, 0 );
- InsertSeparator( 0 );
- InsertWindow( CB_NAME, &aNameCB, 0, 0 );
- sItemText = aNameCB.GetText();
- if ( sItemText.Len() == 0 )
- sItemText = aNameCB.GetQuickHelpText();
- if ( sItemText.Len() > 0 )
- SetItemText( CB_NAME, sItemText );
-
- SetSizePixel(CalcWindowSizePixel()); // Groesse initialisieren
-
- nMaxHeight = GetSizePixel().Height(); // Hoehe nochmal merken, da sie veraendert wurde
- // SetSizePixel ruft Resize-Handler!
-
- Show();
- Resize();
-
- long nUrlWidth = aUrlCB.GetResizeWidth();
- long nNameWidth = aNameCB.GetResizeWidth();
- long nSum = nUrlWidth + nNameWidth;
-
- aUrlCB.SetRatio((nUrlWidth * 100L) / nSum);
- aNameCB.SetRatio((nNameWidth * 100L) / nSum);
-
- SetClickHdl( LINK( this, SvxHyperlinkDlg, TBClickHdl ) );
- SetSelectHdl( LINK( this, SvxHyperlinkDlg, TBSelectHdl ) );
- SetDropdownClickHdl( LINK( this, SvxHyperlinkDlg, DropdownClick ) );
-
- SetItemBits( BTN_TARGET, GetItemBits( BTN_TARGET ) | TIB_DROPDOWNONLY );
- SetItemBits( BTN_INET_SEARCH, GetItemBits( BTN_INET_SEARCH ) | TIB_DROPDOWN );
- SetItemBits( BTN_INET_SEARCH, GetItemBits( BTN_TARGET ) | TIB_DROPDOWNONLY );
-
- aLinkPopup.SetSelectHdl(LINK(this, SvxHyperlinkDlg, LinkPopupSelectHdl));
-
- Link aLk = LINK(this, SvxHyperlinkDlg, ComboSelectHdl);
- aNameCB.SetSelectHdl(aLk);
- aUrlCB.SetSelectHdl(aLk);
-
- aLk = LINK(this, SvxHyperlinkDlg, ComboModifyHdl);
- aNameCB.SetModifyHdl(aLk);
- aUrlCB.SetModifyHdl(aLk);
-
- // Accessibility: Set the quick help text as accessible name for the
- // drop down lists.
- aNameCB.SetAccessibleName (aNameCB.GetQuickHelpText());
- aUrlCB.SetAccessibleName (aUrlCB.GetQuickHelpText());
-
- // Hide button according to config item.
- SvtCommandOptions aCmdOpts;
- if ( aCmdOpts.Lookup( SvtCommandOptions::CMDOPTION_DISABLED,
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "InternetSearch" ) ) ) )
- HideItem( BTN_INET_SEARCH );
-}
-
-SvxHyperlinkDlg::~SvxHyperlinkDlg()
-{
- SfxImageManager::GetImageManager( 0 )->ReleaseToolBox(this);
-
- if (pTargetMenu != NULL)
- delete pTargetMenu;
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Leiste so resizen, dass die Comboboxen automatisch mit
- verkleinert werden
- --------------------------------------------------------------------*/
-
-void SvxHyperlinkDlg::Resize()
-{
- long nWidth = GetSizePixel().Width();
-
- ToolBox::Resize();
-
- if (nWidth) // nWidth ist manchmal 0
- {
- long nDeltaW = nMaxWidth - nWidth + aUrlCB.LogicToPixel(Size(3, 1)).Width() + 1;
-
- long nNewUrlWidth = aUrlCB.CalcResizeWidth(nDeltaW);
- long nNewNameWidth = aNameCB.CalcResizeWidth(nDeltaW);
-
- if (nNewUrlWidth && nNewNameWidth) // Flackern reduzieren
- {
- SetUpdateMode(FALSE);
-
- // Comboboxen resizen
- aUrlCB.DoResize(nNewUrlWidth);
- aNameCB.DoResize(nNewNameWidth);
- RecalcItems(); // Alle Elemente neu anordnen
-
- SetUpdateMode(TRUE);
- }
- }
-}
-
-void SvxHyperlinkDlg::Resizing(Size& rSize)
-{
- if (rSize.Height() > nMaxHeight)
- rSize.Height() = nMaxHeight;
-
- if (rSize.Width() > nMaxWidth)
- rSize.Width() = nMaxWidth;
-
- ToolBox::Resizing(rSize);
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Im Dokument selektierten Hyperlink in Leiste anzeigen
- --------------------------------------------------------------------*/
-
-void SvxHyperlinkDlg::StateChanged( USHORT nSID, SfxItemState eState,
- const SfxPoolItem* pState )
-{
- if ( nSID == SID_HYPERLINK_DIALOG )
- {
- if( eState != SFX_ITEM_DISABLED)
- {
- EnableItem( BTN_OPENDIALOG, TRUE );
-
- BOOL bItem = FALSE;
- if ( pState && eState == SFX_ITEM_AVAILABLE )
- bItem = ((SfxBoolItem*)pState)->GetValue();
- SetItemState ( BTN_OPENDIALOG, bItem ? STATE_CHECK : STATE_NOCHECK );
- }
- else
- {
- SetItemState ( BTN_OPENDIALOG, STATE_NOCHECK );
- EnableItem( BTN_OPENDIALOG, FALSE );
- }
- }
-
- if (nSID == SID_HYPERLINK_SETLINK)
- {
- if (eState == SFX_ITEM_DISABLED)
- bNoDoc = TRUE;
- else
- bNoDoc = FALSE;
- EnableItem(BTN_TARGET, !bNoDoc);
- EnableLink();
- }
-
- if (nSID == SID_HYPERLINK_GETLINK)
- {
- if (eState == SFX_ITEM_AVAILABLE)
- {
- const SvxHyperlinkItem& rHLnkItem = *((const SvxHyperlinkItem*)pState);
-
- USHORT nNamePos = aNameCB.GetEntryPos(aNameCB.GetText());
- USHORT nUrlPos = aUrlCB.GetEntryPos(aUrlCB.GetText());
- USHORT nNotFound = COMBOBOX_ENTRY_NOTFOUND;
-
- if (!bHasOldName &&
- (nNamePos == nNotFound || nUrlPos == nNotFound))
- {
- sOldName = aNameCB.GetText();
- bHasOldName = TRUE;
- }
- if (rHLnkItem.GetName().Len())
- {
- aNameCB.SetText(rHLnkItem.GetName());
- ComboModifyHdl(&aNameCB);
- }
- if (rHLnkItem.GetURL().Len() || rHLnkItem.GetName().Len())
- {
- String sUrl = INetURLObject(rHLnkItem.GetURL()).GetURLNoPass();
- aUrlCB.SetText(sUrl);
- }
- else if (aUrlCB.GetEntryCount())
- { // Letzten Eintrag wieder selektieren
- aNameCB.SetText(aNameCB.GetEntry(0));
- aUrlCB.SetText(aUrlCB.GetEntry(0));
- }
-
- TargetMenu(rHLnkItem.GetTargetFrame(), FALSE);
- bHtmlMode = (rHLnkItem.GetInsertMode() & HLINK_HTMLMODE) != 0;
- }
- else
- return;
-
- ComboModifyHdl(&aUrlCB);
- }
-}
-
-IMPL_LINK( SvxHyperlinkDlg, TBClickHdl, ToolBox *, pBox )
-{
- switch (pBox->GetCurItemId())
- {
- case BTN_LINK:
- {
- if (!bSend) // Link ins Dokument einfuegen
- SendToApp(HLINK_DEFAULT);
- }
- break;
-
- case BTN_OPENDIALOG:
- {
- GetBindings().GetDispatcher()->Execute( SID_HYPERLINK_DIALOG );
- }
- break;
- }
-
- return TRUE;
-}
-
-IMPL_LINK( SvxHyperlinkDlg, TBSelectHdl, ToolBox *, pBox )
-{
- switch (pBox->GetCurItemId())
- {
- // Link als Bookmark im Explorer eintragen
- // Soll erst im Loslassen der Maus gerufen werden, daher im Select-Hdl
- case BTN_INSERT_BOOKMARK:
- {
- String sName = aNameCB.GetText();
- if ( !sName.Len() )
- sName = aUrlCB.GetText();
-
- String aBase =
GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL();
- SfxStringItem aName( SID_BOOKMARK_TITLE, sName );
- SfxStringItem aURL( SID_BOOKMARK_URL,
- URIHelper::SmartRel2Abs( INetURLObject(aBase), aUrlCB.GetText(),
URIHelper::GetMaybeFileHdl(), true, false,
- INetURLObject::WAS_ENCODED,
- INetURLObject::DECODE_UNAMBIGUOUS ) );
- GetBindings().GetDispatcher()->Execute(
- SID_CREATELINK, SFX_CALLMODE_ASYNCHRON, &aName, &aURL, 0L );
- }
- break;
- }
-
- return TRUE;
-}
-
-IMPL_LINK( SvxHyperlinkDlg, DropdownClick, ToolBox *, pBox )
-{
- switch (pBox->GetCurItemId())
- {
- case BTN_LINK:
- {
- // Link-Popup anstossen
- EndSelection(); // Vor dem Execute, damit Popup den Focus bekommt
- aLinkPopup.EnableItem(MN_BUTTON, !bHtmlMode);
- aLinkPopup.Execute( this, GetItemRect( BTN_LINK ), FLOATWIN_POPUPMODE_DOWN );
- }
- break;
-
- case BTN_INET_SEARCH:
- {
- // Search-Engines per Popup auswaehlen
- PopupMenu *pMenu = new PopupMenu;
- pMenu->SetSelectHdl(LINK(this, SvxHyperlinkDlg, SearchPopupSelectHdl));
- SearchDefaultConfigItem_Impl aDefaultEngine;
- String sDefault(aDefaultEngine.GetDefaultSearchEngine());
- sDefault.ToLowerAscii();
- const bool bHasDefault = sDefault.Len() > 0;
-
- sal_uInt16 nCount = aSearchConfig.Count();
- String sFound;
- for (USHORT i = 0; i < nCount; i++)
- {
- const SvxSearchEngineData& rData = aSearchConfig.GetData(i);
- //check if it's the configured default search engine
- String sTest(rData.sEngineName);
- sTest.ToLowerAscii();
- bool bIsDefaultEngine = bHasDefault && STRING_NOTFOUND != sTest.Search( sDefault );
- //then put it at the top
- if(i && bIsDefaultEngine)
- {
- pMenu->InsertItem( i + 1, rData.sEngineName, 0, 0);
- pMenu->InsertSeparator(1);
- }
- else
- {
- if (i)
- pMenu->InsertSeparator();
- pMenu->InsertItem( i + 1, rData.sEngineName);
- }
- }
- pBox->SetItemDown(BTN_INET_SEARCH, TRUE, TRUE);
- pMenu->Execute( this, GetItemRect( BTN_INET_SEARCH ), FLOATWIN_POPUPMODE_DOWN );
- pBox->SetItemDown(BTN_INET_SEARCH, FALSE, TRUE);
- EndSelection();
- delete pMenu;
- }
- break;
-
- case BTN_TARGET:
- {
- // Target Frame einstellen
- TargetMenu(GetSelTarget(), TRUE);
- EndSelection();
- }
- break;
- }
-
- return TRUE;
-}
-
-void SvxHyperlinkDlg::TargetMenu(const String& rSelEntry, BOOL bExecute)
-{
- if (pTargetMenu && !bExecute)
- {
- for (USHORT i = 1; i <= pTargetMenu->GetItemCount(); i++)
- {
- if (pTargetMenu->GetItemText(i) == rSelEntry)
- {
- pTargetMenu->CheckItem(i);
- return;
- }
- }
- }
-
- SfxViewFrame* pVwFrm = SfxViewFrame::Current();
-
- if (pVwFrm) // Alle moeglichen Target Frames zusammensammeln und anzeigen
- {
- TargetList aList;
- pVwFrm->GetTopFrame().GetTargetList(aList);
-
- if ( !aList.empty() )
- {
- size_t nCount = aList.size();
- BOOL bChecked = FALSE;
-
- if (pTargetMenu != NULL)
- delete pTargetMenu;
-
- pTargetMenu = new PopupMenu;
- pTargetMenu->SetMenuFlags( pTargetMenu->GetMenuFlags() |
- MENU_FLAG_NOAUTOMNEMONICS );
-
- for ( size_t i = 0; i < nCount; i++ )
- {
- String sEntry( *aList[ i ] );
- pTargetMenu->InsertItem(i + 1, sEntry, MIB_RADIOCHECK|MIB_AUTOCHECK);
-
- if (sEntry == rSelEntry)
- {
- pTargetMenu->CheckItem(i + 1);
- bChecked = TRUE;
- }
- }
- for ( size_t i = nCount; i; )
- delete aList[ --i ];
-
- if (!bChecked)
- pTargetMenu->CheckItem(1);
-
- if (bExecute)
- {
- USHORT nEntry = pTargetMenu->Execute(
- this, GetItemRect( BTN_TARGET ), FLOATWIN_POPUPMODE_DOWN );
- if ( nEntry )
- pTargetMenu->CheckItem( nEntry );
- }
- }
- }
-}
-
-IMPL_LINK( SvxHyperlinkDlg, LinkPopupSelectHdl, Menu *, pMenu )
-{
- switch (pMenu->GetCurItemId())
- {
- case MN_FIELD: // URL als Hyperlink ins Dok einfuegen
- SendToApp(HLINK_FIELD);
- break;
- case MN_BUTTON: // URL als Button ins Dok einfuegen
- SendToApp(HLINK_BUTTON);
- break;
- }
-
- return TRUE;
-}
-
-IMPL_LINK( SvxHyperlinkDlg, SearchPopupSelectHdl, Menu *, pMenu )
-{
- const SvxSearchEngineData& rData = aSearchConfig.GetData(pMenu->GetCurItemId() - 1);
- String sText(aNameCB.GetText());
- sText.EraseLeadingChars().EraseTrailingChars();
-
- rtl::OUString sPrefix;
- rtl::OUString sSuffix;
- rtl::OUString sSeparator;
- sal_Int32 nCaseMatch;
- sal_Unicode cToken = 0;
-
- if (sText.Search(' ') != STRING_NOTFOUND)
- {
- sPrefix = rData.sExactPrefix;
- sSuffix = rData.sExactSuffix;
- sSeparator = rData.sExactSeparator;
- nCaseMatch = rData.nExactCaseMatch;
- cToken = ' ';
- }
- else if (sText.Search('+') != STRING_NOTFOUND)
- {
- sPrefix = rData.sAndPrefix;
- sSuffix = rData.sAndSuffix;
- sSeparator = rData.sAndSeparator;
- nCaseMatch = rData.nAndCaseMatch;
- cToken = '+';
- }
- else if (sText.Search(',') != STRING_NOTFOUND)
- {
- sPrefix = rData.sOrPrefix;
- sSuffix = rData.sOrSuffix;
- sSeparator = rData.sOrSeparator;
- nCaseMatch = rData.nOrCaseMatch;
- cToken = ',';
- }
- else
- {
- sPrefix = rData.sExactPrefix;
- sSuffix = rData.sExactSuffix;
- nCaseMatch = rData.nExactCaseMatch;
- cToken = 0;
- }
-
- String sURL = sPrefix;
- xub_StrLen nTok;
-
- if(1 == nCaseMatch)
- sText.ToUpperAscii();
- else if(2 == nCaseMatch)
- sText.ToLowerAscii();
-
- if ((nTok = sText.GetTokenCount(cToken)) > 1)
- {
- for (USHORT i = 0; i < nTok; i++)
- {
- sURL += sText.GetToken(i, cToken);
- if(i < nTok -1)
- sURL += (String)sSeparator;
- }
- sURL += (String)sSuffix;
- }
- else
- {
- sURL += sText;
- sURL += (String)sSuffix;
- }
- sURL.EraseAllChars(); // remove all spaces
- SfxViewFrame* pViewFrame = SfxViewFrame::Current();
- if ( pViewFrame )
- pViewFrame = pViewFrame->GetTopViewFrame();
- OpenDoc( sURL, pViewFrame );
-
- return TRUE;
-}
-
-IMPL_LINK( SvxHyperlinkDlg, BookmarkFoundHdl, String *, pUrl )
-{
- if (pUrl && pUrl->Len())
- {
- aUrlCB.SetText(*pUrl);
- ComboModifyHdl(&aUrlCB);
- }
-
- return TRUE;
-}
-/*--------------------------------------------------------------------
- Beschreibung: Link-Button enablen/disablen
- --------------------------------------------------------------------*/
-
-void SvxHyperlinkDlg::EnableLink()
-{
- BOOL bEnable = aUrlCB.GetText().Len() != 0;
-
- EnableItem(BTN_LINK, (!bNoDoc) & bEnable);
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: URL im Dokument einfuegen
- --------------------------------------------------------------------*/
-
-void SvxHyperlinkDlg::SendToApp(USHORT nType)
-{
- BOOL bIsFile = FALSE;
- bSend = TRUE;
- String sURL( aUrlCB.GetText() );
-
- if ( !sURL.Len() )
- return;
-
- String aBase =
GetBindings().GetDispatcher()->GetFrame()->GetObjectShell()->GetMedium()->GetBaseURL();
- INetURLObject aObj( URIHelper::SmartRel2Abs( INetURLObject(aBase), sURL,
URIHelper::GetMaybeFileHdl(), true, false,
- INetURLObject::WAS_ENCODED,
- INetURLObject::DECODE_UNAMBIGUOUS ) );
- sURL = aObj.GetMainURL( INetURLObject::NO_DECODE );
- if ( aObj.GetProtocol() == INET_PROT_FILE )
- bIsFile = TRUE;
-
- if ( bIsFile )
- {
- EnterWait();
- SfxMedium aMedium( sURL, STREAM_STD_READ, TRUE );
- if ( aMedium.Exists( FALSE ) == FALSE )
- {
- LeaveWait();
- QueryBox aBox( this, SVX_RES( RID_SVXQB_DONTEXIST ) );
- if ( aBox.Execute() == RET_NO )
- return;
- }
- else
- LeaveWait();
- }
-
- SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK );
-
- if (aNameCB.GetText().Len())
- aItem.SetName( aNameCB.GetText() );
- else
- aItem.SetName( sURL );
-
- sOldName = aNameCB.GetText();
-
- aItem.SetURL(sURL);
- aItem.SetInsertMode( (SvxLinkInsertMode)nType );
- aItem.SetTargetFrame( GetSelTarget() );
-
- GetBindings().GetDispatcher()->Execute(
- SID_HYPERLINK_SETLINK, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD, &aItem, 0L );
-
- AddToHistory( aNameCB.GetText(), sURL );
-
- if ( sURL != aUrlCB.GetText() )
- aUrlCB.SetText( sURL );
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Selektierten Target Frame Eintrag im Popup ermitteln
- --------------------------------------------------------------------*/
-
-String SvxHyperlinkDlg::GetSelTarget()
-{
- String sTarget;
-
- if (pTargetMenu != NULL)
- {
- for (USHORT i = 1; i <= pTargetMenu->GetItemCount(); i++)
- {
- if (pTargetMenu->IsItemChecked(i))
- {
- sTarget = pTargetMenu->GetItemText(i);
- break;
- }
- }
- }
-
- return sTarget;
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: URL in History der Leiste aufnehmen
- --------------------------------------------------------------------*/
-
-void SvxHyperlinkDlg::AddToHistory(const String& rName, const String& rURL)
-{
- String sName(rName);
-
- if (bHasOldName && sOldName.Len())
- {
- sName = sOldName;
- bHasOldName = FALSE;
- }
-
- if (!sName.Len())
- sName = rURL;
-
- if (rURL.Len())
- {
- USHORT nNamePos = aNameCB.GetEntryPos(sName);
- USHORT nUrlPos = aUrlCB.GetEntryPos(rURL);
- USHORT nPos = COMBOBOX_ENTRY_NOTFOUND;
-
- if (nNamePos != COMBOBOX_ENTRY_NOTFOUND)
- nPos = nNamePos;
- else
- nPos = nUrlPos;
-
- // Alten Eintrag durch neuen Eintrag ersetzen
- if (nPos != COMBOBOX_ENTRY_NOTFOUND)
- {
- aNameCB.RemoveEntry(nPos);
- aUrlCB.RemoveEntry(nPos);
- aNameCB.SetText(rName);
- aUrlCB.SetText(rURL);
- }
-
- aNameCB.InsertEntry(sName, 0);
- aUrlCB.InsertEntry(rURL, 0);
- }
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Bookmark und Search-Button enablen/disablen
- --------------------------------------------------------------------*/
-
-IMPL_LINK( SvxHyperlinkDlg, ComboSelectHdl, ComboBox *, pCombo )
-{
- USHORT nPos = pCombo->GetEntryPos(pCombo->GetText());
-
- if (nPos != COMBOBOX_ENTRY_NOTFOUND)
- {
- aNameCB.SetText(aNameCB.GetEntry(nPos));
- aUrlCB.SetText(aUrlCB.GetEntry(nPos));
-
- EnableLink();
- EnableItem(BTN_INSERT_BOOKMARK, TRUE);
- EnableItem(BTN_INET_SEARCH, TRUE);
- }
- return TRUE;
-}
-
-IMPL_LINK( SvxHyperlinkDlg, ComboModifyHdl, ComboBox *, pCombo )
-{
- BOOL bEnable = TRUE;
-
- if (!pCombo->GetText().Len())
- bEnable = FALSE;
-
- if (pCombo == &aNameCB)
- {
- if (IsItemEnabled(BTN_INET_SEARCH) != bEnable)
- EnableItem(BTN_INET_SEARCH, bEnable);
- }
-
- EnableLink();
-
- if (aUrlCB.GetText().Len())
- bEnable = TRUE;
- else
- bEnable = FALSE;
-
- if (IsItemEnabled(BTN_INSERT_BOOKMARK) != bEnable)
- EnableItem(BTN_INSERT_BOOKMARK, bEnable);
-
- return TRUE;
-}
-
-// --------------------------------------------------------------------
-
-void SvxHyperlinkDlg::DataChanged( const DataChangedEvent& rDCEvt )
-{
- ToolBox::DataChanged( rDCEvt );
-
- if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE))
- SetImages();
-}
-
-// --------------------------------------------------------------------
-
-void SvxHyperlinkDlg::SetImages()
-{
- SetItemImage( BTN_LINK, mpManager->GetImage( BTN_LINK ) );
- SetItemImage( BTN_INSERT_BOOKMARK, mpManager->GetImage( BTN_INSERT_BOOKMARK ) );
- SetItemImage( BTN_INET_SEARCH, mpManager->GetImage( BTN_INET_SEARCH ) );
- SetItemImage( BTN_TARGET, mpManager->GetImage( BTN_TARGET ) );
- SetItemImage( BTN_OPENDIALOG, mpManager->GetImage( BTN_OPENDIALOG ) );
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Comboboxen
- --------------------------------------------------------------------*/
-
-HyperCombo::HyperCombo( SvxHyperlinkDlg* pDialog, const ResId& rResId ) :
- ComboBox( (Window *)pDialog, rResId )
-{
- nRatio = 0;
- pDlg = pDialog;
-
- nMaxWidth = GetSizePixel().Width();
- if (this == &pDlg->aUrlCB)
- nMinWidth = GetTextWidth(String::CreateFromAscii("http://www.stardiv.dewww";));
- else
- nMinWidth = GetTextWidth(String::CreateFromAscii("StarDivision GmbHwww"));
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Comboboxen KeyInput
- --------------------------------------------------------------------*/
-
-long HyperCombo::Notify( NotifyEvent& rNEvt )
-{
- long nHandled = 0;
- static BOOL bLocked = FALSE;
-
- if (bLocked) // Keine weiteren RETURNs annehmen (nicht Reentrant!)
- return nHandled;
-
- bLocked = TRUE;
-
- if ( rNEvt.GetType() == EVENT_KEYINPUT )
- {
- const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
- const KeyCode aKeyCode = pKEvt->GetKeyCode();
-
- if (aKeyCode.GetCode() == KEY_RETURN)
- {
- pDlg->SendToApp(HLINK_DEFAULT);
- nHandled = 1;
- }
- }
- if (this == &pDlg->aNameCB)
- pDlg->sOldName = GetText();
-
- if (!nHandled)
- nHandled = ComboBox::Notify( rNEvt );
-
- bLocked = FALSE;
-
- return nHandled;
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Drag&Drop vor dem Combo-Edit abfangen und weiterleiten
- --------------------------------------------------------------------*/
-
-long HyperCombo::PreNotify( NotifyEvent& rNEvt )
-{
- long nHandled = 0;
-
- nHandled = ComboBox::PreNotify( rNEvt );
-
- return nHandled;
-}
-
-long HyperCombo::CalcResizeWidth( long nW )
-{
- long nNewWidth = Max(nMaxWidth - nW * GetRatio() / 100L, nMinWidth);
-
- if (nNewWidth > nMaxWidth)
- nNewWidth = nMaxWidth;
-
- if (nNewWidth != GetSizePixel().Width())
- return nNewWidth;
- else
- return 0; // Kein Resize notwendig
-}
-
-void HyperCombo::DoResize( long nNewWidth )
-{
- SetSizePixel(Size(nNewWidth, GetSizePixel().Height()));
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: FixedText
- --------------------------------------------------------------------*/
-
-HyperFixedText::HyperFixedText( SvxHyperlinkDlg* pDialog, const ResId& rResId ) :
- FixedInfo( (Window *)pDialog, rResId )
-{
- pDlg = pDialog;
-}
-
-/*--------------------------------------------------------------------
- Beschreibung: Webseite der Search-Engine mit Suchergebnissen anzeigen
- --------------------------------------------------------------------*/
-void SvxHyperlinkDlg::OpenDoc( const String& rURL, SfxViewFrame* pViewFrame )
-{
- SfxStringItem aName( SID_FILE_NAME, rURL );
- SfxStringItem aReferer( SID_REFERER, String::CreateFromAscii("private:user") );
- SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, TRUE );
- SfxBoolItem aSilent( SID_SILENT, TRUE );
- SfxBoolItem aReadOnly( SID_DOC_READONLY, TRUE );
- SfxBoolItem aExternal( SID_BROWSE, TRUE );
- SfxDispatcher* pDisp = SfxViewFrame::Current() ? SfxViewFrame::Current()->GetDispatcher() :
NULL;
-
- if ( pViewFrame )
- {
- SfxFrameItem aView( SID_DOCFRAME, pViewFrame ? &pViewFrame->GetFrame() : NULL );
- if ( pDisp )
- pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
- &aName, &aView, &aNewView, &aSilent, &aReadOnly, &aReferer,
&aExternal, 0L );
- }
- else if ( pDisp )
- pDisp->Execute( SID_OPENDOC, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
- &aName, &aNewView, &aSilent, &aReadOnly, &aReferer, 0L );
-}
-// class SvxHyperlinkDialogWrapper ------------------------------------------
-
-SFX_IMPL_CHILDWINDOW(SvxHyperlinkDlgWrapper, SID_HYPERLINK_INSERT)
-
-/*--------------------------------------------------------------------
- Beschreibung: Wrapper fuer Hyperlinkleiste
- --------------------------------------------------------------------*/
-
-SvxHyperlinkDlgWrapper::SvxHyperlinkDlgWrapper( Window* _pParent, USHORT nId,
- SfxBindings* _pBindings, SfxChildWinInfo*
/*pInfo*/ ) :
-
- SfxChildWindow( _pParent, nId )
-
-{
- pWindow = new SvxHyperlinkDlg( _pBindings, _pParent );
- eChildAlignment = SFX_ALIGN_TOP;
-}
-
-SfxChildWinInfo SvxHyperlinkDlgWrapper::GetInfo() const
-{
- SfxChildWinInfo aInfo = SfxChildWindow::GetInfo();
- return aInfo;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/hyprlink.hrc b/svx/source/dialog/hyprlink.hrc
deleted file mode 100644
index 87f7c9f..0000000
--- a/svx/source/dialog/hyprlink.hrc
+++ /dev/null
@@ -1,58 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_HYPERLINK_HRC
-#define _SVX_HYPERLINK_HRC
-
-#ifndef _SVX_SVXIDS_HRC
-#include <svx/svxids.hrc>
-#endif
-
-#ifndef _SFXSIDS_HRC
-#include <sfx2/sfxsids.hrc>
-#endif
-
-// defines ------------------------------------------------------------------
-
-#define CB_NAME 1
-#define FT_URL 2
-#define CB_URL 3
-#define BTN_LINK SID_HLINKBAR_LINK
-#define BTN_INSERT_BOOKMARK SID_HLINKBAR_BOOKMARK
-#define BTN_INET_SEARCH SID_HLINKBAR_SEARCH
-#define TB 7
-#define MN_FIELD 8
-#define MN_BUTTON 9
-#define BTN_TARGET SID_HLINKBAR_TARGET
-#define STR_ADDRESS 11
-#define STR_EXPLORER 12
-#define STR_BOOKMARK_SEARCH 13
-
-#define BTN_OPENDIALOG SID_HYPERLINK_DIALOG
-
-
-#endif
-
diff --git a/svx/source/dialog/hyprlink.hxx b/svx/source/dialog/hyprlink.hxx
deleted file mode 100644
index b37c2cf..0000000
--- a/svx/source/dialog/hyprlink.hxx
+++ /dev/null
@@ -1,45 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _SVX_DLG_HYPERLINK_HXX
-#define _SVX_DLG_HYPERLINK_HXX
-
-#include <sfx2/childwin.hxx>
-#include "svx/svxdllapi.h"
-
-// class SvxHyperlinkDialogWrapper ---------------------------------------
-class SVX_DLLPUBLIC SvxHyperlinkDlgWrapper : public SfxChildWindow
-{
-public:
- SvxHyperlinkDlgWrapper( Window*pParent, USHORT nId,
- SfxBindings* pBindings, SfxChildWinInfo* pInfo );
- SFX_DECL_CHILDWINDOW(SvxHyperlinkDlgWrapper);
-};
-#endif // _SVX_DLG_HYPERLINK_HXX
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src
deleted file mode 100644
index 75d6775..0000000
--- a/svx/source/dialog/hyprlink.src
+++ /dev/null
@@ -1,167 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
- // include ------------------------------------------------------------------
-#include <svx/dialogs.hrc>
-#include "hyprlink.hrc"
-#include "helpid.hrc"
-#include <svx/svxids.hrc>
-
- // pragma -------------------------------------------------------------------
-
- // RID_SVXDLG_HYPERLINK ------------------------------------------------------
-ToolBox RID_SVXDLG_HYPERLINK
-{
- OutputSize = TRUE ;
- Hide = TRUE;
-
- // Dockable = TRUE ;
- // Closeable = TRUE ;
- // Moveable = TRUE ;
- // Sizeable = TRUE ;
- // EnableResizing = TRUE ;
-
- SVLook = TRUE ;
- Border = TRUE ;
- Size = MAP_APPFONT ( 410 , 17 ) ;
- Scroll = TRUE ;
- HelpID = HID_OFA_HYPERLINK_DLG ;
-
- Text [ en-US ] = "Insert Hyperlink" ;
-
- ComboBox CB_NAME
- {
- HelpID = HID_OFA_HYPERLINK_NAME ;
- Pos = MAP_APPFONT ( 2 , 3 ) ;
- Size = MAP_APPFONT ( 100 , 60 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- AutoSize = TRUE ;
- AutoHScroll = TRUE ;
- DDExtraWidth = TRUE ;
- QuickHelpText [ en-US ] = "URL Name" ;
- };
- FixedText FT_URL
- {
- HelpID = HID_OFA_HYPERLINK_URL_TXT ;
- Pos = MAP_APPFONT ( 105 , 5 ) ;
- Size = MAP_APPFONT ( 16 , 10 ) ;
- Text [ en-US ] = "URL:" ;
- };
- ComboBox CB_URL
- {
- HelpID = HID_OFA_HYPERLINK_URL ;
- Pos = MAP_APPFONT ( 121 , 3 ) ;
- Size = MAP_APPFONT ( 204 , 60 ) ;
- TabStop = TRUE ;
- DropDown = TRUE ;
- AutoSize = TRUE ;
- AutoHScroll = TRUE ;
- DDExtraWidth = TRUE ;
- QuickHelpText [ en-US ] = "Internet URLs" ;
- };
- ItemList =
- {
- ToolBoxItem
- {
- HelpID = HID_OFA_HYPERLINK_TARGET ;
- Identifier = BTN_TARGET ;
- DropDown = TRUE ;
- Text [ en-US ] = "Target Frame" ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- HelpID = SID_HYPERLINK_SETLINK ;
- Identifier = BTN_LINK ;
- Disable = TRUE ;
- DropDown = TRUE ;
- Text [ en-US ] = "Hyperlink" ;
- };
- ToolBoxItem
- {
- HelpID = SID_CREATELINK ;
- Identifier = BTN_INSERT_BOOKMARK ;
- Disable = TRUE ;
- Hide = TRUE;
- Text [ en-US ] = "Link" ;
- };
- ToolBoxItem
- {
- HelpID = HID_OFA_HYPERLINK_SEARCH ;
- Identifier = BTN_INET_SEARCH ;
- Disable = TRUE ;
- DropDown = TRUE ;
- Text [ en-US ] = "Find" ;
- };
- };
- String STR_ADDRESS
- {
- Text [ en-US ] = "Address Book" ;
- };
- String STR_EXPLORER
- {
- Text [ en-US ] = "Bookmark folder" ;
- };
- String STR_BOOKMARK_SEARCH
- {
- Text [ en-US ] = "Search in bookmarks";
- };
-};
- // PopupMenu -------------------------------------------------------------
-Menu RID_SVXMN_HYPERLINK
-{
- ItemList =
- {
- MenuItem
- {
- Identifier = MN_FIELD ;
- Text [ en-US ] = "As Text" ;
- };
- MenuItem
- {
- Identifier = MN_BUTTON ;
- Text [ en-US ] = "As Button" ;
- };
- };
-};
-QueryBox RID_SVXQB_DONTEXIST
-{
- BUTTONS = WB_YES_NO ;
- DEFBUTTON = WB_DEF_YES ;
- Message [ en-US ] = "This URL does not exist.\nInsert anyway?" ;
-};
-
-
-
-
-
-
-
-
diff --git a/svx/source/dialog/makefile.mk b/svx/source/dialog/makefile.mk
index 3805de9..2f1d36c 100644
--- a/svx/source/dialog/makefile.mk
+++ b/svx/source/dialog/makefile.mk
@@ -52,7 +52,6 @@ SRC1FILES = \
fontwork.src \
frmsel.src \
hdft.src \
- hyprlink.src \
imapdlg.src \
langbox.src \
language.src \
@@ -106,7 +105,6 @@ LIB2OBJFILES= \
$(SLO)$/grfflt.obj \
$(SLO)$/hdft.obj \
$(SLO)$/hyperdlg.obj \
- $(SLO)$/hyprlink.obj \
$(SLO)$/imapdlg.obj \
$(SLO)$/imapwnd.obj \
$(SLO)$/linkwarn.obj \
--
1.7.1
From a0dc8343fe9a60b9d34b31d9621e1bb878869f86 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:24:32 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar from libs-gui
Removed all code related to hyperlink bar from libs-gui repo.
---
toolkit/src2xml/src.lst | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/toolkit/src2xml/src.lst b/toolkit/src2xml/src.lst
index 58316eb..9811eb7 100644
--- a/toolkit/src2xml/src.lst
+++ b/toolkit/src2xml/src.lst
@@ -336,7 +336,6 @@
../../svx/source/dialog/macropg.src
../../svx/source/dialog/fontsubs.src
../../svx/source/dialog/align.src
-../../svx/source/dialog/hyprlink.src
../../svx/source/dialog/imapdlg.src
../../svx/source/dialog/dlgctrl.src
../../svx/source/dialog/tabstpge.src
--
1.7.1
From 87d7c7ba064aa803550784e38acb92bc043b1e56 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:25:35 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar from sdk
Removed code related to hyperlink bar from sdk repo.
---
odk/examples/OLE/activex/SOActiveX.cpp | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/odk/examples/OLE/activex/SOActiveX.cpp b/odk/examples/OLE/activex/SOActiveX.cpp
index ef9a2ef..cfadfca 100644
--- a/odk/examples/OLE/activex/SOActiveX.cpp
+++ b/odk/examples/OLE/activex/SOActiveX.cpp
@@ -49,14 +49,12 @@ OLECHAR* pSlotUrl[BARS_NUMBER] =
{L"slot:5910" // SID_TOGGLEFUNCTIONBAR
,L"slot:5920" // SID_TOGGLESTATUSBAR
,L"slot:6661" // SID_TOGGLE_MENUBAR
-// ,L"slot:10603" // SID_HYPERLINK_INSERT
};
OLECHAR* pSlotName[BARS_NUMBER] =
{L"FunctionBarVisible" // SID_TOGGLEFUNCTIONBAR
,L"StatusBarVisible" // SID_TOGGLESTATUSBAR
,L"MenuBarVisible" // SID_TOGGLE_MENUBAR
-// ,L"InsertHyperlink" //
SID_HYPERLINK_INSERT
};
--
1.7.1
From 12062acc41da0ee71ae43beca5ab19f38e711b03 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_eusebio@yahoo.co.uk>
Date: Thu, 10 Feb 2011 08:26:26 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar from testing
Removed code related to hyperlink bar from sdk repo.
---
testautomation/global/sid/all.sid | 1 -
testautomation/global/sid/bars.sid | 2 --
testautomation/global/sid/e_all.sid | 2 --
testautomation/global/win/bars.win | 2 --
4 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid
index 5ee1c15..d4e7bfa 100644
--- a/testautomation/global/sid/all.sid
+++ b/testautomation/global/sid/all.sid
@@ -154,7 +154,6 @@ BearbeitenDiagrammdaten SID_DIAGRAM_DATA
' **** Alle
AnsichtMassstab SID_ATTR_ZOOM
AnsichtBrowser SID_BROWSER
-AnsichtHyperlinkleiste SID_HYPERLINK_INSERT
AnsichtStatusleiste SID_TOGGLESTATUSBAR SID_TOGGLESTATUSBAR
AnsichtGanzerBildschirm SID_WIN_FULLSCREEN SID_FULLSCREEN
diff --git a/testautomation/global/sid/bars.sid b/testautomation/global/sid/bars.sid
index 2c26b9c..1afbd55 100755
--- a/testautomation/global/sid/bars.sid
+++ b/testautomation/global/sid/bars.sid
@@ -354,7 +354,6 @@ WL_WRITER_AutomatischePruefung SID_AUTOSPELL_CHECK
WL_WRITER_SuchenUndErsetzen SID_SEARCH_DLG
WL_WRITER_SteuerzeichenEinAus FN_VIEW_META_CHARS
WL_WRITER_GrafikenAusschalten FN_VIEW_GRAPHIC
-WL_WRITER_Hyperlink SID_HYPERLINK_INSERT
WL_WRITER_OnlineLayout SID_BROWSER_MODE
WL_WRITER_SchattencursorEinschalten FN_SHADOWCURSOR
@@ -431,7 +430,6 @@ WL_WEB_Kontrollfelder SID_CHOOSE_CONTROLS
WL_WEB_SuchenUndErsetzen SID_SEARCH_DLG
WL_WEB_SteuerzeichenEinAus FN_VIEW_META_CHARS
WL_WEB_GrafikenAusschalten FN_VIEW_GRAPHIC
-WL_WEB_Hyperlink SID_HYPERLINK_INSERT
WL_WEB_OnlineLayout SID_BROWSER_MODE
WL_WEB_SchattencursorEinschalten FN_SHADOWCURSOR
WL_WEB_DruckLayout FN_PRINT_LAYOUT
diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid
index d7215aa..c270d0d 100644
--- a/testautomation/global/sid/e_all.sid
+++ b/testautomation/global/sid/e_all.sid
@@ -153,7 +153,6 @@ EditDataRanges .uno:DataRanges
ViewZoom SID_ATTR_ZOOM
ViewBeamer SID_BROWSER
ViewDataSources .uno:ViewDataSourceBrowser
-ViewToolbarsHyperlinkbar .uno:InsertHyperlink
ViewToolbarsConfigure .uno:ConfigureDialog
ViewToolbarsStatusbar SID_TOGGLESTATUSBAR
ViewFullScreen SID_WIN_FULLSCREEN
@@ -200,7 +199,6 @@ ViewToolbarsTable .uno:AvailableToolbars?Toolbar:string=tableobjectbar
ViewToolbarsTextFormatting .uno:AvailableToolbars?Toolbar:string=textobjectbar
ViewToolbarsTextObject .uno:AvailableToolbars?Toolbar:string=drawtextobjectbar
ViewToolbarsTools .uno:AvailableToolbars?Toolbar:string=toolbar
-ViewToolbarsInsertHyperlink .uno:InsertHyperlink
ViewToolbarsInsertFormula .uno:InsertFormula
ViewToolbarsCustomize .uno:ConfigureDialog
ViewToolbarsPreviewbar .uno:AvailableToolbars?Toolbar:string=previewbar
diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win
index 964027c..1c60984 100755
--- a/testautomation/global/win/bars.win
+++ b/testautomation/global/win/bars.win
@@ -1044,7 +1044,6 @@ GalleryButton .uno:Gallery
Gesamtbild SID_WIN_FULLSCREEN
GestalterButton SID_STYLE_DESIGNER
HyperlinkDialog .uno:HyperlinkDialog
-HyperlinkLeisteButton SID_HYPERLINK_INSERT
Kopieren .uno:Copy
NavigatorButton .uno:Navigator
Neu .uno:AddDirect
@@ -1252,7 +1251,6 @@ Hinunterschieben SID_OUTLINE_DOWN
Hinunterstufen SID_OUTLINE_RIGHT
Hochschieben SID_OUTLINE_UP
Hochstufen SID_OUTLINE_LEFT
-Hyperlink .uno:InsertHyperlink
Insert .uno:InsertToolbox
InsertGraphic .uno:InsertGraphic
Interaktion .uno:AnimationObjects
--
1.7.1
Context
- [Libreoffice] Fw: [PATCH] Remove obsolete Hyperlink Bar - final patches · Alfonso Eusebio
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.