diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-04-24 17:21:29 -0400 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-04-26 09:58:01 -0400 |
| commit | 58cb46341c8037c0fc2adeac69f72f09d0ffa952 (patch) | |
| tree | 2aa0dcd83a655a069c317318192bac8c10ce43bf /sc/inc/fielduno.hxx | |
| parent | d4a99ec456c3169ab6c3ef385c43221a9871bc9a (diff) | |
Construct the edit source instance outside ScHeaderFieldObj.
Diffstat (limited to 'sc/inc/fielduno.hxx')
| -rw-r--r-- | sc/inc/fielduno.hxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index 153ea338306f..e8f37da27ce2 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -61,7 +61,6 @@ class ScDocShell; class EditTextObject; class ScHeaderFooterTextData; - class ScCellFieldsObj : public cppu::WeakImplHelper5< com::sun::star::container::XEnumerationAccess, com::sun::star::container::XIndexAccess, @@ -342,7 +341,7 @@ private: const SfxItemPropertySet* pPropSet; com::sun::star::uno::Reference<com::sun::star::text::XTextRange> mpContent; sal_uInt16 nType; - SvxEditSource* pEditSource; + SvxEditSource* mpEditSource; ESelection aSelection; sal_Int16 nFileFormat; // enum SvxFileFormat, valid if not inserted @@ -350,16 +349,16 @@ private: public: ScHeaderFieldObj( const com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& rContent, - ScHeaderFooterTextData* pData, sal_uInt16 nT, const ESelection& rSel); + SvxEditSource* pEditSrc, sal_uInt16 nT, const ESelection& rSel); virtual ~ScHeaderFieldObj(); // called by getImplementation: void DeleteField(); - sal_Bool IsInserted() const { return pEditSource != NULL; } + sal_Bool IsInserted() const { return mpEditSource != NULL; } SvxFieldItem CreateFieldItem(); void InitDoc( const com::sun::star::uno::Reference<com::sun::star::text::XTextRange>& rContent, - ScHeaderFooterTextData& rData, const ESelection& rSel); + SvxEditSource* pEditSrc, const ESelection& rSel); virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type & rType ) |