This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new e08bb2f005 Cleanup
e08bb2f005 is described below
commit e08bb2f00528ee4e1985eb9019e6035fb59cd30b
Author: mseidel <msei...@apache.org>
AuthorDate: Sun Sep 22 22:16:51 2024 +0200
Cleanup
---
main/dbaccess/source/core/resource/strings.src | 148 ++++++++--------
main/dbaccess/source/ui/dlg/admincontrols.src | 188 ++++++++++-----------
.../source/text/swriter/01/02110000.xhp | 8 +-
main/sc/source/ui/src/globstr.src | 8 +-
main/sw/source/ui/utlui/navipi.src | 3 -
5 files changed, 175 insertions(+), 180 deletions(-)
diff --git a/main/dbaccess/source/core/resource/strings.src
b/main/dbaccess/source/core/resource/strings.src
index 4880c547ce..995a379ea1 100644
--- a/main/dbaccess/source/core/resource/strings.src
+++ b/main/dbaccess/source/core/resource/strings.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,316 +7,316 @@
* 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 "core_resource.hrc"
#include "dbamiscres.hrc"
String RID_STR_TRIED_OPEN_TABLE
{
- Text [ en-US ] = "Tried to open the table $name$.";
+ Text [ en-US ] = "Tried to open the table $name$." ;
};
String RID_STR_CONNECTION_INVALID
{
- Text [ en-US ] = "No connection could be established.";
+ Text [ en-US ] = "No connection could be established." ;
};
String RID_STR_TABLE_IS_FILTERED
{
- Text [ en-US ] = "The table $name$ already exists. It is not visible
because it has been filtered out.";
+ Text [ en-US ] = "The table $name$ already exists. It is not visible
because it has been filtered out." ;
};
String RID_STR_NEED_CONFIG_WRITE_ACCESS
{
- Text [ en-US ] = "You have no write access to the configuration data
the object is based on.";
+ Text [ en-US ] = "You have no write access to the configuration data
the object is based on." ;
};
String RID_STR_COULDNOTCONNECT_UNSPECIFIED
{
- Text [ en-US ] = "The connection to the external data source could not
be established. An unknown error occurred. The driver is probably defective.";
+ Text [ en-US ] = "The connection to the external data source could not
be established. An unknown error occurred. The driver is probably defective." ;
};
String RID_STR_COULDNOTCONNECT_NODRIVER
{
- Text [ en-US ] = "The connection to the external data source could not
be established. No SDBC driver was found for the given URL.";
+ Text [ en-US ] = "The connection to the external data source could not
be established. No SDBC driver was found for the given URL." ;
};
String RID_STR_COULDNOTLOAD_MANAGER
{
- Text [ en-US ] = "The connection to the external data source could not
be established. The SDBC driver manager could not be loaded.";
+ Text [ en-US ] = "The connection to the external data source could not
be established. The SDBC driver manager could not be loaded." ;
};
String RID_STR_FORM
{
- Text [ en-US ] = "Form";
+ Text [ en-US ] = "Form" ;
};
String RID_STR_REPORT
{
- Text [ en-US ] = "Report";
+ Text [ en-US ] = "Report" ;
};
String RID_STR_DATASOURCE_NOT_STORED
{
- Text [ en-US ] = "The data source was not saved. Please use the
interface XStorable to save the data source.";
+ Text [ en-US ] = "The data source was not saved. Please use the
interface XStorable to save the data source." ;
};
String RID_STR_ONLY_QUERY
{
- Text [ en-US ] = "The given command is not a SELECT statement.\nOnly
queries are allowed.";
+ Text [ en-US ] = "The given command is not a SELECT statement.\nOnly
queries are allowed." ;
};
String RID_STR_NO_VALUE_CHANGED
{
- Text [ en-US ] = "No values were modified.";
+ Text [ en-US ] = "No values were modified." ;
};
String RID_STR_NO_XROWUPDATE
{
- Text [ en-US ] = "Values could not be inserted. The XRowUpdate
interface is not supported by ResultSet.";
+ Text [ en-US ] = "Values could not be inserted. The XRowUpdate
interface is not supported by ResultSet." ;
};
String RID_STR_NO_XRESULTSETUPDATE
{
- Text [ en-US ] = "Values could not be inserted. The XResultSetUpdate
interface is not supported by ResultSet.";
+ Text [ en-US ] = "Values could not be inserted. The XResultSetUpdate
interface is not supported by ResultSet." ;
};
String RID_STR_NO_UPDATE_MISSING_CONDITION
{
- Text [ en-US ] = "Values could not be modified, due to a missing
condition statement.";
+ Text [ en-US ] = "Values could not be modified, due to a missing
condition statement." ;
};
String RID_STR_NO_COLUMN_ADD
{
- Text [ en-US ] = "The adding of columns is not supported.";
+ Text [ en-US ] = "The adding of columns is not supported." ;
};
String RID_STR_NO_COLUMN_DROP
{
- Text [ en-US ] = "The dropping of columns is not supported.";
+ Text [ en-US ] = "The dropping of columns is not supported." ;
};
String RID_STR_NO_CONDITION_FOR_PK
{
- Text [ en-US ] = "The WHERE condition could not be created for the
primary key.";
+ Text [ en-US ] = "The WHERE condition could not be created for the
primary key." ;
};
String RID_STR_COLUMN_UNKNOWN_PROP
{
- Text [ en-US ] = "The column does not support the property '%value'.";
+ Text [ en-US ] = "The column does not support the property '%value'." ;
};
String RID_STR_COLUMN_NOT_SEARCHABLE
{
- Text [ en-US ] = "The column is not searchable!";
+ Text [ en-US ] = "The column is not searchable!" ;
};
String RID_STR_NOT_SEQUENCE_INT8
{
- Text [ en-US ] = "The value of the columns is not of the type
Sequence<sal_Int8>.";
+ Text [ en-US ] = "The value of the columns is not of the type
Sequence<sal_Int8>." ;
};
String RID_STR_COLUMN_NOT_VALID
{
- Text [ en-US ] = "The column is not valid.";
+ Text [ en-US ] = "The column is not valid." ;
};
String RID_STR_COLUMN_MUST_VISIBLE
{
- Text [ en-US ] = "The column '%name' must be visible as a column.";
+ Text [ en-US ] = "The column '%name' must be visible as a column." ;
};
String RID_STR_NO_XQUERIESSUPPLIER
{
- Text [ en-US ] = "The interface XQueriesSupplier is not available.";
+ Text [ en-US ] = "The interface XQueriesSupplier is not available." ;
};
String RID_STR_NOT_SUPPORTED_BY_DRIVER
{
- Text [ en-US ] = "The driver does not support this function.";
+ Text [ en-US ] = "The driver does not support this function." ;
};
String RID_STR_NO_ABS_ZERO
{
- Text [ en-US ] = "An 'absolute(0)' call is not allowed.";
+ Text [ en-US ] = "An 'absolute(0)' call is not allowed." ;
};
String RID_STR_NO_RELATIVE
{
- Text [ en-US ] = "Relative positioning is not allowed in this state.";
+ Text [ en-US ] = "Relative positioning is not allowed in this state." ;
};
String RID_STR_NO_REFESH_AFTERLAST
{
- Text [ en-US ] = "A row cannot be refreshed when the ResultSet is
positioned after the last row.";
+ Text [ en-US ] = "A row cannot be refreshed when the ResultSet is
positioned after the last row." ;
};
String RID_STR_NO_MOVETOINSERTROW_CALLED
{
- Text [ en-US ] = "A new row cannot be inserted when the ResultSet is
not first moved to the insert row.";
+ Text [ en-US ] = "A new row cannot be inserted when the ResultSet is
not first moved to the insert row." ;
};
String RID_STR_NO_UPDATEROW
{
- Text [ en-US ] = "A row cannot be modified in this state";
+ Text [ en-US ] = "A row cannot be modified in this state" ;
};
String RID_STR_NO_DELETEROW
{
- Text [ en-US ] = "A row cannot be deleted in this state.";
+ Text [ en-US ] = "A row cannot be deleted in this state." ;
};
String RID_STR_NO_TABLE_RENAME
{
- Text [ en-US ] = "The driver does not support table renaming.";
+ Text [ en-US ] = "The driver does not support table renaming." ;
};
String RID_STR_NO_ALTER_COLUMN_DEF
{
- Text [ en-US ] = "The driver does not support the modification of
column descriptions.";
+ Text [ en-US ] = "The driver does not support the modification of
column descriptions." ;
};
String RID_STR_COLUMN_ALTER_BY_NAME
{
- Text [ en-US ] = "The driver does not support the modification of
column descriptions by changing the name.";
+ Text [ en-US ] = "The driver does not support the modification of
column descriptions by changing the name." ;
};
String RID_STR_COLUMN_ALTER_BY_INDEX
{
- Text [ en-US ] = "The driver does not support the modification of
column descriptions by changing the index.";
+ Text [ en-US ] = "The driver does not support the modification of
column descriptions by changing the index." ;
};
String RID_STR_FILE_DOES_NOT_EXIST
{
- Text[ en-US ] = "The file \"$file$\" does not exist.";
+ Text [ en-US ] = "The file \"$file$\" does not exist." ;
};
String RID_STR_TABLE_DOES_NOT_EXIST
{
- Text [ en-US ] = "There exists no table named \"$table$\".";
+ Text [ en-US ] = "There exists no table named \"$table$\"." ;
};
String RID_STR_QUERY_DOES_NOT_EXIST
{
- Text [ en-US ] = "There exists no query named \"$table$\".";
+ Text [ en-US ] = "There exists no query named \"$table$\"." ;
};
String RID_STR_CONFLICTING_NAMES
{
- Text [ en-US ] = "There are tables in the database whose names conflict
with the names of existing queries. To make full use of all queries and tables,
make sure they have distinct names.";
+ Text [ en-US ] = "There are tables in the database whose names conflict
with the names of existing queries. To make full use of all queries and tables,
make sure they have distinct names." ;
};
String RID_STR_COMMAND_LEADING_TO_ERROR
{
- Text [ en-US ] = "The SQL command leading to this error is:\n\n$command$";
+ Text [ en-US ] = "The SQL command leading to this error
is:\n\n$command$" ;
};
String RID_STR_STATEMENT_WITHOUT_RESULT_SET
{
- Text [ en-US ] = "The SQL command does not describe a result set.";
+ Text [ en-US ] = "The SQL command does not describe a result set." ;
};
String RID_STR_NAME_MUST_NOT_BE_EMPTY
{
- Text [ en-US ] = "The name must not be empty.";
+ Text [ en-US ] = "The name must not be empty." ;
};
String RID_STR_NO_NULL_OBJECTS_IN_CONTAINER
{
- Text [ en-US ] = "The container cannot contain NULL objects.";
+ Text [ en-US ] = "The container cannot contain NULL objects." ;
};
String RID_STR_NAME_ALREADY_USED
{
- Text [ en-US ] = "There already is an object with the given name.";
+ Text [ en-US ] = "There already is an object with the given name." ;
};
String RID_STR_OBJECT_CONTAINER_MISMATCH
{
- Text [ en-US ] = "This object cannot be part of this container.";
+ Text [ en-US ] = "This object cannot be part of this container." ;
};
String RID_STR_OBJECT_ALREADY_CONTAINED
{
- Text [ en-US ] = "The object already is, with a different name, part of
the container.";
+ Text [ en-US ] = "The object already is, with a different name, part of
the container." ;
};
String RID_STR_NAME_NOT_FOUND
{
- Text [ en-US ] = "Unable to find the document '$name$'.";
+ Text [ en-US ] = "Unable to find the document '$name$'." ;
};
String RID_STR_ERROR_WHILE_SAVING
{
- Text [ en-US ] = "Could not save the document to $location$:\n$message$";
+ Text [ en-US ] = "Could not save the document to
$location$:\n$message$" ;
};
String RID_NO_SUCH_DATA_SOURCE
{
- Text [ en-US ] = "Error accessing data source '$name$':\n$error$";
+ Text [ en-US ] = "Error accessing data source '$name$':\n$error$" ;
};
String RID_STR_NO_SUB_FOLDER
{
- Text [ en-US ] = "There exists no folder named \"$folder$\".";
+ Text [ en-US ] = "There exists no folder named \"$folder$\"." ;
};
String RID_STR_NO_DELETE_BEFORE_AFTER
{
- Text [ en-US ] = "Cannot delete the before-first or after-last row.";
+ Text [ en-US ] = "Cannot delete the before-first or after-last row." ;
};
String RID_STR_NO_DELETE_INSERT_ROW
{
- Text [ en-US ] = "Cannot delete the insert-row.";
+ Text [ en-US ] = "Cannot delete the insert-row." ;
};
String RID_STR_RESULT_IS_READONLY
{
- Text [ en-US ] = "Result set is read only.";
+ Text [ en-US ] = "Result set is read only." ;
};
String RID_STR_NO_DELETE_PRIVILEGE
{
- Text [ en-US ] = "DELETE privilege not available.";
+ Text [ en-US ] = "DELETE privilege not available." ;
};
String RID_STR_ROW_ALREADY_DELETED
{
- Text [ en-US ] = "Current row is already deleted.";
+ Text [ en-US ] = "Current row is already deleted." ;
};
String RID_STR_UPDATE_FAILED
{
- Text [ en-US ] = "Current row could not be updated.";
+ Text [ en-US ] = "Current row could not be updated." ;
};
//-------------------------------------------------------------------------
String RID_STR_NO_INSERT_PRIVILEGE
{
- Text [ en-US ] = "INSERT privilege not available.";
+ Text [ en-US ] = "INSERT privilege not available." ;
};
String RID_STR_INTERNAL_ERROR
{
- Text [ en-US ] = "Internal error: no statement object provided by the
database driver.";
+ Text [ en-US ] = "Internal error: no statement object provided by the
database driver." ;
};
String RID_STR_EXPRESSION1
{
- Text [ en-US ] = "Expression1";
+ Text [ en-US ] = "Expression1" ;
};
String RID_STR_NO_SQL_COMMAND
{
- Text [ en-US ] = "No SQL command was provided.";
+ Text [ en-US ] = "No SQL command was provided." ;
};
String RID_STR_INVALID_INDEX
{
- Text [ en-US ] = "Invalid column index.";
+ Text [ en-US ] = "Invalid column index." ;
};
String RID_STR_INVALID_CURSOR_STATE
{
- Text [ en-US ] = "Invalid cursor state.";
+ Text [ en-US ] = "Invalid cursor state." ;
};
String RID_STR_CURSOR_BEFORE_OR_AFTER
{
- Text [ en-US ] = "The cursor points to before the first or after the
last row.";
+ Text [ en-US ] = "The cursor points to before the first or after the
last row." ;
};
String RID_STR_NO_BOOKMARK_BEFORE_OR_AFTER
{
- Text [ en-US ] = "The rows before the first and after the last row
don't have a bookmark.";
+ Text [ en-US ] = "The rows before the first and after the last row
don't have a bookmark." ;
};
String RID_STR_NO_BOOKMARK_DELETED
{
- Text [ en-US ] = "The current row is deleted, and thus doesn't have a
bookmark.";
+ Text [ en-US ] = "The current row is deleted, and thus doesn't have a
bookmark." ;
};
String RID_STR_NO_EMBEDDING
{
- Text [ en-US ] = "Embedding of database documents is not supported.";
+ Text [ en-US ] = "Embedding of database documents is not supported." ;
};
String RID_STR_CONNECTION_REQUEST
{
- Text [ en-US ] = "A connection for the following URL was requested
\"$name$\".";
+ Text [ en-US ] = "A connection for the following URL was requested
\"$name$\"." ;
};
String RID_STR_MISSING_EXTENSION
{
- Text [ en-US ] = "The extension is not installed.";
+ Text [ en-US ] = "The extension is not installed." ;
};
+
+// ******************************************************************* EOF
diff --git a/main/dbaccess/source/ui/dlg/admincontrols.src
b/main/dbaccess/source/ui/dlg/admincontrols.src
index 538e00ec92..885c68c369 100644
--- a/main/dbaccess/source/ui/dlg/admincontrols.src
+++ b/main/dbaccess/source/ui/dlg/admincontrols.src
@@ -1,128 +1,128 @@
/**************************************************************
- *
+ *
* 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
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
+ * "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 "AutoControls.hrc"
#include "dbu_dlg.hrc"
#include "admincontrols.hrc"
-#define LINE_HEIGHT ( EDIT_HEIGHT + RELATED_CONTROLS )
-#define SETTINGS_CONTROL_WIDTH ( WIZARD_PAGE_X - 2 * START_X )
-#define COLUMN_WIDTH_1 80
-#define COLUMN_WIDTH_2 ( SETTINGS_CONTROL_WIDTH - COLUMN_WIDTH_1 )
+#define LINE_HEIGHT ( EDIT_HEIGHT +
RELATED_CONTROLS )
+#define SETTINGS_CONTROL_WIDTH ( WIZARD_PAGE_X - 2 * START_X )
+#define COLUMN_WIDTH_1 80
+#define COLUMN_WIDTH_2 ( SETTINGS_CONTROL_WIDTH -
COLUMN_WIDTH_1 )
Control RID_MYSQL_NATIVE_SETTINGS
{
- DialogControl = TRUE;
- Size = MAP_APPFONT( SETTINGS_CONTROL_WIDTH, 5 * LINE_HEIGHT );
- Hide = FALSE;
+ DialogControl = TRUE ;
+ Size = MAP_APPFONT( SETTINGS_CONTROL_WIDTH, 5 * LINE_HEIGHT ) ;
+ Hide = FALSE ;
FixedText FT_MYSQL_DATABASE_NAME
{
- Pos = MAP_APPFONT ( 0, 2 );
- Size = MAP_APPFONT ( COLUMN_WIDTH_1 - UNRELATED_CONTROLS,
FIXEDTEXT_HEIGHT );
- Text[ en-US ] = "~Database name";
+ Pos = MAP_APPFONT ( 0, 2 ) ;
+ Size = MAP_APPFONT ( COLUMN_WIDTH_1 - UNRELATED_CONTROLS,
FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "~Database name" ;
};
-
+
Edit ED_MYSQL_DATABASE_NAME
{
- Pos = MAP_APPFONT ( COLUMN_WIDTH_1, 0 );
- Size = MAP_APPFONT ( COLUMN_WIDTH_2, EDIT_HEIGHT );
- Border = TRUE;
+ Pos = MAP_APPFONT ( COLUMN_WIDTH_1, 0 ) ;
+ Size = MAP_APPFONT ( COLUMN_WIDTH_2, EDIT_HEIGHT ) ;
+ Border = TRUE ;
+ };
+
+ RadioButton RB_MYSQL_HOST_PORT
+ {
+ Pos = MAP_APPFONT ( 0, LINE_HEIGHT ) ;
+ Size = MAP_APPFONT ( COLUMN_WIDTH_1, FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Se~rver / Port" ;
+ Group = TRUE ;
};
- RadioButton RB_MYSQL_HOST_PORT
- {
- Pos = MAP_APPFONT ( 0, LINE_HEIGHT );
- Size = MAP_APPFONT ( COLUMN_WIDTH_1, FIXEDTEXT_HEIGHT ) ;
- Text [ en-US ] = "Se~rver / Port" ;
- Group = TRUE;
- };
-
-#define OPTION_GROUP_START ( LINE_HEIGHT + FIXEDTEXT_HEIGHT +
RELATED_CONTROLS )
-
- FixedText FT_COMMON_HOST_NAME
- {
- Pos = MAP_APPFONT ( INDENT_BELOW_RADIO, OPTION_GROUP_START + 2 );
- Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS -
INDENT_BELOW_RADIO, FIXEDTEXT_HEIGHT );
- Text [ en-US ] = "~Server" ;
- };
-
- Edit ED_COMMON_HOST_NAME
- {
- Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START );
- Size = MAP_APPFONT ( COLUMN_WIDTH_2, EDIT_HEIGHT );
- Border = TRUE;
- };
-
- FixedText FT_COMMON_PORT
- {
- Pos = MAP_APPFONT ( INDENT_BELOW_RADIO, OPTION_GROUP_START +
LINE_HEIGHT + 2 );
- Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS -
INDENT_BELOW_RADIO, FIXEDTEXT_HEIGHT ) ;
- Text [ en-US ] = "~Port" ;
- Group = TRUE;
- };
-
- NumericField NF_COMMON_PORT
- {
- Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + LINE_HEIGHT );
- Size = MAP_APPFONT ( 25, EDIT_HEIGHT );
- Border = TRUE;
- NoThousandSep = TRUE;
- Value = 3306;
- };
-
- FixedText FT_COMMON_PORT_DEFAULT
- {
- Pos = MAP_APPFONT ( COLUMN_WIDTH_1 + 25 + RELATED_CONTROLS,
OPTION_GROUP_START + LINE_HEIGHT + 2 );
- Size = MAP_APPFONT ( COLUMN_WIDTH_2 - 25 - RELATED_CONTROLS,
FIXEDTEXT_HEIGHT );
- Text[ en-US ] = "Default: 3306";
- };
-
- RadioButton RB_MYSQL_SOCKET
- {
- Pos = MAP_APPFONT ( 0, OPTION_GROUP_START + 2 * LINE_HEIGHT + 2 );
- Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS,
FIXEDTEXT_HEIGHT );
- Text [ en-US ] = "So~cket";
- };
-
- Edit ED_MYSQL_SOCKET
- {
- Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + 2 *
LINE_HEIGHT );
- Size = MAP_APPFONT ( COLUMN_WIDTH_2, EDIT_HEIGHT );
+#define OPTION_GROUP_START ( LINE_HEIGHT + FIXEDTEXT_HEIGHT + RELATED_CONTROLS
)
+
+ FixedText FT_COMMON_HOST_NAME
+ {
+ Pos = MAP_APPFONT ( INDENT_BELOW_RADIO, OPTION_GROUP_START + 2
) ;
+ Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS -
INDENT_BELOW_RADIO, FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "~Server" ;
+ };
+
+ Edit ED_COMMON_HOST_NAME
+ {
+ Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START ) ;
+ Size = MAP_APPFONT ( COLUMN_WIDTH_2, EDIT_HEIGHT ) ;
Border = TRUE ;
- };
-
- RadioButton RB_MYSQL_NAMED_PIPE
- {
- Pos = MAP_APPFONT ( 0, OPTION_GROUP_START + 2 * LINE_HEIGHT + 2 );
- Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS,
FIXEDTEXT_HEIGHT );
- Text [ en-US ] = "Named p~ipe";
- };
-
- Edit ED_MYSQL_NAMED_PIPE
- {
- Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + 2 *
LINE_HEIGHT );
- Size = MAP_APPFONT ( COLUMN_WIDTH_2, EDIT_HEIGHT );
+ };
+
+ FixedText FT_COMMON_PORT
+ {
+ Pos = MAP_APPFONT ( INDENT_BELOW_RADIO, OPTION_GROUP_START +
LINE_HEIGHT + 2 ) ;
+ Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS -
INDENT_BELOW_RADIO, FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "~Port" ;
+ Group = TRUE ;
+ };
+
+ NumericField NF_COMMON_PORT
+ {
+ Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START +
LINE_HEIGHT ) ;
+ Size = MAP_APPFONT ( 25, EDIT_HEIGHT ) ;
Border = TRUE ;
- };
+ NoThousandSep = TRUE ;
+ Value = 3306 ;
+ };
+
+ FixedText FT_COMMON_PORT_DEFAULT
+ {
+ Pos = MAP_APPFONT ( COLUMN_WIDTH_1 + 25 + RELATED_CONTROLS,
OPTION_GROUP_START + LINE_HEIGHT + 2 ) ;
+ Size = MAP_APPFONT ( COLUMN_WIDTH_2 - 25 - RELATED_CONTROLS,
FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Default: 3306" ;
+ };
+
+ RadioButton RB_MYSQL_SOCKET
+ {
+ Pos = MAP_APPFONT ( 0, OPTION_GROUP_START + 2 * LINE_HEIGHT + 2
) ;
+ Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS,
FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "So~cket" ;
+ };
+
+ Edit ED_MYSQL_SOCKET
+ {
+ Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + 2 *
LINE_HEIGHT ) ;
+ Size = MAP_APPFONT ( COLUMN_WIDTH_2, EDIT_HEIGHT ) ;
+ Border = TRUE ;
+ };
+
+ RadioButton RB_MYSQL_NAMED_PIPE
+ {
+ Pos = MAP_APPFONT ( 0, OPTION_GROUP_START + 2 * LINE_HEIGHT + 2
) ;
+ Size = MAP_APPFONT ( COLUMN_WIDTH_1 - RELATED_CONTROLS,
FIXEDTEXT_HEIGHT ) ;
+ Text [ en-US ] = "Named p~ipe" ;
+ };
+
+ Edit ED_MYSQL_NAMED_PIPE
+ {
+ Pos = MAP_APPFONT ( COLUMN_WIDTH_1, OPTION_GROUP_START + 2 *
LINE_HEIGHT ) ;
+ Size = MAP_APPFONT ( COLUMN_WIDTH_2, EDIT_HEIGHT ) ;
+ Border = TRUE ;
+ };
};
+
+// ********************************************************************** EOF
diff --git a/main/helpcontent2/source/text/swriter/01/02110000.xhp
b/main/helpcontent2/source/text/swriter/01/02110000.xhp
index 2c65c85d3a..09a6956eab 100644
--- a/main/helpcontent2/source/text/swriter/01/02110000.xhp
+++ b/main/helpcontent2/source/text/swriter/01/02110000.xhp
@@ -242,7 +242,7 @@
</tablerow>
</table>
<bookmark xml-lang="en-US" branch="hid/SW_HID_NAVI_TBX5" id="bm_id3145582"
localize="false"/>
-<paragraph role="heading" id="hd_id3145571" xml-lang="en-US" level="2"
l10n="U" oldref="48">Chapter Up</paragraph>
+<paragraph role="heading" id="hd_id3145571" xml-lang="en-US" level="2"
l10n="U" oldref="48">Promote Chapter</paragraph>
<paragraph role="paragraph" id="par_id3145587" xml-lang="en-US" l10n="CHG"
oldref="49"><ahelp hid="HID_NAVI_TBX5">Moves the selected heading, and the text
below the heading, up one heading position in the Navigator and in the
document. To move only the selected heading and not the text associated with
the heading, hold down Ctrl, and then click this icon.</ahelp></paragraph>
<table id="tbl_id3151301">
<tablerow>
@@ -252,12 +252,12 @@
</image></paragraph>
</tablecell>
<tablecell>
-<paragraph role="paragraph" id="par_id3149147" xml-lang="en-US" l10n="U"
oldref="50">Chapter Up</paragraph>
+<paragraph role="paragraph" id="par_id3149147" xml-lang="en-US" l10n="U"
oldref="50">Promote Chapter</paragraph>
</tablecell>
</tablerow>
</table>
<bookmark xml-lang="en-US" branch="hid/SW_HID_NAVI_TBX6" id="bm_id3154435"
localize="false"/>
-<paragraph role="heading" id="hd_id3154424" xml-lang="en-US" level="2"
l10n="U" oldref="51">Chapter Down</paragraph>
+<paragraph role="heading" id="hd_id3154424" xml-lang="en-US" level="2"
l10n="U" oldref="51">Demote Chapter</paragraph>
<paragraph role="paragraph" id="par_id3154440" xml-lang="en-US" l10n="CHG"
oldref="52"><ahelp hid="HID_NAVI_TBX6">Moves the selected heading, and the text
below the heading, down one heading position in the Navigator and in the
document. To move only the selected heading and not the text associated with
the heading, hold down Ctrl, and then click this icon.</ahelp></paragraph>
<table id="tbl_id3153737">
<tablerow>
@@ -267,7 +267,7 @@
</image></paragraph>
</tablecell>
<tablecell>
-<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U"
oldref="53">Chapter down</paragraph>
+<paragraph role="paragraph" id="par_id3150870" xml-lang="en-US" l10n="U"
oldref="53">Demote Chapter</paragraph>
</tablecell>
</tablerow>
</table>
diff --git a/main/sc/source/ui/src/globstr.src
b/main/sc/source/ui/src/globstr.src
index 1dcb9b6c6d..68d03199f1 100644
--- a/main/sc/source/ui/src/globstr.src
+++ b/main/sc/source/ui/src/globstr.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "globstr.hrc"
#include "sc.hrc"
@@ -1608,12 +1606,12 @@ Resource RID_GLOBSTR
String STR_CHANGED_MOVE_REJECTION_WARNING
{
- Text[ en-US ] = "WARNING: This action may have resulted in
unintended changes to cell references in formulas." ;
+ Text [ en-US ] = "WARNING: This action may have resulted in
unintended changes to cell references in formulas." ;
};
String STR_CHANGED_DELETE_REJECTION_WARNING
{
- Text[ en-US ] = "WARNING: This action may have resulted in
references to the deleted area not being restored." ;
+ Text [ en-US ] = "WARNING: This action may have resulted in
references to the deleted area not being restored." ;
};
String STR_HF_NONE_IN_BRACKETS
@@ -1658,7 +1656,7 @@ Resource RID_GLOBSTR
String STR_ERR_DATAPILOT_INPUT
{
- Text[ en-US ] = "You cannot change this part of the pivot
table." ;
+ Text [ en-US ] = "You cannot change this part of the pivot
table." ;
};
String STR_RECALC_MANUAL
diff --git a/main/sw/source/ui/utlui/navipi.src
b/main/sw/source/ui/utlui/navipi.src
index bd363a8590..1577622de5 100644
--- a/main/sw/source/ui/utlui/navipi.src
+++ b/main/sw/source/ui/utlui/navipi.src
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
#include "cmdid.h"
#include "utlui.hrc"
#include "navipi.hrc"
@@ -145,7 +143,6 @@ Window DLG_NAVIGATION_PI
//
ItemBitmap = Bitmap { File = "navchup.png" ; };
HelpID = HID_NAVI_TBX5 ;
Text [ en-US ] = "Promote Chapter" ;
- //HelpText[english_us-wrong] = "Move chapter
down" ;//"Move chapter up"
};
ToolBoxItem
{
