openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject [openoffice] branch AOO42X updated: Cleaned up resource file, removed MASKCOLOR
Date Sat, 02 Nov 2019 10:47:57 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/AOO42X by this push:
     new 77f5794  Cleaned up resource file, removed MASKCOLOR
77f5794 is described below

commit 77f57947603ac003e0fa97862a297741c883f001
Author: mseidel <mseidel@apache.org>
AuthorDate: Sat Nov 2 11:45:48 2019 +0100

    Cleaned up resource file, removed MASKCOLOR
    
    (cherry picked from commit 6bb5a7b1eb6efa3e2be3d9aedff75220a9e7bd14)
---
 main/cui/source/dialogs/scriptdlg.src | 395 +++++++++++++++++-----------------
 1 file changed, 193 insertions(+), 202 deletions(-)

diff --git a/main/cui/source/dialogs/scriptdlg.src b/main/cui/source/dialogs/scriptdlg.src
index dcbe99a..f0c36f8 100644
--- a/main/cui/source/dialogs/scriptdlg.src
+++ b/main/cui/source/dialogs/scriptdlg.src
@@ -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.
- * 
+ *
  *************************************************************/
 
 
@@ -25,286 +25,277 @@
 #include "scriptdlg.hrc"
 #include "helpid.hrc"
 
-#define MASKCOLOR  MaskColor = \
-    Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
-
 ModalDialog RID_DLG_SCRIPTORGANIZER
 {
-    OutputSize = TRUE ;
-    Size = MAP_APPFONT ( 210 , 165 ) ;
-    Moveable = TRUE ;
-    Text [ en-US ] = "%MACROLANG Macros";
-    Closeable = TRUE ;
-    HelpId = HID_SCRIPTORG_DIALOG;
-    FixedText SF_TXT_SCRIPTS
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        Text [ en-US ] = "~Macros" ;
-    };
+	OutputSize = TRUE ;
+	Size = MAP_APPFONT ( 210, 165 ) ;
+	Moveable = TRUE ;
+	Text [ en-US ] = "%MACROLANG Macros" ;
+	Closeable = TRUE ;
+	HelpId = HID_SCRIPTORG_DIALOG ;
+	FixedText SF_TXT_SCRIPTS
+	{
+		Pos = MAP_APPFONT ( 6, 3 ) ;
+		Size = MAP_APPFONT ( 100, 10 ) ;
+		Text [ en-US ] = "~Macros" ;
+	};
 
-    Control SF_CTRL_SCRIPTSBOX
-    {
-        HelpId = HID_SCRIPTSBOX ;
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 16 ) ;
-        Size = MAP_APPFONT ( 130 , 144 ) ;
-        TabStop = TRUE ;
-        Image IMG_HARDDISK
-        {
-            ImageBitmap = Bitmap { File = "harddisk_16.bmp" ; };
-            MASKCOLOR
-        };
-        Image IMG_HARDDISK_HC
-        {
-            ImageBitmap = Bitmap { File = "harddisk_16_h.bmp" ; };
-            MASKCOLOR
-        };
-        Image IMG_LIB
-        {
-            ImageBitmap = Bitmap { File = "im30820.png"; };
-            MASKCOLOR
-        };
-        Image IMG_LIB_HC
-        {
-            ImageBitmap = Bitmap { File = "imh30820.png"; };
-            MASKCOLOR
-        };
-        Image IMG_MACRO
-        {
-            ImageBitmap = Bitmap { File = "im30821.png"; };
-            MASKCOLOR
-        };
-        Image IMG_MACRO_HC
-        {
-            ImageBitmap = Bitmap { File = "imh30821.png"; };
-            MASKCOLOR
-        };
-        Image IMG_DOCUMENT
-        {
-            ImageBitmap = Bitmap { File = "im30826.png"; };
-            MASKCOLOR
-        };
-        Image IMG_DOCUMENT_HC
-        {
-            ImageBitmap = Bitmap { File = "imh30826.png"; };
-            MASKCOLOR
-        };
-        String STR_MYMACROS
-        {
-            Text [ en-US ] = "My Macros";
-        };
-        String STR_PRODMACROS
-        {
-            Text [ en-US ] = "%PRODUCTNAME Macros";
-        };
-    };
+	Control SF_CTRL_SCRIPTSBOX
+	{
+		HelpId = HID_SCRIPTSBOX ;
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 6, 16 ) ;
+		Size = MAP_APPFONT ( 130, 144 ) ;
+		TabStop = TRUE ;
+		Image IMG_HARDDISK
+		{
+			ImageBitmap = Bitmap {File = "harddisk_16.png" ;} ;
+		};
+		Image IMG_HARDDISK_HC
+		{
+			ImageBitmap = Bitmap {File = "harddisk_16_h.png" ;} ;
+		};
+		Image IMG_LIB
+		{
+			ImageBitmap = Bitmap {File = "im30820.png" ;} ;
+		};
+		Image IMG_LIB_HC
+		{
+			ImageBitmap = Bitmap {File = "imh30820.png" ;} ;
+		};
+		Image IMG_MACRO
+		{
+			ImageBitmap = Bitmap {File = "im30821.png" ;} ;
+		};
+		Image IMG_MACRO_HC
+		{
+			ImageBitmap = Bitmap {File = "imh30821.png" ;} ;
+		};
+		Image IMG_DOCUMENT
+		{
+			ImageBitmap = Bitmap {File = "im30826.png" ;} ;
+		};
+		Image IMG_DOCUMENT_HC
+		{
+			ImageBitmap = Bitmap {File = "imh30826.png" ;} ;
+		};
+		String STR_MYMACROS
+		{
+			Text [ en-US ] = "My Macros" ;
+		};
+		String STR_PRODMACROS
+		{
+			Text [ en-US ] = "%PRODUCTNAME Macros" ;
+		};
+	};
 
