diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-10-27 23:53:34 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2011-10-27 23:54:24 +0200 |
| commit | 67315dcfb0664a35fdd34f86242452bc27df6105 (patch) | |
| tree | 70f8b6b1f2877d5ac2fe7bfc19dd35680c239745 /sc/inc | |
| parent | 35896a678b004a84bafc54fd3e08dfc97a0d4886 (diff) | |
use uno for local range name api, it crashs otherwise sometimes
Diffstat (limited to 'sc/inc')
| -rw-r--r-- | sc/inc/nameuno.hxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sc/inc/nameuno.hxx b/sc/inc/nameuno.hxx index 9d7ca9351343..c08222632419 100644 --- a/sc/inc/nameuno.hxx +++ b/sc/inc/nameuno.hxx @@ -38,6 +38,7 @@ #include <com/sun/star/sheet/XNamedRange.hpp> #include <com/sun/star/sheet/XFormulaTokens.hpp> #include <com/sun/star/sheet/XNamedRanges.hpp> +#include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -69,7 +70,7 @@ private: ScNamedRangesObj* mpParent; ScDocShell* pDocShell; String aName; - ScTableSheetObj* mpSheet; + com::sun::star::uno::Reference< com::sun::star::container::XNamed > mxSheet; private: ScRangeData* GetRangeData_Impl(); @@ -80,7 +81,8 @@ private: SCTAB GetTab_Impl(); public: - ScNamedRangeObj(ScNamedRangesObj* pParent, ScDocShell* pDocSh, const String& rNm, ScTableSheetObj* pSheet = NULL); + ScNamedRangeObj(ScNamedRangesObj* pParent, ScDocShell* pDocSh, const String& rNm, + com::sun::star::uno::Reference< com::sun::star::container::XNamed > xSheet = com::sun::star::uno::Reference< com::sun::star::container::XNamed > ()); virtual ~ScNamedRangeObj(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); @@ -337,9 +339,9 @@ private: virtual ScRangeName* GetRangeName_Impl(); virtual SCTAB GetTab_Impl(); - ScTableSheetObj* mpSheet; + ::com::sun::star::uno::Reference< ::com::sun::star::container::XNamed > mxSheet; public: - ScLocalNamedRangesObj(ScDocShell* pDocSh, ScTableSheetObj* pSheet); + ScLocalNamedRangesObj(ScDocShell* pDocSh, ::com::sun::star::uno::Reference< com::sun::star::container::XNamed > xNamed ); virtual ~ScLocalNamedRangesObj(); }; |