[Libreoffice-commits] core.git: cui/source sfx2/source

[Stephan Bergmann (via logerrit)]

 cui/source/options/treeopt.cxx         |    1 -
 sfx2/source/view/sfxbasecontroller.cxx |    1 -
 2 files changed, 2 deletions(-)

New commits:
commit 6548de27c4804f40ff8b0f7e1c3eb664c64db655
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu Dec 5 17:39:20 2019 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu Dec 5 22:16:47 2019 +0100

    Remove some unused friend declarations
    
    ...which no longer find the befriended classes anyway (and would need to e.g. be
    rewritten using non-elabortated type names if they were still relevant) after
    f853ec317f6af1b8c65cc5bd758371689c75118d "Extend loplugin:external to warn about
    classes" moved the befriending classes into (unnamed) sub-namespaces.  (Except
    on Windows, but where clang-cl now flagged them with "error: unqualified friend
    declaration referring to type outside of the nearest enclosing namespace is a
    Microsoft extension; add a nested name specifier
    [-Werror,-Wmicrosoft-unqualified-friend]".)
    
    Change-Id: Iad7a184dbb62b130f6d93693c16cfd5c9b08fcc1
    Reviewed-on: https://gerrit.libreoffice.org/84578
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 9554159bc54a..5f694550c083 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -226,7 +226,6 @@ namespace {
 class MailMergeCfg_Impl : public utl::ConfigItem
 {
 private:
-    friend class SvxEMailTabPage;
     // variables
     bool bIsEmailSupported;
 
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index dc2c6964938c..305e5b5825eb 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -176,7 +176,6 @@ namespace {
 
 class SfxStatusIndicator : public ::cppu::WeakImplHelper< task::XStatusIndicator, lang::XEventListener >
 {
-friend class SfxBaseController;
     Reference < XController > xOwner;
     Reference < task::XStatusIndicator > xProgress;
     SfxWorkWindow*          pWorkWindow;