diff options
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 6 | ||||
| -rw-r--r-- | svx/source/tbxctrls/tbunocontroller.cxx | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 0b1c52b88acf..125d6d21432e 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -898,7 +898,8 @@ bool SvxStyleBox_Impl::EventNotify( NotifyEvent& rNEvt ) case KEY_ESCAPE: SelectEntryPos( nCurSel ); - ReleaseFocus(); + if ( typeid( *GetParent() ) != typeid( sfx2::sidebar::SidebarToolBox ) ) + ReleaseFocus(); bHandled = true; break; } @@ -1416,7 +1417,8 @@ bool SvxFontNameBox_Impl::EventNotify( NotifyEvent& rNEvt ) case KEY_ESCAPE: SetText( aCurText ); - ReleaseFocus_Impl(); + if ( typeid( *GetParent() ) != typeid( sfx2::sidebar::SidebarToolBox ) ) + ReleaseFocus_Impl(); EndPreview(); break; } diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index 96ff89a22a3c..628a9585e922 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -39,6 +39,8 @@ #include <memory> +#include <sfx2/sidebar/SidebarToolBox.hxx> + using namespace ::com::sun::star; namespace { @@ -230,7 +232,8 @@ bool SvxFontSizeBox_Impl::EventNotify( NotifyEvent& rNEvt ) case KEY_ESCAPE: SetText( m_aCurText ); - ReleaseFocus_Impl(); + if ( typeid( *GetParent() ) != typeid( sfx2::sidebar::SidebarToolBox ) ) + ReleaseFocus_Impl(); bHandled = true; break; } |