diff options
Diffstat (limited to 'sc')
391 files changed, 2375 insertions, 2379 deletions
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index 05acecc69530..580e2a3971ad 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -906,9 +906,9 @@ void Test::testFormulaRefUpdate() // Clear all and start over. clearRange(m_pDoc, ScRange(0,0,0,10,10,0)); - // ------------------------------------------ + // Test range updates - // ------------------------------------------ + // Fill B2:C3 with values. m_pDoc->SetValue(ScAddress(1,1,0), 1); diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index bcfdb477f059..0ad67fca8261 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -48,7 +48,7 @@ // STATIC DATA ----------------------------------------------------------- -//------------------------------------------------------------------------ + using ::editeng::SvxBorderLine; ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ) : @@ -63,7 +63,7 @@ ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ) : pData[0].pPattern = pDocument->GetDefPattern(); // no put } -//------------------------------------------------------------------------ + ScAttrArray::~ScAttrArray() { @@ -78,7 +78,7 @@ ScAttrArray::~ScAttrArray() delete[] pData; } -//------------------------------------------------------------------------ + #if OSL_DEBUG_LEVEL > 1 void ScAttrArray::TestData() const { @@ -107,7 +107,7 @@ void ScAttrArray::TestData() const } #endif -//------------------------------------------------------------------------ + void ScAttrArray::Reset( const ScPatternAttr* pPattern ) { @@ -179,7 +179,7 @@ bool ScAttrArray::Concat(SCSIZE nPos) return bRet; } -//------------------------------------------------------------------------ + bool ScAttrArray::Search( SCROW nRow, SCSIZE& nIndex ) const { @@ -342,7 +342,7 @@ void ScAttrArray::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 n } -//------------------------------------------------------------------------ + void ScAttrArray::SetPattern( SCROW nRow, const ScPatternAttr* pPattern, bool bPutToPool ) { diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index d6d3b4f125bc..d47a519b47da 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -41,7 +41,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + TYPEINIT1(ScMergeAttr, SfxPoolItem); TYPEINIT1_AUTOFACTORY(ScProtectionAttr, SfxPoolItem); @@ -53,7 +53,7 @@ TYPEINIT1(ScDoubleItem, SfxPoolItem); TYPEINIT1(ScPageScaleToItem, SfxPoolItem); TYPEINIT1(ScCondFormatItem, SfxPoolItem); -//------------------------------------------------------------------------ + // // General Help Function @@ -92,9 +92,9 @@ bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxB // Item - Implementierungen // -//------------------------------------------------------------------------ + // Merge -//------------------------------------------------------------------------ + ScMergeAttr::ScMergeAttr(): SfxPoolItem(ATTR_MERGE), @@ -102,7 +102,7 @@ ScMergeAttr::ScMergeAttr(): nRowMerge(0) {} -//------------------------------------------------------------------------ + ScMergeAttr::ScMergeAttr( SCsCOL nCol, SCsROW nRow): SfxPoolItem(ATTR_MERGE), @@ -110,7 +110,7 @@ ScMergeAttr::ScMergeAttr( SCsCOL nCol, SCsROW nRow): nRowMerge(nRow) {} -//------------------------------------------------------------------------ + ScMergeAttr::ScMergeAttr(const ScMergeAttr& rItem): SfxPoolItem(ATTR_MERGE) @@ -123,7 +123,7 @@ ScMergeAttr::~ScMergeAttr() { } -//------------------------------------------------------------------------ + OUString ScMergeAttr::GetValueText() const { @@ -135,7 +135,7 @@ OUString ScMergeAttr::GetValueText() const return aRet; } -//------------------------------------------------------------------------ + bool ScMergeAttr::operator==( const SfxPoolItem& rItem ) const { @@ -145,14 +145,14 @@ bool ScMergeAttr::operator==( const SfxPoolItem& rItem ) const && (nRowMerge == ((ScMergeAttr&)rItem).nRowMerge); } -//------------------------------------------------------------------------ + SfxPoolItem* ScMergeAttr::Clone( SfxItemPool * ) const { return new ScMergeAttr(*this); } -//------------------------------------------------------------------------ + SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) const { @@ -163,16 +163,16 @@ SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) con return new ScMergeAttr(static_cast<SCCOL>(nCol),static_cast<SCROW>(nRow)); } -//------------------------------------------------------------------------ + // MergeFlag -//------------------------------------------------------------------------ + ScMergeFlagAttr::ScMergeFlagAttr(): SfxInt16Item(ATTR_MERGE_FLAG, 0) { } -//------------------------------------------------------------------------ + ScMergeFlagAttr::ScMergeFlagAttr(sal_Int16 nFlags): SfxInt16Item(ATTR_MERGE_FLAG, nFlags) @@ -193,9 +193,9 @@ bool ScMergeFlagAttr::HasPivotPopupButton() const return (GetValue() & SC_MF_BUTTON_POPUP) != 0; } -//------------------------------------------------------------------------ + // Protection -//------------------------------------------------------------------------ + ScProtectionAttr::ScProtectionAttr(): SfxPoolItem(ATTR_PROTECTION), @@ -206,7 +206,7 @@ ScProtectionAttr::ScProtectionAttr(): { } -//------------------------------------------------------------------------ + ScProtectionAttr::ScProtectionAttr( bool bProtect, bool bHFormula, bool bHCell, bool bHPrint): @@ -218,7 +218,7 @@ ScProtectionAttr::ScProtectionAttr( bool bProtect, bool bHFormula, { } -//------------------------------------------------------------------------ + ScProtectionAttr::ScProtectionAttr(const ScProtectionAttr& rItem): SfxPoolItem(ATTR_PROTECTION) @@ -233,7 +233,7 @@ ScProtectionAttr::~ScProtectionAttr() { } -//------------------------------------------------------------------------ + bool ScProtectionAttr::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const { @@ -305,7 +305,7 @@ bool ScProtectionAttr::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId ) return bRet; } -//------------------------------------------------------------------------ + OUString ScProtectionAttr::GetValueText() const { @@ -325,7 +325,7 @@ OUString ScProtectionAttr::GetValueText() const return aValue; } -//------------------------------------------------------------------------ + SfxItemPresentation ScProtectionAttr::GetPresentation ( @@ -374,7 +374,7 @@ SfxItemPresentation ScProtectionAttr::GetPresentation return ePres; } -//------------------------------------------------------------------------ + bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const { @@ -386,14 +386,14 @@ bool ScProtectionAttr::operator==( const SfxPoolItem& rItem ) const && (bHidePrint == ((ScProtectionAttr&)rItem).bHidePrint); } -//------------------------------------------------------------------------ + SfxPoolItem* ScProtectionAttr::Clone( SfxItemPool * ) const { return new ScProtectionAttr(*this); } -//------------------------------------------------------------------------ + SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, sal_uInt16 /* n */ ) const { @@ -410,7 +410,7 @@ SfxPoolItem* ScProtectionAttr::Create( SvStream& rStream, sal_uInt16 /* n */ ) c return new ScProtectionAttr(bProtect,bHFormula,bHCell,bHPrint); } -//------------------------------------------------------------------------ + bool ScProtectionAttr::SetProtection( bool bProtect) { @@ -418,7 +418,7 @@ bool ScProtectionAttr::SetProtection( bool bProtect) return true; } -//------------------------------------------------------------------------ + bool ScProtectionAttr::SetHideFormula( bool bHFormula) { @@ -426,7 +426,7 @@ bool ScProtectionAttr::SetHideFormula( bool bHFormula) return true; } -//------------------------------------------------------------------------ + bool ScProtectionAttr::SetHideCell( bool bHCell) { @@ -434,7 +434,7 @@ bool ScProtectionAttr::SetHideCell( bool bHCell) return true; } -//------------------------------------------------------------------------ + bool ScProtectionAttr::SetHidePrint( bool bHPrint) { @@ -442,9 +442,9 @@ bool ScProtectionAttr::SetHidePrint( bool bHPrint) return true; } -// ----------------------------------------------------------------------- + // ScRangeItem - Tabellenbereich -// ----------------------------------------------------------------------- + bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const { @@ -453,14 +453,14 @@ bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const return ( aRange == ( (ScRangeItem&)rAttr ).aRange ); } -// ----------------------------------------------------------------------- + SfxPoolItem* ScRangeItem::Clone( SfxItemPool* ) const { return new ScRangeItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation ScRangeItem::GetPresentation ( @@ -495,9 +495,9 @@ SfxItemPresentation ScRangeItem::GetPresentation return ePres; } -// ----------------------------------------------------------------------- + // ScTableListItem - List from Tables (-numbers) -// ----------------------------------------------------------------------- + ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) : SfxPoolItem ( rCpy.Which() ), @@ -514,7 +514,7 @@ ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) pTabArr = NULL; } -// ----------------------------------------------------------------------- + ScTableListItem::~ScTableListItem() @@ -522,7 +522,7 @@ ScTableListItem::~ScTableListItem() delete [] pTabArr; } -// ----------------------------------------------------------------------- + ScTableListItem& ScTableListItem::operator=( const ScTableListItem& rCpy ) { @@ -542,7 +542,7 @@ ScTableListItem& ScTableListItem::operator=( const ScTableListItem& rCpy ) return *this; } -// ----------------------------------------------------------------------- + bool ScTableListItem::operator==( const SfxPoolItem& rAttr ) const { @@ -566,14 +566,14 @@ bool ScTableListItem::operator==( const SfxPoolItem& rAttr ) const return bEqual; } -// ----------------------------------------------------------------------- + SfxPoolItem* ScTableListItem::Clone( SfxItemPool* ) const { return new ScTableListItem( *this ); } -//------------------------------------------------------------------------ + SfxItemPresentation ScTableListItem::GetPresentation ( @@ -618,9 +618,9 @@ SfxItemPresentation ScTableListItem::GetPresentation } -// ----------------------------------------------------------------------- + // ScPageHFItem - Dates from the Head and Foot lines -// ----------------------------------------------------------------------- + ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP ) : SfxPoolItem ( nWhichP ), @@ -630,7 +630,7 @@ ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP ) { } -//------------------------------------------------------------------------ + ScPageHFItem::ScPageHFItem( const ScPageHFItem& rItem ) : SfxPoolItem ( rItem ), @@ -646,7 +646,7 @@ ScPageHFItem::ScPageHFItem( const ScPageHFItem& rItem ) pRightArea = rItem.pRightArea->Clone(); } -//------------------------------------------------------------------------ + ScPageHFItem::~ScPageHFItem() { @@ -655,7 +655,7 @@ ScPageHFItem::~ScPageHFItem() delete pRightArea; } -//------------------------------------------------------------------------ + bool ScPageHFItem::QueryValue( uno::Any& rVal, sal_uInt8 /* nMemberId */ ) const { @@ -715,14 +715,14 @@ bool ScPageHFItem::PutValue( const uno::Any& rVal, sal_uInt8 /* nMemberId */ ) return true; } -//------------------------------------------------------------------------ + OUString ScPageHFItem::GetValueText() const { return OUString("ScPageHFItem"); } -//------------------------------------------------------------------------ + bool ScPageHFItem::operator==( const SfxPoolItem& rItem ) const { @@ -735,14 +735,14 @@ bool ScPageHFItem::operator==( const SfxPoolItem& rItem ) const && ScGlobal::EETextObjEqual(pRightArea, r.pRightArea); } -//------------------------------------------------------------------------ + SfxPoolItem* ScPageHFItem::Clone( SfxItemPool* ) const { return new ScPageHFItem( *this ); } -//------------------------------------------------------------------------ + static void lcl_SetSpace( OUString& rStr, const ESelection& rSel ) { @@ -885,7 +885,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const return pItem; } -//------------------------------------------------------------------------ + void ScPageHFItem::SetLeftArea( const EditTextObject& rNew ) @@ -894,7 +894,7 @@ void ScPageHFItem::SetLeftArea( const EditTextObject& rNew ) pLeftArea = rNew.Clone(); } -//------------------------------------------------------------------------ + void ScPageHFItem::SetCenterArea( const EditTextObject& rNew ) { @@ -902,7 +902,7 @@ void ScPageHFItem::SetCenterArea( const EditTextObject& rNew ) pCenterArea = rNew.Clone(); } -//------------------------------------------------------------------------ + void ScPageHFItem::SetRightArea( const EditTextObject& rNew ) { @@ -922,29 +922,29 @@ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea ) } } -//----------------------------------------------------------------------- + // ScViewObjectModeItem - Display Mode of View Objects -//----------------------------------------------------------------------- + ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP ) : SfxEnumItem( nWhichP, VOBJ_MODE_SHOW ) { } -//------------------------------------------------------------------------ + ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP, ScVObjMode eMode ) : SfxEnumItem( nWhichP, sal::static_int_cast<sal_uInt16>(eMode) ) { } -//------------------------------------------------------------------------ + ScViewObjectModeItem::~ScViewObjectModeItem() { } -//------------------------------------------------------------------------ + SfxItemPresentation ScViewObjectModeItem::GetPresentation ( @@ -994,7 +994,7 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation return ePres; } -//------------------------------------------------------------------------ + OUString ScViewObjectModeItem::GetValueText( sal_uInt16 nVal ) const { @@ -1003,28 +1003,28 @@ OUString ScViewObjectModeItem::GetValueText( sal_uInt16 nVal ) const return ScGlobal::GetRscString( STR_VOBJ_MODE_SHOW + (nVal % 2)); } -//------------------------------------------------------------------------ + sal_uInt16 ScViewObjectModeItem::GetValueCount() const { return 2; } -//------------------------------------------------------------------------ + SfxPoolItem* ScViewObjectModeItem::Clone( SfxItemPool* ) const { return new ScViewObjectModeItem( *this ); } -//------------------------------------------------------------------------ + sal_uInt16 ScViewObjectModeItem::GetVersion( sal_uInt16 /* nFileVersion */ ) const { return 1; } -//------------------------------------------------------------------------ + SfxPoolItem* ScViewObjectModeItem::Create( SvStream& rStream, @@ -1047,9 +1047,9 @@ SfxPoolItem* ScViewObjectModeItem::Create( } } -// ----------------------------------------------------------------------- + // double -// ----------------------------------------------------------------------- + ScDoubleItem::ScDoubleItem( sal_uInt16 nWhichP, double nVal ) : SfxPoolItem ( nWhichP ), @@ -1057,7 +1057,7 @@ ScDoubleItem::ScDoubleItem( sal_uInt16 nWhichP, double nVal ) { } -//------------------------------------------------------------------------ + ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem ) : SfxPoolItem ( rItem ) @@ -1065,14 +1065,14 @@ ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem ) nValue = rItem.nValue; } -//------------------------------------------------------------------------ + OUString ScDoubleItem::GetValueText() const { return OUString("ScDoubleItem"); } -//------------------------------------------------------------------------ + bool ScDoubleItem::operator==( const SfxPoolItem& rItem ) const { @@ -1081,14 +1081,14 @@ bool ScDoubleItem::operator==( const SfxPoolItem& rItem ) const return nValue == _rItem.nValue; } -//------------------------------------------------------------------------ + SfxPoolItem* ScDoubleItem::Clone( SfxItemPool* ) const { return new ScDoubleItem( *this ); } -//------------------------------------------------------------------------ + SfxPoolItem* ScDoubleItem::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) const { @@ -1100,7 +1100,7 @@ SfxPoolItem* ScDoubleItem::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) co return pItem; } -//------------------------------------------------------------------------ + ScDoubleItem::~ScDoubleItem() { diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 45c2d6ddc70d..203ed3ea3e35 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -67,12 +67,12 @@ #include <boost/scoped_ptr.hpp> -// ----------------------------------------------------------------------- + // factor from font size to optimal cell height (text width) #define SC_ROT_BREAK_FACTOR 6 -// ----------------------------------------------------------------------- + inline bool IsAmbiguousScript( sal_uInt8 nScript ) { @@ -82,13 +82,13 @@ inline bool IsAmbiguousScript( sal_uInt8 nScript ) nScript != SCRIPTTYPE_COMPLEX ); } -// ----------------------------------------------------------------------------------------- + // // Data operations // -// ----------------------------------------------------------------------------------------- + long ScColumn::GetNeededSize( diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 5974b8f27603..d70b43f9d96d 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -43,7 +43,7 @@ #include "svl/sharedstring.hxx" using namespace formula; -//------------------------------------------------------------------------ + ScFormatEntry::ScFormatEntry(ScDocument* pDoc): mpDoc(pDoc) @@ -1541,7 +1541,7 @@ void ScConditionEntry::endRendering() mpCache.reset(); } -//------------------------------------------------------------------------ + ScCondFormatEntry::ScCondFormatEntry( ScConditionMode eOper, const OUString& rExpr1, const OUString& rExpr2, @@ -1597,7 +1597,7 @@ ScFormatEntry* ScCondFormatEntry::Clone( ScDocument* pDoc ) const return new ScCondFormatEntry( pDoc, *this ); } -//------------------------------------------------------------------------ + ScCondDateFormatEntry::ScCondDateFormatEntry( ScDocument* pDoc ) : ScFormatEntry( pDoc ) @@ -1787,7 +1787,7 @@ void ScCondDateFormatEntry::endRendering() mpCache.reset(); } -//------------------------------------------------------------------------ + ScConditionalFormat::ScConditionalFormat(sal_uInt32 nNewKey, ScDocument* pDocument) : pDoc( pDocument ), @@ -2091,7 +2091,7 @@ void ScConditionalFormat::endRendering() } } -//------------------------------------------------------------------------ + ScConditionalFormatList::ScConditionalFormatList(const ScConditionalFormatList& rList) { diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx index d97847d16800..d89e3592ad45 100644 --- a/sc/source/core/data/dbdocutl.cxx +++ b/sc/source/core/data/dbdocutl.cxx @@ -30,14 +30,14 @@ using namespace ::com::sun::star; -// ---------------------------------------------------------------------------- + ScDatabaseDocUtil::StrData::StrData() : mbSimpleText(true), mnStrLength(0) { } -// ---------------------------------------------------------------------------- + void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, const uno::Reference<sdbc::XRow>& xRow, long nRowPos, diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index f33ff41e2f90..35eb8d572405 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -350,7 +350,7 @@ bool ScDBQueryDataIterator::IsQueryValid( return rDoc.maTabs[nTab]->ValidQuery(nRow, rParam, pCell); } -// ---------------------------------------------------------------------------- + ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc) : DataAccess(pParent), @@ -536,7 +536,7 @@ void ScDBQueryDataIterator::DataAccessInternal::setPos(size_t nPos) nRow = nPos; } -// ---------------------------------------------------------------------------- + ScDBQueryDataIterator::DataAccessMatrix::DataAccessMatrix(const ScDBQueryDataIterator* pParent, ScDBQueryParamMatrix* pParam) : DataAccess(pParent), @@ -765,7 +765,7 @@ bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM return false; } -// ---------------------------------------------------------------------------- + ScDBQueryDataIterator::Value::Value() : mnError(0), mbIsNumber(true) @@ -773,7 +773,7 @@ ScDBQueryDataIterator::Value::Value() : ::rtl::math::setNan(&mfValue); } -// ---------------------------------------------------------------------------- + ScDBQueryDataIterator::ScDBQueryDataIterator(ScDocument* pDocument, ScDBQueryParamBase* pParam) : mpParam (pParam) @@ -1054,7 +1054,7 @@ bool ScCellIterator::next() return getCurrent(); } -//------------------------------------------------------------------------------- + ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable, const ScQueryParam& rParam, bool bMod ) : @@ -1922,7 +1922,7 @@ bool ScQueryCellIterator::BinarySearch() } -//------------------------------------------------------------------------------- + ScHorizontalCellIterator::ScHorizontalCellIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) : @@ -2155,7 +2155,7 @@ void ScHorizontalCellIterator::SkipInvalid() mbMore = false; } -//------------------------------------------------------------------------ + ScHorizontalValueIterator::ScHorizontalValueIterator( ScDocument* pDocument, const ScRange& rRange, bool bSTotal, bool bTextZero ) : @@ -2277,7 +2277,7 @@ bool ScHorizontalValueIterator::GetNext( double& rValue, sal_uInt16& rErr ) return bFound; } -//------------------------------------------------------------------------------- + ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) : @@ -2422,7 +2422,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo } } -//------------------------------------------------------------------------------- + inline bool IsGreater( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { @@ -2526,7 +2526,7 @@ const ScRefCellValue& ScUsedAreaIterator::GetCell() const return maFoundCell; } -//------------------------------------------------------------------------------- + ScDocAttrIterator::ScDocAttrIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, @@ -2659,7 +2659,7 @@ void ScDocRowHeightUpdater::updateAll() } } -//------------------------------------------------------------------------------- + ScAttrRectIterator::ScAttrRectIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 1990b2db7dc1..e614bac560fe 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -186,7 +186,7 @@ static SfxItemInfo const aItemInfos[] = { SID_SCGRIDSHOW, SFX_ITEM_POOLABLE } }; -// ----------------------------------------------------------------------- + ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool) @@ -597,7 +597,7 @@ void ScDocumentPool::DeleteVersionMaps() pVersionMap1 = 0; } -// ---------------------------------------------------------------------------------------- + // // Fuer die Pattern-Attribute (SetItems) kann der sal_uInt16 RefCount leicht ueberlaufen // (z.B. 600 ganze Zeilen abwechselnd formatieren). @@ -654,7 +654,7 @@ void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) } } -// ---------------------------------------------------------------------------------------- + void ScDocumentPool::StyleDeleted( ScStyleSheet* pStyle ) { diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index 1087b3f25c93..bfd0d29fa0ba 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -48,7 +48,7 @@ using namespace formula; -// ----------------------------------------------------------------------- + /** (Goal Seek) Find a value of x that is a root of f(x) This function is used internally for the goal seek operation. It uses the @@ -892,7 +892,7 @@ void ScDocument::DeleteConditionalFormat(sal_uLong nOldIndex, SCTAB nTab) maTabs[nTab]->DeleteConditionalFormat(nOldIndex); } -//------------------------------------------------------------------------ + bool ScDocument::HasDetectiveOperations() const { @@ -919,11 +919,11 @@ void ScDocument::SetDetOpList(ScDetOpList* pNew) pDetOpList = pNew; } -//------------------------------------------------------------------------ + // // Vergleich von Dokumenten // -//------------------------------------------------------------------------ + // Pfriemel-Faktoren #define SC_DOCCOMP_MAXDIFF 256 diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index b769c4d68487..293e1af90532 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star; -// ----------------------------------------------------------------------- + static void lcl_GetChartParameters( const uno::Reference< chart2::XChartDocument >& xChartDoc, OUString& rRanges, chart::ChartDataRowSource& rDataRowSource, diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index b9b8d5f4dbe9..3de5b0727127 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -42,7 +42,7 @@ using namespace com::sun::star; // put functions here that need exceptions! // -// ----------------------------------------------------------------------- + const uno::Reference< i18n::XBreakIterator >& ScDocument::GetBreakIterator() { diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx index ac3f3cf2ed69..0faa829969d4 100644 --- a/sc/source/core/data/documen7.cxx +++ b/sc/source/core/data/documen7.cxx @@ -47,7 +47,7 @@ extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkA // STATIC DATA ----------------------------------------------------------- -// ----------------------------------------------------------------------- + void ScDocument::StartListeningArea( const ScRange& rRange, SvtListener* pListener diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 1c750ce9d419..e5cf04e52120 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -109,7 +109,7 @@ void ScDocument::ImplCreateOptions() pViewOptions = new ScViewOptions(); } -//------------------------------------------------------------------------ + void ScDocument::ImplDeleteOptions() { @@ -118,7 +118,7 @@ void ScDocument::ImplDeleteOptions() delete pExtDocOptions; } -//------------------------------------------------------------------------ + SfxPrinter* ScDocument::GetPrinter(bool bCreateIfNotExist) { @@ -150,7 +150,7 @@ SfxPrinter* ScDocument::GetPrinter(bool bCreateIfNotExist) return pPrinter; } -//------------------------------------------------------------------------ + void ScDocument::SetPrinter( SfxPrinter* pNewPrinter ) { @@ -172,7 +172,7 @@ void ScDocument::SetPrinter( SfxPrinter* pNewPrinter ) InvalidateTextWidth(NULL, NULL, false); // in both cases } -//------------------------------------------------------------------------ + void ScDocument::SetPrintOptions() { @@ -196,7 +196,7 @@ void ScDocument::SetPrintOptions() } } -//------------------------------------------------------------------------ + VirtualDevice* ScDocument::GetVirtualDevice_100th_mm() { @@ -226,7 +226,7 @@ OutputDevice* ScDocument::GetRefDevice() return pRefDevice; } -//------------------------------------------------------------------------ + void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet, const SfxItemSet& rChanges ) @@ -309,7 +309,7 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet, } } -//------------------------------------------------------------------------ + void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc ) { @@ -318,7 +318,7 @@ void ScDocument::CopyStdStylesFrom( ScDocument* pSrcDoc ) xPoolHelper->GetStylePool()->CopyStdStylesFrom( pSrcDoc->xPoolHelper->GetStylePool() ); } -//------------------------------------------------------------------------ + void ScDocument::InvalidateTextWidth( const OUString& rStyleName ) { @@ -328,7 +328,7 @@ void ScDocument::InvalidateTextWidth( const OUString& rStyleName ) InvalidateTextWidth( i ); } -//------------------------------------------------------------------------ + void ScDocument::InvalidateTextWidth( SCTAB nTab ) { @@ -337,7 +337,7 @@ void ScDocument::InvalidateTextWidth( SCTAB nTab ) InvalidateTextWidth( &aAdrFrom, &aAdrTo, false ); } -//------------------------------------------------------------------------ + bool ScDocument::IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab ) { @@ -354,7 +354,7 @@ bool ScDocument::IsPageStyleInUse( const OUString& rStrPageStyle, SCTAB* pInTab return bInUse; } -//------------------------------------------------------------------------ + bool ScDocument::RemovePageStyleInUse( const OUString& rStyle ) { @@ -386,7 +386,7 @@ bool ScDocument::RenamePageStyleInUse( const OUString& rOld, const OUString& rNe return bWasInUse; } -//------------------------------------------------------------------------ + sal_uInt8 ScDocument::GetEditTextDirection(SCTAB nTab) const { @@ -485,7 +485,7 @@ void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress } } -//------------------------------------------------------------------------ + #define CALCMAX 1000 // Berechnungen #define ABORT_EVENTS (VCL_INPUT_ANY & ~VCL_INPUT_TIMER & ~VCL_INPUT_OTHER) @@ -963,7 +963,7 @@ ScDdeLink* lclGetDdeLink( const sfx2::LinkManager* pLinkManager, size_t nDdePos } // namespace -// ---------------------------------------------------------------------------- + bool ScDocument::FindDdeLink( const OUString& rAppl, const OUString& rTopic, const OUString& rItem, sal_uInt8 nMode, size_t& rnDdePos ) @@ -1040,7 +1040,7 @@ bool ScDocument::SetDdeLinkResultMatrix( size_t nDdePos, ScMatrixRef pResults ) return false; } -//------------------------------------------------------------------------ + bool ScDocument::HasAreaLinks() const { @@ -1163,7 +1163,7 @@ void ScDocument::UpdateRefAreaLinks( UpdateRefMode eUpdateRefMode, } } -//------------------------------------------------------------------------ + // TimerDelays etc. void ScDocument::KeyInput( const KeyEvent& ) @@ -1184,7 +1184,7 @@ bool ScDocument::CheckMacroWarn() return true; } -//------------------------------------------------------------------------ + SfxBindings* ScDocument::GetViewBindings() { @@ -1213,7 +1213,7 @@ ScDrawLayer* ScDocument::GetDrawLayer() return pDrawLayer; } -//------------------------------------------------------------------------ + void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType ) { diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 1953f7d3c5ed..9ceb12b03490 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -58,7 +58,7 @@ using namespace ::com::sun::star; #include <stdio.h> -// ----------------------------------------------------------------------- + SfxBroadcaster* ScDocument::GetDrawBroadcaster() diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 3f51268c91ff..7f2025d89597 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -596,7 +596,7 @@ struct ScDPSaveGroupSourceNameFunc } // namespace -// ---------------------------------------------------------------------------- + ScDPDimensionSaveData::ScDPDimensionSaveData() { diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index a5e969461cdc..68e8ce2a9b27 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -102,7 +102,7 @@ size_t ScDPFilteredCache::GroupFilter::getMatchItemCount() const return maItems.size(); } -// ---------------------------------------------------------------------------- + ScDPFilteredCache::Criterion::Criterion() : mnFieldIndex(-1), @@ -110,7 +110,7 @@ ScDPFilteredCache::Criterion::Criterion() : { } -// ---------------------------------------------------------------------------- + ScDPFilteredCache::ScDPFilteredCache(const ScDPCache& rCache) : maShowByFilter(0, MAXROW+1, false), maShowByPage(0, MAXROW+1, true), mrCache(rCache) diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index 361a74febc13..cca401505376 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -126,7 +126,7 @@ private: ScDPNumGroupInfo maNumInfo; }; -// ---------------------------------------------------------------------------- + ScDPGroupDateFilter::ScDPGroupDateFilter( const std::vector<ScDPItemData>& rValues, const Date& rNullDate, const ScDPNumGroupInfo& rNumInfo) : @@ -350,7 +350,7 @@ void ScDPGroupItem::FillGroupFilter( ScDPFilteredCache::GroupFilter& rFilter ) c rFilter.addMatchItem(*itr); } -// ----------------------------------------------------------------------- + ScDPGroupDimension::ScDPGroupDimension( long nSource, const OUString& rNewName ) : nSourceDim( nSource ), @@ -447,7 +447,7 @@ bool ScDPGroupDimension::IsDateDimension() const return mbDateDimension; } -// ----------------------------------------------------------------------- + ScDPNumGroupDimension::ScDPNumGroupDimension() : mbDateDimension(false) {} diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index bc9949f8fcfe..bf2c1654d34c 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -100,7 +100,7 @@ using ::com::sun::star::beans::XPropertySet; #define SC_DBPROP_COMMAND "Command" #define SC_DBPROP_COMMANDTYPE "CommandType" -// ----------------------------------------------------------------------- + #define SCDPSOURCE_SERVICE "com.sun.star.sheet.DataPilotSource" @@ -2471,7 +2471,7 @@ bool ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference< return bRet; } -//------------------------------------------------------------------------ + // convert old pivot tables into new datapilot tables namespace { @@ -2658,7 +2658,7 @@ bool ScDPObject::IsOrientationAllowed( sal_uInt16 nOrient, sal_Int32 nDimFlags ) return bAllowed; } -// ----------------------------------------------------------------------- + bool ScDPObject::HasRegisteredSources() { diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index cb43eccd54db..adff9b10e6d8 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -324,7 +324,7 @@ void lcl_SetFrame( ScDocument* pDoc, SCTAB nTab, pDoc->ApplyFrameAreaTab( ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab ), &aBox, &aBoxInfo ); } -// ----------------------------------------------------------------------- + void lcl_FillNumberFormats( sal_uInt32*& rFormats, long& rCount, const uno::Reference<sheet::XDataPilotMemberResults>& xLevRes, diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index 27405bc00960..9d3157cd207a 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -160,7 +160,7 @@ void ScDatabaseDPData::ReloadCacheTable() CreateCacheTable(); } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index 5230632c9d83..b544387e4006 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -39,7 +39,7 @@ using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Sequence; using ::std::vector; -// ----------------------------------------------------------------------- + ScSheetDPData::ScSheetDPData(ScDocument* pD, const ScSheetSourceDesc& rDesc, const ScDPCache& rCache) : ScDPTableData(pD), diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index 494c492c1f1a..bfe57793df20 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.cxx @@ -38,7 +38,7 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; using ::std::vector; -// --------------------------------------------------------------------------- + ScDPTableData::CalcInfo::CalcInfo() : pInitState( NULL ), @@ -48,7 +48,7 @@ ScDPTableData::CalcInfo::CalcInfo() : { } -// --------------------------------------------------------------------------- + ScDPTableData::ScDPTableData(ScDocument* pDoc) : mpDoc(pDoc) @@ -251,7 +251,7 @@ void ScDPTableData::GetItemData(const ScDPFilteredCache& rCacheTable, sal_Int32 } } -// ----------------------------------------------------------------------- + long ScDPTableData::GetMembersCount( long nDim ) { diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index a1d299bfeec1..76af9eda863c 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -385,7 +385,7 @@ void ScDPRunningTotalState::RemoveRowIndex() } } -// ----------------------------------------------------------------------- + ScDPRelativePos::ScDPRelativePos( long nBase, long nDir ) : nBasePos( nBase ), @@ -393,7 +393,7 @@ ScDPRelativePos::ScDPRelativePos( long nBase, long nDir ) : { } -// ----------------------------------------------------------------------- + void ScDPAggData::Update( const ScDPValue& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ) { @@ -682,7 +682,7 @@ void ScDPAggData::Dump(int nIndent) const } #endif -// ----------------------------------------------------------------------- + ScDPRowTotals::ScDPRowTotals() : bIsInColRoot( false ) @@ -725,7 +725,7 @@ ScDPAggData* ScDPRowTotals::GetGrandTotal( long nMeasure ) return lcl_GetChildTotal( &aGrandTotal, nMeasure ); } -// ----------------------------------------------------------------------- + static ScSubTotalFunc lcl_GetForceFunc( const ScDPLevel* pLevel, long nFuncNo ) { @@ -755,7 +755,7 @@ static ScSubTotalFunc lcl_GetForceFunc( const ScDPLevel* pLevel, long nFuncNo ) return eRet; } -// ----------------------------------------------------------------------- + ScDPResultData::ScDPResultData( ScDPSource& rSrc ) : mrSource(rSrc), @@ -950,7 +950,7 @@ ResultMembers* ScDPResultData::GetDimResultMembers(long nDim, ScDPDimension* pDi return maDimMembers[nDim]; } -// ----------------------------------------------------------------------- + ScDPResultMember::ScDPResultMember( @@ -1836,7 +1836,7 @@ void ScDPResultMember::FillVisibilityData(ScDPResultVisibilityData& rData) const pChildDimension->FillVisibilityData(rData); } -// ----------------------------------------------------------------------- + ScDPDataMember::ScDPDataMember( const ScDPResultData* pData, const ScDPResultMember* pRes ) : pResultData( pData ), @@ -2688,7 +2688,7 @@ void ScDPDataMember::Dump(int nIndent) const } #endif -// ----------------------------------------------------------------------- + // Helper class to select the members to include in // ScDPResultDimension::InitFrom or LateInitFrom if groups are used @@ -2768,7 +2768,7 @@ bool ScDPGroupCompare::TestIncluded( const ScDPMember& rMember ) return bInclude; } -// ----------------------------------------------------------------------- + ScDPResultDimension::ScDPResultDimension( const ScDPResultData* pData ) : pResultData( pData ), @@ -3559,7 +3559,7 @@ void ScDPResultDimension::FillVisibilityData(ScDPResultVisibilityData& rData) co } } -// ----------------------------------------------------------------------- + ScDPDataDimension::ScDPDataDimension( const ScDPResultData* pData ) : pResultData( pData ), @@ -3914,7 +3914,7 @@ ScDPDataMember* ScDPDataDimension::GetMember(long n) return maMembers[n]; } -// ---------------------------------------------------------------------------- + ScDPResultVisibilityData::ScDPResultVisibilityData( ScDPSource* pSource) : @@ -4105,7 +4105,7 @@ ResultMembers::~ResultMembers() for ( DimMemberHash::const_iterator iter = maMemberHash.begin(); iter != maMemberHash.end(); ++iter ) delete iter->second; } -// ----------------------------------------------------------------------- + LateInitParams::LateInitParams( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, bool bRow, bool bInitChild, bool bAllChildren ) : mppDim( ppDim ), diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 979e7fa0293c..8b8075ece756 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -69,11 +69,11 @@ using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Any; using ::com::sun::star::sheet::DataPilotFieldAutoShowInfo; -// ----------------------------------------------------------------------- + #define SC_MINCOUNT_LIMIT 1000000 -// ----------------------------------------------------------------------- + SC_SIMPLE_SERVICE_INFO( ScDPSource, "ScDPSource", "com.sun.star.sheet.DataPilotSource" ) SC_SIMPLE_SERVICE_INFO( ScDPDimensions, "ScDPDimensions", "com.sun.star.sheet.DataPilotSourceDimensions" ) @@ -85,12 +85,12 @@ SC_SIMPLE_SERVICE_INFO( ScDPLevel, "ScDPLevel", "com.sun.star.sheet. SC_SIMPLE_SERVICE_INFO( ScDPMembers, "ScDPMembers", "com.sun.star.sheet.DataPilotSourceMembers" ) SC_SIMPLE_SERVICE_INFO( ScDPMember, "ScDPMember", "com.sun.star.sheet.DataPilotSourceMember" ) -// ----------------------------------------------------------------------- + // property maps for PropertySetInfo // DataDescription / NumberFormat are internal -// ----------------------------------------------------------------------- + //! move to a header? static sal_Bool lcl_GetBoolFromAny( const uno::Any& aAny ) @@ -105,7 +105,7 @@ static void lcl_SetBoolInAny( uno::Any& rAny, sal_Bool bValue ) rAny.setValue( &bValue, getBooleanCppuType() ); } -// ----------------------------------------------------------------------- + ScDPSource::ScDPSource( ScDPTableData* pD ) : pData( pD ), @@ -970,7 +970,7 @@ void ScDPSource::CreateRes_Impl() pColResRoot->CheckShowEmpty(); pRowResRoot->CheckShowEmpty(); - // ---------------------------------------------------------------- + // With all data processed, calculate the final results: // UpdateDataResults calculates all original results from the collected values, @@ -1223,7 +1223,7 @@ void ScDPSource::DumpResults() const SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPSource ) -// ----------------------------------------------------------------------- + ScDPDimensions::ScDPDimensions( ScDPSource* pSrc ) : pSource( pSrc ), @@ -1352,7 +1352,7 @@ ScDPDimension* ScDPDimensions::getByIndex(long nIndex) const return NULL; //! exception? } -// ----------------------------------------------------------------------- + ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) : pSource( pSrc ), @@ -1727,7 +1727,7 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const OUString& aPropertyName SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPDimension ) -// ----------------------------------------------------------------------- + ScDPHierarchies::ScDPHierarchies( ScDPSource* pSrc, long nD ) : pSource( pSrc ), @@ -1835,7 +1835,7 @@ ScDPHierarchy* ScDPHierarchies::getByIndex(long nIndex) const return NULL; //! exception? } -// ----------------------------------------------------------------------- + ScDPHierarchy::ScDPHierarchy( ScDPSource* pSrc, long nD, long nH ) : pSource( pSrc ), @@ -1896,7 +1896,7 @@ void SAL_CALL ScDPHierarchy::setName( const OUString& /* rNewName */ ) throw(uno OSL_FAIL("not implemented"); //! exception? } -// ----------------------------------------------------------------------- + ScDPLevels::ScDPLevels( ScDPSource* pSrc, long nD, long nH ) : pSource( pSrc ), @@ -2015,7 +2015,7 @@ ScDPLevel* ScDPLevels::getByIndex(long nIndex) const return NULL; //! exception? } -// ----------------------------------------------------------------------- + class ScDPGlobalMembersOrder { @@ -2046,7 +2046,7 @@ sal_Bool ScDPGlobalMembersOrder::operator()( sal_Int32 nIndex1, sal_Int32 nIndex return bAscending ? (nCompare < 0) : (nCompare > 0); } -// ----------------------------------------------------------------------- + ScDPLevel::ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL ) : pSource( pSrc ), @@ -2320,7 +2320,7 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const OUString& aPropertyName ) SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPLevel ) -// ----------------------------------------------------------------------- + ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) : pSource( pSrc ), @@ -2593,7 +2593,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const return NULL; //! exception? } -// ----------------------------------------------------------------------- + ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL, SCROW nIndex) : diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx index 64c8c7704e76..fc0feca48f17 100644 --- a/sc/source/core/data/drawpage.cxx +++ b/sc/source/core/data/drawpage.cxx @@ -26,7 +26,7 @@ // STATIC DATA ----------------------------------------------------------- -// ----------------------------------------------------------------------- + ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage) : FmFormPage(rNewModel, bMasterPage) @@ -34,13 +34,13 @@ ScDrawPage::ScDrawPage(ScDrawLayer& rNewModel, bool bMasterPage) : SetSize( Size( LONG_MAX, LONG_MAX ) ); } -// ----------------------------------------------------------------------- + ScDrawPage::~ScDrawPage() { } -// ----------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > ScDrawPage::createUnoPage() { diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index eff38fa156f7..b7d654a54825 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -95,7 +95,7 @@ SfxObjectShell* ScDrawLayer::pGlobalDrawPersist = NULL; sal_Bool bDrawIsInUndo = false; //! Member -// ----------------------------------------------------------------------- + ScUndoObjData::ScUndoObjData( SdrObject* pObjP, const ScAddress& rOS, const ScAddress& rOE, const ScAddress& rNS, const ScAddress& rNE ) : @@ -133,7 +133,7 @@ void ScUndoObjData::Redo() } } -// ----------------------------------------------------------------------- + ScTabDeletedHint::ScTabDeletedHint( SCTAB nTabNo ) : nTab( nTabNo ) @@ -153,7 +153,7 @@ ScTabSizeChangedHint::~ScTabSizeChangedHint() { } -// ----------------------------------------------------------------------- + #define MAXMM 10000000 @@ -187,7 +187,7 @@ static void lcl_ReverseTwipsToMM( Rectangle& rRect ) ReverseTwipsToMM( rRect.Bottom() ); } -// ----------------------------------------------------------------------- + ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 225c0cec5769..f9dd04db2568 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -678,7 +678,7 @@ void ScDocument::FillInfo( if(pCondFormList) pCondFormList->endRendering(); - //------------------------------------------------------------------------- + // bedingte Formatierung auswerten ::boost::ptr_vector<ScPatternAttr> aAltPatterns; // favour preview over condition @@ -741,7 +741,7 @@ void ScDocument::FillInfo( } // bedingte Formatierung Ende - //------------------------------------------------------------------------- + // // Daten von zusammengefassten Zellen anpassen diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 5323fa647370..0cc761ce34db 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -80,7 +80,7 @@ #include "random.hxx" #include "editutil.hxx" -// ----------------------------------------------------------------------- + ScDocShellRef* ScGlobal::pDrawClipDocShellRef = NULL; @@ -156,7 +156,7 @@ bool ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs, const SfxItemState eNewState = rNewAttrs.GetItemState( nWhich ); const SfxItemState eOldState = rOldAttrs.GetItemState( nWhich ); - //---------------------------------------------------------- + if ( eNewState == eOldState ) { @@ -221,7 +221,7 @@ SvNumberFormatter* ScGlobal::GetEnglishFormatter() } -//------------------------------------------------------------------------ + bool ScGlobal::CheckWidthInvalidate( bool& bNumFormatChanged, const SfxItemSet& rNewAttrs, @@ -685,7 +685,7 @@ void ScGlobal::Clear() DELETEZ(pEmptyOUString); } -//------------------------------------------------------------------------ + rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet ) { @@ -710,7 +710,7 @@ rtl_TextEncoding ScGlobal::GetCharsetValue( const OUString& rCharSet ) else return osl_getThreadTextEncoding(); } -//------------------------------------------------------------------------ + OUString ScGlobal::GetCharsetString( rtl_TextEncoding eVal ) { @@ -735,7 +735,7 @@ OUString ScGlobal::GetCharsetString( rtl_TextEncoding eVal ) return OUString::createFromAscii(pChar); } -//------------------------------------------------------------------------ + bool ScGlobal::HasStarCalcFunctionList() { @@ -750,7 +750,7 @@ ScFunctionList* ScGlobal::GetStarCalcFunctionList() return pStarCalcFunctionList; } -//------------------------------------------------------------------------ + ScFunctionMgr* ScGlobal::GetStarCalcFunctionMgr() { @@ -768,7 +768,7 @@ void ScGlobal::ResetFunctionList() DELETEZ( pStarCalcFunctionList ); } -//------------------------------------------------------------------------ + ScUnitConverter* ScGlobal::GetUnitConverter() { @@ -779,7 +779,7 @@ ScUnitConverter* ScGlobal::GetUnitConverter() } -//------------------------------------------------------------------------ + const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr, sal_Unicode c ) @@ -795,7 +795,7 @@ const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr, return NULL; } -// ---------------------------------------------------------------------------- + OUString ScGlobal::addToken(const OUString& rTokenList, const OUString& rToken, sal_Unicode cSep, sal_Int32 nSepCount, bool bForceSep) @@ -888,7 +888,7 @@ const sal_Unicode* ScGlobal::FindUnquoted( const sal_Unicode* pString, sal_Unico return NULL; } -//------------------------------------------------------------------------ + bool ScGlobal::EETextObjEqual( const EditTextObject* pObj1, const EditTextObject* pObj2 ) @@ -970,7 +970,7 @@ void ScGlobal::OpenURL( const OUString& rURL, const OUString& rTarget ) 0L ); } -//------------------------------------------------------------------------ + bool ScGlobal::IsSystemRTL() { @@ -1082,7 +1082,7 @@ sal_uInt16 ScGlobal::GetScriptedWhichID( sal_uInt8 nScriptType, sal_uInt16 nWhic return nWhich; } -//------------------------------------------------------------------------ + void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter ) { @@ -1108,11 +1108,11 @@ void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter ) } -//-------------------------------------------------------------------- -//------------------------------------------------------------------------ + + utl::TransliterationWrapper* ScGlobal::GetpTransliteration() { diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index 324b1c0d2be1..b19f1bebb4ba 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -38,9 +38,9 @@ using ::std::vector; -// ----------------------------------------------------------------------- -//------------------------------------------------------------------------ + + // struct ScImportParam: ScImportParam::ScImportParam() : @@ -105,7 +105,7 @@ bool ScImportParam::operator==( const ScImportParam& rOther ) const //! nQuerySh und pConnection sind gleich ? } -//------------------------------------------------------------------------ + // struct ScConsolidateParam: ScConsolidateParam::ScConsolidateParam() : @@ -114,7 +114,7 @@ ScConsolidateParam::ScConsolidateParam() : Clear(); } -//------------------------------------------------------------------------ + ScConsolidateParam::ScConsolidateParam( const ScConsolidateParam& r ) : nCol(r.nCol),nRow(r.nRow),nTab(r.nTab), @@ -131,14 +131,14 @@ ScConsolidateParam::ScConsolidateParam( const ScConsolidateParam& r ) : } } -//------------------------------------------------------------------------ + ScConsolidateParam::~ScConsolidateParam() { ClearDataAreas(); } -//------------------------------------------------------------------------ + void ScConsolidateParam::ClearDataAreas() { @@ -152,7 +152,7 @@ void ScConsolidateParam::ClearDataAreas() nDataAreaCount = 0; } -//------------------------------------------------------------------------ + void ScConsolidateParam::Clear() { @@ -165,7 +165,7 @@ void ScConsolidateParam::Clear() eFunction = SUBTOTAL_FUNC_SUM; } -//------------------------------------------------------------------------ + ScConsolidateParam& ScConsolidateParam::operator=( const ScConsolidateParam& r ) { @@ -181,7 +181,7 @@ ScConsolidateParam& ScConsolidateParam::operator=( const ScConsolidateParam& r ) return *this; } -//------------------------------------------------------------------------ + bool ScConsolidateParam::operator==( const ScConsolidateParam& r ) const { @@ -206,7 +206,7 @@ bool ScConsolidateParam::operator==( const ScConsolidateParam& r ) const return bEqual; } -//------------------------------------------------------------------------ + void ScConsolidateParam::SetAreas( ScArea* const* ppAreas, sal_uInt16 nCount ) { @@ -220,7 +220,7 @@ void ScConsolidateParam::SetAreas( ScArea* const* ppAreas, sal_uInt16 nCount ) } } -//------------------------------------------------------------------------ + // struct ScSolveParam ScSolveParam::ScSolveParam() @@ -228,7 +228,7 @@ ScSolveParam::ScSolveParam() { } -//------------------------------------------------------------------------ + ScSolveParam::ScSolveParam( const ScSolveParam& r ) : aRefFormulaCell ( r.aRefFormulaCell ), @@ -239,7 +239,7 @@ ScSolveParam::ScSolveParam( const ScSolveParam& r ) { } -//------------------------------------------------------------------------ + ScSolveParam::ScSolveParam( const ScAddress& rFormulaCell, const ScAddress& rVariableCell, @@ -250,14 +250,14 @@ ScSolveParam::ScSolveParam( const ScAddress& rFormulaCell, { } -//------------------------------------------------------------------------ + ScSolveParam::~ScSolveParam() { delete pStrTargetVal; } -//------------------------------------------------------------------------ + ScSolveParam& ScSolveParam::operator=( const ScSolveParam& r ) { @@ -271,7 +271,7 @@ ScSolveParam& ScSolveParam::operator=( const ScSolveParam& r ) return *this; } -//------------------------------------------------------------------------ + bool ScSolveParam::operator==( const ScSolveParam& r ) const { @@ -291,7 +291,7 @@ bool ScSolveParam::operator==( const ScSolveParam& r ) const return bEqual; } -//------------------------------------------------------------------------ + // struct ScTabOpParam ScTabOpParam::ScTabOpParam() : meMode(Column) {} @@ -305,7 +305,7 @@ ScTabOpParam::ScTabOpParam( const ScTabOpParam& r ) { } -//------------------------------------------------------------------------ + ScTabOpParam::ScTabOpParam( const ScRefAddress& rFormulaCell, const ScRefAddress& rFormulaEnd, @@ -320,7 +320,7 @@ ScTabOpParam::ScTabOpParam( const ScRefAddress& rFormulaCell, { } -//------------------------------------------------------------------------ + ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r ) { @@ -332,7 +332,7 @@ ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r ) return *this; } -//------------------------------------------------------------------------ + bool ScTabOpParam::operator==( const ScTabOpParam& r ) const { diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index 71ee12087aeb..40d977df360d 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -23,7 +23,7 @@ // STATIC DATA ----------------------------------------------------------- -//------------------------------------------------------------------------ + ScMarkArray::ScMarkArray() : nCount( 0 ), @@ -33,14 +33,14 @@ ScMarkArray::ScMarkArray() : // special case "no marks" with pData = NULL } -//------------------------------------------------------------------------ + ScMarkArray::~ScMarkArray() { delete[] pData; } -//------------------------------------------------------------------------ + void ScMarkArray::Reset( bool bMarked ) { @@ -55,7 +55,7 @@ void ScMarkArray::Reset( bool bMarked ) pData[0].bMarked = bMarked; } -//------------------------------------------------------------------------ + bool ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const { @@ -103,7 +103,7 @@ bool ScMarkArray::GetMark( SCROW nRow ) const } -//------------------------------------------------------------------------ + void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, bool bMarked ) { diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx index 39ef79213a5f..0ca8ebc7ee82 100644 --- a/sc/source/core/data/markdata.cxx +++ b/sc/source/core/data/markdata.cxx @@ -27,7 +27,7 @@ // STATIC DATA ----------------------------------------------------------- -//------------------------------------------------------------------------ + ScMarkData::ScMarkData() : maTabMarked(), diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx index 941e5293d218..80ba6fea82bb 100644 --- a/sc/source/core/data/olinetab.cxx +++ b/sc/source/core/data/olinetab.cxx @@ -25,7 +25,7 @@ #include "address.hxx" #include "table.hxx" -//------------------------------------------------------------------------ + ScOutlineEntry::ScOutlineEntry( SCCOLROW nNewStart, SCCOLROW nNewSize, bool bNewHidden ) : nStart ( nNewStart ), @@ -104,7 +104,7 @@ void ScOutlineEntry::SetVisible( bool bNewVisible ) bVisible = bNewVisible; } -//------------------------------------------------------------------------ + ScOutlineCollection::ScOutlineCollection() {} @@ -159,7 +159,7 @@ ScOutlineCollection::iterator ScOutlineCollection::FindStart(SCCOLROW nMinStart) return maEntries.lower_bound(nMinStart); } -//------------------------------------------------------------------------ + ScOutlineArray::ScOutlineArray() : nDepth(0) {} @@ -793,7 +793,7 @@ void ScOutlineArray::RemoveAll() nDepth = 0; } -//------------------------------------------------------------------------ + ScOutlineTable::ScOutlineTable() { @@ -835,7 +835,7 @@ bool ScOutlineTable::DeleteRow( SCROW nStartRow, SCSIZE nSize ) return aRowOutline.DeleteSpace( nStartRow, nSize ); } -//------------------------------------------------------------------------ + ScSubOutlineIterator::ScSubOutlineIterator( ScOutlineArray* pOutlineArray ) : pArray( pOutlineArray ), diff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx index 96a02adb16fc..606aefd2a0dd 100644 --- a/sc/source/core/data/pagepar.cxx +++ b/sc/source/core/data/pagepar.cxx @@ -30,13 +30,13 @@ ScPageTableParam::ScPageTableParam() Reset(); } -//------------------------------------------------------------------------ + ScPageTableParam::~ScPageTableParam() { } -//------------------------------------------------------------------------ + void ScPageTableParam::Reset() { @@ -50,7 +50,7 @@ void ScPageTableParam::Reset() nFirstPageNo = 1; } -//------------------------------------------------------------------------ + bool ScPageTableParam::operator==( const ScPageTableParam& r ) const { @@ -65,13 +65,13 @@ ScPageAreaParam::ScPageAreaParam() Reset(); } -//------------------------------------------------------------------------ + ScPageAreaParam::~ScPageAreaParam() { } -//------------------------------------------------------------------------ + void ScPageAreaParam::Reset() { @@ -82,7 +82,7 @@ void ScPageAreaParam::Reset() memset( &aRepeatCol, 0, sizeof(ScRange) ); } -//------------------------------------------------------------------------ + bool ScPageAreaParam::operator==( const ScPageAreaParam& r ) const { diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index bf3d179ae5f1..88ab4affac69 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -65,12 +65,12 @@ ScDocument* ScPatternAttr::pDoc = NULL; -// ----------------------------------------------------------------------- + using sc::HMMToTwips; using sc::TwipsToHMM; -// ----------------------------------------------------------------------- + ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, const OUString& rStyleName ) : SfxSetItem ( ATTR_PATTERN, pItemSet ), @@ -934,7 +934,7 @@ static SfxStyleSheetBase* lcl_CopyStyleToPool return NULL; } - //-------------------------------------------------------- + const OUString aStrSrcStyle = pSrcStyle->GetName(); const SfxStyleFamily eFamily = pSrcStyle->GetFamily(); diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index 74d5cbe274fe..e2aa81063d8b 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.cxx @@ -25,7 +25,7 @@ #include "docpool.hxx" #include "stlpool.hxx" -// ----------------------------------------------------------------------- + ScPoolHelper::ScPoolHelper( ScDocument* pSourceDoc ) :pFormTable(NULL) @@ -120,7 +120,7 @@ void ScPoolHelper::SourceDocumentGone() pFormTable->SetColorLink( Link() ); } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 6a980d1413b1..798eb8962469 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -80,7 +80,7 @@ public: static void SetCaptionItems( SdrCaptionObj& rCaption, const SfxItemSet& rItemSet ); }; -// ---------------------------------------------------------------------------- + void ScCaptionUtil::SetCaptionLayer( SdrCaptionObj& rCaption, bool bShown ) { @@ -206,7 +206,7 @@ private: bool mbNegPage; }; -// ---------------------------------------------------------------------------- + ScCaptionCreator::ScCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, bool bShown, bool bTailFront ) : mrDoc( rDoc ), @@ -416,7 +416,7 @@ public: explicit ScNoteCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, SdrCaptionObj& rCaption, bool bShown ); }; -// ---------------------------------------------------------------------------- + ScNoteCaptionCreator::ScNoteCaptionCreator( ScDocument& rDoc, const ScAddress& rPos, ScNoteData& rNoteData ) : ScCaptionCreator( rDoc, rPos ) // use helper c'tor that does not create the caption yet @@ -475,7 +475,7 @@ struct ScCaptionInitData explicit ScCaptionInitData(); }; -// ---------------------------------------------------------------------------- + ScCaptionInitData::ScCaptionInitData() : mbDefaultPosSize( true ) diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx index 3af5c64beb2a..2d768e8449de 100644 --- a/sc/source/core/data/segmenttree.cxx +++ b/sc/source/core/data/segmenttree.cxx @@ -247,7 +247,7 @@ public: } }; -// ---------------------------------------------------------------------------- + class ScFlatBoolSegmentsImpl : public ScFlatSegmentsImpl<bool> { @@ -304,7 +304,7 @@ SCROW ScFlatBoolRowSegments::ForwardIterator::getLastPos() const return mnLastPos; } -// ---------------------------------------------------------------------------- + ScFlatBoolRowSegments::RangeIterator::RangeIterator(ScFlatBoolRowSegments& rSegs) : mrSegs(rSegs) @@ -335,7 +335,7 @@ bool ScFlatBoolRowSegments::RangeIterator::getNext(RangeData& rRange) return true; } -// ---------------------------------------------------------------------------- + ScFlatBoolRowSegments::ScFlatBoolRowSegments() : mpImpl(new ScFlatBoolSegmentsImpl(static_cast<SCCOLROW>(MAXROW))) @@ -486,7 +486,7 @@ SCROW ScFlatUInt16RowSegments::ForwardIterator::getLastPos() const return mnLastPos; } -// ---------------------------------------------------------------------------- + ScFlatUInt16RowSegments::ScFlatUInt16RowSegments(sal_uInt16 nDefault) : mpImpl(new ScFlatUInt16SegmentsImpl(static_cast<SCCOLROW>(MAXROW), nDefault)) diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx index 231f3a2cf9a7..ca382f575f0a 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -19,7 +19,7 @@ #include "sheetevents.hxx" #include <com/sun/star/script/vba/VBAEventId.hpp> -// ----------------------------------------------------------------------- + OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) { @@ -71,7 +71,7 @@ sal_Int32 ScSheetEvents::GetVbaDocumentEventId(sal_Int32 nEvent) return (nSheetEventId != NO_EVENT) ? (nSheetEventId + USERDEFINED_START) : NO_EVENT; } -// ----------------------------------------------------------------------- + ScSheetEvents::ScSheetEvents() : mpScriptNames(NULL) diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx index d416f32ed0db..d0efd196b958 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.cxx @@ -24,14 +24,14 @@ #include "subtotalparam.hxx" -//------------------------------------------------------------------------ + ScSortParam::ScSortParam() { Clear(); } -//------------------------------------------------------------------------ + ScSortParam::ScSortParam( const ScSortParam& r ) : nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nUserIndex(r.nUserIndex), @@ -47,7 +47,7 @@ ScSortParam::ScSortParam( const ScSortParam& r ) : ScSortParam::~ScSortParam() {} -//------------------------------------------------------------------------ + void ScSortParam::Clear() { @@ -71,7 +71,7 @@ void ScSortParam::Clear() maKeyState.assign( DEFSORT, aKeyState ); } -//------------------------------------------------------------------------ + ScSortParam& ScSortParam::operator=( const ScSortParam& r ) { @@ -98,7 +98,7 @@ ScSortParam& ScSortParam::operator=( const ScSortParam& r ) return *this; } -//------------------------------------------------------------------------ + bool ScSortParam::operator==( const ScSortParam& rOther ) const { @@ -154,7 +154,7 @@ bool ScSortParam::operator==( const ScSortParam& rOther ) const return bEqual; } -//------------------------------------------------------------------------ + ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ) : nCol1(rSub.nCol1),nRow1(rSub.nRow1),nCol2(rSub.nCol2),nRow2(rSub.nRow2),nUserIndex(rSub.nUserIndex), @@ -199,7 +199,7 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ) } } -//------------------------------------------------------------------------ + ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) : nCol1(nCol),nRow1(rParam.nRow1),nCol2(nCol),nRow2(rParam.nRow2),nUserIndex(0), @@ -225,7 +225,7 @@ ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) : maKeyState.push_back( aKeyState ); } -//------------------------------------------------------------------------ + void ScSortParam::MoveToDest() { diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 9d4a4262b31e..dcd04fa0ebb9 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -66,20 +66,20 @@ ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rPoolP, { } -//------------------------------------------------------------------------ + ScStyleSheetPool::~ScStyleSheetPool() { } -//------------------------------------------------------------------------ + void ScStyleSheetPool::SetDocument( ScDocument* pDocument ) { pDoc = pDocument; } -//------------------------------------------------------------------------ + SfxStyleSheetBase& ScStyleSheetPool::Make( const OUString& rName, SfxStyleFamily eFam, sal_uInt16 mask) @@ -106,7 +106,7 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const OUString& rName, return SfxStyleSheetPool::Make(rName, eFam, mask); } -//------------------------------------------------------------------------ + SfxStyleSheetBase* ScStyleSheetPool::Create( const OUString& rName, SfxStyleFamily eFamily, @@ -119,7 +119,7 @@ SfxStyleSheetBase* ScStyleSheetPool::Create( const OUString& rName, return pSheet; } -//------------------------------------------------------------------------ + SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle ) { @@ -127,7 +127,7 @@ SfxStyleSheetBase* ScStyleSheetPool::Create( const SfxStyleSheetBase& rStyle ) return new ScStyleSheet( (const ScStyleSheet&) rStyle ); } -//------------------------------------------------------------------------ + void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle ) { @@ -141,7 +141,7 @@ void ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle ) } } -//------------------------------------------------------------------------ + void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool, const OUString& rName, SfxStyleFamily eFamily ) @@ -197,11 +197,11 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool, } } -//------------------------------------------------------------------------ + // // Standard-Vorlagen // -//------------------------------------------------------------------------ + #define SCSTR(id) ScGlobal::GetRscString(id) @@ -218,7 +218,7 @@ void ScStyleSheetPool::CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ) CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_REPORT), SFX_STYLE_FAMILY_PAGE ); } -//------------------------------------------------------------------------ + static void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, sal_uInt16 nFontType, sal_uInt16 nItemId ) { @@ -264,9 +264,9 @@ void ScStyleSheetPool::CreateStandardStyles() // Zellformatvorlagen: //========================================================== - //------------ + // 1. Standard - //------------ + pSheet = (ScStyleSheet*) &Make( aStrStandard, SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_STD ); @@ -296,9 +296,9 @@ void ScStyleSheetPool::CreateStandardStyles() // if ( eCtl == LANGUAGE_THAI ) // pSet->Put( SvxFontHeightItem( 300, 100, ATTR_CTL_FONT_HEIGHT ) ); // 15 pt - //------------ + // 2. Ergebnis - //------------ + pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT ), SFX_STYLE_FAMILY_PARA, @@ -310,9 +310,9 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) ); pSet->Put( SvxUnderlineItem( UNDERLINE_SINGLE, ATTR_FONT_UNDERLINE ) ); - //------------- + // 3. Ergebnis1 - //------------- + pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT1 ), SFX_STYLE_FAMILY_PARA, @@ -321,9 +321,9 @@ void ScStyleSheetPool::CreateStandardStyles() pSheet->SetParent( SCSTR( STR_STYLENAME_RESULT ) ); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_ERG1 ); - //---------------- + // 4. Ueberschrift - //---------------- + pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE ), SFX_STYLE_FAMILY_PARA, @@ -337,9 +337,9 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) ); pSet->Put( SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) ); - //----------------- + // 5. Ueberschrift1 - //----------------- + pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE1 ), SFX_STYLE_FAMILY_PARA, @@ -354,9 +354,9 @@ void ScStyleSheetPool::CreateStandardStyles() // Seitenformat-Vorlagen: //========================================================== - //------------ + // 1. Standard - //------------ + pSheet = (ScStyleSheet*) &Make( aStrStandard, SFX_STYLE_FAMILY_PAGE, @@ -371,10 +371,10 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET ); DELETEZ( pHFSetItem ); - //---------------------------------------- + // Kopfzeile: // [leer][\TABELLE\][leer] - //---------------------------------------- + pEdEngine->SetText(EMPTY_OUSTRING); pEdEngine->QuickInsertField( SvxFieldItem(SvxTableField(), EE_FEATURE_FIELD), ESelection() ); pTxtObj = pEdEngine->CreateTextObject(); @@ -384,10 +384,10 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pHeaderItem ); DELETEZ( pTxtObj ); - //---------------------------------------- + // Fusszeile: // [leer][Seite \SEITE\][leer] - //---------------------------------------- + aStr = SCSTR( STR_PAGE ) + " "; pEdEngine->SetText( aStr ); nStrLen = aStr.getLength(); @@ -399,9 +399,9 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pFooterItem ); DELETEZ( pTxtObj ); - //---------- + // 2. Report - //---------- + pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_REPORT ), SFX_STYLE_FAMILY_PAGE, @@ -433,10 +433,10 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET ); DELETEZ( pHFSetItem ); - //---------------------------------------- + // Kopfzeile: // [\TABELLE\ (\DATEI\)][leer][\DATUM\, \ZEIT\] - //---------------------------------------- + aStr = " ()"; pEdEngine->SetText( aStr ); pEdEngine->QuickInsertField( SvxFieldItem(SvxFileField(), EE_FEATURE_FIELD), ESelection(0,2,0,2) ); @@ -455,10 +455,10 @@ void ScStyleSheetPool::CreateStandardStyles() DELETEZ( pTxtObj ); pSet->Put( *pHeaderItem ); - //---------------------------------------- + // Fusszeile: // [leer][Seite: \SEITE\ / \SEITEN\][leer] - //---------------------------------------- + aStr = SCSTR( STR_PAGE ) + " "; nStrLen = aStr.getLength(); aStr += " / "; @@ -473,14 +473,14 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pFooterItem ); DELETEZ( pTxtObj ); - //---------------------------------------------------- + DELETEZ( pEmptyTxtObj ); DELETEZ( pHeaderItem ); DELETEZ( pFooterItem ); DELETEZ( pEdEngine ); } -//------------------------------------------------------------------------ + ScStyleSheet* ScStyleSheetPool::FindCaseIns( const OUString& rName, SfxStyleFamily eFam ) diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index 04322d84824b..ef19a93c0891 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -41,7 +41,7 @@ #include "globstr.hrc" #include "sc.hrc" -//------------------------------------------------------------------------ + TYPEINIT1(ScStyleSheet, SfxStyleSheet); @@ -60,7 +60,7 @@ ScStyleSheet::ScStyleSheet( const OUString& rName, { } -//------------------------------------------------------------------------ + ScStyleSheet::ScStyleSheet( const ScStyleSheet& rStyle ) : SfxStyleSheet ( rStyle ) @@ -68,20 +68,20 @@ ScStyleSheet::ScStyleSheet( const ScStyleSheet& rStyle ) { } -//------------------------------------------------------------------------ + ScStyleSheet::~ScStyleSheet() { } -//------------------------------------------------------------------------ + bool ScStyleSheet::HasFollowSupport() const { return false; } -//------------------------------------------------------------------------ + bool ScStyleSheet::HasParentSupport () const { @@ -100,7 +100,7 @@ bool ScStyleSheet::HasParentSupport () const return bHasParentSupport; } -//------------------------------------------------------------------------ + bool ScStyleSheet::SetParent( const OUString& rParentName ) { @@ -135,7 +135,7 @@ bool ScStyleSheet::SetParent( const OUString& rParentName ) return bResult; } -//------------------------------------------------------------------------ + SfxItemSet& ScStyleSheet::GetItemSet() { @@ -252,7 +252,7 @@ SfxItemSet& ScStyleSheet::GetItemSet() return *pSet; } -//------------------------------------------------------------------------ + bool ScStyleSheet::IsUsed() const { @@ -271,7 +271,7 @@ bool ScStyleSheet::IsUsed() const return true; } -//------------------------------------------------------------------------ + void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint ) { @@ -280,7 +280,7 @@ void ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint ) GetItemSet().SetParent( NULL ); } -//------------------------------------------------------------------------ + // schmutzige Tricks, um die Standard-Vorlage immer als "Standard" zu speichern, // obwohl der fuer den Benutzer sichtbare Name uebersetzt ist: diff --git a/sc/source/core/data/subtotalparam.cxx b/sc/source/core/data/subtotalparam.cxx index b449ba2db353..a93d341f072f 100644 --- a/sc/source/core/data/subtotalparam.cxx +++ b/sc/source/core/data/subtotalparam.cxx @@ -22,7 +22,7 @@ ScSubTotalParam::ScSubTotalParam() Clear(); } -//------------------------------------------------------------------------ + ScSubTotalParam::ScSubTotalParam( const ScSubTotalParam& r ) : nCol1(r.nCol1),nRow1(r.nRow1),nCol2(r.nCol2),nRow2(r.nRow2),nUserIndex(r.nUserIndex), @@ -56,7 +56,7 @@ ScSubTotalParam::ScSubTotalParam( const ScSubTotalParam& r ) : } } -//------------------------------------------------------------------------ + void ScSubTotalParam::Clear() { @@ -81,7 +81,7 @@ void ScSubTotalParam::Clear() } } -//------------------------------------------------------------------------ + ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r ) { @@ -130,7 +130,7 @@ ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r ) return *this; } -//------------------------------------------------------------------------ + bool ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const { @@ -172,7 +172,7 @@ bool ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const return bEqual; } -//------------------------------------------------------------------------ + void ScSubTotalParam::SetSubTotals( sal_uInt16 nGroup, const SCCOL* ptrSubTotals, diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 45180cff6014..552292dee0e3 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -219,7 +219,7 @@ bool SetOptimalHeightsToRows(OptimalHeightsFuncObjBase& rFuncObj, } -// ----------------------------------------------------------------------- + ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const OUString& rNewName, bool bColInfo, bool bRowInfo ) : diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index e3545f7ac768..4cb85abc355f 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -149,7 +149,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) } } - //-------------------------------------------------------------------------- + long nPageSizeX = aPageSizeTwips.Width(); long nPageSizeY = aPageSizeTwips.Height(); diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index e1a650d1220a..c544beccd61a 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -33,7 +33,7 @@ #include "postit.hxx" #include "stringutil.hxx" -//-------------------------------------------------------------------------- + using ::com::sun::star::util::SearchOptions; diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx index d4226fd01f2e..9b26930e7c72 100644 --- a/sc/source/core/data/userdat.cxx +++ b/sc/source/core/data/userdat.cxx @@ -21,7 +21,7 @@ #include "drwlayer.hxx" #include "rechead.hxx" -// ----------------------------------------------------------------------- + ScDrawObjFactory::ScDrawObjFactory() { @@ -52,7 +52,7 @@ IMPL_LINK_INLINE_START( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFac } IMPL_LINK_INLINE_END( ScDrawObjFactory, MakeUserData, SdrObjFactory *, pObjFactory ) -//------------------------------------------------------------------------ + ScDrawObjData::ScDrawObjData() : SdrObjUserData( SC_DRAWLAYER, SC_UD_OBJDATA, 0 ), @@ -67,7 +67,7 @@ ScDrawObjData* ScDrawObjData::Clone( SdrObject* ) const return new ScDrawObjData( *this ); } -//------------------------------------------------------------------------ + ScIMapInfo::ScIMapInfo() : SdrObjUserData( SC_DRAWLAYER, SC_UD_IMAPDATA, 0 ) @@ -95,7 +95,7 @@ SdrObjUserData* ScIMapInfo::Clone( SdrObject* ) const return new ScIMapInfo( *this ); } -//------------------------------------------------------------------------ + ScMacroInfo::ScMacroInfo() : SdrObjUserData( SC_DRAWLAYER, SC_UD_MACRODATA, 0 ) diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 7ca9589e1c2f..68d407fde46f 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -605,7 +605,7 @@ rtl_uString* ScStringTokenIterator::Next() return (mbSkipEmpty && maCurString.isValid() && maCurString.isEmpty()) ? Next() : maCurString.getData(); } -// ---------------------------------------------------------------------------- + /** Returns the number format of the passed cell, or the standard format. */ sal_uLong lclGetCellFormat( ScDocument& rDoc, const ScAddress& rPos ) @@ -618,7 +618,7 @@ sal_uLong lclGetCellFormat( ScDocument& rDoc, const ScAddress& rPos ) } // namespace -// ---------------------------------------------------------------------------- + bool ScValidationData::HasSelectionList() const { @@ -839,7 +839,7 @@ bool ScValidationData::FillSelectionList(std::vector<ScTypedStrData>& rStrColl, return bOk; } -// ---------------------------------------------------------------------------- + bool ScValidationData::IsEqualToTokenArray( ScRefCellValue& rCell, const ScAddress& rPos, const ScTokenArray& rTokArr ) const { diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx index 349afdfc3048..c06f55cdbc0b 100644 --- a/sc/source/core/opencl/op_math.cxx +++ b/sc/source/core/opencl/op_math.cxx @@ -348,7 +348,7 @@ void OpCombina::GenSlidingWindowFunction(std::stringstream &ss, ss << " arg0 = trunc(arg0);\n"; ss << " arg1 = trunc(arg1);\n"; ss << " if(arg0 >= arg1 && arg0 > 0 && arg1 > 0)\n"; - ss << " tem = bik(arg0+arg1-1,arg1);\n"; + ss << " tem = bik(arg0+arg1-1,arg1);\n"; ss << " else if(arg0 == 0 && arg1 == 0)\n"; ss << " tem = 0;\n"; ss << " else if(arg0 > 0 && arg1 == 0)\n"; @@ -1409,14 +1409,14 @@ void OpArcCotHyp::GenSlidingWindowFunction(std::stringstream &ss, <const formula::SingleVectorRefToken *>(tmpCur); ss << " arg0 = "; ss << vSubArguments[0]->GenSlidingWindowDeclRef(); - ss << ";\n"; + ss << ";\n"; #ifdef ISNAN ss << " if(isNan("; ss << vSubArguments[0]->GenSlidingWindowDeclRef(); ss << ")||(gid0>="; ss << tmpCurDVR->GetArrayLength(); ss << "))\n"; - ss << " { arg0 = 0.0f; }\n"; + ss << " { arg0 = 0.0f; }\n"; #endif } else if(tmpCur->GetType() == formula::svDouble) @@ -2994,12 +2994,12 @@ void OpAverageIf::GenSlidingWindowFunction(std::stringstream &ss, if(paraOneWidth > 1) { throw Unhandled(); - } + } } if(vSubArguments[paraOneWidth]->GetFormulaToken()->GetType() == formula::svDoubleVectorRef) - + { FormulaToken *tmpCur1 = vSubArguments[1]->GetFormulaToken(); const formula::DoubleVectorRefToken*pCurDVR1= static_cast<const @@ -3108,7 +3108,7 @@ void OpAverageIf::GenSlidingWindowFunction(std::stringstream &ss, ss << " count+=1.0;\n"; ss << " }\n"; } - + ss << " if(count!=0)\n"; ss << " tmp=tmp/count;\n"; ss << " else\n"; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 205d61f68e06..114ffb84f0a7 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -81,9 +81,9 @@ using ::std::auto_ptr; //-----------------------------static data ----------------- -//------------------------------------------------------------------------- + // Funktionen fuer den Zugriff auf das Document -//------------------------------------------------------------------------- + void ScInterpreter::ReplaceCell( ScAddress& rPos ) @@ -847,9 +847,9 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } -//----------------------------------------------------------------------------- + // Stack operations -//----------------------------------------------------------------------------- + // Also releases a TempToken if appropriate. @@ -3690,7 +3690,7 @@ void ScInterpreter::ScTTT() PushError(errNoValue); } -// ------------------------------------------------------------------------- + ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc, diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 769b88686f41..463fd06e29a4 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -746,7 +746,7 @@ ScRefList* ScToken::GetRefList() } // ========================================================================== // real implementations of virtual functions -// -------------------------------------------------------------------------- + diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx index dc6eae07b07d..a6b2cf24de9f 100644 --- a/sc/source/filter/excel/colrowst.cxx +++ b/sc/source/filter/excel/colrowst.cxx @@ -286,7 +286,7 @@ void XclImpColRowSettings::Convert( SCTAB nScTab ) nPrevFlags = nFlags; } - // ------------------------------------------------------------------------ + mbDirty = false; } diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index dbdf92c6d745..9aeddf908b80 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -420,7 +420,7 @@ void ImportExcel8::LoadDocumentProperties() } } -//___________________________________________________________________ + // autofilter void ImportExcel8::FilterMode( void ) diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 977d638cf482..a2a246e4f7b1 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -567,7 +567,7 @@ XclExpFiltermode::XclExpFiltermode() : { } -// ---------------------------------------------------------------------------- + XclExpAutofilterinfo::XclExpAutofilterinfo( const ScAddress& rStartPos, SCCOL nScCol ) : XclExpUInt16Record( EXC_ID_AUTOFILTERINFO, static_cast< sal_uInt16 >( nScCol ) ), @@ -575,7 +575,7 @@ XclExpAutofilterinfo::XclExpAutofilterinfo( const ScAddress& rStartPos, SCCOL nS { } -// ---------------------------------------------------------------------------- + ExcFilterCondition::ExcFilterCondition() : nType( EXC_AFTYPE_NOTUSED ), @@ -673,7 +673,7 @@ void ExcFilterCondition::SaveText( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpAutofilter::XclExpAutofilter( const XclExpRoot& rRoot, sal_uInt16 nC ) : XclExpRecord( EXC_ID_AUTOFILTER, 24 ), @@ -896,7 +896,7 @@ void XclExpAutofilter::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_filterColumn ); } -// ---------------------------------------------------------------------------- + ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) : XclExpRoot( rRoot ), @@ -1068,7 +1068,7 @@ bool ExcAutoFilterRecs::HasFilterMode() const return pFilterMode != NULL; } -// ---------------------------------------------------------------------------- + XclExpFilterManager::XclExpFilterManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index a8f0fe63fea7..c030be9a28c7 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -137,7 +137,7 @@ FltError ImportExcel::Read( void ) switch( eAkt ) { - // ---------------------------------------------------------------- + case Z_BiffNull: // ------------------------------- Z_BiffNull - { switch( nOpcode ) @@ -203,7 +203,7 @@ FltError ImportExcel::Read( void ) } } break; - // ---------------------------------------------------------------- + case Z_Biff2: // ---------------------------------- Z_Biff2 - { switch( nOpcode ) @@ -262,7 +262,7 @@ FltError ImportExcel::Read( void ) } } break; - // ---------------------------------------------------------------- + case Z_Biff3: // ---------------------------------- Z_Biff3 - { switch( nOpcode ) @@ -333,7 +333,7 @@ FltError ImportExcel::Read( void ) } } break; - // ---------------------------------------------------------------- + case Z_Biff4: // ---------------------------------- Z_Biff4 - { switch( nOpcode ) @@ -408,7 +408,7 @@ FltError ImportExcel::Read( void ) } } break; - // ---------------------------------------------------------------- + case Z_Biff4W: // --------------------------------- Z_Biff4W - { switch( nOpcode ) @@ -453,7 +453,7 @@ FltError ImportExcel::Read( void ) } break; - // ---------------------------------------------------------------- + case Z_Biff4T: // --------------------------------- Z_Biff4T - { switch( nOpcode ) @@ -519,7 +519,7 @@ FltError ImportExcel::Read( void ) } break; - // ---------------------------------------------------------------- + case Z_Biff4E: // --------------------------------- Z_Biff4E - { switch( nOpcode ) @@ -593,7 +593,7 @@ FltError ImportExcel::Read( void ) } break; - // ---------------------------------------------------------------- + case Z_Biff5TPre: // ------------------------------- Z_Biff5Pre - { if( nOpcode == 0x0809 ) @@ -634,7 +634,7 @@ FltError ImportExcel::Read( void ) } } break; - // ---------------------------------------------------------------- + case Z_Biff5T: // --------------------------------- Z_Biff5T - { switch( nOpcode ) @@ -689,7 +689,7 @@ FltError ImportExcel::Read( void ) } break; - // ---------------------------------------------------------------- + case Z_Biff5E: // --------------------------------- Z_Biff5E - { switch( nOpcode ) @@ -736,7 +736,7 @@ FltError ImportExcel::Read( void ) } break; - // ---------------------------------------------------------------- + case Z_Ende: // ----------------------------------- Z_Ende - OSL_FAIL( "*ImportExcel::Read(): Not possible state!" ); break; @@ -767,7 +767,7 @@ FltError ImportExcel::Read( void ) } -//___________________________________________________________________ + FltError ImportExcel8::Read( void ) { @@ -956,7 +956,7 @@ FltError ImportExcel8::Read( void ) if( !bInUserView ) switch( eAkt ) { - // ---------------------------------------------------------------- + // before workbook globals: wait for initial workbook globals BOF case EXC_STATE_BEFORE_GLOBALS: { @@ -982,7 +982,7 @@ FltError ImportExcel8::Read( void ) } break; - // ---------------------------------------------------------------- + // prefetch for workbook globals case EXC_STATE_GLOBALS_PRE: { @@ -1023,7 +1023,7 @@ FltError ImportExcel8::Read( void ) } break; - // ---------------------------------------------------------------- + // workbook globals case EXC_STATE_GLOBALS: { @@ -1083,7 +1083,7 @@ FltError ImportExcel8::Read( void ) } break; - // ---------------------------------------------------------------- + // prefetch for worksheet case EXC_STATE_SHEET_PRE: { @@ -1149,7 +1149,7 @@ FltError ImportExcel8::Read( void ) } break; - // ---------------------------------------------------------------- + // worksheet case EXC_STATE_SHEET: { @@ -1240,7 +1240,7 @@ FltError ImportExcel8::Read( void ) } break; - // ---------------------------------------------------------------- + default:; } } @@ -1321,6 +1321,6 @@ FltError ImportExcel8::Read( void ) return eLastErr; } -//___________________________________________________________________ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 1dbd49c9adfe..9443c0e1269b 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -46,7 +46,7 @@ TokenStack::~TokenStack() -//------------------------------------------------------------------------ + // !ACHTUNG!: nach Aussen hin beginnt die Nummerierung mit 1! // !ACHTUNG!: SC-Token werden mit einem Offset nScTokenOff abgelegt diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index f68bf67ec112..cfec247c9098 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -249,7 +249,7 @@ struct XclExpChRootData : public XclChRootData void FinalizeFutureRecBlock( XclExpStream& rStrm ); }; -// ---------------------------------------------------------------------------- + void XclExpChRootData::RegisterFutureRecBlock( const XclChFrBlock& rFrBlock ) { @@ -297,7 +297,7 @@ void XclExpChRootData::FinalizeFutureRecBlock( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpChRoot::XclExpChRoot( const XclExpRoot& rRoot, XclExpChChart& rChartData ) : XclExpRoot( rRoot ), @@ -427,7 +427,7 @@ void XclExpChRoot::FinalizeFutureRecBlock( XclExpStream& rStrm ) mxChData->FinalizeFutureRecBlock( rStrm ); } -// ---------------------------------------------------------------------------- + XclExpChGroupBase::XclExpChGroupBase( const XclExpChRoot& rRoot, sal_uInt16 nFrType, sal_uInt16 nRecId, sal_Size nRecSize ) : @@ -473,7 +473,7 @@ void XclExpChGroupBase::SetFutureRecordContext( sal_uInt16 nFrContext, sal_uInt1 maFrBlock.mnValue2 = nFrValue2; } -// ---------------------------------------------------------------------------- + XclExpChFutureRecordBase::XclExpChFutureRecordBase( const XclExpChRoot& rRoot, XclFutureRecType eRecType, sal_uInt16 nRecId, sal_Size nRecSize ) : @@ -502,7 +502,7 @@ void XclExpChFramePos::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnTLMode << maData.mnBRMode << maData.maRect; } -// ---------------------------------------------------------------------------- + XclExpChLineFormat::XclExpChLineFormat( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHLINEFORMAT, (rRoot.GetBiff() == EXC_BIFF8) ? 12 : 10 ), @@ -585,7 +585,7 @@ XclExpChLineFormatRef lclCreateLineFormat( const XclExpChRoot& rRoot, } // namespace -// ---------------------------------------------------------------------------- + XclExpChAreaFormat::XclExpChAreaFormat( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHAREAFORMAT, (rRoot.GetBiff() == EXC_BIFF8) ? 16 : 12 ), @@ -663,7 +663,7 @@ void XclExpChAreaFormat::WriteBody( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpChEscherFormat::XclExpChEscherFormat( const XclExpChRoot& rRoot ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_UNKNOWN, EXC_ID_CHESCHERFORMAT ), @@ -739,7 +739,7 @@ void XclExpChEscherFormat::WriteBody( XclExpStream& rStrm ) rStrm.CopyFromStream( aMemStrm ); } -// ---------------------------------------------------------------------------- + XclExpChFrameBase::XclExpChFrameBase() { @@ -801,7 +801,7 @@ void XclExpChFrameBase::WriteFrameRecords( XclExpStream& rStrm ) lclSaveRecord( rStrm, mxEscherFmt ); } -// ---------------------------------------------------------------------------- + XclExpChFrame::XclExpChFrame( const XclExpChRoot& rRoot, XclChObjectType eObjType ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_FRAME, EXC_ID_CHFRAME, 4 ), @@ -896,7 +896,7 @@ void lclAddDoubleRefData( } // namespace -// ---------------------------------------------------------------------------- + XclExpChSourceLink::XclExpChSourceLink( const XclExpChRoot& rRoot, sal_uInt8 nDestType ) : XclExpRecord( EXC_ID_CHSOURCELINK ), @@ -1113,7 +1113,7 @@ XclExpChFont::XclExpChFont( sal_uInt16 nFontIdx ) : { } -// ---------------------------------------------------------------------------- + XclExpChObjectLink::XclExpChObjectLink( sal_uInt16 nLinkTarget, const XclChDataPointPos& rPointPos ) : XclExpRecord( EXC_ID_CHOBJECTLINK, 6 ) @@ -1127,7 +1127,7 @@ void XclExpChObjectLink::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnTarget << maData.maPointPos.mnSeriesIdx << maData.maPointPos.mnPointIdx; } -// ---------------------------------------------------------------------------- + XclExpChFrLabelProps::XclExpChFrLabelProps( const XclExpChRoot& rRoot ) : XclExpChFutureRecordBase( rRoot, EXC_FUTUREREC_UNUSEDREF, EXC_ID_CHFRLABELPROPS, 4 ) @@ -1156,7 +1156,7 @@ void XclExpChFrLabelProps::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnFlags << aXclSep; } -// ---------------------------------------------------------------------------- + XclExpChFontBase::~XclExpChFontBase() { @@ -1183,7 +1183,7 @@ void XclExpChFontBase::ConvertRotationBase( SetRotation( nRotation ); } -// ---------------------------------------------------------------------------- + XclExpChText::XclExpChText( const XclExpChRoot& rRoot ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_TEXT, EXC_ID_CHTEXT, (rRoot.GetBiff() == EXC_BIFF8) ? 32 : 26 ), @@ -1438,7 +1438,7 @@ void XclExpChText::WriteBody( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + namespace { @@ -1532,7 +1532,7 @@ void XclExpChMarkerFormat::WriteBody( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpChPieFormat::XclExpChPieFormat() : XclExpUInt16Record( EXC_ID_CHPIEFORMAT, 0 ) @@ -1546,7 +1546,7 @@ void XclExpChPieFormat::Convert( const ScfPropertySet& rPropSet ) SetValue( limit_cast< sal_uInt16 >( fApiDist * 100.0, 0, 100 ) ); } -// ---------------------------------------------------------------------------- + XclExpCh3dDataFormat::XclExpCh3dDataFormat() : XclExpRecord( EXC_ID_CH3DDATAFORMAT, 2 ) @@ -1588,14 +1588,14 @@ void XclExpCh3dDataFormat::WriteBody( XclExpStream& rStrm ) rStrm << maData.mnBase << maData.mnTop; } -// ---------------------------------------------------------------------------- + XclExpChAttachedLabel::XclExpChAttachedLabel( sal_uInt16 nFlags ) : XclExpUInt16Record( EXC_ID_CHATTACHEDLABEL, nFlags ) { } -// ---------------------------------------------------------------------------- + XclExpChDataFormat::XclExpChDataFormat( const XclExpChRoot& rRoot, const XclChDataPointPos& rPointPos, sal_uInt16 nFormatIdx ) : @@ -1678,7 +1678,7 @@ void XclExpChDataFormat::WriteBody( XclExpStream& rStrm ) << maData.mnFlags; } -// ---------------------------------------------------------------------------- + XclExpChSerTrendLine::XclExpChSerTrendLine( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHSERTRENDLINE, 28 ), @@ -1773,7 +1773,7 @@ void XclExpChSerTrendLine::WriteBody( XclExpStream& rStrm ) << maData.mfForecastBack; } -// ---------------------------------------------------------------------------- + XclExpChSerErrorBar::XclExpChSerErrorBar( const XclExpChRoot& rRoot, sal_uInt8 nBarType ) : XclExpRecord( EXC_ID_CHSERERRORBAR, 14 ), @@ -1853,7 +1853,7 @@ void XclExpChSerErrorBar::WriteBody( XclExpStream& rStrm ) << maData.mnValueCount; } -// ---------------------------------------------------------------------------- + namespace { @@ -2268,7 +2268,7 @@ void XclExpChType::WriteBody( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpChChart3d::XclExpChChart3d() : XclExpRecord( EXC_ID_CHCHART3D, 14 ) @@ -2323,7 +2323,7 @@ void XclExpChChart3d::WriteBody( XclExpStream& rStrm ) << maData.mnFlags; } -// ---------------------------------------------------------------------------- + XclExpChLegend::XclExpChLegend( const XclExpChRoot& rRoot ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_LEGEND, EXC_ID_CHLEGEND, 20 ) @@ -2422,7 +2422,7 @@ void XclExpChLegend::WriteBody( XclExpStream& rStrm ) rStrm << maData.maRect << maData.mnDockMode << maData.mnSpacing << maData.mnFlags; } -// ---------------------------------------------------------------------------- + XclExpChDropBar::XclExpChDropBar( const XclExpChRoot& rRoot, XclChObjectType eObjType ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_DROPBAR, EXC_ID_CHDROPBAR, 2 ), @@ -2449,7 +2449,7 @@ void XclExpChDropBar::WriteBody( XclExpStream& rStrm ) rStrm << mnBarDist; } -// ---------------------------------------------------------------------------- + XclExpChTypeGroup::XclExpChTypeGroup( const XclExpChRoot& rRoot, sal_uInt16 nGroupIdx ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_TYPEGROUP, EXC_ID_CHTYPEGROUP, 20 ), @@ -2776,7 +2776,7 @@ void XclExpChLabelRange::WriteBody( XclExpStream& rStrm ) rStrm << maLabelData.mnCross << maLabelData.mnLabelFreq << maLabelData.mnTickFreq << maLabelData.mnFlags; } -// ---------------------------------------------------------------------------- + XclExpChValueRange::XclExpChValueRange( const XclExpChRoot& rRoot ) : XclExpRecord( EXC_ID_CHVALUERANGE, 42 ), @@ -2852,7 +2852,7 @@ void XclExpChValueRange::WriteBody( XclExpStream& rStrm ) << maData.mnFlags; } -// ---------------------------------------------------------------------------- + namespace { @@ -2942,7 +2942,7 @@ void XclExpChTick::WriteBody( XclExpStream& rStrm ) rStrm << GetPalette().GetColorIndex( mnTextColorId ) << maData.mnRotation; } -// ---------------------------------------------------------------------------- + namespace { @@ -3122,7 +3122,7 @@ void XclExpChAxis::WriteBody( XclExpStream& rStrm ) rStrm.WriteZeroBytes( 16 ); } -// ---------------------------------------------------------------------------- + XclExpChAxesSet::XclExpChAxesSet( const XclExpChRoot& rRoot, sal_uInt16 nAxesSetId ) : XclExpChGroupBase( rRoot, EXC_CHFRBLOCK_TYPE_AXESSET, EXC_ID_CHAXESSET, 18 ) @@ -3494,7 +3494,7 @@ void XclExpChChart::WriteBody( XclExpStream& rStrm ) rStrm << maRect; } -// ---------------------------------------------------------------------------- + XclExpChartDrawing::XclExpChartDrawing( const XclExpRoot& rRoot, const Reference< XModel >& rxModel, const Size& rChartSize ) : @@ -3530,7 +3530,7 @@ void XclExpChartDrawing::Save( XclExpStream& rStrm ) mxObjRecs->Save( rStrm ); } -// ---------------------------------------------------------------------------- + XclExpChart::XclExpChart( const XclExpRoot& rRoot, Reference< XModel > xModel, const Rectangle& rChartRect ) : XclExpSubStream( EXC_BOF_CHART ), diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 327ef0ef8265..718ba0a40e49 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -77,7 +77,7 @@ struct XclExpHashEntrySWO { return *rLeft.mpString < *rRight.mpString; } }; -// ---------------------------------------------------------------------------- + /** Implementation of the SST export. @descr Stores all passed strings in a hash table and prevents repeated @@ -105,7 +105,7 @@ private: sal_uInt32 mnSize; /// Size of the SST (count of unique strings). }; -// ---------------------------------------------------------------------------- + const sal_uInt32 EXC_SST_HASHTABLE_SIZE = 2048; @@ -229,7 +229,7 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm ) rStrm.PopStream(); } -// ---------------------------------------------------------------------------- + XclExpSst::XclExpSst() : mxImpl( new XclExpSstImpl ) @@ -602,7 +602,7 @@ private: bool mbPattUsed; /// true = Pattern attribute used. }; -// ---------------------------------------------------------------------------- + XclExpCFImpl::XclExpCFImpl( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority ) : XclExpRoot( rRoot ), @@ -960,7 +960,7 @@ void XclExpCFImpl::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_cfRule ); } -// ---------------------------------------------------------------------------- + XclExpCF::XclExpCF( const XclExpRoot& rRoot, const ScCondFormatEntry& rFormatEntry, sal_Int32 nPriority = 0 ) : XclExpRecord( EXC_ID_CF ), @@ -1131,7 +1131,7 @@ void XclExpColScaleCol::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_color ); } -// ---------------------------------------------------------------------------- + XclExpCondfmt::XclExpCondfmt( const XclExpRoot& rRoot, const ScConditionalFormat& rCondFormat, XclExtLstRef xExtLst, sal_Int32& rIndex ) : XclExpRecord( EXC_ID_CONDFMT ), @@ -1204,7 +1204,7 @@ void XclExpCondfmt::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_conditionalFormatting ); } -// ---------------------------------------------------------------------------- + XclExpColorScale::XclExpColorScale( const XclExpRoot& rRoot, const ScColorScaleFormat& rFormat, sal_Int32 nPriority ): XclExpRecord(), @@ -1389,7 +1389,7 @@ void XclExpIconSet::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_cfRule ); } -// ---------------------------------------------------------------------------- + XclExpCondFormatBuffer::XclExpCondFormatBuffer( const XclExpRoot& rRoot, XclExtLstRef xExtLst ) : XclExpRoot( rRoot ) @@ -1474,7 +1474,7 @@ const char* lcl_GetOperatorType( sal_uInt32 nFlags ) } // namespace -// ---------------------------------------------------------------------------- + XclExpDV::XclExpDV( const XclExpRoot& rRoot, sal_uLong nScHandle ) : XclExpRecord( EXC_ID_DV ), @@ -1693,7 +1693,7 @@ void XclExpDV::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_dataValidation ); } -// ---------------------------------------------------------------------------- + XclExpDval::XclExpDval( const XclExpRoot& rRoot ) : XclExpRecord( EXC_ID_DVAL, 18 ), @@ -1904,7 +1904,7 @@ void XclExpWebQuery::Save( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpWebQueryBuffer::XclExpWebQueryBuffer( const XclExpRoot& rRoot ) { diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 67ac32542453..24e54b31cdea 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -245,7 +245,7 @@ void XclExpDffAnchorBase::ImplCalcAnchorRect( const Rectangle&, MapUnit ) OSL_FAIL( "XclExpDffAnchorBase::ImplCalcAnchorRect - not implemented" ); } -// ---------------------------------------------------------------------------- + XclExpDffSheetAnchor::XclExpDffSheetAnchor( const XclExpRoot& rRoot ) : XclExpDffAnchorBase( rRoot ), @@ -267,7 +267,7 @@ void XclExpDffSheetAnchor::ImplCalcAnchorRect( const Rectangle& rRect, MapUnit e maAnchor.SetRect( GetRoot(), mnScTab, rRect, eMapUnit ); } -// ---------------------------------------------------------------------------- + XclExpDffEmbeddedAnchor::XclExpDffEmbeddedAnchor( const XclExpRoot& rRoot, const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ) : @@ -288,7 +288,7 @@ void XclExpDffEmbeddedAnchor::ImplCalcAnchorRect( const Rectangle& rRect, MapUni maAnchor.SetRect( maPageSize, mnScaleX, mnScaleY, rRect, eMapUnit, true ); } -// ---------------------------------------------------------------------------- + XclExpDffNoteAnchor::XclExpDffNoteAnchor( const XclExpRoot& rRoot, const Rectangle& rRect ) : XclExpDffAnchorBase( rRoot, EXC_ESC_ANCHOR_SIZELOCKED ) @@ -296,7 +296,7 @@ XclExpDffNoteAnchor::XclExpDffNoteAnchor( const XclExpRoot& rRoot, const Rectang maAnchor.SetRect( rRoot, rRoot.GetCurrScTab(), rRect, MAP_100TH_MM ); } -// ---------------------------------------------------------------------------- + XclExpDffDropDownAnchor::XclExpDffDropDownAnchor( const XclExpRoot& rRoot, const ScAddress& rScPos ) : XclExpDffAnchorBase( rRoot, EXC_ESC_ANCHOR_POSLOCKED ) @@ -323,7 +323,7 @@ void XclExpMsoDrawingBase::WriteBody( XclExpStream& rStrm ) rStrm.CopyFromStream( mrEscherEx.GetStream(), mrEscherEx.GetDffFragmentSize( mnFragmentKey ) ); } -// ---------------------------------------------------------------------------- + XclExpMsoDrawingGroup::XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ) : XclExpMsoDrawingBase( rEscherEx, EXC_ID_MSODRAWINGGROUP ) @@ -355,7 +355,7 @@ XclExpMsoDrawingGroup::XclExpMsoDrawingGroup( XclEscherEx& rEscherEx ) : mrEscherEx.UpdateDffFragmentEnd(); } -// ---------------------------------------------------------------------------- + XclExpMsoDrawing::XclExpMsoDrawing( XclEscherEx& rEscherEx ) : XclExpMsoDrawingBase( rEscherEx, EXC_ID_MSODRAWING ) @@ -504,7 +504,7 @@ void XclExpControlHelper::WriteFormulaSubRec( XclExpStream& rStrm, sal_uInt16 nS rStrm.EndRecord(); } -// ---------------------------------------------------------------------------- + //delete for exporting OCX //#if EXC_EXP_OCX_CTRL @@ -1042,7 +1042,7 @@ void XclExpTbxControlObj::WriteSbs( XclExpStream& rStrm ) //#endif -// ---------------------------------------------------------------------------- + XclExpChartObj::XclExpChartObj( XclExpObjectManager& rObjMgr, Reference< XShape > xShape, const Rectangle* pChildAnchor ) : XclObj( rObjMgr, EXC_OBJTYPE_CHART ), @@ -1637,7 +1637,7 @@ void XclExpObjectManager::InitStream( bool bTempFile ) mxDffStrm->SetNumberFormatInt( NUMBERFORMAT_INT_LITTLEENDIAN ); } -// ---------------------------------------------------------------------------- + XclExpEmbeddedObjectManager::XclExpEmbeddedObjectManager( const XclExpObjectManager& rParent, const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 nScaleY ) : diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 706ea3f7f4d0..a01f3dbfa156 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -63,7 +63,7 @@ struct XclExpScToken inline OpCode GetOpCode() const { return mpScToken ? mpScToken->GetOpCode() : static_cast< OpCode >( ocNone ); } }; -// ---------------------------------------------------------------------------- + /** Effective token class conversion types. */ enum XclExpClassConv @@ -73,7 +73,7 @@ enum XclExpClassConv EXC_CLASSCONV_ARR /// Convert VAL tokens to ARR class (REF remains uncahnged). }; -// ---------------------------------------------------------------------------- + /** Token class conversion and position of a token in the token array. */ struct XclExpTokenConvInfo @@ -103,7 +103,7 @@ void XclExpOperandList::AppendOperand( sal_uInt16 nTokPos, XclFuncParamConv eCon typedef boost::shared_ptr< XclExpOperandList > XclExpOperandListRef; typedef ::std::vector< XclExpOperandListRef > XclExpOperandListVector; -// ---------------------------------------------------------------------------- + /** Encapsulates all data needed for a call to an external function (macro, add-in). */ struct XclExpExtFuncData @@ -123,7 +123,7 @@ void XclExpExtFuncData::Set( const OUString& rFuncName, bool bVBasic, bool bHidd mbHidden = bHidden; } -// ---------------------------------------------------------------------------- + /** Encapsulates all data needed to process an entire function. */ class XclExpFuncData @@ -261,7 +261,7 @@ static const XclExpCompConfig spConfigTable[] = { EXC_FMLATYPE_LISTVAL, EXC_CLASSTYPE_NAME, true, false, false, false } }; -// ---------------------------------------------------------------------------- + /** Working data of the formula compiler. Used to push onto a stack for recursive calls. */ struct XclExpCompData @@ -300,7 +300,7 @@ XclExpCompData::XclExpCompData( const XclExpCompConfig* pCfg ) : } // namespace -// ---------------------------------------------------------------------------- + /** Implementation class of the export formula compiler. */ class XclExpFmlaCompImpl : protected XclExpRoot, protected XclTokenArrayHelper @@ -325,7 +325,7 @@ public: bool IsRef2D( const ScSingleRefData& rRefData, bool bCheck3DFlag ) const; bool IsRef2D( const ScComplexRefData& rRefData, bool bCheck3DFlag ) const; - // ------------------------------------------------------------------------ + private: const XclExpCompConfig* GetConfigForType( XclFormulaType eType ) const; inline sal_uInt16 GetSize() const { return static_cast< sal_uInt16 >( mxData->maTokVec.size() ); } @@ -461,7 +461,7 @@ private: void AppendExt( double fData ); void AppendExt( const OUString& rString ); - // ------------------------------------------------------------------------ + private: typedef ::std::map< XclFormulaType, XclExpCompConfig > XclExpCompConfigMap; typedef boost::shared_ptr< XclExpCompData > XclExpCompDataRef; @@ -480,7 +480,7 @@ private: const sal_uInt32 mnMaxRowMask; /// Mask to delete invalid bits in row fields. }; -// ---------------------------------------------------------------------------- + XclExpFmlaCompImpl::XclExpFmlaCompImpl( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), @@ -2595,7 +2595,7 @@ void lclPutRangeToTokenArray( ScTokenArray& rScTokArr, const ScRange& rScRange, } // namespace -// ---------------------------------------------------------------------------- + XclExpFormulaCompiler::XclExpFormulaCompiler( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index f94e81689ff8..113d98c5c4ea 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -149,7 +149,7 @@ inline void lclFillAddress( XclAddress& rXclPos, SCCOL nScCol, SCROW nScRow ) } // namespace -// ---------------------------------------------------------------------------- + XclExpAddressConverter::XclExpAddressConverter( const XclExpRoot& rRoot ) : XclAddressConverterBase( rRoot.GetTracer(), rRoot.GetXclMaxPos() ) @@ -286,7 +286,7 @@ OUString lclGetUrlRepresentation( const SvxURLField& rUrlField ) } // namespace -// ---------------------------------------------------------------------------- + XclExpHyperlinkHelper::XclExpHyperlinkHelper( const XclExpRoot& rRoot, const ScAddress& rScPos ) : XclExpRoot( rRoot ), @@ -333,7 +333,7 @@ XclExpHyperlinkHelper::XclExpHyperlinkRef XclExpHyperlinkHelper::GetLinkRecord() return XclExpHyperlinkRef(); } -// ---------------------------------------------------------------------------- + namespace { @@ -526,7 +526,7 @@ XclExpStringRef lclCreateFormattedString( } // namespace -// ---------------------------------------------------------------------------- + XclExpStringRef XclExpStringHelper::CreateString( const XclExpRoot& rRoot, const OUString& rString, XclStrFlags nFlags, sal_uInt16 nMaxLen ) @@ -962,7 +962,7 @@ OUString lclEncodeDosUrl( } // namespace -// ---------------------------------------------------------------------------- + OUString XclExpUrlHelper::EncodeUrl( const XclExpRoot& rRoot, const OUString& rAbsUrl, const OUString* pTableName ) { diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 7f451c0d7762..23b59771bb6d 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -68,7 +68,7 @@ private: sal_uInt16 mnFlags; /// Flags for record export. }; -// ---------------------------------------------------------------------------- + /** Represents an EXTERNNAME record for an add-in function name. */ class XclExpExtNameAddIn : public XclExpExtNameBase @@ -81,7 +81,7 @@ private: virtual void WriteAddData( XclExpStream& rStrm ); }; -// ---------------------------------------------------------------------------- + /** Represents an EXTERNNAME record for a DDE link. */ class XclExpExtNameDde : public XclExpExtNameBase @@ -99,7 +99,7 @@ private: XclExpCachedMatRef mxMatrix; /// Cached results of the DDE link. }; -// ---------------------------------------------------------------------------- + class XclExpSupbook; @@ -183,7 +183,7 @@ private: SCROW mnScRow; /// Row index of the external cells. }; -// ---------------------------------------------------------------------------- + /** Represents the record XCT which is the header record of a CRN record list. */ @@ -367,7 +367,7 @@ inline bool operator==( const XclExpXti& rLeft, const XclExpXti& rRight ) (rLeft.mnLastSBTab == rRight.mnLastSBTab); } -// ---------------------------------------------------------------------------- + /** Contains a list of all SUPBOOK records and index arrays of external sheets. */ class XclExpSupbookBuffer : public XclExpRecordBase, protected XclExpRoot @@ -500,7 +500,7 @@ protected: explicit XclExpLinkManagerImpl( const XclExpRoot& rRoot ); }; -// ---------------------------------------------------------------------------- + /** Implementation of the link manager for BIFF5/BIFF7. */ class XclExpLinkManagerImpl5 : public XclExpLinkManagerImpl @@ -570,7 +570,7 @@ private: XclExpCodeMap maCodeMap; /// Maps special external codes to EXTERNSHEET records. }; -// ---------------------------------------------------------------------------- + /** Implementation of the link manager for BIFF8. */ class XclExpLinkManagerImpl8 : public XclExpLinkManagerImpl @@ -636,7 +636,7 @@ const sal_uInt8 EXC_TABBUF_VISIBLE = 0x10; /// Sheet is visible. const sal_uInt8 EXC_TABBUF_SELECTED = 0x20; /// Sheet is selected. const sal_uInt8 EXC_TABBUF_MIRRORED = 0x40; /// Sheet is mirrored (right-to-left). -// ---------------------------------------------------------------------------- + XclExpTabInfo::XclExpTabInfo( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), @@ -896,7 +896,7 @@ void XclExpExtNameBase::WriteAddData( XclExpStream& /*rStrm*/ ) { } -// ---------------------------------------------------------------------------- + XclExpExtNameAddIn::XclExpExtNameAddIn( const XclExpRoot& rRoot, const OUString& rName ) : XclExpExtNameBase( rRoot, rName ) @@ -910,7 +910,7 @@ void XclExpExtNameAddIn::WriteAddData( XclExpStream& rStrm ) rStrm << sal_uInt16( 2 ) << EXC_TOKID_ERR << EXC_ERR_REF; } -// ---------------------------------------------------------------------------- + XclExpExtNameDde::XclExpExtNameDde( const XclExpRoot& rRoot, const OUString& rName, sal_uInt16 nFlags, const ScMatrix* pResults ) : @@ -929,7 +929,7 @@ void XclExpExtNameDde::WriteAddData( XclExpStream& rStrm ) mxMatrix->Save( rStrm ); } -// ---------------------------------------------------------------------------- + XclExpExtName::XclExpExtName( const XclExpRoot& rRoot, const XclExpSupbook& rSupbook, const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) : @@ -1918,7 +1918,7 @@ XclExpLinkManagerImpl::XclExpLinkManagerImpl( const XclExpRoot& rRoot ) : { } -// ---------------------------------------------------------------------------- + XclExpLinkManagerImpl5::XclExpLinkManagerImpl5( const XclExpRoot& rRoot ) : XclExpLinkManagerImpl( rRoot ) @@ -2103,7 +2103,7 @@ XclExpLinkManagerImpl5::XclExpExtSheetRef XclExpLinkManagerImpl5::FindInternal( return xExtSheet; } -// ---------------------------------------------------------------------------- + XclExpLinkManagerImpl8::XclExpLinkManagerImpl8( const XclExpRoot& rRoot ) : XclExpLinkManagerImpl( rRoot ), diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index b645d5851722..3e6734eda5b2 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -109,7 +109,7 @@ private: sal_uInt16 mnXclTab; /// The 1-based Excel sheet index for local names. }; -// ---------------------------------------------------------------------------- + class ScRangeData; class ScDBData; @@ -349,7 +349,7 @@ void XclExpName::WriteBody( XclExpStream& rStrm ) mxTokArr->WriteArray( rStrm ); // token array without size } -// ---------------------------------------------------------------------------- + XclExpNameManagerImpl::XclExpNameManagerImpl( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), @@ -675,7 +675,7 @@ void XclExpNameManagerImpl::CreateUserNames() } } -// ---------------------------------------------------------------------------- + XclExpNameManager::XclExpNameManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index ec4187f4497b..12ff6be5759d 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -411,7 +411,7 @@ void XclExpPageSettings::SaveXml( XclExpXmlStream& rStrm ) XclExpImgData( *pGraphic, EXC_ID8_IMGDATA ).SaveXml( rStrm ); } -// ---------------------------------------------------------------------------- + XclExpChartPageSettings::XclExpChartPageSettings( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index a0a00d600a7b..1993828edff4 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -92,7 +92,7 @@ static const sal_uInt16 spnPCItemFlags[] = } // namespace -// ---------------------------------------------------------------------------- + XclExpPCItem::XclExpPCItem( const OUString& rText ) : XclExpRecord( (!rText.isEmpty()) ? EXC_ID_SXSTRING : EXC_ID_SXEMPTY, 0 ), @@ -133,7 +133,7 @@ XclExpPCItem::XclExpPCItem( bool bValue ) : SetBool( bValue ); } -// ---------------------------------------------------------------------------- + bool XclExpPCItem::EqualsText( const OUString& rText ) const { @@ -155,7 +155,7 @@ bool XclExpPCItem::EqualsBool( bool bValue ) const return GetBool() && (*GetBool() == bValue); } -// ---------------------------------------------------------------------------- + void XclExpPCItem::WriteBody( XclExpStream& rStrm ) { @@ -917,7 +917,7 @@ void XclExpPivotCache::WriteSxindexlistList( XclExpStream& rStrm ) const namespace { -// ---------------------------------------------------------------------------- + /** Returns a display string for a data field containing the field name and aggregation function. */ OUString lclGetDataFieldCaption( const OUString& rFieldName, GeneralFunction eFunc ) @@ -947,7 +947,7 @@ OUString lclGetDataFieldCaption( const OUString& rFieldName, GeneralFunction eFu return( aCaption ); } -// ---------------------------------------------------------------------------- + } // namespace @@ -1836,7 +1836,7 @@ void XclExpPivotRecWrapper::SaveXml( XclExpXmlStream& rStrm ) } // namespace -// ---------------------------------------------------------------------------- + XclExpPivotTableManager::XclExpPivotTableManager( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index a305afcb7b2a..62b475c5ca81 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -36,7 +36,7 @@ void XclExpRecordBase::SaveXml( XclExpXmlStream& /*rStrm*/ ) { } -// ---------------------------------------------------------------------------- + XclExpDelegatingRecord::XclExpDelegatingRecord( XclExpRecordBase* pRecord ) : mpRecord( pRecord ) @@ -55,7 +55,7 @@ void XclExpDelegatingRecord::SaveXml( XclExpXmlStream& rStrm ) mpRecord->SaveXml( rStrm ); } -// ---------------------------------------------------------------------------- + XclExpXmlElementRecord::XclExpXmlElementRecord(sal_Int32 const nElement) : mnElement( nElement ) @@ -66,7 +66,7 @@ XclExpXmlElementRecord::~XclExpXmlElementRecord() { } -// ---------------------------------------------------------------------------- + XclExpXmlStartElementRecord::XclExpXmlStartElementRecord(sal_Int32 const nElement) : XclExpXmlElementRecord(nElement) @@ -85,7 +85,7 @@ void XclExpXmlStartElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStream->startElement( mnElement, FSEND ); } -// ---------------------------------------------------------------------------- + XclExpXmlEndElementRecord::XclExpXmlEndElementRecord( sal_Int32 nElement ) : XclExpXmlElementRecord( nElement ) @@ -101,7 +101,7 @@ void XclExpXmlEndElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->endElement( mnElement ); } -// ---------------------------------------------------------------------------- + XclExpXmlStartSingleElementRecord::XclExpXmlStartSingleElementRecord( sal_Int32 const nElement) @@ -119,7 +119,7 @@ void XclExpXmlStartSingleElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStream->write( "<" )->writeId( mnElement ); } -// ---------------------------------------------------------------------------- + XclExpXmlEndSingleElementRecord::XclExpXmlEndSingleElementRecord() { @@ -134,7 +134,7 @@ void XclExpXmlEndSingleElementRecord::SaveXml( XclExpXmlStream& rStrm ) rStrm.GetCurrentStream()->write( "/>" ); } -// ---------------------------------------------------------------------------- + XclExpRecord::XclExpRecord( sal_uInt16 nRecId, sal_Size nRecSize ) : mnRecSize( nRecSize ), @@ -164,7 +164,7 @@ void XclExpRecord::Save( XclExpStream& rStrm ) rStrm.EndRecord(); } -// ---------------------------------------------------------------------------- + template<> void XclExpValueRecord<double>::SaveXml( XclExpXmlStream& rStrm ) @@ -176,7 +176,7 @@ void XclExpValueRecord<double>::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } -// ---------------------------------------------------------------------------- + void XclExpBoolRecord::WriteBody( XclExpStream& rStrm ) { @@ -194,7 +194,7 @@ void XclExpBoolRecord::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } -// ---------------------------------------------------------------------------- + XclExpDummyRecord::XclExpDummyRecord( sal_uInt16 nRecId, const void* pRecData, sal_Size nRecSize ) : XclExpRecord( nRecId ) diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index a1b4d05fbc70..5708cc337f48 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -63,7 +63,7 @@ XclExpRootData::~XclExpRootData() { } -// ---------------------------------------------------------------------------- + XclExpRoot::XclExpRoot( XclExpRootData& rExpRootData ) : XclRoot( rExpRootData ), diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index 9eec03edc219..80bfeb90d204 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -438,7 +438,7 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const } } -// ---------------------------------------------------------------------------- + bool XclExpString::IsWriteFlags() const { diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index c75322850d47..086577958f66 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -177,7 +177,7 @@ void XclListColor::Merge( const XclListColor& rColor ) AddWeighting( nWeight2 ); } -// ---------------------------------------------------------------------------- + /** Data for each inserted original color, represented by a color ID. */ struct XclColorIdData @@ -224,7 +224,7 @@ typedef ::std::vector< XclNearest > XclNearestVec; } // namespace -// ---------------------------------------------------------------------------- + class XclExpPaletteImpl { @@ -318,7 +318,7 @@ private: sal_uInt32 mnLastIdx; /// Last insertion index for search opt. }; -// ---------------------------------------------------------------------------- + const sal_uInt32 EXC_PAL_INDEXBASE = 0xFFFF0000; const sal_uInt32 EXC_PAL_MAXRAWSIZE = 1024; @@ -762,7 +762,7 @@ sal_Int32 XclExpPaletteImpl::GetNearPaletteColors( return nDist1; } -// ---------------------------------------------------------------------------- + XclExpPalette::XclExpPalette( const XclExpRoot& rRoot ) : XclDefaultPalette( rRoot ), @@ -939,7 +939,7 @@ bool XclExpFontHelper::CheckItems( const XclExpRoot& rRoot, const SfxItemSet& rI return bUsed; } -// ---------------------------------------------------------------------------- + namespace { @@ -962,7 +962,7 @@ sal_uInt32 lclCalcHash( const XclFontData& rFontData ) } // namespace -// ---------------------------------------------------------------------------- + XclExpFont::XclExpFont( const XclExpRoot& rRoot, const XclFontData& rFontData, XclExpColorType eColorType ) : @@ -1022,7 +1022,7 @@ void XclExpFont::WriteBody( XclExpStream& rStrm ) << aFontName; } -// ---------------------------------------------------------------------------- + XclExpBlindFont::XclExpBlindFont( const XclExpRoot& rRoot ) : XclExpFont( rRoot, XclFontData(), EXC_COLOR_CELLTEXT ) @@ -1205,7 +1205,7 @@ struct XclExpNumFmtPred { return rFormat.mnScNumFmt == mnScNumFmt; } }; -// ---------------------------------------------------------------------------- + void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm ) { @@ -1216,7 +1216,7 @@ void XclExpNumFmt::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } -// ---------------------------------------------------------------------------- + XclExpNumFmtBuffer::XclExpNumFmtBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), @@ -1383,7 +1383,7 @@ void XclExpCellProt::SaveXml( XclExpXmlStream& rStrm ) const FSEND ); } -// ---------------------------------------------------------------------------- + bool XclExpCellAlign::FillFromItemSet( const SfxItemSet& rItemSet, bool bForceLineBreak, XclBiff eBiff, bool bStyle ) @@ -1541,7 +1541,7 @@ void XclExpCellAlign::SaveXml( XclExpXmlStream& rStrm ) const FSEND ); } -// ---------------------------------------------------------------------------- + namespace { @@ -1595,7 +1595,7 @@ void lclGetBorderLine( } // namespace -// ---------------------------------------------------------------------------- + XclExpCellBorder::XclExpCellBorder() : mnLeftColorId( XclExpPalette::GetColorIdFromIndex( mnLeftColor ) ), @@ -1772,7 +1772,7 @@ void XclExpCellBorder::SaveXml( XclExpXmlStream& rStrm ) const rStyleSheet->endElement( XML_border ); } -// ---------------------------------------------------------------------------- + XclExpCellArea::XclExpCellArea() : mnForeColorId( XclExpPalette::GetColorIdFromIndex( mnForeColor ) ), @@ -1902,7 +1902,7 @@ void XclExpColor::SaveXml( XclExpXmlStream& rStrm ) const rStyleSheet->endElement( XML_fill ); } -// ---------------------------------------------------------------------------- + XclExpXFId::XclExpXFId() : mnXFId( XclExpXFBuffer::GetDefCellXFId() ), @@ -1921,7 +1921,7 @@ void XclExpXFId::ConvertXFIndex( const XclExpRoot& rRoot ) mnXFIndex = rRoot.GetXFBuffer().GetXFIndex( mnXFId ); } -// ---------------------------------------------------------------------------- + XclExpXF::XclExpXF( const XclExpRoot& rRoot, const ScPatternAttr& rPattern, sal_Int16 nScript, @@ -2137,7 +2137,7 @@ void XclExpXF::SaveXml( XclExpXmlStream& rStrm ) rStyleSheet->endElement( XML_xf ); } -// ---------------------------------------------------------------------------- + XclExpDefaultXF::XclExpDefaultXF( const XclExpRoot& rRoot, bool bCellXF ) : XclExpXF( rRoot, bCellXF ) @@ -2156,7 +2156,7 @@ void XclExpDefaultXF::SetNumFmt( sal_uInt16 nXclNumFmt ) mbFmtUsed = true; } -// ---------------------------------------------------------------------------- + XclExpStyle::XclExpStyle( sal_uInt32 nXFId, const OUString& rStyleName ) : XclExpRecord( EXC_ID_STYLE, 4 ), @@ -2243,7 +2243,7 @@ void XclExpStyle::SaveXml( XclExpXmlStream& rStrm ) // OOXTODO: XML_extLst } -// ---------------------------------------------------------------------------- + namespace { @@ -2260,7 +2260,7 @@ bool lclIsBuiltInStyle( const OUString& rStyleName ) } // namespace -// ---------------------------------------------------------------------------- + XclExpXFBuffer::XclExpBuiltInInfo::XclExpBuiltInInfo() : mnStyleId( EXC_STYLE_USERDEF ), @@ -2270,7 +2270,7 @@ XclExpXFBuffer::XclExpBuiltInInfo::XclExpBuiltInInfo() : { } -// ---------------------------------------------------------------------------- + /** Predicate for search algorithm. */ struct XclExpBorderPred diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 89a778b41229..eaf2586f3d6c 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -130,7 +130,7 @@ void XclExpArray::WriteBody( XclExpStream& rStrm ) rStrm << nFlags << sal_uInt32( 0 ) << *mxTokArr; } -// ---------------------------------------------------------------------------- + XclExpArrayBuffer::XclExpArrayBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) @@ -199,7 +199,7 @@ void XclExpShrfmla::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt8( 0 ) << mnUsedCount << *mxTokArr; } -// ---------------------------------------------------------------------------- + XclExpShrfmlaBuffer::XclExpShrfmlaBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) @@ -439,7 +439,7 @@ void XclExpTableop::WriteBody( XclExpStream& rStrm ) rStrm << mnColInpXclRow << mnColInpXclCol << sal_uInt32( 0 ); } -// ---------------------------------------------------------------------------- + XclExpTableopBuffer::XclExpTableopBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ) @@ -613,7 +613,7 @@ void XclExpSingleCellBase::WriteBody( XclExpStream& rStrm ) WriteContents( rStrm ); } -// ---------------------------------------------------------------------------- + IMPL_FIXEDMEMPOOL_NEWDEL( XclExpNumberCell ) @@ -659,7 +659,7 @@ void XclExpNumberCell::WriteContents( XclExpStream& rStrm ) rStrm << mfValue; } -// ---------------------------------------------------------------------------- + IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell ) @@ -809,7 +809,7 @@ void XclExpLabelCell::WriteContents( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + IMPL_FIXEDMEMPOOL_NEWDEL( XclExpFormulaCell ) @@ -1249,7 +1249,7 @@ void XclExpMultiCellBase::RemoveUnusedXFIndexes( const ScfUInt16Vec& rXFIndexes // The Save() function will skip all XF indexes equal to EXC_XF_NOTFOUND. } -// ---------------------------------------------------------------------------- + IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBlankCell ) @@ -1299,7 +1299,7 @@ void XclExpBlankCell::WriteXmlContents( XclExpXmlStream& rStrm, const XclAddress FSEND ); } -// ---------------------------------------------------------------------------- + IMPL_FIXEDMEMPOOL_NEWDEL( XclExpRkCell ) @@ -1408,7 +1408,7 @@ void XclExpOutlineBuffer::UpdateColRow( SCCOLROW nScPos ) } } -// ---------------------------------------------------------------------------- + XclExpGuts::XclExpGuts( const XclExpRoot& rRoot ) : XclExpRecord( EXC_ID_GUTS, 8 ), @@ -1444,7 +1444,7 @@ void XclExpGuts::WriteBody( XclExpStream& rStrm ) rStrm << mnRowWidth << mnColWidth << mnRowLevels << mnColLevels; } -// ---------------------------------------------------------------------------- + XclExpDimensions::XclExpDimensions( const XclExpRoot& rRoot ) : mnFirstUsedXclRow( 0 ), @@ -1514,7 +1514,7 @@ double lclGetCorrectedColWidth( const XclExpRoot& rRoot, sal_uInt16 nXclColWidth } // namespace -// ---------------------------------------------------------------------------- + XclExpDefcolwidth::XclExpDefcolwidth( const XclExpRoot& rRoot ) : XclExpUInt16Record( EXC_ID_DEFCOLWIDTH, EXC_DEFCOLWIDTH_DEF ), @@ -1535,7 +1535,7 @@ void XclExpDefcolwidth::SetDefWidth( sal_uInt16 nXclColWidth ) SetValue( limit_cast< sal_uInt16 >( fNewColWidth / 256.0 + 0.5 ) ); } -// ---------------------------------------------------------------------------- + XclExpColinfo::XclExpColinfo( const XclExpRoot& rRoot, SCCOL nScCol, SCROW nLastScRow, XclExpColOutlineBuffer& rOutlineBfr ) : @@ -1627,7 +1627,7 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } -// ---------------------------------------------------------------------------- + XclExpColinfoBuffer::XclExpColinfoBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), @@ -1745,7 +1745,7 @@ bool operator<( const XclExpDefaultRowData& rLeft, const XclExpDefaultRowData& r ((rLeft.mnHeight == rRight.mnHeight) && (rLeft.mnFlags < rRight.mnFlags)); } -// ---------------------------------------------------------------------------- + XclExpDefrowheight::XclExpDefrowheight() : XclExpRecord( EXC_ID3_DEFROWHEIGHT, 4 ) @@ -1763,7 +1763,7 @@ void XclExpDefrowheight::WriteBody( XclExpStream& rStrm ) rStrm << maDefData.mnFlags << maDefData.mnHeight; } -// ---------------------------------------------------------------------------- + XclExpRow::XclExpRow( const XclExpRoot& rRoot, sal_uInt32 nXclRow, XclExpRowOutlineBuffer& rOutlineBfr, bool bAlwaysEmpty ) : @@ -2060,7 +2060,7 @@ void XclExpRow::SaveXml( XclExpXmlStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpRowBuffer::XclExpRowBuffer( const XclExpRoot& rRoot ) : XclExpRoot( rRoot ), diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index 1c35f72f952b..ea466796d6bc 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -131,7 +131,7 @@ void XclExpWindow2::WriteBody( XclExpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclExpScl::XclExpScl( sal_uInt16 nZoom ) : XclExpRecord( EXC_ID_SCL, 4 ), @@ -157,7 +157,7 @@ void XclExpScl::WriteBody( XclExpStream& rStrm ) rStrm << mnNum << mnDenom; } -// ---------------------------------------------------------------------------- + XclExpPane::XclExpPane( const XclTabViewData& rData ) : XclExpRecord( EXC_ID_PANE, 10 ), @@ -203,7 +203,7 @@ void XclExpPane::WriteBody( XclExpStream& rStrm ) rStrm << sal_uInt8( 0 ); } -// ---------------------------------------------------------------------------- + XclExpSelection::XclExpSelection( const XclTabViewData& rData, sal_uInt8 nPane ) : XclExpRecord( EXC_ID_SELECTION, 15 ), @@ -246,7 +246,7 @@ void XclExpSelection::WriteBody( XclExpStream& rStrm ) maSelData.maXclSelection.Write( rStrm, false ); } -// ---------------------------------------------------------------------------- + XclExpTabBgColor::XclExpTabBgColor( const XclTabViewData& rTabViewData ) : XclExpRecord( EXC_ID_SHEETEXT, 18 ), @@ -288,7 +288,7 @@ sal_uInt16 lclGetXclZoom( long nScZoom, sal_uInt16 nDefXclZoom ) } // namespace -// ---------------------------------------------------------------------------- + XclExpTabViewSettings::XclExpTabViewSettings( const XclExpRoot& rRoot, SCTAB nScTab ) : XclExpRoot( rRoot ), diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 34c53434a588..314c9259910e 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -207,7 +207,7 @@ struct XclImpChRootData : public XclChRootData inline explicit XclImpChRootData( XclImpChChart& rChartData ) : mrChartData( rChartData ) {} }; -// ---------------------------------------------------------------------------- + XclImpChRoot::XclImpChRoot( const XclImpRoot& rRoot, XclImpChChart& rChartData ) : XclImpRoot( rRoot ), @@ -377,7 +377,7 @@ void XclImpChRoot::ConvertPieRotation( ScfPropertySet& rPropSet, sal_uInt16 nAng rPropSet.SetProperty( EXC_CHPROP_STARTINGANGLE, nApiRot ); } -// ---------------------------------------------------------------------------- + XclImpChGroupBase::~XclImpChGroupBase() { @@ -441,7 +441,7 @@ void XclImpChFramePos::ReadChFramePos( XclImpStream& rStrm ) maData.maRect.mnHeight = rStrm.ReadInt16(); rStrm.Ignore( 2 ); } -// ---------------------------------------------------------------------------- + void XclImpChLineFormat::ReadChLineFormat( XclImpStream& rStrm ) { @@ -473,7 +473,7 @@ void XclImpChLineFormat::Convert( const XclImpChRoot& rRoot, } } -// ---------------------------------------------------------------------------- + void XclImpChAreaFormat::ReadChAreaFormat( XclImpStream& rStrm ) { @@ -508,7 +508,7 @@ void XclImpChAreaFormat::Convert( const XclImpChRoot& rRoot, } } -// ---------------------------------------------------------------------------- + XclImpChEscherFormat::XclImpChEscherFormat( const XclImpRoot& rRoot ) : mnDffFillType( mso_fillSolid ) @@ -548,7 +548,7 @@ void XclImpChEscherFormat::Convert( const XclImpChRoot& rRoot, rRoot.ConvertEscherFormat( rPropSet, maData, bUsePicFmt ? &maPicFmt : 0, mnDffFillType, rFmtInfo.mePropMode ); } -// ---------------------------------------------------------------------------- + XclImpChFrameBase::XclImpChFrameBase( const XclChFormatInfo& rFmtInfo ) { @@ -625,7 +625,7 @@ void XclImpChFrameBase::ConvertFrameBase( const XclImpChRoot& rRoot, ConvertAreaBase( rRoot, rPropSet, eObjType, nFormatIdx, bUsePicFmt ); } -// ---------------------------------------------------------------------------- + XclImpChFrame::XclImpChFrame( const XclImpChRoot& rRoot, XclChObjectType eObjType ) : XclImpChFrameBase( rRoot.GetFormatInfo( eObjType ) ), @@ -723,7 +723,7 @@ Reference< XLabeledDataSequence > lclCreateLabeledDataSequence( } // namespace -// ---------------------------------------------------------------------------- + XclImpChSourceLink::XclImpChSourceLink( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -920,7 +920,7 @@ void XclImpChFontBase::ConvertRotationBase( const XclImpChRoot& rRoot, ScfProper rRoot.GetChartPropSetHelper().WriteRotationProperties( rPropSet, GetRotation(), bSupportsStacked ); } -// ---------------------------------------------------------------------------- + XclImpChFont::XclImpChFont() : mnFontIdx( EXC_FONT_NOTFOUND ) @@ -932,7 +932,7 @@ void XclImpChFont::ReadChFont( XclImpStream& rStrm ) rStrm >> mnFontIdx; } -// ---------------------------------------------------------------------------- + XclImpChText::XclImpChText( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -1306,7 +1306,7 @@ void XclImpChMarkerFormat::ConvertColor( const XclImpChRoot& rRoot, rPropSet.SetColorProperty( EXC_CHPROP_COLOR, aLineColor ); } -// ---------------------------------------------------------------------------- + XclImpChPieFormat::XclImpChPieFormat() : mnPieDist( 0 ) @@ -1324,7 +1324,7 @@ void XclImpChPieFormat::Convert( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_OFFSET, fApiDist ); } -// ---------------------------------------------------------------------------- + XclImpChSeriesFormat::XclImpChSeriesFormat() : mnFlags( 0 ) @@ -1336,7 +1336,7 @@ void XclImpChSeriesFormat::ReadChSeriesFormat( XclImpStream& rStrm ) rStrm >> mnFlags; } -// ---------------------------------------------------------------------------- + void XclImpCh3dDataFormat::ReadCh3dDataFormat( XclImpStream& rStrm ) { @@ -1352,7 +1352,7 @@ void XclImpCh3dDataFormat::Convert( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_GEOMETRY3D, nApiType ); } -// ---------------------------------------------------------------------------- + XclImpChAttachedLabel::XclImpChAttachedLabel( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ), @@ -1379,7 +1379,7 @@ XclImpChTextRef XclImpChAttachedLabel::CreateDataLabel( const XclImpChText* pPar return xLabel; } -// ---------------------------------------------------------------------------- + XclImpChDataFormat::XclImpChDataFormat( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -1593,7 +1593,7 @@ void XclImpChDataFormat::UpdateDataLabel( const XclImpChDataFormat* pParentFmt ) mxLabel = mxAttLabel->CreateDataLabel( pDefText ); } -// ---------------------------------------------------------------------------- + XclImpChSerTrendLine::XclImpChSerTrendLine( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -1681,7 +1681,7 @@ Reference< XRegressionCurve > XclImpChSerTrendLine::CreateRegressionCurve() cons return xRegCurve; } -// ---------------------------------------------------------------------------- + XclImpChSerErrorBar::XclImpChSerErrorBar( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -1782,7 +1782,7 @@ Reference< XPropertySet > XclImpChSerErrorBar::CreateErrorBar( const XclImpChSer return xErrorBar; } -// ---------------------------------------------------------------------------- + XclImpChSeries::XclImpChSeries( const XclImpChRoot& rRoot, sal_uInt16 nSeriesIdx ) : XclImpChRoot( rRoot ), @@ -2399,7 +2399,7 @@ Reference< XChartType > XclImpChType::CreateChartType( Reference< XDiagram > xDi return xChartType; } -// ---------------------------------------------------------------------------- + void XclImpChChart3d::ReadChChart3d( XclImpStream& rStrm ) { @@ -2480,7 +2480,7 @@ void XclImpChChart3d::Convert( ScfPropertySet& rPropSet, bool b3dWallChart ) con rPropSet.SetProperty( EXC_CHPROP_D3DSCENELIGHTDIR2, cssd::Direction3D( 0.2, 0.4, 1.0 ) ); } -// ---------------------------------------------------------------------------- + XclImpChLegend::XclImpChLegend( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -2619,7 +2619,7 @@ Reference< XLegend > XclImpChLegend::CreateLegend() const return xLegend; } -// ---------------------------------------------------------------------------- + XclImpChDropBar::XclImpChDropBar( sal_uInt16 nDropBar ) : mnDropBar( nDropBar ), @@ -2643,7 +2643,7 @@ void XclImpChDropBar::Convert( const XclImpChRoot& rRoot, ScfPropertySet& rPropS ConvertFrameBase( rRoot, rPropSet, eObjType ); } -// ---------------------------------------------------------------------------- + XclImpChTypeGroup::XclImpChTypeGroup( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ), @@ -3058,7 +3058,7 @@ void XclImpChLabelRange::ConvertAxisPosition( ScfPropertySet& rPropSet, bool b3d } } -// ---------------------------------------------------------------------------- + XclImpChValueRange::XclImpChValueRange( const XclImpChRoot& rRoot ) : XclImpChRoot( rRoot ) @@ -3135,7 +3135,7 @@ void XclImpChValueRange::ConvertAxisPosition( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_CROSSOVERVALUE, fCrossingPos ); } -// ---------------------------------------------------------------------------- + namespace { @@ -3215,7 +3215,7 @@ void XclImpChTick::Convert( ScfPropertySet& rPropSet ) const rPropSet.SetProperty( EXC_CHPROP_MARKPOSITION, cssc::ChartAxisMarkPosition_AT_AXIS ); } -// ---------------------------------------------------------------------------- + XclImpChAxis::XclImpChAxis( const XclImpChRoot& rRoot, sal_uInt16 nAxisType ) : XclImpChRoot( rRoot ), @@ -3490,7 +3490,7 @@ void XclImpChAxis::CreateWallFrame() } } -// ---------------------------------------------------------------------------- + XclImpChAxesSet::XclImpChAxesSet( const XclImpChRoot& rRoot, sal_uInt16 nAxesSetId ) : XclImpChRoot( rRoot ) @@ -4190,7 +4190,7 @@ Reference< XDiagram > XclImpChChart::CreateDiagram() const return xDiagram; } -// ---------------------------------------------------------------------------- + XclImpChartDrawing::XclImpChartDrawing( const XclImpRoot& rRoot, bool bOwnTab ) : XclImpDrawing( rRoot, bOwnTab ), // sheet charts may contain OLE objects @@ -4252,7 +4252,7 @@ void XclImpChartDrawing::OnObjectInserted( const XclImpDrawObjBase& ) { } -// ---------------------------------------------------------------------------- + XclImpChart::XclImpChart( const XclImpRoot& rRoot, bool bOwnTab ) : XclImpRoot( rRoot ), diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 552dc2626427..ea32ced60b1f 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -213,7 +213,7 @@ void lclInsertUrl( XclImpRoot& rRoot, const OUString& rUrl, SCCOL nScCol, SCROW } // namespace -// ---------------------------------------------------------------------------- + void XclImpHyperlink::ReadHlink( XclImpStream& rStrm ) { @@ -651,7 +651,7 @@ void XclImpCondFormat::Apply() } } -// ---------------------------------------------------------------------------- + XclImpCondFormatManager::XclImpCondFormatManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) @@ -963,7 +963,7 @@ void XclImpWebQuery::Apply( ScDocument& rDoc, const OUString& rFilterName ) } } -// ---------------------------------------------------------------------------- + XclImpWebQueryBuffer::XclImpWebQueryBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) @@ -1109,7 +1109,7 @@ XclImpDecrypterRef lclReadFilepass8( XclImpStream& rStrm ) } // namespace -// ---------------------------------------------------------------------------- + ErrCode XclImpDecryptHelper::ReadFilepass( XclImpStream& rStrm ) { @@ -1201,7 +1201,7 @@ XclImpSheetProtectBuffer::Sheet::Sheet() : { } -// ---------------------------------------------------------------------------- + XclImpSheetProtectBuffer::Sheet::Sheet(const Sheet& r) : mbProtected(r.mbProtected), diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 63ad0de6446d..10d87b3ebe14 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -961,7 +961,7 @@ void XclImpDrawObjBase::ImplReadObj8( XclImpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + void XclImpDrawObjVector::InsertGrouped( XclImpDrawObjRef xDrawObj ) { @@ -980,7 +980,7 @@ sal_Size XclImpDrawObjVector::GetProgressSize() const return nProgressSize; } -// ---------------------------------------------------------------------------- + XclImpPhObj::XclImpPhObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ) @@ -988,7 +988,7 @@ XclImpPhObj::XclImpPhObj( const XclImpRoot& rRoot ) : SetProcessSdrObj( false ); } -// ---------------------------------------------------------------------------- + XclImpGroupObj::XclImpGroupObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), @@ -1046,7 +1046,7 @@ SdrObject* XclImpGroupObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const R return xSdrObj.release(); } -// ---------------------------------------------------------------------------- + XclImpLineObj::XclImpLineObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), @@ -1175,7 +1175,7 @@ SdrObject* XclImpLineObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re return xSdrObj.release(); } -// ---------------------------------------------------------------------------- + XclImpRectObj::XclImpRectObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), @@ -1223,7 +1223,7 @@ SdrObject* XclImpRectObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re return xSdrObj.release(); } -// ---------------------------------------------------------------------------- + XclImpOvalObj::XclImpOvalObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ) @@ -1238,7 +1238,7 @@ SdrObject* XclImpOvalObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Re return xSdrObj.release(); } -// ---------------------------------------------------------------------------- + XclImpArcObj::XclImpArcObj( const XclImpRoot& rRoot ) : XclImpDrawObjBase( rRoot ), @@ -1310,7 +1310,7 @@ SdrObject* XclImpArcObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const Rec return xSdrObj.release(); } -// ---------------------------------------------------------------------------- + XclImpPolygonObj::XclImpPolygonObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ), @@ -1389,7 +1389,7 @@ SdrObject* XclImpPolygonObj::DoCreateSdrObj( XclImpDffConverter& rDffConv, const return xSdrObj.release(); } -// ---------------------------------------------------------------------------- + void XclImpObjTextData::ReadByteString( XclImpStream& rStrm ) { @@ -1410,7 +1410,7 @@ void XclImpObjTextData::ReadFormats( XclImpStream& rStrm ) rStrm.Ignore( maData.mnFormatSize ); } -// ---------------------------------------------------------------------------- + XclImpTextObj::XclImpTextObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ) @@ -1613,7 +1613,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& XclImpRectObj::DoPreProcessSdrObj( rDffConv, rSdrObj ); } -// ---------------------------------------------------------------------------- + XclImpChartObj::XclImpChartObj( const XclImpRoot& rRoot, bool bOwnTab ) : XclImpRectObj( rRoot ), @@ -1797,7 +1797,7 @@ void XclImpChartObj::FinalizeTabChart() SetAnchor( aAnchor ); } -// ---------------------------------------------------------------------------- + XclImpNoteObj::XclImpNoteObj( const XclImpRoot& rRoot ) : XclImpTextObj( rRoot ), @@ -1833,7 +1833,7 @@ void XclImpNoteObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& } } -// ---------------------------------------------------------------------------- + XclImpControlHelper::XclImpControlHelper( const XclImpRoot& rRoot, XclCtrlBindMode eBindMode ) : mrRoot( rRoot ), @@ -2011,7 +2011,7 @@ void XclImpControlHelper::ReadRangeList( ScRangeList& rScRanges, XclImpStream& r } } -// ---------------------------------------------------------------------------- + XclImpTbxObjBase::XclImpTbxObjBase( const XclImpRoot& rRoot ) : XclImpTextObj( rRoot ), @@ -2107,7 +2107,7 @@ void XclImpTbxObjBase::DoPreProcessSdrObj( XclImpDffConverter& /*rDffConv*/, Sdr ProcessControl( *this ); } -// ---------------------------------------------------------------------------- + XclImpButtonObj::XclImpButtonObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ) @@ -2171,7 +2171,7 @@ XclTbxEventType XclImpButtonObj::DoGetEventType() const return EXC_TBX_EVENT_ACTION; } -// ---------------------------------------------------------------------------- + XclImpCheckBoxObj::XclImpCheckBoxObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), @@ -2260,7 +2260,7 @@ XclTbxEventType XclImpCheckBoxObj::DoGetEventType() const return EXC_TBX_EVENT_ACTION; } -// ---------------------------------------------------------------------------- + XclImpOptionButtonObj::XclImpOptionButtonObj( const XclImpRoot& rRoot ) : XclImpCheckBoxObj( rRoot ), @@ -2351,7 +2351,7 @@ XclTbxEventType XclImpOptionButtonObj::DoGetEventType() const return EXC_TBX_EVENT_ACTION; } -// ---------------------------------------------------------------------------- + XclImpLabelObj::XclImpLabelObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ) @@ -2382,7 +2382,7 @@ XclTbxEventType XclImpLabelObj::DoGetEventType() const return EXC_TBX_EVENT_MOUSE; } -// ---------------------------------------------------------------------------- + XclImpGroupBoxObj::XclImpGroupBoxObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), @@ -2431,7 +2431,7 @@ XclTbxEventType XclImpGroupBoxObj::DoGetEventType() const return EXC_TBX_EVENT_MOUSE; } -// ---------------------------------------------------------------------------- + XclImpDialogObj::XclImpDialogObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ) @@ -2455,7 +2455,7 @@ XclTbxEventType XclImpDialogObj::DoGetEventType() const return EXC_TBX_EVENT_MOUSE; } -// ---------------------------------------------------------------------------- + XclImpEditObj::XclImpEditObj( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), @@ -2529,7 +2529,7 @@ XclTbxEventType XclImpEditObj::DoGetEventType() const return EXC_TBX_EVENT_TEXT; } -// ---------------------------------------------------------------------------- + XclImpTbxObjScrollableBase::XclImpTbxObjScrollableBase( const XclImpRoot& rRoot ) : XclImpTbxObjBase( rRoot ), @@ -2565,7 +2565,7 @@ void XclImpTbxObjScrollableBase::DoReadObj8SubRec( XclImpStream& rStrm, sal_uInt } } -// ---------------------------------------------------------------------------- + XclImpSpinButtonObj::XclImpSpinButtonObj( const XclImpRoot& rRoot ) : XclImpTbxObjScrollableBase( rRoot ) @@ -2604,7 +2604,7 @@ XclTbxEventType XclImpSpinButtonObj::DoGetEventType() const return EXC_TBX_EVENT_VALUE; } -// ---------------------------------------------------------------------------- + XclImpScrollBarObj::XclImpScrollBarObj( const XclImpRoot& rRoot ) : XclImpTbxObjScrollableBase( rRoot ) @@ -2646,7 +2646,7 @@ XclTbxEventType XclImpScrollBarObj::DoGetEventType() const return EXC_TBX_EVENT_VALUE; } -// ---------------------------------------------------------------------------- + XclImpTbxObjListBase::XclImpTbxObjListBase( const XclImpRoot& rRoot ) : XclImpTbxObjScrollableBase( rRoot ), @@ -2678,7 +2678,7 @@ void XclImpTbxObjListBase::SetBoxFormatting( ScfPropertySet& rPropSet ) const GetFontBuffer().WriteDefaultCtrlFontProperties( rPropSet ); } -// ---------------------------------------------------------------------------- + XclImpListBoxObj::XclImpListBoxObj( const XclImpRoot& rRoot ) : XclImpTbxObjListBase( rRoot ) @@ -2765,7 +2765,7 @@ XclTbxEventType XclImpListBoxObj::DoGetEventType() const return EXC_TBX_EVENT_CHANGE; } -// ---------------------------------------------------------------------------- + XclImpDropDownObj::XclImpDropDownObj( const XclImpRoot& rRoot ) : XclImpTbxObjListBase( rRoot ), @@ -2861,7 +2861,7 @@ XclTbxEventType XclImpDropDownObj::DoGetEventType() const return (GetDropDownType() == EXC_OBJ_DROPDOWN_COMBOBOX) ? EXC_TBX_EVENT_TEXT : EXC_TBX_EVENT_CHANGE; } -// ---------------------------------------------------------------------------- + XclImpPictureObj::XclImpPictureObj( const XclImpRoot& rRoot ) : XclImpRectObj( rRoot ), @@ -3235,7 +3235,7 @@ void XclImpSolverContainer::UpdateConnection( sal_uInt32 nDffShapeId, SdrObject* } } -// ---------------------------------------------------------------------------- + XclImpSimpleDffConverter::XclImpSimpleDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) : SvxMSDffManager( rDffStrm, rRoot.GetBasePath(), 0, 0, rRoot.GetDoc().GetDrawLayer(), 1440, COL_DEFAULT, 24, 0 ), @@ -3268,7 +3268,7 @@ XclImpDffConverter::XclImpDffConvData::XclImpDffConvData( mbHasCtrlForm( false ) { } -// ---------------------------------------------------------------------------- + XclImpDffConverter::XclImpDffConverter( const XclImpRoot& rRoot, SvStream& rDffStrm ) : XclImpSimpleDffConverter( rRoot, rDffStrm ), @@ -4100,7 +4100,7 @@ void XclImpDrawing::ReadTxo( XclImpStream& rStrm ) } } -// ---------------------------------------------------------------------------- + XclImpSheetDrawing::XclImpSheetDrawing( const XclImpRoot& rRoot, SCTAB nScTab ) : XclImpDrawing( rRoot, true ), diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index 894aedce8177..867f27de9561 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -38,13 +38,13 @@ public: const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr ); - // ------------------------------------------------------------------------ + private: XclFunctionProvider maFuncProv; /// Excel function data provider. const XclBiff meBiff; /// Cached BIFF version to save GetBiff() calls. }; -// ---------------------------------------------------------------------------- + XclImpFmlaCompImpl::XclImpFmlaCompImpl( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), @@ -89,7 +89,7 @@ const ScTokenArray* XclImpFmlaCompImpl::CreateFormula( return pArray; } -// ---------------------------------------------------------------------------- + XclImpFormulaCompiler::XclImpFormulaCompiler( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), diff --git a/sc/source/filter/excel/xihelper.cxx b/sc/source/filter/excel/xihelper.cxx index d101a9ddf02e..d708f7c4e86b 100644 --- a/sc/source/filter/excel/xihelper.cxx +++ b/sc/source/filter/excel/xihelper.cxx @@ -51,7 +51,7 @@ inline void lclFillAddress( ScAddress& rScPos, sal_uInt16 nXclCol, sal_uInt32 nX } // namespace -// ---------------------------------------------------------------------------- + XclImpAddressConverter::XclImpAddressConverter( const XclImpRoot& rRoot ) : XclAddressConverterBase( rRoot.GetTracer(), rRoot.GetScMaxPos() ) @@ -263,7 +263,7 @@ XclImpHFConverter::XclImpHFPortionInfo::XclImpHFPortionInfo() : maSel.nStartPos = maSel.nEndPos = 0; } -// ---------------------------------------------------------------------------- + XclImpHFConverter::XclImpHFConverter( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index a33da234a82a..4f62ad14c83d 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -157,7 +157,7 @@ inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpXti& rXti ) return rStrm >> rXti.mnSupbook >> rXti.mnSBTabFirst >> rXti.mnSBTabLast; } -// ---------------------------------------------------------------------------- + /** Implementation of the link manager. */ class XclImpLinkManagerImpl : protected XclImpRoot diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 58575e581325..6f8094365dd3 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -267,7 +267,7 @@ void XclImpName::InsertName(const ScTokenArray* pArray) mpScData = pData; // cache for later use } -// ---------------------------------------------------------------------------- + XclImpNameManager::XclImpNameManager( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx index 561121c7e846..086dba9cb61b 100644 --- a/sc/source/filter/excel/xipage.cxx +++ b/sc/source/filter/excel/xipage.cxx @@ -170,7 +170,7 @@ void XclImpPageSettings::SetPaperSize( sal_uInt16 nXclPaperSize, bool bPortrait mbValidPaper = true; } -// ---------------------------------------------------------------------------- + namespace { diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 2ea0ed44d0dc..01a7d545f27b 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -1356,7 +1356,7 @@ void XclImpPivotTable::ReadSxViewEx9( XclImpStream& rStrm ) rStrm >> maPTViewEx9Info; } -// ---------------------------------------------------------------------------- + void XclImpPivotTable::Convert() { @@ -1628,7 +1628,7 @@ void XclImpPivotTableManager::ReadSxViewEx9( XclImpStream& rStrm ) maPTables.back()->ReadSxViewEx9( rStrm ); } -// ---------------------------------------------------------------------------- + void XclImpPivotTableManager::ReadPivotCaches( XclImpStream& rStrm ) { diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index 5e7f6ee8e704..187509b07714 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -52,7 +52,7 @@ XclImpRootData::~XclImpRootData() { } -// ---------------------------------------------------------------------------- + XclImpRoot::XclImpRoot( XclImpRootData& rImpRootData ) : XclRoot( rImpRootData ), diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index bc57e556d623..6bb02077fb17 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -106,7 +106,7 @@ sal_uInt16 XclImpDecrypter::Read( SvStream& rStrm, void* pData, sal_uInt16 nByte return nRet; } -// ---------------------------------------------------------------------------- + XclImpBiff5Decrypter::XclImpBiff5Decrypter( sal_uInt16 nKey, sal_uInt16 nHash ) : mnKey( nKey ), @@ -197,7 +197,7 @@ sal_uInt16 XclImpBiff5Decrypter::OnRead( SvStream& rStrm, sal_uInt8* pnData, sal return nRet; } -// ---------------------------------------------------------------------------- + XclImpBiff8Decrypter::XclImpBiff8Decrypter( sal_uInt8 pnSalt[ 16 ], sal_uInt8 pnVerifier[ 16 ], sal_uInt8 pnVerifierHash[ 16 ] ) : @@ -513,7 +513,7 @@ void XclImpStream::EnableDecryption( bool bEnable ) mbUseDecr = bEnable && HasValidDecrypter(); } -// ---------------------------------------------------------------------------- + void XclImpStream::PushPosition() { @@ -605,7 +605,7 @@ sal_uInt16 XclImpStream::PeekRecId( sal_Size nPos ) return nRecId; } -// ---------------------------------------------------------------------------- + XclImpStream& XclImpStream::operator>>( sal_Int8& rnValue ) { @@ -873,7 +873,7 @@ void XclImpStream::Ignore( sal_Size nBytes ) } } -// ---------------------------------------------------------------------------- + sal_Size XclImpStream::ReadUniStringExtHeader( bool& rb16Bit, bool& rbRich, bool& rbFareast, @@ -896,7 +896,7 @@ sal_Size XclImpStream::ReadUniStringExtHeader( bool& rb16Bit, sal_uInt8 nFlags ) return ReadUniStringExtHeader( rb16Bit, bRich, bFareast, nCrun, nExtInf, nFlags ); } -// ---------------------------------------------------------------------------- + OUString XclImpStream::ReadRawUniString( sal_uInt16 nChars, bool b16Bit ) { @@ -1009,7 +1009,7 @@ void XclImpStream::IgnoreUniString( sal_uInt16 nChars ) IgnoreUniString( nChars, ReaduInt8() ); } -// ---------------------------------------------------------------------------- + OUString XclImpStream::ReadRawByteString( sal_uInt16 nChars ) { diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx index d44057514670..e25838cfc86d 100644 --- a/sc/source/filter/excel/xistring.cxx +++ b/sc/source/filter/excel/xistring.cxx @@ -27,7 +27,7 @@ /** All allowed flags for import. */ const XclStrFlags nAllowedFlags = EXC_STR_8BITLENGTH | EXC_STR_SMARTFLAGS | EXC_STR_SEPARATEFORMATS; -// ---------------------------------------------------------------------------- + XclImpString::XclImpString() { diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index c569ce83f05a..324f33e80f93 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -482,7 +482,7 @@ void XclImpFont::GuessScriptType() } } -// ---------------------------------------------------------------------------- + XclImpFontBuffer::XclImpFontBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), @@ -719,7 +719,7 @@ void XclImpCellProt::FillToItemSet( SfxItemSet& rItemSet, bool bSkipPoolDefs ) c } -// ---------------------------------------------------------------------------- + void XclImpCellAlign::FillFromXF2( sal_uInt8 nFlags ) { @@ -794,7 +794,7 @@ void XclImpCellAlign::FillToItemSet( SfxItemSet& rItemSet, const XclImpFont* pFo ScfTools::PutItem( rItemSet, SvxFrameDirectionItem( GetScFrameDir(), ATTR_WRITINGDIR ), bSkipPoolDefs ); } -// ---------------------------------------------------------------------------- + XclImpCellBorder::XclImpCellBorder() { @@ -960,7 +960,7 @@ void XclImpCellBorder::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& } } -// ---------------------------------------------------------------------------- + XclImpCellArea::XclImpCellArea() { @@ -1048,7 +1048,7 @@ void XclImpCellArea::FillToItemSet( SfxItemSet& rItemSet, const XclImpPalette& r } -// ---------------------------------------------------------------------------- + XclImpXF::XclImpXF( const XclImpRoot& rRoot ) : XclXFBase( true ), // default is cell XF @@ -1401,7 +1401,7 @@ void XclImpXF::SetUsedFlags( sal_uInt8 nUsedFlags ) mbAreaUsed = (mbCellXF == ::get_flag( nUsedFlags, EXC_XF_DIFF_AREA )); } -// ---------------------------------------------------------------------------- + XclImpStyle::XclImpStyle( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ), @@ -1495,7 +1495,7 @@ void XclImpStyle::CreateUserStyle( const OUString& rFinalName ) CreateStyleSheet(); } -// ---------------------------------------------------------------------------- + XclImpXFBuffer::XclImpXFBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) @@ -1660,7 +1660,7 @@ bool XclImpXFRange::Expand( const XclImpXFRange& rNextRange ) return false; } -// ---------------------------------------------------------------------------- + void XclImpXFRangeColumn::SetDefaultXF( const XclImpXFIndex& rXFIndex ) { @@ -1672,7 +1672,7 @@ void XclImpXFRangeColumn::SetDefaultXF( const XclImpXFIndex& rXFIndex ) maIndexList.push_back( new XclImpXFRange( 0, MAXROW, rXFIndex ) ); } -// ---------------------------------------------------------------------------- + void XclImpXFRangeColumn::SetXF( SCROW nScRow, const XclImpXFIndex& rXFIndex ) { @@ -1824,7 +1824,7 @@ void XclImpXFRangeColumn::TryConcatPrev( sal_uLong nIndex ) maIndexList.erase( maIndexList.begin() + nIndex ); } -// ---------------------------------------------------------------------------- + XclImpXFRangeBuffer::XclImpXFRangeBuffer( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx index 57f028e4bc5e..282c0d9d10e7 100644 --- a/sc/source/filter/excel/xiview.cxx +++ b/sc/source/filter/excel/xiview.cxx @@ -83,7 +83,7 @@ long lclGetScZoom( sal_uInt16 nXclZoom, sal_uInt16 nDefZoom ) } // namespace -// ---------------------------------------------------------------------------- + XclImpTabViewSettings::XclImpTabViewSettings( const XclImpRoot& rRoot ) : XclImpRoot( rRoot ) diff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx index ffc06a095c42..19e32972a97b 100644 --- a/sc/source/filter/excel/xladdress.cxx +++ b/sc/source/filter/excel/xladdress.cxx @@ -42,7 +42,7 @@ void XclAddress::Write( XclExpStream& rStrm, bool bCol16Bit ) const rStrm << static_cast< sal_uInt8 >( mnCol ); } -// ---------------------------------------------------------------------------- + bool XclRange::Contains( const XclAddress& rPos ) const { @@ -73,7 +73,7 @@ void XclRange::Write( XclExpStream& rStrm, bool bCol16Bit ) const rStrm << static_cast< sal_uInt8 >( maFirst.mnCol ) << static_cast< sal_uInt8 >( maLast.mnCol ); } -// ---------------------------------------------------------------------------- + XclRange XclRangeList::GetEnclosingRange() const { diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index 0f238a7cf873..dbfedce07f6f 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -71,7 +71,7 @@ XclChRectangle::XclChRectangle() : { } -// ---------------------------------------------------------------------------- + XclChDataPointPos::XclChDataPointPos( sal_uInt16 nSeriesIdx, sal_uInt16 nPointIdx ) : mnSeriesIdx( nSeriesIdx ), @@ -85,7 +85,7 @@ bool operator<( const XclChDataPointPos& rL, const XclChDataPointPos& rR ) ((rL.mnSeriesIdx == rR.mnSeriesIdx) && (rL.mnPointIdx < rR.mnPointIdx)); } -// ---------------------------------------------------------------------------- + XclChFrBlock::XclChFrBlock( sal_uInt16 nType ) : mnType( nType ), @@ -103,7 +103,7 @@ XclChFramePos::XclChFramePos() : { } -// ---------------------------------------------------------------------------- + XclChLineFormat::XclChLineFormat() : maColor( COL_BLACK ), @@ -113,7 +113,7 @@ XclChLineFormat::XclChLineFormat() : { } -// ---------------------------------------------------------------------------- + XclChAreaFormat::XclChAreaFormat() : maPattColor( COL_WHITE ), @@ -123,7 +123,7 @@ XclChAreaFormat::XclChAreaFormat() : { } -// ---------------------------------------------------------------------------- + XclChEscherFormat::XclChEscherFormat() { @@ -133,7 +133,7 @@ XclChEscherFormat::~XclChEscherFormat() { } -// ---------------------------------------------------------------------------- + XclChPicFormat::XclChPicFormat() : mnBmpMode( EXC_CHPICFORMAT_NONE ), @@ -142,7 +142,7 @@ XclChPicFormat::XclChPicFormat() : { } -// ---------------------------------------------------------------------------- + XclChFrame::XclChFrame() : mnFormat( EXC_CHFRAME_STANDARD ), @@ -167,14 +167,14 @@ XclChObjectLink::XclChObjectLink() : { } -// ---------------------------------------------------------------------------- + XclChFrLabelProps::XclChFrLabelProps() : mnFlags( 0 ) { } -// ---------------------------------------------------------------------------- + XclChText::XclChText() : maTextColor( COL_BLACK ), @@ -198,7 +198,7 @@ XclChMarkerFormat::XclChMarkerFormat() : { }; -// ---------------------------------------------------------------------------- + XclCh3dDataFormat::XclCh3dDataFormat() : mnBase( EXC_CH3DDATAFORMAT_RECT ), @@ -206,7 +206,7 @@ XclCh3dDataFormat::XclCh3dDataFormat() : { } -// ---------------------------------------------------------------------------- + XclChDataFormat::XclChDataFormat() : mnFormatIdx( EXC_CHDATAFORMAT_DEFAULT ), @@ -214,7 +214,7 @@ XclChDataFormat::XclChDataFormat() : { } -// ---------------------------------------------------------------------------- + XclChSerTrendLine::XclChSerTrendLine() : mfForecastFor( 0.0 ), @@ -231,7 +231,7 @@ XclChSerTrendLine::XclChSerTrendLine() : pDouble->w32_parts.msw = pDouble->w32_parts.lsw = 0xFFFFFFFF; } -// ---------------------------------------------------------------------------- + XclChSerErrorBar::XclChSerErrorBar() : mfValue( 0.0 ), @@ -242,7 +242,7 @@ XclChSerErrorBar::XclChSerErrorBar() : { } -// ---------------------------------------------------------------------------- + XclChSeries::XclChSeries() : mnCategType( EXC_CHSERIES_NUMERIC ), @@ -267,7 +267,7 @@ XclChType::XclChType() : { } -// ---------------------------------------------------------------------------- + XclChChart3d::XclChChart3d() : mnRotation( 20 ), @@ -280,7 +280,7 @@ XclChChart3d::XclChChart3d() : { } -// ---------------------------------------------------------------------------- + XclChLegend::XclChLegend() : mnDockMode( EXC_CHLEGEND_RIGHT ), @@ -290,7 +290,7 @@ XclChLegend::XclChLegend() : { } -// ---------------------------------------------------------------------------- + XclChTypeGroup::XclChTypeGroup() : mnFlags( 0 ), @@ -298,7 +298,7 @@ XclChTypeGroup::XclChTypeGroup() : { } -// ---------------------------------------------------------------------------- + XclChProperties::XclChProperties() : mnFlags( 0 ), @@ -316,7 +316,7 @@ XclChLabelRange::XclChLabelRange() : { } -// ---------------------------------------------------------------------------- + XclChDateRange::XclChDateRange() : mnMinDate( 0 ), @@ -334,7 +334,7 @@ XclChDateRange::XclChDateRange() : { } -// ---------------------------------------------------------------------------- + XclChValueRange::XclChValueRange() : mfMin( 0.0 ), @@ -348,7 +348,7 @@ XclChValueRange::XclChValueRange() : { } -// ---------------------------------------------------------------------------- + XclChTick::XclChTick() : maTextColor( COL_BLACK ), @@ -361,7 +361,7 @@ XclChTick::XclChTick() : { } -// ---------------------------------------------------------------------------- + XclChAxis::XclChAxis() : mnType( EXC_CHAXIS_NONE ) @@ -380,7 +380,7 @@ sal_Int32 XclChAxis::GetApiAxisDimension() const return nApiAxisDim; } -// ---------------------------------------------------------------------------- + XclChAxesSet::XclChAxesSet() : mnAxesSetId( EXC_CHAXESSET_PRIMARY ) @@ -492,7 +492,7 @@ static const XclChFormatInfo spFmtInfos[] = } -// ---------------------------------------------------------------------------- + XclChFormatInfoProvider::XclChFormatInfoProvider() { @@ -561,7 +561,7 @@ void XclChExtTypeInfo::Set( const XclChTypeInfo& rTypeInfo, bool b3dChart, bool mbSpline = bSpline; } -// ---------------------------------------------------------------------------- + XclChTypeInfoProvider::XclChTypeInfoProvider() { @@ -694,7 +694,7 @@ const sal_Char* const sppcBitmapNames[] = { "FillStyle", "FillBitmapName", "Fill } // namespace -// ---------------------------------------------------------------------------- + XclChPropSetHelper::XclChPropSetHelper() : maLineHlpCommon( sppcLineNamesCommon ), @@ -1273,7 +1273,7 @@ EXC_DEFINEFUNC_GETAXISTITLESHAPE( lclGetSecYAxisTitleShape, XSecondAxisTitleSupp } // namespace -// ---------------------------------------------------------------------------- + XclChRootData::XclChRootData() : mxTypeInfoProv( new XclChTypeInfoProvider ), diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index 56fbb5587169..ce0ec44064ae 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -134,7 +134,7 @@ sal_uInt16 lclGetEmbeddedScale( long nPageSize, sal_Int32 nPageScale, long nPos, } // namespace -// ---------------------------------------------------------------------------- + XclObjAnchor::XclObjAnchor() : mnLX( 0 ), @@ -206,7 +206,7 @@ void XclObjAnchor::SetRect( const Size& rPageSize, sal_Int32 nScaleX, sal_Int32 Set( 0, 0, 0, 0 ); } -// ---------------------------------------------------------------------------- + XclObjLineData::XclObjLineData() : mnColorIdx( EXC_OBJ_LINE_AUTOCOLOR ), @@ -225,7 +225,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclObjLineData& rLineData ) >> rLineData.mnAuto; } -// ---------------------------------------------------------------------------- + XclObjFillData::XclObjFillData() : mnBackColorIdx( EXC_OBJ_LINE_AUTOCOLOR ), @@ -244,7 +244,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclObjFillData& rFillData ) >> rFillData.mnAuto; } -// ---------------------------------------------------------------------------- + XclObjTextData::XclObjTextData() : mnTextLen( 0 ), diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 4895721f96f7..967c96b83dbf 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -582,7 +582,7 @@ static const XclFunctionInfo saFuncTable_OOoLO[] = #undef EXC_FUNCENTRY_OOO -// ---------------------------------------------------------------------------- + XclFunctionProvider::XclFunctionProvider( const XclRoot& rRoot ) { @@ -747,7 +747,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclTokenArrayRef& rxTokArr return rStrm; } -// ---------------------------------------------------------------------------- + XclTokenArrayIterator::XclTokenArrayIterator() : mppScTokenBeg( 0 ), diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 29d78d8ff5cb..82935f4c2804 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -109,7 +109,7 @@ void XclPCItem::SetBool( bool bValue ) mbValue = bValue; } -// ---------------------------------------------------------------------------- + bool XclPCItem::IsEqual( const XclPCItem& rItem ) const { @@ -413,7 +413,7 @@ XclExpStream& operator<<( XclExpStream& rStrm, const XclPTCachedName& rCachedNam return rStrm; } -// ---------------------------------------------------------------------------- + const OUString* XclPTVisNameInfo::GetVisName() const { diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index 18668912eba1..0b363995463e 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -75,7 +75,7 @@ XclDebugObjCounter::~XclDebugObjCounter() } #endif -// ---------------------------------------------------------------------------- + XclRootData::XclRootData( XclBiff eBiff, SfxMedium& rMedium, SotStorageRef xRootStrg, ScDocument& rDoc, rtl_TextEncoding eTextEnc, bool bExport ) : @@ -160,7 +160,7 @@ XclRootData::~XclRootData() { } -// ---------------------------------------------------------------------------- + XclRoot::XclRoot( XclRootData& rRootData ) : mrData( rRootData ) diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index 8439347af6d7..e3657b7c060b 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -85,7 +85,7 @@ static const ColorData spnDefColorTable8[] = #undef EXC_PALETTE_EGA_COLORS_LIGHT #undef EXC_PALETTE_EGA_COLORS_DARK -// ---------------------------------------------------------------------------- + XclDefaultPalette::XclDefaultPalette( const XclRoot& rRoot ) : mpnColorTable( 0 ), @@ -169,7 +169,7 @@ namespace AwtFontFamily = Awt::FontFamily; namespace AwtFontUnderline = Awt::FontUnderline; namespace AwtFontStrikeout = Awt::FontStrikeout; -// ---------------------------------------------------------------------------- + XclFontData::XclFontData() { @@ -517,7 +517,7 @@ void XclFontData::SetApiStrikeout( sal_Int16 nApiStrikeout ) (nApiStrikeout != AwtFontStrikeout::DONTKNOW); } -// ---------------------------------------------------------------------------- + bool operator==( const XclFontData& rLeft, const XclFontData& rRight ) { @@ -536,7 +536,7 @@ bool operator==( const XclFontData& rLeft, const XclFontData& rRight ) (rLeft.maName == rRight.maName); } -// ---------------------------------------------------------------------------- + namespace { @@ -614,7 +614,7 @@ void lclWriteChartFont( ScfPropertySet& rPropSet, } // namespace -// ---------------------------------------------------------------------------- + XclFontPropSetHelper::XclFontPropSetHelper() : maHlpChCommon( sppcPropNamesChCommon ), @@ -766,7 +766,7 @@ ScfPropSetHelper& XclFontPropSetHelper::GetChartHelper( sal_Int16 nScript ) namespace { -// ---------------------------------------------------------------------------- + /** Special number format index describing a reused format. */ const NfIndexTableOffset PRV_NF_INDEX_REUSE = NF_INDEX_TABLE_ENTRIES; @@ -778,7 +778,7 @@ const LanguageType PRV_LANGUAGE_FRENCH_PRIM = LANGUAGE_FRENCH & LANGUAGE_MASK_PR /** Parent language identifier for Asian languages. */ const LanguageType PRV_LANGUAGE_ASIAN_PRIM = LANGUAGE_CHINESE & LANGUAGE_MASK_PRIMARY; -// ---------------------------------------------------------------------------- + /** Stores the number format used in Calc for an Excel built-in number format. */ struct XclBuiltInFormat @@ -789,7 +789,7 @@ struct XclBuiltInFormat sal_uInt16 mnXclReuseFmt; /// Use this Excel format, if meOffset==PRV_NF_INDEX_REUSE. }; -// ---------------------------------------------------------------------------- + /** Defines a literal Excel built-in number format. */ #define EXC_NUMFMT_STRING( nXclNumFmt, pcUtf8 ) \ @@ -807,7 +807,7 @@ struct XclBuiltInFormat #define EXC_NUMFMT_ENDTABLE() \ { EXC_FORMAT_NOTFOUND, 0, NF_NUMBER_STANDARD, 0 } -// ---------------------------------------------------------------------------- + // Currency unit characters #define UTF8_BAHT "\340\270\277" @@ -837,7 +837,7 @@ struct XclBuiltInFormat #define UTF8_KO_MIN "\353\266\204" #define UTF8_KO_SEC "\354\264\210" -// ---------------------------------------------------------------------------- + /** Default number format table. Last parent of all other tables, used for unknown languages. */ static const XclBuiltInFormat spBuiltInFormats_DONTKNOW[] = @@ -1410,14 +1410,14 @@ static const XclBuiltInFormat spBuiltInFormats_THAI[] = EXC_NUMFMT_ENDTABLE() }; -// ---------------------------------------------------------------------------- + #undef EXC_NUMFMT_ENDTABLE #undef EXC_NUMFMT_REUSE #undef EXC_NUMFMT_OFFSET #undef EXC_NUMFMT_STRING -// ---------------------------------------------------------------------------- + /** Specifies a number format table for a specific language. */ struct XclBuiltInFormatTable @@ -1471,7 +1471,7 @@ static const XclBuiltInFormatTable spBuiltInFormatTables[] = { LANGUAGE_THAI, LANGUAGE_DONTKNOW, spBuiltInFormats_THAI } }; -// ---------------------------------------------------------------------------- + } // namespace @@ -1570,7 +1570,7 @@ bool operator==( const XclCellProt& rLeft, const XclCellProt& rRight ) return (rLeft.mbLocked == rRight.mbLocked) && (rLeft.mbHidden == rRight.mbHidden); } -// ---------------------------------------------------------------------------- + XclCellAlign::XclCellAlign() : mnHorAlign( EXC_XF_HOR_GENERAL ), @@ -1689,7 +1689,7 @@ bool operator==( const XclCellAlign& rLeft, const XclCellAlign& rRight ) (rLeft.mbLineBreak == rRight.mbLineBreak) && (rLeft.mbShrink == rRight.mbShrink); } -// ---------------------------------------------------------------------------- + XclCellBorder::XclCellBorder() : mnLeftColor( 0 ), @@ -1718,7 +1718,7 @@ bool operator==( const XclCellBorder& rLeft, const XclCellBorder& rRight ) (rLeft.mbDiagTLtoBR == rRight.mbDiagTLtoBR) && (rLeft.mbDiagBLtoTR == rRight.mbDiagBLtoTR); } -// ---------------------------------------------------------------------------- + XclCellArea::XclCellArea() : mnForeColor( EXC_COLOR_WINDOWTEXT ), @@ -1739,7 +1739,7 @@ bool operator==( const XclCellArea& rLeft, const XclCellArea& rRight ) (rLeft.mnPattern == rRight.mnPattern); } -// ---------------------------------------------------------------------------- + XclXFBase::XclXFBase( bool bCellXF ) : mnParent( bCellXF ? EXC_XF_DEFAULTSTYLE : EXC_XF_STYLEPARENT ), diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx index a69c766928e5..6cb3c3e697f5 100644 --- a/sc/source/filter/excel/xlview.cxx +++ b/sc/source/filter/excel/xlview.cxx @@ -35,7 +35,7 @@ XclDocViewData::XclDocViewData() : { } -// ---------------------------------------------------------------------------- + XclTabViewData::XclTabViewData() : maFirstXclPos( ScAddress::UNINITIALIZED ), diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index f9e4af0e1c83..01faa7c2dd8c 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -349,7 +349,7 @@ void ScHTMLExport::WriteHeader() sIndent, eDestEnc, &aNonConvertibleChars ); OUT_LF(); - //---------------------------------------------------------- + if (!xDocProps->getPrintedBy().isEmpty()) { OUT_COMMENT( GLOBSTR( STR_DOC_INFO ) ); @@ -358,7 +358,7 @@ void ScHTMLExport::WriteHeader() xDocProps->getPrintDate(), *ScGlobal::pLocaleData ); OUT_COMMENT( aStrOut ); } - //---------------------------------------------------------- + } OUT_LF(); @@ -762,7 +762,7 @@ void ScHTMLExport::WriteTables() } } - // ------------------- + // <TBODY> // Re-enable only when THEAD and TFOOT are exported // IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tbody ); diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index 93c6e1e43c02..d0e69151c9f3 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.cxx @@ -40,7 +40,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index 99544ba02368..496f57ba17b8 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.cxx @@ -43,7 +43,7 @@ #include "tokenarray.hxx" -//------------------------------------------------------------------------ + FltError ScFormatFilterPluginImpl::ScImportHTML( SvStream &rStream, const OUString& rBaseURL, ScDocument *pDoc, ScRange& rRange, double nOutputFactor, bool bCalcWidthHeight, SvNumberFormatter* pFormatter, diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index 2a9fceafe010..d50f35dba36b 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.cxx @@ -1878,7 +1878,7 @@ private: { if( pTable ) mpCurrTable = pTable; } }; -// ---------------------------------------------------------------------------- + ScHTMLTableMap::ScHTMLTableMap( ScHTMLTable& rParentTable ) : mrParentTable(rParentTable), @@ -1919,7 +1919,7 @@ ScHTMLTable* ScHTMLTableMap::CreateTable( const ImportInfo& rInfo, bool bPreForm return pTable; } -// ---------------------------------------------------------------------------- + /** Simplified forward iterator for convenience. @@ -1964,7 +1964,7 @@ ScHTMLTableAutoId::ScHTMLTableAutoId( ScHTMLTableId& rnUnusedId ) : ++mrnUnusedId; } -// ---------------------------------------------------------------------------- + ScHTMLTable::ScHTMLTable( ScHTMLTable& rParentTable, const ImportInfo& rInfo, bool bPreFormText ) : mpParentTable( &rParentTable ), @@ -2423,7 +2423,7 @@ SvNumberFormatter* ScHTMLTable::GetFormatTable() return mpParser->GetDoc().GetFormatTable(); } -// ---------------------------------------------------------------------------- + bool ScHTMLTable::IsEmptyCell() const { @@ -2715,7 +2715,7 @@ void ScHTMLTable::CalcNeededDocSize( SetDocSize( eOrient, nCellPos, nRealDocSize ); } -// ---------------------------------------------------------------------------- + void ScHTMLTable::FillEmptyCells() { @@ -3279,7 +3279,7 @@ void ScHTMLQueryParser::ParseStyle(const OUString&) {} #endif -// ---------------------------------------------------------------------------- + IMPL_LINK( ScHTMLQueryParser, HTMLImportHdl, const ImportInfo*, pInfo ) { diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index 4892489e1541..dc0dcbaadc46 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.cxx @@ -84,7 +84,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri for( nLauf = 0 ; nLauf < nAnz ; nLauf++ ) aStack >> eParam[ nLauf ]; - // Spezialfaelle... + // special cases... switch( eOc ) { case ocIndex: @@ -118,7 +118,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri case ocFind: case ocHLookup: case ocVLookup: - {// letzten Parameter ++ + {// last parameter ++ IncToken( eParam[ 0 ] ); } break; @@ -131,20 +131,18 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri break; case ocZins: { - // neue Anzahl = 4! + // new quantity = 4! OSL_ENSURE( nAnz == 3, "*LotusToSc::DoFunc(): ZINS() hat 3 Parameter!" ); nAnz = 4; eParam[ 3 ] = eParam[ 0 ]; // 3. -> 1. eParam[ 0 ] = eParam[ 2 ]; // 1. -> 4. NegToken( eParam[ 1 ] ); // 2. -> -2. (+ 2. -> 3.) - eParam[ 2 ] = n0Token; // -> 2. als Default + eParam[ 2 ] = n0Token; // -> 2. as Default } break; default:; } - // ................ - if( !bAddIn ) aPool << eOc; @@ -153,7 +151,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri if( nAnz > 0 ) { - // ACHTUNG: 0 ist der letzte Parameter, nAnz-1 der erste + // ATTENTION: 0 is the last parameter, nAnz-1 the first one sal_Int16 nLast = nAnz - 1; @@ -198,8 +196,6 @@ void LotusToSc::DoFunc( DefTokenId eOc, sal_uInt8 nAnz, const sal_Char* pExtStri aPool << ocClose; - // ................ - aPool >> aStack; if( bNeg ) @@ -522,7 +518,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, sal_Int32& rRest, break; case FT_NOP: break; - // ------------------------------------------ fuer > WK3 - + // for > WK3 case FT_Cref: Read( nRelBits ); ReadSRD( rR, nRelBits ); @@ -688,7 +684,7 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex ) FT_FuncFix1, // 39 Sinus FT_FuncFix1, // 40 Cosinus FT_FuncFix1, // 41 Tangens - FT_FuncFix2, // 42 Arcus-Tangens 2 (4.Quadrant) <----- richtig? - + FT_FuncFix2, // 42 Arcus-Tangens 2 (4.Quadrant) <- correct? FT_FuncFix1, // 43 Arcus-Tangens (2.Quadrant) FT_FuncFix1, // 44 Arcus-Sinus FT_FuncFix1, // 45 Arcus-Cosinus @@ -744,7 +740,7 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex ) FT_FuncFix3, // 95 ? FT_FuncFix3, // 96 ? FT_FuncFix3, // 97 ? - FT_FuncFix3, // 98 Index() <- richtig? - + FT_FuncFix3, // 98 Index() <- correct? FT_FuncFix1, // 99 Cols() FT_FuncFix1, // 100 Rows() FT_FuncFix2, // 101 Repeat() @@ -758,7 +754,7 @@ FUNC_TYPE LotusToSc::IndexToType( sal_uInt8 nIndex ) FT_FuncFix1, // 109 Trim() FT_FuncFix1, // 110 Clean() FT_FuncFix1, // 111 F() - FT_FuncFix1, // 112 Wert() (oder W()?) + FT_FuncFix1, // 112 Wert() (or W()?) FT_FuncFix2, // 113 Exact() FT_NotImpl, // 114 Call() FT_FuncFix1, // 115 @@() @@ -1203,16 +1199,16 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex ) FT_Op, // 23 Groesser-gleich FT_Op, // 24 Kleiner FT_Op, // 25 Groesser - FT_Op, // 26 And (logisch) - FT_Op, // 27 Or (logisch) - FT_FuncFix1, // 28 Not (logisch) - FT_NOP, // 29 unaeres Plus + FT_Op, // 26 And (logical) + FT_Op, // 27 Or (logical) + FT_FuncFix1, // 28 Not (logical) + FT_NOP, // 29 unary plus FT_Op, // 30 Concatenation FT_FuncFix0, // 31 Not applicable FT_FuncFix0, // 32 Error - FT_FuncFix1, // 33 Betrag ABS() - FT_FuncFix1, // 34 Ganzzahl INT() - FT_FuncFix1, // 35 Quadratwurzel + FT_FuncFix1, // 33 Absolute value ABS() + FT_FuncFix1, // 34 Integer INT() + FT_FuncFix1, // 35 Square root FT_FuncFix1, // 36 Zehnerlogarithmus FT_FuncFix1, // 37 Natuerlicher Logarithmus FT_FuncFix0, // 38 PI @@ -1225,7 +1221,7 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex ) FT_FuncFix1, // 45 Arcus-Cosinus FT_FuncFix1, // 46 Exponentialfunktion FT_FuncFix2, // 47 Modulo - FT_FuncVar, // 48 Auswahl + FT_FuncVar, // 48 Selection FT_FuncFix1, // 49 Is not applicable? FT_FuncFix1, // 50 Is Error? FT_FuncFix0, // 51 FALSE @@ -1268,81 +1264,81 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex ) FT_FuncVar, // 88 Std() FT_FuncFix2, // 89 Irr() FT_FuncFix3, // 90 Hlookup() - FT_FuncVar, // 91 Dsum <-------- neu! - - FT_FuncVar, // 92 Davg <-------- neu! - - FT_FuncVar, // 93 Dcnt <-------- neu! - - FT_FuncVar, // 94 Dmin <-------- neu! - - FT_FuncVar, // 95 Dmax <-------- neu! - - FT_FuncVar, // 96 Dvar <-------- neu! - - FT_FuncVar, // 97 Dstd <-------- neu! - - FT_FuncVar, // 98 Index() <-------- change! - - FT_FuncFix1, // 99 Cols() <-------- neu! - - FT_FuncFix1, // 100 Rows() <-------- neu! - - FT_FuncFix2, // 101 Repeat() <-------- neu! - - FT_FuncFix1, // 102 Upper() <-------- neu! - - FT_FuncFix1, // 103 Lower() <-------- neu! - - FT_FuncFix2, // 104 Left() <-------- neu! - - FT_FuncFix2, // 105 Right() <-------- neu! - - FT_FuncFix4, // 106 Replace() <-------- neu! - - FT_FuncFix1, // 107 Proper() <-------- neu! - - FT_FuncFix2, // 108 Cell() <-------- neu! - - FT_FuncFix1, // 109 Trim() <-------- neu! - - FT_FuncFix1, // 110 Clean() <-------- neu! - - FT_FuncFix1, // 111 S() <--------- change in Bez. - - FT_FuncFix1, // 112 N() <--------- change in Bez. - - FT_FuncFix2, // 113 Exact() <-------- neu! - - FT_NotImpl, // 114 App <--------- change in Bez. - - FT_FuncFix1, // 115 @@() <-------- neu! - - FT_FuncFix3, // 116 Rate() <-------- neu! - - FT_FuncFix3, // 117 Term() <--------- change in Anz. - FT_FuncFix3, // 118 Cterm() <--------- change in Anz. - FT_FuncFix3, // 119 Sln() <-------- neu! - - FT_FuncFix4, // 120 Syd() <-------- neu! - - FT_FuncFix4, // 121 Ddb() <-------- neu! - - FT_Splfunc, // 122 Splfunc <-------- neu! - - FT_FuncFix1, // 123 Sheets <-------- neu! - - FT_FuncFix1, // 124 Info <-------- neu! - - FT_FuncVar, // 125 Sumproduct <-------- neu! - - FT_FuncFix1, // 126 Isrange <-------- neu! - - FT_FuncVar, // 127 Dget <-------- neu! - - FT_FuncVar, // 128 Dquery <-------- neu! - - FT_FuncFix4, // 129 Coord <-------- neu! - - FT_NOP, // 130 Reserved (internal) <-------- neu! - - FT_FuncFix0, // 131 Today <-------- neu! - - FT_FuncVar, // 132 Vdb <-------- neu! - - FT_FuncVar, // 133 Dvars <-------- neu! - - FT_FuncVar, // 134 Dstds <-------- neu! - - FT_FuncVar, // 135 Vars <-------- neu! - - FT_FuncVar, // 136 Stds <-------- neu! - - FT_FuncFix2, // 137 D360 <-------- neu! - - FT_NOP, // 138 Reserved (internal) <-------- neu! - - FT_FuncFix0, // 139 Isapp <-------- neu! - Anzahl ? - - FT_FuncVar, // 140 Isaaf <-------- neu! - Anzahl ? - - FT_FuncFix1, // 141 Weekday <-------- neu! - - FT_FuncFix3, // 142 Datedif <-------- neu! - - FT_FuncVar, // 143 Rank <-------- neu! - - FT_FuncFix2, // 144 Numberstring <-------- neu! - - FT_FuncFix1, // 145 Datestring <-------- neu! - - FT_FuncFix1, // 146 Decimal <-------- neu! - - FT_FuncFix1, // 147 Hex <-------- neu! - - FT_FuncFix4, // 148 Db <-------- neu! - - FT_FuncFix4, // 149 Pmti <-------- neu! - - FT_FuncFix4, // 150 Spi <-------- neu! - - FT_FuncFix1, // 151 Fullp <-------- neu! - - FT_FuncFix1, // 152 Halfp <-------- neu! - - FT_FuncVar, // 153 Pureavg <-------- neu! - - FT_FuncVar, // 154 Purecount <-------- neu! - - FT_FuncVar, // 155 Puremax <-------- neu! - - FT_FuncVar, // 156 Puremin <-------- neu! - - FT_FuncVar, // 157 Purestd <-------- neu! - - FT_FuncVar, // 158 Purevar <-------- neu! - - FT_FuncVar, // 159 Purestds <-------- neu! - - FT_FuncVar, // 160 Purevars <-------- neu! - - FT_FuncFix3, // 161 Pmt2 <-------- neu! - - FT_FuncFix3, // 162 Pv2 <-------- neu! - - FT_FuncFix3, // 163 Fv2 <-------- neu! - - FT_FuncFix3, // 164 Term2 <-------- neu! - - FT_NotImpl, // 165 --- <-------- neu! - Anzahl ? - + FT_FuncVar, // 91 Dsum <- new + FT_FuncVar, // 92 Davg <- new + FT_FuncVar, // 93 Dcnt <- new + FT_FuncVar, // 94 Dmin <- new + FT_FuncVar, // 95 Dmax <- new + FT_FuncVar, // 96 Dvar <- new + FT_FuncVar, // 97 Dstd <- new + FT_FuncVar, // 98 Index() <- change! + FT_FuncFix1, // 99 Cols() <- new + FT_FuncFix1, // 100 Rows() <- new + FT_FuncFix2, // 101 Repeat() <- new + FT_FuncFix1, // 102 Upper() <- new + FT_FuncFix1, // 103 Lower() <- new + FT_FuncFix2, // 104 Left() <- new + FT_FuncFix2, // 105 Right() <- new + FT_FuncFix4, // 106 Replace() <- new + FT_FuncFix1, // 107 Proper() <- new + FT_FuncFix2, // 108 Cell() <- new + FT_FuncFix1, // 109 Trim() <- new + FT_FuncFix1, // 110 Clean() <- new + FT_FuncFix1, // 111 S() <- change in Bez. + FT_FuncFix1, // 112 N() <- change in Bez. + FT_FuncFix2, // 113 Exact() <- new + FT_NotImpl, // 114 App <- change in Bez. + FT_FuncFix1, // 115 @@() <- new + FT_FuncFix3, // 116 Rate() <- new + FT_FuncFix3, // 117 Term() <- change in Anz. + FT_FuncFix3, // 118 Cterm() <- change in Anz. + FT_FuncFix3, // 119 Sln() <- new + FT_FuncFix4, // 120 Syd() <- new + FT_FuncFix4, // 121 Ddb() <- new + FT_Splfunc, // 122 Splfunc <- new + FT_FuncFix1, // 123 Sheets <- new + FT_FuncFix1, // 124 Info <- new + FT_FuncVar, // 125 Sumproduct <- new + FT_FuncFix1, // 126 Isrange <- new + FT_FuncVar, // 127 Dget <- new + FT_FuncVar, // 128 Dquery <- new + FT_FuncFix4, // 129 Coord <- new + FT_NOP, // 130 Reserved (internal) <- new + FT_FuncFix0, // 131 Today <- new + FT_FuncVar, // 132 Vdb <- new + FT_FuncVar, // 133 Dvars <- new + FT_FuncVar, // 134 Dstds <- new + FT_FuncVar, // 135 Vars <- new + FT_FuncVar, // 136 Stds <- new + FT_FuncFix2, // 137 D360 <- new + FT_NOP, // 138 Reserved (internal) <- new + FT_FuncFix0, // 139 Isapp <- new quantity ? + FT_FuncVar, // 140 Isaaf <- new quantity ? + FT_FuncFix1, // 141 Weekday <- new + FT_FuncFix3, // 142 Datedif <- new + FT_FuncVar, // 143 Rank <- new + FT_FuncFix2, // 144 Numberstring <- new + FT_FuncFix1, // 145 Datestring <- new + FT_FuncFix1, // 146 Decimal <- new + FT_FuncFix1, // 147 Hex <- new + FT_FuncFix4, // 148 Db <- new + FT_FuncFix4, // 149 Pmti <- new + FT_FuncFix4, // 150 Spi <- new + FT_FuncFix1, // 151 Fullp <- new + FT_FuncFix1, // 152 Halfp <- new + FT_FuncVar, // 153 Pureavg <- new + FT_FuncVar, // 154 Purecount <- new + FT_FuncVar, // 155 Puremax <- new + FT_FuncVar, // 156 Puremin <- new + FT_FuncVar, // 157 Purestd <- new + FT_FuncVar, // 158 Purevar <- new + FT_FuncVar, // 159 Purestds <- new + FT_FuncVar, // 160 Purevars <- new + FT_FuncFix3, // 161 Pmt2 <- new + FT_FuncFix3, // 162 Pv2 <- new + FT_FuncFix3, // 163 Fv2 <- new + FT_FuncFix3, // 164 Term2 <- new + FT_NotImpl, // 165-- <- new quantity ? FT_FuncFix2, // 166 D360 (US-Version) FT_NotImpl, // 167 FT_NotImpl, // 168 @@ -1363,7 +1359,7 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex ) FT_NotImpl, // 183 FT_NotImpl, // 184 FT_NotImpl, // 185 - FT_FuncVar, // 186 Solver <-------- neu! - + FT_FuncVar, // 186 Solver <- new FT_NotImpl, // 187 FT_NotImpl, // 188 FT_NotImpl, // 189 @@ -1441,7 +1437,7 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( sal_uInt8 nIndex ) DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) { static const DefTokenId pToken[ 256 ] = - { // Code Bezeichnung + { // Code Description ocPush, // 0 8-Byte-IEEE-Long-Numbers ocPush, // 1 Variable ocPush, // 2 Bereich @@ -1462,8 +1458,8 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) ocMul, // 17 Multiplikation ocDiv, // 18 Division ocPow, // 19 Potenzierung - ocEqual, // 20 Gleichheit - ocNotEqual, // 21 Ungleich + ocEqual, // 20 Equality + ocNotEqual, // 21 Inequality ocLessEqual, // 22 Kleiner-gleich ocGreaterEqual, // 23 Groesser-gleich ocLess, // 24 Kleiner @@ -1480,7 +1476,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) ocSqrt, // 35 Quadratwurzel ocLog10, // 36 Zehnerlogarithmus ocLn, // 37 Natuerlicher Logarithmus - ocPi, // 38 PI + ocPi, // 38 Pi ocSin, // 39 Sinus ocCos, // 40 Cosinus ocTan, // 41 Tangens @@ -1490,7 +1486,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) ocArcCos, // 45 Arcus-Cosinus ocExp, // 46 Exponentialfunktion ocMod, // 47 Modulo - ocChose, // 48 Auswahl + ocChose, // 48 Selection ocIsNA, // 49 Is not available? ocIsError, // 50 Is Error? ocFalse, // 51 FALSE @@ -1501,17 +1497,17 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) ocRMZ, // 56 Payment ocBW, // 57 Present Value ocZW, // 58 Future Value - ocIf, // 59 If ... then ... else ... + ocIf, // 59 If... then... else... ocGetDay, // 60 Tag des Monats - ocGetMonth, // 61 Monat - ocGetYear, // 62 Jahr - ocRound, // 63 Runden - ocGetTime, // 64 Zeit - ocGetHour, // 65 Stunde + ocGetMonth, // 61 Month + ocGetYear, // 62 Year + ocRound, // 63 Round + ocGetTime, // 64 Time + ocGetHour, // 65 Hour ocGetMin, // 66 Minute - ocGetSec, // 67 Sekunde - ocIsValue, // 68 Ist Zahl? - ocIsString, // 69 Ist Text? + ocGetSec, // 67 Second + ocIsValue, // 68 Is number? + ocIsString, // 69 Is text? ocLen, // 70 Len() ocValue, // 71 Val() ocFixed, // 72 String() ocFixed ersatzweise + Spezialfall @@ -1607,7 +1603,7 @@ DefTokenId LotusToSc::IndexToTokenWK123( sal_uInt8 nIndex ) ocNoName, // 162 Pv2 ocNoName, // 163 Fv2 ocNoName, // 164 Term2 - ocNoName, // 165 --- <-------- neu! - Anzahl ? - + ocNoName, // 165-- <- new quantity ? ocGetDiffDate360, // 166 D360 (US-Version, ersatzweise wie ander D360-Funktion) ocNoName, // 167 ocNoName, // 168 @@ -1714,7 +1710,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n ) NULL, // 1 Variable NULL, // 2 Bereich NULL, // 3 return - NULL, // 4 Klammer + NULL, // 4 Bracket NULL, // 5 2-Byte-Integer NULL, // 6 ASCII-String NULL, // 7 Named range reference @@ -1864,7 +1860,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n ) NULL, // 151 Fullp NULL, // 152 Halfp "PURMITTELWERT", // 153 Pureavg - "PURANZAHL", // 154 Purecount + "PURquantity", // 154 Purecount "PURMAX", // 155 Puremax "PURMIN", // 156 Puremin "PURSTDABW", // 157 Purestd @@ -1875,7 +1871,7 @@ const sal_Char* GetAddInName( const sal_uInt8 n ) NULL, // 162 Pv2 NULL, // 163 Fv2 NULL, // 164 Term2 - NULL, // 165 --- <-------- neu! - Anzahl ? - + NULL, // 165-- <- new quantity ? NULL, // 166 D360 (US-Version, ersatzweise wie ander D360-Funktion) NULL, // 167 NULL, // 168 diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index db31966a7ba2..4538ba078b88 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.cxx @@ -69,7 +69,7 @@ FltError ImportLotus::Read() switch( eAkt ) { - // ----------------------------------------------------------- + case S_START: // S_START if( nOp ) { @@ -99,10 +99,10 @@ FltError ImportLotus::Read() } } break; - // ----------------------------------------------------------- + case S_WK1: // S_WK1 break; - // ----------------------------------------------------------- + case S_WK3: // S_WK3 case S_WK4: // S_WK4 switch( nOp ) @@ -180,10 +180,10 @@ FltError ImportLotus::Read() } break; - // ----------------------------------------------------------- + case S_FM3: // S_FM3 break; - // ----------------------------------------------------------- + case S_END: // S_END break; } diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx index eb6621a0100e..2514ede2c917 100644 --- a/sc/source/filter/lotus/lotus.cxx +++ b/sc/source/filter/lotus/lotus.cxx @@ -27,7 +27,7 @@ #include "filtopt.hxx" #include "ftools.hxx" -//------------------------------------------------------------------------ + extern FltError ScImportLotus123old( SvStream&, ScDocument*, rtl_TextEncoding eSrc ); // alter Krempel in filter.cxx! diff --git a/sc/source/filter/oox/addressconverter.cxx b/sc/source/filter/oox/addressconverter.cxx index 59028bacd59d..cac8530468b3 100644 --- a/sc/source/filter/oox/addressconverter.cxx +++ b/sc/source/filter/oox/addressconverter.cxx @@ -163,7 +163,7 @@ AddressConverter::AddressConverter( const WorkbookHelper& rHelper ) : } } -// ---------------------------------------------------------------------------- + bool AddressConverter::parseOoxAddress2d( sal_Int32& ornColumn, sal_Int32& ornRow, @@ -309,7 +309,7 @@ bool AddressConverter::parseOoxRange2d( return false; } -// ---------------------------------------------------------------------------- + bool AddressConverter::checkCol( sal_Int32 nCol, bool bTrackOverflow ) { @@ -335,7 +335,7 @@ bool AddressConverter::checkTab( sal_Int16 nSheet, bool bTrackOverflow ) return bValid; } -// ---------------------------------------------------------------------------- + bool AddressConverter::checkCellAddress( const CellAddress& rAddress, bool bTrackOverflow ) { @@ -418,7 +418,7 @@ CellAddress AddressConverter::createValidCellAddress( return aAddress; } -// ---------------------------------------------------------------------------- + bool AddressConverter::checkCellRange( const CellRangeAddress& rRange, bool bAllowOverflow, bool bTrackOverflow ) { @@ -477,7 +477,7 @@ bool AddressConverter::convertToCellRange( CellRangeAddress& orRange, return validateCellRange( orRange, bAllowOverflow, bTrackOverflow ); } -// ---------------------------------------------------------------------------- + void AddressConverter::validateCellRangeList( ApiCellRangeList& orRanges, bool bTrackOverflow ) { diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx index 3b98ba7a591e..12193a0a5200 100644 --- a/sc/source/filter/oox/autofilterbuffer.cxx +++ b/sc/source/filter/oox/autofilterbuffer.cxx @@ -59,7 +59,7 @@ const sal_uInt8 BIFF_FILTER_DATATYPE_BOOLEAN = 8; const sal_uInt8 BIFF_FILTER_DATATYPE_EMPTY = 12; const sal_uInt8 BIFF_FILTER_DATATYPE_NOTEMPTY = 14; -// ---------------------------------------------------------------------------- + bool lclGetApiOperatorFromToken( sal_Int32& rnApiOperator, sal_Int32 nToken ) { @@ -381,7 +381,7 @@ void FilterCriterionModel::readBiffData( SequenceInputStream& rStrm ) } } -// ---------------------------------------------------------------------------- + CustomFilter::CustomFilter( const WorkbookHelper& rHelper ) : FilterSettingsBase( rHelper ), diff --git a/sc/source/filter/oox/biffcodec.cxx b/sc/source/filter/oox/biffcodec.cxx index 51e9fce72d76..9e44c140e4c8 100644 --- a/sc/source/filter/oox/biffcodec.cxx +++ b/sc/source/filter/oox/biffcodec.cxx @@ -148,7 +148,7 @@ sal_Int32 lclGetRcfOffset( sal_Int64 nStreamPos ) } // namespace -// ---------------------------------------------------------------------------- + BiffDecoder_RCF::BiffDecoder_RCF( const BiffDecoder_RCF& rDecoder ) : BiffDecoderBase(), // must be called to prevent compiler warning @@ -231,7 +231,7 @@ void BiffDecoder_RCF::implDecode( sal_uInt8* pnDestData, const sal_uInt8* pnSrcD } } -// ---------------------------------------------------------------------------- + BiffCodecHelper::BiffCodecHelper( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) diff --git a/sc/source/filter/oox/commentsbuffer.cxx b/sc/source/filter/oox/commentsbuffer.cxx index e9489d7a320d..7a4218e18c4a 100644 --- a/sc/source/filter/oox/commentsbuffer.cxx +++ b/sc/source/filter/oox/commentsbuffer.cxx @@ -92,7 +92,7 @@ CommentModel::CommentModel() : { } -// ---------------------------------------------------------------------------- + Comment::Comment( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) diff --git a/sc/source/filter/oox/condformatbuffer.cxx b/sc/source/filter/oox/condformatbuffer.cxx index d14ff5dc465d..a3c17e0dd3a2 100644 --- a/sc/source/filter/oox/condformatbuffer.cxx +++ b/sc/source/filter/oox/condformatbuffer.cxx @@ -120,7 +120,7 @@ const sal_uInt16 BIFF12_CFRULE_ABOVEAVERAGE = 0x0004; const sal_uInt16 BIFF12_CFRULE_BOTTOM = 0x0008; const sal_uInt16 BIFF12_CFRULE_PERCENT = 0x0010; -// ---------------------------------------------------------------------------- + template< typename Type > void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString& rPropName, const Type& rValue ) @@ -130,7 +130,7 @@ void lclAppendProperty( ::std::vector< PropertyValue >& orProps, const OUString& orProps.back().Value <<= rValue; } -//------------------------------------------------------------------------------ + void SetCfvoData( ColorScaleRuleModelEntry* pEntry, const AttributeList& rAttribs ) { diff --git a/sc/source/filter/oox/connectionsbuffer.cxx b/sc/source/filter/oox/connectionsbuffer.cxx index 9f81107d342a..631a333cbf72 100644 --- a/sc/source/filter/oox/connectionsbuffer.cxx +++ b/sc/source/filter/oox/connectionsbuffer.cxx @@ -84,7 +84,7 @@ WebPrModel::WebPrModel() : { } -// ---------------------------------------------------------------------------- + ConnectionModel::ConnectionModel() : mnId( -1 ), @@ -110,7 +110,7 @@ WebPrModel& ConnectionModel::createWebPr() return *mxWebPr; } -// ---------------------------------------------------------------------------- + Connection::Connection( const WorkbookHelper& rHelper, sal_Int32 nConnId ) : WorkbookHelper( rHelper ) diff --git a/sc/source/filter/oox/defnamesbuffer.cxx b/sc/source/filter/oox/defnamesbuffer.cxx index 94203a852c7f..ef142cfaa2eb 100644 --- a/sc/source/filter/oox/defnamesbuffer.cxx +++ b/sc/source/filter/oox/defnamesbuffer.cxx @@ -63,7 +63,7 @@ const sal_uInt16 BIFF_REFFLAG_ROW1REL = 0x0002; const sal_uInt16 BIFF_REFFLAG_COL2REL = 0x0004; const sal_uInt16 BIFF_REFFLAG_ROW2REL = 0x0008; -// ---------------------------------------------------------------------------- + const sal_Char* const spcOoxPrefix = "_xlnm."; diff --git a/sc/source/filter/oox/drawingbase.cxx b/sc/source/filter/oox/drawingbase.cxx index bbfd7537ccfa..0661e32a3dbe 100644 --- a/sc/source/filter/oox/drawingbase.cxx +++ b/sc/source/filter/oox/drawingbase.cxx @@ -63,7 +63,7 @@ CellAnchorModel::CellAnchorModel() : { } -// ---------------------------------------------------------------------------- + AnchorClientDataModel::AnchorClientDataModel() : mbLocksWithSheet( true ), diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx index a3ca08f9425b..890a6ff0d9c1 100644 --- a/sc/source/filter/oox/drawingfragment.cxx +++ b/sc/source/filter/oox/drawingfragment.cxx @@ -320,7 +320,7 @@ private: sal_Int32 mnRow; }; -// ---------------------------------------------------------------------------- + VmlFindNoteFunc::VmlFindNoteFunc( const CellAddress& rPos ) : mnCol( rPos.Column ), diff --git a/sc/source/filter/oox/excelfilter.cxx b/sc/source/filter/oox/excelfilter.cxx index 819270548c47..7e61c72131c0 100644 --- a/sc/source/filter/oox/excelfilter.cxx +++ b/sc/source/filter/oox/excelfilter.cxx @@ -64,7 +64,7 @@ Reference< XInterface > ExcelFilter_create( return static_cast< ::cppu::OWeakObject* >( new ExcelFilter( rxContext ) ); } -// ---------------------------------------------------------------------------- + ExcelFilter::ExcelFilter( const Reference< XComponentContext >& rxContext ) throw( RuntimeException ) : XmlFilterBase( rxContext ), diff --git a/sc/source/filter/oox/excelhandlers.cxx b/sc/source/filter/oox/excelhandlers.cxx index 406781bf4ebd..df1a8cb6a065 100644 --- a/sc/source/filter/oox/excelhandlers.cxx +++ b/sc/source/filter/oox/excelhandlers.cxx @@ -56,7 +56,7 @@ BiffContextHandler::~BiffContextHandler() { } -// ---------------------------------------------------------------------------- + BiffWorksheetContextBase::BiffWorksheetContextBase( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) @@ -95,7 +95,7 @@ BiffWorkbookFragmentBase::BiffWorkbookFragmentBase( const WorkbookHelper& rHelpe getCodecHelper().cloneDecoder( getInputStream() ); } -// ---------------------------------------------------------------------------- + } // namespace xls } // namespace oox diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx index c454ae89682d..e4e5d00b9732 100644 --- a/sc/source/filter/oox/externallinkbuffer.cxx +++ b/sc/source/filter/oox/externallinkbuffer.cxx @@ -640,7 +640,7 @@ void RefSheetsModel::readBiff12Data( SequenceInputStream& rStrm ) rStrm >> mnExtRefId >> mnTabId1 >> mnTabId2; } -// ---------------------------------------------------------------------------- + ExternalLinkBuffer::ExternalLinkBuffer( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx index 0fd11295274a..c66dfc4160ba 100644 --- a/sc/source/filter/oox/formulabase.cxx +++ b/sc/source/filter/oox/formulabase.cxx @@ -119,7 +119,7 @@ void BinSingleRef2d::readBiff8Data( BiffInputStream& rStrm, bool bRelativeAsOffs setBiff8Data( nCol, nRow, bRelativeAsOffset ); } -// ---------------------------------------------------------------------------- + void BinComplexRef2d::readBiff12Data( SequenceInputStream& rStrm, bool bRelativeAsOffset ) { @@ -912,7 +912,7 @@ static const FunctionData saFuncTableOOoLO[] = // Other functions. { "ORG.OPENOFFICE.CONVERT", "ORG.OPENOFFICE.CONVERT", NOID, NOID, 3, 3, V, { VR }, FUNCFLAG_MACROCALL_NEW } }; -// ---------------------------------------------------------------------------- + const sal_Unicode API_TOKEN_OPEN = '('; const sal_Unicode API_TOKEN_CLOSE = ')'; @@ -988,7 +988,7 @@ private: sal_uInt8 nMaxParam, bool bImportFilter, FilterType eFilter ); }; -// ---------------------------------------------------------------------------- + FunctionProviderImpl::FunctionProviderImpl( FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport ) @@ -1101,7 +1101,7 @@ void FunctionProviderImpl::initFuncs( const FunctionData* pBeg, const FunctionDa initFunc( *pIt, nMaxParam ); } -// ---------------------------------------------------------------------------- + FunctionProvider::FunctionProvider( FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport ) : @@ -1185,7 +1185,7 @@ private: bool initFuncOpCodes( const ApiTokenMap& rIntFuncTokenMap, const ApiTokenMap& rExtFuncTokenMap, const FunctionInfoVector& rFuncInfos ); }; -// ---------------------------------------------------------------------------- + OpCodeProviderImpl::OpCodeProviderImpl( const FunctionInfoVector& rFuncInfos, const Reference< XMultiServiceFactory >& rxModelFactory ) @@ -1440,7 +1440,7 @@ bool OpCodeProviderImpl::initFuncOpCodes( const ApiTokenMap& rIntFuncTokenMap, c return bIsValid; } -// ---------------------------------------------------------------------------- + OpCodeProvider::OpCodeProvider( const Reference< XMultiServiceFactory >& rxModelFactory, FilterType eFilter, BiffType eBiff, bool bImportFilter, bool bCallerKnowsAboutMacroExport ) : @@ -1580,7 +1580,7 @@ TokenToRangeListState lclProcessClose( sal_Int32& ornParenLevel ) } // namespace -// ---------------------------------------------------------------------------- + FormulaProcessorBase::FormulaProcessorBase( const WorkbookHelper& rHelper ) : OpCodeProvider( rHelper.getBaseFilter().getModelFactory(), rHelper.getFilterType(), rHelper.getBiff(), rHelper.getBaseFilter().isImportFilter() ), @@ -1589,7 +1589,7 @@ FormulaProcessorBase::FormulaProcessorBase( const WorkbookHelper& rHelper ) : { } -// ---------------------------------------------------------------------------- + OUString FormulaProcessorBase::generateAddress2dString( const CellAddress& rAddress, bool bAbsolute ) { @@ -1611,7 +1611,7 @@ OUString FormulaProcessorBase::generateAddress2dString( const BinAddress& rAddre return aBuffer.makeStringAndClear(); } -// ---------------------------------------------------------------------------- + OUString FormulaProcessorBase::generateApiString( const OUString& rString ) { @@ -1649,7 +1649,7 @@ OUString FormulaProcessorBase::generateApiArray( const Matrix< Any >& rMatrix ) return aBuffer.makeStringAndClear(); } -// ---------------------------------------------------------------------------- + Any FormulaProcessorBase::extractReference( const ApiTokenSequence& rTokens ) const { diff --git a/sc/source/filter/oox/formulaparser.cxx b/sc/source/filter/oox/formulaparser.cxx index f6f2948e9042..25c0a260ae4d 100644 --- a/sc/source/filter/oox/formulaparser.cxx +++ b/sc/source/filter/oox/formulaparser.cxx @@ -573,7 +573,7 @@ private: WhiteSpaceVec maClosingSpaces; /// List of whitespaces before closing parenthesis. }; -// ---------------------------------------------------------------------------- + FormulaParserImpl::FormulaParserImpl( const FormulaParser& rParent ) : FormulaFinalizer( rParent ), @@ -1290,7 +1290,7 @@ private: bool mbNeedExtRefs; /// True = parser needs initialization of external reference info. }; -// ---------------------------------------------------------------------------- + OoxFormulaParserImpl::OoxFormulaParserImpl( const FormulaParser& rParent ) : FormulaParserImpl( rParent ), @@ -1842,7 +1842,7 @@ bool lclIsValidNlrRange( const BiffNlr& rNlr, const BinRange& rRange, bool bRow } // namespace -// ---------------------------------------------------------------------------- + class BiffFormulaParserImpl : public FormulaParserImpl { @@ -1919,7 +1919,7 @@ private: bool pushBiffFunction( sal_uInt16 nFuncId ); bool pushBiffFunction( sal_uInt16 nFuncId, sal_uInt8 nParamCount ); - // ------------------------------------------------------------------------ + private: typedef bool (BiffFormulaParserImpl::*ImportTokenFunc)( BiffInputStream& ); typedef bool (BiffFormulaParserImpl::*ImportRefTokenFunc)( BiffInputStream&, bool, bool ); @@ -1947,7 +1947,7 @@ private: sal_uInt16 mnRefIdSize; /// Size of unused data following a reference identifier. }; -// ---------------------------------------------------------------------------- + BiffFormulaParserImpl::BiffFormulaParserImpl( const FormulaParser& rParent ) : FormulaParserImpl( rParent ), @@ -2764,7 +2764,7 @@ bool lclExtractRefId( sal_Int32& rnRefId, OUString& rRemainder, const OUString& } -// ---------------------------------------------------------------------------- + FormulaParser::FormulaParser( const WorkbookHelper& rHelper ) : FormulaProcessorBase( rHelper ) diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx index 84f44a220d45..8ec1cf59590b 100644 --- a/sc/source/filter/oox/numberformatsbuffer.cxx +++ b/sc/source/filter/oox/numberformatsbuffer.cxx @@ -435,7 +435,7 @@ struct BuiltinFormat #define UTF8_KO_MIN "\353\266\204" #define UTF8_KO_SEC "\354\264\210" -// ---------------------------------------------------------------------------- + /** Default number format table. Last parent of all other tables, used for unknown locales. */ static const BuiltinFormat spBuiltinFormats_BASE[] = @@ -533,7 +533,7 @@ static const BuiltinFormat spBuiltinFormats_BASE[] = NUMFMT_ENDTABLE() }; -// ---------------------------------------------------------------------------- + /** Arabic, U.A.E. */ static const BuiltinFormat spBuiltinFormats_ar_AE[] = @@ -1634,7 +1634,7 @@ static const BuiltinFormat spBuiltinFormats_zh_TW[] = NUMFMT_ENDTABLE() }; -// ---------------------------------------------------------------------------- + /** Specifies a built-in number format table for a specific locale. */ struct BuiltinFormatTable @@ -1802,14 +1802,14 @@ NumFmtModel::NumFmtModel() : { } -// ---------------------------------------------------------------------------- + ApiNumFmtData::ApiNumFmtData() : mnIndex( 0 ) { } -// ---------------------------------------------------------------------------- + namespace { @@ -1861,7 +1861,7 @@ sal_Int32 lclCreateFormat( const Reference< XNumberFormats >& rxNumFmts, return nIndex; } -// ---------------------------------------------------------------------------- + /** Functor for converting an XML number format to an API number format index. */ class NumberFormatFinalizer @@ -1893,7 +1893,7 @@ NumberFormatFinalizer::NumberFormatFinalizer( const WorkbookHelper& rHelper ) : } // namespace -// ---------------------------------------------------------------------------- + NumberFormat::NumberFormat( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) diff --git a/sc/source/filter/oox/ooxformulaparser.cxx b/sc/source/filter/oox/ooxformulaparser.cxx index fac24f25416b..7f7a7ddb1a92 100644 --- a/sc/source/filter/oox/ooxformulaparser.cxx +++ b/sc/source/filter/oox/ooxformulaparser.cxx @@ -51,7 +51,7 @@ private: ApiParserWrapper maApiParser; }; -// ---------------------------------------------------------------------------- + OOXMLFormulaParserImpl::OOXMLFormulaParserImpl( const Reference< XMultiServiceFactory >& rxModelFactory ) : FormulaFinalizer( OpCodeProvider( rxModelFactory, FILTER_OOXML, BIFF_UNKNOWN, true ) ), diff --git a/sc/source/filter/oox/pagesettings.cxx b/sc/source/filter/oox/pagesettings.cxx index 90dc156b0fa7..d474de7d3eea 100644 --- a/sc/source/filter/oox/pagesettings.cxx +++ b/sc/source/filter/oox/pagesettings.cxx @@ -342,7 +342,7 @@ enum HFPortionId HF_COUNT }; -// ---------------------------------------------------------------------------- + struct HFPortionInfo { @@ -441,7 +441,7 @@ private: FontModel maFontModel; /// Font attributes of current text range. }; -// ---------------------------------------------------------------------------- + namespace { @@ -468,7 +468,7 @@ static const sal_Char* const sppcItalicNames[] = } // namespace -// ---------------------------------------------------------------------------- + HeaderFooterParser::HeaderFooterParser( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), @@ -881,7 +881,7 @@ void HeaderFooterParser::setNewPortion( HFPortionId ePortion ) // ============================================================================ -// ---------------------------------------------------------------------------- + PageSettingsConverter::HFHelperData::HFHelperData( sal_Int32 nLeftPropId, sal_Int32 nRightPropId ) : mnLeftPropId( nLeftPropId ), @@ -894,7 +894,7 @@ PageSettingsConverter::HFHelperData::HFHelperData( sal_Int32 nLeftPropId, sal_In { } -// ---------------------------------------------------------------------------- + PageSettingsConverter::PageSettingsConverter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx index 8b3c15559ab2..c09abc4ae584 100644 --- a/sc/source/filter/oox/pivotcachebuffer.cxx +++ b/sc/source/filter/oox/pivotcachebuffer.cxx @@ -102,7 +102,7 @@ const sal_uInt8 BIFF12_PCDEFINITION_SUPPORTDRILL = 0x08; const sal_uInt8 BIFF12_PCDWBSOURCE_HASRELID = 0x01; const sal_uInt8 BIFF12_PCDWBSOURCE_HASSHEET = 0x02; -// ---------------------------------------------------------------------------- + const sal_uInt16 BIFF_PC_NOSTRING = 0xFFFF; @@ -127,7 +127,7 @@ const sal_uInt16 BIFF_PCDEFINITION_OPTIMIZEMEMORY = 0x0008; const sal_uInt16 BIFF_PCDEFINITION_BACKGROUNDQUERY = 0x0010; const sal_uInt16 BIFF_PCDEFINITION_ENABLEREFRESH = 0x0020; -// ---------------------------------------------------------------------------- + /** Adjusts the weird date format read from binary streams. @@ -305,7 +305,7 @@ OUString PivotCacheItem::getName() const return OUString(); } -// ---------------------------------------------------------------------------- + PivotCacheItemList::PivotCacheItemList( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -439,7 +439,7 @@ PCFieldModel::PCFieldModel() : { } -// ---------------------------------------------------------------------------- + PCSharedItemsModel::PCSharedItemsModel() : mbHasSemiMixed( true ), @@ -455,7 +455,7 @@ PCSharedItemsModel::PCSharedItemsModel() : { } -// ---------------------------------------------------------------------------- + PCFieldGroupModel::PCFieldGroupModel() : mfStartValue( 0.0 ), @@ -478,7 +478,7 @@ void PCFieldGroupModel::setBiffGroupBy( sal_uInt8 nGroupBy ) mnGroupBy = STATIC_ARRAY_SELECT( spnGroupBy, nGroupBy, XML_range ); } -// ---------------------------------------------------------------------------- + PivotCacheField::PivotCacheField( const WorkbookHelper& rHelper, bool bIsDatabaseField ) : WorkbookHelper( rHelper ), @@ -1053,7 +1053,7 @@ PCDefinitionModel::PCDefinitionModel() : { } -// ---------------------------------------------------------------------------- + PCSourceModel::PCSourceModel() : mnSourceType( XML_TOKEN_INVALID ), @@ -1061,14 +1061,14 @@ PCSourceModel::PCSourceModel() : { } -// ---------------------------------------------------------------------------- + PCWorksheetSourceModel::PCWorksheetSourceModel() { maRange.StartColumn = maRange.StartRow = maRange.EndColumn = maRange.EndRow = -1; } -// ---------------------------------------------------------------------------- + PivotCache::PivotCache( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), diff --git a/sc/source/filter/oox/pivotcachefragment.cxx b/sc/source/filter/oox/pivotcachefragment.cxx index 4ae3e1adeb3d..0b1bee51db88 100644 --- a/sc/source/filter/oox/pivotcachefragment.cxx +++ b/sc/source/filter/oox/pivotcachefragment.cxx @@ -340,7 +340,7 @@ bool lclSeekToPCDField( BiffInputStream& rStrm ) } // namespace -// ---------------------------------------------------------------------------- + BiffPivotCacheFragment::BiffPivotCacheFragment( const WorkbookHelper& rHelper, const OUString& rStrmName, PivotCache& rPivotCache ) : diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx index c0e73ba00bac..0579cd322180 100644 --- a/sc/source/filter/oox/pivottablebuffer.cxx +++ b/sc/source/filter/oox/pivottablebuffer.cxx @@ -70,7 +70,7 @@ const sal_Int32 OOX_PT_DATALAYOUTFIELD = -2; /// Placehol const sal_Int32 OOX_PT_PREVIOUS_ITEM = 0x001000FC; /// Calculation of data item result is based on previous item. const sal_Int32 OOX_PT_NEXT_ITEM = 0x001000FD; /// Calculation of data item result is based on next item. -// ---------------------------------------------------------------------------- + const sal_uInt32 BIFF12_PTFIELD_DATAFIELD = 0x00000008; const sal_uInt32 BIFF12_PTFIELD_DEFAULT = 0x00000100; @@ -176,7 +176,7 @@ void PTFieldItemModel::setBiffType( sal_uInt16 nType ) mnType = STATIC_ARRAY_SELECT( spnTypes, nType, XML_data ); } -// ---------------------------------------------------------------------------- + PTFieldModel::PTFieldModel() : mnAxis( XML_TOKEN_INVALID ), @@ -224,7 +224,7 @@ void PTFieldModel::setBiffAxis( sal_uInt8 nAxis ) mnAxis = STATIC_ARRAY_SELECT( spnAxisIds, nAxis, XML_TOKEN_INVALID ); } -// ---------------------------------------------------------------------------- + PTPageFieldModel::PTPageFieldModel() : mnField( -1 ), @@ -232,7 +232,7 @@ PTPageFieldModel::PTPageFieldModel() : { } -// ---------------------------------------------------------------------------- + PTDataFieldModel::PTDataFieldModel() : mnField( -1 ), @@ -256,7 +256,7 @@ void PTDataFieldModel::setBiffShowDataAs( sal_Int32 nShowDataAs ) mnShowDataAs = STATIC_ARRAY_SELECT( spnShowDataAs, nShowDataAs, XML_TOKEN_INVALID ); } -// ---------------------------------------------------------------------------- + PivotTableField::PivotTableField( PivotTable& rPivotTable, sal_Int32 nFieldIndex ) : WorkbookHelper( rPivotTable ), @@ -762,7 +762,7 @@ PTFilterModel::PTFilterModel() : { } -// ---------------------------------------------------------------------------- + PivotTableFilter::PivotTableFilter( const PivotTable& rPivotTable ) : WorkbookHelper( rPivotTable ), @@ -902,7 +902,7 @@ PTDefinitionModel::PTDefinitionModel() : { } -// ---------------------------------------------------------------------------- + PTLocationModel::PTLocationModel() : mnFirstHeaderRow( 0 ), @@ -913,7 +913,7 @@ PTLocationModel::PTLocationModel() : { } -// ---------------------------------------------------------------------------- + PivotTable::PivotTable( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), diff --git a/sc/source/filter/oox/querytablebuffer.cxx b/sc/source/filter/oox/querytablebuffer.cxx index d4d489b6e79a..feaecbbaa25c 100644 --- a/sc/source/filter/oox/querytablebuffer.cxx +++ b/sc/source/filter/oox/querytablebuffer.cxx @@ -64,7 +64,7 @@ const sal_uInt32 BIFF12_QUERYTABLE_APPLYBORDER = 0x00020000; const sal_uInt32 BIFF12_QUERYTABLE_APPLYFILL = 0x00040000; const sal_uInt32 BIFF12_QUERYTABLE_APPLYPROTECTION = 0x00080000; -// ---------------------------------------------------------------------------- + void lclAppendWebQueryTableName( OUStringBuffer& rTables, const OUString& rTableName ) { @@ -152,7 +152,7 @@ QueryTableModel::QueryTableModel() : { } -// ---------------------------------------------------------------------------- + QueryTable::QueryTable( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) diff --git a/sc/source/filter/oox/richstring.cxx b/sc/source/filter/oox/richstring.cxx index 98c47f12aa2d..5a73c08f5d19 100644 --- a/sc/source/filter/oox/richstring.cxx +++ b/sc/source/filter/oox/richstring.cxx @@ -157,7 +157,7 @@ void RichStringPortion::writeFontProperties( const Reference<XText>& rxText, con pFont->writeToPropertySet(aPropSet, FONT_PROPTYPE_TEXT); } -// ---------------------------------------------------------------------------- + void FontPortionModel::read( SequenceInputStream& rStrm ) { @@ -165,7 +165,7 @@ void FontPortionModel::read( SequenceInputStream& rStrm ) mnFontId = rStrm.readuInt16(); } -// ---------------------------------------------------------------------------- + void FontPortionModelList::appendPortion( const FontPortionModel& rPortion ) { @@ -213,7 +213,7 @@ void PhoneticDataModel::setBiffData( sal_Int32 nType, sal_Int32 nAlignment ) mnAlignment = STATIC_ARRAY_SELECT( spnAlignments, nAlignment, XML_left ); } -// ---------------------------------------------------------------------------- + PhoneticSettings::PhoneticSettings( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -270,7 +270,7 @@ void RichStringPhonetic::setBaseRange( sal_Int32 nBasePos, sal_Int32 nBaseEnd ) mnBaseEnd = nBaseEnd; } -// ---------------------------------------------------------------------------- + void PhoneticPortionModel::read( SequenceInputStream& rStrm ) { @@ -279,7 +279,7 @@ void PhoneticPortionModel::read( SequenceInputStream& rStrm ) mnBaseLen = rStrm.readuInt16(); } -// ---------------------------------------------------------------------------- + void PhoneticPortionModelList::appendPortion( const PhoneticPortionModel& rPortion ) { diff --git a/sc/source/filter/oox/scenariobuffer.cxx b/sc/source/filter/oox/scenariobuffer.cxx index cbe5672d154b..ed8801e4108a 100644 --- a/sc/source/filter/oox/scenariobuffer.cxx +++ b/sc/source/filter/oox/scenariobuffer.cxx @@ -50,7 +50,7 @@ ScenarioCellModel::ScenarioCellModel() : { } -// ---------------------------------------------------------------------------- + ScenarioModel::ScenarioModel() : mbLocked( false ), @@ -58,7 +58,7 @@ ScenarioModel::ScenarioModel() : { } -// ---------------------------------------------------------------------------- + Scenario::Scenario( const WorkbookHelper& rHelper, sal_Int16 nSheet ) : WorkbookHelper( rHelper ), @@ -166,7 +166,7 @@ SheetScenariosModel::SheetScenariosModel() : { } -// ---------------------------------------------------------------------------- + SheetScenarios::SheetScenarios( const WorkbookHelper& rHelper, sal_Int16 nSheet ) : WorkbookHelper( rHelper ), diff --git a/sc/source/filter/oox/sheetdatabuffer.cxx b/sc/source/filter/oox/sheetdatabuffer.cxx index 70787add172f..b4839b2c96dc 100644 --- a/sc/source/filter/oox/sheetdatabuffer.cxx +++ b/sc/source/filter/oox/sheetdatabuffer.cxx @@ -77,7 +77,7 @@ CellModel::CellModel() : { } -// ---------------------------------------------------------------------------- + CellFormulaModel::CellFormulaModel() : mnFormulaType( XML_TOKEN_INVALID ), @@ -101,7 +101,7 @@ bool CellFormulaModel::isValidSharedRef( const CellAddress& rCellAddr ) (maFormulaRef.StartRow <= rCellAddr.Row) && (rCellAddr.Row <= maFormulaRef.EndRow); } -// ---------------------------------------------------------------------------- + DataTableModel::DataTableModel() : mb2dTable( false ), @@ -551,7 +551,7 @@ bool SheetDataBuffer::MergedRange::tryExpand( const CellAddress& rAddress, sal_I return false; } -// ---------------------------------------------------------------------------- + void SheetDataBuffer::setCellFormula( const CellAddress& rCellAddr, const ApiTokenSequence& rTokens ) { diff --git a/sc/source/filter/oox/stylesbuffer.cxx b/sc/source/filter/oox/stylesbuffer.cxx index cd0a43e5c347..13bc1f8be438 100644 --- a/sc/source/filter/oox/stylesbuffer.cxx +++ b/sc/source/filter/oox/stylesbuffer.cxx @@ -206,7 +206,7 @@ const sal_uInt8 BIFF_FONTUNDERL_DOUBLE = 2; const sal_uInt8 BIFF_FONTUNDERL_SINGLE_ACC = 33; const sal_uInt8 BIFF_FONTUNDERL_DOUBLE_ACC = 34; -// ---------------------------------------------------------------------------- + sal_Int32 lclReadRgbColor( BinaryInputStream& rStrm ) { @@ -397,7 +397,7 @@ static const sal_Int32 spnDefColors8[] = } // namespace -// ---------------------------------------------------------------------------- + ColorPalette::ColorPalette( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ) @@ -491,7 +491,7 @@ void lclSetFontName( ApiScriptFontName& rFontName, const FontDescriptor& rFontDe } // namespace -// ---------------------------------------------------------------------------- + FontModel::FontModel() : mnScheme( XML_none ), @@ -543,7 +543,7 @@ void FontModel::setBiffEscapement( sal_uInt16 nEscapement ) mnEscapement = STATIC_ARRAY_SELECT( spnEscapes, nEscapement, XML_baseline ); } -// ---------------------------------------------------------------------------- + ApiFontUsedFlags::ApiFontUsedFlags( bool bAllUsed ) : mbNameUsed( bAllUsed ), @@ -560,7 +560,7 @@ ApiFontUsedFlags::ApiFontUsedFlags( bool bAllUsed ) : { } -// ---------------------------------------------------------------------------- + ApiScriptFontName::ApiScriptFontName() : mnFamily( ::com::sun::star::awt::FontFamily::DONTKNOW ), @@ -568,7 +568,7 @@ ApiScriptFontName::ApiScriptFontName() : { } -// ---------------------------------------------------------------------------- + ApiFontData::ApiFontData() : maDesc( @@ -1146,7 +1146,7 @@ void AlignmentModel::setBiffVerAlign( sal_uInt8 nVerAlign ) mnVerAlign = STATIC_ARRAY_SELECT( spnVerAligns, nVerAlign, XML_bottom ); } -// ---------------------------------------------------------------------------- + ApiAlignmentData::ApiAlignmentData() : meHorJustify( ::com::sun::star::table::CellHoriJustify_STANDARD ), @@ -1399,7 +1399,7 @@ ProtectionModel::ProtectionModel() : { } -// ---------------------------------------------------------------------------- + ApiProtectionData::ApiProtectionData() : maCellProt( sal_True, sal_False, sal_False, sal_False ) @@ -1478,7 +1478,7 @@ void BorderLineModel::setBiffStyle( sal_Int32 nLineStyle ) mnStyle = STATIC_ARRAY_SELECT( spnStyleIds, nLineStyle, XML_none ); } -// ---------------------------------------------------------------------------- + BorderModel::BorderModel( bool bDxf ) : maLeft( bDxf ), @@ -1491,7 +1491,7 @@ BorderModel::BorderModel( bool bDxf ) : { } -// ---------------------------------------------------------------------------- + ApiBorderData::ApiBorderData() : mbBorderUsed( false ), @@ -1548,7 +1548,7 @@ inline void lclSetBorderLineWidth( BorderLine& rBorderLine, } // namespace -// ---------------------------------------------------------------------------- + Border::Border( const WorkbookHelper& rHelper, bool bDxf ) : WorkbookHelper( rHelper ), @@ -1780,7 +1780,7 @@ void PatternFillModel::setBiffPattern( sal_Int32 nPattern ) mnPattern = STATIC_ARRAY_SELECT( spnPatternIds, nPattern, XML_none ); } -// ---------------------------------------------------------------------------- + GradientFillModel::GradientFillModel() : mnType( XML_linear ), @@ -1817,7 +1817,7 @@ void GradientFillModel::readGradientStop( SequenceInputStream& rStrm, bool bDxf maColors[ fPosition ] = aColor; } -// ---------------------------------------------------------------------------- + ApiSolidFillData::ApiSolidFillData() : mnColor( API_RGB_TRANSPARENT ), @@ -1853,7 +1853,7 @@ sal_Int32 lclGetMixedColor( sal_Int32 nPattColor, sal_Int32 nFillColor, sal_Int3 } // namespace -// ---------------------------------------------------------------------------- + Fill::Fill( const WorkbookHelper& rHelper, bool bDxf ) : WorkbookHelper( rHelper ), @@ -2578,7 +2578,7 @@ OUString lclCreateStyleName( const CellStyleModel& rModel ) } // namespace -// ---------------------------------------------------------------------------- + CellStyleModel::CellStyleModel() : mnXfId( -1 ), diff --git a/sc/source/filter/oox/unitconverter.cxx b/sc/source/filter/oox/unitconverter.cxx index 775458758d27..6428a627cd2f 100644 --- a/sc/source/filter/oox/unitconverter.cxx +++ b/sc/source/filter/oox/unitconverter.cxx @@ -50,7 +50,7 @@ const double MM100_PER_POINT = MM100_PER_INCH / 72.0; const double MM100_PER_TWIP = MM100_PER_POINT / 20.0; const double MM100_PER_EMU = 1.0 / 360.0; -// ---------------------------------------------------------------------------- + /** Returns true, if the passed year is a leap year. */ inline bool lclIsLeapYear( sal_Int32 nYear ) @@ -93,7 +93,7 @@ sal_Int32 lclGetDays( const util::Date& rDate ) } // namespace -// ---------------------------------------------------------------------------- + UnitConverter::UnitConverter( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx index 9d1fba171b46..62e5d437aec0 100644 --- a/sc/source/filter/oox/viewsettings.cxx +++ b/sc/source/filter/oox/viewsettings.cxx @@ -98,7 +98,7 @@ const sal_Int16 API_SPLITPANE_TOPRIGHT = 1; /// Top-right pa const sal_Int16 API_SPLITPANE_BOTTOMLEFT = 2; /// Bottom-left, bottom, left, or single pane. const sal_Int16 API_SPLITPANE_BOTTOMRIGHT = 3; /// Bottom-right, or right pane. -// ---------------------------------------------------------------------------- + /** Returns the OOXML pane identifier from the passed BIFF pane id. */ sal_Int32 lclGetOoxPaneId( sal_Int32 nBiffPaneId, sal_Int32 nDefaultPaneId ) @@ -116,7 +116,7 @@ PaneSelectionModel::PaneSelectionModel() : { } -// ---------------------------------------------------------------------------- + SheetViewModel::SheetViewModel() : mnWorkbookViewId( 0 ), @@ -184,7 +184,7 @@ PaneSelectionModel& SheetViewModel::createPaneSelection( sal_Int32 nPaneId ) return *rxPaneSel; } -// ---------------------------------------------------------------------------- + SheetViewSettings::SheetViewSettings( const WorksheetHelper& rHelper ) : WorksheetHelper( rHelper ) @@ -478,7 +478,7 @@ WorkbookViewModel::WorkbookViewModel() : { } -// ---------------------------------------------------------------------------- + ViewSettings::ViewSettings( const WorkbookHelper& rHelper ) : WorkbookHelper( rHelper ), diff --git a/sc/source/filter/oox/workbookhelper.cxx b/sc/source/filter/oox/workbookhelper.cxx index 32c8bd62cc19..8b5b2f93c52b 100644 --- a/sc/source/filter/oox/workbookhelper.cxx +++ b/sc/source/filter/oox/workbookhelper.cxx @@ -318,7 +318,7 @@ private: boost::scoped_ptr<ScDocumentImport> mxDocImport; }; -// ---------------------------------------------------------------------------- + WorkbookGlobals::WorkbookGlobals( ExcelFilter& rFilter ) : mrBaseFilter( rFilter ), diff --git a/sc/source/filter/oox/worksheethelper.cxx b/sc/source/filter/oox/worksheethelper.cxx index 0a560d1db56d..fb80cd6aea84 100644 --- a/sc/source/filter/oox/worksheethelper.cxx +++ b/sc/source/filter/oox/worksheethelper.cxx @@ -132,7 +132,7 @@ bool ColumnModel::isMergeable( const ColumnModel& rModel ) const (mbCollapsed == rModel.mbCollapsed); } -// ---------------------------------------------------------------------------- + RowModel::RowModel() : mnRow( -1 ), @@ -167,7 +167,7 @@ bool RowModel::isMergeable( const RowModel& rModel ) const (mbCollapsed == rModel.mbCollapsed); } -// ---------------------------------------------------------------------------- + PageBreakModel::PageBreakModel() : mnColRow( 0 ), @@ -175,13 +175,13 @@ PageBreakModel::PageBreakModel() : { } -// ---------------------------------------------------------------------------- + HyperlinkModel::HyperlinkModel() { } -// ---------------------------------------------------------------------------- + ValidationModel::ValidationModel() : mnType( XML_none ), @@ -430,7 +430,7 @@ private: bool mbHasDefWidth; /// True = default column width is set from defaultColWidth attribute. }; -// ---------------------------------------------------------------------------- + WorksheetGlobals::WorksheetGlobals( const WorkbookHelper& rHelper, const ISegmentProgressBarRef& rxProgressBar, WorksheetType eSheetType, sal_Int16 nSheet ) : WorkbookHelper( rHelper ), diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx index 864cf8b997f6..8e8240214031 100644 --- a/sc/source/filter/rtf/expbase.cxx +++ b/sc/source/filter/rtf/expbase.cxx @@ -22,7 +22,7 @@ #include "editutil.hxx" -//------------------------------------------------------------------ + ScExportBase::ScExportBase( SvStream& rStrmP, ScDocument* pDocP, const ScRange& rRangeP ) diff --git a/sc/source/filter/starcalc/collect.cxx b/sc/source/filter/starcalc/collect.cxx index 65cb1d1158fd..a46410591b11 100644 --- a/sc/source/filter/starcalc/collect.cxx +++ b/sc/source/filter/starcalc/collect.cxx @@ -24,15 +24,15 @@ #define MAXCOLLECTIONSIZE 16384 #define MAXDELTA 1024 -// ----------------------------------------------------------------------- + ScDataObject::~ScDataObject() { } -//------------------------------------------------------------------------ + // Collection -//------------------------------------------------------------------------ + static void lcl_DeleteScDataObjects( ScDataObject** p, sal_uInt16 nCount ) { @@ -71,17 +71,17 @@ ScCollection::ScCollection(const ScCollection& rCollection) *this = rCollection; } -//------------------------------------------------------------------------ + ScCollection::~ScCollection() { lcl_DeleteScDataObjects( pItems, nCount ); } -//------------------------------------------------------------------------ + sal_uInt16 ScCollection::GetCount() const { return nCount; } -//------------------------------------------------------------------------ + bool ScCollection::AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject) { @@ -106,14 +106,14 @@ bool ScCollection::AtInsert(sal_uInt16 nIndex, ScDataObject* pScDataObject) return false; } -//------------------------------------------------------------------------ + bool ScCollection::Insert(ScDataObject* pScDataObject) { return AtInsert(nCount, pScDataObject); } -//------------------------------------------------------------------------ + ScDataObject* ScCollection::At(sal_uInt16 nIndex) const { @@ -123,7 +123,7 @@ ScDataObject* ScCollection::At(sal_uInt16 nIndex) const return NULL; } -//------------------------------------------------------------------------ + sal_uInt16 ScCollection::IndexOf(ScDataObject* pScDataObject) const { @@ -135,7 +135,7 @@ sal_uInt16 ScCollection::IndexOf(ScDataObject* pScDataObject) const return nIndex; } -//------------------------------------------------------------------------ + ScCollection& ScCollection::operator=( const ScCollection& r ) { @@ -155,7 +155,7 @@ ScCollection& ScCollection::operator=( const ScCollection& r ) return *this; } -//------------------------------------------------------------------------ + ScDataObject* ScCollection::Clone() const { diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 2fd9bd6ce399..870d80aaca81 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.cxx @@ -400,9 +400,9 @@ template < typename T > sal_uLong insert_new( ScCollection* pCollection, SvStrea return nError; } -//-------------------------------------------- + // Font -//-------------------------------------------- + Sc10FontData::Sc10FontData(SvStream& rStream) { @@ -440,9 +440,9 @@ Sc10FontCollection::Sc10FontCollection(SvStream& rStream) : } } -//-------------------------------------------- + // Benannte-Bereiche -//-------------------------------------------- + Sc10NameData::Sc10NameData(SvStream& rStream) { @@ -484,9 +484,9 @@ Sc10NameCollection::Sc10NameCollection(SvStream& rStream) : } } -//-------------------------------------------- + // Vorlagen -//-------------------------------------------- + Sc10PatternData::Sc10PatternData(SvStream& rStream) { @@ -528,9 +528,9 @@ Sc10PatternCollection::Sc10PatternCollection(SvStream& rStream) : } } -//-------------------------------------------- + // Datenbank -//-------------------------------------------- + Sc10DataBaseData::Sc10DataBaseData(SvStream& rStream) { @@ -896,9 +896,9 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) pSet->Put(SfxBoolItem( ATTR_PAGE_HORCENTER, pPage->HorCenter )); pSet->Put(SfxBoolItem( ATTR_PAGE_VERCENTER, pPage->VerCenter )); - //---------------- + // Area-Parameter: - //---------------- + { ScRange* pRepeatRow = NULL; ScRange* pRepeatCol = NULL; @@ -925,9 +925,9 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) delete pRepeatCol; } - //----------------- + // Table-Parameter: - //----------------- + pSet->Put( SfxBoolItem( ATTR_PAGE_NOTES, pPage->PrintNote ) ); pSet->Put( SfxBoolItem( ATTR_PAGE_GRID, pPage->PrintGrid ) ); pSet->Put( SfxBoolItem( ATTR_PAGE_HEADERS, pPage->PrintColRow ) ); @@ -952,9 +952,9 @@ ScDataObject* Sc10PageData::Clone() const } -//-------------------------------------------- + // Import -//-------------------------------------------- + Sc10Import::Sc10Import(SvStream& rStr, ScDocument* pDocument ) : @@ -1447,7 +1447,7 @@ void Sc10Import::LoadTables() nLen = sizeof(TabName) - 1; TabName[nLen] = 0; - //---------------------------------------------------------- + rStream.ReadUInt16( Display ); if ( Tab == (sal_Int16)nShowTab ) @@ -1478,7 +1478,7 @@ void Sc10Import::LoadTables() aSc30ViewOpt.SetObjMode( VOBJ_TYPE_DRAW, eObjMode ); } - //-------------------------------------------------------------------- + rStream.ReadUChar( Visible ); nError = rStream.GetError(); @@ -2420,7 +2420,7 @@ void Sc10Import::LoadObjects() } } -//----------------------------------------------------------------------------------------------- + FltError ScFormatFilterPluginImpl::ScImportStarCalc10( SvStream& rStream, ScDocument* pDocument ) { diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index 12e1ae97f0db..f4e4ff338590 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.cxx @@ -19,7 +19,7 @@ -//___________________________________________________________________ + #include <stdio.h> #include <sot/storage.hxx> @@ -57,7 +57,7 @@ static OString lcl_DateTimeToOString( const DateTime& rDateTime ) return OString( sBuf ); } -//___________________________________________________________________ + // local functions static void lcl_WriteDateTime( XclExpStream& rStrm, const DateTime& rDateTime ) @@ -98,7 +98,7 @@ static inline void lcl_WriteGUID( XclExpStream& rStrm, const sal_uInt8* pGUID ) rStrm.SetSliceSize( 0 ); } -//___________________________________________________________________ + XclExpUserBView::XclExpUserBView( const OUString& rUsername, const sal_uInt8* pGUID ) : sUsername( rUsername ) @@ -133,7 +133,7 @@ sal_Size XclExpUserBView::GetLen() const return 50 + ((sUsername.Len() > 0) ? sUsername.GetSize() : 0); } -//___________________________________________________________________ + XclExpUserBViewList::XclExpUserBViewList( const ScChangeTrack& rChangeTrack ) { @@ -161,7 +161,7 @@ void XclExpUserBViewList::Save( XclExpStream& rStrm ) (*iter)->Save( rStrm ); } -//___________________________________________________________________ + XclExpUsersViewBegin::XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab ) : nCurrTab( nTab ) @@ -197,7 +197,7 @@ sal_Size XclExpUsersViewBegin::GetLen() const return 64; } -//___________________________________________________________________ + void XclExpUsersViewEnd::SaveCont( XclExpStream& rStrm ) { @@ -214,7 +214,7 @@ sal_Size XclExpUsersViewEnd::GetLen() const return 2; } -//___________________________________________________________________ + void XclExpChTr0x0191::SaveCont( XclExpStream& rStrm ) { @@ -231,7 +231,7 @@ sal_Size XclExpChTr0x0191::GetLen() const return 2; } -//___________________________________________________________________ + void XclExpChTr0x0198::SaveCont( XclExpStream& rStrm ) { @@ -249,7 +249,7 @@ sal_Size XclExpChTr0x0198::GetLen() const return 4; } -//___________________________________________________________________ + void XclExpChTr0x0192::SaveCont( XclExpStream& rStrm ) { @@ -267,7 +267,7 @@ sal_Size XclExpChTr0x0192::GetLen() const return 512; } -//___________________________________________________________________ + void XclExpChTr0x0197::SaveCont( XclExpStream& rStrm ) { @@ -284,7 +284,7 @@ sal_Size XclExpChTr0x0197::GetLen() const return 2; } -//___________________________________________________________________ + XclExpChTrEmpty::~XclExpChTrEmpty() { @@ -300,7 +300,7 @@ sal_Size XclExpChTrEmpty::GetLen() const return 0; } -//___________________________________________________________________ + XclExpChTr0x0195::~XclExpChTr0x0195() { @@ -321,7 +321,7 @@ sal_Size XclExpChTr0x0195::GetLen() const return 162; } -//___________________________________________________________________ + XclExpChTr0x0194::~XclExpChTr0x0194() { @@ -345,7 +345,7 @@ sal_Size XclExpChTr0x0194::GetLen() const return 162; } -//___________________________________________________________________ + XclExpChTrHeader::~XclExpChTrHeader() { @@ -394,7 +394,7 @@ void XclExpChTrHeader::SaveXml( XclExpXmlStream& rRevisionHeadersStrm ) pHeaders->write( ">" ); } -//___________________________________________________________________ + XclExpChTrInfo::~XclExpChTrInfo() { @@ -451,7 +451,7 @@ void XclExpChTrInfo::SaveXml( XclExpXmlStream& rRevisionHeadersStrm ) rRevisionHeadersStrm.PushStream( pRevisionLog ); } -//___________________________________________________________________ + XclExpChTrTabIdBuffer::XclExpChTrTabIdBuffer( sal_uInt16 nCount ) : nBufSize( nCount ), @@ -523,7 +523,7 @@ void XclExpChTrTabIdBuffer::Remove() nLastId--; } -//___________________________________________________________________ + XclExpChTrTabId::XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer, bool bInRevisionHeaders ) : nTabCount( rBuffer.GetBufferCount() ) @@ -590,7 +590,7 @@ void XclExpChTrTabId::SaveXml( XclExpXmlStream& rRevisionLogStrm ) rRevisionLogStrm.PushStream( pRevisionLog ); } -//___________________________________________________________________ + // ! does not copy additional actions XclExpChTrAction::XclExpChTrAction( const XclExpChTrAction& rCopy ) : @@ -694,7 +694,7 @@ sal_Size XclExpChTrAction::GetLen() const return GetHeaderByteCount() + GetActionByteCount(); } -//___________________________________________________________________ + XclExpChTrData::XclExpChTrData() : pString( NULL ), @@ -770,7 +770,7 @@ void XclExpChTrData::Write( XclExpStream& rStrm, const XclExpChTrTabIdBuffer& rT } } -//___________________________________________________________________ + XclExpChTrCellContent::XclExpChTrCellContent( const ScChangeActionContent& rAction, @@ -1034,7 +1034,7 @@ void XclExpChTrCellContent::SaveXml( XclExpXmlStream& rRevisionLogStrm ) pStream->endElement( XML_rcc ); } -//___________________________________________________________________ + XclExpChTrInsert::XclExpChTrInsert( const ScChangeAction& rAction, @@ -1142,7 +1142,7 @@ void XclExpChTrInsert::SaveXml( XclExpXmlStream& rRevisionLogStrm ) pStream->endElement( XML_rrc ); } -//___________________________________________________________________ + XclExpChTrInsertTab::XclExpChTrInsertTab( const ScChangeAction& rAction, @@ -1192,7 +1192,7 @@ void XclExpChTrInsertTab::SaveXml( XclExpXmlStream& rStrm ) FSEND ); } -//___________________________________________________________________ + XclExpChTrMoveRange::XclExpChTrMoveRange( const ScChangeActionMove& rAction, @@ -1271,7 +1271,7 @@ void XclExpChTrMoveRange::SaveXml( XclExpXmlStream& rRevisionLogStrm ) pStream->endElement( XML_rm ); } -//___________________________________________________________________ + XclExpChTr0x014A::XclExpChTr0x014A( const XclExpChTrInsert& rAction ) : XclExpChTrInsert( rAction ) @@ -1319,7 +1319,7 @@ void XclExpChTr0x014A::SaveXml( XclExpXmlStream& rStrm ) pStream->endElement( XML_rfmt ); } -//___________________________________________________________________ + class ExcXmlRecord : public ExcRecord { diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index 4137aa86e20a..808f74cd6ea7 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.cxx @@ -30,7 +30,7 @@ #include "externalrefmgr.hxx" #include "document.hxx" -//___________________________________________________________________ + // class XclImpChangeTrack XclImpChangeTrack::XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStream& rBookStrm ) : @@ -497,7 +497,7 @@ void XclImpChangeTrack::Apply() } } -//___________________________________________________________________ + // class XclImpChTrFmlConverter XclImpChTrFmlConverter::~XclImpChTrFmlConverter() diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index c85644748435..fda87c52b59a 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx @@ -32,7 +32,7 @@ using namespace com::sun::star; using namespace xmloff::token; -//------------------------------------------------------------------ + ScXMLCalculationSettingsContext::ScXMLCalculationSettingsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx index 9696efc91968..510b8dbe0e2a 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx @@ -20,7 +20,7 @@ -//___________________________________________________________________ + #include "XMLCellRangeSourceContext.hxx" #include <sax/tools/converter.hxx> @@ -31,7 +31,7 @@ using namespace ::com::sun::star; -//___________________________________________________________________ + ScMyImpCellRangeSource::ScMyImpCellRangeSource() : nColumns( 0 ), @@ -41,7 +41,7 @@ ScMyImpCellRangeSource::ScMyImpCellRangeSource() : } -//___________________________________________________________________ + ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index 245e2cbdc2eb..a6b7b66f0c68 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.cxx @@ -20,7 +20,7 @@ -//___________________________________________________________________ + #include "XMLConsolidationContext.hxx" #include "document.hxx" #include "rangeutl.hxx" @@ -33,7 +33,7 @@ using namespace ::com::sun::star; using namespace xmloff::token; -//___________________________________________________________________ + ScXMLConsolidationContext::ScXMLConsolidationContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index 4d8b7dbad014..b208c219be56 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.cxx @@ -34,7 +34,7 @@ using namespace ::com::sun::star; using namespace xmloff::token; -//___________________________________________________________________ + ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xModel ) { @@ -47,7 +47,7 @@ ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xMode } -//___________________________________________________________________ + sheet::GeneralFunction ScXMLConverter::GetFunctionFromString( const OUString& sFunction ) { if( IsXMLToken(sFunction, XML_SUM ) ) @@ -105,7 +105,7 @@ ScSubTotalFunc ScXMLConverter::GetSubTotalFuncFromString( const OUString& sFunct } -//___________________________________________________________________ + void ScXMLConverter::GetStringFromFunction( OUString& rString, @@ -164,7 +164,7 @@ void ScXMLConverter::GetStringFromFunction( } -//___________________________________________________________________ + sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString( const OUString& rString ) @@ -181,7 +181,7 @@ sheet::DataPilotFieldOrientation ScXMLConverter::GetOrientationFromString( } -//___________________________________________________________________ + void ScXMLConverter::GetStringFromOrientation( OUString& rString, @@ -215,7 +215,7 @@ void ScXMLConverter::GetStringFromOrientation( } -//___________________________________________________________________ + ScDetectiveObjType ScXMLConverter::GetDetObjTypeFromString( const OUString& rString ) { @@ -246,7 +246,7 @@ bool ScXMLConverter::GetDetOpTypeFromString( ScDetOpType& rDetOpType, const OUSt } -//___________________________________________________________________ + void ScXMLConverter::GetStringFromDetObjType( OUString& rString, @@ -301,7 +301,7 @@ void ScXMLConverter::GetStringFromDetOpType( } -//___________________________________________________________________ + void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) { @@ -335,7 +335,7 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const bool bIsFormula) } -//_____________________________________________________________________ + void ScXMLConverter::ConvertDateTimeToString(const DateTime& aDateTime, OUStringBuffer& sDate) { @@ -560,7 +560,7 @@ bool lclSkipEmptyParentheses( const sal_Unicode*& rpcString, const sal_Unicode* } // namespace -// ---------------------------------------------------------------------------- + void ScXMLConditionHelper::parseCondition( ScXMLConditionParseResult& rParseResult, const OUString& rAttribute, sal_Int32 nStartIndex ) diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index dbfe45d27f9c..4d69a920596f 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star; using namespace xmloff::token; -//------------------------------------------------------------------ + ScXMLDDELinksContext::ScXMLDDELinksContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx index 5e88e781fbb1..fd7e78eea2a2 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.cxx +++ b/sc/source/filter/xml/XMLDetectiveContext.cxx @@ -20,7 +20,7 @@ -//___________________________________________________________________ + #include "XMLDetectiveContext.hxx" #include <sax/tools/converter.hxx> @@ -37,7 +37,7 @@ using namespace ::com::sun::star; using namespace xmloff::token; -//___________________________________________________________________ + ScMyImpDetectiveObj::ScMyImpDetectiveObj() : aSourceRange(), @@ -46,7 +46,7 @@ ScMyImpDetectiveObj::ScMyImpDetectiveObj() : { } -//___________________________________________________________________ + bool ScMyImpDetectiveOp::operator<(const ScMyImpDetectiveOp& rDetOp) const { @@ -69,7 +69,7 @@ bool ScMyImpDetectiveOpArray::GetFirstOp( ScMyImpDetectiveOp& rDetOp ) } -//___________________________________________________________________ + ScXMLDetectiveContext::ScXMLDetectiveContext( ScXMLImport& rImport, @@ -113,7 +113,7 @@ void ScXMLDetectiveContext::EndElement() } -//___________________________________________________________________ + ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext( ScXMLImport& rImport, @@ -194,7 +194,7 @@ void ScXMLDetectiveHighlightedContext::EndElement() } -//___________________________________________________________________ + ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx index 9bbd5ee97ff4..ad4d08a228b1 100644 --- a/sc/source/filter/xml/XMLEmptyContext.cxx +++ b/sc/source/filter/xml/XMLEmptyContext.cxx @@ -20,7 +20,7 @@ #include "XMLEmptyContext.hxx" #include "xmlimprt.hxx" -//------------------------------------------------------------------ + ScXMLEmptyContext::ScXMLEmptyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index 3b5d5cf76556..31b82b694636 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.cxx @@ -234,7 +234,7 @@ void ScMyStyleRanges::SetStylesToRanges(const OUString* pStyleName, ScXMLImport& } } -//---------------------------------------------------------------------------- + ScMyStylesImportHelper::ScMyStylesImportHelper(ScXMLImport& rTempImport) : diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index aa5a9bd3f742..382347ac47b2 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.cxx @@ -25,7 +25,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------ + ScXMLTableShapesContext::ScXMLTableShapesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index 988d7335566d..0131c53455d3 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.cxx @@ -31,7 +31,7 @@ using namespace com::sun::star; using namespace xmloff::token; -//------------------------------------------------------------------ + ScXMLTableSourceContext::ScXMLTableSourceContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index a369c9ae4d1a..c0ef84be5c25 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.cxx @@ -40,7 +40,7 @@ using namespace com::sun::star; using namespace xmloff::token; -//----------------------------------------------------------------------------- + class ScXMLChangeInfoContext : public SvXMLImportContext { @@ -69,7 +69,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLBigRangeContext : public SvXMLImportContext { @@ -93,7 +93,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLCellContentDeletionContext : public SvXMLImportContext { @@ -132,7 +132,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLDependenceContext : public SvXMLImportContext { @@ -156,7 +156,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLDependingsContext : public SvXMLImportContext { @@ -180,7 +180,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLChangeDeletionContext : public SvXMLImportContext { @@ -204,7 +204,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLDeletionsContext : public SvXMLImportContext { @@ -228,7 +228,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLChangeCellContext; @@ -264,7 +264,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLChangeCellContext : public SvXMLImportContext { @@ -307,7 +307,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLPreviousContext : public SvXMLImportContext { @@ -343,7 +343,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLContentChangeContext : public SvXMLImportContext { @@ -367,7 +367,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLInsertionContext : public SvXMLImportContext { @@ -390,7 +390,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLInsertionCutOffContext : public SvXMLImportContext { @@ -413,7 +413,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLMovementCutOffContext : public SvXMLImportContext { @@ -436,7 +436,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLCutOffsContext : public SvXMLImportContext { @@ -459,7 +459,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLDeletionContext : public SvXMLImportContext { @@ -482,7 +482,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLMovementContext : public SvXMLImportContext { @@ -507,7 +507,7 @@ public: virtual void EndElement(); }; -//----------------------------------------------------------------------------- + class ScXMLRejectionContext : public SvXMLImportContext { @@ -530,7 +530,7 @@ public: virtual void EndElement(); }; -//------------------------------------------------------------------ + ScXMLTrackedChangesContext::ScXMLTrackedChangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index afeab260b730..deee3871f8b3 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.cxx @@ -24,7 +24,7 @@ #include "sheetdata.hxx" -// ----------------------------------------------------------------------- + ScSheetSaveData::ScSheetSaveData() : mnStartTab( -1 ), diff --git a/sc/source/filter/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index de6eb7003fcd..51843bcd74e0 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star; using namespace xmloff::token; -//------------------------------------------------------------------ + ScXMLAnnotationData::ScXMLAnnotationData() : mbUseShapePos( false ), @@ -42,7 +42,7 @@ ScXMLAnnotationData::~ScXMLAnnotationData() { } -//------------------------------------------------------------------ + ScXMLAnnotationContext::ScXMLAnnotationContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 2496a94cecfc..e592ed5d3104 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.cxx @@ -56,7 +56,7 @@ using namespace com::sun::star; using namespace xmloff::token; -//------------------------------------------------------------------ + ScXMLBodyContext::ScXMLBodyContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 8fec336fde17..dc80fa338f26 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.cxx @@ -40,7 +40,7 @@ using namespace com::sun::star; using namespace xmloff::token; -//------------------------------------------------------------------ + ScXMLTableColContext::ScXMLTableColContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index 8e3c496226e1..3c73191d6312 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.cxx @@ -29,7 +29,7 @@ using namespace xmloff::token; -//------------------------------------------------------------------ + ScXMLContentContext::ScXMLContentContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 45181098b5b7..15b2cfb3c131 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.cxx @@ -168,7 +168,7 @@ public: virtual void EndElement(); }; -//------------------------------------------------------------------ + ScXMLContentValidationsContext::ScXMLContentValidationsContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index a0b68b08975b..f9763333bbd0 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.cxx @@ -53,7 +53,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; -//------------------------------------------------------------------ + ScXMLDataPilotTablesContext::ScXMLDataPilotTablesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 9478b0ca73a5..ab7e2a642d54 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.cxx @@ -59,7 +59,7 @@ using namespace com::sun::star; using namespace xmloff::token; -//------------------------------------------------------------------ + ScXMLDatabaseRangesContext::ScXMLDatabaseRangesContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index fa4c4407cf88..4be07a04f5d6 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -184,7 +184,7 @@ using ::std::vector; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; -//---------------------------------------------------------------------------- + namespace { @@ -238,7 +238,7 @@ OUString lcl_GetFormattedString( ScDocument* pDoc, const ScAddress& rPos ) } // anonymous namespace -//---------------------------------------------------------------------------- + OUString SAL_CALL ScXMLOOoExport_getImplementationName() throw() { @@ -418,7 +418,7 @@ uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInsta { return (cppu::OWeakObject*)new ScXMLExport(comphelper::getComponentContext(rSMgr), ScXMLOasisExport_Settings_getImplementationName(), EXPORT_SETTINGS|EXPORT_OASIS); } -//---------------------------------------------------------------------------- + class ScXMLShapeExport : public XMLShapeExport { @@ -445,7 +445,7 @@ void ScXMLShapeExport::onExport( const uno::Reference < drawing::XShape >& xShap } } -//---------------------------------------------------------------------------- + sal_Int16 ScXMLExport::GetFieldUnit() { diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 6314b85cd199..d24082ad9315 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -227,7 +227,7 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellAttrTokenMap() return *pTableRowCellAttrTokenMap; } -//---------------------------------------------------------------------------- + @@ -2245,7 +2245,7 @@ ScXMLImport::~ScXMLImport() throw() delete pDetectiveOpArray; } -// --------------------------------------------------------------------- + SvXMLImportContext *ScXMLImport::CreateFontDeclsContext(const sal_uInt16 nPrefix, const OUString& rLocalName, const uno::Reference<xml::sax::XAttributeList>& xAttrList) diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx index 412e96106a4b..33cb0f7bd22f 100644 --- a/sc/source/filter/xml/xmllabri.cxx +++ b/sc/source/filter/xml/xmllabri.cxx @@ -19,7 +19,7 @@ -//___________________________________________________________________ + #include "xmllabri.hxx" #include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> @@ -29,7 +29,7 @@ using namespace ::com::sun::star; using namespace xmloff::token; -//___________________________________________________________________ + ScXMLLabelRangesContext::ScXMLLabelRangesContext( ScXMLImport& rImport, @@ -71,7 +71,7 @@ void ScXMLLabelRangesContext::EndElement() } -//___________________________________________________________________ + ScXMLLabelRangeContext::ScXMLLabelRangeContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index 13d6d2d598ed..b936d4dfa3c3 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.cxx @@ -30,7 +30,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------ + ScXMLNamedExpressionsContext::GlobalInserter::GlobalInserter(ScXMLImport& rImport) : mrImport(rImport) {} diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index 548eafc08c36..7f966cc8c610 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.cxx @@ -45,7 +45,7 @@ using namespace com::sun::star; using namespace xmloff::token; -//------------------------------------------------------------------ + ScXMLTableRowContext::ScXMLTableRowContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx index c18f13b90459..684b45dc1d62 100644 --- a/sc/source/filter/xml/xmlsceni.cxx +++ b/sc/source/filter/xml/xmlsceni.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star; using namespace xmloff::token; -//------------------------------------------------------------------ + ScXMLTableScenarioContext::ScXMLTableScenarioContext( ScXMLImport& rImport, diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index 7792ec09fa9a..c111cf4776f4 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.cxx @@ -35,7 +35,7 @@ using namespace com::sun::star; using namespace xmloff::token; -//------------------------------------------------------------------ + ScXMLSortContext::ScXMLSortContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index 753177e46858..7daa392e9ca7 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.cxx @@ -646,7 +646,7 @@ sal_Int32 XMLTableStyleContext::GetNumberFormat() return nNumberFormat; } -// ---------------------------------------------------------------------------- + SvXMLStyleContext *XMLTableStylesContext::CreateStyleStyleChildContext( sal_uInt16 nFamily, sal_uInt16 nPrefix, const OUString& rLocalName, @@ -929,7 +929,7 @@ sal_Int32 XMLTableStylesContext::GetIndex(const sal_Int16 nContextID) return -1; } -// --------------------------------------------------------------------------- + TYPEINIT1( ScXMLMasterStylesContext, SvXMLStylesContext ); bool ScXMLMasterStylesContext::InsertStyleFamily( sal_uInt16 ) const @@ -1057,7 +1057,7 @@ void ScMasterPageContext::Finish( bool bOverwrite ) ClearContent(OUString(SC_UNO_PAGE_RIGHTHDRCON)); } -// --------------------------------------------------------------------------- + ScCellTextStyleContext::ScCellTextStyleContext( SvXMLImport& rImport, sal_uInt16 nPrfx, const OUString& rLName, const uno::Reference<xml::sax::XAttributeList> & xAttrList, diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index fc23c226cde1..a933a1ee22c1 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.cxx @@ -135,7 +135,7 @@ ScXMLExternalTabData::ScXMLExternalTabData() : { } -//------------------------------------------------------------------ + ScXMLTableContext::ScXMLTableContext( ScXMLImport& rImport, sal_uInt16 nPrfx, diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index fcc7b53ce656..5b3528b6ed9f 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.cxx @@ -74,7 +74,7 @@ using namespace com::sun::star; -// ----------------------------------------------------------------------- + ScXMLImportWrapper::ScXMLImportWrapper(ScDocument& rD, SfxMedium* pM, const uno::Reference < embed::XStorage >& xStor ) : rDoc(rD), @@ -367,7 +367,7 @@ bool ScXMLImportWrapper::Import(bool bStylesOnly, ErrCode& nError) } } - // ------------------------------------- + uno::Reference<task::XStatusIndicator> xStatusIndicator(GetStatusIndicator()); if (xStatusIndicator.is()) diff --git a/sc/source/ui/Accessibility/AccessibilityHints.cxx b/sc/source/ui/Accessibility/AccessibilityHints.cxx index 458169a95a6e..1b72fe1220af 100644 --- a/sc/source/ui/Accessibility/AccessibilityHints.cxx +++ b/sc/source/ui/Accessibility/AccessibilityHints.cxx @@ -21,13 +21,13 @@ using namespace ::com::sun::star; -// ----------------------------------------------------------------------- + TYPEINIT1(ScAccWinFocusLostHint, SfxHint); -// ----------------------------------------------------------------------- + // ScAccWinFocusLostHint - the current window lost its focus (to another application, view or document) -// ----------------------------------------------------------------------- + ScAccWinFocusLostHint::ScAccWinFocusLostHint( const uno::Reference< uno::XInterface >& xOld ) @@ -40,13 +40,13 @@ ScAccWinFocusLostHint::~ScAccWinFocusLostHint() { } -// ----------------------------------------------------------------------- + TYPEINIT1(ScAccWinFocusGotHint, SfxHint); -// ----------------------------------------------------------------------- + // ScAccWinFocusGotHint - the window got the focus (from another application, view or document) -// ----------------------------------------------------------------------- + ScAccWinFocusGotHint::ScAccWinFocusGotHint( const uno::Reference< uno::XInterface >& xNew ) @@ -58,13 +58,13 @@ ScAccWinFocusGotHint::ScAccWinFocusGotHint( ScAccWinFocusGotHint::~ScAccWinFocusGotHint() { } -// ----------------------------------------------------------------------- + TYPEINIT1(ScAccGridWinFocusLostHint, SfxHint); -// ----------------------------------------------------------------------- + // ScAccGridWinFocusLostHint - the current grid window lost its focus (to another application, view or document) -// ----------------------------------------------------------------------- + ScAccGridWinFocusLostHint::ScAccGridWinFocusLostHint(ScSplitPos eOld, const uno::Reference< uno::XInterface >& xOld ) @@ -78,13 +78,13 @@ ScAccGridWinFocusLostHint::~ScAccGridWinFocusLostHint() { } -// ----------------------------------------------------------------------- + TYPEINIT1(ScAccGridWinFocusGotHint, SfxHint); -// ----------------------------------------------------------------------- + // ScAccGridWinFocusGotHint - the grid window got the focus (from another application, view or document) -// ----------------------------------------------------------------------- + ScAccGridWinFocusGotHint::ScAccGridWinFocusGotHint(ScSplitPos eNew, const uno::Reference< uno::XInterface >& xNew ) diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 106954ca3f88..0435444f6d48 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -64,7 +64,7 @@ using ::com::sun::star::beans::PropertyValue; using namespace ::com::sun::star::accessibility; -// ---------------------------------------------------------------------------- + const sal_uInt16 nRulerRole = AccessibleRole::TEXT; const sal_uInt16 nGridRole = AccessibleRole::TABLE; @@ -341,7 +341,7 @@ static void lcl_FillFontAttributes( Sequence< PropertyValue >& rSeq, const Font& -// ---------------------------------------------------------------------------- + DBG_NAME( ScAccessibleCsvRuler ) @@ -887,7 +887,7 @@ static inline sal_uInt32 lcl_GetGridColumn( sal_Int32 nApiColumn ) } -// ---------------------------------------------------------------------------- + DBG_NAME( ScAccessibleCsvGrid ) diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx index e52000678343..92c20abb5e2a 100644 --- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx @@ -803,9 +803,9 @@ Rectangle ScAccessibleDataPilotButton::GetBoundingBox(void) const return Rectangle(); } -// ----------------------------------------------------------------------------- + // XAccessibleAction -// ----------------------------------------------------------------------------- + sal_Int32 ScAccessibleDataPilotButton::getAccessibleActionCount( ) throw (uno::RuntimeException) { return 1; diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index ea6ee790f4da..2eb67e2f6e47 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -442,12 +442,12 @@ sal_Int32 ScAccessibleEditObject::GetFgBgColor( const OUString &strPropColor) return nColor; } //===== XAccessibleSelection ============================================ -//-------------------------------------------------------------------------------- + void SAL_CALL ScAccessibleEditObject::selectAccessibleChild( sal_Int32 ) throw ( IndexOutOfBoundsException, RuntimeException ) { } -//---------------------------------------------------------------------------------- + sal_Bool SAL_CALL ScAccessibleEditObject::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException ) @@ -470,17 +470,17 @@ throw ( IndexOutOfBoundsException, } return sal_False; } -//--------------------------------------------------------------------- + void SAL_CALL ScAccessibleEditObject::clearAccessibleSelection( ) throw ( RuntimeException ) { } -//------------------------------------------------------------------------- + void SAL_CALL ScAccessibleEditObject::selectAllAccessibleChildren( ) throw ( RuntimeException ) { } -//---------------------------------------------------------------------------- + sal_Int32 SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChildCount() throw ( RuntimeException ) { @@ -490,7 +490,7 @@ throw ( RuntimeException ) if( isAccessibleChildSelected(i) ) nCount++; return nCount; } -//-------------------------------------------------------------------------------------- + uno::Reference<XAccessible> SAL_CALL ScAccessibleEditObject::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw ( IndexOutOfBoundsException, RuntimeException) { diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index 6c33149afebf..15364d81c102 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.cxx @@ -38,7 +38,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + ScClient::ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ) : SfxInPlaceClient( pViewShell, pDraw, pObj->GetAspect() ), diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index b46272f3bf76..61eb6db1113e 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -74,15 +74,15 @@ using namespace com::sun::star; -// ----------------------------------------------------------------------- + #define SCDRAWTRANS_TYPE_EMBOBJ 1 #define SCDRAWTRANS_TYPE_DRAWMODEL 2 #define SCDRAWTRANS_TYPE_DOCUMENT 3 -// ----------------------------------------------------------------------- -// ----------------------------------------------------------------------- + + ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContainerShell, const TransferableObjectDescriptor& rDesc ) : diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index c5be05bfb2da..026a5ba053ba 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2460,7 +2460,7 @@ void ScInputHandler::SetMode( ScInputMode eNewMode ) bInOwnChange = false; } -//---------------------------------------------------------------------------------------- + // lcl_IsNumber - true, wenn nur Ziffern (dann keine Autokorrektur) @@ -3811,10 +3811,10 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine ) return bRet; } -//------------------------------------------------------------------------ + // Methoden fuer FunktionsAutopiloten: // InputGetSelection, InputSetSelection, InputReplaceSelection, InputGetFormulaStr -//------------------------------------------------------------------------ + void ScInputHandler::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd ) { @@ -3822,7 +3822,7 @@ void ScInputHandler::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd ) rEnd = nFormSelEnd; } -//------------------------------------------------------------------------ + EditView* ScInputHandler::GetFuncEditView() { @@ -3850,7 +3850,7 @@ EditView* ScInputHandler::GetFuncEditView() return pView; } -//------------------------------------------------------------------------ + void ScInputHandler::InputSetSelection( sal_Int32 nStart, sal_Int32 nEnd ) { @@ -3872,7 +3872,7 @@ void ScInputHandler::InputSetSelection( sal_Int32 nStart, sal_Int32 nEnd ) bModified = true; } -//------------------------------------------------------------------------ + void ScInputHandler::InputReplaceSelection( const OUString& rStr ) { @@ -3936,7 +3936,7 @@ ScInputHdlState::ScInputHdlState( const ScAddress& rCurPos, { } -//------------------------------------------------------------------------ + ScInputHdlState::ScInputHdlState( const ScInputHdlState& rCpy ) : pEditData ( NULL ) @@ -3944,14 +3944,14 @@ ScInputHdlState::ScInputHdlState( const ScInputHdlState& rCpy ) *this = rCpy; } -//------------------------------------------------------------------------ + ScInputHdlState::~ScInputHdlState() { delete pEditData; } -//------------------------------------------------------------------------ + bool ScInputHdlState::operator==( const ScInputHdlState& r ) const { @@ -3962,7 +3962,7 @@ bool ScInputHdlState::operator==( const ScInputHdlState& r ) const && ScGlobal::EETextObjEqual( pEditData, r.pEditData ) ); } -//------------------------------------------------------------------------ + ScInputHdlState& ScInputHdlState::operator=( const ScInputHdlState& r ) { diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 02cb95cc5d87..e9d3923fc205 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2062,7 +2062,7 @@ void ScTextWnd::RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextDat maAccTextDatas.erase( aIt ); } -// ----------------------------------------------------------------------- + void ScTextWnd::DataChanged( const DataChangedEvent& rDCEvt ) { diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx index 5733b14523c0..473e62bad48e 100644 --- a/sc/source/ui/app/lnktrans.cxx +++ b/sc/source/ui/app/lnktrans.cxx @@ -24,7 +24,7 @@ using namespace com::sun::star; -// ----------------------------------------------------------------------- + ScLinkTransferObj::ScLinkTransferObj() { diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index c4efedbf50cc..aa2e77b5bdfd 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -24,7 +24,7 @@ #include "docpool.hxx" #include "msgpool.hxx" -//------------------------------------------------------------------------ + static SfxItemInfo const aMsgItemInfos[] = { @@ -40,7 +40,7 @@ static SfxItemInfo const aMsgItemInfos[] = { SID_PRINTER_NOTFOUND_WARN, SFX_ITEM_POOLABLE } // SCITEM_PRINTWARN }; -//------------------------------------------------------------------------ + ScMessagePool::ScMessagePool() : SfxItemPool ( OUString("ScMessagePool"), diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index bf495d8a1ab7..63a68c9f7f98 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -116,17 +116,17 @@ #include "dwfunctr.hxx" #include "acredlin.hxx" -//------------------------------------------------------------------ -//------------------------------------------------------------------ + + ScResId::ScResId( sal_uInt16 nId ) : ResId( nId, *SC_MOD()->GetResMgr() ) { } -//------------------------------------------------------------------ + void ScDLL::Init() { diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 01ebacbbb545..97b5e889b3cf 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -119,7 +119,7 @@ static sal_uInt16 nIdleCount = 0; -//------------------------------------------------------------------ + SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) ) { @@ -128,7 +128,7 @@ SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) ) SFX_STATUSBAR_REGISTRATION( ScResId(SCCFG_STATUSBAR) ); // nur ID wichtig } -//------------------------------------------------------------------ + ScModule::ScModule( SfxObjectFactory* pFact ) : SfxModule( SfxApplication::CreateResManager( "sc" ), false, pFact, NULL ), @@ -208,7 +208,7 @@ ScModule::~ScModule() DeleteCfg(); // wurde mal aus Exit() gerufen } -//------------------------------------------------------------------ + void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 ) { if ( p == pColorConfig || p == pAccessOptions ) @@ -335,7 +335,7 @@ void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -//------------------------------------------------------------------ + void ScModule::DeleteCfg() { @@ -370,11 +370,11 @@ void ScModule::DeleteCfg() } } -//------------------------------------------------------------------ + // // von der Applikation verschoben: // -//------------------------------------------------------------------ + void ScModule::Execute( SfxRequest& rReq ) { @@ -644,7 +644,7 @@ void ScModule::HideDisabledSlots( SfxItemSet& rSet ) } -//------------------------------------------------------------------ + void ScModule::ResetDragObject() { @@ -713,14 +713,14 @@ ScDocument* ScModule::GetClipDoc() return NULL; } -//------------------------------------------------------------------ + void ScModule::SetSelectionTransfer( ScSelectionTransferObj* pNew ) { pSelTransfer = pNew; } -//------------------------------------------------------------------ + void ScModule::InitFormEditData() { @@ -732,7 +732,7 @@ void ScModule::ClearFormEditData() DELETEZ( pFormEditData ); } -//------------------------------------------------------------------ + void ScModule::SetViewOptions( const ScViewOptions& rOpt ) { @@ -972,11 +972,11 @@ sal_uInt16 ScModule::GetOptDigitLanguage() LANGUAGE_SYSTEM; } -//------------------------------------------------------------------ + // // Optionen // -//------------------------------------------------------------------ + // // ModifyOptions - Items aus Calc-Options-Dialog @@ -997,7 +997,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) GetInputOptions(); OSL_ENSURE( pInputCfg, "InputOptions not initialised :-(" ); - //-------------------------------------------------------------- + SfxViewFrame* pViewFrm = SfxViewFrame::Current(); SfxBindings* pBindings = pViewFrm ? &pViewFrm->GetBindings() : NULL; @@ -1014,7 +1014,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) bool bSaveInputOptions = false; bool bCompileErrorCells = false; - //-------------------------------------------------------------------------- + // SFX_APP()->SetOptions( rOptSet ); @@ -1320,7 +1320,7 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) SFX_APP()->Broadcast( SfxSimpleHint( SID_SCPRINTOPTIONS ) ); } - //---------------------------------------------------------- + if ( bSaveAppOptions ) pAppCfg->OptionsChanged(); @@ -1416,11 +1416,11 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } -//------------------------------------------------------------------ + // // Input-Handler // -//------------------------------------------------------------------ + ScInputHandler* ScModule::GetInputHdl( ScTabViewShell* pViewSh, bool bUseRef ) { @@ -1527,7 +1527,7 @@ ScInputHandler* ScModule::GetRefInputHdl() return pRefInputHandler; } -//------------------------------------------------------------------------ + // Olk's Krempel: void ScModule::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd ) @@ -1601,11 +1601,11 @@ void ScModule::ActivateInputWindow( const OUString* pStrFormula, bool bMatrix ) } } -//------------------------------------------------------------------ + // // Referenz - Dialoge // -//------------------------------------------------------------------ + void ScModule::SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm ) { @@ -1909,11 +1909,11 @@ void ScModule::EndReference() } } -//------------------------------------------------------------------ + // // Idle / Online-Spelling // -//------------------------------------------------------------------ + void ScModule::AnythingChanged() { diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index 160deb25727e..1cc6ba8725e9 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -39,7 +39,7 @@ using namespace com::sun::star; -// ----------------------------------------------------------------------- + static sal_Bool lcl_IsURLButton( SdrObject* pObject ) { @@ -334,14 +334,14 @@ void ScSelectionTransferObj::CreateDrawData() const SdrMarkList& rMarkList = pDrawView->GetMarkedObjectList(); ScDrawView::CheckOle( rMarkList, bAnyOle, bOneOle ); - //--------------------------------------------------------- + ScDocShellRef aDragShellRef; if (bAnyOle) { aDragShellRef = new ScDocShell; // ohne Ref lebt die DocShell nicht !!! aDragShellRef->DoInitNew(NULL); } - //--------------------------------------------------------- + ScDrawLayer::SetGlobalDrawPersist(aDragShellRef); SdrModel* pModel = pDrawView->GetMarkedObjModel(); diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 9f48db9ca9e2..6fa8fa7f2cfd 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -66,14 +66,14 @@ using namespace com::sun::star; -// ----------------------------------------------------------------------- + #define SCTRANS_TYPE_IMPEX 1 #define SCTRANS_TYPE_EDIT_RTF 2 #define SCTRANS_TYPE_EDIT_BIN 3 #define SCTRANS_TYPE_EMBOBJ 4 -// ----------------------------------------------------------------------- + void ScTransferObj::GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCROW& nRow, SCCOL& nCol ) { @@ -115,7 +115,7 @@ void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPr ScPrintFunc::DrawToDev( pDoc, pDev, nPrintFactor, aBound, &aViewData, bMetaFile ); } -// ----------------------------------------------------------------------- + ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDescriptor& rDesc ) : pDoc( pClipDoc ), diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 9ff6be39fa1a..449b281c5e44 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -41,9 +41,9 @@ TYPEINIT1(ScTablesHint, SfxHint); TYPEINIT1(ScEditViewHint, SfxHint); TYPEINIT1(ScIndexHint, SfxHint); -// ----------------------------------------------------------------------- + // ScInputStatusItem - Status-Update fuer Eingabezeile -// ----------------------------------------------------------------------- + ScInputStatusItem::ScInputStatusItem( sal_uInt16 nWhichP, const ScAddress& rCurPos, const ScAddress& rStartPos, @@ -109,9 +109,9 @@ const std::vector<editeng::MisspellRanges>* ScInputStatusItem::GetMisspellRanges // ScPaintHint ist nach schints.cxx verschoben // -// ----------------------------------------------------------------------- + // ScTablesHint - Views anpassen, wenn Tabellen eingefuegt / geloescht -// ----------------------------------------------------------------------- + ScTablesHint::ScTablesHint(sal_uInt16 nNewId, SCTAB nTable1, SCTAB nTable2) : nId( nNewId ), @@ -125,9 +125,9 @@ ScTablesHint::~ScTablesHint() } -// ----------------------------------------------------------------------- + // ScIndexHint -// ----------------------------------------------------------------------- + ScIndexHint::ScIndexHint(sal_uInt16 nNewId, sal_uInt16 nIdx) : nId( nNewId ), @@ -140,9 +140,9 @@ ScIndexHint::~ScIndexHint() } -// ----------------------------------------------------------------------- + // ScEditViewHint - neue EditView fuer Cursorposition anlegen -// ----------------------------------------------------------------------- + ScEditViewHint::ScEditViewHint( ScEditEngineDefaulter* pEngine, const ScAddress& rCurPos ) : pEditEngine( pEngine ), @@ -154,9 +154,9 @@ ScEditViewHint::~ScEditViewHint() { } -// ----------------------------------------------------------------------- + // ScSortItem - Daten fuer den Sortierdialog -// ----------------------------------------------------------------------- + ScSortItem::ScSortItem( sal_uInt16 nWhichP, ScViewData* ptrViewData, @@ -167,7 +167,7 @@ ScSortItem::ScSortItem( sal_uInt16 nWhichP, if ( pSortData ) theSortData = *pSortData; } -//------------------------------------------------------------------------ + ScSortItem::ScSortItem( sal_uInt16 nWhichP, const ScSortParam* pSortData ) : @@ -177,7 +177,7 @@ ScSortItem::ScSortItem( sal_uInt16 nWhichP, if ( pSortData ) theSortData = *pSortData; } -//------------------------------------------------------------------------ + ScSortItem::ScSortItem( const ScSortItem& rItem ) : SfxPoolItem ( rItem ), @@ -190,14 +190,14 @@ ScSortItem::~ScSortItem() { } -//------------------------------------------------------------------------ + OUString ScSortItem::GetValueText() const { return OUString("SortItem"); } -//------------------------------------------------------------------------ + bool ScSortItem::operator==( const SfxPoolItem& rItem ) const { @@ -209,14 +209,14 @@ bool ScSortItem::operator==( const SfxPoolItem& rItem ) const && (theSortData == rOther.theSortData) ); } -//------------------------------------------------------------------------ + SfxPoolItem* ScSortItem::Clone( SfxItemPool * ) const { return new ScSortItem( *this ); } -//------------------------------------------------------------------------ + bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const { @@ -225,9 +225,9 @@ bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMembe return true; } -// ----------------------------------------------------------------------- + // ScQueryItem - Daten fuer den Filterdialog -// ----------------------------------------------------------------------- + ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, ScViewData* ptrViewData, @@ -243,7 +243,7 @@ ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, mpQueryData.reset(new ScQueryParam); } -//------------------------------------------------------------------------ + ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, const ScQueryParam* pQueryData ) : @@ -258,7 +258,7 @@ ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, mpQueryData.reset(new ScQueryParam); } -//------------------------------------------------------------------------ + ScQueryItem::ScQueryItem( const ScQueryItem& rItem ) : SfxPoolItem ( rItem ), @@ -273,7 +273,7 @@ ScQueryItem::~ScQueryItem() { } -//------------------------------------------------------------------------ + void ScQueryItem::SetAdvancedQuerySource(const ScRange* pSource) { @@ -297,14 +297,14 @@ bool ScQueryItem::GetAdvancedQuerySource(ScRange& rSource) const return bIsAdvanced; } -//------------------------------------------------------------------------ + OUString ScQueryItem::GetValueText() const { return OUString("QueryItem"); } -//------------------------------------------------------------------------ + bool ScQueryItem::operator==( const SfxPoolItem& rItem ) const { @@ -318,16 +318,16 @@ bool ScQueryItem::operator==( const SfxPoolItem& rItem ) const && (*mpQueryData == *rQueryItem.mpQueryData) ); } -//------------------------------------------------------------------------ + SfxPoolItem* ScQueryItem::Clone( SfxItemPool * ) const { return new ScQueryItem( *this ); } -// ----------------------------------------------------------------------- + // ScSubTotalItem - Daten fuer den Zwischenergebnisdialog -// ----------------------------------------------------------------------- + ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP, ScViewData* ptrViewData, @@ -338,7 +338,7 @@ ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP, if ( pSubTotalData ) theSubTotalData = *pSubTotalData; } -//------------------------------------------------------------------------ + ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP, const ScSubTotalParam* pSubTotalData ) : @@ -348,7 +348,7 @@ ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP, if ( pSubTotalData ) theSubTotalData = *pSubTotalData; } -//------------------------------------------------------------------------ + ScSubTotalItem::ScSubTotalItem( const ScSubTotalItem& rItem ) : SfxPoolItem ( rItem ), @@ -361,14 +361,14 @@ ScSubTotalItem::~ScSubTotalItem() { } -//------------------------------------------------------------------------ + OUString ScSubTotalItem::GetValueText() const { return OUString("SubTotalItem"); } -//------------------------------------------------------------------------ + bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const { @@ -380,14 +380,14 @@ bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const && (theSubTotalData == rSTItem.theSubTotalData) ); } -//------------------------------------------------------------------------ + SfxPoolItem* ScSubTotalItem::Clone( SfxItemPool * ) const { return new ScSubTotalItem( *this ); } -//------------------------------------------------------------------------ + bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const { @@ -396,9 +396,9 @@ bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nM return true; } -// ----------------------------------------------------------------------- + // ScUserListItem - Transporter fuer den Benutzerlisten-TabPage -// ----------------------------------------------------------------------- + ScUserListItem::ScUserListItem( sal_uInt16 nWhichP ) : SfxPoolItem ( nWhichP ), @@ -406,7 +406,7 @@ ScUserListItem::ScUserListItem( sal_uInt16 nWhichP ) { } -//------------------------------------------------------------------------ + ScUserListItem::ScUserListItem( const ScUserListItem& rItem ) : SfxPoolItem ( rItem ) @@ -422,14 +422,14 @@ ScUserListItem::~ScUserListItem() delete pUserList; } -//------------------------------------------------------------------------ + OUString ScUserListItem::GetValueText() const { return OUString("ScUserListItem"); } -//------------------------------------------------------------------------ + bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const { @@ -447,14 +447,14 @@ bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const } -//------------------------------------------------------------------------ + SfxPoolItem* ScUserListItem::Clone( SfxItemPool * ) const { return new ScUserListItem( *this ); } -//------------------------------------------------------------------------ + void ScUserListItem::SetUserList( const ScUserList& rUserList ) { @@ -462,9 +462,9 @@ void ScUserListItem::SetUserList( const ScUserList& rUserList ) pUserList = new ScUserList( rUserList ); } -// ----------------------------------------------------------------------- + // ScConsolidateItem - Daten fuer den Konsolidieren-Dialog -// ----------------------------------------------------------------------- + ScConsolidateItem::ScConsolidateItem( sal_uInt16 nWhichP, @@ -474,7 +474,7 @@ ScConsolidateItem::ScConsolidateItem( if ( pConsolidateData ) theConsData = *pConsolidateData; } -//------------------------------------------------------------------------ + ScConsolidateItem::ScConsolidateItem( const ScConsolidateItem& rItem ) : SfxPoolItem ( rItem ), @@ -482,20 +482,20 @@ ScConsolidateItem::ScConsolidateItem( const ScConsolidateItem& rItem ) : { } -//------------------------------------------------------------------------ + ScConsolidateItem::~ScConsolidateItem() { } -//------------------------------------------------------------------------ + OUString ScConsolidateItem::GetValueText() const { return OUString("ScConsolidateItem"); } -//------------------------------------------------------------------------ + bool ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const { @@ -506,7 +506,7 @@ bool ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const return ( theConsData == rCItem.theConsData); } -//------------------------------------------------------------------------ + SfxPoolItem* ScConsolidateItem::Clone( SfxItemPool * ) const { @@ -514,9 +514,9 @@ SfxPoolItem* ScConsolidateItem::Clone( SfxItemPool * ) const } -// ----------------------------------------------------------------------- + // ScPivotItem - Daten fuer den Pivot-Dialog -// ----------------------------------------------------------------------- + ScPivotItem::ScPivotItem( sal_uInt16 nWhichP, const ScDPSaveData* pData, const ScRange* pRange, bool bNew ) : @@ -531,7 +531,7 @@ ScPivotItem::ScPivotItem( sal_uInt16 nWhichP, const ScDPSaveData* pData, bNewSheet = bNew; } -//------------------------------------------------------------------------ + ScPivotItem::ScPivotItem( const ScPivotItem& rItem ) : SfxPoolItem ( rItem ), @@ -542,21 +542,21 @@ ScPivotItem::ScPivotItem( const ScPivotItem& rItem ) : pSaveData = new ScDPSaveData(*rItem.pSaveData); } -//------------------------------------------------------------------------ + ScPivotItem::~ScPivotItem() { delete pSaveData; } -//------------------------------------------------------------------------ + OUString ScPivotItem::GetValueText() const { return OUString("ScPivotItem"); } -//------------------------------------------------------------------------ + bool ScPivotItem::operator==( const SfxPoolItem& rItem ) const { @@ -569,7 +569,7 @@ bool ScPivotItem::operator==( const SfxPoolItem& rItem ) const bNewSheet == rPItem.bNewSheet ); } -//------------------------------------------------------------------------ + SfxPoolItem* ScPivotItem::Clone( SfxItemPool * ) const { @@ -577,9 +577,9 @@ SfxPoolItem* ScPivotItem::Clone( SfxItemPool * ) const } -// ----------------------------------------------------------------------- + // ScSolveItem - Daten fuer den Solver-Dialog -// ----------------------------------------------------------------------- + ScSolveItem::ScSolveItem( sal_uInt16 nWhichP, const ScSolveParam* pSolveData ) @@ -588,7 +588,7 @@ ScSolveItem::ScSolveItem( sal_uInt16 nWhichP, if ( pSolveData ) theSolveData = *pSolveData; } -//------------------------------------------------------------------------ + ScSolveItem::ScSolveItem( const ScSolveItem& rItem ) : SfxPoolItem ( rItem ), @@ -596,20 +596,20 @@ ScSolveItem::ScSolveItem( const ScSolveItem& rItem ) { } -//------------------------------------------------------------------------ + ScSolveItem::~ScSolveItem() { } -//------------------------------------------------------------------------ + OUString ScSolveItem::GetValueText() const { return OUString("ScSolveItem"); } -//------------------------------------------------------------------------ + bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const { @@ -620,16 +620,16 @@ bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const return ( theSolveData == rPItem.theSolveData ); } -//------------------------------------------------------------------------ + SfxPoolItem* ScSolveItem::Clone( SfxItemPool * ) const { return new ScSolveItem( *this ); } -// ----------------------------------------------------------------------- + // ScTabOpItem - Daten fuer den TabOp-Dialog -// ----------------------------------------------------------------------- + ScTabOpItem::ScTabOpItem( sal_uInt16 nWhichP, const ScTabOpParam* pTabOpData ) @@ -638,7 +638,7 @@ ScTabOpItem::ScTabOpItem( sal_uInt16 nWhichP, if ( pTabOpData ) theTabOpData = *pTabOpData; } -//------------------------------------------------------------------------ + ScTabOpItem::ScTabOpItem( const ScTabOpItem& rItem ) : SfxPoolItem ( rItem ), @@ -646,20 +646,20 @@ ScTabOpItem::ScTabOpItem( const ScTabOpItem& rItem ) { } -//------------------------------------------------------------------------ + ScTabOpItem::~ScTabOpItem() { } -//------------------------------------------------------------------------ + OUString ScTabOpItem::GetValueText() const { return OUString("ScTabOpItem"); } -//------------------------------------------------------------------------ + bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const { @@ -670,7 +670,7 @@ bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const return ( theTabOpData == rPItem.theTabOpData ); } -//------------------------------------------------------------------------ + SfxPoolItem* ScTabOpItem::Clone( SfxItemPool * ) const { diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index fcd0da3eaf62..ca79984636cb 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -69,13 +69,13 @@ ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet* p AddTabPage( "cellprotection" , ScTabPageProtection::Create, 0 ); } -// ----------------------------------------------------------------------- + ScAttrDlg::~ScAttrDlg() { } -// ----------------------------------------------------------------------- + void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) { @@ -97,7 +97,7 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ScAttrDlg, OkHandler) { diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index b4f30e43f069..88090598be77 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -68,14 +68,14 @@ sal_uInt16* ScTabPageProtection::GetRanges() return pProtectionRanges; } -// ----------------------------------------------------------------------- + SfxTabPage* ScTabPageProtection::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTabPageProtection( pParent, rAttrSet ) ); } -//------------------------------------------------------------------------ + void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) { @@ -120,7 +120,7 @@ void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) UpdateButtons(); } -// ----------------------------------------------------------------------- + sal_Bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) { @@ -144,7 +144,7 @@ sal_Bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) bAttrsChanged = !pOldItem || !( aProtAttr == *(const ScProtectionAttr*)pOldItem ); } - //-------------------------------------------------- + if ( bAttrsChanged ) rCoreAttrs.Put( aProtAttr ); @@ -154,7 +154,7 @@ sal_Bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) return bAttrsChanged; } -//------------------------------------------------------------------------ + int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) { @@ -164,7 +164,7 @@ int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } -//------------------------------------------------------------------------ + IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox ) { @@ -195,7 +195,7 @@ IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox ) return 0; } -//------------------------------------------------------------------------ + void ScTabPageProtection::UpdateButtons() { diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx index dde551d844ab..5bba027c5f8b 100644 --- a/sc/source/ui/cctrl/cbuttonw.cxx +++ b/sc/source/ui/cctrl/cbuttonw.cxx @@ -35,20 +35,20 @@ ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice ) SetOptSizePixel(); } -// ------------------------------------------------------------------------- + ScDDComboBoxButton::~ScDDComboBoxButton() { } -// ------------------------------------------------------------------------- + void ScDDComboBoxButton::SetOutputDevice( OutputDevice* pOutputDevice ) { pOut = pOutputDevice; } -// ------------------------------------------------------------------------- + void ScDDComboBoxButton::SetOptSizePixel() { @@ -57,7 +57,7 @@ void ScDDComboBoxButton::SetOptSizePixel() aBtnSize.Width() = pOut->GetSettings().GetStyleSettings().GetScrollBarSize(); } -// ------------------------------------------------------------------------- + void ScDDComboBoxButton::Draw( const Point& rAt, const Size& rSize, @@ -116,7 +116,7 @@ void ScDDComboBoxButton::Draw( const Point& rAt, pOut->SetFillColor(); } -//------------------------------------------------------------------------ + void ScDDComboBoxButton::ImpDrawArrow( const Rectangle& rRect, bool bState ) diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 0ae9ba297c28..9e017bc5cd26 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -48,7 +48,7 @@ ScMenuFloatingWindow::MenuItemData::MenuItemData() : { } -// ---------------------------------------------------------------------------- + ScMenuFloatingWindow::SubMenuItemData::SubMenuItemData(ScMenuFloatingWindow* pParent) : mpSubMenu(NULL), @@ -72,7 +72,7 @@ IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) return 0; } -// ---------------------------------------------------------------------------- + size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999; @@ -872,7 +872,7 @@ ScCheckListMenuWindow::Member::Member() : { } -// ---------------------------------------------------------------------------- + ScCheckListMenuWindow::CancelButton::CancelButton(ScCheckListMenuWindow* pParent) : ::CancelButton(pParent), mpParent(pParent) {} @@ -883,7 +883,7 @@ void ScCheckListMenuWindow::CancelButton::Click() ::CancelButton::Click(); } -// ---------------------------------------------------------------------------- + ScCheckListMenuWindow::ScCheckListMenuWindow(Window* pParent, ScDocument* pDoc) : ScMenuFloatingWindow(pParent, pDoc), diff --git a/sc/source/ui/cctrl/popmenu.cxx b/sc/source/ui/cctrl/popmenu.cxx index 9d30eb3c495f..e6fb1dcce058 100644 --- a/sc/source/ui/cctrl/popmenu.cxx +++ b/sc/source/ui/cctrl/popmenu.cxx @@ -19,7 +19,7 @@ #include "popmenu.hxx" -//------------------------------------------------------------------ + void ScPopupMenu::Select() { diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index 94bb5a67111a..f6d1f9047ff6 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -34,15 +34,15 @@ #include "scresid.hxx" #include "sc.hrc" -// ----------------------------------------------------------------------- + SFX_IMPL_TOOLBOX_CONTROL( ScTbxInsertCtrl, SfxUInt16Item); -//------------------------------------------------------------------ + // // ToolBox - Controller // -//------------------------------------------------------------------ + ScTbxInsertCtrl::ScTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index ce5753ca96e5..8d5a26212f7f 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -39,11 +39,11 @@ // class ScZoomSliderControl --------------------------------------- //======================================================================== -// ----------------------------------------------------------------------- + SFX_IMPL_TOOLBOX_CONTROL( ScZoomSliderControl, SvxZoomSliderItem ); -// ----------------------------------------------------------------------- + ScZoomSliderControl::ScZoomSliderControl( sal_uInt16 nSlotId, @@ -54,14 +54,14 @@ ScZoomSliderControl::ScZoomSliderControl( rTbx.Invalidate(); } -// ----------------------------------------------------------------------- + ScZoomSliderControl::~ScZoomSliderControl() { } -// ----------------------------------------------------------------------- + void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) @@ -89,7 +89,7 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState } } -// ----------------------------------------------------------------------- + Window* ScZoomSliderControl::CreateItemWindow( Window *pParent ) { @@ -101,7 +101,7 @@ Window* ScZoomSliderControl::CreateItemWindow( Window *pParent ) return pSlider; } -// ----------------------------------------------------------------------- + struct ScZoomSliderWnd::ScZoomSliderWnd_Impl { @@ -134,7 +134,7 @@ struct ScZoomSliderWnd::ScZoomSliderWnd_Impl } }; -// ----------------------------------------------------------------------- + const long nButtonWidth = 10; const long nButtonHeight = 10; @@ -148,7 +148,7 @@ const long nSnappingEpsilon = 5; // snapping epsilon in pixels const long nSnappingPointsMinDist = nSnappingEpsilon; // minimum distance of two adjacent snapping points -// ----------------------------------------------------------------------- + sal_uInt16 ScZoomSliderWnd::Offset2Zoom( long nOffset ) const { @@ -209,7 +209,7 @@ sal_uInt16 ScZoomSliderWnd::Offset2Zoom( long nOffset ) const return nRet; } -// ----------------------------------------------------------------------- + long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const { @@ -237,7 +237,7 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const return nRect; } -// ----------------------------------------------------------------------- + ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, @@ -255,14 +255,14 @@ ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno:: SetSizePixel( Size( aSliderSize.Width() * nSliderWidth-1, aSliderSize.Height() + nSliderHeight ) ); } -// ----------------------------------------------------------------------- + ScZoomSliderWnd::~ScZoomSliderWnd() { delete mpImpl; } -// ----------------------------------------------------------------------- + void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -320,7 +320,7 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) mpImpl->mbOmitPaint = false; } -// ----------------------------------------------------------------------- + void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) { @@ -362,7 +362,7 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) } } -// ----------------------------------------------------------------------- + void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) { @@ -414,14 +414,14 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) Paint(aRect); } -// ----------------------------------------------------------------------- + void ScZoomSliderWnd::Paint( const Rectangle& rRect ) { DoPaint( rRect ); } -// ----------------------------------------------------------------------- + void ScZoomSliderWnd::DoPaint( const Rectangle& /*rRect*/ ) { @@ -519,6 +519,6 @@ void ScZoomSliderWnd::DoPaint( const Rectangle& /*rRect*/ ) } -// ----------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 3e659f42489d..4f12df30bcab 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -380,9 +380,9 @@ IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl ) return 0; } -//--------------------------------------------------- + //ScCondFormatDlg -//--------------------------------------------------- + ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx index ae7b198b116e..2f9fdc6daf37 100644 --- a/sc/source/ui/dbgui/csvsplits.cxx +++ b/sc/source/ui/dbgui/csvsplits.cxx @@ -65,7 +65,7 @@ bool ScCsvSplits::HasSplit( sal_Int32 nPos ) const } -// ---------------------------------------------------------------------------- + sal_uInt32 ScCsvSplits::GetIndex( sal_Int32 nPos ) const { @@ -94,7 +94,7 @@ sal_Int32 ScCsvSplits::GetPos( sal_uInt32 nIndex ) const } -// ---------------------------------------------------------------------------- + sal_uInt32 ScCsvSplits::GetIterIndex( const_iterator aIter ) const { diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index f3eaad9067e1..09af5929ba41 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include <vcl/waitobj.hxx> #include <comphelper/processfactory.hxx> @@ -44,7 +44,7 @@ using namespace com::sun::star; #include "miscuno.hxx" #include "dpsdbtab.hxx" -//------------------------------------------------------------------------- + // entries in the "type" ListBox @@ -52,7 +52,7 @@ using namespace com::sun::star; #define DP_TYPELIST_QUERY 1 #define DP_TYPELIST_SQLNAT 3 -//------------------------------------------------------------------------- + ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) : ModalDialog(pParent, "SelectDataSourceDialog", diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 495ea0df0829..63a07ffd13e1 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include "dapitype.hxx" #include "scresid.hxx" @@ -31,7 +31,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------- + ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal) : ModalDialog( pParent, "SelectSourceDialog", "modules/scalc/ui/selectsource.ui" ) @@ -101,7 +101,7 @@ IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn ) return 0; } -//------------------------------------------------------------------------- + ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent, const uno::Sequence<OUString>& rServices ) : diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 715a6b9e310a..019cfe2e2d39 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -37,7 +37,7 @@ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D -//---------------------------------------------------------------------------- + class DBSaveData; @@ -78,7 +78,7 @@ private: -//---------------------------------------------------------------------------- + void DBSaveData::Save() { @@ -92,7 +92,7 @@ void DBSaveData::Save() } -//---------------------------------------------------------------------------- + void DBSaveData::Restore() { @@ -112,7 +112,7 @@ void DBSaveData::Restore() //============================================================================ // class ScDbNameDlg -//---------------------------------------------------------------------------- + ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData) @@ -164,7 +164,7 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, } -//---------------------------------------------------------------------------- + ScDbNameDlg::~ScDbNameDlg() { @@ -172,7 +172,7 @@ ScDbNameDlg::~ScDbNameDlg() } -//---------------------------------------------------------------------------- + void ScDbNameDlg::Init() { @@ -272,7 +272,7 @@ void ScDbNameDlg::SetInfoStrings( const ScDBData* pDBData ) m_pFTOperations->SetText(aBuf.makeStringAndClear()); } -//---------------------------------------------------------------------------- + // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Fenster angezeigt wird. @@ -295,14 +295,14 @@ void ScDbNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } -//---------------------------------------------------------------------------- + bool ScDbNameDlg::Close() { return DoClose( ScDbNameDlgWrapper::GetChildWindowId() ); } -//------------------------------------------------------------------------ + void ScDbNameDlg::SetActive() { @@ -315,7 +315,7 @@ void ScDbNameDlg::SetActive() RefInputDone(); } -//------------------------------------------------------------------------ + void ScDbNameDlg::UpdateNames() { @@ -324,7 +324,7 @@ void ScDbNameDlg::UpdateNames() const DBsType& rDBs = aLocalDbCol.getNamedDBs(); m_pEdName->SetUpdateMode( false ); - //----------------------------------------------------------- + m_pEdName->Clear(); m_pEdAssign->SetText( EMPTY_OUSTRING ); @@ -340,12 +340,12 @@ void ScDbNameDlg::UpdateNames() m_pBtnAdd->Disable(); m_pBtnRemove->Disable(); } - //----------------------------------------------------------- + m_pEdName->SetUpdateMode( true ); m_pEdName->Invalidate(); } -//------------------------------------------------------------------------ + void ScDbNameDlg::UpdateDBData( const OUString& rStrName ) { @@ -379,7 +379,7 @@ void ScDbNameDlg::UpdateDBData( const OUString& rStrName ) m_pOptions->Enable(); } -//------------------------------------------------------------------------ + bool ScDbNameDlg::IsRefInputMode() const @@ -387,7 +387,7 @@ bool ScDbNameDlg::IsRefInputMode() const return bRefInputMode; } -//------------------------------------------------------------------------ + // Handler: // ======== @@ -406,7 +406,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG_INLINE_START(ScDbNameDlg, CancelBtnHdl) { @@ -415,7 +415,7 @@ IMPL_LINK_NOARG_INLINE_START(ScDbNameDlg, CancelBtnHdl) } IMPL_LINK_NOARG_INLINE_END(ScDbNameDlg, CancelBtnHdl) -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) { @@ -564,7 +564,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl) { @@ -630,7 +630,7 @@ IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl) { diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 252803b600e3..e94e2c50fc95 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -115,7 +115,7 @@ IMPL_LINK( ScDPGroupEditHelper, ClickHdl, RadioButton*, pButton ) return 0; } -// ---------------------------------------------------------------------------- + ScDPNumGroupEditHelper::ScDPNumGroupEditHelper( RadioButton& rRbAuto, RadioButton& rRbMan, ScDoubleField& rEdValue ) : @@ -134,7 +134,7 @@ void ScDPNumGroupEditHelper::ImplSetValue( double fValue ) mrEdValue.SetValue( fValue ); } -// ---------------------------------------------------------------------------- + ScDPDateGroupEditHelper::ScDPDateGroupEditHelper( RadioButton& rRbAuto, RadioButton& rRbMan, DateField& rEdValue, const Date& rNullDate ) : diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index 9564ef4418f4..65fd7a6cc826 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -1230,7 +1230,7 @@ ScDPRowFieldControl::~ScDPRowFieldControl() { } -//------------------------------------------------------------------- + Point ScDPRowFieldControl::GetFieldPosition(size_t nIndex) { @@ -1358,7 +1358,7 @@ size_t ScDPRowFieldControl::GetDisplayPosition(size_t nIndex) const return INVALID_INDEX; } -//------------------------------------------------------------------- + OUString ScDPRowFieldControl::GetDescription() const { diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 982bcdcd69f6..ce067fb1c9cc 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -161,7 +161,7 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, } -//---------------------------------------------------------------------------- + ScFilterDlg::~ScFilterDlg() { @@ -174,7 +174,7 @@ ScFilterDlg::~ScFilterDlg() } -//---------------------------------------------------------------------------- + void ScFilterDlg::Init( const SfxItemSet& rArgSet ) { @@ -389,7 +389,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) } -//---------------------------------------------------------------------------- + bool ScFilterDlg::Close() { @@ -400,7 +400,7 @@ bool ScFilterDlg::Close() } -//---------------------------------------------------------------------------- + // Mouse-selected cell area becomes the new selection and is shown in the // reference text box @@ -416,7 +416,7 @@ void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } -//---------------------------------------------------------------------------- + void ScFilterDlg::SetActive() { @@ -432,7 +432,7 @@ void ScFilterDlg::SetActive() RefInputDone(); } -//---------------------------------------------------------------------------- + void ScFilterDlg::FillFieldLists() { @@ -611,7 +611,7 @@ void ScFilterDlg::UpdateHdrInValueList( size_t nList ) } } -//---------------------------------------------------------------------------- + void ScFilterDlg::ClearValueList( size_t nList ) { @@ -626,7 +626,7 @@ void ScFilterDlg::ClearValueList( size_t nList ) } -//---------------------------------------------------------------------------- + size_t ScFilterDlg::GetFieldSelPos( SCCOL nField ) { @@ -636,7 +636,7 @@ size_t ScFilterDlg::GetFieldSelPos( SCCOL nField ) return 0; } -//---------------------------------------------------------------------------- + ScQueryItem* ScFilterDlg::GetOutputItem() { @@ -682,7 +682,7 @@ ScQueryItem* ScFilterDlg::GetOutputItem() } -//---------------------------------------------------------------------------- + bool ScFilterDlg::IsRefInputMode() const { @@ -690,7 +690,7 @@ bool ScFilterDlg::IsRefInputMode() const } -//---------------------------------------------------------------------------- + // Handler: // ======== @@ -731,7 +731,7 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) return 0; } -//---------------------------------------------------------------------------- + IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl) { @@ -747,7 +747,7 @@ IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl) return 0; } -//---------------------------------------------------------------------------- + IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) { @@ -763,7 +763,7 @@ IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) } -//---------------------------------------------------------------------------- + IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) { @@ -1020,7 +1020,7 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) } -//---------------------------------------------------------------------------- + IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { @@ -1061,7 +1061,7 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) } -//---------------------------------------------------------------------------- + IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) { @@ -1147,7 +1147,7 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) return 0; } -//---------------------------------------------------------------------------- + IMPL_LINK_NOARG(ScFilterDlg, ScrollHdl) { SliderMoved(); diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 6af9cfe5e391..58d540974438 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -29,9 +29,9 @@ #include "foptmgr.hxx" -//---------------------------------------------------------------------------- + // ScFilterOptionsMgr (.ui's option helper) -//---------------------------------------------------------------------------- + ScFilterOptionsMgr::ScFilterOptionsMgr( ScViewData* ptrViewData, @@ -69,7 +69,7 @@ ScFilterOptionsMgr::ScFilterOptionsMgr( } -//---------------------------------------------------------------------------- + ScFilterOptionsMgr::~ScFilterOptionsMgr() { @@ -81,7 +81,7 @@ ScFilterOptionsMgr::~ScFilterOptionsMgr() } -//---------------------------------------------------------------------------- + void ScFilterOptionsMgr::Init() { @@ -171,7 +171,7 @@ void ScFilterOptionsMgr::Init() pFtDbArea->SetText( OUString() ); } - //------------------------------------------------------ + // Kopierposition: if ( !rQueryData.bInplace ) @@ -204,7 +204,7 @@ void ScFilterOptionsMgr::Init() pEdCopyArea->SetText( EMPTY_OUSTRING ); } -//---------------------------------------------------------------------------- + bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const { @@ -219,10 +219,10 @@ bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const return ( SCA_VALID == (nResult & SCA_VALID) ); } -//---------------------------------------------------------------------------- + // Handler: -//---------------------------------------------------------------------------- + IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) { @@ -241,7 +241,7 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) } -//---------------------------------------------------------------------------- + IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) { @@ -276,7 +276,7 @@ IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) } -//---------------------------------------------------------------------------- + IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox*, pBox ) { diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx index 5c2124c79a1f..778d018f6899 100644 --- a/sc/source/ui/dbgui/imoptdlg.cxx +++ b/sc/source/ui/dbgui/imoptdlg.cxx @@ -26,7 +26,7 @@ static const sal_Char pStrFix[] = "FIX"; -//------------------------------------------------------------------------ + // Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) // darum ab Version 336 Komma stattdessen @@ -76,7 +76,7 @@ ScImportOptions::ScImportOptions( const OUString& rStr ) } } -//------------------------------------------------------------------------ + OUString ScImportOptions::BuildString() const { @@ -98,7 +98,7 @@ OUString ScImportOptions::BuildString() const return aResult; } -//------------------------------------------------------------------------ + void ScImportOptions::SetTextEncoding( rtl_TextEncoding nEnc ) { diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index a71c97a7d130..4d1b0100643f 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -100,7 +100,7 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, FreeResource(); } -//------------------------------------------------------------------------ + ScPivotFilterDlg::~ScPivotFilterDlg() { @@ -111,7 +111,7 @@ ScPivotFilterDlg::~ScPivotFilterDlg() delete pOutItem; } -//------------------------------------------------------------------------ + void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) { @@ -265,7 +265,7 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) } } -//------------------------------------------------------------------------ + void ScPivotFilterDlg::FillFieldLists() { @@ -302,7 +302,7 @@ void ScPivotFilterDlg::FillFieldLists() } } -//------------------------------------------------------------------------ + void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList ) { @@ -348,7 +348,7 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList ) } } -//------------------------------------------------------------------------ + void ScPivotFilterDlg::ClearValueList( sal_uInt16 nList ) { @@ -362,7 +362,7 @@ void ScPivotFilterDlg::ClearValueList( sal_uInt16 nList ) } } -//------------------------------------------------------------------------ + sal_uInt16 ScPivotFilterDlg::GetFieldSelPos( SCCOL nField ) { @@ -372,7 +372,7 @@ sal_uInt16 ScPivotFilterDlg::GetFieldSelPos( SCCOL nField ) return 0; } -//------------------------------------------------------------------------ + const ScQueryItem& ScPivotFilterDlg::GetOutputItem() { @@ -447,9 +447,9 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() return *pOutItem; } -//------------------------------------------------------------------------ + // Handler: -//------------------------------------------------------------------------ + IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb ) { @@ -542,7 +542,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb ) return 0; } -//---------------------------------------------------------------------------- + IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { @@ -567,7 +567,7 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) { diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index a6c7f7b051f7..04948dd5768b 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -493,7 +493,7 @@ void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa mpBtnOptions->SetClickHdl( LINK( this, ScDPSubtotalDlg, ClickHdl ) ); } -// ---------------------------------------------------------------------------- + IMPL_LINK( ScDPSubtotalDlg, RadioClickHdl, RadioButton*, pBtn ) { diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 8c389ab4428d..09dbf93b7efd 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -113,7 +113,7 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const OUString& rName, bool m_pCbProtect->Enable(false); } -//------------------------------------------------------------------------ + void ScNewScenarioDlg::GetScenarioData( OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const @@ -151,7 +151,7 @@ void ScNewScenarioDlg::SetScenarioData( const OUString& rName, const OUString& r m_pCbProtect->Check ( (nFlags & SC_SCENARIO_PROTECT) != 0 ); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl) { @@ -177,7 +177,7 @@ IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl) //! beim Editieren testen, ob eine andere Tabelle den Namen hat! } -//------------------------------------------------------------------------ + IMPL_LINK( ScNewScenarioDlg, EnableHdl, CheckBox *, pBox ) { diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index bc319b98050d..f36e9b1aed4a 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -233,7 +233,7 @@ static void save_Separators( aItem.PutProperties(aNames, aValues); } -// ---------------------------------------------------------------------------- + ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,OUString aDatName, SvStream* pInStream, ScImportAsciiCall eCall ) : @@ -463,7 +463,7 @@ ScImportAsciiDlg::~ScImportAsciiDlg() } -// ---------------------------------------------------------------------------- + bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText ) { @@ -630,7 +630,7 @@ void ScImportAsciiDlg::UpdateVertical() } -// ---------------------------------------------------------------------------- + IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, RadioButton*, pButton ) { diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 1deb7dbb62e5..f2d250b292f2 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -57,7 +57,7 @@ private: sal_Int32 nIter; }; -//------------------------------------------------------------------------ + sal_uInt16 ScDelimiterTable::GetCode( const OUString& rDel ) const { @@ -81,7 +81,7 @@ sal_uInt16 ScDelimiterTable::GetCode( const OUString& rDel ) const return nCode; } -//------------------------------------------------------------------------ + OUString ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const { @@ -249,7 +249,7 @@ ScImportOptionsDlg::ScImportOptionsDlg( SetText( *pStrTitle ); } -//------------------------------------------------------------------------ + ScImportOptionsDlg::~ScImportOptionsDlg() { @@ -257,7 +257,7 @@ ScImportOptionsDlg::~ScImportOptionsDlg() delete pTextSepTab; } -//------------------------------------------------------------------------ + void ScImportOptionsDlg::GetImportOptions( ScImportOptions& rOptions ) const { @@ -274,7 +274,7 @@ void ScImportOptionsDlg::GetImportOptions( ScImportOptions& rOptions ) const } } -//------------------------------------------------------------------------ + sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const { @@ -302,7 +302,7 @@ sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const return nCode; } -//------------------------------------------------------------------------ + IMPL_LINK( ScImportOptionsDlg, FixedWidthHdl, CheckBox*, pCheckBox ) { diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 6f2b983b3f91..a17354739c4e 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -45,7 +45,7 @@ //============================================================================ // class ScSpecialFilterDialog -//---------------------------------------------------------------------------- + ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, const SfxItemSet& rArgSet ) @@ -101,7 +101,7 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi } -//---------------------------------------------------------------------------- + ScSpecialFilterDlg::~ScSpecialFilterDlg() { @@ -122,7 +122,7 @@ ScSpecialFilterDlg::~ScSpecialFilterDlg() } -//---------------------------------------------------------------------------- + void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) { @@ -204,7 +204,7 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) } -//---------------------------------------------------------------------------- + bool ScSpecialFilterDlg::Close() { @@ -215,7 +215,7 @@ bool ScSpecialFilterDlg::Close() } -//---------------------------------------------------------------------------- + // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Edit angezeigt wird. @@ -239,7 +239,7 @@ void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } -//---------------------------------------------------------------------------- + void ScSpecialFilterDlg::SetActive() { @@ -264,7 +264,7 @@ void ScSpecialFilterDlg::SetActive() } -//---------------------------------------------------------------------------- + ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, const ScRange& rSource ) @@ -277,7 +277,7 @@ ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, } -//---------------------------------------------------------------------------- + bool ScSpecialFilterDlg::IsRefInputMode() const { @@ -285,7 +285,7 @@ bool ScSpecialFilterDlg::IsRefInputMode() const } -//---------------------------------------------------------------------------- + // Handler: // ======== @@ -406,7 +406,7 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) } -//---------------------------------------------------------------------------- + IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) { @@ -437,7 +437,7 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) } -//---------------------------------------------------------------------------- + IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) { @@ -456,7 +456,7 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) } -//---------------------------------------------------------------------------- + IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd ) { diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index 8302b4f42925..436bd96c6213 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -34,7 +34,7 @@ void ScSortKeyItem::DisableField() m_pFrame->Disable(); } -// ----------------------------------------------------------------------- + void ScSortKeyItem::EnableField() { @@ -56,14 +56,14 @@ ScSortKeyWindow::ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& rSortKeyIt } } -// ----------------------------------------------------------------------- + ScSortKeyWindow::~ScSortKeyWindow() { mrSortKeyItems.clear(); } -// ----------------------------------------------------------------------- + void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber ) { @@ -77,7 +77,7 @@ void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber ) mrSortKeyItems.push_back(pSortKeyItem); } -// ----------------------------------------------------------------------- + void ScSortKeyWindow::DoScroll(sal_Int32 nNewPos) { @@ -126,7 +126,7 @@ void ScSortKeyCtrl::setScrollRange() checkAutoVScroll(); } -// ----------------------------------------------------------------------- + IMPL_LINK( ScSortKeyCtrl, ScrollHdl, ScrollBar*, pScrollBar ) { @@ -136,7 +136,7 @@ IMPL_LINK( ScSortKeyCtrl, ScrollHdl, ScrollBar*, pScrollBar ) return 0; } -// ----------------------------------------------------------------------- + void ScSortKeyCtrl::AddSortKey( sal_uInt16 nItem ) { diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index fd6545136a76..ba77cba95248 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -42,7 +42,7 @@ ScSubTotalDlg::ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet) m_pBtnRemove->SetClickHdl( LINK( this, ScSubTotalDlg, RemoveHdl ) ); } -//------------------------------------------------------------------------ + IMPL_LINK_INLINE_START( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn ) { diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index 796386ba0887..f6c4e75c712e 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -20,7 +20,7 @@ #undef SC_DLLIMPLEMENTATION -//------------------------------------------------------------------------ + #include "textimportoptions.hxx" #include "vcl/svapp.hxx" diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 14ca4e67af40..61b54eb870b5 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -48,7 +48,7 @@ using namespace com::sun::star; -// ----------------------------------------------------------------------- + /* * Since the settings on the second Tab Page (Options) effects @@ -116,13 +116,13 @@ void ScTabPageSortFields::SetPosPixel(const Point& rAllocPos) maSortKeyCtrl.setScrollRange(); } -// ----------------------------------------------------------------------- + ScTabPageSortFields::~ScTabPageSortFields() { } -// ----------------------------------------------------------------------- + void ScTabPageSortFields::Init() { @@ -144,7 +144,7 @@ void ScTabPageSortFields::Init() } } -// ----------------------------------------------------------------------- + SfxTabPage* ScTabPageSortFields::Create( Window* pParent, const SfxItemSet& rArgSet ) @@ -152,7 +152,7 @@ SfxTabPage* ScTabPageSortFields::Create( Window* pParent, return ( new ScTabPageSortFields( pParent, rArgSet ) ); } -// ----------------------------------------------------------------------- + void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) { @@ -236,7 +236,7 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) SetLastSortKey( nSortKeyCount ); } -// ----------------------------------------------------------------------- + sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) { @@ -302,7 +302,7 @@ sal_Bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) return sal_True; } -// ----------------------------------------------------------------------- + // for data exchange without dialogue detour: void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet ) @@ -328,7 +328,7 @@ void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) { @@ -347,7 +347,7 @@ int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) return SfxTabPage::LEAVE_PAGE; } -// ----------------------------------------------------------------------- + void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) { @@ -417,7 +417,7 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) } } -//------------------------------------------------------------------------ + sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField ) { @@ -455,9 +455,9 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem ) maSortKeyItems[nItem].m_pLbSort->SelectEntryPos( 0 ); } -// ----------------------------------------------------------------------- + // Handler: -//--------- + IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) { @@ -542,7 +542,7 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, m_pLbSortUser->SetAccessibleName(m_pBtnSortUser->GetText()); } -// ----------------------------------------------------------------------- + ScTabPageSortOptions::~ScTabPageSortOptions() { @@ -555,7 +555,7 @@ ScTabPageSortOptions::~ScTabPageSortOptions() delete pColWrap; //! not if from document } -// ----------------------------------------------------------------------- + void ScTabPageSortOptions::Init() { @@ -640,7 +640,7 @@ void ScTabPageSortOptions::Init() m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM ); } -// ----------------------------------------------------------------------- + SfxTabPage* ScTabPageSortOptions::Create( Window* pParent, @@ -649,7 +649,7 @@ SfxTabPage* ScTabPageSortOptions::Create( return ( new ScTabPageSortOptions( pParent, rArgSet ) ); } -// ----------------------------------------------------------------------- + void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) { @@ -718,7 +718,7 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) } } -// ----------------------------------------------------------------------- + sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) { @@ -767,7 +767,7 @@ sal_Bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) return sal_True; } -// ----------------------------------------------------------------------- + // for data exchange without dialogue detour: void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet ) @@ -793,7 +793,7 @@ void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet ) } } -// ----------------------------------------------------------------------- + int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) { @@ -847,7 +847,7 @@ int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) return bPosInputOk ? SfxTabPage::LEAVE_PAGE : SfxTabPage::KEEP_PAGE; } -// ----------------------------------------------------------------------- + void ScTabPageSortOptions::FillUserSortListBox() { @@ -863,7 +863,7 @@ void ScTabPageSortOptions::FillUserSortListBox() } } -// ----------------------------------------------------------------------- + // Handler: IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox ) @@ -895,7 +895,7 @@ IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) { @@ -912,7 +912,7 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn ) { @@ -927,7 +927,7 @@ IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn ) return 0; } -// ----------------------------------------------------------------------- + void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) { @@ -957,7 +957,7 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) } } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl) { diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 7f777a920b87..3f74086ecbff 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -65,7 +65,7 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, Init (); } -// ----------------------------------------------------------------------- + ScTpSubTotalGroup::~ScTpSubTotalGroup() { @@ -85,7 +85,7 @@ ScTpSubTotalGroup::~ScTpSubTotalGroup() } } -// ----------------------------------------------------------------------- + void ScTpSubTotalGroup::Init() { @@ -106,7 +106,7 @@ void ScTpSubTotalGroup::Init() FillListBoxes(); } -// ----------------------------------------------------------------------- + bool ScTpSubTotalGroup::DoReset( sal_uInt16 nGroupNo, const SfxItemSet& rArgSet ) @@ -120,7 +120,7 @@ bool ScTpSubTotalGroup::DoReset( sal_uInt16 nGroupNo, else nGroupIdx = nGroupNo-1; - //---------------------------------------------------------- + // first we have to clear the listboxes... for ( sal_uInt16 nLbEntry = 0; nLbEntry < mpLbColumns->GetEntryCount(); ++nLbEntry ) @@ -168,7 +168,7 @@ bool ScTpSubTotalGroup::DoReset( sal_uInt16 nGroupNo, return true; } -// ----------------------------------------------------------------------- + bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, SfxItemSet& rArgSet ) @@ -191,7 +191,7 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, else nGroupIdx = nGroupNo-1; - //---------------------------------------------------------- + ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt SfxTabDialog* pDlg = GetTabDialog(); @@ -252,7 +252,7 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, return true; } -// ----------------------------------------------------------------------- + void ScTpSubTotalGroup::FillListBoxes() { @@ -290,7 +290,7 @@ void ScTpSubTotalGroup::FillListBoxes() } } -// ----------------------------------------------------------------------- + sal_uInt16 ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField ) { @@ -309,7 +309,7 @@ sal_uInt16 ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField ) return nFieldPos; } -// ----------------------------------------------------------------------- + ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( sal_uInt16 nPos ) { @@ -333,7 +333,7 @@ ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( sal_uInt16 nPos ) } } -// ----------------------------------------------------------------------- + sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) { @@ -357,9 +357,9 @@ sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) } } -// ----------------------------------------------------------------------- + // Handler: -//--------- + IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb ) { @@ -387,7 +387,7 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) { @@ -411,19 +411,19 @@ SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup1( pParent, rArgSet ) ); } -// ----------------------------------------------------------------------- + SfxTabPage* ScTpSubTotalGroup2::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup2( pParent, rArgSet ) ); } -// ----------------------------------------------------------------------- + SfxTabPage* ScTpSubTotalGroup3::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup3( pParent, rArgSet ) ); } -// ----------------------------------------------------------------------- + ScTpSubTotalGroup1::ScTpSubTotalGroup1( Window* pParent, const SfxItemSet& rArgSet ) : ScTpSubTotalGroup( pParent, rArgSet ) @@ -437,7 +437,7 @@ ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgS ScTpSubTotalGroup( pParent, rArgSet ) {} -// ----------------------------------------------------------------------- + #define RESET(i) (ScTpSubTotalGroup::DoReset( (i), rArgSet )) @@ -446,7 +446,7 @@ void ScTpSubTotalGroup2::Reset( const SfxItemSet& rArgSet ) { RESET(2); } void ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); } #undef RESET -// ----------------------------------------------------------------------- + #define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), rArgSet )) sal_Bool ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); } @@ -483,13 +483,13 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, Init(); } -// ----------------------------------------------------------------------- + ScTpSubTotalOptions::~ScTpSubTotalOptions() { } -// ----------------------------------------------------------------------- + void ScTpSubTotalOptions::Init() { @@ -507,7 +507,7 @@ void ScTpSubTotalOptions::Init() FillUserSortListBox(); } -// ----------------------------------------------------------------------- + SfxTabPage* ScTpSubTotalOptions::Create( Window* pParent, const SfxItemSet& rArgSet ) @@ -515,7 +515,7 @@ SfxTabPage* ScTpSubTotalOptions::Create( Window* pParent, return ( new ScTpSubTotalOptions( pParent, rArgSet ) ); } -// ----------------------------------------------------------------------- + void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) { @@ -542,7 +542,7 @@ void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) CheckHdl( pBtnSort ); } -// ----------------------------------------------------------------------- + sal_Bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) { @@ -572,7 +572,7 @@ sal_Bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) return true; } -// ----------------------------------------------------------------------- + void ScTpSubTotalOptions::FillUserSortListBox() { @@ -587,7 +587,7 @@ void ScTpSubTotalOptions::FillUserSortListBox() } } -// ----------------------------------------------------------------------- + // Handler: IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox ) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 386f942afda3..b07a1c9a716d 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -301,7 +301,7 @@ bool lclGetStringListFromFormula( OUString& rStringList, const OUString& rFmlaSt } // namespace -// ---------------------------------------------------------------------------- + ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage( pParent, ScResId( TP_VALIDATION_VALUES ), rArgSet ), @@ -611,7 +611,7 @@ IMPL_LINK( ScTPValidationValue, KillFocusHdl, Window *, pWnd ) return 0; } -// ---------------------------------------------------------------------------- + IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl) { @@ -693,27 +693,27 @@ ScTPValidationHelp::ScTPValidationHelp( Window* pParent, Init(); } -// ----------------------------------------------------------------------- + ScTPValidationHelp::~ScTPValidationHelp() { } -// ----------------------------------------------------------------------- + void ScTPValidationHelp::Init() { pTsbHelp->EnableTriState( false ); } -//------------------------------------------------------------------------ + sal_uInt16* ScTPValidationHelp::GetRanges() { return pValueRanges; } -// ----------------------------------------------------------------------- + SfxTabPage* ScTPValidationHelp::Create( Window* pParent, const SfxItemSet& rArgSet ) @@ -721,7 +721,7 @@ SfxTabPage* ScTPValidationHelp::Create( Window* pParent, return ( new ScTPValidationHelp( pParent, rArgSet ) ); } -// ----------------------------------------------------------------------- + void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) { @@ -743,7 +743,7 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) pEdInputHelp->SetText( EMPTY_OUSTRING ); } -// ----------------------------------------------------------------------- + sal_Bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) { @@ -776,13 +776,13 @@ ScTPValidationError::ScTPValidationError( Window* pParent, Init(); } -// ----------------------------------------------------------------------- + ScTPValidationError::~ScTPValidationError() { } -// ----------------------------------------------------------------------- + void ScTPValidationError::Init() { @@ -795,14 +795,14 @@ void ScTPValidationError::Init() SelectActionHdl( NULL ); } -//------------------------------------------------------------------------ + sal_uInt16* ScTPValidationError::GetRanges() { return pValueRanges; } -// ----------------------------------------------------------------------- + SfxTabPage* ScTPValidationError::Create( Window* pParent, const SfxItemSet& rArgSet ) @@ -810,7 +810,7 @@ SfxTabPage* ScTPValidationError::Create( Window* pParent, return ( new ScTPValidationError( pParent, rArgSet ) ); } -// ----------------------------------------------------------------------- + void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) { @@ -839,7 +839,7 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) SelectActionHdl( NULL ); } -// ----------------------------------------------------------------------- + sal_Bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) { @@ -851,7 +851,7 @@ sal_Bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) return sal_True; } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl) { @@ -865,7 +865,7 @@ IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl) return( 0L ); } -// ----------------------------------------------------------------------- + IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) { diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index c3def988b08b..bfda73213579 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -56,7 +56,7 @@ struct AreaLink_Impl TYPEINIT1(ScAreaLink,::sfx2::SvBaseLink); -//------------------------------------------------------------------------ + ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const OUString& rFile, const OUString& rFilter, const OUString& rOpt, diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index e5ed5d433360..19c1ed176ff2 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -53,7 +53,7 @@ using namespace ::com::sun::star; -// ----------------------------------------------------------------- + bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange, bool /* bApi */ ) { @@ -239,7 +239,7 @@ bool ScDBDocFunc::ModifyDBData( const ScDBData& rNewData ) return bDone; } -// ----------------------------------------------------------------- + bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed, SCTAB aTab ) { @@ -423,7 +423,7 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bo return bDone; } -// ----------------------------------------------------------------- + bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, bool bRecord, bool bPaint, bool bApi ) @@ -666,7 +666,7 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, return true; } -// ----------------------------------------------------------------- + bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, const ScRange* pAdvSource, bool bRecord, bool bApi ) @@ -1007,7 +1007,7 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, return true; } -// ----------------------------------------------------------------- + bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, const ScSortParam* pForceNewSort, bool bRecord, bool bApi ) diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 2e7adec708c9..41c045096300 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -100,7 +100,7 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram } } -// ----------------------------------------------------------------- + bool ScDBDocFunc::DoImportUno( const ScAddress& rPos, const uno::Sequence<beans::PropertyValue>& aArgs ) @@ -117,7 +117,7 @@ bool ScDBDocFunc::DoImportUno( const ScAddress& rPos, return true; } -// ----------------------------------------------------------------- + bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, const svx::ODataAccessDescriptor* pDescriptor, bool bRecord, bool bAddrInsert ) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index 4ffdebbaea84..c9254a2829e1 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -120,7 +120,7 @@ IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction ) return 0; } -//------------------------------------------------------------------------ + // Zeile ueber dem Range painten (fuer Linien nach AdjustRowHeight) @@ -135,7 +135,7 @@ static void lcl_PaintAbove( ScDocShell& rDocShell, const ScRange& rRange ) } } -//------------------------------------------------------------------------ + bool ScDocFunc::AdjustRowHeight( const ScRange& rRange, bool bPaint ) { @@ -168,7 +168,7 @@ bool ScDocFunc::AdjustRowHeight( const ScRange& rRange, bool bPaint ) } -//------------------------------------------------------------------------ + bool ScDocFunc::DetectiveAddPred(const ScAddress& rPos) { @@ -564,7 +564,7 @@ void ScDocFunc::DetectiveCollectAllSuccs(const ScRangeList& rSrcRanges, vector<S lcl_collectAllPredOrSuccRanges(rSrcRanges, rRefTokens, rDocShell, false); } -//------------------------------------------------------------------------ + bool ScDocFunc::DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags, bool bRecord, bool bApi ) @@ -691,7 +691,7 @@ bool ScDocFunc::DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags, return true; } -//------------------------------------------------------------------------ + bool ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType, bool bRecord, bool bApi ) @@ -747,7 +747,7 @@ bool ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType, return true; } -//------------------------------------------------------------------------ + bool ScDocFunc::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const OUString& rText, bool bApi ) { @@ -1198,7 +1198,7 @@ bool ScDocFunc::SetCellText( return bSet; } -//------------------------------------------------------------------------ + bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow ) { @@ -1219,7 +1219,7 @@ bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow ) return true; } -//------------------------------------------------------------------------ + bool ScDocFunc::SetNoteText( const ScAddress& rPos, const OUString& rText, bool bApi ) { @@ -1250,7 +1250,7 @@ bool ScDocFunc::SetNoteText( const ScAddress& rPos, const OUString& rText, bool return true; } -//------------------------------------------------------------------------ + bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, const OUString* pAuthor, const OUString* pDate, bool bApi ) { @@ -1312,7 +1312,7 @@ bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, c return bDone; } -//------------------------------------------------------------------------ + bool ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern, bool bRecord, bool bApi ) @@ -2893,7 +2893,7 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, return true; } -//------------------------------------------------------------------------ + uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, OUString& sCodeName ) { uno::Reference< lang::XMultiServiceFactory> xSF(rDocSh.GetModel(), uno::UNO_QUERY); @@ -3363,7 +3363,7 @@ bool ScDocFunc::SetTabBgColor( return bSuccess; } -//------------------------------------------------------------------------ + //! SetWidthOrHeight - noch doppelt zu ViewFunc !!!!!! //! Probleme: @@ -3685,7 +3685,7 @@ bool ScDocFunc::RemovePageBreak( bool bColumn, const ScAddress& rPos, return true; } -//------------------------------------------------------------------------ + void ScDocFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ) { @@ -3849,7 +3849,7 @@ bool ScDocFunc::Unprotect( SCTAB nTab, const OUString& rPassword, bool bApi ) return true; } -//------------------------------------------------------------------------ + bool ScDocFunc::ClearItems( const ScMarkData& rMark, const sal_uInt16* pWhich, bool bApi ) { @@ -4068,7 +4068,7 @@ bool ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark, return bSuccess; } -//------------------------------------------------------------------------ + bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark, const ScTokenArray* pTokenArray, const OUString& rString, bool bApi, bool bEnglish, @@ -4157,7 +4157,7 @@ bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark, return bSuccess; } -//------------------------------------------------------------------------ + bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark, const ScTabOpParam& rParam, bool bRecord, bool bApi ) @@ -4218,7 +4218,7 @@ bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark, return bSuccess; } -//------------------------------------------------------------------------ + inline ScDirection DirFromFillDir( FillDir eDir ) { @@ -4673,7 +4673,7 @@ bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e return true; } -//------------------------------------------------------------------------ + bool ScDocFunc::MergeCells( const ScCellMergeOption& rOption, bool bContents, bool bRecord, bool bApi ) { @@ -4864,7 +4864,7 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, bool bRecord ) return true; } -//------------------------------------------------------------------------ + bool ScDocFunc::ModifyRangeNames( const ScRangeName& rNewRanges, SCTAB nTab ) { @@ -4943,7 +4943,7 @@ void ScDocFunc::ModifyAllRangeNames( const boost::ptr_map<OUString, ScRangeName> SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED)); } -//------------------------------------------------------------------------ + void ScDocFunc::CreateOneName( ScRangeName& rList, SCCOL nPosX, SCROW nPosY, SCTAB nTab, @@ -5099,7 +5099,7 @@ bool ScDocFunc::CreateNames( const ScRange& rRange, sal_uInt16 nFlags, bool bApi return bDone; } -//------------------------------------------------------------------------ + bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, bool bApi ) { @@ -5211,7 +5211,7 @@ bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, bool bApi ) return bDone; } -//------------------------------------------------------------------------ + bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, bool bApi ) { @@ -5257,7 +5257,7 @@ bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd return bRet; } -//------------------------------------------------------------------------ + bool ScDocFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index e3a9f4f5dac0..b42162c3a72e 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -165,7 +165,7 @@ static const sal_Char pFilterHtml[] = "HTML (StarCalc)"; static const sal_Char pFilterHtmlWebQ[] = "calc_HTML_WebQuery"; static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)"; -//---------------------------------------------------------------------- + #define ScDocShell #include "scslots.hxx" @@ -180,7 +180,7 @@ SFX_IMPL_OBJECTFACTORY( ScDocShell, SvGlobalName(SO3_SC_CLASSID), SFXOBJECTSHELL TYPEINIT1( ScDocShell, SfxObjectShell ); // SfxInPlaceObject: No TypeInfo? -//------------------------------------------------------------------ + void ScDocShell::FillClass( SvGlobalName* pClassName, sal_uInt32* pFormat, @@ -210,7 +210,7 @@ void ScDocShell::FillClass( SvGlobalName* pClassName, } } -//------------------------------------------------------------------ + void ScDocShell::DoEnterHandler() { @@ -220,7 +220,7 @@ void ScDocShell::DoEnterHandler() SC_MOD()->InputEnterHandler(); } -//------------------------------------------------------------------ + SCTAB ScDocShell::GetSaveTab() { @@ -2674,7 +2674,7 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : // InitItems and CalcOutputFactor are called now in Load/ConvertFrom/InitNew } -//------------------------------------------------------------------ + ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : SfxObjectShell( i_nSfxCreationFlags ), @@ -2723,7 +2723,7 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : // InitItems and CalcOutputFactor are called now in Load/ConvertFrom/InitNew } -//------------------------------------------------------------------ + ScDocShell::~ScDocShell() { @@ -2761,7 +2761,7 @@ ScDocShell::~ScDocShell() #endif } -//------------------------------------------------------------------ + ::svl::IUndoManager* ScDocShell::GetUndoManager() { diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 60ba753e5ce0..6428c22ed57e 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -32,7 +32,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------ + sal_Bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) { @@ -62,7 +62,7 @@ sal_Bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) return bRet; } -//------------------------------------------------------------------ + bool ScDocShell::IsEmpty() const { @@ -75,7 +75,7 @@ void ScDocShell::SetEmpty(bool bSet) bIsEmpty = bSet; } -//------------------------------------------------------------------ + void ScDocShell::InitItems() { @@ -145,7 +145,7 @@ void ScDocShell::InitItems() } } -//------------------------------------------------------------------ + void ScDocShell::ResetDrawObjectShell() { @@ -154,7 +154,7 @@ void ScDocShell::ResetDrawObjectShell() pDrawLayer->SetObjectShell( NULL ); } -//------------------------------------------------------------------ + void ScDocShell::Activate() { @@ -165,7 +165,7 @@ void ScDocShell::Deactivate() { } -//------------------------------------------------------------------ + ScDrawLayer* ScDocShell::MakeDrawLayer() diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 4bbcb5fa9827..23ce64cc8085 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -62,7 +62,7 @@ #include "globstr.hrc" #include "markdata.hxx" -//------------------------------------------------------------------ + // // Redraw - Benachrichtigungen @@ -216,7 +216,7 @@ void ScDocShell::UpdatePaintExt( sal_uInt16& rExtFlags, SCCOL nStartCol, SCROW n UpdatePaintExt( rExtFlags, ScRange( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ) ); } -//------------------------------------------------------------------ + void ScDocShell::LockPaint_Impl(bool bDoc) { @@ -337,7 +337,7 @@ void ScDocShell::UnlockDocument() } } -//------------------------------------------------------------------ + void ScDocShell::SetInplace( bool bInplace ) { @@ -403,7 +403,7 @@ double ScDocShell::GetOutputFactor() const return nPrtToScreenFactor; } -//--------------------------------------------------------------------- + void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and Load { @@ -439,7 +439,7 @@ void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and L aDocument.SetLanguage( (LanguageType) nDefLang, (LanguageType) nCjkLang, (LanguageType) nCtlLang ); } -//--------------------------------------------------------------------- + Printer* ScDocShell::GetDocumentPrinter() // fuer OLE { @@ -568,7 +568,7 @@ sal_uInt16 ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlag return 0; } -//--------------------------------------------------------------------- + ScChangeAction* ScDocShell::GetChangeAction( const ScAddress& rPos ) { @@ -668,7 +668,7 @@ void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pP delete pDlg; } -//--------------------------------------------------------------------- + void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) { @@ -731,11 +731,11 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) SetDocumentModified(); } -//--------------------------------------------------------------------- + // // Merge (Aenderungen zusammenfuehren) // -//--------------------------------------------------------------------- + static inline sal_Bool lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, sal_Bool bIgnore100Sec ) { diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index eea84048a862..275f3af860c0 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -98,7 +98,7 @@ using namespace ::com::sun::star; #include "sheetevents.hxx" #include <documentlinkmgr.hxx> -//------------------------------------------------------------------ + #define IS_SHARE_HEADER(set) \ ((SfxBoolItem&) \ @@ -114,7 +114,7 @@ using namespace ::com::sun::star; #define SC_PREVIEW_SIZE_Y 12400 -//------------------------------------------------------------------ + void ScDocShell::Execute( SfxRequest& rReq ) { @@ -1114,7 +1114,7 @@ void ScDocShell::Execute( SfxRequest& rReq ) } -//------------------------------------------------------------------ + void UpdateAcceptChangesDialog() { @@ -1129,7 +1129,7 @@ void UpdateAcceptChangesDialog() } } -//------------------------------------------------------------------ + bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQueryIfProtected ) { @@ -1195,7 +1195,7 @@ bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQuer } -//------------------------------------------------------------------ + void ScDocShell::DoRecalc( bool bApi ) { @@ -1272,7 +1272,7 @@ void ScDocShell::DoHardRecalc( bool /* bApi */ ) PostPaintGridAll(); } -//------------------------------------------------------------------ + void ScDocShell::DoAutoStyle( const ScRange& rRange, const OUString& rStyle ) { @@ -1297,7 +1297,7 @@ void ScDocShell::DoAutoStyle( const ScRange& rRange, const OUString& rStyle ) } } -//------------------------------------------------------------------ + void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint ) { @@ -2063,7 +2063,7 @@ void ScDocShell::GetPageOnFromPageStyleSet( const SfxItemSet* pStyleSet, OSL_ENSURE( pStyleSet, "PageStyle-Set not found! :-(" ); - //-------------------------------------------------------------------- + const SvxSetItem* pSetItem = NULL; const SfxItemSet* pSet = NULL; @@ -2198,7 +2198,7 @@ bool ScDocShell::DdeSetData( const OUString& rItem, return pObj; } -//------------------------------------------------------------------ + ScViewData* ScDocShell::GetViewData() { @@ -2207,7 +2207,7 @@ ScViewData* ScDocShell::GetViewData() return pViewSh ? pViewSh->GetViewData() : NULL; } -//------------------------------------------------------------------ + SCTAB ScDocShell::GetCurTab() { @@ -2248,7 +2248,7 @@ SfxBindings* ScDocShell::GetViewBindings() return NULL; } -//------------------------------------------------------------------ + ScDocShell* ScDocShell::GetShellByNum( sal_uInt16 nDocNo ) // static { @@ -2271,7 +2271,7 @@ ScDocShell* ScDocShell::GetShellByNum( sal_uInt16 nDocNo ) // static return pFound; } -//------------------------------------------------------------------ + IMPL_LINK( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg ) { diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 388c5bfb4a8d..e901ddb416ed 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -61,7 +61,7 @@ using com::sun::star::uno::UNO_QUERY; using ::std::auto_ptr; using ::std::vector; -// --------------------------------------------------------------------------- + // // former viewfunc/dbfunc methods diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 1165489fe6a4..73fc57356d4d 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -65,7 +65,7 @@ struct ScStylePair // STATIC DATA ----------------------------------------------------------- -//---------------------------------------------------------------------- + // // Ole diff --git a/sc/source/ui/docshell/docsh7.cxx b/sc/source/ui/docshell/docsh7.cxx index fee0a2dff5fb..2c21ac0b9206 100644 --- a/sc/source/ui/docshell/docsh7.cxx +++ b/sc/source/ui/docshell/docsh7.cxx @@ -19,7 +19,7 @@ #include "docsh.hxx" -//------------------------------------------------------------------ + void ScDocShell::GetDrawObjState( SfxItemSet & /* rSet */ ) { diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 916fc7b3f0fd..44dcbed876b9 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -79,7 +79,7 @@ using namespace com::sun::star; using ::std::vector; -// ----------------------------------------------------------------------- + #define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" @@ -152,7 +152,7 @@ namespace #endif // !DISABLE_DBCONNECTIVITY -// ----------------------------------------------------------------------- + // MoveFile/KillFile/IsDocument: similar to SfxContentHelper bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& rDestObj ) @@ -239,7 +239,7 @@ bool ScDocShell::IsDocument( const INetURLObject& rURL ) return bRet; } -// ----------------------------------------------------------------------- + #ifndef DISABLE_DBCONNECTIVITY diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx index 2664e9e2ae34..2a575aa02611 100644 --- a/sc/source/ui/docshell/editable.cxx +++ b/sc/source/ui/docshell/editable.cxx @@ -67,7 +67,7 @@ ScEditableTester::ScEditableTester( ScViewFunc* pView ) : TestView( pView ); } -//------------------------------------------------------------------ + void ScEditableTester::TestBlock( ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) @@ -134,7 +134,7 @@ void ScEditableTester::TestView( ScViewFunc* pView ) } } -//------------------------------------------------------------------ + sal_uInt16 ScEditableTester::GetMessageId() const { diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 7d77afbfa693..2f3363a2d4d9 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -472,21 +472,21 @@ ScExternalRefCache::TokenRef ScExternalRefCache::Table::getEmptyOrNullToken( return TokenRef(); } -// ---------------------------------------------------------------------------- + ScExternalRefCache::TableName::TableName(const OUString& rUpper, const OUString& rReal) : maUpperName(rUpper), maRealName(rReal) { } -// ---------------------------------------------------------------------------- + ScExternalRefCache::CellFormat::CellFormat() : mbIsSet(false), mnType(NUMBERFORMAT_ALL), mnIndex(0) { } -// ---------------------------------------------------------------------------- + ScExternalRefCache::ScExternalRefCache() {} @@ -1584,7 +1584,7 @@ ScExternalRefManager::LinkListener::~LinkListener() { } -// ---------------------------------------------------------------------------- + ScExternalRefManager::ApiGuard::ApiGuard(ScDocument* pDoc) : mpMgr(pDoc->GetExternalRefManager()), @@ -1600,7 +1600,7 @@ ScExternalRefManager::ApiGuard::~ApiGuard() mpMgr->mbUserInteractionEnabled = mbOldInteractionEnabled; } -// ---------------------------------------------------------------------------- + void ScExternalRefManager::getAllCachedTableNames(sal_uInt16 nFileId, vector<OUString>& rTabNames) const { diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx index 187637d7ffd5..034b61fe14a2 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -43,7 +43,7 @@ static void lcl_InvalidateOutliner( SfxBindings* pBindings ) } } -//------------------------------------------------------------------------ + //! PaintWidthHeight zur DocShell verschieben? @@ -78,7 +78,7 @@ static void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab, rDocShell.PostPaint( nStartCol,nStartRow,nTab, MAXCOL,MAXROW,nTab, nParts ); } -//------------------------------------------------------------------------ + bool ScOutlineDocFunc::MakeOutline( const ScRange& rRange, bool bColumns, bool bRecord, bool bApi ) { @@ -265,7 +265,7 @@ bool ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, bool bRecord ) return bSuccess; } -//------------------------------------------------------------------------ + bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, bool bRecord ) { @@ -331,7 +331,7 @@ bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, bool bRecord ) return true; } -//------------------------------------------------------------------------ + bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, bool bRecord, bool bPaint ) @@ -426,7 +426,7 @@ bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool bColumns, sal_uInt16 nLevel return true; } -//------------------------------------------------------------------------ + bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, bool bRecord ) { @@ -624,7 +624,7 @@ bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, bool bRecord ) return bDone; } -//------------------------------------------------------------------------ + bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, bool bRecord, bool bPaint ) diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx index b3a4f9cd5ec0..9db2dfe7a594 100644 --- a/sc/source/ui/docshell/pntlock.cxx +++ b/sc/source/ui/docshell/pntlock.cxx @@ -19,7 +19,7 @@ #include "pntlock.hxx" -//------------------------------------------------------------------------ + ScPaintLockData::ScPaintLockData() : nLevel( 0 ), diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index e2195572c57a..9cedad40c772 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -29,7 +29,7 @@ using namespace formula; -// ----------------------------------------------------------------------- + static bool lcl_FillRangeFromName( ScRange& rRange, ScDocShell* pDocSh, const OUString& rName ) { diff --git a/sc/source/ui/docshell/sizedev.cxx b/sc/source/ui/docshell/sizedev.cxx index 9607fbec4e2b..3b73fc9e41d2 100644 --- a/sc/source/ui/docshell/sizedev.cxx +++ b/sc/source/ui/docshell/sizedev.cxx @@ -25,7 +25,7 @@ #include "scmod.hxx" #include "inputopt.hxx" -//------------------------------------------------------------------ + ScSizeDeviceProvider::ScSizeDeviceProvider( ScDocShell* pDocSh ) { diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index 768c9a9d6492..c67fada503dd 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -56,7 +56,7 @@ struct TableLink_Impl TYPEINIT1(ScTableLink, ::sfx2::SvBaseLink); -//------------------------------------------------------------------------ + ScTableLink::ScTableLink(ScDocShell* pDocSh, const OUString& rFile, const OUString& rFilter, const OUString& rOpt, diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index c407e1932b9e..93ab7847d891 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -38,7 +38,7 @@ SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet& rSet ) return new ScDocStatPage( pParent, rSet ); } -//------------------------------------------------------------------------ + ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "StatisticsInfoPage", "modules/scalc/ui/statisticsinfopage.ui", rSet ) @@ -62,20 +62,20 @@ ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) } -//------------------------------------------------------------------------ + ScDocStatPage::~ScDocStatPage() { } -//------------------------------------------------------------------------ + sal_Bool ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ ) { return false; } -//------------------------------------------------------------------------ + void ScDocStatPage::Reset( const SfxItemSet& /* rSet */ ) { diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index c8d11f50b0a1..cc27e2e81713 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -59,7 +59,7 @@ #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/frame/XFrame.hpp> -//------------------------------------------------------------------ + TYPEINIT1( ScDrawShell, SfxShell ); diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 166802ab7cb1..fa2126e5bbcc 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -56,7 +56,7 @@ sal_uInt16 ScGetFontWorkId(); // in drtxtob using namespace com::sun::star; -//------------------------------------------------------------------ + ScDrawShell::ScDrawShell( ScViewData* pData ) : SfxShell(pData->GetViewShell()), diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx index bbd925492a39..85f481984244 100644 --- a/sc/source/ui/drawfunc/drawsh4.cxx +++ b/sc/source/ui/drawfunc/drawsh4.cxx @@ -32,7 +32,7 @@ #include "sc.hrc" -//------------------------------------------------------------------ + void ScDrawShell::GetFormTextState(SfxItemSet& rSet) { diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 13dff40c40c0..4193e80977aa 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -60,7 +60,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------ + void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink { @@ -242,7 +242,7 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) sal_uInt16 ScGetFontWorkId(); -//------------------------------------------------------------------ + // // Funktionen auf Drawing-Objekten @@ -649,7 +649,7 @@ IMPL_LINK( ScDrawShell, NameObjectHdl, AbstractSvxNameDialog*, pDialog ) return 1; // name is valid } -//------------------------------------------------------------------ + void ScDrawShell::ExecFormText(SfxRequest& rReq) { @@ -667,7 +667,7 @@ void ScDrawShell::ExecFormText(SfxRequest& rReq) } } -//------------------------------------------------------------------ + void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq ) { diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx index 225258ae157d..907f42b7e93f 100644 --- a/sc/source/ui/drawfunc/drtxtob1.cxx +++ b/sc/source/ui/drawfunc/drtxtob1.cxx @@ -38,7 +38,7 @@ #include "scresid.hxx" #include "scabstdlg.hxx" -//------------------------------------------------------------------------ + bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet , sal_uInt16 nSlot) diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index 25e8f3bc270a..24b6d15ce46b 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -45,7 +45,7 @@ #include "drwtrans.hxx" #include "drwlayer.hxx" -//------------------------------------------------------------------------ + sal_uInt16 ScGetFontWorkId() { diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 20bd744234ed..369aa8cc9393 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -36,7 +36,7 @@ #include <math.h> -//------------------------------------------------------------------------ + FuConstCustomShape::FuConstCustomShape( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) : FuConstruct( pViewSh, pWin, pViewP, pDoc, rReq ) diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 222e4679ab8e..4b8bfcbd6a7f 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -32,7 +32,7 @@ #include "scresid.hxx" -//------------------------------------------------------------------------ + /************************************************************************* diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index fa6d53bdd60f..407b39a0bd75 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -37,7 +37,7 @@ //! fusel,fuconstr,futext - zusammenfassen! #define SC_MAXDRAGMOVE 3 -//------------------------------------------------------------------------ + /************************************************************************* |* diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 61cd7882623d..ab88c9df3ff5 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -45,7 +45,7 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& rPage ) { @@ -92,7 +92,7 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r rPos.X() = -rPos.X() - rSize.Width(); // back to real position } -//------------------------------------------------------------------------ + static void lcl_InsertGraphic( const Graphic& rGraphic, const OUString& rFileName, const OUString& rFilterName, sal_Bool bAsLink, sal_Bool bApi, @@ -180,7 +180,7 @@ static void lcl_InsertGraphic( const Graphic& rGraphic, pObj->SetGraphicLink( rFileName, ""/*TODO?*/, rFilterName ); } -//------------------------------------------------------------------------ + static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi, ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView, diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index d6ccb244a91b..6de0e8ab62e8 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -21,7 +21,7 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -//------------------------------------------------------------------------ + #include <toolkit/helper/vclunohelper.hxx> #include <sot/exchange.hxx> @@ -439,7 +439,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* if( SvtModuleOptions().IsChart() ) { - // ---------------------------------------- + // BM/IHA -- // get range @@ -487,7 +487,7 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewSh->GetViewData()->GetView()->Unmark(); } - // ---------------------------------------- + // adapted old code pView->UnmarkAll(); diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx index 0e600076857a..e620d98b1b07 100644 --- a/sc/source/ui/drawfunc/fumark.cxx +++ b/sc/source/ui/drawfunc/fumark.cxx @@ -31,7 +31,7 @@ #include "drawview.hxx" #include "markdata.hxx" -//------------------------------------------------------------------ + /************************************************************************* |* diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 3116a15449dc..bbd74536f293 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -48,7 +48,7 @@ #include "docuno.hxx" #include "docsh.hxx" -// ----------------------------------------------------------------------- + // Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten //! fusel,fuconstr,futext - zusammenfassen! @@ -56,7 +56,7 @@ // Min necessary mouse motion for normal dragging #define SC_MINDRAGMOVE 2 -// ----------------------------------------------------------------------- + using namespace com::sun::star; diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index 7d3ac3b547ff..b8de82e13cd2 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -37,7 +37,7 @@ #include "drawview.hxx" #include <svx/sdrhittesthelper.hxx> -// ----------------------------------------------------------------------- + inline long Diff( const Point& rP1, const Point& rP2 ) { diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index 76a3c7c3fdb5..6374d536d8b9 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -46,7 +46,7 @@ //! fusel,fuconstr,futext - zusammenfassen! #define SC_MAXDRAGMOVE 3 -//------------------------------------------------------------------ + static void lcl_InvalidateAttribs( SfxBindings& rBindings ) { diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx index 55bf00d1ca8b..e043ec1a8374 100644 --- a/sc/source/ui/drawfunc/futext2.cxx +++ b/sc/source/ui/drawfunc/futext2.cxx @@ -24,7 +24,7 @@ #include "futext.hxx" #include "tabvwsh.hxx" -//------------------------------------------------------------------------ + SdrOutliner* FuText::MakeOutliner() { diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx index af833dabdea0..29112e429ff4 100644 --- a/sc/source/ui/drawfunc/futext3.cxx +++ b/sc/source/ui/drawfunc/futext3.cxx @@ -44,12 +44,12 @@ #include "drawview.hxx" #include "undocell.hxx" -// ------------------------------------------------------------------------------------ + // Editieren von Notiz-Legendenobjekten muss immer ueber StopEditMode beendet werden, // damit die Aenderungen ins Dokument uebernommen werden! // (Fontwork-Execute in drawsh und drtxtob passiert nicht fuer Legendenobjekte) // bTextDirection=sal_True means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx). -// ------------------------------------------------------------------------------------ + void FuText::StopEditMode(bool /*bTextDirection*/) { diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 1aa9df2b6603..ef0928e7ee4c 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -40,7 +40,7 @@ #include "dwfunctr.hrc" #include "dwfunctr.hxx" -// ----------------------------------------------------------------------- + SFX_IMPL_DOCKINGWINDOW_WITHID( ScFunctionChildWindow, FID_FUNCTION_BOX ) @@ -801,7 +801,7 @@ void ScFunctionDockWin::UpdateFunctionList() } - //------------------------------------------------------ + pAllFuncList->SetUpdateMode( true ); if ( pAllFuncList->GetEntryCount() > 0 ) @@ -1099,7 +1099,7 @@ void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo) } } -//------------------------------------------------------------------------- + void ScFunctionDockWin::FillInfo(SfxChildWinInfo& rInfo) const { diff --git a/sc/source/ui/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxx index 679e31f7f7c5..8b4853566f96 100644 --- a/sc/source/ui/formdlg/formdata.cxx +++ b/sc/source/ui/formdlg/formdata.cxx @@ -34,7 +34,7 @@ ScFormEditData::ScFormEditData( const ScFormEditData& r ) : formula::FormEditDa { *this = r; } -// ----------------------------------------------------------------------------- + void ScFormEditData::SaveValues() { ScFormEditData* pTemp = new ScFormEditData(*this); diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index f509e2db1e3c..38b9f5bfe45d 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -197,7 +197,7 @@ void ScFormulaDlg::notifyChange() if ( pInputHdl ) pInputHdl->NotifyChange( NULL ); } -// ----------------------------------------------------------------------------- + void ScFormulaDlg::fill() { ScModule* pScMod = SC_MOD(); diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx index e43741fb89af..8ed0dce25906 100644 --- a/sc/source/ui/formdlg/privsplt.cxx +++ b/sc/source/ui/formdlg/privsplt.cxx @@ -371,7 +371,7 @@ void ScPrivatSplit::ImplInitSettings( bool bFont, bool bForeground, bool bBackgr Invalidate(); } -// ----------------------------------------------------------------------- + void ScPrivatSplit::StateChanged( StateChangedType nType ) { @@ -395,7 +395,7 @@ void ScPrivatSplit::StateChanged( StateChangedType nType ) Control::StateChanged( nType ); } -// ----------------------------------------------------------------------- + void ScPrivatSplit::DataChanged( const DataChangedEvent& rDCEvt ) { diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 49f3da52b960..547cb9ea8b0e 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -54,7 +54,7 @@ //============================================================================ // class ScRedlinData -//---------------------------------------------------------------------------- + ScRedlinData::ScRedlinData() :RedlinData() { @@ -81,7 +81,7 @@ ScRedlinData::~ScRedlinData() //============================================================================ // class ScAcceptChgDlg -//---------------------------------------------------------------------------- + ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData) : SfxModelessDialog(pB, pCW, pParent, @@ -1827,7 +1827,7 @@ void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo) } } -//------------------------------------------------------------------------- + void ScAcceptChgDlg::FillInfo(SfxChildWinInfo& rInfo) const { diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 2dcb9cf10f3e..7d874cce6690 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -64,7 +64,7 @@ ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindi ScInputOptions aInputOption=SC_MOD()->GetInputOptions(); bEnableColorRef=aInputOption.GetRangeFinder(); } -// ----------------------------------------------------------------------------- + ScFormulaReferenceHelper::~ScFormulaReferenceHelper() { if (bAccInserted) @@ -79,7 +79,7 @@ ScFormulaReferenceHelper::~ScFormulaReferenceHelper() if ( pInputHdl ) pInputHdl->ResetDelayTimer(); // stop the timer for disabling the input line } -// ----------------------------------------------------------------------------- + void ScFormulaReferenceHelper::enableInput( bool bEnable ) { TypeId aType(TYPE(ScDocShell)); @@ -115,7 +115,7 @@ void ScFormulaReferenceHelper::enableInput( bool bEnable ) pDocShell = (ScDocShell*)SfxObjectShell::GetNext(*pDocShell, &aType); } } -// ----------------------------------------------------------------------------- + void ScFormulaReferenceHelper::ShowSimpleReference(const OUString& rStr) { if( bEnableColorRef ) @@ -144,7 +144,7 @@ void ScFormulaReferenceHelper::ShowSimpleReference(const OUString& rStr) } } } -// ----------------------------------------------------------------------------- + bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const OUString& rStr, ScDocument* pDoc ) { bool bError = false; @@ -175,7 +175,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const OUStr return !bError; } -// ----------------------------------------------------------------------------- + void ScFormulaReferenceHelper::ShowFormulaReference(const OUString& rStr) { if( bEnableColorRef) @@ -231,7 +231,7 @@ void ScFormulaReferenceHelper::ShowFormulaReference(const OUString& rStr) } } } -// ----------------------------------------------------------------------------- + void ScFormulaReferenceHelper::HideReference( bool bDoneRefMode ) { ScViewData* pViewData=ScDocShell::GetViewData(); @@ -252,7 +252,7 @@ void ScFormulaReferenceHelper::HideReference( bool bDoneRefMode ) bHighlightRef=false; } } -// ----------------------------------------------------------------------------- + void ScFormulaReferenceHelper::ShowReference(const OUString& rStr) { if( bEnableColorRef ) @@ -276,7 +276,7 @@ void ScFormulaReferenceHelper::ShowReference(const OUString& rStr) } } } -// ----------------------------------------------------------------------------- + void ScFormulaReferenceHelper::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton ) { if( !pRefEdit && pEdit ) @@ -309,7 +309,7 @@ void ScFormulaReferenceHelper::ReleaseFocus( formula::RefEdit* pEdit, formula::R } } } -// ----------------------------------------------------------------------------- + void ScFormulaReferenceHelper::Init() { ScViewData* pViewData=ScDocShell::GetViewData(); //! use pScViewShell? @@ -328,7 +328,7 @@ void ScFormulaReferenceHelper::Init() nRefTab = nTab; } } -// ----------------------------------------------------------------------------- + IMPL_LINK( ScFormulaReferenceHelper, AccelSelectHdl, Accelerator *, pSelAccel ) { if ( !pSelAccel ) @@ -443,7 +443,7 @@ namespace } } -// ----------------------------------------------------------------------------- + void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton ) { if (!pRefEdit) @@ -589,7 +589,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: } } } -// ----------------------------------------------------------------------------- + void ScFormulaReferenceHelper::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton ) { if( pEdit ) @@ -609,7 +609,7 @@ void ScFormulaReferenceHelper::ToggleCollapsed( formula::RefEdit* pEdit, formula } } } -// ----------------------------------------------------------------------------- + bool ScFormulaReferenceHelper::DoClose( sal_uInt16 nId ) { SfxApplication* pSfxApp = SFX_APP(); @@ -672,7 +672,7 @@ void ScFormulaReferenceHelper::SetDispatcherLock( bool bLock ) // that view's dispatcher is locked when trying to create the dialog // for that view (ScTabViewShell::CreateRefDialog) } -// ----------------------------------------------------------------------------- + void ScFormulaReferenceHelper::ViewShellChanged() { enableInput( false ); @@ -715,7 +715,7 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren) } } -//---------------------------------------------------------------------------- + @@ -750,7 +750,7 @@ static void lcl_InvalidateWindows() pDocShell = (ScDocShell*)SfxObjectShell::GetNext(*pDocShell, &aType); } } -//---------------------------------------------------------------------------- + static void lcl_HideAllReferences() { @@ -766,7 +766,7 @@ static void lcl_HideAllReferences() //============================================================================ //The class of ScAnyRefDlg is rewritten by PengYunQuan for Validity Cell Range Picker // class ScRefHandler -//---------------------------------------------------------------------------- + ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB, bool bBindRef ): m_rWindow( rWindow ), @@ -833,7 +833,7 @@ bool ScRefHandler::EnterRefMode() return m_bInRefMode = true; } -//---------------------------------------------------------------------------- + ScRefHandler::~ScRefHandler() { @@ -860,7 +860,7 @@ bool ScRefHandler::LeaveRefMode() return true; } -//---------------------------------------------------------------------------- + void ScRefHandler::SwitchToDocument() { @@ -890,7 +890,7 @@ void ScRefHandler::SwitchToDocument() } } -//---------------------------------------------------------------------------- + bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 { @@ -903,14 +903,14 @@ bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be return ( aDocName.isEmpty() || aDocName == aCmpName ); } -//---------------------------------------------------------------------------- + bool ScRefHandler::IsRefInputMode() const { return m_rWindow.IsVisible(); // nur wer sichtbar ist kann auch Referenzen bekommen } -//---------------------------------------------------------------------------- + bool ScRefHandler::DoClose( sal_uInt16 nId ) { @@ -923,21 +923,21 @@ void ScRefHandler::SetDispatcherLock( bool bLock ) m_aHelper.SetDispatcherLock( bLock ); } -//---------------------------------------------------------------------------- + void ScRefHandler::ViewShellChanged() { m_aHelper.ViewShellChanged(); } -//---------------------------------------------------------------------------- + void ScRefHandler::AddRefEntry() { // wenn nicht ueberladen, gibt es keine Mehrfach-Referenzen } -//---------------------------------------------------------------------------- + bool ScRefHandler::IsTableLocked() const { @@ -946,12 +946,12 @@ bool ScRefHandler::IsTableLocked() const return false; } -//---------------------------------------------------------------------------- + // // RefInputStart/Done: Zoom-In (AutoHide) auf einzelnes Feld // (per Button oder Bewegung) // -//---------------------------------------------------------------------------- + void ScRefHandler::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton ) { @@ -1005,33 +1005,33 @@ IMPL_LINK_NOARG(ScRefHandler, UpdateFocusHdl) } return 0; } -// ----------------------------------------------------------------------------- + bool ScRefHandler::ParseWithNames( ScRangeList& rRanges, const OUString& rStr, ScDocument* pDoc ) { return m_aHelper.ParseWithNames( rRanges, rStr, pDoc ); } -// ----------------------------------------------------------------------------- + void ScRefHandler::HideReference( bool bDoneRefMode ) { m_aHelper.HideReference( bDoneRefMode ); } -// ----------------------------------------------------------------------------- + void ScRefHandler::ShowReference(const OUString& rStr) { m_aHelper.ShowReference(rStr); } -// ----------------------------------------------------------------------------- + void ScRefHandler::ReleaseFocus( formula::RefEdit* pEdit, formula::RefButton* pButton ) { m_aHelper.ReleaseFocus( pEdit,pButton ); } -//---------------------------------------------------------------------------- + void ScRefHandler::RefInputDone( bool bForced ) { m_aHelper.RefInputDone( bForced ); } -//------------------------------------------------------------------------------- + ScRefHdlModalImpl::ScRefHdlModalImpl(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 9dec29a779c6..1d3bc2874a0c 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -81,14 +81,14 @@ ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocume Init(); } -//------------------------------------------------------------------------ + ScAutoFmtPreview::~ScAutoFmtPreview() { delete pNumFmt; } -//------------------------------------------------------------------------ + static void lcl_SetFontProperties( Font& rFont, @@ -152,7 +152,7 @@ rFont.MethodName( Value ); rCJKFont.MethodName( Value ); rCTLFont.MethodName( Va } } -//------------------------------------------------------------------------ + sal_uInt16 ScAutoFmtPreview::GetFormatIndex( size_t nCol, size_t nRow ) const { @@ -179,15 +179,15 @@ const SvxLineItem& ScAutoFmtPreview::GetDiagItem( size_t nCol, size_t nRow, bool return *static_cast< const SvxLineItem* >( pCurData->GetItem( GetFormatIndex( nCol, nRow ), bTLBR ? ATTR_BORDER_TLBR : ATTR_BORDER_BLTR ) ); } -//------------------------------------------------------------------------ + void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) { if ( pCurData ) { - //------------------------ + // Ausgabe des Zelltextes: - //------------------------ + OUString cellString; sal_Bool bNumFormat = pCurData->GetIncludeValueFormat(); @@ -253,9 +253,9 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) SvxHorJustifyItem aHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY ); SvxCellHorJustify eJustification; - //------------- + // Ausrichtung: - //------------- + eJustification = mbRTL ? SVX_HOR_JUSTIFY_RIGHT : bJustify ? (SvxCellHorJustify)(((const SvxHorJustifyItem*)pCurData->GetItem( nFmtIndex, ATTR_HOR_JUSTIFY ))->GetValue()) : SVX_HOR_JUSTIFY_STANDARD; @@ -306,14 +306,14 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) - aStrSize.Width() - FRAME_OFFSET ); - //----------------------------- + // vertikal (immer zentrieren): - //----------------------------- + aPos.Y() += (mnRowHeight - (sal_uInt16)aStrSize.Height()) / 2; - //----------- + // horizontal - //----------- + if ( eJustification != SVX_HOR_JUSTIFY_STANDARD ) { sal_uInt16 nHorPos = (sal_uInt16) @@ -340,9 +340,9 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) } else { - //--------------------- + // Standardausrichtung: - //--------------------- + if ( (nCol == 0) || (nRow == 0) ) { // Text-Label links oder Summe linksbuendig @@ -355,16 +355,16 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) } } - //------------------------------- + aScriptedText.DrawText( aPos ); - //------------------------------- + } } } #undef FRAME_OFFSET -//------------------------------------------------------------------------ + void ScAutoFmtPreview::DrawStrings() { @@ -373,7 +373,7 @@ void ScAutoFmtPreview::DrawStrings() DrawString( nCol, nRow ); } -//------------------------------------------------------------------------ + void ScAutoFmtPreview::DrawBackground() { @@ -396,7 +396,7 @@ void ScAutoFmtPreview::DrawBackground() } } -//------------------------------------------------------------------------ + void ScAutoFmtPreview::PaintCells() { @@ -415,7 +415,7 @@ void ScAutoFmtPreview::PaintCells() } } -//------------------------------------------------------------------------ + void ScAutoFmtPreview::Init() { @@ -436,7 +436,7 @@ void ScAutoFmtPreview::Init() mbRTL = pDoc->IsLayoutRTL( nCurrentTab ); } -//------------------------------------------------------------------------ + void ScAutoFmtPreview::CalcCellArray( bool bFitWidthP ) { @@ -452,7 +452,7 @@ void ScAutoFmtPreview::CalcCellArray( bool bFitWidthP ) aPrvSize.Height() = maArray.GetHeight() + 4; } -//------------------------------------------------------------------------ + inline void lclSetStyleFromBorder( svx::frame::Style& rStyle, const ::editeng::SvxBorderLine* pBorder ) { @@ -488,7 +488,7 @@ void ScAutoFmtPreview::CalcLineMap() } } -//------------------------------------------------------------------------ + void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData ) { @@ -508,7 +508,7 @@ void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData ) DoPaint( Rectangle( Point(0,0), GetSizePixel() ) ); } -//------------------------------------------------------------------------ + void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) { @@ -540,7 +540,7 @@ void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) aVD.SetDrawMode( nOldDrawMode ); } -//------------------------------------------------------------------------ + void ScAutoFmtPreview::Paint( const Rectangle& rRect ) { diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index e0c53ea02492..8d7eecbe01cd 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -478,7 +478,7 @@ void ScColRowNameRangesDlg::SetActive() void ScColRowNameRangesDlg::UpdateNames() { pLbRange->SetUpdateMode( false ); - //----------------------------------------------------------- + pLbRange->Clear(); aRangeMap.clear(); pEdAssign->SetText( EMPTY_OUSTRING ); @@ -590,7 +590,7 @@ void ScColRowNameRangesDlg::UpdateNames() } delete [] ppSortArray; } - //----------------------------------------------------------- + pLbRange->SetUpdateMode( true ); pLbRange->Invalidate(); } @@ -666,7 +666,7 @@ bool ScColRowNameRangesDlg::IsRefInputMode() const return (pEdActive != NULL); } -//------------------------------------------------------------------------ + // Handler: // ======== diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 62fcaafa7187..94ea4e734932 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -9,7 +9,7 @@ #undef SC_DLLIMPLEMENTATION -//------------------------------------------------------------------ + #include "datafdlg.hxx" #include "scresid.hxx" diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index f93a040b153a..0f5cc7dce2a2 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include "delcldlg.hxx" #include "scresid.hxx" @@ -65,7 +65,7 @@ ScDeleteCellDlg::ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove) } } -//------------------------------------------------------------------------ + DelCellCmd ScDeleteCellDlg::GetDelCellCmd() const { diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index cb9d15d7fb85..deb5e2d58a2b 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -19,7 +19,7 @@ #undef SC_DLLIMPLEMENTATION -//------------------------------------------------------------------ + #include "delcodlg.hxx" #include "scresid.hxx" @@ -33,7 +33,7 @@ sal_uInt16 ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING IDF_NOTE | IDF_FORMULA | IDF_VALUE); -//----------------------------------------------------------------------- + ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, sal_uInt16 nCheckDefaults ) : @@ -78,7 +78,7 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, aBtnDelAll->SetClickHdl( LINK( this, ScDeleteContentsDlg, DelAllHdl ) ); } -//------------------------------------------------------------------------ + sal_uInt16 ScDeleteContentsDlg::GetDelContentsCmdBits() const { @@ -106,7 +106,7 @@ sal_uInt16 ScDeleteContentsDlg::GetDelContentsCmdBits() const : ScDeleteContentsDlg::nPreviousChecks ); } -//------------------------------------------------------------------------ + void ScDeleteContentsDlg::DisableChecks( bool bDelAllChecked ) { @@ -135,7 +135,7 @@ void ScDeleteContentsDlg::DisableChecks( bool bDelAllChecked ) } } -//------------------------------------------------------------------------ + void ScDeleteContentsDlg::DisableObjects() { @@ -144,7 +144,7 @@ void ScDeleteContentsDlg::DisableObjects() aBtnDelObjects->Disable(); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG_INLINE_START(ScDeleteContentsDlg, DelAllHdl) { diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 1e28222655f5..409498d92996 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -22,7 +22,7 @@ -//---------------------------------------------------------------------------- + #include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> @@ -42,7 +42,7 @@ //============================================================================ // class ScFillSeriesDlg -//---------------------------------------------------------------------------- + ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, ScDocument& rDocument, @@ -88,13 +88,13 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, } -//---------------------------------------------------------------------------- + ScFillSeriesDlg::~ScFillSeriesDlg() { } -//---------------------------------------------------------------------------- + void ScFillSeriesDlg::SetEdStartValEnabled(bool bFlag) { @@ -111,7 +111,7 @@ void ScFillSeriesDlg::SetEdStartValEnabled(bool bFlag) } } -//---------------------------------------------------------------------------- + void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) { @@ -200,7 +200,7 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) } -//---------------------------------------------------------------------------- + bool ScFillSeriesDlg::CheckStartVal() { @@ -221,7 +221,7 @@ bool ScFillSeriesDlg::CheckStartVal() } -//---------------------------------------------------------------------------- + bool ScFillSeriesDlg::CheckIncrementVal() { @@ -232,7 +232,7 @@ bool ScFillSeriesDlg::CheckIncrementVal() } -//---------------------------------------------------------------------------- + bool ScFillSeriesDlg::CheckEndVal() { @@ -253,9 +253,9 @@ bool ScFillSeriesDlg::CheckEndVal() } -//---------------------------------------------------------------------------- + // Handler: -//---------------------------------------------------------------------------- + IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) { @@ -294,7 +294,7 @@ IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) } -//---------------------------------------------------------------------------- + IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) { diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index acaecbf58a6d..f5689f338bdf 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include "groupdlg.hxx" #include "scresid.hxx" @@ -50,14 +50,14 @@ ScGroupDlg::ScGroupDlg(Window* pParent, bool bUngroup, bool bRows) m_pBtnRows->GrabFocus(); } -//------------------------------------------------------------------------ + bool ScGroupDlg::GetColsChecked() const { return m_pBtnCols->IsChecked(); } -//------------------------------------------------------------------------ + ScGroupDlg::~ScGroupDlg() { diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index aa915d4d1a15..58b32da9dd70 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -39,7 +39,7 @@ //============================================================================ // class ScHighlightChgDlg -//---------------------------------------------------------------------------- + ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData) : ScAnyRefDlg(pB, pCW, pParent, "ShowChangesDialog", @@ -133,7 +133,7 @@ void ScHighlightChgDlg::Init() HighlightHandle(m_pHighlightBox); } -//---------------------------------------------------------------------------- + // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Edit angezeigt wird. @@ -149,7 +149,7 @@ void ScHighlightChgDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } -//---------------------------------------------------------------------------- + bool ScHighlightChgDlg::Close() { return DoClose( ScHighlightChgDlgWrapper::GetChildWindowId() ); diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index 0d522c80224f..ac7760f6bf2c 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include "inscldlg.hxx" #include "scresid.hxx" @@ -66,7 +66,7 @@ ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) : } } -//------------------------------------------------------------------------ + InsCellCmd ScInsertCellDlg::GetInsCellCmd() const { diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 5213cad3f49a..3c979b539e74 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include "inscodlg.hxx" #include "scresid.hxx" @@ -37,7 +37,7 @@ sal_uInt16 ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0; sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd -//----------------------------------------------------------------------- + ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, sal_uInt16 nCheckDefaults, @@ -124,7 +124,7 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, } -//------------------------------------------------------------------------ + sal_uInt16 ScInsertContentsDlg::GetInsContentsCmdBits() const { @@ -152,7 +152,7 @@ sal_uInt16 ScInsertContentsDlg::GetInsContentsCmdBits() const : ScInsertContentsDlg::nPreviousChecks ); } -//------------------------------------------------------------------------ + InsCellCmd ScInsertContentsDlg::GetMoveMode() { @@ -164,7 +164,7 @@ InsCellCmd ScInsertContentsDlg::GetMoveMode() return INS_NONE; } -//------------------------------------------------------------------------ + void ScInsertContentsDlg::DisableChecks( bool bInsAllChecked ) { @@ -285,7 +285,7 @@ void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable ) } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl) { diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 86367d7c49b5..ade61782d536 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> @@ -71,7 +71,7 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT Init_Impl( bFromFile ); } -//------------------------------------------------------------------------ + ScInsertTableDlg::~ScInsertTableDlg() { @@ -80,7 +80,7 @@ ScInsertTableDlg::~ScInsertTableDlg() delete pDocInserter; } -//------------------------------------------------------------------------ + void ScInsertTableDlg::Init_Impl( bool bFromFile ) { @@ -130,7 +130,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile ) } } -//------------------------------------------------------------------------ + short ScInsertTableDlg::Execute() { @@ -146,7 +146,7 @@ short ScInsertTableDlg::Execute() return nRet; } -//------------------------------------------------------------------------ + void ScInsertTableDlg::SetNewTable_Impl() { @@ -167,7 +167,7 @@ void ScInsertTableDlg::SetNewTable_Impl() } } -//------------------------------------------------------------------------ + void ScInsertTableDlg::SetFromTo_Impl() { @@ -184,7 +184,7 @@ void ScInsertTableDlg::SetFromTo_Impl() } } -//------------------------------------------------------------------------ + void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) { @@ -209,7 +209,7 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) m_pLbTables->SelectEntryPos(0); } -//------------------------------------------------------------------------ + const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN ) { @@ -232,7 +232,7 @@ const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN ) return pStr; } -//------------------------------------------------------------------------ + const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) { @@ -251,9 +251,9 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) } -//------------------------------------------------------------------------ + // Handler: -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) { @@ -277,7 +277,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) { if ( m_pBtnNew->IsChecked() ) @@ -289,7 +289,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) { @@ -301,7 +301,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl) { @@ -309,7 +309,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl) return 0; } -//------------------------------------------------------------------------ + void ScInsertTableDlg::DoEnable_Impl() { diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 2ed54313ccaf..71bb8561f00a 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include <vcl/msgbox.hxx> @@ -48,14 +48,14 @@ ScSelEntryDlg::ScSelEntryDlg(Window* pParent, const std::vector<OUString> &rEnt m_pLb->SelectEntryPos( 0 ); } -//------------------------------------------------------------------------ + OUString ScSelEntryDlg::GetSelectEntry() const { return m_pLb->GetSelectEntry(); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG_INLINE_START(ScSelEntryDlg, DblClkHdl) { diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 0dcf2b283767..99bcb8ced250 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include "mtrindlg.hxx" #include "scresid.hxx" @@ -66,7 +66,7 @@ ScMetricInputDlg::ScMetricInputDlg( Window* pParent, m_pBtnDefVal->Check( nCurrentValue == nDefaultValue ); } -//------------------------------------------------------------------------ + long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const { @@ -92,7 +92,7 @@ long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const return sal::static_int_cast<long>( m_pEdValue->Denormalize( m_pEdValue->GetValue( eUnit ) ) ); } -//------------------------------------------------------------------------ + // Handler: IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) @@ -107,7 +107,7 @@ IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG_INLINE_START(ScMetricInputDlg, ModifyHdl) { diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 32c75cee5fe0..9e7bda9667ed 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include <vcl/msgbox.hxx> @@ -70,13 +70,13 @@ ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault) Init(); } -//------------------------------------------------------------------------ + ScMoveTableDlg::~ScMoveTableDlg() { } -//------------------------------------------------------------------------ + sal_uInt16 ScMoveTableDlg::GetSelectedDocument () const { return nDocument; } @@ -214,7 +214,7 @@ bool ScMoveTableDlg::IsCurrentDocSelected() const return pLbDoc->GetSelectEntryPos() == mnCurrentDocPos; } -//------------------------------------------------------------------------ + void ScMoveTableDlg::Init() { @@ -230,7 +230,7 @@ void ScMoveTableDlg::Init() SelHdl( pLbDoc ); } -//------------------------------------------------------------------------ + void ScMoveTableDlg::InitDocListBox() { @@ -271,7 +271,7 @@ void ScMoveTableDlg::InitDocListBox() pLbDoc->SelectEntryPos( nSelPos ); } -//------------------------------------------------------------------------ + // Handler: IMPL_LINK( ScMoveTableDlg, CheckBtnHdl, void *, pBtn ) diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index df8fb341c65d..a8f50292ccca 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -65,7 +65,7 @@ void ScSolverProgressDialog::SetTimeLimit( sal_Int32 nSeconds ) m_pFtTime->SetText( aNew ); } -//---------------------------------------------------------------------------- + ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* pParent, const OUString& rErrorText ) : ModalDialog(pParent, "NoSolutionDialog", "modules/scalc/ui/nosolutiondialog.ui") @@ -74,7 +74,7 @@ ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* pParent, const OUStr m_pFtErrorText->SetText(rErrorText); } -//---------------------------------------------------------------------------- + ScSolverSuccessDialog::ScSolverSuccessDialog( Window* pParent, const OUString& rSolution ) : ModalDialog(pParent, "SolverSuccessDialog", "modules/scalc/ui/solversuccessdialog.ui") @@ -97,7 +97,7 @@ IMPL_LINK( ScSolverSuccessDialog, ClickHdl, PushButton*, pBtn ) return 0; } -//---------------------------------------------------------------------------- + ScCursorRefEdit::ScCursorRefEdit( Window* pParent, Window *pLabel ) : formula::RefEdit( pParent, pLabel ) @@ -132,7 +132,7 @@ void ScCursorRefEdit::KeyInput( const KeyEvent& rKEvt ) formula::RefEdit::KeyInput( rKEvt ); } -//---------------------------------------------------------------------------- + ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bMin, bool bValue, const OUString& rTarget, const OUString& rVariable, @@ -153,7 +153,7 @@ ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bM //============================================================================ // class ScOptSolverDlg -//---------------------------------------------------------------------------- + ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocShell* pDocSh, ScAddress aCursorPos ) @@ -275,13 +275,13 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP Init( aCursorPos ); } -//---------------------------------------------------------------------------- + ScOptSolverDlg::~ScOptSolverDlg() { } -//---------------------------------------------------------------------------- + void ScOptSolverDlg::Init(const ScAddress& rCursorPos) { @@ -390,7 +390,7 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) mpEdActive = m_pEdObjectiveCell; } -//---------------------------------------------------------------------------- + void ScOptSolverDlg::ReadConditions() { @@ -449,14 +449,14 @@ void ScOptSolverDlg::EnableButtons() } } -//---------------------------------------------------------------------------- + bool ScOptSolverDlg::Close() { return DoClose( ScOptSolverDlgWrapper::GetChildWindowId() ); } -//---------------------------------------------------------------------------- + void ScOptSolverDlg::SetActive() { @@ -473,7 +473,7 @@ void ScOptSolverDlg::SetActive() RefInputDone(); } -//---------------------------------------------------------------------------- + void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { @@ -526,14 +526,14 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } -//---------------------------------------------------------------------------- + bool ScOptSolverDlg::IsRefInputMode() const { return mpEdActive != NULL; } -//---------------------------------------------------------------------------- + // Handler: IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) @@ -581,7 +581,7 @@ IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) return 0; } -//---------------------------------------------------------------------------- + IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control*, pCtrl ) { @@ -612,7 +612,7 @@ IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control*, pCtrl ) return 0; } -//---------------------------------------------------------------------------- + IMPL_LINK_NOARG(ScOptSolverDlg, LoseFocusHdl) { @@ -620,7 +620,7 @@ IMPL_LINK_NOARG(ScOptSolverDlg, LoseFocusHdl) return 0; } -//---------------------------------------------------------------------------- + IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) { @@ -650,7 +650,7 @@ IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) return 0; } -//---------------------------------------------------------------------------- + IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl) { @@ -751,7 +751,7 @@ IMPL_LINK( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit*, pEdit ) return 0; } -//---------------------------------------------------------------------------- + void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus ) { @@ -764,7 +764,7 @@ void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus ) } } -//---------------------------------------------------------------------------- + bool ScOptSolverDlg::ParseRef( ScRange& rRange, const OUString& rInput, bool bAllowRange ) { diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index 04650ada93e9..c738ba3a8593 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -25,7 +25,7 @@ #include "tabvwsh.hxx" #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> -//------------------------------------------------------------------------ + ScRedComDialog::ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet, ScDocShell *pShell, ScChangeAction *pAction, bool bPrevNext) diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 489317c7fd69..4b1d4fa7f3c2 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include "scitems.hxx" #include <svx/algitem.hxx> @@ -99,14 +99,14 @@ ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, FreeResource(); } -//------------------------------------------------------------------------ + ScAutoFormatDlg::~ScAutoFormatDlg() { delete pWndPreview; } -//------------------------------------------------------------------------ + void ScAutoFormatDlg::Init() { @@ -155,7 +155,7 @@ void ScAutoFormatDlg::Init() } } -//------------------------------------------------------------------------ + void ScAutoFormatDlg::UpdateChecks() { @@ -169,9 +169,9 @@ void ScAutoFormatDlg::UpdateChecks() aBtnAdjust .Check( pData->GetIncludeWidthHeight() ); } -//------------------------------------------------------------------------ + // Handler: -//--------- + IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) { @@ -185,7 +185,7 @@ IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl) { @@ -197,7 +197,7 @@ IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl) } IMPL_LINK_NOARG_INLINE_END(ScAutoFormatDlg, DblClkHdl) -//------------------------------------------------------------------------ + IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) { @@ -228,7 +228,7 @@ IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) { @@ -302,7 +302,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl) { @@ -427,7 +427,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) { @@ -451,7 +451,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) return 0; } -//------------------------------------------------------------------------ + OUString ScAutoFormatDlg::GetCurrFormatName() { diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 247b50dee34d..7a1f93d39f13 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include <vcl/msgbox.hxx> @@ -45,7 +45,7 @@ ScShowTabDlg::ScShowTabDlg(Window* pParent) m_pLb->SetDoubleClickHdl( LINK( this, ScShowTabDlg, DblClkHdl ) ); } -//------------------------------------------------------------------------ + void ScShowTabDlg::SetDescription( const OUString& rTitle, const OUString& rFixedText, @@ -64,7 +64,7 @@ void ScShowTabDlg::Insert( const OUString& rString, bool bSelected ) m_pLb->SelectEntryPos( m_pLb->GetEntryCount() - 1 ); } -//------------------------------------------------------------------------ + sal_uInt16 ScShowTabDlg::GetSelectEntryCount() const { @@ -81,7 +81,7 @@ sal_uInt16 ScShowTabDlg::GetSelectEntryPos(sal_uInt16 nPos) const return m_pLb->GetSelectEntryPos(nPos); } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG_INLINE_START(ScShowTabDlg, DblClkHdl) { diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index f44668da4134..e9ab70bb22cc 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -61,26 +61,26 @@ ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pPa SetDispatcherLock( true ); // Modal-Modus einschalten } -//---------------------------------------------------------------------------- + ScSimpleRefDlg::~ScSimpleRefDlg() { SetDispatcherLock( false ); // Modal-Modus einschalten } -//---------------------------------------------------------------------------- + void ScSimpleRefDlg::FillInfo(SfxChildWinInfo& rWinInfo) const { ScAnyRefDlg::FillInfo(rWinInfo); rWinInfo.bVisible=bAutoReOpen; } -//---------------------------------------------------------------------------- + void ScSimpleRefDlg::SetRefString(const OUString &rStr) { m_pEdAssign->SetText(rStr); } -//---------------------------------------------------------------------------- + void ScSimpleRefDlg::Init() { m_pBtnOk->SetClickHdl ( LINK( this, ScSimpleRefDlg, OkBtnHdl ) ); @@ -88,7 +88,7 @@ void ScSimpleRefDlg::Init() bCloseFlag=false; } -//---------------------------------------------------------------------------- + // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Fenster angezeigt wird. void ScSimpleRefDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) @@ -126,14 +126,14 @@ void ScSimpleRefDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } -//---------------------------------------------------------------------------- + bool ScSimpleRefDlg::Close() { CancelBtnHdl(m_pBtnCancel); return true; } -//------------------------------------------------------------------------ + void ScSimpleRefDlg::SetActive() { m_pEdAssign->GrabFocus(); @@ -144,7 +144,7 @@ void ScSimpleRefDlg::SetActive() RefInputDone(); } -//------------------------------------------------------------------------ + bool ScSimpleRefDlg::IsRefInputMode() const { return true; @@ -193,7 +193,7 @@ void ScSimpleRefDlg::RefInputDone( bool bForced) if ( (bForced || bCloseOnButtonUp) && bCloseFlag ) OkBtnHdl(m_pBtnOk); } -//------------------------------------------------------------------------ + // Handler: // ======== IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl) @@ -207,7 +207,7 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl) return 0; } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) { bAutoReOpen=false; @@ -221,6 +221,6 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 6e9acc0dd917..76ed6391f3ce 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -55,7 +55,7 @@ struct ScSolverOptionsEntry } }; -//------------------------------------------------------------------ + class ScSolverOptionsString : public SvLBoxString { @@ -106,7 +106,7 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const rDev.SetFont( aOldFont ); } -//------------------------------------------------------------------ + ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, const uno::Sequence<OUString>& rImplNames, @@ -392,7 +392,7 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl) return 0; } -//------------------------------------------------------------------ + ScSolverIntegerDialog::ScSolverIntegerDialog(Window * pParent) : ModalDialog( pParent, "IntegerDialog", @@ -422,7 +422,7 @@ sal_Int32 ScSolverIntegerDialog::GetValue() const return (sal_Int32) nValue; } -//------------------------------------------------------------------ + ScSolverValueDialog::ScSolverValueDialog( Window * pParent ) : ModalDialog( pParent, "DoubleDialog", diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index 57dddbe7b751..a8f401d4b210 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------ + #define SCSOLVER_SERVICE "com.sun.star.sheet.Solver" diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 6762b599a028..7999bd8b2c09 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -74,13 +74,13 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, Init(); } -//---------------------------------------------------------------------------- + ScSolverDlg::~ScSolverDlg() { } -//---------------------------------------------------------------------------- + void ScSolverDlg::Init() { @@ -107,14 +107,14 @@ void ScSolverDlg::Init() pEdActive = m_pEdFormulaCell; } -//---------------------------------------------------------------------------- + bool ScSolverDlg::Close() { return DoClose( ScSolverDlgWrapper::GetChildWindowId() ); } -//---------------------------------------------------------------------------- + void ScSolverDlg::SetActive() { @@ -131,7 +131,7 @@ void ScSolverDlg::SetActive() RefInputDone(); } -//---------------------------------------------------------------------------- + void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { @@ -155,7 +155,7 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } -//---------------------------------------------------------------------------- + void ScSolverDlg::RaiseError( ScSolverErr eError ) { @@ -183,14 +183,14 @@ void ScSolverDlg::RaiseError( ScSolverErr eError ) } } -//---------------------------------------------------------------------------- + bool ScSolverDlg::IsRefInputMode() const { return pEdActive != NULL; } -//---------------------------------------------------------------------------- + bool ScSolverDlg::CheckTargetValue( const OUString& rStrVal ) { @@ -200,7 +200,7 @@ bool ScSolverDlg::CheckTargetValue( const OUString& rStrVal ) return pDoc->GetFormatTable()->IsNumberFormat( rStrVal, n1, n2 ); } -//---------------------------------------------------------------------------- + // Handler: IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) @@ -261,7 +261,7 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) return 0; } -//---------------------------------------------------------------------------- + IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) { @@ -281,7 +281,7 @@ IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) return 0; } -//---------------------------------------------------------------------------- + IMPL_LINK_NOARG(ScSolverDlg, LoseFocusHdl) { diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index e19317a9bf37..26000471746e 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -20,7 +20,7 @@ #undef SC_DLLIMPLEMENTATION -//------------------------------------------------------------------ + #include "tabbgcolordlg.hxx" #include "scresid.hxx" @@ -65,7 +65,7 @@ ScTabBgColorDlg::ScTabBgColorDlg(Window* pParent, const OUString& rTitle, m_pBtnOk->SetClickHdl( HDL(TabBgColorOKHdl_Impl) ); } -//------------------------------------------------------------------------ + void ScTabBgColorDlg::GetSelectedColor( Color& rColor ) const { diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 67c08135fdd6..5c74f8e76b4f 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -33,7 +33,7 @@ //============================================================================ // class ScTabOpDlg -//---------------------------------------------------------------------------- + ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDocument, @@ -77,14 +77,14 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, Init(); } -//---------------------------------------------------------------------------- + ScTabOpDlg::~ScTabOpDlg() { Hide(); } -//---------------------------------------------------------------------------- + void ScTabOpDlg::Init() { @@ -114,14 +114,14 @@ void ScTabOpDlg::Init() //SFX_APPWINDOW->Enable(); } -//---------------------------------------------------------------------------- + bool ScTabOpDlg::Close() { return DoClose( ScTabOpDlgWrapper::GetChildWindowId() ); } -//---------------------------------------------------------------------------- + void ScTabOpDlg::SetActive() { @@ -137,7 +137,7 @@ void ScTabOpDlg::SetActive() RefInputDone(); } -//---------------------------------------------------------------------------- + void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { @@ -174,7 +174,7 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } -//---------------------------------------------------------------------------- + void ScTabOpDlg::RaiseError( ScTabOpErr eError ) { @@ -223,7 +223,7 @@ void ScTabOpDlg::RaiseError( ScTabOpErr eError ) pEd->GrabFocus(); } -//---------------------------------------------------------------------------- + static sal_Bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCurTab, ScRefAddress& rStart, ScRefAddress& rEnd ) @@ -240,7 +240,7 @@ static sal_Bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCur return bRet; } -//---------------------------------------------------------------------------- + // Handler: IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) @@ -323,7 +323,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) return 0; } -//---------------------------------------------------------------------------- + IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl ) { @@ -342,7 +342,7 @@ IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl ) return 0; } -//---------------------------------------------------------------------------- + IMPL_LINK_NOARG(ScTabOpDlg, LoseFocusHdl) { diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 3b19249be091..27f505a9ac7e 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -30,7 +30,7 @@ #include "sc.hrc" #include <svl/intitem.hxx> #include <svx/flagsdef.hxx> -// ----------------------------------------------------------------------- + ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ) @@ -45,7 +45,7 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, AddTabPage("position", RID_SVXPAGE_CHAR_POSITION); } -// ----------------------------------------------------------------------- + void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { @@ -65,7 +65,7 @@ void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } -// ----------------------------------------------------------------------- + ScParagraphDlg::ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr) : SfxTabDialog(pParent, "ParagraphDialog", @@ -82,7 +82,7 @@ ScParagraphDlg::ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr) m_nTabPageId = AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); } -// ----------------------------------------------------------------------- + void ScParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index 166e8123897f..606e4d113c11 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -58,7 +58,7 @@ void ScCbWarningBox::DisableDialog() } -// ---------------------------------------------------------------------------- + ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) : ScCbWarningBox( pParent, OUString( ScResId( STR_REPLCELLSWARN ) ), true ) diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index e29eff38e977..0bae7989c7b5 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include "namepast.hxx" #include "scresid.hxx" @@ -76,7 +76,7 @@ ScNamePasteDlg::~ScNamePasteDlg() delete mpTable; } -//------------------------------------------------------------------ + IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton ) { @@ -101,7 +101,7 @@ IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton ) return 0; } -//------------------------------------------------------------------ + std::vector<OUString> ScNamePasteDlg::GetSelectedNames() const { diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index 9297aae5f350..a3be41e53ba7 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -28,7 +28,7 @@ // STATIC DATA ----------------------------------------------------------- -//------------------------------------------------------------------------ + ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16 nIdP, ScNavigatorDlg& rDlg, @@ -38,7 +38,7 @@ ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16 nIdP, { } -//------------------------------------------------------------------------ + void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemState /* eState */, const SfxPoolItem* pItem ) diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 0e8319242828..f0e8c493b77a 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -64,7 +64,7 @@ static const sal_Int32 SCNAV_COLLETTERS = ::ScColToAlpha(SCNAV_MAXCOL).getLength #define SCNAV_MAXROW (MAXROWCOUNT) -//------------------------------------------------------------------------ + void ScNavigatorDlg::ReleaseFocus() { @@ -91,13 +91,13 @@ ColumnEdit::ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId ) SetMaxTextLen( SCNAV_COLDIGITS ); // 1...256...18278 or A...IV...ZZZ } -//------------------------------------------------------------------------ + ColumnEdit::~ColumnEdit() { } -//------------------------------------------------------------------------ + bool ColumnEdit::Notify( NotifyEvent& rNEvt ) { @@ -129,7 +129,7 @@ bool ColumnEdit::Notify( NotifyEvent& rNEvt ) return nHandled; } -//------------------------------------------------------------------------ + void ColumnEdit::LoseFocus() { @@ -137,7 +137,7 @@ void ColumnEdit::LoseFocus() } -//------------------------------------------------------------------------ + void ColumnEdit::Up() { @@ -149,7 +149,7 @@ void ColumnEdit::Up() nCol--; } -//------------------------------------------------------------------------ + void ColumnEdit::Down() { @@ -157,7 +157,7 @@ void ColumnEdit::Down() SetCol( nCol-1 ); } -//------------------------------------------------------------------------ + void ColumnEdit::First() { @@ -165,7 +165,7 @@ void ColumnEdit::First() SetText(OUString('A')); } -//------------------------------------------------------------------------ + void ColumnEdit::Last() { @@ -175,7 +175,7 @@ void ColumnEdit::Last() } -//------------------------------------------------------------------------ + void ColumnEdit::EvalText() { @@ -197,7 +197,7 @@ void ColumnEdit::EvalText() nKeyGroup = KEYGROUP_ALPHA; } -//------------------------------------------------------------------------ + void ColumnEdit::ExecuteCol() { @@ -209,7 +209,7 @@ void ColumnEdit::ExecuteCol() rDlg.SetCurrentCell( nCol-1, nRow-1 ); } -//------------------------------------------------------------------------ + void ColumnEdit::SetCol( SCCOL nColNo ) { @@ -228,7 +228,7 @@ void ColumnEdit::SetCol( SCCOL nColNo ) } } -//------------------------------------------------------------------------ + SCCOL ColumnEdit::AlphaToNum( OUString& rStr ) { @@ -253,7 +253,7 @@ SCCOL ColumnEdit::AlphaToNum( OUString& rStr ) return nColumn; } -//------------------------------------------------------------------------ + SCCOL ColumnEdit::NumStrToAlpha( OUString& rStr ) { @@ -267,7 +267,7 @@ SCCOL ColumnEdit::NumStrToAlpha( OUString& rStr ) return nColumn; } -//------------------------------------------------------------------------ + SCCOL ColumnEdit::NumToAlpha( SCCOL nColNo, OUString& rStr ) { @@ -293,13 +293,13 @@ RowEdit::RowEdit( ScNavigatorDlg* pParent, const ResId& rResId ) SetLast( SCNAV_MAXROW); } -//------------------------------------------------------------------------ + RowEdit::~RowEdit() { } -//------------------------------------------------------------------------ + bool RowEdit::Notify( NotifyEvent& rNEvt ) { @@ -320,13 +320,13 @@ bool RowEdit::Notify( NotifyEvent& rNEvt ) return nHandled; } -//------------------------------------------------------------------------ + void RowEdit::LoseFocus() { } -//------------------------------------------------------------------------ + void RowEdit::ExecuteRow() { @@ -347,13 +347,13 @@ ScDocListBox::ScDocListBox( ScNavigatorDlg* pParent, const ResId& rResId ) { } -//------------------------------------------------------------------------ + ScDocListBox::~ScDocListBox() { } -//------------------------------------------------------------------------ + void ScDocListBox::Select() { @@ -378,13 +378,13 @@ CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId ) SetItemBits( IID_DROPMODE, GetItemBits( IID_DROPMODE ) | TIB_DROPDOWNONLY ); } -//------------------------------------------------------------------------ + CommandToolBox::~CommandToolBox() { } -//------------------------------------------------------------------------ + void CommandToolBox::Select( sal_uInt16 nSelId ) { @@ -436,13 +436,13 @@ void CommandToolBox::Select() Select( GetCurItemId() ); } -//------------------------------------------------------------------------ + void CommandToolBox::Click() { } -//------------------------------------------------------------------------ + IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl) { @@ -470,7 +470,7 @@ IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl) return 1; } -//------------------------------------------------------------------------ + void CommandToolBox::UpdateButtons() { @@ -686,12 +686,12 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win ppBoundItems = new ScNavigatorControllerItem* [CTRL_ITEMS]; rBindings.ENTERREGISTRATIONS(); - //----------------------------- + REGISTER_SLOT( 0, SID_CURRENTCELL ); REGISTER_SLOT( 1, SID_CURRENTTAB ); REGISTER_SLOT( 2, SID_CURRENTDOC ); REGISTER_SLOT( 3, SID_SELECT_SCENARIO ); - //----------------------------- + rBindings.LEAVEREGISTRATIONS(); StartListening( *(SFX_APP()) ); @@ -745,7 +745,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win aLbEntries.SetNavigatorDlgFlag(true); } -//------------------------------------------------------------------------ + ScNavigatorDlg::~ScNavigatorDlg() { @@ -762,7 +762,7 @@ ScNavigatorDlg::~ScNavigatorDlg() EndListening( rBindings ); } -//------------------------------------------------------------------------ + void ScNavigatorDlg::Resizing( Size& rNewSize ) // Size = Outputsize? { @@ -818,14 +818,14 @@ void ScNavigatorDlg::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } -//------------------------------------------------------------------------ + void ScNavigatorDlg::Resize() { DoResize(); } -//------------------------------------------------------------------------ + void ScNavigatorDlg::DoResize() { @@ -884,7 +884,7 @@ void ScNavigatorDlg::DoResize() } } -//------------------------------------------------------------------------ + void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) { @@ -957,7 +957,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -//------------------------------------------------------------------------ + IMPL_LINK( ScNavigatorDlg, TimeHdl, Timer*, pTimer ) { @@ -968,7 +968,7 @@ IMPL_LINK( ScNavigatorDlg, TimeHdl, Timer*, pTimer ) return 0; } -//------------------------------------------------------------------------ + void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew) { @@ -979,7 +979,7 @@ void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew) rCfg.SetDragMode(nDropMode); } -//------------------------------------------------------------------------ + void ScNavigatorDlg::CursorPosChanged() { @@ -989,7 +989,7 @@ void ScNavigatorDlg::CursorPosChanged() // if ( GetAreaAtCursor( aStrAreaName ) ) } -//------------------------------------------------------------------------ + void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo ) { @@ -1025,7 +1025,7 @@ void ScNavigatorDlg::SetCurrentCellStr( const OUString rName ) &aNameItem, 0L ); } -//------------------------------------------------------------------------ + void ScNavigatorDlg::SetCurrentTable( SCTAB nTabNo ) { @@ -1058,7 +1058,7 @@ void ScNavigatorDlg::SetCurrentTableStr( const OUString& rName ) } } -//------------------------------------------------------------------------ + void ScNavigatorDlg::SetCurrentObject( const OUString rName ) { @@ -1068,7 +1068,7 @@ void ScNavigatorDlg::SetCurrentObject( const OUString rName ) &aNameItem, 0L ); } -//------------------------------------------------------------------------ + void ScNavigatorDlg::SetCurrentDoc( const OUString& rDocName ) // aktivieren { @@ -1078,14 +1078,14 @@ void ScNavigatorDlg::SetCurrentDoc( const OUString& rDocName ) // aktivie &aDocItem, 0L ); } -//------------------------------------------------------------------------ + ScTabViewShell* ScNavigatorDlg::GetTabViewShell() const { return PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); } -//------------------------------------------------------------------------ + ScNavigatorSettings* ScNavigatorDlg::GetNavigatorSettings() { @@ -1098,7 +1098,7 @@ ScNavigatorSettings* ScNavigatorDlg::GetNavigatorSettings() return pViewSh ? pViewSh->GetNavigatorSettings() : NULL; } -//------------------------------------------------------------------------ + bool ScNavigatorDlg::GetViewData() { @@ -1108,7 +1108,7 @@ bool ScNavigatorDlg::GetViewData() return ( pViewData != NULL ); } -//------------------------------------------------------------------------ + void ScNavigatorDlg::UpdateColumn( const SCCOL* pCol ) { @@ -1121,7 +1121,7 @@ void ScNavigatorDlg::UpdateColumn( const SCCOL* pCol ) CheckDataArea(); } -//------------------------------------------------------------------------ + void ScNavigatorDlg::UpdateRow( const SCROW* pRow ) { @@ -1134,7 +1134,7 @@ void ScNavigatorDlg::UpdateRow( const SCROW* pRow ) CheckDataArea(); } -//------------------------------------------------------------------------ + void ScNavigatorDlg::UpdateTable( const SCTAB* pTab ) { @@ -1146,7 +1146,7 @@ void ScNavigatorDlg::UpdateTable( const SCTAB* pTab ) CheckDataArea(); } -//------------------------------------------------------------------------ + void ScNavigatorDlg::UpdateAll() { @@ -1169,7 +1169,7 @@ void ScNavigatorDlg::UpdateAll() aContentTimer.Stop(); // dann nicht nochmal } -//------------------------------------------------------------------------ + void ScNavigatorDlg::SetListMode( NavListMode eMode, bool bSetSize ) { @@ -1211,7 +1211,7 @@ void ScNavigatorDlg::SetListMode( NavListMode eMode, bool bSetSize ) UnmarkDataArea(); } -//------------------------------------------------------------------------ + void ScNavigatorDlg::ShowList( bool bShow, bool bSetSize ) { @@ -1259,7 +1259,7 @@ void ScNavigatorDlg::ShowList( bool bShow, bool bSetSize ) } } -//------------------------------------------------------------------------ + void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize ) { @@ -1308,11 +1308,11 @@ void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize ) } -//------------------------------------------------------------------------ + // // Dokumente fuer Dropdown-Listbox // -//------------------------------------------------------------------------ + void ScNavigatorDlg::GetDocNames( const OUString* pManualSel ) { @@ -1361,7 +1361,7 @@ void ScNavigatorDlg::GetDocNames( const OUString* pManualSel ) aLbDocuments.SelectEntry( aSelEntry ); } -//------------------------------------------------------------------------ + void ScNavigatorDlg::MarkDataArea() { @@ -1383,7 +1383,7 @@ void ScNavigatorDlg::MarkDataArea() } } -//------------------------------------------------------------------------ + void ScNavigatorDlg::UnmarkDataArea() { @@ -1396,7 +1396,7 @@ void ScNavigatorDlg::UnmarkDataArea() } } -//------------------------------------------------------------------------ + void ScNavigatorDlg::CheckDataArea() { @@ -1414,7 +1414,7 @@ void ScNavigatorDlg::CheckDataArea() } } -//------------------------------------------------------------------------ + void ScNavigatorDlg::StartOfDataArea() { @@ -1434,7 +1434,7 @@ void ScNavigatorDlg::StartOfDataArea() } } -//------------------------------------------------------------------------ + void ScNavigatorDlg::EndOfDataArea() { @@ -1454,7 +1454,7 @@ void ScNavigatorDlg::EndOfDataArea() } } -//------------------------------------------------------------------------ + SfxChildAlignment ScNavigatorDlg::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index d97aeeee4da9..eb88a4b375a9 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -228,7 +228,7 @@ ScScenarioWindow::ScScenarioWindow( Window* pParent, const OUString& aQH_List, } } -// ----------------------------------------------------------------------- + ScScenarioWindow::~ScScenarioWindow() { @@ -244,7 +244,7 @@ void ScScenarioWindow::Paint( const Rectangle& rRect ) Window::Paint( rRect ); } -// ----------------------------------------------------------------------- + void ScScenarioWindow::NotifyState( const SfxPoolItem* pState ) { @@ -273,7 +273,7 @@ void ScScenarioWindow::NotifyState( const SfxPoolItem* pState ) } } -// ----------------------------------------------------------------------- + void ScScenarioWindow::SetSizePixel( const Size& rNewSize ) { diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 9fcfee9f4e1e..43cb3082ef6d 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include <svx/dlgutil.hxx> #include <svx/drawitem.hxx> @@ -44,7 +44,7 @@ #include "opredlin.hxx" -//------------------------------------------------------------------ + ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index a51f2a26275d..2b9dcbae11e0 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -19,7 +19,7 @@ #undef SC_DLLIMPLEMENTATION -//------------------------------------------------------------------ + #include "scitems.hxx" #include <vcl/msgbox.hxx> @@ -69,7 +69,7 @@ ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs) SetExchangeSupport(); } -//----------------------------------------------------------------------- + ScTpCalcOptions::~ScTpCalcOptions() { @@ -77,7 +77,7 @@ ScTpCalcOptions::~ScTpCalcOptions() delete pLocalOptions; } -//----------------------------------------------------------------------- + void ScTpCalcOptions::Init() { @@ -88,14 +88,14 @@ void ScTpCalcOptions::Init() m_pBtnDate1904->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) ); } -//----------------------------------------------------------------------- + SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTpCalcOptions( pParent, rAttrSet ) ); } -//----------------------------------------------------------------------- + void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) { @@ -146,7 +146,7 @@ void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) } -//----------------------------------------------------------------------- + sal_Bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { @@ -173,7 +173,7 @@ sal_Bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) return false; } -//------------------------------------------------------------------------ + int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) { @@ -201,7 +201,7 @@ int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) return nReturn; } -//----------------------------------------------------------------------- + // Handler: IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn ) @@ -222,7 +222,7 @@ IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn ) return 0; } -//----------------------------------------------------------------------- + IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn ) { diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 084060ba1313..ad198d008bd0 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -19,7 +19,7 @@ #undef SC_DLLIMPLEMENTATION -//------------------------------------------------------------------ + #include <scmod.hxx> #include <svl/eitem.hxx> diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index a07018403e0d..dc78e8ed7292 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -29,7 +29,7 @@ #include "sc.hrc" #include "optdlg.hrc" -// ----------------------------------------------------------------------- + ScTpPrintOptions::ScTpPrintOptions( Window* pParent, const SfxItemSet& rCoreAttrs ) @@ -60,7 +60,7 @@ int ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) { @@ -92,7 +92,7 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) m_pForceBreaksCB->SaveValue(); } -// ----------------------------------------------------------------------- + sal_Bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 43ad77cfac04..731073f88ca8 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -89,7 +89,7 @@ ScTpUserLists::ScTpUserLists( Window* pParent, Reset(rCoreAttrs); } -// ----------------------------------------------------------------------- + ScTpUserLists::~ScTpUserLists() { @@ -97,7 +97,7 @@ ScTpUserLists::~ScTpUserLists() delete pRangeUtil; } -// ----------------------------------------------------------------------- + void ScTpUserLists::Init() { @@ -146,14 +146,14 @@ void ScTpUserLists::Init() } -// ----------------------------------------------------------------------- + SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTpUserLists( pParent, rAttrSet ) ); } -// ----------------------------------------------------------------------- + void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) { @@ -205,7 +205,7 @@ void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) } } -// ----------------------------------------------------------------------- + sal_Bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) { @@ -246,7 +246,7 @@ sal_Bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) return bDataModified; } -// ----------------------------------------------------------------------- + int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) { @@ -256,7 +256,7 @@ int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } -// ----------------------------------------------------------------------- + sal_uInt16 ScTpUserLists::UpdateUserListBox() { @@ -264,7 +264,7 @@ sal_uInt16 ScTpUserLists::UpdateUserListBox() if ( !pUserLists ) return 0; - //---------------------------------------------------------- + size_t nCount = pUserLists->size(); OUString aEntry; @@ -279,13 +279,13 @@ sal_uInt16 ScTpUserLists::UpdateUserListBox() return nCount; } -// ----------------------------------------------------------------------- + void ScTpUserLists::UpdateEntries( size_t nList ) { if ( !pUserLists ) return; - //---------------------------------------------------------- + if ( nList < pUserLists->size() ) { @@ -308,7 +308,7 @@ void ScTpUserLists::UpdateEntries( size_t nList ) } } -// ----------------------------------------------------------------------- + void ScTpUserLists::MakeListStr( OUString& rListStr ) { @@ -346,7 +346,7 @@ void ScTpUserLists::MakeListStr( OUString& rListStr ) } -// ----------------------------------------------------------------------- + void ScTpUserLists::AddNewList( const OUString& rEntriesStr ) { @@ -360,14 +360,14 @@ void ScTpUserLists::AddNewList( const OUString& rEntriesStr ) pUserLists->push_back(new ScUserListData(theEntriesStr)); } -// ----------------------------------------------------------------------- + void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, const ScRefAddress& rEndPos ) { if ( bCopyDone ) return; - //---------------------------------------------------------- + SCTAB nTab = rStartPos.Tab(); SCCOL nStartCol = rStartPos.Col(); @@ -446,20 +446,20 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, } } - //---------------------------------------------------------- + bCopyDone = true; } -// ----------------------------------------------------------------------- + void ScTpUserLists::ModifyList( sal_uInt16 nSelList, const OUString& rEntriesStr ) { if ( !pUserLists ) return; - //---------------------------------------------------------- + OUString theEntriesStr( rEntriesStr ); @@ -468,7 +468,7 @@ void ScTpUserLists::ModifyList( sal_uInt16 nSelList, (*pUserLists)[nSelList]->SetString( theEntriesStr ); } -// ----------------------------------------------------------------------- + void ScTpUserLists::RemoveList( size_t nList ) { @@ -480,9 +480,9 @@ void ScTpUserLists::RemoveList( size_t nList ) } } -//----------------------------------------------------------------------- + // Handler: -//--------- + IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb ) { @@ -507,7 +507,7 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) { @@ -528,7 +528,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) mpBtnAdd->Disable(); mpBtnModify->Disable(); mpBtnRemove->Disable(); - //----------------------------- + if ( mpBtnCopy->IsEnabled() ) { mpBtnCopy->Disable(); @@ -557,7 +557,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) } mpBtnAdd->Disable(); mpBtnModify->Disable(); - //----------------------------- + if ( pViewData && !bCopyDone ) { mpBtnCopy->Enable(); @@ -692,7 +692,7 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) if ( bCopyDone ) return 0; - //----------------------------------------------------------- + ScRefAddress theStartPos; ScRefAddress theEndPos; @@ -744,14 +744,14 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) return 0; } -// ----------------------------------------------------------------------- + IMPL_LINK( ScTpUserLists, EdEntriesModHdl, VclMultiLineEdit*, pEd ) { if ( pEd != mpEdEntries ) return 0; - //----------------------------------------------------------- + if ( mpBtnCopy->IsEnabled() ) { diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 568daece00af..7dd0b96b5807 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include "scitems.hxx" #include "tpview.hxx" @@ -309,7 +309,7 @@ void ScTpContentOptions::InitGridOpt() if ( !pColorList.is() ) return; - //------------------------------------------------------ + pColorLB->SetUpdateMode( false ); diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index cfe2ed3c0534..278dfef35328 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -94,7 +94,7 @@ static void printAddressFlags(sal_uInt16 nFlag) //============================================================================ // class ScPrintAreasDlg -//---------------------------------------------------------------------------- + ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ) : ScAnyRefDlg(pB, pCW, pParent, "PrintAreasDialog", "modules/scalc/ui/printareasdialog.ui") @@ -145,7 +145,7 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* } -//---------------------------------------------------------------------------- + ScPrintAreasDlg::~ScPrintAreasDlg() { @@ -161,7 +161,7 @@ ScPrintAreasDlg::~ScPrintAreasDlg() } -//---------------------------------------------------------------------------- + bool ScPrintAreasDlg::Close() { @@ -169,7 +169,7 @@ bool ScPrintAreasDlg::Close() } -//---------------------------------------------------------------------------- + bool ScPrintAreasDlg::IsTableLocked() const { @@ -180,7 +180,7 @@ bool ScPrintAreasDlg::IsTableLocked() const } -//---------------------------------------------------------------------------- + void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ ) { @@ -214,7 +214,7 @@ void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ } -//---------------------------------------------------------------------------- + void ScPrintAreasDlg::AddRefEntry() { @@ -233,7 +233,7 @@ void ScPrintAreasDlg::AddRefEntry() } -//---------------------------------------------------------------------------- + void ScPrintAreasDlg::Deactivate() { @@ -241,7 +241,7 @@ void ScPrintAreasDlg::Deactivate() } -//---------------------------------------------------------------------------- + void ScPrintAreasDlg::SetActive() { @@ -262,7 +262,7 @@ void ScPrintAreasDlg::SetActive() } -//---------------------------------------------------------------------------- + void ScPrintAreasDlg::Impl_Reset() { @@ -287,9 +287,9 @@ void ScPrintAreasDlg::Impl_Reset() Impl_FillLists(); - //------------------------- + // Druckbereich - //------------------------- + aStrRange = ""; OUString aOne; const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); @@ -308,15 +308,15 @@ void ScPrintAreasDlg::Impl_Reset() } pEdPrintArea->SetText( aStrRange ); - //------------------------------- + // Wiederholungszeile - //------------------------------- + lcl_GetRepeatRangeString(pRepeatRowRange, pDoc, true, aStrRange); pEdRepeatRow->SetText( aStrRange ); - //-------------------------------- + // Wiederholungsspalte - //-------------------------------- + lcl_GetRepeatRangeString(pRepeatColRange, pDoc, false, aStrRange); pEdRepeatCol->SetText( aStrRange ); @@ -332,7 +332,7 @@ void ScPrintAreasDlg::Impl_Reset() } -//---------------------------------------------------------------------------- + bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) { @@ -353,7 +353,7 @@ bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) } -//---------------------------------------------------------------------------- + bool ScPrintAreasDlg::Impl_CheckRefStrings() { @@ -418,13 +418,13 @@ bool ScPrintAreasDlg::Impl_CheckRefStrings() } -//---------------------------------------------------------------------------- + void ScPrintAreasDlg::Impl_FillLists() { - //------------------------------------------------------ + // Selektion holen und String in PrintArea-ListBox merken - //------------------------------------------------------ + ScRange aRange; OUString aStrRange; sal_Bool bSimple = sal_True; @@ -445,9 +445,9 @@ void ScPrintAreasDlg::Impl_FillLists() pLbPrintArea->SetEntryData( SC_AREASDLG_PR_SELECT, new OUString( aStrRange ) ); - //------------------------------------------------------ + // Ranges holen und in ListBoxen merken - //------------------------------------------------------ + ScRangeName* pRangeNames = pDoc->GetRangeName(); if (!pRangeNames || pRangeNames->empty()) @@ -493,9 +493,9 @@ void ScPrintAreasDlg::Impl_FillLists() } -//---------------------------------------------------------------------------- + // Handler: -//---------------------------------------------------------------------------- + IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) { @@ -509,9 +509,9 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) SfxStringItem aRepeatRow( FN_PARAM_2, aStr ); SfxStringItem aRepeatCol( FN_PARAM_3, aStr ); - //------------------------- + // Druckbereich veraendert? - //------------------------- + // first try the list box, if "Entite sheet" is selected bool bEntireSheet = (pLbPrintArea->GetSelectEntryPos() == SC_AREASDLG_PR_ENTIRE); @@ -524,14 +524,14 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) bDataChanged |= Impl_GetItem( pEdPrintArea, aPrintArea ); } - //------------------------------- + // Wiederholungszeile veraendert? - //------------------------------- + bDataChanged |= Impl_GetItem( pEdRepeatRow, aRepeatRow ); - //-------------------------------- + // Wiederholungsspalte veraendert? - //-------------------------------- + bDataChanged |= Impl_GetItem( pEdRepeatCol, aRepeatCol ); if ( bDataChanged ) @@ -553,7 +553,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) } -//---------------------------------------------------------------------------- + IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) { @@ -580,7 +580,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) } -//---------------------------------------------------------------------------- + IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb ) { @@ -619,7 +619,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb ) } -//---------------------------------------------------------------------------- + IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) { @@ -671,7 +671,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) //============================================================================ // globale Funktionen: -// ---------------------------------------------------------------------------- + // TODO: It might make sense to move these functions to address.?xx. -kohei @@ -854,7 +854,7 @@ static bool lcl_CheckRepeatString( const OUString& rStr, ScDocument* pDoc, bool return true; } -// ---------------------------------------------------------------------------- + static void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, OUString& rStr ) { diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index ce777e84d7f1..9e04835ba7a7 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include "scitems.hxx" #include <svl/eitem.hxx> @@ -32,7 +32,7 @@ #include "globstr.hrc" #include "scresid.hxx" #include "scuitphfedit.hxx" -//------------------------------------------------------------------ + // macros from docsh4.cxx //! use SIDs? @@ -201,7 +201,7 @@ ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP, } } -// ----------------------------------------------------------------------- + void ScHFEditDlg::PageCreated( sal_uInt16 /* nId */, SfxTabPage& rPage ) { diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 33ddc5bbeb1e..05480042bbcc 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -20,7 +20,7 @@ #undef SC_DLLIMPLEMENTATION -//------------------------------------------------------------------ + #include "scitems.hxx" #include <editeng/eeitem.hxx> @@ -156,7 +156,7 @@ IMPL_LINK( ScHFEditPage, ObjectSelectHdl, ScEditWindow*, pEdit ) return 0; } -// ----------------------------------------------------------------------- + ScHFEditPage::~ScHFEditPage() { @@ -206,7 +206,7 @@ sal_Bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) return sal_True; } -// ----------------------------------------------------------------------- + #define SET_CMD(i,id) \ aCmd = aDel; \ @@ -214,7 +214,7 @@ sal_Bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) aCmd += aDel; \ aCmdArr[i] = aCmd; -// ----------------------------------------------------------------------- + void ScHFEditPage::FillCmdArr() { @@ -759,9 +759,9 @@ void ScHFEditPage::ClearTextAreas() m_pWndRight->Invalidate(); } -//----------------------------------------------------------------------- + // Handler: -//----------------------------------------------------------------------- + IMPL_LINK( ScHFEditPage, ListHdl_Impl, ListBox*, pList ) { @@ -857,7 +857,7 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& true ) {} -// ----------------------------------------------------------------------- + SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScRightHeaderEditPage( pParent, rCoreSet ) ); }; @@ -873,7 +873,7 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r true ) {} -// ----------------------------------------------------------------------- + SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScLeftHeaderEditPage( pParent, rCoreSet ) ); }; @@ -889,7 +889,7 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& false ) {} -// ----------------------------------------------------------------------- + SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScRightFooterEditPage( pParent, rCoreSet ) ); }; @@ -905,7 +905,7 @@ ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& r false ) {} -// ----------------------------------------------------------------------- + SfxTabPage* ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScLeftFooterEditPage( pParent, rCoreSet ) ); }; diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 46dfeaac3a03..3b566e527545 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #define _TPHF_CXX #include "scitems.hxx" @@ -86,13 +86,13 @@ ScHFPage::ScHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) m_pBtnEdit->SetHelpId( HID_SC_FOOTER_EDIT ); } -//------------------------------------------------------------------ + ScHFPage::~ScHFPage() { } -//------------------------------------------------------------------ + void ScHFPage::Reset( const SfxItemSet& rSet ) { @@ -100,7 +100,7 @@ void ScHFPage::Reset( const SfxItemSet& rSet ) TurnOnHdl( 0 ); } -//------------------------------------------------------------------ + sal_Bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) { @@ -120,7 +120,7 @@ sal_Bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) return bResult; } -//------------------------------------------------------------------ + void ScHFPage::ActivatePage( const SfxItemSet& rSet ) { @@ -138,7 +138,7 @@ void ScHFPage::ActivatePage( const SfxItemSet& rSet ) SvxHFPage::ActivatePage( rSet ); } -//------------------------------------------------------------------ + int ScHFPage::DeactivatePage( SfxItemSet* pSetP ) { @@ -149,7 +149,7 @@ int ScHFPage::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } -//------------------------------------------------------------------ + void ScHFPage::ActivatePage() { @@ -159,9 +159,9 @@ void ScHFPage::DeactivatePage() { } -//------------------------------------------------------------------ + // Handler: -//------------------------------------------------------------------ + IMPL_LINK_NOARG(ScHFPage, TurnOnHdl) { @@ -176,7 +176,7 @@ IMPL_LINK_NOARG(ScHFPage, TurnOnHdl) } -//------------------------------------------------------------------ + IMPL_LINK_NOARG(ScHFPage, BtnHdl) { @@ -273,14 +273,14 @@ ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet ) { } -//------------------------------------------------------------------ + SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScHeaderPage( pParent, rCoreSet ) ); } -//------------------------------------------------------------------ + sal_uInt16* ScHeaderPage::GetRanges() { @@ -296,14 +296,14 @@ ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet ) { } -//------------------------------------------------------------------ + SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScFooterPage( pParent, rCoreSet ) ); } -//------------------------------------------------------------------ + sal_uInt16* ScFooterPage::GetRanges() { diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index dc0b9d03d531..8456893d21ee 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -121,7 +121,7 @@ void ScEditWindow::Resize() Control::Resize(); } -// ----------------------------------------------------------------------- + ScEditWindow::~ScEditWindow() { @@ -141,7 +141,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScEditWindow(Window *pParen return new ScEditWindow (pParent, WB_BORDER|WB_TABSTOP, Left); } -// ----------------------------------------------------------------------- + void ScEditWindow::SetNumType(SvxNumType eNumType) { @@ -149,7 +149,7 @@ void ScEditWindow::SetNumType(SvxNumType eNumType) pEdEngine->UpdateFields(); } -// ----------------------------------------------------------------------- + EditTextObject* ScEditWindow::CreateTextObject() { @@ -164,7 +164,7 @@ EditTextObject* ScEditWindow::CreateTextObject() return pEdEngine->CreateTextObject(); } -// ----------------------------------------------------------------------- + void ScEditWindow::SetFont( const ScPatternAttr& rPattern ) { @@ -180,21 +180,21 @@ void ScEditWindow::SetFont( const ScPatternAttr& rPattern ) pEdEngine->SetDefaults( pSet ); } -// ----------------------------------------------------------------------- + void ScEditWindow::SetText( const EditTextObject& rTextObject ) { pEdEngine->SetText( rTextObject ); } -// ----------------------------------------------------------------------- + void ScEditWindow::InsertField( const SvxFieldItem& rFld ) { pEdView->InsertField( rFld ); } -// ----------------------------------------------------------------------- + void ScEditWindow::SetCharAttriutes() { @@ -233,7 +233,7 @@ void ScEditWindow::SetCharAttriutes() } } -// ----------------------------------------------------------------------- + void ScEditWindow::Paint( const Rectangle& rRect ) { @@ -252,14 +252,14 @@ void ScEditWindow::Paint( const Rectangle& rRect ) pEdView->ShowCursor(true,true); } -// ----------------------------------------------------------------------- + void ScEditWindow::MouseMove( const MouseEvent& rMEvt ) { pEdView->MouseMove( rMEvt ); } -// ----------------------------------------------------------------------- + void ScEditWindow::MouseButtonDown( const MouseEvent& rMEvt ) { @@ -269,14 +269,14 @@ void ScEditWindow::MouseButtonDown( const MouseEvent& rMEvt ) pEdView->MouseButtonDown( rMEvt ); } -// ----------------------------------------------------------------------- + void ScEditWindow::MouseButtonUp( const MouseEvent& rMEvt ) { pEdView->MouseButtonUp( rMEvt ); } -// ----------------------------------------------------------------------- + void ScEditWindow::KeyInput( const KeyEvent& rKEvt ) { @@ -299,14 +299,14 @@ void ScEditWindow::KeyInput( const KeyEvent& rKEvt ) } } -// ----------------------------------------------------------------------- + void ScEditWindow::Command( const CommandEvent& rCEvt ) { pEdView->Command( rCEvt ); } -// ----------------------------------------------------------------------- + void ScEditWindow::GetFocus() { @@ -333,7 +333,7 @@ void ScEditWindow::LoseFocus() pAcc = NULL; } -// ----------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ScEditWindow::CreateAccessible() { diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index 1b738d354207..cfaa6b14a2f6 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -22,7 +22,7 @@ -//------------------------------------------------------------------ + #include "scitems.hxx" #include <svx/numinf.hxx> @@ -130,7 +130,7 @@ ScStyleDlg::ScStyleDlg( Window* pParent, } } -// ----------------------------------------------------------------------- + void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) { @@ -182,7 +182,7 @@ void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) } -// ----------------------------------------------------------------------- + const SfxItemSet* ScStyleDlg::GetRefreshedSet() { diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx index 13aaaf95df50..4409ab9ba93d 100644 --- a/sc/source/ui/undo/areasave.cxx +++ b/sc/source/ui/undo/areasave.cxx @@ -24,7 +24,7 @@ #include "document.hxx" #include <documentlinkmgr.hxx> -// ----------------------------------------------------------------------- + ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLink& rSource ) : aFileName ( rSource.GetFile() ), diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 96040f7f081e..d8ff8df96b4b 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -44,7 +44,7 @@ #include "refundo.hxx" #include "markdata.hxx" -// ----------------------------------------------------------------------- + TYPEINIT1(ScUndoDoOutline, ScSimpleUndo); TYPEINIT1(ScUndoMakeOutline, ScSimpleUndo); diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index d55cde4a08d3..ae5b177673b4 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -29,12 +29,12 @@ #include "inputhdl.hxx" #include "globstr.hrc" -// ----------------------------------------------------------------------- + TYPEINIT1(ScUndoModifyStyle, ScSimpleUndo); TYPEINIT1(ScUndoApplyPageStyle, ScSimpleUndo); -// ----------------------------------------------------------------------- + // // modify style (cell or page style) // @@ -86,7 +86,7 @@ void ScStyleSaveData::InitFromStyle( const SfxStyleSheetBase* pSource ) *this = ScStyleSaveData(); // empty } -// ----------------------------------------------------------------------- + ScUndoModifyStyle::ScUndoModifyStyle( ScDocShell* pDocSh, SfxStyleFamily eFam, const ScStyleSaveData& rOld, const ScStyleSaveData& rNew ) : @@ -230,7 +230,7 @@ bool ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; // no repeat possible } -// ----------------------------------------------------------------------- + // // apply page style // diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index 9ebcb601e9c2..f68cae8554d5 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -32,7 +32,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + ScAddressConversionObj::ScAddressConversionObj(ScDocShell* pDocSh, bool _bIsRange) : pDocShell( pDocSh ), diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 5d5c998ab76a..2e0a87b9a443 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -60,12 +60,12 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + // ein AutoFormat hat immer 16 Eintraege #define SC_AF_FIELD_COUNT 16 -//------------------------------------------------------------------------ + // AutoFormat-Map nur fuer PropertySetInfo, ohne Which-IDs @@ -143,7 +143,7 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() return aAutoFieldMap_Impl; } -//------------------------------------------------------------------------ + #define SCAUTOFORMATSOBJ_SERVICE "com.sun.star.sheet.TableAutoFormats" @@ -151,7 +151,7 @@ SC_SIMPLE_SERVICE_INFO( ScAutoFormatFieldObj, "ScAutoFormatFieldObj", "com.sun.s SC_SIMPLE_SERVICE_INFO( ScAutoFormatObj, "ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat" ) SC_SIMPLE_SERVICE_INFO( ScAutoFormatsObj, "ScAutoFormatsObj", SCAUTOFORMATSOBJ_SERVICE ) -//------------------------------------------------------------------------ + static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUString& rName, sal_uInt16& rOutIndex ) { @@ -170,7 +170,7 @@ static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUStrin return false; // is nich } -//------------------------------------------------------------------------ + ScAutoFormatsObj::ScAutoFormatsObj() { @@ -391,7 +391,7 @@ sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const OUString& aName ) *ScGlobal::GetOrCreateAutoFormat(), aString, nDummy ); } -//------------------------------------------------------------------------ + ScAutoFormatObj::ScAutoFormatObj(sal_uInt16 nIndex) : aPropSet( lcl_GetAutoFormatMap() ), @@ -656,7 +656,7 @@ uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const OUString& aPropertyNa SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAutoFormatObj ) -//------------------------------------------------------------------------ + ScAutoFormatFieldObj::ScAutoFormatFieldObj(sal_uInt16 nFormat, sal_uInt16 nField) : aPropSet( lcl_GetAutoFieldMap() ), @@ -853,7 +853,7 @@ uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const OUString& aPrope SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAutoFormatFieldObj ) -//------------------------------------------------------------------------ + diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index bb4fb89a5c91..827e64bc8211 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -42,7 +42,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + // Calc document extern uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw(); @@ -118,7 +118,7 @@ extern OUString SAL_CALL ScXMLOasisExport_Settings_getImplementationName() throw extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_createInstance( const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw( uno::Exception ); -//------------------------------------------------------------------------ + // Anzahl der Funktionen, die als zuletzt benutzt gespeichert werden //! Define mit funcpage.hxx und dwfunctr.hxx zusammenfassen !!! @@ -133,7 +133,7 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_crea // Anzahl der PropertyValues in einer Function-Description #define SC_FUNCDESC_PROPCOUNT 5 -//------------------------------------------------------------------------ + // alles ohne Which-ID, Map nur fuer PropertySetInfo @@ -164,7 +164,7 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() return aSettingsPropertyMap_Impl; } -//------------------------------------------------------------------------ + #define SCFUNCTIONLISTOBJ_SERVICE "com.sun.star.sheet.FunctionDescriptions" #define SCRECENTFUNCTIONSOBJ_SERVICE "com.sun.star.sheet.RecentFunctions" @@ -174,7 +174,7 @@ SC_SIMPLE_SERVICE_INFO( ScFunctionListObj, "ScFunctionListObj", SCFUNCTIONLISTOB SC_SIMPLE_SERVICE_INFO( ScRecentFunctionsObj, "ScRecentFunctionsObj", SCRECENTFUNCTIONSOBJ_SERVICE ) SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREADSHEETSETTINGS_SERVICE ) -//------------------------------------------------------------------------ + extern "C" { @@ -383,7 +383,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory( } // extern C -//------------------------------------------------------------------------ + ScSpreadsheetSettings::ScSpreadsheetSettings() : aPropSet( lcl_GetSettingsPropertyMap() ) @@ -660,7 +660,7 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aProp SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSpreadsheetSettings ) -//------------------------------------------------------------------------ + ScRecentFunctionsObj::ScRecentFunctionsObj() { @@ -741,7 +741,7 @@ sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions() throw(uno::Runt return LRU_MAX; } -//------------------------------------------------------------------------ + ScFunctionListObj::ScFunctionListObj() { @@ -988,7 +988,7 @@ sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName ) return false; } -//------------------------------------------------------------------------ + diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 4867a63bdae9..47d32d3ee420 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -48,7 +48,7 @@ namespace calc //= OCellListSource //===================================================================== DBG_NAME( OCellListSource ) - //--------------------------------------------------------------------- + #ifdef DBG_UTIL const char* OCellListSource::checkConsistency_static( const void* _pThis ) { @@ -65,7 +65,7 @@ namespace calc } #endif - //--------------------------------------------------------------------- + OCellListSource::OCellListSource( const Reference< XSpreadsheetDocument >& _rxDocument ) :OCellListSource_Base( m_aMutex ) ,OCellListSource_PBase( OCellListSource_Base::rBHelper ) @@ -88,7 +88,7 @@ namespace calc ); } - //--------------------------------------------------------------------- + OCellListSource::~OCellListSource( ) { if ( !OCellListSource_Base::rBHelper.bDisposed ) @@ -100,13 +100,13 @@ namespace calc DBG_DTOR( OCellListSource, checkConsistency_static ); } - //-------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( OCellListSource, OCellListSource_Base, OCellListSource_PBase ) - //-------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( OCellListSource, OCellListSource_Base, OCellListSource_PBase ) - //-------------------------------------------------------------------- + void SAL_CALL OCellListSource::disposing() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -126,20 +126,20 @@ namespace calc // TODO: clean up here whatever you need to clean up (e.g. revoking listeners etc.) } - //-------------------------------------------------------------------- + Reference< XPropertySetInfo > SAL_CALL OCellListSource::getPropertySetInfo( ) throw(RuntimeException) { DBG_CHKTHIS( OCellListSource, checkConsistency_static ); return createPropertySetInfo( getInfoHelper() ) ; } - //-------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& SAL_CALL OCellListSource::getInfoHelper() { return *OCellListSource_PABase::getArrayHelper(); } - //-------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* OCellListSource::createArrayHelper( ) const { Sequence< Property > aProps; @@ -147,7 +147,7 @@ namespace calc return new ::cppu::OPropertyArrayHelper(aProps); } - //-------------------------------------------------------------------- + void SAL_CALL OCellListSource::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { DBG_CHKTHIS( OCellListSource, checkConsistency_static ); @@ -158,7 +158,7 @@ namespace calc _rValue <<= getRangeAddress( ); } - //-------------------------------------------------------------------- + void OCellListSource::checkDisposed( ) const SAL_THROW( ( DisposedException ) ) { if ( OCellListSource_Base::rBHelper.bInDispose || OCellListSource_Base::rBHelper.bDisposed ) @@ -202,7 +202,7 @@ namespace calc return aAddress; } - //-------------------------------------------------------------------- + OUString OCellListSource::getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow ) { OSL_PRECOND( m_xRange.is(), "OCellListSource::getRangeAddress: invalid range!" ); @@ -216,7 +216,7 @@ namespace calc return sText; } - //-------------------------------------------------------------------- + sal_Int32 SAL_CALL OCellListSource::getListEntryCount( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -228,7 +228,7 @@ namespace calc return aAddress.EndRow - aAddress.StartRow + 1; } - //-------------------------------------------------------------------- + OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -242,7 +242,7 @@ namespace calc return getCellTextContent_noCheck( 0, _nPosition ); } - //-------------------------------------------------------------------- + Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -260,7 +260,7 @@ namespace calc return aAllEntries; } - //-------------------------------------------------------------------- + void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -274,7 +274,7 @@ namespace calc m_aListEntryListeners.addInterface( _rxListener ); } - //-------------------------------------------------------------------- + void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -288,7 +288,7 @@ namespace calc m_aListEntryListeners.removeInterface( _rxListener ); } - //-------------------------------------------------------------------- + void SAL_CALL OCellListSource::modified( const EventObject& /* aEvent */ ) throw (RuntimeException) { DBG_CHKTHIS( OCellListSource, checkConsistency_static ); @@ -296,7 +296,7 @@ namespace calc notifyModified(); } - //-------------------------------------------------------------------- + void OCellListSource::notifyModified() { EventObject aEvent; @@ -321,7 +321,7 @@ namespace calc } - //-------------------------------------------------------------------- + void SAL_CALL OCellListSource::disposing( const EventObject& aEvent ) throw (RuntimeException) { DBG_CHKTHIS( OCellListSource, checkConsistency_static ); @@ -334,7 +334,7 @@ namespace calc } } - //-------------------------------------------------------------------- + void SAL_CALL OCellListSource::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) { if ( m_bInitialized ) diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 9abcc28e92e6..ebbd4449cfc6 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -131,7 +131,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + class ScNamedEntry { @@ -146,7 +146,7 @@ public: const ScRange& GetRange() const { return aRange; } }; -//------------------------------------------------------------------------ + // The names in the maps must be sorted according to strcmp! //! Instead of Which-ID 0 use special IDs and do not compare via names! @@ -856,12 +856,12 @@ static const SvxItemPropertySet* lcl_GetEditPropertySet() return &aEditPropertySet; } -//------------------------------------------------------------------------ + using sc::HMMToTwips; using sc::TwipsToHMM; -//------------------------------------------------------------------------ + #define SCCHARPROPERTIES_SERVICE "com.sun.star.style.CharacterProperties" #define SCPARAPROPERTIES_SERVICE "com.sun.star.style.ParagraphProperties" @@ -883,7 +883,7 @@ SC_SIMPLE_SERVICE_INFO( ScCellsObj, "ScCellsObj", "com.sun.star.sheet.Cells" ) SC_SIMPLE_SERVICE_INFO( ScTableColumnObj, "ScTableColumnObj", "com.sun.star.table.TableColumn" ) SC_SIMPLE_SERVICE_INFO( ScTableRowObj, "ScTableRowObj", "com.sun.star.table.TableRow" ) -//------------------------------------------------------------------------ + //! ScLinkListener in anderes File verschieben !!! @@ -896,7 +896,7 @@ void ScLinkListener::Notify( SvtBroadcaster&, const SfxHint& rHint ) aLink.Call( (SfxHint*)&rHint ); } -//------------------------------------------------------------------------ + static void lcl_CopyProperties( beans::XPropertySet& rDest, beans::XPropertySet& rSource ) { @@ -1051,7 +1051,7 @@ void ScHelperFunctions::AssignTableBorder2ToAny( uno::Any& rAny, rAny <<= aBorder; } -//------------------------------------------------------------------------ + //! lcl_ApplyBorder nach docfunc verschieben! @@ -1403,7 +1403,7 @@ static OUString lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPos, sal return aVal; } -//------------------------------------------------------------------------ + ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR) : pPropSet(lcl_GetCellsPropertySet()), @@ -1807,7 +1807,7 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellRangesBase::getImplementationId() return theScCellRangesBaseImplementationId::get().getSeq(); } -// --- + void ScCellRangesBase::PaintRanges_Impl( sal_uInt16 nPart ) { @@ -4146,7 +4146,7 @@ ScCellRangesBase* ScCellRangesBase::getImplementation( const uno::Reference<uno: return pRet; } -//------------------------------------------------------------------------ + typedef boost::ptr_vector<ScNamedEntry> ScNamedEntryArr_Impl; @@ -4782,7 +4782,7 @@ uno::Reference<table::XCellRange> ScCellRangeObj::CreateRangeFromDoc( ScDocument return NULL; } -//------------------------------------------------------------------------ + ScCellRangeObj::ScCellRangeObj(ScDocShell* pDocSh, const ScRange& rR) : ScCellRangesBase( pDocSh, rR ), @@ -6062,7 +6062,7 @@ uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames() return aRet; } -//------------------------------------------------------------------------ + const SvxItemPropertySet* ScCellObj::GetEditPropertySet() { @@ -6874,7 +6874,7 @@ sal_Int16 SAL_CALL ScCellObj::resetActionLocks() throw(uno::RuntimeException) return nRet; } -//------------------------------------------------------------------------ + ScTableSheetObj::ScTableSheetObj( ScDocShell* pDocSh, SCTAB nTab ) : ScCellRangeObj( pDocSh, ScRange(0,0,nTab, MAXCOL,MAXROW,nTab) ), @@ -8728,7 +8728,7 @@ ScTableSheetObj* ScTableSheetObj::getImplementation( const uno::Reference<uno::X return pRet; } -//------------------------------------------------------------------------ + ScTableColumnObj::ScTableColumnObj( ScDocShell* pDocSh, SCCOL nCol, SCTAB nTab ) : ScCellRangeObj( pDocSh, ScRange(nCol,0,nTab, nCol,MAXROW,nTab) ), @@ -8937,7 +8937,7 @@ const SfxItemPropertyMap& ScTableColumnObj::GetItemPropertyMap() return pColPropSet->getPropertyMap(); } -//------------------------------------------------------------------------ + ScTableRowObj::ScTableRowObj(ScDocShell* pDocSh, SCROW nRow, SCTAB nTab) : ScCellRangeObj( pDocSh, ScRange(0,nRow,nTab, MAXCOL,nRow,nTab) ), @@ -9093,7 +9093,7 @@ const SfxItemPropertyMap& ScTableRowObj::GetItemPropertyMap() return pRowPropSet->getPropertyMap(); } -//------------------------------------------------------------------------ + ScCellsObj::ScCellsObj(ScDocShell* pDocSh, const ScRangeList& rR) : pDocShell( pDocSh ), @@ -9154,7 +9154,7 @@ sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException) return bHas; } -//------------------------------------------------------------------------ + ScCellsEnumeration::ScCellsEnumeration(ScDocShell* pDocSh, const ScRangeList& rR) : pDocShell( pDocSh ), @@ -9286,7 +9286,7 @@ uno::Any SAL_CALL ScCellsEnumeration::nextElement() throw(container::NoSuchEleme throw container::NoSuchElementException(); // no more elements } -//------------------------------------------------------------------------ + ScCellFormatsObj::ScCellFormatsObj(ScDocShell* pDocSh, const ScRange& rRange) : pDocShell( pDocSh ), @@ -9408,7 +9408,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFormatsObj::createEnumera return NULL; } -//------------------------------------------------------------------------ + ScCellFormatsEnumeration::ScCellFormatsEnumeration(ScDocShell* pDocSh, const ScRange& rRange) : pDocShell( pDocSh ), @@ -9516,7 +9516,7 @@ uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement() throw(container::NoSuc return uno::makeAny(uno::Reference<table::XCellRange> (NextObject_Impl())); } -//------------------------------------------------------------------------ + ScUniqueCellFormatsObj::ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange& rRange) : pDocShell( pDocSh ), @@ -9786,7 +9786,7 @@ uno::Reference<container::XEnumeration> SAL_CALL ScUniqueCellFormatsObj::createE return NULL; } -//------------------------------------------------------------------------ + ScUniqueCellFormatsEnumeration::ScUniqueCellFormatsEnumeration(ScDocShell* pDocSh, const ScMyRangeLists& rRangeLists) : aRangeLists(rRangeLists), diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 2236bac9cd14..1118ca6b30c0 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -52,7 +52,7 @@ namespace calc //= OCellValueBinding //===================================================================== DBG_NAME( OCellValueBinding ) - //--------------------------------------------------------------------- + #ifdef DBG_UTIL const char* OCellValueBinding::checkConsistency_static( const void* _pThis ) { @@ -72,7 +72,7 @@ namespace calc } #endif - //--------------------------------------------------------------------- + OCellValueBinding::OCellValueBinding( const Reference< XSpreadsheetDocument >& _rxDocument, bool _bListPos ) :OCellValueBinding_Base( m_aMutex ) ,OCellValueBinding_PBase( OCellValueBinding_Base::rBHelper ) @@ -97,7 +97,7 @@ namespace calc // which probably maps to the cell being locked } - //--------------------------------------------------------------------- + OCellValueBinding::~OCellValueBinding( ) { if ( !OCellValueBinding_Base::rBHelper.bDisposed ) @@ -109,13 +109,13 @@ namespace calc DBG_DTOR( OCellValueBinding, checkConsistency_static ); } - //-------------------------------------------------------------------- + IMPLEMENT_FORWARD_XINTERFACE2( OCellValueBinding, OCellValueBinding_Base, OCellValueBinding_PBase ) - //-------------------------------------------------------------------- + IMPLEMENT_FORWARD_XTYPEPROVIDER2( OCellValueBinding, OCellValueBinding_Base, OCellValueBinding_PBase ) - //-------------------------------------------------------------------- + void SAL_CALL OCellValueBinding::disposing() { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); @@ -132,20 +132,20 @@ namespace calc // for the cell) } - //-------------------------------------------------------------------- + Reference< XPropertySetInfo > SAL_CALL OCellValueBinding::getPropertySetInfo( ) throw(RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); return createPropertySetInfo( getInfoHelper() ) ; } - //-------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper& SAL_CALL OCellValueBinding::getInfoHelper() { return *OCellValueBinding_PABase::getArrayHelper(); } - //-------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* OCellValueBinding::createArrayHelper( ) const { Sequence< Property > aProps; @@ -153,7 +153,7 @@ namespace calc return new ::cppu::OPropertyArrayHelper(aProps); } - //-------------------------------------------------------------------- + void SAL_CALL OCellValueBinding::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); @@ -167,7 +167,7 @@ namespace calc _rValue <<= xCellAddress->getCellAddress( ); } - //-------------------------------------------------------------------- + Sequence< Type > SAL_CALL OCellValueBinding::getSupportedValueTypes( ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); @@ -199,7 +199,7 @@ namespace calc return aTypes; } - //-------------------------------------------------------------------- + sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); @@ -217,7 +217,7 @@ namespace calc return false; } - //-------------------------------------------------------------------- + Any SAL_CALL OCellValueBinding::getValue( const Type& aType ) throw (IncompatibleTypesException, RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); @@ -304,7 +304,7 @@ namespace calc return aReturn; } - //-------------------------------------------------------------------- + void SAL_CALL OCellValueBinding::setValue( const Any& aValue ) throw (IncompatibleTypesException, NoSupportException, RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); @@ -388,7 +388,7 @@ namespace calc // above } } - //-------------------------------------------------------------------- + void OCellValueBinding::setBooleanFormat() { // set boolean number format if not already set @@ -435,7 +435,7 @@ namespace calc } } - //-------------------------------------------------------------------- + void OCellValueBinding::checkDisposed( ) const SAL_THROW( ( DisposedException ) ) { if ( OCellValueBinding_Base::rBHelper.bInDispose || OCellValueBinding_Base::rBHelper.bDisposed ) @@ -443,7 +443,7 @@ namespace calc // TODO: is it worth having an error message here? } - //-------------------------------------------------------------------- + void OCellValueBinding::checkInitialized() SAL_THROW( ( RuntimeException ) ) { if ( !m_bInitialized ) @@ -451,7 +451,7 @@ namespace calc // TODO: error message } - //-------------------------------------------------------------------- + void OCellValueBinding::checkValueType( const Type& _rType ) const SAL_THROW( ( IncompatibleTypesException ) ) { OCellValueBinding* pNonConstThis = const_cast< OCellValueBinding* >( this ); @@ -497,14 +497,14 @@ namespace calc m_aModifyListeners.addInterface( _rxListener ); } - //-------------------------------------------------------------------- + void SAL_CALL OCellValueBinding::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException) { if ( _rxListener.is() ) m_aModifyListeners.removeInterface( _rxListener ); } - //-------------------------------------------------------------------- + void OCellValueBinding::notifyModified() { EventObject aEvent; @@ -528,7 +528,7 @@ namespace calc } } - //-------------------------------------------------------------------- + void SAL_CALL OCellValueBinding::modified( const EventObject& /* aEvent */ ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); @@ -536,7 +536,7 @@ namespace calc notifyModified(); } - //-------------------------------------------------------------------- + void SAL_CALL OCellValueBinding::disposing( const EventObject& aEvent ) throw (RuntimeException) { DBG_CHKTHIS( OCellValueBinding, checkConsistency_static ); @@ -550,7 +550,7 @@ namespace calc } } - //-------------------------------------------------------------------- + void SAL_CALL OCellValueBinding::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException) { if ( m_bInitialized ) diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 05121150e8ee..795cfdfc06ba 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -433,7 +433,7 @@ vector<ScTokenRef>* Chart2PositionMap::getDataRowRanges(SCROW nRow) const return maData.getRowRanges( nRow); } -// ---------------------------------------------------------------------------- + /** * Designed to be a drop-in replacement for ScChartPositioner, in order to @@ -1092,7 +1092,7 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createLabeledDataSequenceFro } SAL_WNODEPRECATED_DECLARATIONS_POP -//---------------------------------------------------- + /** * Check the current list of reference tokens, and add the upper left * corner of the minimum range that encloses all ranges if certain @@ -2970,7 +2970,7 @@ IMPL_LINK( ScChart2DataSequence, ValueListenerHdl, SfxHint*, pHint ) return 0; } -// ---------------------------------------------------------------------------- + ScChart2DataSequence::ExternalRefListener::ExternalRefListener( ScChart2DataSequence& rParent, ScDocument* pDoc) : @@ -3022,7 +3022,7 @@ const boost::unordered_set<sal_uInt16>& ScChart2DataSequence::ExternalRefListene return maFileIds; } -// ---------------------------------------------------------------------------- + uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() throw (uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index cbd44d8cba64..20c06141b059 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -49,12 +49,12 @@ using namespace com::sun::star; #define PROP_HANDLE_RELATED_CELLRANGES 1 -//------------------------------------------------------------------------ + SC_SIMPLE_SERVICE_INFO( ScChartObj, "ScChartObj", "com.sun.star.table.TableChart" ) SC_SIMPLE_SERVICE_INFO( ScChartsObj, "ScChartsObj", "com.sun.star.table.TableCharts" ) -//------------------------------------------------------------------------ + static SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, SCTAB nTab, const OUString& rName ) { @@ -90,7 +90,7 @@ static SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, SCTAB nTab, const OU return NULL; } -//------------------------------------------------------------------------ + ScChartsObj::ScChartsObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), @@ -443,7 +443,7 @@ sal_Bool SAL_CALL ScChartsObj::hasByName( const OUString& aName ) return ( lcl_FindChartObj( pDocShell, nTab, aName ) != NULL ); } -//------------------------------------------------------------------------ + ScChartObj::ScChartObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN) :ScChartObj_Base( m_aMutex ) @@ -795,7 +795,7 @@ uno::Reference< beans::XPropertySetInfo > ScChartObj::getPropertySetInfo() throw return createPropertySetInfo( getInfoHelper() ) ; } -//------------------------------------------------------------------------ + diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 938bdf81d7db..70f8d03e2d24 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -81,7 +81,7 @@ static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() return aConfigPropertyMap_Impl; } -//------------------------------------------------------------------------ + ScDocumentConfiguration::ScDocumentConfiguration(ScDocShell* pDocSh) : pDocShell(pDocSh) , diff --git a/sc/source/ui/unoobj/convuno.cxx b/sc/source/ui/unoobj/convuno.cxx index 013ed0646acf..ea9c55144c07 100644 --- a/sc/source/ui/unoobj/convuno.cxx +++ b/sc/source/ui/unoobj/convuno.cxx @@ -24,7 +24,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + // everything is static... diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index 5985b6df2d2b..d9e21c0b04e4 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -34,12 +34,12 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + #define SCSHEETCELLCURSOR_SERVICE "com.sun.star.sheet.SheetCellCursor" #define SCCELLCURSOR_SERVICE "com.sun.star.table.CellCursor" -//------------------------------------------------------------------------ + ScCellCursorObj::ScCellCursorObj(ScDocShell* pDocSh, const ScRange& rR) : ScCellRangeObj( pDocSh, rR ) diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 4f793bc3b22c..2e33485d3326 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -110,7 +110,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap() return aDataPilotDescriptorBaseMap_Impl; } -// ---------------------------------------------------------------------------- + const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap() { @@ -138,7 +138,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap() return aDataPilotFieldMap_Impl; } -// ---------------------------------------------------------------------------- + const SfxItemPropertyMapEntry* lcl_GetDataPilotItemMap() { @@ -152,7 +152,7 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotItemMap() return aDataPilotItemMap_Impl; } -// ---------------------------------------------------------------------------- + inline bool lclCheckValidDouble( double fValue, sal_Bool bAuto ) { @@ -185,12 +185,12 @@ SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupsObj, "ScDataPilotFieldGroupsObj", SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupObj, "ScDataPilotFieldGroupObj", "com.sun.star.sheet.DataPilotFieldGroup" ) SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupItemObj, "ScDataPilotFieldGroupItemObj", "com.sun.star.sheet.DataPilotFieldGroupItem" ) -//------------------------------------------------------------------------ + // name that is used in the API for the data layout field #define SC_DATALAYOUT_NAME "Data" -//------------------------------------------------------------------------ + GeneralFunction ScDataPilotConversion::FirstFunc( sal_uInt16 nBits ) { @@ -244,7 +244,7 @@ void ScDataPilotConversion::FillGroupInfo( DataPilotFieldGroupInfo& rInfo, const rInfo.Step = rGroupInfo.mfStep; } -//------------------------------------------------------------------------ + static ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const OUString& rName ) { @@ -296,7 +296,7 @@ static sal_Int32 lcl_GetObjectIndex( ScDPObject* pDPObj, const ScFieldIdentifier return -1; // none } -//------------------------------------------------------------------------ + ScDataPilotTablesObj::ScDataPilotTablesObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), @@ -593,7 +593,7 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName ) return false; } -//------------------------------------------------------------------------ + ScDataPilotDescriptorBase::ScDataPilotDescriptorBase(ScDocShell* pDocSh) : maPropSet( lcl_GetDataPilotDescriptorBaseMap() ), @@ -1103,7 +1103,7 @@ ScDataPilotDescriptorBase* ScDataPilotDescriptorBase::getImplementation( return pRet; } -//------------------------------------------------------------------------ + ScDataPilotTableObj::ScDataPilotTableObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN) : ScDataPilotDescriptorBase( pDocSh ), @@ -1170,7 +1170,7 @@ Sequence<sal_Int8> SAL_CALL ScDataPilotTableObj::getImplementationId() return theScDataPilotTableObjImplementationId::get().getSeq(); } -// --- + ScDPObject* ScDataPilotTableObj::GetDPObject() const { return lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -1822,7 +1822,7 @@ sal_Bool SAL_CALL ScDataPilotFieldsObj::hasByName( const OUString& aName ) return GetObjectByName_Impl(aName) != NULL; } -//------------------------------------------------------------------------ + ScDataPilotFieldObj::ScDataPilotFieldObj( ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rFieldId ) : @@ -2865,7 +2865,7 @@ bool lclExtractGroupMembers( ScFieldGroupMembers& rMembers, const Any& rElement } // namespace -// ---------------------------------------------------------------------------- + ScDataPilotFieldGroupsObj::ScDataPilotFieldGroupsObj( const ScFieldGroups& rGroups ) : maGroups( rGroups ) @@ -3058,7 +3058,7 @@ OUString lclExtractMember( const Any& rElement ) } // namespace -// ---------------------------------------------------------------------------- + ScDataPilotFieldGroupObj::ScDataPilotFieldGroupObj( ScDataPilotFieldGroupsObj& rParent, const OUString& rGroupName ) : mrParent( rParent ), @@ -3361,7 +3361,7 @@ sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() throw(RuntimeException) return ( getCount() != 0 ); } -//------------------------------------------------------------------------ + ScDataPilotItemObj::ScDataPilotItemObj( ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rFieldId, sal_Int32 nIndex ) : ScDataPilotChildObjBase( rParent, rFieldId ), @@ -3543,7 +3543,7 @@ void SAL_CALL ScDataPilotItemObj::removeVetoableChangeListener( { } -//------------------------------------------------------------------------ + diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index 18a93361cc72..81388051b7cf 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -61,7 +61,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + // alles ohne Which-ID, Map nur fuer PropertySetInfo @@ -128,7 +128,7 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() } -//------------------------------------------------------------------------ + SC_SIMPLE_SERVICE_INFO( ScConsolidationDescriptor, "ScConsolidationDescriptor", "com.sun.star.sheet.ConsolidationDescriptor" ) @@ -162,7 +162,7 @@ sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc e return eGeneral; } -//------------------------------------------------------------------------ + // ScImportDescriptor: alles static @@ -270,7 +270,7 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ } } -//------------------------------------------------------------------------ + // ScSortDescriptor: alles static @@ -467,7 +467,7 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b } } -//------------------------------------------------------------------------ + ScSubTotalFieldObj::ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, sal_uInt16 nP ) : xRef( pDesc ), // Objekt festhalten @@ -558,7 +558,7 @@ void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns( rParent.PutData(aParam); } -//------------------------------------------------------------------------ + ScSubTotalDescriptorBase::ScSubTotalDescriptorBase() : aPropSet( lcl_GetSubTotalPropertyMap() ) @@ -813,7 +813,7 @@ ScSubTotalDescriptorBase* ScSubTotalDescriptorBase::getImplementation( return pRet; } -//------------------------------------------------------------------------ + ScSubTotalDescriptor::ScSubTotalDescriptor() { @@ -838,7 +838,7 @@ void ScSubTotalDescriptor::SetParam( const ScSubTotalParam& rNew ) aStoredParam = rNew; // von aussen gesetzt } -//------------------------------------------------------------------------ + ScRangeSubTotalDescriptor::ScRangeSubTotalDescriptor(ScDatabaseRangeObj* pPar) : pParent(pPar) @@ -865,7 +865,7 @@ void ScRangeSubTotalDescriptor::PutData( const ScSubTotalParam& rParam ) pParent->SetSubTotalParam( rParam ); } -//------------------------------------------------------------------------ + ScConsolidationDescriptor::ScConsolidationDescriptor() { @@ -1557,7 +1557,7 @@ uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPro SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFilterDescriptorBase ) -//------------------------------------------------------------------------ + ScFilterDescriptor::ScFilterDescriptor(ScDocShell* pDocShell) : @@ -1584,7 +1584,7 @@ void ScFilterDescriptor::SetParam( const ScQueryParam& rNew ) aStoredParam = rNew; // von aussen gesetzt } -//------------------------------------------------------------------------ + ScRangeFilterDescriptor::ScRangeFilterDescriptor(ScDocShell* pDocShell, ScDatabaseRangeObj* pPar) : ScFilterDescriptorBase(pDocShell), @@ -1612,7 +1612,7 @@ void ScRangeFilterDescriptor::PutData( const ScQueryParam& rParam ) pParent->SetQueryParam( rParam ); } -//------------------------------------------------------------------------ + ScDataPilotFilterDescriptor::ScDataPilotFilterDescriptor(ScDocShell* pDocShell, ScDataPilotDescriptorBase* pPar) : ScFilterDescriptorBase(pDocShell), @@ -1655,7 +1655,7 @@ void ScDataPilotFilterDescriptor::PutData( const ScQueryParam& rParam ) } } -//------------------------------------------------------------------------ + ScDatabaseRangeObj::ScDatabaseRangeObj(ScDocShell* pDocSh, const OUString& rNm) : pDocShell( pDocSh ), @@ -2226,7 +2226,7 @@ uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() return aRet; } -//------------------------------------------------------------------------ + ScDatabaseRangesObj::ScDatabaseRangesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) @@ -2424,7 +2424,7 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const OUString& aName ) return false; } -//------------------------------------------------------------------------ + ScUnnamedDatabaseRangesObj::ScUnnamedDatabaseRangesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) @@ -2510,7 +2510,7 @@ sal_Bool ScUnnamedDatabaseRangesObj::hasByTable( sal_Int32 nTab ) return false; } -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index 78337ff679bc..386bbbde0300 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap() { @@ -73,11 +73,11 @@ using sc::HMMToTwips; using sc::TwipsToHMM; using sc::TwipsToEvenHMM; -//------------------------------------------------------------------------ + SC_SIMPLE_SERVICE_INFO( ScDocDefaultsObj, "ScDocDefaultsObj", "com.sun.star.sheet.Defaults" ) -//------------------------------------------------------------------------ + ScDocDefaultsObj::ScDocDefaultsObj(ScDocShell* pDocSh) : pDocShell( pDocSh ), diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index 496a3d581f4e..7d2ba674cf1f 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -34,12 +34,12 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + static const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns"; //data into text static const char* cURLDocDataSource = ".uno:DataSourceBrowser/DocumentDataSource"; -//------------------------------------------------------------------------ + static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxViewShell* pViewShell ) { @@ -54,7 +54,7 @@ static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxVie return uno::Reference<view::XSelectionSupplier>(); } -//------------------------------------------------------------------------ + ScDispatchProviderInterceptor::ScDispatchProviderInterceptor(ScTabViewShell* pViewSh) : @@ -194,7 +194,7 @@ void SAL_CALL ScDispatchProviderInterceptor::disposing( const lang::EventObject& m_xIntercepted = NULL; } -//------------------------------------------------------------------------ + ScDispatch::ScDispatch(ScTabViewShell* pViewSh) : pViewShell( pViewSh ), diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index dcdd27036ea0..b58b3e6f3c8b 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -192,7 +192,7 @@ static const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap() using sc::HMMToTwips; using sc::TwipsToHMM; -//------------------------------------------------------------------------ + #define SCMODELOBJ_SERVICE "com.sun.star.sheet.SpreadsheetDocument" #define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings" @@ -206,7 +206,7 @@ SC_SIMPLE_SERVICE_INFO( ScTableColumnsObj, "ScTableColumnsObj", "com.sun.star.ta SC_SIMPLE_SERVICE_INFO( ScTableRowsObj, "ScTableRowsObj", "com.sun.star.table.TableRows" ) SC_SIMPLE_SERVICE_INFO( ScTableSheetsObj, "ScTableSheetsObj", "com.sun.star.sheet.Spreadsheets" ) -//------------------------------------------------------------------------ + class ScPrintUIOptions : public vcl::PrinterOptionsHelper { @@ -2384,7 +2384,7 @@ uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms() } -//------------------------------------------------------------------------ + ScDrawPagesObj::ScDrawPagesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) @@ -2496,7 +2496,7 @@ sal_Bool SAL_CALL ScDrawPagesObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -//------------------------------------------------------------------------ + ScTableSheetsObj::ScTableSheetsObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) @@ -2903,7 +2903,7 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const OUString& aName ) return false; } -//------------------------------------------------------------------------ + ScTableColumnsObj::ScTableColumnsObj(ScDocShell* pDocSh, SCTAB nT, SCCOL nSC, SCCOL nEC) : pDocShell( pDocSh ), @@ -3173,7 +3173,7 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const OUString& aProperty SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableColumnsObj ) -//------------------------------------------------------------------------ + ScTableRowsObj::ScTableRowsObj(ScDocShell* pDocSh, SCTAB nT, SCROW nSR, SCROW nER) : pDocShell( pDocSh ), @@ -3461,7 +3461,7 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const OUString& aPropertyNam SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableRowsObj ) -//------------------------------------------------------------------------ + ScSpreadsheetSettingsObj::~ScSpreadsheetSettingsObj() { @@ -3508,7 +3508,7 @@ uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const OUString& /* SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSpreadsheetSettingsObj ) -//------------------------------------------------------------------------ + ScAnnotationsObj::ScAnnotationsObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), @@ -3640,7 +3640,7 @@ sal_Bool SAL_CALL ScAnnotationsObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -//------------------------------------------------------------------------ + ScScenariosObj::ScScenariosObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx index 12de924bea6f..a6f5ed09359d 100644 --- a/sc/source/ui/unoobj/drdefuno.cxx +++ b/sc/source/ui/unoobj/drdefuno.cxx @@ -23,7 +23,7 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + ScDrawDefaultsObj::ScDrawDefaultsObj(ScDocShell* pDocSh) : SvxUnoDrawPool( NULL ), diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index a84b71788d74..de0f08766d09 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -66,7 +66,7 @@ void ScHeaderFooterEditSource::UpdateData() mrTextData.UpdateData(); } -//------------------------------------------------------------------------ + ScCellEditSource::ScCellEditSource(ScDocShell* pDocSh, const ScAddress& rP) : pCellTextData(new ScCellTextData(pDocSh, rP)) {} @@ -106,7 +106,7 @@ ScEditEngineDefaulter* ScCellEditSource::GetEditEngine() return pCellTextData->GetEditEngine(); } -//------------------------------------------------------------------------ + ScAnnotationEditSource::ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddress& rP) : pDocShell( pDocSh ), @@ -216,7 +216,7 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -//------------------------------------------------------------------------ + ScSimpleEditSource::ScSimpleEditSource( SvxTextForwarder* pForw ) : pForwarder( pForw ) @@ -245,7 +245,7 @@ void ScSimpleEditSource::UpdateData() // nothing } -//------------------------------------------------------------------------ + SAL_WNODEPRECATED_DECLARATIONS_PUSH ScAccessibilityEditSource::ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData ) diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 5d2b140eb850..665cef1d2b22 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -27,11 +27,11 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + SC_SIMPLE_SERVICE_INFO( ScSheetEventsObj, "ScSheetEventsObj", "com.sun.star.document.Events" ) -//------------------------------------------------------------------------ + ScSheetEventsObj::ScSheetEventsObj(ScDocShell* pDocSh, SCTAB nT) : mpDocShell( pDocSh ), diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 125520ecac14..e227a5c6a969 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -149,7 +149,7 @@ sal_Int16 lcl_SvxToUnoFileFormat( SvxFileFormat nSvxValue ) SC_SIMPLE_SERVICE_INFO( ScCellFieldsObj, "ScCellFieldsObj", "com.sun.star.text.TextFields" ) SC_SIMPLE_SERVICE_INFO( ScHeaderFieldsObj, "ScHeaderFieldsObj", "com.sun.star.text.TextFields" ) -//------------------------------------------------------------------------ + // ScUnoEditEngine nur um aus einer EditEngine die Felder herauszubekommen... @@ -281,7 +281,7 @@ SvxFieldData* ScUnoEditEngine::FindByPos(sal_Int32 nPar, sal_Int32 nPos, sal_Int return pFound; } -//------------------------------------------------------------------------ + ScCellFieldsObj::ScCellFieldsObj( const uno::Reference<text::XTextRange>& xContent, diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index ef9e51752615..e5e6a7deeb83 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star; using namespace rtl; using namespace com::sun::star::uno; -//------------------------------------------------------------------------ + #define SCFILTEROPTIONSOBJ_SERVICE "com.sun.star.ui.dialogs.FilterOptionsDialog" #define SCFILTEROPTIONSOBJ_IMPLNAME "com.sun.star.comp.Calc.FilterOptionsDialog" @@ -63,7 +63,7 @@ SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj, SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTE #define DBF_SEP_PATH_IMPORT "Office.Calc/Dialogs/DBFImport" #define DBF_SEP_PATH_EXPORT "Office.Calc/Dialogs/DBFExport" -//------------------------------------------------------------------------ + static void load_CharSet( rtl_TextEncoding &nCharSet, bool bExport ) { @@ -109,7 +109,7 @@ static void save_CharSet( rtl_TextEncoding nCharSet, bool bExport ) aItem.PutProperties(aNames, aValues); } -//------------------------------------------------------------------------ + ScFilterOptionsObj::ScFilterOptionsObj() : bExport( false ) diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 425a72fdf465..ac0c45785549 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -40,7 +40,7 @@ using namespace ::com::sun::star; using namespace ::formula; -//------------------------------------------------------------------------ + // Map nur fuer PropertySetInfo @@ -63,13 +63,13 @@ static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() return aValidatePropertyMap_Impl; } -//------------------------------------------------------------------------ + SC_SIMPLE_SERVICE_INFO( ScTableConditionalEntry, "ScTableConditionalEntry", "com.sun.star.sheet.TableConditionalEntry" ) SC_SIMPLE_SERVICE_INFO( ScTableConditionalFormat, "ScTableConditionalFormat", "com.sun.star.sheet.TableConditionalFormat" ) SC_SIMPLE_SERVICE_INFO( ScTableValidationObj, "ScTableValidationObj", "com.sun.star.sheet.TableValidation" ) -//------------------------------------------------------------------------ + static sal_Int32 lcl_ConditionModeToOperatorNew( ScConditionMode eMode ) { @@ -138,7 +138,7 @@ static ScConditionMode lcl_ConditionOperatorToMode( sheet::ConditionOperator eOp return eMode; } -//------------------------------------------------------------------------ + ScCondFormatEntryItem::ScCondFormatEntryItem() : meGrammar1( FormulaGrammar::GRAM_UNSPECIFIED ), @@ -147,7 +147,7 @@ ScCondFormatEntryItem::ScCondFormatEntryItem() : { } -//------------------------------------------------------------------------ + ScTableConditionalFormat::ScTableConditionalFormat( ScDocument* pDoc, sal_uLong nKey, SCTAB nTab, FormulaGrammar::Grammar eGrammar) @@ -511,7 +511,7 @@ ScTableConditionalFormat* ScTableConditionalFormat::getImplementation( return pRet; } -//------------------------------------------------------------------------ + ScTableConditionalEntry::ScTableConditionalEntry(const ScCondFormatEntryItem& aItem) : aData( aItem ) @@ -616,7 +616,7 @@ void SAL_CALL ScTableConditionalEntry::setStyleName( const OUString& aStyleName aData.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName( aStyleName, SFX_STYLE_FAMILY_PARA ); } -//------------------------------------------------------------------------ + ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey, const formula::FormulaGrammar::Grammar eGrammar) : @@ -1041,7 +1041,7 @@ ScTableValidationObj* ScTableValidationObj::getImplementation( return pRet; } -//------------------------------------------------------------------------ + diff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxx index 242816de80fc..031ccdf7f3b3 100644 --- a/sc/source/ui/unoobj/forbiuno.cxx +++ b/sc/source/ui/unoobj/forbiuno.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + static rtl::Reference<SvxForbiddenCharactersTable> lcl_GetForbidden( ScDocShell* pDocSh ) { diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 5002b712d43b..db56e8196dda 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -48,7 +48,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + // registered as implementation for service FunctionAccess, // also supports service SpreadsheetDocumentSettings (to set null date etc.) @@ -56,7 +56,7 @@ using namespace com::sun::star; #define SCFUNCTIONACCESS_SERVICE "com.sun.star.sheet.FunctionAccess" #define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings" -//------------------------------------------------------------------------ + // helper to use cached document if not in use, temporary document otherwise @@ -75,7 +75,7 @@ public: ScDocument* GetDocument(); }; -//------------------------------------------------------------------------ + ScDocument* ScTempDocSource::CreateDocument() { @@ -114,7 +114,7 @@ ScDocument* ScTempDocSource::GetDocument() return rCache.GetDocument(); } -//------------------------------------------------------------------------ + ScTempDocCache::ScTempDocCache() : pDoc( NULL ), @@ -141,7 +141,7 @@ void ScTempDocCache::Clear() pDoc = NULL; } -//------------------------------------------------------------------------ + // copy results from one document into another //! merge this with ScAreaLink::Refresh @@ -183,7 +183,7 @@ static sal_Bool lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange, return sal_True; } -//------------------------------------------------------------------------ + ScFunctionAccess::ScFunctionAccess() : pOptions( NULL ), diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 1eb1529ada05..02cd924ff3a3 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -49,7 +49,7 @@ using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::uno::RuntimeException; using ::std::vector; -//------------------------------------------------------------------------ + // fuer Sheet- und Area-Links benutzt: static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() @@ -66,7 +66,7 @@ static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() return aSheetLinkMap_Impl; } -//------------------------------------------------------------------------ + SC_SIMPLE_SERVICE_INFO( ScAreaLinkObj, "ScAreaLinkObj", "com.sun.star.sheet.CellAreaLink" ) SC_SIMPLE_SERVICE_INFO( ScAreaLinksObj, "ScAreaLinksObj", "com.sun.star.sheet.CellAreaLinks" ) @@ -75,7 +75,7 @@ SC_SIMPLE_SERVICE_INFO( ScDDELinksObj, "ScDDELinksObj", "com.sun.star.sheet.DDEL SC_SIMPLE_SERVICE_INFO( ScSheetLinkObj, "ScSheetLinkObj", "com.sun.star.sheet.SheetLink" ) SC_SIMPLE_SERVICE_INFO( ScSheetLinksObj, "ScSheetLinksObj", "com.sun.star.sheet.SheetLinks" ) -//------------------------------------------------------------------------ + ScSheetLinkObj::ScSheetLinkObj(ScDocShell* pDocSh, const OUString& rName) : aPropSet( lcl_GetSheetLinkMap() ), @@ -375,7 +375,7 @@ void ScSheetLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay) ModifyRefreshDelay_Impl( nRefreshDelay ); } -//------------------------------------------------------------------------ + ScSheetLinksObj::ScSheetLinksObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) @@ -581,7 +581,7 @@ uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::R return aSeq; } -//------------------------------------------------------------------------ + static ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, size_t nPos ) { @@ -921,7 +921,7 @@ void SAL_CALL ScAreaLinkObj::setDestArea( const table::CellRangeAddress& aDestAr Modify_Impl( NULL, NULL, NULL, NULL, &aDestArea ); } -//------------------------------------------------------------------------ + ScAreaLinksObj::ScAreaLinksObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) @@ -1045,7 +1045,7 @@ sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -//------------------------------------------------------------------------ + ScDDELinkObj::ScDDELinkObj(ScDocShell* pDocSh, const OUString& rA, const OUString& rT, const OUString& rI) : @@ -1255,7 +1255,7 @@ void ScDDELinkObj::Refreshed_Impl() aRefreshListeners[n]->refreshed( aEvent ); } -//------------------------------------------------------------------------ + ScDDELinksObj::ScDDELinksObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) diff --git a/sc/source/ui/unoobj/listenercalls.cxx b/sc/source/ui/unoobj/listenercalls.cxx index 34dfdc7d108f..359307ad2139 100644 --- a/sc/source/ui/unoobj/listenercalls.cxx +++ b/sc/source/ui/unoobj/listenercalls.cxx @@ -23,7 +23,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + ScUnoListenerCalls::ScUnoListenerCalls() { diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index ae5cc965be49..37131a51da25 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -26,11 +26,11 @@ using namespace com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; -//------------------------------------------------------------------------ + SC_SIMPLE_SERVICE_INFO( ScNameToIndexAccess, "ScNameToIndexAccess", "stardiv.unknown" ) -//------------------------------------------------------------------------ + uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::Any& rAny ) { @@ -185,7 +185,7 @@ void ScUnoHelpFunctions::SetOptionalPropertyValue( } } -//------------------------------------------------------------------------ + ScIndexEnumeration::ScIndexEnumeration(const uno::Reference<container::XIndexAccess>& rInd, const OUString& rServiceName) : @@ -245,9 +245,9 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceNa return aRet; } -//------------------------------------------------------------------------ -//------------------------------------------------------------------------ + + ScNameToIndexAccess::ScNameToIndexAccess( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess>& rNameObj ) : @@ -297,7 +297,7 @@ sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(::com::sun::star::u return getCount() > 0; } -//------------------------------------------------------------------------ + diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 0454aed72fb5..645f98b8b49f 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -46,7 +46,7 @@ using ::com::sun::star::uno::Any; #include "scui_def.hxx" -//------------------------------------------------------------------------ + static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() { @@ -71,7 +71,7 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangesMap() return aNamedRangesMap_Impl; } -//------------------------------------------------------------------------ + #define SCNAMEDRANGEOBJ_SERVICE "com.sun.star.sheet.NamedRange" @@ -468,7 +468,7 @@ const uno::Sequence<sal_Int8>& ScNamedRangeObj::getUnoTunnelId() return theScNamedRangeObjUnoTunnelId::get().getSeq(); } -//------------------------------------------------------------------------ + ScNamedRangesObj::ScNamedRangesObj(ScDocShell* pDocSh) : mbModifyAndBroadcast(true), @@ -823,7 +823,7 @@ sal_Int16 ScNamedRangesObj::resetActionLocks() throw(uno::RuntimeException) return nLockCount; } -//------------------------------------------------------------------------ + ScGlobalNamedRangesObj::ScGlobalNamedRangesObj(ScDocShell* pDocSh) : ScNamedRangesObj(pDocSh) @@ -876,7 +876,7 @@ SCTAB ScGlobalNamedRangesObj::GetTab_Impl() return -1; } -//------------------------------------------------------------------------ + ScLocalNamedRangesObj::ScLocalNamedRangesObj( ScDocShell* pDocSh, uno::Reference<container::XNamed> xSheet ) : ScNamedRangesObj(pDocSh), @@ -939,7 +939,7 @@ SCTAB ScLocalNamedRangesObj::GetTab_Impl() return nTab; } -//------------------------------------------------------------------------ + ScLabelRangeObj::ScLabelRangeObj(ScDocShell* pDocSh, bool bCol, const ScRange& rR) : pDocShell( pDocSh ), @@ -1060,7 +1060,7 @@ void SAL_CALL ScLabelRangeObj::setDataArea( const table::CellRangeAddress& aData Modify_Impl( NULL, &aDataRange ); } -//------------------------------------------------------------------------ + ScLabelRangesObj::ScLabelRangesObj(ScDocShell* pDocSh, bool bCol) : pDocShell( pDocSh ), @@ -1224,7 +1224,7 @@ sal_Bool SAL_CALL ScLabelRangesObj::hasElements() throw(uno::RuntimeException) return ( getCount() != 0 ); } -//------------------------------------------------------------------------ + diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index 1ef66163a81c..6f2b6de75975 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -38,7 +38,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + static const SvxItemPropertySet* lcl_GetAnnotationPropertySet() { @@ -54,12 +54,12 @@ static const SvxItemPropertySet* lcl_GetAnnotationPropertySet() return &aAnnotationPropertySet_Impl; } -//------------------------------------------------------------------------ + SC_SIMPLE_SERVICE_INFO( ScAnnotationObj, "ScAnnotationObj", "com.sun.star.sheet.CellAnnotation" ) //SC_SIMPLE_SERVICE_INFO( ScAnnotationShapeObj, "ScAnnotationShapeObj", "com.sun.star.sheet.CellAnnotationShape" ) -//------------------------------------------------------------------------ + ScAnnotationObj::ScAnnotationObj(ScDocShell* pDocSh, const ScAddress& rPos) : pDocShell( pDocSh ), diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index 68056df7d17d..5961baa70583 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -28,7 +28,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() { static const SfxItemPropertyMapEntry aMap[] = @@ -179,7 +179,7 @@ uno::Any ScDocOptionsHelper::getPropertyValue( return aRet; } -//------------------------------------------------------------------------ + ScDocOptionsObj::ScDocOptionsObj( const ScDocOptions& rOpt ) : ScModelObj( NULL ), diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index 1b16b550646e..5c21fb42ec6e 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -24,7 +24,7 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + ScPageObj::ScPageObj( SdrPage* pPage ) : SvxFmDrawPage( pPage ) diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 9ca7b2f82e37..eca963eac7f3 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -245,7 +245,7 @@ public: } }; -//------------------------------------------------------------------------ + // struct ProvNamesId_Type { @@ -377,7 +377,7 @@ static const sal_Char* aOldNames[SC_SERVICE_COUNT] = -//------------------------------------------------------------------------ + // alles static diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index cf1de02f53d0..8da14f7914f2 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -48,7 +48,7 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + typedef std::map<OUString, uno::Sequence< sal_Int8 > *> ScShapeImplementationIdMap; @@ -88,7 +88,7 @@ ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCr return 0; } -//------------------------------------------------------------------------ + namespace { @@ -99,7 +99,7 @@ namespace } } -//------------------------------------------------------------------------ + ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) : pShapePropertySet(NULL), diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index d5e11823c7a7..efe360964627 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + //! SearchWords sucht in ganzen Zellen - umbenennen ??? @@ -61,12 +61,12 @@ static const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap() return aSearchPropertyMap_Impl; } -//------------------------------------------------------------------------ + #define SCSEARCHDESCRIPTOR_SERVICE "com.sun.star.util.SearchDescriptor" #define SCREPLACEDESCRIPTOR_SERVICE "com.sun.star.util.ReplaceDescriptor" -//------------------------------------------------------------------------ + ScCellSearchObj::ScCellSearchObj() : aPropSet(lcl_GetSearchPropertyMap()) @@ -248,7 +248,7 @@ ScCellSearchObj* ScCellSearchObj::getImplementation( } -//------------------------------------------------------------------------ + diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index c6404248073e..5d981ab43208 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -68,7 +68,7 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + static const SfxItemPropertySet* lcl_GetCellStyleSet() { @@ -368,7 +368,7 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() } -//------------------------------------------------------------------------ + // Index-Access auf die Style-Typen: 0 = Cell, 1 = Page @@ -379,12 +379,12 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() static const sal_uInt16 aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SFX_STYLE_FAMILY_PARA, SFX_STYLE_FAMILY_PAGE }; -//------------------------------------------------------------------------ + using sc::HMMToTwips; using sc::TwipsToHMM; -//------------------------------------------------------------------------ + #define SCSTYLE_SERVICE "com.sun.star.style.Style" #define SCCELLSTYLE_SERVICE "com.sun.star.style.CellStyle" @@ -393,11 +393,11 @@ using sc::TwipsToHMM; SC_SIMPLE_SERVICE_INFO( ScStyleFamiliesObj, "ScStyleFamiliesObj", "com.sun.star.style.StyleFamilies" ) SC_SIMPLE_SERVICE_INFO( ScStyleFamilyObj, "ScStyleFamilyObj", "com.sun.star.style.StyleFamily" ) -//------------------------------------------------------------------------ + #define SC_PAPERBIN_DEFAULTNAME "[From printer settings]" -//------------------------------------------------------------------------ + static bool lcl_AnyTabProtected( ScDocument& rDoc ) { @@ -408,7 +408,7 @@ static bool lcl_AnyTabProtected( ScDocument& rDoc ) return false; } -//------------------------------------------------------------------------ + ScStyleFamiliesObj::ScStyleFamiliesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) @@ -598,7 +598,7 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO return aSequence; } -//------------------------------------------------------------------------ + ScStyleFamilyObj::ScStyleFamilyObj(ScDocShell* pDocSh, SfxStyleFamily eFam) : pDocShell( pDocSh ), @@ -939,7 +939,7 @@ void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, c OSL_FAIL( "###unexpected!" ); } -//------------------------------------------------------------------------ + // Default-ctor wird fuer die Reflection gebraucht @@ -2012,7 +2012,7 @@ uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() return aRet; } -//------------------------------------------------------------------------ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 535a51f9ccb4..317672dd9127 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -39,7 +39,7 @@ using namespace ::com::sun::star; -//------------------------------------------------------------------------ + sal_uInt16 nTypeResIds[SC_LINKTARGETTYPE_COUNT] = { @@ -59,7 +59,7 @@ static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() return aLinkTargetMap_Impl; } -//------------------------------------------------------------------------ + // service for ScLinkTargetTypeObj is not defined // must not support document::LinkTarget because the target type cannot be used as a target @@ -68,7 +68,7 @@ SC_SIMPLE_SERVICE_INFO( ScLinkTargetTypesObj, "ScLinkTargetTypesObj", "com.sun.s SC_SIMPLE_SERVICE_INFO( ScLinkTargetTypeObj, "ScLinkTargetTypeObj", "com.sun.star.document.LinkTargetSupplier" ) SC_SIMPLE_SERVICE_INFO( ScLinkTargetsObj, "ScLinkTargetsObj", "com.sun.star.document.LinkTargets" ) -//------------------------------------------------------------------------ + ScLinkTargetTypesObj::ScLinkTargetTypesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) @@ -137,7 +137,7 @@ sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements(void) throw( uno::RuntimeExc return sal_True; } -//------------------------------------------------------------------------ + ScLinkTargetTypeObj::ScLinkTargetTypeObj(ScDocShell* pDocSh, sal_uInt16 nT) : pDocShell( pDocSh ), @@ -249,7 +249,7 @@ uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const OUString& Property SC_IMPL_DUMMY_PROPERTY_LISTENER( ScLinkTargetTypeObj ) -//------------------------------------------------------------------------ + ScLinkTargetsObj::ScLinkTargetsObj( const uno::Reference< container::XNameAccess > & rColl ) : xCollection( rColl ) diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 3ea1258d396f..380809a2898d 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -49,7 +49,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + static const SvxItemPropertySet * lcl_GetHdFtPropertySet() { @@ -87,12 +87,12 @@ static const SvxItemPropertySet * lcl_GetHdFtPropertySet() return &aHdFtPropertySet_Impl; } -//------------------------------------------------------------------------ + SC_SIMPLE_SERVICE_INFO( ScHeaderFooterContentObj, "ScHeaderFooterContentObj", "com.sun.star.sheet.HeaderFooterContent" ) SC_SIMPLE_SERVICE_INFO( ScHeaderFooterTextObj, "ScHeaderFooterTextObj", "stardiv.one.Text.Text" ) -//------------------------------------------------------------------------ + ScHeaderFooterContentObj::ScHeaderFooterContentObj( const EditTextObject* pLeft, const EditTextObject* pCenter, @@ -181,7 +181,7 @@ ScHeaderFooterContentObj* ScHeaderFooterContentObj::getImplementation( } -//------------------------------------------------------------------------ + ScHeaderFooterTextData::ScHeaderFooterTextData( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : @@ -266,7 +266,7 @@ const EditTextObject* ScHeaderFooterTextData::GetTextObject() const return mpTextObj; } -//------------------------------------------------------------------------ + ScHeaderFooterTextObj::ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : @@ -578,7 +578,7 @@ sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements() throw(uno::RuntimeExcepti return mxUnoText->hasElements(); } -//------------------------------------------------------------------------ + ScCellTextCursor::ScCellTextCursor(const ScCellTextCursor& rOther) : SvxUnoTextCursor( rOther ), @@ -674,7 +674,7 @@ ScCellTextCursor* ScCellTextCursor::getImplementation( const uno::Reference<uno: return pRet; } -//------------------------------------------------------------------------ + ScHeaderFooterTextCursor::ScHeaderFooterTextCursor(const ScHeaderFooterTextCursor& rOther) : SvxUnoTextCursor( rOther ), @@ -771,7 +771,7 @@ ScHeaderFooterTextCursor* ScHeaderFooterTextCursor::getImplementation( return pRet; } -//------------------------------------------------------------------------ + ScDrawTextCursor::ScDrawTextCursor(const ScDrawTextCursor& rOther) : SvxUnoTextCursor( rOther ), @@ -866,7 +866,7 @@ ScDrawTextCursor* ScDrawTextCursor::getImplementation( const uno::Reference<uno: return pRet; } -//------------------------------------------------------------------------ + ScSimpleEditSourceHelper::ScSimpleEditSourceHelper() { @@ -911,7 +911,7 @@ EditTextObject* ScEditEngineTextObj::CreateTextObject() return GetEditEngine()->CreateTextObject(); } -//------------------------------------------------------------------------ + ScCellTextData::ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP) : pDocShell( pDocSh ), diff --git a/sc/source/ui/unoobj/unoreflist.cxx b/sc/source/ui/unoobj/unoreflist.cxx index 139fb4e57fc8..aa78b4124473 100644 --- a/sc/source/ui/unoobj/unoreflist.cxx +++ b/sc/source/ui/unoobj/unoreflist.cxx @@ -20,7 +20,7 @@ #include "unoreflist.hxx" #include "document.hxx" -//------------------------------------------------------------------------ + ScUnoRefList::ScUnoRefList() { @@ -46,7 +46,7 @@ void ScUnoRefList::Undo( ScDocument* pDoc ) } } -//------------------------------------------------------------------------ + TYPEINIT1(ScUnoRefUndoHint, SfxHint); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index f54eba652565..86f4dd6ce43c 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -74,7 +74,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + //! Clipping-Markierungen @@ -117,14 +117,14 @@ static const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap() return aViewOptPropertyMap_Impl; } -//------------------------------------------------------------------------ + #define SCTABVIEWOBJ_SERVICE "com.sun.star.sheet.SpreadsheetView" #define SCVIEWSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetViewSettings" SC_SIMPLE_SERVICE_INFO( ScViewPaneBase, "ScViewPaneObj", "com.sun.star.sheet.SpreadsheetViewPane" ) -//------------------------------------------------------------------------ + ScViewPaneBase::ScViewPaneBase(ScTabViewShell* pViewSh, sal_uInt16 nP) : pViewShell( pViewSh ), @@ -424,7 +424,7 @@ awt::Rectangle ScViewPaneBase::GetVisArea() const return aVisArea; } -//------------------------------------------------------------------------ + ScViewPaneObj::ScViewPaneObj(ScTabViewShell* pViewSh, sal_uInt16 nP) : ScViewPaneBase( pViewSh, nP ) @@ -456,7 +456,7 @@ void SAL_CALL ScViewPaneObj::release() throw() OWeakObject::release(); } -//------------------------------------------------------------------------ + // Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 868f48633c7e..a8fc770bcb6b 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -937,7 +937,7 @@ ScVbaApplication::getPathSeparator() throw (uno::RuntimeException) return OUString( (sal_Unicode) SAL_PATHDELIMITER ); } -// ---------------------------------------------------------------------------- + // Helpers for Intersect and Union namespace { @@ -1113,7 +1113,7 @@ uno::Reference< excel::XRange > lclCreateVbaRange( } // namespace -// ---------------------------------------------------------------------------- + uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect( const uno::Reference< excel::XRange >& rArg1, const uno::Reference< excel::XRange >& rArg2, diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index f22a6c029d9f..7f3cc718a85a 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -180,7 +180,7 @@ private: bool mbDisposed; }; -// ---------------------------------------------------------------------------- + ScVbaEventListener::ScVbaEventListener( ScVbaEventsHelper& rVbaEvents, const uno::Reference< frame::XModel >& rxModel, ScDocShell* pDocShell ) : mrVbaEvents( rVbaEvents ), diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 52f27ffce710..b9423a611c90 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -45,7 +45,7 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan return true; } -// ---------------------------------------------------------------------------- + /** Functor to decide whether the anchors of two Hyperlink objects are equal. */ struct EqualAnchorFunctor @@ -130,7 +130,7 @@ private: HyperlinkVector maHlinks; }; -// ---------------------------------------------------------------------------- + ScVbaHlinkContainer::ScVbaHlinkContainer() throw (uno::RuntimeException) { diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 0decef12d3dc..57259716ef22 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -1275,7 +1275,7 @@ getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const return new ScVbaRange( xFixThisParent, xContext, xRanges ); } -// ---------------------------------------------------------------------------- + namespace { @@ -1381,7 +1381,7 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC } // namespace -// ---------------------------------------------------------------------------- + css::uno::Reference< excel::XRange > ScVbaRange::getRangeObjectForName( diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index c2244873e84b..24be47bb2fa7 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -134,7 +134,7 @@ private: ShapeVector maShapes; }; -// ---------------------------------------------------------------------------- + ScVbaObjectContainer::ScVbaObjectContainer( const uno::Reference< XHelperInterface >& rxParent, @@ -251,7 +251,7 @@ private: ScVbaObjectContainerRef mxContainer; }; -// ---------------------------------------------------------------------------- + ScVbaObjectEnumeration::ScVbaObjectEnumeration( const ScVbaObjectContainerRef& rxContainer ) : SimpleEnumerationBase( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ), @@ -371,7 +371,7 @@ protected: sal_Int16 mnComponentType; }; -// ---------------------------------------------------------------------------- + ScVbaControlContainer::ScVbaControlContainer( const uno::Reference< XHelperInterface >& rxParent, @@ -473,7 +473,7 @@ protected: virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const; }; -// ---------------------------------------------------------------------------- + ScVbaButtonContainer::ScVbaButtonContainer( const uno::Reference< XHelperInterface >& rxParent, diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index 9a4bbc3cc9a1..193bdfed4b41 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -31,12 +31,12 @@ #include "sc.hrc" #include "document.hxx" -//------------------------------------------------------------------------ + #define ScAuditingShell #include "scslots.hxx" -//------------------------------------------------------------------------ + TYPEINIT1( ScAuditingShell, SfxShell ); @@ -46,7 +46,7 @@ SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL)) } -//------------------------------------------------------------------------ + ScAuditingShell::ScAuditingShell(ScViewData* pData) : SfxShell(pData->GetViewShell()), @@ -65,13 +65,13 @@ ScAuditingShell::ScAuditingShell(ScViewData* pData) : SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Auditing)); } -//------------------------------------------------------------------------ + ScAuditingShell::~ScAuditingShell() { } -//------------------------------------------------------------------------ + void ScAuditingShell::Execute( SfxRequest& rReq ) { @@ -132,7 +132,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq ) } } -//------------------------------------------------------------------------ + void ScAuditingShell::GetState( SfxItemSet& rSet ) { diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 6b5dfe57a3be..dfea35039125 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -57,7 +57,7 @@ #include "clipparam.hxx" #include "markdata.hxx" -//------------------------------------------------------------------ + #define ScCellShell #define CellMovement @@ -102,7 +102,7 @@ ScCellShell::~ScCellShell() delete pImpl; } -//------------------------------------------------------------------ + void ScCellShell::GetBlockState( SfxItemSet& rSet ) { @@ -1046,7 +1046,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) } // while ( nWitch ) } -//------------------------------------------------------------------ + diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index e4cc9bc8c8ff..780c08e69f0d 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -94,7 +94,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; -//------------------------------------------------------------------ + void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { ScModule* pScMod = SC_MOD(); diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 0553dde76833..5ee73670f36b 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -54,7 +54,7 @@ using sc::HMMToTwips; using sc::TwipsToHMM; using sc::TwipsToEvenHMM; -//------------------------------------------------------------------ + void ScCellShell::Execute( SfxRequest& rReq ) { @@ -322,9 +322,9 @@ void ScCellShell::Execute( SfxRequest& rReq ) { if ( pReqArgs != NULL ) { - //---------------------------------- + // set cell attribute without dialog: - //---------------------------------- + SfxItemSet* pEmptySet = new SfxItemSet( *pReqArgs->GetPool(), ATTR_PATTERN_START, @@ -523,7 +523,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) } break; - //---------------------------------------------------------------- + case FID_ROW_HEIGHT: { @@ -714,7 +714,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) rReq.Done(); break; - //---------------------------------------------------------------- + case SID_CELL_FORMAT_RESET: diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index 7142f812cdda..ec6bd68e6f6f 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -25,7 +25,7 @@ #include "drwlayer.hxx" #include "document.hxx" -// ----------------------------------------------------------------------- + using namespace com::sun::star; diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx index 296f9b7bdf2f..8e630933731e 100644 --- a/sc/source/ui/view/drawattr.cxx +++ b/sc/source/ui/view/drawattr.cxx @@ -20,14 +20,14 @@ #include "drawattr.hxx" #include "global.hxx" -//------------------------------------------------------------------------ + OUString SvxDrawToolItem::GetValueText() const { return GetValueText(GetValue()); } -//------------------------------------------------------------------------ + OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const { @@ -50,14 +50,14 @@ OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const return OUString::createFromAscii( p ); } -//------------------------------------------------------------------------ + SfxPoolItem* SvxDrawToolItem::Clone( SfxItemPool * ) const { return new SvxDrawToolItem(*this); } -//------------------------------------------------------------------------ + SfxPoolItem* SvxDrawToolItem::Create( SvStream& rStream, sal_uInt16 nVer ) const { diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx index 2a0291ffb9df..dec25bc19cfe 100644 --- a/sc/source/ui/view/drawvie2.cxx +++ b/sc/source/ui/view/drawvie2.cxx @@ -21,7 +21,7 @@ // STATIC DATA ----------------------------------------------------------- -// ----------------------------------------------------------------------- + // UpdateBrowser in MarkListHasChanged gerufen diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 94ccd3e33e80..3973d09622fc 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -54,7 +54,7 @@ using namespace com::sun::star; Point aDragStartDiff; -// ----------------------------------------------------------------------- + void ScDrawView::CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rOneOle ) { diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 89d227e6dfd1..92c3c4a5cc67 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -58,11 +58,11 @@ using namespace com::sun::star; -// ----------------------------------------------------------------------- + #define SC_HANDLESIZE_BIG 9 -// ----------------------------------------------------------------------- + void ScDrawView::Construct() { diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 22293589bccf..243c3498b07c 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -150,7 +150,7 @@ ScFormatShell::~ScFormatShell() { } -//------------------------------------------------------------------ + void ScFormatShell::GetStyleState( SfxItemSet& rSet ) { @@ -246,7 +246,7 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet ) } } -//------------------------------------------------------------------ + void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { @@ -257,7 +257,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) return; } - //-------------------------------------------------------------------- + SfxBindings& rBindings = pViewData->GetBindings(); const SfxItemSet* pArgs = rReq.GetArgs(); const sal_uInt16 nSlotId = rReq.GetSlot(); @@ -1252,7 +1252,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) } -//------------------------------------------------------------------ + void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) { @@ -1604,7 +1604,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) } -//------------------------------------------------------------------ + void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) { @@ -2149,7 +2149,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) Invalidate(SID_ATTR_ALIGN_STACKED); } -//------------------------------------------------------------------ + void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) { @@ -2173,11 +2173,11 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) SfxItemState eState; // const SfxPoolItem* pItem; - //-------------------------------------------------------------------- + // eigene Kontrolle ueber RadioButton-Funktionalitaet: - //-------------------------------------------------------------------- + // Unterstreichung - //------------------------ + eState = rAttrSet.GetItemState( ATTR_FONT_UNDERLINE, true ); if ( eState == SFX_ITEM_DONTCARE ) @@ -2203,9 +2203,9 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( nId, true ) ); } - //------------------------ + // horizontale Ausrichtung - //------------------------ + const SvxHorJustifyItem* pHorJustify = NULL; const SvxVerJustifyItem* pVerJustify = NULL; @@ -2276,9 +2276,9 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) bJustifyStd = false; } - //------------------------ + // vertikale Ausrichtung - //------------------------ + nWhich = 0; aBoolItem.SetValue( true ); @@ -2340,7 +2340,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) } -//------------------------------------------------------------------ + void ScFormatShell::GetBorderState( SfxItemSet& rSet ) { @@ -2356,7 +2356,7 @@ void ScFormatShell::GetBorderState( SfxItemSet& rSet ) rSet.Put( aInfoItem ); } -//------------------------------------------------------------------ + void ScFormatShell::GetAlignState( SfxItemSet& rSet ) { diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx index 71244d20f04c..20d85945bc8d 100644 --- a/sc/source/ui/view/gridmerg.cxx +++ b/sc/source/ui/view/gridmerg.cxx @@ -21,7 +21,7 @@ #include "gridmerg.hxx" -//------------------------------------------------------------------ + ScGridMerger::ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePixelY ) : pDev( pOutDev ), diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 3449885204ca..4ff4264c3ab9 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -237,7 +237,7 @@ public: bool HasDates() const { return mbListHasDates; } }; -//------------------------------------------------------------------- + // ListBox in einem FloatingWindow (pParent) ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid, @@ -280,7 +280,7 @@ void ScFilterListBox::LoseFocus() #endif } -// ----------------------------------------------------------------------- + bool ScFilterListBox::PreNotify( NotifyEvent& rNEvt ) { @@ -433,7 +433,7 @@ static bool lcl_GetHyperlinkCell( return bFound; } -// --------------------------------------------------------------------------- + // WB_DIALOGCONTROL noetig fuer UNO-Controls ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ) : Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ), @@ -3409,7 +3409,7 @@ void ScGridWindow::UpdateInputContext() SetInputContext( aContext ); } -//-------------------------------------------------------- + // sensitiver Bereich (Pixel) #define SCROLL_SENSITIVE 20 @@ -3498,12 +3498,12 @@ static ScRange lcl_MakeDropRange( SCCOL nPosX, SCROW nPosY, SCTAB nTab, const Sc return ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab ); } -//-------------------------------------------------------- + extern bool bPasteIsDrop; // viewfun4 -> move to header extern bool bPasteIsMove; // viewfun7 -> move to header -//-------------------------------------------------------- + sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) { @@ -4477,7 +4477,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } -//-------------------------------------------------------- + void ScGridWindow::PasteSelection( const Point& rPosPixel ) { @@ -4550,7 +4550,7 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) } } -//-------------------------------------------------------- + void ScGridWindow::UpdateEditViewPos() { @@ -4771,7 +4771,7 @@ void ScGridWindow::LoseFocus() Point ScGridWindow::GetMousePosPixel() const { return aCurMousePos; } -//------------------------------------------------------------------------ + bool ScGridWindow::HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex, SCsCOL* pAddX, SCsROW* pAddY) @@ -5154,7 +5154,7 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, bool bUp ) pViewData->GetView()->ResetTimer(); } -//------------------------------------------------------------------------ + bool ScGridWindow::GetEditUrl( const Point& rPos, OUString* pName, OUString* pUrl, OUString* pTarget ) diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 3bdbdce67af8..359cf3ae376d 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -57,7 +57,7 @@ using ::boost::unordered_map; // STATIC DATA ----------------------------------------------------------- -// ----------------------------------------------------------------------- + DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const { @@ -240,7 +240,7 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent& } } -// ----------------------------------------------------------------------- + // // Data Pilot interaction // @@ -627,7 +627,7 @@ void ScGridWindow::DPMouseButtonUp( const MouseEvent& rMEvt ) SetPointer( Pointer( POINTER_ARROW ) ); } -// ----------------------------------------------------------------------- + void ScGridWindow::UpdateDragRect( bool bShowRange, const Rectangle& rPosRect ) { @@ -656,7 +656,7 @@ void ScGridWindow::UpdateDragRect( bool bShowRange, const Rectangle& rPosRect ) UpdateDragRectOverlay(); } -// ----------------------------------------------------------------------- + // Page-Break-Modus diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index b9a400dce490..8a646ff8e0c7 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -43,7 +43,7 @@ #include "userdat.hxx" #include "unitconv.hxx" #include <svx/svdpage.hxx> -// ----------------------------------------------------------------------- + bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt) { diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 42ddaf6544ba..5a0d7854822a 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -65,7 +65,7 @@ // #i74769# #include <svx/sdrpaintwindow.hxx> -//------------------------------------------------------------------------ + static void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) { @@ -252,7 +252,7 @@ static void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, S } } -//------------------------------------------------------------------------ + static void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData, const std::vector<ScHighlightEntry>& rHighlightRanges ) @@ -272,7 +272,7 @@ static void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData, } } -//------------------------------------------------------------------------ + void ScGridWindow::DoInvertRect( const Rectangle& rPixel ) { @@ -288,7 +288,7 @@ void ScGridWindow::DoInvertRect( const Rectangle& rPixel ) UpdateHeaderOverlay(); // uses aInvertRect } -//------------------------------------------------------------------------ + void ScGridWindow::PrePaint() { @@ -306,7 +306,7 @@ void ScGridWindow::PrePaint() } } -//------------------------------------------------------------------------ + void ScGridWindow::Paint( const Rectangle& rRect ) { @@ -480,7 +480,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod nPPTX, nPPTY, false, bFormulaMode, &pViewData->GetMarkData() ); - //-------------------------------------------------------------------- + Fraction aZoomX = pViewData->GetZoomX(); Fraction aZoomY = pViewData->GetZoomY(); @@ -1525,7 +1525,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) } } -// ------------------------------------------------------------------------- + void ScGridWindow::DataChanged( const DataChangedEvent& rDCEvt ) { diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index f039502a6c30..ca2c578f144e 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -53,7 +53,7 @@ #include "postit.hxx" #include "global.hxx" #include "globstr.hrc" -// ----------------------------------------------------------------------- + bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard ) { @@ -240,7 +240,7 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard ) return bDone; } -// ----------------------------------------------------------------------- + void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) { diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 9ce482b73659..16039fb5b57a 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -934,9 +934,9 @@ void ScHeaderControl::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp(rHEvt); } -// ----------------------------------------------------------------------- + // Dummys fuer virtuelle Methoden -// ----------------------------------------------------------------------- + SCCOLROW ScHeaderControl::GetHiddenCount( SCCOLROW nEntryNo ) const { diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx index acd397707abd..ec0a02fb5f0d 100644 --- a/sc/source/ui/view/invmerge.cxx +++ b/sc/source/ui/view/invmerge.cxx @@ -21,7 +21,7 @@ #include "invmerge.hxx" -//------------------------------------------------------------------ + ScInvertMerger::ScInvertMerger( ::std::vector< Rectangle >* pRectangles ) : pRects( pRectangles ) diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 624df51021de..20c503a19b18 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -35,7 +35,7 @@ #define SC_NOTEMARK_TIME 800 #define SC_NOTEMARK_SHORT 70 -// ----------------------------------------------------------------------- + ScNoteMarker::ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal, ScDocument* pD, ScAddress aPos, const OUString& rUser, diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx index 4417e9467e42..b79e5b7129ee 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.cxx @@ -28,7 +28,7 @@ // STATIC DATA ----------------------------------------------------------- -// ----------------------------------------------------------------------- + void ActivateOlk( ScViewData* /* pViewData */ ) { diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 1a934bbab2c5..fa9bffc26ae8 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -81,7 +81,7 @@ const sal_uInt16 SC_SHRINKAGAIN_MAX = 7; // STATIC DATA ----------------------------------------------------------- -// ----------------------------------------------------------------------- + class ScDrawStringsVars { diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx index c0e81d3113dd..2b70ae011759 100644 --- a/sc/source/ui/view/pfuncache.cxx +++ b/sc/source/ui/view/pfuncache.cxx @@ -25,7 +25,7 @@ #include "markdata.hxx" #include "prevloc.hxx" -//------------------------------------------------------------------------ + ScPrintFuncCache::ScPrintFuncCache( ScDocShell* pD, const ScMarkData& rMark, const ScPrintSelectionStatus& rStatus ) : diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index e5b2c33f6e25..79c0759e0bad 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -31,12 +31,12 @@ #include "document.hxx" #include "sc.hrc" -//------------------------------------------------------------------------ + #define ScPageBreakShell #include "scslots.hxx" -//------------------------------------------------------------------------ + TYPEINIT1( ScPageBreakShell, SfxShell ); @@ -46,7 +46,7 @@ SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell, ScResId(SCSTR_PAGEBREAKSHELL)) } -//------------------------------------------------------------------------ + ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) : SfxShell(pViewSh) { @@ -62,7 +62,7 @@ ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) : SetName(OUString("PageBreak")); } -//------------------------------------------------------------------------ + ScPageBreakShell::~ScPageBreakShell() { } diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 798b7b1c6450..0d08c9f6e817 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -74,7 +74,7 @@ using namespace com::sun::star; -// ----------------------------------------------------------------------- + #define ScPreviewShell #include "scslots.hxx" @@ -94,7 +94,7 @@ SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" ) SFX_VIEW_REGISTRATION(ScDocShell); } -//------------------------------------------------------------------ + void ScPreviewShell::Construct( Window* pParent ) { @@ -205,7 +205,7 @@ void ScPreviewShell::InitStartTable(SCTAB nTab) pPreview->SetPageNo( pPreview->GetFirstPage(nTab) ); } -//------------------------------------------------------------------ + OUString ScPreviewShell::GetDescription() const { @@ -568,7 +568,7 @@ void ScPreviewShell::Deactivate(sal_Bool bMDI) } } -//------------------------------------------------------------------------ + void ScPreviewShell::Execute( SfxRequest& rReq ) { diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index b63fe5368d5c..f223eeb3061c 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -28,7 +28,7 @@ // STATIC DATA ----------------------------------------------------------- -// ----------------------------------------------------------------------- + void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index b32cb95b7628..fe44102e1cb5 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -79,7 +79,7 @@ #define GET_USHORT(set,which) ((const SfxUInt16Item&)(set)->Get((which))).GetValue() #define GET_SHOW(set,which) ( VOBJ_MODE_SHOW == ScVObjMode( ((const ScViewObjectModeItem&)(set)->Get((which))).GetValue()) ) -//------------------------------------------------------------------------ + ScPageRowEntry::ScPageRowEntry(const ScPageRowEntry& r) { @@ -161,7 +161,7 @@ size_t ScPageRowEntry::CountVisible() const return nPagesX; } -//------------------------------------------------------------------------ + static long lcl_LineTotal(const ::editeng::SvxBorderLine* pLine) { @@ -846,9 +846,9 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) } lcl_FillHFParam( aFtr, pFooterSet ); - //------------------------------------------------------ + // Compile Table-/Area-Params from single Items - //------------------------------------------------------ + // TabPage "Table" const SfxUInt16Item* pScaleItem = NULL; @@ -926,9 +926,9 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) aTableParam.bForceBreaks = pOptions && pOptions->GetForceBreaks(); - //------------------------------------------------------ + // TabPage "Parts": - //------------------------------------------------------ + //! walk throuch all PrintAreas of the table !!! const ScRange* pPrintArea = pDoc->GetPrintRange( nPrintTab, 0 ); @@ -2555,7 +2555,7 @@ void ScPrintFunc::InitModes() // set MapModes from nZoom etc. aTwipMode = MapMode( MAP_TWIP, aTwipsOfs, aHorFract, aZoomFract ); } -//-------------------------------------------------------------------- + void ScPrintFunc::ApplyPrintSettings() { @@ -2595,7 +2595,7 @@ void ScPrintFunc::ApplyPrintSettings() } } -//-------------------------------------------------------------------- + // rPageRanges = range for all tables // nStartPage = rPageRanges starts at nStartPage // nDisplayStart = continuous number for displaying the page number @@ -2611,7 +2611,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, if ( pPrinter && bDoPrint ) ApplyPrintSettings(); - //-------------------------------------------------------------------- + InitModes(); if ( pLocationData ) @@ -2622,7 +2622,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, MakeTableString(); - //-------------------------------------------------------------------- + long nPageNo = 0; long nPrinted = 0; diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 5364c13131d8..e2e804696956 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -31,7 +31,7 @@ #include "scmod.hxx" #include "validate.hxx" -// ----------------------------------------------------------------------- + SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDlgWrapper, FID_DEFINE_NAME ) SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDefDlgWrapper, FID_ADD_NAME ) @@ -125,9 +125,9 @@ IMPL_CHILD_CTOR( ScPrintAreasDlgWrapper, SID_OPENDLG_EDIT_PRINTAREA ) IMPL_CHILD_CTOR( ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION ) -//------------------------------------------------------------------------- + // ScSimpleRefDlgWrapper -//------------------------------------------------------------------------- + static bool bScSimpleRefFlag; static long nScSimpleRefHeight; @@ -243,9 +243,9 @@ void ScSimpleRefDlgWrapper::StartRefInput() -//------------------------------------------------------------------------- + // ScAcceptChgDlgWrapper //FIXME: should be moved into ViewShell -//------------------------------------------------------------------------- + ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP, sal_uInt16 nId, @@ -279,9 +279,9 @@ void ScAcceptChgDlgWrapper::ReInitDlg() } } -//------------------------------------------------------------------------- + // ScHighlightChgDlgWrapper -//------------------------------------------------------------------------- + IMPL_CHILD_CTOR( ScHighlightChgDlgWrapper, FID_CHG_SHOW ) diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx index 800f5236a6fb..3753396d825f 100644 --- a/sc/source/ui/view/scextopt.cxx +++ b/sc/source/ui/view/scextopt.cxx @@ -80,7 +80,7 @@ private: ScExtTabSettingsMap maMap; }; -// ---------------------------------------------------------------------------- + ScExtTabSettingsCont::ScExtTabSettingsCont() { @@ -143,7 +143,7 @@ ScExtDocOptionsImpl::ScExtDocOptionsImpl() : { } -// ---------------------------------------------------------------------------- + ScExtDocOptions::ScExtDocOptions() : mxImpl( new ScExtDocOptionsImpl ) diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index 1b4b8ad38388..f12bb5ec847f 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -44,7 +44,7 @@ using namespace com::sun::star; static Point aSwitchPos; //! Member static bool bDidSwitch = false; -// ----------------------------------------------------------------------- + // View (Gridwin / keyboard) ScViewFunctionSet::ScViewFunctionSet( ScViewData* pNewViewData ) : diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 8ac4636722b2..cd8fd0b55c64 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -375,7 +375,7 @@ ScConversionParam::ScConversionParam( ScConversionType eConvType, mnOptions = i18n::TextConversionOption::CHARACTER_BY_CHARACTER; } -// ---------------------------------------------------------------------------- + ScTextConversionEngine::ScTextConversionEngine( SfxItemPool* pEnginePoolP, ScViewData& rViewData, diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index bee68c7afe1b..8cac82a491db 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -94,7 +94,7 @@ ScRange lcl_getSubRangeByIndex( const ScRange& rRange, sal_Int32 nIndex ) using namespace com::sun::star; -// ----------------------------------------------------------------------- + // // --- Public-Funktionen @@ -772,7 +772,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, // VisibleCellsY == CellsAtY( GetPosY( eWhichY ), 1, eWhichY ) - //------------------------------------------------------------------------------- + // falls z.B. Suchen-Dialog offen ist, Cursor nicht hinter den Dialog stellen // wenn moeglich, die Zeile mit dem Cursor oberhalb oder unterhalb des Dialogs @@ -839,7 +839,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, } } } - //------------------------------------------------------------------------------- + SCsCOL nNewDeltaX = nDeltaX; SCsROW nNewDeltaY = nDeltaY; diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 6eee7b5ba3a4..04fdf7e8d389 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -533,7 +533,7 @@ void ScTabView::DigitLanguageChanged() pGridWin[i]->SetDigitLanguage( eNewLang ); } -//--------------------------------------------------------------- + void ScTabView::ScrollToObject( SdrObject* pDrawObj ) { @@ -620,7 +620,7 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect ) } } -//--------------------------------------------------------------- + void ScTabView::SetBrushDocument( ScDocument* pNew, bool bLock ) { diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 50cb51ffbcff..fca644ab010d 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -49,7 +49,7 @@ #include <svx/svdpage.hxx> #include <fuconcustomshape.hxx> -// ----------------------------------------------------------------------- + SdrView* ScTabViewShell::GetDrawView() const { diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index bd7ef6fe2fa6..a6f201accb5f 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -70,7 +70,7 @@ using ::std::auto_ptr; -//------------------------------------------------------------------ + /** Try to parse the given range using Calc-style syntax first, then Excel-style if that fails. */ @@ -766,7 +766,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - //---------------------------------------------------------------- + case FID_TAB_SELECTALL: SelectAllTables(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index e9da7c7719c3..978500e4bc27 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -101,7 +101,7 @@ sal_uInt16 ScTabViewShell::nInsertCtrlState = SID_INSERT_GRAPHIC; sal_uInt16 ScTabViewShell::nInsCellsCtrlState = 0; sal_uInt16 ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM; -// ----------------------------------------------------------------------- + void ScTabViewShell::Activate(sal_Bool bMDI) { @@ -310,7 +310,7 @@ bool ScTabViewShell::PrepareClose(sal_Bool bUI) return SfxViewShell::PrepareClose(bUI); } -//------------------------------------------------------------------ + // Zoom fuer In-Place berechnen // aus Verhaeltnis von VisArea und Fenstergroesse des GridWin @@ -451,7 +451,7 @@ void ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const rRect.SetSize( pWin->LogicToPixel( aLogicRect.GetSize() ) ); } -//------------------------------------------------------------------ + void ScTabViewShell::Move() { @@ -464,7 +464,7 @@ void ScTabViewShell::Move() } } -//------------------------------------------------------------------ + void ScTabViewShell::ShowCursor(bool /* bOn */) { @@ -478,7 +478,7 @@ void ScTabViewShell::ShowCursor(bool /* bOn */) */ } -//------------------------------------------------------------------ + void ScTabViewShell::WriteUserData(OUString& rData, bool /* bBrowse */) { @@ -570,7 +570,7 @@ void ScTabViewShell::DoReadUserData( const OUString& rData ) //! if ViewData has more tables than document, remove tables in ViewData } -//------------------------------------------------------------------ + void ScTabViewShell::UpdateDrawShell() { @@ -1052,14 +1052,14 @@ void ScTabViewShell::SetDrawTextUndo( ::svl::IUndoManager* pNewUndoMgr ) } } -//------------------------------------------------------------------ + ScTabViewShell* ScTabViewShell::GetActiveViewShell() { return PTR_CAST(ScTabViewShell,Current()); } -//------------------------------------------------------------------ + SfxPrinter* ScTabViewShell::GetPrinter( sal_Bool bCreate ) { @@ -1093,7 +1093,7 @@ void ScTabViewShell::StopEditShell() SetEditShell(NULL, false ); } -//------------------------------------------------------------------ + // close handler to ensure function of dialog: @@ -1201,7 +1201,7 @@ void ScTabViewShell::StopSimpleRefDialog() } } -//------------------------------------------------------------------ + bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) { @@ -1466,7 +1466,7 @@ bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) return TabKeyInput( rKeyEvent ); } -//------------------------------------------------------------------ + #define __INIT_ScTabViewShell \ eCurOST(OST_NONE), \ @@ -1516,7 +1516,7 @@ bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) mbInSwitch(false) -//------------------------------------------------------------------ + void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) { @@ -1716,10 +1716,10 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) SetBorderPixel( aBorder ); } -//------------------------------------------------------------------ -//------------------------------------------------------------------ + + ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, SfxViewShell* pOldSh ) : @@ -1773,7 +1773,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, #undef __INIT_ScTabViewShell -//------------------------------------------------------------------ + ScTabViewShell::~ScTabViewShell() { @@ -1817,7 +1817,7 @@ ScTabViewShell::~ScTabViewShell() DELETEZ(pAccessibilityBroadcaster); } -//------------------------------------------------------------------ + void ScTabViewShell::SetDialogDPObject( const ScDPObject* pObj ) { @@ -1828,7 +1828,7 @@ void ScTabViewShell::SetDialogDPObject( const ScDPObject* pObj ) pDialogDPObject = NULL; } -//------------------------------------------------------------------ + void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) { @@ -1856,7 +1856,7 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) // eNumType kennt der Dialog selber } -//------------------------------------------------------------------ + void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest ) { @@ -1882,7 +1882,7 @@ ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings() } -//------------------------------------------------------------------ + void ScTabViewShell::ExecTbx( SfxRequest& rReq ) { diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index ae8205817c30..d8357a03fdba 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -306,13 +306,13 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SfxViewShell::Notify( rBC, rHint ); } -//------------------------------------------------------------------ + SvxNumberInfoItem* ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, ScViewData* pViewData ) { - //------------------------------ + // NumberInfo-Item konstruieren: - //------------------------------ + SvxNumberValueType eValType = SVX_VALUE_TYPE_UNDEFINED; double nCellValue = 0; OUString aCellString; @@ -379,7 +379,7 @@ SvxNumberInfoItem* ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, ScViewD pDoc->GetFormatTable(), static_cast<const sal_uInt16>(SID_ATTR_NUMBERFORMAT_INFO)); } -//------------------------------------------------------------------ + void ScTabViewShell::UpdateNumberFormatter( const SvxNumberInfoItem& rInfoItem ) diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx index c60115eb7dc0..6674445d28b3 100644 --- a/sc/source/ui/view/tabvwsh8.cxx +++ b/sc/source/ui/view/tabvwsh8.cxx @@ -24,7 +24,7 @@ #include "document.hxx" -//------------------------------------------------------------------ + void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine ) { @@ -42,7 +42,7 @@ void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine } } -//------------------------------------------------------------------ + sal_Bool ScTabViewShell::HasSelection( sal_Bool bText ) const { @@ -70,7 +70,7 @@ sal_Bool ScTabViewShell::HasSelection( sal_Bool bText ) const return bHas; } -//------------------------------------------------------------------ + void ScTabViewShell::UIDeactivated( SfxInPlaceClient* pClient ) { diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 5f2f415b12c2..72a38f273161 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -45,7 +45,7 @@ SvxIMapDlg* ScGetIMapDlg(); const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg ); const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ); -//------------------------------------------------------------------ + void ScTabViewShell::ExecChildWin(SfxRequest& rReq) { @@ -72,7 +72,7 @@ void ScTabViewShell::GetChildWinState( SfxItemSet& rSet ) } } -//------------------------------------------------------------------ + void ScTabViewShell::ExecGallery( SfxRequest& rReq ) { @@ -106,14 +106,14 @@ void ScTabViewShell::GetGalleryState( SfxItemSet& /* rSet */ ) { } -//------------------------------------------------------------------ + ScInputHandler* ScTabViewShell::GetInputHandler() const { return pInputHandler; } -//------------------------------------------------------------------ + OUString ScTabViewShell::GetDescription() const { diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index a9d2767bf4a6..57abb07c31a5 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -466,7 +466,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) } // while ( nWitch ) } -//------------------------------------------------------------------ + void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName) { ScDocument* pDoc = GetViewData()->GetDocument(); @@ -553,7 +553,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName } } -//------------------------------------------------------------------ + bool ScTabViewShell::IsRefInputMode() const { @@ -600,7 +600,7 @@ bool ScTabViewShell::IsRefInputMode() const return false; } -//------------------------------------------------------------------ + void ScTabViewShell::ExecuteInputDirect() { @@ -614,7 +614,7 @@ void ScTabViewShell::ExecuteInputDirect() } } -//------------------------------------------------------------------ + void ScTabViewShell::UpdateInputHandler( bool bForce /* = sal_False */, bool bStopEditing /* = sal_True */ ) { @@ -714,7 +714,7 @@ void ScTabViewShell::UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust ) pHdl->UpdateCellAdjust( eJust ); } -//------------------------------------------------------------------ + void ScTabViewShell::ExecuteSave( SfxRequest& rReq ) { diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 86f8c66d222d..8a8c5df576dd 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -487,7 +487,7 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet) } -//------------------------------------------------------------------ + void ScTabViewShell::ExecuteUndo(SfxRequest& rReq) { diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index afdd056de325..03430eae901c 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -73,7 +73,7 @@ #include <config_orcus.h> -//------------------------------------------------------------------ + void ScTabViewShell::SetCurRefDlgId( sal_uInt16 nNew ) { diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 49c9d8a98c0b..c593bf695d73 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -118,7 +118,7 @@ OUString ScTabViewShell::GetSelectionText( bool bWholeWord ) return aStrSelection; } -//------------------------------------------------------------------------ + void ScTabViewShell::InsertURL( const OUString& rName, const OUString& rURL, const OUString& rTarget, sal_uInt16 nMode ) @@ -153,7 +153,7 @@ void ScTabViewShell::InsertURL( const OUString& rName, const OUString& rURL, con } } -//------------------------------------------------------------------------ + static void lcl_SelectFieldAfterInsert( EditView& rView ) { @@ -350,7 +350,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) } } -//-------------------------------------------------------------------- + diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 059fdce5b63d..17b7e17a7d6b 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -781,7 +781,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } } - //------------------------------------------------------------------ + void ScTabViewShell::GetStateTable( SfxItemSet& rSet ) { diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index e256e55c40ca..85f335e005b4 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -36,7 +36,7 @@ using namespace com::sun::star; #include "globstr.hrc" #include <avmedia/mediawindow.hxx> -//------------------------------------------------------------------------ + void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rURL, const OUString& rTarget, diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index f99c60617fc6..4be04c6e49ee 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -40,7 +40,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------ + void ScTabViewShell::ExecuteSbx( SfxRequest& /* rReq */ ) { @@ -53,7 +53,7 @@ void ScTabViewShell::GetSbxState( SfxItemSet& /* rSet */ ) // SID_RANGE_REGION (CurrentRegion) - removed (old Basic) } -//------------------------------------------------------------------ + void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) { diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 2364c1bf8aa1..0ddaecf34901 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -101,7 +101,7 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ); // STATIC DATA --------------------------------------------------------------- -//---------------------------------------------------------------------------- + bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData ) { @@ -163,7 +163,7 @@ bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData ) } -//---------------------------------------------------------------------------- + bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint ) { @@ -203,7 +203,7 @@ bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint ) } -//---------------------------------------------------------------------------- + enum ScAutoSum { @@ -236,7 +236,7 @@ static ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, } -//---------------------------------------------------------------------------- + #define SC_AUTOSUM_MAXCOUNT 20 @@ -271,7 +271,7 @@ static ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow #undef SC_AUTOSUM_MAXCOUNT -//---------------------------------------------------------------------------- + static bool lcl_FindNextSumEntryInColumn( ScDocument* pDoc, SCCOL nCol, SCROW& nRow, SCTAB nTab, SCCOLROW& nExtend, SCROW nMinRow ) @@ -290,7 +290,7 @@ static bool lcl_FindNextSumEntryInColumn( ScDocument* pDoc, SCCOL nCol, SCROW& n return false; } -//---------------------------------------------------------------------------- + static bool lcl_FindNextSumEntryInRow( ScDocument* pDoc, SCCOL& nCol, SCROW nRow, SCTAB nTab, SCCOLROW& nExtend, SCROW nMinCol ) @@ -309,7 +309,7 @@ static bool lcl_FindNextSumEntryInRow( ScDocument* pDoc, SCCOL& nCol, SCROW nRow return false; } -//---------------------------------------------------------------------------- + static bool lcl_GetAutoSumForColumnRange( ScDocument* pDoc, ScRangeList& rRangeList, const ScRange& rRange ) { @@ -353,7 +353,7 @@ static bool lcl_GetAutoSumForColumnRange( ScDocument* pDoc, ScRangeList& rRangeL return true; } -//---------------------------------------------------------------------------- + static bool lcl_GetAutoSumForRowRange( ScDocument* pDoc, ScRangeList& rRangeList, const ScRange& rRange ) { @@ -397,7 +397,7 @@ static bool lcl_GetAutoSumForRowRange( ScDocument* pDoc, ScRangeList& rRangeList return true; } -//---------------------------------------------------------------------------- + bool ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList ) { @@ -503,7 +503,7 @@ bool ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList ) return false; } -//---------------------------------------------------------------------------- + void ScViewFunc::EnterAutoSum(const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr) { @@ -511,7 +511,7 @@ void ScViewFunc::EnterAutoSum(const ScRangeList& rRangeList, bool bSubTotal, con EnterBlock( aFormula, NULL ); } -//---------------------------------------------------------------------------- + bool ScViewFunc::AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor, bool bContinue ) { @@ -712,7 +712,7 @@ bool ScViewFunc::AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor return true; } -//---------------------------------------------------------------------------- + OUString ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr ) { @@ -757,7 +757,7 @@ OUString ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSub return aBuf.makeStringAndClear(); } -//---------------------------------------------------------------------------- + void ScViewFunc::EnterBlock( const OUString& rString, const EditTextObject* pData ) { @@ -846,7 +846,7 @@ void ScViewFunc::EnterBlock( const OUString& rString, const EditTextObject* pDat } -//---------------------------------------------------------------------------- + // manual page break void ScViewFunc::InsertPageBreak( bool bColumn, bool bRecord, const ScAddress* pPos, @@ -867,7 +867,7 @@ void ScViewFunc::InsertPageBreak( bool bColumn, bool bRecord, const ScAddress* p } -//---------------------------------------------------------------------------- + void ScViewFunc::DeletePageBreak( bool bColumn, bool bRecord, const ScAddress* pPos, bool bSetModified ) @@ -886,7 +886,7 @@ void ScViewFunc::DeletePageBreak( bool bColumn, bool bRecord, const ScAddress* p UpdatePageBreakData( true ); // for PageBreak-Mode } -//---------------------------------------------------------------------------- + void ScViewFunc::RemoveManualBreaks() { @@ -912,7 +912,7 @@ void ScViewFunc::RemoveManualBreaks() pDocSh->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID ); } -//---------------------------------------------------------------------------- + void ScViewFunc::SetPrintZoom(sal_uInt16 nScale, sal_uInt16 nPages) { @@ -929,7 +929,7 @@ void ScViewFunc::AdjustPrintZoom() GetViewData()->GetDocShell()->AdjustPrintZoom( aRange ); } -//---------------------------------------------------------------------------- + void ScViewFunc::SetPrintRanges( bool bEntireSheet, const OUString* pPrint, const OUString* pRepCol, const OUString* pRepRow, @@ -1041,7 +1041,7 @@ void ScViewFunc::SetPrintRanges( bool bEntireSheet, const OUString* pPrint, pDocSh->SetDocumentModified(); } -//---------------------------------------------------------------------------- + // Merge cells bool ScViewFunc::TestMergeCells() // pre-test (for menu) @@ -1059,7 +1059,7 @@ bool ScViewFunc::TestMergeCells() // pre-test (for menu) } -//---------------------------------------------------------------------------- + bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bCenter ) { @@ -1156,7 +1156,7 @@ bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bC } -//---------------------------------------------------------------------------- + bool ScViewFunc::TestRemoveMerge() { @@ -1172,7 +1172,7 @@ bool ScViewFunc::TestRemoveMerge() } -//---------------------------------------------------------------------------- + static bool lcl_extendMergeRange(ScCellMergeOption& rOption, const ScRange& rRange) { @@ -1248,7 +1248,7 @@ bool ScViewFunc::RemoveMerge( bool bRecord ) return true; //! bOk ?? } -//---------------------------------------------------------------------------- + void ScViewFunc::FillSimple( FillDir eDir, bool bRecord ) { @@ -1268,7 +1268,7 @@ void ScViewFunc::FillSimple( FillDir eDir, bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } -//---------------------------------------------------------------------------- + void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, double fStart, double fStep, double fMax, bool bRecord ) @@ -1293,7 +1293,7 @@ void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, ErrorMessage(STR_NOMULTISELECT); } -//---------------------------------------------------------------------------- + void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount, bool bRecord ) @@ -1338,7 +1338,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, } } -//---------------------------------------------------------------------------- + void ScViewFunc::FillTab( sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bAsLink ) { @@ -1407,7 +1407,7 @@ void ScViewFunc::FillTab( sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmp pDocSh->PostDataChanged(); } -//---------------------------------------------------------------------------- + /** Downward fill of selected cell(s) by double-clicking cross-hair cursor @@ -1482,7 +1482,7 @@ void ScViewFunc::FillCrossDblClick() } } -//---------------------------------------------------------------------------- + void ScViewFunc::TransliterateText( sal_Int32 nType ) { @@ -1503,7 +1503,7 @@ void ScViewFunc::TransliterateText( sal_Int32 nType ) } } -//---------------------------------------------------------------------------- + // AutoFormat ScAutoFormatData* ScViewFunc::CreateAutoFormatData() @@ -1528,7 +1528,7 @@ ScAutoFormatData* ScViewFunc::CreateAutoFormatData() } -//---------------------------------------------------------------------------- + void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord ) { @@ -1547,7 +1547,7 @@ void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord ) } -//---------------------------------------------------------------------------- + // Suchen & Ersetzen bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, @@ -1765,7 +1765,7 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, } -//---------------------------------------------------------------------------- + // Zielwertsuche void ScViewFunc::Solve( const ScSolveParam& rParam ) @@ -1841,7 +1841,7 @@ void ScViewFunc::Solve( const ScSolveParam& rParam ) } -//---------------------------------------------------------------------------- + // multi operation void ScViewFunc::TabOp( const ScTabOpParam& rParam, bool bRecord ) @@ -1858,7 +1858,7 @@ void ScViewFunc::TabOp( const ScTabOpParam& rParam, bool bRecord ) } -//---------------------------------------------------------------------------- + void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) @@ -1881,7 +1881,7 @@ void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment, } -//---------------------------------------------------------------------------- + void ScViewFunc::ExtendScenario() { @@ -1902,7 +1902,7 @@ void ScViewFunc::ExtendScenario() } -//---------------------------------------------------------------------------- + void ScViewFunc::UseScenario( const OUString& rName ) { @@ -1915,7 +1915,7 @@ void ScViewFunc::UseScenario( const OUString& rName ) } -//---------------------------------------------------------------------------- + // Insert table bool ScViewFunc::InsertTable( const OUString& rName, SCTAB nTab, bool bRecord ) @@ -1929,7 +1929,7 @@ bool ScViewFunc::InsertTable( const OUString& rName, SCTAB nTab, bool bRecord ) return bSuccess; } -//---------------------------------------------------------------------------- + // Insert tables bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, @@ -1980,7 +1980,7 @@ bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, } -//---------------------------------------------------------------------------- + bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) { @@ -2014,7 +2014,7 @@ bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) } -//---------------------------------------------------------------------------- + bool ScViewFunc::DeleteTable( SCTAB nTab, bool bRecord ) { @@ -2206,7 +2206,7 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) } -//---------------------------------------------------------------------------- + bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) { @@ -2222,7 +2222,7 @@ bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) } -//---------------------------------------------------------------------------- + bool ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab ) { @@ -2244,7 +2244,7 @@ bool ScViewFunc::SetTabBgColor( ScUndoTabColorInfo::List& rUndoSetTabBgColorInfo return bSuccess; } -//---------------------------------------------------------------------------- + void ScViewFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, @@ -2260,7 +2260,7 @@ void ScViewFunc::InsertAreaLink( const OUString& rFile, } -//---------------------------------------------------------------------------- + void ScViewFunc::InsertTableLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, @@ -2296,7 +2296,7 @@ void ScViewFunc::InsertTableLink( const OUString& rFile, } -//---------------------------------------------------------------------------- + // Copy/link tables from another document void ScViewFunc::ImportTables( ScDocShell* pSrcShell, @@ -2420,7 +2420,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, } -//---------------------------------------------------------------------------- + // Move/Copy table to another document void ScViewFunc::MoveTable( @@ -2776,7 +2776,7 @@ void ScViewFunc::MoveTable( } -//---------------------------------------------------------------------------- + void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) { @@ -2816,7 +2816,7 @@ void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) } -//---------------------------------------------------------------------------- + void ScViewFunc::HideTable( const ScMarkData& rMark ) { @@ -2867,7 +2867,7 @@ void ScViewFunc::HideTable( const ScMarkData& rMark ) } -//---------------------------------------------------------------------------- + void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont ) { @@ -2904,7 +2904,7 @@ void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont ) } -//---------------------------------------------------------------------------- + void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, const SvxBorderLine* pDestLine, @@ -2943,7 +2943,7 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, } -//---------------------------------------------------------------------------- + void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, bool bColorOnly ) @@ -2987,7 +2987,7 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, ATTR_PATTERN_START, ATTR_PATTERN_END ); - //------------------------------------------------------------ + const SvxBorderLine* pBoxLine = NULL; SvxBorderLine aLine; @@ -3060,7 +3060,7 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, #undef SET_LINE_ATTRIBUTES -//---------------------------------------------------------------------------- + void ScViewFunc::SetValidation( const ScValidationData& rNew ) { diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index ae40407029e2..e83551516ee1 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -75,7 +75,7 @@ using namespace com::sun::star; // GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx -//---------------------------------------------------------------------------- + // C U T void ScViewFunc::CutToClip( ScDocument* pClipDoc, bool bIncludeObjects ) @@ -151,7 +151,7 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, bool bIncludeObjects ) } -//---------------------------------------------------------------------------- + // C O P Y bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, bool bCut, bool bApi, bool bIncludeObjects, bool bStopEdit ) @@ -436,7 +436,7 @@ ScTransferObj* ScViewFunc::CopyToTransferable() return NULL; } -//---------------------------------------------------------------------------- + // P A S T E void ScViewFunc::PasteDraw() @@ -689,7 +689,7 @@ bool ScViewFunc::PasteFromSystem( sal_uLong nFormatId, bool bApi ) } -//---------------------------------------------------------------------------- + // P A S T E bool ScViewFunc::PasteOnDrawObjectLinked( @@ -1748,7 +1748,7 @@ void ScViewFunc::PostPasteFromClip(const ScRangeList& rPasteRanges, const ScMark } -//---------------------------------------------------------------------------- + // D R A G A N D D R O P // // innerhalb des Dokuments diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 9a7910b453c7..ea3595717fe4 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -25,7 +25,7 @@ #include <svx/unomodel.hxx> #include <unotools/streamwrap.hxx> -//------------------------------------------------------------------ + #include <svx/fmmodel.hxx> #include <svx/svdetc.hxx> @@ -72,7 +72,7 @@ using namespace com::sun::star; -//------------------------------------------------------------------ + bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, const uno::Reference<datatransfer::XTransferable>& rxTransferable, diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 1404d5b2cf39..88640ee3a6d1 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -102,7 +102,7 @@ ScViewFunc::~ScViewFunc() { } -//------------------------------------------------------------------------------------ + void ScViewFunc::StartFormatArea() { @@ -226,7 +226,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, aFormatSource.Set( nCol, nRow, nTab ); // then set a new source } -//------------------------------------------------------------------------------------ + // additional routines @@ -1325,7 +1325,7 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, bool bRecord } if ( !pStyleSheet) return; - // ------------------------------------------------------------------- + ScViewData* pViewData = GetViewData(); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -1417,7 +1417,7 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, bool bRecord void ScViewFunc::RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet ) { if ( !pStyleSheet) return; - // ------------------------------------------------------------------- + ScViewData* pViewData = GetViewData(); ScDocument* pDoc = pViewData->GetDocument(); @@ -1444,7 +1444,7 @@ void ScViewFunc::RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet ) void ScViewFunc::UpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet ) { if ( !pStyleSheet) return; - // ------------------------------------------------------------------- + ScViewData* pViewData = GetViewData(); ScDocument* pDoc = pViewData->GetDocument(); diff --git a/sc/source/ui/view/waitoff.cxx b/sc/source/ui/view/waitoff.cxx index cd981c29338c..e9a63b0d4338 100644 --- a/sc/source/ui/view/waitoff.cxx +++ b/sc/source/ui/view/waitoff.cxx @@ -21,7 +21,7 @@ #include "waitoff.hxx" -//------------------------------------------------------------------------ + ScWaitCursorOff::ScWaitCursorOff( Window* pWinP ) : diff --git a/sc/workben/addin.cxx b/sc/workben/addin.cxx index e1ac9979d1bd..97a153e8f634 100644 --- a/sc/workben/addin.cxx +++ b/sc/workben/addin.cxx @@ -99,7 +99,7 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory( } // extern C -//------------------------------------------------------------------------ + ScTestAddIn::ScTestAddIn() { diff --git a/sc/workben/result.cxx b/sc/workben/result.cxx index c11d74b6d106..13ce3abee4d4 100644 --- a/sc/workben/result.cxx +++ b/sc/workben/result.cxx @@ -27,11 +27,11 @@ using namespace com::sun::star; -//------------------------------------------------------------------------ + SV_IMPL_PTRARR( XResultListenerArr_Impl, XResultListenerPtr ); -//------------------------------------------------------------------------ + ScAddInResult::ScAddInResult(const String& rStr) : aArg( rStr ), @@ -111,7 +111,7 @@ void SAL_CALL ScAddInResult::removeResultListener( const ::com::sun::star::uno:: release(); } -//------------------------------------------------------------------------ + diff --git a/sc/workben/test.cxx b/sc/workben/test.cxx index 2ec6a2fcbee1..327f6bfc2756 100644 --- a/sc/workben/test.cxx +++ b/sc/workben/test.cxx @@ -84,7 +84,7 @@ public: DECL_LINK(ViewHdl, PushButton*); }; -//----------------------------------------------------------------------- + class ScTestListener : public XSelectionChangeListener, public UsrObject { @@ -106,13 +106,13 @@ public: virtual void selectionChanged(const EventObject& aEvent); }; -//----------------------------------------------------------------------- + static long nBla = 0; static XCellRef xGlobalCell; -//----------------------------------------------------------------------- + ScTestListener::ScTestListener(FixedText* pF) : pFixedText( pF ) @@ -165,7 +165,7 @@ void ScTestListener::selectionChanged(const EventObject& aEvent) } -//----------------------------------------------------------------------- + extern "C" Window* SAL_CALL CreateWindow( Window *pParent, const String& rParam ) { @@ -246,7 +246,7 @@ MyWindow::MyWindow( Window *pParent ) : aViewButton.Show(); } -//----------------------------------------------------------------------- + XSpreadsheetDocumentRef lcl_GetDocument() { @@ -290,7 +290,7 @@ XInterfaceRef lcl_GetView() return xView; } -//----------------------------------------------------------------------- + void lcl_OutputNames( const XInterfaceRef& xSource, // XNameAccess const XSpreadsheetDocumentRef& xDoc, @@ -324,7 +324,7 @@ void lcl_OutputNames( const XInterfaceRef& xSource, // XNameAccess } } -//----------------------------------------------------------------------- + void lcl_SetText( const XTextRef& xText ) { @@ -353,7 +353,7 @@ void lcl_SetText( const XTextRef& xText ) xProp->setPropertyValue(L"Bold", UsrAny((sal_Bool)true)); } -//----------------------------------------------------------------------- + void lcl_DoCount() { @@ -1634,7 +1634,7 @@ IMPL_LINK_NOARG(MyWindow, CountHdl) return 0; } -//----------------------------------------------------------------------- + IMPL_LINK_NOARG(MyWindow, TextHdl) { @@ -1683,7 +1683,7 @@ IMPL_LINK_NOARG(MyWindow, TextHdl) return 0; } -//----------------------------------------------------------------------- + IMPL_LINK_NOARG(MyWindow, BlaHdl) { @@ -1757,7 +1757,7 @@ IMPL_LINK_NOARG(MyWindow, BlaHdl) } -//----------------------------------------------------------------------- + IMPL_LINK_NOARG(MyWindow, TabHdl) { @@ -1830,7 +1830,7 @@ IMPL_LINK_NOARG(MyWindow, TabHdl) return 0; } -//----------------------------------------------------------------------- + void lcl_FillCells(XCellCollectionRef xColl) { |