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)

4 files changed, 118 insertions, 75 deletions

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index 54872032ed3b..94e0bf68647c 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -218,6 +218,11 @@
                     <value xml:lang="en-US">Margins</value>
                 </prop>
             </node>
+            <node oor:name=".uno:ScalingFactor" oor:op="replace">
+                <prop oor:name="Label" oor:type="xs:string">
+                    <value xml:lang="en-US">Scaling Factor</value>
+                </prop>
+            </node>
             <node oor:name=".uno:ClosePreview" oor:op="replace">
                 <prop oor:name="Label" oor:type="xs:string">
                     <value xml:lang="en-US">Close Preview</value>
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc
index b43b03b2771e..99a343e62f17 100644
--- a/svx/inc/svx/svxids.hrc
+++ b/svx/inc/svx/svxids.hrc
@@ -137,6 +137,8 @@
 
 #define MID_ZOOMSLIDER_CURRENTZOOM      0x79
 #define MID_ZOOMSLIDER_SNAPPINGPOINTS   0x7a
+#define MID_ZOOMSLIDER_MINZOOM          0x7b
+#define MID_ZOOMSLIDER_MAXZOOM          0x7c
 
 #define MID_ADR_FATHERSNAME     0x80
 #define MID_ADR_APARTMENT       0x81
diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index b88c8601d4da..4b811dee5321 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -696,6 +696,8 @@ struct ZoomSlider
 {
     INT16  CurrentZoom          MID_ZOOMSLIDER_CURRENTZOOM;
     Points SnappingPoints       MID_ZOOMSLIDER_SNAPPINGPOINTS;
+    INT16  SvxMinZoom           MID_ZOOMSLIDER_MINZOOM;
+    INT16  SvxMaxZoom           MID_ZOOMSLIDER_MAXZOOM;
 };
 item ZoomSlider SvxZoomSliderItem;
 
diff --git a/svx/source/items/zoomslideritem.cxx b/svx/source/items/zoomslideritem.cxx
index 719e646164f0..75f4248e4191 100644
--- a/svx/source/items/zoomslideritem.cxx
+++ b/svx/source/items/zoomslideritem.cxx
@@ -107,10 +107,8 @@ int SvxZoomSliderItem::operator==( const SfxPoolItem& rAttr ) const
 
     SvxZoomSliderItem& rItem = (SvxZoomSliderItem&)rAttr;
 
-    return ( (GetValue() == rItem.GetValue())   &&
-             (maValues == rItem.maValues ) &&
-             (mnMinZoom == rItem.mnMinZoom) &&
-             (mnMaxZoom == rItem.mnMaxZoom) );
+    return ( GetValue() == rItem.GetValue() && maValues == rItem.maValues &&
+             mnMinZoom == rItem.mnMinZoom && mnMaxZoom == rItem.mnMaxZoom );
 }
 
 sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const
@@ -119,25 +117,40 @@ sal_Bool SvxZoomSliderItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE nMe
     switch ( nMemberId )
     {
         case 0 :
-        {
-            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOMSLIDER_PARAMS );
-            aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_CURRENTZOOM ));
-            aSeq[0].Value <<= sal_Int32( GetValue() );
-            aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_SNAPPINGPOINTS ));
-            aSeq[1].Value <<= maValues;
-            aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MINZOOM ) );
-            aSeq[2].Value <<= (sal_Int32)mnMinZoom;
-            aSeq[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MAXZOOM ) );
-            aSeq[3].Value <<= (sal_Int32)mnMaxZoom;
-            rVal <<= aSeq;
-        }
-        break;
-
-        case MID_ZOOMSLIDER_CURRENTZOOM : rVal <<= (sal_Int32) GetValue(); break;
+            {
+                ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq( ZOOMSLIDER_PARAMS );
+                aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_CURRENTZOOM ));
+                aSeq[0].Value <<= sal_Int32( GetValue() );
+                aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_SNAPPINGPOINTS ));
+                aSeq[1].Value <<= maValues;
+                aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MINZOOM ) );
+                aSeq[2].Value <<= mnMinZoom;
+                aSeq[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ZOOMSLIDER_PARAM_MAXZOOM ) );
+                aSeq[3].Value <<= mnMaxZoom;
+                rVal <<= aSeq;
+            }
+            break;
+
+        case MID_ZOOMSLIDER_CURRENTZOOM :
+            {
+                rVal <<= (sal_Int32) GetValue();
+            }
+            break;
         case MID_ZOOMSLIDER_SNAPPINGPOINTS:
             {
-                 rVal <<= maValues; break;
+                 rVal <<= maValues;
+            }
+            break;
+        case MID_ZOOMSLIDER_MINZOOM:
+            {
+                rVal <<= mnMinZoom;
+            }
+            break;
+        case MID_ZOOMSLIDER_MAXZOOM:
+            {
+                rVal <<= mnMaxZoom;
             }
+            break;
         default:
             DBG_ERROR("svx::SvxZoomSliderItem::QueryValue(), Wrong MemberId!");
             return sal_False;
