tweak assert so comment appears in abort message

Change-Id: Ibf78e5cd1620f0b61cae030e3870be4a6f87e71d

6 files changed, 6 insertions, 6 deletions

diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index a1c59ef0819b..f9fee0b6220e 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -626,7 +626,7 @@ void Application::InitSettings()
 {
     ImplSVData* pSVData = ImplGetSVData();
 
-    assert(!pSVData->maAppData.mpSettings);     // initialization should not happen twice!
+    assert(!pSVData->maAppData.mpSettings && "initialization should not happen twice!");
 
     pSVData->maAppData.mpCfgListener = new LocaleConfigurationListener;
     pSVData->maAppData.mpSettings = new AllSettings();
diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 2d3ce6102307..5730fcc1d476 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -977,7 +977,7 @@ void CffSubsetterContext::convertOneTypeOp( void)
             read2push();
         } else {
             popAll2Write( nType2Op);
-            assert( false); // TODO?
+            assert(false && "TODO?");
         }
         break;
     }
diff --git a/vcl/source/gdi/bmpfast.cxx b/vcl/source/gdi/bmpfast.cxx
index b81a6c001221..7bfb28b7139e 100644
--- a/vcl/source/gdi/bmpfast.cxx
+++ b/vcl/source/gdi/bmpfast.cxx
@@ -593,7 +593,7 @@ bool ImplBlendToBitmap( TrueColorPixelPtr<SRCFMT>& rSrcLine,
         nDstLinestep = -nDstLinestep;
     }
 
-    assert(rDstBuffer.mnHeight <= rSrcBuffer.mnHeight); // not sure about that?
+    assert(rDstBuffer.mnHeight <= rSrcBuffer.mnHeight && "not sure about that?");
     for (int y = rDstBuffer.mnHeight; --y >= 0;)
     {
         ImplBlendLines<8>( aDstLine, rSrcLine, aMskLine, rDstBuffer.mnWidth );
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 12aa2323d5d9..9cf4725d5b33 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -779,7 +779,7 @@ bool Dialog::ImplStartExecuteModal()
                 << "\"cancelled in silent mode");
         return false;
     default:
-        assert(false); // this cannot happen
+        assert(false && "this cannot happen");
         // fall through
     case Application::DIALOG_CANCEL_FATAL:
         std::abort();
diff --git a/vcl/unx/gtk/a11y/atklistener.cxx b/vcl/unx/gtk/a11y/atklistener.cxx
index 511ff0ab0f42..45c06022f990 100644
--- a/vcl/unx/gtk/a11y/atklistener.cxx
+++ b/vcl/unx/gtk/a11y/atklistener.cxx
@@ -138,7 +138,7 @@ void AtkListener::updateChildList(accessibility::XAccessibleContext* pContext)
              catch (lang::IndexOutOfBoundsException const&)
              {
                  sal_Int32 nChildren2 = pContext->getAccessibleChildCount();
-                 assert(nChildren2 <= n); // consistency?
+                 assert(nChildren2 <= n && "consistency?");
                  m_aChildList.resize(std::min(nChildren2, n));
                  break;
              }
diff --git a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
index b1e7e238fcb6..c56339519dc1 100644
--- a/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salnativewidgets-gtk.cxx
@@ -824,7 +824,7 @@ bool GtkSalGraphics::drawNativeControl(    ControlType nType,
         }
     }
 
-    assert(gdkDrawable); //rhbz#1050162
+    assert(gdkDrawable && "rhbz#1050162");
     if (gdkDrawable == 0)
         return false;