[Libreoffice-commits] .: 2 commits - sd/inc sd/source

Thu Feb 10 00:37:13 PST 2011

sd/inc/pch/precompiled_sd.hxx            |    1 -
 sd/source/ui/app/sddll2.cxx              |    2 --
 sd/source/ui/docshell/docshell.cxx       |    1 -
 sd/source/ui/docshell/grdocsh.cxx        |    1 -
 sd/source/ui/slideshow/slideshowimpl.cxx |    2 --
 sd/source/ui/view/drviewsb.cxx           |    1 -
 sd/source/ui/view/drvwshrg.cxx           |    3 ---
 sd/source/ui/view/outlnvsh.cxx           |    2 --
 8 files changed, 13 deletions(-)

New commits:
commit 6cc290dc2e99513b140d3b3ec3808484eaf08ed6
Author: Alfonso Eusebio <alfonso_eusebio at yahoo.co.uk>
Date:   Wed Feb 9 17:16:20 2011 +0000

    Remove includes related to Hyperlink Bar in impress_draw
    
    Removed includes dependant on hyperlink bar headers.

diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 0c897bb..3069268 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -623,7 +623,6 @@
 #include "svx/grafctrl.hxx"
 #include "svx/hlnkitem.hxx"
 #include "svx/hyperdlg.hxx"
-#include "svx/hyprlink.hxx"
 #include "svx/imapdlg.hxx"
 #include "svx/itemwin.hxx"
 #include "svx/langbox.hxx"
diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx
index 445029d..b6fe3b0 100644
--- a/sd/source/ui/app/sddll2.cxx
+++ b/sd/source/ui/app/sddll2.cxx
@@ -44,7 +44,6 @@
 #include <svx/fontwork.hxx>
 #include <svx/colrctrl.hxx>
 #include <svx/verttexttbxctrl.hxx>
-#include <svx/hyprlink.hxx>
 #include <svx/hyperdlg.hxx>
 #include <svx/fillctrl.hxx>
 #include <svx/linectrl.hxx>
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index a3f2fb1..e44e109 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -64,7 +64,6 @@
 #include <svx/colrctrl.hxx>
 #include <svx/bmpmask.hxx>
 #include <svx/srchdlg.hxx>
-#include <svx/hyprlink.hxx>
 #include <svx/hyperdlg.hxx>
 #include <svx/galbrws.hxx>
 #include "NavigatorChildWindow.hxx"
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index 3c34b29..0ff45d3 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -33,7 +33,6 @@
 #include <svx/svdlayer.hxx>
 #include <svx/svxids.hrc>
 
-#include <svx/hyprlink.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <svx/hlnkitem.hxx>
 #include <tools/urlobj.hxx>
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index 84a1cf3..a2ca8c6 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -42,7 +42,6 @@
 #include <svx/tbxcustomshapes.hxx>
 
 #include <svx/svxids.hrc>
-#include <svx/hyprlink.hxx>
 #include <svx/hyperdlg.hxx>
 #include <avmedia/mediaplayer.hxx>
 
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 510a06a..c0f2d54 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -35,7 +35,6 @@
 #include <memory>
 
 #include "app.hrc"
-#include <svx/hyprlink.hxx>
 #include <svx/hyperdlg.hxx>
 #include <svx/zoomslideritem.hxx>
 
commit 70da661ce8303ae0e553753d853d8ce495a42fc9
Author: Alfonso Eusebio <alfonso_eusebio at yahoo.co.uk>
Date:   Wed Feb 9 15:55:11 2011 +0000

    Remove obsolete Hyperlink Bar from impress_draw
    
    Removed hyperlink bar references from impress and draw.
    Menu entry appears greyed out until it gets removed from core modules.

diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx
index 39bef70..445029d 100644
--- a/sd/source/ui/app/sddll2.cxx
+++ b/sd/source/ui/app/sddll2.cxx
@@ -135,7 +135,6 @@ void SdDLL::RegisterControllers()
     SvxBmpMaskChildWindow::RegisterChildWindow(0, pMod);
     GalleryChildWindow::RegisterChildWindow(0, pMod);
     SvxIMapDlgChildWindow::RegisterChildWindow(0, pMod);
