From 58cb46341c8037c0fc2adeac69f72f09d0ffa952 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Tue, 24 Apr 2012 17:21:29 -0400 Subject: Construct the edit source instance outside ScHeaderFieldObj. --- sc/inc/fielduno.hxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'sc/inc/fielduno.hxx') 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 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& 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& 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 ) -- cgit -2021'>distro/collabora/co-2021 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author