summaryrefslogtreecommitdiff
path: root/sc/source/ui/unoobj/cellsuno.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/unoobj/cellsuno.cxx')
-rw-r--r--sc/source/ui/unoobj/cellsuno.cxx80
1 files changed, 40 insertions, 40 deletions
diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx
index 9d33a95a061f..52587e58abec 100644
--- a/sc/source/ui/unoobj/cellsuno.cxx
+++ b/sc/source/ui/unoobj/cellsuno.cxx
@@ -1167,9 +1167,9 @@ sal_Bool lcl_PutDataArray( ScDocShell& rDocShell, const ScRange& rRange,
ScMarkData aDestMark;
aDestMark.SelectOneTable( nTab );
rDocShell.GetUndoManager()->AddUndoAction(
- new ScUndoPaste( &rDocShell,
- nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab, aDestMark,
- pUndoDoc, NULL, IDF_CONTENTS, NULL,NULL,NULL,NULL, false ) );
+ new ScUndoPaste(
+ &rDocShell, ScRange(nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab),
+ aDestMark, pUndoDoc, NULL, IDF_CONTENTS, NULL, false));
}
if (!bHeight)
@@ -1255,8 +1255,8 @@ sal_Bool lcl_PutFormulaArray( ScDocShell& rDocShell, const ScRange& rRange,
aDestMark.SelectOneTable( nTab );
rDocShell.GetUndoManager()->AddUndoAction(
new ScUndoPaste( &rDocShell,
- nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab, aDestMark,
- pUndoDoc, NULL, IDF_CONTENTS, NULL,NULL,NULL,NULL, false ) );
+ ScRange(nStartCol, nStartRow, nTab, nEndCol, nEndRow, nTab), aDestMark,
+ pUndoDoc, NULL, IDF_CONTENTS, NULL, false));
}
if (!bHeight)
@@ -7196,7 +7196,7 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc
//? UpdatePageBreakData( sal_True );
pDocSh->SetDocumentModified();
- pDocSh->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID );
+ pDocSh->PostPaint(ScRange(0, 0, nTab, MAXCOL, MAXROW, nTab), PAINT_GRID);
}
}
@@ -7205,7 +7205,7 @@ void SAL_CALL ScTableSheetObj::removeAllManualPageBreaks() throw(uno::RuntimeExc
rtl::OUString SAL_CALL ScTableSheetObj::getName() throw(uno::RuntimeException)
{
SolarMutexGuard aGuard;
- String aName;
+ rtl::OUString aName;
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
pDocSh->GetDocument()->GetName( GetTab_Impl(), aName );
@@ -7694,14 +7694,14 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr
ScDocument* pDoc = pDocSh->GetDocument();
SCTAB nTab = GetTab_Impl();
- String aFileString (aUrl);
- String aFilterString (aFilterName);
- String aOptString (aFilterOptions);
- String aSheetString (aSheetName);
+ rtl::OUString aFileString = aUrl;
+ rtl::OUString aFilterString = aFilterName;
+ rtl::OUString aOptString = aFilterOptions;
+ rtl::OUString aSheetString = aSheetName;
aFileString = ScGlobal::GetAbsDocName( aFileString, pDocSh );
- if ( !aFilterString.Len() )
- ScDocumentLoader::GetFilterName( aFileString, aFilterString, aOptString, sal_True, false );
+ if (aFilterString.isEmpty())
+ ScDocumentLoader::GetFilterName( aFileString, aFilterString, aOptString, true, false );
// remove application prefix from filter name here, so the filter options
// aren't reset when the filter name is changed in ScTableLink::DataChanged
@@ -7736,7 +7736,7 @@ void SAL_CALL ScTableSheetObj::link( const rtl::OUString& aUrl, const rtl::OUStr
if (pBase->ISA(ScTableLink))
{
ScTableLink* pTabLink = (ScTableLink*)pBase;
- if ( pTabLink->GetFileName() == aFileString )
+ if ( aFileString.equals(pTabLink->GetFileName()) )
pTabLink->Update(); // inkl. Paint&Undo
//! Der Dateiname sollte nur einmal vorkommen (?)
@@ -8015,7 +8015,7 @@ rtl::OUString SAL_CALL ScTableSheetObj::getScenarioComment() throw(uno::RuntimeE
ScDocShell* pDocSh = GetDocShell();
if ( pDocSh )
{
- String aComment;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDocSh->GetDocument()->GetScenarioData( GetTab_Impl(), aComment, aColor, nFlags );
@@ -8034,8 +8034,8 @@ void SAL_CALL ScTableSheetObj::setScenarioComment( const rtl::OUString& aScenari
ScDocument* pDoc = pDocSh->GetDocument();
SCTAB nTab = GetTab_Impl();
- String aName;
- String aComment;
+ rtl::OUString aName;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetName( nTab, aName );
@@ -8094,7 +8094,7 @@ void SAL_CALL ScTableSheetObj::apply() throw(uno::RuntimeException)
{
ScDocument* pDoc = pDocSh->GetDocument();
SCTAB nTab = GetTab_Impl();
- String aName;
+ rtl::OUString aName;
pDoc->GetName( nTab, aName ); // Name dieses Szenarios
SCTAB nDestTab = nTab;
@@ -8254,8 +8254,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
sal_Int32 nNewColor = 0;
if (aValue >>= nNewColor)
{
- String aName;
- String aComment;
+ rtl::OUString aName;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetName( nTab, aName );
@@ -8271,8 +8271,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aName;
- String aComment;
+ rtl::OUString aName;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetName( nTab, aName );
@@ -8304,8 +8304,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aName;
- String aComment;
+ rtl::OUString aName;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetName( nTab, aName );
@@ -8337,8 +8337,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aName;
- String aComment;
+ rtl::OUString aName;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetName( nTab, aName );
@@ -8370,8 +8370,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aName;
- String aComment;
+ rtl::OUString aName;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetName( nTab, aName );
@@ -8403,8 +8403,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aName;
- String aComment;
+ rtl::OUString aName;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetName( nTab, aName );
@@ -8436,8 +8436,8 @@ void ScTableSheetObj::SetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aName;
- String aComment;
+ rtl::OUString aName;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetName( nTab, aName );
@@ -8550,7 +8550,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aComment;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
@@ -8562,7 +8562,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aComment;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
@@ -8574,7 +8574,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aComment;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
@@ -8586,7 +8586,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aComment;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
@@ -8598,7 +8598,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aComment;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
@@ -8610,7 +8610,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aComment;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
@@ -8622,7 +8622,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
{
if (pDoc->IsScenario(nTab))
{
- String aComment;
+ rtl::OUString aComment;
Color aColor;
sal_uInt16 nFlags;
pDoc->GetScenarioData( nTab, aComment, aColor, nFlags );
@@ -8648,7 +8648,7 @@ void ScTableSheetObj::GetOnePropertyValue( const SfxItemPropertySimpleEntry* pEn
}
else if ( pEntry->nWID == SC_WID_UNO_CODENAME )
{
- String aCodeName;
+ rtl::OUString aCodeName;
if ( pDocSh )
pDocSh->GetDocument()->GetCodeName( GetTab_Impl(), aCodeName );
rAny <<= rtl::OUString( aCodeName );
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-04 01:27:48 +0000