summaryrefslogtreecommitdiff
path: root/cppcanvas
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 09:39:49 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 09:39:49 +1000
commitbbd2d2c116158613ec690bdadca7abe59af88860 (patch)
tree05c55876c9fc6ba0fcfdf1ed931449eca5d2080e /cppcanvas
parentb8fc5aee3c1c2e7966ae12c32db8c481d95715a6 (diff)
tdf#43157: convert cppcanvas module away from OSL_ASSERT to assert
Change-Id: I1db04c35cc004a33b0d2586f9eb1d21bc545eb81
Diffstat (limited to 'cppcanvas')
-rwxr-xr-xcppcanvas/source/mtfrenderer/emfpfont.cxx2
-rw-r--r--cppcanvas/source/mtfrenderer/emfplus.cxx2
-rwxr-xr-xcppcanvas/source/mtfrenderer/emfpstringformat.cxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/cppcanvas/source/mtfrenderer/emfpfont.cxx b/cppcanvas/source/mtfrenderer/emfpfont.cxx
index 2df7981e6ab6..f618719ade35 100755
--- a/cppcanvas/source/mtfrenderer/emfpfont.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpfont.cxx
@@ -51,7 +51,7 @@ namespace cppcanvas
s.ReadUInt32(header).ReadFloat(emSize).ReadUInt32(sizeUnit).ReadInt32(fontFlags).ReadUInt32(reserved).ReadUInt32(length);
- OSL_ASSERT((header >> 12) == 0xdbc01);
+ assert((header >> 12) == 0xdbc01);
SAL_INFO("cppcanvas.emf", "EMF+\tfont\nEMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x" << (header & 0x1fff) << " size: " << std::dec << emSize << " unit: 0x" << std::hex << sizeUnit << std::dec);
SAL_INFO("cppcanvas.emf", "EMF+\tflags: 0x" << std::hex << fontFlags << " reserved: 0x" << reserved << " length: 0x" << std::hex << length << std::dec);
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 4d4bfb528d61..6d264b5806ac 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -440,7 +440,7 @@ namespace cppcanvas
int length = aStartColor.getLength ();
uno::Sequence< double > aColor (length);
- OSL_ASSERT (length == aEndColor.getLength());
+ assert (length == aEndColor.getLength());
for (int i = 0; i < brush->blendPoints; i++) {
aStops[i] = brush->blendPositions [i];
diff --git a/cppcanvas/source/mtfrenderer/emfpstringformat.cxx b/cppcanvas/source/mtfrenderer/emfpstringformat.cxx
index 01bbb4aae874..d23c0173daab 100755
--- a/cppcanvas/source/mtfrenderer/emfpstringformat.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpstringformat.cxx
@@ -52,7 +52,7 @@ namespace cppcanvas
s.ReadFloat(firstTabOffset).ReadInt32(hotkeyPrefix).ReadFloat(leadingMargin).ReadFloat(trailingMargin).ReadFloat(tracking);
s.ReadInt32(trimming).ReadInt32(tabStopCount).ReadInt32(rangeCount);
- OSL_ASSERT((header >> 12) == 0xdbc01);
+ assert((header >> 12) == 0xdbc01);
SAL_INFO("cppcanvas.emf", "EMF+\t string format\nEMF+\theader: 0x" << std::hex << (header >> 12) << " version: 0x" << (header & 0x1fff) << " StringFormatFlags: " << std::dec << stringFormatFlags << " Language: " << language);
SAL_INFO("cppcanvas.emf", "EMF+\t StringAlignment: " << stringAlignment << " LineAlign: " << lineAlign << " DigitSubstitution: " << digitSubstitution << " DigitLanguage: " << digitLanguage);