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

[Stephan Bergmann]

 svl/source/svdde/ddeimp.hxx  |    1 -
 svl/source/svdde/ddestrg.cxx |    9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit f278b6d4afacb3d41f47023161ed8f076e5642f2
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 11 11:14:59 2017 +0200

    Clean up uses of SAL_U/SAL_W: svl
    
    Change-Id: Iab8a066d050ec042a32d57c338f5318c992c1999

diff --git a/svl/source/svdde/ddeimp.hxx b/svl/source/svdde/ddeimp.hxx
index e5029780eb57..b891a1509476 100644
--- a/svl/source/svdde/ddeimp.hxx
+++ b/svl/source/svdde/ddeimp.hxx
@@ -62,7 +62,6 @@ protected:
     DWORD       hInst;
 
 public:
-                DdeString( DWORD, const sal_Unicode* );
                 DdeString( DWORD, const OUString& );
                 ~DdeString();
 
diff --git a/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx
index 366e6ada7cf7..841c3d7e8e28 100644
--- a/svl/source/svdde/ddestrg.cxx
+++ b/svl/source/svdde/ddestrg.cxx
@@ -23,17 +23,10 @@
 #include "ddeimp.hxx"
 #include <svl/svdde.hxx>
 
-DdeString::DdeString( DWORD hDdeInst, const sal_Unicode* p )
-    : m_aString(p)
-{
-    hString = DdeCreateStringHandle( hDdeInst, SAL_W(p), CP_WINUNICODE );
-    hInst = hDdeInst;
-}
-
 DdeString::DdeString( DWORD hDdeInst, const OUString& r)
     : m_aString(r)
 {
-    hString = DdeCreateStringHandle( hDdeInst, SAL_W(r.getStr()), CP_WINUNICODE );
+    hString = DdeCreateStringHandle( hDdeInst, reinterpret_cast<wchar_t const *>(r.getStr()), CP_WINUNICODE );
     hInst = hDdeInst;
 }