summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Weghorn <m.weghorn@posteo.de>2020-05-13 16:05:50 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2020-05-14 09:57:07 +0200
commit11079fa85c9698ac333f43303636c4fff31b0976 (patch)
treef9ffdc72da1bd31788b21a2a8d642c97a43ac6c6
parent56d381c3deb213a40c54ce6e194f79f0334b5d7b (diff)
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@posteo.de>
-rw-r--r--toolkit/inc/controls/controlmodelcontainerbase.hxx4
-rw-r--r--toolkit/source/controls/controlmodelcontainerbase.cxx2
2 files changed, 3 insertions, 3 deletions
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)