Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

1 files changed, 12 insertions, 9 deletions

diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index cdedb01ee7e0..4d34950ad9f6 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -230,8 +230,10 @@ private:
 
     DECL_LINK(WindowEventHandler, VclWindowEvent*);
 
+#ifdef VERBOSE
     void DumpShellStack (const ShellStack& rStack);
     void DumpSfxShellStack (void);
+#endif
 
     /** To be called before a shell is taken fom the SFX shell stack.  This
         method deactivates an active text editing to avoid problems with
@@ -907,7 +909,7 @@ void ViewShellManager::Implementation::UpdateShellStack (void)
 
     // Remember the undo manager from the top-most shell on the stack.
     SfxShell* pTopMostShell = mrBase.GetSubShell(0);
-    SfxUndoManager* pUndoManager = (pTopMostShell!=NULL)
+    ::svl::IUndoManager* pUndoManager = (pTopMostShell!=NULL)
         ? pTopMostShell->GetUndoManager()
         : NULL;
 
@@ -922,7 +924,7 @@ void ViewShellManager::Implementation::UpdateShellStack (void)
 
     // 3. Get SFX shell stack.
     ShellStack aSfxShellStack;
-    USHORT nIndex (0);
+    sal_uInt16 nIndex (0);
     while (mrBase.GetSubShell(nIndex)!=NULL)
         ++nIndex;
     aSfxShellStack.reserve(nIndex);
@@ -1008,7 +1010,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe
 
     // Remember the undo manager from the top-most shell on the stack.
     SfxShell* pTopMostShell = mrBase.GetSubShell(0);
-    SfxUndoManager* pUndoManager = (pTopMostShell!=NULL)
+    ::svl::IUndoManager* pUndoManager = (pTopMostShell!=NULL)
         ? pTopMostShell->GetUndoManager()
         : NULL;
 
@@ -1019,7 +1021,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe
 
     // 0.Make sure that the given shell is on the stack.  This is a
     // preparation for the following assertion.
-    for (USHORT nIndex=0; true; nIndex++)
+    for (sal_uInt16 nIndex=0; true; nIndex++)
     {
         SfxShell* pShellOnStack = mrBase.GetSubShell(nIndex);
         if (pShellOnStack == NULL)
@@ -1037,7 +1039,7 @@ void ViewShellManager::Implementation::TakeShellsFromStack (const SfxShell* pShe
     {
         // 1. Deactivate our shells on the stack before they are removed so
         // that during the Deactivation() calls the stack is still intact.
-        for (USHORT nIndex=0; true; nIndex++)
+        for (sal_uInt16 nIndex=0; true; nIndex++)
         {
             SfxShell* pShellOnStack = mrBase.GetSubShell(nIndex);
             Deactivate(pShellOnStack);
@@ -1180,7 +1182,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent*,
                 break;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -1314,6 +1316,7 @@ void ViewShellManager::Implementation::Shutdown (void)
 
 
 
+#ifdef VERBOSE
 void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack)
 {
     ShellStack::const_reverse_iterator iEntry;
@@ -1332,7 +1335,7 @@ void ViewShellManager::Implementation::DumpShellStack (const ShellStack& rStack)
 void ViewShellManager::Implementation::DumpSfxShellStack (void)
 {
     ShellStack aSfxShellStack;
-    USHORT nIndex (0);
+    sal_uInt16 nIndex (0);
     while (mrBase.GetSubShell(nIndex)!=NULL)
         ++nIndex;
     aSfxShellStack.reserve(nIndex);
@@ -1340,7 +1343,7 @@ void ViewShellManager::Implementation::DumpSfxShellStack (void)
         aSfxShellStack.push_back(mrBase.GetSubShell(nIndex));
     DumpShellStack(aSfxShellStack);
 }
-
+#endif
 
 
 
@@ -1365,7 +1368,7 @@ void ViewShellManager::Implementation::Deactivate (SfxShell* pShell)
     }
 
     // Now we can deactivate the shell.
-    pShell->Deactivate(TRUE);
+    pShell->Deactivate(sal_True);
 }