[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/svx svx/source

[Noel Grandin]

 compilerplugins/clang/unusedenumconstants.py |    1 +
 include/svx/sidebar/SelectionAnalyzer.hxx    |    1 -
 include/svx/svdview.hxx                      |    1 -
 svx/source/sidebar/SelectionAnalyzer.cxx     |    5 -----
 svx/source/svdraw/svdview.cxx                |    1 -
 5 files changed, 1 insertion(+), 8 deletions(-)

New commits:
commit ed8773a201bc4954050b87f6d2952525831d3499
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Feb 13 14:52:42 2017 +0200

    remove unused Outline enumerator from SelectionAnalyzer::ViewType enum
    
    Change-Id: I256318046b10f6a75542d5cbf4560bb99a6dfff6
    Reviewed-on: https://gerrit.libreoffice.org/34239
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/svx/sidebar/SelectionAnalyzer.hxx b/include/svx/sidebar/SelectionAnalyzer.hxx
index c4ed2fa..d1aebbc 100644
--- a/include/svx/sidebar/SelectionAnalyzer.hxx
+++ b/include/svx/sidebar/SelectionAnalyzer.hxx
@@ -45,7 +45,6 @@ public:
         Master,
         Handout,
         Notes,
-        Outline
     };
     static vcl::EnumContext::Context GetContextForSelection_SD (
         const SdrMarkList& rMarkList,
diff --git a/svx/source/sidebar/SelectionAnalyzer.cxx b/svx/source/sidebar/SelectionAnalyzer.cxx
index 7ee232f..4598667 100644
--- a/svx/source/sidebar/SelectionAnalyzer.cxx
+++ b/svx/source/sidebar/SelectionAnalyzer.cxx
@@ -117,9 +117,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForSelection_SD (
                 case ViewType::Notes:
                     eContext = EnumContext::Context::NotesPage;
                     break;
-                case ViewType::Outline:
-                    eContext = EnumContext::Context::OutlineText;
-                    break;
             }
             break;
 
@@ -297,8 +294,6 @@ EnumContext::Context SelectionAnalyzer::GetContextForObjectId_SD (
                     return EnumContext::Context::HandoutPage;
                 case ViewType::Notes:
                     return EnumContext::Context::NotesPage;
-                case ViewType::Outline:
-                    return EnumContext::Context::OutlineText;
                 default:
                     return EnumContext::Context::Unknown;
             }
commit 251decd3205af54772780240849b828984e16a6a
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Mon Feb 13 11:51:28 2017 +0200

    remove unused BrkAction enumerator from SdrEventKind
    
    Change-Id: I46c50bbbad5d269b7f15e041db115fa7f37a8168
    Reviewed-on: https://gerrit.libreoffice.org/34205
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py
index e706c18..856a84e 100755
--- a/compilerplugins/clang/unusedenumconstants.py
+++ b/compilerplugins/clang/unusedenumconstants.py
@@ -139,6 +139,7 @@ for d in definitionSet:
          "include/vcl/print.hxx", # NupOrderType, from UI combobox
          "sw/source/uibase/inc/swcont.hxx", # RegionMode, from UI; ContentTypeId, from UI(registry)
          "sw/inc/toxe.hxx", # ToxAuthorityType (from UI)
+         "include/svx/sxekitm.hxx", # SdrEdgeKind (from UI)
         # represents constants from an external API
          "opencl/inc/opencl_device_selection.h",
          "vcl/inc/sft.hxx",
diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx
index a161157..3caee8e 100644
--- a/include/svx/svdview.hxx
+++ b/include/svx/svdview.hxx
@@ -66,7 +66,6 @@ enum class SdrEventKind {
     MoveAction,
     EndAction,
     BackAction,
-    BrkAction,
     EndCreate,
     EndDrag,
     MarkObj,
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 3b602c5..2ee34fc 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -789,7 +789,6 @@ bool SdrView::DoMouseEvent(const SdrViewEvent& rVEvt)
         case SdrEventKind::MoveAction: MovAction(aLogicPos); bRet=true; break;
         case SdrEventKind::EndAction: EndAction(); bRet=true; break;
         case SdrEventKind::BackAction: BckAction(); bRet=true; break;
-        case SdrEventKind::BrkAction: BrkAction(); bRet=true; break;
         case SdrEventKind::EndMark  : EndAction(); bRet=true; break;
         case SdrEventKind::BrkMark  : {
             BrkAction();