sw/inc/fldbas.hxx | 5 +----
sw/source/core/fields/fldbas.cxx | 10 ----------
2 files changed, 1 insertion(+), 14 deletions(-)
New commits:
commit 6448c83a8740711172b3c59175a2abd15c00114b
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Wed Oct 25 09:59:51 2023 +0200
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Wed Oct 25 11:42:13 2023 +0200
DBG_UTIL implementation differs only by never-wrong assert
Change-Id: Ifb879d6536c80f00da61707fb0aa0700dcd19bcc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158288
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 4aa874c3021d..7518c47582f3 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -349,13 +349,10 @@ public:
/// ResId
SwFieldIds Which() const
-#ifdef DBG_UTIL
- ; // implemented in fldbas.cxx
-#else
{
+ assert(m_pType);
return m_pType->Which();
}
-#endif
// TYP_ID
SwFieldTypesEnum GetTypeId() const;
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index c528f2a0d65a..b3fab811f1c2 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -257,16 +257,6 @@ SwField::~SwField()
{
}
-// instead of indirectly via the type
-
-#ifdef DBG_UTIL
-SwFieldIds SwField::Which() const
-{
- assert(m_pType);
- return m_pType->Which();
-}
-#endif
-
SwFieldTypesEnum SwField::GetTypeId() const
{