@@ -153,79 +166,100 @@ sal_Bool SvxZoomSliderItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE
     switch ( nMemberId )
     {
         case 0 :
-        {
-            ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq;
-            if (( rVal >>= aSeq ) && ( aSeq.getLength() == ZOOMSLIDER_PARAMS ))
             {
-                sal_Int32 nCurrentZoom( 0 );
-                com::sun::star::uno::Sequence < sal_Int32 > aValues;
+                ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > aSeq;
+                if (( rVal >>= aSeq ) && ( aSeq.getLength() == ZOOMSLIDER_PARAMS ))
+                {
+                    sal_Int32 nCurrentZoom( 0 );
+                    com::sun::star::uno::Sequence < sal_Int32 > aValues;
 
-                sal_Bool  bAllConverted( sal_True );
-                sal_Int16 nConvertedCount( 0 );
-                sal_Int32 nMinZoom( 0 ), nMaxZoom( 0 );
+                    sal_Bool  bAllConverted( sal_True );
+                    sal_Int16 nConvertedCount( 0 );
+                    sal_Int32 nMinZoom( 0 ), nMaxZoom( 0 );
 
-                for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
-                {
-                    if ( aSeq[i].Name.equalsAscii( ZOOMSLIDER_PARAM_CURRENTZOOM ))
+                    for ( sal_Int32 i = 0; i < aSeq.getLength(); i++ )
                     {
-                        bAllConverted &= ( aSeq[i].Value >>= nCurrentZoom );
-                        ++nConvertedCount;
+                        if ( aSeq[i].Name.equalsAscii( ZOOMSLIDER_PARAM_CURRENTZOOM ))
+                        {
+                            bAllConverted &= ( aSeq[i].Value >>= nCurrentZoom );
+                            ++nConvertedCount;
+                        }
+                        else if ( aSeq[i].Name.equalsAscii( ZOOMSLIDER_PARAM_SNAPPINGPOINTS ))
+                        {
+                            bAllConverted &= ( aSeq[i].Value >>= aValues );
+                            ++nConvertedCount;
+                        }
+                        else if( aSeq[i].Name.equalsAscii( ZOOMSLIDER_PARAM_MINZOOM ) )
+                        {
+                            bAllConverted &= ( aSeq[i].Value >>= nMinZoom );
+                            ++nConvertedCount;
+                        }
+                        else if( aSeq[i].Name.equalsAscii( ZOOMSLIDER_PARAM_MAXZOOM ) )
+                        {
+                            bAllConverted &= ( aSeq[i].Value >>= nMaxZoom );
+                            ++nConvertedCount;
+                        }
                     }
-                    else if ( aSeq[i].Name.equalsAscii( ZOOMSLIDER_PARAM_SNAPPINGPOINTS ))
-                    {
-                        bAllConverted &= ( aSeq[i].Value >>= aValues );
-                        ++nConvertedCount;
-                    }
-                    else if( aSeq[i].Name.equalsAscii( ZOOMSLIDER_PARAM_MINZOOM ) )
-                    {
-                        bAllConverted &= ( aSeq[i].Value >>= nMinZoom );
-                        ++nConvertedCount;
-                    }
-                    else if( aSeq[i].Name.equalsAscii( ZOOMSLIDER_PARAM_MAXZOOM ) )
+
+                    if ( bAllConverted && nConvertedCount == ZOOMSLIDER_PARAMS )
                     {
-                        bAllConverted &= ( aSeq[i].Value >>= nMaxZoom );
-                        ++nConvertedCount;
+                        SetValue( (UINT16)nCurrentZoom );
+                        maValues = aValues;
+                        mnMinZoom = sal::static_int_cast< USHORT >( nMinZoom );
+                        mnMaxZoom = sal::static_int_cast< USHORT >( nMaxZoom );
+
+                        return sal_True;
                     }
                 }
 
-                if ( bAllConverted && nConvertedCount == ZOOMSLIDER_PARAMS )
-                {
-                    SetValue( (UINT16)nCurrentZoom );
-                    maValues = aValues;
-                    mnMinZoom = sal::static_int_cast< USHORT >( nMinZoom );
-                    mnMaxZoom = sal::static_int_cast< USHORT >( nMaxZoom );
-
-                    return sal_True;
-                }
+                return sal_False;
             }
 
-            return sal_False;
-        }
-
         case MID_ZOOMSLIDER_CURRENTZOOM:
-        {
-            sal_Int32 nVal = 0;
-            if ( rVal >>= nVal )
             {
-                SetValue( (UINT16)nVal );
-                return sal_True;
+                sal_Int32 nVal = 0;
+                if ( rVal >>= nVal )
+                {
+                    SetValue( (UINT16)nVal );
+                    return sal_True;
+                }
+                else
+                    return sal_False;
             }
-            else
-                return sal_False;
-        }
 
         case MID_ZOOMSLIDER_SNAPPINGPOINTS:
-        {
-            com::sun::star::uno::Sequence < sal_Int32 > aValues;
-            if ( rVal >>= aValues )
             {
-                maValues = aValues;
-                return sal_True;
+                com::sun::star::uno::Sequence < sal_Int32 > aValues;
+                if ( rVal >>= aValues )
+                {
+                    maValues = aValues;
+                    return sal_True;
+                }
+                else
+                    return sal_False;
+            }
+        case MID_ZOOMSLIDER_MINZOOM:
+            {
+                sal_Int32 nVal = 0;
+                if( rVal >>= nVal )
+                {
+                    mnMinZoom = (UINT16)nVal;
+                    return sal_True;
+                }
+                else
+                    return sal_False;
+            }
+        case MID_ZOOMSLIDER_MAXZOOM:
+            {
+                sal_Int32 nVal = 0;
+                if( rVal >>= nVal )
+                {
+                    mnMaxZoom = (UINT16)nVal;
+                    return sal_True;
+                }
+                else
+                    return sal_False;
             }
-            else
-                return sal_False;
-        }
-
         default:
             DBG_ERROR("svx::SvxZoomSliderItem::PutValue(), Wrong MemberId!");
             return sal_False;