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

1 files changed, 3 insertions, 3 deletions

diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index b9ff1d7665a0..8d04419ed2ef 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -189,8 +189,10 @@ public:
             m_pMark = m_pPoint;
         }
     }
-#ifndef DBG_UTIL
+#if OSL_DEBUG_LEVEL > 1
+    void Exchange();
 
+#else
     void Exchange()
     {
         if (m_pPoint != m_pMark)
@@ -200,8 +202,6 @@ public:
             m_pMark = pTmp;
         }
     }
-#else
-    void Exchange();
 #endif
 
     /** A PaM marks a selection if Point and Mark are distinct positions.