summaryrefslogtreecommitdiff
path: root/sc/source/filter/ftools
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter/ftools')
-rw-r--r--sc/source/filter/ftools/fapihelper.cxx4
-rw-r--r--sc/source/filter/ftools/fprogressbar.cxx6
-rw-r--r--sc/source/filter/ftools/ftools.cxx2
-rw-r--r--sc/source/filter/ftools/sharedformulagroups.cxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx
index e2d0a2a0a3dd..0f17a3e2c541 100644
--- a/sc/source/filter/ftools/fapihelper.cxx
+++ b/sc/source/filter/ftools/fapihelper.cxx
@@ -320,7 +320,7 @@ bool ScfPropSetHelper::ReadValue( Any& rAny )
Any* pAny = GetNextAny();
if( pAny )
rAny = *pAny;
- return pAny != 0;
+ return pAny != nullptr;
}
bool ScfPropSetHelper::ReadValue( Color& rColor )
@@ -371,7 +371,7 @@ void ScfPropSetHelper::WriteToPropertySet( ScfPropertySet& rPropSet ) const
Any* ScfPropSetHelper::GetNextAny()
{
OSL_ENSURE( mnNextIdx < maNameOrder.size(), "ScfPropSetHelper::GetNextAny - sequence overflow" );
- Any* pAny = 0;
+ Any* pAny = nullptr;
if( mnNextIdx < maNameOrder.size() )
pAny = &maValueSeq[ maNameOrder[ mnNextIdx++ ] ];
return pAny;
diff --git a/sc/source/filter/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx
index 645323b9cf1c..84deda9ec4a2 100644
--- a/sc/source/filter/ftools/fprogressbar.cxx
+++ b/sc/source/filter/ftools/fprogressbar.cxx
@@ -58,8 +58,8 @@ ScfProgressBar::~ScfProgressBar()
void ScfProgressBar::Init( SfxObjectShell* pDocShell )
{
mpDocShell = pDocShell;
- mpParentProgress = 0;
- mpParentSegment = mpCurrSegment = 0;
+ mpParentProgress = nullptr;
+ mpParentSegment = mpCurrSegment = nullptr;
mnTotalSize = mnTotalPos = mnUnitSize = mnNextUnitPos = 0;
mnSysProgressScale = 1; // used to workaround the ULONG_MAX/100 limit
mbInProgress = false;
@@ -68,7 +68,7 @@ void ScfProgressBar::Init( SfxObjectShell* pDocShell )
ScfProgressBar::ScfProgressSegment* ScfProgressBar::GetSegment( sal_Int32 nSegment )
{
if( nSegment < 0 )
- return 0;
+ return nullptr;
return &(maSegments.at( nSegment ));
}
diff --git a/sc/source/filter/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx
index 324c0e34c9fd..fb80b938c3b7 100644
--- a/sc/source/filter/ftools/ftools.cxx
+++ b/sc/source/filter/ftools/ftools.cxx
@@ -234,7 +234,7 @@ ScStyleSheet& lclMakeStyleSheet( ScStyleSheetPool& rPool, const OUString& rStyle
// find an unused name
OUString aNewName( rStyleName );
sal_Int32 nIndex = 0;
- SfxStyleSheetBase* pOldStyleSheet = 0;
+ SfxStyleSheetBase* pOldStyleSheet = nullptr;
while( SfxStyleSheetBase* pStyleSheet = rPool.Find( aNewName, eFamily ) )
{
if( !pOldStyleSheet )
diff --git a/sc/source/filter/ftools/sharedformulagroups.cxx b/sc/source/filter/ftools/sharedformulagroups.cxx
index 9a00ade2f0a8..46ccb31d03c6 100644
--- a/sc/source/filter/ftools/sharedformulagroups.cxx
+++ b/sc/source/filter/ftools/sharedformulagroups.cxx
@@ -19,7 +19,7 @@ void SharedFormulaGroups::set( size_t nSharedId, ScTokenArray* pArray )
const ScTokenArray* SharedFormulaGroups::get( size_t nSharedId ) const
{
StoreType::const_iterator it = maStore.find(nSharedId);
- return it == maStore.end() ? NULL : it->second;
+ return it == maStore.end() ? nullptr : it->second;
}
}