summaryrefslogtreecommitdiff
path: root/vcl/source/gdi/fontcvt.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 18:23:02 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 18:23:02 +0000
commita799c496374d991e6bf9d4287b028bb43397d06c (patch)
tree2b0a3365daecc1e4217fd4f732affe59e35358e3 /vcl/source/gdi/fontcvt.cxx
parent6f7b5f3eda304872f74aa4a25d866e45fe81fcdc (diff)
INTEGRATION: CWS warnings01 (1.17.70); FILE MERGED
2006/04/07 18:48:32 sb 1.17.70.4: RESYNC: (1.17-1.18); FILE MERGED 2006/03/17 16:12:45 pl 1.17.70.3: #i55991# removed warnings for windows platform 2005/11/04 16:49:41 pl 1.17.70.2: #i55991# removed warnings for linux/solaris 2005/10/21 17:31:13 pl 1.17.70.1: #i55991# removed warnings for linux platform
Diffstat (limited to 'vcl/source/gdi/fontcvt.cxx')
-rw-r--r--vcl/source/gdi/fontcvt.cxx11
1 files changed, 7 insertions, 4 deletions
diff --git a/vcl/source/gdi/fontcvt.cxx b/vcl/source/gdi/fontcvt.cxx
index 6bd556183b6b..fec25d9e1917 100644
--- a/vcl/source/gdi/fontcvt.cxx
+++ b/vcl/source/gdi/fontcvt.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: fontcvt.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: rt $ $Date: 2006-02-09 14:11:29 $
+ * last change: $Author: hr $ $Date: 2006-06-19 19:23:02 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -1331,7 +1331,7 @@ String StarSymbolToMSMultiFontImpl::ConvertString(String &rString,
}
sRet.AssignAscii(SymbolFontToString(nI));
- xub_StrLen nSize = aPossibilities.size();
+ xub_StrLen nSize = sal::static_int_cast<xub_StrLen>(aPossibilities.size());
for(xub_StrLen nPos = 0; nPos < nSize; ++nPos)
{
const Result &rResult = aPossibilities[nPos];
@@ -1435,7 +1435,10 @@ static RecodeTable aRecodeTable[] =
};
static ImplCvtChar aImplStarSymbolCvt = { NULL, "StarBats", ImplStarSymbolToStarBats };
+#if 0
+// not used
static ImplCvtChar aImplDingBatsCvt = { aMonotypeSortsTab, "StarSymbol", NULL };
+#endif
// -----------------------------------------------------------------------
@@ -1504,7 +1507,7 @@ FontToSubsFontConverter CreateFontToSubsFontConverter(
// -----------------------------------------------------------------------
-void DestroyFontToSubsFontConverter( FontToSubsFontConverter hConverter )
+void DestroyFontToSubsFontConverter( FontToSubsFontConverter )
{
// nothing to do for now, because we use static ImplCvtChars
}