CWS-TOOLING: integrate CWS calc47

2008-12-10 20:38:34 +0100 oc  r265231 : #i97115#
2008-12-09 14:19:59 +0100 oc  r265084 : #i96939#
2008-12-09 11:55:29 +0100 oc  r265073 : #i97061#
2008-12-09 11:37:05 +0100 oc  r265067 : #i97061#
2008-12-09 11:31:49 +0100 oc  r265066 : #i97061#
2008-12-09 11:30:30 +0100 oc  r265065 : #i97061#
2008-12-04 17:13:43 +0100 er  r264859 : DBG_ERROR needs semicolon
2008-12-04 02:34:13 +0100 er  r264811 : unxsols4 needs to be compiled with exceptions when using STL
2008-12-04 02:24:30 +0100 er  r264810 : WaE unxsols4: ScZoomSliderWnd::Update hides the function Window::Update()
2008-12-04 01:40:22 +0100 er  r264809 : DBG_ASSERT needs semicolon
2008-12-03 11:00:55 +0100 er  r264753 : CWS-TOOLING: rebase CWS calc47 to trunk@264325 (milestone: DEV300:m36)
2008-10-31 12:30:09 +0100 nn  r262863 : #i90362# call CheckNeedsRepaint in UpdateFormulas
2008-10-29 14:49:48 +0100 nn  r262802 : #i88521# initialization order (gcc warning)
2008-10-29 12:31:38 +0100 nn  r262782 : #i88521# toolbar entry for scaling factor in page preview (patch from maoyg)
2008-10-29 12:31:00 +0100 nn  r262781 : #i88521# toolbar entry for scaling factor in page preview (patch from maoyg)
2008-10-29 12:28:45 +0100 nn  r262780 : #i88521# toolbar entry for scaling factor in page preview (patch from maoyg)
2008-10-28 17:01:37 +0100 nn  r262756 : resolve gcc warnings
2008-10-28 13:46:07 +0100 nn  r262742 : #i9709# always use system encoding for DDE (patch from rail)
2008-10-28 13:45:44 +0100 nn  r262741 : #i9709# always use system encoding for DDE (patch from rail)
2008-10-27 20:55:51 +0100 nn  r262689 : #i44349# refresh auto filter flags in ScUndoDragDrop::Redo (patch from gaozm)
2008-10-27 20:40:06 +0100 nn  r262688 : #i4517# rename sheet with double click (patch from kohei)
2008-10-27 20:28:55 +0100 nn  r262687 : #i20491# ensure stable sorting (patch from maoyg)
2008-10-27 20:13:19 +0100 nn  r262686 : #i22758# direct sort (toolbar buttons): detect headers (patch from maoyg)
2008-10-27 19:42:51 +0100 nn  r262685 : #i7277# default for sorting is cursor column (patch from maoyg)
2008-10-27 19:18:57 +0100 nn  r262684 : #i7088# insert/delete columns/rows across selected sheets (patch from maoyg)
2008-10-27 18:59:43 +0100 nn  r262683 : #i86856# show formula syntax in tip help (patch from maoyg)
2008-10-27 18:30:45 +0100 nn  r262682 : #i89145# scroll wheel handling in page preview (patch from maoyg)
2008-10-27 18:03:10 +0100 nn  r262681 : #i85226# take care of subtotal formulas in ScUndoQuery::Undo (patch from gaozm)
2008-10-27 17:41:16 +0100 nn  r262680 : #i88437# add zoom slider in status bar also for Calc (patch from maoyg)
2008-10-27 15:53:52 +0100 nn  r262678 : #i88467# undo for page margins/column widths in page preview (patch from maoyg)

5 files changed, 115 insertions, 6 deletions

diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx
index 3550fa157b24..b45a3d6825de 100644
--- a/sc/source/ui/inc/docfunc.hxx
+++ b/sc/source/ui/inc/docfunc.hxx
@@ -103,9 +103,11 @@ public:
     BOOL            ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
                                     BOOL bRecord, BOOL bApi );
 
-    BOOL            InsertCells( const ScRange& rRange, InsCellCmd eCmd, BOOL bRecord, BOOL bApi,
+    BOOL            InsertCells( const ScRange& rRange,const ScMarkData* pTabMark,
+                                 InsCellCmd eCmd, BOOL bRecord, BOOL bApi,
                                     BOOL bPartOfPaste = FALSE );
-    BOOL            DeleteCells( const ScRange& rRange, DelCellCmd eCmd, BOOL bRecord, BOOL bApi );
+    BOOL            DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
+                                 DelCellCmd eCmd, BOOL bRecord, BOOL bApi );
 
     BOOL            MoveBlock( const ScRange& rSource, const ScAddress& rDestPos,
                                 BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi );
diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx
index f02d8be298e1..c71d389e62fe 100644
--- a/sc/source/ui/inc/inputhdl.hxx
+++ b/sc/source/ui/inc/inputhdl.hxx
@@ -69,7 +69,9 @@ private:
 
     TypedStrCollection*     pColumnData;
     TypedStrCollection*     pFormulaData;
+    TypedStrCollection*     pFormulaDataPara;
     ULONG                   nTipVisible;
+    ULONG                   nTipVisibleSec;
     String                  aManualTip;
     String                  aAutoSearch;
     USHORT                  nAutoPos;
@@ -191,7 +193,10 @@ public:
     void            ResetDelayTimer(); //BugId 54702
 
     void            HideTip();
+    void            HideTipBelow();
+    void            ShowTipCursor();
     void            ShowTip( const String& rText );     // am Cursor
