diff options
| -rw-r--r-- | framework/source/uielement/generictoolbarcontroller.cxx | 8 | ||||
| -rw-r--r-- | sw/sdi/_tabsh.sdi | 4 | ||||
| -rw-r--r-- | sw/sdi/swriter.sdi | 4 | ||||
| -rw-r--r-- | sw/source/uibase/shells/tabsh.cxx | 10 |
4 files changed, 22 insertions, 4 deletions
diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 25f2e0157e9e..e8e49cb30933 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/frame/ControlCommand.hpp> #include <comphelper/propertyvalue.hxx> +#include <svl/imageitm.hxx> #include <vcl/commandinfoprovider.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> @@ -218,6 +219,7 @@ void GenericToolbarController::statusChanged( const FeatureStateEvent& Event ) ItemStatus aItemState; Visibility aItemVisibility; ControlCommand aControlCommand; + SfxImageItem aImageItem; if (( Event.State >>= bValue ) && !m_bEnumCommand ) { @@ -293,6 +295,12 @@ void GenericToolbarController::statusChanged( const FeatureStateEvent& Event ) if ( m_bMadeInvisible ) m_xToolbar->ShowItem( m_nID ); } + else if ( aImageItem.PutValue( Event.State, 0 ) ) + { + m_xToolbar->SetItemImageMirrorMode( m_nID, aImageItem.IsMirrored() ); + if ( m_bMadeInvisible ) + m_xToolbar->ShowItem( m_nID ); + } else if ( m_bMadeInvisible ) m_xToolbar->ShowItem( m_nID ); diff --git a/sw/sdi/_tabsh.sdi b/sw/sdi/_tabsh.sdi index 5d4017b4790d..e4b6b9a2dd6c 100644 --- a/sw/sdi/_tabsh.sdi +++ b/sw/sdi/_tabsh.sdi @@ -141,7 +141,7 @@ interface BaseTextTable FN_TABLE_INSERT_COL_BEFORE // status(final|play) [ ExecMethod = Execute ; - StateMethod = NoState ; + StateMethod = GetState ; DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] @@ -156,7 +156,7 @@ interface BaseTextTable FN_TABLE_INSERT_COL_AFTER // status(final|play) [ ExecMethod = Execute ; - StateMethod = NoState ; + StateMethod = GetState ; DisableFlags="SfxDisableFlags::SwOnProtectedCursor"; ] diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi index bf4ed3ec8b25..49fa8f2bb4e6 100644 --- a/sw/sdi/swriter.sdi +++ b/sw/sdi/swriter.sdi @@ -2643,7 +2643,7 @@ SfxVoidItem InsertColumnDialog FN_TABLE_INSERT_COL_DLG GroupId = SfxGroupId::Table; ] -SfxVoidItem InsertColumnsBefore FN_TABLE_INSERT_COL_BEFORE +SfxImageItem InsertColumnsBefore FN_TABLE_INSERT_COL_BEFORE () [ AutoUpdate = FALSE, @@ -2680,7 +2680,7 @@ SfxVoidItem InsertColumns FN_TABLE_INSERT_COL GroupId = SfxGroupId::Table; ] -SfxVoidItem InsertColumnsAfter FN_TABLE_INSERT_COL_AFTER +SfxImageItem InsertColumnsAfter FN_TABLE_INSERT_COL_AFTER () [ AutoUpdate = FALSE, diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx index 3cbea6b77389..88a4c3e10c15 100644 --- a/sw/source/uibase/shells/tabsh.cxx +++ b/sw/source/uibase/shells/tabsh.cxx @@ -18,6 +18,7 @@ */ #include <hintids.hxx> +#include <svl/imageitm.hxx> #include <svl/numformat.hxx> #include <svl/zforlist.hxx> #include <svl/stritem.hxx> @@ -1358,6 +1359,15 @@ void SwTableShell::GetState(SfxItemSet &rSet) } break; } + case FN_TABLE_INSERT_COL_BEFORE: + case FN_TABLE_INSERT_COL_AFTER: + { + SfxImageItem aImageItem(nSlot); + if (pFormat->GetFrameDir().GetValue() == SvxFrameDirection::Horizontal_RL_TB) + aImageItem.SetMirrored(true); + rSet.Put(aImageItem); + break; + } case FN_TABLE_INSERT_ROW: case FN_TABLE_INSERT_ROW_AFTER: case FN_TABLE_INSERT_ROW_DLG: |