ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

Extended loplugin:ostr: Automatic rewrite O[U]StringLiteral: svx

Browse Source 
Change-Id: Ib5028b826a3f62303b9e0502af70ad62c578fbb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158240
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2023-10-20 18:43:34 +02:00
parent 7c59c59a0b
commit b60b3b5bbc
46 changed files with 201 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files
svx/qa/unit/gallery/test_gallery.cxx
+7 -7
View File
@@ -68,7 +68,7 @@ void GalleryObjTest::TestCreateTheme()
std::unique_ptr<Gallery> pGallery(new Gallery(aGalleryURL));
CPPUNIT_ASSERT_MESSAGE("Could not create gallery instance", (pGallery != nullptr));
static constexpr OUStringLiteral myThemeName = u"addytesttheme";
static constexpr OUString myThemeName = u"addytesttheme"_ustr;
CPPUNIT_ASSERT_MESSAGE("Could not create theme", pGallery->CreateTheme(myThemeName));
CPPUNIT_ASSERT_MESSAGE("Could not find theme", pGallery->HasTheme(myThemeName));
@@ -93,7 +93,7 @@ void GalleryObjTest::TestDeleteTheme()
std::unique_ptr<Gallery> pGallery(new Gallery(aGalleryURL));
CPPUNIT_ASSERT_MESSAGE("Could not create gallery instance", (pGallery != nullptr));
static constexpr OUStringLiteral myThemeName = u"addytesttheme";
static constexpr OUString myThemeName = u"addytesttheme"_ustr;
CPPUNIT_ASSERT_MESSAGE("Could not create theme", pGallery->CreateTheme(myThemeName));
CPPUNIT_ASSERT_MESSAGE("Could not find theme", pGallery->HasTheme(myThemeName));
@@ -129,12 +129,12 @@ void GalleryObjTest::TestSetThemeName()
std::unique_ptr<Gallery> pGallery(new Gallery(aGalleryURL));
CPPUNIT_ASSERT_MESSAGE("Could not create gallery instance", (pGallery != nullptr));
static constexpr OUStringLiteral myThemeName = u"addytesttheme";
static constexpr OUString myThemeName = u"addytesttheme"_ustr;
CPPUNIT_ASSERT_MESSAGE("Could not create theme", pGallery->CreateTheme(myThemeName));
CPPUNIT_ASSERT_MESSAGE("Could not find theme", pGallery->HasTheme(myThemeName));
// Rename theme
static constexpr OUStringLiteral myNewThemeName = u"addytestthemenew";
static constexpr OUString myNewThemeName = u"addytestthemenew"_ustr;
pGallery->RenameTheme(myThemeName, myNewThemeName);
CPPUNIT_ASSERT_MESSAGE("Could not rename theme because old theme name still exists",
!pGallery->HasTheme(myThemeName));
@@ -296,7 +296,7 @@ void GalleryObjTest::TestInsertGalleryObject()
std::unique_ptr<Gallery> pGallery(new Gallery(aGalleryURL));
CPPUNIT_ASSERT_MESSAGE("Could not create gallery instance", (pGallery != nullptr));
static constexpr OUStringLiteral myThemeName = u"addytesttheme";
static constexpr OUString myThemeName = u"addytesttheme"_ustr;
CPPUNIT_ASSERT_MESSAGE("Could not create theme", pGallery->CreateTheme(myThemeName));
CPPUNIT_ASSERT_MESSAGE("Could not find theme", pGallery->HasTheme(myThemeName));
@@ -341,7 +341,7 @@ void GalleryObjTest::TestRemoveGalleryObject()
std::unique_ptr<Gallery> pGallery(new Gallery(aGalleryURL));
CPPUNIT_ASSERT_MESSAGE("Could not create gallery instance", (pGallery != nullptr));
static constexpr OUStringLiteral myThemeName = u"addytesttheme";
static constexpr OUString myThemeName = u"addytesttheme"_ustr;
CPPUNIT_ASSERT_MESSAGE("Could not create theme", pGallery->CreateTheme(myThemeName));
CPPUNIT_ASSERT_MESSAGE("Could not find theme", pGallery->HasTheme(myThemeName));
@@ -396,7 +396,7 @@ void GalleryObjTest::TestChangePositionGalleryObject()
std::unique_ptr<Gallery> pGallery(new Gallery(aGalleryURL));
CPPUNIT_ASSERT_MESSAGE("Could not create gallery instance", (pGallery != nullptr));
static constexpr OUStringLiteral myThemeName = u"addytesttheme";
static constexpr OUString myThemeName = u"addytesttheme"_ustr;
CPPUNIT_ASSERT_MESSAGE("Could not create theme", pGallery->CreateTheme(myThemeName));
CPPUNIT_ASSERT_MESSAGE("Could not find theme", pGallery->HasTheme(myThemeName));
svx/source/accessibility/AccessibleControlShape.cxx
+4 -4
View File
@@ -61,10 +61,10 @@ using namespace ::com::sun::star::container;
namespace
{
constexpr OUStringLiteral NAME_PROPERTY_NAME = u"Name";
constexpr OUStringLiteral DESC_PROPERTY_NAME = u"HelpText";
constexpr OUStringLiteral LABEL_PROPERTY_NAME = u"Label";
constexpr OUStringLiteral LABEL_CONTROL_PROPERTY_NAME = u"LabelControl";
constexpr OUString NAME_PROPERTY_NAME = u"Name"_ustr;
constexpr OUString DESC_PROPERTY_NAME = u"HelpText"_ustr;
constexpr OUString LABEL_PROPERTY_NAME = u"Label"_ustr;
constexpr OUString LABEL_CONTROL_PROPERTY_NAME = u"LabelControl"_ustr;
// return the property which should be used as AccessibleName
OUString lcl_getPreferredAccNameProperty( const Reference< XPropertySetInfo >& _rxPSI )
svx/source/accessibility/AccessibleShape.cxx
+2 -2
View File
@@ -473,8 +473,8 @@ awt::Rectangle SAL_CALL AccessibleShape::getBounds()
if ( mxShape.is() )
{
static constexpr OUStringLiteral sBoundRectName = u"BoundRect";
static constexpr OUStringLiteral sAnchorPositionName = u"AnchorPosition";
static constexpr OUString sBoundRectName = u"BoundRect"_ustr;
static constexpr OUString sAnchorPositionName = u"AnchorPosition"_ustr;
// Get the shape's bounding box in internal coordinates (in 100th of
// mm). Use the property BoundRect. Only if that is not supported ask
svx/source/customshapes/EnhancedCustomShape2d.cxx
+1 -1
View File
@@ -557,7 +557,7 @@ void EnhancedCustomShape2d::ApplyShapeAttributes( const SdrCustomShapeGeometryIt
m_nCoordWidthG = std::abs( aViewBox.Width );
m_nCoordHeightG = std::abs( aViewBox.Height);
}
static constexpr OUStringLiteral sPath( u"Path" );
static constexpr OUString sPath( u"Path"_ustr );
static constexpr OUStringLiteral sCoordinates( u"Coordinates" );
static constexpr OUStringLiteral sGluePoints( u"GluePoints" );
static constexpr OUStringLiteral sSegments( u"Segments" );
svx/source/dialog/ClassificationDialog.cxx
+1 -1
View File
@@ -71,7 +71,7 @@ namespace {
constexpr size_t RECENTLY_USED_LIMIT = 5;
constexpr OUStringLiteral constRecentlyUsedFileName(u"recentlyUsed.xml");
constexpr OUString constRecentlyUsedFileName(u"recentlyUsed.xml"_ustr);
OUString lcl_getClassificationUserPath()
{
svx/source/dialog/imapdlg.cxx
+7 -7
View File
@@ -47,14 +47,14 @@
#include "dlgunit.hxx"
#include <memory>
constexpr OUStringLiteral SELF_TARGET = u"_self";
constexpr OUStringLiteral IMAP_CERN_FILTER = u"MAP - CERN";
constexpr OUStringLiteral IMAP_NCSA_FILTER = u"MAP - NCSA";
constexpr OUStringLiteral IMAP_BINARY_FILTER = u"SIP - StarView ImageMap";
constexpr OUString SELF_TARGET = u"_self"_ustr;
constexpr OUString IMAP_CERN_FILTER = u"MAP - CERN"_ustr;
constexpr OUString IMAP_NCSA_FILTER = u"MAP - NCSA"_ustr;
constexpr OUString IMAP_BINARY_FILTER = u"SIP - StarView ImageMap"_ustr;
constexpr OUStringLiteral IMAP_ALL_TYPE = u"*.*";
constexpr OUStringLiteral IMAP_BINARY_TYPE = u"*.sip";
constexpr OUStringLiteral IMAP_CERN_TYPE = u"*.map";
constexpr OUStringLiteral IMAP_NCSA_TYPE = u"*.map";
constexpr OUString IMAP_BINARY_TYPE = u"*.sip"_ustr;
constexpr OUString IMAP_CERN_TYPE = u"*.map"_ustr;
constexpr OUString IMAP_NCSA_TYPE = u"*.map"_ustr;
SFX_IMPL_MODELESSDIALOGCONTOLLER_WITHID( SvxIMapDlgChildWindow, SID_IMAP );
svx/source/dialog/rubydialog.cxx
+5 -5
View File
@@ -57,11 +57,11 @@ SFX_IMPL_CHILDWINDOW(SvxRubyChildWindow, SID_RUBY_DIALOG);
namespace
{
constexpr OUStringLiteral cRubyBaseText = u"RubyBaseText";
constexpr OUStringLiteral cRubyText = u"RubyText";
constexpr OUStringLiteral cRubyAdjust = u"RubyAdjust";
constexpr OUStringLiteral cRubyPosition = u"RubyPosition";
constexpr OUStringLiteral cRubyCharStyleName = u"RubyCharStyleName";
constexpr OUString cRubyBaseText = u"RubyBaseText"_ustr;
constexpr OUString cRubyText = u"RubyText"_ustr;
constexpr OUString cRubyAdjust = u"RubyAdjust"_ustr;
constexpr OUString cRubyPosition = u"RubyPosition"_ustr;
constexpr OUString cRubyCharStyleName = u"RubyCharStyleName"_ustr;
} // end anonymous namespace
svx/source/dialog/swframeexample.cxx
+2 -2
View File
@@ -31,7 +31,7 @@
using namespace ::com::sun::star::text;
#define FLYINFLY_BORDER 3
constexpr OUStringLiteral DEMOTEXT = u"Ij";
constexpr OUString DEMOTEXT = u"Ij"_ustr;
namespace {
@@ -684,7 +684,7 @@ void SwFrameExample::Paint(vcl::RenderContext& rRenderContext, const tools::Rect
}
else
{
rRenderContext.DrawText(aParaPrtArea, OUString(DEMOTEXT));
rRenderContext.DrawText(aParaPrtArea, DEMOTEXT);
DrawRect_Impl(rRenderContext, aDrawObj, m_aBlankCol, m_aBlankFrameCol );
}
svx/source/fmcomp/fmgridcl.cxx
+1 -1
View File
@@ -1706,7 +1706,7 @@ void FmGridControl::InitColumnByField(
}
// the control type is determined by the ColumnServiceName
static constexpr OUStringLiteral s_sPropColumnServiceName = u"ColumnServiceName";
static constexpr OUString s_sPropColumnServiceName = u"ColumnServiceName"_ustr;
if ( !::comphelper::hasProperty( s_sPropColumnServiceName, _rxColumnModel ) )
return;
svx/source/fmcomp/gridcell.cxx
+5 -5
View File
@@ -84,8 +84,8 @@ using namespace ::dbtools;
using ::com::sun::star::util::XNumberFormatter;
constexpr OUStringLiteral INVALIDTEXT = u"###";
constexpr OUStringLiteral OBJECTTEXT = u"<OBJECT>";
constexpr OUString INVALIDTEXT = u"###"_ustr;
constexpr OUString OBJECTTEXT = u"<OBJECT>"_ustr;
//= helper
@@ -458,7 +458,7 @@ void DbGridColumn::Paint(OutputDevice& rDev,
if ( !bEnabled )
nStyle |= DrawTextFlags::Disable;
rDev.DrawText(rRect, OUString(INVALIDTEXT), nStyle);
rDev.DrawText(rRect, INVALIDTEXT, nStyle);
}
else if (m_bAutoValue && pRow->IsNew())
{
@@ -493,14 +493,14 @@ void DbGridColumn::Paint(OutputDevice& rDev,
if ( !bEnabled )
nStyle |= DrawTextFlags::Disable;
rDev.DrawText(rRect, OUString(INVALIDTEXT), nStyle);
rDev.DrawText(rRect, INVALIDTEXT, nStyle);
}
else if (pRow->HasField(m_nFieldPos) && m_bObject)
{
DrawTextFlags nStyle = DrawTextFlags::Clip | DrawTextFlags::Center;
if ( !bEnabled )
nStyle |= DrawTextFlags::Disable;
rDev.DrawText(rRect, OUString(OBJECTTEXT), nStyle);
rDev.DrawText(rRect, OBJECTTEXT, nStyle);
}
}
else if ( auto pFilterCell = dynamic_cast<FmXFilterCell*>( m_pCell.get() ) )
svx/source/fmcomp/gridcols.cxx
+2 -2
View File
@@ -76,8 +76,8 @@ namespace
sal_Int32 getColumnTypeByModelName(const OUString& aModelName)
{
static constexpr OUStringLiteral aModelPrefix(u"com.sun.star.form.component.");
static constexpr OUStringLiteral aCompatibleModelPrefix(u"stardiv.one.form.component.");
static constexpr OUString aModelPrefix(u"com.sun.star.form.component."_ustr);
static constexpr OUString aCompatibleModelPrefix(u"stardiv.one.form.component."_ustr);
sal_Int32 nTypeId = -1;
if (aModelName == FM_COMPONENT_EDIT)
svx/source/form/datanavi.cxx
+23 -23
View File
@@ -59,9 +59,9 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::dom::events;
using namespace ::svx;
constexpr OUStringLiteral CFGNAME_DATANAVIGATOR = u"DataNavigator";
constexpr OUStringLiteral CFGNAME_SHOWDETAILS = u"ShowDetails";
constexpr OUStringLiteral MSG_VARIABLE = u"%1";
constexpr OUString CFGNAME_DATANAVIGATOR = u"DataNavigator"_ustr;
constexpr OUString CFGNAME_SHOWDETAILS = u"ShowDetails"_ustr;
constexpr OUString MSG_VARIABLE = u"%1"_ustr;
constexpr OUStringLiteral MODELNAME = u"$MODELNAME";
constexpr OUStringLiteral INSTANCENAME = u"$INSTANCENAME";
constexpr OUStringLiteral ELEMENTNAME = u"$ELEMENTNAME";
@@ -75,35 +75,35 @@ namespace svxform
// properties of instance
constexpr OUStringLiteral PN_INSTANCE_MODEL = u"Instance";
constexpr OUStringLiteral PN_INSTANCE_ID = u"ID";
constexpr OUString PN_INSTANCE_ID = u"ID"_ustr;
constexpr OUStringLiteral PN_INSTANCE_URL = u"URL";
// properties of binding
constexpr OUStringLiteral PN_BINDING_ID = u"BindingID";
constexpr OUStringLiteral PN_BINDING_EXPR = u"BindingExpression";
constexpr OUString PN_BINDING_ID = u"BindingID"_ustr;
constexpr OUString PN_BINDING_EXPR = u"BindingExpression"_ustr;
constexpr OUStringLiteral PN_BINDING_MODEL = u"Model";
constexpr OUStringLiteral PN_BINDING_NAMESPACES = u"ModelNamespaces";
constexpr OUStringLiteral PN_READONLY_EXPR = u"ReadonlyExpression";
constexpr OUStringLiteral PN_RELEVANT_EXPR = u"RelevantExpression";
constexpr OUStringLiteral PN_REQUIRED_EXPR = u"RequiredExpression";
constexpr OUStringLiteral PN_CONSTRAINT_EXPR = u"ConstraintExpression";
constexpr OUStringLiteral PN_CALCULATE_EXPR = u"CalculateExpression";
constexpr OUStringLiteral PN_BINDING_TYPE = u"Type";
constexpr OUString PN_BINDING_NAMESPACES = u"ModelNamespaces"_ustr;
constexpr OUString PN_READONLY_EXPR = u"ReadonlyExpression"_ustr;
constexpr OUString PN_RELEVANT_EXPR = u"RelevantExpression"_ustr;
constexpr OUString PN_REQUIRED_EXPR = u"RequiredExpression"_ustr;
constexpr OUString PN_CONSTRAINT_EXPR = u"ConstraintExpression"_ustr;
constexpr OUString PN_CALCULATE_EXPR = u"CalculateExpression"_ustr;
constexpr OUString PN_BINDING_TYPE = u"Type"_ustr;
// properties of submission
constexpr OUStringLiteral PN_SUBMISSION_ID = u"ID";
constexpr OUStringLiteral PN_SUBMISSION_BIND = u"Bind";
constexpr OUStringLiteral PN_SUBMISSION_REF = u"Ref";
constexpr OUStringLiteral PN_SUBMISSION_ACTION = u"Action";
constexpr OUStringLiteral PN_SUBMISSION_METHOD = u"Method";
constexpr OUStringLiteral PN_SUBMISSION_REPLACE = u"Replace";
constexpr OUString PN_SUBMISSION_ID = u"ID"_ustr;
constexpr OUString PN_SUBMISSION_BIND = u"Bind"_ustr;
constexpr OUString PN_SUBMISSION_REF = u"Ref"_ustr;
constexpr OUString PN_SUBMISSION_ACTION = u"Action"_ustr;
constexpr OUString PN_SUBMISSION_METHOD = u"Method"_ustr;
constexpr OUString PN_SUBMISSION_REPLACE = u"Replace"_ustr;
// other const strings
constexpr OUStringLiteral TRUE_VALUE = u"true()";
constexpr OUString TRUE_VALUE = u"true()"_ustr;
constexpr OUStringLiteral NEW_ELEMENT = u"newElement";
constexpr OUStringLiteral NEW_ATTRIBUTE = u"newAttribute";
constexpr OUStringLiteral EVENTTYPE_CHARDATA = u"DOMCharacterDataModified";
constexpr OUStringLiteral EVENTTYPE_ATTR = u"DOMAttrModified";
constexpr OUString EVENTTYPE_CHARDATA = u"DOMCharacterDataModified"_ustr;
constexpr OUString EVENTTYPE_ATTR = u"DOMAttrModified"_ustr;
#define MIN_PAGE_COUNT 3 // at least one instance, one submission and one binding page
@@ -932,7 +932,7 @@ namespace svxform
DBG_ASSERT( pNode->m_xPropSet.is(), "XFormsPage::RemoveEntry(): no propset" );
bool bSubmission = ( DGTSubmission == m_eGroup );
TranslateId pResId = bSubmission ? RID_STR_QRY_REMOVE_SUBMISSION : RID_STR_QRY_REMOVE_BINDING;
OUString sProperty = bSubmission ? OUString(PN_SUBMISSION_ID) : OUString(PN_BINDING_ID);
OUString sProperty = bSubmission ? PN_SUBMISSION_ID : PN_BINDING_ID;
OUString sSearch = bSubmission ? OUString(SUBMISSIONNAME) : OUString(BINDINGNAME);
OUString sName;
try
svx/source/form/fmobj.cxx
+1 -1
View File
@@ -161,7 +161,7 @@ void FmFormObj::impl_checkRefDevice_nothrow( bool _force )
Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW );
Reference< XPropertySetInfo > xPropertyInfo( xModelProps->getPropertySetInfo(), UNO_SET_THROW );
static constexpr OUStringLiteral sRefDevicePropName = u"ReferenceDevice";
static constexpr OUString sRefDevicePropName = u"ReferenceDevice"_ustr;
if ( xPropertyInfo->hasPropertyByName( sRefDevicePropName ) )
{
rtl::Reference<VCLXDevice> pUnoRefDevice = new VCLXDevice;
svx/source/form/fmundo.cxx
+1 -1
View File
@@ -676,7 +676,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
// TODO: we should cache all those things, else this might be too expensive.
// However, this requires we're notified of changes in the value binding
static constexpr OUStringLiteral s_sExternalData = u"ExternalData";
static constexpr OUString s_sExternalData = u"ExternalData"_ustr;
if ( xBindingPropsPSI.is() && xBindingPropsPSI->hasPropertyByName( s_sExternalData ) )
{
bool bExternalData = true;
svx/source/form/formcontrolfactory.cxx
+1 -1
View File
@@ -433,7 +433,7 @@ namespace svxform
case FormComponentType::IMAGEBUTTON:
case FormComponentType::IMAGECONTROL:
{
static constexpr OUStringLiteral sScaleModeProperty( u"ScaleMode" );
static constexpr OUString sScaleModeProperty( u"ScaleMode"_ustr );
if ( xPSI->hasPropertyByName( sScaleModeProperty ) )
_rxControlModel->setPropertyValue( sScaleModeProperty, Any( ImageScaleMode::ISOTROPIC ) );
}
svx/source/form/formcontroller.cxx
+1 -1
View File
@@ -3540,7 +3540,7 @@ namespace
{
try
{
static constexpr OUStringLiteral s_sFormsCheckRequiredFields = u"FormsCheckRequiredFields";
static constexpr OUString s_sFormsCheckRequiredFields = u"FormsCheckRequiredFields"_ustr;
// first, check whether the form has a property telling us the answer
// this allows people to use the XPropertyContainer interface of a form to control
svx/source/gallery2/gallery1.cxx
+2 -2
View File
@@ -347,8 +347,8 @@ void Gallery::ImplLoadSubDirs( const INetURLObject& rBaseURL, bool& rbDirIsReadO
if( xContentAccess.is() )
{
static constexpr OUStringLiteral s_sTitle = u"Title";
static constexpr OUStringLiteral s_sIsReadOnly = u"IsReadOnly";
static constexpr OUString s_sTitle = u"Title"_ustr;
static constexpr OUString s_sIsReadOnly = u"IsReadOnly"_ustr;
while( xResultSet->next() )
{
svx/source/items/statusitem.cxx
+2 -2
View File
@@ -13,8 +13,8 @@
#include <svl/memberid.h>
#include <svx/statusitem.hxx>
constexpr OUStringLiteral STATUS_PARAM_VALUE = u"Value";
constexpr OUStringLiteral STATUS_PARAM_TYPE = u"Type";
constexpr OUString STATUS_PARAM_VALUE = u"Value"_ustr;
constexpr OUString STATUS_PARAM_TYPE = u"Type"_ustr;
constexpr int STATUS_PARAMS = 2;
SvxStatusItem::SvxStatusItem(TypedWhichId<SvxStatusItem> nWhich, const OUString& rString,
svx/source/items/viewlayoutitem.cxx
+2 -2
View File
@@ -29,8 +29,8 @@
SfxPoolItem* SvxViewLayoutItem::CreateDefault() { return new SvxViewLayoutItem; }
constexpr OUStringLiteral VIEWLAYOUT_PARAM_COLUMNS = u"Columns";
constexpr OUStringLiteral VIEWLAYOUT_PARAM_BOOKMODE = u"BookMode";
constexpr OUString VIEWLAYOUT_PARAM_COLUMNS = u"Columns"_ustr;
constexpr OUString VIEWLAYOUT_PARAM_BOOKMODE = u"BookMode"_ustr;
#define VIEWLAYOUT_PARAMS 2
svx/source/items/zoomslideritem.cxx
+4 -4
View File
@@ -28,10 +28,10 @@
SfxPoolItem* SvxZoomSliderItem::CreateDefault() { return new SvxZoomSliderItem; }
constexpr OUStringLiteral ZOOMSLIDER_PARAM_CURRENTZOOM = u"Columns";
constexpr OUStringLiteral ZOOMSLIDER_PARAM_SNAPPINGPOINTS = u"SnappingPoints";
constexpr OUStringLiteral ZOOMSLIDER_PARAM_MINZOOM = u"MinValue";
constexpr OUStringLiteral ZOOMSLIDER_PARAM_MAXZOOM = u"MaxValue";
constexpr OUString ZOOMSLIDER_PARAM_CURRENTZOOM = u"Columns"_ustr;
constexpr OUString ZOOMSLIDER_PARAM_SNAPPINGPOINTS = u"SnappingPoints"_ustr;
constexpr OUString ZOOMSLIDER_PARAM_MINZOOM = u"MinValue"_ustr;
constexpr OUString ZOOMSLIDER_PARAM_MAXZOOM = u"MaxValue"_ustr;
#define ZOOMSLIDER_PARAMS 4
svx/source/mnuctrls/smarttagmenu.cxx
+1 -1
View File
@@ -183,7 +183,7 @@ void SmartTagMenuController::FillMenu()
sal_Int16 nItemCount = m_xPopupMenu->getItemCount();
if (nItemCount > 0)
{
static constexpr OUStringLiteral aCommand = u".uno:AutoCorrectDlg?OpenSmartTag:bool=true";
static constexpr OUString aCommand = u".uno:AutoCorrectDlg?OpenSmartTag:bool=true"_ustr;
m_xPopupMenu->insertSeparator(nItemCount++);
auto aProperties = vcl::CommandInfoProvider::GetCommandProperties(aCommand, m_aModuleName);
m_xPopupMenu->insertItem(nMenuId, vcl::CommandInfoProvider::GetPopupLabelForCommand(aProperties),
svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+1 -1
View File
@@ -37,7 +37,7 @@
using namespace css;
using namespace css::uno;
constexpr OUStringLiteral SIDEBARGRADIENT = u"sidebargradient";
constexpr OUString SIDEBARGRADIENT = u"sidebargradient"_ustr;
namespace svx::sidebar {
svx/source/sidebar/line/LinePropertyPanelBase.cxx
+1 -1
View File
@@ -31,7 +31,7 @@
using namespace css;
using namespace css::uno;
constexpr OUStringLiteral SELECTWIDTH = u"SelectWidth";
constexpr OUString SELECTWIDTH = u"SelectWidth"_ustr;
namespace svx::sidebar {
svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+1 -1
View File
@@ -52,7 +52,7 @@
using namespace css;
using namespace css::uno;
constexpr OUStringLiteral USERITEM_NAME = u"FitItem";
constexpr OUString USERITEM_NAME = u"FitItem"_ustr;
namespace svx::sidebar {
svx/source/svdraw/svdoashp.cxx
+16 -16
View File
@@ -386,7 +386,7 @@ uno::Reference<drawing::XCustomShapeEngine> const & SdrObjCustomShape::GetCustom
aEngine = sEnhancedCustomShapeEngine;
{
static constexpr OUStringLiteral sCustomShape = u"CustomShape";
static constexpr OUString sCustomShape = u"CustomShape"_ustr;
uno::Sequence<beans::PropertyValue> aPropValues{ comphelper::makePropertyValue(sCustomShape,
aXShape) };
uno::Sequence<uno::Any> aArgument{ uno::Any(aPropValues) };
@@ -444,7 +444,7 @@ const SdrObject* SdrObjCustomShape::GetSdrObjectShadowFromCustomShape() const
bool SdrObjCustomShape::IsTextPath() const
{
static constexpr OUStringLiteral sTextPath( u"TextPath" );
static constexpr OUString sTextPath( u"TextPath"_ustr );
bool bTextPathOn = false;
const SdrCustomShapeGeometryItem& rGeometryItem = GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY );
const uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sTextPath, sTextPath );
@@ -457,7 +457,7 @@ bool SdrObjCustomShape::UseNoFillStyle() const
{
bool bRet = false;
OUString sShapeType;
static constexpr OUStringLiteral sType( u"Type" );
static constexpr OUString sType( u"Type"_ustr );
const SdrCustomShapeGeometryItem& rGeometryItem( GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
const uno::Any* pAny = rGeometryItem.GetPropertyValueByName( sType );
if ( pAny )
@@ -841,7 +841,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
{
beans::PropertyValue aPropVal;
OUString sShapeType;
static constexpr OUStringLiteral sType( u"Type" );
static constexpr OUString sType( u"Type"_ustr );
SdrCustomShapeGeometryItem aGeometryItem( GetMergedItem( SDRATTR_CUSTOMSHAPE_GEOMETRY ) );
if ( pType && !pType->isEmpty() )
{
@@ -873,7 +873,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
// AdjustmentValues
static constexpr OUStringLiteral sAdjustmentValues( u"AdjustmentValues" );
static constexpr OUString sAdjustmentValues( u"AdjustmentValues"_ustr );
const uno::Any* pAny = aGeometryItem.GetPropertyValueByName( sAdjustmentValues );
if ( pAny )
*pAny >>= seqAdjustmentValues;
@@ -908,7 +908,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
// Coordsize
static constexpr OUStringLiteral sViewBox( u"ViewBox" );
static constexpr OUString sViewBox( u"ViewBox"_ustr );
const uno::Any* pViewBox = aGeometryItem.GetPropertyValueByName( sViewBox );
awt::Rectangle aViewBox;
if ( !pViewBox || !(*pViewBox >>= aViewBox ) )
@@ -925,12 +925,12 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
}
}
static constexpr OUStringLiteral sPath( u"Path" );
static constexpr OUString sPath( u"Path"_ustr );
// Path/Coordinates
static constexpr OUStringLiteral sCoordinates( u"Coordinates" );
static constexpr OUString sCoordinates( u"Coordinates"_ustr );
pAny = aGeometryItem.GetPropertyValueByName( sPath, sCoordinates );
if ( !pAny && pDefCustomShape && pDefCustomShape->nVertices && pDefCustomShape->pVertices )
{
@@ -948,7 +948,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
}
// Path/GluePoints
static constexpr OUStringLiteral sGluePoints( u"GluePoints" );
static constexpr OUString sGluePoints( u"GluePoints"_ustr );
pAny = aGeometryItem.GetPropertyValueByName( sPath, sGluePoints );
if ( !pAny && pDefCustomShape && pDefCustomShape->nGluePoints && pDefCustomShape->pGluePoints )
{
@@ -966,7 +966,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
}
// Path/Segments
static constexpr OUStringLiteral sSegments( u"Segments" );
static constexpr OUString sSegments( u"Segments"_ustr );
pAny = aGeometryItem.GetPropertyValueByName( sPath, sSegments );
if ( !pAny && pDefCustomShape && pDefCustomShape->nElements && pDefCustomShape->pElements )
{
@@ -985,7 +985,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
}
// Path/StretchX
static constexpr OUStringLiteral sStretchX( u"StretchX" );
static constexpr OUString sStretchX( u"StretchX"_ustr );
pAny = aGeometryItem.GetPropertyValueByName( sPath, sStretchX );
if ( !pAny && pDefCustomShape )
{
@@ -999,7 +999,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
}
// Path/StretchY
static constexpr OUStringLiteral sStretchY( u"StretchY" );
static constexpr OUString sStretchY( u"StretchY"_ustr );
pAny = aGeometryItem.GetPropertyValueByName( sPath, sStretchY );
if ( !pAny && pDefCustomShape )
{
@@ -1013,7 +1013,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
}
// Path/TextFrames
static constexpr OUStringLiteral sTextFrames( u"TextFrames" );
static constexpr OUString sTextFrames( u"TextFrames"_ustr );
pAny = aGeometryItem.GetPropertyValueByName( sPath, sTextFrames );
if ( !pAny && pDefCustomShape && pDefCustomShape->nTextRect && pDefCustomShape->pTextRect )
{
@@ -1034,7 +1034,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
}
// Equations
static constexpr OUStringLiteral sEquations( u"Equations" );
static constexpr OUString sEquations( u"Equations"_ustr );
pAny = aGeometryItem.GetPropertyValueByName( sEquations );
if ( !pAny && pDefCustomShape && pDefCustomShape->nCalculation && pDefCustomShape->pCalculation )
{
@@ -1050,7 +1050,7 @@ void SdrObjCustomShape::MergeDefaultAttributes( const OUString* pType )
}
// Handles
static constexpr OUStringLiteral sHandles( u"Handles" );
static constexpr OUString sHandles( u"Handles"_ustr );
pAny = aGeometryItem.GetPropertyValueByName( sHandles );
if ( !pAny && pDefCustomShape && pDefCustomShape->nHandles && pDefCustomShape->pHandles )
{
@@ -1126,7 +1126,7 @@ bool SdrObjCustomShape::IsDefaultGeometry( const DefaultType eDefaultType ) cons
MSO_SPT eSpType = EnhancedCustomShapeTypeNames::Get( sShapeType );
const mso_CustomShape* pDefCustomShape = GetCustomShapeContent( eSpType );
static constexpr OUStringLiteral sPath( u"Path" );
static constexpr OUString sPath( u"Path"_ustr );
switch( eDefaultType )
{
case DefaultType::Viewbox :
svx/source/svdraw/svdoole2.cxx
+1 -1
View File
@@ -410,7 +410,7 @@ void SAL_CALL SdrLightEmbeddedClient_Impl::deactivatedUI()
css::uno::Reference< css::frame::XLayoutManager > xLayoutManager(getLayoutManager());
if ( xLayoutManager.is() )
{
static constexpr OUStringLiteral aMenuBarURL = u"private:resource/menubar/menubar";
static constexpr OUString aMenuBarURL = u"private:resource/menubar/menubar"_ustr;
if ( !xLayoutManager->isElementVisible( aMenuBarURL ) )
xLayoutManager->createElement( aMenuBarURL );
}
svx/source/svdraw/svdtrans.cxx
+1 -1
View File
@@ -686,7 +686,7 @@ void SdrFormatter::Undirty()
OUString SdrFormatter::GetStr(tools::Long nVal) const
{
static constexpr OUStringLiteral aNullCode(u"0");
static constexpr OUString aNullCode(u"0"_ustr);
if(!nVal)
{
svx/source/svdraw/svdview.cxx
+1 -1
View File
@@ -1170,7 +1170,7 @@ PointerStyle SdrView::GetPreferredPointer(const Point& rMousePos, const OutputDe
return PointerStyle::Arrow;
}
constexpr OUStringLiteral STR_NOTHING = u"nothing";
constexpr OUString STR_NOTHING = u"nothing"_ustr;
OUString SdrView::GetStatusText()
{
OUString aName;
svx/source/table/cellcursor.cxx
+2 -2
View File
@@ -284,7 +284,7 @@ void CellCursor::split_column( sal_Int32 nCol, sal_Int32 nColumns, std::vector<
if( nNewCols > 0 )
{
static constexpr OUStringLiteral sWidth(u"Width");
static constexpr OUString sWidth(u"Width"_ustr);
Reference< XTableColumns > xCols( mxTable->getColumns(), UNO_SET_THROW );
Reference< XPropertySet > xRefColumn( xCols->getByIndex( nCol ), UNO_QUERY_THROW );
sal_Int32 nWidth = 0;
@@ -398,7 +398,7 @@ void CellCursor::split_row( sal_Int32 nRow, sal_Int32 nRows, std::vector< sal_In
if( nNewRows > 0 )
{
static constexpr OUStringLiteral sHeight(u"Height");
static constexpr OUString sHeight(u"Height"_ustr);
Reference< XTableRows > xRows( mxTable->getRows(), UNO_SET_THROW );
Reference< XPropertySet > xRefRow( xRows->getByIndex( nRow ), UNO_QUERY_THROW );
sal_Int32 nHeight = 0;
svx/source/table/svdotable.cxx
+1 -1
View File
@@ -537,7 +537,7 @@ void SdrTableObjImpl::DragEdge( bool mbHorizontal, int nEdge, sal_Int32 nOffset
try
{
static constexpr OUStringLiteral sSize( u"Size" );
static constexpr OUString sSize( u"Size"_ustr );
if( mbHorizontal )
{
if (nEdge <= getRowCount())
svx/source/table/tablecontroller.cxx
+1 -1
View File
@@ -563,7 +563,7 @@ void SvxTableController::onInsert( sal_uInt16 nSId, const SfxItemSet* pArgs )
RemoveSelection();
static constexpr OUStringLiteral sSize( u"Size" );
static constexpr OUString sSize( u"Size"_ustr );
const bool bUndo(rModel.IsUndoEnabled());
switch( nSId )
svx/source/table/tablelayouter.cxx
+1 -1
View File
@@ -48,7 +48,7 @@ namespace sdr::table {
static SvxBorderLine gEmptyBorder;
constexpr OUStringLiteral gsSize( u"Size" );
constexpr OUString gsSize( u"Size"_ustr );
TableLayouter::TableLayouter( TableModelRef xTableModel )
: mxTable(std::move( xTableModel ))
svx/source/table/tablemodel.cxx
+2 -2
View File
@@ -980,7 +980,7 @@ void TableModel::optimize()
{
try
{
static constexpr OUStringLiteral sWidth(u"Width");
static constexpr OUString sWidth(u"Width"_ustr);
sal_Int32 nWidth1 = 0, nWidth2 = 0;
uno::Reference<beans::XPropertySet> xSet1( static_cast< XCellRange* >( maColumns[nCol].get() ), uno::UNO_QUERY_THROW );
uno::Reference<beans::XPropertySet> xSet2( static_cast< XCellRange* >( maColumns[nCol-1].get() ), uno::UNO_QUERY_THROW );
@@ -1017,7 +1017,7 @@ void TableModel::optimize()
{
try
{
static constexpr OUStringLiteral sHeight(u"Height");
static constexpr OUString sHeight(u"Height"_ustr);
sal_Int32 nHeight1 = 0, nHeight2 = 0;
uno::Reference<beans::XPropertySet> xSet1( static_cast< XCellRange* >( maRows[nRow].get() ), uno::UNO_QUERY_THROW );
uno::Reference<beans::XPropertySet> xSet2( static_cast< XCellRange* >( maRows[nRow-1].get() ), uno::UNO_QUERY_THROW );
svx/source/table/tablertfexporter.cxx
+1 -1
View File
@@ -68,7 +68,7 @@ void ExportAsRTF( SvStream& rStrm, SdrTableObj& rObj )
aEx.Write();
}
constexpr OUStringLiteral gsSize( u"Size" );
constexpr OUString gsSize( u"Size"_ustr );
SdrTableRtfExporter::SdrTableRtfExporter( SvStream& rStrm, SdrTableObj& rObj )
: mrStrm( rStrm )
svx/source/tbxctrls/extrusioncontrols.cxx
+14 -14
View File
@@ -43,9 +43,9 @@ namespace svx
{
const sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 };
constexpr OUStringLiteral g_sExtrusionDirection = u".uno:ExtrusionDirection";
constexpr OUStringLiteral g_sExtrusionProjection = u".uno:ExtrusionProjection";
constexpr OUStringLiteral EMPTY = u"";
constexpr OUString g_sExtrusionDirection = u".uno:ExtrusionDirection"_ustr;
constexpr OUString g_sExtrusionProjection = u".uno:ExtrusionProjection"_ustr;
constexpr OUString EMPTY = u""_ustr;
constexpr OUString aLightOffBmps[] =
{
@@ -224,7 +224,7 @@ void ExtrusionDirectionWindow::statusChanged(
IMPL_LINK_NOARG(ExtrusionDirectionWindow, SelectValueSetHdl, ValueSet*, void)
{
Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(
OUString(g_sExtrusionDirection).copy(5),
g_sExtrusionDirection.copy(5),
gSkewList[mxDirectionSet->GetSelectedItemId()-1]) };
mxControl->dispatchCommand( g_sExtrusionDirection, aArgs );
@@ -237,7 +237,7 @@ IMPL_LINK_NOARG(ExtrusionDirectionWindow, SelectToolbarMenuHdl, weld::Toggleable
int nProjection = mxPerspective->get_active() ? 0 : 1;
Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(
OUString(g_sExtrusionProjection).copy(5), static_cast<sal_Int32>(nProjection)) };
g_sExtrusionProjection.copy(5), static_cast<sal_Int32>(nProjection)) };
mxControl->dispatchCommand( g_sExtrusionProjection, aArgs );
implSetProjection( nProjection, true );
@@ -324,8 +324,8 @@ double ExtrusionDepthDialog::getDepth() const
double const aDepthListInch[] = { 0, 1270,2540,5080,10160 };
double const aDepthListMM[] = { 0, 1000, 2500, 5000, 10000 };
constexpr OUStringLiteral gsExtrusionDepth( u".uno:ExtrusionDepth" );
constexpr OUStringLiteral gsMetricUnit( u".uno:MetricUnit" );
constexpr OUString gsExtrusionDepth( u".uno:ExtrusionDepth"_ustr );
constexpr OUString gsMetricUnit( u".uno:MetricUnit"_ustr );
ExtrusionDepthWindow::ExtrusionDepthWindow(svt::PopupWindowController* pControl, weld::Widget* pParent)
: WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/depthwindow.ui", "DepthWindow")
@@ -496,7 +496,7 @@ IMPL_LINK(ExtrusionDepthWindow, SelectHdl, weld::Toggleable&, rButton, void)
}
Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(
OUString(gsExtrusionDepth).copy(5), fDepth) };
gsExtrusionDepth.copy(5), fDepth) };
mxControl->dispatchCommand( gsExtrusionDepth, aArgs );
mbCommandDispatched = true;
@@ -585,8 +585,8 @@ com_sun_star_comp_svx_ExtrusionDepthController_get_implementation(
}
constexpr OUStringLiteral g_sExtrusionLightingDirection = u".uno:ExtrusionLightingDirection";
constexpr OUStringLiteral g_sExtrusionLightingIntensity = u".uno:ExtrusionLightingIntensity";
constexpr OUString g_sExtrusionLightingDirection = u".uno:ExtrusionLightingDirection"_ustr;
constexpr OUString g_sExtrusionLightingIntensity = u".uno:ExtrusionLightingIntensity"_ustr;
ExtrusionLightingWindow::ExtrusionLightingWindow(svt::PopupWindowController* pControl,
weld::Widget* pParent)
@@ -726,7 +726,7 @@ IMPL_LINK_NOARG(ExtrusionLightingWindow, SelectValueSetHdl, ValueSet*, void)
nDirection--;
Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(
OUString(g_sExtrusionLightingDirection).copy(5), nDirection) };
g_sExtrusionLightingDirection.copy(5), nDirection) };
mxControl->dispatchCommand( g_sExtrusionLightingDirection, aArgs );
@@ -750,7 +750,7 @@ IMPL_LINK(ExtrusionLightingWindow, SelectToolbarMenuHdl, weld::Toggleable&, rBut
nLevel = 2;
Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(
OUString(g_sExtrusionLightingIntensity).copy(5), static_cast<sal_Int32>(nLevel)) };
g_sExtrusionLightingIntensity.copy(5), static_cast<sal_Int32>(nLevel)) };
mxControl->dispatchCommand( g_sExtrusionLightingIntensity, aArgs );
@@ -818,7 +818,7 @@ com_sun_star_comp_svx_ExtrusionLightingControl_get_implementation(
}
constexpr OUStringLiteral g_sExtrusionSurface = u".uno:ExtrusionSurface";
constexpr OUString g_sExtrusionSurface = u".uno:ExtrusionSurface"_ustr;
ExtrusionSurfaceWindow::ExtrusionSurfaceWindow(svt::PopupWindowController* pControl, weld::Widget* pParent)
: WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/surfacewindow.ui", "SurfaceWindow")
@@ -894,7 +894,7 @@ IMPL_LINK(ExtrusionSurfaceWindow, SelectHdl, weld::Toggleable&, rButton, void)
nSurface = 4;
Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(
OUString(g_sExtrusionSurface).copy(5), nSurface) };
g_sExtrusionSurface.copy(5), nSurface) };
mxControl->dispatchCommand( g_sExtrusionSurface, aArgs );
svx/source/tbxctrls/fillctrl.cxx
+2 -2
View File
@@ -28,8 +28,8 @@
#include <svx/svxids.hrc>
#include <tools/json_writer.hxx>
constexpr OUStringLiteral TMP_STR_BEGIN = u"[";
constexpr OUStringLiteral TMP_STR_END = u"]";
constexpr OUString TMP_STR_BEGIN = u"["_ustr;
constexpr OUString TMP_STR_END = u"]"_ustr;
#include <svx/drawitem.hxx>
#include <svx/xfillit0.hxx>
svx/source/tbxctrls/fontworkgallery.cxx
+7 -7
View File
@@ -303,7 +303,7 @@ private:
}
constexpr OUStringLiteral gsFontworkAlignment(u".uno:FontworkAlignment");
constexpr OUString gsFontworkAlignment(u".uno:FontworkAlignment"_ustr);
FontworkAlignmentWindow::FontworkAlignmentWindow(svt::PopupWindowController* pControl, weld::Widget* pParent)
: WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/fontworkalignmentcontrol.ui", "FontworkAlignmentControl")
@@ -376,7 +376,7 @@ IMPL_LINK(FontworkAlignmentWindow, SelectHdl, weld::Toggleable&, rButton, void)
nAlignment = 4;
Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(
OUString(gsFontworkAlignment).copy(5), nAlignment) };
gsFontworkAlignment.copy(5), nAlignment) };
mxControl->dispatchCommand( gsFontworkAlignment, aArgs );
@@ -498,8 +498,8 @@ private:
}
constexpr OUStringLiteral gsFontworkCharacterSpacing(u".uno:FontworkCharacterSpacing");
constexpr OUStringLiteral gsFontworkKernCharacterPairs(u".uno:FontworkKernCharacterPairs");
constexpr OUString gsFontworkCharacterSpacing(u".uno:FontworkCharacterSpacing"_ustr);
constexpr OUString gsFontworkKernCharacterPairs(u".uno:FontworkKernCharacterPairs"_ustr);
FontworkCharacterSpacingWindow::FontworkCharacterSpacingWindow(svt::PopupWindowController* pControl, weld::Widget* pParent)
: WeldToolbarPopup(pControl->getFrameInterface(), pParent, "svx/ui/fontworkcharacterspacingcontrol.ui", "FontworkCharacterSpacingControl")
@@ -624,7 +624,7 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, KernSelectHdl, weld::Toggleable&
bool bKernOnOff = mxKernPairs->get_active();
Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(
OUString(gsFontworkKernCharacterPairs).copy(5), bKernOnOff) };
gsFontworkKernCharacterPairs.copy(5), bKernOnOff) };
mxControl->dispatchCommand( gsFontworkKernCharacterPairs, aArgs );
mbCommandDispatched = true;
@@ -637,7 +637,7 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, KernSelectHdl, weld::Toggleable&
void FontworkCharacterSpacingWindow::DispatchSpacingDialog()
{
Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(
OUString(gsFontworkCharacterSpacing).copy(5), mnCharacterSpacing) };
gsFontworkCharacterSpacing.copy(5), mnCharacterSpacing) };
rtl::Reference<svt::PopupWindowController> xControl(mxControl);
xControl->EndPopupMode();
@@ -676,7 +676,7 @@ IMPL_LINK(FontworkCharacterSpacingWindow, SelectHdl, weld::Toggleable&, rButton,
nCharacterSpacing = 100;
Sequence< PropertyValue > aArgs{ comphelper::makePropertyValue(
OUString(gsFontworkCharacterSpacing).copy(5), nCharacterSpacing) };
gsFontworkCharacterSpacing.copy(5), nCharacterSpacing) };
mxControl->dispatchCommand( gsFontworkCharacterSpacing, aArgs );
mbCommandDispatched = true;
svx/source/tbxctrls/grafctrl.cxx
+2 -2
View File
@@ -64,7 +64,7 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::lang;
constexpr OUStringLiteral TOOLBOX_NAME = u"colorbar";
constexpr OUString TOOLBOX_NAME = u"colorbar"_ustr;
#define RID_SVXSTR_UNDO_GRAFCROP RID_SVXSTR_GRAFCROP
namespace {
@@ -163,7 +163,7 @@ struct CommandToRID
static OUString ImplGetRID( std::u16string_view aCommand )
{
static constexpr OUStringLiteral EMPTY = u"";
static constexpr OUString EMPTY = u""_ustr;
static constexpr CommandToRID aImplCommandToResMap[] =
{
{ ".uno:GrafRed", RID_SVXBMP_GRAF_RED },
svx/source/tbxctrls/tbcontrl.cxx
+1 -1
View File
@@ -4188,7 +4188,7 @@ void SvxCurrencyToolBoxControl::inner_GetCurrencySymbols(
CollatorWrapper aCollator( ::comphelper::getProcessComponentContext() );
aCollator.loadDefaultCollator( Application::GetSettings().GetLanguageTag().getLocale(), 0 );
static constexpr OUStringLiteral aTwoSpace(u" ");
static constexpr OUString aTwoSpace(u" "_ustr);
// appending "long symbol" list
for( sal_uInt16 i = 1; i < nCount; ++i )
svx/source/tbxctrls/tbunosearchcontrollers.cxx
+9 -9
View File
@@ -67,12 +67,12 @@ using namespace css;
namespace {
constexpr OUStringLiteral COMMAND_FINDTEXT = u".uno:FindText";
constexpr OUStringLiteral COMMAND_DOWNSEARCH = u".uno:DownSearch";
constexpr OUStringLiteral COMMAND_UPSEARCH = u".uno:UpSearch";
constexpr OUString COMMAND_FINDTEXT = u".uno:FindText"_ustr;
constexpr OUString COMMAND_DOWNSEARCH = u".uno:DownSearch"_ustr;
constexpr OUString COMMAND_UPSEARCH = u".uno:UpSearch"_ustr;
constexpr OUStringLiteral COMMAND_FINDALL = u".uno:FindAll";
constexpr OUStringLiteral COMMAND_MATCHCASE = u".uno:MatchCase";
constexpr OUStringLiteral COMMAND_SEARCHFORMATTED = u".uno:SearchFormattedDisplayString";
constexpr OUString COMMAND_MATCHCASE = u".uno:MatchCase"_ustr;
constexpr OUString COMMAND_SEARCHFORMATTED = u".uno:SearchFormattedDisplayString"_ustr;
class CheckButtonItemWindow final : public InterimItemWindow
{
@@ -296,7 +296,7 @@ IMPL_LINK(FindTextFieldControl, KeyInputHdl, const KeyEvent&, rKeyEvent, bool)
aValue >>= xLayoutManager;
if (xLayoutManager.is())
{
static constexpr OUStringLiteral sResourceURL( u"private:resource/toolbar/findbar" );
static constexpr OUString sResourceURL( u"private:resource/toolbar/findbar"_ustr );
xLayoutManager->hideElement( sResourceURL );
xLayoutManager->destroyElement( sResourceURL );
}
@@ -718,7 +718,7 @@ private:
UpDownSearchToolboxController::UpDownSearchToolboxController( const css::uno::Reference< css::uno::XComponentContext > & rxContext, Type eType )
: UpDownSearchToolboxController_Base( rxContext,
css::uno::Reference< css::frame::XFrame >(),
(eType == UP) ? OUString( COMMAND_UPSEARCH ): OUString( COMMAND_DOWNSEARCH ) ),
(eType == UP) ? COMMAND_UPSEARCH: COMMAND_DOWNSEARCH ),
meType( eType )
{
}
@@ -1126,7 +1126,7 @@ void SAL_CALL ExitSearchToolboxController::execute( sal_Int16 /*KeyModifier*/ )
aValue >>= xLayoutManager;
if (xLayoutManager.is())
{
static constexpr OUStringLiteral sResourceURL( u"private:resource/toolbar/findbar" );
static constexpr OUString sResourceURL( u"private:resource/toolbar/findbar"_ustr );
xLayoutManager->hideElement( sResourceURL );
xLayoutManager->destroyElement( sResourceURL );
}
@@ -1371,7 +1371,7 @@ void SAL_CALL FindbarDispatcher::dispatch( const css::util::URL& aURL, const css
if (!xLayoutManager.is())
return;
static constexpr OUStringLiteral sResourceURL( u"private:resource/toolbar/findbar" );
static constexpr OUString sResourceURL( u"private:resource/toolbar/findbar"_ustr );
css::uno::Reference< css::ui::XUIElement > xUIElement = xLayoutManager->getElement(sResourceURL);
if (!xUIElement.is())
{
svx/source/toolbars/extrusionbar.cxx
+10 -10
View File
@@ -117,8 +117,8 @@ static void getLightingDirectionDefaults( const Direction3D **pLighting1Defaults
static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& rGeometryItem, SdrObject* pObj )
{
static constexpr OUStringLiteral sExtrusion = u"Extrusion";
static constexpr OUStringLiteral sRotateAngle = u"RotateAngle";
static constexpr OUString sExtrusion = u"Extrusion"_ustr;
static constexpr OUString sRotateAngle = u"RotateAngle"_ustr;
sal_uInt16 nSID = rReq.GetSlot();
switch( nSID )
@@ -686,7 +686,7 @@ static void getExtrusionDirectionState( SdrView const * pSdrView, SfxItemSet& rS
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
static constexpr OUStringLiteral sExtrusion = u"Extrusion";
static constexpr OUString sExtrusion = u"Extrusion"_ustr;
const css::uno::Any* pAny;
@@ -833,7 +833,7 @@ static void getExtrusionProjectionState( SdrView const * pSdrView, SfxItemSet& r
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
static constexpr OUStringLiteral sExtrusion = u"Extrusion";
static constexpr OUString sExtrusion = u"Extrusion"_ustr;
const css::uno::Any* pAny;
@@ -888,7 +888,7 @@ static void getExtrusionSurfaceState( SdrView const * pSdrView, SfxItemSet& rSet
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
static constexpr OUStringLiteral sExtrusion = u"Extrusion";
static constexpr OUString sExtrusion = u"Extrusion"_ustr;
const css::uno::Any* pAny;
@@ -981,7 +981,7 @@ static void getExtrusionDepthState( SdrView const * pSdrView, SfxItemSet& rSet )
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
static constexpr OUStringLiteral sExtrusion = u"Extrusion";
static constexpr OUString sExtrusion = u"Extrusion"_ustr;
const css::uno::Any* pAny;
@@ -1058,7 +1058,7 @@ static void getExtrusionLightingDirectionState( SdrView const * pSdrView, SfxIte
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
static constexpr OUStringLiteral sExtrusion = u"Extrusion";
static constexpr OUString sExtrusion = u"Extrusion"_ustr;
const Direction3D * pLighting1Defaults;
const Direction3D * pLighting2Defaults;
@@ -1137,7 +1137,7 @@ static void getExtrusionLightingIntensityState( SdrView const * pSdrView, SfxIte
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
static constexpr OUStringLiteral sExtrusion = u"Extrusion";
static constexpr OUString sExtrusion = u"Extrusion"_ustr;
const css::uno::Any* pAny;
@@ -1204,7 +1204,7 @@ static void getExtrusionColorState( SdrView const * pSdrView, SfxItemSet& rSet )
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
static constexpr OUStringLiteral sExtrusion = u"Extrusion";
static constexpr OUString sExtrusion = u"Extrusion"_ustr;
const css::uno::Any* pAny;
@@ -1273,7 +1273,7 @@ static void getExtrusionColorState( SdrView const * pSdrView, SfxItemSet& rSet )
namespace svx {
bool checkForSelectedCustomShapes( SdrView const * pSdrView, bool bOnlyExtruded )
{
static constexpr OUStringLiteral sExtrusion = u"Extrusion";
static constexpr OUString sExtrusion = u"Extrusion"_ustr;
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
const size_t nCount = rMarkList.GetMarkCount();
svx/source/toolbars/fontworkbar.cxx
+8 -8
View File
@@ -207,7 +207,7 @@ FontworkBar::~FontworkBar()
namespace svx {
bool checkForFontWork( const SdrObject* pObj )
{
static constexpr OUStringLiteral sTextPath = u"TextPath";
static constexpr OUString sTextPath = u"TextPath"_ustr;
bool bFound = false;
if( dynamic_cast<const SdrObjCustomShape*>( pObj) != nullptr )
@@ -305,19 +305,19 @@ static void impl_execute( SfxRequest const & rReq, SdrCustomShapeGeometryItem& r
static void GetGeometryForCustomShape( SdrCustomShapeGeometryItem& rGeometryItem, const OUString& rCustomShape )
{
static constexpr OUStringLiteral sType( u"Type" );
static constexpr OUString sType( u"Type"_ustr );
css::beans::PropertyValue aPropVal;
aPropVal.Name = sType;
aPropVal.Value <<= rCustomShape;
rGeometryItem.SetPropertyValue( aPropVal );
static constexpr OUStringLiteral sAdjustmentValues( u"AdjustmentValues" );
static constexpr OUStringLiteral sCoordinateOrigin( u"CoordinateOrigin" );
static constexpr OUStringLiteral sCoordinateSize( u"CoordinateSize" );
static constexpr OUStringLiteral sEquations( u"Equations" );
static constexpr OUStringLiteral sHandles( u"Handles" );
static constexpr OUStringLiteral sPath( u"Path" );
static constexpr OUString sAdjustmentValues( u"AdjustmentValues"_ustr );
static constexpr OUString sCoordinateOrigin( u"CoordinateOrigin"_ustr );
static constexpr OUString sCoordinateSize( u"CoordinateSize"_ustr );
static constexpr OUString sEquations( u"Equations"_ustr );
static constexpr OUString sHandles( u"Handles"_ustr );
static constexpr OUString sPath( u"Path"_ustr );
rGeometryItem.ClearPropertyValue( sAdjustmentValues );
rGeometryItem.ClearPropertyValue( sCoordinateOrigin );
rGeometryItem.ClearPropertyValue( sCoordinateSize );
svx/source/unodraw/unomod.cxx
+1 -1
View File
@@ -374,7 +374,7 @@ uno::Reference< uno::XInterface > SAL_CALL SvxUnoDrawingModel::createInstance( c
uno::Reference< uno::XInterface > xRet;
static constexpr OUStringLiteral aPackagePrefix( u"com.sun.star.presentation." );
static constexpr OUString aPackagePrefix( u"com.sun.star.presentation."_ustr );
if( aServiceSpecifier.startsWith( aPackagePrefix ) )
{
SvxShape* pShape = nullptr;
svx/source/unodraw/unoshape.cxx
+37 -37
View File
@@ -3126,49 +3126,49 @@ OUString SAL_CALL SvxShape::getImplementationName()
return "SvxShape";
}
constexpr OUStringLiteral sUNO_service_style_ParagraphProperties = u"com.sun.star.style.ParagraphProperties";
constexpr OUStringLiteral sUNO_service_style_ParagraphPropertiesComplex = u"com.sun.star.style.ParagraphPropertiesComplex";
constexpr OUStringLiteral sUNO_service_style_ParagraphPropertiesAsian = u"com.sun.star.style.ParagraphPropertiesAsian";
constexpr OUStringLiteral sUNO_service_style_CharacterProperties = u"com.sun.star.style.CharacterProperties";
constexpr OUStringLiteral sUNO_service_style_CharacterPropertiesComplex = u"com.sun.star.style.CharacterPropertiesComplex";
constexpr OUStringLiteral sUNO_service_style_CharacterPropertiesAsian = u"com.sun.star.style.CharacterPropertiesAsian";
constexpr OUString sUNO_service_style_ParagraphProperties = u"com.sun.star.style.ParagraphProperties"_ustr;
constexpr OUString sUNO_service_style_ParagraphPropertiesComplex = u"com.sun.star.style.ParagraphPropertiesComplex"_ustr;
constexpr OUString sUNO_service_style_ParagraphPropertiesAsian = u"com.sun.star.style.ParagraphPropertiesAsian"_ustr;
constexpr OUString sUNO_service_style_CharacterProperties = u"com.sun.star.style.CharacterProperties"_ustr;
constexpr OUString sUNO_service_style_CharacterPropertiesComplex = u"com.sun.star.style.CharacterPropertiesComplex"_ustr;
constexpr OUString sUNO_service_style_CharacterPropertiesAsian = u"com.sun.star.style.CharacterPropertiesAsian"_ustr;
constexpr OUStringLiteral sUNO_service_drawing_FillProperties = u"com.sun.star.drawing.FillProperties";
constexpr OUStringLiteral sUNO_service_drawing_TextProperties = u"com.sun.star.drawing.TextProperties";
constexpr OUStringLiteral sUNO_service_drawing_LineProperties = u"com.sun.star.drawing.LineProperties";
constexpr OUStringLiteral sUNO_service_drawing_ConnectorProperties = u"com.sun.star.drawing.ConnectorProperties";
constexpr OUStringLiteral sUNO_service_drawing_MeasureProperties = u"com.sun.star.drawing.MeasureProperties";
constexpr OUStringLiteral sUNO_service_drawing_ShadowProperties = u"com.sun.star.drawing.ShadowProperties";
constexpr OUString sUNO_service_drawing_FillProperties = u"com.sun.star.drawing.FillProperties"_ustr;
constexpr OUString sUNO_service_drawing_TextProperties = u"com.sun.star.drawing.TextProperties"_ustr;
constexpr OUString sUNO_service_drawing_LineProperties = u"com.sun.star.drawing.LineProperties"_ustr;
constexpr OUString sUNO_service_drawing_ConnectorProperties = u"com.sun.star.drawing.ConnectorProperties"_ustr;
constexpr OUString sUNO_service_drawing_MeasureProperties = u"com.sun.star.drawing.MeasureProperties"_ustr;
constexpr OUString sUNO_service_drawing_ShadowProperties = u"com.sun.star.drawing.ShadowProperties"_ustr;
constexpr OUStringLiteral sUNO_service_drawing_RotationDescriptor = u"com.sun.star.drawing.RotationDescriptor";
constexpr OUString sUNO_service_drawing_RotationDescriptor = u"com.sun.star.drawing.RotationDescriptor"_ustr;
constexpr OUStringLiteral sUNO_service_drawing_Text = u"com.sun.star.drawing.Text";
constexpr OUStringLiteral sUNO_service_drawing_GroupShape = u"com.sun.star.drawing.GroupShape";
constexpr OUString sUNO_service_drawing_Text = u"com.sun.star.drawing.Text"_ustr;
constexpr OUString sUNO_service_drawing_GroupShape = u"com.sun.star.drawing.GroupShape"_ustr;
constexpr OUStringLiteral sUNO_service_drawing_CustomShapeProperties = u"com.sun.star.drawing.CustomShapeProperties";
constexpr OUStringLiteral sUNO_service_drawing_CustomShape = u"com.sun.star.drawing.CustomShape";
constexpr OUString sUNO_service_drawing_CustomShapeProperties = u"com.sun.star.drawing.CustomShapeProperties"_ustr;
constexpr OUString sUNO_service_drawing_CustomShape = u"com.sun.star.drawing.CustomShape"_ustr;
constexpr OUStringLiteral sUNO_service_drawing_PolyPolygonDescriptor = u"com.sun.star.drawing.PolyPolygonDescriptor";
constexpr OUStringLiteral sUNO_service_drawing_PolyPolygonBezierDescriptor= u"com.sun.star.drawing.PolyPolygonBezierDescriptor";
constexpr OUString sUNO_service_drawing_PolyPolygonDescriptor = u"com.sun.star.drawing.PolyPolygonDescriptor"_ustr;
constexpr OUString sUNO_service_drawing_PolyPolygonBezierDescriptor= u"com.sun.star.drawing.PolyPolygonBezierDescriptor"_ustr;
constexpr OUStringLiteral sUNO_service_drawing_LineShape = u"com.sun.star.drawing.LineShape";
constexpr OUStringLiteral sUNO_service_drawing_Shape = u"com.sun.star.drawing.Shape";
constexpr OUStringLiteral sUNO_service_drawing_RectangleShape = u"com.sun.star.drawing.RectangleShape";
constexpr OUStringLiteral sUNO_service_drawing_EllipseShape = u"com.sun.star.drawing.EllipseShape";
constexpr OUStringLiteral sUNO_service_drawing_PolyPolygonShape = u"com.sun.star.drawing.PolyPolygonShape";
constexpr OUStringLiteral sUNO_service_drawing_PolyLineShape = u"com.sun.star.drawing.PolyLineShape";
constexpr OUStringLiteral sUNO_service_drawing_OpenBezierShape = u"com.sun.star.drawing.OpenBezierShape";
constexpr OUStringLiteral sUNO_service_drawing_ClosedBezierShape = u"com.sun.star.drawing.ClosedBezierShape";
constexpr OUStringLiteral sUNO_service_drawing_TextShape = u"com.sun.star.drawing.TextShape";
constexpr OUStringLiteral sUNO_service_drawing_GraphicObjectShape = u"com.sun.star.drawing.GraphicObjectShape";
constexpr OUStringLiteral sUNO_service_drawing_OLE2Shape = u"com.sun.star.drawing.OLE2Shape";
constexpr OUStringLiteral sUNO_service_drawing_PageShape = u"com.sun.star.drawing.PageShape";
constexpr OUStringLiteral sUNO_service_drawing_CaptionShape = u"com.sun.star.drawing.CaptionShape";
constexpr OUStringLiteral sUNO_service_drawing_MeasureShape = u"com.sun.star.drawing.MeasureShape";
constexpr OUStringLiteral sUNO_service_drawing_FrameShape = u"com.sun.star.drawing.FrameShape";
constexpr OUStringLiteral sUNO_service_drawing_ControlShape = u"com.sun.star.drawing.ControlShape";
constexpr OUStringLiteral sUNO_service_drawing_ConnectorShape = u"com.sun.star.drawing.ConnectorShape";
constexpr OUStringLiteral sUNO_service_drawing_MediaShape = u"com.sun.star.drawing.MediaShape";
constexpr OUString sUNO_service_drawing_LineShape = u"com.sun.star.drawing.LineShape"_ustr;
constexpr OUString sUNO_service_drawing_Shape = u"com.sun.star.drawing.Shape"_ustr;
constexpr OUString sUNO_service_drawing_RectangleShape = u"com.sun.star.drawing.RectangleShape"_ustr;
constexpr OUString sUNO_service_drawing_EllipseShape = u"com.sun.star.drawing.EllipseShape"_ustr;
constexpr OUString sUNO_service_drawing_PolyPolygonShape = u"com.sun.star.drawing.PolyPolygonShape"_ustr;
constexpr OUString sUNO_service_drawing_PolyLineShape = u"com.sun.star.drawing.PolyLineShape"_ustr;
constexpr OUString sUNO_service_drawing_OpenBezierShape = u"com.sun.star.drawing.OpenBezierShape"_ustr;
constexpr OUString sUNO_service_drawing_ClosedBezierShape = u"com.sun.star.drawing.ClosedBezierShape"_ustr;
constexpr OUString sUNO_service_drawing_TextShape = u"com.sun.star.drawing.TextShape"_ustr;
constexpr OUString sUNO_service_drawing_GraphicObjectShape = u"com.sun.star.drawing.GraphicObjectShape"_ustr;
constexpr OUString sUNO_service_drawing_OLE2Shape = u"com.sun.star.drawing.OLE2Shape"_ustr;
constexpr OUString sUNO_service_drawing_PageShape = u"com.sun.star.drawing.PageShape"_ustr;
constexpr OUString sUNO_service_drawing_CaptionShape = u"com.sun.star.drawing.CaptionShape"_ustr;
constexpr OUString sUNO_service_drawing_MeasureShape = u"com.sun.star.drawing.MeasureShape"_ustr;
constexpr OUString sUNO_service_drawing_FrameShape = u"com.sun.star.drawing.FrameShape"_ustr;
constexpr OUString sUNO_service_drawing_ControlShape = u"com.sun.star.drawing.ControlShape"_ustr;
constexpr OUString sUNO_service_drawing_ConnectorShape = u"com.sun.star.drawing.ConnectorShape"_ustr;
constexpr OUString sUNO_service_drawing_MediaShape = u"com.sun.star.drawing.MediaShape"_ustr;
uno::Sequence< OUString > SAL_CALL SvxShape::getSupportedServiceNames()
svx/source/xml/xmleohlp.cxx
+1 -1
View File
@@ -60,7 +60,7 @@ using namespace ::com::sun::star::lang;
constexpr OUStringLiteral XML_CONTAINERSTORAGE_NAME_60 = u"Pictures";
constexpr OUStringLiteral XML_CONTAINERSTORAGE_NAME = u"ObjectReplacements";
constexpr OUStringLiteral XML_EMBEDDEDOBJECT_URL_BASE = u"vnd.sun.star.EmbeddedObject:";
constexpr OUString XML_EMBEDDEDOBJECT_URL_BASE = u"vnd.sun.star.EmbeddedObject:"_ustr;
constexpr OUStringLiteral XML_EMBEDDEDOBJECTGRAPHIC_URL_BASE = u"vnd.sun.star.GraphicObject:";
svx/source/xoutdev/_xoutbmp.cxx
+4 -4
View File
@@ -34,13 +34,13 @@
constexpr OUStringLiteral FORMAT_SVG = u"svg";
constexpr OUStringLiteral FORMAT_WMF = u"wmf";
constexpr OUStringLiteral FORMAT_EMF = u"emf";
constexpr OUString FORMAT_EMF = u"emf"_ustr;
constexpr OUStringLiteral FORMAT_PDF = u"pdf";
constexpr OUStringLiteral FORMAT_BMP = u"bmp";
constexpr OUStringLiteral FORMAT_GIF = u"gif";
constexpr OUString FORMAT_BMP = u"bmp"_ustr;
constexpr OUString FORMAT_GIF = u"gif"_ustr;
constexpr OUStringLiteral FORMAT_JPG = u"jpg";
constexpr OUStringLiteral FORMAT_PNG = u"png";
constexpr OUString FORMAT_PNG = u"png"_ustr;
constexpr OUStringLiteral FORMAT_TIF = u"tif";
constexpr OUStringLiteral FORMAT_WEBP = u"webp";