diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 17:43:34 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 17:43:34 +0000 |
| commit | 30d63512c57c57dab68b8761ce696d24b41b29b5 (patch) | |
| tree | 80baa255fb8d55ec11728bcc3eb6a34146099b4e /sd/source/ui/toolpanel/TestMenu.cxx | |
| parent | f79fa81c9b8c1527c2b4f63f74529f4c227cb0cb (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.5.38); FILE MERGED
2006/11/27 16:31:00 cl 1.5.38.3: #i69285# warning free code changes for sd project
2006/11/27 15:15:04 cl 1.5.38.2: #i69285# warning free code changes for sd project
2006/11/22 12:42:15 cl 1.5.38.1: #i69285# warning free code changes for unxlngi6.pro
Diffstat (limited to 'sd/source/ui/toolpanel/TestMenu.cxx')
| -rw-r--r-- | sd/source/ui/toolpanel/TestMenu.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/toolpanel/TestMenu.cxx b/sd/source/ui/toolpanel/TestMenu.cxx index b4c76a8d3e22..926988be251a 100644 --- a/sd/source/ui/toolpanel/TestMenu.cxx +++ b/sd/source/ui/toolpanel/TestMenu.cxx @@ -4,9 +4,9 @@ * * $RCSfile: TestMenu.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:15:19 $ + * last change: $Author: kz $ $Date: 2006-12-12 18:43:34 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -108,8 +108,8 @@ Size ColorMenu::GetPreferredSize (void) Size aItemSize = maSet.CalcItemSizePixel (Size()); Size aPreferredWindowSize = maSet.CalcWindowSizePixel ( aItemSize, - mnPreferredColumnCount, - CalculateRowCount (aItemSize, mnPreferredColumnCount)); + (USHORT)mnPreferredColumnCount, + (USHORT)CalculateRowCount (aItemSize, (USHORT)mnPreferredColumnCount)); return aPreferredWindowSize; } @@ -204,9 +204,9 @@ void ColorMenu::Resize (void) else if (nColumnCount > 4) nColumnCount = 4; - int nRowCount = CalculateRowCount (aItemSize, nColumnCount); + USHORT nRowCount = (USHORT)CalculateRowCount (aItemSize, nColumnCount); - maSet.SetColCount (nColumnCount); + maSet.SetColCount ((USHORT)nColumnCount); maSet.SetLineCount (nRowCount); } } @@ -216,7 +216,7 @@ void ColorMenu::Resize (void) -int ColorMenu::CalculateRowCount (const Size& rItemSize, int nColumnCount) +int ColorMenu::CalculateRowCount (const Size&, int nColumnCount) { int nRowCount = 0; @@ -240,7 +240,7 @@ void ColorMenu::Fill (void) maSet.Clear(); maSet.SetItemWidth (30); maSet.SetItemHeight (30); - int i = 0; + USHORT i = 0; maSet.InsertItem (++i, rSettings.GetFaceColor()); maSet.SetItemText (i, String::CreateFromAscii("FaceColor")); maSet.InsertItem (++i, rSettings.GetCheckedColor()); |