-    PushButton SF_PB_RUN
-    {
-        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN";
-        Pos = MAP_APPFONT ( 144 , 6 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        DefButton = TRUE;
-        Text [ en-US ] = "R~un" ;
-    };
-    CancelButton SF_PB_CLOSE
-    {
-        Pos = MAP_APPFONT ( 144 , 23 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Close" ;
-    };
+	PushButton SF_PB_RUN
+	{
+		HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN" ;
+		Pos = MAP_APPFONT ( 144, 6 ) ;
+		Size = MAP_APPFONT ( 60, 14 ) ;
+		DefButton = TRUE ;
+		Text [ en-US ] = "R~un" ;
+	};
+	CancelButton SF_PB_CLOSE
+	{
+		Pos = MAP_APPFONT ( 144, 23 ) ;
+		Size = MAP_APPFONT ( 60, 14 ) ;
+		TabStop = TRUE ;
+		Text [ en-US ] = "Close" ;
+	};
 
-    PushButton SF_PB_CREATE
-    {
-        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE";
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Pos = MAP_APPFONT ( 144 , 60 ) ;
-        Text [ en-US ] = "~Create..." ;
-        TabStop = TRUE ;
-    };
-    PushButton SF_PB_EDIT
-    {
-        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT";
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Pos = MAP_APPFONT ( 144 , 77 ) ;
-        Text [ en-US ] = "~Edit" ;
-        TabStop = TRUE ;
-    };
-    PushButton SF_PB_RENAME
-    {
-        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME";
-        Pos = MAP_APPFONT ( 144 , 94 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Text [ en-US ] = "Rename..." ;
-    };
-    PushButton SF_PB_DEL
-    {
-        HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL";
-        Pos = MAP_APPFONT ( 144 , 114 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        Text [ en-US ] = "~Delete..." ;
-        TabStop = TRUE ;
-    };
-    HelpButton SF_PB_HELP
-    {
-        Pos = MAP_APPFONT ( 144 , 131 ) ;
-        Size = MAP_APPFONT ( 60 , 14 ) ;
-        TabStop = TRUE ;
-    };
+	PushButton SF_PB_CREATE
+	{
+		HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE" ;
+		Size = MAP_APPFONT ( 60, 14 ) ;
+		Pos = MAP_APPFONT ( 144, 60 ) ;
+		Text [ en-US ] = "~Create..." ;
+		TabStop = TRUE ;
+	};
+	PushButton SF_PB_EDIT
+	{
+		HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT" ;
+		Size = MAP_APPFONT ( 60, 14 ) ;
+		Pos = MAP_APPFONT ( 144, 77 ) ;
+		Text [ en-US ] = "~Edit" ;
+		TabStop = TRUE ;
+	};
+	PushButton SF_PB_RENAME
+	{
+		HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME" ;
+		Pos = MAP_APPFONT ( 144, 94 ) ;
+		Size = MAP_APPFONT ( 60, 14 ) ;
+		Text [ en-US ] = "Rename..." ;
+	};
+	PushButton SF_PB_DEL
+	{
+		HelpID = "cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL" ;
+		Pos = MAP_APPFONT ( 144, 114 ) ;
+		Size = MAP_APPFONT ( 60, 14 ) ;
+		Text [ en-US ] = "~Delete..." ;
+		TabStop = TRUE ;
+	};
+	HelpButton SF_PB_HELP
+	{
+		Pos = MAP_APPFONT ( 144, 131 ) ;
+		Size = MAP_APPFONT ( 60, 14 ) ;
+		TabStop = TRUE ;
+	};
 
 };
 ModalDialog RID_DLG_NEWLIB
 {
-    HelpID = "cui:ModalDialog:RID_DLG_NEWLIB";
-    Text [ en-US ] = "Create Library" ;
-    Size = MAP_APPFONT ( 160 , 50 ) ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    OKButton PB_OK
-    {
-        Pos = MAP_APPFONT ( 104 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton PB_CANCEL
-    {
-        Pos = MAP_APPFONT ( 104 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_NEWLIB
-    {
-        Pos = MAP_APPFONT ( 6 , 6 ) ;
-        Size = MAP_APPFONT ( 100 , 50 ) ;
-        WordBreak = TRUE ;
-        Text [ en-US ] = "Enter the name for the new library." ;
-    };
-    Edit ED_LIBNAME
-    {
-        HelpID = "cui:Edit:RID_DLG_NEWLIB:ED_LIBNAME";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 6 , 59 ) ;
-        Size = MAP_APPFONT ( 92 , 12 ) ;
-        TabStop = TRUE ;
-    };
-    String STR_NEWLIB
-    {
-        Text [ en-US ] = "Create Library" ;
-    };
-    String STR_NEWMACRO
-    {
-        Text [ en-US ] = "Create Macro" ;
-    };
-    String STR_FT_NEWMACRO
-    {
-        Text [ en-US ] = "Enter the name for the new macro." ;
-    };
-    String STR_RENAME
-    {
-        Text [ en-US ] = "Rename" ;
-    };
-    String STR_FT_RENAME
-    {
-        Text [ en-US ] = "Enter the new name for the selected object." ;
-    };
+	HelpID = "cui:ModalDialog:RID_DLG_NEWLIB" ;
+	Text [ en-US ] = "Create Library" ;
+	Size = MAP_APPFONT ( 160, 50 ) ;
+	Moveable = TRUE ;
+	Closeable = TRUE ;
+	OKButton PB_OK
+	{
+		Pos = MAP_APPFONT ( 104, 6 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		TabStop = TRUE ;
+		DefButton = TRUE ;
+	};
+	CancelButton PB_CANCEL
+	{
+		Pos = MAP_APPFONT ( 104, 23 ) ;
+		Size = MAP_APPFONT ( 50, 14 ) ;
+		TabStop = TRUE ;
+	};
+	FixedText FT_NEWLIB
+	{
+		Pos = MAP_APPFONT ( 6, 6 ) ;
+		Size = MAP_APPFONT ( 100, 50 ) ;
+		WordBreak = TRUE ;
+		Text [ en-US ] = "Enter the name for the new library." ;
+	};
+	Edit ED_LIBNAME
+	{
+		HelpID = "cui:Edit:RID_DLG_NEWLIB:ED_LIBNAME" ;
+		Border = TRUE ;
+		Pos = MAP_APPFONT ( 6, 59 ) ;
+		Size = MAP_APPFONT ( 92, 12 ) ;
+		TabStop = TRUE ;
+	};
+	String STR_NEWLIB
+	{
+		Text [ en-US ] = "Create Library" ;
+	};
+	String STR_NEWMACRO
+	{
+		Text [ en-US ] = "Create Macro" ;
+	};
+	String STR_FT_NEWMACRO
+	{
+		Text [ en-US ] = "Enter the name for the new macro." ;
+	};
+	String STR_RENAME
+	{
+		Text [ en-US ] = "Rename" ;
+	};
+	String STR_FT_RENAME
+	{
+		Text [ en-US ] = "Enter the new name for the selected object." ;
+	};
 };
 String RID_SVXSTR_DELQUERY
 {
-    Text [ en-US ] = "Do you want to delete the following object?";
+	Text [ en-US ] = "Do you want to delete the following object?" ;
 };
 String RID_SVXSTR_DELQUERY_TITLE
 {
-    Text [ en-US ] = "Confirm Deletion";
+	Text [ en-US ] = "Confirm Deletion" ;
 };
 String RID_SVXSTR_DELFAILED
 {
-    Text [ en-US ] = "The selected object could not be deleted.";
+	Text [ en-US ] = "The selected object could not be deleted." ;
 };
 String RID_SVXSTR_DELFAILEDPERM
 {
-    Text [ en-US ] = " You do not have permission to delete this object.";
+	Text [ en-US ] = " You do not have permission to delete this object." ;
 };
 String RID_SVXSTR_DELFAILED_TITLE
 {
-    Text [ en-US ] = "Error Deleting Object";
+	Text [ en-US ] = "Error Deleting Object" ;
 };
 String RID_SVXSTR_CREATEFAILED
 {
-    Text [ en-US ] = "The object could not be created.";
+	Text [ en-US ] = "The object could not be created." ;
 };
 String RID_SVXSTR_CREATEFAILEDDUP
 {
-    Text [ en-US ] = " Object with the same name already exists.";
+	Text [ en-US ] = " Object with the same name already exists." ;
 };
 String RID_SVXSTR_CREATEFAILEDPERM
 {
-    Text [ en-US ] = " You do not have permission to create this object.";
+	Text [ en-US ] = " You do not have permission to create this object." ;
 };
 String RID_SVXSTR_CREATEFAILED_TITLE
 {
-    Text [ en-US ] = "Error Creating Object";
+	Text [ en-US ] = "Error Creating Object" ;
 };
 String RID_SVXSTR_RENAMEFAILED
 {
-    Text [ en-US ] = "The object could not be renamed.";
+	Text [ en-US ] = "The object could not be renamed." ;
 };
 String RID_SVXSTR_RENAMEFAILEDPERM
 {
-    Text [ en-US ] = " You do not have permission to rename this object.";
+	Text [ en-US ] = " You do not have permission to rename this object." ;
 };
 String RID_SVXSTR_RENAMEFAILED_TITLE
 {
-    Text [ en-US ] = "Error Renaming Object";
+	Text [ en-US ] = "Error Renaming Object" ;
 };
 
 String RID_SVXSTR_ERROR_TITLE
 {
-    Text [ en-US ] = "%PRODUCTNAME Error";
+	Text [ en-US ] = "%PRODUCTNAME Error" ;
 };
 
 String RID_SVXSTR_ERROR_LANG_NOT_SUPPORTED
 {
-    Text [ en-US ] = "The scripting language %LANGUAGENAME is not supported.";
+	Text [ en-US ] = "The scripting language %LANGUAGENAME is not supported." ;
 };
 String RID_SVXSTR_ERROR_RUNNING
 {
-    Text [ en-US ] = "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME.";
+	Text [ en-US ] = "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME."
;
 };
 
 String RID_SVXSTR_EXCEPTION_RUNNING
 {
-    Text [ en-US ] = "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME.";
+	Text [ en-US ] = "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME."
;
 };
 
 String RID_SVXSTR_ERROR_AT_LINE
 {
-    Text [ en-US ] = "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME
at line: %LINENUMBER.";
+	Text [ en-US ] = "An error occurred while running the %LANGUAGENAME script %SCRIPTNAME at
line: %LINENUMBER." ;
 };
 
 String RID_SVXSTR_EXCEPTION_AT_LINE
 {
-    Text [ en-US ] = "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME
at line: %LINENUMBER.";
+	Text [ en-US ] = "An exception occurred while running the %LANGUAGENAME script %SCRIPTNAME
at line: %LINENUMBER." ;
 };
 
 String RID_SVXSTR_FRAMEWORK_ERROR_RUNNING
 {
-    Text [ en-US ] = "A Scripting Framework error occurred while running the %LANGUAGENAME
script %SCRIPTNAME.";
+	Text [ en-US ] = "A Scripting Framework error occurred while running the %LANGUAGENAME script
%SCRIPTNAME." ;
 };
 
 String RID_SVXSTR_FRAMEWORK_ERROR_AT_LINE
 {
-    Text [ en-US ] = "A Scripting Framework error occurred while running the %LANGUAGENAME
script %SCRIPTNAME at line: %LINENUMBER.";
+	Text [ en-US ] = "A Scripting Framework error occurred while running the %LANGUAGENAME script
%SCRIPTNAME at line: %LINENUMBER." ;
 };
 
 String RID_SVXSTR_ERROR_TYPE_LABEL
 {
-    Text [ en-US ] = "Type:";
+	Text [ en-US ] = "Type:" ;
 };
 
 String RID_SVXSTR_ERROR_MESSAGE_LABEL
 {
-    Text [ en-US ] = "Message:";
+	Text [ en-US ] = "Message:" ;
 };
+
+// ********************************************************************** EOF


Mime
View raw message