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

[Michael Weghorn (via logerrit)]

 toolkit/inc/controls/controlmodelcontainerbase.hxx    |    4 ++--
 toolkit/source/controls/controlmodelcontainerbase.cxx |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 11079fa85c9698ac333f43303636c4fff31b0976
Author:     Michael Weghorn <m.weghorn at posteo.de>
AuthorDate: Wed May 13 16:05:50 2020 +0200
Commit:     Michael Weghorn <m.weghorn at posteo.de>
CommitDate: Thu May 14 09:57:07 2020 +0200

    Rename ContainerControl_IBase -> ControlContainer_IBase
    
    The only class inheriting from it is ControlContainerBase,
    so make the naming more consistent, also to match the
    naming pattern used elsewhere.
    
    Change-Id: I91739fb105f97605a3c279100b8c4e666aa3b010
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94139
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.weghorn at posteo.de>

diff --git a/toolkit/inc/controls/controlmodelcontainerbase.hxx b/toolkit/inc/controls/controlmodelcontainerbase.hxx
index 3c5c3993ccc1..31ff2cdb9e73 100644
--- a/toolkit/inc/controls/controlmodelcontainerbase.hxx
+++ b/toolkit/inc/controls/controlmodelcontainerbase.hxx
@@ -213,9 +213,9 @@ typedef ::cppu::AggImplInheritanceHelper3   < UnoControlContainer
                             ,   css::container::XContainerListener
                             ,   css::util::XChangesListener
                             ,   css::util::XModifyListener
-                            >   ContainerControl_IBase;
+                            >   ControlContainer_IBase;
 
-class ControlContainerBase : public ContainerControl_IBase
+class ControlContainerBase : public ControlContainer_IBase
 {
 protected:
     css::uno::Reference< css::uno::XComponentContext >  m_xContext;
diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx
index ebf5cfdf63b6..bff374628d49 100644
--- a/toolkit/source/controls/controlmodelcontainerbase.cxx
+++ b/toolkit/source/controls/controlmodelcontainerbase.cxx
@@ -1251,7 +1251,7 @@ void SAL_CALL ResourceListener::disposing(
 
 
 ControlContainerBase::ControlContainerBase( const Reference< XComponentContext >& rxContext )
-    :ContainerControl_IBase()
+    :ControlContainer_IBase()
     ,m_xContext(rxContext)
     ,mbSizeModified(false)
     ,mbPosModified(false)