From 9be25f14bdd801106efcfae34c8f1492cddfa714 Mon Sep 17 00:00:00 2001 From: Luboš Luňák Date: Mon, 18 Mar 2013 17:05:51 +0100 Subject: avoid Wundef for various FIXME, FEATURE_NOT_DONE_YET and what not Change-Id: I8e409ba63d32dca9a1c7f09d143165d1d702d642 --- basic/source/sbx/sbxcurr.cxx | 8 ++++---- filter/source/svg/svgexport.cxx | 2 +- i18npool/qa/cppunit/test_breakiterator.cxx | 6 +++--- oox/inc/oox/ole/olehelper.hxx | 4 ++-- oox/source/core/xmlfilterbase.cxx | 12 ++++++------ oox/source/dump/pptxdumper.cxx | 2 +- oox/source/ole/axcontrol.cxx | 2 +- oox/source/ole/olehelper.cxx | 2 +- sc/source/filter/excel/read.cxx | 2 +- toolkit/source/awt/scrollabledialog.cxx | 2 +- toolkit/source/awt/vclxtoolkit.cxx | 2 +- vcl/source/gdi/pdfwriter_impl2.cxx | 2 +- xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx | 2 +- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 2 +- 14 files changed, 25 insertions(+), 25 deletions(-) diff --git a/basic/source/sbx/sbxcurr.cxx b/basic/source/sbx/sbxcurr.cxx index 4df61fc36083..7b4bde230f2e 100644 --- a/basic/source/sbx/sbxcurr.cxx +++ b/basic/source/sbx/sbxcurr.cxx @@ -32,7 +32,7 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal ) sal_Int64 absVal = isNeg ? -rVal : rVal; sal_Unicode cDecimalSep = '.'; -#if MAYBEFUTURE +#ifdef MAYBEFUTURE sal_Unicode cThousandSep = ','; ImpGetIntntlSep( cDecimalSep, cThousandSep ); #endif @@ -51,7 +51,7 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal ) if ( !bLessThanOne ) { nCapacity = initialLen + 1; -#if MAYBEFUTURE +#ifdef MAYBEFUTURE if ( initialLen > 5 ) { sal_Int32 nThouSeperators = ( initialLen - 5 ) / 3; @@ -74,7 +74,7 @@ static rtl::OUString ImpCurrencyToString( const sal_Int64 &rVal ) { if ( nDigitCount == 4 ) aBuf[nInsertIndex--] = cDecimalSep; -#if MAYBEFUTURE +#ifdef MAYBEFUTURE if ( nDigitCount > 4 && ! ( ( nDigitCount - 4 ) % 3) ) aBuf[nInsertIndex--] = cThousandSep; #endif @@ -110,7 +110,7 @@ static sal_Int64 ImpStringToCurrency( const rtl::OUString &rStr ) sal_Unicode cDeciPnt = sal_Unicode('.'); sal_Unicode c1000Sep = sal_Unicode(','); -#if MAYBEFUTURE +#ifdef MAYBEFUTURE sal_Unicode cLocaleDeciPnt, cLocale1000Sep; ImpGetIntntlSep( cLocaleDeciPnt, cLocale1000Sep ); diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index 5017d99a116a..81a4435325a2 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -1830,7 +1830,7 @@ sal_Bool SVGFilter::implCreateObjects() if( xDrawPage.is() ) { -#if ENABLE_EXPORT_CUSTOM_SLIDE_BACKGROUND +#ifdef ENABLE_EXPORT_CUSTOM_SLIDE_BACKGROUND // TODO complete the implementation for exporting custom background for each slide // implementation status: // - hatch stroke color is set to 'none' so the hatch is not visible, why ? diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx index 5730d0d58129..665747b5fc01 100644 --- a/i18npool/qa/cppunit/test_breakiterator.cxx +++ b/i18npool/qa/cppunit/test_breakiterator.cxx @@ -57,7 +57,7 @@ public: void testWeak(); void testAsian(); void testThai(); -#if TODO +#ifdef TODO void testNorthernThai(); #endif void testKhmer(); @@ -69,7 +69,7 @@ public: CPPUNIT_TEST(testWeak); CPPUNIT_TEST(testAsian); CPPUNIT_TEST(testThai); -#if TODO +#ifdef TODO CPPUNIT_TEST(testNorthernThai); #endif @@ -851,7 +851,7 @@ void TestBreakIterator::testThai() } } -#if TODO +#ifdef TODO void TestBreakIterator::testNorthernThai() { lang::Locale aLocale; 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() ) diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 694b9dde54db..8ffa93580ac2 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -769,7 +769,7 @@ FltError ImportExcel::Read( void ) FltError ImportExcel8::Read( void ) { -#if EXC_INCL_DUMPER +#ifdef EXC_INCL_DUMPER { Biff8RecDumper aDumper( GetRoot(), sal_True ); if( aDumper.Dump( aIn ) ) diff --git a/toolkit/source/awt/scrollabledialog.cxx b/toolkit/source/awt/scrollabledialog.cxx index 968ec9f8a716..91edeffecf77 100644 --- a/toolkit/source/awt/scrollabledialog.cxx +++ b/toolkit/source/awt/scrollabledialog.cxx @@ -176,7 +176,7 @@ void ScrollableWrapper::ResetScrollBars() } template class ScrollableWrapper< Dialog >; -#if SCROLLABLEFRAME +#ifdef SCROLLABLEFRAME template class ScrollableWrapper< GroupBox >; #endif diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index eaba013c30a4..cb6668d85194 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -692,7 +692,7 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp, break; case WINDOW_GROUPBOX: { -#if SCROLLABLEFRAME +#ifdef SCROLLABLEFRAME if ( bFrameControl ) { pNewWindow = new toolkit::ScrollableWrapper< GroupBox >( pParent, nWinBits | WB_VSCROLL ); diff --git a/vcl/source/gdi/pdfwriter_impl2.cxx b/vcl/source/gdi/pdfwriter_impl2.cxx index 469f49205ee4..03401a3b99d9 100644 --- a/vcl/source/gdi/pdfwriter_impl2.cxx +++ b/vcl/source/gdi/pdfwriter_impl2.cxx @@ -529,7 +529,7 @@ void PDFWriterImpl::playMetafile( const GDIMetaFile& i_rMtf, vcl::PDFExtOutDevDa if( pGradAction ) { - #if USE_PDFGRADIENTS + #ifdef USE_PDFGRADIENTS m_rOuterFace.DrawGradient( pGradAction->GetPolyPolygon(), pGradAction->GetGradient() ); #else implWriteGradient( pGradAction->GetPolyPolygon(), pGradAction->GetGradient(), pDummyVDev, i_rContext ); diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx index 52c6a0d80cfa..30b662836d1e 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_expmodels.cxx @@ -124,7 +124,7 @@ void ElementDescriptor::readFrameModel( StyleBag * all_styles ) title->addAttribute( XMLNS_DIALOGS_PREFIX ":value", aTitle ); addSubElement( title ); } -#if SCROLLABLEFRAME +#ifdef SCROLLABLEFRAME readScrollableSettings(); #endif uno::Reference< container::XNameContainer > xControlContainer( _xProps, uno::UNO_QUERY ); diff --git a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx index 93649f57a327..eccf7eaf1b5a 100644 --- a/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx +++ b/xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx @@ -97,7 +97,7 @@ void Frame::endElement() { xControlModel->setPropertyValue( "Label" , makeAny( _label ) ); } -#if SCROLLABLEFRAME +#ifdef SCROLLABLEFRAME ctx.importScollableSettings( _xAttributes ); #endif ctx.importEvents( _events ); -- cgit