[Libreoffice-commits] .: 2 commits - i18npool/source svx/source

[Caolán McNamara]

 i18npool/source/textconversion/Makefile |    5 +++++
 svx/source/svdraw/svdorect.cxx          |   13 ++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit bd6fadb384bf1a2f542a077a44549a533e8fcb62
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 19 15:56:11 2011 +0100

    another one

diff --git a/i18npool/source/textconversion/Makefile b/i18npool/source/textconversion/Makefile
index 490d11a..8a4693d 100644
--- a/i18npool/source/textconversion/Makefile
+++ b/i18npool/source/textconversion/Makefile
@@ -34,7 +34,12 @@ include $(GBUILDDIR)/gbuild_simple.mk
 	sed 's/\(^.*get\)/SAL_DLLPUBLIC_EXPORT \1/' $< > $@
 
 %_invis.cxx : $(realpath $(SRC_ROOT)/i18npool/source/textconversion/data)/%.dic
+ifeq ($(OS_FOR_BUILD),WNT)
+	$(gb_Helper_execute)genconv_dict $* `cygpath -m $<` $@
+else
 	$(gb_Helper_execute)genconv_dict $* $< $@
+endif
+
 
 .PHONY: all
 # vim: set noet sw=4 ts=4:
commit d3a0aa10d89fcf8dcd27996338efbb7cc3f0b357
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Aug 19 15:53:46 2011 +0100

    would leak on SdrRectObj::RecalcXPoly, drop NULL checks before delete

diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx
index 1572f12..91833fc 100644
--- a/svx/source/svdraw/svdorect.cxx
+++ b/svx/source/svdraw/svdorect.cxx
@@ -111,10 +111,7 @@ SdrRectObj::SdrRectObj(SdrObjKind eNewTextKind, const Rectangle& rRect)
 
 SdrRectObj::~SdrRectObj()
 {
-    if(mpXPoly)
-    {
-        delete mpXPoly;
-    }
+    delete mpXPoly;
 }
 
 SdrRectObj& SdrRectObj::operator=(const SdrRectObj& rCopy)
@@ -136,11 +133,8 @@ SdrRectObj& SdrRectObj::operator=(const SdrRectObj& rCopy)
 
 void SdrRectObj::SetXPolyDirty()
 {
-    if(mpXPoly)
-    {
-        delete mpXPoly;
-        mpXPoly = 0L;
-    }
+    delete mpXPoly;
+    mpXPoly = 0L;
 }
 
 XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const
@@ -169,6 +163,7 @@ XPolygon SdrRectObj::ImpCalcXPoly(const Rectangle& rRect1, long nRad1) const
 
 void SdrRectObj::RecalcXPoly()
 {
+    delete mpXPoly;
     mpXPoly = new XPolygon(ImpCalcXPoly(aRect,GetEckenradius()));
 }