[Libreoffice-commits] core.git: include/sfx2 sd/inc sd/sdi sfx2/sdi

Noel Grandin noel.grandin at collabora.co.uk
Mon Mar 27 06:10:25 UTC 2017


 include/sfx2/sfxsids.hrc |    1 
 sd/inc/app.hrc           |    9 +--
 sd/sdi/_drvwsh.sdi       |   20 --------
 sd/sdi/sdraw.sdi         |  109 -----------------------------------------------
 sd/sdi/tables.sdi        |    5 --
 sfx2/sdi/sfx.sdi         |   18 -------
 6 files changed, 3 insertions(+), 159 deletions(-)

New commits:
commit ee045805e640058d798029ce20b7d9f75d138b38
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date:   Fri Mar 24 13:06:46 2017 +0200

    remove unhandled SID commands in sd
    
    checked to make sure none of the related .uno commands are present
    in any .xcu files.
    
    Change-Id: Iec555836a0a926e070b7632dc1205decf49d331f
    Reviewed-on: https://gerrit.libreoffice.org/35615
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index f497bea5a00b..81b113b58160 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -541,7 +541,6 @@
 #define SID_SHOW_BROWSER                    (SID_SVX_START + 163)
 #define SID_GALLERY_BG_BRUSH                (SID_SVX_START + 279)
 #define SID_SEARCH_OPTIONS                  (SID_SVX_START + 281)
-#define SID_ZOOM                            (SID_SVX_START + 289)
 #define SID_SEARCH_ITEM                     (SID_SVX_START + 291)
 #define SID_SIDEBAR                         (SID_SVX_START + 336)
 #define SID_NOTEBOOKBAR                     (SID_SVX_START + 338)
diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc
index 2bf78397a1b3..0897e6c38fbe 100644
--- a/sd/inc/app.hrc
+++ b/sd/inc/app.hrc
@@ -84,7 +84,7 @@
 #define SID_COMBINE                         (SID_SD_START+26)
 #define SID_NAME_GROUP                      (SID_SD_START+27)
 #define SID_DRAWTBX_CONNECTORS              (SID_SD_START+28)
-#define SID_TEXTALIGNMENT                   (SID_SD_START+29)
+    // FREE
 // In svxids.hrc: SID_BEZIER_ELIMINATE_POINTS   (SID_SD_START+30)
 #define SID_MOREFRONT                       (SID_SD_START+31)
 #define SID_MOREBACK                        (SID_SD_START+32)
@@ -104,7 +104,7 @@
 #define SID_MODIFYLAYER                     (SID_SD_START+45)
 #define SID_PAGEMODE                        (SID_SD_START+46)
 #define SID_LAYERMODE                       (SID_SD_START+47)
-#define SID_STARTAPP                        (SID_SD_START+49)
+    // FREE
 #define SID_MASTERPAGE                      (SID_SD_START+50)
 // Navigation between slides
 #define SID_GO_TO_NEXT_PAGE                 (SID_SD_START+51)
@@ -128,7 +128,6 @@
 #define SID_HANDOUT_MASTER_MODE             (SID_SD_START+70)
 #define SID_LINEEND_POLYGON                 (SID_SD_START+71)
     // FREE
-#define SID_GRAPHIC_EXPORT                  (SID_SD_START+73)
 #define SID_SWITCH_POINTEDIT                (SID_SD_START+74)
     // FREE
 // In svxids.hrc: SID_TEXTEDIT              (SID_SD_START+76)
@@ -278,7 +277,7 @@
 // In svxids.hrc: SID_BEZIERTO                  (SID_SD_START+252)
 #define SID_PAGESIZE                        (SID_SD_START+253)
 #define SID_PAGEMARGIN                      (SID_SD_START+254)
-#define SID_SELECTAT                        (SID_SD_START+256)
+    // FREE
 #define SID_COLORVIEW                       (SID_SD_START+257)
     // FREE
 #define SID_GETRED                          (SID_SD_START+259)
