ditch some junk

lotuswordpro/source/filter/lwplayout.cxx

@@ -2078,59 +2078,6 @@ sal_uInt8 LwpPlacableLayout::GetRelativeType()
     return LwpVirtualLayout::GetRelativeType();
 }
 /**
-* @descr:   Get relative from where type
-*
-*/
-sal_uInt8 LwpPlacableLayout::GetRelativeFromWhere()
-{
-    LwpLayoutRelativity* pLayRel = GetRelativityPiece();
-    if(pLayRel)
-    {
-        return pLayRel->GetRelGuts()->GetRelativeFromWhere();
-    }
-    return 0;
-}
-/**
-* @descr:   Get relative distance
-*
-*/
-LwpPoint LwpPlacableLayout::GetRelativeDistance()
-{
-    LwpPoint aPoint;
-    LwpLayoutRelativity* pLayRel = GetRelativityPiece();
-    if(pLayRel)
-    {
-        aPoint = pLayRel->GetRelGuts()->GetRelativeDistance();
-    }
-    return aPoint;
-}
-/**
-* @descr:   Get tether type
-*
-*/
-sal_uInt8 LwpPlacableLayout::GetTetherType()
-{
-    LwpLayoutRelativity* pLayRel = GetRelativityPiece();
-    if(pLayRel)
-    {
-        return pLayRel->GetRelGuts()->GetTetherType();
-    }
-    return 0;
-}
-/**
-* @descr:   Get tether where type
-*
-*/
-sal_uInt8 LwpPlacableLayout::GetTetherWhere()
-{
-    LwpLayoutRelativity* pLayRel = GetRelativityPiece();
-    if(pLayRel)
-    {
-        return pLayRel->GetRelGuts()->GetTetherWhere();
-    }
-    return 0;
-}
-/**
 * @descr:   Get offset from the baseline
 *
 */

lotuswordpro/source/filter/lwplayout.hxx

@@ -420,10 +420,6 @@ public:
     virtual sal_uInt8 GetWrapType();
     virtual LwpLayoutRelativity* GetRelativityPiece();
     virtual sal_uInt8 GetRelativeType();
-    sal_uInt8 GetRelativeFromWhere();
-    LwpPoint GetRelativeDistance();
-    sal_uInt8 GetTetherType();
-    sal_uInt8 GetTetherWhere();
     virtual sal_Int32 GetBaseLineOffset();
     virtual sal_Bool IsAnchorPage();
     virtual sal_Bool IsAnchorFrame();

lotuswordpro/source/filter/lwprowlayout.cxx

@@ -479,10 +479,4 @@ void LwpRowHeadingLayout::Read()
     m_pObjStrm->SkipExtra();
 }
 
-LwpRowLayout * LwpRowHeadingLayout::GetRowLayout()
-{
-    LwpRowLayout * pRow = dynamic_cast<LwpRowLayout *>(cRowLayout.obj());
-    return pRow;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

lotuswordpro/source/filter/lwprowlayout.hxx

@@ -126,7 +126,6 @@ public:
     LwpRowHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm);
     virtual ~LwpRowHeadingLayout();
     virtual LWP_LAYOUT_TYPE GetLayoutType () { return LWP_ROW_HEADING_LAYOUT;}
-    LwpRowLayout * GetRowLayout();
 protected:
     void Read();
     LwpObjectID cRowLayout;

lotuswordpro/source/filter/lwpsortopt.cxx

@@ -89,13 +89,6 @@ void LwpSortOption::Read(LwpObjectStream *pStrm)
     }
     pStrm->SkipExtra();
 }
-/**
- * @descr       skip the sort option
- **/
-void LwpSortOption::Skip(LwpObjectStream *pStrm)
-{
-    pStrm->SeekRel(DiskSize());
-}
 /**
  * @descr       return the disk size
  **/

lotuswordpro/source/filter/lwpsortopt.hxx

@@ -92,7 +92,6 @@ public:
     ~LwpSortOption(){}
 public:
     void Read(LwpObjectStream *pStrm);
