[Libreoffice-commits] core.git: framework/inc framework/source svtools/source vcl/source

[Libreoffice Gerrit user]

 framework/inc/classes/framecontainer.hxx |    2 +-
 framework/source/services/frame.cxx      |    2 +-
 svtools/source/contnr/iconview.cxx       |    4 ++--
 vcl/source/treelist/treelistbox.cxx      |    4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f0bf6a4178dfb3a75d01c4b8b48531a079b75b5b
Author:     Andrea Gelmini <andrea.gelmini at gelma.net>
AuthorDate: Fri Nov 9 07:49:16 2018 +0100
Commit:     Olivier Hallot <olivier.hallot at libreoffice.org>
CommitDate: Wed Nov 28 15:33:45 2018 +0100

    Fix typo deactive
    
    Change-Id: I68a87a9435784f949f1e7b730270641bd8e05b43
    Reviewed-on: https://gerrit.libreoffice.org/63149
    Tested-by: Jenkins
    Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>

diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index 5da67fcf49ba..5a82d3f9a315 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -45,7 +45,7 @@ typedef ::std::vector< css::uno::Reference< css::frame::XFrame > >  TFrameContai
     @descr          Every object of frame, task or desktop hold reference to his children. These container is used as helper
                     to do this. Some helper-classes like OFrames or OTasksAccess use it to. They hold a pointer to an instance
                     of this class, which is a member of a frame, task or desktop! You can append and remove frames.
-                    It's possible to set one of these frames as active or deactive. You could have full index-access to
+                    It's possible to set one of these frames as active or deactivate. You could have full index-access to
                     container-items.
 
     @devstatus      ready to use
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 66fe3032356a..8f3c36fefbcb 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -2111,7 +2111,7 @@ void SAL_CALL Frame::disposing()
     // If somewhere called dispose() whitout close() before - normally no dialogs
     // should exist. Otherwise it's the problem of the outside caller.
     // Note:
-    //      (a) Do it after stopWindowListening(). May that force some active/deactive
+    //      (a) Do it after stopWindowListening(). May that force some active/deactivate
     //          notifications which we don't need here really.
     //      (b) Don't forget to save the old value of IsDialogCancelEnabled() to
     //          restore it afterwards (to not kill headless mode).
diff --git a/svtools/source/contnr/iconview.cxx b/svtools/source/contnr/iconview.cxx
index 31f80325f40d..c323a693f045 100644
--- a/svtools/source/contnr/iconview.cxx
+++ b/svtools/source/contnr/iconview.cxx
@@ -141,8 +141,8 @@ void IconView::PaintEntry(SvTreeListEntry& rEntry, long nX, long nY,
         if (pViewDataEntry->IsHighlighted())
         {
             Color aNewWallColor = rSettings.GetHighlightColor();
-            // if the face color is bright then the deactive color is also bright
-            // -> so you can't see any deactive selection
+            // if the face color is bright then the deactivate color is also bright
+            // -> so you can't see any deactivate selection
             if (bHideSelection && !rSettings.GetFaceColor().IsBright()
                && aWallpaper.GetColor().IsBright() != rSettings.GetDeactiveColor().IsBright())
             {
diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index 8962b8410664..fe09ca2494cb 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -2715,8 +2715,8 @@ void SvTreeListBox::PaintEntry1(SvTreeListEntry& rEntry, long nLine, vcl::Render
         if (pViewDataEntry->IsHighlighted() && bSelTab)
         {
             Color aNewWallColor = rSettings.GetHighlightColor();
-            // if the face color is bright then the deactive color is also bright
-            // -> so you can't see any deactive selection
+            // if the face color is bright then the deactivate color is also bright
+            // -> so you can't see any deactivate selection
             if (bHideSelection && !rSettings.GetFaceColor().IsBright()
                && aWallpaper.GetColor().IsBright() != rSettings.GetDeactiveColor().IsBright())
             {