summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--io/source/acceptor/acceptor.hxx2
-rw-r--r--jvmfwk/inc/vendorbase.hxx11
-rw-r--r--lotuswordpro/inc/xfilter/xfparastyle.hxx2
-rw-r--r--lotuswordpro/source/filter/explode.hxx1
-rw-r--r--lotuswordpro/source/filter/lwpcelllayout.hxx1
-rw-r--r--lotuswordpro/source/filter/lwplayout.hxx24
-rw-r--r--lotuswordpro/source/filter/lwppara.hxx2
-rw-r--r--lotuswordpro/source/filter/lwprowlayout.hxx2
-rw-r--r--lotuswordpro/source/filter/lwpsdwrect.hxx2
-rw-r--r--lotuswordpro/source/filter/lwptable.hxx5
-rw-r--r--lotuswordpro/source/filter/lwptablelayout.hxx41
11 files changed, 48 insertions, 45 deletions
diff --git a/io/source/acceptor/acceptor.hxx b/io/source/acceptor/acceptor.hxx
index 9dc3690166cc..221ad16d2b2d 100644
--- a/io/source/acceptor/acceptor.hxx
+++ b/io/source/acceptor/acceptor.hxx
@@ -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;
diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx
index 5c13ee7a5f94..dca8f3fb02d8 100644
--- a/jvmfwk/inc/vendorbase.hxx
+++ b/jvmfwk/inc/vendorbase.hxx
@@ -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);
};
}
diff --git a/lotuswordpro/inc/xfilter/xfparastyle.hxx b/lotuswordpro/inc/xfilter/xfparastyle.hxx
index 339f6a3c7fff..1a12c2f4c9c4 100644
--- a/lotuswordpro/inc/xfilter/xfparastyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfparastyle.hxx
@@ -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;
diff --git a/lotuswordpro/source/filter/explode.hxx b/lotuswordpro/source/filter/explode.hxx
index fb13a6f26696..d3151b22fef3 100644
--- a/lotuswordpro/source/filter/explode.hxx
+++ b/lotuswordpro/source/filter/explode.hxx
@@ -93,6 +93,7 @@ public:
sal_uInt32 ReadBits(sal_uInt16 iCount, sal_uInt32& nBits);
sal_uInt32 Decode(HuffmanTreeNode* pRoot);
+private:
/**
* @brief
* compressed/decompressed stream
diff --git a/lotuswordpro/source/filter/lwpcelllayout.hxx b/lotuswordpro/source/filter/lwpcelllayout.hxx
index e6a3130702b3..72aad7b4136f 100644
--- a/lotuswordpro/source/filter/lwpcelllayout.hxx
+++ b/lotuswordpro/source/filter/lwpcelllayout.hxx
@@ -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;
diff --git a/lotuswordpro/source/filter/lwplayout.hxx b/lotuswordpro/source/filter/lwplayout.hxx
index 9ac89fddc60c..3c86921da631 100644
--- a/lotuswordpro/source/filter/lwplayout.hxx
+++ b/lotuswordpro/source/filter/lwplayout.hxx
@@ -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
diff --git a/lotuswordpro/source/filter/lwppara.hxx b/lotuswordpro/source/filter/lwppara.hxx
index bfb1dcb82b9a..2d2f980914c2 100644
--- a/lotuswordpro/source/filter/lwppara.hxx
+++ b/lotuswordpro/source/filter/lwppara.hxx
@@ -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
diff --git a/lotuswordpro/source/filter/lwprowlayout.hxx b/lotuswordpro/source/filter/lwprowlayout.hxx
index ad2c9eacb959..38dfefaaef5c 100644
--- a/lotuswordpro/source/filter/lwprowlayout.hxx
+++ b/lotuswordpro/source/filter/lwprowlayout.hxx
@@ -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);
diff --git a/lotuswordpro/source/filter/lwpsdwrect.hxx b/lotuswordpro/source/filter/lwpsdwrect.hxx
index ec92097f58bd..a5fd73ab3ea3 100644
--- a/lotuswordpro/source/filter/lwpsdwrect.hxx
+++ b/lotuswordpro/source/filter/lwpsdwrect.hxx
@@ -89,8 +89,6 @@ class SdwRectangle
{
private:
bool m_bRotated;
-
-public:
std::array<Point, 4> m_nRectCorner;
public:
diff --git a/lotuswordpro/source/filter/lwptable.hxx b/lotuswordpro/source/filter/lwptable.hxx
index b55d7a4b4436..6139a351c594 100644
--- a/lotuswordpro/source/filter/lwptable.hxx
+++ b/lotuswordpro/source/filter/lwptable.hxx
@@ -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;
};
/**
diff --git a/lotuswordpro/source/filter/lwptablelayout.hxx b/lotuswordpro/source/filter/lwptablelayout.hxx
index beee6acb6c16..945d6ca5bce7 100644
--- a/lotuswordpro/source/filter/lwptablelayout.hxx
+++ b/lotuswordpro/source/filter/lwptablelayout.hxx
@@ -154,23 +154,6 @@ protected:
void ParseTable();
void PostProcessParagraph(XFCell *pCell, sal_uInt16 nRowID, sal_uInt16 nColID);
- sal_uInt16 m_nRows;
- sal_uInt16 m_nCols;
-
- std::vector<TableConvertAttempt> m_aConvertingStack;
-
-private:
- //CColumnLayoutHead cColumnLayout;
- LwpObjectID m_ColumnLayout;
- LwpCellLayout * m_pDefaultCellLayout;
- OUString m_DefaultColumnStyleName;
- OUString m_DefaultRowStyleName;
-
- // wordpro cell map
- 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,
@@ -180,6 +163,7 @@ public:
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);
@@ -189,15 +173,30 @@ private:
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();
+
+ void PutCellVals(LwpFoundry* pFoundry, LwpObjectID aTableID);
+
+ sal_uInt16 m_nRows;
+ sal_uInt16 m_nCols;
+
+ std::vector<TableConvertAttempt> m_aConvertingStack;
+
+ //CColumnLayoutHead cColumnLayout;
+ LwpObjectID m_ColumnLayout;
+ LwpCellLayout * m_pDefaultCellLayout;
+ OUString m_DefaultColumnStyleName;
+ OUString m_DefaultRowStyleName;
+
+ // wordpro cell map
+ std::vector<LwpCellLayout*> m_WordProCellsMap;
+ // column vector
+ std::vector<LwpColumnLayout*> m_aColumns;
+ std::map<sal_uInt16,LwpRowLayout*> m_RowsMap;
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);
};
/**
generated by cgit (git 2.34.1) at 2024-12-23 01:13:20 +0000