diff options
Diffstat (limited to 'sw/source/ui/envelp/envimg.cxx')
| -rw-r--r-- | sw/source/ui/envelp/envimg.cxx | 50 |
1 files changed, 19 insertions, 31 deletions
diff --git a/sw/source/ui/envelp/envimg.cxx b/sw/source/ui/envelp/envimg.cxx index 1a2ee6c27f22..d83deaa3eab2 100644 --- a/sw/source/ui/envelp/envimg.cxx +++ b/sw/source/ui/envelp/envimg.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -38,16 +39,11 @@ #include <unotools/useroptions.hxx> #include <tools/shl.hxx> #include <swmodule.hxx> -#include <errhdl.hxx> #include <swtypes.hxx> #include <envimg.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif -#ifndef _ENVELP_HRC #include <envelp.hrc> -#endif #include <unomid.h> @@ -58,13 +54,13 @@ #endif using namespace utl; -using namespace rtl; using namespace ::com::sun::star::uno; +using ::rtl::OUString; + TYPEINIT1_AUTOFACTORY( SwEnvItem, SfxPoolItem ); -// -------------------------------------------------------------------------- SW_DLLPUBLIC String MakeSender() { SvtUserOptions& rUserOpt = SW_MOD()->GetUserOptions(); @@ -107,7 +103,7 @@ SW_DLLPUBLIC String MakeSender() } return sRet; } -// -------------------------------------------------------------------------- + SwEnvItem::SwEnvItem() : SfxPoolItem(FN_ENVELOP) { @@ -127,7 +123,7 @@ SwEnvItem::SwEnvItem() : lAddrFromLeft = Max(lWidth, lHeight) / 2; lAddrFromTop = Min(lWidth, lHeight) / 2; } -// -------------------------------------------------------------------------- + SwEnvItem::SwEnvItem(const SwEnvItem& rItem) : SfxPoolItem(FN_ENVELOP), aAddrText (rItem.aAddrText), @@ -146,7 +142,6 @@ SwEnvItem::SwEnvItem(const SwEnvItem& rItem) : { } -// -------------------------------------------------------------------------- SwEnvItem& SwEnvItem::operator =(const SwEnvItem& rItem) { aAddrText = rItem.aAddrText; @@ -164,7 +159,7 @@ SwEnvItem& SwEnvItem::operator =(const SwEnvItem& rItem) lShiftDown = rItem.lShiftDown; return *this; } -// -------------------------------------------------------------------------- + int SwEnvItem::operator ==(const SfxPoolItem& rItem) const { const SwEnvItem& rEnv = (const SwEnvItem&) rItem; @@ -184,13 +179,11 @@ int SwEnvItem::operator ==(const SfxPoolItem& rItem) const lShiftDown == rEnv.lShiftDown; } -// -------------------------------------------------------------------------- SfxPoolItem* SwEnvItem::Clone(SfxItemPool*) const { return new SwEnvItem(*this); } -// -------------------------------------------------------------------------- -// -------------------------------------------------------------------------- + SwEnvCfgItem::SwEnvCfgItem() : ConfigItem(C2U("Office.Writer/Envelope")) { @@ -198,7 +191,7 @@ SwEnvCfgItem::SwEnvCfgItem() : Sequence<Any> aValues = GetProperties(aNames); EnableNotification(aNames); const Any* pValues = aValues.getConstArray(); - DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); + OSL_ENSURE(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) { for(int nProp = 0; nProp < aNames.getLength(); nProp++) @@ -253,15 +246,11 @@ SwEnvCfgItem::SwEnvCfgItem() : } } } -/* -----------------------------26.09.00 14:04-------------------------------- - ---------------------------------------------------------------------------*/ SwEnvCfgItem::~SwEnvCfgItem() { } -/* -----------------------------26.09.00 14:05-------------------------------- - ---------------------------------------------------------------------------*/ void SwEnvCfgItem::Commit() { Sequence<OUString> aNames = GetPropertyNames(); @@ -293,9 +282,6 @@ void SwEnvCfgItem::Commit() void SwEnvCfgItem::Notify( const ::com::sun::star::uno::Sequence< rtl::OUString >& ) {} -/* -----------------------------26.09.00 14:04-------------------------------- - - ---------------------------------------------------------------------------*/ Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames() { static const char* aPropNames[] = @@ -317,14 +303,16 @@ Sequence<rtl::OUString> SwEnvCfgItem::GetPropertyNames() const int nCount = 13; Sequence<OUString> aNames(nCount); OUString* pNames = aNames.getArray(); + for(int i = 0; i < nCount; i++) pNames[i] = OUString::createFromAscii(aPropNames[i]); + return aNames; } -sal_Bool SwEnvItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const +bool SwEnvItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const { - sal_Bool bRet = sal_True; + sal_Bool bRet = true; switch(nMemberId & ~CONVERT_TWIPS) { case MID_ENV_ADDR_TEXT : rVal <<= aAddrText; break; @@ -341,17 +329,15 @@ sal_Bool SwEnvItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const case MID_ENV_SHIFT_RIGHT : rVal <<= lShiftRight; break; case MID_ENV_SHIFT_DOWN : rVal <<= lShiftDown; break; default: - DBG_ERROR("Wrong memberId"); - bRet = sal_False; + OSL_FAIL("Wrong memberId"); + bRet = false; } return bRet; } -/* -----------------------------26.04.01 12:26-------------------------------- - ---------------------------------------------------------------------------*/ -sal_Bool SwEnvItem::PutValue(const Any& rVal, sal_uInt8 nMemberId) +bool SwEnvItem::PutValue(const Any& rVal, sal_uInt8 nMemberId) { - sal_Bool bRet = sal_False; + bool bRet = false; switch(nMemberId & ~CONVERT_TWIPS) { case MID_ENV_ADDR_TEXT : bRet = (rVal >>= aAddrText); break; @@ -375,7 +361,9 @@ sal_Bool SwEnvItem::PutValue(const Any& rVal, sal_uInt8 nMemberId) case MID_ENV_SHIFT_RIGHT : bRet = (rVal >>= lShiftRight); break; case MID_ENV_SHIFT_DOWN : bRet = (rVal >>= lShiftDown); break; default: - DBG_ERROR("Wrong memberId"); + OSL_FAIL("Wrong memberId"); } return bRet; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |