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

[Stephan Bergmann]

 shell/source/win32/shlxthandler/classfactory.cxx        |    7 -------
 shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx |    7 -------
 2 files changed, 14 deletions(-)

New commits:
commit 096d1d6e7cb52591e30eb9ae16ff6eb562f9dbf1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon May 12 12:32:56 2014 +0200

    This code is not linked against sal
    
    Change-Id: I7f44cd54732a60e9655f0bbb90615f3d3988ce58

diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx
index d5a394f..d3a14b9 100644
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
@@ -17,12 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#undef OSL_DEBUG_LEVEL
-
-
-#include <osl/diagnose.h>
-#include <sal/log.hxx>
-
 #include "internal/global.hxx"
 #include "classfactory.hxx"
 #include "internal/infotips.hxx"
@@ -122,7 +116,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance(
 
     if (0 == pUnk)
     {
-        SAL_WARN("shell", "Could not create COM object");
         return E_OUTOFMEMORY;
     }
 
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 10deb73..acc0174 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -17,11 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#undef OSL_DEBUG_LEVEL
-
-
-#include <osl/diagnose.h>
-
 #include "internal/global.hxx"
 #include "internal/propertyhdl.hxx"
 #include "internal/fileextensions.hxx"
@@ -32,7 +27,6 @@
 #include <propkey.h>
 #include <propvarutil.h>
 #include <sal/macros.h>
-#include <sal/log.hxx>
 
 #include <malloc.h>
 #include <strsafe.h>
@@ -383,7 +377,6 @@ HRESULT STDMETHODCALLTYPE CClassFactory::CreateInstance(
 
     if (0 == pUnk)
     {
-        SAL_WARN("shell", "Could not create COM object");
         return E_OUTOFMEMORY;
     }