[Libreoffice-commits] .: Branch 'libreoffice-3-4' - sc/inc sc/source

[Kohei Yoshida]

 sc/inc/formularesult.hxx         |    2 +-
 sc/source/core/tool/interpr4.cxx |    2 +-
 sc/source/core/tool/token.cxx    |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ac8ad054276a607b429a3fab5265dab552c1ed7b
Author: Eike Rathke <erack at erack.de>
Date:   Thu Aug 25 04:03:12 2011 +0200

    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 at suse.com>

diff --git a/sc/inc/formularesult.hxx b/sc/inc/formularesult.hxx
index 706f3aa..bd68e52 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 8de2e38..07ff54b 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 1cf448e..5c4ece5 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
 {