[Libreoffice-commits] core.git: include/vcl vcl/source

[Kshitij Pathania]

 include/vcl/EnumContext.hxx       |    3 ++-
 vcl/source/window/EnumContext.cxx |    9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 508f14b13614c9f5f9611589e7f744d1bc523ff3
Author: Kshitij Pathania <kshitijpathania at gmail.com>
Date:   Thu Jul 5 10:15:21 2018 +0530

    Conserved the alphabetical order in contexts.
    
    ThreeDObject is remained on top as its entry begin with 3.
    All others are sorted now except the generalised ones in last.
    
    Change-Id: Id56550da450f0d2a0dd770a78360d20ada90f048
    Reviewed-on: https://gerrit.libreoffice.org/56984
    Tested-by: Jenkins
    Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>

diff --git a/include/vcl/EnumContext.hxx b/include/vcl/EnumContext.hxx
index d5f1e91aa1f4..dfdc8e8a8c94 100644
--- a/include/vcl/EnumContext.hxx
+++ b/include/vcl/EnumContext.hxx
@@ -90,13 +90,14 @@ public:
         OLE,
         OutlineText,
         Pivot,
+        Printpreview,
         Series,
         SlidesorterPage,
         Table,
         Text,
         TextObject,
         Trendline,
-        Printpreview,
+
         // Default context of an application.  Do we need this?
         Default,
 
diff --git a/vcl/source/window/EnumContext.cxx b/vcl/source/window/EnumContext.cxx
index 895333e16e43..ec8249d67f1c 100644
--- a/vcl/source/window/EnumContext.cxx
+++ b/vcl/source/window/EnumContext.cxx
@@ -160,9 +160,6 @@ void EnumContext::ProvideContextContainers()
     if (!maContextMap.empty())
         return;
 
-    AddEntry("any", Context::Any);
-    AddEntry("default", Context::Default);
-    AddEntry("empty", Context::Empty);
     AddEntry("3DObject", Context::ThreeDObject);
     AddEntry("Annotation", Context::Annotation);
     AddEntry("Auditing", Context::Auditing);
@@ -188,14 +185,18 @@ void EnumContext::ProvideContextContainers()
     AddEntry("OLE", Context::OLE);
     AddEntry("OutlineText", Context::OutlineText);
     AddEntry("Pivot", Context::Pivot);
+    AddEntry("Printpreview", Context::Printpreview);
     AddEntry("Series", Context::Series);
     AddEntry("SlidesorterPage", Context::SlidesorterPage);
     AddEntry("Table", Context::Table);
     AddEntry("Text", Context::Text);
     AddEntry("TextObject", Context::TextObject);
     AddEntry("Trendline", Context::Trendline);
-    AddEntry("Printpreview", Context::Printpreview);
 
+    // other general contexts
+    AddEntry("any", Context::Any);
+    AddEntry("default", Context::Default);
+    AddEntry("empty", Context::Empty);
 }
 
 EnumContext::Context EnumContext::GetContextEnum (const ::rtl::OUString& rsContextName)