[Libreoffice-commits] core.git: sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Thu Oct 13 08:21:25 UTC 2016
sw/source/core/layout/pagechg.cxx | 2 +-
sw/source/core/text/itrcrsr.cxx | 8 --------
2 files changed, 1 insertion(+), 9 deletions(-)
New commits:
commit 192edafdd0e0ce38665d14022b4511eba1a9c954
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Thu Oct 13 08:02:22 2016 +0200
sw: remove useless debug code in SwTextMargin::CtorInitTextMargin()
Change-Id: I15bde2652ca39c2ea43036557c36b77c5ead0d32
Reviewed-on: https://gerrit.libreoffice.org/29750
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Tested-by: Jenkins <ci at libreoffice.org>
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 720a541..0257f12 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1528,7 +1528,7 @@ void SwRootFrame::AssertPageFlys( SwPageFrame *pPage )
// It can move by itself. Just send a modify to its anchor attribute.
#if OSL_DEBUG_LEVEL > 1
const size_t nCnt = pPage->GetSortedObjs()->size();
- rFormat.NotifyClients( 0, (SwFormatAnchor*)&rAnch );
+ rFormat.NotifyClients( nullptr, &rAnch );
OSL_ENSURE( !pPage->GetSortedObjs() ||
nCnt != pPage->GetSortedObjs()->size(),
"Object couldn't be reattached!" );
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 68fde89..884e5ce 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -344,14 +344,6 @@ void SwTextMargin::CtorInitTextMargin( SwTextFrame *pNewFrame, SwTextSizeInfo *p
// #i91133#
mnTabLeft = pNode->GetLeftMarginForTabCalculation();
-#if OSL_DEBUG_LEVEL > 1
- static bool bOne = false;
- static bool bLast = false;
- static bool bCenter = false;
- bOneBlock |= bOne;
- bLastBlock |= bLast;
- bLastCenter |= bCenter;
-#endif
DropInit();
}
More information about the Libreoffice-commits
mailing list