diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-01 13:20:55 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-04-01 13:20:55 +0000 |
| commit | a08dbc2fa8f1a79555352d0b1693e6e3faa96516 (patch) | |
| tree | 0da8a16d67b4fc243ac0cd4562ab28ac27b6e1c8 /sc | |
| parent | 46dfc893a9f36622e201a8168dc915db9794b695 (diff) | |
CWS-TOOLING: integrate CWS cmcfixes56
2009-03-26 14:46:13 +0100 cmc r270080 : #i100517# merge changes of locales32 to match
2009-03-26 14:31:32 +0100 cmc r270079 : #i100517# add some brackets and remove stray ;
2009-03-25 13:30:36 +0100 cmc r270021 : #i100503# make tralay work again
2009-03-25 10:13:35 +0100 cmc r269999 : #i100536# remove last unused method
2009-03-24 15:13:50 +0100 cmc r269955 : #i100517# fix straight-forward warnings
2009-03-24 14:36:37 +0100 cmc r269947 : #i100469# keep ia64 and arm alignments after fork-exec to signal change, but hackaround for arm to keep userlevel qemu-arm working
2009-03-24 14:02:27 +0100 cmc r269943 : #i100223# make stl headers warning free for extra gcc 4.3 warnings
2009-03-24 13:58:15 +0100 cmc r269942 : #i100504# drawinglayer is warning free on ix86 linux
2009-03-24 13:56:15 +0100 cmc r269940 : #i100469# keep ia64 and arm alignments after fork-exec to signal change
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/inc/formula.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbahelper.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 52bd475df543..a40a6092fe26 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -111,7 +111,7 @@ public: // sc::IAnyRefDialog virtual void ShowReference(const String& _sRef); virtual void HideReference( BOOL bDoneRefMode = TRUE ); - virtual void SetReference( const ScRange& rRef, ScDocument* pDoc ); + virtual void SetReference( const ScRange& rRef, ScDocument* pD ); virtual void ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); virtual void ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton = NULL ); diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index 1ab2ea102891..353c036393c2 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -444,7 +444,7 @@ XLRGBToOORGB( sal_Int32 nCol ) uno::Any OORGBToXLRGB( const uno::Any& aCol ) { - sal_Int32 nCol; + sal_Int32 nCol=0; aCol >>= nCol; nCol = OORGBToXLRGB( nCol ); return uno::makeAny( nCol ); @@ -452,7 +452,7 @@ OORGBToXLRGB( const uno::Any& aCol ) uno::Any XLRGBToOORGB( const uno::Any& aCol ) { - sal_Int32 nCol; + sal_Int32 nCol=0; aCol >>= nCol; nCol = XLRGBToOORGB( nCol ); return uno::makeAny( nCol ); |