diff options
Diffstat (limited to 'sd/source/ui/slidesorter/view/SlsTheme.cxx')
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsTheme.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index 7357d7ea00b8..3949e218c9a8 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -59,9 +59,9 @@ ColorData HGBAdapt ( const sal_Int32 nNewSaturation, const sal_Int32 nNewBrightness) { - USHORT nHue (0); - USHORT nSaturation (0); - USHORT nBrightness (0); + sal_uInt16 nHue (0); + sal_uInt16 nSaturation (0); + sal_uInt16 nBrightness (0); Color(aColorData).RGBtoHSB(nHue, nSaturation, nBrightness); return Color::HSBtoRGB( nHue, @@ -259,13 +259,13 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert { case Font_PageNumber: pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); - pFont->SetTransparent(TRUE); + pFont->SetTransparent(sal_True); pFont->SetWeight(WEIGHT_BOLD); break; case Font_PageCount: pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); - pFont->SetTransparent(TRUE); + pFont->SetTransparent(sal_True); pFont->SetWeight(WEIGHT_NORMAL); { const Size aSize (pFont->GetSize()); @@ -275,7 +275,7 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert case Font_Button: pFont.reset(new Font(Application::GetSettings().GetStyleSettings().GetAppFont())); - pFont->SetTransparent(TRUE); + pFont->SetTransparent(sal_True); pFont->SetWeight(WEIGHT_BOLD); { const Size aSize (pFont->GetSize()); @@ -516,7 +516,7 @@ Theme::GradientDescriptor& Theme::GetGradient (const GradientColorType eType) -void Theme::InitializeIcon (const IconType eType, USHORT nResourceId) +void Theme::InitializeIcon (const IconType eType, sal_uInt16 nResourceId) { if (eType>=0 && size_t(eType)<maIcons.size()) { |