diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 15:31:37 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-19 15:31:37 +0000 |
| commit | 012848b7fbf4edf58374b86a68f5600859904372 (patch) | |
| tree | 317ba495e56965be53882269c523ca0f73c5b104 /svx/source/sdr | |
| parent | 50a57c52fee8fd206b5d768eb0adb6ef892d7f9e (diff) | |
INTEGRATION: CWS warnings01 (1.7.190); FILE MERGED
2006/05/17 14:09:38 sb 1.7.190.2: #i65443# Fixed previous changes.
2006/02/21 16:59:34 aw 1.7.190.1: #i55991# Adaptions to warning free code
Diffstat (limited to 'svx/source/sdr')
| -rw-r--r-- | svx/source/sdr/properties/textproperties.cxx | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index 2fdc3a142656..9ac8b6b6577d 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -4,9 +4,9 @@ * * $RCSfile: textproperties.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: hr $ $Date: 2005-09-27 12:29:44 $ + * last change: $Author: hr $ $Date: 2006-06-19 16:31:37 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -213,7 +213,7 @@ namespace sdr OutlinerParaObject* pParaObj = rObj.GetOutlinerParaObject(); // #i25616# - sal_Int32 nOldLineWidth; + sal_Int32 nOldLineWidth(0L); if(XATTR_LINEWIDTH == nWhich && rObj.DoesSupportTextIndentingOnLineWidthChange()) { @@ -295,10 +295,10 @@ namespace sdr if(nParaCount) { - SfxItemSet* pTempSet; - for(sal_uInt32 nPara(0L); nPara < nParaCount; nPara++) { + SfxItemSet* pTempSet = 0L; + // since setting the stylesheet removes all para attributes if(bDontRemoveHardAttr) { @@ -337,10 +337,11 @@ namespace sdr if(bDontRemoveHardAttr) { - // restore para attributes - rOutliner.SetParaAttribs(nPara, *pTempSet); - - delete pTempSet; + if(pTempSet) + { + // restore para attributes + rOutliner.SetParaAttribs(nPara, *pTempSet); + } } else { @@ -367,6 +368,11 @@ namespace sdr } } } + + if(pTempSet) + { + delete pTempSet; + } } OutlinerParaObject* pTemp = rOutliner.CreateParaObject(0, (sal_uInt16)nParaCount); |