[Libreoffice-commits] .: vcl/inc vcl/win

[Andras Timar]

 dev/null                       |binary
 vcl/inc/win/salids.hrc         |    2 --
 vcl/win/source/app/salinst.cxx |    1 -
 vcl/win/source/src/salsrc.rc   |    2 --
 4 files changed, 5 deletions(-)

New commits:
commit 915fe51391bdeee79f31173aeedab9746fc88000
Author: Andras Timar <atimar at suse.com>
Date:   Sun Dec 4 15:07:50 2011 +0100

    remove StarDesktop icon

diff --git a/vcl/inc/win/salids.hrc b/vcl/inc/win/salids.hrc
index 3049f11..574bdc0 100644
--- a/vcl/inc/win/salids.hrc
+++ b/vcl/inc/win/salids.hrc
@@ -115,6 +115,4 @@
 
 #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 90841f7..d3fce7c 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -541,7 +541,6 @@ 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 147b80f..956f862 100644
--- a/vcl/win/source/src/salsrc.rc
+++ b/vcl/win/source/src/salsrc.rc
@@ -117,6 +117,4 @@ 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
deleted file mode 100644
index b2a0a07..0000000
Binary files a/vcl/win/source/src/sd.ico and /dev/null differ