[Libreoffice-commits] .: Branch 'libreoffice-3-6' - 2 commits - sal/Library_sal.mk sfx2/source

[Libreoffice Gerrit user]

 sal/Library_sal.mk                   |    3 +++
 sfx2/source/appl/shutdowniconw32.cxx |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit afbbc9c44b80208a5374f987ef4072e1cb5cdb18
Author: Luboš Luňák <l.lunak at suse.cz>
Date:   Thu Nov 15 12:17:00 2012 +0100

    fix mingw build

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index de22417..e1360f8 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -81,6 +81,9 @@ $(eval $(call gb_Library_use_libraries,sal,\
 	$(if $(filter $(OS),ANDROID), \
 		lo-bootstrap \
 	) \
+	$(if $(filter-out $(GUI),UNX), \
+		uwinapi \
+	) \
 	$(gb_STDLIBS) \
 ))
 
commit a5d27e22c0c3be80a61c4d37252aeeaa81a704fa
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Jul 17 10:34:30 2012 +0200

    Fix MinGW build.
    
    Change-Id: I48bad55cc982fba6fb48a921746801de9993bff1
    Signed-off-by: Luboš Luňák <l.lunak at suse.cz>

diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index 28f783b..2f85ae5 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -289,7 +289,7 @@ static void addTaskbarIcon( HWND hWnd )
         IMAGE_ICON, GetSystemMetrics( SM_CXSMICON ), GetSystemMetrics( SM_CYSMICON ),
         LR_DEFAULTCOLOR | LR_SHARED );
 
-    wcsncpy( nid.szTip, strTip.getStr(), 64 );
+    wcsncpy( nid.szTip, reinterpret_cast<LPCWSTR>(strTip.getStr()), 64 );
 
     nid.cbSize              = sizeof(nid);
     nid.hWnd                = hWnd;