sw/inc/prtopt.hxx | 2 -
sw/inc/pvprtdat.hxx | 50 +++++++++++++--------------
sw/source/core/access/AccessibilityCheck.cxx | 22 +++++------
sw/source/uibase/config/prtopt.cxx | 4 +-
4 files changed, 39 insertions(+), 39 deletions(-)
New commits:
commit 502d7cc09b11db236d4d92e8a19385e06942dcce
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Mon Feb 17 09:04:41 2020 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Feb 17 09:58:56 2020 +0100
sw: prefix members of HeaderCheck, NumberingCheck, SwPagePreviewPrtData ...
... and SwPrintOptions
See tdf#94879 for motivation.
Change-Id: Ic99281a5a093b707dc271d0710b1bf6e5fc65807
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88845
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
Tested-by: Jenkins
diff --git a/sw/inc/prtopt.hxx b/sw/inc/prtopt.hxx
index 88592dabea31..40eb643889d2 100644
--- a/sw/inc/prtopt.hxx
+++ b/sw/inc/prtopt.hxx
@@ -25,7 +25,7 @@
class SwPrintOptions final : public SwPrintData, public utl::ConfigItem
{
private:
- bool const bIsWeb;
+ bool const m_bIsWeb;
css::uno::Sequence<OUString> GetPropertyNames() const;
diff --git a/sw/inc/pvprtdat.hxx b/sw/inc/pvprtdat.hxx
index a45aa5431d27..2a8d5fb0c108 100644
--- a/sw/inc/pvprtdat.hxx
+++ b/sw/inc/pvprtdat.hxx
@@ -25,43 +25,43 @@
class SwPagePreviewPrtData
{
- sal_Int32 nLeftSpace, nRightSpace, nTopSpace, nBottomSpace,
- nHorzSpace, nVertSpace;
- sal_uInt8 nRow, nCol;
- bool bLandscape : 1;
+ sal_Int32 m_nLeftSpace, m_nRightSpace, m_nTopSpace, m_nBottomSpace,
+ m_nHorzSpace, m_nVertSpace;
+ sal_uInt8 m_nRow, m_nCol;
+ bool m_bLandscape : 1;
public:
SwPagePreviewPrtData()
- : nLeftSpace(0), nRightSpace(0), nTopSpace(0), nBottomSpace(0),
- nHorzSpace(0), nVertSpace(0), nRow(1), nCol(1),
- bLandscape(false)
+ : m_nLeftSpace(0), m_nRightSpace(0), m_nTopSpace(0), m_nBottomSpace(0),
+ m_nHorzSpace(0), m_nVertSpace(0), m_nRow(1), m_nCol(1),
+ m_bLandscape(false)
{}
- sal_Int32 GetLeftSpace() const { return nLeftSpace; }
- void SetLeftSpace( sal_Int32 n ) { nLeftSpace = n; }
+ sal_Int32 GetLeftSpace() const { return m_nLeftSpace; }
+ void SetLeftSpace( sal_Int32 n ) { m_nLeftSpace = n; }
- sal_Int32 GetRightSpace() const { return nRightSpace; }
- void SetRightSpace( sal_Int32 n ) { nRightSpace = n; }
+ sal_Int32 GetRightSpace() const { return m_nRightSpace; }
+ void SetRightSpace( sal_Int32 n ) { m_nRightSpace = n; }
- sal_Int32 GetTopSpace() const { return nTopSpace; }
- void SetTopSpace( sal_Int32 n ) { nTopSpace = n; }
+ sal_Int32 GetTopSpace() const { return m_nTopSpace; }
+ void SetTopSpace( sal_Int32 n ) { m_nTopSpace = n; }
- sal_Int32 GetBottomSpace() const { return nBottomSpace; }
- void SetBottomSpace(sal_Int32 n ) { nBottomSpace = n; }
+ sal_Int32 GetBottomSpace() const { return m_nBottomSpace; }
+ void SetBottomSpace(sal_Int32 n ) { m_nBottomSpace = n; }
- sal_Int32 GetHorzSpace() const { return nHorzSpace; }
- void SetHorzSpace( sal_Int32 n ) { nHorzSpace = n; }
+ sal_Int32 GetHorzSpace() const { return m_nHorzSpace; }
+ void SetHorzSpace( sal_Int32 n ) { m_nHorzSpace = n; }
- sal_Int32 GetVertSpace() const { return nVertSpace; }
- void SetVertSpace( sal_Int32 n ) { nVertSpace = n; }
+ sal_Int32 GetVertSpace() const { return m_nVertSpace; }
+ void SetVertSpace( sal_Int32 n ) { m_nVertSpace = n; }
- sal_uInt8 GetRow() const { return nRow; }
- void SetRow(sal_uInt8 n ) { nRow = n; }
+ sal_uInt8 GetRow() const { return m_nRow; }
+ void SetRow(sal_uInt8 n ) { m_nRow = n; }
- sal_uInt8 GetCol() const { return nCol; }
- void SetCol( sal_uInt8 n ) { nCol = n; }
+ sal_uInt8 GetCol() const { return m_nCol; }
+ void SetCol( sal_uInt8 n ) { m_nCol = n; }
- bool GetLandscape() const { return bLandscape; }
- void SetLandscape( bool b ) { bLandscape = b; }
+ bool GetLandscape() const { return m_bLandscape; }
+ void SetLandscape( bool b ) { m_bLandscape = b; }
};
#endif
diff --git a/sw/source/core/access/AccessibilityCheck.cxx
b/sw/source/core/access/AccessibilityCheck.cxx
index bf1660d073c1..641c32b49f15 100644
--- a/sw/source/core/access/AccessibilityCheck.cxx
+++ b/sw/source/core/access/AccessibilityCheck.cxx
@@ -208,9 +208,9 @@ public:
class NumberingCheck : public NodeCheck
{
private:
- SwTextNode* pPreviousTextNode;
+ SwTextNode* m_pPreviousTextNode;
- const std::vector<std::pair<OUString, OUString>>
constNumberingCombinations{
+ const std::vector<std::pair<OUString, OUString>> m_aNumberingCombinations{
{ "1.", "2." }, { "(1)", "(2)" }, { "1)", "2)" }, { "a.", "b." }, {
"(a)", "(b)" },
{ "a)", "b)" }, { "A.", "B." }, { "(A)", "(B)" }, { "A)", "B)" }
};
@@ -218,7 +218,7 @@ private:
public:
NumberingCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
: NodeCheck(rIssueCollection)
- , pPreviousTextNode(nullptr)
+ , m_pPreviousTextNode(nullptr)
{
}
@@ -226,12 +226,12 @@ public:
{
if (pCurrent->IsTextNode())
{
- if (pPreviousTextNode)
+ if (m_pPreviousTextNode)
{
- for (auto& rPair : constNumberingCombinations)
+ for (auto& rPair : m_aNumberingCombinations)
{
if
(pCurrent->GetTextNode()->GetText().startsWith(rPair.second)
- &&
pPreviousTextNode->GetText().startsWith(rPair.first))
+ &&
m_pPreviousTextNode->GetText().startsWith(rPair.first))
{
OUString sNumbering = rPair.first + " " + rPair.second
+ "...";
OUString sIssueText
@@ -240,7 +240,7 @@ public:
}
}
}
- pPreviousTextNode = pCurrent->GetTextNode();
+ m_pPreviousTextNode = pCurrent->GetTextNode();
}
}
};
@@ -595,12 +595,12 @@ public:
class HeaderCheck : public NodeCheck
{
private:
- int nPreviousLevel;
+ int m_nPreviousLevel;
public:
HeaderCheck(sfx::AccessibilityIssueCollection& rIssueCollection)
: NodeCheck(rIssueCollection)
- , nPreviousLevel(0)
+ , m_nPreviousLevel(0)
{
}
@@ -614,11 +614,11 @@ public:
if (nLevel < 0)
return;
- if (nLevel > nPreviousLevel && std::abs(nLevel - nPreviousLevel) >
1)
+ if (nLevel > m_nPreviousLevel && std::abs(nLevel -
m_nPreviousLevel) > 1)
{
lclAddIssue(m_rIssueCollection,
SwResId(STR_HEADINGS_NOT_IN_ORDER));
}
- nPreviousLevel = nLevel;
+ m_nPreviousLevel = nLevel;
}
}
};
diff --git a/sw/source/uibase/config/prtopt.cxx
b/sw/source/uibase/config/prtopt.cxx
index 8f39010a4719..13831df970f4 100644
--- a/sw/source/uibase/config/prtopt.cxx
+++ b/sw/source/uibase/config/prtopt.cxx
@@ -50,7 +50,7 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames() const
"Content/PrintPlaceholders", // 16 not in Sw/Web
"Content/PrintHiddenText" // 17 not in Sw/Web
};
- const int nCount = bIsWeb ? 12 : 18;
+ const int nCount = m_bIsWeb ? 12 : 18;
Sequence<OUString> aNames(nCount);
OUString* pNames = aNames.getArray();
for(int i = 0; i < nCount; i++)
@@ -63,7 +63,7 @@ Sequence<OUString> SwPrintOptions::GetPropertyNames() const
SwPrintOptions::SwPrintOptions(bool bWeb) :
ConfigItem(bWeb ? OUString("Office.WriterWeb/Print") :
OUString("Office.Writer/Print"),
ConfigItemMode::ReleaseTree),
- bIsWeb(bWeb)
+ m_bIsWeb(bWeb)
{
m_bPrintPageBackground = !bWeb;
m_bPrintBlackFont = bWeb;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
