chart2/source/controller/dialogs/res_Trendline.hxx | 1 -
svtools/source/control/valueset.cxx | 10 +++-------
2 files changed, 3 insertions(+), 8 deletions(-)
New commits:
commit 7a11e6106bf3080357ea486500d786010b0b5693
Author: Matteo Casalin <matteo.casa...@poste.it>
Date: Sun Dec 18 21:48:03 2011 +0100
Remove unneeded tests before delete
Pointers deleted in destructor are modified in remaining code,
and already set to NULL when necessary.
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index abf575b..576a091 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -118,11 +118,8 @@ ValueSet::~ValueSet()
if (xComponent.is())
xComponent->dispose ();
- if ( mpScrBar )
- delete mpScrBar;
-
- if ( mpNoneItem )
- delete mpNoneItem;
+ delete mpScrBar;
+ delete mpNoneItem;
ImplDeleteItems();
delete mpImpl;
@@ -665,8 +662,7 @@ void ValueSet::Format()
mbFormat = sal_False;
// ScrollBar loeschen
- if ( pDelScrBar )
- delete pDelScrBar;
+ delete pDelScrBar;
}
// -----------------------------------------------------------------------
commit 791b1e941ecdbf176831857e85fcd48720ae45b4
Author: Matteo Casalin <matteo.casa...@poste.it>
Date: Sun Dec 18 15:37:09 2011 +0100
Remove unused header
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx
b/chart2/source/controller/dialogs/res_Trendline.hxx
index 6e290f8..6f9c395 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -31,7 +31,6 @@
#include <vcl/window.hxx>
#include <vcl/button.hxx>
#include <vcl/fixed.hxx>
-#include <svtools/valueset.hxx>
#include <svl/itemset.hxx>
#include <svx/chrtitem.hxx>
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
