diff options
Diffstat (limited to 'lotuswordpro')
23 files changed, 124 insertions, 124 deletions
diff --git a/lotuswordpro/source/filter/bento.hxx b/lotuswordpro/source/filter/bento.hxx index 4d9e8f67e4ad..dcd5acf1754f 100644 --- a/lotuswordpro/source/filter/bento.hxx +++ b/lotuswordpro/source/filter/bento.hxx @@ -406,8 +406,8 @@ public: // Internal methods 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; } + BenContainerPos GetPosition() { return cPos; } + size_t GetLength() { return csName.length()+ 1; } CBenNamedObjectListElmt& GetNameListElmt() { return cNameListElmt; } private: // Data diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx index d162c209c524..ac0630e6e62f 100644 --- a/lotuswordpro/source/filter/lwpcelllayout.hxx +++ b/lotuswordpro/source/filter/lwpcelllayout.hxx @@ -100,7 +100,7 @@ public: LwpObjectID * GetPreviousCellStory(); virtual LwpPara* GetLastParaOfPreviousStory() SAL_OVERRIDE; LwpTableLayout * GetTableLayout(); - virtual void SetCellMap(void); + virtual void SetCellMap(); double GetActualWidth(); OUString GetNumfmtName(){return m_NumfmtName;} protected: @@ -154,7 +154,7 @@ public: virtual void Parse(IXFStream* pOutputStream) SAL_OVERRIDE; virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) SAL_OVERRIDE; void RegisterStyle() SAL_OVERRIDE {} - virtual void SetCellMap(void) SAL_OVERRIDE; + virtual void SetCellMap() SAL_OVERRIDE; protected: void Read() SAL_OVERRIDE; LwpObjectID cconnectedlayout; @@ -174,7 +174,7 @@ public: virtual XFCell* ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) SAL_OVERRIDE; sal_uInt16 GetNumrows(){return m_nRealrowspan;} sal_uInt8 GetNumcols(){return m_nRealcolspan;} - virtual void SetCellMap(void) SAL_OVERRIDE; + virtual void SetCellMap() SAL_OVERRIDE; void SetNumrows(sal_uInt16 nVal){m_nRealrowspan = nVal;} void SetNumcols(sal_uInt8 nVal){m_nRealcolspan = nVal;} protected: diff --git a/lotuswordpro/source/filter/lwpdllist.cxx b/lotuswordpro/source/filter/lwpdllist.cxx index abf4d66cb617..04310d204dd9 100644 --- a/lotuswordpro/source/filter/lwpdllist.cxx +++ b/lotuswordpro/source/filter/lwpdllist.cxx @@ -64,7 +64,7 @@ #include "lwpdllist.hxx" -LwpDLList::LwpDLList(void) +LwpDLList::LwpDLList() { m_pNext = m_pPrevious = NULL; } @@ -80,7 +80,7 @@ LwpDLList::insert(LwpDLList* Next,LwpDLList* Previous) m_pPrevious = Previous; } -LwpDLList::~LwpDLList(void) +LwpDLList::~LwpDLList() { remove(); } diff --git a/lotuswordpro/source/filter/lwpdllist.hxx b/lotuswordpro/source/filter/lwpdllist.hxx index bbb67d200561..744d399e9f35 100644 --- a/lotuswordpro/source/filter/lwpdllist.hxx +++ b/lotuswordpro/source/filter/lwpdllist.hxx @@ -68,12 +68,12 @@ class LwpDLList { public: - LwpDLList(void); + LwpDLList(); virtual ~LwpDLList(); void insert(LwpDLList*, LwpDLList*); - void remove(void); - LwpDLList* GetNext(void); - LwpDLList* GetPrevious(void); + void remove(); + LwpDLList* GetNext(); + LwpDLList* GetPrevious(); void SetNext(LwpDLList*); void SetPrevious(LwpDLList*); private: @@ -81,7 +81,7 @@ private: LwpDLList* m_pPrevious; }; -inline LwpDLList* LwpDLList::GetNext(void) +inline LwpDLList* LwpDLList::GetNext() { return m_pNext; } @@ -91,7 +91,7 @@ inline void LwpDLList::SetNext(LwpDLList* Next) m_pNext = Next; } -inline LwpDLList* LwpDLList::GetPrevious(void) +inline LwpDLList* LwpDLList::GetPrevious() { return m_pPrevious; } diff --git a/lotuswordpro/source/filter/lwplayout.cxx b/lotuswordpro/source/filter/lwplayout.cxx index 69ad38e423d9..14036a2717c3 100644 --- a/lotuswordpro/source/filter/lwplayout.cxx +++ b/lotuswordpro/source/filter/lwplayout.cxx @@ -939,7 +939,7 @@ LwpTabOverride* LwpMiddleLayout::GetTabOverride() * @param: * @return: */ -sal_uInt16 LwpMiddleLayout::GetScaleMode(void) +sal_uInt16 LwpMiddleLayout::GetScaleMode() { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) return GetLayoutScale()->GetScaleMode(); @@ -949,7 +949,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleMode(void) return (LwpLayoutScale::FIT_IN_FRAME | LwpLayoutScale::MAINTAIN_ASPECT_RATIO); } -sal_uInt16 LwpMiddleLayout::GetScaleTile(void) +sal_uInt16 LwpMiddleLayout::GetScaleTile() { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) return (GetLayoutScale()->GetPlacement() & LwpLayoutScale::TILED) @@ -960,7 +960,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleTile(void) return 0; } -sal_uInt16 LwpMiddleLayout::GetScaleCenter(void) +sal_uInt16 LwpMiddleLayout::GetScaleCenter() { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) return (GetLayoutScale()->GetPlacement() & LwpLayoutScale::CENTERED) @@ -971,7 +971,7 @@ sal_uInt16 LwpMiddleLayout::GetScaleCenter(void) return 0; } -sal_uInt32 LwpMiddleLayout::GetScalePercentage(void) +sal_uInt32 LwpMiddleLayout::GetScalePercentage() { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) return GetLayoutScale()->GetScalePercentage()/10;//m_nScalePercentage 1000 = 100% @@ -981,7 +981,7 @@ sal_uInt32 LwpMiddleLayout::GetScalePercentage(void) return 100; } -double LwpMiddleLayout::GetScaleWidth(void) +double LwpMiddleLayout::GetScaleWidth() { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleWidth()); @@ -991,7 +991,7 @@ double LwpMiddleLayout::GetScaleWidth(void) return 0; } -double LwpMiddleLayout::GetScaleHeight(void) +double LwpMiddleLayout::GetScaleHeight() { if ((m_nOverrideFlag & OVER_SCALING) && m_LayScale.obj().is()) return LwpTools::ConvertFromUnits(GetLayoutScale()->GetScaleHeight()); @@ -1000,7 +1000,7 @@ double LwpMiddleLayout::GetScaleHeight(void) else return 0; } -bool LwpMiddleLayout::CanSizeRight(void) +bool LwpMiddleLayout::CanSizeRight() { sal_uInt8 RelType = GetRelativeType(); @@ -1040,7 +1040,7 @@ sal_Int32 LwpMiddleLayout::DetermineWidth() } return 0; } -bool LwpMiddleLayout::IsSizeRightToContainer(void) +bool LwpMiddleLayout::IsSizeRightToContainer() { if (!CanSizeRight()) return false; @@ -1059,7 +1059,7 @@ bool LwpMiddleLayout::IsSizeRightToContainer(void) else return false; } -bool LwpMiddleLayout::IsSizeRightToContent(void) +bool LwpMiddleLayout::IsSizeRightToContent() { if (!CanSizeRight()) return false; diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx index 9d6488d09da3..b213bfc53b09 100644 --- a/lotuswordpro/source/filter/lwplayout.hxx +++ b/lotuswordpro/source/filter/lwplayout.hxx @@ -303,18 +303,18 @@ public: bool GetUsePrinterSettings(); LwpLayoutScale* GetLayoutScale(){return dynamic_cast<LwpLayoutScale*>(m_LayScale.obj().get());} - sal_uInt16 GetScaleMode(void); - sal_uInt16 GetScaleTile(void); - sal_uInt16 GetScaleCenter(void); - sal_uInt32 GetScalePercentage(void); - double GetScaleWidth(void); - double GetScaleHeight(void); + sal_uInt16 GetScaleMode(); + sal_uInt16 GetScaleTile(); + sal_uInt16 GetScaleCenter(); + sal_uInt32 GetScalePercentage(); + double GetScaleWidth(); + double GetScaleHeight(); - bool CanSizeRight(void); + bool CanSizeRight(); virtual double GetWidth() SAL_OVERRIDE; sal_Int32 GetMinimumWidth(); - bool IsSizeRightToContent(void); - bool IsSizeRightToContainer(void); + bool IsSizeRightToContent(); + bool IsSizeRightToContainer(); sal_Int32 DetermineWidth(); virtual double GetHeight(); LwpPoint GetOrigin(); diff --git a/lotuswordpro/source/filter/lwpnumericfmt.cxx b/lotuswordpro/source/filter/lwpnumericfmt.cxx index 9d54213d8724..d512ad82d365 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.cxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.cxx @@ -275,7 +275,7 @@ bool LwpNumericFormat::IsCurrencyFormat(sal_uInt16 Format) * @return. */ sal_uInt16 -LwpNumericFormat::GetDecimalPlaces(void) +LwpNumericFormat::GetDecimalPlaces() { if (IsDecimalPlacesOverridden()) return cDecimalPlaces; diff --git a/lotuswordpro/source/filter/lwpnumericfmt.hxx b/lotuswordpro/source/filter/lwpnumericfmt.hxx index 9b3a4d40d046..74b9587ed3b9 100644 --- a/lotuswordpro/source/filter/lwpnumericfmt.hxx +++ b/lotuswordpro/source/filter/lwpnumericfmt.hxx @@ -252,10 +252,10 @@ public: ~LwpNumericFormat(){} void Read(); static bool IsCurrencyFormat(sal_uInt16 Format); - sal_uInt16 GetDecimalPlaces(void); - bool IsDecimalPlacesOverridden(void); - bool IsNegativeOverridden(void); - bool IsZeroOverridden(void); + sal_uInt16 GetDecimalPlaces(); + bool IsDecimalPlacesOverridden(); + bool IsNegativeOverridden(); + bool IsZeroOverridden(); XFStyle* Convert(); private: @@ -286,19 +286,19 @@ private: }; inline bool -LwpNumericFormat::IsDecimalPlacesOverridden(void) +LwpNumericFormat::IsDecimalPlacesOverridden() { return (cFlags & NF_OVER_DECIMAL_PLACES) != 0; } inline bool -LwpNumericFormat::IsNegativeOverridden(void) +LwpNumericFormat::IsNegativeOverridden() { return (cFlags & NF_OVER_NEGATIVE) != 0; } inline bool -LwpNumericFormat::IsZeroOverridden(void) +LwpNumericFormat::IsZeroOverridden() { return (cFlags & NF_OVER_ZERO) != 0; } diff --git a/lotuswordpro/source/filter/lwpobjstrm.cxx b/lotuswordpro/source/filter/lwpobjstrm.cxx index 55fcae7206be..7f61cdfb509d 100644 --- a/lotuswordpro/source/filter/lwpobjstrm.cxx +++ b/lotuswordpro/source/filter/lwpobjstrm.cxx @@ -393,7 +393,7 @@ sal_uInt16 LwpObjectStream::DecompressBuffer(sal_uInt8* pDst, sal_uInt8* pSrc, s /** * @descr quick read string with 1252 */ -OUString LwpObjectStream::QuickReadStringPtr(void) +OUString LwpObjectStream::QuickReadStringPtr() { sal_uInt16 diskSize; diff --git a/lotuswordpro/source/filter/lwpparaproperty.cxx b/lotuswordpro/source/filter/lwpparaproperty.cxx index 9c8be79955ae..3dc427f01940 100644 --- a/lotuswordpro/source/filter/lwpparaproperty.cxx +++ b/lotuswordpro/source/filter/lwpparaproperty.cxx @@ -151,11 +151,11 @@ LwpParaAlignProperty::LwpParaAlignProperty(LwpObjectStream* pFile) } -LwpParaAlignProperty::~LwpParaAlignProperty(void) +LwpParaAlignProperty::~LwpParaAlignProperty() { } -sal_uInt32 LwpParaAlignProperty::GetType(void) +sal_uInt32 LwpParaAlignProperty::GetType() { return PP_LOCAL_ALIGN; } @@ -168,11 +168,11 @@ LwpParaIndentProperty::LwpParaIndentProperty(LwpObjectStream* pFile) m_pIndent = pIndentPiece ? dynamic_cast<LwpIndentOverride*>(pIndentPiece->GetOverride()) : NULL; } -LwpParaIndentProperty::~LwpParaIndentProperty(void) +LwpParaIndentProperty::~LwpParaIndentProperty() { } -sal_uInt32 LwpParaIndentProperty::GetType(void) +sal_uInt32 LwpParaIndentProperty::GetType() { return PP_LOCAL_INDENT; } @@ -186,11 +186,11 @@ LwpParaSpacingProperty::LwpParaSpacingProperty(LwpObjectStream* pFile) m_pSpacing = pSpacingPiece ? dynamic_cast<LwpSpacingOverride*>(pSpacingPiece->GetOverride()) : NULL; } -LwpParaSpacingProperty::~LwpParaSpacingProperty(void) +LwpParaSpacingProperty::~LwpParaSpacingProperty() { } -sal_uInt32 LwpParaSpacingProperty::GetType(void) +sal_uInt32 LwpParaSpacingProperty::GetType() { return PP_LOCAL_SPACING; } diff --git a/lotuswordpro/source/filter/lwpparaproperty.hxx b/lotuswordpro/source/filter/lwpparaproperty.hxx index fd3bf7ff3a10..ab7df94ff7c5 100644 --- a/lotuswordpro/source/filter/lwpparaproperty.hxx +++ b/lotuswordpro/source/filter/lwpparaproperty.hxx @@ -90,21 +90,21 @@ class LwpParaProperty : public LwpDLList { public: LwpParaProperty(){} - virtual ~LwpParaProperty(void){} - virtual sal_uInt32 GetType(void) = 0; - inline LwpParaProperty* GetNext(void); - inline LwpParaProperty* GetPrevious(void); + virtual ~LwpParaProperty(){} + virtual sal_uInt32 GetType() = 0; + inline LwpParaProperty* GetNext(); + inline LwpParaProperty* GetPrevious(); static LwpParaProperty* ReadPropertyList(LwpObjectStream* pFile,rtl::Reference<LwpObject> const & Whole); }; -inline LwpParaProperty* LwpParaProperty::GetNext(void) +inline LwpParaProperty* LwpParaProperty::GetNext() { return static_cast<LwpParaProperty*>(LwpDLList::GetNext()); } -inline LwpParaProperty* LwpParaProperty::GetPrevious(void) +inline LwpParaProperty* LwpParaProperty::GetPrevious() { return static_cast<LwpParaProperty*>(LwpDLList::GetPrevious()); } @@ -117,15 +117,15 @@ class LwpParaAlignProperty : public LwpParaProperty public: // LwpParaAlignProperty(LwpParaAlignProperty* pOther); LwpParaAlignProperty(LwpObjectStream* pFile); - virtual ~LwpParaAlignProperty(void); - LwpAlignmentOverride* GetAlignment(void); - sal_uInt32 GetType(void) SAL_OVERRIDE; + virtual ~LwpParaAlignProperty(); + LwpAlignmentOverride* GetAlignment(); + sal_uInt32 GetType() SAL_OVERRIDE; private: LwpAlignmentOverride* m_pAlignment; }; -inline LwpAlignmentOverride* LwpParaAlignProperty::GetAlignment(void) +inline LwpAlignmentOverride* LwpParaAlignProperty::GetAlignment() { return m_pAlignment; } @@ -134,9 +134,9 @@ class LwpParaIndentProperty : public LwpParaProperty { public: LwpParaIndentProperty(LwpObjectStream* pFile); - virtual ~LwpParaIndentProperty(void); - LwpIndentOverride* GetIndent(void); - sal_uInt32 GetType(void) SAL_OVERRIDE; + virtual ~LwpParaIndentProperty(); + LwpIndentOverride* GetIndent(); + sal_uInt32 GetType() SAL_OVERRIDE; inline LwpObjectID GetIndentID(); private: @@ -147,7 +147,7 @@ inline LwpObjectID LwpParaIndentProperty::GetIndentID() { return m_aIndentID; } -inline LwpIndentOverride* LwpParaIndentProperty::GetIndent(void) +inline LwpIndentOverride* LwpParaIndentProperty::GetIndent() { return m_pIndent; } @@ -156,15 +156,15 @@ class LwpParaSpacingProperty : public LwpParaProperty { public: LwpParaSpacingProperty(LwpObjectStream* pFile); - virtual ~LwpParaSpacingProperty(void); - LwpSpacingOverride* GetSpacing(void); - sal_uInt32 GetType(void) SAL_OVERRIDE; + virtual ~LwpParaSpacingProperty(); + LwpSpacingOverride* GetSpacing(); + sal_uInt32 GetType() SAL_OVERRIDE; private: LwpSpacingOverride* m_pSpacing; }; -inline LwpSpacingOverride* LwpParaSpacingProperty::GetSpacing(void) +inline LwpSpacingOverride* LwpParaSpacingProperty::GetSpacing() { return m_pSpacing; } @@ -248,7 +248,7 @@ class LwpParaTabRackProperty : public LwpParaProperty { public: LwpParaTabRackProperty(LwpObjectStream* pStrm); - virtual ~LwpParaTabRackProperty(void); + virtual ~LwpParaTabRackProperty(); sal_uInt32 GetType() SAL_OVERRIDE { return PP_LOCAL_TABRACK; } inline LwpTabOverride* GetTab(); @@ -266,14 +266,14 @@ class LwpParaBackGroundProperty : public LwpParaProperty { public: LwpParaBackGroundProperty(LwpObjectStream* pFile); - virtual ~LwpParaBackGroundProperty(void); - LwpBackgroundOverride* GetBackground(void); - sal_uInt32 GetType(void) SAL_OVERRIDE; + virtual ~LwpParaBackGroundProperty(); + LwpBackgroundOverride* GetBackground(); + sal_uInt32 GetType() SAL_OVERRIDE; private: LwpBackgroundOverride* m_pBackground; }; -inline LwpBackgroundOverride* LwpParaBackGroundProperty::GetBackground(void) +inline LwpBackgroundOverride* LwpParaBackGroundProperty::GetBackground() { return m_pBackground; } diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx b/lotuswordpro/source/filter/lwprowlayout.cxx index 32f052e72da8..e7bae0f15dfc 100644 --- a/lotuswordpro/source/filter/lwprowlayout.cxx +++ b/lotuswordpro/source/filter/lwprowlayout.cxx @@ -93,7 +93,7 @@ LwpRowLayout::~LwpRowLayout() * @param * @return */ -void LwpRowLayout::SetRowMap(void) +void LwpRowLayout::SetRowMap() { LwpObjectID& rCellID= GetChildHead(); LwpCellLayout * pCellLayout = dynamic_cast<LwpCellLayout *>(rCellID.obj().get()); diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx index 070683ed47b2..3173f93bee24 100644 --- a/lotuswordpro/source/filter/lwprowlayout.hxx +++ b/lotuswordpro/source/filter/lwprowlayout.hxx @@ -84,7 +84,7 @@ public: sal_uInt16 GetRowID() { return crowid;} virtual void RegisterStyle() SAL_OVERRIDE; inline LwpTableLayout * GetParentTableLayout(){return dynamic_cast<LwpTableLayout *>(GetParent().obj().get());} - void SetRowMap(void); + void SetRowMap(); protected: void Read() SAL_OVERRIDE; sal_uInt16 crowid; diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.cxx b/lotuswordpro/source/filter/lwpsdwfileloader.cxx index 3c3ed764fec4..150fad3dc129 100644 --- a/lotuswordpro/source/filter/lwpsdwfileloader.cxx +++ b/lotuswordpro/source/filter/lwpsdwfileloader.cxx @@ -70,7 +70,7 @@ LwpSdwFileLoader::LwpSdwFileLoader(SvStream* pStream, LwpGraphicObject* pGraphic pStream->Seek(0); } -LwpSdwFileLoader::~LwpSdwFileLoader(void) +LwpSdwFileLoader::~LwpSdwFileLoader() { } // add by ,03/25/2005 diff --git a/lotuswordpro/source/filter/lwpsdwfileloader.hxx b/lotuswordpro/source/filter/lwpsdwfileloader.hxx index a634eda1a34e..c903cf649b99 100644 --- a/lotuswordpro/source/filter/lwpsdwfileloader.hxx +++ b/lotuswordpro/source/filter/lwpsdwfileloader.hxx @@ -81,10 +81,10 @@ private: LwpGraphicObject* m_pGraphicObj; public: LwpSdwFileLoader(SvStream* pStream, LwpGraphicObject* pGraphicObj); - ~LwpSdwFileLoader(void); + ~LwpSdwFileLoader(); public: -// void LoadObjectList(void); -// void RegisterStyle(void); +// void LoadObjectList(); +// void RegisterStyle(); // add by ,03/25/2005 void CreateDrawObjects(std::vector< rtl::Reference<XFFrame> >* pDrawObjVector); diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx index aabda032cc72..872d0117cdad 100644 --- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx +++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.cxx @@ -243,7 +243,7 @@ void LwpSdwGroupLoaderV0102::BeginDrawObjects(std::vector< rtl::Reference<XFFram * the corresponding drawing objects. * @param pDrawObjVector a container which will contains the created drawing object of XF-Model. */ -XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject(void) +XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject() { //flag unsigned char BinSignature[2]; @@ -304,7 +304,7 @@ XFDrawGroup* LwpSdwGroupLoaderV0102::CreateDrawGroupObject(void) * @descr Create the XF-drawing objects according to the object type read from bento stream. * @return the created XF-drawing objects. */ -XFFrame* LwpSdwGroupLoaderV0102::CreateDrawObject(void) +XFFrame* LwpSdwGroupLoaderV0102::CreateDrawObject() { //record type unsigned char recType; diff --git a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx index f8d8d7b017ab..c9d7476f310b 100644 --- a/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx +++ b/lotuswordpro/source/filter/lwpsdwgrouploaderv0102.hxx @@ -88,8 +88,8 @@ public: public: void BeginDrawObjects(std::vector< rtl::Reference<XFFrame> >* pDrawObjVector); - XFDrawGroup* CreateDrawGroupObject(void); - XFFrame* CreateDrawObject(void); + XFDrawGroup* CreateDrawGroupObject(); + XFFrame* CreateDrawObject(); // end add }; diff --git a/lotuswordpro/source/filter/lwptable.cxx b/lotuswordpro/source/filter/lwptable.cxx index 300fb38d3945..420b7e85a170 100644 --- a/lotuswordpro/source/filter/lwptable.cxx +++ b/lotuswordpro/source/filter/lwptable.cxx @@ -190,7 +190,7 @@ LwpGlossary::LwpGlossary(LwpObjectHeader &objHdr, LwpSvStream* pStrm):LwpParalle LwpGlossary::~LwpGlossary() { } -sal_uInt16 LwpGlossary::GetNumIndexRows(void) +sal_uInt16 LwpGlossary::GetNumIndexRows() { if (GetRow() > 0 && GetRow() <= MAX_NUM_ROWS) return GetRow() - 1; // Minus one row for repeated heading. diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx index 833716c4a34e..6c4f1cbc973a 100644 --- a/lotuswordpro/source/filter/lwptable.hxx +++ b/lotuswordpro/source/filter/lwptable.hxx @@ -184,7 +184,7 @@ public: virtual ~LwpGlossary(); protected: void Read() SAL_OVERRIDE; - sal_uInt16 GetNumIndexRows(void); + sal_uInt16 GetNumIndexRows(); }; #endif diff --git a/lotuswordpro/source/filter/lwptabrack.hxx b/lotuswordpro/source/filter/lwptabrack.hxx index 6f3efc10905f..d8c6e617fee7 100644 --- a/lotuswordpro/source/filter/lwptabrack.hxx +++ b/lotuswordpro/source/filter/lwptabrack.hxx @@ -69,7 +69,7 @@ class LwpTabRack; class LwpTab { public: - LwpTab(void); + LwpTab(); enum TabType { diff --git a/lotuswordpro/source/filter/lwptblcell.hxx b/lotuswordpro/source/filter/lwptblcell.hxx index 1bbe0614e346..8c72b4e4c6fa 100644 --- a/lotuswordpro/source/filter/lwptblcell.hxx +++ b/lotuswordpro/source/filter/lwptblcell.hxx @@ -231,19 +231,19 @@ private: class LwpRowColumnQualifier { public: - LwpRowColumnQualifier(void); + LwpRowColumnQualifier(); ~LwpRowColumnQualifier(){} - inline void SetAbsolute(void); - inline void ClearAbsolute(void); - bool IsAbsolute(void); + inline void SetAbsolute(); + inline void ClearAbsolute(); + bool IsAbsolute(); - inline void SetAfter(void); - inline void ClearAfter(void); - bool IsAfter(void); + inline void SetAfter(); + inline void ClearAfter(); + bool IsAfter(); void SetBad(bool Bad); - bool IsBad(void); + bool IsBad(); void QuickRead(LwpObjectStream *pStrm); @@ -258,25 +258,25 @@ private: }; inline void -LwpRowColumnQualifier::SetAbsolute(void) +LwpRowColumnQualifier::SetAbsolute() { cFlags |= REF_ABSOLUTE; } inline void -LwpRowColumnQualifier::ClearAbsolute(void) +LwpRowColumnQualifier::ClearAbsolute() { cFlags &= ~REF_ABSOLUTE; } inline void -LwpRowColumnQualifier::SetAfter(void) +LwpRowColumnQualifier::SetAfter() { cFlags |= REF_AFTER; } inline void -LwpRowColumnQualifier::ClearAfter(void) +LwpRowColumnQualifier::ClearAfter() { cFlags &= ~REF_AFTER; } @@ -311,7 +311,7 @@ LwpRowColumnQualifier::IsAbsolute() class LwpRowSpecifier { public: - LwpRowSpecifier(void) + LwpRowSpecifier() : cRow(0) {} ~LwpRowSpecifier(){} @@ -320,18 +320,18 @@ public: OUString ToString(sal_uInt16 nFormulaRow); sal_uInt16 RowID(sal_uInt16 FormulaRow); - sal_uInt16 &Row(void); + sal_uInt16 &Row(); - void SetAbsolute(void); - void ClearAbsolute(void); - bool IsAbsolute(void); + void SetAbsolute(); + void ClearAbsolute(); + bool IsAbsolute(); - void SetAfter(void); - void ClearAfter(void); - bool IsAfter(void); + void SetAfter(); + void ClearAfter(); + bool IsAfter(); void SetBad(bool Bad); - bool IsBad(void); + bool IsBad(); void SetRowDelta(sal_uInt16 ReferenceRowID, sal_uInt16 FormulaRowID); private: @@ -361,13 +361,13 @@ LwpRowSpecifier::Row() } inline void -LwpRowSpecifier::SetAbsolute(void) +LwpRowSpecifier::SetAbsolute() { cQualifier.SetAbsolute(); } inline void -LwpRowSpecifier::ClearAbsolute(void) +LwpRowSpecifier::ClearAbsolute() { cQualifier.ClearAbsolute(); } @@ -379,13 +379,13 @@ LwpRowSpecifier::IsAbsolute() } inline void -LwpRowSpecifier::SetAfter(void) +LwpRowSpecifier::SetAfter() { cQualifier.SetAfter(); } inline void -LwpRowSpecifier::ClearAfter(void) +LwpRowSpecifier::ClearAfter() { cQualifier.ClearAfter(); } @@ -414,7 +414,7 @@ LwpRowSpecifier::IsBad() class LwpColumnSpecifier { public: - LwpColumnSpecifier(void) + LwpColumnSpecifier() : cColumn(0) {} ~LwpColumnSpecifier() @@ -425,14 +425,14 @@ public: OUString ToString(sal_uInt8 nFormulaCol); sal_uInt8 ColumnID(sal_uInt8 FormulaColumn); - void SetAbsolute(void); - void ClearAbsolute(void); - bool IsAbsolute(void); - void SetAfter(void); - void ClearAfter(void); - bool IsAfter(void); + void SetAbsolute(); + void ClearAbsolute(); + bool IsAbsolute(); + void SetAfter(); + void ClearAfter(); + bool IsAfter(); void SetBad(bool Bad); - bool IsBad(void); + bool IsBad(); void SetColumnDelta(sal_uInt8 ReferenceColumnID, sal_uInt8 FormulaColumnID); private: @@ -455,13 +455,13 @@ LwpColumnSpecifier::ColumnID(sal_uInt8 FormulaColumn) } inline void -LwpColumnSpecifier::SetAbsolute(void) +LwpColumnSpecifier::SetAbsolute() { cQualifier.SetAbsolute(); } inline void -LwpColumnSpecifier::ClearAbsolute(void) +LwpColumnSpecifier::ClearAbsolute() { cQualifier.ClearAbsolute(); } @@ -473,13 +473,13 @@ LwpColumnSpecifier::IsAbsolute() } inline void -LwpColumnSpecifier::SetAfter(void) +LwpColumnSpecifier::SetAfter() { cQualifier.SetAfter(); } inline void -LwpColumnSpecifier::ClearAfter(void) +LwpColumnSpecifier::ClearAfter() { cQualifier.ClearAfter(); } diff --git a/lotuswordpro/source/filter/lwptoc.hxx b/lotuswordpro/source/filter/lwptoc.hxx index 2635a50e3ff1..83031433a79c 100644 --- a/lotuswordpro/source/filter/lwptoc.hxx +++ b/lotuswordpro/source/filter/lwptoc.hxx @@ -152,10 +152,10 @@ public: LwpTocLevelData(LwpObjectHeader &objHdr, LwpSvStream* pStrm); void RegisterStyle() SAL_OVERRIDE; virtual void XFConvert(XFContentContainer* pCont) SAL_OVERRIDE; - inline sal_uInt16 GetLevel(void){return m_nLevel;} - inline bool GetUseText(void){ return (m_nFlags & USETEXT) ? sal_True : sal_False;} - inline OUString GetSearchStyle(void){return m_SearchName.str();} - inline bool GetUseLeadingText(void){ return (m_nFlags & USENUMBER) ? sal_True : sal_False;} + inline sal_uInt16 GetLevel(){return m_nLevel;} + inline bool GetUseText(){ return (m_nFlags & USETEXT) ? sal_True : sal_False;} + inline OUString GetSearchStyle(){return m_SearchName.str();} + inline bool GetUseLeadingText(){ return (m_nFlags & USENUMBER) ? sal_True : sal_False;} private: virtual ~LwpTocLevelData(); diff --git a/lotuswordpro/source/filter/utlist.hxx b/lotuswordpro/source/filter/utlist.hxx index deb9f72d1e4b..6b05e4a1eb9e 100644 --- a/lotuswordpro/source/filter/utlist.hxx +++ b/lotuswordpro/source/filter/utlist.hxx @@ -125,7 +125,7 @@ public: // Methods bool IsEmpty() { return GetFirst() == &GetTerminating(); }; bool ContainsAtLeastTwoItems() { return GetFirst() != GetLast(); }; - void Destroy(void); + void Destroy(); private: // Data CUtListElmt cDummyElmt; |