Hi,
Please find attached patches that removes the Hyperlink Bar from writer (made
available under LGPLv3+/MPL).
Patches have been rebased with origin/master, compiled and tested before
submission.
I've started removing the references to the Hyperlink Bar from the apps. Once
that's done I'll remove the implementation and menu entries in core modules.
After applying this patch the menu entry to activate the bar is still present
but greyed out. This should disappear once core modules are done.
The patch that removes the includes was created after the other one (apologies
for generating two patches).
Regards,
Alfonso
From d939187f1d850dc31ba320c576f161f211a5b628 Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_euse...@yahoo.co.uk>
Date: Wed, 9 Feb 2011 16:13:23 +0000
Subject: [PATCH] Remove obsolete Hyperlink Bar from writer
Removed hyperlink bar references form writer.
Menu entry appears greyed out until it gets removed from core modules.
---
sw/source/ui/app/apphdl.cxx | 1 -
sw/source/ui/app/docsh.cxx | 1 -
sw/source/ui/app/swmodule.cxx | 1 -
3 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 4676f13..805b25e 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -140,7 +140,6 @@ using namespace ::com::sun::star;
SFX_IMPL_INTERFACE( SwModule, SfxModule, SW_RES(RID_SW_NAME) )
{
- SFX_CHILDWINDOW_REGISTRATION(SvxHyperlinkDlgWrapper::GetChildWindowId());
SFX_STATUSBAR_REGISTRATION(SW_RES(CFG_STATUSBAR));
SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION |
SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER,
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index ab1401a..0037cb1 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -133,7 +133,6 @@ using namespace ::com::sun::star::container;
SFX_IMPL_INTERFACE( SwDocShell, SfxObjectShell, SW_RES(0) )
{
- SFX_CHILDWINDOW_REGISTRATION( SID_HYPERLINK_INSERT );
}
TYPEINIT2(SwDocShell, SfxObjectShell, SfxListener);
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 564d720..d11b782 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -390,7 +390,6 @@ void SwDLL::RegisterControls()
SvxIMapDlgChildWindow::RegisterChildWindow( sal_False, pMod );
SvxSearchDialogWrapper::RegisterChildWindow( sal_False, pMod );
SvxHlinkDlgWrapper::RegisterChildWindow( sal_False, pMod );
- SvxHyperlinkDlgWrapper::RegisterChildWindow( sal_False, pMod, SFX_CHILDWIN_FORCEDOCK );
SvxFontWorkChildWindow::RegisterChildWindow( sal_False, pMod );
SwFldDlgWrapper::RegisterChildWindow( sal_False, pMod );
SwFldDataOnlyDlgWrapper::RegisterChildWindow( sal_False, pMod );
--
1.7.1
From 33e46ddd41c0570863005cf3bef16cd933ecb78e Mon Sep 17 00:00:00 2001
From: Alfonso Eusebio <alfonso_euse...@yahoo.co.uk>
Date: Wed, 9 Feb 2011 17:33:57 +0000
Subject: [PATCH] Remove includes related to Hyperlink Bar from writer
Removed includes for hyperlink header files from writer.
---
sw/inc/pch/precompiled_sw.hxx | 1 -
sw/source/ui/app/apphdl.cxx | 1 -
sw/source/ui/app/swmodule.cxx | 1 -
3 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index ee7ffa5..fccfc1f 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -752,7 +752,6 @@
#include "svtools/htmlcfg.hxx"
#include "svx/htmlmode.hxx"
#include "svx/hyperdlg.hxx"
-#include "svx/hyprlink.hxx"
#include "svx/imapdlg.hxx"
#include "editeng/itemtype.hxx"
#include "svx/langbox.hxx"
diff --git a/sw/source/ui/app/apphdl.cxx b/sw/source/ui/app/apphdl.cxx
index 805b25e..a0cc824 100644
--- a/sw/source/ui/app/apphdl.cxx
+++ b/sw/source/ui/app/apphdl.cxx
@@ -49,7 +49,6 @@
#include <svl/eitem.hxx>
#include <svl/whiter.hxx>
#include <svl/isethint.hxx>
-#include <svx/hyprlink.hxx>
#include <sfx2/request.hxx>
#include <sfx2/fcontnr.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index d11b782..994bca5 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -58,7 +58,6 @@
#include <svx/tbxcolor.hxx>
#include <svx/clipboardctl.hxx>
#include <svx/lboxctrl.hxx>
-#include <svx/hyprlink.hxx>
#include <svx/tbxcustomshapes.hxx>
#include <svx/imapdlg.hxx>
#include <svx/srchdlg.hxx>
--
1.7.1
_______________________________________________
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