@@ -421,7 +420,6 @@
 #define SID_LEFT_PANE_DRAW                  (SID_SD_START+415)
         // FREE
 #define SID_NOTES_WINDOW                    (SID_SD_START+417)
-#define SID_SWITCH_SHELL_PANE               (SID_SD_START+418)
         // FREE
 #define SID_NORMAL_MULTI_PANE_GUI           (SID_SD_START+420)
 #define SID_SLIDE_SORTER_MULTI_PANE_GUI     (SID_SD_START+421)
@@ -450,7 +448,6 @@
 // Add companion for the SID_HIDE_SLIDE (that is defined in svx)
 #define SID_SHOW_SLIDE                      (SID_SD_START+441)
 
-#define SID_TABLE_TOOLBOX                   (SID_SD_START+443)
     // FREE
 #define SID_ZOOM_MODE                       (SID_SD_START+447)
 #define SID_HIDE_LAST_LEVEL                 (SID_SD_START+448)
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index b5f40fff9084..e2206f7ca94a 100644
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -432,11 +432,6 @@ interface DrawView
         ExecMethod = FuTemporary ;
         StateMethod = GetMenuState ;
     ]
-    SID_SELECTAT // ole : no, status : play rec
-    [
-        ExecMethod = FuTemporary ;
-        StateMethod = GetMenuState ;
-    ]
     SID_PRESENTATION_LAYOUT // ole : no, status : ?
     [
         ExecMethod = FuTemporary ;
@@ -669,11 +664,6 @@ interface DrawView
         ExecMethod = FuSupport ;
         StateMethod = GetMenuState ;
     ]
-    SID_ZOOM // ole : no, status : play rec
-    [
-        ExecMethod = FuSupport ;
-        StateMethod = GetMenuState ;
-    ]
     SID_DELETE // ole : no, status : ?
     [
         ExecMethod = FuSupport ;
@@ -1633,11 +1623,6 @@ interface DrawView
         ExecMethod = FuTemporary ;
         StateMethod = GetMenuState ;
     ]
-    SID_GRAPHIC_EXPORT // ole : no, status : ?
-    [
-        ExecMethod = FuTemporary ;
-        StateMethod = GetMenuState ;
-    ]
     SID_NAME_GROUP // ole : no, status : ?
     [
         ExecMethod = FuTemporary ;
@@ -1680,11 +1665,6 @@ interface DrawView
         GroupId = GID_DOCUMENT ;
     MenuConfig = TRUE ;
     ]
-    SID_TEXTALIGNMENT // ole : no, status : ?
-    [
-        ExecMethod = FuTemporary ;
-        StateMethod = GetMenuState ;
-    ]
     SID_COLOR_CONTROL // ole : no, status : ?
     [
         ExecMethod = FuTemporary ;
diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index bbaf03a7683e..58eb1559a9a9 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -1848,23 +1848,6 @@ SfxVoidItem GradientStartColor SID_SETGRADSTARTCOLOR
     GroupId = GID_FORMAT;
 ]
 
-SfxVoidItem GraphicExport SID_GRAPHIC_EXPORT
-()
-[
-    AutoUpdate = FALSE,
-    FastCall = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_APPLICATION;
-]
-
 SfxBoolItem GridFront SID_GRID_FRONT
 
 [
@@ -3461,23 +3444,6 @@ SvxObjectItem RulerObject SID_RULER_OBJECT
     GroupId = ;
 ]
 
-SfxVoidItem SelectAt SID_SELECTAT
-(SfxUInt32Item AnchorX ID_VAL_ANCHOR_X,SfxUInt32Item AnchorY ID_VAL_ANCHOR_Y,SfxUInt32Item Left ID_VAL_MOUSESTART_X,SfxUInt32Item Top ID_VAL_MOUSESTART_Y,SfxUInt32Item Right ID_VAL_LENGTH_X,SfxUInt32Item Bottom ID_VAL_LENGTH_Y)
-[
-    AutoUpdate = FALSE,
-    FastCall = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_EDIT;
-]
-
 SfxVoidItem SelectGradient SID_SELECTGRADIENT
 (SfxStringItem Name ID_VAL_INDEX)
 [
@@ -3741,23 +3707,6 @@ SfxBoolItem Sphere SID_3D_SPHERE
     GroupId = GID_DRAWING;
 ]
 
