summaryrefslogtreecommitdiff
path: root/sd/source/ui/toolpanel/TestMenu.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sd/source/ui/toolpanel/TestMenu.cxx')
-rw-r--r--sd/source/ui/toolpanel/TestMenu.cxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx
index 5ed76e024086..c0b210d7284f 100644
--- a/sd/source/ui/toolpanel/TestMenu.cxx
+++ b/sd/source/ui/toolpanel/TestMenu.cxx
@@ -98,8 +98,8 @@ Size ColorMenu::GetPreferredSize (void)
Size aItemSize = maSet.CalcItemSizePixel (Size());
Size aPreferredWindowSize = maSet.CalcWindowSizePixel (
aItemSize,
- (USHORT)mnPreferredColumnCount,
- (USHORT)CalculateRowCount (aItemSize, (USHORT)mnPreferredColumnCount));
+ (sal_uInt16)mnPreferredColumnCount,
+ (sal_uInt16)CalculateRowCount (aItemSize, (sal_uInt16)mnPreferredColumnCount));
return aPreferredWindowSize;
}
@@ -194,9 +194,9 @@ void ColorMenu::Resize (void)
else if (nColumnCount > 4)
nColumnCount = 4;
- USHORT nRowCount = (USHORT)CalculateRowCount (aItemSize, nColumnCount);
+ sal_uInt16 nRowCount = (sal_uInt16)CalculateRowCount (aItemSize, nColumnCount);
- maSet.SetColCount ((USHORT)nColumnCount);
+ maSet.SetColCount ((sal_uInt16)nColumnCount);
maSet.SetLineCount (nRowCount);
}
}
@@ -230,7 +230,7 @@ void ColorMenu::Fill (void)
maSet.Clear();
maSet.SetItemWidth (30);
maSet.SetItemHeight (30);
- USHORT i = 0;
+ sal_uInt16 i = 0;
maSet.InsertItem (++i, rSettings.GetFaceColor());
maSet.SetItemText (i, String::CreateFromAscii("FaceColor"));
maSet.InsertItem (++i, rSettings.GetCheckedColor());