[Libreoffice-commits] core.git: Branch 'libreoffice-7-6' - bin/find-can-be-private-symbols.functions.results sw/inc

[Mike Kaganski (via logerrit)]

 bin/find-can-be-private-symbols.functions.results |    2 --
 sw/inc/doc.hxx                                    |    2 +-
 sw/inc/editsh.hxx                                 |    2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 32ba86400908aae2e09c826a2b589ce10319e6a7
Author:     Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Sat Oct 21 14:28:27 2023 +0300
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Oct 27 10:08:07 2023 +0200

    Make ConvertFieldsToText private
    
    Change-Id: Ie3d22b63260d2b2b05a46c5b2a6ca915cf9d4bcd
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158304
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158475
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/bin/find-can-be-private-symbols.functions.results 
b/bin/find-can-be-private-symbols.functions.results
index e3cb6f130544..e534ae5aa940 100644
--- a/bin/find-can-be-private-symbols.functions.results
+++ b/bin/find-can-be-private-symbols.functions.results
@@ -11939,7 +11939,6 @@ SwDoc::CloneSdrObj(SdrObject const&, bool, bool)
 SwDoc::CompareDoc(SwDoc const&)
 SwDoc::ContainsHiddenChars() const
 SwDoc::ContainsPageDesc(SwPageDesc const*, unsigned long*) const
-SwDoc::ConvertFieldsToText(SwRootFrame const&)
 SwDoc::CopyCharFormat(SwCharFormat const&)
 SwDoc::CopyFormat(SwFormat const&, SwFormatsBase const&, SwFormat* 
(SwDoc::*)(rtl::OUString const&, SwFormat*, bool, bool), SwFormat const&)
 SwDoc::CopyFormatArr(SwFormatsBase const&, SwFormatsBase const&, SwFormat* 
(SwDoc::*)(rtl::OUString const&, SwFormat*, bool, bool), SwFormat&)
@@ -12354,7 +12353,6 @@ SwEditShell::ClearAutomaticContour()
 SwEditShell::CollectAdvancedClassification()
 SwEditShell::CollectParagraphClassification()
 SwEditShell::CompareDoc(SwDoc const&)
-SwEditShell::ConvertFieldsToText()
 SwEditShell::Copy(SwEditShell&)
 SwEditShell::CopySelToDoc(SwDoc&)
 SwEditShell::CreateExtTextInput(o3tl::strong_int<unsigned short, 
LanguageTypeTag>)
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 04e12b2a4967..a08638d9c625 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1445,7 +1445,7 @@ public:
     // restore the invisible content if it's available on the undo stack
     bool RestoreInvisibleContent();
 
-    bool ConvertFieldsToText(SwRootFrame const& rLayout);
+    SAL_DLLPRIVATE bool ConvertFieldsToText(SwRootFrame const& rLayout);
 
     // Create sub-documents according to given collection.
     // If no collection is given, use chapter styles for 1st level.
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 766e504b4072..3813c33a6241 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -186,7 +186,7 @@ public:
     void CountWords( SwDocStat& rStat ) const;
 
     /// Replace fields by text - mailmerge support.
-    bool ConvertFieldsToText();
+    SAL_DLLPRIVATE bool ConvertFieldsToText();
 
     /// Set all numbering start points to a fixed value - mailmerge support.
     void SetNumberingRestart();