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 /sw/source/core/SwNumberTree/SwNodeNum.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 'sw/source/core/SwNumberTree/SwNodeNum.cxx')
| -rw-r--r-- | sw/source/core/SwNumberTree/SwNodeNum.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/SwNumberTree/SwNodeNum.cxx b/sw/source/core/SwNumberTree/SwNodeNum.cxx index cbd2d222f572..67a0110000c6 100644 --- a/sw/source/core/SwNumberTree/SwNodeNum.cxx +++ b/sw/source/core/SwNumberTree/SwNodeNum.cxx @@ -319,7 +319,7 @@ SwNumberTree::tSwNumTreeNumber SwNodeNum::GetStartValue() const if (nLevel >= 0 && nLevel < MAXLEVEL) { - const SwNumFmt * pFmt = pRule->GetNumFmt( static_cast<USHORT>(nLevel)); + const SwNumFmt * pFmt = pRule->GetNumFmt( static_cast<sal_uInt16>(nLevel)); if (pFmt) aResult = pFmt->GetStart(); |