include/unotools/configvaluecontainer.hxx | 8 +-
svx/source/form/fmsrccfg.cxx | 70 ++++++++++++------------
unotools/source/config/configvaluecontainer.cxx | 8 +-
unotools/source/config/fontcfg.cxx | 52 ++++++++---------
4 files changed, 69 insertions(+), 69 deletions(-)
New commits:
commit cb08b5e8617ea7b278eef0acc0606585b294e1db
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu May 9 11:31:33 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 12 17:01:23 2024 +0200
replace createFromAscii with OUString literals in DefaultFontConfiguration
Change-Id: I550a9a2c069b43cc8824d3b26736f656393a5afb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167546
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/unotools/source/config/fontcfg.cxx
b/unotools/source/config/fontcfg.cxx
index 14bfb646fb75..a9b1556fbbea 100644
--- a/unotools/source/config/fontcfg.cxx
+++ b/unotools/source/config/fontcfg.cxx
@@ -48,36 +48,36 @@ using namespace com::sun::star::configuration;
* DefaultFontConfiguration
*/
-static const char* getKeyType( DefaultFontType nKeyType )
+static OUString getKeyType( DefaultFontType nKeyType )
{
switch( nKeyType )
{
- case DefaultFontType::CJK_DISPLAY: return "CJK_DISPLAY";
- case DefaultFontType::CJK_HEADING: return "CJK_HEADING";
- case DefaultFontType::CJK_PRESENTATION: return "CJK_PRESENTATION";
- case DefaultFontType::CJK_SPREADSHEET: return "CJK_SPREADSHEET";
- case DefaultFontType::CJK_TEXT: return "CJK_TEXT";
- case DefaultFontType::CTL_DISPLAY: return "CTL_DISPLAY";
- case DefaultFontType::CTL_HEADING: return "CTL_HEADING";
- case DefaultFontType::CTL_PRESENTATION: return "CTL_PRESENTATION";
- case DefaultFontType::CTL_SPREADSHEET: return "CTL_SPREADSHEET";
- case DefaultFontType::CTL_TEXT: return "CTL_TEXT";
- case DefaultFontType::FIXED: return "FIXED";
- case DefaultFontType::LATIN_DISPLAY: return "LATIN_DISPLAY";
- case DefaultFontType::LATIN_FIXED: return "LATIN_FIXED";
- case DefaultFontType::LATIN_HEADING: return "LATIN_HEADING";
- case DefaultFontType::LATIN_PRESENTATION: return "LATIN_PRESENTATION";
- case DefaultFontType::LATIN_SPREADSHEET: return "LATIN_SPREADSHEET";
- case DefaultFontType::LATIN_TEXT: return "LATIN_TEXT";
- case DefaultFontType::SANS: return "SANS";
- case DefaultFontType::SANS_UNICODE: return "SANS_UNICODE";
- case DefaultFontType::SERIF: return "SERIF";
- case DefaultFontType::SYMBOL: return "SYMBOL";
- case DefaultFontType::UI_FIXED: return "UI_FIXED";
- case DefaultFontType::UI_SANS: return "UI_SANS";
+ case DefaultFontType::CJK_DISPLAY: return u"CJK_DISPLAY"_ustr;
+ case DefaultFontType::CJK_HEADING: return u"CJK_HEADING"_ustr;
+ case DefaultFontType::CJK_PRESENTATION: return u"CJK_PRESENTATION"_ustr;
+ case DefaultFontType::CJK_SPREADSHEET: return u"CJK_SPREADSHEET"_ustr;
+ case DefaultFontType::CJK_TEXT: return u"CJK_TEXT"_ustr;
+ case DefaultFontType::CTL_DISPLAY: return u"CTL_DISPLAY"_ustr;
+ case DefaultFontType::CTL_HEADING: return u"CTL_HEADING"_ustr;
+ case DefaultFontType::CTL_PRESENTATION: return u"CTL_PRESENTATION"_ustr;
+ case DefaultFontType::CTL_SPREADSHEET: return u"CTL_SPREADSHEET"_ustr;
+ case DefaultFontType::CTL_TEXT: return u"CTL_TEXT"_ustr;
+ case DefaultFontType::FIXED: return u"FIXED"_ustr;
+ case DefaultFontType::LATIN_DISPLAY: return u"LATIN_DISPLAY"_ustr;
+ case DefaultFontType::LATIN_FIXED: return u"LATIN_FIXED"_ustr;
+ case DefaultFontType::LATIN_HEADING: return u"LATIN_HEADING"_ustr;
+ case DefaultFontType::LATIN_PRESENTATION: return
u"LATIN_PRESENTATION"_ustr;
+ case DefaultFontType::LATIN_SPREADSHEET: return u"LATIN_SPREADSHEET"_ustr;
+ case DefaultFontType::LATIN_TEXT: return u"LATIN_TEXT"_ustr;
+ case DefaultFontType::SANS: return u"SANS"_ustr;
+ case DefaultFontType::SANS_UNICODE: return u"SANS_UNICODE"_ustr;
+ case DefaultFontType::SERIF: return u"SERIF"_ustr;
+ case DefaultFontType::SYMBOL: return u"SYMBOL"_ustr;
+ case DefaultFontType::UI_FIXED: return u"UI_FIXED"_ustr;
+ case DefaultFontType::UI_SANS: return u"UI_SANS"_ustr;
default:
OSL_FAIL( "unmatched type" );
- return "";
+ return u""_ustr;
}
}
@@ -188,7 +188,7 @@ OUString DefaultFontConfiguration::tryLocale( const
OUString& rBcp47, const OUSt
OUString DefaultFontConfiguration::getDefaultFont( const LanguageTag&
rLanguageTag, DefaultFontType nType ) const
{
- OUString aType = OUString::createFromAscii( getKeyType( nType ) );
+ OUString aType = getKeyType( nType );
// Try the simple cases first without constructing fallbacks.
OUString aRet = tryLocale( rLanguageTag.getBcp47(), aType );
if (aRet.isEmpty())
commit bd77596dd8e3f6d3660ce5b096d8160502e13a70
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 8 21:57:45 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sun May 12 17:01:14 2024 +0200
replace createFromAscii with OUString literals in
OConfigurationValueContainer
Change-Id: Ib94018bfc542c91c01894006076eb16023d104ad
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167545
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/unotools/configvaluecontainer.hxx
b/include/unotools/configvaluecontainer.hxx
index a123dba58867..34a01f7c7c59 100644
--- a/include/unotools/configvaluecontainer.hxx
+++ b/include/unotools/configvaluecontainer.hxx
@@ -73,7 +73,7 @@ namespace utl
As this class is intended to manipulate objects it does not
hold itself (see the various
registerXXX methods), it needs to guard these access for multi
threading safety.<br/>
The mutex given here is locked whenever such an access occurs.
- @param _pConfigLocation
+ @param _rConfigLocation
is an ASCII string describing the configurations node path
@param _nAccessFlags
specifies different aspects of the configuration aspect to be
created, e.g. it's update mode etc.<br/>
@@ -84,7 +84,7 @@ namespace utl
OConfigurationValueContainer(
const css::uno::Reference< css::uno::XComponentContext >& _rxORB,
std::mutex& _rAccessSafety,
- const char* _pConfigLocation,
+ const OUString& _rConfigLocation,
const sal_Int32 _nLevels
);
@@ -98,7 +98,7 @@ namespace utl
<p>Usually, in your derived class you simply add a member of the
correct type of the configuration
value, and then call this method with the address of this
member.</p>
- @param _pRelativePathAscii
+ @param _rRelativePathAscii
is a relative (ASCII) path of the node which should be
"mirrored" into the accessor.
@param _pContainer
points to the accessors location in memory. Usually, this is
simply an address of your derived class
@@ -106,7 +106,7 @@ namespace utl
is the type of your accessor. This type must be supported by
the configuration.
*/
void registerExchangeLocation(
- const char* _pRelativePathAscii,
+ const OUString& _rRelativePathAscii,
void* _pContainer,
const css::uno::Type& _rValueType
);
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index 499d2cb16760..610eb58ae455 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -149,46 +149,46 @@ namespace svxform
#define TA( c ) &c, cppu::UnoType<decltype(c)>::get()
FmSearchConfigItem::FmSearchConfigItem()
- :OConfigurationValueContainer(
::comphelper::getProcessComponentContext(), m_aMutex,
"/org.openoffice.Office.DataAccess/FormSearchOptions", 2 )
+ :OConfigurationValueContainer(
::comphelper::getProcessComponentContext(), m_aMutex,
u"/org.openoffice.Office.DataAccess/FormSearchOptions"_ustr, 2 )
{
// register our members so the data exchange with the node values is
done automatically
- registerExchangeLocation( "SearchHistory", TA(
aHistory ) );
- registerExchangeLocation( "LevenshteinOther", TA(
nLevOther ) );
- registerExchangeLocation( "LevenshteinShorter", TA(
nLevShorter ) );
- registerExchangeLocation( "LevenshteinLonger", TA(
nLevLonger ) );
- registerExchangeLocation( "IsLevenshteinRelaxed", TA(
bLevRelaxed ) );
- registerExchangeLocation( "IsSearchAllFields", TA(
bAllFields ) );
- registerExchangeLocation( "IsUseFormatter", TA(
bUseFormatter ) );
- registerExchangeLocation( "IsBackwards", TA(
bBackwards ) );
- registerExchangeLocation( "IsWildcardSearch", TA(
bWildcard ) );
- registerExchangeLocation( "IsUseRegularExpression", TA(
bRegular ) );
- registerExchangeLocation( "IsSimilaritySearch", TA(
bApproxSearch ) );
- registerExchangeLocation( "IsUseAsianOptions", TA(
bSoundsLikeCJK ) );
+ registerExchangeLocation( u"SearchHistory"_ustr,
TA( aHistory ) );
+ registerExchangeLocation( u"LevenshteinOther"_ustr,
TA( nLevOther ) );
+ registerExchangeLocation( u"LevenshteinShorter"_ustr,
TA( nLevShorter ) );
+ registerExchangeLocation( u"LevenshteinLonger"_ustr,
TA( nLevLonger ) );
+ registerExchangeLocation( u"IsLevenshteinRelaxed"_ustr,
TA( bLevRelaxed ) );
+ registerExchangeLocation( u"IsSearchAllFields"_ustr,
TA( bAllFields ) );
+ registerExchangeLocation( u"IsUseFormatter"_ustr,
TA( bUseFormatter ) );
+ registerExchangeLocation( u"IsBackwards"_ustr,
TA( bBackwards ) );
+ registerExchangeLocation( u"IsWildcardSearch"_ustr,
TA( bWildcard ) );
+ registerExchangeLocation( u"IsUseRegularExpression"_ustr,
TA( bRegular ) );
+ registerExchangeLocation( u"IsSimilaritySearch"_ustr,
TA( bApproxSearch ) );
+ registerExchangeLocation( u"IsUseAsianOptions"_ustr,
TA( bSoundsLikeCJK ) );
// the properties which need to be translated
- registerExchangeLocation( "SearchType", TA(
m_sSearchForType ) );
- registerExchangeLocation( "SearchPosition", TA(
m_sSearchPosition ) );
-
- registerExchangeLocation( "IsMatchCase", TA(
m_bIsMatchCase ) );
- registerExchangeLocation( "Japanese/IsMatchFullHalfWidthForms", TA(
m_bIsMatchFullHalfWidthForms ) );
- registerExchangeLocation( "Japanese/IsMatchHiraganaKatakana", TA(
m_bIsMatchHiraganaKatakana ) );
- registerExchangeLocation( "Japanese/IsMatchContractions", TA(
m_bIsMatchContractions ) );
- registerExchangeLocation( "Japanese/IsMatchMinusDashCho-on", TA(
m_bIsMatchMinusDashCho_on ) );
- registerExchangeLocation( "Japanese/IsMatchRepeatCharMarks", TA(
m_bIsMatchRepeatCharMarks ) );
- registerExchangeLocation( "Japanese/IsMatchVariantFormKanji", TA(
m_bIsMatchVariantFormKanji ) );
- registerExchangeLocation( "Japanese/IsMatchOldKanaForms", TA(
m_bIsMatchOldKanaForms ) );
- registerExchangeLocation( "Japanese/IsMatch_DiZi_DuZu", TA(
m_bIsMatch_DiZi_DuZu ) );
- registerExchangeLocation( "Japanese/IsMatch_BaVa_HaFa", TA(
m_bIsMatch_BaVa_HaFa ) );
- registerExchangeLocation( "Japanese/IsMatch_TsiThiChi_DhiZi", TA(
m_bIsMatch_TsiThiChi_DhiZi ) );
- registerExchangeLocation( "Japanese/IsMatch_HyuIyu_ByuVyu", TA(
m_bIsMatch_HyuIyu_ByuVyu ) );
- registerExchangeLocation( "Japanese/IsMatch_SeShe_ZeJe", TA(
m_bIsMatch_SeShe_ZeJe ) );
- registerExchangeLocation( "Japanese/IsMatch_IaIya", TA(
m_bIsMatch_IaIya ) );
- registerExchangeLocation( "Japanese/IsMatch_KiKu", TA(
m_bIsMatch_KiKu ) );
- registerExchangeLocation( "Japanese/IsIgnorePunctuation", TA(
m_bIsIgnorePunctuation ) );
- registerExchangeLocation( "Japanese/IsIgnoreWhitespace", TA(
m_bIsIgnoreWhitespace ) );
- registerExchangeLocation( "Japanese/IsIgnoreProlongedSoundMark",TA(
m_bIsIgnoreProlongedSoundMark ) );
- registerExchangeLocation( "Japanese/IsIgnoreMiddleDot", TA(
m_bIsIgnoreMiddleDot ) );
+ registerExchangeLocation( u"SearchType"_ustr,
TA( m_sSearchForType ) );
+ registerExchangeLocation( u"SearchPosition"_ustr,
TA( m_sSearchPosition ) );
+
+ registerExchangeLocation( u"IsMatchCase"_ustr,
TA( m_bIsMatchCase ) );
+ registerExchangeLocation( u"Japanese/IsMatchFullHalfWidthForms"_ustr,
TA( m_bIsMatchFullHalfWidthForms ) );
+ registerExchangeLocation( u"Japanese/IsMatchHiraganaKatakana"_ustr,
TA( m_bIsMatchHiraganaKatakana ) );
+ registerExchangeLocation( u"Japanese/IsMatchContractions"_ustr,
TA( m_bIsMatchContractions ) );
+ registerExchangeLocation( u"Japanese/IsMatchMinusDashCho-on"_ustr,
TA( m_bIsMatchMinusDashCho_on ) );
+ registerExchangeLocation( u"Japanese/IsMatchRepeatCharMarks"_ustr,
TA( m_bIsMatchRepeatCharMarks ) );
+ registerExchangeLocation( u"Japanese/IsMatchVariantFormKanji"_ustr,
TA( m_bIsMatchVariantFormKanji ) );
+ registerExchangeLocation( u"Japanese/IsMatchOldKanaForms"_ustr,
TA( m_bIsMatchOldKanaForms ) );
+ registerExchangeLocation( u"Japanese/IsMatch_DiZi_DuZu"_ustr,
TA( m_bIsMatch_DiZi_DuZu ) );
+ registerExchangeLocation( u"Japanese/IsMatch_BaVa_HaFa"_ustr,
TA( m_bIsMatch_BaVa_HaFa ) );
+ registerExchangeLocation( u"Japanese/IsMatch_TsiThiChi_DhiZi"_ustr,
TA( m_bIsMatch_TsiThiChi_DhiZi ) );
+ registerExchangeLocation( u"Japanese/IsMatch_HyuIyu_ByuVyu"_ustr,
TA( m_bIsMatch_HyuIyu_ByuVyu ) );
+ registerExchangeLocation( u"Japanese/IsMatch_SeShe_ZeJe"_ustr,
TA( m_bIsMatch_SeShe_ZeJe ) );
+ registerExchangeLocation( u"Japanese/IsMatch_IaIya"_ustr,
TA( m_bIsMatch_IaIya ) );
+ registerExchangeLocation( u"Japanese/IsMatch_KiKu"_ustr,
TA( m_bIsMatch_KiKu ) );
+ registerExchangeLocation( u"Japanese/IsIgnorePunctuation"_ustr,
TA( m_bIsIgnorePunctuation ) );
+ registerExchangeLocation( u"Japanese/IsIgnoreWhitespace"_ustr,
TA( m_bIsIgnoreWhitespace ) );
+ registerExchangeLocation(
u"Japanese/IsIgnoreProlongedSoundMark"_ustr,TA( m_bIsIgnoreProlongedSoundMark )
);
+ registerExchangeLocation( u"Japanese/IsIgnoreMiddleDot"_ustr,
TA( m_bIsIgnoreMiddleDot ) );
read( );
}
diff --git a/unotools/source/config/configvaluecontainer.cxx
b/unotools/source/config/configvaluecontainer.cxx
index 0ac1be06f4db..fc03dfc3a94a 100644
--- a/unotools/source/config/configvaluecontainer.cxx
+++ b/unotools/source/config/configvaluecontainer.cxx
@@ -204,10 +204,10 @@ namespace utl
OConfigurationValueContainer::OConfigurationValueContainer(
const Reference< XComponentContext >& _rxORB, std::mutex&
_rAccessSafety,
- const char* _pConfigLocation, const sal_Int32 _nLevels )
+ const OUString& _rConfigLocation, const sal_Int32 _nLevels )
:m_pImpl( new OConfigurationValueContainerImpl( _rxORB, _rAccessSafety
) )
{
- implConstruct( OUString::createFromAscii( _pConfigLocation ), _nLevels
);
+ implConstruct( _rConfigLocation, _nLevels );
}
OConfigurationValueContainer::~OConfigurationValueContainer()
@@ -229,7 +229,7 @@ namespace utl
"Could not access the configuration node located at " <<
_rConfigLocation);
}
- void OConfigurationValueContainer::registerExchangeLocation( const char*
_pRelativePath,
+ void OConfigurationValueContainer::registerExchangeLocation( const
OUString& _rRelativePath,
void* _pContainer, const Type& _rValueType )
{
// checks...
@@ -247,7 +247,7 @@ namespace utl
"OConfigurationValueContainer::registerExchangeLocation: invalid
type!" );
// build an accessor for this container
- NodeValueAccessor aNewAccessor( OUString::createFromAscii(
_pRelativePath ) );
+ NodeValueAccessor aNewAccessor( _rRelativePath );
aNewAccessor.bind( _pContainer, _rValueType );
// insert it into our structure
