diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2010-01-20 17:05:34 -0500 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2010-01-20 17:05:34 -0500 |
commit | d8c9ce99b4ab513775ef566f4498a66246ffb11b (patch) | |
tree | c5dc0da584d0414fd3d173a7b26b116604b56f8c | |
parent | 58f94f9afcaea325ad087c19ffb825dfb83448df (diff) |
calctabcolor: removed compiler warnings.
-rw-r--r-- | sc/source/ui/dbgui/validate.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/undotab.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/undo/undotab.cxx | 20 | ||||
-rw-r--r-- | sc/source/ui/view/viewdata.cxx | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 81e8ff35195d..2d286355db6c 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -584,7 +584,7 @@ void ScTPValidationValue::TidyListBoxes() pWnd = GetChild(0); - while( std::find( alstOrder.begin(), alstOrder.end(), pWnd ) != alstOrder.end() && NULL != ( pWnd = pWnd->GetWindow( WINDOW_NEXT) ) ); + while( std::find( alstOrder.begin(), alstOrder.end(), pWnd ) != alstOrder.end() && NULL != ( pWnd = pWnd->GetWindow( WINDOW_NEXT) ) ) ; if ( pWnd ) { diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index e4e4911d606d..c158c9747da7 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -249,10 +249,10 @@ public: virtual String GetComment() const; private: + ScUndoSetTabBgColorInfoList* aUndoSetTabBgColorInfoList; SCTAB nTab; Color aOldTabBgColor; Color aNewTabBgColor; - ScUndoSetTabBgColorInfoList* aUndoSetTabBgColorInfoList; BOOL bIsMultipleUndo; void DoChange( SCTAB nTab, const Color& rTabBgColor ) const; diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 41c56cadb3be..fdadd74f5cba 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -793,12 +793,12 @@ ScUndoSetTabBgColor::ScUndoSetTabBgColor( ScDocShell* pNewDocShell, const Color& aOTabBgColor, const Color& aNTabBgColor) : ScSimpleUndo( pNewDocShell ), + aUndoSetTabBgColorInfoList ( NULL ), nTab ( nT ), - bIsMultipleUndo ( FALSE ), - aUndoSetTabBgColorInfoList ( NULL ) + aOldTabBgColor( aOTabBgColor ), + aNewTabBgColor( aNTabBgColor ), + bIsMultipleUndo ( FALSE ) { - aOldTabBgColor = aOTabBgColor; - aNewTabBgColor = aNTabBgColor; } ScUndoSetTabBgColor::ScUndoSetTabBgColor( ScDocShell* pNewDocShell, @@ -809,11 +809,11 @@ ScUndoSetTabBgColor::ScUndoSetTabBgColor( ScDocShell* pNewDocShell, aUndoSetTabBgColorInfoList = pUndoSetTabBgColorInfoList; } -__EXPORT ScUndoSetTabBgColor::~ScUndoSetTabBgColor() +ScUndoSetTabBgColor::~ScUndoSetTabBgColor() { } -String __EXPORT ScUndoSetTabBgColor::GetComment() const +String ScUndoSetTabBgColor::GetComment() const { if (bIsMultipleUndo && aUndoSetTabBgColorInfoList && aUndoSetTabBgColorInfoList->Count() > 1) return ScGlobal::GetRscString( STR_UNDO_SET_MULTI_TAB_BG_COLOR ); @@ -865,7 +865,7 @@ void ScUndoSetTabBgColor::DoChange(BOOL bUndoType) const } } -void __EXPORT ScUndoSetTabBgColor::Undo() +void ScUndoSetTabBgColor::Undo() { if ( bIsMultipleUndo ) DoChange(TRUE); @@ -873,7 +873,7 @@ void __EXPORT ScUndoSetTabBgColor::Undo() DoChange(nTab, aOldTabBgColor); } -void __EXPORT ScUndoSetTabBgColor::Redo() +void ScUndoSetTabBgColor::Redo() { if ( bIsMultipleUndo ) DoChange(FALSE); @@ -881,12 +881,12 @@ void __EXPORT ScUndoSetTabBgColor::Redo() DoChange(nTab, aNewTabBgColor); } -void __EXPORT ScUndoSetTabBgColor::Repeat(SfxRepeatTarget& /* rTarget */) +void ScUndoSetTabBgColor::Repeat(SfxRepeatTarget& /* rTarget */) { // No Repeat } -BOOL __EXPORT ScUndoSetTabBgColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const +BOOL ScUndoSetTabBgColor::CanRepeat(SfxRepeatTarget& /* rTarget */) const { return FALSE; } diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index c59aabab3796..f43fcdde2ef8 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -286,7 +286,7 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV { sal_Int32 nColor = COL_AUTO; aSettings[i].Value >>= nColor; - if (nColor != COL_AUTO) + if (static_cast<ColorData>(nColor) != COL_AUTO) aTabBgColor.SetColor(static_cast<ColorData>(nColor)); } } |