[Libreoffice-commits] .: scaddins/source sc/source
Christina Rossmanith
crossmanith at kemper.freedesktop.org
Tue Mar 1 04:01:40 PST 2011
sc/source/filter/excel/colrowst.cxx | 2 -
sc/source/filter/excel/excform.cxx | 11 +++-----
sc/source/filter/excel/excform8.cxx | 11 +++-----
sc/source/filter/excel/excrecds.cxx | 2 -
sc/source/filter/excel/exctools.cxx | 4 +--
sc/source/filter/excel/frmbase.cxx | 2 -
sc/source/filter/excel/impop.cxx | 6 ++--
sc/source/filter/excel/read.cxx | 6 ++--
sc/source/filter/excel/xecontent.cxx | 2 -
sc/source/filter/excel/xeescher.cxx | 4 +--
sc/source/filter/excel/xeformula.cxx | 2 -
sc/source/filter/excel/xelink.cxx | 2 -
sc/source/filter/excel/xename.cxx | 2 -
sc/source/filter/excel/xepivot.cxx | 6 ++--
sc/source/filter/excel/xestream.cxx | 2 -
sc/source/filter/excel/xestyle.cxx | 8 +++---
sc/source/filter/excel/xetable.cxx | 8 +++---
sc/source/filter/excel/xichart.cxx | 10 +++----
sc/source/filter/excel/xicontent.cxx | 2 -
sc/source/filter/excel/xiescher.cxx | 14 +++++-----
sc/source/filter/excel/xihelper.cxx | 2 -
sc/source/filter/excel/xilink.cxx | 2 -
sc/source/filter/excel/xiname.cxx | 4 +--
sc/source/filter/excel/xistring.cxx | 2 -
sc/source/filter/excel/xistyle.cxx | 22 ++++++++---------
sc/source/filter/excel/xiview.cxx | 2 -
sc/source/filter/excel/xlescher.cxx | 6 ++--
sc/source/filter/excel/xlstyle.cxx | 2 -
sc/source/filter/excel/xltools.cxx | 2 -
sc/source/filter/html/htmlexp.cxx | 14 +++++-----
sc/source/filter/html/htmlpars.cxx | 8 +++---
sc/source/filter/inc/namebuff.hxx | 4 +--
sc/source/filter/lotus/op.cxx | 10 +++----
sc/source/filter/rtf/eeimpars.cxx | 4 +--
sc/source/filter/starcalc/scflt.cxx | 4 +--
sc/source/filter/xcl97/xcl97esc.cxx | 2 -
sc/source/filter/xcl97/xcl97rec.cxx | 2 -
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 4 +--
sc/source/filter/xml/XMLColumnRowGroupExport.cxx | 2 -
sc/source/filter/xml/XMLStylesExportHelper.cxx | 2 -
sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2 -
sc/source/filter/xml/xmlcelli.cxx | 2 -
sc/source/filter/xml/xmlcvali.cxx | 2 -
sc/source/filter/xml/xmldpimp.cxx | 2 -
sc/source/filter/xml/xmlexprt.cxx | 6 ++--
sc/source/filter/xml/xmlimprt.cxx | 2 -
sc/source/filter/xml/xmlimprt.hxx | 2 -
sc/source/filter/xml/xmllabri.cxx | 2 -
sc/source/filter/xml/xmlstyli.cxx | 2 -
scaddins/source/analysis/analysishelper.cxx | 2 -
50 files changed, 114 insertions(+), 116 deletions(-)
New commits:
commit c65576fa3597c4e639263c2e1e02aafefb64f5bb
Author: Guillaume Poussel <gpoussel at gmail.com>
Date: Tue Mar 1 13:01:08 2011 +0100
Remove bogus comments.
diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx
index cdcaba7..9cebbba 100644
--- a/sc/source/filter/excel/colrowst.cxx
+++ b/sc/source/filter/excel/colrowst.cxx
@@ -193,7 +193,7 @@ void XclImpColRowSettings::SetManualRowHeight( SCROW nScRow )
void XclImpColRowSettings::SetDefaultXF( SCCOL nScCol1, SCCOL nScCol2, sal_uInt16 nXFIndex )
{
- /* #109555# assign the default column formatting here to ensure that
+ /* assign the default column formatting here to ensure that
explicit cell formatting is not overwritten. */
DBG_ASSERT( (nScCol1 <= nScCol2) && ValidCol( nScCol2 ), "XclImpColRowSettings::SetDefaultXF - invalid column index" );
nScCol2 = ::std::min( nScCol2, MAXCOL );
diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx
index 9c9ed79..6bf5e48 100644
--- a/sc/source/filter/excel/excform.cxx
+++ b/sc/source/filter/excel/excform.cxx
@@ -234,7 +234,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
{
aIn >> nOp;
- // #98524# always reset flags
+ // always reset flags
aSRD.InitFlags();
aCRD.InitFlags();
@@ -330,7 +330,6 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s
case 0x10: // Union [314 265]
// ocSep behelfsweise statt 'ocUnion'
aStack >> nMerk0;
-//#100928# aPool << ocOpen << aStack << ocSep << nMerk0 << ocClose;
aPool << aStack << ocSep << nMerk0;
// doesn't fit exactly, but is more Excel-like
aPool >> aStack;
@@ -925,7 +924,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal
aIn >> nOp;
nIgnore = 0;
- // #98524# always reset flags
+ // always reset flags
aSRD.InitFlags();
aCRD.InitFlags();
@@ -1390,7 +1389,7 @@ BOOL ExcelToSc::GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Si
nTab1 = static_cast< SCTAB >( nTabFirst );
nTab2 = static_cast< SCTAB >( nTabLast );
- // #122885# skip references to deleted sheets
+ // skip references to deleted sheets
if( (nRefIdx >= 0) || !ValidTab( nTab1 ) || (nTab1 != nTab2) )
break;
@@ -1595,7 +1594,7 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCo
// a function table, and pre-call argument normalisation 1st.
INT16 nLastRemovable = nLast - nMinParamCount;
- // #84453# skip missing parameters at end of parameter list
+ // skip missing parameters at end of parameter list
while( nSkipEnd < nLastRemovable &&
aPool.IsSingleOp( eParam[ nSkipEnd + 1 ], ocMissing ) )
nSkipEnd++;
@@ -1654,7 +1653,7 @@ void ExcelToSc::ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData &rSRD, c
}
// T A B
- // #67965# abs needed if rel in shared formula for ScCompiler UpdateNameReference
+ // abs needed if rel in shared formula for ScCompiler UpdateNameReference
if ( rSRD.IsTabRel() && !rSRD.IsFlag3D() )
rSRD.nTab = GetCurrScTab();
}
diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx
index fac3285..ceb4533 100644
--- a/sc/source/filter/excel/excform8.cxx
+++ b/sc/source/filter/excel/excform8.cxx
@@ -132,7 +132,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
{
aIn >> nOp;
- // #98524# always reset flags
+ // always reset flags
aSRD.InitFlags();
aCRD.InitFlags();
@@ -223,7 +223,6 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn,
case 0x10: // Union [314 265]
// ocSep behelfsweise statt 'ocUnion'
aStack >> nMerk0;
-//#100928# aPool << ocOpen << aStack << ocSep << nMerk0 << ocClose;
aPool << aStack << ocSep << nMerk0;
// doesn't fit exactly, but is more Excel-like
aPool >> aStack;
@@ -898,7 +897,7 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa
{
aIn >> nOp;
- // #98524# always reset flags
+ // always reset flags
aSRD.InitFlags();
aCRD.InitFlags();
@@ -1247,7 +1246,7 @@ ConvErr ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStrea
{
rStrm >> nOp;
- // #98524# always reset flags
+ // always reset flags
aSRD.InitFlags();
aCRD.InitFlags();
@@ -1387,7 +1386,7 @@ void ExcelToSc8::ExcRelToScRel8( UINT16 nRow, UINT16 nC, ScSingleRefData &rSRD,
rSRD.nRow = Min( static_cast<SCROW>(nRow), MAXROW);
// T A B
- // #67965# abs needed if rel in shared formula for ScCompiler UpdateNameReference
+ // abs needed if rel in shared formula for ScCompiler UpdateNameReference
if ( rSRD.IsTabRel() && !rSRD.IsFlag3D() )
rSRD.nTab = GetCurrScTab();
}
@@ -1471,7 +1470,7 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen )
aIn >> nIxti >> nRow1 >> nRow2 >> nCol1 >> nCol2;
_3d_common:
- // #122885# skip references to deleted sheets
+ // skip references to deleted sheets
if( !rLinkMan.GetScTabRange( nTab1, nTab2, nIxti ) || !ValidTab( nTab1 ) || !ValidTab( nTab2 ) )
break;
diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx
index 469e549..f400aae 100644
--- a/sc/source/filter/excel/excrecds.cxx
+++ b/sc/source/filter/excel/excrecds.cxx
@@ -893,7 +893,7 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) :
maRef = aRange;
- // #i2394# #100489# built-in defined names must be sorted by containing sheet name
+ // #i2394# built-in defined names must be sorted by containing sheet name
rNameMgr.InsertBuiltInName( EXC_BUILTIN_FILTERDATABASE, aRange );
// advanced filter
diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx
index dcba10c..e07b619 100644
--- a/sc/source/filter/excel/exctools.cxx
+++ b/sc/source/filter/excel/exctools.cxx
@@ -255,7 +255,7 @@ void ExcScenario::Apply( const XclImpRoot& rRoot, const BOOL bLast )
return;
r.SetScenario( nNewTab, TRUE );
- // #112621# do not show scenario frames
+ // do not show scenario frames
r.SetScenarioData( nNewTab, *pComment, COL_LIGHTGRAY, /*SC_SCENARIO_SHOWFRAME|*/SC_SCENARIO_COPYALL|(nProtected ? SC_SCENARIO_PROTECT : 0) );
boost::ptr_vector<ExcScenarioCell>::const_iterator iter;
@@ -273,7 +273,7 @@ void ExcScenario::Apply( const XclImpRoot& rRoot, const BOOL bLast )
if( bLast )
r.SetActiveScenario( nNewTab, TRUE );
- // #111896# modify what the Active tab is set to if the new
+ // modify what the Active tab is set to if the new
// scenario tab occurs before the active tab.
ScExtDocSettings& rDocSett = rRoot.GetExtDocOptions().GetDocSettings();
if( (static_cast< SCCOL >( nTab ) < rDocSett.mnDisplTab) && (rDocSett.mnDisplTab < MAXTAB) )
diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx
index c4552fd..0af659f 100644
--- a/sc/source/filter/excel/frmbase.cxx
+++ b/sc/source/filter/excel/frmbase.cxx
@@ -98,7 +98,7 @@ void _ScRangeListTabs::Append( ScComplexRefData a, SCsTAB nTab, const BOOL b )
{
if( b )
{
- // #96263# ignore 3D ranges
+ // ignore 3D ranges
if( a.Ref1.nTab != a.Ref2.nTab )
return;
diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx
index 57cb68e..5e23a5d 100644
--- a/sc/source/filter/excel/impop.cxx
+++ b/sc/source/filter/excel/impop.cxx
@@ -139,7 +139,7 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ):
pExcRoot->pShrfmlaBuff = new ShrfmlaBuffer( pExcRoot ); //&aShrfrmlaBuff;
pExcRoot->pExtNameBuff = new ExtNameBuff ( *this );
- pExtNameBuff = new NameBuffer( pExcRoot ); //#94039# prevent empty rootdata
+ pExtNameBuff = new NameBuffer( pExcRoot ); //prevent empty rootdata
pExtNameBuff->SetBase( 1 );
pOutlineListBuffer = new XclImpOutlineListBuffer( );
@@ -1184,7 +1184,7 @@ const ScTokenArray* ImportExcel::ErrorToFormula( BYTE bErrOrVal, BYTE nError, do
void ImportExcel::AdjustRowHeight()
{
- /* #93255# Speed up chart import: import all sheets without charts, then
+ /* Speed up chart import: import all sheets without charts, then
update row heights (here), last load all charts -> do not any longer
update inside of ScDocShell::ConvertFrom() (causes update of existing
charts during each and every change of row height). */
@@ -1242,7 +1242,7 @@ void ImportExcel::PostDocLoad( void )
}
}
- // #111099# open forms in alive mode (has no effect, if no controls in document)
+ // open forms in alive mode (has no effect, if no controls in document)
if( ScModelObj* pDocObj = GetDocModelObj() )
pDocObj->setPropertyValue( CREATE_OUSTRING( SC_UNO_APPLYFMDES ), uno::Any( false ) );
diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx
index cdd7d2a..77011d0 100644
--- a/sc/source/filter/excel/read.cxx
+++ b/sc/source/filter/excel/read.cxx
@@ -124,7 +124,7 @@ FltError ImportExcel::Read( void )
if( !aIn.IsValid() )
{
- // #124240# finalize table if EOF is missing
+ // finalize table if EOF is missing
switch( eAkt )
{
case Z_Biff2:
@@ -854,7 +854,7 @@ FltError ImportExcel8::Read( void )
if( !aIn.IsValid() )
{
- // #124240# #i63591# finalize table if EOF is missing
+ // #i63591# finalize table if EOF is missing
switch( eAkt )
{
case EXC_STATE_SHEET_PRE:
@@ -1028,7 +1028,7 @@ FltError ImportExcel8::Read( void )
{
if( nRecId == EXC_ID5_BOF )
{
- // #94191# import only 256 sheets
+ // import only 256 sheets
if( GetCurrScTab() > GetScMaxPos().Tab() )
{
XclTools::SkipSubStream( maStrm );
diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx
index 50ee7fc..60b42bc 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -1061,7 +1061,7 @@ XclExpDV::XclExpDV( const XclExpRoot& rRoot, ULONG nScHandle ) :
case SC_VALERR_WARNING: mnFlags |= EXC_DV_ERROR_WARNING; break;
case SC_VALERR_INFO: mnFlags |= EXC_DV_ERROR_INFO; break;
case SC_VALERR_MACRO:
- // #111781# set INFO for validity with macro call, delete title
+ // set INFO for validity with macro call, delete title
mnFlags |= EXC_DV_ERROR_INFO;
maErrorTitle.Assign( '\0' ); // contains macro name
break;
diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx
index 09502c0..e26a0b3 100644
--- a/sc/source/filter/excel/xeescher.cxx
+++ b/sc/source/filter/excel/xeescher.cxx
@@ -1554,7 +1554,7 @@ boost::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( SdrPa
{
if( pSdrPage )
mxEscherEx->AddSdrPage( *pSdrPage );
- // #106213# the first dummy object may still be open
+ // the first dummy object may still be open
DBG_ASSERT( mxEscherEx->GetGroupLevel() <= 1, "XclExpObjectManager::ProcessDrawing - still groups open?" );
while( mxEscherEx->GetGroupLevel() )
mxEscherEx->LeaveGroup();
@@ -1566,7 +1566,7 @@ boost::shared_ptr< XclExpRecordBase > XclExpObjectManager::ProcessDrawing( const
{
if( rxShapes.is() )
mxEscherEx->AddUnoShapes( rxShapes );
- // #106213# the first dummy object may still be open
+ // the first dummy object may still be open
DBG_ASSERT( mxEscherEx->GetGroupLevel() <= 1, "XclExpObjectManager::ProcessDrawing - still groups open?" );
while( mxEscherEx->GetGroupLevel() )
mxEscherEx->LeaveGroup();
diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx
index f4b5b73..bf7adbd 100644
--- a/sc/source/filter/excel/xeformula.cxx
+++ b/sc/source/filter/excel/xeformula.cxx
@@ -1659,7 +1659,7 @@ void XclExpFmlaCompImpl::AppendTrailingParam( XclExpFuncData& rFuncData )
case ocIf:
if( nParamCount == 1 )
{
- // #112262# Excel needs at least two parameters in IF function
+ // Excel needs at least two parameters in IF function
PrepareParam( rFuncData );
AppendBoolToken( true );
FinishParam( rFuncData );
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 722b395..1f119a2 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -713,7 +713,7 @@ XclExpTabInfo::XclExpTabInfo( const XclExpRoot& rRoot ) :
SCTAB nDisplScTab = rDocOpt.GetDocSettings().mnDisplTab;
- // #112908# find first visible exported sheet
+ // find first visible exported sheet
if( (nFirstVisScTab == SCTAB_INVALID) || !IsExportTab( nFirstVisScTab ) )
{
// no exportable visible sheet -> use first exportable sheet
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index 25cf5f4..dc8e515 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -613,7 +613,7 @@ void XclExpNameManagerImpl::CreateBuiltInNames()
ScDocument& rDoc = GetDoc();
XclExpTabInfo& rTabInfo = GetTabInfo();
- /* #i2394# #100489# built-in defined names must be sorted by the name of the
+ /* #i2394# built-in defined names must be sorted by the name of the
containing sheet. Example: SheetA!Print_Range must be stored *before*
SheetB!Print_Range, regardless of the position of SheetA in the document! */
for( SCTAB nScTabIdx = 0, nScTabCount = rTabInfo.GetScTabCount(); nScTabIdx < nScTabCount; ++nScTabIdx )
diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx
index 050b72c..e8dcd3e 100644
--- a/sc/source/filter/excel/xepivot.cxx
+++ b/sc/source/filter/excel/xepivot.cxx
@@ -665,7 +665,7 @@ XclExpPivotCache::XclExpPivotCache( const XclExpRoot& rRoot, const ScDPObject& r
if( 2 * (nDocRow2 - nDocRow1) < (nSrcRow2 - nSrcRow1) )
::set_flag( maPCInfo.mnFlags, EXC_SXDB_SAVEDATA, false );
- // #160184# Excel must refresh tables to make drilldown working
+ // Excel must refresh tables to make drilldown working
::set_flag( maPCInfo.mnFlags, EXC_SXDB_REFRESH_LOAD );
// adjust row indexes, keep one row of empty area to surely have the empty cache item
@@ -1720,13 +1720,13 @@ void XclExpPivotTable::WriteSxli( XclExpStream& rStrm, sal_uInt16 nLineCount, sa
sal_uInt16 nLineSize = 8 + 2 * nIndexCount;
rStrm.StartRecord( EXC_ID_SXLI, nLineSize * nLineCount );
- /* #158444# Excel expects the records to be filled completely, do not
+ /* Excel expects the records to be filled completely, do not
set a segment size... */
// rStrm.SetSliceSize( nLineSize );
for( sal_uInt16 nLine = 0; nLine < nLineCount; ++nLine )
{
- // #106598# Excel XP needs a partly initialized SXLI record
+ // Excel XP needs a partly initialized SXLI record
rStrm << sal_uInt16( 0 ) // number of equal index entries
<< EXC_SXVI_TYPE_DATA
<< nIndexCount
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index 0565bd4..77bf63d 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -334,7 +334,7 @@ void XclExpStream::WriteUnicodeBuffer( const ScfUInt16Vec& rBuffer, sal_uInt8 nF
}
}
-// ER: #71367# Xcl has an obscure sense of whether starting a new record or not,
+// Xcl has an obscure sense of whether starting a new record or not,
// and crashes if it encounters the string header at the very end of a record.
// Thus we add 1 to give some room, seems like they do it that way but with another count (10?)
void XclExpStream::WriteByteString( const ByteString& rString, sal_uInt16 nMaxLen, bool b16BitCount )
diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx
index 5b8853f..8964b9f 100644
--- a/sc/source/filter/excel/xestyle.cxx
+++ b/sc/source/filter/excel/xestyle.cxx
@@ -387,7 +387,7 @@ void XclExpPaletteImpl::Finalize()
while( mxColorList->size() > mrDefPal.GetColorCount() )
ReduceLeastUsedColor();
-// --- #104865# use default palette and replace colors with nearest used colors ---
+// --- use default palette and replace colors with nearest used colors ---
nCount = mxColorList->size();
XclRemapVec aRemapVec( nCount );
@@ -862,7 +862,7 @@ sal_Int16 XclExpFontHelper::GetFirstUsedScript( const XclExpRoot& rRoot, const S
static const WhichAndScript WAS_ASIAN( ATTR_CJK_FONT, ::com::sun::star::i18n::ScriptType::ASIAN );
static const WhichAndScript WAS_CMPLX( ATTR_CTL_FONT, ::com::sun::star::i18n::ScriptType::COMPLEX );
- /* #114008# do not let a font from a parent style override an explicit
+ /* do not let a font from a parent style override an explicit
cell font. */
sal_Int16 nDefScript = rRoot.GetDefApiScript();
@@ -1080,7 +1080,7 @@ sal_uInt16 XclExpFontBuffer::Insert(
{
XclExpFontRef xFont( new XclExpFont( GetRoot(), rFontData, eColorType ) );
maFontList.ReplaceRecord( xFont, EXC_FONT_APP );
- // #108487# set width of '0' character for column width export
+ // set width of '0' character for column width export
SetCharWidth( xFont->GetFontData() );
return EXC_FONT_APP;
}
@@ -1120,7 +1120,7 @@ sal_uInt16 XclExpFontBuffer::Insert(
sal_uInt16 XclExpFontBuffer::Insert( const SfxItemSet& rItemSet,
sal_Int16 nScript, XclExpColorType eColorType, bool bAppFont )
{
- // #i17050# #114008# #115495# script type now provided by caller
+ // #i17050# script type now provided by caller
Font aFont = XclExpFontHelper::GetFontFromItemSet( GetRoot(), rItemSet, nScript );
return Insert( aFont, eColorType, bAppFont );
}
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 6ed4ab7..5881d70 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -785,7 +785,7 @@ XclExpFormulaCell::XclExpFormulaCell(
// alternative number format passed to XF buffer
ULONG nAltScNumFmt = NUMBERFORMAT_ENTRY_NOT_FOUND;
- /* #73420# Xcl doesn't know Boolean number formats, we write
+ /* Xcl doesn't know Boolean number formats, we write
"TRUE";"FALSE" (language dependent). Don't do it for automatic
formula formats, because Excel gets them right. */
/* #i8640# Don't set text format, if we have string results. */
@@ -794,7 +794,7 @@ XclExpFormulaCell::XclExpFormulaCell(
(nFormatType != NUMBERFORMAT_LOGICAL) &&
(nFormatType != NUMBERFORMAT_TEXT) )
nAltScNumFmt = mrScFmlaCell.GetStandardFormat( rFormatter, nScNumFmt );
- /* #73420# If cell number format is Boolean and automatic formula
+ /* If cell number format is Boolean and automatic formula
format is Boolean don't write that ugly special format. */
else if( (nFormatType == NUMBERFORMAT_LOGICAL) &&
(rFormatter.GetType( nScNumFmt ) == NUMBERFORMAT_LOGICAL) )
@@ -1938,7 +1938,7 @@ void XclExpRow::InsertCell( XclExpCellRef xCell, size_t nPos, bool bIsMergedBase
{
DBG_ASSERT( xCell, "XclExpRow::InsertCell - missing cell" );
- /* #109751# If we have a multi-line text in a merged cell, and the resulting
+ /* If we have a multi-line text in a merged cell, and the resulting
row height has not been confirmed, we need to force the EXC_ROW_UNSYNCED
flag to be true to ensure Excel works correctly. */
if( bIsMergedBase && xCell->IsMultiLineText() )
@@ -2359,7 +2359,7 @@ XclExpCellTable::XclExpCellTable( const XclExpRoot& rRoot ) :
aScRange.aEnd.IncCol( rMergeItem.GetColMerge() - 1 );
aScRange.aEnd.IncRow( rMergeItem.GetRowMerge() - 1 );
sal_uInt32 nXFId = xCell ? xCell->GetFirstXFId() : EXC_XFID_NOTFOUND;
- // #120156# blank cells merged vertically may occur repeatedly
+ // blank cells merged vertically may occur repeatedly
DBG_ASSERT( (aScRange.aStart.Col() == aScRange.aEnd.Col()) || (nScCol == nLastScCol),
"XclExpCellTable::XclExpCellTable - invalid repeated blank merged cell" );
for( SCCOL nIndex = nScCol; nIndex <= nLastScCol; ++nIndex )
diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx
index c82b0c5..cebd20e 100644
--- a/sc/source/filter/excel/xichart.cxx
+++ b/sc/source/filter/excel/xichart.cxx
@@ -411,7 +411,7 @@ void XclImpChLineFormat::ReadChLineFormat( XclImpStream& rStrm )
const XclImpRoot& rRoot = rStrm.GetRoot();
if( rRoot.GetBiff() == EXC_BIFF8 )
- // #116397# BIFF8: index into palette used instead of RGB data
+ // BIFF8: index into palette used instead of RGB data
maData.maColor = rRoot.GetPalette().GetColor( rStrm.ReaduInt16() );
}
@@ -444,7 +444,7 @@ void XclImpChAreaFormat::ReadChAreaFormat( XclImpStream& rStrm )
const XclImpRoot& rRoot = rStrm.GetRoot();
if( rRoot.GetBiff() == EXC_BIFF8 )
{
- // #116397# BIFF8: index into palette used instead of RGB data
+ // BIFF8: index into palette used instead of RGB data
const XclImpPalette& rPal = rRoot.GetPalette();
maData.maPattColor = rPal.GetColor( rStrm.ReaduInt16() );
maData.maBackColor = rPal.GetColor( rStrm.ReaduInt16());
@@ -902,7 +902,7 @@ void XclImpChText::ReadHeaderRecord( XclImpStream& rStrm )
if( GetBiff() == EXC_BIFF8 )
{
- // #116397# BIFF8: index into palette used instead of RGB data
+ // BIFF8: index into palette used instead of RGB data
maData.maTextColor = GetPalette().GetColor( rStrm.ReaduInt16() );
// placement and rotation
rStrm >> maData.mnFlags2 >> maData.mnRotation;
@@ -1213,7 +1213,7 @@ void XclImpChMarkerFormat::ReadChMarkerFormat( XclImpStream& rStrm )
const XclImpRoot& rRoot = rStrm.GetRoot();
if( rRoot.GetBiff() == EXC_BIFF8 )
{
- // #116397# BIFF8: index into palette used instead of RGB data
+ // BIFF8: index into palette used instead of RGB data
const XclImpPalette& rPal = rRoot.GetPalette();
maData.maLineColor = rPal.GetColor( rStrm.ReaduInt16() );
maData.maFillColor = rPal.GetColor( rStrm.ReaduInt16() );
@@ -3012,7 +3012,7 @@ void XclImpChTick::ReadChTick( XclImpStream& rStrm )
if( GetBiff() == EXC_BIFF8 )
{
- // #116397# BIFF8: index into palette used instead of RGB data
+ // BIFF8: index into palette used instead of RGB data
maData.maTextColor = GetPalette().GetColor( rStrm.ReaduInt16() );
// rotation
rStrm >> maData.mnRotation;
diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx
index 95ca683..1d53236 100644
--- a/sc/source/filter/excel/xicontent.cxx
+++ b/sc/source/filter/excel/xicontent.cxx
@@ -980,7 +980,7 @@ void XclImpWebQueryBuffer::ReadQsi( XclImpStream& rStrm )
// #i64794# Excel replaces spaces with underscores
aXclName.SearchAndReplaceAll( ' ', '_' );
- // #101529# find the defined name used in Calc
+ // find the defined name used in Calc
if( const XclImpName* pName = GetNameManager().FindName( aXclName, GetCurrScTab() ) )
{
if( const ScRangeData* pRangeData = pName->GetScRangeData() )
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index a324b25..b8c6b2b 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -399,7 +399,7 @@ void XclImpDrawObjBase::SetDffData( const DffObjData& rDffObjData, const String&
String XclImpDrawObjBase::GetObjName() const
{
- /* #118053# #i51348# Always return a non-empty name. Create English
+ /* #i51348# Always return a non-empty name. Create English
default names depending on the object type. This is not implemented as
virtual functions in derived classes, as class type and object type may
not match. */
@@ -1607,7 +1607,7 @@ void XclImpChartObj::DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt16 nSubRecId
// enable CONTINUE handling for the entire chart substream
rStrm.ResetRecord( true );
ReadChartSubStream( rStrm );
- /* #90118# disable CONTINUE handling again to be able to read
+ /* disable CONTINUE handling again to be able to read
following CONTINUE records as MSODRAWING records. */
rStrm.ResetRecord( false );
}
@@ -1843,7 +1843,7 @@ void XclImpControlHelper::ProcessControl( const XclImpDrawObjBase& rDrawObj ) co
ScfPropertySet aPropSet( xCtrlModel );
- // #118053# #i51348# set object name at control model
+ // #i51348# set object name at control model
aPropSet.SetStringProperty( CREATE_OUSTRING( "Name" ), rDrawObj.GetObjName() );
// control visible and printable?
@@ -2908,7 +2908,7 @@ void XclImpPictureObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObje
OUString aNewName;
rEmbObjCont.InsertEmbeddedObject( xEmbObj, aNewName );
if( aOldName != aNewName )
- // #95381# SetPersistName, not SetName
+ // SetPersistName, not SetName
pOleSdrObj->SetPersistName( aNewName );
}
}
@@ -3399,7 +3399,7 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffO
XclImpDrawObjRef xDrawObj = rConvData.mrDrawing.FindDrawObj( rDffObjData.rSpHd );
const Rectangle& rAnchorRect = rDffObjData.aChildAnchor;
- // #102378# Do not process the global page group shape (flag SP_FPATRIARCH)
+ // Do not process the global page group shape (flag SP_FPATRIARCH)
bool bGlobalPageGroup = ::get_flag< sal_uInt32 >( rDffObjData.nSpFlags, SP_FPATRIARCH );
if( !xDrawObj || !xDrawObj->IsProcessSdrObj() || bGlobalPageGroup )
return 0; // simply return, xSdrObj will be destroyed
@@ -3412,7 +3412,7 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffO
if( ppTopLevelObj && bIsTopLevel )
*ppTopLevelObj = xDrawObj.get();
- // #119010# connectors don't have to be area objects
+ // connectors don't have to be area objects
if( dynamic_cast< SdrEdgeObj* >( xSdrObj.get() ) )
xDrawObj->SetAreaObj( false );
@@ -3432,7 +3432,7 @@ SdrObject* XclImpDffConverter::ProcessObj( SvStream& rDffStrm, DffObjData& rDffO
xDrawObj->SetDffData( rDffObjData, aObjName, aHyperlink, bVisible, bAutoMargin );
/* Connect textbox data (string, alignment, text orientation) to object.
- #98132# don't ask for a text-ID, DFF export doesn't set one. */
+ don't ask for a text-ID, DFF export doesn't set one. */
if( XclImpTextObj* pTextObj = dynamic_cast< XclImpTextObj* >( xDrawObj.get() ) )
if( const XclImpObjTextData* pTextData = rConvData.mrDrawing.FindTextData( rDffObjData.rSpHd ) )
pTextObj->SetTextData( *pTextData );
diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx
index f6ef3e2..f0bd842 100644
--- a/sc/source/filter/excel/xihelper.cxx
+++ b/sc/source/filter/excel/xihelper.cxx
@@ -596,7 +596,7 @@ namespace {
void lclAppendUrlChar( String& rUrl, sal_Unicode cChar )
{
- // #126855# encode special characters
+ // encode special characters
switch( cChar )
{
case '#': rUrl.AppendAscii( "%23" ); break;
diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx
index 143d95a..634a723 100644
--- a/sc/source/filter/excel/xilink.cxx
+++ b/sc/source/filter/excel/xilink.cxx
@@ -263,7 +263,7 @@ void XclImpTabInfo::ReadTabid( XclImpStream& rStrm )
maTabIdVec.clear();
maTabIdVec.reserve( nReadCount );
for( sal_Size nIndex = 0; rStrm.IsValid() && (nIndex < nReadCount); ++nIndex )
- // #93471# zero index is not allowed in BIFF8, but it seems that it occurs in real life
+ // zero index is not allowed in BIFF8, but it seems that it occurs in real life
maTabIdVec.push_back( rStrm.ReaduInt16() );
}
}
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx
index a8994fa..b602edf 100644
--- a/sc/source/filter/excel/xiname.cxx
+++ b/sc/source/filter/excel/xiname.cxx
@@ -137,7 +137,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) :
if( nXclTab != EXC_NAME_GLOBAL )
{
sal_uInt16 nUsedTab = (GetBiff() == EXC_BIFF8) ? nXclTab : nExtSheet;
- // #163146# do not rename sheet-local names by default, this breaks VBA scripts
+ // do not rename sheet-local names by default, this breaks VBA scripts
// maScName.Append( '_' ).Append( String::CreateFromInt32( nUsedTab ) );
// TODO: may not work for BIFF5, handle skipped sheets (all BIFF)
mnScTab = static_cast< SCTAB >( nUsedTab - 1 );
@@ -216,7 +216,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nXclNameIdx ) :
// 4) *** create a defined name in the Calc document *** ------------------
- // #163146# do not ignore hidden names (may be regular names created by VBA scripts)
+ // do not ignore hidden names (may be regular names created by VBA scripts)
if( pTokArr /*&& (bBuiltIn || !::get_flag( nFlags, EXC_NAME_HIDDEN ))*/ && !mbFunction && !mbVBName )
{
// create the Calc name data
diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx
index 665011a..4dfcf4b 100644
--- a/sc/source/filter/excel/xistring.cxx
+++ b/sc/source/filter/excel/xistring.cxx
@@ -82,7 +82,7 @@ void XclImpString::Read( XclImpStream& rStrm, XclStrFlags nFlags )
sal_uInt16 nRunCount;
sal_uInt32 nExtInf;
rStrm.ReadUniStringExtHeader( b16Bit, bRich, bFarEast, nRunCount, nExtInf, nFlagField );
- // #122185# ignore the flags, they may be wrong
+ // ignore the flags, they may be wrong
// --- character array ---
maString = rStrm.ReadRawUniString( nChars, b16Bit );
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx
index 7da454f..c3e6ae6 100644
--- a/sc/source/filter/excel/xistyle.cxx
+++ b/sc/source/filter/excel/xistyle.cxx
@@ -320,7 +320,7 @@ void XclImpFont::FillToItemSet( SfxItemSet& rItemSet, XclFontItemType eType, boo
SvxFontItem aFontItem( maData.GetScFamily( GetTextEncoding() ), maData.maName, EMPTY_STRING,
PITCH_DONTKNOW, eTempTextEnc, ATTR_FONT );
- // #91658# set only for valid script types
+ // set only for valid script types
if( mbHasWstrn )
PUTITEM( aFontItem, ATTR_FONT, EE_CHAR_FONTINFO );
if( mbHasAsian )
@@ -334,7 +334,7 @@ void XclImpFont::FillToItemSet( SfxItemSet& rItemSet, XclFontItemType eType, boo
{
sal_Int32 nHeight = maData.mnHeight;
if( bEE && (eType != EXC_FONTITEM_HF) ) // do not convert header/footer height
- nHeight = (nHeight * 127 + 36) / EXC_POINTS_PER_INCH; // #98527# 1 in == 72 pt
+ nHeight = (nHeight * 127 + 36) / EXC_POINTS_PER_INCH; // 1 in == 72 pt
SvxFontHeightItem aHeightItem( nHeight, 100, ATTR_FONT_HEIGHT );
PUTITEM( aHeightItem, ATTR_FONT_HEIGHT, EE_CHAR_FONTHEIGHT );
@@ -443,7 +443,7 @@ void XclImpFont::GuessScriptType()
mbHasWstrn = true;
mbHasAsian = mbHasCmplx = false;
- // #91658# #113783# find the script types for which the font contains characters
+ // find the script types for which the font contains characters
if( OutputDevice* pPrinter = GetPrinter() )
{
Font aFont( maData.maName, Size( 0, 10 ) );
@@ -452,7 +452,7 @@ void XclImpFont::GuessScriptType()
pPrinter->SetFont( aFont );
if( pPrinter->GetFontCharMap( aCharMap ) )
{
- // #91658# CJK fonts
+ // CJK fonts
mbHasAsian =
aCharMap.HasChar( 0x3041 ) || // 3040-309F: Hiragana
aCharMap.HasChar( 0x30A1 ) || // 30A0-30FF: Katakana
@@ -467,7 +467,7 @@ void XclImpFont::GuessScriptType()
aCharMap.HasChar( 0xCC01 ) || // AC00-D7AF: Hangul Syllables
aCharMap.HasChar( 0xF901 ) || // F900-FAFF: CJK Compatibility Ideographs
aCharMap.HasChar( 0xFF71 ); // FF00-FFEF: Halfwidth/Fullwidth Forms
- // #113783# CTL fonts
+ // CTL fonts
mbHasCmplx =
aCharMap.HasChar( 0x05D1 ) || // 0590-05FF: Hebrew
aCharMap.HasChar( 0x0631 ) || // 0600-06FF: Arabic
@@ -783,7 +783,7 @@ void XclImpCellAlign::FillToItemSet( SfxItemSet& rItemSet, const XclImpFont* pFo
// set an angle in the range from -90 to 90 degrees
sal_Int32 nAngle = XclTools::GetScRotation( nXclRot, 0 );
ScfTools::PutItem( rItemSet, SfxInt32Item( ATTR_ROTATE_VALUE, nAngle ), bSkipPoolDefs );
- // #105933# set "Use asian vertical layout", if cell is stacked and font contains CKJ characters
+ // set "Use asian vertical layout", if cell is stacked and font contains CKJ characters
bool bAsianVert = bStacked && pFont && pFont->HasAsianChars();
ScfTools::PutItem( rItemSet, SfxBoolItem( ATTR_VERTICAL_ASIAN, bAsianVert ), bSkipPoolDefs );
@@ -1036,7 +1036,7 @@ void XclImpCellArea::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& r
{
SvxBrushItem aBrushItem( ATTR_BACKGROUND );
- // #108935# do not use IsTransparent() - old Calc filter writes tranparency with different color indexes
+ // do not use IsTransparent() - old Calc filter writes tranparency with different color indexes
if( mnPattern == EXC_PATT_NONE )
{
aBrushItem.SetColor( Color( COL_TRANSPARENT ) );
@@ -1196,7 +1196,7 @@ const ScPatternAttr& XclImpXF::CreatePattern( bool bSkipPoolDefs )
/* Enables mb***Used flags, if the formatting attributes differ from
the passed XF record. In cell XFs Excel uses the cell attributes,
if they differ from the parent style XF.
- #109899# ...or if the respective flag is not set in parent style XF. */
+ ...or if the respective flag is not set in parent style XF. */
if( pParentXF )
{
if( !mbProtUsed )
@@ -1807,11 +1807,11 @@ void XclImpXFRangeBuffer::SetXF( const ScAddress& rScPos, sal_uInt16 nXFIndex, X
maColumns.resize( nIndex + 1 );
if( !maColumns[ nIndex ] )
maColumns[ nIndex ].reset( new XclImpXFRangeColumn );
- // #108770# remember all Boolean cells, they will get 'Standard' number format
+ // remember all Boolean cells, they will get 'Standard' number format
maColumns[ nIndex ]->SetXF( nScRow, XclImpXFIndex( nXFIndex, eMode == xlXFModeBoolCell ) );
// set "center across selection" and "fill" attribute for all following empty cells
- // #97130# ignore it on row default XFs
+ // ignore it on row default XFs
if( eMode != xlXFModeRow )
{
const XclImpXF* pXF = GetXFBuffer().GetXF( nXFIndex );
@@ -1827,7 +1827,7 @@ void XclImpXFRangeBuffer::SetXF( const ScAddress& rScPos, sal_uInt16 nXFIndex, X
)
pRange->aEnd.IncCol();
}
- else if( eMode != xlXFModeBlank ) // #108781# do not merge empty cells
+ else if( eMode != xlXFModeBlank ) // do not merge empty cells
SetMerge( nScCol, nScRow );
}
}
diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx
index b1290ba..f84ea61 100644
--- a/sc/source/filter/excel/xiview.cxx
+++ b/sc/source/filter/excel/xiview.cxx
@@ -143,7 +143,7 @@ void XclImpTabViewSettings::ReadWindow2( XclImpStream& rStrm, bool bChart )
sal_uInt16 nFlags;
rStrm >> nFlags >> maData.maFirstXclPos;
- // #i59590# #158194# real life: Excel ignores some view settings in chart sheets
+ // #i59590# real life: Excel ignores some view settings in chart sheets
maData.mbSelected = ::get_flag( nFlags, EXC_WIN2_SELECTED );
maData.mbDisplayed = ::get_flag( nFlags, EXC_WIN2_DISPLAYED );
maData.mbMirrored = !bChart && ::get_flag( nFlags, EXC_WIN2_MIRRORED );
diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx
index 8a26dde..2e5ab54 100644
--- a/sc/source/filter/excel/xlescher.cxx
+++ b/sc/source/filter/excel/xlescher.cxx
@@ -79,7 +79,7 @@ namespace {
/** Returns the scaling factor to calculate coordinates from twips. */
double lclGetTwipsScale( MapUnit eMapUnit )
{
- /* #111027# We cannot use OutputDevice::LogicToLogic() or the XclTools
+ /* We cannot use OutputDevice::LogicToLogic() or the XclTools
conversion functions to calculate drawing layer coordinates due to
Calc's strange definition of a point (1 inch == 72.27 points, instead
of 72 points). */
@@ -189,7 +189,7 @@ Rectangle XclObjAnchor::GetRect( const XclRoot& rRoot, SCTAB nScTab, MapUnit eMa
lclGetXFromCol( rDoc, nScTab, maLast.mnCol, mnRX + 1, fScale ),
lclGetYFromRow( rDoc, nScTab, maLast.mnRow, mnBY, fScale ) );
- // #106948# adjust coordinates in mirrored sheets
+ // adjust coordinates in mirrored sheets
if( rDoc.IsLayoutRTL( nScTab ) )
lclMirrorRectangle( aRect );
return aRect;
@@ -201,7 +201,7 @@ void XclObjAnchor::SetRect( const XclRoot& rRoot, SCTAB nScTab, const Rectangle&
sal_uInt16 nXclMaxCol = rRoot.GetXclMaxPos().Col();
sal_uInt16 nXclMaxRow = static_cast<sal_uInt16>( rRoot.GetXclMaxPos().Row());
- // #106948# adjust coordinates in mirrored sheets
+ // adjust coordinates in mirrored sheets
Rectangle aRect( rRect );
if( rDoc.IsLayoutRTL( nScTab ) )
lclMirrorRectangle( aRect );
diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx
index 6033958..64a1481 100644
--- a/sc/source/filter/excel/xlstyle.cxx
+++ b/sc/source/filter/excel/xlstyle.cxx
@@ -199,7 +199,7 @@ void XclFontData::Clear()
void XclFontData::FillFromVclFont( const Font& rFont )
{
- maName = XclTools::GetXclFontName( rFont.GetName() ); // #106246# substitute with MS fonts
+ maName = XclTools::GetXclFontName( rFont.GetName() ); // substitute with MS fonts
maStyle.Erase();
maColor = rFont.GetColor();
SetScUnderline( rFont.GetUnderline() );
diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx
index eb262bd..49c9fd4 100644
--- a/sc/source/filter/excel/xltools.cxx
+++ b/sc/source/filter/excel/xltools.cxx
@@ -458,7 +458,7 @@ sal_uInt16 XclTools::GetXclCodePage( rtl_TextEncoding eTextEnc )
String XclTools::GetXclFontName( const String& rFontName )
{
- // #106246# substitute with MS fonts
+ // substitute with MS fonts
String aNewName( GetSubsFontName( rFontName, SUBSFONT_ONLYONE | SUBSFONT_MS ) );
if( aNewName.Len() )
return aNewName;
diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx
index 3f76d3a..6d4e23d 100644
--- a/sc/source/filter/html/htmlexp.cxx
+++ b/sc/source/filter/html/htmlexp.cxx
@@ -207,9 +207,9 @@ void lcl_AppendHTMLColorTripel( ByteString& rStr, const Color& rColor )
sal_Char* p = buf;
rStr += "\"#";
- p += sprintf( p, "%02X", rColor.GetRed() ); // #100211# - checked
- p += sprintf( p, "%02X", rColor.GetGreen() ); // #100211# - checked
- p += sprintf( p, "%02X", rColor.GetBlue() ); // #100211# - checked
+ p += sprintf( p, "%02X", rColor.GetRed() );
+ p += sprintf( p, "%02X", rColor.GetGreen() );
+ p += sprintf( p, "%02X", rColor.GetBlue() );
rStr += buf;
rStr += '\"';
}
@@ -233,7 +233,7 @@ ScHTMLExport::ScHTMLExport( SvStream& rStrmP, const String& rBaseURL, ScDocument
bTableDataWidth( TRUE ),
bTableDataHeight( TRUE )
{
- strcpy( sIndent, sIndentSource ); // #100211# - checked
+ strcpy( sIndent, sIndentSource );
sIndent[0] = 0;
// set HTML configuration
@@ -945,14 +945,14 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
Color aBgColor;
if ( rBrushItem.GetColor().GetTransparency() == 255 )
- aBgColor = aHTMLStyle.aBackgroundColor; // #55121# keine ungewollte Hintergrundfarbe
+ aBgColor = aHTMLStyle.aBackgroundColor; // keine ungewollte Hintergrundfarbe
else
aBgColor = rBrushItem.GetColor();
BOOL bBold = ( WEIGHT_BOLD <= rWeightItem.GetWeight() );
BOOL bItalic = ( ITALIC_NONE != rPostureItem.GetPosture() );
BOOL bUnderline = ( UNDERLINE_NONE != rUnderlineItem.GetLineStyle() );
- BOOL bSetFontColor = ( COL_AUTO != rColorItem.GetValue().GetColor() ); // #97650# default is AUTO now
+ BOOL bSetFontColor = ( COL_AUTO != rColorItem.GetValue().GetColor() ); // default is AUTO now
BOOL bSetFontName = ( aHTMLStyle.aFontFamilyName != rFontItem.GetFamilyName() );
USHORT nSetFontSizeNumber = 0;
UINT32 nFontHeight = rFontHeightItem.GetHeight();
@@ -1106,7 +1106,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab )
{
if ( !aStrOut.Len() )
{
- TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // #42573# keine komplett leere Zelle
+ TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // keine komplett leere Zelle
}
else
{
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 1c8b32d..0311103 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -561,7 +561,7 @@ void ScHTMLLayoutParser::SetWidths()
}
else
{ // einige mit einige ohne Width
- // #36350# wieso eigentlich kein pE ?!?
+ // wieso eigentlich kein pE ?!?
if ( nFirstTableCell < maList.size() )
{
USHORT* pOffsets = new USHORT[ nColsPerRow+1 ];
@@ -781,7 +781,7 @@ IMPL_LINK( ScHTMLLayoutParser, HTMLImportHdl, ImportInfo*, pInfo )
if ( pInfo->aSelection.nEndPos )
{
// If text remains: create paragraph, without calling CloseEntry().
- if( bInCell ) // #108269# ...but only in opened table cells.
+ if( bInCell ) // ...but only in opened table cells.
{
bInCell = FALSE;
NextRow( pInfo );
@@ -2097,7 +2097,7 @@ void ScHTMLTable::BodyOn( const ImportInfo& rInfo )
bool bPushed = PushEntry( rInfo );
if( !mpParentTable )
{
- // #108269# do not start new row, if nothing (no title) precedes the body.
+ // do not start new row, if nothing (no title) precedes the body.
if( bPushed || !mbRowOn )
ImplRowOn();
if( bPushed || !mbDataOn )
@@ -2674,7 +2674,7 @@ void ScHTMLTable::RecalcDocPos( const ScHTMLPos& rBasePos )
}
else
{
- // #111667# fill up incomplete entry lists
+ // fill up incomplete entry lists
SCROW nFirstUnusedRow = aCellDocPos.mnRow + aCellDocSize.mnRows;
while( aEntryDocPos.mnRow < nFirstUnusedRow )
{
diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx
index fdad176..18419a5 100644
--- a/sc/source/filter/inc/namebuff.hxx
+++ b/sc/source/filter/inc/namebuff.hxx
@@ -108,7 +108,7 @@ class NameBuffer : private List, public ExcRoot
private:
UINT16 nBase; // Index-Basis
public:
-// inline NameBuffer( void ); //#94039# prevent empty rootdata
+// inline NameBuffer( void ); //prevent empty rootdata
inline NameBuffer( RootData* );
inline NameBuffer( RootData*, UINT16 nNewBase );
@@ -119,7 +119,7 @@ public:
void operator <<( const String& rNewString );
};
-//#94039# prevent empty rootdata
+//prevent empty rootdata
//inline NameBuffer::NameBuffer( void )
//{
// nBase = 0;
diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx
index d8048b4..0ca7683 100644
--- a/sc/source/filter/lotus/op.cxx
+++ b/sc/source/filter/lotus/op.cxx
@@ -238,10 +238,10 @@ void OP_NamedRange( SvStream& r, UINT16 /*n*/ )
if( isdigit( *cPuffer ) )
{ // erstes Zeichen im Namen eine Zahl -> 'A' vor Namen setzen
*pAnsi = 'A';
- strcpy( pAnsi + 1, cPuffer ); // #100211# - checked
+ strcpy( pAnsi + 1, cPuffer );
}
else
- strcpy( pAnsi, cPuffer ); // #100211# - checked
+ strcpy( pAnsi, cPuffer );
String aTmp( pAnsi, pLotusRoot->eCharsetQ );
@@ -273,10 +273,10 @@ void OP_SymphNamedRange( SvStream& r, UINT16 /*n*/ )
if( isdigit( *cPuffer ) )
{ // erstes Zeichen im Namen eine Zahl -> 'A' vor Namen setzen
*pAnsi = 'A';
- strcpy( pAnsi + 1, cPuffer ); // #100211# - checked
+ strcpy( pAnsi + 1, cPuffer );
}
else
- strcpy( pAnsi, cPuffer ); // #100211# - checked
+ strcpy( pAnsi, cPuffer );
String aTmp( pAnsi, pLotusRoot->eCharsetQ );
ScfTools::ConvertToScDefinedName( aTmp );
@@ -646,7 +646,7 @@ void OP_ApplyPatternArea123( SvStream& rStream )
{
std::map<UINT16, ScPatternAttr>::iterator loc = aLotusPatternPool.find( nData );
- // #126338# apparently, files with invalid index occur in the wild -> don't crash then
+ // apparently, files with invalid index occur in the wild -> don't crash then
DBG_ASSERT( loc != aLotusPatternPool.end(), "invalid format index" );
if ( loc != aLotusPatternPool.end() )
pDoc->ApplyPatternAreaTab( nCol, nRow, nCol + nColCount - 1, nRow + nRowCount - 1, static_cast< SCTAB >( nTab + i ), loc->second );
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index 231c55a..5127c8a 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -585,12 +585,12 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab,
{
Rectangle aRect ( aInsertPos, aLogicSize );
SdrGrafObj* pObj = new SdrGrafObj( *pI->pGraphic, aRect );
- // #118522# calling SetGraphicLink here doesn't work
+ // calling SetGraphicLink here doesn't work
pObj->SetName( pI->aURL );
pPage->InsertObject( pObj );
- // #118522# SetGraphicLink has to be used after inserting the object,
+ // SetGraphicLink has to be used after inserting the object,
// otherwise an empty graphic is swapped in and the contact stuff crashes.
// See #i37444#.
pObj->SetGraphicLink( pI->aURL, pI->aFilterName );
diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx
index 3aa3b33..ad8e3ab 100644
--- a/sc/source/filter/starcalc/scflt.cxx
+++ b/sc/source/filter/starcalc/scflt.cxx
@@ -1018,7 +1018,7 @@ void Sc10Import::LoadFileHeader()
if ( nError == 0 )
{
sal_Char Sc10CopyRight[32];
- strcpy(Sc10CopyRight, "Blaise-Tabelle"); // #100211# - checked
+ strcpy(Sc10CopyRight, "Blaise-Tabelle");
Sc10CopyRight[14] = 10;
Sc10CopyRight[15] = 13;
Sc10CopyRight[16] = 0;
@@ -1133,7 +1133,7 @@ void Sc10Import::LoadPatternCollection()
else
{
pPattern->Name[ 27 ] = 0;
- strcat( pPattern->Name, "_Old" ); // #100211# - checked
+ strcat( pPattern->Name, "_Old" );
aName = SC10TOSTRING( pPattern->Name );
pStylePool->Make( aName, SFX_STYLE_FAMILY_PARA );
}
diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx
index f7a6273..5315419 100644
--- a/sc/source/filter/xcl97/xcl97esc.cxx
+++ b/sc/source/filter/xcl97/xcl97esc.cxx
@@ -258,7 +258,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape
}
else if( !ScDrawLayer::IsNoteCaption( pObj ) )
{
- // #107540# ignore permanent note shapes
+ // ignore permanent note shapes
// #i12190# do not ignore callouts (do not filter by object type ID)
pCurrXclObj = ShapeInteractionHelper::CreateShapeObj( mrObjMgr, rxShape );
ShapeInteractionHelper::PopulateShapeInteractionInfo( mrObjMgr, rxShape, *pCurrAppData );
diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx
index 0e45bfe..7fd34c9 100644
--- a/sc/source/filter/xcl97/xcl97rec.cxx
+++ b/sc/source/filter/xcl97/xcl97rec.cxx
@@ -825,7 +825,7 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm )
sal_Char aBuf[ sizeof(UINT32) * 2 + 1 ];
// FIXME Eeek! Is this just a way to get a unique id?
UINT32 nPictureId = UINT32(sal_uIntPtr(this) >> 2);
- sprintf( aBuf, "%08X", static_cast< unsigned int >( nPictureId ) ); // #100211# - checked
+ sprintf( aBuf, "%08X", static_cast< unsigned int >( nPictureId ) );
aStorageName.AppendAscii( aBuf );
SotStorageRef xOleStg = pRootStorage->OpenSotStorage( aStorageName,
STREAM_READWRITE| STREAM_SHARE_DENYALL );
diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
index c238467..e2acf1d 100644
--- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
+++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
@@ -463,7 +463,7 @@ void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo, S
aDateTime.SetDate( aDate.GetDate() );
aDateTime.SetTime( aTime.GetTime() );
- // #97286# old files didn't store 100th seconds, enable again
+ // old files didn't store 100th seconds, enable again
if ( aInfo.aDateTime.HundredthSeconds )
pTrack->SetTime100thSeconds( TRUE );
@@ -835,7 +835,7 @@ void ScXMLChangeTrackingImportHelper::CreateChangeTrack(ScDocument* pTempDoc)
if (pDoc)
{
pTrack = new ScChangeTrack(pDoc, aUsers);
- // #97286# old files didn't store 100th seconds, disable until encountered
+ // old files didn't store 100th seconds, disable until encountered
pTrack->SetTime100thSeconds( FALSE );
ScMyActions::iterator aItr(aActions.begin());
diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
index 2ce8985..1922bc3 100644
--- a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
+++ b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx
@@ -90,7 +90,7 @@ sal_Bool ScMyOpenCloseColumnRowGroup::IsGroupStart(const sal_Int32 nField)
sal_Int32 nItrField = aItr->nField;
if ( nItrField < nField )
{
- // #103327# when used to find repeated rows at the beginning of a group,
+ // when used to find repeated rows at the beginning of a group,
// aTableStart may contain entries before nField. They must be skipped here
// (they will be used for OpenGroups later in the right order).
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index f686c26..263dbab 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -1135,7 +1135,7 @@ rtl::OUString* ScColumnRowStylesBase::GetStyleNameByIndex(const sal_Int32 nIndex
{
if ( nIndex < 0 || nIndex >= sal::static_int_cast<sal_Int32>( aStyleNames.size() ) )
{
- // #123981# should no longer happen, use first style then
+ // should no longer happen, use first style then
DBG_ERRORFILE("GetStyleNameByIndex: invalid index");
return aStyleNames[0];
}
diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
index e317387..171bca8 100644
--- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
+++ b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx
@@ -188,7 +188,7 @@ void XMLTableShapeImportHelper::finishShape(
bNote = true;
}
}
- else //#99532# this are grouped shapes which should also get the layerid
+ else //this are grouped shapes which should also get the layerid
{
sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0);
sal_Int16 nLayerID(-1);
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 35f78f7..07b4b4c 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -550,7 +550,7 @@ void ScXMLTableRowCellContext::SetContentValidation(com::sun::star::uno::Referen
xCondition->setFormula1(aValidation.sFormula1);
xCondition->setFormula2(aValidation.sFormula2);
xCondition->setOperator(aValidation.aOperator);
- // #b4974740# source position must be set as string, because it may
+ // source position must be set as string, because it may
// refer to a sheet that hasn't been loaded yet.
xPropertySet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_SOURCESTR)), uno::makeAny(aValidation.sBaseCellAddress));
// Transport grammar and formula namespace
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index bf485ec..2a6aafa 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -354,7 +354,7 @@ void ScXMLContentValidationContext::SetFormula( OUString& rFormula, OUString& rF
void ScXMLContentValidationContext::GetCondition( ScMyImportValidation& rValidation ) const
{
- rValidation.aValidationType = sheet::ValidationType_ANY; // #b6343997# default if no condition is given
+ rValidation.aValidationType = sheet::ValidationType_ANY; // default if no condition is given
rValidation.aOperator = sheet::ConditionOperator_NONE;
if( sCondition.getLength() > 0 )
diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx
index 7922f09..6a9aee8 100644
--- a/sc/source/filter/xml/xmldpimp.cxx
+++ b/sc/source/filter/xml/xmldpimp.cxx
@@ -340,7 +340,7 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHas
{
if (pDPSave)
{
- // #91045# if a dimension with that name has already been inserted,
+ // if a dimension with that name has already been inserted,
// mark the new one as duplicate
if ( !pDim->IsDataLayout() &&
pDPSave->GetExistingDimensionByName(pDim->GetName()) )
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index d2df642..455c20e 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -898,7 +898,7 @@ void ScXMLExport::GetDetectiveOpList( ScMyDetectiveOpContainer& rDetOp )
{
rDetOp.AddOperation( pDetData->GetOperation(), rDetPos, nIndex );
- // #123981# cells with detective operations are written even if empty
+ // cells with detective operations are written even if empty
pSharedData->SetLastColumn( nTab, rDetPos.Col() );
pSharedData->SetLastRow( nTab, rDetPos.Row() );
}
@@ -1202,7 +1202,7 @@ void ScXMLExport::WriteRowStartTag(
const ScMyDefaultStyleList& rRowDefaults = *pDefaults->GetRowDefaults();
if ( nRow >= sal::static_int_cast<sal_Int32>( rRowDefaults.size() ) )
{
- // #123981# used to happen with detective operations - if there are more cases, use the last row's style
+ // used to happen with detective operations - if there are more cases, use the last row's style
DBG_ERRORFILE("WriteRowStartTag: not enough defaults");
nRow = rRowDefaults.size() - 1;
}
@@ -1998,7 +1998,7 @@ void ScXMLExport::AddStyleFromCells(const uno::Reference<beans::XPropertySet>& x
// so in the worst case only one property has to be copied, but in the best case no
// property has to be copied
aItr = xPropStates.erase(aItr);
- aEndItr = xPropStates.end(); // #120346# old aEndItr is invalidated!
+ aEndItr = xPropStates.end(); // old aEndItr is invalidated!
}
break;
case CTF_SC_CELLSTYLE :
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index 27d661b..36f5269 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2020,7 +2020,7 @@ sal_Bool ScXMLImport::GetValidation(const rtl::OUString& sName, ScMyImportValida
{
if (aItr->sName == sName)
{
- // #b4974740# source position must be set as string,
+ // source position must be set as string,
// so sBaseCellAddress no longer has to be converted here
bFound = sal_True;
diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx
index b377967..e460901 100644
--- a/sc/source/filter/xml/xmlimprt.hxx
+++ b/sc/source/filter/xml/xmlimprt.hxx
@@ -653,7 +653,7 @@ struct ScMyImportValidation
rtl::OUString sFormula2;
rtl::OUString sFormulaNmsp1;
rtl::OUString sFormulaNmsp2;
- rtl::OUString sBaseCellAddress; // #b4974740# string is used directly
+ rtl::OUString sBaseCellAddress; // string is used directly
com::sun::star::sheet::ValidationAlertStyle aAlertStyle;
com::sun::star::sheet::ValidationType aValidationType;
com::sun::star::sheet::ConditionOperator aOperator;
diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx
index 0c2e87e..fe33f82 100644
--- a/sc/source/filter/xml/xmllabri.cxx
+++ b/sc/source/filter/xml/xmllabri.cxx
@@ -132,7 +132,7 @@ SvXMLImportContext* ScXMLLabelRangeContext::CreateChildContext(
void ScXMLLabelRangeContext::EndElement()
{
- // #b5071088# Label ranges must be stored as strings until all sheets are loaded
+ // Label ranges must be stored as strings until all sheets are loaded
// (like named expressions).
ScMyLabelRange* pLabelRange = new ScMyLabelRange;
diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx
index 1fa6f76..5fa6f7c 100644
--- a/sc/source/filter/xml/xmlstyli.cxx
+++ b/sc/source/filter/xml/xmlstyli.cxx
@@ -349,7 +349,7 @@ void XMLTableStyleContext::SetOperator( uno::Sequence< beans::PropertyValue >& r
void XMLTableStyleContext::SetBaseCellAddress( uno::Sequence< beans::PropertyValue >& rProps, const OUString& rBaseCell ) const
{
- /* #b4974740# Source position must be set as string, because it may refer
+ /* Source position must be set as string, because it may refer
to a sheet that hasn't been loaded yet. */
lclAppendProperty( rProps, OUString( RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_SOURCESTR ) ), rBaseCell );
}
diff --git a/scaddins/source/analysis/analysishelper.cxx b/scaddins/source/analysis/analysishelper.cxx
index e3bc67b..eeae6e1 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -2123,7 +2123,7 @@ sal_Int16 ConvertData::GetMatchingLevel( const STRING& rRef ) const
n = INV_MATCHLEV; // milli-bits doesn't make sense
#endif
-//! <HACK> #100616# "cm3" is not 10^-2 m^3 but 10^-6 m^3 !!! ------------------
+//! <HACK> "cm3" is not 10^-2 m^3 but 10^-6 m^3 !!! ------------------
if( n != INV_MATCHLEV )
{
sal_Unicode cLast = p[ aStr.getLength() - 1 ];
More information about the Libreoffice-commits
mailing list