writerfilter: remove commented out code chunks

Change-Id: Ib303edb8962b70727624ff44a8bb957e10362529

writerfilter/source/dmapper/NumberingManager.cxx

@@ -134,11 +134,6 @@ void ListLevel::SetValue( Id nId, sal_Int32 nValue )
         case NS_rtf::LN_FCONVERTED:
             m_nFPrevSpace = nValue;
         break;
-#if 0
-        case NS_rtf::LN_FWORD6:
-            m_nFWord6 = nValue;
-        break;
-#endif
         case NS_rtf::LN_IXCHFOLLOW:
         case NS_ooxml::LN_CT_Lvl_suff:
             m_nXChFollow = nValue;
@@ -721,9 +716,6 @@ void ListsManager::lcl_attribute( Id nName, Value& rVal )
         case NS_rtf::LN_FNORESTART:
         case NS_rtf::LN_FIDENTSAV:
         case NS_rtf::LN_FCONVERTED:
-#if 0
-        case NS_rtf::LN_FWORD6:
-#endif
         case NS_rtf::LN_IXCHFOLLOW:
             if ( pCurrentLvl.get( ) )
                 pCurrentLvl->SetValue( nName, sal_Int32( nIntValue ) );
@@ -884,9 +876,6 @@ void ListsManager::lcl_sprm( Sprm& rSprm )
             case NS_rtf::LN_FNORESTART:
             case NS_rtf::LN_FIDENTSAV:
             case NS_rtf::LN_FCONVERTED:
-#if 0
-            case NS_rtf::LN_FWORD6:
-#endif
             case NS_rtf::LN_IXCHFOLLOW:
                 if (m_pCurrentDefinition->GetCurrentLevel().get())
                     m_pCurrentDefinition->GetCurrentLevel( )->SetValue( nSprmId, nIntValue );

writerfilter/source/doctok/DffImpl.cxx

@@ -373,37 +373,6 @@ DffBSE::get_blip()
     return pResult;
 }
 
-#if 0
-WW8BinaryObjReference::Pointer_t DffBSE::get_binary()
-{
-    WW8BinaryObjReference::Pointer_t pResult;
-
-    if (getCount() > 0x45)
-        pResult = WW8BinaryObjReference::Pointer_t
-            (new WW8BinaryObjReference(this, 0x45,
-                                       getCount() - 0x45));
-    else
-    {
-        WW8FBSE aFBSE(this, 0x8);
-
-        sal_Int32 nOffset = sal::static_int_cast<sal_Int32>(aFBSE.get_foDelay());
-        if (nOffset > 0 && getDocument() != NULL)
-        {
-            WW8StructBase aStructBase(*getDocument()->getDocStream(),
-                                      nOffset, 0x8);
-
-            sal_uInt32 nCount = aStructBase.getU32(0x4) - 0x11;
-
-            pResult = WW8BinaryObjReference::Pointer_t
-                (new WW8BinaryObjReference(*getDocument()->getDocStream(),
-                                           aFBSE.get_foDelay() + 0x19, nCount));
-        }
-    }
-
-    return pResult;
-}
-#endif
-
 // WW8FOPTE
 void WW8FOPTE::resolveNoAuto(Properties & rHandler)
 {

writerfilter/source/doctok/WW8BinTableImpl.cxx

@@ -34,17 +34,6 @@ sal_uInt32 WW8BinTableImpl::getPageNumber(const Fc & rFc) const
 
     if (mPageMap.find(rFc) == mPageMap.end())
     {
-#if 0
-        sal_uInt32 n = getEntryCount();
-
-        while (rFc < getFc(n))
-        {
-            --n;
-        }
-
-        nResult = getPageNumber(n);
-        mPageMap[rFc] = nResult;
-#else
         sal_uInt32 left = 0;
         sal_uInt32 right = getEntryCount();
 
@@ -63,7 +52,6 @@ sal_uInt32 WW8BinTableImpl::getPageNumber(const Fc & rFc) const
 
         nResult = getPageNumber(left);
         mPageMap[rFc] = nResult;
-#endif
 
     }
     else

writerfilter/source/doctok/WW8FKPImpl.cxx

@@ -23,30 +23,6 @@
 namespace writerfilter {
 namespace doctok
 {
-#if 0
-sal_uInt32 WW8FKPImpl::getIndex(const Fc & rFc) const
-{
-    sal_uInt32 nLeft = 0;
-    sal_uInt32 nRight = getEntryCount();
-
-    while (nRight - nLeft > 1)
-    {
-        sal_uInt32 nMiddle = (nLeft + nRight) / 2;
-        Fc aFcMiddle = getFc(nMiddle);
-
-        if (! (rFc < aFcMiddle))
-        {
-            nLeft = nMiddle;
-        }
-        else
-        {
-            nRight = nMiddle;
-        }
-    }
-
-    return nLeft;
-}
-#else
 sal_uInt32 WW8FKPImpl::getIndex(const Fc & rFc) const
 {
     sal_uInt32 nResult = getEntryCount();
@@ -56,7 +32,6 @@ sal_uInt32 WW8FKPImpl::getIndex(const Fc & rFc) const
 
     return nResult;
 }
-#endif
 
 
 writerfilter::Reference<Properties>::Pointer_t WW8CHPFKPImpl::getProperties(const Fc & rFc) const
@@ -77,12 +52,6 @@ writerfilter::Reference<Properties>::Pointer_t WW8CHPFKPImpl::getProperties(cons
                 (new WW8PropertySetImpl(*this, nOffset + 1, nCbChpx));
         }
     }
-#if 0
-    else
-    {
-        clog << "outsider!!!" << endl;
-    }
-#endif
 
     return pResult;
 }
@@ -139,12 +108,6 @@ WW8PAPFKPImpl::getProperties(const Fc & rFc) const
                                             true));
             }
         }
