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

loplugin:unusedfields make some fields private

Browse Source 
this is one of the secondary analyses this plugin performs

Change-Id: I1c496e234513362338600180e51f7e71e605a7cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143180
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2022-11-23 16:09:51 +02:00
parent 651658d37b
commit 4504d6ddf1
11 changed files with 51 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
io/source/acceptor/acceptor.hxx
View File

@@ -39,6 +39,7 @@ namespace io_acceptor {
void stopAccepting();
private:
std::mutex m_mutex;
::osl::Pipe m_pipe;
OUString m_sPipeName;
@@ -59,6 +60,7 @@ namespace io_acceptor {
void stopAccepting();
private:
::osl::SocketAddr m_addr;
::osl::AcceptorSocket m_socket;
OUString m_sSocketName;

11
jvmfwk/inc/vendorbase.hxx
View File

@@ -167,17 +167,18 @@ protected:
virtual char const* const* getLibraryPaths(int* size) = 0;
typedef rtl::Reference<VendorBase> (*createInstance_func)();
friend rtl::Reference<VendorBase>
createInstance(createInstance_func pFunc,
const std::vector<std::pair<OUString, OUString>>& properties);
private:
OUString m_sVendor;
OUString m_sVersion;
OUString m_sHome;
OUString m_sRuntimeLibrary;
OUString m_sLD_LIBRARY_PATH;
OUString m_sArch;
typedef rtl::Reference<VendorBase> (*createInstance_func)();
friend rtl::Reference<VendorBase>
createInstance(createInstance_func pFunc,
const std::vector<std::pair<OUString, OUString>>& properties);
};
}

2
lotuswordpro/inc/xfilter/xfparastyle.hxx
View File

@@ -217,7 +217,7 @@ public:
void SetNumberRight(bool bFlag){m_bNumberRight = bFlag;}
bool GetNumberRight() const {return m_bNumberRight;}
protected:
private:
OUString m_strMasterPage;
enumXFAlignType m_eAlignType;

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

