diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-26 00:40:28 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-01-26 00:49:17 +0100 |
| commit | 2b17d6c14d226b1973c87ff161586c39899e403f (patch) | |
| tree | 32f143d47b51a3d7a8b7e5e96d6497f5cab53c48 /sc | |
| parent | this test case must be changed a bit (diff) | |
| download | core-2b17d6c14d226b1973c87ff161586c39899e403f.tar.gz core-2b17d6c14d226b1973c87ff161586c39899e403f.zip | |
remove some data members from the class
Change-Id: I69df18c7b613673834613d49ab0d58bbee9cc0df
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.cxx | 6 | ||||
| -rw-r--r-- | sc/source/filter/xml/xmlcelli.hxx | 9 |
2 files changed, 4 insertions, 11 deletions
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index ba67212b11e0..b0cd059da643 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.cxx @@ -78,6 +78,8 @@ #include <com/sun/star/util/Date.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/text/ControlCharacter.hpp> +#include <com/sun/star/table/XCell.hpp> +#include <com/sun/star/document/XActionLockable.hpp> #include <com/sun/star/sheet/ValidationType.hpp> #include <com/sun/star/sheet/ValidationAlertStyle.hpp> @@ -310,10 +312,10 @@ void ScXMLTableRowCellContext::SetCursorOnTextImport(const rtl::OUString& rOUTem uno::Reference<table::XCellRange> xCellRange(rXMLImport.GetTables().GetCurrentXCellRange()); if (xCellRange.is()) { - xBaseCell.set( xCellRange->getCellByPosition(nCol, nRow) ); + com::sun::star::uno::Reference<com::sun::star::table::XCell> xBaseCell( xCellRange->getCellByPosition(nCol, nRow) ); if (xBaseCell.is()) { - xLockable.set(xBaseCell, uno::UNO_QUERY); + com::sun::star::uno::Reference<com::sun::star::document::XActionLockable> xLockable(xBaseCell, uno::UNO_QUERY); if (xLockable.is()) xLockable->addActionLock(); uno::Reference<text::XText> xText(xBaseCell, uno::UNO_QUERY); diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 2bf8b8c6a3e1..44d2733a87b7 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -24,13 +24,6 @@ #include "XMLCellRangeSourceContext.hxx" #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimp.hxx> -#include <com/sun/star/table/XCell.hpp> -#include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/table/XCellRange.hpp> -#include <com/sun/star/table/CellRangeAddress.hpp> -#include <com/sun/star/table/CellAddress.hpp> -#include <com/sun/star/sheet/XSpreadsheetDocument.hpp> -#include <com/sun/star/document/XActionLockable.hpp> #include "formula/grammar.hxx" #include <boost/optional.hpp> @@ -42,8 +35,6 @@ struct ScXMLAnnotationData; class ScXMLTableRowCellContext : public SvXMLImportContext { typedef ::std::pair< ::rtl::OUString, ::rtl::OUString > FormulaWithNamespace; - com::sun::star::uno::Reference<com::sun::star::table::XCell> xBaseCell; - com::sun::star::uno::Reference<com::sun::star::document::XActionLockable> xLockable; ::boost::optional< rtl::OUString > pOUTextValue; ::boost::optional< rtl::OUString > pOUTextContent; ::boost::optional< FormulaWithNamespace > pOUFormula; |