From b02c52b467ff3259501350f2e6cb0de123f5b794 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Sat, 26 Jan 2013 14:48:25 +0100
Subject: use isEmpty instead of getLength

Change-Id: I9e5ce12776fcb31577a735296ab10b2c98c238f8
---
 sc/source/filter/xml/XMLStylesImportHelper.hxx | 4 ++--
 sc/source/filter/xml/xmlcelli.hxx              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sc/source/filter/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx
index 12807dbb007d..b64411dc5db7 100644
--- a/sc/source/filter/xml/XMLStylesImportHelper.hxx
+++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx
@@ -156,8 +156,8 @@ class ScMyStylesImportHelper
     {
         return ((pFirst && pSecond && pFirst->equals(*pSecond)) ||
                 (!pFirst && !pSecond) ||
-                (!pFirst && pSecond && !pSecond->getLength()) ||
-                (!pSecond &&  pFirst && !pFirst->getLength()));
+                (!pFirst && pSecond && pSecond->isEmpty()) ||
+                (!pSecond && pFirst && pFirst->isEmpty()));
     }
 public:
     ScMyStylesImportHelper(ScXMLImport& rImport);
diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx
index 44d2733a87b7..9584d8e0ccc4 100644
--- a/sc/source/filter/xml/xmlcelli.hxx
+++ b/sc/source/filter/xml/xmlcelli.hxx
@@ -19,7 +19,6 @@
 #ifndef SC_XMLCELLI_HXX
 #define SC_XMLCELLI_HXX
 
-#include <memory>
 #include "XMLDetectiveContext.hxx"
 #include "XMLCellRangeSourceContext.hxx"
 #include <xmloff/xmlictxt.hxx>
@@ -27,6 +26,7 @@
 
 #include "formula/grammar.hxx"
 #include <boost/optional.hpp>
+#include <boost/scoped_ptr.hpp>
 
 class ScXMLImport;
 class ScFormulaCell;
@@ -39,7 +39,7 @@ class ScXMLTableRowCellContext : public SvXMLImportContext
     ::boost::optional< rtl::OUString > pOUTextContent;
     ::boost::optional< FormulaWithNamespace > pOUFormula;
     rtl::OUString* pContentValidationName;
-    ::std::auto_ptr< ScXMLAnnotationData > mxAnnotationData;
+    boost::scoped_ptr< ScXMLAnnotationData > mxAnnotationData;
     ScMyImpDetectiveObjVec* pDetectiveObjVec;
     ScMyImpCellRangeSource* pCellRangeSource;
     double      fValue;
-- 
cgit v1.2.3