mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

loplugin:expandablemethodds in lotuswordpro..package

Browse Source 
Change-Id: Id33d88edc4be00f4238792d885e392cc08e72386
Reviewed-on: https://gerrit.libreoffice.org/30017
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2016-10-18 15:18:44 +02:00
parent 0aa24916cb
commit e140e40c12
22 changed files with 13 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lotuswordpro/source/filter/bento.hxx
View File

@ -273,7 +273,6 @@ public: // Internal methods
inline pCBenValueSegment GetNextValueSegment(pCBenValueSegment
pCurrValueSegment);
inline pLtcBenContainer GetContainer();
CUtList& GetValueSegments() { return cValueSegments; }
private: // Data
@ -337,8 +336,6 @@ inline pCBenValueSegment CBenValue::GetNextValueSegment(pCBenValueSegment
pCurrValueSegment)
{ return static_cast<pCBenValueSegment>( cValueSegments.GetNextOrNULL(pCurrValueSegment) ); }
inline pLtcBenContainer CBenValue::GetContainer()
{ return GetProperty()->GetContainer(); }
class CBenNamedObject : public CBenObject
{

2
lotuswordpro/source/filter/benval.cxx
View File

@ -76,7 +76,7 @@ CBenValue::ReadValueData(void * pReadBuffer, unsigned long Offset,
unsigned long SegOffset = 0;
*pAmtRead = 0;
pCBenValueSegment pCurrSeg = nullptr;
pLtcBenContainer pContainer = GetContainer();
pLtcBenContainer pContainer = GetProperty()->GetContainer();
BenByte* pBuffer = static_cast<BenByte*>(pReadBuffer);
/// pReadBuffer -- pointer to buffer of read result, allocated outside this function

4
lotuswordpro/source/filter/lwpfrib.cxx
View File

@ -204,8 +204,8 @@ LwpFrib* LwpFrib::CreateFrib(LwpPara* pPara, LwpObjectStream* pObjStrm, sal_uInt
newFrib->SetModifiers(pModInfo);
}
newFrib->SetType(fribtype);
newFrib->SetEditor(editID);
newFrib->m_nFribType = fribtype;
newFrib->m_nEditor = editID;
newFrib->Read(pObjStrm, friblen);
return newFrib;
}

2
lotuswordpro/source/filter/lwpfrib.hxx
View File

@ -93,8 +93,6 @@ public:
LwpFrib* GetNext(){return m_pNext;}
void SetNext(LwpFrib* next){m_pNext = next;}
sal_uInt8 GetType() { return m_nFribType;}
void SetType(sal_uInt8 type) { m_nFribType = type;}
void SetEditor(sal_uInt8 editor) { m_nEditor = editor;}
OUString GetEditor();
XFColor GetHighlightColor();
protected:

2
lotuswordpro/source/filter/lwpfribmark.hxx
View File

@ -77,7 +77,6 @@ public:
virtual ~LwpFribCHBlock() override {}
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
LwpCHBlkMarker* GetMarker();
sal_uInt8 GetType(){return m_nType;}
enum{MARKER_START=1,MARKER_END,MARKER_NONE};
void XFConvert(XFContentContainer* pXFPara,LwpStory* pStory);
private:
@ -151,7 +150,6 @@ public:
virtual ~LwpFribRubyMarker() override {}
void Read(LwpObjectStream* pObjStrm, sal_uInt16 len) override;
LwpRubyMarker* GetMarker();
sal_uInt8 GetType(){return m_nType;}
enum{MARKER_START=1,MARKER_END,MARKER_NONE};
void XFConvert(XFContentContainer* pXFPara);
void RegisterStyle(LwpFoundry* pFoundry) override;

4
lotuswordpro/source/filter/lwpfribsection.cxx
View File

@ -382,7 +382,7 @@ void LwpMasterPage::ParseSection(LwpFrib* pFrib)
if(m_pLayout->HasFillerPageText(m_pPara->GetFoundry()))
{
XFParagraph *pPara = new XFParagraph();
pPara->SetStyleName(GetFillerPageStyleName());
pPara->SetStyleName(m_FillerPageStyleName);
m_pPara->AddXFContent(pPara);
rFribPtr.SetXFPara(pPara);
@ -419,7 +419,7 @@ void LwpMasterPage::ParseSection(LwpFrib* pFrib)
if(pFrib->HasNextFrib())
{
XFParagraph *pNextPara = new XFParagraph();
pNextPara->SetStyleName(GetStyleName());
pNextPara->SetStyleName(m_StyleName);
m_pPara->AddXFContent(pNextPara);
rFribPtr.SetXFPara(pNextPara);
}

2
lotuswordpro/source/filter/lwpfribsection.hxx
View File

@ -81,8 +81,6 @@ public:
void ParseSection(LwpFrib* pFrib);
XFSection* CreateXFSection();
const OUString& GetStyleName(){ return m_StyleName;}
const OUString& GetFillerPageStyleName(){ return m_FillerPageStyleName;}
bool IsNextPageType();
private:

9
lotuswordpro/source/filter/lwpobjfactory.cxx
View File

@ -105,17 +105,8 @@ LwpObjectFactory::LwpObjectFactory(LwpSvStream* pSvStream)
LwpObjectFactory::~LwpObjectFactory()
{
if(!m_IdToObjList.empty())
ClearObjectMap();
}
/**
* @descr clear object map and delete all objects
*/
void LwpObjectFactory::ClearObjectMap()
{
m_IdToObjList.clear();
}
/**
* @descr read the index manager
*/

1
lotuswordpro/source/filter/lwpobjfactory.hxx
View File

@ -105,7 +105,6 @@ private:
typedef std::unordered_map<LwpObjectID, rtl::Reference<LwpObject>, hashFunc, eqFunc> LwpIdToObjMap;
LwpIdToObjMap m_IdToObjList;
LwpIndexManager m_IndexMgr;
void ClearObjectMap();
protected:
rtl::Reference<LwpObject> FindObject(const LwpObjectID &objID);

11
lotuswordpro/source/filter/lwppara.hxx
View File

@ -175,8 +175,6 @@ public:
OUString const & GetContentText(bool bAllText = false);
void SetParaDropcap(bool bFlag);
void SetDropcapLines(sal_uInt16 number);
void SetDropcapChars(sal_uInt32 chars);
void SetDropcapLayout(LwpDropcapLayout* pLayout);
XFContentContainer* GetXFContainer();
@ -186,7 +184,6 @@ public:
void RegisterTabStyle(XFParaStyle* pXFParaStyle);
LwpBulletStyleMgr* GetBulletStyleMgr();
sal_uInt32 GetOrdinal(){ return m_nOrdinal;}
bool operator <(LwpPara& Other);
bool ComparePagePosition(LwpVirtualLayout* pPreLayout, LwpVirtualLayout* pNextLayout);
@ -351,14 +348,6 @@ inline void LwpPara::SetParaDropcap(bool bFlag)
{
m_bHasDropcap = bFlag;
}
inline void LwpPara::SetDropcapLines(sal_uInt16 number)
{
m_nLines = number;
}
inline void LwpPara::SetDropcapChars(sal_uInt32 chars)
{
m_nChars = chars;
}
inline void LwpPara::SetDropcapLayout(LwpDropcapLayout* pLayout)
{
m_pDropcapLayout = pLayout;

8
lotuswordpro/source/filter/lwppara1.cxx
View File

@ -100,6 +100,7 @@
#include "lwpdropcapmgr.hxx"
#include "lwptable.hxx"
#include "lwpcelllayout.hxx"
#include "lwpframelayout.hxx"
// boost::polymorphic_downcast checks and reports (using assert), if the
// cast is incorrect (in debug builds).
@ -148,11 +149,10 @@ XFParaStyle* LwpPara::GetXFParaStyle()
/**
* @short get drop cap info
*/
#include "lwpframelayout.hxx"
void LwpPara::GatherDropcapInfo()
{
SetDropcapLines(m_pDropcapLayout->GetLines());
SetDropcapChars(m_pDropcapLayout->GetChars());
m_nLines = m_pDropcapLayout->GetLines();
m_nChars = m_pDropcapLayout->GetChars();
}
/**
* @short get parent paragraph
@ -593,7 +593,7 @@ LwpTabOverride* LwpPara::GetLocalTabOverride()
*/
bool LwpPara::operator< (LwpPara& Other)
{
return m_nOrdinal < Other.GetOrdinal();
return m_nOrdinal < Other.m_nOrdinal;
}
/**

8
lotuswordpro/source/filter/lwpprtinfo.cxx
View File

@ -57,14 +57,6 @@
LwpPrinterInfo::LwpPrinterInfo(LwpObjectStream* pStrm)
{
Read(pStrm);
}
/**
* @descr read printer info in VO_DOCUMENT
*/
void LwpPrinterInfo::Read(LwpObjectStream* pStrm)
{
//Just skip now
Skip(pStrm);
}
/**

1
lotuswordpro/source/filter/lwpprtinfo.hxx
View File

@ -74,7 +74,6 @@ public:
~LwpPrinterInfo(){}
public:
static void Read(LwpObjectStream* pStrm);
static void Skip(LwpObjectStream *pStrm);
};
#endif

7
lotuswordpro/source/filter/lwptaboverride.hxx
View File

@ -90,7 +90,6 @@ public:
inline LwpObjectID& GetTabRackID();
inline bool IsTabRackOverridden();
inline void Override(LwpTabOverride* pOther);
inline void OverrideTabRack(LwpObjectID* pTabRackID);
protected:
LwpTabOverride(LwpTabOverride const& rOther);
@ -117,7 +116,7 @@ inline void LwpTabOverride::Override(LwpTabOverride* pOther)
{
if (IsTabRackOverridden())
//m_aTabRackID = *(pOther->GetTabRackID());
pOther->OverrideTabRack(&GetTabRackID());
pOther->m_aTabRackID = GetTabRackID();
}
}
@ -126,10 +125,6 @@ inline bool LwpTabOverride::IsTabRackOverridden()
return (m_nOverride & TO_TABRACK) != 0;
}
inline void LwpTabOverride::OverrideTabRack(LwpObjectID* pTabRackID)
{
m_aTabRackID = *pTabRackID;
}
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
lotuswordpro/source/filter/lwptblcell.cxx
View File

@ -102,7 +102,7 @@ void LwpCellList::Parse(IXFStream* /*pOutputStream*/)
void LwpCellList::Convert(XFCell * pCell, LwpTableLayout* /*pCellsMap*/)
{
LwpObjectID aValueID = GetValueID();
LwpObjectID aValueID = cValue;
LwpNumericValue* pValue = dynamic_cast<LwpNumericValue*>(aValueID.obj().get());
if (pValue)
{

1
lotuswordpro/source/filter/lwptblcell.hxx
View File

@ -84,7 +84,6 @@ public:
virtual void Parse(IXFStream* pOutputStream) override;
LwpObjectID GetNextID(){return GetNext();}
sal_uInt8 GetColumnID(){return cColumn;}
const LwpObjectID& GetValueID(){return cValue;}
virtual void Convert(XFCell * pCell, LwpTableLayout* pCellsMap=nullptr);
protected:

2
lotuswordpro/source/filter/utlist.cxx
View File

@ -68,7 +68,7 @@ CUtListElmt::CUtListElmt(pCUtList pList)
CUtListElmt::~CUtListElmt()
{
if (OnList())
if (cpNext != nullptr)
{
cpPrev->cpNext = cpNext;
cpNext->cpPrev = cpPrev;

1
lotuswordpro/source/filter/utlist.hxx
View File

@ -75,7 +75,6 @@ public: // Methods
explicit CUtListElmt(pCUtListElmt pPrev) { InsertAfter(pPrev); }
explicit CUtListElmt(pCUtList pList);
virtual ~CUtListElmt();
bool OnList() { return cpNext != nullptr; }
void MakeNotOnList() { cpNext = nullptr; } // Same as Remove but doesn't
// patch up list
pCUtListElmt GetNext() const { return cpNext; }

6
lotuswordpro/source/filter/xfilter/xffontfactory.cxx
View File

@ -65,12 +65,6 @@ XFFontFactory::XFFontFactory()
XFFontFactory::~XFFontFactory()
{
Reset();
}
void XFFontFactory::Reset()
{
s_aFonts.clear();
}
void XFFontFactory::AddFont(rtl::Reference<XFFont> const & pFont)

6
lotuswordpro/source/filter/xfilter/xffontfactory.hxx
View File

@ -81,12 +81,6 @@ public:
~XFFontFactory();
XFFontFactory(const XFFontFactory&){}
public:
/**
* @descr Clear all fonts, this is called when load a file.
*/
void Reset();
private:
/**
* @descr Add a font. if there exist a font with same properties with pFont, them the font object

1
package/inc/ZipPackageStream.hxx
View File

@ -77,7 +77,6 @@ private:
throw(css::uno::RuntimeException);
public:
bool IsEncrypted () const { return m_bIsEncrypted;}
bool IsPackageMember () const { return m_nStreamMode == PACKAGE_STREAM_PACKAGEMEMBER;}
bool IsFromManifest() const { return m_bFromManifest; }

2
package/source/zippackage/ZipPackageStream.cxx
View File

@ -920,7 +920,7 @@ void ZipPackageStream::successfullyWritten( ZipEntry *pEntry )
ZipPackageFolder::copyZipEntry( aEntry, *pEntry );
// TODO/LATER: get rid of this hack ( the encrypted stream size property is changed during saving )
if ( IsEncrypted() )
if ( m_bIsEncrypted )
setSize( m_nOwnStreamOrigSize );
aEntry.nOffset *= -1;