diff options
Diffstat (limited to 'sw/source/ui/envelp/envimg.cxx')
| -rw-r--r-- | sw/source/ui/envelp/envimg.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index 522f5cdf0bfa..535f3063e0fe 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -47,7 +47,7 @@ #include <unomid.h> -#ifdef WIN +#ifdef WNT #define NEXTLINE UniString::CreateFromAscii("\r\n") #else #define NEXTLINE '\n' @@ -68,7 +68,7 @@ SW_DLLPUBLIC String MakeSender() String sRet; String sSenderToken(SW_RES(STR_SENDER_TOKENS)); xub_StrLen nSttPos = 0, nTokenCount = sSenderToken.GetTokenCount(';'); - BOOL bLastLength = TRUE; + sal_Bool bLastLength = sal_True; for( xub_StrLen i = 0; i < nTokenCount; i++ ) { String sToken = sSenderToken.GetToken( 0, ';', nSttPos ); @@ -82,7 +82,7 @@ SW_DLLPUBLIC String MakeSender() { if(bLastLength) sRet +=NEXTLINE; - bLastLength = TRUE; + bLastLength = sal_True; } else if(sToken.EqualsAscii("FIRSTNAME")) sRet += (String)rUserOpt.GetFirstName(); @@ -108,7 +108,7 @@ SwEnvItem::SwEnvItem() : SfxPoolItem(FN_ENVELOP) { aAddrText = aEmptyStr; - bSend = TRUE; + bSend = sal_True; aSendText = MakeSender(); lSendFromLeft = 566; // 1 cm lSendFromTop = 566; // 1 cm @@ -116,7 +116,7 @@ SwEnvItem::SwEnvItem() : lWidth = aEnvSz.Width(); lHeight = aEnvSz.Height(); eAlign = ENV_HOR_LEFT; - bPrintFromAbove = TRUE; + bPrintFromAbove = sal_True; lShiftRight = 0; lShiftDown = 0; @@ -310,7 +310,7 @@ Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames() return aNames; } -bool SwEnvItem::QueryValue( Any& rVal, BYTE nMemberId ) const +bool SwEnvItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const { sal_Bool bRet = true; switch(nMemberId & ~CONVERT_TWIPS) @@ -335,7 +335,7 @@ bool SwEnvItem::QueryValue( Any& rVal, BYTE nMemberId ) const return bRet; } -bool SwEnvItem::PutValue(const Any& rVal, BYTE nMemberId) +bool SwEnvItem::PutValue(const Any& rVal, sal_uInt8 nMemberId) { bool bRet = false; switch(nMemberId & ~CONVERT_TWIPS) |