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

#102059# Changed macros in FixedText

Browse source
This commit is contained in:
Andreas Bregas 2002-08-06 08:12:20 +00:00
parent ee8f0a80f6
commit bd4ebe175d
4 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,9 +2,9 @@
*
* $RCSfile: macrodlg.cxx,v $
*
* $Revision: 1.19 $
* $Revision: 1.20 $
*
* last change: $Author: ab $ $Date: 2002-07-30 13:10:21 $
* last change: $Author: ab $ $Date: 2002-08-06 09:12:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -130,6 +130,8 @@ MacroChooser::MacroChooser( Window* pParnt, BOOL bScanBasics ) :
// die BasicIDE.
bForceStoreBasic = FALSE;
aMacrosInTxtBaseStr = aMacrosInTxt.GetText();
aMacroBox.SetSelectionMode( SINGLE_SELECTION );
aMacroBox.SetHighlightRange(); // ueber ganze Breite selektieren
@ -576,6 +578,8 @@ IMPL_LINK( MacroChooser, MacroSelectHdl, SvTreeListBox *, pBox )
IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
{
static String aSpaceStr = String::CreateFromAscii(" ");
// Wird auch gerufen, wenn Deselektiert!
// 2 Funktionsaufrufe in jedem SelectHdl, nur weil Olli
// keinen separatren DeselctHdl einfuehren wollte:
@ -588,6 +592,12 @@ IMPL_LINK( MacroChooser, BasicSelectHdl, SvTreeListBox *, pBox )
aMacroBox.Clear();
if ( pModule )
{
String aStr = aMacrosInTxtBaseStr;
aStr += aSpaceStr;
aStr += pModule->GetName();
aMacrosInTxt.SetText( aStr );
// Die Macros sollen in der Reihenfolge angezeigt werden,
// wie sie im Modul stehen.
MacroList aMacros;

5
basctl/source/basicide/macrodlg.hxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: macrodlg.hxx,v $
*
* $Revision: 1.5 $
* $Revision: 1.6 $
*
* last change: $Author: ab $ $Date: 2002-07-30 13:10:22 $
* last change: $Author: ab $ $Date: 2002-08-06 09:12:19 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -100,6 +100,7 @@ private:
FixedText aMacroNameTxt;
Edit aMacroNameEdit;
FixedText aMacrosInTxt;
String aMacrosInTxtBaseStr;
SvTreeListBox aMacroBox;
FixedText aMacroFromTxT;
FixedText aMacrosSaveInTxt;

8
basctl/source/basicide/macrodlg.src
View file

@ -2,9 +2,9 @@
*
* $RCSfile: macrodlg.src,v $
*
* $Revision: 1.41 $
* $Revision: 1.42 $
*
* last change: $Author: kz $ $Date: 2002-08-05 20:31:43 $
* last change: $Author: ab $ $Date: 2002-08-06 09:12:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -89,8 +89,8 @@ ModalDialog RID_MACROCHOOSER
{
Pos = MAP_APPFONT ( 122 , 30 ) ;
Size = MAP_APPFONT ( 100 , 10 ) ;
Text = "Makros ~in " ;
Text [ ENGLISH ] = "Macros ~in " ;
Text = "Vorhandene Makros ~in:" ;
Text [ ENGLISH ] = "Existing macros ~in:" ;
Text[ english_us ] = "Existing macros ~in:";
Text[ portuguese ] = "Macros ~in ";
Text[ russian ] = "Macros ~in ";

8
basctl/source/basicide/moduldlg.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: moduldlg.cxx,v $
*
* $Revision: 1.20 $
* $Revision: 1.21 $
*
* last change: $Author: ab $ $Date: 2002-07-30 13:10:27 $
* last change: $Author: ab $ $Date: 2002-08-06 09:12:20 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -1065,8 +1065,8 @@ SbModule* createModImpl( Window* pWin, SfxObjectShell* pShell, StarBASIC* pLib,
if (xNewDlg->Execute() != 0)
{
if ( aModName.Len() == 0 )
aModName = BasicIDE::CreateModuleName( pShell, aLibName );
if ( xNewDlg->GetObjectName().Len() )
aModName = xNewDlg->GetObjectName();
try
{