#98888#: allow Showing Childwindow without getting focus

3 files changed, 28 insertions, 74 deletions

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 91f085971096..252b8bdfb431 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appopen.cxx,v $
  *
- *  $Revision: 1.50 $
+ *  $Revision: 1.51 $
  *
- *  last change: $Author: mba $ $Date: 2002-06-04 07:50:20 $
+ *  last change: $Author: mba $ $Date: 2002-07-03 16:28:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1365,49 +1365,3 @@ SfxViewFrame *SfxApplication::CreateView_Impl
     SfxFrame* pFrame = SfxTopFrame::Create( pDoc, 0, bHidden, pSet );
     return pFrame->GetCurrentViewFrame();
 }
-
-//--------------------------------------------------------------------
-
-void SfxApplication::CreateDocState_Impl(SfxItemSet &rSet)
-{
-    DBG_MEMTEST();
-    const USHORT *pRanges = rSet.GetRanges();
-    DBG_ASSERT(pRanges, "Set ohne Bereich");
-    while(*pRanges)
-    {
-        for(USHORT nWhich = *pRanges++; nWhich <= *pRanges; ++nWhich)
-        {
-            switch(nWhich)
-            {
-                case SID_CURRENT_URL:
-                {
-                    SfxViewFrame *pFrame = pViewFrame;
-                    if ( pFrame )
-                    {
-                        // Bei internem InPlace den ContainerFrame nehmen
-                        if ( pFrame->GetParentViewFrame_Impl() )
-                            pFrame = pFrame->GetParentViewFrame_Impl();
-
-                        // URL des aktiven Frames anzeigen; wenn es ein Frame
-                        // in einem als Frameset implementierten Dokument ist, dann
-                        // die URL des Framesets anzeigen ( Explorer, Mail ).
-                        if ( pFrame->GetParentViewFrame() )
-                        {
-                            if ( pFrame->GetParentViewFrame()->GetViewShell()->
-                                IsImplementedAsFrameset_Impl() )
-                            pFrame = pFrame->GetParentViewFrame();
-                        }
-
-                        rSet.Put( SfxStringItem( nWhich, pFrame->GetActualPresentationURL_Impl() ) );
-                    }
-                    else
-                        rSet.Put( SfxStringItem( nWhich, String() ) );
-                    break;
-                }
-            }
-        }
-        ++pRanges;
-    }
-}
-
-
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx
index 140f8df401ea..6236083cda14 100644
--- a/sfx2/source/appl/childwin.cxx
+++ b/sfx2/source/appl/childwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: childwin.cxx,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: mba $ $Date: 2002-01-08 08:47:29 $
+ *  last change: $Author: mba $ $Date: 2002-07-03 16:28:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -713,18 +713,18 @@ void SfxChildWindow::Hide()
 
 
 
-void SfxChildWindow::Show()
+void SfxChildWindow::Show( USHORT nFlags )
 {
     switch ( pWindow->GetType() )
     {
         case RSC_DOCKINGWINDOW :
-            ((DockingWindow*)pWindow)->Show();
+            ((DockingWindow*)pWindow)->Show( TRUE, nFlags );
             break;
         case RSC_TOOLBOX :
-            ((ToolBox*)pWindow)->Show();
+            ((ToolBox*)pWindow)->Show( TRUE, nFlags );
             break;
         default:
-            pWindow->Show();
+            pWindow->Show( TRUE, nFlags );
             break;
     }
 }
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 22769347b565..db9002b8101e 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: workwin.cxx,v $
  *
- *  $Revision: 1.32 $
+ *  $Revision: 1.33 $
  *
- *  last change: $Author: mba $ $Date: 2002-06-25 16:13:03 $
+ *  last change: $Author: mba $ $Date: 2002-07-03 16:28:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -881,16 +881,16 @@ void SfxWorkWindow::ShowChilds_Impl()
                 switch ( pCli->pWin->GetType() )
                 {
                     case RSC_DOCKINGWINDOW :
-                        ((DockingWindow*)pCli->pWin)->Show();
+                        ((DockingWindow*)pCli->pWin)->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
                         break;
                     case RSC_TOOLBOX :
-                        ((ToolBox*)pCli->pWin)->Show();
+                        ((ToolBox*)pCli->pWin)->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
                         break;
                     case RSC_SPLITWINDOW :
-                        ((SplitWindow*)pCli->pWin)->Show();
+                        ((SplitWindow*)pCli->pWin)->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
                         break;
                     default:
-                        pCli->pWin->Show();
+                        pCli->pWin->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
                         break;
                 }
             }
