diff options
| -rw-r--r-- | sc/source/ui/inc/viewutil.hxx | 6 | ||||
| -rw-r--r-- | sc/source/ui/view/viewutil.cxx | 15 |
2 files changed, 10 insertions, 11 deletions
diff --git a/sc/source/ui/inc/viewutil.hxx b/sc/source/ui/inc/viewutil.hxx index 7339854cc018..145cc0b52cae 100644 --- a/sc/source/ui/inc/viewutil.hxx +++ b/sc/source/ui/inc/viewutil.hxx @@ -40,12 +40,12 @@ enum ScUpdateMode { SC_UPDATE_ALL, SC_UPDATE_CHANGED, SC_UPDATE_MARKS }; class SC_DLLPUBLIC ScViewUtil { public: - static sal_Bool ExecuteCharMap( const SvxFontItem& rOldFont, + static bool ExecuteCharMap( const SvxFontItem& rOldFont, SfxViewFrame& rFrame, SvxFontItem& rNewFont, OUString& rString ); - static sal_Bool IsActionShown( const ScChangeAction& rAction, + static bool IsActionShown( const ScChangeAction& rAction, const ScChangeViewSettings& rSettings, ScDocument& rDocument ); @@ -84,7 +84,7 @@ private: public: ScUpdateRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); void SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); - sal_Bool GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); + bool GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ); }; #endif diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index cad155d32dfb..66ea64548770 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -1,4 +1,3 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /* * This file is part of the LibreOffice project. * @@ -133,7 +132,7 @@ sal_Int32 ScViewUtil::GetTransliterationType( sal_uInt16 nSlotID ) return nType; } -sal_Bool ScViewUtil::IsActionShown( const ScChangeAction& rAction, +bool ScViewUtil::IsActionShown( const ScChangeAction& rAction, const ScChangeViewSettings& rSettings, ScDocument& rDocument ) { @@ -233,7 +232,7 @@ sal_Bool ScViewUtil::IsActionShown( const ScChangeAction& rAction, } } - return sal_True; + return true; } void ScViewUtil::UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc ) @@ -339,12 +338,12 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, sal } -sal_Bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont, +bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont, SfxViewFrame& rFrame, SvxFontItem& rNewFont, OUString& rString ) { - sal_Bool bRet = false; + bool bRet = false; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); if(pFact) { @@ -360,7 +359,7 @@ sal_Bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont, rString = pItem->GetValue(); if ( pFontItem ) rNewFont = SvxFontItem( pFontItem->GetFamily(), pFontItem->GetFamilyName(), pFontItem->GetStyleName(), pFontItem->GetPitch(), pFontItem->GetCharSet(), rNewFont.Which() ); - bRet = sal_True; + bRet = true; } delete pDlg; } @@ -412,7 +411,7 @@ void ScUpdateRect::SetNew( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ) nNewEndY = nY2; } -sal_Bool ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) +bool ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) { if ( nNewStartX == nOldStartX && nNewEndX == nOldEndX && nNewStartY == nOldStartY && nNewEndY == nOldEndY ) @@ -456,7 +455,7 @@ sal_Bool ScUpdateRect::GetDiff( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) } } - return sal_True; + return true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |