summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lotuswordpro/source/filter/lwplayout.cxx53
-rw-r--r--lotuswordpro/source/filter/lwplayout.hxx4
-rw-r--r--lotuswordpro/source/filter/lwprowlayout.cxx6
-rw-r--r--lotuswordpro/source/filter/lwprowlayout.hxx1
-rw-r--r--lotuswordpro/source/filter/lwpsortopt.cxx7
-rw-r--r--lotuswordpro/source/filter/lwpsortopt.hxx1
-rw-r--r--lotuswordpro/source/filter/lwpstory.cxx24
-rw-r--r--lotuswordpro/source/filter/lwpstory.hxx1
-rw-r--r--lotuswordpro/source/filter/lwptablelayout.cxx12
-rw-r--r--lotuswordpro/source/filter/lwptablelayout.hxx1
-rw-r--r--package/source/manifest/ManifestDefines.hxx5
-rw-r--r--package/source/manifest/ManifestImport.cxx3
-rw-r--r--package/source/manifest/ManifestImport.hxx1
-rw-r--r--unusedcode.easy8
-rw-r--r--xmloff/inc/xmloff/xmlkywd.hxx1
-rw-r--r--xmloff/source/core/xmlexp.cxx3
16 files changed, 2 insertions, 129 deletions
diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx
index 8931a164f7a8..9bbad2fd756b 100644
--- a/lotuswordpro/source/filter/lwplayout.cxx
+++ b/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
*
*/
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 056cd6874fda..abe582dcf7e6 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/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();
diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx
index 0d6264da06da..219f3582920b 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/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: */
diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx
index a1693f864bca..54be9f0bad3c 100644
--- a/lotuswordpro/source/filter/lwprowlayout.hxx
+++ b/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;
diff --git a/lotuswordpro/source/filter/lwpsortopt.cxx b/lotuswordpro/source/filter/lwpsortopt.cxx
index e4ce34da591d..151e24fa66fb 100644
--- a/lotuswordpro/source/filter/lwpsortopt.cxx
+++ b/lotuswordpro/source/filter/lwpsortopt.cxx
@@ -90,13 +90,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
**/
sal_uInt16 LwpSortOption::DiskSize()
diff --git a/lotuswordpro/source/filter/lwpsortopt.hxx b/lotuswordpro/source/filter/lwpsortopt.hxx
index a138ea1fa27a..a1df7d05ea95 100644
--- a/lotuswordpro/source/filter/lwpsortopt.hxx
+++ b/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];
diff --git a/lotuswordpro/source/filter/lwpstory.cxx b/lotuswordpro/source/filter/lwpstory.cxx
index c9af88c2cfac..5b2e6f62496c 100644
--- a/lotuswordpro/source/filter/lwpstory.cxx
+++ b/lotuswordpro/source/filter/lwpstory.cxx
@@ -324,30 +324,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:
* @param:
diff --git a/lotuswordpro/source/filter/lwpstory.hxx b/lotuswordpro/source/filter/lwpstory.hxx
index 5944979bb2cc..7bbd2b5a2f99 100644
--- a/lotuswordpro/source/filter/lwpstory.hxx
+++ b/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);
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx
index a269a6e61edb..f09272015910 100644
--- a/lotuswordpro/source/filter/lwptablelayout.cxx
+++ b/lotuswordpro/source/filter/lwptablelayout.cxx
@@ -406,18 +406,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
* @return
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index f38a3683510b..f5a5adf138c9 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/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:
diff --git a/package/source/manifest/ManifestDefines.hxx b/package/source/manifest/ManifestDefines.hxx
index 4d8d9f0cbef0..969f4d834835 100644
--- a/package/source/manifest/ManifestDefines.hxx
+++ b/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"
diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx
index 902f5b58ed98..f685f7ea87fb 100644
--- a/package/source/manifest/ManifestImport.cxx
+++ b/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;
diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx
index 5d67206c6709..1c646a7952a6 100644
--- a/package/source/manifest/ManifestImport.hxx
+++ b/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;
diff --git a/unusedcode.easy b/unusedcode.easy
index 5b4e3196f27a..c7ec603952c0 100644
--- a/unusedcode.easy
+++ b/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)
diff --git a/xmloff/inc/xmloff/xmlkywd.hxx b/xmloff/inc/xmloff/xmlkywd.hxx
index bce52d875b52..95f6cb0b10c3 100644
--- a/xmloff/inc/xmloff/xmlkywd.hxx
+++ b/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\">" );
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 3002548674df..1498d48d9584 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/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();
generated by cgit (git 2.34.1) at 2025-01-09 08:50:50 +0000