summaryrefslogtreecommitdiff
path: root/sc/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui')
-rw-r--r--sc/source/ui/Accessibility/AccessibleCsvControl.cxx2
-rw-r--r--sc/source/ui/app/inputhdl.cxx2
-rw-r--r--sc/source/ui/docshell/datastream.cxx2
-rw-r--r--sc/source/ui/docshell/docsh4.cxx2
-rw-r--r--sc/source/ui/drawfunc/drawsh2.cxx2
-rw-r--r--sc/source/ui/view/gridwin.cxx4
-rw-r--r--sc/source/ui/view/tabview.cxx6
-rw-r--r--sc/source/ui/view/tabview3.cxx2
-rw-r--r--sc/source/ui/view/tabview5.cxx2
-rw-r--r--sc/source/ui/view/viewdata.cxx2
-rw-r--r--sc/source/ui/view/viewfun2.cxx2
11 files changed, 14 insertions, 14 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index eeaee6e2f91c..6ebe5041ba14 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -420,7 +420,7 @@ OUString SAL_CALL ScAccessibleCsvRuler::getText()
{
SolarMutexGuard aGuard;
ensureAlive();
- return OUString( maBuffer.getStr(), implGetTextLength() );
+ return OUString(maBuffer.subView( 0, implGetTextLength() ));
}
OUString SAL_CALL ScAccessibleCsvRuler::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex )
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 8184bac0b946..c0ee11966887 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -336,7 +336,7 @@ void ScInputHandler::SendReferenceMarks( const SfxViewShell* pViewShell,
ss << " ] }";
- OString aPayload = ss.str().c_str();
+ OString aPayload( ss.str() );
pViewShell->libreOfficeKitViewCallback(
LOK_CALLBACK_REFERENCE_MARKS, aPayload );
}
diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx
index 55b2f93381f5..cbce943eda11 100644
--- a/sc/source/ui/docshell/datastream.cxx
+++ b/sc/source/ui/docshell/datastream.cxx
@@ -197,7 +197,7 @@ private:
rLine.maCells.clear();
mpStream->ReadLine(rLine.maLine);
CSVHandler aHdl(rLine, mnColCount);
- orcus::csv_parser<CSVHandler> parser(rLine.maLine.getStr(), aHdl, maConfig);
+ orcus::csv_parser<CSVHandler> parser(rLine.maLine, aHdl, maConfig);
parser.parse();
}
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 737acbddd80c..611d6537456e 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -2585,7 +2585,7 @@ void ScDocShell::LOKCommentNotify(LOKCommentNotificationType nType, const ScDocu
while (pViewShell)
{
if (pThisViewShell == nullptr || pViewShell->GetDocId() == pThisViewShell->GetDocId())
- pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_COMMENT, aPayload.c_str());
+ pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_COMMENT, OString(aPayload));
pViewShell = SfxViewShell::GetNext(*pViewShell);
}
}
diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx
index 775c00fefdbc..8556c18e6b94 100644
--- a/sc/source/ui/drawfunc/drawsh2.cxx
+++ b/sc/source/ui/drawfunc/drawsh2.cxx
@@ -353,7 +353,7 @@ static void setupFillColorForChart(const SfxViewShell* pShell, SfxItemSet& rSet)
if (comphelper::LibreOfficeKit::isActive())
pShell->libreOfficeKitViewCallback(LOK_CALLBACK_STATE_CHANGED,
- (".uno:FillColor=" + std::to_string(nFillColor)).c_str());
+ (".uno:FillColor=" + OString::number(nFillColor)));
}
if (!(comphelper::LibreOfficeKit::isActive() && xInfo->hasPropertyByName("FillGradientName")))
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index d00d3c451d2f..2ff49c0a5dfe 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5007,7 +5007,7 @@ void ScGridWindow::updateLOKInputHelp(const OUString& title, const OUString& con
std::stringstream aStream;
boost::property_tree::write_json(aStream, aTree);
- pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_VALIDITY_INPUT_HELP, aStream.str().c_str());
+ pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_VALIDITY_INPUT_HELP, OString(aStream.str()));
}
void ScGridWindow::updateLOKValListButton( bool bVisible, const ScAddress& rPos ) const
@@ -5017,7 +5017,7 @@ void ScGridWindow::updateLOKValListButton( bool bVisible, const ScAddress& rPos
std::stringstream ss;
ss << nX << ", " << nY << ", " << static_cast<unsigned int>(bVisible);
ScTabViewShell* pViewShell = mrViewData.GetViewShell();
- pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_VALIDITY_LIST_BUTTON, ss.str().c_str());
+ pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_VALIDITY_LIST_BUTTON, OString(ss.str()));
}
void ScGridWindow::notifyKitCellFollowJump( ) const
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 093ebe4f89c5..b6c7a2bd8e66 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2688,7 +2688,7 @@ void lcl_ExtendTiledDimension(bool bColumn, const SCCOLROW nEnd, const SCCOLROW
// Provide size in the payload, so clients don't have to query for that.
std::stringstream ss;
ss << aNewSize.Width() << ", " << aNewSize.Height();
- OString sSize = ss.str().c_str();
+ OString sSize( ss.str() );
ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>(
rViewData.GetViewShell()->GetCurrentDocument());
SfxLokHelper::notifyDocumentSizeChanged(rViewData.GetViewShell(), sSize, pModel, false);
@@ -2945,7 +2945,7 @@ OString ScTabView::getSheetGeometryData(bool bColumns, bool bRows, bool bSizes,
if ((!bSizes && !bHidden && !bFiltered && !bGroups) ||
(!bColumns && !bRows))
{
- return getJSONString(aTree).c_str();
+ return OString(getJSONString(aTree));
}
struct GeomEntry
@@ -2997,7 +2997,7 @@ OString ScTabView::getSheetGeometryData(bool bColumns, bool bRows, bool bSizes,
aTree.add_child(rDimEntry.pKey, aDimTree);
}
- return getJSONString(aTree).c_str();
+ return OString(getJSONString(aTree));
}
void ScTabView::extendTiledAreaIfNeeded()
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 395d959839d3..514341af267a 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -444,7 +444,7 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, bool bNew )
// call lok::Document::getDocumentSize().
std::stringstream ss;
ss << aNewSize.Width() << ", " << aNewSize.Height();
- OString sSize = ss.str().c_str();
+ OString sSize( ss.str() );
ScModelObj* pModel = comphelper::getFromUnoTunnel<ScModelObj>(aViewData.GetViewShell()->GetCurrentDocument());
SfxLokHelper::notifyDocumentSizeChanged(aViewData.GetViewShell(), sSize, pModel, false);
}
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 77280b583cc7..670efabc1eb2 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -337,7 +337,7 @@ void ScTabView::TabChanged( bool bSameTabButMoved )
Size aDocSize = pModelObj->getDocumentSize();
std::stringstream ss;
ss << aDocSize.Width() << ", " << aDocSize.Height();
- OString sRect = ss.str().c_str();
+ OString sRect(ss.str());
ScTabViewShell* pViewShell = aViewData.GetViewShell();
// Invalidate first
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 936eb34d4805..a69ed16d4d5a 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2622,7 +2622,7 @@ OString ScViewData::describeCellCursorAt(SCCOL nX, SCROW nY, bool bPixelAligned)
<< nX << ", " << nY;
}
- return ss.str().c_str();
+ return OString(ss.str());
}
// Number of cells on a screen
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 222ee4a61e98..24b3e6c86ff2 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -2195,7 +2195,7 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem,
std::stringstream aStream;
boost::property_tree::write_json(aStream, aTree);
- OString aPayload = aStream.str().c_str();
+ OString aPayload( aStream.str() );
SfxViewShell* pViewShell = GetViewData().GetViewShell();
pViewShell->libreOfficeKitViewCallback(LOK_CALLBACK_SEARCH_RESULT_SELECTION, aPayload);
generated by cgit (git 2.34.1) at 2025-04-28 13:12:41 +0000