+    void            ShowTipBelow( const String& rText );
 
     void            SetRefScale( const Fraction& rX, const Fraction& rY );
     void            UpdateRefDevice();
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index b24992fc2ef5..6b98d2c51754 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -62,6 +62,7 @@ class ScPreviewShell: public SfxViewShell
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSourceData;  // ViewData
     BYTE            nSourceDesignMode;      // form design mode from TabView
     SvxZoomType     eZoom;
+    long            nMaxVertPos;
 
     SfxBroadcaster* pAccessibilityBroadcaster;
 
diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx
new file mode 100644
index 000000000000..0132ec844233
--- /dev/null
+++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx
@@ -0,0 +1,95 @@
+/*************************************************************************
+*
+*  OpenOffice.org - a multi-platform office productivity suite
+*
+*  $RCSfile: tbzoomsliderctrl.hxx,v $
+*
+*  $Revision: 1.1 $
+*
+*  last change: $Author: maoyg $ $Date: 2008/04/25 10:08:08 $
+*
+*  The Contents of this file are made available subject to
+*  the terms of GNU Lesser General Public License Version 2.1.
+*
+*
+*    GNU Lesser General Public License Version 2.1
+*    =============================================
+*    Copyright 2005 by Sun Microsystems, Inc.
+*    901 San Antonio Road, Palo Alto, CA 94303, USA
+*
+*    This library is free software; you can redistribute it and/or
+*    modify it under the terms of the GNU Lesser General Public
+*    License version 2.1, as published by the Free Software Foundation.
+*
+*    This library is distributed in the hope that it will be useful,
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+*    Lesser General Public License for more details.
+*
+*    You should have received a copy of the GNU Lesser General Public
+*    License along with this library; if not, write to the Free Software
+*    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+*    MA  02111-1307  USA
+*
+************************************************************************/
+#ifndef _SC_ZOOMSLIDERTBCONTRL_HXX
+#define _SC_ZOOMSLIDERTBCONTRL_HXX
+
+#ifndef _WINDOW_HXX        //autogen
+#include <vcl/window.hxx>
+#endif
+#ifndef _SFXPOOLITEM_HXX   //autogen
+#include <svtools/poolitem.hxx>
+#endif
+#ifndef _SFXTBXCTRL_HXX    //autogen
+#include <sfx2/tbxctrl.hxx>
+#endif
+#ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_
+#include <com/sun/star/frame/XDispatchProvider.hpp>
+#endif
+#ifndef _COM_SUN_STAR_FRAME_XFRAME_HPP_
+#include <com/sun/star/frame/XFrame.hpp>
+#endif
+#include <svx/zoomslideritem.hxx>
+
+
+//class ScZoomSliderControl define
+class ScZoomSliderControl: public SfxToolBoxControl
+{
+public:
+    SFX_DECL_TOOLBOX_CONTROL();
+    ScZoomSliderControl( USHORT nSlotId, USHORT nId, ToolBox& rTbx );
+    ~ScZoomSliderControl();
+
+    virtual void    StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState );
+    virtual Window* CreateItemWindow( Window *pParent );
+};
+
+//========================================================================
+// class ScZoomSliderWnd define---------------------------------------
+//========================================================================
+class ScZoomSliderWnd: public Window
+{
+private:
+    struct                  ScZoomSliderWnd_Impl;
+    ScZoomSliderWnd_Impl*   mpImpl;
+    Size                    aLogicalSize;
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > m_xDispatchProvider;
+    ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >            m_xFrame;
+
+    USHORT          Offset2Zoom( long nOffset ) const;
+    long            Zoom2Offset( USHORT nZoom ) const;
+    void            DoPaint( const Rectangle& rRect );
+
+public:
+    ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider,
+                    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , USHORT nCurrentZoom );
+    ~ScZoomSliderWnd();
+    void            UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem );
+
+protected:
+    virtual void    MouseButtonDown( const MouseEvent& rMEvt );
+    virtual void    MouseMove( const MouseEvent& rMEvt );
+    virtual void    Paint( const Rectangle& rRect );
+};
+#endif
diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx
index e697878f1ee9..4da2e7c2b45e 100644
--- a/sc/source/ui/inc/undoblk.hxx
+++ b/sc/source/ui/inc/undoblk.hxx
@@ -54,8 +54,8 @@ class ScUndoInsertCells: public ScMoveUndo
 public:
                     TYPEINFO();
                     ScUndoInsertCells( ScDocShell* pNewDocShell,
-                                       const ScRange& rRange, InsCellCmd eNewCmd,
-                                       ScDocument* pUndoDocument, ScRefUndoData* pRefData,
+                                       const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
+                                       InsCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData,
                                        BOOL bNewPartOfPaste );
     virtual         ~ScUndoInsertCells();
 
@@ -70,6 +70,9 @@ public:
 
 private:
     ScRange         aEffRange;
+    SCTAB           nCount;
+    SCTAB*          pTabs;
+    SCTAB*          pScenarios;
     ULONG           nEndChangeAction;
     InsCellCmd      eCmd;
     BOOL            bPartOfPaste;
@@ -85,8 +88,8 @@ class ScUndoDeleteCells: public ScMoveUndo
 public:
                     TYPEINFO();
                     ScUndoDeleteCells( ScDocShell* pNewDocShell,
-                                       const ScRange& rRange, DelCellCmd eNewCmd,
-                                       ScDocument* pUndoDocument, ScRefUndoData* pRefData );
+                                       const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios,
+                                       DelCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData );
     virtual         ~ScUndoDeleteCells();
 
     virtual void    Undo();
@@ -98,6 +101,9 @@ public:
 
 private:
     ScRange         aEffRange;
+    SCTAB           nCount;
+    SCTAB*          pTabs;
+    SCTAB*          pScenarios;
     ULONG           nStartChangeAction;
     ULONG           nEndChangeAction;
     DelCellCmd      eCmd;