-    void Skip(LwpObjectStream *pStrm);
     sal_uInt16 DiskSize();
 private:
     LwpSortKey m_Keys[3];

lotuswordpro/source/filter/lwpstory.cxx

@@ -323,30 +323,6 @@ sal_Bool LwpStory::IsNeedSection()
     }
     return bNewSection;
 }
-/**************************************************************************
- * @descr:  process frame which anchor type is to page, frame or cell
- * @param:
- * @param:
- * @return:
-**************************************************************************/
-void LwpStory::XFConvertFrame(XFContentContainer* pCont)
-{
-    LwpVirtualLayout* pLayout = GetLayout(NULL);
-    while(pLayout)
-    {
-        LwpVirtualLayout* pFrameLayout = dynamic_cast<LwpVirtualLayout*>(pLayout->GetChildHead()->obj());
-        while(pFrameLayout)
-        {
-            if((pFrameLayout->IsAnchorPage()&&(pFrameLayout->IsFrame()||pFrameLayout->IsSuperTable()||pFrameLayout->IsGroupHead()))
-                ||(pFrameLayout->IsAnchorFrame()))
-            {
-                pFrameLayout->XFConvert(pCont);
-            }
-            pFrameLayout = dynamic_cast<LwpVirtualLayout*>(pFrameLayout->GetNext()->obj());
-        }
-        pLayout = GetLayout(pLayout);
-    }
-}
 /**************************************************************************
  * @descr:  process frame which anchor type is to cell
  * @param:

lotuswordpro/source/filter/lwpstory.hxx

@@ -97,7 +97,6 @@ private:
 
 protected:
     void Read();
-    void XFConvertFrame(XFContentContainer* pCont);
     void XFConvertFrameInCell(XFContentContainer* pCont);
     void XFConvertFrameInFrame(XFContentContainer* pCont);
     void XFConvertFrameInHeaderFooter(XFContentContainer* pCont);

lotuswordpro/source/filter/lwptablelayout.cxx

@@ -405,18 +405,6 @@ void  LwpSuperTableLayout::XFConvertFrame(XFContentContainer* pCont, sal_Int32 n
     }
 
 }
-/**
- * @short   parse frame
- * @param
- * @return
- */
-void  LwpSuperTableLayout::ParseFrame(XFFrame * pXFFrame)
-{
-    if(m_pFrame)
-    {
-        m_pFrame->Parse(pXFFrame);
-    }
-}
 /**
  * @short  register frame style
  * @param

lotuswordpro/source/filter/lwptablelayout.hxx

@@ -179,7 +179,6 @@ public:
     void XFConvert(XFContentContainer* pCont);
     // for frame style
     virtual void XFConvertFrame(XFContentContainer* pCont, sal_Int32 nStart = 0, sal_Int32 nEnd = 0, sal_Bool bAll = sal_False);
-    void ParseFrame(XFFrame* pXFFrame);
     void RegisterFrameStyle();
     LwpTableHeadingLayout* GetTableHeadingLayout();
 protected:

package/source/manifest/ManifestDefines.hxx

@@ -61,10 +61,7 @@
 #define ATTRIBUTE_SALT "manifest:salt"
 #define ATTRIBUTE_ITERATION_COUNT "manifest:iteration-count"
 
-#define SHA256_URL "http://www.w3.org/2001/04/xmlenc#sha256"
-//http://tools.oasis-open.org/issues/browse/OFFICE-3702
-//http://tools.oasis-open.org/issues/browse/OFFICE-3708
-#define SHA256_URL_TYPO "http://www.w3.org/2000/09/xmldsig#sha256"
+#define SHA256_URL "http://www.w3.org/2000/09/xmldsig#sha256"
 #define SHA1_NAME "SHA1"
 #define SHA1_URL "http://www.w3.org/2000/09/xmldsig#sha1"
 

package/source/manifest/ManifestImport.cxx

@@ -88,7 +88,6 @@ ManifestImport::ManifestImport( vector < Sequence < PropertyValue > > & rNewManV
 , sWhiteSpace                   ( RTL_CONSTASCII_USTRINGPARAM ( " " ) )
 
 , sSHA256_URL                   ( RTL_CONSTASCII_USTRINGPARAM ( SHA256_URL ) )
-, sSHA256_URL_TYPO              ( RTL_CONSTASCII_USTRINGPARAM ( SHA256_URL_TYPO ) )
 , sSHA1_Name                    ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_NAME ) )
 , sSHA1_URL                     ( RTL_CONSTASCII_USTRINGPARAM ( SHA1_URL ) )
 
@@ -282,7 +281,7 @@ void SAL_CALL ManifestImport::startElement( const OUString& aName, const uno::Re
             else if ( aConvertedName == sStartKeyAlgElement )
             {
                 OUString aString = aConvertedAttribs[sStartKeyAlgNameAttribute];
-                if (aString.equals(sSHA256_URL) || aString.equals(sSHA256_URL_TYPO))
+                if ( aString.equals( sSHA256_URL ) )
                 {
                     aSequence[nNumProperty].Name = sStartKeyAlgProperty;
                     aSequence[nNumProperty++].Value <<= xml::crypto::DigestID::SHA256;

package/source/manifest/ManifestImport.hxx

@@ -106,7 +106,6 @@ protected:
     const ::rtl::OUString sWhiteSpace;
 
     const ::rtl::OUString sSHA256_URL;
-    const ::rtl::OUString sSHA256_URL_TYPO;
     const ::rtl::OUString sSHA1_Name;
     const ::rtl::OUString sSHA1_URL;
 

unusedcode.easy

@@ -376,14 +376,6 @@ LwpObjectID::GetBuffer(char*)
 LwpObjectID::ReadCompressed(LwpSvStream*, LwpObjectID&)
 LwpObjectStream::QuickReadInt8(bool*)
 LwpPara::OverrideTab(LwpTabOverride*, LwpTabOverride*, XFParaStyle*)
-LwpPlacableLayout::GetRelativeDistance()
-LwpPlacableLayout::GetRelativeFromWhere()
-LwpPlacableLayout::GetTetherType()
-LwpPlacableLayout::GetTetherWhere()
-LwpRowHeadingLayout::GetRowLayout()
-LwpSortOption::Skip(LwpObjectStream*)
-LwpStory::XFConvertFrame(XFContentContainer*)
-LwpSuperTableLayout::ParseFrame(XFFrame*)
 MSDffImportRecords::Insert(MSDffImportRecords const*, unsigned short, unsigned short)
 MSDffImportRecords::Insert(SvxMSDffImportRec* const&, unsigned short&)
 MSDffImportRecords::Insert(SvxMSDffImportRec* const*, unsigned short)

xmloff/inc/xmloff/xmlkywd.hxx

@@ -56,7 +56,6 @@ XML_CONSTASCII_ACTION( sXML_CDATA, "CDATA" );
 XML_CONSTASCII_ACTION( sXML_WS, " " );
 XML_CONSTASCII_ACTION( sXML_xml, "xml" );
 XML_CONSTASCII_ACTION( sXML_xmlns, "xmlns" );
-XML_CONSTASCII_ACTION( sXML_xml_pi, "version=\"1.0\" encoding=\"UTF-8\"" );
 XML_CONSTASCII_ACTION( sXML_xml_doctype_prefix, "<!DOCTYPE " );
 XML_CONSTASCII_ACTION( sXML_xml_doctype_suffix, " PUBLIC \"-//OpenOffice.org//DTD OfficeDocument 1.0//EN\" \"office.dtd\">" );
 

xmloff/source/core/xmlexp.cxx

@@ -1369,9 +1369,6 @@ sal_uInt32 SvXMLExport::exportDoc( enum ::xmloff::token::XMLTokenEnum eClass )
 
     mxHandler->startDocument();
 
-    // <?xml version="1.0" encoding="UTF-8"?>
-//  xHandler->processingInstruction( S2U( sXML_xml ), S2U( sXML_xml_pi ) );
-
     // <office:document ...>
     CheckAttrList();