oox/inc/oox/ole/olehelper.hxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 13982b4f1712b50710c1642945e25aaaffc19a85
Author: Noel Power <noel.po...@novell.com>
Date: Mon Sep 26 14:11:15 2011 +0100
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 :-/
diff --git a/oox/inc/oox/ole/olehelper.hxx b/oox/inc/oox/ole/olehelper.hxx
index e711804..933d4a5 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;
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
