diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2017-05-07 17:03:35 +1000 |
| commit | 97eb00c75e173d4c8d0b483a7941ad3d2f23783e (patch) | |
| tree | 7974a8b9423c56982646366b0859dfb2a1a88d50 /sfx2/source/sidebar/Theme.cxx | |
| parent | d0a99cc2ed76be220f7e868e332ba19f6e48a440 (diff) | |
revert OSL_ASSERT changes
Change-Id: I365d140446bd2a62cf8256acbfdd53fe72987380
Diffstat (limited to 'sfx2/source/sidebar/Theme.cxx')
| -rw-r--r-- | sfx2/source/sidebar/Theme.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index db73bc21e273..2b29083f5bd9 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -61,7 +61,7 @@ Theme::~Theme() Image Theme::GetImage (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); - assert(eType==PT_Image); + OSL_ASSERT(eType==PT_Image); const sal_Int32 nIndex (GetIndex(eItem, eType)); const Theme& rTheme (GetCurrentTheme()); return rTheme.maImages[nIndex]; @@ -70,7 +70,7 @@ Image Theme::GetImage (const ThemeItem eItem) Color Theme::GetColor (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); - assert(eType==PT_Color || eType==PT_Paint); + OSL_ASSERT(eType==PT_Color || eType==PT_Paint); const sal_Int32 nIndex (GetIndex(eItem, eType)); const Theme& rTheme (GetCurrentTheme()); if (eType == PT_Color) @@ -84,7 +84,7 @@ Color Theme::GetColor (const ThemeItem eItem) const Paint& Theme::GetPaint (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); - assert(eType==PT_Paint); + OSL_ASSERT(eType==PT_Paint); const sal_Int32 nIndex (GetIndex(eItem, eType)); const Theme& rTheme (GetCurrentTheme()); return rTheme.maPaints[nIndex]; @@ -98,7 +98,7 @@ const Wallpaper Theme::GetWallpaper (const ThemeItem eItem) sal_Int32 Theme::GetInteger (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); - assert(eType==PT_Integer); + OSL_ASSERT(eType==PT_Integer); const sal_Int32 nIndex (GetIndex(eItem, eType)); const Theme& rTheme (GetCurrentTheme()); return rTheme.maIntegers[nIndex]; @@ -107,7 +107,7 @@ sal_Int32 Theme::GetInteger (const ThemeItem eItem) bool Theme::GetBoolean (const ThemeItem eItem) { const PropertyType eType (GetPropertyType(eItem)); - assert(eType==PT_Boolean); + OSL_ASSERT(eType==PT_Boolean); const sal_Int32 nIndex (GetIndex(eItem, eType)); const Theme& rTheme (GetCurrentTheme()); return rTheme.maBooleans[nIndex]; @@ -337,7 +337,7 @@ void Theme::UpdateTheme() catch(beans::UnknownPropertyException& rException) { SAL_WARN("sfx", "unknown property: " << rException.Message); - assert(false); + OSL_ASSERT(false); } } @@ -884,7 +884,7 @@ sal_Int32 Theme::GetIndex (const ThemeItem eItem, const PropertyType eType) return eItem - Bool_Rect_-1; default: - assert(false); + OSL_ASSERT(false); return 0; } } @@ -1049,7 +1049,7 @@ void Theme::ProcessNewValue ( break; } case PT_Invalid: - assert(eType != PT_Invalid); + OSL_ASSERT(eType != PT_Invalid); throw RuntimeException(); } } |