diff options
Diffstat (limited to 'sc/source/ui/docshell')
-rw-r--r-- | sc/source/ui/docshell/dbdocfun.cxx | 6 | ||||
-rw-r--r-- | sc/source/ui/docshell/dbdocimp.cxx | 28 | ||||
-rw-r--r-- | sc/source/ui/docshell/docfunc.cxx | 10 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh3.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh4.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh5.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/docsh6.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/docshell/externalrefmgr.cxx | 8 | ||||
-rw-r--r-- | sc/source/ui/docshell/impex.cxx | 12 | ||||
-rw-r--r-- | sc/source/ui/docshell/macromgr.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/olinefun.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/docshell/pagedata.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/docshell/tpstat.cxx | 4 |
13 files changed, 51 insertions, 51 deletions
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 19c1ed176ff2..8a590db78f8d 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -168,7 +168,7 @@ bool ScDBDocFunc::RenameDBRange( const OUString& rOld, const OUString& rNew ) bool bInserted = rDBs.insert(pNewData); if (!bInserted) // Fehler -> alten Zustand wiederherstellen pDoc->SetDBCollection(pUndoColl); // gehoert dann dem Dokument - // + pDoc->CompileDBFormula( false ); // CompileFormulaString if (bInserted) // Einfuegen hat geklappt @@ -1667,8 +1667,8 @@ void ScDBDocFunc::RefreshPivotTableGroups(ScDPObject* pDPObj) } } -//================================================================== -// + + // database import void ScDBDocFunc::UpdateImport( const OUString& rTarget, const svx::ODataAccessDescriptor& rDescriptor ) diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 41c045096300..3b8ee69953d0 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -192,9 +192,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, ScDocument* pImportDoc = new ScDocument( SCDOCMODE_UNDO ); pImportDoc->InitUndo( pDoc, nTab, nTab ); - // + // get data from database into import document - // + try { @@ -216,9 +216,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, OSL_ENSURE( xRowProp.is(), "can't get RowSet" ); if ( xRowProp.is() ) { - // + // set source parameters - // + sal_Int32 nType = rParam.bSql ? sdb::CommandType::COMMAND : ( (rParam.nType == ScDbQuery) ? sdb::CommandType::QUERY : @@ -251,9 +251,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } if ( xRowSet.is() ) { - // + // get column descriptions - // + long nColCount = 0; uno::Reference<sdbc::XResultSetMetaData> xMeta; @@ -401,9 +401,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, OSL_FAIL("Unexpected exception in database"); } - // + // test for cell protection - // + sal_Bool bKeepFormat = !bAddrInsert && pDBData->IsKeepFmt(); sal_Bool bMoveCells = !bAddrInsert && pDBData->IsDoSize(); @@ -449,9 +449,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } } - // + // copy data from import doc into real document - // + if ( bSuccess ) { @@ -489,9 +489,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, pImportDoc->ApplyPatternAreaTab( 0,0,MAXCOL,MAXROW, nTab, aPattern ); } - // + // copy old data for undo - // + SCCOL nUndoEndCol = std::max( nEndCol, rParam.nCol2 ); // rParam = old end SCROW nUndoEndRow = std::max( nEndRow, rParam.nRow2 ); @@ -529,9 +529,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nCopyFlags, false, pUndoDoc ); } - // + // move new data - // + if (bMoveCells) { diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index c1deef098d9b..182cf6cd4a20 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -98,7 +98,7 @@ using ::std::vector; // STATIC DATA ----------------------------------------------------------- -//======================================================================== + IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction ) { @@ -2296,9 +2296,9 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, } } - // + // ausfuehren - // + WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference @@ -2660,9 +2660,9 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, sal_uInt16 nDestExt = 0; rDocShell.UpdatePaintExt( nDestExt, nDestCol,nDestRow,nDestTab, nDestEndCol,nDestEndRow,nDestEndTab ); - // + // ausfuehren - // + ScDocument* pUndoDoc = NULL; ScDocument* pRefUndoDoc = NULL; diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 23ce64cc8085..5de3b11dcf53 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -64,9 +64,9 @@ -// + // Redraw - Benachrichtigungen -// + void ScDocShell::PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos ) @@ -732,9 +732,9 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) } -// + // 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 c1ef3e4aa811..c68d39486c1a 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1868,10 +1868,10 @@ void ScDocShell::GetSbxState( SfxItemSet &rSet ) // SID_TABLES_GET (Tables), // SID_PIVOT_GET (DataPilotTables) - removed (old Basic) - // + // Wenn hier Slots von der View-Shell executed werden, muss auch der // GetState weitergeleitet werden! - // + ScTabViewShell* pVisibleSh = GetBestViewShell(); // sichtbare View if ( pVisibleSh ) diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index e901ddb416ed..0366dccae1cf 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -63,9 +63,9 @@ using ::std::vector; -// + // former viewfunc/dbfunc methods -// + void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId ) { diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 73fc57356d4d..a0d29a893948 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -67,9 +67,9 @@ struct ScStylePair -// + // Ole -// + void ScDocShell::SetVisArea( const Rectangle & rVisArea ) { @@ -215,9 +215,9 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, bool bSnapSize ) SetVisAreaOrSize( aNewArea, true ); // hier muss auch der Start angepasst werden } -// + // Style-Krempel fuer Organizer etc. -// + SfxStyleSheetBasePool* ScDocShell::GetStyleSheetPool() { diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index a41ee468e478..5b6384832bb5 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -243,7 +243,7 @@ void removeRangeNamesBySrcDoc(ScRangeName& rRanges, sal_uInt16 nFileId) } -// ============================================================================ + ScExternalRefCache::Table::Table() : meReferenced( REFERENCED_MARKED ) @@ -1228,7 +1228,7 @@ ScExternalRefCache::DocItem* ScExternalRefCache::getDocItem(sal_uInt16 nFileId) return &itrDoc->second; } -// ============================================================================ + ScExternalRefLink::ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId, const OUString& rFilter) : ::sfx2::SvBaseLink(::sfx2::LINKUPDATE_ONCALL, FORMAT_FILE), @@ -1298,7 +1298,7 @@ IMPL_LINK_NOARG(ScExternalRefLink, ExternalRefEndEditHdl) return 0; } -// ============================================================================ + static FormulaToken* convertToToken( ScDocument* pHostDoc, ScDocument* pSrcDoc, ScRefCellValue& rCell ) { @@ -1574,7 +1574,7 @@ ScExternalRefCache::TableTypeRef ScExternalRefManager::getCacheTable( return maRefCache.getCacheTable(nFileId, rTabName, bCreateNew, pnIndex); } -// ============================================================================ + ScExternalRefManager::LinkListener::LinkListener() { diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 3b2928a6121a..46215811392d 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -56,7 +56,7 @@ #include <boost/scoped_ptr.hpp> -//======================================================================== + // We don't want to end up with 2GB read in one line just because of malformed // multiline fields, so chop it _somewhere_, which is twice supported columns @@ -206,7 +206,7 @@ bool ScImportExport::IsFormatSupported( sal_uLong nFormat ) } -////////////////////////////////////////////////////////////////////////////// + // Vorbereitung fuer Undo: Undo-Dokument erzeugen @@ -264,7 +264,7 @@ void ScImportExport::EndPaste(bool bAutoRowHeight) } -///////////////////////////////////////////////////////////////////////////// + bool ScImportExport::ImportData( const OUString& /* rMimeType */, const ::com::sun::star::uno::Any & /* rValue */ ) @@ -862,7 +862,7 @@ static inline void lcl_WriteSimpleString( SvStream& rStrm, const OUString& rStri ScImportExport::WriteUnicodeOrByteString( rStrm, rString ); } -////////////////////////////////////////////////////////////////////////////// + bool ScImportExport::Text2Doc( SvStream& rStrm ) @@ -957,9 +957,9 @@ bool ScImportExport::Text2Doc( SvStream& rStrm ) return bOk; } - // + // erweiterter Ascii-Import - // + static bool lcl_PutString( diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 8b2d75af5f18..9d6efe8cadbf 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -36,7 +36,7 @@ using ::std::list; using ::std::for_each; using ::std::pair; -// ============================================================================ + /** * A simple container to keep track of cells that depend on basic modules @@ -92,7 +92,7 @@ private: }; -// ============================================================================ + ScMacroManager::ScMacroManager(ScDocument* pDoc) : mpDepTracker(new ScUserMacroDepTracker), diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx index 034b61fe14a2..5759666d14da 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -28,7 +28,7 @@ #include "sc.hrc" -//======================================================================== + static void lcl_InvalidateOutliner( SfxBindings* pBindings ) { diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx index 4128244cd6dd..cad02c397574 100644 --- a/sc/source/ui/docshell/pagedata.cxx +++ b/sc/source/ui/docshell/pagedata.cxx @@ -21,7 +21,7 @@ #include "pagedata.hxx" -//============================================================================ + ScPrintRangeData::ScPrintRangeData() { @@ -64,7 +64,7 @@ void ScPrintRangeData::SetPagesY( size_t nCount, const SCROW* pData ) nPagesY = nCount; } -//============================================================================ + ScPageBreakData::ScPageBreakData(size_t nMax) { diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 93ab7847d891..0117dc47991a 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -29,9 +29,9 @@ #include "tpstat.hxx" -//======================================================================== + // Dokumentinfo-Tabpage: -//======================================================================== + SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet& rSet ) { |