[Libreoffice-commits] core.git: sw/inc sw/source

[Stephan Bergmann (via logerrit)]

 sw/inc/fesh.hxx                |   13 +++++++------
 sw/source/core/frmedt/fews.cxx |    4 ++--
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 8beb951309fb3b0300e0b871909de8c8c6712a05
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Sun Dec 15 10:24:25 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Sun Dec 15 12:15:37 2019 +0100

    Make some SwFEShell data members private
    
    ...which had each been added in the odd combination of a public data member
    together with get/set member functions, in
    0c8b1efbad48fa9697c0b1afbe4753bbbc3c4c5c "tdf#127759 Writer: add table
    row/column insert mode" and 1e278d1d0cfb1d5375195aa764739f00633f21e8 "tdf#37156
    Writer menu: Paste as Nested table", respectively.  Also prefix bTableCopied
    with "m_" for consistency with the rest of the SwFEShell data members.
    
    Change-Id: Idc6c57d19ec5db4344a9dc3b3e2a5ebeb8aabde8
    Reviewed-on: https://gerrit.libreoffice.org/85163
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index b928420ea824..46f6be2294b0 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -206,6 +206,10 @@ private:
     std::unique_ptr<SdrDropMarkerOverlay> m_pChainFrom;
     bool m_bCheckForOLEInCaption;
     comphelper::OInterfaceContainerHelper2 m_aPasteListeners;
+    /// insert table rows or columns instead of overwriting the existing table cells
+    SwTable::SearchType m_eTableInsertMode;
+    /// table copied to the clipboard by the last private copy
+    bool m_bTableCopied;
 
     SAL_DLLPRIVATE SwFlyFrame *FindFlyFrame( const css::uno::Reference < css::embed::XEmbeddedObject >&  ) const;
 
@@ -639,14 +643,11 @@ public:
     void DeleteTable();
     bool DeleteRow(bool bCompleteTable = false);
 
-    /// insert table rows or columns instead of overwriting the existing table cells
-    SwTable::SearchType m_eTableInsertMode;
     SwTable::SearchType GetTableInsertMode() const         { return m_eTableInsertMode; }
     void SetTableInsertMode( SwTable::SearchType eFlag )  { m_eTableInsertMode = eFlag; }
-    /// table copied to the clipboard by the last private copy
-    bool bTableCopied;
-    bool GetTableCopied()  { return bTableCopied; }
-    void SetTableCopied( bool bCopied )  { bTableCopied = bCopied; }
+
+    bool GetTableCopied()  { return m_bTableCopied; }
+    void SetTableCopied( bool bCopied )  { m_bTableCopied = bCopied; }
 
     bool DeleteTableSel();        ///< Current selection, may be whole table.
 
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index df6995a5174a..fc0f211f06c4 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -706,7 +706,7 @@ SwFEShell::SwFEShell( SwDoc& rDoc, vcl::Window *pWindow, const SwViewOption *pOp
     , m_bCheckForOLEInCaption(false)
     , m_aPasteListeners(GetPasteMutex())
     , m_eTableInsertMode(SwTable::SEARCH_NONE)
-    , bTableCopied(false)
+    , m_bTableCopied(false)
 {
 }
 
@@ -715,7 +715,7 @@ SwFEShell::SwFEShell( SwEditShell& rShell, vcl::Window *pWindow )
     , m_bCheckForOLEInCaption(false)
     , m_aPasteListeners(GetPasteMutex())
     , m_eTableInsertMode(SwTable::SEARCH_NONE)
-    , bTableCopied(false)
+    , m_bTableCopied(false)
 {
 }