Author: mseidel
Date: Thu Jun 20 08:51:06 2019
New Revision: 1861679
URL: http://svn.apache.org/viewvc?rev=1861679&view=rev
Log:
Merged r1861665 from trunk
Removed some whitespace, changed String
Modified:
openoffice/branches/AOO42X/ (props changed)
openoffice/branches/AOO42X/main/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 20 08:51:06 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,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567
+/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,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861665
Modified:
openoffice/branches/AOO42X/main/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc?rev=1861679&r1=1861678&r2=1861679&view=diff
==============================================================================
---
openoffice/branches/AOO42X/main/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
(original)
+++
openoffice/branches/AOO42X/main/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
Thu Jun 20 08:51:06 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,21 +7,20 @@
* 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.
- *
+ *
*************************************************************/
-
#ifndef _DBAUI_AUTOCONTROLS_HRC_
#define _DBAUI_AUTOCONTROLS_HRC_
@@ -92,7 +91,7 @@
Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
\
HelpId = AUTO_HID2;
\
TabStop = TRUE ;
\
- Text[ en-US ] = "Browse";
\
+ Text[ en-US ] = "Browse...";
\
};
//
--------------------------------------------------------------------------------------------------
@@ -133,7 +132,7 @@
HelpId = AUTO_HID;
\
TabStop = TRUE ;
\
Border = TRUE ;
\
- };
+ };
//
--------------------------------------------------------------------------------------------------
@@ -211,7 +210,7 @@
CurPos = 0 ;
\
};
\
-//
--------------------------------------------------------------------------------------------------
+//
--------------------------------------------------------------------------------------------------
#define AUTO_SEPARATORCONTROLGROUP(AUTO_Y,AUTOPAGE_X)
\
\
FixedText FT_AUTOEXTENSIONHEADER
\
@@ -380,7 +379,7 @@
String STR_AUTONO_WILDCARDS
\
{
\
Text[ en-US ] = "Wildcards such as ?,* are not allowed in #1."
; \
- };
+ };
#define NAMECONTROLGROUP_HEIGHT (FIXEDTEXT_HEIGHT + 2 + EDIT_HEIGHT)
@@ -442,7 +441,7 @@
Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ;
\
TabStop = TRUE ;
\
Border = TRUE ;
\
- };
+ };
#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID, AUTO_HID2, AUTO_HID3, AUTO_HID4,
AUTO_HID5 )
\
@@ -451,7 +450,7 @@
AUTO_HOSTCONTROLGROUP(96, AUTO_HID2)
\
AUTO_PORTCONTROLGROUP(113, AUTO_HID3 )
\
AUTO_SOCKETCONTROLGROUP(129)
\
- AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID4, AUTO_HID5)
+ AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID4, AUTO_HID5)
//
--------------------------------------------------------------------------------------------------
