diff options
36 files changed, 34 insertions, 140 deletions
diff --git a/filter/source/msfilter/msvbasic.hxx b/filter/source/msfilter/msvbasic.hxx index 6529349162f2..1e5349684776 100644 --- a/filter/source/msfilter/msvbasic.hxx +++ b/filter/source/msfilter/msvbasic.hxx @@ -57,12 +57,11 @@ using namespace ::com::sun::star::script::ModuleType; DECLARE_DYNARRAY(StringArray,String *) -// #117718# define internal types to distinguish between +// define internal types to distinguish between // module types, form, class & normal -// #i37965# DR 2004-12-03: add "Document", used in Excel for macros attached to sheet +// #i37965# add "Document", used in Excel for macros attached to sheet -// #117718# define map to hold types of module -// +// define map to hold types of module typedef sal_Int32 ModType; typedef ::std::map< UniString, ModType > ModuleTypeHash; diff --git a/filter/source/msfilter/svxmsbas.cxx b/filter/source/msfilter/svxmsbas.cxx index e35439c79f11..f453c7145e27 100644 --- a/filter/source/msfilter/svxmsbas.cxx +++ b/filter/source/msfilter/svxmsbas.cxx @@ -391,7 +391,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< Stri { StringArray aDecompressed = aVBA.Decompress(i); #if 0 -/* DR 2005-08-11 #124850# Do not filter special characters from module name. +/* Do not filter special characters from module name. Just put the original module name and let the Basic interpreter deal with it. Needed for roundtrip... */ diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 1e6b4b08f55c..f8c0dbc20739 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -204,13 +204,12 @@ sal_Bool PDFExport::ExportSelection( vcl::PDFWriter& rPDFWriter, Reference< com: aMtf.SetPrefMapMode( aMapMode ); aMtf.Record( pOut ); - // --> FME 2004-10-08 #i35176# + // #i35176# // IsLastPage property. const sal_Int32 nCurrentRenderer = nSel - 1; nSel = aMultiSelection.NextSelected(); if ( pLastPage && sal_Int32(SFX_ENDOFSELECTION) == nSel ) *pLastPage <<= sal_True; - // <-- rRenderable->render( nCurrentRenderer, rSelection, rRenderOptions ); diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx index 3fd83bcd3b6c..ff45aa031b72 100644 --- a/hwpfilter/source/hwpreader.cxx +++ b/hwpfilter/source/hwpreader.cxx @@ -363,8 +363,6 @@ void HwpReader::makeMeta() } sprintf(buf,"%d-%02d-%02dT%02d:%02d:00",year,month,day,hour,minute); -/* 2001?? 9?? 8?? ??????, 14?? 16?? */ -// 2001-09-07T11:16:47 rstartEl( ascii("meta:creation-date"), rList ); rchars( ascii(buf)); rendEl( ascii("meta:creation-date") ); @@ -372,7 +370,6 @@ void HwpReader::makeMeta() if (hwpinfo->summary.keyword[0][0] || hwpinfo->summary.etc[0][0]) { -/* ???????? dc?? ????????. */ rstartEl(ascii("meta:keywords"), rList); if (hwpinfo->summary.keyword[0][0]) { @@ -500,7 +497,6 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo ) if( hdo->type == HWPDO_LINE || hdo->type == HWPDO_ARC || hdo->type == HWPDO_FREEFORM || hdo->type == HWPDO_ADVANCED_ARC ) { - /* ???????? ???? */ if( prop->line_tstyle && !ArrowShape[prop->line_tstyle].bMade ) { ArrowShape[prop->line_tstyle].bMade = sal_True; @@ -553,7 +549,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo ) if( hdo->type != HWPDO_LINE ) { - if( prop->flag >> 18 & 0x01 ) /* ?????? ???? ???? ???? */ + if( prop->flag >> 18 & 0x01 ) { padd( ascii("draw:name"), sXML_CDATA, ascii(Int2Str(hdo->index, "fillimage%d", buf))); if( !prop->pictype ) @@ -561,7 +557,7 @@ void HwpReader::makeDrawMiscStyle( HWPDrawingObject *hdo ) padd( ascii("xlink:href"), sXML_CDATA, hconv(kstr2hstr( (uchar *)urltounix(prop->szPatternFile, buf), sbuf), gstr)); } - else /* ???????? image???? ?????? ???????? ????. */ + else { EmPicture *emp = 0L; if ( strlen( prop->szPatternFile ) > 3) diff --git a/lotuswordpro/source/filter/benname.cxx b/lotuswordpro/source/filter/benname.cxx index d75ce2bf8132..1c346bc9936c 100644 --- a/lotuswordpro/source/filter/benname.cxx +++ b/lotuswordpro/source/filter/benname.cxx @@ -56,7 +56,7 @@ #include "first.hxx" namespace OpenStormBento { - // changed by to remove warning 2004-06-24 +// changed to remove warning CBenNamedObject::CBenNamedObject(pLtcBenContainer pContainer, BenObjectID ObjectID, pCBenObject pPrevObject, const char * sName, pCBenNamedObjectListElmt pPrevNamedObjectListElmt) : diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index 21d821b032fe..e3008f14ade0 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -214,7 +214,7 @@ private: // Data class CBenNamedObjectListElmt : public CUtListElmt { public: // Methods - // added by to remove warning 2004-06-24 + // added to remove warning CBenNamedObjectListElmt(pCBenNamedObjectListElmt pPrev) : CUtListElmt(pPrev) { cpNamedObject = NULL; } void SetNamedObject(pCBenNamedObject pObj) @@ -293,13 +293,12 @@ public: // Internal methods pCUtList GetObjects() { return &cObjects; } pCUtList GetNamedObjects() { return &cNamedObjects; } - // Added by 2004-06-10 LtcUtBenValueStream * FindNextValueStreamWithPropertyName(const char * sPropertyName, LtcUtBenValueStream * pCurrentValueStream); LtcUtBenValueStream * FindValueStreamWithPropertyName(const char * sPropertyName); LtcUtBenValueStream * FindObjectValueStreamWithObjectIDAndProperty(BenObjectID ObjectID, const char * sPropertyName); BenError CreateGraphicStreams(std::vector<SvStream *> * pStreamVector) ; BenError CreateGraphicStream(SvStream * &pStream, const char *pObjectName); - //Add by 10/24/2005 + SotStorageStreamRef ConvertAswStorageToOLE2Stream(const char * sObjectName); LtcUtBenValueStream * FindOLEStorageStreamWithObjectName(const char * sObjectName, AswEntry& rDirStruct); void ReadAswEntry(SvStream * pStream, AswEntry& rEntry); @@ -368,7 +367,7 @@ public: pCBenProperty BEN_EXPORT GetProperty() { return cpProperty; } public: // Internal methods - // added by to remove WARNING 2004-06-24 + // added to remove WARNING CBenValue(BenObjectID TypeID):CBenIDListElmt(TypeID) { cpProperty = NULL; @@ -414,7 +413,7 @@ public: pLtcBenContainer GetContainer() { return GetBenObject()->GetContainer(); } public: // Internal methods - // changed by to remove WARNING here 2004-06-24 + // changed to remove WARNING here CBenProperty(pCBenObject pObject, BenObjectID PropertyID, BenObjectID TypeID, pCBenIDListElmt pPrevProperty) : CBenIDListElmt(PropertyID, pPrevProperty), cValue(TypeID) diff --git a/lotuswordpro/source/filter/first.hxx b/lotuswordpro/source/filter/first.hxx index 25325c0bbd99..d533b90ad38a 100644 --- a/lotuswordpro/source/filter/first.hxx +++ b/lotuswordpro/source/filter/first.hxx @@ -58,7 +58,7 @@ #include "bento.hxx" // Public header -//#define ASSERT(cond) UT_ASSERT(cond) // Deleted by 2004-06-16 +//#define ASSERT(cond) UT_ASSERT(cond) namespace OpenStormBento { // String constants diff --git a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx index 1a0d4e4b744c..ce3b38bba0c2 100644 --- a/lotuswordpro/source/filter/lwpbackgroundstuff.hxx +++ b/lotuswordpro/source/filter/lwpbackgroundstuff.hxx @@ -57,10 +57,6 @@ * @file * Backgound object of Wordpro. ************************************************************************/ -/************************************************************************* -* Change History -* 2005-01-12 Create and implement. -************************************************************************/ #ifndef _LWPBACKGROUNDSTUFF_HXX #define _LWPBACKGROUNDSTUFF_HXX #include "lwpcolor.hxx" diff --git a/lotuswordpro/source/filter/lwpborderstuff.cxx b/lotuswordpro/source/filter/lwpborderstuff.cxx index c23d14c8acfb..6d0780fc1ef6 100644 --- a/lotuswordpro/source/filter/lwpborderstuff.cxx +++ b/lotuswordpro/source/filter/lwpborderstuff.cxx @@ -57,11 +57,6 @@ * @file * Border stuff of Wordpro. ************************************************************************/ -/************************************************************************* -* Change History -* 2005-01-11 Create and implement. -* 2005-01-17 Add Get** functions. -************************************************************************/ #include "lwpborderstuff.hxx" #include "lwpstyledef.hxx" #include "lwpfilehdr.hxx" diff --git a/lotuswordpro/source/filter/lwpborderstuff.hxx b/lotuswordpro/source/filter/lwpborderstuff.hxx index a63a9b84c3e0..4b79fd7b23a5 100644 --- a/lotuswordpro/source/filter/lwpborderstuff.hxx +++ b/lotuswordpro/source/filter/lwpborderstuff.hxx @@ -57,10 +57,6 @@ * @file * Border stuff of Wordpro. ************************************************************************/ -/************************************************************************* -* Change History -* 2005-01-11 Create and implement. -************************************************************************/ #ifndef _LWPBORDERSTUFF_HXX #define _LWPBORDERSTUFF_HXX diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.cxx b/lotuswordpro/source/filter/lwpbreaksoverride.cxx index f6c8f756321f..26dac3c19de1 100644 --- a/lotuswordpro/source/filter/lwpbreaksoverride.cxx +++ b/lotuswordpro/source/filter/lwpbreaksoverride.cxx @@ -57,11 +57,6 @@ * @file * Breaks override of Wordpro. ************************************************************************/ -/************************************************************************* -* Change History -* 2005-01-12 Create and implement. -************************************************************************/ - #include <memory> #include "clone.hxx" diff --git a/lotuswordpro/source/filter/lwpbreaksoverride.hxx b/lotuswordpro/source/filter/lwpbreaksoverride.hxx index adde24d9be0a..d878901e976d 100644 --- a/lotuswordpro/source/filter/lwpbreaksoverride.hxx +++ b/lotuswordpro/source/filter/lwpbreaksoverride.hxx @@ -57,10 +57,6 @@ * @file * Breaks override of Wordpro. ************************************************************************/ -/************************************************************************* -* Change History -* 2005-01-12 Create and implement. -************************************************************************/ #ifndef _LWPBREAKSOVERRIDE_HXX #define _LWPBREAKSOVERRIDE_HXX diff --git a/lotuswordpro/source/filter/lwpcelllayout.cxx b/lotuswordpro/source/filter/lwpcelllayout.cxx index cd591f719892..fcfccca88a98 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.cxx +++ b/lotuswordpro/source/filter/lwpcelllayout.cxx @@ -284,7 +284,7 @@ void LwpCellLayout::ApplyFmtStyle(XFCellStyle *pCellStyle) { XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); m_NumfmtName = pXFStyleManager->AddStyle(pStyle)->GetStyleName(); - pCellStyle->SetDataStyle(m_NumfmtName);//modified by ,2005/11/30 + pCellStyle->SetDataStyle(m_NumfmtName); } } diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx index e6c954a76aec..78c6229f0e0f 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.hxx +++ b/lotuswordpro/source/filter/lwpcelllayout.hxx @@ -141,7 +141,7 @@ protected: LeaderDotType cType; OUString m_CellStyleNames[enumCellBorderTopLimit]; - OUString m_NumfmtName;//Add by , to support number color,2005/11/30 + OUString m_NumfmtName;//Add to support number color private: LwpCellList* GetCellList(LwpFoundry* pFoundry, LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt8 nCol); }; diff --git a/lotuswordpro/source/filter/lwpchangemgr.cxx b/lotuswordpro/source/filter/lwpchangemgr.cxx index 11885252922e..7afd992fda65 100644 --- a/lotuswordpro/source/filter/lwpchangemgr.cxx +++ b/lotuswordpro/source/filter/lwpchangemgr.cxx @@ -134,7 +134,6 @@ void LwpChangeMgr::ConvertAllChange(IXFStream* pStream) XFChangeDelete* pDelete = new XFChangeDelete; pDelete->SetChangeID(iter->second); pDelete->SetEditor(iter->first->GetEditor()); -/// ConvertFribContent(pDelete,iter->first); //delete tmp,note by ,2005/7/1 m_ChangeList.push_back(pDelete); } } @@ -143,17 +142,14 @@ void LwpChangeMgr::ConvertAllChange(IXFStream* pStream) pStream->GetAttrList()->Clear(); if (m_ChangeList.size() == 0) return; -//Add by ,for disable change tracking,2005/11/21 + // Add for disable change tracking pStream->GetAttrList()->AddAttribute( A2OUSTR("text:track-changes"),A2OUSTR("false")); -//Add end pStream->StartElement( A2OUSTR("text:tracked-changes") ); for (iter1=m_ChangeList.begin();iter1 !=m_ChangeList.end();++iter1) (*iter1)->ToXml(pStream); pStream->EndElement(A2OUSTR("text:tracked-changes")); -// m_DocFribMap.clear(); - for (iter1=m_ChangeList.begin();iter1 !=m_ChangeList.end();++iter1) { delete *iter1; diff --git a/lotuswordpro/source/filter/lwpcharsetmgr.cxx b/lotuswordpro/source/filter/lwpcharsetmgr.cxx index dc0f90ba34a6..02ea5c2b74c1 100644 --- a/lotuswordpro/source/filter/lwpcharsetmgr.cxx +++ b/lotuswordpro/source/filter/lwpcharsetmgr.cxx @@ -57,14 +57,10 @@ * @file * For LWP filter architecture prototype ************************************************************************/ -/************************************************************************* - * Change History - Jan 2005 Created - ************************************************************************/ #include "lwpcharsetmgr.hxx" -//Added by yanjun for SS migration : 2007-12-21 +//Added for SS migration #include "rtl/textenc.h" -//End + LwpCharSetMgr* LwpCharSetMgr::Instance = NULL; LwpCharSetMgr* LwpCharSetMgr::GetInstance() diff --git a/lotuswordpro/source/filter/lwpfilter.cxx b/lotuswordpro/source/filter/lwpfilter.cxx index 74783f3ea7d4..b9e640935fc8 100644 --- a/lotuswordpro/source/filter/lwpfilter.cxx +++ b/lotuswordpro/source/filter/lwpfilter.cxx @@ -57,10 +57,6 @@ * @file * Circle object. ************************************************************************/ -/************************************************************************* - * Change History - * 2005-1-17 create this file. - ************************************************************************/ #include "lwpfilter.hxx" #include "lwpresource.hxx" //for sax stream diff --git a/lotuswordpro/source/filter/lwpfilter.hxx b/lotuswordpro/source/filter/lwpfilter.hxx index 2292c6aaa0e2..0484f5178cd9 100644 --- a/lotuswordpro/source/filter/lwpfilter.hxx +++ b/lotuswordpro/source/filter/lwpfilter.hxx @@ -57,10 +57,6 @@ * @file * Circle object. ************************************************************************/ -/************************************************************************* - * Change History - * 2005-01-17 create this file. - ************************************************************************/ #ifndef _LWPFILTER_HXX #define _LWPFILTER_HXX diff --git a/lotuswordpro/source/filter/lwpfont.cxx b/lotuswordpro/source/filter/lwpfont.cxx index acc00e2a1088..a06a99dffcbf 100644 --- a/lotuswordpro/source/filter/lwpfont.cxx +++ b/lotuswordpro/source/filter/lwpfont.cxx @@ -268,8 +268,8 @@ void LwpFontTable::Read(LwpObjectStream *pStrm) OUString LwpFontTable::GetFaceName(sal_uInt16 index) //index: start from 1 { assert(index>0); - if (index < 1)//add by , for fix crash,2005/12/20 - return OUString();//add end + if (index < 1)//add for fix crash + return OUString(); return m_pFontEntries[index-1].GetFaceName(); } @@ -554,7 +554,7 @@ void LwpFontManager::SetDfltFont(XFFont* /*pFont*/) OUString LwpFontManager::GetNameByID(sal_uInt32 fontID) { - return ( m_FNMgr.GetNameByIndex(GetFontNameIndex(fontID)) );//use font id for bullet? note by ,2005/7/5 + return ( m_FNMgr.GetNameByIndex(GetFontNameIndex(fontID)) );//use font id for bullet? } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.cxx b/lotuswordpro/source/filter/lwpnumberingoverride.cxx index db33130070f9..baad51c46685 100644 --- a/lotuswordpro/source/filter/lwpnumberingoverride.cxx +++ b/lotuswordpro/source/filter/lwpnumberingoverride.cxx @@ -57,10 +57,6 @@ * @file * Numbering override of Wordpro. ************************************************************************/ -/************************************************************************* -* Change History -* 2005-01-12 Create and implement. -************************************************************************/ #include "lwpnumberingoverride.hxx" #include "lwpobjstrm.hxx" diff --git a/lotuswordpro/source/filter/lwpnumberingoverride.hxx b/lotuswordpro/source/filter/lwpnumberingoverride.hxx index 010c3d3ec374..ab8524e0c073 100644 --- a/lotuswordpro/source/filter/lwpnumberingoverride.hxx +++ b/lotuswordpro/source/filter/lwpnumberingoverride.hxx @@ -57,11 +57,6 @@ * @file * Numbering override of Wordpro. ************************************************************************/ -/************************************************************************* -* Change History -* 2005-01-12 Create and implement. -************************************************************************/ - #ifndef _LWPNUMBERINGOVERRIDE_HXX #define _LWPNUMBERINGOVERRIDE_HXX diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index f65b71fbe6f6..9255d889b007 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -344,7 +344,7 @@ sal_Bool LwpPara::RegisterMasterPage(XFParaStyle* pBaseStyle) pOverStyle->SetStyleName( A2OUSTR("")); pOverStyle->SetMasterPage(pLayout->GetStyleName()); if (m_ParentStyleName.getLength()) - pOverStyle->SetParentStyleName(m_ParentStyleName); //Add by 2005/12/12 + pOverStyle->SetParentStyleName(m_ParentStyleName); XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName(); } @@ -364,7 +364,7 @@ void LwpPara::RegisterStyle() XFParaStyle* pBaseStyle = static_cast<XFParaStyle*>(m_pFoundry->GetStyleManager()->GetStyle(m_ParaStyle)); if (pBaseStyle == NULL) return; m_StyleName = pBaseStyle->GetStyleName();//such intf to be added - m_ParentStyleName = m_StyleName;//Add by ,2005/12/12 + m_ParentStyleName = m_StyleName; XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager(); if (GetParaStyle()->GetIndent()) @@ -522,7 +522,7 @@ void LwpPara::RegisterStyle() } } if (m_ParentStyleName.getLength()) - pOverStyle->SetParentStyleName(m_ParentStyleName); //Add by 2005/12/12 + pOverStyle->SetParentStyleName(m_ParentStyleName); m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName(); } @@ -536,7 +536,7 @@ void LwpPara::RegisterStyle() *pOverStyle = *pBaseStyle; OverrideIndent(NULL,m_pIndentOverride,pOverStyle); if (m_ParentStyleName.getLength()) - pOverStyle->SetParentStyleName(m_ParentStyleName); //Add by 2005/12/12 + pOverStyle->SetParentStyleName(m_ParentStyleName); m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName(); } } @@ -551,7 +551,7 @@ void LwpPara::RegisterStyle() *pOverStyle = *pOldStyle; pOverStyle->SetAlignType(enumXFAlignStart); if (m_ParentStyleName.getLength()) - pOverStyle->SetParentStyleName(m_ParentStyleName); //Add by 2005/12/12 + pOverStyle->SetParentStyleName(m_ParentStyleName); m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName(); } } @@ -767,7 +767,7 @@ void LwpPara::RegisterStyle() XFMargins* pMargin = &pOverStyle->GetMargins(); pMargin->SetTop(pMargin->GetTop()+pPrePara->GetBelowSpacing()); if (m_ParentStyleName.getLength()) - pOverStyle->SetParentStyleName(m_ParentStyleName); //Add by 2005/12/12 + pOverStyle->SetParentStyleName(m_ParentStyleName); m_StyleName = pXFStyleManager->AddStyle(pOverStyle)->GetStyleName(); } } @@ -780,7 +780,7 @@ void LwpPara::RegisterStyle() //pOverStyle->SetStyleName(A2OUSTR("")); this->RegisterTabStyle(pParaStyle); if (m_ParentStyleName.getLength()) - pParaStyle->SetParentStyleName(m_ParentStyleName); //Add by 2005/12/12 + pParaStyle->SetParentStyleName(m_ParentStyleName); m_StyleName = pXFStyleManager->AddStyle(pParaStyle)->GetStyleName(); } @@ -798,7 +798,7 @@ void LwpPara::RegisterStyle() *pStyle = *GetXFParaStyle(); pStyle->SetDropCap(m_nChars-1,m_nLines); if (m_ParentStyleName.getLength()) - pStyle->SetParentStyleName(m_ParentStyleName); //Add by 2005/12/12 + pStyle->SetParentStyleName(m_ParentStyleName); m_StyleName = pXFStyleManager->AddStyle(pStyle)->GetStyleName(); } // maybe useful for futer version diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx index fcda32e62b4b..6e19ce4e0838 100644 --- a/lotuswordpro/source/filter/lwppara.hxx +++ b/lotuswordpro/source/filter/lwppara.hxx @@ -229,7 +229,7 @@ protected: //LwpForked3NotifyList* m_NotifyList; //not saved rtl::OUString m_StyleName; - rtl::OUString m_ParentStyleName;//Add by ,to support toc,2005/12/13 + rtl::OUString m_ParentStyleName;//Add to support toc LwpBreaksOverride* m_pBreaks; rtl::OUString m_AftPageBreakName; rtl::OUString m_BefPageBreakName; @@ -238,10 +238,9 @@ protected: rtl::OUString m_BefColumnBreakName; LwpIndentOverride* m_pIndentOverride; rtl::OUString m_Content;//for silver bullet,get text of first frib, add by 2/1 - sal_uInt32 m_FontID;//for silver bullet, add by 2/1 + sal_uInt32 m_FontID;//for silver bullet rtl::OUString m_AllText;//get all text in this paragraph - //add by sal_Bool m_bHasBullet; LwpObjectID m_aSilverBulletID; LwpSilverBullet* m_pSilverBullet; diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.cxx b/lotuswordpro/source/filter/lwpparaborderoverride.cxx index b36b432eeddf..d232c76673f8 100644 --- a/lotuswordpro/source/filter/lwpparaborderoverride.cxx +++ b/lotuswordpro/source/filter/lwpparaborderoverride.cxx @@ -57,11 +57,6 @@ * @file * Border override of Wordpro. ************************************************************************/ -/************************************************************************* -* Change History -* 2005-01-11 create and implement. -************************************************************************/ - #include <memory> #include "clone.hxx" diff --git a/lotuswordpro/source/filter/lwpparaborderoverride.hxx b/lotuswordpro/source/filter/lwpparaborderoverride.hxx index dc32a5232f2d..d48239b735f4 100644 --- a/lotuswordpro/source/filter/lwpparaborderoverride.hxx +++ b/lotuswordpro/source/filter/lwpparaborderoverride.hxx @@ -57,10 +57,6 @@ * @file * Border override of Wordpro. ************************************************************************/ -/************************************************************************* -* Change History -* 2005-01-11 Create and implement. -************************************************************************/ #ifndef _LWPPARABORDEROVERRIDE_HXX #define _LWPPARABORDEROVERRIDE_HXX diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index 0e3dcdec32fb..a1fc2a3f6578 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -220,7 +220,7 @@ void LwpParaStyle::Apply(XFParaStyle *pParaStyle) } } - // 01/28/2005 + //add tab style pPiece = (LwpVirtualPiece*)m_TabStyle.obj(); if( pPiece ) @@ -231,7 +231,6 @@ void LwpParaStyle::Apply(XFParaStyle *pParaStyle) ApplyTab(pParaStyle,pTab); } } - //add by 2005/02/16 pPiece = (LwpVirtualPiece*)m_BreaksStyle.obj(); if( pPiece ) { @@ -241,7 +240,7 @@ void LwpParaStyle::Apply(XFParaStyle *pParaStyle) ApplyBreaks(pParaStyle,pBreak); } } - //add end + } void LwpParaStyle::ApplySubBorder(LwpBorderStuff* pBorderStuff, LwpBorderStuff::BorderType eType, XFBorders* pXFBorders) diff --git a/lotuswordpro/source/filter/lwpparastyle.hxx b/lotuswordpro/source/filter/lwpparastyle.hxx index d980a03c7d7b..b078cc96adc5 100644 --- a/lotuswordpro/source/filter/lwpparastyle.hxx +++ b/lotuswordpro/source/filter/lwpparastyle.hxx @@ -93,7 +93,6 @@ public: static void ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, LwpIndentOverride* pIndent); static void ApplySpacing(LwpPara* pPara, XFParaStyle* pParaStyle, LwpSpacingOverride* pSpacing); - // 2005/01/28 static void ApplyTab(XFParaStyle* pParaStyle, LwpTabOverride* pTab); void RegisterStyle(); @@ -109,7 +108,6 @@ public: sal_Bool IsNumberRight(); public: - //add by , 01/27/2004 static void ApplySubBorder(LwpBorderStuff* pBorderStuff, LwpBorderStuff::BorderType eType, XFBorders* pXFBorders); //end diff --git a/lotuswordpro/source/filter/lwppttntbl.hxx b/lotuswordpro/source/filter/lwppttntbl.hxx index c19a6e238b06..a2399ac06278 100644 --- a/lotuswordpro/source/filter/lwppttntbl.hxx +++ b/lotuswordpro/source/filter/lwppttntbl.hxx @@ -53,10 +53,6 @@ * * ************************************************************************/ -/************************************************************************* -* Change History -* 2005-06-01 created -************************************************************************/ /** * @file * For LWP filter architecture prototype diff --git a/lotuswordpro/source/filter/lwpsilverbullet.hxx b/lotuswordpro/source/filter/lwpsilverbullet.hxx index d1e3489bf73b..b9aca7a1f878 100644 --- a/lotuswordpro/source/filter/lwpsilverbullet.hxx +++ b/lotuswordpro/source/filter/lwpsilverbullet.hxx @@ -70,9 +70,7 @@ #include "lwpdlvlist.hxx" #include "lwpobjid.hxx" #include "lwpatomholder.hxx" -//Added by yanjun for SS merge: 2007-12-21 #include "unicode/utypes.h" -//End const sal_uInt16 MAXNUMBERPOSITIONS = 10; //max number of positions const sal_uInt16 NUMCHAR_none = 0x00; //none of numberchar const sal_uInt16 NUMCHAR_1 = 0x01; //index for numberchar "1" @@ -87,7 +85,6 @@ const sal_uInt16 NUMCHAR_Chinese1 = 0x09; //index for numberchar "Ҽ" const sal_uInt16 NUMCHAR_Chinese2 = 0x08; //index for numberchar "һ" const sal_uInt16 NUMCHAR_Chinese3= 0x0A; //index for numberchar "" const sal_uInt16 NUMCHAR_Chinese4 = 0x13; //index for numberchar "01" in chinese version -//add end class LwpStory; class LwpAtomHolder; diff --git a/lotuswordpro/source/filter/lwpslvlist.hxx b/lotuswordpro/source/filter/lwpslvlist.hxx index 52773cb10316..63ae67b5a888 100644 --- a/lotuswordpro/source/filter/lwpslvlist.hxx +++ b/lotuswordpro/source/filter/lwpslvlist.hxx @@ -57,11 +57,6 @@ * @file * single list. ************************************************************************/ -/************************************************************************* - * Change History - * 2005-01-12 create and implement. - ************************************************************************/ - #ifndef _LWPSLVLIST_HXX #define _LWPSLVLIST_HXX diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index c2093b976956..1148d82fe657 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -1073,9 +1073,8 @@ sal_Bool LwpTableLayout::FindSplitColMark(XFTable* pXFTable,sal_uInt8* pCellMar void LwpTableLayout::ConvertTable(XFTable* pXFTable,sal_uInt16 nStartRow, sal_uInt16 nEndRow,sal_uInt8 nStartCol,sal_uInt8 nEndCol) { - //out put column info TO BE CHANGED,note by ,2005/4/4 + //out put column info TO BE CHANGED ConvertColumn(pXFTable,nStartCol,nEndCol); - //note end std::map<sal_uInt16,LwpRowLayout*>::iterator iter; @@ -1194,11 +1193,9 @@ void LwpTableLayout::PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_ if(pCellLayout) { XFParagraph * pXFPara = NULL; - //mod by ,fix bug 2759,2006/3/22 pXFPara = static_cast<XFParagraph*>(pCell->FindFirstContent(enumXFContentPara)); if (!pXFPara) return; - //mod end XFColor aColor; XFColor aNullColor = XFColor(); diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx index fd50f5f0ac7a..33f89e272fb9 100644 --- a/lotuswordpro/source/filter/lwptablelayout.hxx +++ b/lotuswordpro/source/filter/lwptablelayout.hxx @@ -128,7 +128,6 @@ private: // column vector LwpColumnLayout ** m_pColumns; -//add by ,2005/4/1 public: void XFConvert(XFContentContainer* pCont); void ConvertTable(XFTable* pXFTable,sal_uInt16 nStartRow, diff --git a/lotuswordpro/source/filter/lwptaboverride.hxx b/lotuswordpro/source/filter/lwptaboverride.hxx index dabdf5452cbf..616af75836c7 100644 --- a/lotuswordpro/source/filter/lwptaboverride.hxx +++ b/lotuswordpro/source/filter/lwptaboverride.hxx @@ -57,11 +57,6 @@ * @file * Tab override for VO_PARASTYLE. ************************************************************************/ -/************************************************************************* - * Change History - * 2005-01-12 create and implement. - ************************************************************************/ - #ifndef _LWPTABOVERRIDE_HXX #define _LWPTABOVERRIDE_HXX diff --git a/lotuswordpro/source/filter/lwptabrack.cxx b/lotuswordpro/source/filter/lwptabrack.cxx index 9beda51d2caa..1659d80bea94 100644 --- a/lotuswordpro/source/filter/lwptabrack.cxx +++ b/lotuswordpro/source/filter/lwptabrack.cxx @@ -57,10 +57,6 @@ * @file * Tabrack for LwpTabPiece object. ************************************************************************/ -/************************************************************************* - * Change History - * 2005-01-12 create this file. - ************************************************************************/ #include "lwptabrack.hxx" #include "lwpobjstrm.hxx" #include "lwpslvlist.hxx" diff --git a/lotuswordpro/source/filter/lwptabrack.hxx b/lotuswordpro/source/filter/lwptabrack.hxx index cc06ee746277..4f25a0e7b70e 100644 --- a/lotuswordpro/source/filter/lwptabrack.hxx +++ b/lotuswordpro/source/filter/lwptabrack.hxx @@ -57,11 +57,6 @@ * @file * Tabrack for LwpTabPiece object. ************************************************************************/ -/************************************************************************* - * Change History - * 2005-01-12 create this file. - ************************************************************************/ - #ifndef _LWPTABRACK_HXX #define _LWPTABRACK_HXX @@ -100,7 +95,6 @@ public: }; public: void Read(LwpObjectStream *pStrm); - // 2005/01/28 inline sal_uInt32 GetPosition(); inline TabType GetTabType(); inline LeaderType GetLeaderType(); @@ -115,7 +109,6 @@ protected: sal_uInt16 m_nAlignChar; //be careful }; -// 2005/01/28 inline sal_uInt32 LwpTab::GetPosition() { return m_nX; @@ -147,7 +140,6 @@ public: virtual ~LwpTabRack(){} public: void Read(); - // 2005/01/28 sal_uInt16 GetNumTabs(); LwpTab* Lookup(sal_uInt16 nIndex); LwpTabRack* GetNext(); diff --git a/lotuswordpro/source/filter/lwptools.hxx b/lotuswordpro/source/filter/lwptools.hxx index 12bf4132dda5..0bf51b7357d1 100644 --- a/lotuswordpro/source/filter/lwptools.hxx +++ b/lotuswordpro/source/filter/lwptools.hxx @@ -93,18 +93,13 @@ public: OUString& str, sal_uInt16 strlen, rtl_TextEncoding aEncoding ); static BOOL IsUnicodePacked(LwpObjectStream* pObjStrm, sal_uInt16 len); - // 01/19/2005 inline static double ConvertFromUnits(const sal_Int32& nUnits); inline static double ConvertToMetric(const double& fInch); inline static double ConvertFromMetric(const double& fCM); inline static double ConvertFromUnitsToMetric(const sal_Int32& nUnits); - //end - //add by , 03/11/2005 inline static sal_Int32 ConvertToUnits(const double& fInch); - //add end - //, 02/23/2005 inline static sal_Bool IsOddNumber(sal_uInt16& nNumber); inline static sal_Bool IsEvenNumber(sal_uInt16& nNumber); @@ -112,7 +107,6 @@ public: static OUString convertToFileUrl(const OString& fileName); static rtl::OUString DateTimeToOUString(LtTm& dt); - //add by ,2005/6/1 static XFDateStyle* GetSystemDateStyle(sal_Bool bLongFormat); static XFTimeStyle* GetSystemTimeStyle(); }; |