diff options
| author | Noel Power <noel.power@novell.com> | 2011-09-26 14:11:15 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2011-09-26 14:15:37 +0100 |
| commit | 13982b4f1712b50710c1642945e25aaaffc19a85 (patch) | |
| tree | 2e1b18f6e47e6ef4f5c8d4cc197bf9f21bc582c6 /oox | |
| parent | Do as the comment says: use the pragma for gcc >= 4.2.1 (diff) | |
| download | core-13982b4f1712b50710c1642945e25aaaffc19a85.tar.gz core-13982b4f1712b50710c1642945e25aaaffc19a85.zip | |
conditionalise out presently unused class variables
currently we conditionalise out the parts of the code intended to replace the remaining code in SvxMSConvertOCXControls with flag SvxMSConvertOCXControlsRemoved. Some unused class variables should also have been conditionalise out. Hmmm maybe I should just get rid of it all :-/
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/inc/oox/ole/olehelper.hxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/oox/inc/oox/ole/olehelper.hxx b/oox/inc/oox/ole/olehelper.hxx index e711804aac3f..933d4a518423 100644 --- a/oox/inc/oox/ole/olehelper.hxx +++ b/oox/inc/oox/ole/olehelper.hxx @@ -168,10 +168,12 @@ private: // implementation into the sd module itself. class OOX_DLLPUBLIC MSConvertOCXControls : public SvxMSConvertOCXControls { +#if SvxMSConvertOCXControlsRemoved com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > mxShapes; com::sun::star::uno::Reference< com::sun::star::drawing::XDrawPage > mxDrawPage; com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > mxFormComps; com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > mxServiceFactory; +#endif protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > mxCtx; ::oox::GraphicHelper maGrfHelper; |