sw/source/writerfilter/rtftok/rtfsdrimport.cxx | 12 +++++-------
toolkit/source/controls/grid/gridcolumn.cxx | 22 +++++++++++-----------
toolkit/source/controls/grid/gridcolumn.hxx | 4 ++--
3 files changed, 18 insertions(+), 20 deletions(-)
New commits:
commit 95dcfa737d6ec4786e1afd33ced064e07976196e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu May 2 15:25:49 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat May 4 15:08:25 2024 +0200
replace createFromAscii with OUString literals in RTFSdrImport
Change-Id: I3f49ee652817c778d3888d53f6151e998f689dd5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167116
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/sw/source/writerfilter/rtftok/rtfsdrimport.cxx
b/sw/source/writerfilter/rtftok/rtfsdrimport.cxx
index da2a2bd1365f..dff40953d1bd 100644
--- a/sw/source/writerfilter/rtftok/rtfsdrimport.cxx
+++ b/sw/source/writerfilter/rtftok/rtfsdrimport.cxx
@@ -164,18 +164,16 @@ void RTFSdrImport::resolveLineColorAndWidth(bool
bTextFrame,
}
else
{
- static const char* aBorders[]
- = { "TopBorder", "LeftBorder", "BottomBorder", "RightBorder" };
- for (const char* pBorder : aBorders)
+ static constexpr OUString aBorders[]
+ = { u"TopBorder"_ustr, u"LeftBorder"_ustr, u"BottomBorder"_ustr,
u"RightBorder"_ustr };
+ for (const OUString& pBorder : aBorders)
{
- auto aBorderLine =
xPropertySet->getPropertyValue(OUString::createFromAscii(pBorder))
- .get<table::BorderLine2>();
+ auto aBorderLine =
xPropertySet->getPropertyValue(pBorder).get<table::BorderLine2>();
if (rLineColor.hasValue())
aBorderLine.Color = rLineColor.get<sal_Int32>();
if (rLineWidth.hasValue())
aBorderLine.LineWidth = rLineWidth.get<sal_Int32>();
- xPropertySet->setPropertyValue(OUString::createFromAscii(pBorder),
- uno::Any(aBorderLine));
+ xPropertySet->setPropertyValue(pBorder, uno::Any(aBorderLine));
}
}
}
commit d13bd5313a2a102f1be2eff439e602e57265febb
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu May 2 15:32:09 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat May 4 15:08:13 2024 +0200
replace createFromAscii with OUString literals in GridColumn
Change-Id: Icfb1a4f1a4848e95687f8d1e18a77c55343478a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167118
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx
b/toolkit/source/controls/grid/gridcolumn.cxx
index 92d28ce9c822..a5165a63cd71 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -72,12 +72,12 @@ namespace toolkit
}
- void GridColumn::broadcast_changed( char const * const
i_asciiAttributeName, const Any& i_oldValue, const Any& i_newValue,
+ void GridColumn::broadcast_changed( const OUString& i_asciiAttributeName,
const Any& i_oldValue, const Any& i_newValue,
std::unique_lock<std::mutex>& i_Guard )
{
Reference< XInterface > const xSource( getXWeak() );
GridColumnEvent const aEvent(
- xSource, OUString::createFromAscii( i_asciiAttributeName ),
+ xSource, i_asciiAttributeName,
i_oldValue, i_newValue, m_nIndex
);
@@ -108,7 +108,7 @@ namespace toolkit
void SAL_CALL GridColumn::setColumnWidth(::sal_Int32 value)
{
- impl_set( m_nColumnWidth, value, "ColumnWidth" );
+ impl_set( m_nColumnWidth, value, u"ColumnWidth"_ustr );
}
@@ -121,7 +121,7 @@ namespace toolkit
void SAL_CALL GridColumn::setMaxWidth(::sal_Int32 value)
{
- impl_set( m_nMaxWidth, value, "MaxWidth" );
+ impl_set( m_nMaxWidth, value, u"MaxWidth"_ustr );
}
@@ -134,7 +134,7 @@ namespace toolkit
void SAL_CALL GridColumn::setMinWidth(::sal_Int32 value)
{
- impl_set( m_nMinWidth, value, "MinWidth" );
+ impl_set( m_nMinWidth, value, u"MinWidth"_ustr );
}
@@ -147,7 +147,7 @@ namespace toolkit
void SAL_CALL GridColumn::setTitle(const OUString & value)
{
- impl_set( m_sTitle, value, "Title" );
+ impl_set( m_sTitle, value, u"Title"_ustr );
}
@@ -160,7 +160,7 @@ namespace toolkit
void SAL_CALL GridColumn::setHelpText( const OUString & value )
{
- impl_set( m_sHelpText, value, "HelpText" );
+ impl_set( m_sHelpText, value, u"HelpText"_ustr );
}
@@ -173,7 +173,7 @@ namespace toolkit
void SAL_CALL GridColumn::setResizeable(sal_Bool value)
{
- impl_set( m_bResizeable, bool(value), "Resizeable" );
+ impl_set( m_bResizeable, bool(value), u"Resizeable"_ustr );
}
@@ -188,7 +188,7 @@ namespace toolkit
{
if ( i_value < 0 )
throw IllegalArgumentException( OUString(), *this, 1 );
- impl_set( m_nFlexibility, i_value, "Flexibility" );
+ impl_set( m_nFlexibility, i_value, u"Flexibility"_ustr );
}
@@ -201,7 +201,7 @@ namespace toolkit
void SAL_CALL GridColumn::setHorizontalAlign(HorizontalAlignment align)
{
- impl_set( m_eHorizontalAlign, align, "HorizontalAlign" );
+ impl_set( m_eHorizontalAlign, align, u"HorizontalAlign"_ustr );
}
@@ -250,7 +250,7 @@ namespace toolkit
void SAL_CALL GridColumn::setDataColumnIndex( ::sal_Int32
i_dataColumnIndex )
{
- impl_set( m_nDataColumnIndex, i_dataColumnIndex, "DataColumnIndex" );
+ impl_set( m_nDataColumnIndex, i_dataColumnIndex,
u"DataColumnIndex"_ustr );
}
diff --git a/toolkit/source/controls/grid/gridcolumn.hxx
b/toolkit/source/controls/grid/gridcolumn.hxx
index 13c87922715b..500275027865 100644
--- a/toolkit/source/controls/grid/gridcolumn.hxx
+++ b/toolkit/source/controls/grid/gridcolumn.hxx
@@ -81,14 +81,14 @@ public:
private:
void broadcast_changed(
- char const * const i_asciiAttributeName,
+ const OUString & i_asciiAttributeName,
const css::uno::Any& i_oldValue,
const css::uno::Any& i_newValue,
std::unique_lock<std::mutex>& i_Guard
);
template< class TYPE >
- void impl_set( TYPE & io_attribute, TYPE const & i_newValue, char const *
i_attributeName )
+ void impl_set( TYPE & io_attribute, TYPE const & i_newValue, const
OUString& i_attributeName )
{
std::unique_lock aGuard(m_aMutex);
if (m_bDisposed)
