diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-03 12:21:11 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-08-03 12:21:11 +0000 |
| commit | 0036a6e05811bf2b71bd092aad6525a437b527bb (patch) | |
| tree | 90352dbdd0ee4179f39c2ef8f18e1b09160741fc /svx/source | |
| parent | 71d9ec767afcc5e99c9c7c313983dfd2386dccd5 (diff) | |
INTEGRATION: CWS aw017 (1.39.372); FILE MERGED
2004/07/29 14:20:49 aw 1.39.372.1: #i25616#
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/svdraw/svdoattr.cxx | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index f4e5b88e327f..9e78d2e64d0b 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: svdoattr.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: rt $ $Date: 2003-11-24 16:56:05 $ + * last change: $Author: hr $ $Date: 2004-08-03 13:21:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -497,17 +497,26 @@ void __EXPORT SdrAttrObj::SFX_NOTIFY(SfxBroadcaster& rBC, const TypeId& rBCType, } } -INT32 SdrAttrObj::ImpGetLineWdt() const +sal_Int32 SdrAttrObj::ImpGetLineWdt() const { - const SfxItemSet& rSet = GetMergedItemSet(); - XLineStyle eLine = ((XLineStyleItem&)(rSet.Get(XATTR_LINESTYLE))).GetValue(); + sal_Int32 nRetval(0); - if(XLINE_NONE == eLine) - return 0; // Garkeine Linie da. - - sal_Int32 nWdt = ((XLineWidthItem&)(rSet.Get(XATTR_LINEWIDTH))).GetValue(); + if(XLINE_NONE != ((XLineStyleItem&)(GetObjectItem(XATTR_LINESTYLE))).GetValue()) + { + nRetval = ((XLineWidthItem&)(GetObjectItem(XATTR_LINEWIDTH))).GetValue(); + } - return nWdt; + return nRetval; + +//#i25616# const SfxItemSet& rSet = GetMergedItemSet(); +//#i25616# XLineStyle eLine = ((XLineStyleItem&)(rSet.Get(XATTR_LINESTYLE))).GetValue(); +//#i25616# +//#i25616# if(XLINE_NONE == eLine) +//#i25616# return 0; // Garkeine Linie da. +//#i25616# +//#i25616# sal_Int32 nWdt = ((XLineWidthItem&)(rSet.Get(XATTR_LINEWIDTH))).GetValue(); +//#i25616# +//#i25616# return nWdt; } INT32 SdrAttrObj::ImpGetLineEndAdd() const |