diff options
author | Katarina Machalkova <kmachalkova@suse.cz> | 2010-10-19 17:04:12 +0200 |
---|---|---|
committer | Katarina Machalkova <kmachalkova@suse.cz> | 2010-10-19 17:04:12 +0200 |
commit | 4f54b69d72817bc642b0804458f3f03de264b7c7 (patch) | |
tree | e154966f1b3045e8cf752a6809566461ae944ae3 /oox/source/drawingml/clrscheme.cxx | |
parent | fbcee910cdb406c3c12068b4e68de642006d3cb6 (diff) |
Merged oox-smartart-import.diff from ooo-build
Diffstat (limited to 'oox/source/drawingml/clrscheme.cxx')
-rw-r--r-- | oox/source/drawingml/clrscheme.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/oox/source/drawingml/clrscheme.cxx b/oox/source/drawingml/clrscheme.cxx index b7e558266372..4aea4fe6e2ba 100644 --- a/oox/source/drawingml/clrscheme.cxx +++ b/oox/source/drawingml/clrscheme.cxx @@ -26,6 +26,7 @@ * ************************************************************************/ +#include <osl/diagnose.h> #include "oox/drawingml/clrscheme.hxx" #include "tokens.hxx" @@ -62,6 +63,7 @@ ClrScheme::~ClrScheme() sal_Bool ClrScheme::getColor( sal_Int32 nSchemeClrToken, sal_Int32& rColor ) const { + OSL_ASSERT((nSchemeClrToken & sal_Int32(0xFFFF0000))==0); switch( nSchemeClrToken ) { case XML_bg1 : nSchemeClrToken = XML_lt1; break; |