summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorHerbert Dürr <hdu@apache.org>2014-01-06 14:10:06 +0000
committerHerbert Dürr <hdu@apache.org>2014-01-06 14:10:06 +0000
commitc31988351c10e9f3fd783730d95da34efd52c153 (patch)
tree03d146162a361043f12e1448245e4e93c31b61a9 /sc
parent631b6b53afe97f22405f5239e7d13422622f980b (diff)
#i123817# prepare codebase for updating to boost 1.55
Notes
Notes: merged as: 9e77ddcd19d328c54ed0fb3ebb83f585b85f0249
Diffstat (limited to 'sc')
-rw-r--r--sc/source/core/data/documen3.cxx2
-rw-r--r--sc/source/core/data/dpsave.cxx4
-rw-r--r--sc/source/core/data/table5.cxx2
-rw-r--r--sc/source/ui/Accessibility/AccessibleText.cxx2
-rw-r--r--sc/source/ui/unoobj/chart2uno.cxx10
5 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index 487eb94d152f..739028c16c0f 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -1813,7 +1813,7 @@ void ScDocument::SetDocProtection(const ScDocProtection* pProtect)
if (pProtect)
pDocProtection.reset(new ScDocProtection(*pProtect));
else
- pDocProtection.reset(NULL);
+ pDocProtection.reset();
}
sal_Bool ScDocument::IsDocProtected() const
diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx
index 0f444dafdafc..707031d3ccd5 100644
--- a/sc/source/core/data/dpsave.cxx
+++ b/sc/source/core/data/dpsave.cxx
@@ -165,7 +165,7 @@ const OUString* ScDPSaveMember::GetLayoutName() const
void ScDPSaveMember::RemoveLayoutName()
{
- mpLayoutName.reset(NULL);
+ mpLayoutName.reset();
}
void ScDPSaveMember::WriteToSource( const uno::Reference<uno::XInterface>& xMember, sal_Int32 nPosition )
@@ -465,7 +465,7 @@ const OUString* ScDPSaveDimension::GetLayoutName() const
void ScDPSaveDimension::RemoveLayoutName()
{
- mpLayoutName.reset(NULL);
+ mpLayoutName.reset();
}
void ScDPSaveDimension::SetReferenceValue(const sheet::DataPilotFieldReference* pNew)
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 43445b695685..3d16680028ca 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -1031,7 +1031,7 @@ void ScTable::SetProtection(const ScTableProtection* pProtect)
if (pProtect)
pTabProtection.reset(new ScTableProtection(*pProtect));
else
- pTabProtection.reset(NULL);
+ pTabProtection.reset();
if (IsStreamValid())
SetStreamValid(sal_False);
diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx
index cb33b7d93dd5..840084da83ab 100644
--- a/sc/source/ui/Accessibility/AccessibleText.cxx
+++ b/sc/source/ui/Accessibility/AccessibleText.cxx
@@ -1891,7 +1891,7 @@ SvxTextForwarder* ScAccessibleCsvTextData::GetTextForwarder()
mpTextForwarder.reset( new SvxEditEngineForwarder( *mpEditEngine ) );
}
else
- mpTextForwarder.reset( NULL );
+ mpTextForwarder.reset();
return mpTextForwarder.get();
}
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index dc822985768b..a9e8c1e772d2 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -509,7 +509,7 @@ private:
void Chart2Positioner::invalidateGlue()
{
meGlue = GLUETYPE_NA;
- mpPositionMap.reset(NULL);
+ mpPositionMap.reset();
}
void Chart2Positioner::glueState()
@@ -700,7 +700,7 @@ void Chart2Positioner::glueState()
void Chart2Positioner::createPositionMap()
{
if (meGlue == GLUETYPE_NA && mpPositionMap.get())
- mpPositionMap.reset(NULL);
+ mpPositionMap.reset();
if (mpPositionMap.get())
return;
@@ -783,8 +783,8 @@ void Chart2Positioner::createPositionMap()
}
nNoGlueRow += nRow2 - nRow1 + 1;
}
- pNewAddress.reset(NULL);
- pNewRowTable.reset(NULL);
+ pNewAddress.reset();
+ pNewRowTable.reset();
bool bFillRowHeader = mbRowHeaders;
bool bFillColumnHeader = mbColHeaders;
@@ -2758,7 +2758,7 @@ void ScChart2DataSequence::StopListeningToAllExternalRefs()
for (; itr != itrEnd; ++itr)
pRefMgr->removeLinkListener(*itr, m_pExtRefListener.get());
- m_pExtRefListener.reset(NULL);
+ m_pExtRefListener.reset();
}
void ScChart2DataSequence::CopyData(const ScChart2DataSequence& r)