summaryrefslogtreecommitdiff
path: root/lotuswordpro
diff options
context:
space:
mode:
authorNoel <noelgrandin@gmail.com>2020-11-18 10:10:40 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-11-24 09:45:04 +0100
commitbb06f51308428500c9c8d11ae05f0aa03ecc179c (patch)
treeb18620e8572ed6d4c43c8605660d59f5f7a7e531 /lotuswordpro
parent42e8e16cf93dcf944e5c1106f76aaa32057c0397 (diff)
loplugin:stringviewparam extend to comparison operators
which means that some call sites have to change to use unicode string literals i.e. u"foo" instead of "foo" Change-Id: Ie51c3adf56d343dd1d1710777f9d2a43ee66221c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106125 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'lotuswordpro')
-rw-r--r--lotuswordpro/inc/lwpfoundry.hxx2
-rw-r--r--lotuswordpro/inc/xfilter/xfstylecont.hxx2
-rw-r--r--lotuswordpro/inc/xfilter/xfstylemanager.hxx6
-rw-r--r--lotuswordpro/source/filter/lwpdoc.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpfoundry.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpfribmark.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpmarker.cxx2
-rw-r--r--lotuswordpro/source/filter/lwpmarker.hxx2
-rw-r--r--lotuswordpro/source/filter/lwpproplist.cxx6
-rw-r--r--lotuswordpro/source/filter/lwpproplist.hxx6
-rw-r--r--lotuswordpro/source/filter/xfilter/xfstylecont.cxx2
-rw-r--r--lotuswordpro/source/filter/xfilter/xfstylemanager.cxx6
12 files changed, 20 insertions, 20 deletions
diff --git a/lotuswordpro/inc/lwpfoundry.hxx b/lotuswordpro/inc/lwpfoundry.hxx
index fc9989107639..6f5776d3c286 100644
--- a/lotuswordpro/inc/lwpfoundry.hxx
+++ b/lotuswordpro/inc/lwpfoundry.hxx
@@ -267,7 +267,7 @@ public:
LwpSection* EnumSections(LwpSection* pSection);
LwpBulletStyleMgr* GetBulletStyleMgr() { return m_xBulletStyleMgr.get(); }
- LwpObjectID* FindParaStyleByName(const OUString& name);
+ LwpObjectID* FindParaStyleByName(std::u16string_view name);
OUString FindActuralStyleName(const OUString& name);
};
diff --git a/lotuswordpro/inc/xfilter/xfstylecont.hxx b/lotuswordpro/inc/xfilter/xfstylecont.hxx
index 601fbd252a61..f2617eefa3c8 100644
--- a/lotuswordpro/inc/xfilter/xfstylecont.hxx
+++ b/lotuswordpro/inc/xfilter/xfstylecont.hxx
@@ -109,7 +109,7 @@ public:
/**
* @descr get style by name.
*/
- IXFStyle* FindStyle(const OUString& name);
+ IXFStyle* FindStyle(std::u16string_view name);
/**
* @descr clear container.
diff --git a/lotuswordpro/inc/xfilter/xfstylemanager.hxx b/lotuswordpro/inc/xfilter/xfstylemanager.hxx
index d2de7b5759b9..c6a96f560823 100644
--- a/lotuswordpro/inc/xfilter/xfstylemanager.hxx
+++ b/lotuswordpro/inc/xfilter/xfstylemanager.hxx
@@ -95,11 +95,11 @@ public:
IXFStyleRet AddStyle(std::unique_ptr<IXFStyle> pStyle);
- IXFStyle* FindStyle(const OUString& name);
+ IXFStyle* FindStyle(std::u16string_view name);
- XFParaStyle* FindParaStyle(const OUString& name);
+ XFParaStyle* FindParaStyle(std::u16string_view name);
- XFTextStyle* FindTextStyle(const OUString& name);
+ XFTextStyle* FindTextStyle(std::u16string_view name);
void SetLineNumberConfig(XFLineNumberConfig *pLNConfig);
diff --git a/lotuswordpro/source/filter/lwpdoc.cxx b/lotuswordpro/source/filter/lwpdoc.cxx
index c09d670b150c..bb9c8810e899 100644
--- a/lotuswordpro/source/filter/lwpdoc.cxx
+++ b/lotuswordpro/source/filter/lwpdoc.cxx
@@ -785,7 +785,7 @@ void LwpDocument::XFConvertFrameInPage(XFContentContainer* pCont)
void LwpDocument::ChangeStyleName()
{
XFStyleManager* pXFStyleManager = LwpGlobalMgr::GetInstance()->GetXFStyleManager();
- XFTextStyle* pStyle = dynamic_cast<XFTextStyle*>(pXFStyleManager->FindStyle("ClickHere"));
+ XFTextStyle* pStyle = dynamic_cast<XFTextStyle*>(pXFStyleManager->FindStyle(u"ClickHere"));
if (pStyle)
{
pStyle->SetStyleName("Placeholder");
diff --git a/lotuswordpro/source/filter/lwpfoundry.cxx b/lotuswordpro/source/filter/lwpfoundry.cxx
index d18dcd3903b6..5c3d12524fdb 100644
--- a/lotuswordpro/source/filter/lwpfoundry.cxx
+++ b/lotuswordpro/source/filter/lwpfoundry.cxx
@@ -264,7 +264,7 @@ LwpObjectID * LwpFoundry::GetDefaultTextStyle()
* @descr: Get paragraph style object id according to its style name
*
*/
-LwpObjectID * LwpFoundry::FindParaStyleByName(const OUString& name)
+LwpObjectID * LwpFoundry::FindParaStyleByName(std::u16string_view name)
{
LwpDLVListHeadHolder* pParaStyleHolder = dynamic_cast<LwpDLVListHeadHolder*>(GetTextStyleHead().obj().get());
if(pParaStyleHolder)
diff --git a/lotuswordpro/source/filter/lwpfribmark.cxx b/lotuswordpro/source/filter/lwpfribmark.cxx
index 093d462fb29a..eba748865d10 100644
--- a/lotuswordpro/source/filter/lwpfribmark.cxx
+++ b/lotuswordpro/source/filter/lwpfribmark.cxx
@@ -104,7 +104,7 @@ void LwpFribCHBlock::XFConvert(XFContentContainer* pXFPara, LwpStory* pStory)
if (pHyperlink)
{
pHyperlink->SetHyperlinkFlag(true);
- pHyperlink->SetHyperlink(pMarker->GetNamedProperty("URL"));
+ pHyperlink->SetHyperlink(pMarker->GetNamedProperty(u"URL"));
}
}
else if (type == MARKER_END) //or none
diff --git a/lotuswordpro/source/filter/lwpmarker.cxx b/lotuswordpro/source/filter/lwpmarker.cxx
index 7433042849b2..653121532a09 100644
--- a/lotuswordpro/source/filter/lwpmarker.cxx
+++ b/lotuswordpro/source/filter/lwpmarker.cxx
@@ -87,7 +87,7 @@ void LwpMarker::Read()
m_pObjStrm->SkipExtra();
}
-OUString LwpMarker::GetNamedProperty(const OUString& name)
+OUString LwpMarker::GetNamedProperty(std::u16string_view name)
{
LwpPropList* pProp = GetPropList();
if (pProp)
diff --git a/lotuswordpro/source/filter/lwpmarker.hxx b/lotuswordpro/source/filter/lwpmarker.hxx
index 2a94aaaa2f76..8375d07327d4 100644
--- a/lotuswordpro/source/filter/lwpmarker.hxx
+++ b/lotuswordpro/source/filter/lwpmarker.hxx
@@ -70,7 +70,7 @@ class LwpMarker : public LwpDLNFPVList
public:
LwpMarker(LwpObjectHeader const &objHdr, LwpSvStream *pStrm);
void Read() override;
- OUString GetNamedProperty(const OUString& name);
+ OUString GetNamedProperty(std::u16string_view name);
protected:
enum{
MARKER_START=1,
diff --git a/lotuswordpro/source/filter/lwpproplist.cxx b/lotuswordpro/source/filter/lwpproplist.cxx
index 9e4f6df2877f..e0e159cad43b 100644
--- a/lotuswordpro/source/filter/lwpproplist.cxx
+++ b/lotuswordpro/source/filter/lwpproplist.cxx
@@ -78,12 +78,12 @@ void LwpPropListElement::Read()
m_pObjStrm->SkipExtra();
}
-bool LwpPropListElement::IsNamed(const OUString& name)
+bool LwpPropListElement::IsNamed(std::u16string_view name)
{
return name == m_Name.str();
}
-OUString LwpPropList::GetNamedProperty(const OUString& name)
+OUString LwpPropList::GetNamedProperty(std::u16string_view name)
{
LwpPropListElement* pProp = FindPropByName(name);
if (pProp)
@@ -93,7 +93,7 @@ OUString LwpPropList::GetNamedProperty(const OUString& name)
return OUString();
}
-LwpPropListElement* LwpPropList::FindPropByName(const OUString& name)
+LwpPropListElement* LwpPropList::FindPropByName(std::u16string_view name)
{
LwpPropListElement* pElement = GetFirst();
diff --git a/lotuswordpro/source/filter/lwpproplist.hxx b/lotuswordpro/source/filter/lwpproplist.hxx
index f0ae21451df9..3600b8417c13 100644
--- a/lotuswordpro/source/filter/lwpproplist.hxx
+++ b/lotuswordpro/source/filter/lwpproplist.hxx
@@ -69,7 +69,7 @@ class LwpPropListElement : public LwpDLVList
public:
LwpPropListElement(LwpObjectHeader const& objHdr, LwpSvStream* pStrm);
void Read() override;
- bool IsNamed(const OUString& name);
+ bool IsNamed(std::u16string_view name);
LwpPropListElement* GetNext();
const LwpAtomHolder& GetValue() const { return m_Value; }
const LwpAtomHolder& GetName() const { return m_Name; }
@@ -87,11 +87,11 @@ public:
LwpPropList() {}
using LwpDLVListHead::Read;
LwpPropListElement* GetFirst();
- OUString GetNamedProperty(const OUString& name);
+ OUString GetNamedProperty(std::u16string_view name);
OUString EnumNamedProperty(OUString& name, OUString& value);
private:
- LwpPropListElement* FindPropByName(const OUString& name);
+ LwpPropListElement* FindPropByName(std::u16string_view name);
};
#endif
diff --git a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
index 16fe9725cd72..c9bcfc3c8c97 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylecont.cxx
@@ -137,7 +137,7 @@ IXFStyle* XFStyleContainer::FindSameStyle(IXFStyle *pStyle)
return nullptr;
}
-IXFStyle* XFStyleContainer::FindStyle(const OUString& name)
+IXFStyle* XFStyleContainer::FindStyle(std::u16string_view name)
{
for (auto const& style : m_aStyles)
{
diff --git a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
index 34ddb7d09363..7cf97f8a41d5 100644
--- a/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
+++ b/lotuswordpro/source/filter/xfilter/xfstylemanager.cxx
@@ -219,7 +219,7 @@ IXFStyleRet XFStyleManager::AddStyle(std::unique_ptr<IXFStyle> pStyle)
return aRet;
}
-IXFStyle* XFStyleManager::FindStyle(const OUString& name)
+IXFStyle* XFStyleManager::FindStyle(std::u16string_view name)
{
IXFStyle *pStyle = FindParaStyle(name);
if( pStyle )
@@ -272,7 +272,7 @@ IXFStyle* XFStyleManager::FindStyle(const OUString& name)
return nullptr;
}
-XFParaStyle* XFStyleManager::FindParaStyle(const OUString& name)
+XFParaStyle* XFStyleManager::FindParaStyle(std::u16string_view name)
{
IXFStyle *pStyle = s_aParaStyles.FindStyle(name);
if( pStyle )
@@ -281,7 +281,7 @@ XFParaStyle* XFStyleManager::FindParaStyle(const OUString& name)
return static_cast<XFParaStyle*>(s_aStdParaStyles.FindStyle(name));
}
-XFTextStyle* XFStyleManager::FindTextStyle(const OUString& name)
+XFTextStyle* XFStyleManager::FindTextStyle(std::u16string_view name)
{
IXFStyle *pStyle = s_aTextStyles.FindStyle(name);
if( pStyle )