@@ -93,6 +93,7 @@ public:
sal_uInt32 ReadBits(sal_uInt16 iCount, sal_uInt32& nBits);
sal_uInt32 Decode(HuffmanTreeNode* pRoot);
private:
/**
* @brief
* compressed/decompressed stream

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

@@ -184,6 +184,7 @@ protected:
virtual sal_uInt16 GetBelowRowID(sal_uInt16 nRow) override {return nRow + m_nRealrowspan; };
virtual LwpCellBorderType GetCellBorderType(sal_uInt16 nRow, sal_uInt16 nCol, LwpTableLayout * pTableLayout) override;
virtual rtl::Reference<XFCell> ConvertCell(LwpObjectID aTableID, sal_uInt16 nRow, sal_uInt16 nCol) override;
private:
sal_uInt16 cnumrows;
sal_uInt8 cnumcols;
sal_uInt16 m_nRealrowspan;

24
lotuswordpro/source/filter/lwplayout.hxx
View File

@@ -418,9 +418,6 @@ public:
class LwpLayout : public LwpMiddleLayout
{
private:
bool m_bGettingShadow;
bool m_bGettingNumCols;
public:
LwpLayout( LwpObjectHeader const &objHdr, LwpSvStream* pStrm );
virtual ~LwpLayout() override;
@@ -430,21 +427,12 @@ public:
XFShadow* GetXFShadow();
protected:
void Read() override;
protected:
LwpUseWhen m_aUseWhen;
LwpObjectID m_Position;
LwpObjectID m_LayColumns;
LwpObjectID m_LayGutterStuff;
LwpObjectID m_LayJoinStuff;
LwpObjectID m_LayShadow;
LwpObjectID m_LayExtJoinStuff;
public:
LwpUseWhen* VirtualGetUseWhen() override;
virtual sal_uInt16 GetNumCols() override;
virtual double GetColGap(sal_uInt16 nIndex) override;
sal_uInt16 GetUsePage();
public:
enum UseWhenType
{
StartWithinColume,
@@ -453,7 +441,6 @@ public:
StartOnOddPage,
StartOnEvenPage
};
public:
UseWhenType GetUseWhenType();
virtual bool IsUseOnAllPages() override;
virtual bool IsUseOnAllEvenPages() override;
@@ -461,6 +448,17 @@ public:
virtual bool IsUseOnPage() override;
LwpObjectID& GetPosition(){ return m_Position;}
virtual rtl::Reference<LwpVirtualLayout> GetContainerLayout() override;
private:
bool m_bGettingShadow;
bool m_bGettingNumCols;
LwpUseWhen m_aUseWhen;
LwpObjectID m_Position;
LwpObjectID m_LayColumns;
LwpObjectID m_LayGutterStuff;
LwpObjectID m_LayJoinStuff;
LwpObjectID m_LayShadow;
LwpObjectID m_LayExtJoinStuff;
};
class LwpPlacableLayout : public LwpLayout

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

@@ -187,7 +187,7 @@ public:
void SetAllText(std::u16string_view sText);
protected:
private:
sal_uInt32 m_nOrdinal; // Ordinal number of this paragraph
LwpObjectID m_ParaStyle; // handle of paragraph style
LwpPoint m_Hint; // Paragraph hint - width & height

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

@@ -84,6 +84,7 @@ public:
void SetRowMap();
protected:
void Read() override;
private:
sal_uInt16 crowid;
sal_Int32 cheight; // Minimum height if height is automatic.
sal_uInt8 cLeaderDotCount; // dfb - # of cells with leader dots
@@ -95,7 +96,6 @@ protected:
RF_VALID_HAS_BORDER = 0x02,
RF_LEADER_COUNT_VALID = 0x4
};
private:
std::vector<LwpConnectedCellLayout*> m_ConnCellList;
sal_Int32 FindMarkConnCell(sal_uInt8 nStartCol,sal_uInt8 nEndCol);
sal_Int32 FindNextMarkConnCell(sal_uInt16 nMarkConnCell,sal_uInt8 nEndCol);

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

@@ -89,8 +89,6 @@ class SdwRectangle
{
private:
bool m_bRotated;
public:
std::array<Point, 4> m_nRectCorner;
public:

5
lotuswordpro/source/filter/lwptable.hxx
View File

@@ -122,7 +122,11 @@ public:
bool IsNumberDown() const;
virtual bool IsTable() override { return true;}
LwpSuperTableLayout* GetSuperTableLayout();
protected:
void Read() override;
private:
LwpForkedNotifyList m_CPNotifyList;
sal_uInt16 m_nRow, m_nColumn;
@@ -139,7 +143,6 @@ protected:
LwpObjectID m_Layout;
LwpObjectID m_DefaultCellStyle; // gCVirtualLayout
void Read() override;
};
/**

47
lotuswordpro/source/filter/lwptablelayout.hxx
View File

@@ -154,12 +154,34 @@ protected:
void ParseTable();
void PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_uInt16 nColID);
public:
void XFConvert(XFContentContainer* pCont) override;
void ConvertTable(rtl::Reference<XFTable> const & pXFTable, sal_uInt16 nStartRow,
sal_uInt16 nEndRow,sal_uInt8 nStartCol,sal_uInt8 nEndCol);
const OUString& GetDefaultRowStyleName() const {return m_DefaultRowStyleName;}
void SetCellsMap(sal_uInt16 nRow1, sal_uInt8 nCol1, sal_uInt16 nRow2, sal_uInt8 nCol2, XFCell* pXFCell);
XFCell* GetCellsMap(sal_uInt16 nRow,sal_uInt8 nCol);
const std::map<sal_uInt16,LwpRowLayout*>& GetRowsMap() const {return m_RowsMap;}
LwpRowLayout* GetRowLayout(sal_uInt16 nRow);
private:
void ConvertDefaultRow(rtl::Reference<XFTable> const & pXFTable, sal_uInt8 nStartCol,
sal_uInt8 nEndCol, sal_uInt16 nRowID);
void ConvertColumn(rtl::Reference<XFTable> const & pXFTable, sal_uInt8 nStartCol, sal_uInt8 nEndCol);
sal_uInt16 ConvertHeadingRow(rtl::Reference<XFTable> const & pXFTable,sal_uInt16 nStartHeadRow,sal_uInt16 nEndHeadRow);
static bool FindSplitColMark(XFTable* pXFTable, std::vector<sal_uInt8>& rCellMark, sal_uInt8& nMaxColSpan);
void SplitRowToCells(XFTable* pTmpTable, rtl::Reference<XFTable> const & pXFTable,
sal_uInt8 nFirstColSpann, const sal_uInt8* pCellMark);
void SplitConflictCells();
void PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID);
sal_uInt16 m_nRows;
sal_uInt16 m_nCols;
std::vector<TableConvertAttempt> m_aConvertingStack;
private:
//CColumnLayoutHead cColumnLayout;
LwpObjectID m_ColumnLayout;
LwpCellLayout * m_pDefaultCellLayout;
@@ -170,34 +192,11 @@ private:
std::vector<LwpCellLayout*> m_WordProCellsMap;
// column vector
std::vector<LwpColumnLayout*> m_aColumns;
public:
void XFConvert(XFContentContainer* pCont) override;
void ConvertTable(rtl::Reference<XFTable> const & pXFTable, sal_uInt16 nStartRow,
sal_uInt16 nEndRow,sal_uInt8 nStartCol,sal_uInt8 nEndCol);
const OUString& GetDefaultRowStyleName() const {return m_DefaultRowStyleName;}
void SetCellsMap(sal_uInt16 nRow1, sal_uInt8 nCol1, sal_uInt16 nRow2, sal_uInt8 nCol2, XFCell* pXFCell);
XFCell* GetCellsMap(sal_uInt16 nRow,sal_uInt8 nCol);
const std::map<sal_uInt16,LwpRowLayout*>& GetRowsMap() const {return m_RowsMap;}
LwpRowLayout* GetRowLayout(sal_uInt16 nRow);
private:
void ConvertDefaultRow(rtl::Reference<XFTable> const & pXFTable, sal_uInt8 nStartCol,
sal_uInt8 nEndCol, sal_uInt16 nRowID);
void ConvertColumn(rtl::Reference<XFTable> const & pXFTable, sal_uInt8 nStartCol, sal_uInt8 nEndCol);
sal_uInt16 ConvertHeadingRow(rtl::Reference<XFTable> const & pXFTable,sal_uInt16 nStartHeadRow,sal_uInt16 nEndHeadRow);
static bool FindSplitColMark(XFTable* pXFTable, std::vector<sal_uInt8>& rCellMark, sal_uInt8& nMaxColSpan);
void SplitRowToCells(XFTable* pTmpTable, rtl::Reference<XFTable> const & pXFTable,
sal_uInt8 nFirstColSpann, const sal_uInt8* pCellMark);
std::map<sal_uInt16,LwpRowLayout*> m_RowsMap;
void SplitConflictCells();
rtl::Reference<XFTable> m_pXFTable;
bool m_bConverted;
using rt_type = mdds::rtree<int, XFCellListener>;
rt_type m_CellsMap;
void PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID);
};
/**