@@ -1256,7 +1256,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl()
                     if ( IsDockingAllowed() && bAllChildsVisible )
                         rpCli->nVisible |= CHILD_ACTIVE;
                     if ( CHILD_VISIBLE == (rpCli->nVisible & CHILD_VISIBLE) )
-                        rTbx.Show();
+                        rTbx.Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
                 }
             }
         }
@@ -1708,7 +1708,7 @@ void SfxWorkWindow::HidePopups_Impl(BOOL bHide, BOOL bParent, USHORT nId )
                 {
                     pCli->nVisible |= CHILD_ACTIVE;
                     if ( bHasTbx && CHILD_VISIBLE == (pCli->nVisible & CHILD_VISIBLE) )
-                        aObjBars[n].pTbx->GetToolBox().Show();
+                        aObjBars[n].pTbx->GetToolBox().Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
                 }
             }
         }
@@ -1730,7 +1730,7 @@ void SfxWorkWindow::HidePopups_Impl(BOOL bHide, BOOL bParent, USHORT nId )
             {
                 pChild->nVisible |= CHILD_ACTIVE;
                 if ( CHILD_VISIBLE == (pChild->nVisible & CHILD_VISIBLE) )
-                    pCW->Show();
+                    pCW->Show( SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
             }
         }
     }
@@ -1819,7 +1819,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild,
 
                 pWin = pSplitWin->GetSplitWindow();
                 if ( pSplitWin->GetWindowCount() == 1 )
-                    ((SplitWindow*)pWin)->Show();
+                    ((SplitWindow*)pWin)->Show( TRUE, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
             }
         }
 
@@ -2113,7 +2113,7 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( ULONG lId, BOOL bEnabled, USHORT
 //--------------------------------------------------------------------
 // Der An/Aus-Status eines ChildWindows wird umgeschaltet.
 
-void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId)
+void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId, BOOL bSetFocus)
 {
     USHORT nCount = pChildWins->Count();
     USHORT n;
@@ -2146,7 +2146,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId)
                 if ( pChild && pChild->IsHideAtToggle() )
                 {
                     pCW->bCreate = !pCW->bCreate;
-                    ShowChildWindow_Impl( nId, pCW->bCreate );
+                    ShowChildWindow_Impl( nId, pCW->bCreate, bSetFocus );
                 }
                 else
                 {
@@ -2167,7 +2167,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId)
 
             if ( pChild )
             {
-                ShowChildWindow_Impl( nId, pCW->bCreate );
+                ShowChildWindow_Impl( nId, pCW->bCreate, bSetFocus );
             }
             else
             {
@@ -2197,7 +2197,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(USHORT nId)
     }
     else if ( pParent )
     {
-        pParent->ToggleChildWindow_Impl( nId );
+        pParent->ToggleChildWindow_Impl( nId, bSetFocus );
         return;
     }
 
@@ -2325,7 +2325,7 @@ BOOL SfxWorkWindow::KnowsChildWindow_Impl(USHORT nId)
 
 //--------------------------------------------------------------------
 
-void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn)
+void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn, BOOL bSetFocus)
 {
     SfxChildWin_Impl *pCW=NULL;
     SfxWorkWindow *pWork = pParent;
@@ -2372,12 +2372,12 @@ void SfxWorkWindow::SetChildWindow_Impl(USHORT nId, BOOL bOn)
     }
 
     if ( pCW->bCreate != bOn )
-        pWork->ToggleChildWindow_Impl(nId);
+        pWork->ToggleChildWindow_Impl(nId,bSetFocus);
 }
 
 //--------------------------------------------------------------------
 
-void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible)
+void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible, BOOL bSetFocus)
 {
     USHORT nCount = pChildWins->Count();
     SfxChildWin_Impl* pCW=0;
@@ -2400,7 +2400,7 @@ void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible)
                 if ( pCW->pCli )
                 {
                     pCW->pCli->nVisible = CHILD_VISIBLE;
-                    pChildWin->Show();
+                    pChildWin->Show( bSetFocus ? 0 : SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
                 }
                 else
                     ((SfxDockingWindow*)pChildWin->GetWindow())->Reappear_Impl();
@@ -2423,7 +2423,7 @@ void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible)
         }
         else if ( bVisible )
         {
-            SetChildWindow_Impl( nId, TRUE );
+            SetChildWindow_Impl( nId, TRUE, bSetFocus );
             pChildWin = pCW->pWin;
         }
 
@@ -2443,7 +2443,7 @@ void SfxWorkWindow::ShowChildWindow_Impl(USHORT nId, BOOL bVisible)
 
     if ( pParent )
     {
-        pParent->ShowChildWindow_Impl( nId, bVisible );
+        pParent->ShowChildWindow_Impl( nId, bVisible, bSetFocus );
         return;
     }