-SfxVoidItem StartApplication SID_STARTAPP
-()
-[
-    AutoUpdate = FALSE,
-    FastCall = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_APPLICATION;
-]
-
 SfxVoidItem SummaryPage SID_SUMMARY_PAGE
 ()
 [
@@ -3825,24 +3774,6 @@ SfxVoidItem SwitchPointEdit SID_SWITCH_POINTEDIT
     GroupId = GID_VIEW;
 ]
 
-SfxBoolItem TextAlignment SID_TEXTALIGNMENT
-
-[
-    AutoUpdate = FALSE,
-    FastCall = FALSE,
-    ReadOnlyDoc = FALSE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-
-
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_FORMAT;
-]
-
 SfxVoidItem TextAttributes SID_TEXTATTR_DLG
 (SfxBoolItem IsAutoGrow ID_VAL_DUMMY0,SfxBoolItem IsCenter ID_VAL_DUMMY1,SfxBoolItem IsFitToSize ID_VAL_DUMMY2,SfxUInt32Item LeftBorder ID_VAL_DUMMY3,SfxUInt32Item RightBorder ID_VAL_DUMMY4,SfxUInt32Item TopBorder ID_VAL_DUMMY5,SfxUInt32Item BottomBorder ID_VAL_DUMMY6)
 [
@@ -4238,22 +4169,6 @@ SfxBoolItem DisplayMasterObjects SID_DISPLAY_MASTER_OBJECTS
     GroupId = GID_VIEW;
 ]
 
-SfxVoidItem TableToolBox SID_TABLE_TOOLBOX
-[
-    AutoUpdate = FALSE,
-    FastCall = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_APPLICATION;
-]
-
 SfxVoidItem DistributeColumns SID_TABLE_DISTRIBUTE_COLUMNS
 ()
 [
@@ -4428,30 +4343,6 @@ SfxInt32Item SwitchViewShell SID_SWITCH_SHELL
     GroupId = GID_VIEW;
 ]
 
-/** This item holds the requested pane of the multi pane GUI in which a
-    change of the view shell is requested by a call to the SID_SWITCH_SHELL
-    slot.
-*/
-SfxInt32Item SwitchViewShellPane SID_SWITCH_SHELL_PANE
-[
-    // flags:
-    AutoUpdate = FALSE,
-    FastCall = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Asynchron;
-
-
-    // config:
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_VIEW;
-]
-
 SfxBoolItem LeftPaneImpress SID_LEFT_PANE_IMPRESS
 
 [
diff --git a/sd/sdi/tables.sdi b/sd/sdi/tables.sdi
index 4e234a75aefd..ba9488841933 100644
--- a/sd/sdi/tables.sdi
+++ b/sd/sdi/tables.sdi
@@ -18,11 +18,6 @@
 
 shell TableObjectBar
 {
-    SID_TABLE_TOOLBOX // ole : no, status : ?
-    [
-        ExecMethod = Execute ;
-        StateMethod = GetState ;
-    ]
     SID_FRAME_LINESTYLE
     [
         ExecMethod = Execute;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 573afcdb563e..0619d990314e 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -4831,24 +4831,6 @@ SfxVoidItem ZoomMinus SID_ZOOM_IN
 ]
 
 
-SfxVoidItem Zooming SID_ZOOM
-(SfxUInt32Item ZoomScale ID_VAL_ZOOM)
-[
-    AutoUpdate = FALSE,
-    FastCall = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = FALSE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = ;
-]
-
-
 SfxVoidItem ZoomNext SID_ZOOM_NEXT
 ()
 [


More information about the Libreoffice-commits mailing list