diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 19:18:54 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-02-26 14:47:34 -0600 |
commit | 7986dcfdcad22d7203f256fb9a4ad53bda4ca422 (patch) | |
tree | 0cf345a92fd1b7d864b446cc71d0ba1a1c0187aa /lotuswordpro/source | |
parent | writerfilter: convert sprm:C{DxaSpace,CharScale,HpsKern,HpsPos} (diff) | |
download | core-7986dcfdcad22d7203f256fb9a4ad53bda4ca422.tar.gz core-7986dcfdcad22d7203f256fb9a4ad53bda4ca422.zip |
Remove visual noise from lotuswordpro
Change-Id: Ie161a2aa1a434d0778e1937a833819c934ed1889
Reviewed-on: https://gerrit.libreoffice.org/8281
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'lotuswordpro/source')
114 files changed, 32 insertions, 242 deletions
diff --git a/lotuswordpro/source/filter/bencont.cxx b/lotuswordpro/source/filter/bencont.cxx index fc0638b3e6f5..f6a414e73488 100644 --- a/lotuswordpro/source/filter/bencont.cxx +++ b/lotuswordpro/source/filter/bencont.cxx @@ -248,7 +248,6 @@ LtcUtBenValueStream * LtcBenContainer::FindNextValueStreamWithPropertyName(const pObj = pCurrentValueStream->GetValue()->GetProperty()->GetBenObject(); } - pObj =FindNextObjectWithProperty(pObj, pPropertyName->GetID()); // Get next object with same property name if (NULL == pObj) return NULL; @@ -323,7 +322,6 @@ BenError LtcBenContainer::CreateGraphicStream(SvStream * &pStream, const char *p pS = FindValueStreamWithPropertyName(sSName); pD = FindValueStreamWithPropertyName(sDName); - sal_uInt32 nDLen = 0; if(pD) { diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index ac0a351ebbc6..90e173bfaa1a 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -408,10 +408,8 @@ public: // Internal methods pCBenNamedObjectListElmt pPrevNamedObjectListElmt); const char * GetName() { return csName.data(); } - const char * GetNameCStr() { return csName.c_str(); } - void SetPosition(BenContainerPos Pos) { cPos = Pos; } BenContainerPos GetPosition(void) { return cPos; } size_t GetLength(void) { return csName.length()+ 1; } @@ -445,7 +443,6 @@ public: // Internal methods virtual bool IsTypeName(); }; - } // end namespace OpenStormBento #endif diff --git a/lotuswordpro/source/filter/explode.hxx b/lotuswordpro/source/filter/explode.hxx index 8f5ca889b866..a44d2c74bce1 100644 --- a/lotuswordpro/source/filter/explode.hxx +++ b/lotuswordpro/source/filter/explode.hxx @@ -72,7 +72,6 @@ public: sal_uInt32 QueryValue(const sal_Char *pCode); }; - /** * @brief * define the function type for input read, output write @@ -115,7 +114,6 @@ public: sal_uInt32 m_iArrayOfM[16]; - HuffmanTreeNode *m_Tree1, *m_Tree2; void ConstructTree1(); diff --git a/lotuswordpro/source/filter/localtime.cxx b/lotuswordpro/source/filter/localtime.cxx index da6ce4610afa..f8af7e69d6c0 100644 --- a/lotuswordpro/source/filter/localtime.cxx +++ b/lotuswordpro/source/filter/localtime.cxx @@ -84,9 +84,8 @@ bool LtgGmTime(long rtime,LtTm& rtm) tmptim = (long)(caltim / FOURYEAR_SEC); caltim -= ((long)tmptim * FOURYEAR_SEC); - // //Determine which year of the interval - // + // 1970, 1974, 1978,...,etc. tmptim = (tmptim * 4) + 70; @@ -117,20 +116,19 @@ bool LtgGmTime(long rtime,LtTm& rtm) } } - // //tmptim now holds the value for tm_year. caltim now holds the //number of elapsed seconds since the beginning of that year. - // + rtm.tm_year = tmptim; - // + //Determine days since January 1 (0 - 365). This is the tm_yday value. //Leave caltim with number of elapsed seconds in that day. - // + rtm.tm_yday = (long)(caltim / DAY_SEC); caltim -= (long)(rtm.tm_yday) * DAY_SEC; - // + //Determine months since January (0 - 11) and day of month (1 - 31) - // + long* mdays; if ( islpyr ) { @@ -147,14 +145,13 @@ bool LtgGmTime(long rtime,LtTm& rtm) rtm.tm_mday = rtm.tm_yday - mdays[tmptim]; - // //Determine days since Sunday (0 - 6) - // + rtm.tm_wday = ((long)(rtime / DAY_SEC) + BASE_DOW) % 7; - // + //Determine hours since midnight (0 - 23), minutes after the hour //(0 - 59), and seconds after the minute (0 - 59). - // + rtm.tm_hour = (long)(caltim / 3600); caltim -= (long)rtm.tm_hour * 3600; @@ -163,9 +160,6 @@ bool LtgGmTime(long rtime,LtTm& rtm) rtm.tm_isdst = 0; - // - // - // //adjust year & month rtm.tm_year += 1900; ++(rtm.tm_mon); diff --git a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx index 32e04474669c..6d984dfb9faa 100644 --- a/lotuswordpro/source/filter/lwpbackgroundoverride.hxx +++ b/lotuswordpro/source/filter/lwpbackgroundoverride.hxx @@ -56,7 +56,6 @@ #ifndef _LWPBACKGROUNDOVERRIDE_HXX #define _LWPBACKGROUNDOVERRIDE_HXX - #include "lwpoverride.hxx" #include "lwpbackgroundstuff.hxx" diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx index 8de00f3ecda1..85cf12cedef3 100644 --- a/lotuswordpro/source/filter/lwpbackgroundstuff.cxx +++ b/lotuswordpro/source/filter/lwpbackgroundstuff.cxx @@ -68,7 +68,6 @@ #include "vcl/bmpacc.hxx" #include "svx/xbitmap.hxx" - void LwpBackgroundStuff::Read(LwpObjectStream* pStrm) { m_nID = pStrm->QuickReaduInt16(); @@ -172,7 +171,6 @@ XFBGImage* LwpBackgroundStuff::GetFillPattern() delete [] pImageBuff; pImageBuff = NULL; - pXFBGImage->SetRepeate(); // end of add diff --git a/lotuswordpro/source/filter/lwpbasetype.hxx b/lotuswordpro/source/filter/lwpbasetype.hxx index 0d812a70c799..9f83d5100afa 100644 --- a/lotuswordpro/source/filter/lwpbasetype.hxx +++ b/lotuswordpro/source/filter/lwpbasetype.hxx @@ -63,7 +63,6 @@ Jan 2005 Created ************************************************************************/ - #ifndef _LWPBASETYPE_HXX #define _LWPBASETYPE_HXX diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.cxx b/lotuswordpro/source/filter/lwpbreaksoverride.cxx index 6556b68300ae..8356a2b46edc 100644 --- a/lotuswordpro/source/filter/lwpbreaksoverride.cxx +++ b/lotuswordpro/source/filter/lwpbreaksoverride.cxx @@ -64,7 +64,6 @@ #include "lwpobjstrm.hxx" #include "lwpatomholder.hxx" - LwpBreaksOverride::LwpBreaksOverride() { m_pNextStyle = new LwpAtomHolder(); diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.hxx b/lotuswordpro/source/filter/lwpbreaksoverride.hxx index 3c3c4e362175..2de0887413d2 100644 --- a/lotuswordpro/source/filter/lwpbreaksoverride.hxx +++ b/lotuswordpro/source/filter/lwpbreaksoverride.hxx @@ -118,7 +118,6 @@ public: inline void RevertKeepWithPrevious(); inline void RevertUseNextStyle(); - void OverridePageBreakBefore(sal_Bool bVal); void OverridePageBreakAfter(sal_Bool bVal); void OverridePageBreakWithin(sal_Bool bVal); @@ -128,7 +127,6 @@ public: void OverrideKeepWithPrevious(sal_Bool bVal); void OverrideUseNextStyle(sal_Bool bVal); - inline LwpAtomHolder* GetNextStyle(); //end add @@ -247,7 +245,6 @@ inline LwpAtomHolder* LwpBreaksOverride::GetNextStyle() return m_pNextStyle; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx index 0ff666f89321..d82e207e6012 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.cxx +++ b/lotuswordpro/source/filter/lwpcelllayout.cxx @@ -524,16 +524,16 @@ void LwpCellLayout::RegisterDefaultCell() switch(eLoop) { case enumNoBottomBorder: - // _ + //| | - // + // remove bottom line pBorders->SetWidth(enumXFBorderBottom, 0); break; case enumNoLeftNoBottomBorder: - // _ + // | - // + // remove left and bottom pBorders->SetWidth(enumXFBorderLeft, 0); pBorders->SetWidth(enumXFBorderBottom, 0); @@ -545,7 +545,7 @@ void LwpCellLayout::RegisterDefaultCell() // nothing to remove break; case enumNoLeftBorder: - // + //| | // remove left line @@ -675,7 +675,6 @@ void LwpCellLayout::ApplyProtect(XFCell * pCell, LwpObjectID aTableID) pCell->SetProtect(bProtected); } - LwpConnectedCellLayout::LwpConnectedCellLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm) : LwpCellLayout(objHdr, pStrm) {} @@ -908,7 +907,6 @@ XFCell* LwpHiddenCellLayout::ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, { } - LwpParallelColumnsBlock::LwpParallelColumnsBlock(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpCellLayout(objHdr, pStrm) {} diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx index 587e1354f972..b432d49194df 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.hxx +++ b/lotuswordpro/source/filter/lwpcelllayout.hxx @@ -77,7 +77,6 @@ typedef enum enumCellBorderTopLimit = 4, } LwpCellBorderType; - class XFCell; class XFCellStyle; class LwpCellList; diff --git a/lotuswordpro/source/filter/lwpcharacterstyle.hxx b/lotuswordpro/source/filter/lwpcharacterstyle.hxx index aa0c1f9ecea9..1ddd39baf73e 100644 --- a/lotuswordpro/source/filter/lwpcharacterstyle.hxx +++ b/lotuswordpro/source/filter/lwpcharacterstyle.hxx @@ -67,7 +67,6 @@ #include "lwpobj.hxx" #include "lwpdlvlist.hxx" - class LwpAtomHolder; class LwpTextLanguageOverride; class LwpTextAttributeOverride; diff --git a/lotuswordpro/source/filter/lwpcharsetmgr.hxx b/lotuswordpro/source/filter/lwpcharsetmgr.hxx index d52c9ebd8700..6995026ac1fc 100644 --- a/lotuswordpro/source/filter/lwpcharsetmgr.hxx +++ b/lotuswordpro/source/filter/lwpcharsetmgr.hxx @@ -81,8 +81,6 @@ private: static LwpCharSetMgr* Instance; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpcontent.cxx b/lotuswordpro/source/filter/lwpcontent.cxx index 2296ef9cefa0..254ac4500cc9 100644 --- a/lotuswordpro/source/filter/lwpcontent.cxx +++ b/lotuswordpro/source/filter/lwpcontent.cxx @@ -70,7 +70,6 @@ LwpHeadContent::LwpHeadContent(LwpObjectHeader &objHdr, LwpSvStream* pStrm) : LwpContent(objHdr, pStrm) {} - void LwpHeadContent::Read() { LwpContent::Read(); diff --git a/lotuswordpro/source/filter/lwpdefs.hxx b/lotuswordpro/source/filter/lwpdefs.hxx index edde602e3145..29d6a5712df6 100644 --- a/lotuswordpro/source/filter/lwpdefs.hxx +++ b/lotuswordpro/source/filter/lwpdefs.hxx @@ -214,7 +214,6 @@ enum VO_TYPE //for default tab distance VO_VERDOCUMENT = 161, - //The last one VO_INVALID = -1 }; diff --git a/lotuswordpro/source/filter/lwpdivinfo.hxx b/lotuswordpro/source/filter/lwpdivinfo.hxx index 707c7deb27a6..43a497889072 100644 --- a/lotuswordpro/source/filter/lwpdivinfo.hxx +++ b/lotuswordpro/source/filter/lwpdivinfo.hxx @@ -74,7 +74,6 @@ #define STR_OleDivisionClassName "OLEDivision" - class LwpDivInfo : public LwpObject { public: diff --git a/lotuswordpro/source/filter/lwpdivopts.cxx b/lotuswordpro/source/filter/lwpdivopts.cxx index 71381b68b512..292034f31945 100644 --- a/lotuswordpro/source/filter/lwpdivopts.cxx +++ b/lotuswordpro/source/filter/lwpdivopts.cxx @@ -80,8 +80,6 @@ void LwpHyphenOptions::Read(LwpObjectStream *pStrm) pStrm->SkipExtra(); } - - LwpTextLanguage::LwpTextLanguage(){} LwpTextLanguage::~LwpTextLanguage(){} diff --git a/lotuswordpro/source/filter/lwpdivopts.hxx b/lotuswordpro/source/filter/lwpdivopts.hxx index 552c559a22f6..a1bdeb172d38 100644 --- a/lotuswordpro/source/filter/lwpdivopts.hxx +++ b/lotuswordpro/source/filter/lwpdivopts.hxx @@ -84,7 +84,6 @@ private: sal_uInt16 m_nMaxLines; }; - /* Text languange. This class which holds identifiers for language and dialect. @@ -105,7 +104,6 @@ private: sal_uInt16 m_nLanguage; }; - class LwpDivisionOptions : public LwpObject { public: diff --git a/lotuswordpro/source/filter/lwpdoc.hxx b/lotuswordpro/source/filter/lwpdoc.hxx index 0e4a737c2464..1d87fa9aff01 100644 --- a/lotuswordpro/source/filter/lwpdoc.hxx +++ b/lotuswordpro/source/filter/lwpdoc.hxx @@ -66,7 +66,6 @@ #ifndef _LWPDOCUMENT_HXX #define _LWPDOCUMENT_HXX - #include "lwpobj.hxx" #include "lwpsortopt.hxx" #include "lwpuidoc.hxx" diff --git a/lotuswordpro/source/filter/lwpdocdata.cxx b/lotuswordpro/source/filter/lwpdocdata.cxx index 772b28b87669..27ad616c2acc 100644 --- a/lotuswordpro/source/filter/lwpdocdata.cxx +++ b/lotuswordpro/source/filter/lwpdocdata.cxx @@ -71,7 +71,7 @@ LwpDocData::~LwpDocData() void LwpDocData::Read() { //XFDateTime - ////////////////////////////////////////////////////////////////////////// + //doc options //cOptionFlag m_DocOptions.nOptionFlag = m_pObjStrm->QuickReaduInt16(); @@ -90,7 +90,7 @@ void LwpDocData::Read() //cMarginMarksChar m_DocOptions.nMarginMarksChar = m_pObjStrm->QuickReaduInt16(); m_pObjStrm->SkipExtra(); - ////////////////////////////////////////////////////////////////////////// + //doc info //cDescription m_DocInfo.description.Read(m_pObjStrm); @@ -132,7 +132,7 @@ void LwpDocData::Read() delete [] pCDLNList; delete [] pEditorList; - ////////////////////////////////////////////////////////////////////////// + //doc control //cGreeting m_DocControl.cGreeting.Read(m_pObjStrm); @@ -161,7 +161,7 @@ void LwpDocData::Read() m_DocControl.nEditorVerification = m_pObjStrm->QuickReaduInt16(); m_pObjStrm->SkipExtra(); - ////////////////////////////////////////////////////////////////////////// + //editor list //numeditors sal_uInt16 numeditors = m_pObjStrm->QuickReaduInt16(); diff --git a/lotuswordpro/source/filter/lwpdrawobj.cxx b/lotuswordpro/source/filter/lwpdrawobj.cxx index fd4a8a009c7c..1f13b8e90337 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.cxx +++ b/lotuswordpro/source/filter/lwpdrawobj.cxx @@ -1308,7 +1308,6 @@ XFFrame* LwpDrawTextArt::CreateStandardDrawObj(const OUString& rStyleName ) return this->CreateDrawObj(rStyleName); } - /** * @descr Constructor of class LwpDrawMetafile * @param pStream The memory stream which contains the lwp-sdw draw objects diff --git a/lotuswordpro/source/filter/lwpdrawobj.hxx b/lotuswordpro/source/filter/lwpdrawobj.hxx index e570b7c121c1..cdf8b1df8873 100644 --- a/lotuswordpro/source/filter/lwpdrawobj.hxx +++ b/lotuswordpro/source/filter/lwpdrawobj.hxx @@ -143,7 +143,6 @@ public: inline DrawObjectType GetObjectType() const { return m_eType; } }; - /** * @brief * Lwp-draw-group object. @@ -164,7 +163,6 @@ protected: virtual XFFrame* CreateStandardDrawObj(const OUString& /*rStyleName*/) { return NULL; } }; - /** * @brief * Lwp-draw-line object. @@ -206,7 +204,6 @@ protected: virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName); }; - /** * @brief * Lwp-draw-polygon object. @@ -271,7 +268,6 @@ protected: virtual XFFrame* CreateStandardDrawObj(const OUString& rStyleName); }; - /** * @brief * Lwp-draw-arc object. diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx index 50948172d75e..2b7880b019e5 100644 --- a/lotuswordpro/source/filter/lwpfilter.cxx +++ b/lotuswordpro/source/filter/lwpfilter.cxx @@ -198,7 +198,6 @@ Sequence< OUString> LWPFilterImportFilter::getSupportedServiceNames( void ) thro return seq; } - OUString SAL_CALL LWPFilterImportFilter::detect( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aDescriptor ) throw (::com::sun::star::uno::RuntimeException, std::exception) { @@ -229,10 +228,10 @@ OUString SAL_CALL LWPFilterImportFilter::detect( ::com::sun::star::uno::Sequence { uno::Reference< XInputStream> rInputStream; aDescriptor[i].Value >>= rInputStream; - // + // TODO TRANSFORM IMPLEMENTATION HERE!!!!!! // and call m_DocumentHandler's SAX mDochods - // + if( IsWordproFile(rInputStream) ) { if ( aTypeName == "wordpro_template" ) @@ -465,7 +464,6 @@ sal_Bool IsWordproFile(OUString file) return bRet; } - sal_Bool IsWordproFile( uno::Reference<XInputStream>& rInputStream) { Sequence<sal_Int8> aData; diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx index f0809f0a8b6d..321ca0dc9b39 100644 --- a/lotuswordpro/source/filter/lwpfont.cxx +++ b/lotuswordpro/source/filter/lwpfont.cxx @@ -304,7 +304,6 @@ void LwpFontNameEntry::Override(XFFont* pFont) pFont->SetColor(aColor); } - if (IsBackgroundColorOverridden() ) { if (m_BackColor.IsValidColor()) @@ -359,7 +358,6 @@ sal_Bool LwpFontNameEntry::IsBackgroundColorOverridden() // return (0 != (m_nOverrideBits & ALL_BITS)); //} - LwpFontNameManager::LwpFontNameManager() :m_pFontNames(NULL) {} diff --git a/lotuswordpro/source/filter/lwpfont.hxx b/lotuswordpro/source/filter/lwpfont.hxx index 5bdeb16dca28..7cdf58d918f2 100644 --- a/lotuswordpro/source/filter/lwpfont.hxx +++ b/lotuswordpro/source/filter/lwpfont.hxx @@ -107,7 +107,6 @@ private: LwpFontTableEntry* m_pFontEntries; }; - class LwpFontNameEntry { public: diff --git a/lotuswordpro/source/filter/lwpfootnote.cxx b/lotuswordpro/source/filter/lwpfootnote.cxx index db1f1dfb7291..31078ad47353 100644 --- a/lotuswordpro/source/filter/lwpfootnote.cxx +++ b/lotuswordpro/source/filter/lwpfootnote.cxx @@ -144,7 +144,6 @@ LwpFootnote* LwpFribFootnote::GetFootnote() return dynamic_cast<LwpFootnote*>(m_Footnote.obj()); } - LwpFootnote::LwpFootnote(LwpObjectHeader &objHdr, LwpSvStream *pStrm) : LwpOrderedObject(objHdr, pStrm) { @@ -438,7 +437,6 @@ void LwpFootnoteSeparatorOptions::Read(LwpObjectStream *pObjStrm) pObjStrm->SkipExtra(); } - LwpFootnoteOptions::LwpFootnoteOptions(LwpObjectHeader &objHdr, LwpSvStream *pStrm) : LwpObject(objHdr, pStrm) { @@ -533,7 +531,6 @@ void LwpFootnoteOptions::RegisterEndnoteStyle() pXFStyleManager->SetEndnoteConfig(pEndnoteConfig); } - /** * @descr Get continue on message */ diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx index 30380c6530b7..8c62711a40c7 100644 --- a/lotuswordpro/source/filter/lwpfoundry.cxx +++ b/lotuswordpro/source/filter/lwpfoundry.cxx @@ -160,7 +160,6 @@ void LwpFoundry::Read(LwpObjectStream *pStrm) m_pStyleMgr->SetFoundry(this); } - void LwpFoundry::ReadStyles(LwpObjectStream *pStrm) { m_TextStyle.ReadIndexed(pStrm); @@ -525,7 +524,6 @@ LwpStyleManager::~LwpStyleManager() m_StyleList.clear(); } - #include "xfilter/xfstylemanager.hxx" /* VO_PARASTYLE/VO_CHARACTERSTYLE call this method to add its created style to XFStyleManager diff --git a/lotuswordpro/source/filter/lwpfoundry.hxx b/lotuswordpro/source/filter/lwpfoundry.hxx index e7241e09cf1d..6ee2f63d2caa 100644 --- a/lotuswordpro/source/filter/lwpfoundry.hxx +++ b/lotuswordpro/source/filter/lwpfoundry.hxx @@ -79,7 +79,6 @@ class LwpBookMark; #include <vector> #define TAG_USER_VERSION 0x72655655UL // "UVer" - class LwpVersionManager { public: diff --git a/lotuswordpro/source/filter/lwpfribbreaks.cxx b/lotuswordpro/source/filter/lwpfribbreaks.cxx index aea054faa023..f23d8d9aae41 100644 --- a/lotuswordpro/source/filter/lwpfribbreaks.cxx +++ b/lotuswordpro/source/filter/lwpfribbreaks.cxx @@ -124,7 +124,6 @@ void LwpFribPageBreak::Read(LwpObjectStream * pObjStrm, sal_uInt16 /*len*/) m_Layout.ReadIndexed(pObjStrm); } - void LwpFribPageBreak::RegisterBreakStyle(LwpPara* pPara) { XFParaStyle* pBaseStyle = pPara->GetXFParaStyle(); diff --git a/lotuswordpro/source/filter/lwpfribmark.hxx b/lotuswordpro/source/filter/lwpfribmark.hxx index 1dbd7cbdfdb2..8fedfa0cad7f 100644 --- a/lotuswordpro/source/filter/lwpfribmark.hxx +++ b/lotuswordpro/source/filter/lwpfribmark.hxx @@ -62,7 +62,6 @@ May 2005 Created ************************************************************************/ - #ifndef _LWPFRIBMARKER_HXX_ #define _LWPFRIBMARKER_HXX_ diff --git a/lotuswordpro/source/filter/lwpfribptr.cxx b/lotuswordpro/source/filter/lwpfribptr.cxx index 89c0db7b5029..1b973ebe1685 100644 --- a/lotuswordpro/source/filter/lwpfribptr.cxx +++ b/lotuswordpro/source/filter/lwpfribptr.cxx @@ -87,7 +87,6 @@ #include "lwpchangemgr.hxx" #include "lwpglobalmgr.hxx" - LwpFribPtr::LwpFribPtr() : m_pFribs(NULL),m_pXFPara(NULL),m_pPara(NULL) { diff --git a/lotuswordpro/source/filter/lwpfribsection.cxx b/lotuswordpro/source/filter/lwpfribsection.cxx index 244823ec56e1..03804c71d565 100644 --- a/lotuswordpro/source/filter/lwpfribsection.cxx +++ b/lotuswordpro/source/filter/lwpfribsection.cxx @@ -210,7 +210,6 @@ void LwpFribSection::SetDefaultAlphaIndex(XFIndex * pXFIndex) //pXFIndex->AddTemplate(A2OUSTR("separator"),A2OUSTR("Separator"),pTemplateSep); pXFIndex->AddTemplate(A2OUSTR("separator"),styleName,pTemplateSep); - styleName = pFoundry->FindActuralStyleName(A2OUSTR("Primary")); XFIndexTemplate * pTemplate1 = new XFIndexTemplate(); @@ -246,7 +245,6 @@ void LwpFribSection::SetDefaultAlphaIndex(XFIndex * pXFIndex) } } - LwpMasterPage::LwpMasterPage(LwpPara* pPara, LwpPageLayout* pLayout) :m_bNewSection(sal_False),m_pPara(pPara),m_pLayout(pLayout) { diff --git a/lotuswordpro/source/filter/lwpheader.hxx b/lotuswordpro/source/filter/lwpheader.hxx index 0061c642cdb3..27da9264db43 100644 --- a/lotuswordpro/source/filter/lwpheader.hxx +++ b/lotuswordpro/source/filter/lwpheader.hxx @@ -77,7 +77,6 @@ #include <rtl/ustring.hxx> #include <memory.h> - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpidxmgr.cxx b/lotuswordpro/source/filter/lwpidxmgr.cxx index ccd2c388a612..07ea4a1a521f 100644 --- a/lotuswordpro/source/filter/lwpidxmgr.cxx +++ b/lotuswordpro/source/filter/lwpidxmgr.cxx @@ -134,7 +134,6 @@ void LwpIndexManager::Read(LwpSvStream* pStrm) //New Code ReadObjIndex( pStrm ); - //Read object in root, these objects are between the leaf objects if(k!=m_nLeafCount-1) { @@ -162,7 +161,6 @@ void LwpIndexManager::ReadRootData(LwpObjectStream* pObjStrm) akey->id.Read(pObjStrm); m_RootObjs.push_back(akey); - sal_uInt16 k = 0; for (k = 1; k < KeyCount; k++) @@ -184,7 +182,6 @@ void LwpIndexManager::ReadRootData(LwpObjectStream* pObjStrm) } - //Add new method to handle ObjIndex data /** * @descr Read data in VO_OBJINDEX @@ -226,7 +223,6 @@ void LwpIndexManager::ReadObjIndexData(LwpObjectStream* pObjStrm) if (nPos != nActualPos) throw BadSeek(); - ReadLeafIndex(pObjStrm->GetStream()); if(j!=LeafCount-1) @@ -241,7 +237,6 @@ void LwpIndexManager::ReadObjIndexData(LwpObjectStream* pObjStrm) m_TempVec.clear(); } - /** * @descr Read VO_OBJINDEX */ @@ -265,7 +260,6 @@ void LwpIndexManager::ReadObjIndex( LwpSvStream *pStrm ) delete pObjStrm; } - /** * @descr Read VO_LEAFOBJINDEX */ @@ -328,7 +322,6 @@ sal_uInt32 LwpIndexManager::GetObjOffset( LwpObjectID objid ) //sal_uInt16 L, U, M; sal_uInt32 L, U, M; - L = 0; U = m_nKeyCount; while (L != U) diff --git a/lotuswordpro/source/filter/lwpidxmgr.hxx b/lotuswordpro/source/filter/lwpidxmgr.hxx index 605efb352062..fd48ebda4f49 100644 --- a/lotuswordpro/source/filter/lwpidxmgr.hxx +++ b/lotuswordpro/source/filter/lwpidxmgr.hxx @@ -100,12 +100,10 @@ protected: protected: void ReadRootData(LwpObjectStream *pObjStrm ); //Read root index data - //Add new method to handle ObjIndex void ReadObjIndexData(LwpObjectStream* pObjStrm); void ReadObjIndex( LwpSvStream *pStrm ); //Read Obj index - void ReadLeafIndex( LwpSvStream *pStrm ); //Read leaf index obj void ReadLeafData( LwpObjectStream *pStrm ); //Read leaf index obj data void ReadTimeTable( LwpObjectStream *pStrm ); diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index d9128f15a863..d24aeb473d14 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -1237,7 +1237,6 @@ sal_Bool LwpMiddleLayout::IsAutoGrowRight() return LwpVirtualLayout::IsAutoGrowRight(); } - /** * @descr: Get contents orientation * @@ -1397,7 +1396,6 @@ XFBGImage* LwpMiddleLayout::GetXFBGImage() } } - //automatic, top left pXFBGImage->SetPosition(enumXFAlignStart,enumXFAlignTop); if(pLay->GetScaleCenter()) @@ -1442,7 +1440,6 @@ sal_Bool LwpMiddleLayout::GetUsePrinterSettings() return sal_False; } - //Check whether there are contents in the layout sal_Bool LwpMiddleLayout::HasContent() { @@ -2061,7 +2058,6 @@ sal_Int32 LwpPlacableLayout::GetBaseLineOffset() } return 0; - } /** * @descr: whether the parent layout is page layout diff --git a/lotuswordpro/source/filter/lwplaypiece.cxx b/lotuswordpro/source/filter/lwplaypiece.cxx index 2445c9c68b99..56f23071c3e2 100644 --- a/lotuswordpro/source/filter/lwplaypiece.cxx +++ b/lotuswordpro/source/filter/lwplaypiece.cxx @@ -320,7 +320,6 @@ void LwpLayoutGutters::Read() } } - void LwpLayoutGutters::Parse(IXFStream* /*pOutputStream*/) {} diff --git a/lotuswordpro/source/filter/lwpmargins.hxx b/lotuswordpro/source/filter/lwpmargins.hxx index bcd455df323c..613ca96cde79 100644 --- a/lotuswordpro/source/filter/lwpmargins.hxx +++ b/lotuswordpro/source/filter/lwpmargins.hxx @@ -53,7 +53,7 @@ * * ************************************************************************/ -// + #ifndef _LWPMARGINS_HXX #define _LWPMARGINS_HXX diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx index fd01102b06dc..b6d9221e3fb2 100644 --- a/lotuswordpro/source/filter/lwpmarker.cxx +++ b/lotuswordpro/source/filter/lwpmarker.cxx @@ -322,7 +322,6 @@ void LwpCHBlkMarker::EnumAllKeywords() } } - LwpBookMark::LwpBookMark(LwpObjectHeader &objHdr, LwpSvStream *pStrm) : LwpDLNFVList(objHdr,pStrm) , m_nFlag(0) diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx index d10d50450822..975d1a95324d 100644 --- a/lotuswordpro/source/filter/lwpmarker.hxx +++ b/lotuswordpro/source/filter/lwpmarker.hxx @@ -62,7 +62,6 @@ Mar 2005 Created ************************************************************************/ - #ifndef _LWPMARKER_HXX_ #define _LWPMARKER_HXX_ diff --git a/lotuswordpro/source/filter/lwpnotes.cxx b/lotuswordpro/source/filter/lwpnotes.cxx index c6028cf83abe..5c7d916fcd75 100644 --- a/lotuswordpro/source/filter/lwpnotes.cxx +++ b/lotuswordpro/source/filter/lwpnotes.cxx @@ -129,7 +129,6 @@ void LwpFribNote::XFConvert(XFContentContainer* pCont) } - LwpNoteLayout::LwpNoteLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm) : LwpFrameLayout(objHdr, pStrm) , m_nTime(0) @@ -298,7 +297,6 @@ void LwpNoteTextLayout::XFConvert(XFContentContainer * pCont) } } - LwpViewportLayout::LwpViewportLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm) : LwpPlacableLayout(objHdr, pStrm) { diff --git a/lotuswordpro/source/filter/lwpnotes.hxx b/lotuswordpro/source/filter/lwpnotes.hxx index 1ca0e19c307a..aef0d0c55817 100644 --- a/lotuswordpro/source/filter/lwpnotes.hxx +++ b/lotuswordpro/source/filter/lwpnotes.hxx @@ -107,7 +107,6 @@ private: LwpAtomHolder m_UserName; }; - /** * @brief VO_NOTEHEADERLAYOUT object * diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx b/lotuswordpro/source/filter/lwpnumericfmt.cxx index 2a956dea4d16..2c3993313929 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.cxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx @@ -64,7 +64,6 @@ #include "lwpnumericfmt.hxx" -/////////////////////////////////////////////////////////////////// LwpCurrencyPool LwpNumericFormat::m_aCurrencyInfo; /** @@ -102,7 +101,7 @@ sal_Bool LwpCurrencyPool::IsShowSpace(sal_uInt16 nFormat) { return m_aCurrencyInfo[nFormat].bShowSpace; } -////////////////////////////////////////////////////////////////////// + /** * * @date 03/26/2005 @@ -132,7 +131,6 @@ void LwpLayoutNumerics::Read() m_pObjStrm->SkipExtra(); } } -/////////////////////////////////////////////////////////////////// /** * @@ -175,7 +173,6 @@ LwpNumericFormatSubset::~LwpNumericFormatSubset() { } -/////////////////////////////////////////////////////////////////////////////////// LwpNumericFormat::LwpNumericFormat(LwpObjectStream * pStrm) : m_pObjStrm(pStrm) , cFlags(0) diff --git a/lotuswordpro/source/filter/lwpobjfactory.cxx b/lotuswordpro/source/filter/lwpobjfactory.cxx index f1dfa9abd9bf..1793a5f8e434 100644 --- a/lotuswordpro/source/filter/lwpobjfactory.cxx +++ b/lotuswordpro/source/filter/lwpobjfactory.cxx @@ -361,7 +361,7 @@ LwpObject* LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObjectHeader &objH newObj = new LwpOleObject(objHdr, m_pSvStream); break; } - // + case VO_GRAPHIC: { newObj = new LwpGraphicObject(objHdr, m_pSvStream); @@ -372,7 +372,7 @@ LwpObject* LwpObjectFactory::CreateObject(sal_uInt32 type, LwpObjectHeader &objH newObj = new LwpDocData(objHdr, m_pSvStream); break; } - // + case VO_DROPCAPLAYOUT: { newObj = new LwpDropcapLayout(objHdr, m_pSvStream); diff --git a/lotuswordpro/source/filter/lwpobjhdr.hxx b/lotuswordpro/source/filter/lwpobjhdr.hxx index ac0068d7a251..35228ac49c98 100644 --- a/lotuswordpro/source/filter/lwpobjhdr.hxx +++ b/lotuswordpro/source/filter/lwpobjhdr.hxx @@ -62,7 +62,6 @@ Jan 2005 Created ************************************************************************/ - #ifndef _LWPOBJECTHEADER_HXX #define _LWPOBJECTHEADER_HXX diff --git a/lotuswordpro/source/filter/lwpoleobject.cxx b/lotuswordpro/source/filter/lwpoleobject.cxx index 5251a4aed3d0..4afb0309d6da 100644 --- a/lotuswordpro/source/filter/lwpoleobject.cxx +++ b/lotuswordpro/source/filter/lwpoleobject.cxx @@ -116,7 +116,6 @@ void LwpGraphicOleObject::GetGrafScaledSize(double & fWidth, double & fHeight) double fSclGrafWidth = fWidth;//LwpTools::ConvertFromUnitsToMetric(pMyScale->GetScaleWidth()); double fSclGrafHeight = fHeight;//LwpTools::ConvertFromUnitsToMetric(pMyScale->GetScaleHeight()); - LwpVirtualLayout* pLayout = GetLayout(NULL); if (pLayout && pLayout->IsFrame()) { diff --git a/lotuswordpro/source/filter/lwpoleobject.hxx b/lotuswordpro/source/filter/lwpoleobject.hxx index 2c83616d5a97..8acdf94faed5 100644 --- a/lotuswordpro/source/filter/lwpoleobject.hxx +++ b/lotuswordpro/source/filter/lwpoleobject.hxx @@ -74,7 +74,6 @@ #include <sfx2/objsh.hxx> #include <sot/storinfo.hxx> - typedef struct tagAFID_CACHE { unsigned long LinkedFileSize; /* 0 if not linked */ diff --git a/lotuswordpro/source/filter/lwpoverride.cxx b/lotuswordpro/source/filter/lwpoverride.cxx index 2feb62b507f6..1f64516901e0 100644 --- a/lotuswordpro/source/filter/lwpoverride.cxx +++ b/lotuswordpro/source/filter/lwpoverride.cxx @@ -450,7 +450,6 @@ void LwpIndentOverride::Read(LwpObjectStream* pStrm) pStrm->SkipExtra(); } - /*class LwpAmikakeOverride*/ LwpAmikakeOverride::LwpAmikakeOverride() : m_pBackgroundStuff(new LwpBackgroundStuff), m_nType(AMIKAKE_NONE) diff --git a/lotuswordpro/source/filter/lwpoverride.hxx b/lotuswordpro/source/filter/lwpoverride.hxx index c01d2ae56cc9..82483ed4b1c7 100644 --- a/lotuswordpro/source/filter/lwpoverride.hxx +++ b/lotuswordpro/source/filter/lwpoverride.hxx @@ -106,7 +106,6 @@ protected: sal_uInt16 m_nApply; }; -///////////////////////////////////////////////////////////////// class LwpTextLanguageOverride : public LwpOverride { public: @@ -126,7 +125,6 @@ private: sal_uInt16 m_nLanguage; }; -///////////////////////////////////////////////////////////////// class LwpTextAttributeOverride : public LwpOverride { public: @@ -158,7 +156,7 @@ inline sal_uInt16 LwpTextAttributeOverride::GetHideLevels() const { return m_nHideLevels; } -///////////////////////////////////////////////////////////////// + class LwpKinsokuOptsOverride : public LwpOverride { public: @@ -178,7 +176,6 @@ private: sal_uInt16 m_nLevels; }; -///////////////////////////////////////////////////////////////// class LwpBulletOverride : public LwpOverride { public: @@ -199,7 +196,6 @@ public: inline sal_Bool IsRightAligned(); inline sal_Bool IsEditable(); - void OverrideSilverBullet(LwpObjectID aID); void OverrideSkip(sal_Bool bOver); void OverrideRightAligned(sal_Bool bOver); @@ -280,7 +276,6 @@ inline void LwpBulletOverride::RevertRightAligned() LwpOverride::Override(BO_RIGHTALIGN, STATE_STYLE); } -///////////////////////////////////////////////////////////////// class LwpAlignmentOverride : public LwpOverride { public: @@ -325,7 +320,6 @@ private: sal_uInt16 m_nAlignChar; }; -///////////////////////////////////////////////////////////////// class LwpSpacingCommonOverride : public LwpOverride { public: @@ -370,7 +364,6 @@ protected: sal_Int32 m_nMultiple; }; -///////////////////////////////////////////////////////////////// class LwpSpacingOverride : public LwpOverride { public: @@ -401,7 +394,6 @@ private: LwpSpacingCommonOverride* m_pParaSpacingBelow; }; -///////////////////////////////////////////////////////////////// class LwpIndentOverride : public LwpOverride { public: @@ -480,7 +472,6 @@ inline double LwpIndentOverride::GetRight() const return LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits(m_nRight)); } -///////////////////////////////////////////////////////////////// class LwpBackgroundStuff; class LwpAmikakeOverride : public LwpOverride { diff --git a/lotuswordpro/source/filter/lwppagehint.cxx b/lotuswordpro/source/filter/lwppagehint.cxx index 166f0f5dc657..df34d9f8d0ed 100644 --- a/lotuswordpro/source/filter/lwppagehint.cxx +++ b/lotuswordpro/source/filter/lwppagehint.cxx @@ -64,7 +64,6 @@ #include "lwppagehint.hxx" - void LwpSLVListHead::Read(LwpObjectStream* pObjStrm) { m_ListHead.ReadIndexed(pObjStrm); diff --git a/lotuswordpro/source/filter/lwppagehint.hxx b/lotuswordpro/source/filter/lwppagehint.hxx index d81e691b604f..712f54a36f6c 100644 --- a/lotuswordpro/source/filter/lwppagehint.hxx +++ b/lotuswordpro/source/filter/lwppagehint.hxx @@ -127,5 +127,5 @@ private: sal_uInt16 m_nLayoutPageNumber; }; -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwppagelayout.cxx b/lotuswordpro/source/filter/lwppagelayout.cxx index 251c8be2f508..b93233e6f362 100644 --- a/lotuswordpro/source/filter/lwppagelayout.cxx +++ b/lotuswordpro/source/filter/lwppagelayout.cxx @@ -202,7 +202,6 @@ void LwpPageLayout::ParseBorders(XFPageMaster *pm1) } } - /** * @descr: set page shadow * @@ -749,7 +748,6 @@ void LwpHeaderLayout::Read() m_pObjStrm->SkipExtra(); } - void LwpHeaderLayout::RegisterStyle(XFPageMaster* pm1) { XFHeaderStyle* pHeaderStyle = new XFHeaderStyle(); @@ -859,7 +857,6 @@ void LwpHeaderLayout::ParseBackColor(XFHeaderStyle* pHeaderStyle) } } - void LwpHeaderLayout::ParseWaterMark(XFHeaderStyle * pHeaderStyle) { XFBGImage* pXFBGImage = GetXFBGImage(); @@ -1049,7 +1046,6 @@ void LwpFooterLayout::RegisterStyle(XFMasterPage* mp1) mp1->SetFooter(pFooter); } - void LwpFooterLayout::ParseWaterMark(XFFooterStyle * pFooterStyle) { XFBGImage* pXFBGImage = GetXFBGImage(); diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx index 37dab63f6b9c..aa9b9a9c6b7a 100644 --- a/lotuswordpro/source/filter/lwppara.hxx +++ b/lotuswordpro/source/filter/lwppara.hxx @@ -62,7 +62,6 @@ Jan 2005 Created ************************************************************************/ - #ifndef _LWPPARAGRAPH_HXX_ #define _LWPPARAGRAPH_HXX_ diff --git a/lotuswordpro/source/filter/lwpparaproperty.cxx b/lotuswordpro/source/filter/lwpparaproperty.cxx index d250f1922083..e572441c51a0 100644 --- a/lotuswordpro/source/filter/lwpparaproperty.cxx +++ b/lotuswordpro/source/filter/lwpparaproperty.cxx @@ -195,7 +195,7 @@ sal_uInt32 LwpParaSpacingProperty::GetType(void) return PP_LOCAL_SPACING; } -// 01/25/2004//////////////////////////////////////////////////////// +// 01/25/2004 LwpParaBorderProperty::LwpParaBorderProperty(LwpObjectStream* pStrm) : m_pParaBorderOverride(NULL) { @@ -248,7 +248,7 @@ LwpParaNumberingProperty::LwpParaNumberingProperty(LwpObjectStream * pStrm) LwpNumberingPiece *pNumberingPiece = dynamic_cast<LwpNumberingPiece*>(aNumberingPiece.obj(VO_NUMBERINGPIECE)); m_pNumberingOverride = pNumberingPiece ? dynamic_cast<LwpNumberingOverride*>(pNumberingPiece->GetOverride()) : NULL; } -//end////////////////////////////////////////////////////////////////////// +//end LwpParaTabRackProperty::LwpParaTabRackProperty(LwpObjectStream* pFile) { diff --git a/lotuswordpro/source/filter/lwpparaproperty.hxx b/lotuswordpro/source/filter/lwpparaproperty.hxx index 667f9e9ae729..60fb965be79b 100644 --- a/lotuswordpro/source/filter/lwpparaproperty.hxx +++ b/lotuswordpro/source/filter/lwpparaproperty.hxx @@ -112,7 +112,6 @@ inline LwpParaProperty* LwpParaProperty::GetPrevious(void) //align/indent/spacing //TO DO:border/backgroud etc - class LwpParaAlignProperty : public LwpParaProperty { public: @@ -217,7 +216,6 @@ inline LwpBreaksOverride* LwpParaBreaksProperty::GetLocalParaBreaks() return m_pBreaks; } - class LwpParaBulletProperty : public LwpParaProperty { public: @@ -242,7 +240,6 @@ inline LwpBulletOverride* LwpParaBulletProperty::GetLocalParaBullet() return m_pBullet; } - class LwpParaNumberingProperty : public LwpParaProperty { public: @@ -286,7 +283,6 @@ inline sal_uInt32 LwpParaTabRackProperty::GetType(void) return PP_LOCAL_TABRACK; } - class LwpParaBackGroundProperty : public LwpParaProperty { public: diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index a64860d39b28..03c06a2dfe2c 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -85,7 +85,6 @@ #include "lwpsilverbullet.hxx" - LwpParaStyle::LwpParaStyle(LwpObjectHeader& objHdr, LwpSvStream* pStrm) : LwpTextStyle(objHdr, pStrm), m_pKinsokuOptsOverride(new LwpKinsokuOptsOverride), m_pBulletOverride(new LwpBulletOverride) @@ -153,7 +152,6 @@ void LwpParaStyle::Read() m_pObjStrm->SkipExtra(); } - } } @@ -223,7 +221,6 @@ void LwpParaStyle::Apply(XFParaStyle *pParaStyle) } } - //add tab style pPiece = dynamic_cast<LwpVirtualPiece*>(m_TabStyle.obj()); if( pPiece ) @@ -686,7 +683,6 @@ void LwpParaStyle::ApplyTab(XFParaStyle *pParaStyle, LwpTabOverride *pTabOverRid } - void LwpParaStyle::RegisterStyle() { XFParaStyle* pStyle = new XFParaStyle(); @@ -779,7 +775,6 @@ LwpNumberingOverride* LwpParaStyle::GetNumberingOverride() const return NULL; } - /************************************************************************** * @short: * @descr: diff --git a/lotuswordpro/source/filter/lwppiece.hxx b/lotuswordpro/source/filter/lwppiece.hxx index 0e79d2f40924..576b14964bff 100644 --- a/lotuswordpro/source/filter/lwppiece.hxx +++ b/lotuswordpro/source/filter/lwppiece.hxx @@ -108,7 +108,6 @@ protected: LwpOverride *m_pOverride; }; - class LwpParaBorderPiece : public LwpVirtualPiece { public: @@ -145,7 +144,6 @@ public: } }; - class LwpBackgroundPiece : public LwpVirtualPiece { public: diff --git a/lotuswordpro/source/filter/lwppttntbl.hxx b/lotuswordpro/source/filter/lwppttntbl.hxx index c1dff5af2b9f..d2a1b6b9c3a0 100644 --- a/lotuswordpro/source/filter/lwppttntbl.hxx +++ b/lotuswordpro/source/filter/lwppttntbl.hxx @@ -128,7 +128,6 @@ static const sal_uInt8 s_pLwpPatternTab[][8] = { //Id Name { 0x81, 0x41, 0x60, 0x70, 0x78, 0x70, 0x60, 0x41 },//62 { 0xEE, 0x57, 0xAB, 0x55, 0xEE, 0x5D, 0xBA, 0x75 },//63 -// { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },//2 SolidBackground { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },//2 SolidBackground { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF },//2 SolidBackground diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx index 3c544eee0f17..596dd5f0c04b 100644 --- a/lotuswordpro/source/filter/lwprowlayout.cxx +++ b/lotuswordpro/source/filter/lwprowlayout.cxx @@ -462,7 +462,6 @@ sal_Bool LwpRowLayout::GetMergeCellFlag() return sal_True; } - LwpRowHeadingLayout::LwpRowHeadingLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm) : LwpRowLayout(objHdr, pStrm) {} diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx index 5790d71a569f..4d54d632c9ee 100644 --- a/lotuswordpro/source/filter/lwprowlayout.hxx +++ b/lotuswordpro/source/filter/lwprowlayout.hxx @@ -113,7 +113,6 @@ public: void RegisterCurRowStyle(XFRow* pXFRow,sal_uInt16 nRowMark); }; - /** * @brief * VO_ROWHEADINGLAYOUT obj diff --git a/lotuswordpro/source/filter/lwpsection.hxx b/lotuswordpro/source/filter/lwpsection.hxx index 3141d975b1e9..9eeedd0f6c83 100644 --- a/lotuswordpro/source/filter/lwpsection.hxx +++ b/lotuswordpro/source/filter/lwpsection.hxx @@ -148,7 +148,6 @@ inline LwpAtomHolder* LwpSection::GetAtomHolder() return &m_AtomHolder; } - class LwpIndexSection : public LwpSection { public: diff --git a/lotuswordpro/source/filter/lwpstyledef.hxx b/lotuswordpro/source/filter/lwpstyledef.hxx index faa0b320c0f6..907e11cb5c36 100644 --- a/lotuswordpro/source/filter/lwpstyledef.hxx +++ b/lotuswordpro/source/filter/lwpstyledef.hxx @@ -87,7 +87,6 @@ #define BORDER_GIRDER 23 // User defined bitmap borders (200 - 400) -//======================================== // scalable lines #define BGRP_SOLID 20 @@ -179,7 +178,6 @@ #define DECO3_JOIN_H UNIT_56_96 // User defined bitmap border groups 200 - 400 -//============================================ /* background patterns */ #define BACK_TRANSPARENT 0 diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx index 43e750ca600a..98f8770c4102 100644 --- a/lotuswordpro/source/filter/lwptable.hxx +++ b/lotuswordpro/source/filter/lwptable.hxx @@ -187,7 +187,6 @@ protected: sal_uInt16 GetNumIndexRows(void); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index 209c2ace7c5a..c5421d81ddc8 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -748,7 +748,6 @@ void LwpTableLayout::RegisterStyle() // Parse table ParseTable(); - //Comment:The old code doesn't check if the LwpFoundry pointer is NULL, // So the NULL pointer cause sodc frozee. Add code to check the // the pointer. @@ -1105,7 +1104,6 @@ void LwpTableLayout::PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID) //New Code if( !pFoundry ) return; - try{ LwpDLVListHeadHolder* pHolder = (LwpDLVListHeadHolder*)pFoundry->GetNumberManager()->GetTableRangeID().obj(); @@ -1402,7 +1400,6 @@ XFCell* LwpTableLayout::GetCellsMap(sal_uInt16 nRow,sal_uInt8 nCol) return NULL; } - //add end by LwpColumnLayout::LwpColumnLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm) : LwpVirtualLayout(objHdr, pStrm) @@ -1508,7 +1505,6 @@ void LwpSuperGlossaryLayout::Read() m_pObjStrm->SkipExtra(); } - LwpParallelColumnsLayout::LwpParallelColumnsLayout(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpTableLayout(objHdr, pStrm) { } diff --git a/lotuswordpro/source/filter/lwptabrack.cxx b/lotuswordpro/source/filter/lwptabrack.cxx index 32f229949e56..b27082cea0a2 100644 --- a/lotuswordpro/source/filter/lwptabrack.cxx +++ b/lotuswordpro/source/filter/lwptabrack.cxx @@ -79,7 +79,6 @@ void LwpTab::Read(LwpObjectStream *pStrm) m_nAlignChar = pStrm->QuickReaduInt16(); } - LwpTabRack::LwpTabRack(LwpObjectHeader objHdr, LwpSvStream* pStrm):LwpObject(objHdr,pStrm) { m_nNumTabs = 0; diff --git a/lotuswordpro/source/filter/lwptblcell.cxx b/lotuswordpro/source/filter/lwptblcell.cxx index 375683344cc3..1ed04eacde9d 100644 --- a/lotuswordpro/source/filter/lwptblcell.cxx +++ b/lotuswordpro/source/filter/lwptblcell.cxx @@ -67,7 +67,6 @@ #include "lwptblcell.hxx" #include "lwppara.hxx" -////////////////////////////////////////////////////////////////// LwpCellList::LwpCellList(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm) {} @@ -113,7 +112,6 @@ void LwpCellList::Convert(XFCell * pCell, LwpTableLayout* /*pCellsMap*/) } } -////////////////////////////////////////////////////////////////// LwpNumericValue::LwpNumericValue(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpObject(objHdr, pStrm) {} @@ -129,7 +127,7 @@ void LwpNumericValue::Read() void LwpNumericValue::Parse(IXFStream* /*pOutputStream*/) { } -////////////////////////////////////////////////////////////////// + LwpRowList::LwpRowList(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm) {} @@ -155,7 +153,6 @@ void LwpRowList::Read() { } -////////////////////////////////////////////////////////////////// LwpTableRange::LwpTableRange(LwpObjectHeader &objHdr, LwpSvStream* pStrm) :LwpDLVList(objHdr, pStrm) {} @@ -176,7 +173,6 @@ void LwpTableRange::Parse(IXFStream* /*pOutputStream*/) { } -////////////////////////////////////////////////////////////////// LwpCellRange::LwpCellRange(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpObject(objHdr, pStrm) {} @@ -193,8 +189,6 @@ void LwpCellRange::Parse(IXFStream* /*pOutputStream*/) { } -////////////////////////////////////////////////////////////////// - LwpFolder::LwpFolder(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm) {} @@ -220,8 +214,6 @@ void LwpFolder::Parse(IXFStream* /*pOutputStream*/) { } -////////////////////////////////////////////////////////////////// - LwpDependent::LwpDependent(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpDLVList(objHdr, pStrm) {} @@ -242,7 +234,6 @@ void LwpDependent::Read() void LwpDependent::Parse(IXFStream* /*pOutputStream*/) { } -////////////////////////////////////////////////////////////////// void LwpRowSpecifier::QuickRead(LwpObjectStream *pStrm) { diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx index ffb149fff972..ddf1b19d90cc 100644 --- a/lotuswordpro/source/filter/lwptblcell.hxx +++ b/lotuswordpro/source/filter/lwptblcell.hxx @@ -137,7 +137,6 @@ protected: void Read(); }; -//////////////////////////////////////////////////////////////////////// /** * @brief * VO_TABLERANGE object @@ -218,8 +217,6 @@ protected: // dropped, sorted. }; - -/////////////////////////////////////////////////////////////// /** * @brief * row or column id diff --git a/lotuswordpro/source/filter/lwptblformula.cxx b/lotuswordpro/source/filter/lwptblformula.cxx index 214fb77693ed..c82073207f64 100644 --- a/lotuswordpro/source/filter/lwptblformula.cxx +++ b/lotuswordpro/source/filter/lwptblformula.cxx @@ -76,7 +76,6 @@ LwpFormulaArg::~LwpFormulaArg() { } -////////////////////////////////////////////////////////////////// LwpFormulaInfo::LwpFormulaInfo(LwpObjectHeader &objHdr, LwpSvStream* pStrm) : LwpCellList(objHdr, pStrm) , m_bSupported(sal_True) @@ -433,8 +432,6 @@ void LwpFormulaInfo::Convert(XFCell * pCell,LwpTableLayout* pCellsMap) LwpCellList::Convert(pCell); } -////////////////////////////////////////////////////////////////// - /** * * @date 03/26/2005 diff --git a/lotuswordpro/source/filter/lwptblformula.hxx b/lotuswordpro/source/filter/lwptblformula.hxx index 3ed67ae8e0fd..43ed1ae4216a 100644 --- a/lotuswordpro/source/filter/lwptblformula.hxx +++ b/lotuswordpro/source/filter/lwptblformula.hxx @@ -196,7 +196,6 @@ public: virtual OUString ToString(LwpTableLayout* pCellsMap); }; - class LwpFormulaInfo : public LwpCellList { public: diff --git a/lotuswordpro/source/filter/tocread.cxx b/lotuswordpro/source/filter/tocread.cxx index 580b80db917c..bb143710338b 100644 --- a/lotuswordpro/source/filter/tocread.cxx +++ b/lotuswordpro/source/filter/tocread.cxx @@ -151,7 +151,6 @@ CBenTOCReader::SearchForLabel(BenByte * pLabel) if (Length - CurrOffset > MAX_SEARCH_AMOUNT) break; - // If before beginning of buffer if (CurrOffset - BEN_MAGIC_BYTES_SIZE < BufferStartOffset) { diff --git a/lotuswordpro/source/filter/utlist.cxx b/lotuswordpro/source/filter/utlist.cxx index 55fa883a17a5..11d5bf04f107 100644 --- a/lotuswordpro/source/filter/utlist.cxx +++ b/lotuswordpro/source/filter/utlist.cxx @@ -75,9 +75,6 @@ CUtListElmt::~CUtListElmt() } } - - - CUtList::~CUtList() { pCUtListElmt pTerminating = GetTerminating(); @@ -119,9 +116,6 @@ CUtList::Destroy() } } - - - CUtOwningList::~CUtOwningList() { Destroy(); diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx index 35a15dc486f4..c2a28656e1a7 100644 --- a/lotuswordpro/source/filter/utlist.hxx +++ b/lotuswordpro/source/filter/utlist.hxx @@ -61,7 +61,6 @@ namespace OpenStormBento { - UtDefClassP(CUtListElmt); UtDefClassP(CUtList); UtDefClassP(CUtComparableListElmt); @@ -102,9 +101,6 @@ private: // Data pCUtListElmt cpPrev; }; - - - class CUtComparableListElmt : public CUtListElmt { public: // Methods @@ -116,9 +112,6 @@ public: // Methods public: // Pure virtual methods }; - - - class CUtList { public: // Methods @@ -138,9 +131,6 @@ private: // Data CUtListElmt cDummyElmt; }; - - - class CUtOwningList : public CUtList { public: // Methods diff --git a/lotuswordpro/source/filter/xfilter/ixfstream.hxx b/lotuswordpro/source/filter/xfilter/ixfstream.hxx index d400b98326c6..75b6f17d9371 100644 --- a/lotuswordpro/source/filter/xfilter/ixfstream.hxx +++ b/lotuswordpro/source/filter/xfilter/ixfstream.hxx @@ -60,7 +60,6 @@ #ifndef _IXFSTREAM_INC #define _IXFSTREAM_INC - #include <rtl/ustring.hxx> class IXFAttrList; diff --git a/lotuswordpro/source/filter/xfilter/xfborders.cxx b/lotuswordpro/source/filter/xfilter/xfborders.cxx index 975429ba9491..8ffc2554cb26 100644 --- a/lotuswordpro/source/filter/xfilter/xfborders.cxx +++ b/lotuswordpro/source/filter/xfilter/xfborders.cxx @@ -185,9 +185,8 @@ bool operator!=(XFBorder& b1, XFBorder& b2) return !(b1 == b2); } -// //XFBorders: -// + void XFBorders::SetColor(enumXFBorder side, XFColor& color) { switch(side) diff --git a/lotuswordpro/source/filter/xfilter/xfborders.hxx b/lotuswordpro/source/filter/xfilter/xfborders.hxx index f84ac4ae5650..d72c3198e01b 100644 --- a/lotuswordpro/source/filter/xfilter/xfborders.hxx +++ b/lotuswordpro/source/filter/xfilter/xfborders.hxx @@ -187,6 +187,5 @@ private: XFBorder m_aBorderBottom; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfcell.cxx b/lotuswordpro/source/filter/xfilter/xfcell.cxx index 25dd1609d99c..c7b739edfcce 100644 --- a/lotuswordpro/source/filter/xfilter/xfcell.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcell.cxx @@ -160,7 +160,6 @@ void XFCell::Add(IXFContent *pContent) } } - void XFCell::SetValue(double value) { SetValue(DoubleToOUString(value,18)); diff --git a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx index 268a7c784365..b03124880fe9 100644 --- a/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcellstyle.cxx @@ -62,7 +62,6 @@ #include "xffont.hxx" #include "xfbgimage.hxx" - XFCellStyle::XFCellStyle() { m_eHoriAlign = enumXFAlignNone; diff --git a/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx b/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx index 1249c2e623a4..9198bd601673 100644 --- a/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfcolstyle.hxx @@ -105,6 +105,5 @@ inline double XFColStyle::GetWidth() return m_fWidth; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx index 1403c12d627f..48ae2fbc6b7b 100644 --- a/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx +++ b/lotuswordpro/source/filter/xfilter/xfcontentcontainer.cxx @@ -146,7 +146,6 @@ void XFContentContainer::Reset() m_aContents.clear(); } - IXFContent* XFContentContainer::FindFirstContent(enumXFContent type) { IXFContent *pRet = NULL; diff --git a/lotuswordpro/source/filter/xfilter/xfdate.hxx b/lotuswordpro/source/filter/xfilter/xfdate.hxx index 484fbbf4f30a..a629618be32f 100644 --- a/lotuswordpro/source/filter/xfilter/xfdate.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdate.hxx @@ -127,7 +127,6 @@ public: virtual void ToXml(IXFStream *pStrm); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfdefs.hxx b/lotuswordpro/source/filter/xfilter/xfdefs.hxx index d91a58e3d3f3..5db73f541dd2 100644 --- a/lotuswordpro/source/filter/xfilter/xfdefs.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdefs.hxx @@ -170,7 +170,6 @@ enum enumXFEmphasize enumXFEmphasizeAccent }; - enum enumXFAlignType { enumXFAlignNone = 0, @@ -507,7 +506,6 @@ enum enumXFFWShadow enumXFFWShadowSlant }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx b/lotuswordpro/source/filter/xfilter/xfdocfield.hxx index f98bb2ef0604..dfad88ecedac 100644 --- a/lotuswordpro/source/filter/xfilter/xfdocfield.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdocfield.hxx @@ -193,7 +193,6 @@ public: virtual void ToXml(IXFStream *pStrm); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx index 509984270f14..2cf3df54f702 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawlinestyle.hxx @@ -210,7 +210,6 @@ inline sal_Int32 XFDrawLineStyle::GetTransparency() return m_nTransparency; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx index dfa5517f0079..37ed84150439 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawobj.hxx @@ -156,6 +156,5 @@ inline void XFDrawObject::SetSkewY(double cy) m_fSkewY = cy*2*PI/360; } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx index 5124512b534d..d879ddfbaaab 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawpath.hxx @@ -137,7 +137,6 @@ inline void XFSvgPathEntry::AddPoint(XFPoint pt) m_aPoints.push_back(pt); } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx index b59a84cdadb1..b047f44e41c1 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawpolygon.cxx @@ -88,7 +88,6 @@ void XFDrawPolygon::ToXml(IXFStream *pStrm) strPoints = strPoints.trim(); pAttrList->AddAttribute( A2OUSTR("draw:points"), strPoints); - // SetPosition(rect.GetX(),rect.GetY(),rect.GetWidth(),rect.GetHeight()); XFDrawObject::ToXml(pStrm); diff --git a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx index 00a14896c88b..4c3792f0ed93 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawpolyline.cxx @@ -88,7 +88,6 @@ void XFDrawPolyline::ToXml(IXFStream *pStrm) strPoints = strPoints.trim(); pAttrList->AddAttribute( A2OUSTR("draw:points"), strPoints); - // SetPosition(rect.GetX(),rect.GetY(),rect.GetWidth(),rect.GetHeight()); XFDrawObject::ToXml(pStrm); diff --git a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx index db9a53e947b6..a14a22f95b19 100644 --- a/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfdrawstyle.hxx @@ -144,7 +144,6 @@ inline void XFDrawStyle::SetWrapType(enumXFWrap wrap, sal_Int32 nParagraphs) m_nWrapLines = nParagraphs; } - inline void XFDrawStyle::SetArrowStart(OUString start, double size, sal_Bool center) { assert(size>0); diff --git a/lotuswordpro/source/filter/xfilter/xffont.cxx b/lotuswordpro/source/filter/xfilter/xffont.cxx index 7ea9f5872b2e..ce2d2bef8a15 100644 --- a/lotuswordpro/source/filter/xfilter/xffont.cxx +++ b/lotuswordpro/source/filter/xfilter/xffont.cxx @@ -238,7 +238,6 @@ bool operator!=(XFFont& f1, XFFont& f2) return !(f1==f2); } - void XFFont::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); @@ -369,7 +368,6 @@ void XFFont::ToXml(IXFStream *pStrm) pAttrList->AddAttribute(A2OUSTR("style:text-blinking"), A2OUSTR("true") ); } - //position & sacle: if( ((m_nFlag & XFFONT_FLAG_SCALE) && m_nScale>0 ) || ((m_nFlag & XFFONT_FLAG_POSITION) && m_nPosition != 0) diff --git a/lotuswordpro/source/filter/xfilter/xffont.hxx b/lotuswordpro/source/filter/xfilter/xffont.hxx index 73e319019eb0..17eccc073f5c 100644 --- a/lotuswordpro/source/filter/xfilter/xffont.hxx +++ b/lotuswordpro/source/filter/xfilter/xffont.hxx @@ -297,7 +297,6 @@ private: sal_Bool m_bTransparent; }; - inline void XFFont::SetFontName(OUString name) { m_strFontName = name; @@ -319,7 +318,6 @@ inline void XFFont::SetFontNameComplex(OUString name) m_nFlag |= XFFONT_FLAG_NAME_COMPLEX; } -// inline void XFFont::SetFontSize(sal_Int16 size) { m_nFontSize = size; diff --git a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx index 245e694174da..a9c3445b2ccb 100644 --- a/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx +++ b/lotuswordpro/source/filter/xfilter/xffootnoteconfig.hxx @@ -218,7 +218,6 @@ inline void XFFootnoteConfig::ToXml(IXFStream *pStrm) if( !m_strMasterPage.isEmpty() ) pAttrList->AddAttribute( A2OUSTR("text:master-page-name"), m_strMasterPage); - pAttrList->AddAttribute( A2OUSTR("text:start-value"), Int32ToOUString(m_nStartValue) ); if( m_bIsFootnote ) diff --git a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx index b884e5cefa44..6ab28faf5e74 100644 --- a/lotuswordpro/source/filter/xfilter/xfframestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfframestyle.cxx @@ -223,7 +223,6 @@ void XFFrameStyle::ToXml(IXFStream *pStrm) pAttrList->AddAttribute( A2OUSTR("style:horizontal-pos"), GetFrameXPos(m_eXPos) ); pAttrList->AddAttribute( A2OUSTR("style:horizontal-rel"), GetFrameXRel(m_eXRel) ); - // pStrm->StartElement( A2OUSTR("style:properties") ); if( m_pColumns ) m_pColumns->ToXml(pStrm); diff --git a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx index 3d30962f008a..1971ebb6cb59 100644 --- a/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfimagestyle.cxx @@ -199,7 +199,6 @@ void XFImageStyle::ToXml(IXFStream *pStrm) pAttrList->AddAttribute(A2OUSTR("fo:clip"),clip); } - // pStrm->StartElement( A2OUSTR("style:properties") ); pStrm->EndElement( A2OUSTR("style:properties") ); diff --git a/lotuswordpro/source/filter/xfilter/xfindex.cxx b/lotuswordpro/source/filter/xfilter/xfindex.cxx index 0ebaf489e18c..e707b8e0b5e9 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.cxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.cxx @@ -254,7 +254,6 @@ void XFIndex::ToXml(IXFStream *pStrm) pStrm->EndElement( strIndexName ); } - void XFIndexTemplate::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); diff --git a/lotuswordpro/source/filter/xfilter/xfindex.hxx b/lotuswordpro/source/filter/xfilter/xfindex.hxx index e5b7c1e4870e..e49a1e2add3f 100644 --- a/lotuswordpro/source/filter/xfilter/xfindex.hxx +++ b/lotuswordpro/source/filter/xfilter/xfindex.hxx @@ -228,7 +228,6 @@ inline void XFIndexTemplate::AddTextEntry(OUString sText, OUString styleName) m_aTextEntries[nLen] = sText; } - inline void XFIndexTemplate::Clear() { m_aEntries.clear(); diff --git a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx index 455e8576107c..0b047fa1cf10 100644 --- a/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx +++ b/lotuswordpro/source/filter/xfilter/xflinenumberconfig.hxx @@ -193,7 +193,6 @@ inline void XFLineNumberConfig::ToXml(IXFStream *pStrm) else pAttrList->AddAttribute( A2OUSTR("text:count-in-floating-frames"), A2OUSTR("false") ); - pStrm->StartElement( A2OUSTR("text:linenumbering-configuration") ); pAttrList->Clear(); @@ -205,6 +204,5 @@ inline void XFLineNumberConfig::ToXml(IXFStream *pStrm) pStrm->EndElement( A2OUSTR("text:linenumbering-configuration") ); } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xflistitem.hxx b/lotuswordpro/source/filter/xfilter/xflistitem.hxx index 419cccb877c9..25aec26403ff 100644 --- a/lotuswordpro/source/filter/xfilter/xflistitem.hxx +++ b/lotuswordpro/source/filter/xfilter/xflistitem.hxx @@ -110,7 +110,5 @@ inline void XFListItem::ToXml(IXFStream *pStrm) } } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx index e017c0858e69..2d3ef51d8161 100644 --- a/lotuswordpro/source/filter/xfilter/xfliststyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfliststyle.cxx @@ -74,8 +74,6 @@ void XFListLevel::ToXml(IXFStream * /*pStrm*/) { } - - void XFListlevelNumber::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); @@ -105,7 +103,6 @@ void XFListlevelNumber::ToXml(IXFStream *pStrm) } pAttrList->AddAttribute( A2OUSTR("fo:text-align"), GetAlignName(m_eAlign) ); - pStrm->StartElement( A2OUSTR("style:properties") ); pStrm->EndElement( A2OUSTR("style:properties") ); @@ -153,7 +150,6 @@ void XFListLevelBullet::ToXml(IXFStream *pStrm) pStrm->EndElement( A2OUSTR("text:list-level-style-bullet") ); } - XFListStyle::XFListStyle() { XFNumFmt nf; @@ -289,7 +285,7 @@ void XFListStyle::SetListBullet(sal_Int32 level, pLevel->SetSuffix(suffix); pLevel->SetBulletChar(bullet); pLevel->SetFontName(fontname); - // + pLevel->SetListlevelType(enumXFListLevelBullet); pLevel->SetMinLabelWidth(0.499); pLevel->SetIndent(0.501*level); @@ -307,7 +303,7 @@ void XFListStyle::SetListNumber(sal_Int32 level, XFNumFmt& fmt, sal_Int16 sta XFListlevelNumber *pLevel = new XFListlevelNumber(); pLevel->SetNumFmt(fmt); pLevel->SetStartValue(start); - // + pLevel->SetListlevelType(enumXFListLevelNumber); pLevel->SetMinLabelWidth(0.499); pLevel->SetIndent(0.501*level); diff --git a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx index a5395fe0237d..79590f72ab8f 100644 --- a/lotuswordpro/source/filter/xfilter/xfliststyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfliststyle.hxx @@ -137,7 +137,6 @@ private: XFNumFmt m_aNumFmt; }; - class XFListLevelBullet : public XFListLevel { public: @@ -181,7 +180,6 @@ private: OUString m_strBinaryData; }; - class XFListStyle : public XFStyle { public: @@ -225,8 +223,6 @@ private: XFListLevel *m_pListLevels[10]; }; - - inline void XFListLevel::SetListlevelType(enumXFListLevel type) { m_eListType = type; diff --git a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx index 19879326cbc9..82f0af6b0a0c 100644 --- a/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx +++ b/lotuswordpro/source/filter/xfilter/xfmasterpage.cxx @@ -96,7 +96,6 @@ enumXFStyle XFMasterPage::GetStyleFamily() return enumXFStyleMasterPage; } - void XFMasterPage::SetPageMaster(OUString pm) { m_strPageMaster = pm; diff --git a/lotuswordpro/source/filter/xfilter/xfpadding.hxx b/lotuswordpro/source/filter/xfilter/xfpadding.hxx index 30b5ad7690a0..4fa9c1a05b9f 100644 --- a/lotuswordpro/source/filter/xfilter/xfpadding.hxx +++ b/lotuswordpro/source/filter/xfilter/xfpadding.hxx @@ -118,7 +118,6 @@ private: double m_fBottom; }; - inline XFPadding::XFPadding() { Reset(); diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx index d5e305348768..a2ea03492002 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.cxx @@ -514,7 +514,6 @@ enumXFStyle XFDefaultParaStyle::GetStyleFamily() return enumXFStyleDefaultPara; } - void XFDefaultParaStyle::ToXml(IXFStream * pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); diff --git a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx index 19267fb0c80c..5cd91421c043 100644 --- a/lotuswordpro/source/filter/xfilter/xfparastyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xfparastyle.hxx @@ -150,7 +150,6 @@ public: enumXFAlignType GetAlighType(); - /** * @descr Set last line alignment property of the paragraph. * @param eAlign alignment type,left,right,center or justify. diff --git a/lotuswordpro/source/filter/xfilter/xfrow.cxx b/lotuswordpro/source/filter/xfilter/xfrow.cxx index 7efbb3cff8df..030fbe527a6d 100644 --- a/lotuswordpro/source/filter/xfilter/xfrow.cxx +++ b/lotuswordpro/source/filter/xfilter/xfrow.cxx @@ -96,7 +96,6 @@ XFRow& XFRow::operator=(const XFRow& other) return *this; } - XFRow::~XFRow() { std::map<sal_Int32,XFCell*>::iterator it; diff --git a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx index 4f59a1f7c359..bed7ea2f0288 100644 --- a/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xfsectionstyle.cxx @@ -137,6 +137,5 @@ void XFSectionStyle::ToXml(IXFStream *pStrm) pStrm->EndElement( A2OUSTR("style:style") ); - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xfshadow.hxx b/lotuswordpro/source/filter/xfilter/xfshadow.hxx index 187fd3c9c702..47da66591372 100644 --- a/lotuswordpro/source/filter/xfilter/xfshadow.hxx +++ b/lotuswordpro/source/filter/xfilter/xfshadow.hxx @@ -118,7 +118,6 @@ private: XFColor m_aColor; }; - inline void XFShadow::SetPosition(enumXFShadowPos pos) { m_ePosition = pos; diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx index 3d565a90d2d9..7ab73a9d3284 100644 --- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx +++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx @@ -93,7 +93,6 @@ XFStyleContainer::~XFStyleContainer() } } - void XFStyleContainer::Reset() { std::vector<IXFStyle*>::iterator it; @@ -143,7 +142,6 @@ IXFStyle* XFStyleContainer::AddStyle(IXFStyle *pStyle) } } - m_aStyles.push_back(pStyle); //transform the font object to XFFontFactory @@ -209,7 +207,6 @@ void XFStyleContainer::ToXml(IXFStream *pStrm) } } - void XFStyleContainer::ManageStyleFont(IXFStyle *pStyle) { XFFont *pStyleFont = NULL; diff --git a/lotuswordpro/source/filter/xfilter/xftable.cxx b/lotuswordpro/source/filter/xfilter/xftable.cxx index 0b193ae11e86..322fb69fd026 100644 --- a/lotuswordpro/source/filter/xfilter/xftable.cxx +++ b/lotuswordpro/source/filter/xfilter/xftable.cxx @@ -111,8 +111,6 @@ XFTable& XFTable::operator =(const XFTable& other) return *this; } - - XFTable::~XFTable() { std::map<sal_uInt16, XFRow*>::iterator it; diff --git a/lotuswordpro/source/filter/xfilter/xftable.hxx b/lotuswordpro/source/filter/xfilter/xftable.hxx index 8dae00a67265..387eac7b4c2a 100644 --- a/lotuswordpro/source/filter/xfilter/xftable.hxx +++ b/lotuswordpro/source/filter/xfilter/xftable.hxx @@ -145,7 +145,6 @@ inline sal_Bool XFTable::IsSubTable() return m_bSubTable; } - inline void XFTable::SetDefaultCellStyle(OUString style) { m_strDefCellStyle = style; diff --git a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx index 22fe63574ad4..5173f9efe04a 100644 --- a/lotuswordpro/source/filter/xfilter/xftabstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xftabstyle.hxx @@ -115,6 +115,5 @@ inline void XFTabStyle::SetLeaderChar(sal_Unicode leader) m_strLeader = OUString(chs); } - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx b/lotuswordpro/source/filter/xfilter/xftextstyle.hxx index 34d95ada15d6..f728007a286d 100644 --- a/lotuswordpro/source/filter/xfilter/xftextstyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xftextstyle.hxx @@ -82,7 +82,6 @@ public: XFFont* GetFont(){ return m_pFont; } - virtual enumXFStyle GetStyleFamily(); virtual sal_Bool Equal(IXFStyle *pStyle); diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx index fa457fed637a..f890af77b36d 100644 --- a/lotuswordpro/source/filter/xfilter/xftimestyle.cxx +++ b/lotuswordpro/source/filter/xfilter/xftimestyle.cxx @@ -122,7 +122,6 @@ enumXFStyle XFTimeStyle::GetStyleFamily() return enumXFStyleTime; } - void XFTimeStyle::ToXml(IXFStream *pStrm) { IXFAttrList *pAttrList = pStrm->GetAttrList(); diff --git a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx index ba4b7b67e68d..88977fafe993 100644 --- a/lotuswordpro/source/filter/xfilter/xftimestyle.hxx +++ b/lotuswordpro/source/filter/xfilter/xftimestyle.hxx @@ -135,7 +135,6 @@ private: sal_Bool m_bTruncate; }; - inline void XFDateTimePart::SetPartType(enumXFDatePart ePart) { m_ePart = ePart; diff --git a/lotuswordpro/source/filter/xfilter/xfutil.hxx b/lotuswordpro/source/filter/xfilter/xfutil.hxx index d89da05554ae..9c238db582f5 100644 --- a/lotuswordpro/source/filter/xfilter/xfutil.hxx +++ b/lotuswordpro/source/filter/xfilter/xfutil.hxx @@ -65,7 +65,6 @@ #include <rtl/ustring.hxx> #include <string> - #define A2OUSTR(str) OUString::createFromAscii(str) OUString Int32ToOUString(sal_Int32 num); |