BreakPoint isn't really useful

merge branches to fix OSL_DEBUG_LEVEL > 1 build

Change-Id: If4a81287ffffbc41d7caa1240293d34e5186f293

sw/source/core/layout/layact.cxx

@@ -65,22 +65,6 @@
 #define IS_INVAFLY (pPage->IsInvalidFly())
 
 // Save some typing work to avoid accessing destroyed pages.
-#if OSL_DEBUG_LEVEL > 1
-
-static void BreakPoint()
-{
-    return;
-}
-
-#define XCHECKPAGE \
-            {   if ( IsAgain() ) \
-                {   BreakPoint(); \
-                    if( bNoLoop ) \
-                        pLayoutAccess->GetLayouter()->EndLoopControl(); \
-                    return; \
-                } \
-            }
-#else
 #define XCHECKPAGE \
             {   if ( IsAgain() ) \
                 { \
@@ -89,7 +73,6 @@ static void BreakPoint()
                     return; \
                 } \
             }
-#endif
 
 #define RESCHEDULE \
     { \