You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ar...@apache.org on 2012/10/07 13:47:35 UTC
svn commit: r1395275 - in /incubator/ooo/trunk/main/basctl/source/basicide:
baside2b.cxx baside3.cxx basidesh.cxx
Author: arielch
Date: Sun Oct 7 11:47:35 2012
New Revision: 1395275
URL: http://svn.apache.org/viewvc?rev=1395275&view=rev
Log:
#i108689# - Invalidate Basic IDE slots in order to trigger feature update
Modified:
incubator/ooo/trunk/main/basctl/source/basicide/baside2b.cxx
incubator/ooo/trunk/main/basctl/source/basicide/baside3.cxx
incubator/ooo/trunk/main/basctl/source/basicide/basidesh.cxx
Modified: incubator/ooo/trunk/main/basctl/source/basicide/baside2b.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basctl/source/basicide/baside2b.cxx?rev=1395275&r1=1395274&r2=1395275&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basctl/source/basicide/baside2b.cxx (original)
+++ incubator/ooo/trunk/main/basctl/source/basicide/baside2b.cxx Sun Oct 7 11:47:35 2012
@@ -356,7 +356,11 @@ void __EXPORT EditorWindow::MouseButtonU
pEditView->MouseButtonUp( rEvt );
SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
if ( pBindings )
+ {
+ pBindings->Invalidate( SID_COPY );
+ pBindings->Invalidate( SID_CUT );
pBindings->Invalidate( SID_BASICIDE_STAT_POS );
+ }
}
}
@@ -454,15 +458,20 @@ void __EXPORT EditorWindow::KeyInput( co
SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
if ( pBindings )
{
+ pBindings->Invalidate( SID_CUT );
+ pBindings->Invalidate( SID_COPY );
pBindings->Invalidate( SID_BASICIDE_STAT_POS );
+
if ( rKEvt.GetKeyCode().GetGroup() == KEYGROUP_CURSOR )
pBindings->Update( SID_BASICIDE_STAT_POS );
+
if ( !bWasModified && pEditEngine->IsModified() )
{
pBindings->Invalidate( SID_SAVEDOC );
pBindings->Invalidate( SID_DOC_MODIFIED );
pBindings->Invalidate( SID_UNDO );
}
+
if ( rKEvt.GetKeyCode().GetCode() == KEY_INSERT )
pBindings->Invalidate( SID_ATTR_INSERT );
}
Modified: incubator/ooo/trunk/main/basctl/source/basicide/baside3.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basctl/source/basicide/baside3.cxx?rev=1395275&r1=1395274&r2=1395275&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basctl/source/basicide/baside3.cxx (original)
+++ incubator/ooo/trunk/main/basctl/source/basicide/baside3.cxx Sun Oct 7 11:47:35 2012
@@ -188,6 +188,8 @@ void DialogWindow::MouseButtonUp( const
pBindings->Invalidate( SID_SHOW_PROPERTYBROWSER );
pBindings->Invalidate( SID_DOC_MODIFIED );
pBindings->Invalidate( SID_SAVEDOC );
+ pBindings->Invalidate( SID_COPY );
+ pBindings->Invalidate( SID_CUT );
}
}
@@ -202,6 +204,8 @@ void DialogWindow::MouseMove( const Mous
void DialogWindow::KeyInput( const KeyEvent& rKEvt )
{
+ SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
+
if( rKEvt.GetKeyCode() == KEY_BACKSPACE )
{
BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
@@ -214,9 +218,8 @@ void DialogWindow::KeyInput( const KeyEv
}
else
{
- SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
if( pBindings && rKEvt.GetKeyCode() == KEY_TAB )
- pBindings->Invalidate( SID_SHOW_PROPERTYBROWSER );
+ pBindings->Invalidate( SID_SHOW_PROPERTYBROWSER );
if( !pEditor->KeyInput( rKEvt ) )
{
@@ -224,6 +227,13 @@ void DialogWindow::KeyInput( const KeyEv
Window::KeyInput( rKEvt );
}
}
+
+ // may be KEY_TAB, KEY_BACKSPACE, KEY_ESCAPE
+ if( pBindings )
+ {
+ pBindings->Invalidate( SID_COPY );
+ pBindings->Invalidate( SID_CUT );
+ }
}
void DialogWindow::Command( const CommandEvent& rCEvt )
Modified: incubator/ooo/trunk/main/basctl/source/basicide/basidesh.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/basctl/source/basicide/basidesh.cxx?rev=1395275&r1=1395274&r2=1395275&view=diff
==============================================================================
--- incubator/ooo/trunk/main/basctl/source/basicide/basidesh.cxx (original)
+++ incubator/ooo/trunk/main/basctl/source/basicide/basidesh.cxx Sun Oct 7 11:47:35 2012
@@ -947,6 +947,9 @@ void BasicIDEShell::InvalidateBasicIDESl
SfxBindings* pBindings = BasicIDE::GetBindingsPtr();
if ( pBindings )
{
+ pBindings->Invalidate( SID_COPY );
+ pBindings->Invalidate( SID_CUT );
+ pBindings->Invalidate( SID_PASTE );
pBindings->Invalidate( SID_UNDO );
pBindings->Invalidate( SID_REDO );
pBindings->Invalidate( SID_SAVEDOC );