openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject svn commit: r1860665 - in /openoffice/branches/AOO42X: ./ main/sc/source/ui/formdlg/dwfunctr.src
Date Wed, 05 Jun 2019 14:46:21 GMT
Author: mseidel
Date: Wed Jun  5 14:46:21 2019
New Revision: 1860665

URL: http://svn.apache.org/viewvc?rev=1860665&view=rev
Log:
Merged r1860664 from trunk

Cleaned up whitespace, removed maskcolor

Modified:
    openoffice/branches/AOO42X/   (props changed)
    openoffice/branches/AOO42X/main/sc/source/ui/formdlg/dwfunctr.src

Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  5 14:46:21 2019
@@ -9,4 +9,4 @@
 /openoffice/branches/ia2:1417739-1541842
 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
 0288,1860381,1860383,1860448
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
 0288,1860381,1860383,1860448,1860664

Modified: openoffice/branches/AOO42X/main/sc/source/ui/formdlg/dwfunctr.src
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/sc/source/ui/formdlg/dwfunctr.src?rev=1860665&r1=1860664&r2=1860665&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/sc/source/ui/formdlg/dwfunctr.src (original)
+++ openoffice/branches/AOO42X/main/sc/source/ui/formdlg/dwfunctr.src Wed Jun  5 14:46:21
2019
@@ -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,25 +7,26 @@
  * 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.
- * 
+ *
  *************************************************************/
 
 
- // include ---------------------------------------------------------------
+
+// include ---------------------------------------------------------------
 #include "sc.hrc"
 #include "dwfunctr.hrc"
- // pragma ----------------------------------------------------------------
+// pragma ----------------------------------------------------------------
 
- // RID_SVXDLG_CALCFUNC --------------------------------------------------
+// RID_SVXDLG_CALCFUNC --------------------------------------------------
 DockingWindow FID_FUNCTION_BOX
 {
 	Border = TRUE ;
@@ -37,14 +38,14 @@ DockingWindow FID_FUNCTION_BOX
 	Zoomable = TRUE ;
 	Dockable = TRUE ;
 	EnableResizing = TRUE ;
-	Size = MAP_APPFONT ( 130 , 160 ) ;
+	Size = MAP_APPFONT ( 130, 160 ) ;
 	HelpId = HID_FUNCTION_BOX ;
 	ListBox CB_CAT
 	{
-	    HelpID = "sc:ListBox:FID_FUNCTION_BOX:CB_CAT";
+		HelpID = "sc:ListBox:FID_FUNCTION_BOX:CB_CAT" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 20 , 4 ) ;
-		Size = MAP_APPFONT ( 56 , 80 ) ;
+		Pos = MAP_APPFONT ( 20, 4 ) ;
+		Size = MAP_APPFONT ( 56, 80 ) ;
 		DropDown = TRUE ;
 		AutoSize = TRUE ;
 		TabStop = TRUE ;
@@ -52,27 +53,27 @@ DockingWindow FID_FUNCTION_BOX
 		AutoHScroll = TRUE ;
 		StringList [ en-US ] =
 		{
-			< "Last Used" ; Default ; > ;
-			< "All" ; Default ; > ;
-			< "Database" ; Default ; > ;
-			< "Date&Time" ; Default ; > ;
-			< "Financial" ; Default ; > ;
-			< "Information" ; Default ; > ;
-			< "Logical" ; Default ; > ;
-			< "Mathematical" ; Default ; > ;
-			< "Array" ; Default ; > ;
-			< "Statistical" ; Default ; > ;
-			< "Spreadsheet" ; Default ; > ;
-			< "Text" ; Default ; > ;
-			< "Add-in" ; Default ; > ;
+			< "Last Used" ;		Default ; > ;
+			< "All" ;			Default ; > ;
+			< "Database" ;		Default ; > ;
+			< "Date&Time" ;		Default ; > ;
+			< "Financial" ;		Default ; > ;
+			< "Information" ;	Default ; > ;
+			< "Logical" ;		Default ; > ;
+			< "Mathematical" ;	Default ; > ;
+			< "Array" ;			Default ; > ;
+			< "Statistical" ;	Default ; > ;
+			< "Spreadsheet" ;	Default ; > ;
+			< "Text" ;			Default ; > ;
+			< "Add-in" ;		Default ; > ;
 		};
 	};
 	ListBox DDLB_FUNC
 	{
-	    HelpID = "sc:ListBox:FID_FUNCTION_BOX:DDLB_FUNC";
+		HelpID = "sc:ListBox:FID_FUNCTION_BOX:DDLB_FUNC" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 103 , 4 ) ;
-		Size = MAP_APPFONT ( 56 , 80 ) ;
+		Pos = MAP_APPFONT ( 103, 4 ) ;
+		Size = MAP_APPFONT ( 56, 80 ) ;
 		Hide = TRUE ;
 		TabStop = TRUE ;
 		DropDown = TRUE ;
@@ -80,10 +81,10 @@ DockingWindow FID_FUNCTION_BOX
 	};
 	ListBox LB_FUNC
 	{
-	    HelpID = "sc:ListBox:FID_FUNCTION_BOX:LB_FUNC";
+		HelpID = "sc:ListBox:FID_FUNCTION_BOX:LB_FUNC" ;
 		Border = TRUE ;
-		Pos = MAP_APPFONT ( 3 , 19 ) ;
-		Size = MAP_APPFONT ( 72 , 90 ) ;
+		Pos = MAP_APPFONT ( 3, 19 ) ;
+		Size = MAP_APPFONT ( 72, 90 ) ;
 		TabStop = TRUE ;
 		AutoHScroll = TRUE ;
 	};
@@ -92,64 +93,31 @@ DockingWindow FID_FUNCTION_BOX
 		WordBreak = TRUE ;
 		Border = TRUE ;
 		SVLook = TRUE ;
-		Pos = MAP_APPFONT ( 3 , 115 ) ;
-		Size = MAP_APPFONT ( 72 , 40 ) ;
+		Pos = MAP_APPFONT ( 3, 115 ) ;
+		Size = MAP_APPFONT ( 72, 40 ) ;
 	};
 	Control FT_SPLIT
 	{
-		Pos = MAP_APPFONT ( 3 , 110 ) ;
-		Size = MAP_APPFONT ( 72 , 3 ) ;
+		Pos = MAP_APPFONT ( 3, 110 ) ;
+		Size = MAP_APPFONT ( 72, 3 ) ;
 	};
 	ImageButton IMB_INSERT
 	{
-	    HelpID = "sc:ImageButton:FID_FUNCTION_BOX:IMB_INSERT";
-		Pos = MAP_APPFONT ( 3 , 4 ) ;
-		Size = MAP_APPFONT ( 13 , 13 ) ;
+		HelpID = "sc:ImageButton:FID_FUNCTION_BOX:IMB_INSERT" ;
+		Pos = MAP_APPFONT ( 3, 4 ) ;
+		Size = MAP_APPFONT ( 13, 13 ) ;
 		TabStop = TRUE ;
 		ButtonImage = Image
 		{
 			ImageBitmap = Bitmap
 			{
-				File = "fx.bmp" ;
+				File = "fx.png" ;
 			};
-            MaskColor = STD_MASKCOLOR;
 		};
 		DefButton = TRUE ;
 		QuickHelpText [ en-US ] = "Insert Function into calculation sheet" ;
 	};
 	Text [ en-US ] = "Functions" ;
 };
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
+// ********************************************************************** EOF



Mime
View raw message