strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#104198# Macro dialog: Set sellection to Basic of active document

Browse source
This commit is contained in:
Andreas Bregas 2002-11-06 15:52:23 +00:00
parent bcb3f833e5
commit f7865c7659
1 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
basctl/source/basicide/macrodlg.cxx
View file

@ -2,9 +2,9 @@
* *
* $RCSfile: macrodlg.cxx,v $ * $RCSfile: macrodlg.cxx,v $
* *
* $Revision: 1.22 $ * $Revision: 1.23 $
* *
* last change: $Author: ab $ $Date: 2002-11-01 12:12:45 $ * last change: $Author: ab $ $Date: 2002-11-06 16:52:23 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -149,6 +149,8 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bScanBasics ) :
aNewModButton.Hide(); // default aNewModButton.Hide(); // default
aMacrosSaveInTxt.Hide(); // default aMacrosSaveInTxt.Hide(); // default
aMacrosInTxt.SetStyle( WB_NOMULTILINE | WB_PATHELLIPSIS );
aMacroNameEdit.SetModifyHdl( LINK( this, MacroChooser, EditModifyHdl ) ); aMacroNameEdit.SetModifyHdl( LINK( this, MacroChooser, EditModifyHdl ) );
aBasicBox.SetSelectHdl( LINK( this, MacroChooser, BasicSelectHdl ) ); aBasicBox.SetSelectHdl( LINK( this, MacroChooser, BasicSelectHdl ) );
@ -325,6 +327,41 @@ short __EXPORT MacroChooser::Execute()
} }
} }
// #104198 Check if "wrong" document is active
SvLBoxEntry* pSelectedEntry = aBasicBox.GetCurEntry();
SbxItem aSbxItem = aBasicBox.GetSbxItem( pSelectedEntry );
SfxObjectShell* pSelectedShell = aSbxItem.GetShell();
// App Basic is always ok, so only check if shell was found
if( pSelectedShell )
{
SfxObjectShell* pCurShell = SfxObjectShell::Current();
if( pCurShell != pSelectedShell )
{
// Search for the right entry
ULONG nRootPos = 0;
SvLBoxEntry* pRootEntry = aBasicBox.GetEntry( nRootPos );
while( pRootEntry )
{
SbxItem aCmpSbxItem = aBasicBox.GetSbxItem( pRootEntry );
SfxObjectShell* pCmpShell = aCmpSbxItem.GetShell();
if( pCmpShell == pCurShell )
{
SvLBoxEntry* pEntry = pRootEntry;
SvLBoxEntry* pLastValid = pEntry;
while ( pEntry )
{
pLastValid = pEntry;
pEntry = aBasicBox.FirstChild( pEntry );
}
if( pLastValid )
aBasicBox.SetCurEntry( pLastValid );
}
pRootEntry = aBasicBox.GetEntry( ++nRootPos );
}
}
}
CheckButtons(); CheckButtons();
UpdateFields(); UpdateFields();