avoid Wundef for various FIXME, FEATURE_NOT_DONE_YET and what not

Change-Id: I8e409ba63d32dca9a1c7f09d143165d1d702d642

5 files changed, 11 insertions, 11 deletions

diff --git a/oox/inc/oox/ole/olehelper.hxx b/oox/inc/oox/ole/olehelper.hxx
index 8825baf9e7eb..68d3133b7db6 100644
--- a/oox/inc/oox/ole/olehelper.hxx
+++ b/oox/inc/oox/ole/olehelper.hxx
@@ -151,7 +151,7 @@ private:
 // implementation into the sd module itself.
 class OOX_DLLPUBLIC MSConvertOCXControls : public SvxMSConvertOCXControls
 {
-#if SvxMSConvertOCXControlsRemoved
+#ifdef 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;
@@ -176,7 +176,7 @@ public:
                                    sal_Int32 nPos, sal_Int32 nSize );
     static sal_Bool WriteOCXStream( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rxModel, SotStorageRef &rSrc1, const com::sun::star::uno::Reference< com::sun::star::awt::XControlModel > &rControlModel, const com::sun::star::awt::Size& rSize,rtl::OUString &rName);
 
-#if SvxMSConvertOCXControlsRemoved
+#ifdef SvxMSConvertOCXControlsRemoved
     const com::sun::star::uno::Reference< com::sun::star::drawing::XShapes > & GetShapes();
     const com::sun::star::uno::Reference< com::sun::star::container::XIndexContainer > &  GetFormComps();
     virtual const com::sun::star::uno::Reference<
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 13515b681074..2289e4d4be61 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -540,7 +540,7 @@ writeCoreProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xPro
             FSNS( XML_xmlns, XML_xsi ),         "http://www.w3.org/2001/XMLSchema-instance",
             FSEND );
 
-#if OOXTODO
+#ifdef OOXTODO
     writeElement( pCoreProps, FSNS( XML_cp, XML_category ),         "category" );
     writeElement( pCoreProps, FSNS( XML_cp, XML_contentStatus ),    "status" );
     writeElement( pCoreProps, FSNS( XML_cp, XML_contentType ),      "contentType" );
@@ -548,7 +548,7 @@ writeCoreProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xPro
     writeElement( pCoreProps, FSNS( XML_dcterms, XML_created ),     xProperties->getCreationDate() );
     writeElement( pCoreProps, FSNS( XML_dc, XML_creator ),          xProperties->getAuthor() );
     writeElement( pCoreProps, FSNS( XML_dc, XML_description ),      xProperties->getDescription() );
-#if OOXTODO
+#ifdef OOXTODO
     writeElement( pCoreProps, FSNS( XML_dc, XML_identifier ),       "ident" );
 #endif  /* def OOXTODO */
     writeElement( pCoreProps, FSNS( XML_cp, XML_keywords ),         xProperties->getKeywords() );
@@ -559,7 +559,7 @@ writeCoreProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xPro
     writeElement( pCoreProps, FSNS( XML_cp, XML_revision ),         xProperties->getEditingCycles() );
     writeElement( pCoreProps, FSNS( XML_dc, XML_subject ),          xProperties->getSubject() );
     writeElement( pCoreProps, FSNS( XML_dc, XML_title ),            xProperties->getTitle() );
-#if OOXTODO
+#ifdef OOXTODO
     writeElement( pCoreProps, FSNS( XML_cp, XML_version ),          "version" );
 #endif  /* def OOXTODO */
 
@@ -581,7 +581,7 @@ writeAppProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xProp
             FSEND );
 
     writeElement( pAppProps, XML_Template,              xProperties->getTemplateName() );
-#if OOXTODO
+#ifdef OOXTODO
     writeElement( pAppProps, XML_Manager,               "manager" );
     writeElement( pAppProps, XML_Company,               "company" );
     writeElement( pAppProps, XML_Pages,                 "pages" );
@@ -594,7 +594,7 @@ writeAppProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xProp
     writeElement( pAppProps, XML_Notes,                 "notes" );
 #endif  /* def OOXTODO */
     writeElement( pAppProps, XML_TotalTime,             xProperties->getEditingDuration() );
-#if OOXTODO
+#ifdef OOXTODO
     writeElement( pAppProps, XML_HiddenSlides,          "hidden slides" );
     writeElement( pAppProps, XML_MMClips,               "mm clips" );
     writeElement( pAppProps, XML_ScaleCrop,             "scale crop" );
@@ -609,7 +609,7 @@ writeAppProperties( XmlFilterBase& rSelf, Reference< XDocumentProperties > xProp
     writeElement( pAppProps, XML_DigSig,                "digital signature" );
 #endif  /* def OOXTODO */
     writeElement( pAppProps, XML_Application,           xProperties->getGenerator() );
-#if OOXTODO
+#ifdef OOXTODO
     writeElement( pAppProps, XML_AppVersion,            "app version" );
     writeElement( pAppProps, XML_DocSecurity,           "doc security" );
 #endif  /* def OOXTODO */
diff --git a/oox/source/dump/pptxdumper.cxx b/oox/source/dump/pptxdumper.cxx
index f406fcfba430..1e372a6a1454 100644
--- a/oox/source/dump/pptxdumper.cxx
+++ b/oox/source/dump/pptxdumper.cxx
@@ -53,7 +53,7 @@ void RootStorageObject::implDumpStream( const Reference< XInputStream >& rxStrm,
     {
         Dumper( getContext(), rxStrm, rSysFileName ).dump();
     }
-#if FIXME
+#ifdef FIXME
     else if(
         aExt.equalsIgnoreAsciiCaseAscii("xlsb") ||
         aExt.equalsIgnoreAsciiCaseAscii("xlsm") ||
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx
index 648b10ded2fa..813b78b6d08a 100644
--- a/oox/source/ole/axcontrol.cxx
+++ b/oox/source/ole/axcontrol.cxx
@@ -2379,7 +2379,7 @@ void AxFrameModel::convertProperties( PropertyMap& rPropMap, const ControlConver
 {
     rPropMap.setProperty( PROP_Label, maCaption );
     rPropMap.setProperty( PROP_Enabled, getFlag( mnFlags, AX_CONTAINER_ENABLED ) );
-#if SCROLLABLEFRAME
+#ifdef SCROLLABLEFRAME
     rConv.convertScrollabilitySettings( rPropMap, maScrollPos, maLogicalSize, mnScrollBars );
 #endif
     AxContainerModelBase::convertProperties( rPropMap, rConv );
diff --git a/oox/source/ole/olehelper.cxx b/oox/source/ole/olehelper.cxx
index 8e67c6d51903..6ab01afb0fb7 100644
--- a/oox/source/ole/olehelper.cxx
+++ b/oox/source/ole/olehelper.cxx
@@ -604,7 +604,7 @@ sal_Bool MSConvertOCXControls::WriteOCXStream( const Reference< XModel >& rxMode
     return sal_True;
 }
 
-#if SvxMSConvertOCXControlsRemoved
+#ifdef SvxMSConvertOCXControlsRemoved
 const Reference< com::sun::star::lang::XMultiServiceFactory > & MSConvertOCXControls::GetServiceFactory()
 {
     if ( !mxServiceFactory.is() && mxModel.is() )