[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - sd/source vcl/win vcl/WinResTarget_vcl.mk

Matthias Seidel mseidel at apache.org
Thu Jul 12 12:10:50 UTC 2018


 dev/null                         |binary
 sd/source/filter/html/pubdlg.src |    8 +-
 vcl/WinResTarget_vcl.mk          |   10 +--
 vcl/win/source/src/oo.ico        |binary
 vcl/win/source/src/salsrc.rc     |  119 +++++++++++++++++++--------------------
 5 files changed, 69 insertions(+), 68 deletions(-)

New commits:
commit 9353191981faed85afa7e40bd3941a8bd9d87102
Author: Matthias Seidel <mseidel at apache.org>
Date:   Thu Jul 12 10:46:06 2018 +0000

    Replacing sd.ico (StarDesktop?) with OpenOffice icon

diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index e3b29b5b3540..b6c5c5ae3a6c 100755
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -24,8 +24,8 @@
 $(eval $(call gb_WinResTarget_WinResTarget,vcl/src))
 
 $(eval $(call gb_WinResTarget_set_include,vcl/src,\
-        $$(INCLUDE) \
-        -I$(SRCDIR)/vcl/inc \
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/inc \
 ))
 
 ifeq ($(OS),WNT)
@@ -49,7 +49,7 @@ $(eval $(call gb_WinResTarget_add_dependency,vcl/src,\
     vcl/win/source/src/copyf.cur \
     vcl/win/source/src/drect.cur \
     vcl/win/source/src/movef.cur \
-    vcl/win/source/src/sd.ico \
+    vcl/win/source/src/oo.ico \
     vcl/win/source/src/ase.cur \
     vcl/win/source/src/copyf2.cur \
     vcl/win/source/src/dtext.cur \
@@ -127,8 +127,8 @@ $(eval $(call gb_WinResTarget_add_file,vcl/src,\
 ))
 
 $(eval $(call gb_WinResTarget_set_include,vcl/src,\
-        $$(INCLUDE) \
-        -I$(SRCDIR)/vcl/os2/source/src \
+    $$(INCLUDE) \
+    -I$(SRCDIR)/vcl/os2/source/src \
 ))
 
 endif
diff --git a/vcl/win/source/src/oo.ico b/vcl/win/source/src/oo.ico
new file mode 100644
index 000000000000..f9c2b09e67bb
Binary files /dev/null and b/vcl/win/source/src/oo.ico differ
diff --git a/vcl/win/source/src/salsrc.rc b/vcl/win/source/src/salsrc.rc
index 810f15564c30..5adb26a9cb3f 100644
--- a/vcl/win/source/src/salsrc.rc
+++ b/vcl/win/source/src/salsrc.rc
@@ -28,67 +28,67 @@
 #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_VSIZ			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_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_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_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_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_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_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_FREEHAND		CURSOR		DFREE.CUR
 SAL_RESID_POINTER_DRAW_CONNECT		CURSOR		DCONNECT.CUR
-SAL_RESID_POINTER_DRAW_TEXT 		CURSOR		DTEXT.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_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			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
@@ -96,22 +96,23 @@ 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_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_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		OO.ICO
 
-SAL_RESID_ICON_DEFAULT				ICON		SD.ICO
diff --git a/vcl/win/source/src/sd.ico b/vcl/win/source/src/sd.ico
deleted file mode 100644
index b2a0a07a67c3..000000000000
Binary files a/vcl/win/source/src/sd.ico and /dev/null differ
commit d7de7c96a56a98c10e73322f1812d4a5c9d95523
Author: Matthias Seidel <mseidel at apache.org>
Date:   Thu Jul 12 10:35:57 2018 +0000

    Small change to the aspect ratio of the graphics

diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src
index d7ad5d7697f4..22ed793b26f7 100644
--- a/sd/source/filter/html/pubdlg.src
+++ b/sd/source/filter/html/pubdlg.src
@@ -147,7 +147,7 @@ ModalDialog DLG_PUBLISHING
     {
         Pos = MAP_APPFONT( 21, 102 );
         Scale = TRUE;
-        Size = MAP_APPFONT( 60, 45 );
+        Size = MAP_APPFONT( 60, 48 );
         Fixed = Bitmap { File = "pubdes1.png"; };
         OutputSize = TRUE ;
         Border = TRUE;
@@ -157,7 +157,7 @@ ModalDialog DLG_PUBLISHING
     {
         Pos = MAP_APPFONT( 21, 102 );
         Scale = TRUE;
-        Size = MAP_APPFONT( 60, 45 );
+        Size = MAP_APPFONT( 60, 48 );
         Fixed = Bitmap { File = "pubdes2.png"; };
         OutputSize = TRUE ;
         Border = TRUE;
@@ -167,7 +167,7 @@ ModalDialog DLG_PUBLISHING
     {
         Pos = MAP_APPFONT( 21, 102 );
         Scale = TRUE;
-        Size = MAP_APPFONT( 60, 45 );
+        Size = MAP_APPFONT( 60, 48 );
         Fixed = Bitmap { File = "pubdes3.png"; };
         OutputSize = TRUE ;
         Border = TRUE;
@@ -177,7 +177,7 @@ ModalDialog DLG_PUBLISHING
     {
         Pos = MAP_APPFONT( 21, 102 );
         Scale = TRUE;
-        Size = MAP_APPFONT( 60, 45 );
+        Size = MAP_APPFONT( 60, 48 );
         Fixed = Bitmap { File = "pubdes4.png"; };
         OutputSize = TRUE ;
         Border = TRUE;


More information about the Libreoffice-commits mailing list