diff options
| author | Eike Rathke <erack@erack.de> | 2011-08-25 04:03:12 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@erack.de> | 2011-08-25 04:10:27 +0200 |
| commit | 61674465b74f60d7ddb2d7a0fa0e17c9990f6301 (patch) | |
| tree | ce909d149e32e4476e7b448b1788e3ff831a96bc | |
| parent | 8f931c854038dada37b96db32a0b68ffe52981fa (diff) | |
use boost::intrusive_ptr::get() instead of operator->()
Old intrusive pointer in operator->() simply returned a NULL pointer if
so, boost::intrusive_ptr asserts on that. If explicitly used to obtain
the pointer use get() instead.
| -rw-r--r-- | sc/inc/formularesult.hxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/interpr4.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/tool/token.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx index 640573559606..1cc5faf5f77f 100644 --- a/sc/inc/formularesult.hxx +++ b/sc/inc/formularesult.hxx @@ -407,7 +407,7 @@ inline bool ScFormulaResult::IsEmptyDisplayedAsString() const // don't need to test for mpToken here, GetType() already did it const ScEmptyCellToken* p = dynamic_cast<const ScEmptyCellToken*>( static_cast<const ScMatrixCellResultToken*>( - mpToken)->GetUpperLeftToken().operator->()); + mpToken)->GetUpperLeftToken().get()); if (p) return p->IsDisplayedAsString(); } diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 2f2d8826c670..05ff646b5514 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4301,7 +4301,7 @@ StackVar ScInterpreter::Interpret() if (eType == svMatrix) // Results are immutable in case they would be reused as input for new // interpreters. - static_cast<ScToken*>(xResult.operator->())->GetMatrix()->SetImmutable( true); + static_cast<ScToken*>(xResult.get())->GetMatrix()->SetImmutable( true); return eType; } diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index c34a1ac9d801..f0dc5cf90418 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1041,7 +1041,7 @@ const ScMatrix* ScMatrixCellResultToken::GetMatrix() const { return xMatrix.get // satisfy vtable linkage. ScMatrix* ScMatrixCellResultToken::GetMatrix() { - return const_cast<ScMatrix*>(xMatrix.operator->()); + return const_cast<ScMatrix*>(xMatrix.get()); } bool ScMatrixCellResultToken::operator==( const FormulaToken& r ) const { |