vcl/inc/win/salids.hrc | 2 ++ vcl/win/source/app/salinst.cxx | 1 + vcl/win/source/src/salsrc.rc | 2 ++ vcl/win/source/src/sd.ico |binary 4 files changed, 5 insertions(+)
New commits: commit 30febe7998caa282ea9a7ebb53dd8517d5b2abc6 Author: Jan Holesovsky <ke...@suse.cz> Date: Mon Dec 5 10:10:24 2011 +0100 Revert "remove StarDesktop icon" This breaks unit tests in svtools. This reverts commit 915fe51391bdeee79f31173aeedab9746fc88000. diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc index 574bdc0..3049f11 100644 --- a/vcl/inc/win/salids.hrc +++ b/vcl/inc/win/salids.hrc @@ -115,4 +115,6 @@ #define SAL_RESID_BITMAP_50 11000 +#define SAL_RESID_ICON_DEFAULT 1 + #endif // _SV_SALIDS_HRC diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx index d3fce7c..90841f7 100644 --- a/vcl/win/source/app/salinst.cxx +++ b/vcl/win/source/app/salinst.cxx @@ -541,6 +541,7 @@ SalInstance* CreateSalInstance() aWndClassEx.hbrBackground = 0; aWndClassEx.lpszMenuName = 0; aWndClassEx.lpszClassName = SAL_FRAME_CLASSNAMEW; + ImplLoadSalIcon( SAL_RESID_ICON_DEFAULT, aWndClassEx.hIcon, aWndClassEx.hIconSm ); if ( !RegisterClassExW( &aWndClassEx ) ) return NULL; diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc index 956f862..147b80f 100644 --- a/vcl/win/source/src/salsrc.rc +++ b/vcl/win/source/src/salsrc.rc @@ -117,4 +117,6 @@ SAL_RESID_POINTER_PAINTBRUSH CURSOR pntbrsh.cur SAL_RESID_BITMAP_50 BITMAP "50.bmp" +SAL_RESID_ICON_DEFAULT ICON sd.ico + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/win/source/src/sd.ico b/vcl/win/source/src/sd.ico new file mode 100644 index 0000000..b2a0a07 Binary files /dev/null and b/vcl/win/source/src/sd.ico differ _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits