filter/qa/cppunit/priority-test.cxx | 2
filter/qa/cppunit/xslt-test.cxx | 30 -
filter/qa/pdf.cxx | 104 +--
filter/qa/unit/svg.cxx | 70 +-
filter/qa/unit/textfilterdetect.cxx | 43 -
filter/source/config/cache/basecontainer.cxx | 12
filter/source/config/cache/configflush.cxx | 4
filter/source/config/cache/contenthandlerfactory.cxx | 4
filter/source/config/cache/filtercache.cxx | 30 -
filter/source/config/cache/filterfactory.cxx | 6
filter/source/config/cache/frameloaderfactory.cxx | 4
filter/source/config/cache/typedetection.cxx | 26
filter/source/graphic/GraphicExportFilter.cxx | 4
filter/source/graphicfilter/icgm/actimpr.cxx | 92 +--
filter/source/graphicfilter/icgm/cgm.cxx | 10
filter/source/graphicfilter/icgm/class1.cxx | 4
filter/source/graphicfilter/icgm/class4.cxx | 6
filter/source/graphicfilter/icgm/class7.cxx | 10
filter/source/msfilter/escherex.cxx | 170 ++---
filter/source/msfilter/eschesdo.cxx | 52 -
filter/source/msfilter/mscodec.cxx | 22
filter/source/msfilter/msdffimp.cxx | 60 +-
filter/source/msfilter/msocximex.cxx | 4
filter/source/msfilter/msoleexp.cxx | 28
filter/source/msfilter/mstoolbar.cxx | 10
filter/source/msfilter/msvbahelper.cxx | 14
filter/source/msfilter/rtfutil.cxx | 6
filter/source/msfilter/svdfppt.cxx | 102 +--
filter/source/msfilter/svxmsbas2.cxx | 2
filter/source/odfflatxml/OdfFlatXml.cxx | 6
filter/source/pdf/impdialog.cxx | 540 +++++++++---------
filter/source/pdf/pdfdecomposer.cxx | 4
filter/source/pdf/pdfdialog.cxx | 4
filter/source/pdf/pdfexport.cxx | 52 -
filter/source/pdf/pdffilter.cxx | 82 +-
filter/source/pdf/pdfinteract.cxx | 8
filter/source/storagefilterdetect/filterdetect.cxx | 66 +-
filter/source/svg/svgexport.cxx | 536 ++++++++---------
filter/source/svg/svgfilter.cxx | 18
filter/source/svg/svgfontexport.cxx | 38 -
filter/source/svg/svgwriter.cxx | 220 +++----
filter/source/svg/svgwriter.hxx | 2
filter/source/t602/t602filter.cxx | 490 ++++++++--------
filter/source/textfilterdetect/filterdetect.cxx | 4
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 42 -
filter/source/xmlfilterdetect/filterdetect.cxx | 10
filter/source/xsltdialog/typedetectionexport.cxx | 22
filter/source/xsltdialog/typedetectionimport.cxx | 12
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 4
filter/source/xsltdialog/xmlfilterjar.cxx | 20
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 66 +-
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 14
filter/source/xsltdialog/xmlfiltertabpagebasic.cxx | 14
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 24
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 62 +-
filter/source/xsltfilter/LibXSLTTransformer.cxx | 6
filter/source/xsltfilter/OleHandler.cxx | 4
filter/source/xsltfilter/XSLTFilter.cxx | 32 -
forms/source/component/Button.hxx | 4
forms/source/component/CheckBox.hxx | 4
forms/source/component/ComboBox.cxx | 2
forms/source/component/ComboBox.hxx | 4
forms/source/component/Currency.hxx | 4
forms/source/component/DatabaseForm.cxx | 24
forms/source/component/Date.hxx | 4
forms/source/component/Edit.cxx | 2
forms/source/component/Edit.hxx | 4
forms/source/component/File.hxx | 2
forms/source/component/Filter.cxx | 12
forms/source/component/FixedText.hxx | 2
forms/source/component/FormComponent.cxx | 10
forms/source/component/FormattedField.cxx | 4
forms/source/component/FormattedField.hxx | 4
forms/source/component/FormattedFieldWrapper.cxx | 4
forms/source/component/FormsCollection.cxx | 6
forms/source/component/Grid.hxx | 2
forms/source/component/GroupBox.hxx | 4
forms/source/component/GroupManager.cxx | 2
forms/source/component/Hidden.hxx | 2
forms/source/component/ImageButton.hxx | 4
forms/source/component/ImageControl.cxx | 4
forms/source/component/ImageControl.hxx | 4
forms/source/component/ListBox.cxx | 8
forms/source/component/ListBox.hxx | 4
forms/source/component/Numeric.hxx | 4
forms/source/component/Pattern.hxx | 4
forms/source/component/RadioButton.hxx | 4
forms/source/component/Time.hxx | 4
forms/source/component/clickableimage.cxx | 12
forms/source/component/imgprod.cxx | 4
forms/source/component/navigationbar.cxx | 4
forms/source/component/propertybaghelper.cxx | 2
forms/source/component/refvaluecomponent.cxx | 4
forms/source/component/scrollbar.cxx | 6
forms/source/component/spinbutton.cxx | 6
forms/source/helper/windowstateguard.cxx | 4
forms/source/misc/InterfaceContainer.cxx | 10
forms/source/misc/limitedformats.cxx | 8
forms/source/richtext/richtextcontrol.cxx | 6
forms/source/richtext/richtextengine.cxx | 2
forms/source/richtext/richtextimplcontrol.cxx | 2
forms/source/richtext/richtextmodel.cxx | 18
forms/source/runtime/formoperations.cxx | 8
forms/source/solar/component/navbarcontrol.cxx | 6
forms/source/xforms/binding.cxx | 70 +-
forms/source/xforms/convert.cxx | 2
forms/source/xforms/model.cxx | 16
forms/source/xforms/model_ui.cxx | 10
forms/source/xforms/submission.cxx | 40 -
forms/source/xforms/submission/replace.cxx | 6
forms/source/xforms/submission/submission_post.cxx | 2
forms/source/xforms/xforms_services.cxx | 4
formula/source/core/api/FormulaOpCodeMapperObj.cxx | 4
formula/source/ui/dlg/FormulaHelper.cxx | 2
formula/source/ui/dlg/formula.cxx | 74 +-
formula/source/ui/dlg/funcpage.cxx | 10
formula/source/ui/dlg/parawin.cxx | 56 -
formula/source/ui/dlg/structpg.cxx | 6
118 files changed, 1946 insertions(+), 1937 deletions(-)
New commits:
commit 1eaae3966db362b5094feee4ac9a462ee9993d90
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 8 08:28:09 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed May 8 11:15:40 2024 +0200
loplugin:ostr in forms
Change-Id: Ifee5d86b54aa746dbd3b17ff966794f32fbc23bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167303
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/forms/source/component/Button.hxx
b/forms/source/component/Button.hxx
index 7ccaf7d8adee..e0159d9c4ab1 100644
--- a/forms/source/component/Button.hxx
+++ b/forms/source/component/Button.hxx
@@ -62,7 +62,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OButtonModel"; }
+ { return u"com.sun.star.form.OButtonModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -138,7 +138,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OButtonControl"; }
+ { return u"com.sun.star.form.OButtonControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
diff --git a/forms/source/component/CheckBox.hxx
b/forms/source/component/CheckBox.hxx
index 8023e7446cf5..0da4d0f766e5 100644
--- a/forms/source/component/CheckBox.hxx
+++ b/forms/source/component/CheckBox.hxx
@@ -41,7 +41,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OCheckBoxModel"; }
+ { return u"com.sun.star.form.OCheckBoxModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -72,7 +72,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OCheckBoxControl"; }
+ { return u"com.sun.star.form.OCheckBoxControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
};
diff --git a/forms/source/component/ComboBox.cxx
b/forms/source/component/ComboBox.cxx
index 4bd7c8e998de..9e2d60a7d75b 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -515,7 +515,7 @@ void OComboBoxModel::loadData( bool _bForce )
// otherwise look for the alias
Reference<XPropertySet> xFormProp(m_xCursor,UNO_QUERY);
Reference< XColumnsSupplier > xSupplyFields;
- xFormProp->getPropertyValue("SingleSelectQueryComposer")
>>= xSupplyFields;
+
xFormProp->getPropertyValue(u"SingleSelectQueryComposer"_ustr) >>=
xSupplyFields;
// search the field
DBG_ASSERT(xSupplyFields.is(), "OComboBoxModel::loadData :
invalid query composer !");
diff --git a/forms/source/component/ComboBox.hxx
b/forms/source/component/ComboBox.hxx
index ed2360144225..dd2a7b6ea4c3 100644
--- a/forms/source/component/ComboBox.hxx
+++ b/forms/source/component/ComboBox.hxx
@@ -76,7 +76,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OComboBoxModel"; }
+ { return u"com.sun.star.form.OComboBoxModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -133,7 +133,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OComboBoxControl"; }
+ { return u"com.sun.star.form.OComboBoxControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
};
diff --git a/forms/source/component/Currency.hxx
b/forms/source/component/Currency.hxx
index f77f711f090a..8cf24431ac6d 100644
--- a/forms/source/component/Currency.hxx
+++ b/forms/source/component/Currency.hxx
@@ -42,7 +42,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OCurrencyModel"; }
+ { return u"com.sun.star.form.OCurrencyModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -74,7 +74,7 @@ public:
explicit OCurrencyControl(const css::uno::Reference<
css::uno::XComponentContext>& _rxContext);
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OCurrencyControl"; }
+ { return u"com.sun.star.form.OCurrencyControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
};
diff --git a/forms/source/component/DatabaseForm.cxx
b/forms/source/component/DatabaseForm.cxx
index 4bad0608b5bc..868b6bd19f11 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -338,7 +338,7 @@ ODatabaseForm::ODatabaseForm( const ODatabaseForm&
_cloneSource )
{
css::uno::Any a(cppu::getCaughtException());
throw WrappedTargetRuntimeException(
- "Could not clone the given database form.",
+ u"Could not clone the given database form."_ustr,
*const_cast< ODatabaseForm* >( &_cloneSource ),
a
);
@@ -935,7 +935,7 @@ void ODatabaseForm::InsertTextPart( INetMIMEMessage&
rParent, std::u16string_vie
OUString aBestMatchingEncoding =
OUString::createFromAscii(pBestMatchingEncoding);
pChild->SetContentType(
"text/plain; charset=\"" + aBestMatchingEncoding + "\"");
- pChild->SetContentTransferEncoding("8bit");
+ pChild->SetContentTransferEncoding(u"8bit"_ustr);
// Body
std::unique_ptr<SvMemoryStream> pStream(new SvMemoryStream);
@@ -997,7 +997,7 @@ void ODatabaseForm::InsertFilePart( INetMIMEMessage&
rParent, std::u16string_vie
"\"";
pChild->SetContentDisposition(aContentDisp);
pChild->SetContentType( aContentType );
- pChild->SetContentTransferEncoding("8bit");
+ pChild->SetContentTransferEncoding(u"8bit"_ustr);
// Body
@@ -2111,8 +2111,8 @@ static void lcl_dispatch(const Reference< XFrame >&
xFrame,const Reference<XURLT
Sequence<PropertyValue> aArgs
{
- comphelper::makePropertyValue("Referer", aReferer),
- comphelper::makePropertyValue("PostData", xPostData)
+ comphelper::makePropertyValue(u"Referer"_ustr, aReferer),
+ comphelper::makePropertyValue(u"PostData"_ustr, xPostData)
};
xDisp->dispatch(aURL, aArgs);
@@ -2192,7 +2192,7 @@ void ODatabaseForm::submit_impl(const
Reference<XControl>& Control, const css::a
if (xDisp.is())
{
- Sequence<PropertyValue> aArgs {
comphelper::makePropertyValue("Referer", aReferer) };
+ Sequence<PropertyValue> aArgs {
comphelper::makePropertyValue(u"Referer"_ustr, aReferer) };
xDisp->dispatch(aURL, aArgs);
}
}
@@ -2228,9 +2228,9 @@ void ODatabaseForm::submit_impl(const
Reference<XControl>& Control, const css::a
Sequence<PropertyValue> aArgs
{
- comphelper::makePropertyValue("Referer", aReferer),
- comphelper::makePropertyValue("ContentType", aContentType),
- comphelper::makePropertyValue("PostData", xPostData)
+ comphelper::makePropertyValue(u"Referer"_ustr, aReferer),
+ comphelper::makePropertyValue(u"ContentType"_ustr,
aContentType),
+ comphelper::makePropertyValue(u"PostData"_ustr, xPostData)
};
xDisp->dispatch(aURL, aArgs);
@@ -3708,7 +3708,7 @@ void SAL_CALL ODatabaseForm::propertyChange( const
PropertyChangeEvent& evt )
OUString SAL_CALL ODatabaseForm::getImplementationName()
{
- return "com.sun.star.comp.forms.ODatabaseForm";
+ return u"com.sun.star.comp.forms.ODatabaseForm"_ustr;
}
@@ -3723,7 +3723,7 @@ Sequence< OUString > SAL_CALL
ODatabaseForm::getSupportedServiceNames()
// concat without own services
return ::comphelper::concatSequences(
css::uno::Sequence<OUString> {
- FRM_SUN_FORMCOMPONENT, "com.sun.star.form.FormComponents",
+ FRM_SUN_FORMCOMPONENT, u"com.sun.star.form.FormComponents"_ustr,
FRM_SUN_COMPONENT_FORM, FRM_SUN_COMPONENT_HTMLFORM,
FRM_SUN_COMPONENT_DATAFORM, FRM_COMPONENT_FORM },
aServices
@@ -4017,7 +4017,7 @@ OUString SAL_CALL ODatabaseForm::getName()
catch (const css::beans::UnknownPropertyException&)
{
throw WrappedTargetRuntimeException(
- "ODatabaseForm::getName",
+ u"ODatabaseForm::getName"_ustr,
*this,
::cppu::getCaughtException()
);
diff --git a/forms/source/component/Date.hxx b/forms/source/component/Date.hxx
index 77d4d8a3e033..b1815cee168c 100644
--- a/forms/source/component/Date.hxx
+++ b/forms/source/component/Date.hxx
@@ -58,7 +58,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.ODateModel"; }
+ { return u"com.sun.star.form.ODateModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -105,7 +105,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.ODateControl"; }
+ { return u"com.sun.star.form.ODateControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
};
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index b1b81b0bbcfd..2812e7a2aa27 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -580,7 +580,7 @@ void OEditModel::onConnectedDbColumn( const Reference<
XInterface >& _rxForm )
if ( !m_bMaxTextLenModified )
{
sal_Int32 nFieldLen = 0;
- xField->getPropertyValue("Precision") >>= nFieldLen;
+ xField->getPropertyValue(u"Precision"_ustr) >>= nFieldLen;
if (nFieldLen > 0 && nFieldLen <= SAL_MAX_INT16)
{
diff --git a/forms/source/component/Edit.hxx b/forms/source/component/Edit.hxx
index 219b41d21d17..6f3c568bcbb6 100644
--- a/forms/source/component/Edit.hxx
+++ b/forms/source/component/Edit.hxx
@@ -79,7 +79,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OEditModel"; }
+ { return u"com.sun.star.form.OEditModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -150,7 +150,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OEditControl"; }
+ { return u"com.sun.star.form.OEditControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
diff --git a/forms/source/component/File.hxx b/forms/source/component/File.hxx
index 6ef7532aa842..69370e17d82a 100644
--- a/forms/source/component/File.hxx
+++ b/forms/source/component/File.hxx
@@ -51,7 +51,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OFileControlModel"; }
+ { return u"com.sun.star.form.OFileControlModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
diff --git a/forms/source/component/Filter.cxx
b/forms/source/component/Filter.cxx
index bf33ce4ae8b8..4e59d22c0ac6 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -282,7 +282,7 @@ namespace frm
bool bSelected = ( rEvent.Selected == TRISTATE_TRUE );
- OUString sExpressionMarker( "$expression$" );
+ OUString sExpressionMarker( u"$expression$"_ustr );
::dbtools::getBooleanComparisonPredicate(
sExpressionMarker,
bSelected,
@@ -387,7 +387,7 @@ namespace frm
// create a query composer
Reference< XColumnsSupplier > xSuppColumns;
- xFormProps->getPropertyValue("SingleSelectQueryComposer") >>=
xSuppColumns;
+ xFormProps->getPropertyValue(u"SingleSelectQueryComposer"_ustr)
>>= xSuppColumns;
const Reference< XConnection > xConnection(
::dbtools::getConnection( xForm ), UNO_SET_THROW );
const Reference< XNameAccess > xFieldNames(
xSuppColumns->getColumns(), UNO_SET_THROW );
@@ -720,7 +720,7 @@ namespace frm
{
try
{
- Reference< XExecutableDialog > xErrorDialog =
ErrorMessageDialog::create( m_xContext, "", m_xMessageParent, Any(_rExcept));
+ Reference< XExecutableDialog > xErrorDialog =
ErrorMessageDialog::create( m_xContext, u""_ustr, m_xMessageParent,
Any(_rExcept));
xErrorDialog->execute();
}
catch( const Exception& )
@@ -855,7 +855,7 @@ namespace frm
OUString SAL_CALL OFilterControl::getImplementationName( )
{
- return "com.sun.star.comp.forms.OFilterControl";
+ return u"com.sun.star.comp.forms.OFilterControl"_ustr;
}
sal_Bool SAL_CALL OFilterControl::supportsService( const OUString&
ServiceName )
@@ -865,8 +865,8 @@ namespace frm
Sequence< OUString > SAL_CALL OFilterControl::getSupportedServiceNames( )
{
- return { "com.sun.star.form.control.FilterControl",
- "com.sun.star.awt.UnoControl" };
+ return { u"com.sun.star.form.control.FilterControl"_ustr,
+ u"com.sun.star.awt.UnoControl"_ustr };
}
} // namespace frm
diff --git a/forms/source/component/FixedText.hxx
b/forms/source/component/FixedText.hxx
index a4bafab60d27..34fd77956a67 100644
--- a/forms/source/component/FixedText.hxx
+++ b/forms/source/component/FixedText.hxx
@@ -40,7 +40,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OFixedTextModel"; }
+ { return u"com.sun.star.form.OFixedTextModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
diff --git a/forms/source/component/FormComponent.cxx
b/forms/source/component/FormComponent.cxx
index 600d7c9a9c9e..d2ca58dd5c0c 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -635,7 +635,7 @@ OUString SAL_CALL OControlModel::getName()
{
css::uno::Any a(cppu::getCaughtException());
throw WrappedTargetRuntimeException(
- "OControlModel::getName",
+ u"OControlModel::getName"_ustr,
*this,
a
);
@@ -653,7 +653,7 @@ void SAL_CALL OControlModel::setName(const OUString& _rName)
{
css::uno::Any a(cppu::getCaughtException());
throw WrappedTargetRuntimeException(
- "OControlModel::setName",
+ u"OControlModel::setName"_ustr,
*this,
a
);
@@ -685,7 +685,7 @@ Sequence<OUString> SAL_CALL
OControlModel::getSupportedServiceNames()
Sequence< OUString > OControlModel::getSupportedServiceNames_Static()
{
- return { FRM_SUN_FORMCOMPONENT, "com.sun.star.form.FormControlModel" };
+ return { FRM_SUN_FORMCOMPONENT, u"com.sun.star.form.FormControlModel"_ustr
};
}
// XEventListener
@@ -1522,7 +1522,7 @@ css::uno::Sequence<OUString> SAL_CALL
OBoundControlModel::getSupportedServiceNam
Sequence< OUString > OBoundControlModel::getSupportedServiceNames_Static()
{
- Sequence<OUString> aOwnServiceNames {
"com.sun.star.form.DataAwareControlModel" };
+ Sequence<OUString> aOwnServiceNames {
u"com.sun.star.form.DataAwareControlModel"_ustr };
return ::comphelper::concatSequences(
OControlModel::getSupportedServiceNames_Static(),
aOwnServiceNames
@@ -1994,7 +1994,7 @@ void OBoundControlModel::initFromField( const Reference<
XRowSet >& _rxRowSet )
if (xPS.is())
{
assert(!shouldTransfer);
- xPS->getPropertyValue("IsNew") >>= shouldTransfer;
+ xPS->getPropertyValue(u"IsNew"_ustr) >>= shouldTransfer;
}
}
if ( shouldTransfer )
diff --git a/forms/source/component/FormattedField.cxx
b/forms/source/component/FormattedField.cxx
index fa1fdb216b2b..67485c654f87 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -462,7 +462,7 @@ void OFormattedModel::updateFormatterNullDate()
// calc the current NULL date
Reference< XNumberFormatsSupplier > xSupplier( calcFormatsSupplier() );
if ( xSupplier.is() )
- xSupplier->getNumberFormatSettings()->getPropertyValue("NullDate") >>=
m_aNullDate;
+
xSupplier->getNumberFormatSettings()->getPropertyValue(u"NullDate"_ustr) >>=
m_aNullDate;
}
Reference< XNumberFormatsSupplier > OFormattedModel::calcFormatsSupplier()
const
@@ -605,7 +605,7 @@ void OFormattedModel::onConnectedDbColumn( const Reference<
XInterface >& _rxFor
Reference<XNumberFormatsSupplier> xSupplier = calcFormatsSupplier();
m_bNumeric = getBOOL( getPropertyValue( PROPERTY_TREATASNUMERIC ) );
m_nKeyType = getNumberFormatType( xSupplier->getNumberFormats(),
nFormatKey );
- xSupplier->getNumberFormatSettings()->getPropertyValue("NullDate") >>=
m_aNullDate;
+ xSupplier->getNumberFormatSettings()->getPropertyValue(u"NullDate"_ustr)
>>= m_aNullDate;
OEditBaseModel::onConnectedDbColumn( _rxForm );
}
diff --git a/forms/source/component/FormattedField.hxx
b/forms/source/component/FormattedField.hxx
index c9d0f1c1705e..b7dc20d0be87 100644
--- a/forms/source/component/FormattedField.hxx
+++ b/forms/source/component/FormattedField.hxx
@@ -76,7 +76,7 @@ class OFormattedModel final
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OFormattedModel"; }
+ { return u"com.sun.star.form.OFormattedModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() override;
@@ -157,7 +157,7 @@ class OFormattedModel final
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OFormattedControl"; }
+ { return u"com.sun.star.form.OFormattedControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL
getSupportedServiceNames() override;
diff --git a/forms/source/component/FormattedFieldWrapper.cxx
b/forms/source/component/FormattedFieldWrapper.cxx
index d97387e4b6e1..8b7f9a17c204 100644
--- a/forms/source/component/FormattedFieldWrapper.cxx
+++ b/forms/source/component/FormattedFieldWrapper.cxx
@@ -343,7 +343,7 @@
com_sun_star_form_OFormattedFieldWrapper_get_implementation(css::uno::XComponent
{
css::uno::Reference<css::uno::XInterface> inst(
OFormattedFieldWrapper::createFormattedFieldWrapper(
- component, false, "com.sun.star.form.OFormattedFieldWrapper"));
+ component, false,
u"com.sun.star.form.OFormattedFieldWrapper"_ustr));
inst->acquire();
return inst.get();
}
@@ -354,7 +354,7 @@
com_sun_star_comp_forms_OFormattedFieldWrapper_ForcedFormatted_get_implementatio
{
css::uno::Reference<css::uno::XInterface> inst(
OFormattedFieldWrapper::createFormattedFieldWrapper(
- component, true,
"com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"));
+ component, true,
u"com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"_ustr));
inst->acquire();
return inst.get();
}
diff --git a/forms/source/component/FormsCollection.cxx
b/forms/source/component/FormsCollection.cxx
index 2d426c7a34ab..0b5b2f0e1eb6 100644
--- a/forms/source/component/FormsCollection.cxx
+++ b/forms/source/component/FormsCollection.cxx
@@ -31,7 +31,7 @@ using namespace ::com::sun::star::util;
OUString SAL_CALL OFormsCollection::getServiceName()
{
- return "com.sun.star.form.Forms";
+ return u"com.sun.star.form.Forms"_ustr;
}
Sequence< sal_Int8 > SAL_CALL OFormsCollection::getImplementationId( )
@@ -83,7 +83,7 @@ Any SAL_CALL OFormsCollection::queryAggregation(const Type&
_rType)
OUString SAL_CALL OFormsCollection::getImplementationName()
{
- return "com.sun.star.form.OFormsCollection";
+ return u"com.sun.star.form.OFormsCollection"_ustr;
}
sal_Bool SAL_CALL OFormsCollection::supportsService( const OUString&
_rServiceName )
@@ -93,7 +93,7 @@ sal_Bool SAL_CALL OFormsCollection::supportsService( const
OUString& _rServiceNa
css::uno::Sequence<OUString> SAL_CALL
OFormsCollection::getSupportedServiceNames()
{
- return { "com.sun.star.form.Forms", "com.sun.star.form.FormComponents" };
+ return { u"com.sun.star.form.Forms"_ustr,
u"com.sun.star.form.FormComponents"_ustr };
}
// XCloneable
diff --git a/forms/source/component/Grid.hxx b/forms/source/component/Grid.hxx
index 8339bb49a539..6ee7174da3a4 100644
--- a/forms/source/component/Grid.hxx
+++ b/forms/source/component/Grid.hxx
@@ -106,7 +106,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OGridControlModel"; }
+ { return u"com.sun.star.form.OGridControlModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
diff --git a/forms/source/component/GroupBox.hxx
b/forms/source/component/GroupBox.hxx
index c1c53df0b613..578b25b7fbaa 100644
--- a/forms/source/component/GroupBox.hxx
+++ b/forms/source/component/GroupBox.hxx
@@ -40,7 +40,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OGroupBoxModel"; }
+ { return u"com.sun.star.form.OGroupBoxModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -70,7 +70,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OGroupBoxControl"; }
+ { return u"com.sun.star.form.OGroupBoxControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
};
diff --git a/forms/source/component/GroupManager.cxx
b/forms/source/component/GroupManager.cxx
index edd296d6c77a..895dde067d54 100644
--- a/forms/source/component/GroupManager.cxx
+++ b/forms/source/component/GroupManager.cxx
@@ -180,7 +180,7 @@ Sequence< Reference<XControlModel> >
OGroup::GetControlModels() const
}
OGroupManager::OGroupManager(const Reference< XContainer >& _rxContainer)
- :m_pCompGroup( new OGroup( "AllComponentGroup" ) )
+ :m_pCompGroup( new OGroup( u"AllComponentGroup"_ustr ) )
,m_xContainer(_rxContainer)
{
osl_atomic_increment(&m_refCount);
diff --git a/forms/source/component/Hidden.hxx
b/forms/source/component/Hidden.hxx
index 7bd01ccf939a..9137ba75c0c0 100644
--- a/forms/source/component/Hidden.hxx
+++ b/forms/source/component/Hidden.hxx
@@ -48,7 +48,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OHiddenModel"; }
+ { return u"com.sun.star.form.OHiddenModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
diff --git a/forms/source/component/ImageButton.hxx
b/forms/source/component/ImageButton.hxx
index 0e5c402abbc3..81b96470bd4b 100644
--- a/forms/source/component/ImageButton.hxx
+++ b/forms/source/component/ImageButton.hxx
@@ -41,7 +41,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OImageButtonModel"; }
+ { return u"com.sun.star.form.OImageButtonModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -72,7 +72,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OImageButtonControl"; }
+ { return u"com.sun.star.form.OImageButtonControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
diff --git a/forms/source/component/ImageControl.cxx
b/forms/source/component/ImageControl.cxx
index 0f48eecf5496..7064f3ad5f45 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -752,7 +752,7 @@ void OImageControlControl::implClearGraphics( bool _bForce )
if ( sOldImageURL.isEmpty() )
// the ImageURL is already empty, so simply setting a new empty
one would not suffice
// (since it would be ignored)
- xSet->setPropertyValue( PROPERTY_IMAGE_URL, Any( OUString(
"private:emptyImage" ) ) );
+ xSet->setPropertyValue( PROPERTY_IMAGE_URL, Any(
u"private:emptyImage"_ustr ) );
// (the concrete URL we're passing here doesn't matter. It's
important that
// the model cannot resolve it to a valid resource describing
an image stream
}
@@ -838,7 +838,7 @@ bool OImageControlControl::impl_isEmptyGraphics_nothrow()
const
{
Reference< XPropertySet > xModelProps( const_cast<
OImageControlControl* >( this )->getModel(), UNO_QUERY_THROW );
Reference< XGraphic > xGraphic;
- OSL_VERIFY( xModelProps->getPropertyValue("Graphic") >>= xGraphic );
+ OSL_VERIFY( xModelProps->getPropertyValue(u"Graphic"_ustr) >>=
xGraphic );
bIsEmpty = !xGraphic.is();
}
catch( const Exception& )
diff --git a/forms/source/component/ImageControl.hxx
b/forms/source/component/ImageControl.hxx
index 245d13163e4f..100908085d2b 100644
--- a/forms/source/component/ImageControl.hxx
+++ b/forms/source/component/ImageControl.hxx
@@ -78,7 +78,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OImageControlModel"; }
+ { return u"com.sun.star.form.OImageControlModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -163,7 +163,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OImageControlControl"; }
+ { return u"com.sun.star.form.OImageControlControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
diff --git a/forms/source/component/ListBox.cxx
b/forms/source/component/ListBox.cxx
index 33d31180315c..33647f0ceb96 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -474,7 +474,7 @@ namespace frm
if ( ( pSelectedItemsPos != _rPropertyNames.end() ) &&
aStringItemListExists )
{
if (_rPropertyNames.getLength() != _rValues.getLength())
- throw css::lang::IllegalArgumentException("lengths do not
match",
+ throw css::lang::IllegalArgumentException(u"lengths do not
match"_ustr,
static_cast<cppu::OWeakObject*>(this), -1);
// both properties are present
@@ -795,7 +795,7 @@ namespace frm
{
// otherwise look for the alias
Reference< XColumnsSupplier > xSupplyFields;
-
xFormProps->getPropertyValue("SingleSelectQueryComposer") >>= xSupplyFields;
+
xFormProps->getPropertyValue(u"SingleSelectQueryComposer"_ustr) >>=
xSupplyFields;
// search the field
DBG_ASSERT(xSupplyFields.is(),
"OListBoxModel::loadData : invalid query composer !");
@@ -815,7 +815,7 @@ namespace frm
Reference<XDatabaseMetaData> xMeta =
xConnection->getMetaData();
OUString aQuote = xMeta->getIdentifierQuoteString();
- OUString aStatement("SELECT ");
+ OUString aStatement(u"SELECT "_ustr);
if (aBoundFieldName.isEmpty()) // act like a combobox
aStatement += "DISTINCT ";
@@ -920,7 +920,7 @@ namespace frm
try
{
Reference< XPropertySet > xBoundField(
xColumns->getByIndex( *aBoundColumn ), UNO_QUERY_THROW );
- OSL_VERIFY( xBoundField->getPropertyValue("Type")
>>= m_nBoundColumnType );
+ OSL_VERIFY(
xBoundField->getPropertyValue(u"Type"_ustr) >>= m_nBoundColumnType );
}
catch( const Exception& )
{
diff --git a/forms/source/component/ListBox.hxx
b/forms/source/component/ListBox.hxx
index cad8cc708b4b..af6da2f29a68 100644
--- a/forms/source/component/ListBox.hxx
+++ b/forms/source/component/ListBox.hxx
@@ -133,7 +133,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OListBoxModel"; }
+ { return u"com.sun.star.form.OListBoxModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -272,7 +272,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OListBoxControl"; }
+ { return u"com.sun.star.form.OListBoxControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
diff --git a/forms/source/component/Numeric.hxx
b/forms/source/component/Numeric.hxx
index 0b5cb703eca2..2d471a5d38d0 100644
--- a/forms/source/component/Numeric.hxx
+++ b/forms/source/component/Numeric.hxx
@@ -43,7 +43,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.ONumericModel"; }
+ { return u"com.sun.star.form.ONumericModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -76,7 +76,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.ONumericControl"; }
+ { return u"com.sun.star.form.ONumericControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
};
diff --git a/forms/source/component/Pattern.hxx
b/forms/source/component/Pattern.hxx
index d0923c13cf58..95eb618c14f9 100644
--- a/forms/source/component/Pattern.hxx
+++ b/forms/source/component/Pattern.hxx
@@ -49,7 +49,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OPatternModel"; }
+ { return u"com.sun.star.form.OPatternModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -82,7 +82,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OPatternControl"; }
+ { return u"com.sun.star.form.OPatternControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
};
diff --git a/forms/source/component/RadioButton.hxx
b/forms/source/component/RadioButton.hxx
index 0e50acfc4245..1128bb4e1e34 100644
--- a/forms/source/component/RadioButton.hxx
+++ b/forms/source/component/RadioButton.hxx
@@ -39,7 +39,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.ORadioButtonModel"; }
+ { return u"com.sun.star.form.ORadioButtonModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -81,7 +81,7 @@ public:
// XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.ORadioButtonControl"; }
+ { return u"com.sun.star.form.ORadioButtonControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
};
diff --git a/forms/source/component/Time.hxx b/forms/source/component/Time.hxx
index 3a6793fa5c81..1568dec57a39 100644
--- a/forms/source/component/Time.hxx
+++ b/forms/source/component/Time.hxx
@@ -58,7 +58,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OTimeModel"; }
+ { return u"com.sun.star.form.OTimeModel"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
@@ -103,7 +103,7 @@ public:
// css::lang::XServiceInfo
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.OTimeControl"; }
+ { return u"com.sun.star.form.OTimeControl"_ustr; }
virtual css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames()
override;
};
diff --git a/forms/source/component/clickableimage.cxx
b/forms/source/component/clickableimage.cxx
index 02187ee2aabd..6ab579072e1b 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -300,24 +300,24 @@ namespace frm
FrameSearchFlag::SELF | FrameSearchFlag::PARENT |
FrameSearchFlag::SIBLINGS |
FrameSearchFlag::CREATE );
- Sequence<PropertyValue> aArgs {
comphelper::makePropertyValue("Referer", xModel->getURL()) };
+ Sequence<PropertyValue> aArgs {
comphelper::makePropertyValue(u"Referer"_ustr, xModel->getURL()) };
if (xDisp.is())
xDisp->dispatch( aURL, aArgs );
}
else
{
- URL aHyperLink =
m_aFeatureInterception.getTransformer().getStrictURL( ".uno:OpenHyperlink" );
+ URL aHyperLink =
m_aFeatureInterception.getTransformer().getStrictURL(
u".uno:OpenHyperlink"_ustr );
Reference< XDispatch > xDisp = Reference<
XDispatchProvider > (xFrame,UNO_QUERY_THROW)->queryDispatch(aHyperLink,
OUString() , 0);
if ( xDisp.is() )
{
Sequence<PropertyValue> aProps{
- comphelper::makePropertyValue("URL",
aURL.Complete),
+ comphelper::makePropertyValue(u"URL"_ustr,
aURL.Complete),
comphelper::makePropertyValue(
- "FrameName",
xSet->getPropertyValue(PROPERTY_TARGET_FRAME)),
- comphelper::makePropertyValue("Referer",
xModel->getURL())
+ u"FrameName"_ustr,
xSet->getPropertyValue(PROPERTY_TARGET_FRAME)),
+ comphelper::makePropertyValue(u"Referer"_ustr,
xModel->getURL())
};
xDisp->dispatch( aHyperLink, aProps );
@@ -652,7 +652,7 @@ namespace frm
ImageProducer *pImgProd = GetImageProducer();
// grab the ImageURL
OUString sURL;
- getPropertyValue("ImageURL") >>= sURL;
+ getPropertyValue(u"ImageURL"_ustr) >>= sURL;
if (!m_pMedium)
{
if ( ::svt::GraphicAccess::isSupportedURL( sURL ) )
diff --git a/forms/source/component/imgprod.cxx
b/forms/source/component/imgprod.cxx
index d281367eb23a..bec815b91343 100644
--- a/forms/source/component/imgprod.cxx
+++ b/forms/source/component/imgprod.cxx
@@ -364,7 +364,7 @@ void ImageProducer::initialize( const css::uno::Sequence<
css::uno::Any >& aArgu
}
OUString ImageProducer::getImplementationName() {
- return "com.sun.star.form.ImageProducer";
+ return u"com.sun.star.form.ImageProducer"_ustr;
}
sal_Bool ImageProducer::supportsService(OUString const & ServiceName) {
@@ -372,7 +372,7 @@ sal_Bool ImageProducer::supportsService(OUString const &
ServiceName) {
}
css::uno::Sequence<OUString> ImageProducer::getSupportedServiceNames() {
- return {"com.sun.star.awt.ImageProducer"};
+ return {u"com.sun.star.awt.ImageProducer"_ustr};
}
diff --git a/forms/source/component/navigationbar.cxx
b/forms/source/component/navigationbar.cxx
index 429a9ceb9f62..f210ecd0d175 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -168,7 +168,7 @@ namespace frm
OUString SAL_CALL ONavigationBarModel::getImplementationName()
{
- return "com.sun.star.comp.form.ONavigationBarModel";
+ return u"com.sun.star.comp.form.ONavigationBarModel"_ustr;
}
@@ -423,7 +423,7 @@ namespace frm
break;
case PROPERTY_ID_DEFAULTCONTROL:
- aDefault <<= OUString(
"com.sun.star.form.control.NavigationToolBar" );
+ aDefault <<= u"com.sun.star.form.control.NavigationToolBar"_ustr;
break;
case PROPERTY_ID_HELPTEXT:
diff --git a/forms/source/component/propertybaghelper.cxx
b/forms/source/component/propertybaghelper.cxx
index e2c92e24c008..8a18a094d415 100644
--- a/forms/source/component/propertybaghelper.cxx
+++ b/forms/source/component/propertybaghelper.cxx
@@ -267,7 +267,7 @@ namespace frm
aValues = xMe->getPropertyValues( aPropertyNames );
if ( aValues.getLength() != aPropertyNames.getLength() )
- throw RuntimeException("property name and value counts out of
sync");
+ throw RuntimeException(u"property name and value counts out of
sync"_ustr);
}
catch( const RuntimeException& ) { throw; }
catch( const Exception& )
diff --git a/forms/source/component/refvaluecomponent.cxx
b/forms/source/component/refvaluecomponent.cxx
index 09765259f18e..8450b2f7f18c 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -108,8 +108,8 @@ namespace frm
|| nDefaultChecked > 2)
{
throw css::lang::IllegalArgumentException(
- ("DefaultState property value must be a SHORT in the range"
- " 0--2"),
+ (u"DefaultState property value must be a SHORT in the
range"
+ " 0--2"_ustr),
css::uno::Reference<css::uno::XInterface>(), -1);
}
m_eDefaultChecked = static_cast<ToggleState>(nDefaultChecked);
diff --git a/forms/source/component/scrollbar.cxx
b/forms/source/component/scrollbar.cxx
index 36f4d2ce6ced..edf44e1a56d9 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -111,7 +111,7 @@ namespace frm
OUString SAL_CALL OScrollBarModel::getImplementationName()
{
- return "com.sun.star.comp.forms.OScrollBarModel";
+ return u"com.sun.star.comp.forms.OScrollBarModel"_ustr;
}
// note that we're passing OControlModel as "base class". This is
because
@@ -285,8 +285,8 @@ namespace frm
Any OScrollBarModel::translateExternalValueToControlValue( const Any&
_rExternalValue ) const
{
return translateExternalDoubleToControlIntValue( _rExternalValue,
m_xAggregateSet,
- "ScrollValueMin",
- "ScrollValueMax" );
+ u"ScrollValueMin"_ustr,
+ u"ScrollValueMax"_ustr );
}
diff --git a/forms/source/component/spinbutton.cxx
b/forms/source/component/spinbutton.cxx
index eec9522639ba..5d12db677be9 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -64,7 +64,7 @@ namespace frm
OUString SAL_CALL OSpinButtonModel::getImplementationName()
{
- return "com.sun.star.comp.forms.OSpinButtonModel";
+ return u"com.sun.star.comp.forms.OSpinButtonModel"_ustr;
}
// note that we're passing OControlModel as "base class". This is
because
@@ -239,8 +239,8 @@ namespace frm
Any OSpinButtonModel::translateExternalValueToControlValue( const Any&
_rExternalValue ) const
{
return translateExternalDoubleToControlIntValue( _rExternalValue,
m_xAggregateSet,
- "SpinValueMin",
- "SpinValueMax" );
+ u"SpinValueMin"_ustr,
+ u"SpinValueMax"_ustr );
}
diff --git a/forms/source/helper/windowstateguard.cxx
b/forms/source/helper/windowstateguard.cxx
index dd47dd2989b9..162040ab8bc5 100644
--- a/forms/source/helper/windowstateguard.cxx
+++ b/forms/source/helper/windowstateguard.cxx
@@ -91,9 +91,9 @@ namespace frm
,m_xModelProps( _rxMdelProps )
{
if ( !m_xWindow.is() )
- throw IllegalArgumentException("no window supplied", *this, 0);
+ throw IllegalArgumentException(u"no window supplied"_ustr, *this,
0);
if ( !m_xModelProps.is() )
- throw IllegalArgumentException("no property set supplied", *this,
1);
+ throw IllegalArgumentException(u"no property set supplied"_ustr,
*this, 1);
osl_atomic_increment( &m_refCount );
{
diff --git a/forms/source/misc/InterfaceContainer.cxx
b/forms/source/misc/InterfaceContainer.cxx
index dba3d96ee405..c8653b153b3c 100644
--- a/forms/source/misc/InterfaceContainer.cxx
+++ b/forms/source/misc/InterfaceContainer.cxx
@@ -112,7 +112,7 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow(
const sal_Int32 i_nIn
break;
Reference< XMultiServiceFactory > xDocFac( xDoc, UNO_QUERY_THROW );
- Reference< XCodeNameQuery > xNameQuery(
xDocFac->createInstance("ooo.vba.VBACodeNameProvider"), UNO_QUERY );
+ Reference< XCodeNameQuery > xNameQuery(
xDocFac->createInstance(u"ooo.vba.VBACodeNameProvider"_ustr), UNO_QUERY );
if ( !xNameQuery.is() )
break;
@@ -135,9 +135,9 @@ void OInterfaceContainer::impl_addVbEvents_nolck_nothrow(
const sal_Int32 i_nIn
Reference< XPropertySet > xProps( xElement, UNO_QUERY_THROW );
OUString sServiceName;
- xProps->getPropertyValue("DefaultControl") >>= sServiceName;
+ xProps->getPropertyValue(u"DefaultControl"_ustr) >>= sServiceName;
- Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier(
m_xContext->getServiceManager()->createInstanceWithContext("ooo.vba.VBAToOOEventDesc",
m_xContext), UNO_QUERY_THROW );
+ Reference< ooo::vba::XVBAToOOEventDescGen > xDescSupplier(
m_xContext->getServiceManager()->createInstanceWithContext(u"ooo.vba.VBAToOOEventDesc"_ustr,
m_xContext), UNO_QUERY_THROW );
Sequence< ScriptEventDescriptor > vbaEvents =
xDescSupplier->getEventDescriptions( sServiceName , sCodeName );
// register the vba script events
@@ -205,7 +205,7 @@ void OInterfaceContainer::clonedFrom(const
OInterfaceContainer& _cloneSource)
catch (const Exception&)
{
throw WrappedTargetRuntimeException(
- "Could not clone the given interface hierarchy.",
+ u"Could not clone the given interface hierarchy."_ustr,
static_cast< XIndexContainer* >( const_cast< OInterfaceContainer*
>( &_cloneSource ) ),
::cppu::getCaughtException()
);
@@ -817,7 +817,7 @@ void OInterfaceContainer::implInsert(sal_Int32 _nIndex,
const Reference< XProper
bool bHandleVbaEvents = false;
try
{
- _rxElement->getPropertyValue("GenerateVbaEvents") >>= bHandleVbaEvents;
+ _rxElement->getPropertyValue(u"GenerateVbaEvents"_ustr) >>=
bHandleVbaEvents;
}
catch( const Exception& )
{
diff --git a/forms/source/misc/limitedformats.cxx
b/forms/source/misc/limitedformats.cxx
index b7a0d5abcbd6..1296b976e9f7 100644
--- a/forms/source/misc/limitedformats.cxx
+++ b/forms/source/misc/limitedformats.cxx
@@ -55,9 +55,9 @@ namespace frm
static const Locale& getLocale(LocaleType _eType)
{
- static const Locale s_aEnglishUS( "en", "us", OUString() );
- static const Locale s_aGerman( "de", "DE", OUString() );
- static const Locale s_aSystem( "", "", "" );
+ static const Locale s_aEnglishUS( u"en"_ustr, u"us"_ustr, OUString() );
+ static const Locale s_aGerman( u"de"_ustr, u"DE"_ustr, OUString() );
+ static const Locale s_aSystem( u""_ustr, u""_ustr, u""_ustr );
switch (_eType)
{
@@ -329,7 +329,7 @@ namespace frm
if (!bFoundIt)
{ // somebody gave us a format which we can't translate
- throw IllegalArgumentException("This control supports only a very
limited number of formats.", nullptr, 2);
+ throw IllegalArgumentException(u"This control supports only a very
limited number of formats."_ustr, nullptr, 2);
}
return bModified;
diff --git a/forms/source/richtext/richtextcontrol.cxx
b/forms/source/richtext/richtextcontrol.cxx
index b2ff9f310ad0..1dfc5315fee2 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -215,13 +215,13 @@ namespace frm
OUString SAL_CALL ORichTextControl::getImplementationName()
{
- return "com.sun.star.comp.form.ORichTextControl";
+ return u"com.sun.star.comp.form.ORichTextControl"_ustr;
}
Sequence< OUString > SAL_CALL ORichTextControl::getSupportedServiceNames()
{
- return { "com.sun.star.awt.UnoControl",
- "com.sun.star.awt.UnoControlEdit",
+ return { u"com.sun.star.awt.UnoControl"_ustr,
+ u"com.sun.star.awt.UnoControlEdit"_ustr,
FRM_SUN_CONTROL_RICHTEXTCONTROL };
}
diff --git a/forms/source/richtext/richtextengine.cxx
b/forms/source/richtext/richtextengine.cxx
index 37570639e808..6be1d246e190 100644
--- a/forms/source/richtext/richtextengine.cxx
+++ b/forms/source/richtext/richtextengine.cxx
@@ -55,7 +55,7 @@ namespace frm
// defaults
vcl::Font aFont =
Application::GetSettings().GetStyleSettings().GetAppFont();
- aFont.SetFamilyName( "Times New Roman" );
+ aFont.SetFamilyName( u"Times New Roman"_ustr );
pPool->SetUserDefaultItem( SvxFontItem( aFont.GetFamilyType(),
aFont.GetFamilyName(), OUString(), aFont.GetPitch(), aFont.GetCharSet(),
EE_CHAR_FONTINFO ) );
// 12 pt font size
diff --git a/forms/source/richtext/richtextimplcontrol.cxx
b/forms/source/richtext/richtextimplcontrol.cxx
index ba99314fd6ba..6c2845369e2b 100644
--- a/forms/source/richtext/richtextimplcontrol.cxx
+++ b/forms/source/richtext/richtextimplcontrol.cxx
@@ -438,7 +438,7 @@ namespace frm
{
m_pViewport->GetOutDev()->Push( vcl::PushFlags::FONT );
m_pViewport->SetFont( m_pEngine->GetStandardFont(0) );
- nFontWidth = m_pViewport->GetTextWidth( "x" );
+ nFontWidth = m_pViewport->GetTextWidth( u"x"_ustr );
m_pViewport->GetOutDev()->Pop();
}
// ... is the scroll size for the horizontal scrollbar
diff --git a/forms/source/richtext/richtextmodel.cxx
b/forms/source/richtext/richtextmodel.cxx
index 02e1585a1852..bc2e920b1932 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -258,20 +258,20 @@ namespace frm
OUString SAL_CALL ORichTextModel::getImplementationName()
{
- return "com.sun.star.comp.forms.ORichTextModel";
+ return u"com.sun.star.comp.forms.ORichTextModel"_ustr;
}
Sequence< OUString > SAL_CALL ORichTextModel::getSupportedServiceNames()
{
Sequence< OUString > aOwnNames {
FRM_SUN_COMPONENT_RICHTEXTCONTROL,
- "com.sun.star.text.TextRange",
- "com.sun.star.style.CharacterProperties",
- "com.sun.star.style.ParagraphProperties",
- "com.sun.star.style.CharacterPropertiesAsian",
- "com.sun.star.style.CharacterPropertiesComplex",
- "com.sun.star.style.ParagraphPropertiesAsian",
- "com.sun.star.style.ParagraphPropertiesComplex" };
+ u"com.sun.star.text.TextRange"_ustr,
+ u"com.sun.star.style.CharacterProperties"_ustr,
+ u"com.sun.star.style.ParagraphProperties"_ustr,
+ u"com.sun.star.style.CharacterPropertiesAsian"_ustr,
+ u"com.sun.star.style.CharacterPropertiesComplex"_ustr,
+ u"com.sun.star.style.ParagraphPropertiesAsian"_ustr,
+ u"com.sun.star.style.ParagraphPropertiesComplex"_ustr };
return ::comphelper::combineSequences(
getAggregateServiceNames(),
@@ -440,7 +440,7 @@ namespace frm
{
// forward to our aggregate, so the EditEngine knows about it
if ( m_xAggregateSet.is() )
- m_xAggregateSet->setPropertyValue( "WritingMode", _rValue
);
+ m_xAggregateSet->setPropertyValue( u"WritingMode"_ustr,
_rValue );
}
break;
diff --git a/forms/source/runtime/formoperations.cxx
b/forms/source/runtime/formoperations.cxx
index 1e3df2857e74..41a7c5f5ebd2 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -152,7 +152,7 @@ namespace frm
OUString SAL_CALL FormOperations::getImplementationName( )
{
- return "com.sun.star.comp.forms.FormOperations";
+ return u"com.sun.star.comp.forms.FormOperations"_ustr;
}
sal_Bool SAL_CALL FormOperations::supportsService( const OUString&
ServiceName )
@@ -162,7 +162,7 @@ namespace frm
Sequence< OUString > SAL_CALL FormOperations::getSupportedServiceNames( )
{
- return { "com.sun.star.form.runtime.FormOperations" };
+ return { u"com.sun.star.form.runtime.FormOperations"_ustr };
}
Reference< XRowSet > SAL_CALL FormOperations::getCursor()
@@ -810,7 +810,7 @@ namespace frm
sal_Int32 nPosition = -1;
::comphelper::NamedValueCollection aArguments( _rArguments );
- aArguments.get_ensureType( "Position", nPosition );
+ aArguments.get_ensureType( u"Position"_ustr, nPosition );
if ( nPosition < 1 )
nPosition = 1;
@@ -1204,7 +1204,7 @@ namespace frm
Reference< XMultiServiceFactory > xFactory(
::dbtools::getConnection( m_xCursor ), UNO_QUERY );
if ( xFactory.is() )
{
- m_xParser.set(
xFactory->createInstance("com.sun.star.sdb.SingleSelectQueryComposer"),
UNO_QUERY );
+ m_xParser.set(
xFactory->createInstance(u"com.sun.star.sdb.SingleSelectQueryComposer"_ustr),
UNO_QUERY );
OSL_ENSURE( m_xParser.is(),
"FormOperations::impl_ensureInitializedParser_nothrow: factory did not create a
parser for us!" );
}
}
diff --git a/forms/source/solar/component/navbarcontrol.cxx
b/forms/source/solar/component/navbarcontrol.cxx
index 61671c0f363a..266e3c1a5a90 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -153,14 +153,14 @@ namespace frm
OUString SAL_CALL ONavigationBarControl::getImplementationName()
{
- return "com.sun.star.comp.form.ONavigationBarControl";
+ return u"com.sun.star.comp.form.ONavigationBarControl"_ustr;
}
Sequence< OUString > SAL_CALL
ONavigationBarControl::getSupportedServiceNames()
{
- return { "com.sun.star.awt.UnoControl",
- "com.sun.star.form.control.NavigationToolBar" };
+ return { u"com.sun.star.awt.UnoControl"_ustr,
+ u"com.sun.star.form.control.NavigationToolBar"_ustr };
}
diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx
index c739126642c4..40dd16586227 100644
--- a/forms/source/xforms/binding.cxx
+++ b/forms/source/xforms/binding.cxx
@@ -425,7 +425,7 @@ bool Binding::getExternalData() const
try
{
OSL_VERIFY(
- mxModel->getPropertyValue( "ExternalData" ) >>= bExternalData );
+ mxModel->getPropertyValue( u"ExternalData"_ustr ) >>=
bExternalData );
}
catch( const Exception& )
{
@@ -438,7 +438,7 @@ bool Binding::getExternalData() const
void Binding::checkLive()
{
if( ! isLive() )
- throw RuntimeException("Binding not initialized",
static_cast<XValueBinding*>(this));
+ throw RuntimeException(u"Binding not initialized"_ustr,
static_cast<XValueBinding*>(this));
}
bool Binding::isLive() const
@@ -454,15 +454,15 @@ static void lcl_addListenerToNode( const
Reference<XNode>& xNode,
if( !xTarget.is() )
return;
- xTarget->addEventListener( "DOMCharacterDataModified",
+ xTarget->addEventListener( u"DOMCharacterDataModified"_ustr,
xListener, false );
- xTarget->addEventListener( "DOMCharacterDataModified",
+ xTarget->addEventListener( u"DOMCharacterDataModified"_ustr,
xListener, true );
- xTarget->addEventListener( "DOMAttrModified",
+ xTarget->addEventListener( u"DOMAttrModified"_ustr,
xListener, false );
- xTarget->addEventListener( "DOMAttrModified",
+ xTarget->addEventListener( u"DOMAttrModified"_ustr,
xListener, true );
- xTarget->addEventListener( "xforms-generic",
+ xTarget->addEventListener( u"xforms-generic"_ustr,
xListener, true );
}
@@ -473,15 +473,15 @@ static void lcl_removeListenerFromNode( const
Reference<XNode>& xNode,
if( !xTarget.is() )
return;
- xTarget->removeEventListener( "DOMCharacterDataModified",
+ xTarget->removeEventListener( u"DOMCharacterDataModified"_ustr,
xListener, false );
- xTarget->removeEventListener( "DOMCharacterDataModified",
+ xTarget->removeEventListener( u"DOMCharacterDataModified"_ustr,
xListener, true );
- xTarget->removeEventListener( "DOMAttrModified",
+ xTarget->removeEventListener( u"DOMAttrModified"_ustr,
xListener, false );
- xTarget->removeEventListener( "DOMAttrModified",
+ xTarget->removeEventListener( u"DOMAttrModified"_ustr,
xListener, true );
- xTarget->removeEventListener( "xforms-generic",
+ xTarget->removeEventListener( u"xforms-generic"_ustr,
xListener, true );
}
@@ -506,7 +506,7 @@ static void lcl_removeListenerFromNode( const
Reference<XNode>& xNode,
void Binding::bind( bool bForceRebind )
{
if( ! mxModel.is() )
- throw RuntimeException("Binding has no Model",
static_cast<XValueBinding*>(this));
+ throw RuntimeException(u"Binding has no Model"_ustr,
static_cast<XValueBinding*>(this));
// bind() will evaluate this binding as follows:
// 1) evaluate the binding expression
@@ -660,7 +660,7 @@ void Binding::valueModified()
void Binding::distributeMIP( const css::uno::Reference<css::xml::dom::XNode> &
rxNode ) {
rtl::Reference<css::xforms::XFormsEventConcrete> pEvent = new
css::xforms::XFormsEventConcrete;
- pEvent->initXFormsEvent("xforms-generic", true, false);
+ pEvent->initXFormsEvent(u"xforms-generic"_ustr, true, false);
// naive depth-first traversal
css::uno::Reference<css::xml::dom::XNode> xNode( rxNode );
@@ -954,7 +954,7 @@ css::uno::Any Binding::getValue( const css::uno::Type&
rType )
// second, check for type
if( ! supportsType( rType ) )
- throw IncompatibleTypesException("type unsupported",
static_cast<XValueBinding*>(this));
+ throw IncompatibleTypesException(u"type unsupported"_ustr,
static_cast<XValueBinding*>(this));
// return string value (if present; else return empty Any)
css::uno::Any result;
@@ -974,19 +974,19 @@ void Binding::setValue( const css::uno::Any& aValue )
// check for supported type
if( ! supportsType( aValue.getValueType() ) )
- throw IncompatibleTypesException("type unsupported",
static_cast<XValueBinding*>(this));
+ throw IncompatibleTypesException(u"type unsupported"_ustr,
static_cast<XValueBinding*>(this));
if( !maBindingExpression.hasValue() )
- throw InvalidBindingStateException("no suitable node found",
static_cast<XValueBinding*>(this));
+ throw InvalidBindingStateException(u"no suitable node found"_ustr,
static_cast<XValueBinding*>(this));
css::uno::Reference<css::xml::dom::XNode> xNode =
maBindingExpression.getNode();
if( !xNode.is() )
- throw InvalidBindingStateException("no suitable node found",
static_cast<XValueBinding*>(this));
+ throw InvalidBindingStateException(u"no suitable node found"_ustr,
static_cast<XValueBinding*>(this));
OUString sValue = Convert::get().toXSD( aValue );
bool bSuccess = mxModel->setSimpleContent( xNode, sValue );
if( ! bSuccess )
- throw InvalidBindingStateException("can't set value",
static_cast<XValueBinding*>(this));
+ throw InvalidBindingStateException(u"can't set value"_ustr,
static_cast<XValueBinding*>(this));
}
@@ -1037,7 +1037,7 @@ OUString Binding::getListEntry( sal_Int32 nPosition )
// check bounds and return proper item
PathExpression::NodeVector_t aNodes = maBindingExpression.getNodeList();
if( nPosition < 0 || o3tl::make_unsigned(nPosition) >= aNodes.size() )
- throw IndexOutOfBoundsException("", static_cast<XValueBinding*>(this));
+ throw IndexOutOfBoundsException(u""_ustr,
static_cast<XValueBinding*>(this));
return lcl_getString( aNodes[ nPosition ] );
}
@@ -1186,49 +1186,49 @@ css::uno::Reference<css::xforms::XModel>
Binding::getModel() const
void Binding::initializePropertySet()
{
- registerProperty( css::beans::Property("BindingID", HANDLE_BindingID,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"BindingID"_ustr,
HANDLE_BindingID, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Binding, OUString >(this,
&Binding::setBindingID, &Binding::getBindingID));
- registerProperty( css::beans::Property("BindingExpression",
HANDLE_BindingExpression, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"BindingExpression"_ustr,
HANDLE_BindingExpression, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Binding, OUString >(this,
&Binding::setBindingExpression, &Binding::getBindingExpression));
- registerProperty( css::beans::Property("Model", HANDLE_Model,
cppu::UnoType<css::uno::Reference<css::xforms::XModel>>::get(),
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY
),
+ registerProperty( css::beans::Property(u"Model"_ustr, HANDLE_Model,
cppu::UnoType<css::uno::Reference<css::xforms::XModel>>::get(),
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY
),
new DirectPropertyAccessor< Binding,
css::uno::Reference<css::xforms::XModel> >(this, nullptr, &Binding::getModel));
- registerProperty( css::beans::Property("BindingNamespaces",
HANDLE_BindingNamespaces,
cppu::UnoType<css::uno::Reference<css::container::XNameContainer>>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"BindingNamespaces"_ustr,
HANDLE_BindingNamespaces,
cppu::UnoType<css::uno::Reference<css::container::XNameContainer>>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Binding,
css::uno::Reference<css::container::XNameContainer> >(this,
&Binding::setBindingNamespaces, &Binding::getBindingNamespaces));
- registerProperty( css::beans::Property("ModelNamespaces",
HANDLE_ModelNamespaces,
cppu::UnoType<css::uno::Reference<css::container::XNameContainer>>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"ModelNamespaces"_ustr,
HANDLE_ModelNamespaces,
cppu::UnoType<css::uno::Reference<css::container::XNameContainer>>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Binding,
css::uno::Reference<css::container::XNameContainer> >(this,
&Binding::setModelNamespaces, &Binding::getModelNamespaces));
- registerProperty( css::beans::Property("ModelID", HANDLE_ModelID,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::READONLY ),
+ registerProperty( css::beans::Property(u"ModelID"_ustr, HANDLE_ModelID,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::READONLY ),
new DirectPropertyAccessor< Binding, OUString >(this, nullptr,
&Binding::getModelID));
- registerProperty( css::beans::Property("ReadonlyExpression",
HANDLE_ReadonlyExpression, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"ReadonlyExpression"_ustr,
HANDLE_ReadonlyExpression, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Binding, OUString >(this,
&Binding::setReadonlyExpression, &Binding::getReadonlyExpression));
- registerProperty( css::beans::Property("RelevantExpression",
HANDLE_RelevantExpression, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"RelevantExpression"_ustr,
HANDLE_RelevantExpression, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Binding, OUString >(this,
&Binding::setRelevantExpression, &Binding::getRelevantExpression));
- registerProperty( css::beans::Property("RequiredExpression",
HANDLE_RequiredExpression, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"RequiredExpression"_ustr,
HANDLE_RequiredExpression, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Binding, OUString >(this,
&Binding::setRequiredExpression, &Binding::getRequiredExpression));
- registerProperty( css::beans::Property("ConstraintExpression",
HANDLE_ConstraintExpression, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"ConstraintExpression"_ustr,
HANDLE_ConstraintExpression, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Binding, OUString >(this,
&Binding::setConstraintExpression, &Binding::getConstraintExpression));
- registerProperty( css::beans::Property("CalculateExpression",
HANDLE_CalculateExpression, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"CalculateExpression"_ustr,
HANDLE_CalculateExpression, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Binding, OUString >(this,
&Binding::setCalculateExpression, &Binding::getCalculateExpression));
- registerProperty( css::beans::Property("Type", HANDLE_Type,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Type"_ustr, HANDLE_Type,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Binding, OUString >(this, &Binding::setType,
&Binding::getType));
- registerProperty( css::beans::Property("ReadOnly", HANDLE_ReadOnly,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::READONLY ),
+ registerProperty( css::beans::Property(u"ReadOnly"_ustr, HANDLE_ReadOnly,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::READONLY ),
new DirectPropertyAccessor< Binding, bool >(this, nullptr,
&Binding::getReadOnly));
- registerProperty( css::beans::Property("Relevant", HANDLE_Relevant,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::READONLY ),
+ registerProperty( css::beans::Property(u"Relevant"_ustr, HANDLE_Relevant,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND |
css::beans::PropertyAttribute::READONLY ),
new DirectPropertyAccessor< Binding, bool >(this, nullptr,
&Binding::getRelevant));
- registerProperty( css::beans::Property("ExternalData",
HANDLE_ExternalData, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY
),
+ registerProperty( css::beans::Property(u"ExternalData"_ustr,
HANDLE_ExternalData, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND | css::beans::PropertyAttribute::READONLY
),
new BooleanPropertyAccessor< Binding >(this, nullptr,
&Binding::getExternalData));
initializePropertyValueCache( HANDLE_ReadOnly );
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 0f7193422fa5..d16ec31a3b42 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -53,7 +53,7 @@ namespace
{ return Any(rStr); }
OUString lcl_toXSD_bool( const Any& rAny )
- { bool b = false; rAny >>= b; return b ? OUString("true") :
OUString("false"); }
+ { bool b = false; rAny >>= b; return b ? u"true"_ustr : u"false"_ustr; }
Any lcl_toAny_bool( const OUString& rStr )
{
diff --git a/forms/source/xforms/model.cxx b/forms/source/xforms/model.cxx
index fbb0de1ebdd8..4fd318319590 100644
--- a/forms/source/xforms/model.cxx
+++ b/forms/source/xforms/model.cxx
@@ -116,7 +116,7 @@ EvaluationContext Model::getEvaluationContext()
// no element found? Then insert default element 'instanceData'
if( ! xElement.is() )
{
- xElement.set( xInstance->createElement( "instanceData" ),
UNO_QUERY_THROW );
+ xElement.set( xInstance->createElement( u"instanceData"_ustr ),
UNO_QUERY_THROW );
xInstance->appendChild( xElement );
}
@@ -554,18 +554,18 @@ css::uno::Reference<css::container::XSet>
Model::getSubmissions()
void Model::initializePropertySet()
{
- registerProperty( css::beans::Property("ID", HANDLE_ID,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"ID"_ustr, HANDLE_ID,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
new APIPropertyAccessor< Model, OUString >(this, &Model::setID,
&Model::getID) );
- registerProperty( css::beans::Property("ForeignSchema",
HANDLE_ForeignSchema,
cppu::UnoType<css::uno::Reference<css::xml::dom::XDocument>>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"ForeignSchema"_ustr,
HANDLE_ForeignSchema,
cppu::UnoType<css::uno::Reference<css::xml::dom::XDocument>>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Model,
css::uno::Reference<css::xml::dom::XDocument> >( this,
&Model::setForeignSchema, &Model::getForeignSchema) );
- registerProperty( css::beans::Property("SchemaRef", HANDLE_SchemaRef,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"SchemaRef"_ustr,
HANDLE_SchemaRef, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Model, OUString >( this, &Model::setSchemaRef,
&Model::getSchemaRef) );
- registerProperty( css::beans::Property("Namespaces", HANDLE_Namespaces,
cppu::UnoType<css::uno::Reference<css::container::XNameContainer>>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Namespaces"_ustr,
HANDLE_Namespaces,
cppu::UnoType<css::uno::Reference<css::container::XNameContainer>>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Model,
css::uno::Reference<css::container::XNameContainer> >( this,
&Model::setNamespaces, &Model::getNamespaces) );
- registerProperty( css::beans::Property("ExternalData",
HANDLE_ExternalData, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"ExternalData"_ustr,
HANDLE_ExternalData, cppu::UnoType<sal_Bool>::get(),
css::beans::PropertyAttribute::BOUND ),
new BooleanPropertyAccessor< Model >( this, &Model::setExternalData,
&Model::getExternalData ) );
}
@@ -582,7 +582,7 @@ Sequence<sal_Int8> Model::getImplementationId()
OUString Model::getImplementationName()
{
- return "com.sun.star.form.Model";
+ return u"com.sun.star.form.Model"_ustr;
}
sal_Bool Model::supportsService(OUString const & ServiceName)
@@ -592,7 +592,7 @@ sal_Bool Model::supportsService(OUString const &
ServiceName)
css::uno::Sequence<OUString> Model::getSupportedServiceNames()
{
- return {"com.sun.star.xforms.Model"};
+ return {u"com.sun.star.xforms.Model"_ustr};
}
extern "C" SAL_DLLPUBLIC_EXPORT css::uno::XInterface*
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index ad1da7a3ac3f..4f84ec34a1bf 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -71,7 +71,7 @@ using namespace com::sun::star::xml::xpath;
OUString Model::getDefaultServiceNameForNode( const
css::uno::Reference<css::xml::dom::XNode>& xNode )
{
// determine service for control. string/text field is default.
- OUString sService = "com.sun.star.form.component.TextField";
+ OUString sService = u"com.sun.star.form.component.TextField"_ustr;
// query repository for suitable type
OSL_ENSURE( mxDataTypes.is(), "no type repository?" );
@@ -337,9 +337,9 @@ OUString Model::getBindingName( const css::uno::Reference<
::css::beans::XProper
sal_Bool /*bDetail*/ )
{
OUString sID;
- xBinding->getPropertyValue( "BindingID" ) >>= sID;
+ xBinding->getPropertyValue( u"BindingID"_ustr ) >>= sID;
OUString sExpression;
- xBinding->getPropertyValue( "BindingExpression" ) >>= sExpression;
+ xBinding->getPropertyValue( u"BindingExpression"_ustr ) >>= sExpression;
OUString sRet;
if( !sID.isEmpty() )
@@ -356,7 +356,7 @@ OUString Model::getSubmissionName( const
css::uno::Reference< ::css::beans::XPro
sal_Bool /*bDetail*/ )
{
OUString sID;
- xSubmission->getPropertyValue( "ID" ) >>= sID;
+ xSubmission->getPropertyValue( u"ID"_ustr ) >>= sID;
return sID;
}
@@ -395,7 +395,7 @@ css::uno::Reference<css::xml::dom::XDocument>
Model::newInstance( const OUString
DBG_ASSERT( xInstance.is(), "failed to create DOM instance" );
Reference<XNode>( xInstance, UNO_QUERY_THROW )->appendChild(
- Reference<XNode>( xInstance->createElement( "instanceData" ),
+ Reference<XNode>( xInstance->createElement( u"instanceData"_ustr ),
UNO_QUERY_THROW ) );
Sequence<PropertyValue> aSequence;
diff --git a/forms/source/xforms/submission.cxx
b/forms/source/xforms/submission.cxx
index 256838558f6e..40e7fbad33fc 100644
--- a/forms/source/xforms/submission.cxx
+++ b/forms/source/xforms/submission.cxx
@@ -76,7 +76,7 @@ Submission::Submission() :
mbIndent(),
mbOmitXmlDeclaration(),
mbStandalone(),
- msReplace( "none" )
+ msReplace( u"none"_ustr )
{
initializePropertySet();
}
@@ -210,7 +210,7 @@ bool Submission::doSubmit( const Reference<
XInteractionHandler >& xHandler )
}
else
{
- aExpression.setExpression( "/" );
+ aExpression.setExpression( u"/"_ustr );
aEvalContext = mxModel->getEvaluationContext();
}
aExpression.evaluate( aEvalContext );
@@ -285,7 +285,7 @@ void Submission::liveCheck()
bool bValid = mxModel.is();
if( ! bValid )
- throw RuntimeException("model not set");
+ throw RuntimeException(u"model not set"_ustr);
}
css::uno::Reference<XModel> Submission::getModel() const
@@ -316,52 +316,52 @@ css::uno::Reference<XModel> Submission::getModel() const
void Submission::initializePropertySet()
{
- registerProperty( css::beans::Property("ID", HANDLE_ID,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"ID"_ustr, HANDLE_ID,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, OUString >(this,
&Submission::setID, &Submission::getID) );
- registerProperty( css::beans::Property("Bind", HANDLE_Bind,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Bind"_ustr, HANDLE_Bind,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, OUString >(this,
&Submission::setBind, &Submission::getBind) );
- registerProperty( css::beans::Property("Ref", HANDLE_Ref,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Ref"_ustr, HANDLE_Ref,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, OUString >(this,
&Submission::setRef, &Submission::getRef) );
- registerProperty( css::beans::Property("Action", HANDLE_Action,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Action"_ustr, HANDLE_Action,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, OUString >(this,
&Submission::setAction, &Submission::getAction) );
- registerProperty( css::beans::Property("Method", HANDLE_Method,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Method"_ustr, HANDLE_Method,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, OUString >(this,
&Submission::setMethod, &Submission::getMethod) );
- registerProperty( css::beans::Property("Version", HANDLE_Version,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Version"_ustr, HANDLE_Version,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, OUString >(this,
&Submission::setVersion, &Submission::getVersion) );
- registerProperty( css::beans::Property("Indent", HANDLE_Indent,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Indent"_ustr, HANDLE_Indent,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND ),
new BooleanPropertyAccessor< Submission >(this, &Submission::setIndent,
&Submission::getIndent));
- registerProperty( css::beans::Property("MediaType", HANDLE_MediaType,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"MediaType"_ustr,
HANDLE_MediaType, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, OUString >(this,
&Submission::setMediaType, &Submission::getMediaType) );
- registerProperty( css::beans::Property("Encoding", HANDLE_Encoding,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Encoding"_ustr, HANDLE_Encoding,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, OUString >(this,
&Submission::setEncoding, &Submission::getEncoding) );
- registerProperty( css::beans::Property("OmitXmlDeclaration",
HANDLE_OmitXmlDeclaration, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"OmitXmlDeclaration"_ustr,
HANDLE_OmitXmlDeclaration, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND ),
new BooleanPropertyAccessor< Submission >(this,
&Submission::setOmitXmlDeclaration, &Submission::getOmitXmlDeclaration));
- registerProperty( css::beans::Property("Standalone", HANDLE_Standalone,
cppu::UnoType<bool>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Standalone"_ustr,
HANDLE_Standalone, cppu::UnoType<bool>::get(),
css::beans::PropertyAttribute::BOUND ),
new BooleanPropertyAccessor< Submission >(this,
&Submission::setStandalone, &Submission::getStandalone));
- registerProperty( css::beans::Property("CDataSectionElement",
HANDLE_CDataSectionElement, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"CDataSectionElement"_ustr,
HANDLE_CDataSectionElement, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, OUString >(this,
&Submission::setCDataSectionElement, &Submission::getCDataSectionElement) );
- registerProperty( css::beans::Property("Replace", HANDLE_Replace,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Replace"_ustr, HANDLE_Replace,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, OUString >(this,
&Submission::setReplace, &Submission::getReplace) );
- registerProperty( css::beans::Property("Separator", HANDLE_Separator,
cppu::UnoType<OUString>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Separator"_ustr,
HANDLE_Separator, cppu::UnoType<OUString>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, OUString >(this,
&Submission::setSeparator, &Submission::getSeparator) );
- registerProperty( css::beans::Property("IncludeNamespacePrefixes",
HANDLE_IncludeNamespacePrefixes, cppu::UnoType<Sequence<OUString>>::get(),
css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"IncludeNamespacePrefixes"_ustr,
HANDLE_IncludeNamespacePrefixes, cppu::UnoType<Sequence<OUString>>::get(),
css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, Sequence<OUString> >(this,
&Submission::setIncludeNamespacePrefixes,
&Submission::getIncludeNamespacePrefixes) );
- registerProperty( css::beans::Property("Model", HANDLE_Model,
cppu::UnoType<Reference<XModel>>::get(), css::beans::PropertyAttribute::BOUND ),
+ registerProperty( css::beans::Property(u"Model"_ustr, HANDLE_Model,
cppu::UnoType<Reference<XModel>>::get(), css::beans::PropertyAttribute::BOUND ),
new DirectPropertyAccessor< Submission, Reference<XModel> >(this,
&Submission::setModel, &Submission::getModel) );
initializePropertyValueCache( HANDLE_Indent );
@@ -419,7 +419,7 @@ void SAL_CALL Submission::submitWithInteraction(
if ( !xModel.is() || msID.isEmpty() )
throw RuntimeException(
- "This is not a valid submission object.",
+ u"This is not a valid submission object."_ustr,
*this
);
diff --git a/forms/source/xforms/submission/replace.cxx
b/forms/source/xforms/submission/replace.cxx
index ca91176c4c76..631d75a06a7e 100644
--- a/forms/source/xforms/submission/replace.cxx
+++ b/forms/source/xforms/submission/replace.cxx
@@ -63,14 +63,14 @@ CSubmission::SubmissionResult
CSubmission::replace(std::u16string_view aReplace,
// open the stream from the result...
// build media descriptor
Sequence< PropertyValue > descriptor{
- PropertyValue("InputStream",
+ PropertyValue(u"InputStream"_ustr,
-1, Any(m_aResultStream), PropertyState_DIRECT_VALUE),
- PropertyValue("ReadOnly",
+ PropertyValue(u"ReadOnly"_ustr,
-1, Any(true), PropertyState_DIRECT_VALUE)
};
OUString aURL =
m_aURLObj.GetMainURL(INetURLObject::DecodeMechanism::NONE);
- xLoader->loadComponentFromURL(aURL, "_default",
FrameSearchFlag::ALL, descriptor);
+ xLoader->loadComponentFromURL(aURL, u"_default"_ustr,
FrameSearchFlag::ALL, descriptor);
return CSubmission::SUCCESS;
diff --git a/forms/source/xforms/submission/submission_post.cxx
b/forms/source/xforms/submission/submission_post.cxx
index 90cfd68c4f27..ef3b65cae5c1 100644
--- a/forms/source/xforms/submission/submission_post.cxx
+++ b/forms/source/xforms/submission/submission_post.cxx
@@ -58,7 +58,7 @@ CSubmission::SubmissionResult CSubmissionPost::submit(const
css::uno::Reference<
aPostArgument.Referer.clear();
Any aCommandArgument;
aCommandArgument <<= aPostArgument;
- aContent.executeCommand( "post", aCommandArgument);
+ aContent.executeCommand( u"post"_ustr, aCommandArgument);
try {
m_aResultStream = aSink->getInputStream();
diff --git a/forms/source/xforms/xforms_services.cxx
b/forms/source/xforms/xforms_services.cxx
index 23a1ee400ffb..89ae4fafff92 100644
--- a/forms/source/xforms/xforms_services.cxx
+++ b/forms/source/xforms/xforms_services.cxx
@@ -36,14 +36,14 @@ class Implementation:
css::lang::XServiceInfo>
{
OUString SAL_CALL getImplementationName() override
- { return "com.sun.star.form.XForms"; }
+ { return u"com.sun.star.form.XForms"_ustr; }
sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override
{ return cppu::supportsService(this, ServiceName); }
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override
{
- return {"com.sun.star.xforms.XForms"};
+ return {u"com.sun.star.xforms.XForms"_ustr};
}
};
commit 12215925202d6d540e4a22b93a8f49b4ec35c111
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 8 08:28:35 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed May 8 11:15:34 2024 +0200
loplugin:ostr in formula
Change-Id: Iac66906636e64c0547122ac413bee494631c7c06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167304
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
index a3ffe56cc8c9..cc5331b741d4 100644
--- a/formula/source/core/api/FormulaOpCodeMapperObj.cxx
+++ b/formula/source/core/api/FormulaOpCodeMapperObj.cxx
@@ -82,12 +82,12 @@ SAL_CALL FormulaOpCodeMapperObj::getAvailableMappings(
OUString SAL_CALL FormulaOpCodeMapperObj::getImplementationName( )
{
- return "simple.formula.FormulaOpCodeMapperObj";
+ return u"simple.formula.FormulaOpCodeMapperObj"_ustr;
}
uno::Sequence< OUString > SAL_CALL
FormulaOpCodeMapperObj::getSupportedServiceNames( )
{
- return { "com.sun.star.sheet.FormulaOpCodeMapper" };
+ return { u"com.sun.star.sheet.FormulaOpCodeMapper"_ustr };
}
} // formula
diff --git a/formula/source/ui/dlg/FormulaHelper.cxx
b/formula/source/ui/dlg/FormulaHelper.cxx
index bfe26ef1fc3c..c2541403ff2a 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -44,7 +44,7 @@ namespace formula
virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>&
) const override {}
virtual void initArgumentInfo() const override {}
virtual OUString getSignature() const override { return
OUString(); }
- virtual OUString getHelpId() const override { return ""; }
+ virtual OUString getHelpId() const override { return u""_ustr; }
virtual bool isHidden() const override { return false; }
virtual sal_uInt32 getParameterCount() const override { return 0; }
virtual sal_uInt32 getVarArgsStart() const override { return 0; }
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 123642c46c1e..0edc5b78420c 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -225,39 +225,39 @@ FormulaDlg_Impl::FormulaDlg_Impl(weld::Dialog& rDialog,
, m_nSelectionEnd(-1)
, m_pTheRefEdit(nullptr)
, m_pTheRefButton(nullptr)
- , m_xTabCtrl(rBuilder.weld_notebook("tabcontrol"))
- , m_xParaWinBox(rBuilder.weld_container("BOX"))
- , m_xFtHeadLine(rBuilder.weld_label("headline"))
- , m_xFtFuncName(rBuilder.weld_label("funcname"))
- , m_xFtFuncDesc(rBuilder.weld_label("funcdesc"))
- , m_xFtEditName(rBuilder.weld_label("editname"))
- , m_xFtResult(rBuilder.weld_label("label2"))
- , m_xWndResult(rBuilder.weld_entry("result"))
- , m_xFtFormula(rBuilder.weld_label("formula"))
- , m_xMEdit(rBuilder.weld_text_view("ed_formula"))
- , m_xBtnMatrix(rBuilder.weld_check_button("array"))
- , m_xBtnCancel(rBuilder.weld_button("cancel"))
- , m_xBtnBackward(rBuilder.weld_button("back"))
- , m_xBtnForward(rBuilder.weld_button("next"))
- , m_xBtnEnd(rBuilder.weld_button("ok"))
- , m_xFtFormResult(rBuilder.weld_label("label1"))
- , m_xWndFormResult(rBuilder.weld_entry("formula_result"))
- , m_xEdRef(new RefEdit(rBuilder.weld_entry("ED_REF")))
- , m_xRefBtn(new RefButton(rBuilder.weld_button("RB_REF")))
+ , m_xTabCtrl(rBuilder.weld_notebook(u"tabcontrol"_ustr))
+ , m_xParaWinBox(rBuilder.weld_container(u"BOX"_ustr))
+ , m_xFtHeadLine(rBuilder.weld_label(u"headline"_ustr))
+ , m_xFtFuncName(rBuilder.weld_label(u"funcname"_ustr))
+ , m_xFtFuncDesc(rBuilder.weld_label(u"funcdesc"_ustr))
+ , m_xFtEditName(rBuilder.weld_label(u"editname"_ustr))
+ , m_xFtResult(rBuilder.weld_label(u"label2"_ustr))
+ , m_xWndResult(rBuilder.weld_entry(u"result"_ustr))
+ , m_xFtFormula(rBuilder.weld_label(u"formula"_ustr))
+ , m_xMEdit(rBuilder.weld_text_view(u"ed_formula"_ustr))
+ , m_xBtnMatrix(rBuilder.weld_check_button(u"array"_ustr))
+ , m_xBtnCancel(rBuilder.weld_button(u"cancel"_ustr))
+ , m_xBtnBackward(rBuilder.weld_button(u"back"_ustr))
+ , m_xBtnForward(rBuilder.weld_button(u"next"_ustr))
+ , m_xBtnEnd(rBuilder.weld_button(u"ok"_ustr))
+ , m_xFtFormResult(rBuilder.weld_label(u"label1"_ustr))
+ , m_xWndFormResult(rBuilder.weld_entry(u"formula_result"_ustr))
+ , m_xEdRef(new RefEdit(rBuilder.weld_entry(u"ED_REF"_ustr)))
+ , m_xRefBtn(new RefButton(rBuilder.weld_button(u"RB_REF"_ustr)))
{
auto nWidth = m_xMEdit->get_approximate_digit_width() * 62;
//Space for two lines of text
- m_xFtHeadLine->set_label("X
X
");
+ m_xFtHeadLine->set_label(u"X
X
"_ustr);
auto nHeight = m_xFtHeadLine->get_preferred_size().Height();
m_xFtHeadLine->set_size_request(nWidth, nHeight);
- m_xFtHeadLine->set_label("");
+ m_xFtHeadLine->set_label(u""_ustr);
- m_xFtFuncName->set_label("X
X
");
+ m_xFtFuncName->set_label(u"X
X
"_ustr);
nHeight = m_xFtFuncName->get_preferred_size().Height();
m_xFtFuncName->set_size_request(nWidth, nHeight);
m_xFtFuncDesc->set_size_request(nWidth, nHeight);
- m_xFtFuncName->set_label("");
+ m_xFtFuncName->set_label(u""_ustr);
m_xMEdit->set_size_request(nWidth,
m_xMEdit->get_height_rows(5));
@@ -281,9 +281,9 @@ FormulaDlg_Impl::FormulaDlg_Impl(weld::Dialog& rDialog,
m_xParaWin->SetArgModifiedHdl( LINK( this, FormulaDlg_Impl, ModifyHdl ) );
m_xParaWin->SetFxHdl( LINK( this, FormulaDlg_Impl, FxHdl ) );
- m_xFuncPage.reset(new FuncPage(m_xTabCtrl->get_page("functiontab"),
_pFunctionMgr));
- m_xStructPage.reset(new StructPage(m_xTabCtrl->get_page("structtab")));
- m_xTabCtrl->set_current_page("functiontab");
+ m_xFuncPage.reset(new FuncPage(m_xTabCtrl->get_page(u"functiontab"_ustr),
_pFunctionMgr));
+ m_xStructPage.reset(new
StructPage(m_xTabCtrl->get_page(u"structtab"_ustr)));
+ m_xTabCtrl->set_current_page(u"functiontab"_ustr);
m_aOldHelp = m_rDialog.get_help_id(); // HelpId from
resource always for "Page 1"
@@ -318,8 +318,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(weld::Dialog& rDialog,
FormulaDlg_Impl::~FormulaDlg_Impl()
{
- m_xTabCtrl->remove_page("functiontab");
- m_xTabCtrl->remove_page("structtab");
+ m_xTabCtrl->remove_page(u"functiontab"_ustr);
+ m_xTabCtrl->remove_page(u"structtab"_ustr);
DeleteArgs();
}
@@ -355,7 +355,7 @@ void FormulaDlg_Impl::InitFormulaOpCodeMapper()
m_pFunctionOpCodesEnd = m_aFunctionOpCodes.getConstArray() +
m_aFunctionOpCodes.getLength();
// 0:TOKEN_OPEN, 1:TOKEN_CLOSE, 2:TOKEN_SEP
- uno::Sequence< OUString > aArgs { "(", ")", ";" };
+ uno::Sequence< OUString > aArgs { u"("_ustr, u")"_ustr, u";"_ustr };
m_aSeparatorsOpCodes = m_xOpCodeMapper->getMappings( aArgs,
sheet::FormulaLanguage::ODFF);
m_aSpecialOpCodes = m_xOpCodeMapper->getAvailableMappings(
sheet::FormulaLanguage::ODFF, sheet::FormulaMapGroup::SPECIAL);
@@ -931,7 +931,7 @@ void FormulaDlg_Impl::FillControls( bool &rbNext, bool
&rbPrev)
}
else
{
- m_xFtEditName->set_label("");
+ m_xFtEditName->set_label(u""_ustr);
m_xMEdit->set_help_id(m_aEditHelpId);
}
// test if before/after are anymore functions
@@ -1255,7 +1255,7 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void )
return;
m_xBtnForward->set_sensitive(true); //@ In order to be able to input
another function.
- m_xTabCtrl->set_current_page("functiontab");
+ m_xTabCtrl->set_current_page(u"functiontab"_ustr);
OUString aUndoStr = m_pHelper->getCurrentFormula(); // it will be
added before a ";"
FormEditData* pData = m_pHelper->getFormEditData();
@@ -1464,7 +1464,7 @@ void FormulaDlg_Impl::UpdateSelection()
}
else
{
- m_pHelper->setCurrentFormula("");
+ m_pHelper->setCurrentFormula(u""_ustr);
m_nArgs = 0;
}
@@ -1589,9 +1589,9 @@ void FormulaDlg_Impl::Update()
FormulaCursor();
CalcStruct(sExpression);
if (pData->GetMode() == FormulaDlgMode::Formula)
- m_xTabCtrl->set_current_page("functiontab");
+ m_xTabCtrl->set_current_page(u"functiontab"_ustr);
else
- m_xTabCtrl->set_current_page("structtab");
+ m_xTabCtrl->set_current_page(u"structtab"_ustr);
m_xBtnMatrix->set_active(pData->GetMatrixFlag());
}
@@ -1649,7 +1649,7 @@ bool FormulaDlg_Impl::CheckMatrix(OUString& aFormula)
m_xBtnMatrix->set_sensitive(false);
} // if ( bMatrix )
- m_xTabCtrl->set_current_page("structtab");
+ m_xTabCtrl->set_current_page(u"structtab"_ustr);
return bMatrix;
}
@@ -1752,7 +1752,7 @@ void FormulaDlg_Impl::SetEdSelection()
FormulaModalDialog::FormulaModalDialog(weld::Window* pParent,
IFunctionManager const * _pFunctionMgr,
IControlReferenceHandler* _pDlg)
- : GenericDialogController(pParent, "formula/ui/formuladialog.ui",
"FormulaDialog")
+ : GenericDialogController(pParent, u"formula/ui/formuladialog.ui"_ustr,
u"FormulaDialog"_ustr)
, m_pImpl(new FormulaDlg_Impl(*m_xDialog, *m_xBuilder,
false/*_bSupportFunctionResult*/,
false/*_bSupportResult*/,
false/*_bSupportMatrix*/,
this, _pFunctionMgr, _pDlg))
@@ -1806,7 +1806,7 @@ void FormulaModalDialog::StoreFormEditData(FormEditData*
pData)
FormulaDlg::FormulaDlg(SfxBindings* pB, SfxChildWindow* pCW,
weld::Window* pParent,
IFunctionManager const * _pFunctionMgr,
IControlReferenceHandler* _pDlg)
- : SfxModelessDialogController( pB, pCW, pParent,
"formula/ui/formuladialog.ui", "FormulaDialog")
+ : SfxModelessDialogController( pB, pCW, pParent,
u"formula/ui/formuladialog.ui"_ustr, u"FormulaDialog"_ustr)
, m_pImpl(new FormulaDlg_Impl(*m_xDialog, *m_xBuilder,
true/*_bSupportFunctionResult*/
, true/*_bSupportResult*/
, true/*_bSupportMatrix*/
diff --git a/formula/source/ui/dlg/funcpage.cxx
b/formula/source/ui/dlg/funcpage.cxx
index dbdb49464ae7..d0a26fd2c2f5 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -41,11 +41,11 @@ IMPL_LINK(FuncPage, KeyInputHdl, const KeyEvent&, rKEvt,
bool)
sal_Int32 FuncPage::m_nRememberedFunctionCategory = 1;
FuncPage::FuncPage(weld::Container* pParent, const IFunctionManager*
_pFunctionManager)
- : m_xBuilder(Application::CreateBuilder(pParent,
"formula/ui/functionpage.ui"))
- , m_xContainer(m_xBuilder->weld_container("FunctionPage"))
- , m_xLbCategory(m_xBuilder->weld_combo_box("category"))
- , m_xLbFunction(m_xBuilder->weld_tree_view("function"))
- , m_xLbFunctionSearchString(m_xBuilder->weld_entry("search"))
+ : m_xBuilder(Application::CreateBuilder(pParent,
u"formula/ui/functionpage.ui"_ustr))
+ , m_xContainer(m_xBuilder->weld_container(u"FunctionPage"_ustr))
+ , m_xLbCategory(m_xBuilder->weld_combo_box(u"category"_ustr))
+ , m_xLbFunction(m_xBuilder->weld_tree_view(u"function"_ustr))
+ , m_xLbFunctionSearchString(m_xBuilder->weld_entry(u"search"_ustr))
, m_pFunctionManager(_pFunctionManager)
{
m_xLbFunction->make_sorted();
diff --git a/formula/source/ui/dlg/parawin.cxx
b/formula/source/ui/dlg/parawin.cxx
index bcc1c2d1a962..979125866bb9 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -40,41 +40,41 @@ ParaWin::ParaWin(weld::Container*
pParent,IControlReferenceHandler* _pDlg)
, pMyParent(_pDlg)
, m_sOptional(ForResId(STR_OPTIONAL))
, m_sRequired(ForResId(STR_REQUIRED))
- , m_xBuilder(Application::CreateBuilder(pParent,
"formula/ui/parameter.ui"))
- , m_xContainer(m_xBuilder->weld_container("ParameterPage"))
- , m_xSlider(m_xBuilder->weld_scrolled_window("scrollbar", true))
- , m_xParamGrid(m_xBuilder->weld_widget("paramgrid"))
- , m_xGrid(m_xBuilder->weld_widget("grid"))
- , m_xFtEditDesc(m_xBuilder->weld_label("editdesc"))
- , m_xFtArgName(m_xBuilder->weld_label("parname"))
- , m_xFtArgDesc(m_xBuilder->weld_label("pardesc"))
- , m_xBtnFx1(m_xBuilder->weld_button("FX1"))
- , m_xBtnFx2(m_xBuilder->weld_button("FX2"))
- , m_xBtnFx3(m_xBuilder->weld_button("FX3"))
- , m_xBtnFx4(m_xBuilder->weld_button("FX4"))
- , m_xFtArg1(m_xBuilder->weld_label("FT_ARG1"))
- , m_xFtArg2(m_xBuilder->weld_label("FT_ARG2"))
- , m_xFtArg3(m_xBuilder->weld_label("FT_ARG3"))
- , m_xFtArg4(m_xBuilder->weld_label("FT_ARG4"))
- , m_xEdArg1(new ArgEdit(m_xBuilder->weld_entry("ED_ARG1")))
- , m_xEdArg2(new ArgEdit(m_xBuilder->weld_entry("ED_ARG2")))
- , m_xEdArg3(new ArgEdit(m_xBuilder->weld_entry("ED_ARG3")))
- , m_xEdArg4(new ArgEdit(m_xBuilder->weld_entry("ED_ARG4")))
- , m_xRefBtn1(new RefButton(m_xBuilder->weld_button("RB_ARG1")))
- , m_xRefBtn2(new RefButton(m_xBuilder->weld_button("RB_ARG2")))
- , m_xRefBtn3(new RefButton(m_xBuilder->weld_button("RB_ARG3")))
- , m_xRefBtn4(new RefButton(m_xBuilder->weld_button("RB_ARG4")))
+ , m_xBuilder(Application::CreateBuilder(pParent,
u"formula/ui/parameter.ui"_ustr))
+ , m_xContainer(m_xBuilder->weld_container(u"ParameterPage"_ustr))
+ , m_xSlider(m_xBuilder->weld_scrolled_window(u"scrollbar"_ustr, true))
+ , m_xParamGrid(m_xBuilder->weld_widget(u"paramgrid"_ustr))
+ , m_xGrid(m_xBuilder->weld_widget(u"grid"_ustr))
+ , m_xFtEditDesc(m_xBuilder->weld_label(u"editdesc"_ustr))
+ , m_xFtArgName(m_xBuilder->weld_label(u"parname"_ustr))
+ , m_xFtArgDesc(m_xBuilder->weld_label(u"pardesc"_ustr))
+ , m_xBtnFx1(m_xBuilder->weld_button(u"FX1"_ustr))
+ , m_xBtnFx2(m_xBuilder->weld_button(u"FX2"_ustr))
+ , m_xBtnFx3(m_xBuilder->weld_button(u"FX3"_ustr))
+ , m_xBtnFx4(m_xBuilder->weld_button(u"FX4"_ustr))
+ , m_xFtArg1(m_xBuilder->weld_label(u"FT_ARG1"_ustr))
+ , m_xFtArg2(m_xBuilder->weld_label(u"FT_ARG2"_ustr))
+ , m_xFtArg3(m_xBuilder->weld_label(u"FT_ARG3"_ustr))
+ , m_xFtArg4(m_xBuilder->weld_label(u"FT_ARG4"_ustr))
+ , m_xEdArg1(new ArgEdit(m_xBuilder->weld_entry(u"ED_ARG1"_ustr)))
+ , m_xEdArg2(new ArgEdit(m_xBuilder->weld_entry(u"ED_ARG2"_ustr)))
+ , m_xEdArg3(new ArgEdit(m_xBuilder->weld_entry(u"ED_ARG3"_ustr)))
+ , m_xEdArg4(new ArgEdit(m_xBuilder->weld_entry(u"ED_ARG4"_ustr)))
+ , m_xRefBtn1(new RefButton(m_xBuilder->weld_button(u"RB_ARG1"_ustr)))
+ , m_xRefBtn2(new RefButton(m_xBuilder->weld_button(u"RB_ARG2"_ustr)))
+ , m_xRefBtn3(new RefButton(m_xBuilder->weld_button(u"RB_ARG3"_ustr)))
+ , m_xRefBtn4(new RefButton(m_xBuilder->weld_button(u"RB_ARG4"_ustr)))
{
// Space for three lines of text in function description.
- m_xFtEditDesc->set_label("X
X
X
");
+ m_xFtEditDesc->set_label(u"X
X
X
"_ustr);
auto nEditHeight = m_xFtEditDesc->get_preferred_size().Height();
m_xFtEditDesc->set_size_request(-1, nEditHeight);
- m_xFtEditDesc->set_label("");
+ m_xFtEditDesc->set_label(u""_ustr);
// Space for two lines of text in parameter description.
- m_xFtArgDesc->set_label("X
X
");
+ m_xFtArgDesc->set_label(u"X
X
"_ustr);
auto nArgHeight = m_xFtArgDesc->get_preferred_size().Height();
m_xFtArgDesc->set_size_request(-1, nArgHeight);
- m_xFtArgDesc->set_label("");
+ m_xFtArgDesc->set_label(u""_ustr);
m_xBtnFx1->set_from_icon_name(BMP_FX);
m_xBtnFx2->set_from_icon_name(BMP_FX);
diff --git a/formula/source/ui/dlg/structpg.cxx
b/formula/source/ui/dlg/structpg.cxx
index 6cfc34a96ca1..be73dffd0594 100644
--- a/formula/source/ui/dlg/structpg.cxx
+++ b/formula/source/ui/dlg/structpg.cxx
@@ -33,9 +33,9 @@ void StructPage::SetActiveFlag(bool bFlag)
}
StructPage::StructPage(weld::Container* pParent)
- : m_xBuilder(Application::CreateBuilder(pParent,
"formula/ui/structpage.ui"))
- , m_xContainer(m_xBuilder->weld_container("StructPage"))
- , m_xTlbStruct(m_xBuilder->weld_tree_view("struct"))
+ : m_xBuilder(Application::CreateBuilder(pParent,
u"formula/ui/structpage.ui"_ustr))
+ , m_xContainer(m_xBuilder->weld_container(u"StructPage"_ustr))
+ , m_xTlbStruct(m_xBuilder->weld_tree_view(u"struct"_ustr))
, maImgEnd(BMP_STR_END)
, maImgError(BMP_STR_ERROR)
, pSelectedToken(nullptr)
commit e1d980bef0d0aaf6cfe87ddbebefd5c771c4f26e
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Wed May 8 08:27:46 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed May 8 11:15:29 2024 +0200
loplugin:ostr in filter
Change-Id: I9468cb2bf7b3614e5ee2e1ca6969282041699371
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167302
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins
diff --git a/filter/qa/cppunit/priority-test.cxx
b/filter/qa/cppunit/priority-test.cxx
index 7b37ce07e6ee..b04aa125e09e 100644
--- a/filter/qa/cppunit/priority-test.cxx
+++ b/filter/qa/cppunit/priority-test.cxx
@@ -39,7 +39,7 @@ public:
void PriorityFilterTest::testPriority()
{
uno::Reference<document::XTypeDetection> xDetection(
-
comphelper::getProcessServiceFactory()->createInstance("com.sun.star.document.TypeDetection"),
uno::UNO_QUERY);
+
comphelper::getProcessServiceFactory()->createInstance(u"com.sun.star.document.TypeDetection"_ustr),
uno::UNO_QUERY);
CPPUNIT_ASSERT_MESSAGE("No type detection component", xDetection.is());
static struct {
-e
... etc. - the rest is truncated
