diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-05-09 14:43:27 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-05-09 16:37:16 +0100 |
commit | e78b716035c42e4397524c04ff4db83944576bbb (patch) | |
tree | 3d7009c908519c4b247f1a384ccad33afc1e6826 /lotuswordpro | |
parent | cb7ff0d3801868d6ed7ba9be79095cdce9e29915 (diff) |
WaE: silence tedious msvc2008 warnings
Change-Id: Iecdc085b9af162ffdc6e0c52ad8a408a0983e088
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/lwptablelayout.cxx | 2 | ||||
-rw-r--r-- | lotuswordpro/source/filter/xfilter/xfutil.cxx | 45 |
2 files changed, 31 insertions, 16 deletions
diff --git a/lotuswordpro/source/filter/lwptablelayout.cxx b/lotuswordpro/source/filter/lwptablelayout.cxx index 5f9ae7e60fee..ec059754f065 100644 --- a/lotuswordpro/source/filter/lwptablelayout.cxx +++ b/lotuswordpro/source/filter/lwptablelayout.cxx @@ -1245,7 +1245,7 @@ void LwpTableLayout::ConvertColumn(XFTable *pXFTable,sal_uInt8 nStartCol,sal_uIn return; } - for (sal_uInt16 iLoop = 0; iLoop < nEndCol-nStartCol ; iLoop ++) + for (sal_uInt32 iLoop = 0; iLoop < static_cast<sal_uInt32>(nEndCol)-nStartCol; ++iLoop) { // add row to table LwpObjectID *pColID = GetColumnLayoutHead(); diff --git a/lotuswordpro/source/filter/xfilter/xfutil.cxx b/lotuswordpro/source/filter/xfilter/xfutil.cxx index 480482f300af..9eacb9575020 100644 --- a/lotuswordpro/source/filter/xfilter/xfutil.cxx +++ b/lotuswordpro/source/filter/xfilter/xfutil.cxx @@ -488,44 +488,59 @@ rtl::OUString GetDrawKind(enumXFDrawKind kind) rtl::OUString GetPageUsageName(enumXFPageUsage usage) { + rtl::OUString sRet; switch(usage) { case enumXFPageUsageAll: - return A2OUSTR("all"); + sRet = A2OUSTR("all"); + break; case enumXFPageUsageLeft: - return A2OUSTR("left"); + sRet = A2OUSTR("left"); + break; case enumXFPageUsageRight: - return A2OUSTR("right"); + sRet = A2OUSTR("right"); + break; case enumXFPageUsageMirror: - return A2OUSTR("mirrored"); + sRet = A2OUSTR("mirrored"); + break; default: - return A2OUSTR("mirrored"); + sRet = A2OUSTR("mirrored"); + break; } - return A2OUSTR(""); + return sRet; } rtl::OUString GetValueType(enumXFValueType type) { + rtl::OUString sRet; switch(type) { case enumXFValueTypeBoolean: - return A2OUSTR("boolean"); + sRet = A2OUSTR("boolean"); + break; case enumXFValueTypeCurrency: - return A2OUSTR("currency"); + sRet = A2OUSTR("currency"); + break; case enumXFValueTypeDate: - return A2OUSTR("date"); + sRet = A2OUSTR("date"); + break; case enumXFValueTypeFloat: - return A2OUSTR("float"); + sRet = A2OUSTR("float"); + break; case enumXFValueTypePercentage: - return A2OUSTR("percentage"); + sRet = A2OUSTR("percentage"); + break; case enumXFValueTypeString: - return A2OUSTR("string"); + sRet = A2OUSTR("string"); + break; case enumXFValueTypeTime: - return A2OUSTR("time"); + sRet = A2OUSTR("time"); + break; default: - return A2OUSTR("mirrored"); + sRet = A2OUSTR("mirrored"); + break; } - return A2OUSTR(""); + return sRet; } rtl::OUString GetColorMode(enumXFColorMode mode) |