diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-11-25 18:50:04 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-11-25 18:50:04 +0100 |
| commit | 1a6bf8c433b128606af043a01a1366eab00b3d68 (patch) | |
| tree | 446ad553d122fad153e3a28a52770dd7bd671e82 /sw/inc/txtfld.hxx | |
| parent | 2b20a3ef7a0b2ff030945d679b897c2062d7e0ff (diff) | |
| parent | c16ba8a04fd4599e439e7e039705e41691c43acb (diff) | |
Merge remote branch 'origin/libreoffice-3-3'
Conflicts:
sw/inc/SwNumberTree.hxx
sw/inc/calbck.hxx
sw/inc/tox.hxx
sw/inc/viscrs.hxx
sw/source/core/doc/docnum.cxx
sw/source/core/docnode/finalthreadmanager.cxx
sw/source/core/docnode/ndnum.cxx
sw/source/core/docnode/ndtbl.cxx
sw/source/core/draw/dcontact.cxx
sw/source/core/edit/edlingu.cxx
sw/source/core/edit/ednumber.cxx
sw/source/core/except/errhdl.cxx
sw/source/core/fields/chpfld.cxx
sw/source/core/fields/fldbas.cxx
sw/source/core/frmedt/fetab.cxx
sw/source/core/layout/flycnt.cxx
sw/source/core/layout/makefile.mk
sw/source/core/layout/pagechg.cxx
sw/source/core/layout/tabfrm.cxx
sw/source/core/ole/ndole.cxx
sw/source/core/text/makefile.mk
sw/source/core/txtnode/txtedt.cxx
sw/source/filter/basflt/fltini.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/ww1/fltshell.cxx
sw/source/filter/ww1/w1sprm.cxx
sw/source/filter/ww8/wrtw8nds.cxx
sw/source/filter/ww8/wrtw8num.cxx
sw/source/filter/ww8/ww8par3.cxx
sw/source/filter/ww8/ww8par5.cxx
sw/source/filter/ww8/ww8par6.cxx
sw/source/filter/xml/xmltble.cxx
sw/source/filter/xml/xmltbli.cxx
sw/source/ui/dbui/dbinsdlg.cxx
sw/source/ui/dbui/mmoutputpage.cxx
sw/source/ui/dialog/swdlgfact.cxx
sw/source/ui/docvw/edtwin.cxx
sw/source/ui/docvw/srcedtw.cxx
Diffstat (limited to 'sw/inc/txtfld.hxx')
| -rw-r--r-- | sw/inc/txtfld.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/inc/txtfld.hxx b/sw/inc/txtfld.hxx index f955c364e1cb..f5748117bf93 100644 --- a/sw/inc/txtfld.hxx +++ b/sw/inc/txtfld.hxx @@ -66,7 +66,7 @@ public: inline SwTxtNode& SwTxtFld::GetTxtNode() const { - ASSERT( m_pTxtNode, "SwTxtFld:: where is my TxtNode?" ); + OSL_ENSURE( m_pTxtNode, "SwTxtFld:: where is my TxtNode?" ); return *m_pTxtNode; } |