diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-09 11:54:53 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-09 11:54:53 +0000 |
| commit | 8b4cfad3fd8b8d41be20dae44bfbf9c73019d96b (patch) | |
| tree | 0bc4a62a1431f1bbeba98056c82d293d776c7571 /sw/source/ui/envelp | |
| parent | 5dfb59695fbe0e94a75f3abd4683bf691d811abe (diff) | |
CWS-TOOLING: integrate CWS configitems02_svn
2008-12-02 10:22:34 +0100 as r264664 : #i5114# truncate list also in case list size was changed externaly
2008-11-28 10:25:56 +0100 as r264530 : make gcc happy with new line at end of file
2008-11-21 09:44:40 +0100 jsk r264109 : #i96409#
2008-11-21 08:03:30 +0100 jsk r264106 : #i96409#
2008-11-21 07:55:59 +0100 jsk r264105 : #i96409#
2008-11-10 13:42:44 +0100 as r263518 : make code warning free (linux)
2008-10-21 16:38:44 +0200 as r262573 : #i51626# refactor svtools config items (at least some of them)
Diffstat (limited to 'sw/source/ui/envelp')
| -rw-r--r-- | sw/source/ui/envelp/envimg.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index fffd1fff412e..aada68947ceb 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: envimg.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.13.176.2 $ * * This file is part of OpenOffice.org. * @@ -82,7 +82,7 @@ SW_DLLPUBLIC String MakeSender() if(sToken.EqualsAscii("COMPANY")) { xub_StrLen nOldLen = sRet.Len(); - sRet += rUserOpt.GetCompany(); + sRet += (String)rUserOpt.GetCompany(); bLastLength = sRet.Len() != nOldLen; } else if(sToken.EqualsAscii("CR")) @@ -92,19 +92,19 @@ SW_DLLPUBLIC String MakeSender() bLastLength = TRUE; } else if(sToken.EqualsAscii("FIRSTNAME")) - sRet += rUserOpt.GetFirstName(); + sRet += (String)rUserOpt.GetFirstName(); else if(sToken.EqualsAscii("LASTNAME")) - sRet += rUserOpt.GetLastName(); + sRet += (String)rUserOpt.GetLastName(); else if(sToken.EqualsAscii("ADDRESS")) - sRet += rUserOpt.GetStreet(); + sRet += (String)rUserOpt.GetStreet(); else if(sToken.EqualsAscii("COUNTRY")) - sRet += rUserOpt.GetCountry(); + sRet += (String)rUserOpt.GetCountry(); else if(sToken.EqualsAscii("POSTALCODE")) - sRet += rUserOpt.GetZip(); + sRet += (String)rUserOpt.GetZip(); else if(sToken.EqualsAscii("CITY")) - sRet += rUserOpt.GetCity(); + sRet += (String)rUserOpt.GetCity(); else if(sToken.EqualsAscii("STATEPROV")) - sRet += rUserOpt.GetState(); + sRet += (String)rUserOpt.GetState(); else if(sToken.Len()) //spaces sRet += sToken; } |