1479
1479
dnl ===================================================================
1480
1480
dnl Check the whether vba need to be delivered as an uno package or part
1481
1481
dnl of the install
1482
Index: sc/source/ui/vba/vbaapplication.cxx
1483
===================================================================
1484
RCS file: /cvs/sc/sc/source/ui/vba/vbaapplication.cxx,v
1485
retrieving revision 1.2
1486
retrieving revision 1.2.2.1
1487
diff -u -p -u -p -r1.2 -r1.2.2.1
1488
--- sc/source/ui/vba/vbaapplication.cxx 25 Apr 2007 16:00:39 -0000 1.2
1489
+++ sc/source/ui/vba/vbaapplication.cxx 18 May 2007 12:38:29 -0000 1.2.2.1
1490
@@ -293,7 +293,7 @@ void SAL_CALL
1491
ScVbaApplication::setStatusBar( const uno::Any& _statusbar ) throw (uno::RuntimeException)
1493
rtl::OUString sText;
1494
- sal_Bool bDefault;
1495
+ sal_Bool bDefault = sal_False;
1496
uno::Reference< frame::XModel > xModel( getCurrentDocument(), uno::UNO_QUERY_THROW );
1497
uno::Reference< task::XStatusIndicatorSupplier > xStatusIndicatorSupplier( xModel->getCurrentController(), uno::UNO_QUERY_THROW );
1498
uno::Reference< task::XStatusIndicator > xStatusIndicator( xStatusIndicatorSupplier->getStatusIndicator(), uno::UNO_QUERY_THROW );
1499
@@ -426,7 +426,7 @@ ScVbaApplication::GoTo( const uno::Any&
1501
if( Scroll.hasValue() )
1504
+ sal_Bool aScroll = sal_False;
1505
if( Scroll >>= aScroll )
1508
Index: sc/source/ui/vba/vbaborders.cxx
1509
===================================================================
1510
RCS file: /cvs/sc/sc/source/ui/vba/vbaborders.cxx,v
1511
retrieving revision 1.2
1512
retrieving revision 1.2.2.1
1513
diff -u -p -u -p -r1.2 -r1.2.2.1
1514
--- sc/source/ui/vba/vbaborders.cxx 25 Apr 2007 16:01:16 -0000 1.2
1515
+++ sc/source/ui/vba/vbaborders.cxx 23 Jul 2007 11:51:59 -0000 1.2.2.1
1516
@@ -171,7 +171,7 @@ public:
1518
void SAL_CALL setColor( const uno::Any& _color ) throw (uno::RuntimeException)
1521
+ sal_Int32 nColor = 0;
1523
table::BorderLine aBorderLine;
1524
if ( getBorderLine( aBorderLine ) )
1525
@@ -185,14 +185,14 @@ public:
1527
uno::Any SAL_CALL getColorIndex() throw (uno::RuntimeException)
1530
+ sal_Int32 nColor = 0;
1531
XLRGBToOORGB( getColor() ) >>= nColor;
1532
uno::Reference< container::XIndexAccess > xIndex = m_Palette.getPalette();
1533
sal_Int32 nElems = xIndex->getCount();
1534
sal_Int32 nIndex = -1;
1535
for ( sal_Int32 count=0; count<nElems; ++count )
1537
- sal_Int32 nPaletteColor;
1538
+ sal_Int32 nPaletteColor = 0;
1539
xIndex->getByIndex( count ) >>= nPaletteColor;
1540
if ( nPaletteColor == nColor )
1542
@@ -205,7 +205,7 @@ public:
1544
void SAL_CALL setColorIndex( const uno::Any& _colorindex ) throw (uno::RuntimeException)
1547
+ sal_Int32 nColor = 0;
1548
_colorindex >>= nColor;
1549
if ( !nColor || nColor == XlColorIndex::xlColorIndexAutomatic )
1551
@@ -235,7 +235,7 @@ public:
1553
void SAL_CALL setWeight( const uno::Any& _weight ) throw (uno::RuntimeException)
1555
- sal_Int32 nWeight;
1556
+ sal_Int32 nWeight = 0;
1557
_weight >>= nWeight;
1558
table::BorderLine aBorderLine;
1559
if ( getBorderLine( aBorderLine ) )
1560
@@ -273,7 +273,7 @@ public:
1562
// Urk no choice but to silently ignore we don't support this attribute
1563
// #TODO would be nice to support the excel line styles
1564
- sal_Int32 nLineStyle;
1565
+ sal_Int32 nLineStyle = 0;
1566
_linestyle >>= nLineStyle;
1567
table::BorderLine aBorderLine;
1568
if ( getBorderLine( aBorderLine ) )
1569
Index: sc/source/ui/vba/vbacomment.cxx
1570
===================================================================
1571
RCS file: /cvs/sc/sc/source/ui/vba/vbacomment.cxx,v
1572
retrieving revision 1.2
1573
retrieving revision 1.2.2.1
1574
diff -u -p -u -p -r1.2 -r1.2.2.1
1575
--- sc/source/ui/vba/vbacomment.cxx 25 Apr 2007 16:04:24 -0000 1.2
1576
+++ sc/source/ui/vba/vbacomment.cxx 7 Aug 2007 12:59:15 -0000 1.2.2.1
1577
@@ -197,7 +197,7 @@ ScVbaComment::Text( const uno::Any& aTex
1579
if ( aStart.hasValue() )
1582
+ sal_Int16 nStart = 0;
1583
sal_Bool bOverwrite = sal_True;
1584
Overwrite >>= bOverwrite;
1586
Index: sc/source/ui/vba/vbadialogs.cxx
1587
===================================================================
1588
RCS file: /cvs/sc/sc/source/ui/vba/vbadialogs.cxx,v
1589
retrieving revision 1.2
1590
retrieving revision 1.2.2.1
1591
diff -u -p -u -p -r1.2 -r1.2.2.1
1592
--- sc/source/ui/vba/vbadialogs.cxx 25 Apr 2007 16:05:43 -0000 1.2
1593
+++ sc/source/ui/vba/vbadialogs.cxx 23 Jul 2007 11:51:59 -0000 1.2.2.1
1594
@@ -97,7 +97,7 @@ ScVbaDialogs::getCount() throw (uno::Run
1596
ScVbaDialogs::Item( const uno::Any &aItem ) throw (uno::RuntimeException)
1599
+ sal_Int32 nIndex = 0;
1601
uno::Reference< excel::XDialog > aDialog( new ScVbaDialog( nIndex, m_xContext ) );
1602
return uno::Any( aDialog );
1603
Index: sc/source/ui/vba/vbafont.cxx
1604
===================================================================
1605
RCS file: /cvs/sc/sc/source/ui/vba/vbafont.cxx,v
1606
retrieving revision 1.2
1607
retrieving revision 1.2.2.1
1608
diff -u -p -u -p -r1.2 -r1.2.2.1
1609
--- sc/source/ui/vba/vbafont.cxx 25 Apr 2007 16:06:21 -0000 1.2
1610
+++ sc/source/ui/vba/vbafont.cxx 23 Jul 2007 11:51:59 -0000 1.2.2.1
1611
@@ -169,7 +169,7 @@ ScVbaFont::getColorIndex() throw ( uno::
1612
sal_Int32 nIndex = -1;
1613
for ( sal_Int32 count=0; count<nElems; ++count )
1615
- sal_Int32 nPaletteColor;
1616
+ sal_Int32 nPaletteColor = 0;
1617
xIndex->getByIndex( count ) >>= nPaletteColor;
1618
if ( nPaletteColor == nColor )
1620
@@ -257,7 +257,7 @@ ScVbaFont::getBold() throw ( uno::Runtim
1621
if ( mpDataSet->GetItemState( ATTR_FONT_WEIGHT, TRUE, NULL) == SFX_ITEM_DONTCARE )
1625
+ double fValue = 0.0;
1626
mxFont->getPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharWeight" ) ) ) >>= fValue;
1627
return uno::makeAny( fValue == awt::FontWeight::BOLD );
1629
Index: sc/source/ui/vba/vbahelper.hxx
1630
===================================================================
1631
RCS file: /cvs/sc/sc/source/ui/vba/vbahelper.hxx,v
1632
retrieving revision 1.2
1633
retrieving revision 1.2.2.1
1634
diff -u -p -u -p -r1.2 -r1.2.2.1
1635
--- sc/source/ui/vba/vbahelper.hxx 25 Apr 2007 16:07:33 -0000 1.2
1636
+++ sc/source/ui/vba/vbahelper.hxx 3 May 2007 11:16:34 -0000 1.2.2.1
1638
#include <com/sun/star/frame/XModel.hpp>
1639
#include <docsh.hxx>
1641
-#define css com::sun::star
1642
-#define oo org::openoffice
1643
+namespace css = ::com::sun::star;
1647
namespace openoffice
1648
@@ -69,6 +69,8 @@ namespace org
1652
+namespace oo = org::openoffice;
1655
# define SC_VBA_FIXME(a) OSL_TRACE( a )
1656
# define SC_VBA_STUB() SC_VBA_FIXME(( "%s - stubbed\n", __FUNCTION__ ))
1657
Index: sc/source/ui/vba/vbainterior.cxx
1658
===================================================================
1659
RCS file: /cvs/sc/sc/source/ui/vba/vbainterior.cxx,v
1660
retrieving revision 1.2
1661
retrieving revision 1.2.2.1
1662
diff -u -p -u -p -r1.2 -r1.2.2.1
1663
--- sc/source/ui/vba/vbainterior.cxx 25 Apr 2007 16:07:44 -0000 1.2
1664
+++ sc/source/ui/vba/vbainterior.cxx 23 Jul 2007 11:51:59 -0000 1.2.2.1
1665
@@ -115,7 +115,7 @@ ScVbaInterior::getColorIndex() throw ( c
1666
sal_Int32 nIndex = -1;
1667
for ( sal_Int32 count=0; count<nElems; ++count )
1669
- sal_Int32 nPaletteColor;
1670
+ sal_Int32 nPaletteColor = 0;
1671
xIndex->getByIndex( count ) >>= nPaletteColor;
1672
if ( nPaletteColor == nColor )
1674
Index: sc/source/ui/vba/vbarange.cxx
1675
===================================================================
1676
RCS file: /cvs/sc/sc/source/ui/vba/vbarange.cxx,v
1677
retrieving revision 1.2
1678
retrieving revision 1.2.2.3
1679
diff -u -p -u -p -r1.2 -r1.2.2.3
1680
--- sc/source/ui/vba/vbarange.cxx 25 Apr 2007 16:10:29 -0000 1.2
1681
+++ sc/source/ui/vba/vbarange.cxx 7 Aug 2007 12:59:15 -0000 1.2.2.3
1682
@@ -330,7 +330,7 @@ public:
1684
uno::Reference< beans::XPropertySet > getNumberProps()
1687
+ long nIndexKey = 0;
1688
uno::Any aValue = mxRangeProps->getPropertyValue(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("NumberFormat")));
1689
aValue >>= nIndexKey;
1691
@@ -487,7 +487,7 @@ CellValueSetter::processValue( const uno
1693
case uno::TypeClass_BOOLEAN:
1696
+ sal_Bool bState = sal_False;
1697
if ( aValue >>= bState )
1699
uno::Reference< table::XCellRange > xRange( xCell, uno::UNO_QUERY_THROW );
1700
@@ -514,7 +514,7 @@ CellValueSetter::processValue( const uno
1705
+ double nDouble = 0.0;
1706
if ( aValue >>= nDouble )
1707
xCell->setValue( nDouble );
1709
@@ -1506,7 +1506,7 @@ ScVbaRange::Characters(const uno::Any& S
1710
return xRange->Characters( Start, Length );
1713
- long nIndex, nCount;
1714
+ long nIndex = 0, nCount = 0;
1715
::rtl::OUString rString;
1716
uno::Reference< text::XTextRange > xTextRange(mxRange, ::uno::UNO_QUERY_THROW );
1717
rString = xTextRange->getString();
1718
@@ -1741,7 +1741,7 @@ ScVbaRange::Rows(const uno::Any& aIndex
1719
return xRange->Rows( aIndex );
1723
+ sal_Int32 nValue = 0;
1724
rtl::OUString sAddress;
1725
if( aIndex.hasValue() )
1727
@@ -1789,7 +1789,7 @@ ScVbaRange::Columns( const uno::Any& aIn
1728
if ( aIndex.hasValue() )
1730
uno::Reference< excel::XRange > xRange;
1732
+ sal_Int32 nValue = 0;
1733
rtl::OUString sAddress;
1734
RangeHelper thisRange( mxRange );
1735
uno::Reference< sheet::XCellRangeAddressable > xThisRangeAddress = thisRange.getCellRangeAddressable();
1736
@@ -1940,7 +1940,7 @@ ScVbaRange::getNumberFormat() throw (uno
1737
uno::Reference< excel::XRange >
1738
ScVbaRange::Resize( const uno::Any &RowSize, const uno::Any &ColumnSize ) throw (uno::RuntimeException)
1740
- long nRowSize, nColumnSize;
1741
+ long nRowSize = 0, nColumnSize = 0;
1742
sal_Bool bIsRowChanged = ( RowSize >>= nRowSize ), bIsColumnChanged = ( ColumnSize >>= nColumnSize );
1743
uno::Reference< table::XColumnRowRange > xColumnRowRange(mxRange, ::uno::UNO_QUERY_THROW);
1744
uno::Reference< sheet::XSheetCellRange > xSheetRange(mxRange, ::uno::UNO_QUERY_THROW);
1745
@@ -2318,7 +2318,7 @@ ScVbaRange::setHidden( const uno::Any& _
1750
+ sal_Bool bHidden = sal_False;
1751
if ( !(_hidden >>= bHidden) )
1752
throw uno::RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Failed to extract param for Hidden property" ) ), uno::Reference< uno::XInterface >() );
1754
@@ -2818,7 +2818,7 @@ ScVbaRange::Delete( const uno::Any& Shif
1755
sheet::CellDeleteMode mode = sheet::CellDeleteMode_NONE ;
1756
if ( Shift.hasValue() )
1759
+ sal_Int32 nShift = 0;
1763
@@ -3074,7 +3074,7 @@ ScVbaRange::getRowHeight() throw (uno::R
1765
ScVbaRange::setRowHeight( const uno::Any& _rowheight) throw (uno::RuntimeException)
1767
- double nHeight; // Incomming height is in points
1768
+ double nHeight = 0; // Incomming height is in points
1769
_rowheight >>= nHeight;
1770
nHeight = lcl_Round2DecPlaces( nHeight );
1771
RangeHelper thisRange( mxRange );
1772
@@ -3129,7 +3129,7 @@ ScVbaRange::getPageBreak() throw (uno::R
1774
ScVbaRange::setPageBreak( const uno::Any& _pagebreak) throw (uno::RuntimeException)
1776
- sal_Int32 nPageBreak;
1777
+ sal_Int32 nPageBreak = 0;
1778
_pagebreak >>= nPageBreak;
1780
ScDocShell* pShell = getDocShellFromRange( mxRange );
1781
@@ -3427,7 +3427,7 @@ ScVbaRange::Insert( const uno::Any& Shif
1782
sheet::CellInsertMode mode = sheet::CellInsertMode_NONE;
1783
if ( Shift.hasValue() )
1786
+ sal_Int32 nShift = 0;
1790
Index: sc/source/ui/vba/vbaworksheets.cxx
1791
===================================================================
1792
RCS file: /cvs/sc/sc/source/ui/vba/vbaworksheets.cxx,v
1793
retrieving revision 1.2
1794
retrieving revision 1.2.2.1
1795
diff -u -p -u -p -r1.2 -r1.2.2.1
1796
--- sc/source/ui/vba/vbaworksheets.cxx 25 Apr 2007 16:14:08 -0000 1.2
1797
+++ sc/source/ui/vba/vbaworksheets.cxx 17 May 2007 16:12:07 -0000 1.2.2.1
1798
@@ -227,7 +227,7 @@ ScVbaWorksheets::getVisible() throw (uno
1800
ScVbaWorksheets::setVisible( const uno::Any& _visible ) throw (uno::RuntimeException)
1803
+ sal_Bool bState = sal_False;
1804
if ( _visible >>= bState )
1806
uno::Reference< container::XEnumeration > xEnum( createEnumeration(), uno::UNO_QUERY_THROW );
1482
1807
Index: sc/util/makefile.mk
1483
1808
===================================================================
1484
1809
RCS file: /cvs/sc/sc/util/makefile.mk,v
1485
retrieving revision 1.39
1486
retrieving revision 1.39.2.1
1487
diff -u -p -u -p -r1.39 -r1.39.2.1
1488
--- sc/util/makefile.mk 25 Apr 2007 16:15:20 -0000 1.39
1489
+++ sc/util/makefile.mk 3 May 2007 09:00:47 -0000 1.39.2.1
1490
@@ -278,6 +278,7 @@ DEF9NAME=$(SHL9TARGET)
1810
retrieving revision 1.41
1811
retrieving revision 1.39.2.2
1812
diff -u -p -u -p -r1.41 -r1.39.2.2
1813
--- sc/util/makefile.mk 22 May 2007 20:15:40 -0000 1.41
1814
+++ sc/util/makefile.mk 5 Jul 2007 13:16:15 -0000 1.39.2.2
1815
@@ -266,6 +266,7 @@ DEF9NAME=$(SHL9TARGET)
1493
1818
$(CPPUHELPERLIB) \