sc/source/ui/view/SparklineShell.cxx | 7 +++++--
sc/source/ui/view/auditsh.cxx | 4 ++--
sc/source/ui/view/cellsh.cxx | 8 ++++----
sc/source/ui/view/cellsh1.cxx | 18 +++++++++---------
sc/source/ui/view/cellsh2.cxx | 6 +++---
sc/source/ui/view/cellsh3.cxx | 18 +++++++++---------
sc/source/ui/view/drawvie4.cxx | 4 ++--
sc/source/ui/view/editsh.cxx | 8 ++++----
sc/source/ui/view/formatsh.cxx | 4 ++--
sc/source/ui/view/gridwin.cxx | 18 +++++++++---------
sc/source/ui/view/gridwin4.cxx | 2 +-
sc/source/ui/view/hdrcont.cxx | 6 +++---
sc/source/ui/view/output2.cxx | 12 ++++++------
sc/source/ui/view/pgbrksh.cxx | 4 ++--
sc/source/ui/view/pivotsh.cxx | 4 ++--
sc/source/ui/view/prevwsh.cxx | 6 +++---
sc/source/ui/view/printfun.cxx | 6 +++---
sc/source/ui/view/tabcont.cxx | 6 +++---
sc/source/ui/view/tabvwsh4.cxx | 6 +++---
sc/source/ui/view/tabvwsha.cxx | 2 +-
sc/source/ui/view/tabvwshb.cxx | 4 ++--
sc/source/ui/view/tabvwshg.cxx | 12 ++++++------
sc/source/ui/view/viewdata.cxx | 2 +-
sc/source/ui/view/viewfun2.cxx | 10 +++++-----
sc/source/ui/view/viewfun3.cxx | 24 ++++++++++++------------
sc/source/ui/view/viewfun4.cxx | 6 +++---
sc/source/ui/view/viewfun5.cxx | 2 +-
sc/source/ui/view/viewfun6.cxx | 2 +-
sc/source/ui/view/viewfun7.cxx | 4 ++--
sc/source/ui/view/viewfunc.cxx | 32 ++++++++++++++++----------------
30 files changed, 125 insertions(+), 122 deletions(-)
New commits:
commit f9ffaeaf7b2dce382474dbbb61819a2c039c0bf6
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sat Jun 1 10:27:57 2024 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Sat Jun 1 20:00:59 2024 +0200
loplugin:ostr in sc/../view
Change-Id: I24e84cd42e3f55761fbc1fb8ae9b2cf3fc7bd385
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168309
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/source/ui/view/SparklineShell.cxx
b/sc/source/ui/view/SparklineShell.cxx
index 9de6c6af1e02..1cf505df8a37 100644
--- a/sc/source/ui/view/SparklineShell.cxx
+++ b/sc/source/ui/view/SparklineShell.cxx
@@ -23,7 +23,10 @@ namespace sc
{
SFX_IMPL_INTERFACE(SparklineShell, SfxShell)
-void SparklineShell::InitInterface_Impl() {
GetStaticInterface()->RegisterPopupMenu("sparkline"); }
+void SparklineShell::InitInterface_Impl()
+{
+ GetStaticInterface()->RegisterPopupMenu(u"sparkline"_ustr);
+}
SparklineShell::SparklineShell(ScTabViewShell* pViewShell)
: SfxShell(pViewShell)
@@ -37,7 +40,7 @@ SparklineShell::SparklineShell(ScTabViewShell* pViewShell)
{
pUndoManager->SetMaxUndoActionCount(0);
}
- SetName("Sparkline");
+ SetName(u"Sparkline"_ustr);
SfxShell::SetContextName(
vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Sparkline));
}
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index 2ea903f59e75..d1dcff0aa65f 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -36,7 +36,7 @@ SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell)
void ScAuditingShell::InitInterface_Impl()
{
- GetStaticInterface()->RegisterPopupMenu("audit");
+ GetStaticInterface()->RegisterPopupMenu(u"audit"_ustr);
}
ScAuditingShell::ScAuditingShell(ScViewData& rData) :
@@ -51,7 +51,7 @@ ScAuditingShell::ScAuditingShell(ScViewData& rData) :
{
pMgr->SetMaxUndoActionCount( 0 );
}
- SetName("Auditing");
+ SetName(u"Auditing"_ustr);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Auditing));
}
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index d907daf51ac2..ffffb61a5618 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -67,7 +67,7 @@ void ScCellShell::InitInterface_Impl()
SfxVisibilityFlags::Standard |
SfxVisibilityFlags::Server,
ToolbarId::Objectbar_Format);
- GetStaticInterface()->RegisterPopupMenu("cell");
+ GetStaticInterface()->RegisterPopupMenu(u"cell"_ustr);
}
ScCellShell::ScCellShell(ScViewData& rData, const VclPtr<vcl::Window>&
frameWin) :
@@ -76,7 +76,7 @@ ScCellShell::ScCellShell(ScViewData& rData, const
VclPtr<vcl::Window>& frameWin)
bPastePossible(false),
pFrameWin(frameWin)
{
- SetName("Cell");
+ SetName(u"Cell"_ustr);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Cell));
}
@@ -883,7 +883,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
// In interpreter may happen via rescheduled Basic
if ( rDoc.IsInInterpreter() )
- rSet.Put( SvxStatusItem( SID_TABLE_CELL, "...",
StatusCategory::Formula ) );
+ rSet.Put( SvxStatusItem( SID_TABLE_CELL, u"..."_ustr,
StatusCategory::Formula ) );
else
{
FormulaError nErrCode = FormulaError::NONE;
@@ -998,7 +998,7 @@ void ScCellShell::GetState(SfxItemSet &rSet)
rDoc.GetScenarioData( nScTab, aStr, aDummyCol,
nFlags );
aList.push_back(aStr);
// Protection is sal_True if both Sheet and
Scenario are protected
- aList.push_back((bSheetProtected && (nFlags &
ScScenarioFlags::Protected)) ? OUString("1") : OUString("0"));
+ aList.push_back((bSheetProtected && (nFlags &
ScScenarioFlags::Protected)) ? u"1"_ustr : u"0"_ustr);
++nScTab;
}
}
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index 3c59c4dfed9f..50c5635a3b18 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -1704,7 +1704,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
rReq.SetSlot(FID_INS_CELL_CONTENTS);
// paste links to values/numbers, strings, formulas and dates
// do not paste attributes, notes and objects
- rReq.AppendItem(SfxStringItem(FID_INS_CELL_CONTENTS, "VSFD"));
+ rReq.AppendItem(SfxStringItem(FID_INS_CELL_CONTENTS,
u"VSFD"_ustr));
rReq.AppendItem(SfxBoolItem(FN_PARAM_4, true)); // as link
ExecuteSlot(rReq, GetInterface());
rReq.SetReturnValue(SfxInt16Item(nSlot, 1)); // 1 = success
@@ -1835,9 +1835,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
SfxViewFrame& rViewFrame =
pTabViewShell->GetViewFrame();
auto xFrame =
rViewFrame.GetFrame().GetFrameInterface();
const OUString
aModuleName(vcl::CommandInfoProvider::GetModuleIdentifier(xFrame));
- auto aProperties =
vcl::CommandInfoProvider::GetCommandProperties(".uno:PasteTextImportDialog",
aModuleName);
+ auto aProperties =
vcl::CommandInfoProvider::GetCommandProperties(u".uno:PasteTextImportDialog"_ustr,
aModuleName);
OUString
sLabel(vcl::CommandInfoProvider::GetTooltipLabelForCommand(aProperties));
- pDlg->InsertUno(".uno:PasteTextImportDialog",
sLabel);
+
pDlg->InsertUno(u".uno:PasteTextImportDialog"_ustr, sLabel);
TransferableDataHelper aDataHelper(
TransferableDataHelper::CreateFromSystemClipboard( pWin ) );
@@ -2000,7 +2000,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
Reference< ui::dialogs::XExecutableDialog > xDialog(
xMCF->createInstanceWithContext(
-
"com.sun.star.linguistic2.ChineseTranslationDialog"
+
u"com.sun.star.linguistic2.ChineseTranslationDialog"_ustr
, xContext),
UNO_QUERY);
Reference< lang::XInitialization > xInit( xDialog,
UNO_QUERY );
@@ -2026,9 +2026,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
{
try
{
-
xProp->getPropertyValue("IsDirectionToSimplified") >>= bToSimplified;
-
xProp->getPropertyValue("IsUseCharacterVariants") >>= bUseVariants;
-
xProp->getPropertyValue("IsTranslateCommonTerms") >>= bCommonTerms;
+
xProp->getPropertyValue(u"IsDirectionToSimplified"_ustr) >>= bToSimplified;
+
xProp->getPropertyValue(u"IsUseCharacterVariants"_ustr) >>= bUseVariants;
+
xProp->getPropertyValue(u"IsTranslateCommonTerms"_ustr) >>= bCommonTerms;
}
catch( Exception& )
{
@@ -3020,7 +3020,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
const SfxItemSet *pArgs = rReq.GetArgs();
const OUString sFunction = pArgs ?
static_cast<const SfxStringItem&>( pArgs->Get(
SID_AUTO_SUM ) ).GetValue()
- : "";
+ : u""_ustr;
OpCode eFunction = ocSum;
if (sFunction == "average")
@@ -3579,7 +3579,7 @@ void ScCellShell::ExecuteSubtotals(SfxRequest& rReq)
aArgSet.Put( ScSubTotalItem( SCITEM_SUBTDATA, &GetViewData(),
&aSubTotalParam ) );
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
pDlg.disposeAndReset(pFact->CreateScSubTotalDlg(pTabViewShell->GetFrameWeld(),
aArgSet));
- pDlg->SetCurPageId("1stgroup");
+ pDlg->SetCurPageId(u"1stgroup"_ustr);
short bResult = pDlg->Execute();
diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 594186f4120e..91f24d70a0fa 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -251,7 +251,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
{
uno::Reference<frame::XFrame> xFrame =
rViewFrame.GetFrame().GetFrameInterface();
uno::Reference<frame::XFrame> xBeamerFrame =
xFrame->findFrame(
- "_beamer",
+ u"_beamer"_ustr,
frame::FrameSearchFlag::CHILDREN);
if ( xBeamerFrame.is() )
bWasOpen = true;
@@ -526,7 +526,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
std::shared_ptr<ScAsyncTabController>
pDlg(pFact->CreateScSortDlg(pTabViewShell->GetFrameWeld(), &aArgSet));
- pDlg->SetCurPageId("criteria"); // 1=sort field tab
2=sort options tab
+ pDlg->SetCurPageId(u"criteria"_ustr); // 1=sort field
tab 2=sort options tab
VclAbstractDialog::AsyncContext aContext;
aContext.maEndDialogFn = [pDlg, &rData,
pTabViewShell](sal_Int32 nResult)
@@ -812,7 +812,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq )
case SID_DATA_PROVIDER:
{
auto xDoc = o3tl::make_shared<ScDocument>();
- xDoc->InsertTab(0, "test");
+ xDoc->InsertTab(0, u"test"_ustr);
ScDocument& rDoc = GetViewData().GetDocument();
ScDataProviderDlg aDialog(pTabViewShell->GetDialogParent(), xDoc,
&rDoc);
if (aDialog.run() == RET_OK)
diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index 703fe8d153e7..6dba303ea028 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -491,25 +491,25 @@ void ScCellShell::Execute( SfxRequest& rReq )
}
else
{
- pTabViewShell->ExecuteCellFormatDlg( rReq, "" );
+ pTabViewShell->ExecuteCellFormatDlg( rReq, u""_ustr );
}
}
break;
case SID_ENABLE_HYPHENATION:
- pTabViewShell->ExecuteCellFormatDlg(rReq, "alignment");
+ pTabViewShell->ExecuteCellFormatDlg(rReq, u"alignment"_ustr);
break;
case SID_PROPERTY_PANEL_CELLTEXT_DLG:
- pTabViewShell->ExecuteCellFormatDlg( rReq, "font" );
+ pTabViewShell->ExecuteCellFormatDlg( rReq, u"font"_ustr );
break;
case SID_CELL_FORMAT_BORDER:
- pTabViewShell->ExecuteCellFormatDlg( rReq, "borders" );
+ pTabViewShell->ExecuteCellFormatDlg( rReq, u"borders"_ustr );
break;
case SID_CHAR_DLG_EFFECT:
- pTabViewShell->ExecuteCellFormatDlg( rReq, "fonteffects" );
+ pTabViewShell->ExecuteCellFormatDlg( rReq, u"fonteffects"_ustr );
break;
case SID_OPENDLG_SOLVE:
@@ -707,7 +707,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
rData.GetTabNo()
);
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
VclPtr<AbstractScMetricInputDlg>
pDlg(pFact->CreateScMetricInputDlg(
- pTabViewShell->GetFrameWeld(), "RowHeightDialog",
nCurHeight,
+ pTabViewShell->GetFrameWeld(),
u"RowHeightDialog"_ustr, nCurHeight,
rData.GetDocument().GetSheetOptimalMinRowHeight(rData.GetTabNo()),
eMetric, 2, MAX_ROW_HEIGHT));
@@ -748,7 +748,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
VclPtr<AbstractScMetricInputDlg>
pDlg(pFact->CreateScMetricInputDlg(
- pTabViewShell->GetFrameWeld(),
"OptimalRowHeightDialog",
+ pTabViewShell->GetFrameWeld(),
u"OptimalRowHeightDialog"_ustr,
ScGlobal::nLastRowHeightExtra, 0, eMetric, 2,
MAX_EXTRA_HEIGHT));
pDlg->StartExecuteAsync([pDlg, pTabViewShell](sal_Int32
nResult){
@@ -813,7 +813,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
rData.GetTabNo()
);
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
VclPtr<AbstractScMetricInputDlg>
pDlg(pFact->CreateScMetricInputDlg(
- pTabViewShell->GetFrameWeld(), "ColWidthDialog",
nCurHeight,
+ pTabViewShell->GetFrameWeld(), u"ColWidthDialog"_ustr,
nCurHeight,
STD_COL_WIDTH, eMetric, 2, MAX_COL_WIDTH));
pDlg->StartExecuteAsync([pDlg, pTabViewShell](sal_Int32
nResult){
@@ -853,7 +853,7 @@ void ScCellShell::Execute( SfxRequest& rReq )
ScAbstractDialogFactory* pFact =
ScAbstractDialogFactory::Create();
VclPtr<AbstractScMetricInputDlg>
pDlg(pFact->CreateScMetricInputDlg(
- pTabViewShell->GetFrameWeld(), "OptimalColWidthDialog",
+ pTabViewShell->GetFrameWeld(),
u"OptimalColWidthDialog"_ustr,
ScGlobal::nLastColWidthExtra, STD_EXTRA_WIDTH,
eMetric, 2, MAX_EXTRA_WIDTH));
pDlg->StartExecuteAsync([pDlg, pTabViewShell](sal_Int32
nResult){
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 0d36c294a51b..33af7b0eabb8 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -152,11 +152,11 @@ void getRangeFromErrorBar(const uno::Reference<
chart2::XChartDocument >& rChart
{
uno::Reference< beans::XPropertySet > xPropSet( xSeries,
uno::UNO_QUERY);
uno::Reference< chart2::data::XDataSource > xErrorBarY;
- xPropSet->getPropertyValue("ErrorBarY") >>= xErrorBarY;
+ xPropSet->getPropertyValue(u"ErrorBarY"_ustr) >>= xErrorBarY;
if(xErrorBarY.is())
getRangeFromDataSource(xErrorBarY, rRangeRep);
uno::Reference< chart2::data::XDataSource > xErrorBarX;
- xPropSet->getPropertyValue("ErrorBarX") >>= xErrorBarX;
+ xPropSet->getPropertyValue(u"ErrorBarX"_ustr) >>= xErrorBarX;
if(xErrorBarX.is())
getRangeFromDataSource(xErrorBarX, rRangeRep);
}
diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx
index 6058a6be2f17..4f89028d4c16 100644
--- a/sc/source/ui/view/editsh.cxx
+++ b/sc/source/ui/view/editsh.cxx
@@ -91,7 +91,7 @@ SFX_IMPL_INTERFACE(ScEditShell, SfxShell)
void ScEditShell::InitInterface_Impl()
{
- GetStaticInterface()->RegisterPopupMenu("celledit");
+ GetStaticInterface()->RegisterPopupMenu(u"celledit"_ustr);
}
ScEditShell::ScEditShell(EditView* pView, ScViewData& rData) :
@@ -102,7 +102,7 @@ ScEditShell::ScEditShell(EditView* pView, ScViewData&
rData) :
{
SetPool( pEditView->getEditEngine().GetEmptyItemSet().GetPool() );
SetUndoManager( &pEditView->getEditEngine().GetUndoManager() );
- SetName("EditCell");
+ SetName(u"EditCell"_ustr);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::EditCell));
}
@@ -513,7 +513,7 @@ void ScEditShell::Execute( SfxRequest& rReq )
rViewData.GetDialogParent(), &aAttrs, pObjSh, false));
if (nSlot == SID_CHAR_DLG_EFFECT)
{
- pDlg->SetCurPageId("fonteffects");
+ pDlg->SetCurPageId(u"fonteffects"_ustr);
}
short nRet = pDlg->Execute();
// pDlg is needed below
@@ -1299,7 +1299,7 @@ OUString ScEditShell::GetSelectionText( bool bWholeWord )
ESelection aSel = pEditView->GetSelection();
OUString aStrCurrentDelimiters = rEngine.GetWordDelimiters();
- rEngine.SetWordDelimiters(" .,;\"'");
+ rEngine.SetWordDelimiters(u" .,;\"'"_ustr);
aStrSelection = rEngine.GetWord( aSel.nEndPara, aSel.nEndPos );
rEngine.SetWordDelimiters( aStrCurrentDelimiters );
}
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index cd2a23f9421a..75e99b2033e4 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -130,7 +130,7 @@ ScFormatShell::ScFormatShell(ScViewData& rData) :
{
pMgr->SetMaxUndoActionCount( 0 );
}
- SetName("Format");
+ SetName(u"Format"_ustr);
}
ScFormatShell::~ScFormatShell()
@@ -942,7 +942,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
case SID_ATTR_CHAR_COLOR:
case SID_ATTR_CHAR_FONT:
case SID_ATTR_CHAR_FONTHEIGHT:
- pTabViewShell->ExecuteCellFormatDlg(rReq, "font"); //
when ToolBar is vertical
+ pTabViewShell->ExecuteCellFormatDlg(rReq, u"font"_ustr);
// when ToolBar is vertical
break;
case SID_BACKGROUND_COLOR:
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 9777f1bff331..d73701241e7c 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -194,9 +194,9 @@ bool ScGridWindow::VisibleRange::set(SCCOL nCol1, SCROW
nRow1, SCCOL nCol2, SCRO
// ListBox in a FloatingWindow (pParent)
ScFilterListBox::ScFilterListBox(weld::Window* pParent, ScGridWindow* pGrid,
SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode
eNewMode)
- : xBuilder(Application::CreateBuilder(pParent,
"modules/scalc/ui/filterlist.ui"))
- , xPopover(xBuilder->weld_popover("FilterList"))
- , xTreeView(xBuilder->weld_tree_view("list"))
+ : xBuilder(Application::CreateBuilder(pParent,
u"modules/scalc/ui/filterlist.ui"_ustr))
+ , xPopover(xBuilder->weld_popover(u"FilterList"_ustr))
+ , xTreeView(xBuilder->weld_tree_view(u"list"_ustr))
, pGridWin(pGrid)
, nCol(nNewCol)
, nRow(nNewRow)
@@ -405,7 +405,7 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent,
ScViewData& rData, ScSplitPos
m_nDownPosX( -1 ),
m_nDownPosY( -1 )
{
- set_id("grid_window");
+ set_id(u"grid_window"_ustr);
switch(eWhich)
{
case SC_SPLIT_TOPLEFT:
@@ -1132,7 +1132,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW
nRow)
// remember filter rules before modification
mpAutoFilterPopup->getResult(aSaveAutoFilterResult);
- collectUIInformation(OUString::number(nRow),
OUString::number(nCol),"AUTOFILTER");
+ collectUIInformation(OUString::number(nRow),
OUString::number(nCol),u"AUTOFILTER"_ustr);
}
void ScGridWindow::RefreshAutoFilterButton(const ScAddress& rPos)
@@ -1286,12 +1286,12 @@ void
ScGridWindow::UpdateAutoFilterFromMenu(AutoFilterMode eMode)
case AutoFilterMode::Top10:
pEntry->eOp = SC_TOPVAL;
pEntry->GetQueryItem().meType = ScQueryEntry::ByString;
- pEntry->GetQueryItem().maString = rPool.intern("10");
+ pEntry->GetQueryItem().maString = rPool.intern(u"10"_ustr);
break;
case AutoFilterMode::Bottom10:
pEntry->eOp = SC_BOTVAL;
pEntry->GetQueryItem().meType = ScQueryEntry::ByString;
- pEntry->GetQueryItem().maString = rPool.intern("10");
+ pEntry->GetQueryItem().maString = rPool.intern(u"10"_ustr);
break;
case AutoFilterMode::Empty:
pEntry->SetQueryByEmpty();
@@ -1630,7 +1630,7 @@ void ScGridWindow::LaunchDataSelectMenu(const SCCOL nCol,
const SCROW nRow)
mpFilterBox->EndInit();
}
- collectUIInformation(OUString::number(nRow),
OUString::number(nCol),"SELECTMENU");
+ collectUIInformation(OUString::number(nRow),
OUString::number(nCol),u"SELECTMENU"_ustr);
}
void ScGridWindow::FilterSelect( sal_uLong nSel )
@@ -3416,7 +3416,7 @@ void ScGridWindow::Command( const CommandEvent& rCEvt )
if (pHdl)
pHdl->SetModified();
- const OUString sOldText = pHdl ? pHdl->GetEditString() : "";
+ const OUString sOldText = pHdl ? pHdl->GetEditString() : u""_ustr;
// Only done/shown if a misspelled word is actually under the
mouse pointer.
Link<SpellCallbackInfo&,void> aLink = LINK( this, ScGridWindow,
PopupSpellingHdl );
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a9492df22f5d..166056d914d8 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -688,7 +688,7 @@ void ScGridWindow::DrawEditView(OutputDevice &rDevice,
EditView *pEditView)
//tdf#100925, rhbz#1283420, Draw some text here, to get
//X11CairoTextRender::getCairoContext called, so that the forced read
//from the underlying X Drawable gets it to sync.
- rDevice.DrawText(aLogicRect.BottomLeft(), " ");
+ rDevice.DrawText(aLogicRect.BottomLeft(), u" "_ustr);
rDevice.DrawRect(aLogicRect);
// paint the editeng text
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 251f9f6f3cf7..7b7e18f2e644 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -86,14 +86,14 @@ ScHeaderControl::ScHeaderControl( vcl::Window* pParent,
SelectionEngine* pSelect
bAutoFilterSet = false;
Size aSize = LogicToPixel( Size(
- GetTextWidth("8888"),
+ GetTextWidth(u"8888"_ustr),
GetTextHeight() ) );
aSize.AdjustWidth(4 ); // place for highlight border
aSize.AdjustHeight(3 );
SetSizePixel( aSize );
nWidth = nSmallWidth = aSize.Width();
- nBigWidth = LogicToPixel( Size( GetTextWidth("8888888"), 0 ) ).Width() + 5;
+ nBigWidth = LogicToPixel( Size( GetTextWidth(u"8888888"_ustr), 0 )
).Width() + 5;
aShowHelpTimer.SetInvokeHandler(LINK(this, ScHeaderControl,
ShowDragHelpHdl));
aShowHelpTimer.SetTimeout(GetSettings().GetMouseSettings().GetDoubleClickTime());
@@ -968,7 +968,7 @@ void ScHeaderControl::Command( const CommandEvent& rCEvt )
pViewSh->MarkRange( aNewRange );
}
- pViewSh->GetDispatcher()->ExecutePopup( bVertical ? OUString(
"rowheader" ) : OUString( "colheader" ) );
+ pViewSh->GetDispatcher()->ExecutePopup( bVertical ?
u"rowheader"_ustr : u"colheader"_ustr );
}
}
else if ( nCmd == CommandEventId::StartDrag )
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index 8ddb8722f6ea..1a8d1356a4a6 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -565,7 +565,7 @@ bool ScDrawStringsVars::SetText( const ScRefCellValue&
rCell )
void ScDrawStringsVars::SetHashText()
{
- SetAutoText("###");
+ SetAutoText(u"###"_ustr);
}
void ScDrawStringsVars::RepeatToFill( tools::Long nColWidth )
@@ -3117,7 +3117,7 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam)
if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip ||
aAreaParam.mbRightClip ) )
{
- SetEngineTextAndGetWidth( rParam, "###", nNeededPixel, ( nLeftM +
nRightM ) );
+ SetEngineTextAndGetWidth( rParam, u"###"_ustr, nNeededPixel, (
nLeftM + nRightM ) );
tools::Long nLayoutSign = bLayoutRTL ? -1 : 1;
ScCellInfo* pClipMarkCell =
&rParam.mpThisRowInfo->cellInfo(rParam.mnX);
SetClipMarks( aAreaParam, pClipMarkCell, eOutHorJust, nLayoutSign
);
@@ -3528,7 +3528,7 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam&
rParam)
}
if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip ||
aAreaParam.mbRightClip ) )
{
- nEngineWidth = SetEngineTextAndGetWidth( rParam, "###",
nNeededPixel, ( nLeftM + nRightM ) );
+ nEngineWidth = SetEngineTextAndGetWidth( rParam, u"###"_ustr,
nNeededPixel, ( nLeftM + nRightM ) );
// No clip marks if "###" doesn't fit (same as in DrawStrings)
}
@@ -3772,7 +3772,7 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam&
rParam)
}
if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip ||
aAreaParam.mbRightClip ) )
{
- nEngineWidth = SetEngineTextAndGetWidth( rParam, "###",
nNeededPixel, ( nLeftM + nRightM ) );
+ nEngineWidth = SetEngineTextAndGetWidth( rParam, u"###"_ustr,
nNeededPixel, ( nLeftM + nRightM ) );
// No clip marks if "###" doesn't fit (same as in DrawStrings)
}
@@ -3993,7 +3993,7 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam)
if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip ||
aAreaParam.mbRightClip ) )
{
- nEngineWidth = SetEngineTextAndGetWidth( rParam, "###",
nNeededPixel, ( nLeftM + nRightM ) );
+ nEngineWidth = SetEngineTextAndGetWidth( rParam, u"###"_ustr,
nNeededPixel, ( nLeftM + nRightM ) );
tools::Long nLayoutSign = bLayoutRTL ? -1 : 1;
ScCellInfo* pClipMarkCell =
&rParam.mpThisRowInfo->cellInfo(rParam.mnX);
SetClipMarks( aAreaParam, pClipMarkCell, eOutHorJust, nLayoutSign
);
@@ -4293,7 +4293,7 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam&
rParam)
}
if ( rParam.mbCellIsValue && ( aAreaParam.mbLeftClip ||
aAreaParam.mbRightClip ) )
{
- nEngineWidth = SetEngineTextAndGetWidth( rParam, "###", nNeededPixel,
( nLeftM + nRightM ) );
+ nEngineWidth = SetEngineTextAndGetWidth( rParam, u"###"_ustr,
nNeededPixel, ( nLeftM + nRightM ) );
tools::Long nLayoutSign = bLayoutRTL ? -1 : 1;
ScCellInfo* pClipMarkCell =
&rParam.mpThisRowInfo->cellInfo(rParam.mnX);
SetClipMarks( aAreaParam, pClipMarkCell, eOutHorJust, nLayoutSign );
diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx
index a0cdb21be6eb..c2ca88a25ae0 100644
--- a/sc/source/ui/view/pgbrksh.cxx
+++ b/sc/source/ui/view/pgbrksh.cxx
@@ -31,7 +31,7 @@ SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell)
void ScPageBreakShell::InitInterface_Impl()
{
- GetStaticInterface()->RegisterPopupMenu("pagebreak");
+ GetStaticInterface()->RegisterPopupMenu(u"pagebreak"_ustr);
}
ScPageBreakShell::ScPageBreakShell(ScTabViewShell* pViewSh)
@@ -45,7 +45,7 @@ ScPageBreakShell::ScPageBreakShell(ScTabViewShell* pViewSh)
{
pMgr->SetMaxUndoActionCount(0);
}
- SetName("PageBreak");
+ SetName(u"PageBreak"_ustr);
}
ScPageBreakShell::~ScPageBreakShell() {}
diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx
index b4ef807ffa46..019e4da8f34e 100644
--- a/sc/source/ui/view/pivotsh.cxx
+++ b/sc/source/ui/view/pivotsh.cxx
@@ -43,7 +43,7 @@ SFX_IMPL_INTERFACE(ScPivotShell, SfxShell)
void ScPivotShell::InitInterface_Impl()
{
- GetStaticInterface()->RegisterPopupMenu("pivot");
+ GetStaticInterface()->RegisterPopupMenu(u"pivot"_ustr);
}
ScPivotShell::ScPivotShell( ScTabViewShell* pViewSh ) :
@@ -58,7 +58,7 @@ ScPivotShell::ScPivotShell( ScTabViewShell* pViewSh ) :
{
pMgr->SetMaxUndoActionCount( 0 );
}
- SetName("Pivot");
+ SetName(u"Pivot"_ustr);
SfxShell::SetContextName(vcl::EnumContext::GetContextName(vcl::EnumContext::Context::Pivot));
}
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index a0dd401b97b2..ec56b1fabed7 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -91,7 +91,7 @@ void ScPreviewShell::InitInterface_Impl()
SfxVisibilityFlags::Standard|SfxVisibilityFlags::Server|SfxVisibilityFlags::ReadonlyDoc,
ToolbarId::Objectbar_Preview);
- GetStaticInterface()->RegisterPopupMenu("preview");
+ GetStaticInterface()->RegisterPopupMenu(u"preview"_ustr);
}
SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" )
@@ -139,7 +139,7 @@ void ScPreviewShell::Construct( vcl::Window* pParent )
pHorScroll->Show( false );
pVerScroll->Show( false );
- SetName("Preview");
+ SetName(u"Preview"_ustr);
}
ScPreviewShell::ScPreviewShell(SfxViewFrame& rViewFrame,
@@ -917,7 +917,7 @@ void ScPreviewShell::ReadUserData(const OUString& rData,
bool /* bBrowse */)
void ScPreviewShell::WriteUserDataSequence(uno::Sequence <
beans::PropertyValue >& rSeq)
{
// tdf#130559: don't export preview view data if active
- if (comphelper::IsContextFlagActive("NoPreviewData"))
+ if (comphelper::IsContextFlagActive(u"NoPreviewData"_ustr))
return;
rSeq.realloc(3);
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 465827174b76..c5dd892bab25 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -558,7 +558,7 @@ void ScPrintFunc::DrawToDev(ScDocument& rDoc, OutputDevice*
pDev, double /* nPri
if (!bReopen)
{
sal_Int32 nId = pPDF->EnsureStructureElement(nullptr);
- pPDF->InitStructureElement(nId, vcl::PDFWriter::Part, "Worksheet");
+ pPDF->InitStructureElement(nId, vcl::PDFWriter::Part,
u"Worksheet"_ustr);
pPDF->BeginStructureElement(nId);
pPDF->GetScPDFState()->m_WorksheetId = nId;
}
@@ -1622,7 +1622,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL
nX2, SCROW nY2,
if (!bReopen)
{
sal_Int32 nId = pPDF->EnsureStructureElement(nullptr);
- pPDF->InitStructureElement(nId, vcl::PDFWriter::Part, "Worksheet");
+ pPDF->InitStructureElement(nId, vcl::PDFWriter::Part,
u"Worksheet"_ustr);
pPDF->BeginStructureElement(nId);
pPDF->GetScPDFState()->m_WorksheetId = nId;
}
@@ -1933,7 +1933,7 @@ tools::Long ScPrintFunc::DoNotes( tools::Long nNoteStart,
bool bDoPrint, ScPrevi
ScAutoFontColorMode eColorMode = bUseStyleColor ?
ScAutoFontColorMode::Display : ScAutoFontColorMode::Print;
rDoc.getCellAttributeHelper().getDefaultCellAttribute().fillFont(aMarkFont,
eColorMode);
pDev->SetFont(aMarkFont);
- tools::Long nMarkLen = pDev->GetTextWidth("GW99999:");
+ tools::Long nMarkLen = pDev->GetTextWidth(u"GW99999:"_ustr);
// without Space-Char, because it rarely arrives there
Size aDataSize = aPageRect.GetSize();
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index 12fc1a7a6c67..2fffc87fc1b4 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -94,8 +94,8 @@ IMPL_LINK(ScTabControl, ShowPageList, const CommandEvent &,
rEvent, void)
{
tools::Rectangle aRect(rEvent.GetMousePosPixel(), Size(1, 1));
weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect);
- std::unique_ptr<weld::Builder>
xBuilder(Application::CreateBuilder(pPopupParent,
"modules/scalc/ui/pagelistmenu.ui"));
- std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu("menu"));
+ std::unique_ptr<weld::Builder>
xBuilder(Application::CreateBuilder(pPopupParent,
u"modules/scalc/ui/pagelistmenu.ui"_ustr));
+ std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu(u"menu"_ustr));
sal_uInt16 nCurPageId = GetCurPageId();
@@ -464,7 +464,7 @@ void ScTabControl::Command( const CommandEvent& rCEvt )
// Popup-Menu:
// get Dispatcher from ViewData (ViewFrame) instead of Shell (Frame), so
it can't be null
- pViewData->GetDispatcher().ExecutePopup( "sheettab" );
+ pViewData->GetDispatcher().ExecutePopup( u"sheettab"_ustr );
}
void ScTabControl::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel )
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 5be05d61ce4f..a61bbf4ae242 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1506,7 +1506,7 @@ void ScTabViewShell::Construct( TriState nForceDesignMode
)
EnableAutoSpell(ScModule::GetAutoSpellProperty());
- SetName("View"); // for SBX
+ SetName(u"View"_ustr); // for SBX
Color aColBlack( COL_BLACK );
SetPool( &SC_MOD()->GetPool() );
SetWindow( GetActiveWin() );
@@ -1759,11 +1759,11 @@
ScViewOptiChangesListener::ScViewOptiChangesListener(ScTabViewShell& rViewShell)
uno::Reference<uno::XInterface> xViewConfigurationAccess
= xConfigurationProvider->createInstanceWithArguments(
- "com.sun.star.configuration.ConfigurationAccess", {
uno::Any(aViewProperty) });
+ u"com.sun.star.configuration.ConfigurationAccess"_ustr, {
uno::Any(aViewProperty) });
uno::Reference<uno::XInterface> xColorSchemeConfigurationAccess
= xConfigurationProvider->createInstanceWithArguments(
- "com.sun.star.configuration.ConfigurationAccess", {
uno::Any(aColorSchemeProperty) });
+ u"com.sun.star.configuration.ConfigurationAccess"_ustr, {
uno::Any(aColorSchemeProperty) });
m_xViewChangesNotifier.set(xViewConfigurationAccess, uno::UNO_QUERY);
m_xColorSchemeChangesNotifier.set(xColorSchemeConfigurationAccess,
uno::UNO_QUERY);
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 70bd9c897f1e..9a707ff4790f 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -1019,7 +1019,7 @@ void ScTabViewShell::ExecStyle( SfxRequest& rReq )
css::uno::Reference< css::beans::XPropertySet > xInfo;
xStyles->getByName( pNameItem->GetValue() ) >>= xInfo;
OUString aUIName;
- xInfo->getPropertyValue("DisplayName") >>= aUIName;
+ xInfo->getPropertyValue(u"DisplayName"_ustr) >>= aUIName;
if ( !aUIName.isEmpty() )
rReq.AppendItem( SfxStringItem( SID_STYLE_APPLY,
aUIName ) );
}
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 9bd0ab29d47e..a4204f57e767 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -130,7 +130,7 @@ public:
awt::Rectangle xRectangle;
sal_Int32 dimensionIndex = 0;
- OUString sPivotTableName("DataPilot1");
+ OUString sPivotTableName(u"DataPilot1"_ustr);
for (beans::PropertyValue const& rProperty : aProperties)
{
@@ -468,7 +468,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq)
case SID_ADDITIONS_DIALOG:
{
- OUString sAdditionsTag = "";
+ OUString sAdditionsTag = u""_ustr;
const SfxStringItem* pStringArg =
rReq.GetArg<SfxStringItem>(FN_PARAM_ADDITIONS_TAG);
if (pStringArg)
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index 027dff150ef6..ec9cc6136ac3 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -76,22 +76,22 @@ void ScTabViewShell::InsertURLButton( const OUString&
rName, const OUString& rUR
uno::Reference< beans::XPropertySet > xPropSet( xControlModel,
uno::UNO_QUERY );
- xPropSet->setPropertyValue("Label", uno::Any(rName) );
+ xPropSet->setPropertyValue(u"Label"_ustr, uno::Any(rName) );
OUString aTmp = INetURLObject::GetAbsURL(
rDoc.GetDocumentShell()->GetMedium()->GetBaseURL(), rURL );
- xPropSet->setPropertyValue("TargetURL", uno::Any(aTmp) );
+ xPropSet->setPropertyValue(u"TargetURL"_ustr, uno::Any(aTmp) );
if( !rTarget.isEmpty() )
{
- xPropSet->setPropertyValue("TargetFrame", uno::Any(rTarget) );
+ xPropSet->setPropertyValue(u"TargetFrame"_ustr, uno::Any(rTarget) );
}
- xPropSet->setPropertyValue("ButtonType",
uno::Any(form::FormButtonType_URL) );
+ xPropSet->setPropertyValue(u"ButtonType"_ustr,
uno::Any(form::FormButtonType_URL) );
#if HAVE_FEATURE_AVMEDIA
- if ( ::avmedia::MediaWindow::isMediaURL( rURL, ""/*TODO?*/ ) )
+ if ( ::avmedia::MediaWindow::isMediaURL( rURL, u""_ustr/*TODO?*/ ) )
{
- xPropSet->setPropertyValue("DispatchURLInternal", uno::Any(true) );
+ xPropSet->setPropertyValue(u"DispatchURLInternal"_ustr, uno::Any(true)
);
}
#endif
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 1c0ad55c3d2a..40e9ce7a9d5a 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -892,7 +892,7 @@ void ScViewData::InsertTab( SCTAB nTab )
UpdateCurrentTab();
maMarkData.InsertTab(nTab);
- collectUIInformation({{}}, "InsertTab");
+ collectUIInformation({{}}, u"InsertTab"_ustr);
}
void ScViewData::InsertTabs( SCTAB nTab, SCTAB nNewSheets )
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index d842742ec214..6e9095207b2b 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1269,7 +1269,7 @@ void ScViewFunc::MergeCells( bool bApi, bool bDoContents,
bool bCenter,
OUString aStartAddress = aMarkRange.aStart.GetColRowString();
OUString aEndAddress = aMarkRange.aEnd.GetColRowString();
- collectUIInformation({{"RANGE", aStartAddress + ":" +
aEndAddress}}, "MERGE_CELLS");
+ collectUIInformation({{"RANGE", aStartAddress + ":" +
aEndAddress}}, u"MERGE_CELLS"_ustr);
}
};
@@ -1406,7 +1406,7 @@ bool ScViewFunc::RemoveMerge()
}
OUString aCellLocation = aRange.aStart.GetColRowString();
- collectUIInformation({{"CELL", aCellLocation}}, "UNMERGE_CELL");
+ collectUIInformation({{"CELL", aCellLocation}}, u"UNMERGE_CELL"_ustr);
return true; //! bOk ??
}
@@ -1532,7 +1532,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol,
SCROW nStartRow,
if (HelperNotifyChanges::getMustPropagateChangesModel(pModelObj))
HelperNotifyChanges::Notify(*pModelObj, aChangeRanges);
else if (pModelObj)
- HelperNotifyChanges::Notify(*pModelObj, aChangeRanges,
"data-area-invalidate");
+ HelperNotifyChanges::Notify(*pModelObj, aChangeRanges,
u"data-area-invalidate"_ustr);
}
void ScViewFunc::CopyAutoSpellData( FillDir eDir, SCCOL nStartCol, SCROW
nStartRow,
@@ -2868,7 +2868,7 @@ void ScViewFunc::MoveTable(sal_uInt16 nDestDocNo, SCTAB
nDestTab, bool bCopy,
// execute without SfxCallMode::RECORD, because already contained in
move command
SfxStringItem aItem( SID_FILE_NAME, "private:factory/" + STRING_SCAPP
);
- SfxStringItem aTarget( SID_TARGETNAME, "_blank" );
+ SfxStringItem aTarget( SID_TARGETNAME, u"_blank"_ustr );
const SfxPoolItemHolder
aResult(GetViewData().GetDispatcher().ExecuteList(
SID_OPENDOC, SfxCallMode::API|SfxCallMode::SYNCHRON,
@@ -2913,7 +2913,7 @@ void ScViewFunc::MoveTable(sal_uInt16 nDestDocNo, SCTAB
nDestTab, bool bCopy,
{
while (rDestDoc.GetTableCount() > 1)
rDestDoc.DeleteTab(0);
- rDestDoc.RenameTab( 0, "______42_____" );
+ rDestDoc.RenameTab( 0, u"______42_____"_ustr );
}
SCTAB nTabCount = rDoc.GetTableCount();
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index bed890278a3f..f9ded7171687 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -157,7 +157,7 @@ void ScViewFunc::CutToClip()
OUString aStartAddress = aRange.aStart.GetColRowString();
OUString aEndAddress = aRange.aEnd.GetColRowString();
- collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},
"CUT");
+ collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},
u"CUT"_ustr);
}
else
ErrorMessage( STR_NOMULTISELECT );
@@ -192,7 +192,7 @@ bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, bool
bCut, bool bApi, bool bI
if( !bCut ){
OUString aStartAddress = aRange.aStart.GetColRowString();
OUString aEndAddress = aRange.aEnd.GetColRowString();
- collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},
"COPY");
+ collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},
u"COPY"_ustr);
}
return bDone;
}
@@ -511,8 +511,8 @@ void ScViewFunc::PasteFromSystem()
TransferableDataHelper aDataHelper(
TransferableDataHelper::CreateFromSystemClipboard( pWin ) );
{
- SotClipboardFormatId nBiff8 =
SotExchange::RegisterFormatName("Biff8");
- SotClipboardFormatId nBiff5 =
SotExchange::RegisterFormatName("Biff5");
+ SotClipboardFormatId nBiff8 =
SotExchange::RegisterFormatName(u"Biff8"_ustr);
+ SotClipboardFormatId nBiff5 =
SotExchange::RegisterFormatName(u"Biff5"_ustr);
SotClipboardFormatId nFormat; // output param for GetExchangeAction
sal_uInt8 nEventAction; // output param for GetExchangeAction
@@ -650,8 +650,8 @@ void ScViewFunc::PasteFromTransferable( const
uno::Reference<datatransfer::XTran
else
{
TransferableDataHelper aDataHelper( rxTransferable );
- SotClipboardFormatId nBiff8 =
SotExchange::RegisterFormatName("Biff8");
- SotClipboardFormatId nBiff5 =
SotExchange::RegisterFormatName("Biff5");
+ SotClipboardFormatId nBiff8 =
SotExchange::RegisterFormatName(u"Biff8"_ustr);
+ SotClipboardFormatId nBiff5 =
SotExchange::RegisterFormatName(u"Biff5"_ustr);
SotClipboardFormatId nFormatId = SotClipboardFormatId::NONE;
// first SvDraw-model, then drawing
// (only one drawing is allowed)
@@ -793,7 +793,7 @@ bool ScViewFunc::PasteOnDrawObjectLinked(
const OUString aBeginUndo(ScResId(STR_UNDO_DRAGDROP));
- if(pScDrawView->ApplyGraphicToObject( rHitObj, aGraphic,
aBeginUndo, "" ))
+ if(pScDrawView->ApplyGraphicToObject( rHitObj, aGraphic,
aBeginUndo, u""_ustr ))
{
return true;
}
@@ -808,7 +808,7 @@ bool ScViewFunc::PasteOnDrawObjectLinked(
{
const OUString aBeginUndo(ScResId(STR_UNDO_DRAGDROP));
- if(pScDrawView->ApplyGraphicToObject( rHitObj, Graphic(aMtf),
aBeginUndo, "" ))
+ if(pScDrawView->ApplyGraphicToObject( rHitObj, Graphic(aMtf),
aBeginUndo, u""_ustr ))
{
return true;
}
@@ -823,7 +823,7 @@ bool ScViewFunc::PasteOnDrawObjectLinked(
{
const OUString aBeginUndo(ScResId(STR_UNDO_DRAGDROP));
- if(pScDrawView->ApplyGraphicToObject( rHitObj, Graphic(aBmpEx),
aBeginUndo, "" ))
+ if(pScDrawView->ApplyGraphicToObject( rHitObj, Graphic(aBmpEx),
aBeginUndo, u""_ustr ))
{
return true;
}
@@ -1487,7 +1487,7 @@ bool ScViewFunc::PasteFromClip( InsertDeleteFlags nFlags,
ScDocument* pClipDoc,
}
OUString aStartAddress = aMarkRange.aStart.GetColRowString();
OUString aEndAddress = aMarkRange.aEnd.GetColRowString();
- collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},
"PASTE");
+ collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},
u"PASTE"_ustr);
return true;
}
@@ -1847,9 +1847,9 @@ void ScViewFunc::PostPasteFromClip(const ScRangeList&
rPasteRanges, const ScMark
}
if (HelperNotifyChanges::getMustPropagateChangesModel(pModelObj))
- HelperNotifyChanges::Notify(*pModelObj, aChangeRanges, "paste");
+ HelperNotifyChanges::Notify(*pModelObj, aChangeRanges, u"paste"_ustr);
else if (pModelObj)
- HelperNotifyChanges::Notify(*pModelObj, aChangeRanges,
"data-area-invalidate");
+ HelperNotifyChanges::Notify(*pModelObj, aChangeRanges,
u"data-area-invalidate"_ustr);
}
// D R A G A N D D R O P
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index fc7da221eae7..17677ee7ac61 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -584,7 +584,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const
OUString& rFile, bool bLink
// is it a media URL?
#if HAVE_FEATURE_AVMEDIA
- if( ::avmedia::MediaWindow::isMediaURL( aStrURL, ""/*TODO?*/ ) )
+ if( ::avmedia::MediaWindow::isMediaURL( aStrURL, u""_ustr/*TODO?*/ ) )
{
const SfxStringItem aMediaURLItem( SID_INSERT_AVMEDIA, aStrURL );
const SfxPoolItemHolder
aResult(GetViewData().GetDispatcher().ExecuteList(
@@ -614,7 +614,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const
OUString& rFile, bool bLink
SfxStringItem aFileNameItem( SID_FILE_NAME, aStrURL );
SfxStringItem aFilterItem( SID_FILTER_NAME, pFlt->GetName() );
// #i69524# add target, as in SfxApplication when the Open dialog
is used
- SfxStringItem aTargetItem( SID_TARGETNAME, "_default" );
+ SfxStringItem aTargetItem( SID_TARGETNAME, u"_default"_ustr );
// Open Asynchronously, because it can also happen from D&D
// and that is not so good for the MAC...
@@ -664,7 +664,7 @@ bool ScViewFunc::PasteFile( const Point& rPos, const
OUString& rFile, bool bLink
//TODO/LATER: what about "bLink"?
- uno::Sequence < beans::PropertyValue > aMedium{
comphelper::makePropertyValue("URL",
+ uno::Sequence < beans::PropertyValue > aMedium{
comphelper::makePropertyValue(u"URL"_ustr,
aStrURL) };
comphelper::EmbeddedObjectContainer aCnt( xStorage );
diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx
index 25e89487f96f..c9a3c4bed01c 100644
--- a/sc/source/ui/view/viewfun5.cxx
+++ b/sc/source/ui/view/viewfun5.cxx
@@ -602,7 +602,7 @@ bool ScViewFunc::PasteDataFormatSource(
SotClipboardFormatId nFormatId,
embed::InsertedObjectInfo aInfo =
xClipboardCreator->createInstanceInitFromClipboard(
xTmpStor,
- "DummyName",
+ u"DummyName"_ustr,
uno::Sequence<
beans::PropertyValue >() );
// TODO/LATER: in future InsertedObjectInfo will be used
to get container related information
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index fccd840ecf3d..916997ecf21f 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -558,7 +558,7 @@ void ScViewFunc::EditNote()
ScTabView::OnLOKNoteStateChanged( pNote );
}
- collectUIInformation("OPEN");
+ collectUIInformation(u"OPEN"_ustr);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index 0656cc416238..bb693fa86d31 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -372,13 +372,13 @@ bool ScViewFunc::PasteObject( const Point& rPos, const
uno::Reference < embed::X
bool ScViewFunc::PasteBitmapEx( const Point& rPos, const BitmapEx& rBmpEx )
{
Graphic aGraphic(rBmpEx);
- return PasteGraphic( rPos, aGraphic, "" );
+ return PasteGraphic( rPos, aGraphic, u""_ustr );
}
bool ScViewFunc::PasteMetaFile( const Point& rPos, const GDIMetaFile& rMtf )
{
Graphic aGraphic(rMtf);
- return PasteGraphic( rPos, aGraphic, "" );
+ return PasteGraphic( rPos, aGraphic, u""_ustr );
}
bool ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic,
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 679f60295aff..b207f7677282 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -408,7 +408,7 @@ static bool lcl_AddFunction( ScAppOptions& rAppOpt,
sal_uInt16 nOpCode )
namespace HelperNotifyChanges
{
static void NotifyIfChangesListeners(const ScDocShell &rDocShell, const
ScMarkData& rMark,
- SCCOL nCol, SCROW nRow, const
OUString& rType = "cell-change")
+ SCCOL nCol, SCROW nRow, const
OUString& rType = u"cell-change"_ustr)
{
ScModelObj* pModelObj = rDocShell.GetModel();
@@ -421,7 +421,7 @@ namespace HelperNotifyChanges
else
{
Notify(*pModelObj, aChangeRanges, isDataAreaInvalidateType(rType)
- ? OUString("data-area-invalidate") :
OUString("data-area-extend"));
+ ? u"data-area-invalidate"_ustr : u"data-area-extend"_ustr);
}
}
}
@@ -434,8 +434,8 @@ namespace
std::unique_ptr<weld::TextView> m_xError;
public:
AutoCorrectQuery(weld::Window* pParent, const OUString& rFormula)
- : weld::MessageDialogController(pParent,
"modules/scalc/ui/warnautocorrect.ui", "WarnAutoCorrect", "grid")
- , m_xError(m_xBuilder->weld_text_view("error"))
+ : weld::MessageDialogController(pParent,
u"modules/scalc/ui/warnautocorrect.ui"_ustr, u"WarnAutoCorrect"_ustr,
u"grid"_ustr)
+ , m_xError(m_xBuilder->weld_text_view(u"error"_ustr))
{
m_xDialog->set_default_response(RET_YES);
@@ -1497,7 +1497,7 @@ void ScViewFunc::ApplySelectionPattern( const
ScPatternAttr& rAttr, bool bCursor
}
}
}
- HelperNotifyChanges::Notify(*pModelObj, aChangeRanges, "attribute",
aProperties);
+ HelperNotifyChanges::Notify(*pModelObj, aChangeRanges,
u"attribute"_ustr, aProperties);
}
StartFormatArea();
@@ -1867,8 +1867,8 @@ bool ScViewFunc::InsertCells( InsCellCmd eCmd, bool
bRecord, bool bPartOfPaste,
if ( bInsertCols || bInsertRows )
{
OUString aOperation = bInsertRows ?
- OUString("insert-rows"):
- OUString("insert-columns");
+ u"insert-rows"_ustr:
+ u"insert-columns"_ustr;
HelperNotifyChanges::NotifyIfChangesListeners(*pDocSh, aRange,
aOperation);
}
@@ -1893,7 +1893,7 @@ bool ScViewFunc::InsertCells( InsCellCmd eCmd, bool
bRecord, bool bPartOfPaste,
OUString aStartAddress = aRange.aStart.GetColRowString();
OUString aEndAddress = aRange.aEnd.GetColRowString();
- collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},
"INSERT_CELLS");
+ collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},
u"INSERT_CELLS"_ustr);
return bSuccess;
}
else
@@ -1946,8 +1946,8 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd )
if ( eCmd == DelCellCmd::Rows || eCmd == DelCellCmd::Cols )
{
OUString aOperation = ( eCmd == DelCellCmd::Rows) ?
- OUString("delete-rows"):
- OUString("delete-columns");
+ u"delete-rows"_ustr:
+ u"delete-columns"_ustr;
HelperNotifyChanges::NotifyIfChangesListeners(*pDocSh, aRange,
aOperation);
}
@@ -1988,7 +1988,7 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd )
OUString aStartAddress = aRange.aStart.GetColRowString();
OUString aEndAddress = aRange.aEnd.GetColRowString();
- collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},
"DELETE_CELLS");
+ collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},
u"DELETE_CELLS"_ustr);
Unmark();
}
@@ -2261,9 +2261,9 @@ void ScViewFunc::DeleteContents( InsertDeleteFlags nFlags
)
}
if (HelperNotifyChanges::getMustPropagateChangesModel(pModelObj))
- HelperNotifyChanges::Notify(*pModelObj, aChangeRanges,
"delete-content");
+ HelperNotifyChanges::Notify(*pModelObj, aChangeRanges,
u"delete-content"_ustr);
else if (pModelObj)
- HelperNotifyChanges::Notify(*pModelObj, aChangeRanges,
"data-area-invalidate");
+ HelperNotifyChanges::Notify(*pModelObj, aChangeRanges,
u"data-area-invalidate"_ustr);
}
CellContentChanged();
@@ -2278,7 +2278,7 @@ void ScViewFunc::DeleteContents( InsertDeleteFlags nFlags
)
}
OUString aStartAddress = aMarkRange.aStart.GetColRowString();
OUString aEndAddress = aMarkRange.aEnd.GetColRowString();
- collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},
"DELETE");
+ collectUIInformation({{"RANGE", aStartAddress + ":" + aEndAddress}},
u"DELETE"_ustr);
}
// column width/row height (via header) - undo OK
@@ -2601,7 +2601,7 @@ void ScViewFunc::SetWidthOrHeight(
}
}
}
- HelperNotifyChanges::Notify(*pModelObj, aChangeRanges, "column-resize");
+ HelperNotifyChanges::Notify(*pModelObj, aChangeRanges,
u"column-resize"_ustr);
}
// column width/row height (via marked range)
@@ -2992,7 +2992,7 @@ void ScViewFunc::ChangeNumFmtDecimals( bool bIncrement )
//! SvNumberformat has a Member bStandard, but doesn't disclose it
bool bWasStandard = ( nOldFormat == pFormatter->GetStandardIndex(
eLanguage ) );
- OUString sExponentialStandardFormat = "";
+ OUString sExponentialStandardFormat = u""_ustr;
if (bWasStandard)
{
// with "Standard" the decimal places depend on cell content