-    SvxHyperlinkDlgWrapper::RegisterChildWindow(0, pMod, SFX_CHILDWIN_FORCEDOCK);
     SvxHlinkDlgWrapper::RegisterChildWindow(0, pMod);
     ::sd::SpellDialogChildWindow::RegisterChildWindow(0, pMod);
     ::avmedia::MediaPlayer::RegisterChildWindow(0, pMod);
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 3c40042..edb0e3e 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -91,7 +91,6 @@ using namespace sd;
 SFX_IMPL_INTERFACE(DrawDocShell, SfxObjectShell, SdResId(0))
 {
     SFX_CHILDWINDOW_REGISTRATION(SvxSearchDialogWrapper::GetChildWindowId());
-        SFX_CHILDWINDOW_REGISTRATION(SID_HYPERLINK_INSERT);
 }
 
 
diff --git a/sd/source/ui/docshell/grdocsh.cxx b/sd/source/ui/docshell/grdocsh.cxx
index 3c6110a..9c50d67 100644
--- a/sd/source/ui/docshell/grdocsh.cxx
+++ b/sd/source/ui/docshell/grdocsh.cxx
@@ -58,7 +58,6 @@ TYPEINIT1(GraphicDocShell, DrawDocShell);
 SFX_IMPL_INTERFACE(GraphicDocShell, SfxObjectShell, SdResId(0))
 {
     SFX_CHILDWINDOW_REGISTRATION(SID_SEARCH_DLG);
-    SFX_CHILDWINDOW_REGISTRATION( SID_HYPERLINK_INSERT );
 }
 
 SFX_IMPL_OBJECTFACTORY( GraphicDocShell, SvGlobalName(SO3_SDRAW_CLASSID_60), SFXOBJECTSHELL_STD_NORMAL, "sdraw" )
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 4a2391f..a3f2fb1 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2684,7 +2684,6 @@ FncGetChildWindowId aShowChilds[] =
     &SvxSearchDialogWrapper::GetChildWindowId,
     &SvxBmpMaskChildWindow::GetChildWindowId,
     &SvxIMapDlgChildWindow::GetChildWindowId,
-    &SvxHyperlinkDlgWrapper::GetChildWindowId,
     &SvxHlinkDlgWrapper::GetChildWindowId,
     &SfxTemplateDialogWrapper::GetChildWindowId,
     &GalleryChildWindow::GetChildWindowId
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index 1306285..84a1cf3 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -89,7 +89,6 @@ SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL))
     SFX_CHILDWINDOW_REGISTRATION( SvxBmpMaskChildWindow::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( GalleryChildWindow::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( SvxIMapDlgChildWindow::GetChildWindowId() );
-    SFX_CHILDWINDOW_REGISTRATION( SvxHyperlinkDlgWrapper::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( SvxHlinkDlgWrapper::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( ::sd::SpellDialogChildWindow::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG );
@@ -115,7 +114,6 @@ SFX_IMPL_INTERFACE(GraphicViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL)) //SOH
     SFX_CHILDWINDOW_REGISTRATION( SvxBmpMaskChildWindow::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( GalleryChildWindow::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( SvxIMapDlgChildWindow::GetChildWindowId() );
-    SFX_CHILDWINDOW_REGISTRATION( SvxHyperlinkDlgWrapper::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( SvxHlinkDlgWrapper::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( ::sd::SpellDialogChildWindow::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG );
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index c9cdbb5..510a06a 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -129,7 +129,6 @@ SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell, SdResId(STR_OUTLINEVIEWSHELL))
     SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC,
                                 SdResId(RID_DRAW_VIEWER_TOOLBOX) );
     SFX_CHILDWINDOW_REGISTRATION( SfxTemplateDialogWrapper::GetChildWindowId() );
-    SFX_CHILDWINDOW_REGISTRATION( SvxHyperlinkDlgWrapper::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( SvxHlinkDlgWrapper::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( ::sd::SpellDialogChildWindow::GetChildWindowId() );
     SFX_CHILDWINDOW_REGISTRATION( SID_SEARCH_DLG );
