mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#92656# GPF when changing the symbol-set fixed

Browse Source
This commit is contained in:
Thomas Lange
2001-10-02 11:58:49 +00:00
parent 37370eec3e
commit d30e2d25d3
3 changed files with 31 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
starmath/inc/symbol.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: symbol.hxx,v $ * $RCSfile: symbol.hxx,v $
* *
* $Revision: 1.8 $ * $Revision: 1.9 $
* *
* last change: $Author: tl $ $Date: 2001-09-13 11:15:07 $ * last change: $Author: tl $ $Date: 2001-10-02 12:57:44 $
* *
* 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
@@ -159,6 +159,7 @@ public:
BOOL IsPredefined() const { return bPredefined; } BOOL IsPredefined() const { return bPredefined; }
const String & GetSetName() const { return aSetName; } const String & GetSetName() const { return aSetName; }
void SetSetName( const String &rName ) { aSetName = rName; }
const String & GetExportName() const { return aExportName; } const String & GetExportName() const { return aExportName; }
void SetExportName( const String &rName ) { aExportName = rName; } void SetExportName( const String &rName ) { aExportName = rName; }

32
starmath/source/dialog.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: dialog.cxx,v $ * $RCSfile: dialog.cxx,v $
* *
* $Revision: 1.14 $ * $Revision: 1.15 $
* *
* last change: $Author: tl $ $Date: 2001-09-13 11:16:08 $ * last change: $Author: tl $ $Date: 2001-10-02 12:58:49 $
* *
* 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
@@ -1863,8 +1863,20 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, pButton )
// das SymbolSet wechseln wenn n<>tig // das SymbolSet wechseln wenn n<>tig
if (pOldSymSet != pNewSymSet) if (pOldSymSet != pNewSymSet)
{ {
pNewSymSet->AddSymbol( new SmSym( *pSym ) );
pOldSymSet->DeleteSymbol(nSymbol); pOldSymSet->DeleteSymbol(nSymbol);
pNewSymSet->AddSymbol(pSym);
//
// update controls
//
// actualize symbol-lists in the dialog
String aOldSymbolName( pOrigSymbol->GetName() );
aOldSymbols.SetText( String() );
aOldSymbols.RemoveEntry( aOldSymbolName );
if (aSymbolSets.GetText() == aOldSymbolSets.GetText())
aSymbols.RemoveEntry( aOldSymbolName );
// clear display for original symbol
SetOrigSymbol(NULL, XubString());
} }
//!! den SymbolSet Manger dazu zwingen seinen HashTable zu aktualisieren, //!! den SymbolSet Manger dazu zwingen seinen HashTable zu aktualisieren,
@@ -1894,8 +1906,6 @@ IMPL_LINK( SmSymDefineDialog, DeleteClickHdl, Button *, pButton )
USHORT nSymbolNo = pSymSet->GetSymbolPos(aOldSymbolName); USHORT nSymbolNo = pSymSet->GetSymbolPos(aOldSymbolName);
DBG_ASSERT(nSymbolNo != SYMBOL_NONE, "Sm : kein Symbol"); DBG_ASSERT(nSymbolNo != SYMBOL_NONE, "Sm : kein Symbol");
// Bez<65>ge auf das Symbols l<>schen // Bez<65>ge auf das Symbols l<>schen
DBG_ASSERT(pOrigSymbol == &pSymSet->GetSymbol(nSymbolNo),
"Sm : Fehler beim l<>schen des Symbols");
SetOrigSymbol(NULL, XubString()); SetOrigSymbol(NULL, XubString());
// und weg mit dem Symbol // und weg mit dem Symbol
pSymSet->DeleteSymbol(nSymbolNo); pSymSet->DeleteSymbol(nSymbolNo);
@@ -2044,6 +2054,7 @@ SmSymDefineDialog::~SmSymDefineDialog()
{ {
delete pFontList; delete pFontList;
delete pSubsetMap; delete pSubsetMap;
delete pOrigSymbol;
} }
@@ -2148,12 +2159,17 @@ BOOL SmSymDefineDialog::SelectSymbolSet(ComboBox &rComboBox,
void SmSymDefineDialog::SetOrigSymbol(const SmSym *pSymbol, void SmSymDefineDialog::SetOrigSymbol(const SmSym *pSymbol,
const XubString &rSymbolSetName) const XubString &rSymbolSetName)
{ {
pOrigSymbol = pSymbol; // clear old symbol
delete pOrigSymbol;
pOrigSymbol = 0;
XubString aSymName, XubString aSymName,
aSymSetName; aSymSetName;
if (pSymbol) if (pSymbol)
{ {
// set new symbol
pOrigSymbol = new SmSym( *pSymbol );
aSymName = pSymbol->GetName(); aSymName = pSymbol->GetName();
aSymSetName = rSymbolSetName; aSymSetName = rSymbolSetName;
aOldSymbolDisplay.SetFont(pSymbol->GetFace()); aOldSymbolDisplay.SetFont(pSymbol->GetFace());

6
starmath/source/symbol.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: symbol.cxx,v $ * $RCSfile: symbol.cxx,v $
* *
* $Revision: 1.17 $ * $Revision: 1.18 $
* *
* last change: $Author: tl $ $Date: 2001-09-13 11:21:41 $ * last change: $Author: tl $ $Date: 2001-10-02 12:58:24 $
* *
* 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
@@ -287,6 +287,8 @@ USHORT SmSymSet::AddSymbol(SmSym* pSymbol)
{ {
DBG_ASSERT(pSymbol, "Kein Symbol"); DBG_ASSERT(pSymbol, "Kein Symbol");
if (pSymbol)
pSymbol->SetSetName( GetName() );
SymbolList.Insert(pSymbol, LIST_APPEND); SymbolList.Insert(pSymbol, LIST_APPEND);
DBG_ASSERT(SymbolList.GetPos(pSymbol) == SymbolList.Count() - 1, DBG_ASSERT(SymbolList.GetPos(pSymbol) == SymbolList.Count() - 1,
"Sm : ... ergibt falschen return Wert"); "Sm : ... ergibt falschen return Wert");