diff options
| author | Eike Rathke <erack@erack.de> | 2011-08-25 04:03:12 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@suse.com> | 2011-08-30 21:59:09 -0400 |
| commit | ac8ad054276a607b429a3fab5265dab552c1ed7b (patch) | |
| tree | 5afc58b0229cc759b383a1b0be66056b060f7bbf | |
| parent | 3031674a1bd4a3a2c4f5131ad847c61c9dcbcc55 (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.
Signed-off-by: Kohei Yoshida <kohei.yoshida@suse.com>
| -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 706f3aa6d..bd68e5295 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 8de2e386c..07ff54b51 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -4307,7 +4307,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 1cf448e47..5c4ece545 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -1062,7 +1062,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 { |