[PATCH 2/2] Remove some dead code
Thomas Arnhold
thomas at arnhold.org
Sun Jan 16 10:21:03 PST 2011
---
sc/source/ui/dbgui/tpsort.cxx | 6 ---
sc/source/ui/docshell/docfunc.cxx | 19 +---------
sc/source/ui/docshell/docsh.cxx | 40 +-------------------
sc/source/ui/docshell/docsh5.cxx | 7 +---
sc/source/ui/docshell/docsh8.cxx | 3 -
sc/source/ui/docshell/impex.cxx | 4 --
.../ui/unoobj/ChartRangeSelectionListener.cxx | 10 -----
sc/source/ui/unoobj/dapiuno.cxx | 12 ------
sc/source/ui/unoobj/textuno.cxx | 8 ----
sc/source/ui/vba/vbaaxis.cxx | 3 -
sc/source/ui/vba/vbachart.cxx | 6 ---
sc/source/ui/vba/vbainterior.cxx | 3 -
sc/source/ui/vba/vbaworksheets.cxx | 2 +-
13 files changed, 4 insertions(+), 119 deletions(-)
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 8957631..517a9b5 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -577,8 +577,6 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent,
aLineDirection ( this, ScResId( FL_DIRECTION ) ),
aBtnTopDown ( this, ScResId( BTN_TOP_DOWN ) ),
aBtnLeftRight ( this, ScResId( BTN_LEFT_RIGHT ) ),
-// aFtAreaLabel ( this, ScResId( FT_AREA_LABEL ) ),
-// aFtArea ( this, ScResId( FT_AREA ) ),
//
#if ENABLE_LAYOUT_EXPERIMENTAL
#undef this
@@ -700,10 +698,6 @@ void ScTabPageSortOptions::Init()
theArea += theDbName;
theArea += ')';
- //aFtArea.SetText( theArea );
- //theArea.Insert( aStrAreaLabel, 0 );
- //aFtAreaLabel.SetText( theArea );
-
aBtnHeader.SetText( aStrColLabel );
}
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index c940a93..85e31a5 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -687,7 +687,6 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
else
{
pDoc->DeleteSelection( nFlags, aMultiMark );
-// aMultiMark.MarkToSimple();
}
// add undo action after drawing undo is complete (objects and note captions)
@@ -701,10 +700,7 @@ BOOL ScDocFunc::DeleteContents( const ScMarkData& rMark, USHORT nFlags,
else if (nExtFlags & SC_PF_LINES)
lcl_PaintAbove( rDocShell, aExtendedRange ); // fuer Linien ueber dem Bereich
-// rDocShell.UpdateOle(GetViewData()); //! an der View?
aModificator.SetDocumentModified();
-//! CellContentChanged();
-//! ShowAllCursors();
return TRUE;
}
@@ -1333,14 +1329,8 @@ BOOL ScDocFunc::ApplyStyle( const ScMarkData& rMark, const String& rStyleName,
}
-// BOOL bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
-// pDoc->ApplySelectionPattern( rPattern, rMark );
-
pDoc->ApplySelectionStyle( (ScStyleSheet&)*pStyleSheet, rMark );
-// if (!bPaintExt)
-// bPaintExt = pDoc->HasAttrib( aMultiRange, HASATTR_PAINTEXT );
-// USHORT nExtFlags = bPaintExt ? SC_PF_LINES : 0;
USHORT nExtFlags = 0;
if (!AdjustRowHeight( aMultiRange ))
rDocShell.PostPaint( aMultiRange, PAINT_GRID, nExtFlags );
@@ -1751,7 +1741,6 @@ BOOL ScDocFunc::InsertCells( const ScRange& rRange, const ScMarkData* pTabMark,
rDocShell.PostPaint( nPaintStartX, nPaintStartY, i, nPaintEndX, nPaintEndY, i+nScenarioCount, nPaintFlags, nExtFlags );
}
}
- //aModificator.SetDocumentModified();
}
else
{
@@ -3598,7 +3587,6 @@ BOOL ScDocFunc::ClearItems( const ScMarkData& rMark, const USHORT* pWhich, BOOL
aMultiMark.MarkToMulti();
aMultiMark.GetMultiMarkArea( aMarkRange );
-// if (bRecord)
if (bUndo)
{
SCTAB nStartTab = aMarkRange.aStart.Tab();
@@ -3639,7 +3627,6 @@ BOOL ScDocFunc::ChangeIndent( const ScMarkData& rMark, BOOL bIncrement, BOOL bAp
ScRange aMarkRange;
rMark.GetMultiMarkArea( aMarkRange );
-// if (bRecord)
if (bUndo)
{
SCTAB nStartTab = aMarkRange.aStart.Tab();
@@ -3820,7 +3807,7 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
WaitObject aWait( rDocShell.GetActiveDialogParent() );
ScDocument* pUndoDoc = NULL;
-// if (bRecord) // immer
+
if (bUndo)
{
//! auch bei Undo selektierte Tabellen beruecksichtigen
@@ -3856,7 +3843,6 @@ BOOL ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark,
pDoc->InsertMatrixFormula( nStartCol, nStartRow, nEndCol, nEndRow,
aMark, rString, NULL, eGrammar);
-// if (bRecord) // immer
if (bUndo)
{
//! auch bei Undo selektierte Tabellen beruecksichtigen
@@ -4038,7 +4024,6 @@ BOOL ScDocFunc::FillSimple( const ScRange& rRange, const ScMarkData* pTabMark,
}
rDocShell.PostPaintGridAll();
-// rDocShell.PostPaintDataChanged();
aModificator.SetDocumentModified();
bSuccess = TRUE;
@@ -4147,7 +4132,6 @@ BOOL ScDocFunc::FillSeries( const ScRange& rRange, const ScMarkData* pTabMark,
AdjustRowHeight(rRange);
rDocShell.PostPaintGridAll();
-// rDocShell.PostPaintDataChanged();
aModificator.SetDocumentModified();
}
@@ -4288,7 +4272,6 @@ BOOL ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e
}
rDocShell.PostPaintGridAll();
-// rDocShell.PostPaintDataChanged();
aModificator.SetDocumentModified();
rRange = aDestArea; // Zielbereich zurueckgeben (zum Markieren)
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 0789d89..105469b 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -161,11 +161,8 @@ const sal_Char ScDocShell::pStyleName[] = "SfxStyleSheets";
// Filter-Namen (wie in sclib.cxx)
static const sal_Char pFilterSc50[] = "StarCalc 5.0";
-//static const sal_Char pFilterSc50Temp[] = "StarCalc 5.0 Vorlage/Template";
static const sal_Char pFilterSc40[] = "StarCalc 4.0";
-//static const sal_Char pFilterSc40Temp[] = "StarCalc 4.0 Vorlage/Template";
static const sal_Char pFilterSc30[] = "StarCalc 3.0";
-//static const sal_Char pFilterSc30Temp[] = "StarCalc 3.0 Vorlage/Template";
static const sal_Char pFilterSc10[] = "StarCalc 1.0";
static const sal_Char pFilterXML[] = "StarOffice XML (Calc)";
static const sal_Char pFilterAscii[] = "Text - txt - csv (StarCalc)";
@@ -1158,9 +1155,6 @@ BOOL ScDocShell::ConvertFrom( SfxMedium& rMedium )
}
else
bRet = TRUE;
-
- // #93255# update of row height done inside of Excel filter to speed up chart import
-// bSetRowHeights = TRUE; // #75357# optimal row heights must be updated
}
else if (aFltName.EqualsAscii(pFilterAscii))
{
@@ -1483,12 +1477,6 @@ BOOL ScDocShell::ConvertFrom( SfxMedium& rMedium )
nWidth + (USHORT)ScGlobal::nLastColWidthExtra );
}
}
-// if ( bSetRowHeights )
-// {
-// // nExtra must be 0
-// aDocument.SetOptimalHeight( 0, nEndRow, nTab, 0, &aVirtDev,
-// nPPTX, nPPTY, aZoom, aZoom, FALSE );
-// }
}
if (bSetRowHeights)
@@ -1605,13 +1593,6 @@ BOOL ScDocShell::SaveAs( SfxMedium& rMedium )
BOOL ScDocShell::IsInformationLost()
{
-/*
- const SfxFilter *pFilt = GetMedium()->GetFilter();
- BOOL bRet = pFilt && pFilt->IsAlienFormat() && bNoInformLost;
- if (bNoInformLost) // nur einmal!!
- bNoInformLost = FALSE;
- return bRet;
-*/
//!!! bei Gelegenheit ein korrekte eigene Behandlung einbauen
return SfxObjectShell::IsInformationLost();
@@ -1621,12 +1602,10 @@ BOOL ScDocShell::IsInformationLost()
// Xcl-like column width measured in characters of standard font.
xub_StrLen lcl_ScDocShell_GetColWidthInChars( USHORT nWidth )
{
- // double fColScale = 1.0;
- double f = nWidth;
+ double f = nWidth;
f *= 1328.0 / 25.0;
f += 90.0;
f *= 1.0 / 23.0;
- // f /= fColScale * 256.0;
f /= 256.0;
return xub_StrLen( f );
@@ -2074,19 +2053,6 @@ BOOL ScDocShell::ConvertTo( SfxMedium &rMed )
BOOL bRet = FALSE;
String aFltName = rMed.GetFilter()->GetFilterName();
-/*
- if (aFltName.EqualsAscii(pFilterLotus))
- {
- SvStream* pStream = rMed.GetOutStream();
- if (pStream)
- {
- FltError eError = ScFormatFilter::Get().ScExportLotus123( *pStream, &aDocument, ExpWK1,
- CHARSET_IBMPC_437 );
- bRet = eError == eERR_OK;
- }
- }
- else
-*/
if (aFltName.EqualsAscii(pFilterXML))
{
//TODO/LATER: this shouldn't happen!
@@ -2211,12 +2177,8 @@ BOOL ScDocShell::ConvertTo( SfxMedium &rMed )
if ( eError != eERR_OK && (eError & ERRCODE_WARNING_MASK) )
{
-//! if ( !rMed.GetError() )
-//! rMed.SetError( eError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
eError = eERR_OK;
}
-//! else if ( aDocument.GetTableCount() > 1 && !rMed.GetError() )
-//! rMed.SetError( SCWARN_EXPORT_ASCII, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
INetURLObject aTmpFile( rMed.GetPhysicalName(), INET_PROT_FILE );
if ( bHasMemo )
diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx
index 852e5b1..2bdad7c 100644
--- a/sc/source/ui/docshell/docsh5.cxx
+++ b/sc/source/ui/docshell/docsh5.cxx
@@ -260,15 +260,10 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe
nStartCol = nEndCol = nCol;
nStartRow = nEndRow = nRow;
nStartTab = nEndTab = nTab;
-// bMark = FALSE; // nichts zu markieren
}
else
{
- if ( bSelected )
- {
-// bMark = FALSE;
- }
- else
+ if ( !bSelected )
{ // zusammenhaengender Bereich
nStartCol = nCol;
nStartRow = nRow;
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 32fec8a..b35ac92 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -171,7 +171,6 @@ namespace
// -----------------------------------------------------------------------
// MoveFile/KillFile/IsDocument: similar to SfxContentHelper
-// static
BOOL ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& rDestObj )
{
sal_Bool bMoveData = sal_True;
@@ -216,7 +215,6 @@ BOOL ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject&
}
-// static
BOOL ScDocShell::KillFile( const INetURLObject& rURL )
{
sal_Bool bRet = sal_True;
@@ -236,7 +234,6 @@ BOOL ScDocShell::KillFile( const INetURLObject& rURL )
return bRet;
}
-// static
BOOL ScDocShell::IsDocument( const INetURLObject& rURL )
{
sal_Bool bRet = sal_False;
diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx
index 23b7238..9c07413 100644
--- a/sc/source/ui/docshell/impex.cxx
+++ b/sc/source/ui/docshell/impex.cxx
@@ -516,7 +516,6 @@ BOOL ScImportExport::ExportStream( SvStream& rStrm, const String& rBaseURL, ULON
}
-//static
void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const String& rString, BOOL bZero )
{
rtl_TextEncoding eEnc = rStrm.GetStreamCharSet();
@@ -547,7 +546,6 @@ void ScImportExport::WriteUnicodeOrByteString( SvStream& rStrm, const String& rS
// This function could be replaced by endlub()
-// static
void ScImportExport::WriteUnicodeOrByteEndl( SvStream& rStrm )
{
if ( rStrm.GetStreamCharSet() == RTL_TEXTENCODING_UNICODE )
@@ -1361,7 +1359,6 @@ BOOL ScImportExport::ExtText2Doc( SvStream& rStrm )
}
-// static
const sal_Unicode* ScImportExport::ScanNextFieldFromString( const sal_Unicode* p,
String& rField, sal_Unicode cStr, const sal_Unicode* pSeps, bool bMergeSeps, bool& rbIsQuoted )
{
@@ -1519,7 +1516,6 @@ BOOL ScImportExport::Doc2Text( SvStream& rStrm )
if( nCol < nEndCol )
lcl_WriteSimpleString( rStrm, String(cSep) );
}
-// if( nRow < nEndRow )
WriteUnicodeOrByteEndl( rStrm );
if( rStrm.GetError() != SVSTREAM_OK )
break;
diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
index 95976b1..e7d4e6a 100644
--- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
+++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx
@@ -70,16 +70,6 @@ void SAL_CALL ScChartRangeSelectionListener::selectionChanged( const lang::Event
{
m_pViewShell->DoChartSelection( aRanges );
}
-// SfxViewFrame *pFrame = SfxViewFrame::GetFirst( m_pDocShell );
-// while (pFrame)
-// {
-// SfxViewShell* pSh = pFrame->GetViewShell();
-// if (pSh && pSh->ISA(ScTabViewShell))
-// {
-// ScTabViewShell* pViewSh = (ScTabViewShell*)pSh;
-// }
-// pFrame = SfxViewFrame::GetNext( *pFrame, m_pDocShell );
-// }
}
}
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 3f7ef28..819a840 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -1090,7 +1090,6 @@ sal_Int64 SAL_CALL ScDataPilotDescriptorBase::getSomething(
return 0;
}
-// static
const Sequence<sal_Int8>& ScDataPilotDescriptorBase::getUnoTunnelId()
{
static Sequence<sal_Int8> * pSeq = 0;
@@ -1107,7 +1106,6 @@ const Sequence<sal_Int8>& ScDataPilotDescriptorBase::getUnoTunnelId()
return *pSeq;
}
-// static
ScDataPilotDescriptorBase* ScDataPilotDescriptorBase::getImplementation(
const Reference<XDataPilotDescriptor> xObj )
{
@@ -1282,14 +1280,6 @@ void SAL_CALL ScDataPilotTableObj::refresh() throw(RuntimeException)
SolarMutexGuard aGuard;
if( ScDPObject* pDPObj = lcl_GetDPObject(GetDocShell(), nTab, aName) )
RefreshDPObject( pDPObj, NULL, GetDocShell(), TRUE, TRUE );
- //if (pDPObj)
- //{
- // ScDPObject* pNew = new ScDPObject(*pDPObj);
- // ScDBDocFunc aFunc(*GetDocShell());
- // aFunc.DataPilotUpdate( pDPObj, pNew, TRUE, TRUE );
- // delete pNew; // DataPilotUpdate copies settings from "new" object
- //}
-
}
Sequence< Sequence<Any> > SAL_CALL ScDataPilotTableObj::getDrillDownData(const CellAddress& aAddr)
@@ -3035,8 +3025,6 @@ void ScDataPilotFieldGroupsObj::renameFieldGroup( const OUString& rOldName, cons
aOldIt->maName = rNewName;
}
-// private
-
ScFieldGroups::iterator ScDataPilotFieldGroupsObj::implFindByName( const OUString& rName )
{
for( ScFieldGroups::iterator aIt = maGroups.begin(), aEnd = maGroups.end(); aIt != aEnd; ++aIt )
diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx
index 0de4ab2..d2c9727 100644
--- a/sc/source/ui/unoobj/textuno.cxx
+++ b/sc/source/ui/unoobj/textuno.cxx
@@ -200,7 +200,6 @@ sal_Int64 SAL_CALL ScHeaderFooterContentObj::getSomething(
return 0;
}
-// static
const uno::Sequence<sal_Int8>& ScHeaderFooterContentObj::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -217,7 +216,6 @@ const uno::Sequence<sal_Int8>& ScHeaderFooterContentObj::getUnoTunnelId()
return *pSeq;
}
-// static
ScHeaderFooterContentObj* ScHeaderFooterContentObj::getImplementation(
const uno::Reference<sheet::XHeaderFooterContent> xObj )
{
@@ -694,7 +692,6 @@ sal_Int64 SAL_CALL ScCellTextCursor::getSomething(
return SvxUnoTextCursor::getSomething( rId );
}
-// static
const uno::Sequence<sal_Int8>& ScCellTextCursor::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -711,7 +708,6 @@ const uno::Sequence<sal_Int8>& ScCellTextCursor::getUnoTunnelId()
return *pSeq;
}
-// static
ScCellTextCursor* ScCellTextCursor::getImplementation( const uno::Reference<uno::XInterface> xObj )
{
ScCellTextCursor* pRet = NULL;
@@ -798,7 +794,6 @@ sal_Int64 SAL_CALL ScHeaderFooterTextCursor::getSomething(
return SvxUnoTextCursor::getSomething( rId );
}
-// static
const uno::Sequence<sal_Int8>& ScHeaderFooterTextCursor::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -815,7 +810,6 @@ const uno::Sequence<sal_Int8>& ScHeaderFooterTextCursor::getUnoTunnelId()
return *pSeq;
}
-// static
ScHeaderFooterTextCursor* ScHeaderFooterTextCursor::getImplementation(
const uno::Reference<uno::XInterface> xObj )
{
@@ -902,7 +896,6 @@ sal_Int64 SAL_CALL ScDrawTextCursor::getSomething(
return SvxUnoTextCursor::getSomething( rId );
}
-// static
const uno::Sequence<sal_Int8>& ScDrawTextCursor::getUnoTunnelId()
{
static uno::Sequence<sal_Int8> * pSeq = 0;
@@ -919,7 +912,6 @@ const uno::Sequence<sal_Int8>& ScDrawTextCursor::getUnoTunnelId()
return *pSeq;
}
-// static
ScDrawTextCursor* ScDrawTextCursor::getImplementation( const uno::Reference<uno::XInterface> xObj )
{
ScDrawTextCursor* pRet = NULL;
diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx
index a1f0dc3..fc93458 100644
--- a/sc/source/ui/vba/vbaaxis.cxx
+++ b/sc/source/ui/vba/vbaaxis.cxx
@@ -173,7 +173,6 @@ ScVbaAxis::getCrosses( ) throw (script::BasicErrorException, uno::RuntimeExcept
{
double forigin = 0.0;
mxPropertySet->getPropertyValue(ORIGIN) >>= forigin;
-//obsolete double fmax = AnyConverter.toDouble(mxPropertySet.getPropertyValue("Max"));
double fmin = 0.0;
mxPropertySet->getPropertyValue(VBA_MIN) >>= fmin;
if (forigin == fmin)
@@ -195,11 +194,9 @@ ScVbaAxis::setCrossesAt( double _fCrossesAt ) throw (script::BasicErrorException
{
try
{
-// if (getCrosses() == xlAxisCrossesCustom){
setMaximumScaleIsAuto( sal_False );
setMinimumScaleIsAuto( sal_False );
mxPropertySet->setPropertyValue(ORIGIN, uno::makeAny(_fCrossesAt));
-// }
}
catch (uno::Exception& e)
{
diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx
index 647e3ba..9c55800 100644
--- a/sc/source/ui/vba/vbachart.cxx
+++ b/sc/source/ui/vba/vbachart.cxx
@@ -1035,7 +1035,6 @@ ScVbaChart::isSeriesIndexValid(sal_Int32 _seriesindex) throw( script::BasicError
try
{
uno::Reference< chart::XChartDataArray > xChartDataArray( mxChartDocument->getData(), uno::UNO_QUERY_THROW );
- // dblValues = xChartDataArray.getData();
//TODO I guess we have to differentiate between XlRowCol
if ( !xChartDataArray.is() )
{
@@ -1213,13 +1212,8 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro
}
break;
case xlSeriesAxis:
-// if (_nAxisGroup == xlPrimary){
xAxisProps = xAxisZSupplier->getZAxis();
break;
-// }
-// else if (_nAxisGroup == xlSecondary){
- // return xTwoAxisXSupplier.getSecondaryZAxis();
- // }
case xlValue:
if (_nAxisGroup == xlPrimary)
xAxisProps = xAxisYSupplier->getYAxis();
diff --git a/sc/source/ui/vba/vbainterior.cxx b/sc/source/ui/vba/vbainterior.cxx
index 9bf1482..5892acf 100644
--- a/sc/source/ui/vba/vbainterior.cxx
+++ b/sc/source/ui/vba/vbainterior.cxx
@@ -92,7 +92,6 @@ static PatternMap aPatternMap( lcl_getPatternMap() );
ScVbaInterior::ScVbaInterior( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< beans::XPropertySet >& xProps, ScDocument* pScDoc ) throw ( lang::IllegalArgumentException) : ScVbaInterior_BASE( xParent, xContext ), m_xProps(xProps), m_pScDoc( pScDoc )
{
// auto color
- //m_aPattColor.SetColor( (sal_uInt32)0xFFFFFFFF );
m_aPattColor.SetColor( (sal_uInt32)0x0 );
m_nPattern = 0L;
if ( !m_xProps.is() )
@@ -113,7 +112,6 @@ ScVbaInterior::setColor( const uno::Any& _color ) throw (uno::RuntimeException)
if( _color >>= nColor )
{
SetUserDefinedAttributes( BACKCOLOR, SetAttributeData( XLRGBToOORGB( nColor ) ) );
- //m_xProps->setPropertyValue( BACKCOLOR , XLRGBToOORGB(_color));
SetMixedColor();
}
}
@@ -277,7 +275,6 @@ uno::Any
ScVbaInterior::SetAttributeData( sal_Int32 nValue )
{
xml::AttributeData aAttributeData;
- //aAttributeData.Namespace = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ooo.vba.excel.CellPatten"));
aAttributeData.Type = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "sal_Int32" ));
aAttributeData.Value = rtl::OUString::valueOf( nValue );
return uno::makeAny( aAttributeData );
diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx
index 5263b9a..23e77a3 100644
--- a/sc/source/ui/vba/vbaworksheets.cxx
+++ b/sc/source/ui/vba/vbaworksheets.cxx
@@ -480,7 +480,7 @@ ScVbaWorksheets::getServiceNames()
return sNames;
}
-/*static*/ bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const ::rtl::OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException )
+bool ScVbaWorksheets::nameExists( uno::Reference <sheet::XSpreadsheetDocument>& xSpreadDoc, const ::rtl::OUString & name, SCTAB& nTab ) throw ( lang::IllegalArgumentException )
{
if (!xSpreadDoc.is())
throw lang::IllegalArgumentException( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "nameExists() xSpreadDoc is null" ) ), uno::Reference< uno::XInterface >(), 1 );
--
1.7.3.5
--------------070302030400050501060009--
More information about the LibreOffice
mailing list