Extended loplugin:ostr: connectivity

Change-Id: I284c896777c4f62499eb6b7c0a9883d9abf8d1f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159721
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

4 files changed, 109 insertions, 110 deletions

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
index 8e0915f5fd05..269113383d8d 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
@@ -73,7 +73,7 @@ void OConnection::construct(const OUString& url, const Sequence<PropertyValue>&
     mysql_library_init(0, nullptr, nullptr);
     mysql_init(&m_mysql);
 
-    OString charset_name{ "utf8mb4" };
+    OString charset_name{ "utf8mb4"_ostr };
     mysql_options(&m_mysql, MYSQL_SET_CHARSET_NAME, charset_name.getStr());
 
     sal_Int32 nIndex;
@@ -192,9 +192,8 @@ void OConnection::construct(const OUString& url, const Sequence<PropertyValue>&
                            *this, OUString(), 0, Any());
     }
 
-    lcl_executeUpdate(&m_mysql,
-                      OString{ "SET session sql_mode='ANSI_QUOTES,NO_AUTO_VALUE_ON_ZERO'" });
-    lcl_executeUpdate(&m_mysql, OString{ "SET NAMES utf8mb4" });
+    lcl_executeUpdate(&m_mysql, "SET session sql_mode='ANSI_QUOTES,NO_AUTO_VALUE_ON_ZERO'"_ostr);
+    lcl_executeUpdate(&m_mysql, "SET NAMES utf8mb4"_ostr);
 }
 
 OUString OConnection::getImplementationName()
diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 4f3faaec419c..e616e9b22966 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -390,7 +390,7 @@ void PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 )
     MutexGuard guard( m_xMutex->GetMutex() );
     checkClosed();
     checkColumnIndex( parameterIndex );
-    m_vars[parameterIndex-1] = OString( "NULL" );
+    m_vars[parameterIndex-1] = "NULL"_ostr;
 }
 
 void PreparedStatement::setObjectNull(
@@ -399,7 +399,7 @@ void PreparedStatement::setObjectNull(
     MutexGuard guard( m_xMutex->GetMutex() );
     checkClosed();
     checkColumnIndex( parameterIndex );
-    m_vars[parameterIndex-1] = OString( "NULL" );
+    m_vars[parameterIndex-1] = "NULL"_ostr;
 }
 
 
@@ -409,9 +409,9 @@ void PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x )
     checkClosed();
     checkColumnIndex( parameterIndex );
     if( x )
-        m_vars[parameterIndex-1] = OString( "'t'" );
+        m_vars[parameterIndex-1] = "'t'"_ostr;
     else
-        m_vars[parameterIndex-1] = OString( "'f'" );
+        m_vars[parameterIndex-1] = "'f'"_ostr;
 }
 
 void PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x )
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 222f57f528d2..c7b94fee121f 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -530,7 +530,7 @@ void tokenizeSQL( const OString & sql, std::vector< OString > &vec  )
                 {
                     if( i - start )
                         vec.push_back( OString( &sql.getStr()[start], i - start ) );
-                    vec.push_back( OString( "." ) );
+                    vec.push_back( "."_ostr );
                     start = i + 1;
                 }
             }
diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx
index 71a9105aac6e..ad91f618d9fc 100644
--- a/connectivity/source/parse/sqlnode.cxx
+++ b/connectivity/source/parse/sqlnode.cxx
@@ -1347,107 +1347,107 @@ OSQLParser::OSQLParser(css::uno::Reference< css::uno::XComponentContext > xConte
             OString      sRuleName;  // the name of the rule ("select_statement")
         }   aRuleDescriptions[] =
         {
-            { OSQLParseNode::select_statement, "select_statement" },
-            { OSQLParseNode::table_exp, "table_exp" },
-            { OSQLParseNode::table_ref_commalist, "table_ref_commalist" },
-            { OSQLParseNode::table_ref, "table_ref" },
-            { OSQLParseNode::catalog_name, "catalog_name" },
-            { OSQLParseNode::schema_name, "schema_name" },
-            { OSQLParseNode::table_name, "table_name" },
-            { OSQLParseNode::opt_column_commalist, "opt_column_commalist" },
-            { OSQLParseNode::column_commalist, "column_commalist" },
-            { OSQLParseNode::column_ref_commalist, "column_ref_commalist" },
-            { OSQLParseNode::column_ref, "column_ref" },
-            { OSQLParseNode::opt_order_by_clause, "opt_order_by_clause" },
-            { OSQLParseNode::ordering_spec_commalist, "ordering_spec_commalist" },
-            { OSQLParseNode::ordering_spec, "ordering_spec" },
-            { OSQLParseNode::opt_asc_desc, "opt_asc_desc" },
-            { OSQLParseNode::where_clause, "where_clause" },
-            { OSQLParseNode::opt_where_clause, "opt_where_clause" },
-            { OSQLParseNode::search_condition, "search_condition" },
-            { OSQLParseNode::comparison, "comparison" },
-            { OSQLParseNode::comparison_predicate, "comparison_predicate" },
-            { OSQLParseNode::between_predicate, "between_predicate" },
-            { OSQLParseNode::like_predicate, "like_predicate" },
-            { OSQLParseNode::opt_escape, "opt_escape" },
-            { OSQLParseNode::test_for_null, "test_for_null" },
-            { OSQLParseNode::scalar_exp_commalist, "scalar_exp_commalist" },
-            { OSQLParseNode::scalar_exp, "scalar_exp" },
-            { OSQLParseNode::parameter_ref, "parameter_ref" },
-            { OSQLParseNode::parameter, "parameter" },
-            { OSQLParseNode::general_set_fct, "general_set_fct" },
-            { OSQLParseNode::range_variable, "range_variable" },
-            { OSQLParseNode::column, "column" },
-            { OSQLParseNode::delete_statement_positioned, "delete_statement_positioned" },
-            { OSQLParseNode::delete_statement_searched, "delete_statement_searched" },
-            { OSQLParseNode::update_statement_positioned, "update_statement_positioned" },
-            { OSQLParseNode::update_statement_searched, "update_statement_searched" },
-            { OSQLParseNode::assignment_commalist, "assignment_commalist" },
-            { OSQLParseNode::assignment, "assignment" },
-            { OSQLParseNode::values_or_query_spec, "values_or_query_spec" },
-            { OSQLParseNode::insert_statement, "insert_statement" },
-            { OSQLParseNode::insert_atom_commalist, "insert_atom_commalist" },
-            { OSQLParseNode::insert_atom, "insert_atom" },
-            { OSQLParseNode::from_clause, "from_clause" },
-            { OSQLParseNode::qualified_join, "qualified_join" },
-            { OSQLParseNode::cross_union, "cross_union" },
-            { OSQLParseNode::select_sublist, "select_sublist" },
-            { OSQLParseNode::derived_column, "derived_column" },
-            { OSQLParseNode::column_val, "column_val" },
-            { OSQLParseNode::set_fct_spec, "set_fct_spec" },
-            { OSQLParseNode::boolean_term, "boolean_term" },
-            { OSQLParseNode::boolean_primary, "boolean_primary" },
-            { OSQLParseNode::num_value_exp, "num_value_exp" },
-            { OSQLParseNode::join_type, "join_type" },
-            { OSQLParseNode::position_exp, "position_exp" },
-            { OSQLParseNode::extract_exp, "extract_exp" },
-            { OSQLParseNode::length_exp, "length_exp" },
-            { OSQLParseNode::char_value_fct, "char_value_fct" },
-            { OSQLParseNode::odbc_call_spec, "odbc_call_spec" },
-            { OSQLParseNode::in_predicate, "in_predicate" },
-            { OSQLParseNode::existence_test, "existence_test" },
-            { OSQLParseNode::unique_test, "unique_test" },
-            { OSQLParseNode::all_or_any_predicate, "all_or_any_predicate" },
-            { OSQLParseNode::named_columns_join, "named_columns_join" },
-            { OSQLParseNode::join_condition, "join_condition" },
-            { OSQLParseNode::joined_table, "joined_table" },
-            { OSQLParseNode::boolean_factor, "boolean_factor" },
-            { OSQLParseNode::sql_not, "sql_not" },
-            { OSQLParseNode::manipulative_statement, "manipulative_statement" },
-            { OSQLParseNode::subquery, "subquery" },
-            { OSQLParseNode::value_exp_commalist, "value_exp_commalist" },
-            { OSQLParseNode::odbc_fct_spec, "odbc_fct_spec" },
-            { OSQLParseNode::union_statement, "union_statement" },
-            { OSQLParseNode::outer_join_type, "outer_join_type" },
-            { OSQLParseNode::char_value_exp, "char_value_exp" },
-            { OSQLParseNode::term, "term" },
-            { OSQLParseNode::value_exp_primary, "value_exp_primary" },
-            { OSQLParseNode::value_exp, "value_exp" },
-            { OSQLParseNode::selection, "selection" },
-            { OSQLParseNode::fold, "fold" },
-            { OSQLParseNode::char_substring_fct, "char_substring_fct" },
-            { OSQLParseNode::factor, "factor" },
-            { OSQLParseNode::base_table_def, "base_table_def" },
-            { OSQLParseNode::base_table_element_commalist, "base_table_element_commalist" },
-            { OSQLParseNode::data_type, "data_type" },
-            { OSQLParseNode::column_def, "column_def" },
-            { OSQLParseNode::table_node, "table_node" },
-            { OSQLParseNode::as_clause, "as_clause" },
-            { OSQLParseNode::opt_as, "opt_as" },
-            { OSQLParseNode::op_column_commalist, "op_column_commalist" },
-            { OSQLParseNode::table_primary_as_range_column, "table_primary_as_range_column" },
-            { OSQLParseNode::datetime_primary, "datetime_primary" },
-            { OSQLParseNode::concatenation, "concatenation" },
-            { OSQLParseNode::char_factor, "char_factor" },
-            { OSQLParseNode::bit_value_fct, "bit_value_fct" },
-            { OSQLParseNode::comparison_predicate_part_2, "comparison_predicate_part_2" },
-            { OSQLParseNode::parenthesized_boolean_value_expression, "parenthesized_boolean_value_expression" },
-            { OSQLParseNode::character_string_type, "character_string_type" },
-            { OSQLParseNode::other_like_predicate_part_2, "other_like_predicate_part_2" },
-            { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2" },
-            { OSQLParseNode::null_predicate_part_2, "null_predicate_part_2" },
-            { OSQLParseNode::cast_spec, "cast_spec" },
-            { OSQLParseNode::window_function, "window_function" }
+            { OSQLParseNode::select_statement, "select_statement"_ostr },
+            { OSQLParseNode::table_exp, "table_exp"_ostr },
+            { OSQLParseNode::table_ref_commalist, "table_ref_commalist"_ostr },
+            { OSQLParseNode::table_ref, "table_ref"_ostr },
+            { OSQLParseNode::catalog_name, "catalog_name"_ostr },
+            { OSQLParseNode::schema_name, "schema_name"_ostr },
+            { OSQLParseNode::table_name, "table_name"_ostr },
+            { OSQLParseNode::opt_column_commalist, "opt_column_commalist"_ostr },
+            { OSQLParseNode::column_commalist, "column_commalist"_ostr },
+            { OSQLParseNode::column_ref_commalist, "column_ref_commalist"_ostr },
+            { OSQLParseNode::column_ref, "column_ref"_ostr },
+            { OSQLParseNode::opt_order_by_clause, "opt_order_by_clause"_ostr },
+            { OSQLParseNode::ordering_spec_commalist, "ordering_spec_commalist"_ostr },
+            { OSQLParseNode::ordering_spec, "ordering_spec"_ostr },
+            { OSQLParseNode::opt_asc_desc, "opt_asc_desc"_ostr },
+            { OSQLParseNode::where_clause, "where_clause"_ostr },
+            { OSQLParseNode::opt_where_clause, "opt_where_clause"_ostr },
+            { OSQLParseNode::search_condition, "search_condition"_ostr },
+            { OSQLParseNode::comparison, "comparison"_ostr },
+            { OSQLParseNode::comparison_predicate, "comparison_predicate"_ostr },
+            { OSQLParseNode::between_predicate, "between_predicate"_ostr },
+            { OSQLParseNode::like_predicate, "like_predicate"_ostr },
+            { OSQLParseNode::opt_escape, "opt_escape"_ostr },
+            { OSQLParseNode::test_for_null, "test_for_null"_ostr },
+            { OSQLParseNode::scalar_exp_commalist, "scalar_exp_commalist"_ostr },
+            { OSQLParseNode::scalar_exp, "scalar_exp"_ostr },
+            { OSQLParseNode::parameter_ref, "parameter_ref"_ostr },
+            { OSQLParseNode::parameter, "parameter"_ostr },
+            { OSQLParseNode::general_set_fct, "general_set_fct"_ostr },
+            { OSQLParseNode::range_variable, "range_variable"_ostr },
+            { OSQLParseNode::column, "column"_ostr },
+            { OSQLParseNode::delete_statement_positioned, "delete_statement_positioned"_ostr },
+            { OSQLParseNode::delete_statement_searched, "delete_statement_searched"_ostr },
+            { OSQLParseNode::update_statement_positioned, "update_statement_positioned"_ostr },
+            { OSQLParseNode::update_statement_searched, "update_statement_searched"_ostr },
+            { OSQLParseNode::assignment_commalist, "assignment_commalist"_ostr },
+            { OSQLParseNode::assignment, "assignment"_ostr },
+            { OSQLParseNode::values_or_query_spec, "values_or_query_spec"_ostr },
+            { OSQLParseNode::insert_statement, "insert_statement"_ostr },
+            { OSQLParseNode::insert_atom_commalist, "insert_atom_commalist"_ostr },
+            { OSQLParseNode::insert_atom, "insert_atom"_ostr },
+            { OSQLParseNode::from_clause, "from_clause"_ostr },
+            { OSQLParseNode::qualified_join, "qualified_join"_ostr },
+            { OSQLParseNode::cross_union, "cross_union"_ostr },
+            { OSQLParseNode::select_sublist, "select_sublist"_ostr },
+            { OSQLParseNode::derived_column, "derived_column"_ostr },
+            { OSQLParseNode::column_val, "column_val"_ostr },
+            { OSQLParseNode::set_fct_spec, "set_fct_spec"_ostr },
+            { OSQLParseNode::boolean_term, "boolean_term"_ostr },
+            { OSQLParseNode::boolean_primary, "boolean_primary"_ostr },
+            { OSQLParseNode::num_value_exp, "num_value_exp"_ostr },
+            { OSQLParseNode::join_type, "join_type"_ostr },
+            { OSQLParseNode::position_exp, "position_exp"_ostr },
+            { OSQLParseNode::extract_exp, "extract_exp"_ostr },
+            { OSQLParseNode::length_exp, "length_exp"_ostr },
+            { OSQLParseNode::char_value_fct, "char_value_fct"_ostr },
+            { OSQLParseNode::odbc_call_spec, "odbc_call_spec"_ostr },
+            { OSQLParseNode::in_predicate, "in_predicate"_ostr },
+            { OSQLParseNode::existence_test, "existence_test"_ostr },
+            { OSQLParseNode::unique_test, "unique_test"_ostr },
+            { OSQLParseNode::all_or_any_predicate, "all_or_any_predicate"_ostr },
+            { OSQLParseNode::named_columns_join, "named_columns_join"_ostr },
+            { OSQLParseNode::join_condition, "join_condition"_ostr },
+            { OSQLParseNode::joined_table, "joined_table"_ostr },
+            { OSQLParseNode::boolean_factor, "boolean_factor"_ostr },
+            { OSQLParseNode::sql_not, "sql_not"_ostr },
+            { OSQLParseNode::manipulative_statement, "manipulative_statement"_ostr },
+            { OSQLParseNode::subquery, "subquery"_ostr },
+            { OSQLParseNode::value_exp_commalist, "value_exp_commalist"_ostr },
+            { OSQLParseNode::odbc_fct_spec, "odbc_fct_spec"_ostr },
+            { OSQLParseNode::union_statement, "union_statement"_ostr },
+            { OSQLParseNode::outer_join_type, "outer_join_type"_ostr },
+            { OSQLParseNode::char_value_exp, "char_value_exp"_ostr },
+            { OSQLParseNode::term, "term"_ostr },
+            { OSQLParseNode::value_exp_primary, "value_exp_primary"_ostr },
+            { OSQLParseNode::value_exp, "value_exp"_ostr },
+            { OSQLParseNode::selection, "selection"_ostr },
+            { OSQLParseNode::fold, "fold"_ostr },
+            { OSQLParseNode::char_substring_fct, "char_substring_fct"_ostr },
+            { OSQLParseNode::factor, "factor"_ostr },
+            { OSQLParseNode::base_table_def, "base_table_def"_ostr },
+            { OSQLParseNode::base_table_element_commalist, "base_table_element_commalist"_ostr },
+            { OSQLParseNode::data_type, "data_type"_ostr },
+            { OSQLParseNode::column_def, "column_def"_ostr },
+            { OSQLParseNode::table_node, "table_node"_ostr },
+            { OSQLParseNode::as_clause, "as_clause"_ostr },
+            { OSQLParseNode::opt_as, "opt_as"_ostr },
+            { OSQLParseNode::op_column_commalist, "op_column_commalist"_ostr },
+            { OSQLParseNode::table_primary_as_range_column, "table_primary_as_range_column"_ostr },
+            { OSQLParseNode::datetime_primary, "datetime_primary"_ostr },
+            { OSQLParseNode::concatenation, "concatenation"_ostr },
+            { OSQLParseNode::char_factor, "char_factor"_ostr },
+            { OSQLParseNode::bit_value_fct, "bit_value_fct"_ostr },
+            { OSQLParseNode::comparison_predicate_part_2, "comparison_predicate_part_2"_ostr },
+            { OSQLParseNode::parenthesized_boolean_value_expression, "parenthesized_boolean_value_expression"_ostr },
+            { OSQLParseNode::character_string_type, "character_string_type"_ostr },
+            { OSQLParseNode::other_like_predicate_part_2, "other_like_predicate_part_2"_ostr },
+            { OSQLParseNode::between_predicate_part_2, "between_predicate_part_2"_ostr },
+            { OSQLParseNode::null_predicate_part_2, "null_predicate_part_2"_ostr },
+            { OSQLParseNode::cast_spec, "cast_spec"_ostr },
+            { OSQLParseNode::window_function, "window_function"_ostr }
         };
         const size_t nRuleMapCount = std::size( aRuleDescriptions );
         // added a new rule? Adjust this map!