summaryrefslogtreecommitdiff
path: root/cppcanvas/source/mtfrenderer
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
committerChris Sherlock <chris.sherlock79@gmail.com>2017-05-07 17:03:35 +1000
commit97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch)
tree7974a8b9423c56982646366b0859dfb2a1a88d50 /cppcanvas/source/mtfrenderer
parentd0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff)
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'cppcanvas/source/mtfrenderer')
-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 f618719ade35..2df7981e6ab6 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);
- assert((header >> 12) == 0xdbc01);
+ OSL_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 6d264b5806ac..4d4bfb528d61 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);
- assert (length == aEndColor.getLength());
+ OSL_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 d23c0173daab..01bbb4aae874 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);
- assert((header >> 12) == 0xdbc01);
+ OSL_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);