summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
Diffstat (limited to 'sc')
-rw-r--r--sc/qa/unit/ucalc.cxx4
-rw-r--r--sc/source/core/data/bcaslot.cxx6
-rw-r--r--sc/source/core/data/stlpool.cxx6
-rw-r--r--sc/source/core/opencl/formulagroupcl.cxx2
-rw-r--r--sc/source/core/tool/formulalogger.cxx2
-rw-r--r--sc/source/core/tool/interpr7.cxx2
-rw-r--r--sc/source/filter/excel/xecontent.cxx2
-rw-r--r--sc/source/filter/excel/xeescher.cxx2
-rw-r--r--sc/source/filter/excel/xestream.cxx2
-rw-r--r--sc/source/filter/excel/xestyle.cxx2
-rw-r--r--sc/source/filter/excel/xiescher.cxx4
-rw-r--r--sc/source/filter/inc/ooxformulaparser.hxx12
-rw-r--r--sc/source/filter/oox/ooxformulaparser.cxx2
-rw-r--r--sc/source/filter/xcl97/xcl97rec.cxx6
-rw-r--r--sc/source/ui/inc/AccessibleEditObject.hxx2
-rw-r--r--sc/source/ui/sidebar/ScPanelFactory.cxx3
-rw-r--r--sc/source/ui/sidebar/ScPanelFactory.hxx2
-rw-r--r--sc/source/ui/vba/vbaname.cxx4
-rw-r--r--sc/source/ui/vba/vbapagesetup.hxx8
-rw-r--r--sc/source/ui/vba/vbarange.cxx2
-rw-r--r--sc/source/ui/view/tabview.cxx2
21 files changed, 37 insertions, 40 deletions
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 5645600c2a45..c9d092cb54de 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -6796,8 +6796,8 @@ void Test::checkPrecisionAsShown( OUString& rCode, double fValue, double fExpect
CPPUNIT_ASSERT_EQUAL( sal_Int32(0), nCheckPos );
}
double fRoundValue = m_pDoc->RoundValueAsShown( fValue, nFormat );
- rtl::OString aMessage = "Format \"";
- aMessage += rtl::OUStringToOString( rCode, RTL_TEXTENCODING_ASCII_US );
+ OString aMessage = "Format \"";
+ aMessage += OUStringToOString( rCode, RTL_TEXTENCODING_ASCII_US );
aMessage += "\" is not correctly rounded";
CPPUNIT_ASSERT_EQUAL_MESSAGE( aMessage.getStr(), fExpectedRoundVal, fRoundValue );
}
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 48101b3849e4..af95ef99c288 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -587,7 +587,7 @@ void ScBroadcastAreaSlot::Dump() const
const SvtBroadcaster::ListenersType& rListeners = rBC.GetAllListeners();
size_t n = rListeners.size();
- cout << " * range: " << rtl::OUStringToOString(pArea->GetRange().Format(ScRefFlags::VALID|ScRefFlags::TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
+ cout << " * range: " << OUStringToOString(pArea->GetRange().Format(ScRefFlags::VALID|ScRefFlags::TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
<< ", group: " << pArea->IsGroupListening()
<< ", listener count: " << n << endl;
@@ -597,7 +597,7 @@ void ScBroadcastAreaSlot::Dump() const
if (pFC)
{
cout << " * listener: formula cell: "
- << rtl::OUStringToOString(pFC->aPos.Format(ScRefFlags::VALID|ScRefFlags::TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
+ << OUStringToOString(pFC->aPos.Format(ScRefFlags::VALID|ScRefFlags::TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
<< endl;
continue;
}
@@ -606,7 +606,7 @@ void ScBroadcastAreaSlot::Dump() const
if (pFGListener)
{
cout << " * listener: formula group: (pos: "
- << rtl::OUStringToOString(pFGListener->getTopCellPos().Format(ScRefFlags::VALID | ScRefFlags::TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
+ << OUStringToOString(pFGListener->getTopCellPos().Format(ScRefFlags::VALID | ScRefFlags::TAB_3D, pDoc), RTL_TEXTENCODING_UTF8).getStr()
<< ", length: " << pFGListener->getGroupLength()
<< ")" << endl;
continue;
diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx
index 512e6fda53e7..029e96c72f2f 100644
--- a/sc/source/core/data/stlpool.cxx
+++ b/sc/source/core/data/stlpool.cxx
@@ -388,7 +388,7 @@ namespace {
struct CaseInsensitiveNamePredicate : svl::StyleSheetPredicate
{
- CaseInsensitiveNamePredicate(const rtl::OUString& rName, SfxStyleFamily eFam)
+ CaseInsensitiveNamePredicate(const OUString& rName, SfxStyleFamily eFam)
: mFamily(eFam)
{
mUppercaseName = ScGlobal::pCharClass->uppercase(rName);
@@ -399,7 +399,7 @@ struct CaseInsensitiveNamePredicate : svl::StyleSheetPredicate
{
if (rStyleSheet.GetFamily() == mFamily)
{
- rtl::OUString aUpName = ScGlobal::pCharClass->uppercase(rStyleSheet.GetName());
+ OUString aUpName = ScGlobal::pCharClass->uppercase(rStyleSheet.GetName());
if (mUppercaseName == aUpName)
{
return true;
@@ -408,7 +408,7 @@ struct CaseInsensitiveNamePredicate : svl::StyleSheetPredicate
return false;
}
- rtl::OUString mUppercaseName;
+ OUString mUppercaseName;
SfxStyleFamily const mFamily;
};
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 0f0f5e57f134..7c9c6baa3e88 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -300,7 +300,7 @@ public:
throw Unhandled(__FILE__, __LINE__);
}
- const rtl::OUString s = ref->GetString().getString().toAsciiUpperCase();
+ const OUString s = ref->GetString().getString().toAsciiUpperCase();
hashCode = s.hashCode();
// Pass the scalar result back to the rest of the formula kernel
diff --git a/sc/source/core/tool/formulalogger.cxx b/sc/source/core/tool/formulalogger.cxx
index af6c873a1ae7..0f2c82041d7b 100644
--- a/sc/source/core/tool/formulalogger.cxx
+++ b/sc/source/core/tool/formulalogger.cxx
@@ -300,7 +300,7 @@ void FormulaLogger::writeAscii( const char* s, size_t n )
void FormulaLogger::write( const OUString& ou )
{
- OString s = rtl::OUStringToOString(ou, RTL_TEXTENCODING_UTF8).getStr();
+ OString s = OUStringToOString(ou, RTL_TEXTENCODING_UTF8).getStr();
writeAscii(s.getStr(), s.getLength());
}
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index b69a96504dd6..0026f8f1377e 100644
--- a/sc/source/core/tool/interpr7.cxx
+++ b/sc/source/core/tool/interpr7.cxx
@@ -175,7 +175,7 @@ void ScInterpreter::ScFilterXML()
{
if( nSize > nNode )
{
- rtl::OUString aResult;
+ OUString aResult;
if(pNodeSet->nodeTab[nNode]->type == XML_NAMESPACE_DECL)
{
xmlNsPtr ns = reinterpret_cast<xmlNsPtr>(pNodeSet->nodeTab[nNode]);
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 43c9b98fe8cc..920de7431839 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -206,7 +206,7 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm )
"sharedStrings.xml",
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml",
- rtl::OUStringToOString(oox::getRelationship(Relationship::SHAREDSTRINGS), RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(oox::getRelationship(Relationship::SHAREDSTRINGS), RTL_TEXTENCODING_UTF8).getStr());
rStrm.PushStream( pSst );
pSst->startElement( XML_sst,
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 81aab4194e24..111820021319 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1434,7 +1434,7 @@ void XclExpComments::SaveXml( XclExpXmlStream& rStrm )
XclXmlUtils::GetStreamName( "../", "comments", mnTab + 1 ),
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml",
- rtl::OUStringToOString(oox::getRelationship(Relationship::COMMENTS), RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(oox::getRelationship(Relationship::COMMENTS), RTL_TEXTENCODING_UTF8).getStr());
rStrm.PushStream( rComments );
if( rStrm.getVersion() == oox::core::ISOIEC_29500_2008 )
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 2934439d69a6..b70086e9f364 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1089,7 +1089,7 @@ bool XclExpXmlStream::exportDocument()
PushStream( CreateOutputStream( workbook, workbook,
uno::Reference <XOutputStream>(),
pWorkbookContentType,
- rtl::OUStringToOString(oox::getRelationship(Relationship::OFFICEDOCUMENT), RTL_TEXTENCODING_UTF8).getStr() ) );
+ OUStringToOString(oox::getRelationship(Relationship::OFFICEDOCUMENT), RTL_TEXTENCODING_UTF8).getStr() ) );
if (mbExportVBA)
{
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index d7a621c30150..177a15a46a5a 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -3162,7 +3162,7 @@ void XclExpXmlStyleSheet::SaveXml( XclExpXmlStream& rStrm )
"styles.xml",
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml",
- rtl::OUStringToOString(oox::getRelationship(Relationship::STYLES), RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(oox::getRelationship(Relationship::STYLES), RTL_TEXTENCODING_UTF8).getStr());
rStrm.PushStream( aStyleSheet );
aStyleSheet->startElement( XML_styleSheet,
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 09ff5e63b422..63387a275984 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -455,7 +455,7 @@ SdrObjectUniquePtr XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffC
{
const Reference< XControlModel >& xCtrlModel = pSdrUnoObj->GetUnoControlModel();
Reference< XPropertySet > xPropSet(xCtrlModel,UNO_QUERY);
- const static rtl::OUString sPropertyName("ControlTypeinMSO");
+ const static OUString sPropertyName("ControlTypeinMSO");
enum { eCreateFromOffice = 0, eCreateFromMSTBXControl, eCreateFromMSOCXControl };
@@ -475,7 +475,7 @@ SdrObjectUniquePtr XclImpDrawObjBase::CreateSdrObject( XclImpDffConverter& rDffC
if( mnObjType == 8 )//OCX
{
//Need summary type for export
- const static rtl::OUString sObjIdPropertyName("ObjIDinMSO");
+ const static OUString sObjIdPropertyName("ObjIDinMSO");
const XclImpPictureObj* const pObj = dynamic_cast< const XclImpPictureObj* const >(this);
if( pObj != nullptr && pObj->IsOcxControl() )
{
diff --git a/sc/source/filter/inc/ooxformulaparser.hxx b/sc/source/filter/inc/ooxformulaparser.hxx
index 133ed1013897..b4166d0d17dc 100644
--- a/sc/source/filter/inc/ooxformulaparser.hxx
+++ b/sc/source/filter/inc/ooxformulaparser.hxx
@@ -47,13 +47,13 @@ public:
// com.sun.star.lang.XServiceInfo interface -------------------------------
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getImplementationName() override;
virtual sal_Bool SAL_CALL
- supportsService( const ::rtl::OUString& rService ) override;
+ supportsService( const OUString& rService ) override;
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() override;
// com.sun.star.lang.XInitialization interface ----------------------------
@@ -63,17 +63,17 @@ public:
// com.sun.star.sheet.XFilterFormulaParser interface ----------------------
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
getSupportedNamespace() override;
// com.sun.star.sheet.XFormulaParser interface ----------------------------
virtual css::uno::Sequence< css::sheet::FormulaToken > SAL_CALL
parseFormula(
- const ::rtl::OUString& rFormula,
+ const OUString& rFormula,
const css::table::CellAddress& rReferencePos ) override;
- virtual ::rtl::OUString SAL_CALL
+ virtual OUString SAL_CALL
printFormula(
const css::uno::Sequence< css::sheet::FormulaToken >& rTokens,
const css::table::CellAddress& rReferencePos ) override;
diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx
index c563321a03c5..c3de7a4927bc 100644
--- a/sc/source/filter/oox/ooxformulaparser.cxx
+++ b/sc/source/filter/oox/ooxformulaparser.cxx
@@ -34,8 +34,6 @@ using namespace ::com::sun::star::sheet;
using namespace ::com::sun::star::table;
using namespace ::com::sun::star::uno;
-using ::rtl::OUString;
-
class OOXMLFormulaParserImpl : private FormulaFinalizer
{
public:
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 22e1dfac26be..16216b02affd 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -256,7 +256,7 @@ void SaveDrawingMLObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int
XclXmlUtils::GetStreamName( "../", "drawings/drawing", nDrawing ),
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.drawing+xml",
- rtl::OUStringToOString(oox::getRelationship(Relationship::DRAWING), RTL_TEXTENCODING_UTF8).getStr(),
+ OUStringToOString(oox::getRelationship(Relationship::DRAWING), RTL_TEXTENCODING_UTF8).getStr(),
&sId );
rStrm.GetCurrentStream()->singleElement( XML_drawing,
@@ -290,7 +290,7 @@ void SaveVmlObjects( XclExpObjList& rList, XclExpXmlStream& rStrm, sal_Int32& nV
XclXmlUtils::GetStreamName( "../", "drawings/vmlDrawing", nDrawing ),
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.vmlDrawing",
- rtl::OUStringToOString(oox::getRelationship(Relationship::VMLDRAWING), RTL_TEXTENCODING_UTF8).getStr(),
+ OUStringToOString(oox::getRelationship(Relationship::VMLDRAWING), RTL_TEXTENCODING_UTF8).getStr(),
&sId );
rStrm.GetCurrentStream()->singleElement( XML_legacyDrawing,
@@ -1280,7 +1280,7 @@ void ExcBundlesheet8::SaveXml( XclExpXmlStream& rStrm )
XclXmlUtils::GetStreamName( nullptr, "worksheets/sheet", nTab+1),
rStrm.GetCurrentStream()->getOutputStream(),
"application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml",
- rtl::OUStringToOString(oox::getRelationship(Relationship::WORKSHEET), RTL_TEXTENCODING_UTF8).getStr(),
+ OUStringToOString(oox::getRelationship(Relationship::WORKSHEET), RTL_TEXTENCODING_UTF8).getStr(),
&sId );
rStrm.GetCurrentStream()->singleElement( XML_sheet,
diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx
index 9d5160da9c0f..9a029e8cabf6 100644
--- a/sc/source/ui/inc/AccessibleEditObject.hxx
+++ b/sc/source/ui/inc/AccessibleEditObject.hxx
@@ -179,7 +179,7 @@ private:
virtual sal_Int32 SAL_CALL getBackground( ) override;
- sal_Int32 GetFgBgColor( const rtl::OUString &strPropColor) ;
+ sal_Int32 GetFgBgColor( const OUString &strPropColor) ;
};
#endif
diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx
index 41777caf360c..ad5ed4234e99 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.cxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.cxx
@@ -39,7 +39,6 @@
using namespace css;
using namespace css::uno;
-using ::rtl::OUString;
namespace sc { namespace sidebar {
@@ -53,7 +52,7 @@ ScPanelFactory::~ScPanelFactory()
}
Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement (
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments)
{
Reference<ui::XUIElement> xElement;
diff --git a/sc/source/ui/sidebar/ScPanelFactory.hxx b/sc/source/ui/sidebar/ScPanelFactory.hxx
index 1e08c43281e9..817058588fe9 100644
--- a/sc/source/ui/sidebar/ScPanelFactory.hxx
+++ b/sc/source/ui/sidebar/ScPanelFactory.hxx
@@ -46,7 +46,7 @@ public:
// XUIElementFactory
css::uno::Reference<css::ui::XUIElement> SAL_CALL createUIElement(
- const ::rtl::OUString& rsResourceURL,
+ const OUString& rsResourceURL,
const ::css::uno::Sequence<css::beans::PropertyValue>& rArguments) override;
OUString SAL_CALL getImplementationName() override;
diff --git a/sc/source/ui/vba/vbaname.cxx b/sc/source/ui/vba/vbaname.cxx
index 920cc22cb520..e89ba81d48b5 100644
--- a/sc/source/ui/vba/vbaname.cxx
+++ b/sc/source/ui/vba/vbaname.cxx
@@ -131,7 +131,7 @@ void ScVbaName::setContent( const OUString& rContent, const formula::FormulaGra
OUString
ScVbaName::getValue()
{
- rtl::OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
+ OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_A1 );
return sResult;
}
@@ -169,7 +169,7 @@ ScVbaName::setRefersToLocal( const OUString & rRefersTo )
OUString
ScVbaName::getRefersToR1C1()
{
- rtl::OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
+ OUString sResult = getContent( formula::FormulaGrammar::GRAM_NATIVE_XL_R1C1 );
return sResult;
}
diff --git a/sc/source/ui/vba/vbapagesetup.hxx b/sc/source/ui/vba/vbapagesetup.hxx
index e1c6c4cfc50b..39ed7ff65d33 100644
--- a/sc/source/ui/vba/vbapagesetup.hxx
+++ b/sc/source/ui/vba/vbapagesetup.hxx
@@ -79,10 +79,10 @@ public:
virtual sal_Bool SAL_CALL getPrintGridlines() override;
virtual void SAL_CALL setPrintGridlines( sal_Bool _printgridlines ) override;
- virtual ::rtl::OUString SAL_CALL getPrintTitleRows() override;
- virtual void SAL_CALL setPrintTitleRows( const ::rtl::OUString& _printtitlerows ) override;
- virtual ::rtl::OUString SAL_CALL getPrintTitleColumns() override;
- virtual void SAL_CALL setPrintTitleColumns( const ::rtl::OUString& _printtitlecolumns ) override;
+ virtual OUString SAL_CALL getPrintTitleRows() override;
+ virtual void SAL_CALL setPrintTitleRows( const OUString& _printtitlerows ) override;
+ virtual OUString SAL_CALL getPrintTitleColumns() override;
+ virtual void SAL_CALL setPrintTitleColumns( const OUString& _printtitlecolumns ) override;
virtual sal_Int32 SAL_CALL getPaperSize() override;
virtual void SAL_CALL setPaperSize( sal_Int32 papersize ) override;
// XHelperInterface
diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx
index fafee6815e70..5d90aec39f2a 100644
--- a/sc/source/ui/vba/vbarange.cxx
+++ b/sc/source/ui/vba/vbarange.cxx
@@ -1961,7 +1961,7 @@ ScVbaRange::getFormulaArray()
uno::Any aSingleValueOrMatrix;
// When dealing with a single element ( embedded in the sequence of sequence ) unwrap and return
// that value
- uno::Sequence< uno::Sequence<rtl::OUString> > aTmpSeq = xCellRangeFormula->getFormulaArray();
+ uno::Sequence< uno::Sequence<OUString> > aTmpSeq = xCellRangeFormula->getFormulaArray();
if ( aTmpSeq.getLength() == 1 )
{
if ( aTmpSeq[ 0 ].getLength() == 1 )
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 7e7e40b95fd6..8f7f7e37c836 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -2473,7 +2473,7 @@ OUString ScTabView::getRowColumnHeaders(const tools::Rectangle& rRectangle)
bool bRangeHeaderSupport = comphelper::LibreOfficeKit::isRangeHeaders();
- rtl::OUStringBuffer aBuffer(256);
+ OUStringBuffer aBuffer(256);
aBuffer.append("{ \"commandName\": \".uno:ViewRowColumnHeaders\",\n");
SCTAB nTab = aViewData.GetTabNo();
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-17 19:45:30 +0000