diff options
author | Muthu Subramanian <sumuthu@novell.com> | 2011-07-01 15:38:44 +0530 |
---|---|---|
committer | Muthu Subramanian <sumuthu@novell.com> | 2011-07-01 15:42:12 +0530 |
commit | 2fb377c19f8ae38e7ec649af1343bbd64b70a16b (patch) | |
tree | 0e765efe5ae4a78805102fe339690411b6bfaf37 /sc/inc | |
parent | 9291672fd750be475dd39131cc297e7dae10c1ab (diff) |
XLSX formula import improvement. Recommit.
Diffstat (limited to 'sc/inc')
-rw-r--r-- | sc/inc/cell.hxx | 1 | ||||
-rw-r--r-- | sc/inc/cellsuno.hxx | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sc/inc/cell.hxx b/sc/inc/cell.hxx index e24154516d4d..fcd83da9ddd6 100644 --- a/sc/inc/cell.hxx +++ b/sc/inc/cell.hxx @@ -404,6 +404,7 @@ public: void SetTableOpDirty(); sal_Bool IsDirtyOrInTableOpDirty() const; sal_Bool GetDirty() const { return bDirty; } + void ResetDirty() { bDirty = false; } sal_Bool NeedsListening() const { return bNeedListening; } void SetNeedsListening( sal_Bool bVar ) { bNeedListening = bVar; } void Compile(const String& rFormula, diff --git a/sc/inc/cellsuno.hxx b/sc/inc/cellsuno.hxx index b1f703f39b9f..92d2bc53b033 100644 --- a/sc/inc/cellsuno.hxx +++ b/sc/inc/cellsuno.hxx @@ -73,6 +73,7 @@ #include <com/sun/star/util/XSortable.hpp> #include <com/sun/star/util/XImportable.hpp> #include <com/sun/star/table/XColumnRowRange.hpp> +#include <com/sun/star/table/XCell2.hpp> #include <com/sun/star/table/BorderLine.hpp> #include <com/sun/star/table/TableBorder.hpp> #include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp> @@ -817,7 +818,7 @@ public: class SC_DLLPUBLIC ScCellObj : public ScCellRangeObj, public com::sun::star::text::XText, public com::sun::star::container::XEnumerationAccess, - public com::sun::star::table::XCell, + public com::sun::star::table::XCell2, public com::sun::star::sheet::XFormulaTokens, public com::sun::star::sheet::XCellAddressable, public com::sun::star::sheet::XSheetAnnotationAnchor, @@ -929,6 +930,10 @@ public: virtual ::rtl::OUString SAL_CALL getFormula() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFormula( const ::rtl::OUString& aFormula ) throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormulaResult( const double nValue ) + throw(::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL setFormulaString( const ::rtl::OUString& aFormula ) + throw(::com::sun::star::uno::RuntimeException); virtual double SAL_CALL getValue() throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setValue( double nValue ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::table::CellContentType SAL_CALL getType() |