#80274# gallery child window

5 files changed, 42 insertions, 51 deletions

diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi
index 908477bb19c2..641f27c43d02 100644
--- a/sc/sdi/tabvwsh.sdi
+++ b/sc/sdi/tabvwsh.sdi
@@ -3,7 +3,7 @@
  // StarCalc
  //
  // (C) 1994 StarDivision GmbH, Hamburg, Germany
- // $Author: hr $ $Date: 2000-09-18 16:44:52 $ $Revision: 1.1.1.1 $
+ // $Author: nn $ $Date: 2000-11-14 15:35:03 $ $Revision: 1.2 $
  // $Logfile:   T:/sc/sdi/tabvwsh.sdv  $ $Workfile:   tabvwsh.sdi  $
  //----------------------------------------------------------------------------
 
@@ -80,7 +80,7 @@ interface BaseSelection : Selection
     SID_INSERT_SIMAGE       [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
     SID_INSERT_SMATH        [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
     SID_GALLERY_FORMATS     [ ExecMethod = ExecGallery; StateMethod = GetGalleryState; ]
-    SID_GALLERY             [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
+    SID_GALLERY             [ ExecMethod = ExecChildWin; StateMethod = GetChildWinState; ]
     SID_DRAW_NOTEEDIT       [ ExecMethod = ExecDraw; StateMethod = GetDrawState; ]
     SID_OBJECTRESIZE        [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ]
 
@@ -240,43 +240,4 @@ shell ScTabViewShell : SfxViewShell
 
 }
 
-/*------------------------------------------------------------------------
-    $Log: not supported by cvs2svn $
-    Revision 1.250  2000/06/21 12:33:27  nn
-    #75361# slots for grid options moved to tabvwsh
-
-    Revision 1.249  2000/05/11 17:01:05  nn
-    slots for old basic api removed2
-
-    Revision 1.248  1999/08/24 14:12:30  ANK
-    #68244# JumpToTable moved
-
-
-      Rev 1.247   24 Aug 1999 16:12:30   ANK
-   #68244# JumpToTable moved
-
-      Rev 1.246   09 Aug 1999 19:07:32   NN
-   sound/video
-
-      Rev 1.245   21 Jun 1999 20:38:22   ANK
-   #66547# Slot's moved
-
-      Rev 1.244   02 Jun 1999 21:42:24   ANK
-   #66547# SubShells
-
-------------------------------------------------------------------------*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 6409a9448c75..47dc523f53cd 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: scdll.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: nn $ $Date: 2000-10-20 18:23:17 $
+ *  last change: $Author: nn $ $Date: 2000-11-14 15:36:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,6 +111,7 @@
 #include <svx/fntctl.hxx>
 #include <svx/fntszctl.hxx>
 #include <svx/grafctrl.hxx>
+#include <svx/galbrws.hxx>
 
 #include "tbinsert.hxx"
 
@@ -268,6 +269,7 @@ void ScDLL::Init()
     SvxFontWorkChildWindow      ::RegisterChildWindow(FALSE, pMod);
     SvxHyperlinkDlgWrapper      ::RegisterChildWindow(FALSE, pMod);
     SvxIMapDlgChildWindow       ::RegisterChildWindow(FALSE, pMod);
+    GalleryChildWindow          ::RegisterChildWindow(FALSE, pMod);
 
     //  Edit-Engine-Felder, soweit nicht schon in OfficeApplication::Init
 
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index e1653c753427..2ecde896c254 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwsh.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: nn $ $Date: 2000-11-13 19:25:51 $
+ *  last change: $Author: nn $ $Date: 2000-11-14 15:39:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -297,6 +297,9 @@ public:
     void            ExecGallery(SfxRequest& rReq);      // StarGallery
     void            GetGalleryState(SfxItemSet& rSet);
 
+    void            ExecChildWin(SfxRequest& rReq);
+    void            GetChildWinState( SfxItemSet& rSet );
+
     void            ExecImageMap( SfxRequest& rReq );
     void            GetImageMapState( SfxItemSet& rSet );
 
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index f687d715c603..3fb7aa070798 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwsh.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mh $ $Date: 2000-11-14 10:36:48 $
+ *  last change: $Author: nn $ $Date: 2000-11-14 15:41:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,6 +69,7 @@
 // INCLUDE ---------------------------------------------------------------
 
 #include "scitems.hxx"
+#include <svx/galbrws.hxx>
 #include <svx/imapdlg.hxx>
 #include <svx/srchitem.hxx>
 #include <offmgr/sbasltid.hrc>
@@ -122,6 +123,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell,SfxViewShell,ScResId(SCSTR_TABVIEWSHELL))
     SFX_CHILDWINDOW_REGISTRATION(ScSimpleRefDlgWrapper::GetChildWindowId());
     SFX_CHILDWINDOW_REGISTRATION(SID_SEARCH_DLG);
     SFX_CHILDWINDOW_REGISTRATION(SID_HYPERLINK_DIALOG);
+    SFX_CHILDWINDOW_REGISTRATION(GalleryChildWindow::GetChildWindowId());
 }
 
 SFX_IMPL_VIEWFACTORY( ScTabViewShell, ScResId(STR_NONAME) )
diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx
index eccae187f783..aa7c39b70852 100644
--- a/sc/source/ui/view/tabvwsh9.cxx
+++ b/sc/source/ui/view/tabvwsh9.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tabvwsh9.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: nn $ $Date: 2000-09-22 18:31:22 $
+ *  last change: $Author: nn $ $Date: 2000-11-14 15:41:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -353,12 +353,11 @@
 #define _SVX_TAB_LINE_HXX
 #define _SVX_TRANSFRM_HXX
 
-class SbxArray;
-
 // INCLUDE ---------------------------------------------------------------
 
 #include <svx/svdmark.hxx>
 #include <svx/svdview.hxx>
+#include <svx/galbrws.hxx>
 #include <sfx2/bindings.hxx>
 #include <sfx2/request.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -389,6 +388,30 @@ const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg );
 
 //------------------------------------------------------------------
 
+void ScTabViewShell::ExecChildWin(SfxRequest& rReq)
+{
+    USHORT nSlot = rReq.GetSlot();
+    switch(nSlot)
+    {
+        case SID_GALLERY:
+        {
+            SfxViewFrame* pThisFrame = GetViewFrame();
+            pThisFrame->ToggleChildWindow( GalleryChildWindow::GetChildWindowId() );
+            pThisFrame->GetBindings().Invalidate( SID_GALLERY );
+            rReq.Ignore();
+        }
+        break;
+    }
+}
+
+void ScTabViewShell::GetChildWinState( SfxItemSet& rSet )
+{
+    if( SFX_ITEM_AVAILABLE == rSet.GetItemState( SID_GALLERY ) )
+    {
+        USHORT nId = GalleryChildWindow::GetChildWindowId();
+        rSet.Put( SfxBoolItem( SID_GALLERY, GetViewFrame()->HasChildWindow( nId ) ) );
+    }
+}
 
 //------------------------------------------------------------------