[Libreoffice-commits] core.git: sfx2/source

Julien Nabet serval2412 at yahoo.fr
Sat Nov 5 13:54:34 UTC 2016


 sfx2/source/appl/app.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 8f79079fa97acd084d8afbcc1a4f525d276fb05f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Nov 5 12:41:32 2016 +0100

    Replace OSL_ENSURE by SAL_WARN_IF + clean include
    
    Change-Id: I4d3a50fda2f865a546aafc38f06096117da34711
    Reviewed-on: https://gerrit.libreoffice.org/30588
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Tested-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index ad86ee8..307e218 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -35,7 +35,6 @@
 #include <svl/svdde.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/tempfile.hxx>
-#include <osl/file.hxx>
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/frame/XFrameActionListener.hpp>
 #include <com/sun/star/frame/XComponentLoader.hpp>
@@ -217,7 +216,7 @@ SfxApplication::SfxApplication()
 
 SfxApplication::~SfxApplication()
 {
-    OSL_ENSURE( GetObjectShells_Impl().size() == 0, "Memory leak: some object shells were not removed!" );
+    SAL_WARN_IF(GetObjectShells_Impl().size() != 0, "sfx.appl", "Memory leak: some object shells were not removed!");
 
     Broadcast( SfxHint(SFX_HINT_DYING) );
 


More information about the Libreoffice-commits mailing list