diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:53 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:58:53 +0100 |
| commit | e8216218859b2a01a4e9b7f6ff07d79c06d8f444 (patch) | |
| tree | 8bad69041e6324593f25224f01bcb15aea0876e4 /basctl | |
| parent | 227745b536e12358db1d92369ca5321ac53f44ef (diff) | |
| parent | 7f9327e90e1e04325ad091f1e20995da4cb2e929 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
package/source/zippackage/ZipPackageFolder.cxx
Diffstat (limited to 'basctl')
| -rw-r--r-- | basctl/source/basicide/baside2b.cxx | 1 | ||||
| -rw-r--r-- | basctl/source/basicide/basidesh.cxx | 5 | ||||
| -rw-r--r-- | basctl/source/basicide/bastype2.cxx | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index ec77618d42c3..030a152f3509 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -457,6 +457,7 @@ void EditorWindow::KeyInput( const KeyEvent& rKEvt ) { pBindings->Invalidate( SID_SAVEDOC ); pBindings->Invalidate( SID_DOC_MODIFIED ); + pBindings->Invalidate( SID_UNDO ); } if ( rKEvt.GetKeyCode().GetCode() == KEY_INSERT ) pBindings->Invalidate( SID_ATTR_INSERT ); diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 54295cfd6d87..596e1e973b2f 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -304,7 +304,10 @@ void BasicIDEShell::onDocumentSave( const ScriptDocument& /*_rDocument*/ ) void BasicIDEShell::onDocumentSaveDone( const ScriptDocument& /*_rDocument*/ ) { - // not interested in + // #i115671: Update SID_SAVEDOC after saving is completed + SfxBindings* pBindings = BasicIDE::GetBindingsPtr(); + if ( pBindings ) + pBindings->Invalidate( SID_SAVEDOC ); } void BasicIDEShell::onDocumentSaveAs( const ScriptDocument& /*_rDocument*/ ) diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 673f9f0b5cb4..1fd2953c5175 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -373,7 +373,7 @@ void BasicTreeListBox::ImpCreateLibSubEntries( SvLBoxEntry* pLibRootEntry, const // dialogs if ( nMode & BROWSEMODE_DIALOGS ) { - Reference< script::XLibraryContainer > xDlgLibContainer( rDocument.getLibraryContainer( E_SCRIPTS ) ); + Reference< script::XLibraryContainer > xDlgLibContainer( rDocument.getLibraryContainer( E_DIALOGS ) ); if ( xDlgLibContainer.is() && xDlgLibContainer->hasByName( aOULibName ) && xDlgLibContainer->isLibraryLoaded( aOULibName ) ) { |