summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-08-18 20:53:27 +0200
committerMichael Stahl <mstahl@redhat.com>2017-08-21 15:52:41 +0200
commit38fa44435a428685b4ac59ee98972a8521942225 (patch)
tree442600a651acb02d79bd531bcc4a47b40f7565e8
parente86def1f3f86731230a27926d61d525653f62c72 (diff)
fix bogus always-true asserts
Most of these were converted from OSL_ASSERT Change-Id: Ia95a758cdebf72ee80d00866644d92e6bb915071
-rw-r--r--cui/source/tabpages/tppattern.cxx2
-rw-r--r--svx/source/unodraw/unopage.cxx2
-rw-r--r--svx/source/xoutdev/xtable.cxx8
-rw-r--r--ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx2
-rw-r--r--ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx2
-rw-r--r--vcl/win/app/salinst.cxx2
6 files changed, 9 insertions, 9 deletions
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index 26e1f2b9c7b1..7b6cf2c63649 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -408,7 +408,7 @@ IMPL_LINK_NOARG(SvxPatternTabPage, ClickAddHdl_Impl, Button*, void)
pEntry.reset(new XBitmapEntry(dynamic_cast<const XFillBitmapItem*>(pPoolItem)->GetGraphicObject(), aName));
}
else
- assert("SvxPatternTabPage::ClickAddHdl_Impl(), XBitmapEntry* pEntry == nullptr ?");
+ assert(!"SvxPatternTabPage::ClickAddHdl_Impl(), XBitmapEntry* pEntry == nullptr ?");
}
if( pEntry )
diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx
index 3397653a2a3d..171a511e7e11 100644
--- a/svx/source/unodraw/unopage.cxx
+++ b/svx/source/unodraw/unopage.cxx
@@ -75,7 +75,7 @@ SvxDrawPage::~SvxDrawPage() throw()
{
if( !mrBHelper.bDisposed )
{
- assert("SvxDrawPage must be disposed!");
+ assert(!"SvxDrawPage must be disposed!");
acquire();
dispose();
}
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index fbaba94c97e1..6bb2105988c3 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -194,7 +194,7 @@ void XPropertyList::Insert(std::unique_ptr<XPropertyEntry> pEntry, long nIndex)
{
if (!pEntry)
{
- assert("empty XPropertyEntry not allowed in XPropertyList");
+ assert(!"empty XPropertyEntry not allowed in XPropertyList");
return;
}
@@ -209,12 +209,12 @@ void XPropertyList::Replace(std::unique_ptr<XPropertyEntry> pEntry, long nIndex)
{
if (!pEntry)
{
- assert("empty XPropertyEntry not allowed in XPropertyList");
+ assert(!"empty XPropertyEntry not allowed in XPropertyList");
return;
}
if (!isValidIdx(nIndex))
{
- assert("trying to replace invalid entry in XPropertyList");
+ assert(!"trying to replace invalid entry in XPropertyList");
return;
}
@@ -225,7 +225,7 @@ void XPropertyList::Remove(long nIndex)
{
if (!isValidIdx(nIndex))
{
- assert("trying to remove invalid entry in XPropertyList");
+ assert(!"trying to remove invalid entry in XPropertyList");
return;
}
diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
index bcca8dd0d14c..3b41f13ef0a9 100644
--- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx
@@ -162,7 +162,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t
}
else
{
- assert("Headers Bucket missing");
+ assert(!"Headers Bucket missing");
}
return req_bkt;
diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
index 77c6ba9538ab..57502dc3ccbd 100644
--- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
+++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx
@@ -167,7 +167,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_
}
else
{
- assert("Headers Bucket missing");
+ assert(!"Headers Bucket missing");
}
return req_bkt;
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 7ea3bd526675..09532902af00 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -722,7 +722,7 @@ LRESULT CALLBACK SalComWndProc( HWND, UINT nMsg, WPARAM wParam, LPARAM lParam, i
// PM_QS_POSTMESSAGE is needed, so we don't process the SendMessage from DoYield!
while ( PeekMessageW(&aMsg, nullptr, SAL_MSG_TIMER_CALLBACK,
SAL_MSG_TIMER_CALLBACK, PM_REMOVE | PM_NOYIELD | PM_QS_POSTMESSAGE) )
- assert( "Multiple timer messages in queue" );
+ assert(! "Multiple timer messages in queue" );
GetSalData()->mbOnIdleRunScheduler = false;
EmitTimerCallback();
break;