[Libreoffice-commits] .: vcl/win

Tor Lillqvist tml at kemper.freedesktop.org
Fri Jul 15 07:54:45 PDT 2011


 vcl/win/source/src/salsrc.rc |  167 +++++++++++++++++++++----------------------
 1 file changed, 84 insertions(+), 83 deletions(-)

New commits:
commit 3ed40303e53b0a466f6ed533e61e2ee284a22484
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Jul 15 17:53:03 2011 +0300

    Adapt for windres, use the actual lower-case file names

diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc
index 11b967f..147b80f 100644
--- a/vcl/win/source/src/salsrc.rc
+++ b/vcl/win/source/src/salsrc.rc
@@ -1,3 +1,4 @@
+/* -*- Mode: Fundamental; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*************************************************************************
 *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -28,94 +29,94 @@
 // for WINVER
 #include <windows.h>
 
-#ifndef _SV_SALIDS_HRC
 #include <win/salids.hrc>
-#endif
 
-SAL_RESID_POINTER_NULL				CURSOR		NULLPTR.CUR
+SAL_RESID_POINTER_NULL                  CURSOR          nullptr.cur
 #if ( WINVER < 0x0400 )
-SAL_RESID_POINTER_HELP				CURSOR		HELP.CUR
+SAL_RESID_POINTER_HELP                  CURSOR          help.cur
 #endif
 #ifndef WNT
-SAL_RESID_POINTER_HSIZE 			CURSOR		HSIZE.CUR
-SAL_RESID_POINTER_VSIZE 			CURSOR		VSIZE.CUR
-SAL_RESID_POINTER_NESWSIZE			CURSOR		NESWSIZE.CUR
-SAL_RESID_POINTER_NWSESIZE			CURSOR		NWSESIZE.CUR
+SAL_RESID_POINTER_HSIZE                 CURSOR          hsize.cur
+SAL_RESID_POINTER_VSIZE                 CURSOR          vsize.cur
+SAL_RESID_POINTER_NESWSIZE              CURSOR          neswsize.cur
+SAL_RESID_POINTER_NWSESIZE              CURSOR          nwsesize.cur
 #endif
-SAL_RESID_POINTER_CROSS 			CURSOR		CROSS.CUR
-SAL_RESID_POINTER_MOVE				CURSOR		MOVE.CUR
-SAL_RESID_POINTER_HSPLIT			CURSOR		HSPLIT.CUR
-SAL_RESID_POINTER_VSPLIT			CURSOR		VSPLIT.CUR
-SAL_RESID_POINTER_HSIZEBAR			CURSOR		HSIZEBAR.CUR
-SAL_RESID_POINTER_VSIZEBAR			CURSOR		VSIZEBAR.CUR
-SAL_RESID_POINTER_HAND				CURSOR		HAND.CUR
-SAL_RESID_POINTER_REFHAND			CURSOR		REFHAND.CUR
-SAL_RESID_POINTER_PEN				CURSOR		PEN.CUR
-SAL_RESID_POINTER_MAGNIFY			CURSOR		MAGNIFY.CUR
-SAL_RESID_POINTER_FILL				CURSOR		FILL.CUR
-SAL_RESID_POINTER_ROTATE			CURSOR		ROTATE.CUR
-SAL_RESID_POINTER_HSHEAR			CURSOR		HSHEAR.CUR
-SAL_RESID_POINTER_VSHEAR			CURSOR		VSHEAR.CUR
-SAL_RESID_POINTER_MIRROR			CURSOR		MIRROR.CUR
-SAL_RESID_POINTER_CROOK 			CURSOR		CROOK.CUR
-SAL_RESID_POINTER_CROP				CURSOR		CROP.CUR
-SAL_RESID_POINTER_MOVEPOINT 		CURSOR		MOVEPT.CUR
-SAL_RESID_POINTER_MOVEBEZIERWEIGHT	CURSOR		MOVEBW.CUR
-SAL_RESID_POINTER_MOVEDATA			CURSOR		MOVEDATA.CUR
-SAL_RESID_POINTER_COPYDATA			CURSOR		COPYDATA.CUR
-SAL_RESID_POINTER_LINKDATA			CURSOR		LINKDATA.CUR
-SAL_RESID_POINTER_MOVEDATALINK		CURSOR		MOVEDLNK.CUR
-SAL_RESID_POINTER_COPYDATALINK		CURSOR		COPYDLNK.CUR
-SAL_RESID_POINTER_MOVEFILE			CURSOR		MOVEF.CUR
-SAL_RESID_POINTER_COPYFILE			CURSOR		COPYF.CUR
-SAL_RESID_POINTER_LINKFILE			CURSOR		LINKF.CUR
-SAL_RESID_POINTER_MOVEFILELINK		CURSOR		MOVEFLNK.CUR
-SAL_RESID_POINTER_COPYFILELINK		CURSOR		COPYFLNK.CUR
-SAL_RESID_POINTER_MOVEFILES 		CURSOR		MOVEF2.CUR
-SAL_RESID_POINTER_COPYFILES 		CURSOR		COPYF2.CUR
-SAL_RESID_POINTER_NOTALLOWED		CURSOR		NOTALLOW.CUR
-SAL_RESID_POINTER_DRAW_LINE 		CURSOR		DLINE.CUR
-SAL_RESID_POINTER_DRAW_RECT 		CURSOR		DRECT.CUR
-SAL_RESID_POINTER_DRAW_POLYGON		CURSOR		DPOLYGON.CUR
-SAL_RESID_POINTER_DRAW_BEZIER		CURSOR		DBEZIER.CUR
-SAL_RESID_POINTER_DRAW_ARC			CURSOR		DARC.CUR
-SAL_RESID_POINTER_DRAW_PIE			CURSOR		DPIE.CUR
-SAL_RESID_POINTER_DRAW_CIRCLECUT	CURSOR		DCIRCCUT.CUR
-SAL_RESID_POINTER_DRAW_ELLIPSE		CURSOR		DELLIPSE.CUR
-SAL_RESID_POINTER_DRAW_FREEHAND 	CURSOR		DFREE.CUR
-SAL_RESID_POINTER_DRAW_CONNECT		CURSOR		DCONNECT.CUR
-SAL_RESID_POINTER_DRAW_TEXT 		CURSOR		DTEXT.CUR
-SAL_RESID_POINTER_DRAW_CAPTION		CURSOR		DCAPT.CUR
-SAL_RESID_POINTER_CHART 			CURSOR		CHART.CUR
-SAL_RESID_POINTER_DETECTIVE 		CURSOR		DETECTIV.CUR
-SAL_RESID_POINTER_PIVOT_COL 		CURSOR		PIVOTCOL.CUR
-SAL_RESID_POINTER_PIVOT_ROW 		CURSOR		PIVOTROW.CUR
-SAL_RESID_POINTER_PIVOT_FIELD		CURSOR		PIVOTFLD.CUR
-SAL_RESID_POINTER_PIVOT_DELETE		CURSOR		PIVOTDEL.CUR
-SAL_RESID_POINTER_CHAIN 			CURSOR		CHAIN.CUR
-SAL_RESID_POINTER_CHAIN_NOTALLOWED	CURSOR		CHAINNOT.CUR
-SAL_RESID_POINTER_TIMEEVENT_MOVE	CURSOR		TIMEMOVE.CUR
-SAL_RESID_POINTER_TIMEEVENT_SIZE	CURSOR		TIMESIZE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_N		CURSOR		ASN.CUR
-SAL_RESID_POINTER_AUTOSCROLL_S		CURSOR		ASS.CUR
-SAL_RESID_POINTER_AUTOSCROLL_W		CURSOR		ASW.CUR
-SAL_RESID_POINTER_AUTOSCROLL_E		CURSOR		ASE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NW 	CURSOR		ASNW.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NE 	CURSOR		ASNE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_SW 	CURSOR		ASSW.CUR
-SAL_RESID_POINTER_AUTOSCROLL_SE 	CURSOR		ASSE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NS 	CURSOR		ASNS.CUR
-SAL_RESID_POINTER_AUTOSCROLL_WE 	CURSOR		ASWE.CUR
-SAL_RESID_POINTER_AUTOSCROLL_NSWE	CURSOR		ASNSWE.CUR
-SAL_RESID_POINTER_AIRBRUSH              CURSOR          AIRBRUSH.CUR
-SAL_RESID_POINTER_TEXT_VERTICAL 	CURSOR		VTEXT.CUR
-SAL_RESID_POINTER_TAB_SELECT_S          CURSOR          TBLSELS.CUR
-SAL_RESID_POINTER_TAB_SELECT_E          CURSOR          TBLSELE.CUR
-SAL_RESID_POINTER_TAB_SELECT_SE         CURSOR          TBLSELSE.CUR
-SAL_RESID_POINTER_TAB_SELECT_W          CURSOR          TBLSELW.CUR
-SAL_RESID_POINTER_TAB_SELECT_SW         CURSOR          TBLSELSW.CUR
-SAL_RESID_POINTER_PAINTBRUSH            CURSOR          PNTBRSH.CUR
+SAL_RESID_POINTER_CROSS                 CURSOR          cross.cur
+SAL_RESID_POINTER_MOVE                  CURSOR          move.cur
+SAL_RESID_POINTER_HSPLIT                CURSOR          hsplit.cur
+SAL_RESID_POINTER_VSPLIT                CURSOR          vsplit.cur
+SAL_RESID_POINTER_HSIZEBAR              CURSOR          hsizebar.cur
+SAL_RESID_POINTER_VSIZEBAR              CURSOR          vsizebar.cur
+SAL_RESID_POINTER_HAND                  CURSOR          hand.cur
+SAL_RESID_POINTER_REFHAND               CURSOR          refhand.cur
+SAL_RESID_POINTER_PEN                   CURSOR          pen.cur
+SAL_RESID_POINTER_MAGNIFY               CURSOR          magnify.cur
+SAL_RESID_POINTER_FILL                  CURSOR          fill.cur
+SAL_RESID_POINTER_ROTATE                CURSOR          rotate.cur
+SAL_RESID_POINTER_HSHEAR                CURSOR          hshear.cur
+SAL_RESID_POINTER_VSHEAR                CURSOR          vshear.cur
+SAL_RESID_POINTER_MIRROR                CURSOR          mirror.cur
+SAL_RESID_POINTER_CROOK                 CURSOR          crook.cur
+SAL_RESID_POINTER_CROP                  CURSOR          crop.cur
+SAL_RESID_POINTER_MOVEPOINT             CURSOR          movept.cur
+SAL_RESID_POINTER_MOVEBEZIERWEIGHT      CURSOR          movebw.cur
+SAL_RESID_POINTER_MOVEDATA              CURSOR          movedata.cur
+SAL_RESID_POINTER_COPYDATA              CURSOR          copydata.cur
+SAL_RESID_POINTER_LINKDATA              CURSOR          linkdata.cur
+SAL_RESID_POINTER_MOVEDATALINK          CURSOR          movedlnk.cur
+SAL_RESID_POINTER_COPYDATALINK          CURSOR          copydlnk.cur
+SAL_RESID_POINTER_MOVEFILE              CURSOR          movef.cur
+SAL_RESID_POINTER_COPYFILE              CURSOR          copyf.cur
+SAL_RESID_POINTER_LINKFILE              CURSOR          linkf.cur
+SAL_RESID_POINTER_MOVEFILELINK          CURSOR          moveflnk.cur
+SAL_RESID_POINTER_COPYFILELINK          CURSOR          copyflnk.cur
+SAL_RESID_POINTER_MOVEFILES             CURSOR          movef2.cur
+SAL_RESID_POINTER_COPYFILES             CURSOR          copyf2.cur
+SAL_RESID_POINTER_NOTALLOWED            CURSOR          notallow.cur
+SAL_RESID_POINTER_DRAW_LINE             CURSOR          dline.cur
+SAL_RESID_POINTER_DRAW_RECT             CURSOR          drect.cur
+SAL_RESID_POINTER_DRAW_POLYGON          CURSOR          dpolygon.cur
+SAL_RESID_POINTER_DRAW_BEZIER           CURSOR          dbezier.cur
+SAL_RESID_POINTER_DRAW_ARC              CURSOR          darc.cur
+SAL_RESID_POINTER_DRAW_PIE              CURSOR          dpie.cur
+SAL_RESID_POINTER_DRAW_CIRCLECUT        CURSOR          dcirccut.cur
+SAL_RESID_POINTER_DRAW_ELLIPSE          CURSOR          dellipse.cur
+SAL_RESID_POINTER_DRAW_FREEHAND         CURSOR          dfree.cur
+SAL_RESID_POINTER_DRAW_CONNECT          CURSOR          dconnect.cur
+SAL_RESID_POINTER_DRAW_TEXT             CURSOR          dtext.cur
+SAL_RESID_POINTER_DRAW_CAPTION          CURSOR          dcapt.cur
+SAL_RESID_POINTER_CHART                 CURSOR          chart.cur
+SAL_RESID_POINTER_DETECTIVE             CURSOR          detectiv.cur
+SAL_RESID_POINTER_PIVOT_COL             CURSOR          pivotcol.cur
+SAL_RESID_POINTER_PIVOT_ROW             CURSOR          pivotrow.cur
+SAL_RESID_POINTER_PIVOT_FIELD           CURSOR          pivotfld.cur
+SAL_RESID_POINTER_PIVOT_DELETE          CURSOR          pivotdel.cur
+SAL_RESID_POINTER_CHAIN                 CURSOR          chain.cur
+SAL_RESID_POINTER_CHAIN_NOTALLOWED      CURSOR          chainnot.cur
+SAL_RESID_POINTER_TIMEEVENT_MOVE        CURSOR          timemove.cur
+SAL_RESID_POINTER_TIMEEVENT_SIZE        CURSOR          timesize.cur
+SAL_RESID_POINTER_AUTOSCROLL_N          CURSOR          asn.cur
+SAL_RESID_POINTER_AUTOSCROLL_S          CURSOR          ass.cur
+SAL_RESID_POINTER_AUTOSCROLL_W          CURSOR          asw.cur
+SAL_RESID_POINTER_AUTOSCROLL_E          CURSOR          ase.cur
+SAL_RESID_POINTER_AUTOSCROLL_NW         CURSOR          asnw.cur
+SAL_RESID_POINTER_AUTOSCROLL_NE         CURSOR          asne.cur
+SAL_RESID_POINTER_AUTOSCROLL_SW         CURSOR          assw.cur
+SAL_RESID_POINTER_AUTOSCROLL_SE         CURSOR          asse.cur
+SAL_RESID_POINTER_AUTOSCROLL_NS         CURSOR          asns.cur
+SAL_RESID_POINTER_AUTOSCROLL_WE         CURSOR          aswe.cur
+SAL_RESID_POINTER_AUTOSCROLL_NSWE       CURSOR          asnswe.cur
+SAL_RESID_POINTER_AIRBRUSH              CURSOR          airbrush.cur
+SAL_RESID_POINTER_TEXT_VERTICAL         CURSOR          vtext.cur
+SAL_RESID_POINTER_TAB_SELECT_S          CURSOR          tblsels.cur
+SAL_RESID_POINTER_TAB_SELECT_E          CURSOR          tblsele.cur
+SAL_RESID_POINTER_TAB_SELECT_SE         CURSOR          tblselse.cur
+SAL_RESID_POINTER_TAB_SELECT_W          CURSOR          tblselw.cur
+SAL_RESID_POINTER_TAB_SELECT_SW         CURSOR          tblselsw.cur
+SAL_RESID_POINTER_PAINTBRUSH            CURSOR          pntbrsh.cur
+
+SAL_RESID_BITMAP_50                     BITMAP          "50.bmp"
 
-SAL_RESID_BITMAP_50                             BITMAP          50.BMP
+SAL_RESID_ICON_DEFAULT                  ICON            sd.ico
 
-SAL_RESID_ICON_DEFAULT				ICON		SD.ICO
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list