include/svx/svxids.hrc | 2 +- sc/sdi/drawsh.sdi | 2 +- sc/source/ui/drawfunc/drawsh5.cxx | 2 +- sd/sdi/_drvwsh.sdi | 2 +- sd/source/ui/view/drviews2.cxx | 2 +- svx/sdi/svx.sdi | 2 +- svx/source/toolbars/extrusionbar.cxx | 10 +++++----- sw/sdi/drawsh.sdi | 2 +- sw/source/uibase/shells/drawsh.cxx | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-)
New commits: commit e051bb72d6a12e4a10d4a3548eb6a131b80d96fb Author: Andrea Gelmini <[email protected]> AuthorDate: Mon Sep 17 12:04:41 2018 +0200 Commit: Olivier Hallot <[email protected]> CommitDate: Wed Nov 28 15:36:02 2018 +0100 Fix SID_EXTRUSION_TOOGLE -> SID_EXTRUSION_TOGGLE It passed "make check" on Linux. If accepted, I have to update these files: helpcontent2/helpers/help_hid.lst : SID_EXTRUSION_TOOGLE,10960,.uno:ExtrusionToggle helpcontent2/helpers/longnames_commands.csv : SID_EXTRUSION_TOOGLE,.uno:ExtrusionToggle helpcontent2/helpers/uno_hid.lst : SID_EXTRUSION_TOOGLE,10960,.uno:ExtrusionToggle Change-Id: Ie315ef92b6aa8c03c6fc180f4e82d95f28975c2e Reviewed-on: https://gerrit.libreoffice.org/60631 Tested-by: Jenkins Reviewed-by: Olivier Hallot <[email protected]> diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index acd2df632a1a..03c606182239 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -740,7 +740,7 @@ class SfxStringItem; #define SID_VERTICALTEXT_STATE ( SID_SVX_START + 957 ) #define SID_OPEN_XML_FILTERSETTINGS ( SID_SVX_START + 958 ) #define SID_HANGUL_HANJA_CONVERSION ( SID_SVX_START + 959 ) -#define SID_EXTRUSION_TOOGLE ( SID_SVX_START + 960 ) +#define SID_EXTRUSION_TOGGLE ( SID_SVX_START + 960 ) #define SID_EXTRUSION_TILT_DOWN ( SID_SVX_START + 961 ) #define SID_EXTRUSION_TILT_UP ( SID_SVX_START + 962 ) #define SID_EXTRUSION_TILT_LEFT ( SID_SVX_START + 963 ) diff --git a/sc/sdi/drawsh.sdi b/sc/sdi/drawsh.sdi index 2cd59627b427..53916eca91a2 100644 --- a/sc/sdi/drawsh.sdi +++ b/sc/sdi/drawsh.sdi @@ -193,7 +193,7 @@ interface TableDraw SID_FORMATPAINTBRUSH [ ExecMethod = ExecFormatPaintbrush; StateMethod = StateFormatPaintbrush; ] SID_OPEN_XML_FILTERSETTINGS [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] - SID_EXTRUSION_TOOGLE [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] + SID_EXTRUSION_TOGGLE [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] SID_EXTRUSION_TILT_DOWN [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] SID_EXTRUSION_TILT_UP [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] SID_EXTRUSION_TILT_LEFT [ ExecMethod = ExecDrawFunc ; StateMethod = GetDrawFuncState ; ] diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 81b9c310e3d6..4c08816a940e 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -576,7 +576,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) break; } - case SID_EXTRUSION_TOOGLE: + case SID_EXTRUSION_TOGGLE: case SID_EXTRUSION_TILT_DOWN: case SID_EXTRUSION_TILT_UP: case SID_EXTRUSION_TILT_LEFT: diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 5e24ed525be8..e0638004ec9f 100644 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -2376,7 +2376,7 @@ interface DrawView ExecMethod = Execute ; StateMethod = GetMenuState ; ] - SID_EXTRUSION_TOOGLE + SID_EXTRUSION_TOGGLE [ ExecMethod = FuTemporary ; StateMethod = GetMenuState ; diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index a4863b8aca00..5d9a38aefd0e 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -3071,7 +3071,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq) } break; - case SID_EXTRUSION_TOOGLE: + case SID_EXTRUSION_TOGGLE: case SID_EXTRUSION_TILT_DOWN: case SID_EXTRUSION_TILT_UP: case SID_EXTRUSION_TILT_LEFT: diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index d38f9d78a69e..b697c4064f9d 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -9505,7 +9505,7 @@ SfxVoidItem FontNameList SID_ATTR_CHAR_FONTLIST ] -SfxBoolItem ExtrusionToggle SID_EXTRUSION_TOOGLE +SfxBoolItem ExtrusionToggle SID_EXTRUSION_TOGGLE [ AutoUpdate = TRUE, diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index cf14a4a55448..94bb8e326721 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -119,7 +119,7 @@ static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& r sal_uInt16 nSID = rReq.GetSlot(); switch( nSID ) { - case SID_EXTRUSION_TOOGLE: + case SID_EXTRUSION_TOGGLE: { css::uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sExtrusion, sExtrusion ); @@ -458,7 +458,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindi switch( nSID ) { - case SID_EXTRUSION_TOOGLE: + case SID_EXTRUSION_TOGGLE: { if ( !pStrResId ) pStrResId = RID_SVXSTR_UNDO_APPLY_EXTRUSION_ON_OFF; @@ -584,7 +584,7 @@ void ExtrusionBar::execute( SdrView* pSdrView, SfxRequest const & rReq, SfxBindi break; } - if( nSID == SID_EXTRUSION_TOOGLE ) + if( nSID == SID_EXTRUSION_TOGGLE ) { static const sal_uInt16 SidArray[] = { SID_EXTRUSION_TILT_DOWN, @@ -1285,10 +1285,10 @@ void ExtrusionBar::getState( SdrView const * pSdrView, SfxItemSet& rSet ) if(! bOnlyExtrudedCustomShapes) rSet.DisableItem( SID_EXTRUSION_SURFACE_FLOATER ); } - if (rSet.GetItemState(SID_EXTRUSION_TOOGLE) != SfxItemState::UNKNOWN) + if (rSet.GetItemState(SID_EXTRUSION_TOGGLE) != SfxItemState::UNKNOWN) { if( !checkForSelectedCustomShapes( pSdrView, false ) ) - rSet.DisableItem( SID_EXTRUSION_TOOGLE ); + rSet.DisableItem( SID_EXTRUSION_TOGGLE ); } if (rSet.GetItemState(SID_EXTRUSION_DEPTH) != SfxItemState::UNKNOWN) { diff --git a/sw/sdi/drawsh.sdi b/sw/sdi/drawsh.sdi index 0b30d6fba4ce..a50df1289a61 100644 --- a/sw/sdi/drawsh.sdi +++ b/sw/sdi/drawsh.sdi @@ -266,7 +266,7 @@ interface TextDraw : TextDrawBase DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] - SID_EXTRUSION_TOOGLE + SID_EXTRUSION_TOGGLE [ ExecMethod = Execute ; StateMethod = GetState ; diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index baf3939e0282..aa1b2b4c48d6 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -311,7 +311,7 @@ void SwDrawShell::Execute(SfxRequest &rReq) GetView().UpdateWordCount(this, nSlotId); } break; - case SID_EXTRUSION_TOOGLE: + case SID_EXTRUSION_TOGGLE: case SID_EXTRUSION_TILT_DOWN: case SID_EXTRUSION_TILT_UP: case SID_EXTRUSION_TILT_LEFT: _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
