diff options
Diffstat (limited to 'sc/source/ui')
| -rw-r--r-- | sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbafont.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/vba/vbaworksheets.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/preview.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/tabview.cxx | 4 | ||||
| -rw-r--r-- | sc/source/ui/view/tabvwshf.cxx | 43 |
6 files changed, 35 insertions, 34 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx index dc1dc0cac7bc..faff13dda9f7 100644 --- a/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx +++ b/sc/source/ui/Accessibility/AccessibleSpreadsheet.cxx @@ -1690,9 +1690,9 @@ bool ScAccessibleSpreadsheet::GetFormulaCurrentFocusCell(ScAddress &addr) uno::Reference < XAccessible > ScAccessibleSpreadsheet::GetActiveCell() { if( m_mapSelectionSend.find( maActiveCell ) != m_mapSelectionSend.end() ) - return m_mapSelectionSend[maActiveCell]; - else - return getAccessibleCellAt(maActiveCell.Row(), maActiveCell .Col()); + return m_mapSelectionSend[maActiveCell]; + else + return getAccessibleCellAt(maActiveCell.Row(), maActiveCell .Col()); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 1d82ded74aad..bd0f410de6fe 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -79,12 +79,12 @@ ScVbaFont::setColorIndex( const uno::Any& _colorindex ) // handled properly here if ( !nIndex || ( nIndex == excel::XlColorIndex::xlColorIndexAutomatic ) ) - { + { nIndex = 1; // check default ( assume black ) - ScVbaFont_BASE::setColorIndex( uno::makeAny( nIndex ) ); - } - else - ScVbaFont_BASE::setColorIndex( _colorindex ); + ScVbaFont_BASE::setColorIndex( uno::makeAny( nIndex ) ); + } + else + ScVbaFont_BASE::setColorIndex( _colorindex ); } uno::Any SAL_CALL diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 46b2bc880c58..81870ab6a3a6 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -230,7 +230,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, if ( Before.hasValue() ) { - if ( Before >>= xBeforeAfterSheet ) + if ( Before >>= xBeforeAfterSheet ) aStringSheet = xBeforeAfterSheet->getName(); else Before >>= aStringSheet; @@ -238,7 +238,7 @@ ScVbaWorksheets::Add( const uno::Any& Before, const uno::Any& After, if (aStringSheet.isEmpty() && After.hasValue() ) { - if ( After >>= xBeforeAfterSheet ) + if ( After >>= xBeforeAfterSheet ) aStringSheet = xBeforeAfterSheet->getName(); else After >>= aStringSheet; diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index ec9206921c9c..0438ce1467f4 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -890,7 +890,7 @@ void ScPreview::DoInvalidate() // If the whole GetState of the shell is called // The Invalidate must come behind asynchronously - if (bInGetState) + if (bInGetState) Application::PostUserEvent( LINK( this, ScPreview, InvalidateHdl ), nullptr, true ); else StaticInvalidate(); // Immediately diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index acb9a8ba3d57..7e7e40b95fd6 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -441,8 +441,8 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) { nTabSize = pTabControl->GetSizePixel().Width(); - if ( aViewData.GetHSplitMode() != SC_SPLIT_FIX ) // left Scrollbar - { + if ( aViewData.GetHSplitMode() != SC_SPLIT_FIX ) // left Scrollbar + { if (nTabSize > nSizeLt-SC_SCROLLBAR_MIN) nTabSize = nSizeLt-SC_SCROLLBAR_MIN; if (nTabSize < SC_TABBAR_MIN) diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index ba955827015d..e0fbd782619b 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -795,38 +795,39 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) { ScMarkData::iterator itr = rMark.begin(), itrEnd = rMark.end(); for (; itr != itrEnd; ++itr) + { + if ( !pDoc->IsTabProtected(*itr) ) { - if ( !pDoc->IsTabProtected(*itr) ) - { - ScUndoTabColorInfo aTabColorInfo(*itr); - aTabColorInfo.maNewTabBgColor = aSelectedColor; - pTabColorList->push_back(aTabColorInfo); - } + ScUndoTabColorInfo aTabColorInfo(*itr); + aTabColorInfo.maNewTabBgColor = aSelectedColor; + pTabColorList->push_back(aTabColorInfo); } - bDone = SetTabBgColor( *pTabColorList ); } - else - { - bDone = SetTabBgColor( aSelectedColor, nCurrentTab ); //ScViewFunc.SetTabBgColor - } - if ( bDone ) - { - rReq.AppendItem( SvxColorItem( aTabBgColor, nSlot ) ); - rReq.Done(); - } - else + bDone = SetTabBgColor( *pTabColorList ); + } + else + { + bDone = SetTabBgColor( aSelectedColor, nCurrentTab ); //ScViewFunc.SetTabBgColor + } + + if ( bDone ) + { + rReq.AppendItem( SvxColorItem( aTabBgColor, nSlot ) ); + rReq.Done(); + } + else + { + if( rReq.IsAPI() ) { - if( rReq.IsAPI() ) - { #if HAVE_FEATURE_SCRIPTING - StarBASIC::Error( ERRCODE_BASIC_SETPROP_FAILED ); + StarBASIC::Error( ERRCODE_BASIC_SETPROP_FAILED ); #endif - } } } } } } + } break; case FID_TAB_EVENTS: |