-#if 0
-        else
-        {
-            clog << "outsider!!!" << endl;
-        }
-#endif
     }
 
     return pResult;

writerfilter/source/doctok/WW8StreamImpl.cxx

@@ -138,14 +138,6 @@ string WW8StreamImpl::getSubStreamNames() const
             if (n > 0)
                 sResult += ", ";
 
-#if 0
-            rtl::OString aOStr;
-            aOUStr.convertToString(&aOStr, RTL_TEXTENCODING_ASCII_US,
-                                    OUSTRING_TO_OSTRING_CVTFLAGS);
-
-
-            sResult += aOStr.getStr();
-#endif
             char sBuffer[256];
             for (sal_uInt32 j = 0;
                  j < sal::static_int_cast<sal_uInt32>(aOUStr.getLength()); ++j)

writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx

@@ -89,18 +89,9 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
 
             doctok::WW8Document::Pointer_t pDocument(doctok::WW8DocumentFactory::createDocument(pDocStream));
 
-#if 0
-        TimeValue t1; osl_getSystemTime(&t1);
-#endif
-
         Stream::Pointer_t pStream = createStreamHandler();
         pDocument->resolve(*pStream);
 
-#if 0
-        TimeValue t2; osl_getSystemTime(&t2);
-        printf("time=%is\n", t2.Seconds-t1.Seconds);
-#endif
-
         ::ucbhelper::ContentBroker::deinitialize();
     }
     else

writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx

@@ -107,24 +107,6 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
         ooxml::OOXMLDocument::Pointer_t pDocument
             (ooxml::OOXMLDocumentFactory::createDocument(pDocStream));
 
-#if 0
-        uno::Reference<text::XTextDocument> xDocument
-            (xFactory->createInstanceWithContext
-             (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
-                              ("com.sun.star.text.TextDocument")),
-              xContext), uno::UNO_QUERY_THROW );
-        uno::Reference<frame::XModel> xModel
-            (xDocument, uno::UNO_QUERY_THROW);
-
-        uno::Reference<drawing::XDrawPageSupplier> xDrawPageSupplier
-            (xDocument, uno::UNO_QUERY_THROW);
-        uno::Reference<drawing::XShapes> xShapes
-            (xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY_THROW);
-
-        pDocument->setModel(xModel);
-        pDocument->setShapes(xShapes);
-#endif
-
         Stream::Pointer_t pStream = createStreamHandler();
         pDocument->resolve(*pStream);
 

writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx

@@ -258,22 +258,6 @@ sal_Int32 SAL_CALL XMLScanner::run( const uno::Sequence< rtl::OUString >& aArgum
             uno::Reference <lang::XSingleServiceFactory> xStorageFactory(
                 xServiceFactory->createInstance (rtl::OUString("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW);
 
-#if 0
-            rtl::OUString outFileUrl;
-            {
-            rtl_uString *dir1=NULL;
-            osl_getProcessWorkingDir(&dir1);
-            osl_getAbsoluteFileURL(dir1, aArguments[1].pData, &outFileUrl.pData);
-            rtl_uString_release(dir1);
-            }
-
-            uno::Sequence< uno::Any > aArgs( 2 );
-            aArgs[0] <<= outFileUrl;
-            aArgs[1] <<= embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE;
-            uno::Reference<embed::XStorage> xStorage(xStorageFactory->createInstanceWithArguments(aArgs), uno::UNO_QUERY_THROW);
-            uno::Reference<beans::XPropertySet> xPropSet(xStorage, uno::UNO_QUERY_THROW);
-            xPropSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(rtl::OUString("application/vnd.oasis.opendocument.text")));
-#endif
             uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl);
             uno::Reference< task::XStatusIndicator > xStatusIndicator;