You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2025/12/30 07:13:47 UTC

(openoffice) branch AOO41X updated (203ea0b258 -> 75ed7293d2)

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a change to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


    from 203ea0b258 Remove obolete App icons (Windows)
     new 9938463617 Cleanup
     new 75ed7293d2 Addition to my last commit

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 main/desktop/win32/source/guiloader/makefile.mk | 30 ++++++++++++-------------
 1 file changed, 14 insertions(+), 16 deletions(-)


(openoffice) 01/02: Cleanup

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 99384636174dbc00196c59754dc85c3c3dff1345
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Dec 30 08:12:57 2025 +0100

    Cleanup
---
 main/desktop/win32/source/guiloader/makefile.mk | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/main/desktop/win32/source/guiloader/makefile.mk b/main/desktop/win32/source/guiloader/makefile.mk
index 2bad5faa36..054887b53f 100644
--- a/main/desktop/win32/source/guiloader/makefile.mk
+++ b/main/desktop/win32/source/guiloader/makefile.mk
@@ -1,5 +1,5 @@
 #**************************************************************
-#  
+#
 #  Licensed to the Apache Software Foundation (ASF) under one
 #  or more contributor license agreements.  See the NOTICE file
 #  distributed with this work for additional information
@@ -7,16 +7,16 @@
 #  to you under the Apache License, Version 2.0 (the
 #  "License"); you may not use this file except in compliance
 #  with the License.  You may obtain a copy of the License at
-#  
+#
 #    http://www.apache.org/licenses/LICENSE-2.0
-#  
+#
 #  Unless required by applicable law or agreed to in writing,
 #  software distributed under the License is distributed on an
 #  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
 #  KIND, either express or implied.  See the License for the
 #  specific language governing permissions and limitations
 #  under the License.
-#  
+#
 #**************************************************************
 
 
@@ -59,4 +59,3 @@ STDLIB2=$(SHLWAPILIB)
 
 
 .INCLUDE :  target.mk
-


(openoffice) 02/02: Addition to my last commit

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO41X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 75ed7293d2692588e0e2dcb6e347e513c07a959d
Author: mseidel <ms...@apache.org>
AuthorDate: Tue Dec 30 07:58:01 2025 +0100

    Addition to my last commit
    
    (cherry picked from commit 018fa46b8d4738ddc0bf41d771ec28d39ceb0a2e)
---
 main/desktop/win32/source/guiloader/makefile.mk | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/main/desktop/win32/source/guiloader/makefile.mk b/main/desktop/win32/source/guiloader/makefile.mk
index 054887b53f..79088d4ba0 100644
--- a/main/desktop/win32/source/guiloader/makefile.mk
+++ b/main/desktop/win32/source/guiloader/makefile.mk
@@ -19,8 +19,6 @@
 #
 #**************************************************************
 
-
-
 PRJ=..$/..$/..
 
 PRJNAME=desktop
@@ -31,17 +29,17 @@ UWINAPILIB=
 
 # --- Settings -----------------------------------------------------
 
-.INCLUDE :  settings.mk
+.INCLUDE : settings.mk
 
 # --- Files --------------------------------------------------------
 
 APP1TARGET=guiloader
 APP1NOSAL=TRUE
-APP1ICON=$(SOLARRESDIR)$/icons/ooo-main-app.ico
+APP1ICON=$(SOLARRESDIR)$/icons/ooo3_main_app.ico
 APP1OBJS=\
-    $(OBJ)$/extendloaderenvironment.obj \
-    $(OBJ)$/genericloader.obj \
-    $(SOLARLIBDIR)$/pathutils-obj.obj
+	$(OBJ)$/extendloaderenvironment.obj \
+	$(OBJ)$/genericloader.obj \
+	$(SOLARLIBDIR)$/pathutils-obj.obj
 STDLIB1=$(SHLWAPILIB)
 
 .IF "$(LINK_SO)"=="TRUE"
@@ -49,13 +47,14 @@ APP2TARGET=so$/guiloader
 APP2NOSAL=TRUE
 APP2ICON=$(SOLARRESDIR)$/icons/so9_main_app.ico
 APP2OBJS=\
-    $(OBJ)$/extendloaderenvironment.obj \
-    $(OBJ)$/genericloader.obj \
-    $(SOLARLIBDIR)$/pathutils-obj.obj
+	$(OBJ)$/extendloaderenvironment.obj \
+	$(OBJ)$/genericloader.obj \
+	$(SOLARLIBDIR)$/pathutils-obj.obj
 STDLIB2=$(SHLWAPILIB)
 .ENDIF # "$(LINK_SO)"=="TRUE"
 
 # --- Targets ------------------------------------------------------
 
+.INCLUDE : target.mk
 
-.INCLUDE :  target.mk
+# vim: set noet sw=4 ts=4: