diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:59:29 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:59:29 +0100 |
| commit | 5a267de99f19bdab857429a81ffcfbb4d06f5bbd (patch) | |
| tree | 1425ce2404af0e2542e1be0dca3821600f5b82a8 /starmath/source/symbol.cxx | |
| parent | 3bb681a344beb911d92b48469afbd0ccc51db1dd (diff) | |
| parent | 99ebfb7335c333a77910b1059b7b41fb34ff0899 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
starmath/source/symbol.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/draw/dview.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/layout/calcmove.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/rtf/rtftbl.cxx
sw/source/ui/config/modcfg.cxx
sw/source/ui/dialog/docstdlg.cxx
sw/source/ui/dialog/docstdlg.src
sw/source/ui/fldui/flddb.cxx
sw/source/ui/fldui/flddinf.cxx
sw/source/ui/fldui/flddok.cxx
sw/source/ui/fldui/fldfunc.cxx
sw/source/ui/fldui/fldmgr.cxx
sw/source/ui/fldui/fldpage.hxx
sw/source/ui/fldui/fldref.cxx
sw/source/ui/fldui/fldvar.cxx
sw/source/ui/fldui/fldvar.hxx
sw/source/ui/fldui/fldwrap.cxx
sw/source/ui/fldui/xfldui.cxx
sw/source/ui/inc/docstdlg.hxx
sw/source/ui/shells/langhelper.cxx
sw/source/ui/shells/txtattr.cxx
sw/source/ui/shells/txtcrsr.cxx
sw/source/ui/table/tabledlg.cxx
Diffstat (limited to 'starmath/source/symbol.cxx')
| -rw-r--r-- | starmath/source/symbol.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx index fb87c31521d5..b0deeb4d93fe 100644 --- a/starmath/source/symbol.cxx +++ b/starmath/source/symbol.cxx @@ -78,7 +78,7 @@ SmSym::SmSym(const SmSym& rSymbol) } -SmSym::SmSym(const String& rName, const Font& rFont, sal_Unicode cChar, +SmSym::SmSym(const String& rName, const Font& rFont, sal_UCS4 cChar, const String& rSet, bool bIsPredefined) { m_aName = m_aExportName = rName; @@ -207,14 +207,19 @@ bool SmSymbolManager::AddOrReplaceSymbol( const SmSym &rSymbol, bool bForceChang } else if (pFound && !bForceChange && bSymbolConflict) { - // TODO: but what ... + // TODO: to solve this a document owned symbol manager would be required ... OSL_FAIL( "symbol conflict, different symbol with same name found!" ); + // symbols in all formulas. A copy of the global one would be needed here + // and then the new symbol has to be forcefully applied. This would keep + // the current formula intact but will leave the set of symbols in the + // global symbol manager somewhat to chance. } - } OSL_ENSURE( bAdded, "failed to add symbol" ); - if (bAdded) - m_bModified = true; + if (bAdded) + m_bModified = true; + DBG_ASSERT( bAdded || (pFound && !bSymbolConflict), "AddOrReplaceSymbol: unresolved symbol conflict" ); + } return bAdded; } |