diff options
| author | Kurt Zenker <kz@openoffice.org> | 2006-12-12 17:50:32 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2006-12-12 17:50:32 +0000 |
| commit | 73ef78402fe6ba0caa4a470681d6b24102afb84a (patch) | |
| tree | a0eb4b02a13f428ecb997e888a06a4fd5c850d9c /sd | |
| parent | c726c83b1300cfb5da787e06011005ac0f7e6ebb (diff) | |
INTEGRATION: CWS sdwarningsbegone (1.7.38); FILE MERGED
2006/11/27 13:48:13 cl 1.7.38.1: #i69285# warning free code changes for sd project
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/toolpanel/controls/PreviewValueSet.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx b/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx index a2ba42cbc821..c53d879401be 100644 --- a/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx +++ b/sd/source/ui/toolpanel/controls/PreviewValueSet.cxx @@ -4,9 +4,9 @@ * * $RCSfile: PreviewValueSet.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-09-16 19:20:15 $ + * last change: $Author: kz $ $Date: 2006-12-12 18:50:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -187,7 +187,7 @@ USHORT PreviewValueSet::CalculateColumnCount (int nWidth) const else if (mnMaxColumnCount>0 && nColumnCount>mnMaxColumnCount) nColumnCount = mnMaxColumnCount; } - return nColumnCount; + return (USHORT)nColumnCount; } @@ -204,7 +204,7 @@ USHORT PreviewValueSet::CalculateRowCount (USHORT nColumnCount) const nRowCount = 1; } - return nRowCount; + return (USHORT)nRowCount; } |