diff options
Diffstat (limited to 'sc/source/ui/view')
84 files changed, 4879 insertions, 4884 deletions
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index 115055b2f136..f75778991f09 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,7 +103,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq ) rBindings.Invalidate( SID_FILL_ADD_SUCC ); rBindings.Invalidate( SID_FILL_DEL_SUCC ); break; - case SID_CANCEL: // Escape + case SID_CANCEL: // Escape case SID_FILL_NONE: pViewData->GetViewShell()->SetAuditShell( FALSE ); break; @@ -150,7 +150,7 @@ void ScAuditingShell::Execute( SfxRequest& rReq ) void ScAuditingShell::GetState( SfxItemSet& rSet ) { - rSet.Put( SfxBoolItem( nFunction, TRUE ) ); // aktive Funktion markieren + rSet.Put( SfxBoolItem( nFunction, TRUE ) ); // aktive Funktion markieren } diff --git a/sc/source/ui/view/cellmergeoption.cxx b/sc/source/ui/view/cellmergeoption.cxx index d7a4343db4e0..61f2d8bd7727 100644 --- a/sc/source/ui/view/cellmergeoption.cxx +++ b/sc/source/ui/view/cellmergeoption.cxx @@ -17,7 +17,7 @@ * Portions created by the Initial Developer are Copyright (C) 2010 the * Initial Developer. All Rights Reserved. * - * Contributor(s): + * Contributor(s): * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 3 or later (the "GPLv3+"), or diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 7cfa50a4e686..ba4127e51331 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ //------------------------------------------------------------------ #define ScCellShell -#define CellMovement +#define CellMovement #include "scslots.hxx" #define SearchSettings @@ -117,7 +117,7 @@ ScCellShell::~ScCellShell() void ScCellShell::GetBlockState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); ScRange aMarkRange; ScMarkType eMarkType = GetViewData()->GetSimpleArea( aMarkRange ); BOOL bSimpleArea = (eMarkType == SC_MARK_SIMPLE); @@ -138,59 +138,59 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet ) while ( nWhich ) { BOOL bDisable = FALSE; - BOOL bNeedEdit = TRUE; // muss Selektion editierbar sein? + BOOL bNeedEdit = TRUE; // muss Selektion editierbar sein? switch ( nWhich ) { - case FID_FILL_TO_BOTTOM: // Fuellen oben/unten - case FID_FILL_TO_TOP: // mind. 2 Zeilen markiert? + case FID_FILL_TO_BOTTOM: // Fuellen oben/unten + case FID_FILL_TO_TOP: // mind. 2 Zeilen markiert? bDisable = (!bSimpleArea) || (nRow1 == nRow2); if ( !bDisable && bEditable ) - { // Matrix nicht zerreissen + { // Matrix nicht zerreissen if ( nWhich == FID_FILL_TO_BOTTOM ) bDisable = pDoc->HasSelectedBlockMatrixFragment( - nCol1, nRow1, nCol2, nRow1, rMark ); // erste Zeile + nCol1, nRow1, nCol2, nRow1, rMark ); // erste Zeile else bDisable = pDoc->HasSelectedBlockMatrixFragment( - nCol1, nRow2, nCol2, nRow2, rMark ); // letzte Zeile + nCol1, nRow2, nCol2, nRow2, rMark ); // letzte Zeile } break; - case FID_FILL_TO_RIGHT: // Fuellen links/rechts - case FID_FILL_TO_LEFT: // mind. 2 Spalten markiert? + case FID_FILL_TO_RIGHT: // Fuellen links/rechts + case FID_FILL_TO_LEFT: // mind. 2 Spalten markiert? bDisable = (!bSimpleArea) || (nCol1 == nCol2); if ( !bDisable && bEditable ) - { // Matrix nicht zerreissen + { // Matrix nicht zerreissen if ( nWhich == FID_FILL_TO_RIGHT ) bDisable = pDoc->HasSelectedBlockMatrixFragment( - nCol1, nRow1, nCol1, nRow2, rMark ); // erste Spalte + nCol1, nRow1, nCol1, nRow2, rMark ); // erste Spalte else bDisable = pDoc->HasSelectedBlockMatrixFragment( - nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte + nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte } break; - case FID_FILL_SERIES: // Block fuellen - case SID_OPENDLG_TABOP: // Mehrfachoperationen, mind. 2 Zellen markiert? + case FID_FILL_SERIES: // Block fuellen + case SID_OPENDLG_TABOP: // Mehrfachoperationen, mind. 2 Zellen markiert? if (pDoc->GetChangeTrack()!=NULL &&nWhich ==SID_OPENDLG_TABOP) bDisable = TRUE; else bDisable = (!bSimpleArea) || (nCol1 == nCol2 && nRow1 == nRow2); if ( !bDisable && bEditable && nWhich == FID_FILL_SERIES ) - { // Matrix nicht zerreissen + { // Matrix nicht zerreissen bDisable = pDoc->HasSelectedBlockMatrixFragment( - nCol1, nRow1, nCol2, nRow1, rMark ) // erste Zeile - || pDoc->HasSelectedBlockMatrixFragment( - nCol1, nRow2, nCol2, nRow2, rMark ) // letzte Zeile - || pDoc->HasSelectedBlockMatrixFragment( - nCol1, nRow1, nCol1, nRow2, rMark ) // erste Spalte - || pDoc->HasSelectedBlockMatrixFragment( - nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte + nCol1, nRow1, nCol2, nRow1, rMark ) // erste Zeile + || pDoc->HasSelectedBlockMatrixFragment( + nCol1, nRow2, nCol2, nRow2, rMark ) // letzte Zeile + || pDoc->HasSelectedBlockMatrixFragment( + nCol1, nRow1, nCol1, nRow2, rMark ) // erste Spalte + || pDoc->HasSelectedBlockMatrixFragment( + nCol2, nRow1, nCol2, nRow2, rMark ); // letzte Spalte } break; - case SID_CUT: // Ausschneiden, - case FID_INS_CELL: // Zellen einfuegen, nur einf. Selektion + case SID_CUT: // Ausschneiden, + case FID_INS_CELL: // Zellen einfuegen, nur einf. Selektion bDisable = (!bSimpleArea); break; @@ -204,16 +204,16 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet ) bDisable = (!bSimpleArea) || GetViewData()->SimpleRowMarked(); break; - case SID_COPY: // Kopieren + case SID_COPY: // Kopieren // nur wegen Matrix nicht editierbar? Matrix nicht zerreissen //! schlaegt nicht zu, wenn geschuetzt UND Matrix, aber damit //! muss man leben.. wird in Copy-Routine abgefangen, sonst //! muesste hier nochmal Aufwand getrieben werden if ( !(!bEditable && bOnlyNotBecauseOfMatrix) ) - bNeedEdit = FALSE; // erlaubt, wenn geschuetzt/ReadOnly + bNeedEdit = FALSE; // erlaubt, wenn geschuetzt/ReadOnly break; - case SID_AUTOFORMAT: // Autoformat, mind. 3x3 selektiert + case SID_AUTOFORMAT: // Autoformat, mind. 3x3 selektiert bDisable = (!bSimpleArea) || ((nCol2 - nCol1) < 2) || ((nRow2 - nRow1) < 2); break; @@ -270,9 +270,9 @@ void ScCellShell::GetBlockState( SfxItemSet& rSet ) } } -// Funktionen, die je nach Cursorposition disabled sind -// Default: -// SID_INSERT_POSTIT, SID_CHARMAP, SID_OPENDLG_FUNCTION +// Funktionen, die je nach Cursorposition disabled sind +// Default: +// SID_INSERT_POSTIT, SID_CHARMAP, SID_OPENDLG_FUNCTION void ScCellShell::GetCellState( SfxItemSet& rSet ) { @@ -286,7 +286,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet ) while ( nWhich ) { BOOL bDisable = FALSE; - BOOL bNeedEdit = TRUE; // muss Cursorposition editierbar sein? + BOOL bNeedEdit = TRUE; // muss Cursorposition editierbar sein? switch ( nWhich ) { case SID_THESAURUS: @@ -295,7 +295,7 @@ void ScCellShell::GetCellState( SfxItemSet& rSet ) bDisable = ( eType != CELLTYPE_STRING && eType != CELLTYPE_EDIT); if (!bDisable) { - // test for available languages + // test for available languages USHORT nLang = ScViewUtil::GetEffLanguage( pDoc, aCursor ); bDisable = !ScModule::HasThesaurusLanguage( nLang ); } @@ -343,9 +343,9 @@ sal_Bool lcl_TestFormat( SvxClipboardFmtItem& rFormats, const TransferableDataHe { if ( rDataHelper.HasFormat( nFormatId ) ) { - // #90675# translated format name strings are no longer inserted here, - // handled by "paste special" dialog / toolbox controller instead. - // Only the object type name has to be set here: + // #90675# translated format name strings are no longer inserted here, + // handled by "paste special" dialog / toolbox controller instead. + // Only the object type name has to be set here: String aStrVal; if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE ) { @@ -401,7 +401,7 @@ void ScCellShell::GetPossibleClipboardFormats( SvxClipboardFmtItem& rFormats ) lcl_TestFormat( rFormats, aDataHelper, SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ); } -// Einfuegen, Inhalte einfuegen +// Einfuegen, Inhalte einfuegen BOOL lcl_IsCellPastePossible( const TransferableDataHelper& rData ) { @@ -469,7 +469,7 @@ void __EXPORT ScCellShell::GetClipState( SfxItemSet& rSet ) BOOL bDisable = !bPastePossible; - // Zellschutz / Multiselektion + // Zellschutz / Multiselektion if (!bDisable) { @@ -499,17 +499,17 @@ void __EXPORT ScCellShell::GetClipState( SfxItemSet& rSet ) } } -// only SID_HYPERLINK_GETLINK: +// only SID_HYPERLINK_GETLINK: void ScCellShell::GetHLinkState( SfxItemSet& rSet ) { - // always return an item (or inserting will be disabled) - // if the cell at the cursor contains only a link, return that link + // always return an item (or inserting will be disabled) + // if the cell at the cursor contains only a link, return that link SvxHyperlinkItem aHLinkItem; if ( !GetViewData()->GetView()->HasBookmarkAtCursor( &aHLinkItem ) ) { - //! put selected text into item? + //! put selected text into item? } rSet.Put(aHLinkItem); @@ -519,16 +519,16 @@ void ScCellShell::GetState(SfxItemSet &rSet) { // removed: SID_BORDER_OBJECT (old Basic) - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); // BOOL bOle = pTabViewShell->GetViewFrame()->GetFrame().IsInPlace(); -// BOOL bTabProt = GetViewData()->GetDocument()->IsTabProtected(GetViewData()->GetTabNo()); +// BOOL bTabProt = GetViewData()->GetDocument()->IsTabProtected(GetViewData()->GetTabNo()); ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScViewData* pData = GetViewData(); - ScDocument* pDoc = pData->GetDocument(); - ScMarkData& rMark = pData->GetMarkData(); - SCCOL nPosX = pData->GetCurX(); - SCROW nPosY = pData->GetCurY(); - SCTAB nTab = pData->GetTabNo(); + ScDocument* pDoc = pData->GetDocument(); + ScMarkData& rMark = pData->GetMarkData(); + SCCOL nPosX = pData->GetCurX(); + SCROW nPosY = pData->GetCurY(); + SCTAB nTab = pData->GetTabNo(); SCTAB nTabCount = pDoc->GetTableCount(); SCTAB nTabSelCount = rMark.GetSelectCount(); @@ -561,7 +561,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) case SID_RANGE_NOTETEXT: { - // #43343# always take cursor position, do not use top-left cell of selection + // #43343# always take cursor position, do not use top-left cell of selection ScAddress aPos( nPosX, nPosY, nTab ); String aNoteText; if ( const ScPostIt* pNote = pDoc->GetNote( aPos ) ) @@ -612,16 +612,16 @@ void ScCellShell::GetState(SfxItemSet &rSet) case SID_STATUS_SELMODE: { - /* 0: STD Click hebt Sel auf - * 1: ER Click erweitert Selektion - * 2: ERG Click definiert weitere Selektion + /* 0: STD Click hebt Sel auf + * 1: ER Click erweitert Selektion + * 2: ERG Click definiert weitere Selektion */ USHORT nMode = pTabViewShell->GetLockedModifiers(); switch ( nMode ) { - case KEY_SHIFT: nMode = 1; break; - case KEY_MOD1: nMode = 2; break; // Control-Taste + case KEY_SHIFT: nMode = 1; break; + case KEY_MOD1: nMode = 2; break; // Control-Taste case 0: default: nMode = 0; @@ -633,7 +633,7 @@ void ScCellShell::GetState(SfxItemSet &rSet) case SID_STATUS_DOCPOS: { - String aStr( ScGlobal::GetRscString( STR_TABLE ) ); + String aStr( ScGlobal::GetRscString( STR_TABLE ) ); aStr += ' '; aStr += String::CreateFromInt32( nTab + 1 ); @@ -643,14 +643,14 @@ void ScCellShell::GetState(SfxItemSet &rSet) } break; - // Summe etc. mit Datum/Zeit/Fehler/Pos&Groesse zusammengefasst + // Summe etc. mit Datum/Zeit/Fehler/Pos&Groesse zusammengefasst // #i34458# The SfxStringItem belongs only into SID_TABLE_CELL. It no longer has to be // duplicated in SID_ATTR_POSITION or SID_ATTR_SIZE for SvxPosSizeStatusBarControl. case SID_TABLE_CELL: { - // Testen, ob Fehler unter Cursor - // (nicht pDoc->GetErrCode, um keine zirkulaeren Referenzen auszuloesen) + // Testen, ob Fehler unter Cursor + // (nicht pDoc->GetErrCode, um keine zirkulaeren Referenzen auszuloesen) // In interpreter may happen via rescheduled Basic if ( pDoc->IsInInterpreter() ) @@ -744,9 +744,9 @@ void ScCellShell::GetState(SfxItemSet &rSet) { // ScDocument* pDoc = GetViewData()->GetDocument(); // SCTAB nTab = GetViewData()->GetTabNo(); - List aList; + List aList; - Color aDummyCol; + Color aDummyCol; if ( !pDoc->IsScenario(nTab) ) { @@ -770,8 +770,8 @@ void ScCellShell::GetState(SfxItemSet &rSet) } else { - String aComment; - USHORT nDummyFlags; + String aComment; + USHORT nDummyFlags; pDoc->GetScenarioData( nTab, aComment, aDummyCol, nDummyFlags ); DBG_ASSERT( aList.Count() == 0, "List not empty!" ); aList.Insert( new String( aComment ) ); @@ -796,12 +796,12 @@ void ScCellShell::GetState(SfxItemSet &rSet) rSet.DisableItem( nWhich ); break; -/* Zellschutz bei selektierten Zellen wird bei anderen Funktionen auch nicht abgefragt... +/* Zellschutz bei selektierten Zellen wird bei anderen Funktionen auch nicht abgefragt... case SID_DELETE: { if ( pDoc->IsTabProtected(nTab) ) { - const SfxItemSet& rAttrSet = GetSelectionPattern()->GetItemSet(); + const SfxItemSet& rAttrSet = GetSelectionPattern()->GetItemSet(); const ScProtectionAttr& rProtAttr = (const ScProtectionAttr&)rAttrSet.Get( ATTR_PROTECTION, TRUE ); if ( rProtAttr.GetProtection() ) rSet.DisableItem( nWhich ); @@ -890,8 +890,8 @@ void ScCellShell::GetState(SfxItemSet &rSet) DBG_ERROR( "Old update method. Use ScTabViewShell::UpdateInputHandler()." ); break; - case SID_SCENARIOS: // Szenarios: - if (!(rMark.IsMarked() || rMark.IsMultiMarked())) // nur, wenn etwas selektiert + case SID_SCENARIOS: // Szenarios: + if (!(rMark.IsMarked() || rMark.IsMultiMarked())) // nur, wenn etwas selektiert rSet.DisableItem( nWhich ); break; diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 750d3648631e..bd139fab1fd8 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -118,13 +118,13 @@ using namespace ::com::sun::star::uno; //------------------------------------------------------------------ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { - ScModule* pScMod = SC_MOD(); - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + ScModule* pScMod = SC_MOD(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox // Eingabe beenden if ( GetViewData()->HasEditView( GetViewData()->GetActivePart() ) ) @@ -149,7 +149,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) switch ( nSlot ) { // - // Einfuegen / Loeschen von Zellen / Zeilen / Spalten + // Einfuegen / Loeschen von Zellen / Zeilen / Spalten // case FID_INS_ROW: @@ -327,7 +327,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) break; // - // Inhalte von Zellen loeschen + // Inhalte von Zellen loeschen // case SID_DELETE_CONTENTS: @@ -337,18 +337,18 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case SID_DELETE: { - USHORT nFlags = IDF_NONE; + USHORT nFlags = IDF_NONE; if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { - const SfxPoolItem* pItem; - String aFlags = 'A'; + const SfxPoolItem* pItem; + String aFlags = 'A'; if( IS_AVAILABLE( SID_DELETE, &pItem ) ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); aFlags.ToUpperAscii(); - BOOL bCont = TRUE; + BOOL bCont = TRUE; for( xub_StrLen i=0 ; bCont && i<aFlags.Len() ; i++ ) { @@ -358,7 +358,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) nFlags |= IDF_ALL; bCont = FALSE; // nicht mehr weitermachen! break; - case 'S': nFlags |= IDF_STRING; break; + case 'S': nFlags |= IDF_STRING; break; case 'V': nFlags |= IDF_VALUE; break; case 'D': nFlags |= IDF_DATETIME; break; case 'F': nFlags |= IDF_FORMULA; break; @@ -398,7 +398,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( ! rReq.IsAPI() ) { - String aFlags; + String aFlags; if( nFlags == IDF_ALL ) { @@ -423,7 +423,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) break; // - // Ausfuellen... + // Ausfuellen... // case FID_FILL_TO_BOTTOM: @@ -451,18 +451,18 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) USHORT nFlags = IDF_NONE; USHORT nFunction = PASTE_NOFUNC; BOOL bSkipEmpty = FALSE; - BOOL bAsLink = FALSE; + BOOL bAsLink = FALSE; if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { - const SfxPoolItem* pItem; - String aFlags = 'A'; + const SfxPoolItem* pItem; + String aFlags = 'A'; if( IS_AVAILABLE( FID_FILL_TAB, &pItem ) ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); aFlags.ToUpperAscii(); - BOOL bCont = TRUE; + BOOL bCont = TRUE; for( xub_StrLen i=0 ; bCont && i<aFlags.Len() ; i++ ) { @@ -472,7 +472,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) nFlags |= IDF_ALL; bCont = FALSE; // nicht mehr weitermachen! break; - case 'S': nFlags |= IDF_STRING; break; + case 'S': nFlags |= IDF_STRING; break; case 'V': nFlags |= IDF_VALUE; break; case 'D': nFlags |= IDF_DATETIME; break; case 'F': nFlags |= IDF_FORMULA; break; @@ -494,11 +494,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if (pDlg->Execute() == RET_OK) { - nFlags = pDlg->GetInsContentsCmdBits(); + nFlags = pDlg->GetInsContentsCmdBits(); nFunction = pDlg->GetFormulaCmdBits(); bSkipEmpty = pDlg->IsSkipEmptyCells(); - bAsLink = pDlg->IsLink(); - // MoveMode gibt's bei Tabelle fuellen nicht + bAsLink = pDlg->IsLink(); + // MoveMode gibt's bei Tabelle fuellen nicht } delete pDlg; } @@ -509,7 +509,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( ! rReq.IsAPI() ) { - String aFlags; + String aFlags; if( nFlags == IDF_ALL ) { @@ -541,13 +541,13 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SCROW nEndRow; SCTAB nEndTab; USHORT nPossDir = FDS_OPT_NONE; - FillDir eFillDir = FILL_TO_BOTTOM; - FillCmd eFillCmd = FILL_LINEAR; - FillDateCmd eFillDateCmd = FILL_DAY; + FillDir eFillDir = FILL_TO_BOTTOM; + FillCmd eFillCmd = FILL_LINEAR; + FillDateCmd eFillDateCmd = FILL_DAY; double fStartVal = MAXDOUBLE; - double fIncVal = 1; - double fMaxVal = MAXDOUBLE; - BOOL bDoIt = FALSE; + double fIncVal = 1; + double fMaxVal = MAXDOUBLE; + BOOL bDoIt = FALSE; GetViewData()->GetSimpleArea( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ); @@ -564,16 +564,16 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) eFillDir=FILL_TO_BOTTOM; } - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocument* pDoc = GetViewData()->GetDocument(); SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); if( pReqArgs ) { const SfxPoolItem* pItem; - String aFillDir, aFillCmd, aFillDateCmd; - String aFillStep, aFillStart, aFillMax; + String aFillDir, aFillCmd, aFillDateCmd; + String aFillStep, aFillStart, aFillMax; sal_uInt32 nKey; - double fTmpVal; + double fTmpVal; bDoIt=FALSE; @@ -630,7 +630,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( pFormatter->IsNumberFormat( aFillMax, nKey, fTmpVal )) fMaxVal = fTmpVal; - bDoIt = TRUE; + bDoIt = TRUE; } else // (pReqArgs == NULL) => Dialog hochziehen @@ -661,7 +661,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // String aStartStr; - // Startwert nur vorbelegen, wenn nur 1 Zeile oder Spalte: + // Startwert nur vorbelegen, wenn nur 1 Zeile oder Spalte: if ( nStartCol == nEndCol || nStartRow == nEndRow ) { double fInputEndVal = 0.0; @@ -735,9 +735,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( pDlg->Execute() == RET_OK ) { - eFillDir = pDlg->GetFillDir(); - eFillCmd = pDlg->GetFillCmd(); - eFillDateCmd = pDlg->GetFillDateCmd(); + eFillDir = pDlg->GetFillDir(); + eFillCmd = pDlg->GetFillCmd(); + eFillDateCmd = pDlg->GetFillDateCmd(); if(eFillCmd==FILL_AUTO) { @@ -745,51 +745,51 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if(aStr.Len()>0) pTabViewShell->EnterData( nStartCol, nStartRow, nStartTab, aStr ); } - fStartVal = pDlg->GetStart(); - fIncVal = pDlg->GetStep(); - fMaxVal = pDlg->GetMax(); - bDoIt = TRUE; + fStartVal = pDlg->GetStart(); + fIncVal = pDlg->GetStep(); + fMaxVal = pDlg->GetMax(); + bDoIt = TRUE; } delete pDlg; } if( bDoIt ) { - //nScFillModeMouseModifier = 0; // kein Ctrl/Copy + //nScFillModeMouseModifier = 0; // kein Ctrl/Copy pTabViewShell->FillSeries( eFillDir, eFillCmd, eFillDateCmd, fStartVal, fIncVal, fMaxVal ); if( ! rReq.IsAPI() ) { - String aPara; - Color* pColor=0; + String aPara; + Color* pColor=0; switch( eFillDir ) { - case FILL_TO_BOTTOM: aPara = 'B'; break; - case FILL_TO_RIGHT: aPara = 'R'; break; - case FILL_TO_TOP: aPara = 'T'; break; - case FILL_TO_LEFT: aPara = 'L'; break; + case FILL_TO_BOTTOM: aPara = 'B'; break; + case FILL_TO_RIGHT: aPara = 'R'; break; + case FILL_TO_TOP: aPara = 'T'; break; + case FILL_TO_LEFT: aPara = 'L'; break; default: aPara.Erase(); break; } rReq.AppendItem( SfxStringItem( FID_FILL_SERIES, aPara ) ); switch( eFillCmd ) { - case FILL_SIMPLE: aPara = 'S'; break; - case FILL_LINEAR: aPara = 'L'; break; - case FILL_GROWTH: aPara = 'G'; break; - case FILL_DATE: aPara = 'D'; break; - case FILL_AUTO: aPara = 'A'; break; + case FILL_SIMPLE: aPara = 'S'; break; + case FILL_LINEAR: aPara = 'L'; break; + case FILL_GROWTH: aPara = 'G'; break; + case FILL_DATE: aPara = 'D'; break; + case FILL_AUTO: aPara = 'A'; break; default: aPara.Erase(); break; } rReq.AppendItem( SfxStringItem( FN_PARAM_1, aPara ) ); switch( eFillDateCmd ) { - case FILL_DAY: aPara = 'D'; break; - case FILL_WEEKDAY: aPara = 'W'; break; - case FILL_MONTH: aPara = 'M'; break; - case FILL_YEAR: aPara = 'Y'; break; + case FILL_DAY: aPara = 'D'; break; + case FILL_WEEKDAY: aPara = 'W'; break; + case FILL_MONTH: aPara = 'M'; break; + case FILL_YEAR: aPara = 'Y'; break; default: aPara.Erase(); break; } rReq.AppendItem( SfxStringItem( FN_PARAM_2, aPara ) ); @@ -844,9 +844,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) GetViewData()->GetSimpleArea( nStartCol,nStartRow,nStartTab, nEndCol,nEndRow,nEndTab ); } - else // Aufruf per Maus + else // Aufruf per Maus { - // #55284# nicht innerhalb einer zusammengefassten Zelle + // #55284# nicht innerhalb einer zusammengefassten Zelle if ( nStartCol == nEndCol && nStartRow == nEndRow ) { @@ -904,7 +904,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( ! rReq.IsAPI() ) { - String aAdrStr; + String aAdrStr; ScAddress aAdr( nFillCol, nFillRow, 0 ); aAdr.Format( aAdrStr, SCR_ABS, pDoc, pDoc->GetAddressConvention() ); @@ -923,8 +923,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) break; // - // Gliederung (Outlines) - // SID_AUTO_OUTLINE, SID_OUTLINE_DELETEALL in Execute (in docsh.idl) + // Gliederung (Outlines) + // SID_AUTO_OUTLINE, SID_OUTLINE_DELETEALL in Execute (in docsh.idl) // case SID_OUTLINE_HIDE: @@ -1032,7 +1032,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } } - else // Dialog, wenn nicht ganze Zeilen/Spalten markiert + else // Dialog, wenn nicht ganze Zeilen/Spalten markiert { if ( GetViewData()->SimpleColMarked() && !GetViewData()->SimpleRowMarked() ) bColumns = TRUE; @@ -1094,7 +1094,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } } - else // Dialog nur, wenn Aufheben fuer Zeilen und Spalten moeglich + else // Dialog nur, wenn Aufheben fuer Zeilen und Spalten moeglich { BOOL bColPoss, bRowPoss; pTabViewShell->TestRemoveOutline( bColPoss, bRowPoss ); @@ -1133,11 +1133,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) break; // - // Clipboard + // Clipboard // - case SID_COPY: // fuer Grafiken in DrawShell + case SID_COPY: // fuer Grafiken in DrawShell { WaitObject aWait( GetViewData()->GetDialogParent() ); pTabViewShell->CopyToClip( NULL, FALSE, FALSE, TRUE ); @@ -1148,7 +1148,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - case SID_CUT: // fuer Grafiken in DrawShell + case SID_CUT: // fuer Grafiken in DrawShell { WaitObject aWait( GetViewData()->GetDialogParent() ); pTabViewShell->CutToClip( NULL, TRUE ); @@ -1193,7 +1193,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pTabViewShell->PasteFromSystem(nFormat); } //?else - //? pTabViewShell->PasteFromSystem(); + //? pTabViewShell->PasteFromSystem(); rReq.Done(); } @@ -1206,7 +1206,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) USHORT nFunction = PASTE_NOFUNC; BOOL bSkipEmpty = FALSE; BOOL bTranspose = FALSE; - BOOL bAsLink = FALSE; + BOOL bAsLink = FALSE; InsCellCmd eMoveMode = INS_NONE; Window* pWin = GetViewData()->GetActiveWin(); @@ -1219,14 +1219,14 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip ); if ( pReqArgs!=NULL && pTabViewShell->SelectionEditable() ) { - const SfxPoolItem* pItem; - String aFlags = 'A'; + const SfxPoolItem* pItem; + String aFlags = 'A'; if( IS_AVAILABLE( FID_INS_CELL_CONTENTS, &pItem ) ) aFlags = ((const SfxStringItem*)pItem)->GetValue(); aFlags.ToUpperAscii(); - BOOL bCont = TRUE; + BOOL bCont = TRUE; for( xub_StrLen i=0 ; bCont && i<aFlags.Len() ; i++ ) { @@ -1236,7 +1236,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) nFlags |= IDF_ALL; bCont = FALSE; // nicht mehr weitermachen! break; - case 'S': nFlags |= IDF_STRING; break; + case 'S': nFlags |= IDF_STRING; break; case 'V': nFlags |= IDF_VALUE; break; case 'D': nFlags |= IDF_DATETIME; break; case 'F': nFlags |= IDF_FORMULA; break; @@ -1306,11 +1306,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } if (pDlg->Execute() == RET_OK) { - nFlags = pDlg->GetInsContentsCmdBits(); + nFlags = pDlg->GetInsContentsCmdBits(); nFunction = pDlg->GetFormulaCmdBits(); bSkipEmpty = pDlg->IsSkipEmptyCells(); bTranspose = pDlg->IsTranspose(); - bAsLink = pDlg->IsLink(); + bAsLink = pDlg->IsLink(); eMoveMode = pDlg->GetMoveMode(); } delete pDlg; @@ -1324,16 +1324,16 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { WaitObject aWait( GetViewData()->GetDialogParent() ); if ( bAsLink && bOtherDoc ) - pTabViewShell->PasteFromSystem(SOT_FORMATSTR_ID_LINK); // DDE einfuegen + pTabViewShell->PasteFromSystem(SOT_FORMATSTR_ID_LINK); // DDE einfuegen else pTabViewShell->PasteFromClip( nFlags, pOwnClip->GetDocument(), nFunction, bSkipEmpty, bTranspose, bAsLink, - eMoveMode, IDF_NONE, TRUE ); // allow warning dialog + eMoveMode, IDF_NONE, TRUE ); // allow warning dialog } if( !pReqArgs ) { - String aFlags; + String aFlags; if( nFlags == IDF_ALL ) { @@ -1360,7 +1360,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } } - pTabViewShell->CellContentChanged(); // => PasteFromXXX ??? + pTabViewShell->CellContentChanged(); // => PasteFromXXX ??? break; case SID_PASTE_SPECIAL: @@ -1369,7 +1369,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { Window* pWin = GetViewData()->GetActiveWin(); - // Clipboard-ID als Parameter angegeben? Basic "PasteSpecial(Format)" + // Clipboard-ID als Parameter angegeben? Basic "PasteSpecial(Format)" const SfxPoolItem* pItem=NULL; if ( pReqArgs && pReqArgs->GetItemState(nSlot, TRUE, &pItem) == SFX_ITEM_SET && @@ -1458,11 +1458,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } } - pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? + pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? break; // - // sonstiges + // sonstiges // case FID_INS_ROWBRK: @@ -1685,22 +1685,22 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { const SfxBoolItem* pOkItem = (const SfxBoolItem*)&pReqArgs->Get( SID_DLG_RETOK ); -// pScMod->SetFunctionDlg( NULL ); +// pScMod->SetFunctionDlg( NULL ); - if ( pOkItem->GetValue() ) // OK + if ( pOkItem->GetValue() ) // OK { - String aFormula; - const SfxStringItem* pSItem = (const SfxStringItem*)&pReqArgs->Get( SCITEM_STRING ); - const SfxBoolItem* pMatrixItem = (const SfxBoolItem*) &pReqArgs->Get( SID_DLG_MATRIX ); + String aFormula; + const SfxStringItem* pSItem = (const SfxStringItem*)&pReqArgs->Get( SCITEM_STRING ); + const SfxBoolItem* pMatrixItem = (const SfxBoolItem*) &pReqArgs->Get( SID_DLG_MATRIX ); aFormula += pSItem->GetValue(); pScMod->ActivateInputWindow( &aFormula, pMatrixItem->GetValue() ); } - else // CANCEL + else // CANCEL { pScMod->ActivateInputWindow( NULL ); } - rReq.Ignore(); // only SID_ENTER_STRING is recorded + rReq.Ignore(); // only SID_ENTER_STRING is recorded } break; @@ -1708,7 +1708,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if ( pReqArgs ) { const SfxPoolItem* pItem; - String aName, aSymbol, aAttrib; + String aName, aSymbol, aAttrib; if( IS_AVAILABLE( FID_DEFINE_NAME, &pItem ) ) aName = ((const SfxStringItem*)pItem)->GetValue(); @@ -1724,12 +1724,12 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if (pTabViewShell->InsertName( aName, aSymbol, aAttrib )) rReq.Done(); else - SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler + SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler } } else { - USHORT nId = ScNameDlgWrapper::GetChildWindowId(); + USHORT nId = ScNameDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -1740,7 +1740,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case SID_DEFINE_COLROWNAMERANGES: { - USHORT nId = ScColRowNameRangesDlgWrapper::GetChildWindowId(); + USHORT nId = ScColRowNameRangesDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -1800,7 +1800,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) case FID_INSERT_NAME: { - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocument* pDoc = GetViewData()->GetDocument(); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); @@ -1816,11 +1816,11 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) ScInputHandler* pHdl = pScMod->GetInputHdl( pTabViewShell ); if (pHdl) { - // das "=" per Key-Event, schaltet in den Eingabe-Modus + // das "=" per Key-Event, schaltet in den Eingabe-Modus pScMod->InputKeyEvent( KeyEvent('=',KeyCode()) ); String aName = pDlg->GetSelectedName(); - pHdl->InsertFunction( aName, FALSE ); // ohne "()" + pHdl->InsertFunction( aName, FALSE ); // ohne "()" } } break; @@ -1834,7 +1834,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { const SfxStringItem& rTextItem = (const SfxStringItem&)pReqArgs->Get( SID_RANGE_NOTETEXT ); - // #43343# immer Cursorposition + // #43343# immer Cursorposition ScAddress aPos( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); pTabViewShell->SetNoteText( aPos, rTextItem.GetValue() ); rReq.Done(); @@ -1926,7 +1926,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); // font color doesn't matter here - Font aCurFont; + Font aCurFont; pTabViewShell->GetSelectionPattern()->GetFont( aCurFont, SC_AUTOCOL_BLACK, NULL, NULL, NULL, pTabViewShell->GetSelectionScriptType() ); @@ -1969,7 +1969,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( pItem ) { pTabViewShell->UseScenario( pItem->GetValue() ); - //! wofuer soll der Return-Wert gut sein?!?! + //! wofuer soll der Return-Wert gut sein?!?! rReq.SetReturnValue( SfxStringItem( SID_SELECT_SCENARIO, pItem->GetValue() ) ); rReq.Done(); } @@ -1988,8 +1988,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) if( IS_AVAILABLE( SID_HYPERLINK_SETLINK, &pItem ) ) { const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem; - const String& rName = pHyper->GetName(); - const String& rURL = pHyper->GetURL(); + const String& rName = pHyper->GetName(); + const String& rURL = pHyper->GetURL(); const String& rTarget = pHyper->GetTargetFrame(); USHORT nType = (USHORT) pHyper->GetInsertMode(); @@ -2189,10 +2189,10 @@ void ScCellShell::PasteFromClipboard( ScViewData* pViewData, ScTabViewShell* pTa pTabViewShell->PasteFromClip( nFlags, pClipDoc, PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE, - bShowDialog ); // allow warning dialog + bShowDialog ); // allow warning dialog } } - pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? + pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index a74a73c85721..16959485992b 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -70,8 +70,8 @@ #include "scresid.hxx" #include "pivot.hxx" #include "dpobject.hxx" -#include "dpsdbtab.hxx" // ScImportSourceDesc -#include "dpshttab.hxx" // ScSheetSourceDesc +#include "dpsdbtab.hxx" // ScImportSourceDesc +#include "dpshttab.hxx" // ScSheetSourceDesc #include "validate.hrc" // ScValidationDlg #include "scui_def.hxx" @@ -128,7 +128,7 @@ bool lcl_GetTextToColumnsRange( const ScViewData* pData, ScRange& rRange ) BOOL lcl_GetSortParam( const ScViewData* pData, ScSortParam& rSortParam ) { ScTabViewShell* pTabViewShell = pData->GetViewShell(); - ScDBData* pDBData = pTabViewShell->GetDBData(); + ScDBData* pDBData = pTabViewShell->GetDBData(); ScDocument* pDoc = pData->GetDocument(); SCTAB nTab = pData->GetTabNo(); ScDirection eFillDir = DIR_TOP; @@ -210,12 +210,12 @@ namespace void ScCellShell::ExecuteDB( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); USHORT nSlotId = rReq.GetSlot(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - ScModule* pScMod = SC_MOD(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + ScModule* pScMod = SC_MOD(); - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox if ( GetViewData()->HasEditView( GetViewData()->GetActivePart() ) ) { @@ -227,7 +227,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { case SID_VIEW_DATA_SOURCE_BROWSER: { - // check if database beamer is open + // check if database beamer is open SfxViewFrame* pViewFrame = pTabViewShell->GetViewFrame(); BOOL bWasOpen = FALSE; @@ -242,26 +242,26 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if ( bWasOpen ) { - // close database beamer: just forward to SfxViewFrame + // close database beamer: just forward to SfxViewFrame pViewFrame->ExecuteSlot( rReq ); } else { - // show database beamer: SfxViewFrame call must be synchronous + // show database beamer: SfxViewFrame call must be synchronous - pViewFrame->ExecuteSlot( rReq, (BOOL) FALSE ); // FALSE = synchronous + pViewFrame->ExecuteSlot( rReq, (BOOL) FALSE ); // FALSE = synchronous - // select current database in database beamer + // select current database in database beamer ScImportParam aImportParam; - ScDBData* pDBData = pTabViewShell->GetDBData(TRUE,SC_DB_OLD); // don't create if none found + ScDBData* pDBData = pTabViewShell->GetDBData(TRUE,SC_DB_OLD); // don't create if none found if (pDBData) pDBData->GetImportParam( aImportParam ); ScDBDocFunc::ShowInBeamer( aImportParam, pTabViewShell->GetViewFrame() ); } - rReq.Done(); // needed because it's a toggle slot + rReq.Done(); // needed because it's a toggle slot } break; @@ -276,7 +276,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if (aImportParam.bImport && !pDBData->HasImportSelection()) { pTabViewShell->ImportData( aImportParam ); - pDBData->SetImportParam( aImportParam ); //! Undo ?? + pDBData->SetImportParam( aImportParam ); //! Undo ?? bOk = TRUE; } } @@ -294,7 +294,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ScDBData* pDBData = pTabViewShell->GetDBData(TRUE,SC_DB_OLD); if (pDBData) { - // Import wiederholen wie SID_REIMPORT_DATA + // Import wiederholen wie SID_REIMPORT_DATA BOOL bContinue = TRUE; ScImportParam aImportParam; @@ -302,23 +302,23 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if (aImportParam.bImport && !pDBData->HasImportSelection()) { bContinue = pTabViewShell->ImportData( aImportParam ); - pDBData->SetImportParam( aImportParam ); //! Undo ?? + pDBData->SetImportParam( aImportParam ); //! Undo ?? - // markieren (Groesse kann sich geaendert haben) + // markieren (Groesse kann sich geaendert haben) ScRange aNewRange; pDBData->GetArea(aNewRange); pTabViewShell->MarkRange(aNewRange); } - if ( bContinue ) // #41905# Fehler beim Import -> Abbruch + if ( bContinue ) // #41905# Fehler beim Import -> Abbruch { - // interne Operationen, wenn welche gespeichert + // interne Operationen, wenn welche gespeichert if ( pDBData->HasQueryParam() || pDBData->HasSortParam() || pDBData->HasSubTotalParam() ) pTabViewShell->RepeatDB(); - // Pivottabellen die den Bereich als Quelldaten haben + // Pivottabellen die den Bereich als Quelldaten haben ScRange aRange; pDBData->GetArea(aRange); @@ -362,7 +362,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { SfxAbstractTabDialog * pDlg = NULL; ScSubTotalParam aSubTotalParam; - SfxItemSet aArgSet( GetPool(), SCITEM_SUBTDATA, SCITEM_SUBTDATA ); + SfxItemSet aArgSet( GetPool(), SCITEM_SUBTDATA, SCITEM_SUBTDATA ); ScDBData* pDBData = pTabViewShell->GetDBData(); pDBData->GetSubTotalParam( aSubTotalParam ); @@ -417,7 +417,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) //#i60401 ux-ctest: Calc does not support all users' strategies regarding sorting data //the patch comes from maoyg ScSortParam aSortParam; - ScDBData* pDBData = pTabViewShell->GetDBData(); + ScDBData* pDBData = pTabViewShell->GetDBData(); ScViewData* pData = GetViewData(); pDBData->GetSortParam( aSortParam ); @@ -437,22 +437,22 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) else if( nCol > aSortParam.nCol2 ) nCol = aSortParam.nCol2; - aSortParam.bHasHeader = bHasHeader; - aSortParam.bByRow = TRUE; - aSortParam.bCaseSens = FALSE; - aSortParam.bNaturalSort = FALSE; - aSortParam.bIncludePattern = TRUE; - aSortParam.bInplace = TRUE; - aSortParam.bDoSort[0] = TRUE; - aSortParam.nField[0] = nCol; - aSortParam.bAscending[0] = (nSlotId == SID_SORT_ASCENDING); + aSortParam.bHasHeader = bHasHeader; + aSortParam.bByRow = TRUE; + aSortParam.bCaseSens = FALSE; + aSortParam.bNaturalSort = FALSE; + aSortParam.bIncludePattern = TRUE; + aSortParam.bInplace = TRUE; + aSortParam.bDoSort[0] = TRUE; + aSortParam.nField[0] = nCol; + aSortParam.bAscending[0] = (nSlotId == SID_SORT_ASCENDING); for ( USHORT i=1; i<MAXSORT; i++ ) aSortParam.bDoSort[i] = FALSE; aArgSet.Put( ScSortItem( SCITEM_SORTDATA, GetViewData(), &aSortParam ) ); - pTabViewShell->UISort( aSortParam ); // Teilergebnisse bei Bedarf neu + pTabViewShell->UISort( aSortParam ); // Teilergebnisse bei Bedarf neu rReq.Done(); } @@ -466,10 +466,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) //#i60401 ux-ctest: Calc does not support all users' strategies regarding sorting data //the patch comes from maoyg - if ( pArgs ) // Basic + if ( pArgs ) // Basic { ScSortParam aSortParam; - ScDBData* pDBData = pTabViewShell->GetDBData(); + ScDBData* pDBData = pTabViewShell->GetDBData(); ScViewData* pData = GetViewData(); pDBData->GetSortParam( aSortParam ); @@ -483,7 +483,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) if( bHasHeader ) aSortParam.bHasHeader = bHasHeader; - aSortParam.bInplace = TRUE; // von Basic immer + aSortParam.bInplace = TRUE; // von Basic immer const SfxPoolItem* pItem; if ( pArgs->GetItemState( SID_SORT_BYROW, TRUE, &pItem ) == SFX_ITEM_SET ) @@ -501,7 +501,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) USHORT nUserIndex = ((const SfxUInt16Item*)pItem)->GetValue(); aSortParam.bUserDef = ( nUserIndex != 0 ); if ( nUserIndex ) - aSortParam.nUserIndex = nUserIndex - 1; // Basic: 1-basiert + aSortParam.nUserIndex = nUserIndex - 1; // Basic: 1-basiert } SCCOLROW nField0 = 0; @@ -534,7 +534,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) else { ScSortParam aSortParam; - ScDBData* pDBData = pTabViewShell->GetDBData(); + ScDBData* pDBData = pTabViewShell->GetDBData(); ScViewData* pData = GetViewData(); pDBData->GetSortParam( aSortParam ); @@ -543,7 +543,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) { SfxAbstractTabDialog* pDlg = NULL; ScDocument* pDoc = GetViewData()->GetDocument(); - SfxItemSet aArgSet( GetPool(), SCITEM_SORTDATA, SCITEM_SORTDATA ); + SfxItemSet aArgSet( GetPool(), SCITEM_SORTDATA, SCITEM_SORTDATA ); pDBData->GetSortParam( aSortParam ); BOOL bHasHeader = pDoc->HasColHeader( aSortParam.nCol1, aSortParam.nRow1, aSortParam.nCol2, aSortParam.nRow2, pData->GetTabNo() ); @@ -557,7 +557,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) pDlg = pFact->CreateScSortDlg( pTabViewShell->GetDialogParent(), &aArgSet, RID_SCDLG_SORT ); DBG_ASSERT(pDlg, "Dialog create fail!"); - pDlg->SetCurPageId(1); // 1=sort field tab 2=sort options tab + pDlg->SetCurPageId(1); // 1=sort field tab 2=sort options tab if ( pDlg->Execute() == RET_OK ) { @@ -628,7 +628,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } else { - USHORT nId = ScFilterDlgWrapper::GetChildWindowId(); + USHORT nId = ScFilterDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -649,7 +649,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } else { - USHORT nId = ScSpecialFilterDlgWrapper::GetChildWindowId(); + USHORT nId = ScSpecialFilterDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -691,7 +691,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) case SID_UNFILTER: { ScQueryParam aParam; - ScDBData* pDBData = pTabViewShell->GetDBData(); + ScDBData* pDBData = pTabViewShell->GetDBData(); pDBData->GetQueryParam( aParam ); SCSIZE nEC = aParam.GetEntryCount(); @@ -758,23 +758,23 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) ScDPObject* pDPObj = pDoc->GetDPAtCursor( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() ); - if ( pDPObj ) // on an existing table? + if ( pDPObj ) // on an existing table? { pNewDPObject = new ScDPObject( *pDPObj ); } - else // create new table + else // create new table { - // select database range or data + // select database range or data pTabViewShell->GetDBData( TRUE, SC_DB_OLD ); ScMarkData& rMark = GetViewData()->GetMarkData(); if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) pTabViewShell->MarkDataArea( FALSE ); - // output to cursor position for non-sheet data + // output to cursor position for non-sheet data ScAddress aDestPos( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() ); - // first select type of source data + // first select type of source data BOOL bEnableExt = ScDPObject::HasRegisteredSources(); @@ -818,9 +818,9 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } delete pDataDlg; } - else // selection + else // selection { - //! use database ranges (select before type dialog?) + //! use database ranges (select before type dialog?) ScRange aRange; ScMarkType eType = GetViewData()->GetSimpleArea(aRange); if ( (eType & SC_MARK_SIMPLE) == SC_MARK_SIMPLE ) @@ -841,7 +841,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) BOOL bOK = TRUE; if ( pDoc->HasSubTotalCells( aRange ) ) { - // confirm selection if it contains SubTotal cells + // confirm selection if it contains SubTotal cells QueryBox aBox( pTabViewShell->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), @@ -856,7 +856,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) pNewDPObject = new ScDPObject( pDoc ); pNewDPObject->SetSheetDesc( aShtDesc ); - // output below source data + // output below source data if ( aRange.aEnd.Row()+2 <= MAXROW - 4 ) aDestPos = ScAddress( aRange.aStart.Col(), aRange.aEnd.Row()+2, @@ -871,10 +871,10 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) pNewDPObject->SetOutRange( aDestPos ); } - pTabViewShell->SetDialogDPObject( pNewDPObject ); // is copied + pTabViewShell->SetDialogDPObject( pNewDPObject ); // is copied if ( pNewDPObject ) { - // start layout dialog + // start layout dialog USHORT nId = ScPivotLayoutWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); @@ -888,7 +888,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) case SID_DEFINE_DBNAME: { - USHORT nId = ScDbNameDlgWrapper::GetChildWindowId(); + USHORT nId = ScDbNameDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -916,16 +916,16 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) } else { - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocument* pDoc = GetViewData()->GetDocument(); ScDBCollection* pDBCol = pDoc->GetDBCollection(); if ( pDBCol ) { - const String aStrNoName( ScGlobal::GetRscString(STR_DB_NONAME) ); - List aList; - USHORT nDBCount = pDBCol->GetCount(); - ScDBData* pDbData = NULL; - String* pDBName = NULL; + const String aStrNoName( ScGlobal::GetRscString(STR_DB_NONAME) ); + List aList; + USHORT nDBCount = pDBCol->GetCount(); + ScDBData* pDbData = NULL; + String* pDBName = NULL; for ( USHORT i=0; i < nDBCount; i++ ) { @@ -1008,7 +1008,7 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) nCurX, nCurY, nTab, ATTR_VALIDDATA ))->GetValue(); if ( nIndex ) { - const ScValidationData* pOldData = pDoc->GetValidationEntry( nIndex ); + const ScValidationData* pOldData = pDoc->GetValidationEntry( nIndex ); if ( pOldData ) { eMode = pOldData->GetDataMode(); @@ -1031,17 +1031,17 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aArgSet.Put( SfxAllEnumItem( FID_VALID_MODE, sal::static_int_cast<USHORT>(eMode) ) ); aArgSet.Put( SfxAllEnumItem( FID_VALID_CONDMODE, sal::static_int_cast<USHORT>(eOper) ) ); - aArgSet.Put( SfxStringItem( FID_VALID_VALUE1, aExpr1 ) ); - aArgSet.Put( SfxStringItem( FID_VALID_VALUE2, aExpr2 ) ); - aArgSet.Put( SfxBoolItem( FID_VALID_BLANK, bBlank ) ); + aArgSet.Put( SfxStringItem( FID_VALID_VALUE1, aExpr1 ) ); + aArgSet.Put( SfxStringItem( FID_VALID_VALUE2, aExpr2 ) ); + aArgSet.Put( SfxBoolItem( FID_VALID_BLANK, bBlank ) ); aArgSet.Put( SfxInt16Item( FID_VALID_LISTTYPE, nListType ) ); - aArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, bShowHelp ) ); - aArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, aHelpTitle ) ); - aArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, aHelpText ) ); - aArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, bShowError ) ); + aArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, bShowHelp ) ); + aArgSet.Put( SfxStringItem( FID_VALID_HELPTITLE, aHelpTitle ) ); + aArgSet.Put( SfxStringItem( FID_VALID_HELPTEXT, aHelpText ) ); + aArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, bShowError ) ); aArgSet.Put( SfxAllEnumItem( FID_VALID_ERRSTYLE, sal::static_int_cast<USHORT>(eErrStyle) ) ); - aArgSet.Put( SfxStringItem( FID_VALID_ERRTITLE, aErrTitle ) ); - aArgSet.Put( SfxStringItem( FID_VALID_ERRTEXT, aErrText ) ); + aArgSet.Put( SfxStringItem( FID_VALID_ERRTITLE, aErrTitle ) ); + aArgSet.Put( SfxStringItem( FID_VALID_ERRTEXT, aErrText ) ); } } @@ -1120,13 +1120,13 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) aData.SetIgnoreBlank( bBlank ); aData.SetListType( nListType ); - aData.SetInput(aHelpTitle, aHelpText); // sets bShowInput to TRUE + aData.SetInput(aHelpTitle, aHelpText); // sets bShowInput to TRUE if (!bShowHelp) - aData.ResetInput(); // reset only bShowInput + aData.ResetInput(); // reset only bShowInput - aData.SetError(aErrTitle, aErrText, eErrStyle); // sets bShowError to TRUE + aData.SetError(aErrTitle, aErrText, eErrStyle); // sets bShowError to TRUE if (!bShowError) - aData.ResetError(); // reset only bShowError + aData.ResetError(); // reset only bShowError pTabViewShell->SetValidation( aData ); rReq.Done( *pOutSet ); @@ -1196,13 +1196,13 @@ void ScCellShell::ExecuteDB( SfxRequest& rReq ) void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); ScViewData* pData = GetViewData(); - ScDocShell* pDocSh = pData->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); - SCCOL nPosX = pData->GetCurX(); - SCROW nPosY = pData->GetCurY(); - SCTAB nTab = pData->GetTabNo(); + ScDocShell* pDocSh = pData->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); + SCCOL nPosX = pData->GetCurX(); + SCROW nPosY = pData->GetCurY(); + SCTAB nTab = pData->GetTabNo(); BOOL bAutoFilter = FALSE; BOOL bAutoFilterTested = FALSE; @@ -1215,8 +1215,8 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) { case SID_REFRESH_DBAREA: { - // importierte Daten ohne Selektion - // oder Filter,Sortierung,Teilergebis (auch ohne Import) + // importierte Daten ohne Selektion + // oder Filter,Sortierung,Teilergebis (auch ohne Import) BOOL bOk = FALSE; ScDBData* pDBData = pTabViewShell->GetDBData(FALSE,SC_DB_OLD); if (pDBData && pDoc->GetChangeTrack() == NULL) @@ -1255,7 +1255,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) case SCITEM_SUBTDATA: case SID_OPENDLG_PIVOTTABLE: { - //! move ReadOnly check to idl flags + //! move ReadOnly check to idl flags if ( pDocSh->IsReadOnly() || pDoc->GetChangeTrack()!=NULL || GetViewData()->IsMultiMarked() ) @@ -1267,7 +1267,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) case SID_REIMPORT_DATA: { - // nur importierte Daten ohne Selektion + // nur importierte Daten ohne Selektion ScDBData* pDBData = pTabViewShell->GetDBData(FALSE,SC_DB_OLD); if (!pDBData || !pDBData->HasImportParam() || pDBData->HasImportSelection() || pDoc->GetChangeTrack()!=NULL) @@ -1282,13 +1282,13 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) if (!SvtModuleOptions().IsModuleInstalled(SvtModuleOptions::E_SDATABASE)) rSet.Put(SfxVisibilityItem(nWhich, sal_False)); else - // get state (BoolItem) from SfxViewFrame + // get state (BoolItem) from SfxViewFrame pTabViewShell->GetViewFrame()->GetSlotState( nWhich, NULL, &rSet ); } break; case SID_SBA_BRW_INSERT: { - // SBA will ein BOOL-Item, damit ueberhaupt enabled + // SBA will ein BOOL-Item, damit ueberhaupt enabled BOOL bEnable = TRUE; rSet.Put(SfxBoolItem(nWhich, bEnable)); diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index a57835fdf54d..c56d82691f85 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,7 +53,7 @@ #include "autoform.hxx" #include "autofmt.hxx" #include "cellsh.hxx" -#include "attrdlg.hrc" // TP_ALIGNMENT +#include "attrdlg.hrc" // TP_ALIGNMENT #include "inputhdl.hxx" #include "editable.hxx" @@ -61,34 +61,34 @@ #define IS_EDITMODE() GetViewData()->HasEditView( GetViewData()->GetActivePart() ) -inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } -inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } -inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; } +inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } +inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } +inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; } //------------------------------------------------------------------ void ScCellShell::Execute( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); - ScModule* pScMod = SC_MOD(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); + ScModule* pScMod = SC_MOD(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); - if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox if ( IS_EDITMODE() ) { switch ( nSlot ) { - // beim Oeffnen eines Referenz-Dialogs darf die SubShell nicht umgeschaltet werden - // (beim Schliessen des Dialogs wird StopEditShell gerufen) + // beim Oeffnen eines Referenz-Dialogs darf die SubShell nicht umgeschaltet werden + // (beim Schliessen des Dialogs wird StopEditShell gerufen) case SID_OPENDLG_FUNCTION: - // #53318# inplace macht die EditShell Aerger... - //! kann nicht immer umgeschaltet werden ???? + // #53318# inplace macht die EditShell Aerger... + //! kann nicht immer umgeschaltet werden ???? if (!pTabViewShell->GetViewFrame()->GetFrame().IsInPlace()) - pTabViewShell->SetDontSwitch(TRUE); // EditShell nicht abschalten + pTabViewShell->SetDontSwitch(TRUE); // EditShell nicht abschalten // kein break case FID_CELL_FORMAT: @@ -121,16 +121,16 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_STATUS_SELMODE: if ( pReqArgs ) { - /* 0: STD Click hebt Sel auf - * 1: ER Click erweitert Selektion - * 2: ERG Click definiert weitere Selektion + /* 0: STD Click hebt Sel auf + * 1: ER Click erweitert Selektion + * 2: ERG Click definiert weitere Selektion */ UINT16 nMode = ((const SfxUInt16Item&)pReqArgs->Get( nSlot )).GetValue(); switch ( nMode ) { - case 1: nMode = KEY_SHIFT; break; - case 2: nMode = KEY_MOD1; break; // Control-Taste + case 1: nMode = KEY_SHIFT; break; + case 2: nMode = KEY_MOD1; break; // Control-Taste case 0: default: nMode = 0; @@ -140,15 +140,15 @@ void ScCellShell::Execute( SfxRequest& rReq ) } else { - // no arguments (also executed by double click on the status bar controller): - // advance to next selection mode + // no arguments (also executed by double click on the status bar controller): + // advance to next selection mode USHORT nModifiers = pTabViewShell->GetLockedModifiers(); switch ( nModifiers ) { - case KEY_SHIFT: nModifiers = KEY_MOD1; break; // EXT -> ADD - case KEY_MOD1: nModifiers = 0; break; // ADD -> STD - default: nModifiers = KEY_SHIFT; break; // STD -> EXT + case KEY_SHIFT: nModifiers = KEY_MOD1; break; // EXT -> ADD + case KEY_MOD1: nModifiers = 0; break; // ADD -> STD + default: nModifiers = KEY_SHIFT; break; // STD -> EXT } pTabViewShell->LockModifiers( nModifiers ); } @@ -157,14 +157,14 @@ void ScCellShell::Execute( SfxRequest& rReq ) rReq.Done(); break; - // SID_STATUS_SELMODE_NORM wird nicht benutzt ??? + // SID_STATUS_SELMODE_NORM wird nicht benutzt ??? case SID_STATUS_SELMODE_NORM: pTabViewShell->LockModifiers( 0 ); rBindings.Invalidate( SID_STATUS_SELMODE ); break; - // SID_STATUS_SELMODE_ERG / SID_STATUS_SELMODE_ERW als Toggles: + // SID_STATUS_SELMODE_ERG / SID_STATUS_SELMODE_ERW als Toggles: case SID_STATUS_SELMODE_ERG: if ( pTabViewShell->GetLockedModifiers() & KEY_MOD1 ) @@ -197,18 +197,18 @@ void ScCellShell::Execute( SfxRequest& rReq ) ScInputHandler* pHdl = SC_MOD()->GetInputHdl( pTabViewShell ); if ( !pHdl || !pHdl->IsInEnterHandler() ) { - // #101061# UpdateInputHandler is needed after the cell content - // has changed, but if called from EnterHandler, UpdateInputHandler - // will be called later when moving the cursor. + // #101061# UpdateInputHandler is needed after the cell content + // has changed, but if called from EnterHandler, UpdateInputHandler + // will be called later when moving the cursor. pTabViewShell->UpdateInputHandler(); } rReq.Done(); - // hier kein GrabFocus, weil sonst auf dem Mac die Tabelle vor die - // Seitenansicht springt, wenn die Eingabe nicht abgeschlossen war - // (GrabFocus passiert in KillEditView) + // hier kein GrabFocus, weil sonst auf dem Mac die Tabelle vor die + // Seitenansicht springt, wenn die Eingabe nicht abgeschlossen war + // (GrabFocus passiert in KillEditView) } } break; @@ -264,7 +264,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) aCursorPos.Tab() == GetViewData()->GetTabNo() ) { - SfxStringItem aItem( SID_ENTER_STRING, aString ); + SfxStringItem aItem( SID_ENTER_STRING, aString ); // SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); const SfxPoolItem* aArgs[2]; @@ -294,9 +294,9 @@ void ScCellShell::Execute( SfxRequest& rReq ) } - // hier kein GrabFocus, weil sonst auf dem Mac die Tabelle vor die - // Seitenansicht springt, wenn die Eingabe nicht abgeschlossen war - // (GrabFocus passiert in KillEditView) + // hier kein GrabFocus, weil sonst auf dem Mac die Tabelle vor die + // Seitenansicht springt, wenn die Eingabe nicht abgeschlossen war + // (GrabFocus passiert in KillEditView) } break; @@ -313,7 +313,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_OPENDLG_CONSOLIDATE: { - USHORT nId = ScConsolidateDlgWrapper::GetChildWindowId(); + USHORT nId = ScConsolidateDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -328,18 +328,18 @@ void ScCellShell::Execute( SfxRequest& rReq ) //---------------------------------- // Zellattribute ohne Dialog setzen: //---------------------------------- - SfxItemSet* pEmptySet = + SfxItemSet* pEmptySet = new SfxItemSet( *pReqArgs->GetPool(), ATTR_PATTERN_START, ATTR_PATTERN_END ); - SfxItemSet* pNewSet = + SfxItemSet* pNewSet = new SfxItemSet( *pReqArgs->GetPool(), ATTR_PATTERN_START, ATTR_PATTERN_END ); - const SfxPoolItem* pAttr = NULL; - USHORT nWhich = 0; + const SfxPoolItem* pAttr = NULL; + USHORT nWhich = 0; for ( nWhich=ATTR_PATTERN_START; nWhich<=ATTR_PATTERN_END; nWhich++ ) if ( pReqArgs->GetItemState( nWhich, TRUE, &pAttr ) == SFX_ITEM_SET ) @@ -365,7 +365,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_OPENDLG_SOLVE: { - USHORT nId = ScSolverDlgWrapper::GetChildWindowId(); + USHORT nId = ScSolverDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -385,7 +385,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_OPENDLG_TABOP: { - USHORT nId = ScTabOpDlgWrapper::GetChildWindowId(); + USHORT nId = ScTabOpDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -438,8 +438,8 @@ void ScCellShell::Execute( SfxRequest& rReq ) aBaseName += ScGlobal::GetRscString(STR_SCENARIO); aBaseName += '_'; - // vorneweg testen, ob der Prefix als gueltig erkannt wird - // wenn nicht, nur doppelte vermeiden + // vorneweg testen, ob der Prefix als gueltig erkannt wird + // wenn nicht, nur doppelte vermeiden BOOL bPrefix = pDoc->ValidTabName( aBaseName ); DBG_ASSERT(bPrefix, "ungueltiger Tabellenname"); @@ -470,8 +470,8 @@ void ScCellShell::Execute( SfxRequest& rReq ) if ( pReqArgs->GetItemState( SID_NEW_TABLENAME, TRUE, &pItem ) == SFX_ITEM_SET ) aArgComment = ((const SfxStringItem*)pItem)->GetValue(); - aColor = Color( COL_LIGHTGRAY ); // Default - nFlags = 0; // nicht-TwoWay + aColor = Color( COL_LIGHTGRAY ); // Default + nFlags = 0; // nicht-TwoWay pTabViewShell->MakeScenario( aArgName, aArgComment, aColor, nFlags ); if( ! rReq.IsAPI() ) @@ -530,8 +530,8 @@ void ScCellShell::Execute( SfxRequest& rReq ) else { ScViewData* pData = GetViewData(); - FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric(); - USHORT nCurHeight = pData->GetDocument()-> + FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric(); + USHORT nCurHeight = pData->GetDocument()-> GetRowHeight( pData->GetCurY(), pData->GetTabNo() ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -621,9 +621,9 @@ void ScCellShell::Execute( SfxRequest& rReq ) } else { - FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric(); + FieldUnit eMetric = SC_MOD()->GetAppOptions().GetAppMetric(); ScViewData* pData = GetViewData(); - USHORT nCurHeight = pData->GetDocument()-> + USHORT nCurHeight = pData->GetDocument()-> GetColWidth( pData->GetCurX(), pData->GetTabNo() ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -864,7 +864,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) else if (pTabViewShell->HasPaintBrush()) pTabViewShell->ResetBrushDocument(); // abort format paint brush else if (pTabViewShell->HasHintWindow()) - pTabViewShell->RemoveHintWindow(); // Eingabemeldung abschalten + pTabViewShell->RemoveHintWindow(); // Eingabemeldung abschalten else if( ScViewUtil::IsFullScreen( *pTabViewShell ) ) ScViewUtil::SetFullScreen( *pTabViewShell, false ); else @@ -880,7 +880,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) //} } -// SetSumAssignMode(); //ScInputWindow +// SetSumAssignMode(); //ScInputWindow } break; @@ -898,7 +898,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_OPENDLG_CONDFRMT: { - USHORT nId = ScCondFormatDlgWrapper::GetChildWindowId(); + USHORT nId = ScCondFormatDlgWrapper::GetChildWindowId(); SfxViewFrame* pViewFrm = pTabViewShell->GetViewFrame(); SfxChildWindow* pWnd = pViewFrm->GetChildWindow( nId ); @@ -906,7 +906,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) } break; - // ---------------------------------------------------------------- + // ---------------------------------------------------------------- case FID_INPUTLINE_STATUS: DBG_ERROR("Execute von InputLine-Status"); @@ -914,7 +914,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) case SID_STATUS_DOCPOS: // Launch navigator. - GetViewData()->GetDispatcher().Execute( + GetViewData()->GetDispatcher().Execute( SID_NAVIGATOR, SFX_CALLMODE_SYNCHRON|SFX_CALLMODE_RECORD ); break; diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx index f5c4e70ae98a..894bee330330 100644 --- a/sc/source/ui/view/cellsh4.cxx +++ b/sc/source/ui/view/cellsh4.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,16 +61,16 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) { ScViewData* pData = GetViewData(); - ScTabViewShell* pTabViewShell = pData->GetViewShell(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); - SCsCOLROW nRepeat = 1; - BOOL bSel = FALSE; - BOOL bKeep = FALSE; + ScTabViewShell* pTabViewShell = pData->GetViewShell(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlotId = rReq.GetSlot(); + SCsCOLROW nRepeat = 1; + BOOL bSel = FALSE; + BOOL bKeep = FALSE; if ( pReqArgs != NULL ) { - const SfxPoolItem* pItem; + const SfxPoolItem* pItem; if( IS_AVAILABLE( FN_PARAM_1, &pItem ) ) nRepeat = static_cast<SCsCOLROW>(((const SfxInt16Item*)pItem)->GetValue()); if( IS_AVAILABLE( FN_PARAM_2, &pItem ) ) @@ -78,11 +78,11 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) } else { - // evaluate locked selection mode + // evaluate locked selection mode USHORT nLocked = pTabViewShell->GetLockedModifiers(); if ( nLocked & KEY_SHIFT ) - bSel = TRUE; // EXT + bSel = TRUE; // EXT else if ( nLocked & KEY_MOD1 ) { // ADD mode: keep the selection, start a new block when marking with shift again @@ -140,7 +140,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) SCsCOLROW nRTLSign = 1; if ( pData->GetDocument()->IsLayoutRTL( pData->GetTabNo() ) ) { - //! evaluate cursor movement option? + //! evaluate cursor movement option? nRTLSign = -1; } @@ -152,7 +152,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) switch ( nSlotId ) { case SID_CURSORDOWN: - pTabViewShell->MoveCursorRel( 0, nRepeat, SC_FOLLOW_LINE, bSel, bKeep ); + pTabViewShell->MoveCursorRel( 0, nRepeat, SC_FOLLOW_LINE, bSel, bKeep ); break; case SID_CURSORBLKDOWN: @@ -160,7 +160,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) break; case SID_CURSORUP: - pTabViewShell->MoveCursorRel( 0, -nRepeat, SC_FOLLOW_LINE, bSel, bKeep ); + pTabViewShell->MoveCursorRel( 0, -nRepeat, SC_FOLLOW_LINE, bSel, bKeep ); break; case SID_CURSORBLKUP: @@ -176,7 +176,7 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) break; case SID_CURSORRIGHT: - pTabViewShell->MoveCursorRel( static_cast<SCsCOL>(nRepeat * nRTLSign), 0, SC_FOLLOW_LINE, bSel, bKeep ); + pTabViewShell->MoveCursorRel( static_cast<SCsCOL>(nRepeat * nRTLSign), 0, SC_FOLLOW_LINE, bSel, bKeep ); break; case SID_CURSORBLKRIGHT: @@ -184,11 +184,11 @@ void ScCellShell::ExecuteCursor( SfxRequest& rReq ) break; case SID_CURSORPAGEDOWN: - pTabViewShell->MoveCursorPage( 0, nRepeat, SC_FOLLOW_FIX, bSel, bKeep ); + pTabViewShell->MoveCursorPage( 0, nRepeat, SC_FOLLOW_FIX, bSel, bKeep ); break; case SID_CURSORPAGEUP: - pTabViewShell->MoveCursorPage( 0, -nRepeat, SC_FOLLOW_FIX, bSel, bKeep ); + pTabViewShell->MoveCursorPage( 0, -nRepeat, SC_FOLLOW_FIX, bSel, bKeep ); break; case SID_CURSORPAGERIGHT_: //XXX !!! @@ -279,7 +279,7 @@ void ScCellShell::ExecuteCursorSel( SfxRequest& rReq ) void ScCellShell::ExecuteMove( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); USHORT nSlotId = rReq.GetSlot(); if(nSlotId != SID_CURSORTOPOFSCREEN && nSlotId != SID_CURSORENDOFSCREEN) @@ -296,8 +296,8 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq ) pTabViewShell->SelectNextTab( -1, (nSlotId == SID_PREV_TABLE_SEL) ); break; - // Cursorbewegungen in Bloecken gehen nicht von Basic aus, - // weil das ScSbxRange-Objekt bei Eingaben die Markierung veraendert + // Cursorbewegungen in Bloecken gehen nicht von Basic aus, + // weil das ScSbxRange-Objekt bei Eingaben die Markierung veraendert case SID_NEXT_UNPROTECT: pTabViewShell->FindNextUnprot( FALSE, !rReq.IsAPI() ); @@ -379,13 +379,13 @@ void ScCellShell::ExecuteMove( SfxRequest& rReq ) void ScCellShell::ExecutePageSel( SfxRequest& rReq ) { - USHORT nSlotId = rReq.GetSlot(); + USHORT nSlotId = rReq.GetSlot(); switch ( nSlotId ) { - case SID_CURSORHOME_SEL: rReq.SetSlot( SID_CURSORHOME ); break; - case SID_CURSOREND_SEL: rReq.SetSlot( SID_CURSOREND ); break; - case SID_CURSORTOPOFFILE_SEL: rReq.SetSlot( SID_CURSORTOPOFFILE ); break; - case SID_CURSORENDOFFILE_SEL: rReq.SetSlot( SID_CURSORENDOFFILE ); break; + case SID_CURSORHOME_SEL: rReq.SetSlot( SID_CURSORHOME ); break; + case SID_CURSOREND_SEL: rReq.SetSlot( SID_CURSOREND ); break; + case SID_CURSORTOPOFFILE_SEL: rReq.SetSlot( SID_CURSORTOPOFFILE ); break; + case SID_CURSORENDOFFILE_SEL: rReq.SetSlot( SID_CURSORENDOFFILE ); break; default: DBG_ERROR("Unbekannte Message bei ViewShell (ExecutePageSel)"); return; @@ -396,25 +396,25 @@ void ScCellShell::ExecutePageSel( SfxRequest& rReq ) void ScCellShell::ExecutePage( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlotId = rReq.GetSlot(); - BOOL bSel = FALSE; - BOOL bKeep = FALSE; + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlotId = rReq.GetSlot(); + BOOL bSel = FALSE; + BOOL bKeep = FALSE; if ( pReqArgs != NULL ) { - const SfxPoolItem* pItem; + const SfxPoolItem* pItem; if( IS_AVAILABLE( FN_PARAM_2, &pItem ) ) bSel = ((const SfxBoolItem*)pItem)->GetValue(); } else { - // evaluate locked selection mode + // evaluate locked selection mode USHORT nLocked = pTabViewShell->GetLockedModifiers(); if ( nLocked & KEY_SHIFT ) - bSel = TRUE; // EXT + bSel = TRUE; // EXT else if ( nLocked & KEY_MOD1 ) { // ADD mode: keep the selection, start a new block when marking with shift again diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index c94e08803594..4f4bc7a4db1d 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -117,7 +117,7 @@ void ScColBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize ) { USHORT nSizeTwips; ScSizeMode eMode = SC_SIZE_DIRECT; - if (nNewSize>0 && nNewSize<10) nNewSize=10; // (Pixel) + if (nNewSize>0 && nNewSize<10) nNewSize=10; // (Pixel) if ( nNewSize == HDR_SIZE_OPTIMUM ) { @@ -128,7 +128,7 @@ void ScColBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize ) nSizeTwips = (USHORT) ( nNewSize / pViewData->GetPPTX() ); ScMarkData& rMark = pViewData->GetMarkData(); -// SCTAB nTab = pViewData->GetTabNo(); +// SCTAB nTab = pViewData->GetTabNo(); SCCOLROW* pRanges = new SCCOLROW[MAXCOL+1]; SCCOL nRangeCnt = 0; @@ -187,19 +187,19 @@ void ScColBar::SelectWindow() { ScTabViewShell* pViewSh = pViewData->GetViewShell(); - pViewSh->SetActive(); // Appear und SetViewFrame + pViewSh->SetActive(); // Appear und SetViewFrame pViewSh->DrawDeselectAll(); ScSplitPos eActive = pViewData->GetActivePart(); if (eWhich==SC_SPLIT_LEFT) { - if (eActive==SC_SPLIT_TOPRIGHT) eActive=SC_SPLIT_TOPLEFT; - if (eActive==SC_SPLIT_BOTTOMRIGHT) eActive=SC_SPLIT_BOTTOMLEFT; + if (eActive==SC_SPLIT_TOPRIGHT) eActive=SC_SPLIT_TOPLEFT; + if (eActive==SC_SPLIT_BOTTOMRIGHT) eActive=SC_SPLIT_BOTTOMLEFT; } else { - if (eActive==SC_SPLIT_TOPLEFT) eActive=SC_SPLIT_TOPRIGHT; - if (eActive==SC_SPLIT_BOTTOMLEFT) eActive=SC_SPLIT_BOTTOMRIGHT; + if (eActive==SC_SPLIT_TOPLEFT) eActive=SC_SPLIT_TOPRIGHT; + if (eActive==SC_SPLIT_BOTTOMLEFT) eActive=SC_SPLIT_BOTTOMRIGHT; } pViewSh->ActivatePart( eActive ); @@ -235,7 +235,7 @@ String ScColBar::GetDragHelp( long nVal ) return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_WIDTH) ); } -BOOL ScColBar::IsLayoutRTL() // overloaded only for columns +BOOL ScColBar::IsLayoutRTL() // overloaded only for columns { return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); } @@ -283,7 +283,7 @@ void ScRowBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize ) { USHORT nSizeTwips; ScSizeMode eMode = SC_SIZE_DIRECT; - if (nNewSize>0 && nNewSize<10) nNewSize=10; // (Pixel) + if (nNewSize>0 && nNewSize<10) nNewSize=10; // (Pixel) if ( nNewSize == HDR_SIZE_OPTIMUM ) { @@ -294,7 +294,7 @@ void ScRowBar::SetEntrySize( SCCOLROW nPos, USHORT nNewSize ) nSizeTwips = (USHORT) ( nNewSize / pViewData->GetPPTY() ); ScMarkData& rMark = pViewData->GetMarkData(); -// SCTAB nTab = pViewData->GetTabNo(); +// SCTAB nTab = pViewData->GetTabNo(); SCCOLROW* pRanges = new SCCOLROW[MAXROW+1]; SCROW nRangeCnt = 0; @@ -353,19 +353,19 @@ void ScRowBar::SelectWindow() { ScTabViewShell* pViewSh = pViewData->GetViewShell(); - pViewSh->SetActive(); // Appear und SetViewFrame + pViewSh->SetActive(); // Appear und SetViewFrame pViewSh->DrawDeselectAll(); ScSplitPos eActive = pViewData->GetActivePart(); if (eWhich==SC_SPLIT_TOP) { - if (eActive==SC_SPLIT_BOTTOMLEFT) eActive=SC_SPLIT_TOPLEFT; - if (eActive==SC_SPLIT_BOTTOMRIGHT) eActive=SC_SPLIT_TOPRIGHT; + if (eActive==SC_SPLIT_BOTTOMLEFT) eActive=SC_SPLIT_TOPLEFT; + if (eActive==SC_SPLIT_BOTTOMRIGHT) eActive=SC_SPLIT_TOPRIGHT; } else { - if (eActive==SC_SPLIT_TOPLEFT) eActive=SC_SPLIT_BOTTOMLEFT; - if (eActive==SC_SPLIT_TOPRIGHT) eActive=SC_SPLIT_BOTTOMRIGHT; + if (eActive==SC_SPLIT_TOPLEFT) eActive=SC_SPLIT_BOTTOMLEFT; + if (eActive==SC_SPLIT_TOPRIGHT) eActive=SC_SPLIT_BOTTOMRIGHT; } pViewSh->ActivatePart( eActive ); @@ -401,7 +401,7 @@ String ScRowBar::GetDragHelp( long nVal ) return lcl_MetricString( nTwips, ScGlobal::GetRscString(STR_TIP_HEIGHT) ); } -// GetHiddenCount ist nur fuer Zeilen ueberladen +// GetHiddenCount ist nur fuer Zeilen ueberladen SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo ) { @@ -410,7 +410,7 @@ SCROW ScRowBar::GetHiddenCount( SCROW nEntryNo ) return pDoc->GetHiddenRowCount( nEntryNo, nTab ); } -BOOL ScRowBar::IsMirrored() // overloaded only for rows +BOOL ScRowBar::IsMirrored() // overloaded only for rows { return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); } diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 6b95b3b4ff8c..f9e854e3467d 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ ScDBFunc::~ScDBFunc() } // -// Hilfsfunktionen +// Hilfsfunktionen // void ScDBFunc::GotoDBArea( const String& rDBName ) @@ -89,7 +89,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName ) SetTabNo( nTab ); MoveCursorAbs( nStartCol, nStartRow, ScFollowMode( SC_FOLLOW_JUMP ), - FALSE, FALSE ); // bShift,bControl + FALSE, FALSE ); // bShift,bControl DoneBlockMode(); InitBlockMode( nStartCol, nStartRow, nTab ); MarkCursor( nEndCol, nEndRow, nTab ); @@ -98,7 +98,7 @@ void ScDBFunc::GotoDBArea( const String& rDBName ) } } -// aktuellen Datenbereich fuer Sortieren / Filtern suchen +// aktuellen Datenbereich fuer Sortieren / Filtern suchen ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection eSel, bool /*bShrinkToData*/, bool bExpandRows ) { @@ -111,20 +111,20 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e bool bShrinkColumnsOnly = false; if (eSel == SC_DBSEL_ROW_DOWN) { - // Don't alter row range, additional rows may have been selected on + // Don't alter row range, additional rows may have been selected on // purpose to append data, or to have a fake header row. bShrinkColumnsOnly = true; - // Select further rows only if only one row or a portion thereof is + // Select further rows only if only one row or a portion thereof is // selected. if (aRange.aStart.Row() != aRange.aEnd.Row()) { - // If an area is selected shrink that to the actual used + // If an area is selected shrink that to the actual used // columns, don't draw filter buttons for empty columns. eSel = SC_DBSEL_SHRINK_TO_USED_DATA; } else if (aRange.aStart.Col() == aRange.aEnd.Col()) { - // One cell only, if it is not marked obtain entire used data + // One cell only, if it is not marked obtain entire used data // area. const ScMarkData& rMarkData = GetViewData()->GetMarkData(); if (!(rMarkData.IsMarked() || rMarkData.IsMultiMarked())) @@ -155,10 +155,7 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e ScDocument* pDoc = pDocSh->GetDocument(); SCCOL nCol1 = aRange.aStart.Col(), nCol2 = aRange.aEnd.Col(); SCROW nRow1 = aRange.aStart.Row(), nRow2 = aRange.aEnd.Row(); - bool bShrunk; - pDoc->ShrinkToUsedDataArea( bShrunk, aRange.aStart.Tab(), - nCol1, nRow1, nCol2, nRow2, bShrinkColumnsOnly); - if (bShrunk) + if (pDoc->ShrinkToUsedDataArea( aRange.aStart.Tab(), nCol1, nRow1, nCol2, nRow2, bShrinkColumnsOnly)) { aRange.aStart.SetCol(nCol1); aRange.aEnd.SetCol(nCol2); @@ -196,7 +193,7 @@ ScDBData* ScDBFunc::GetDBData( BOOL bMark, ScGetDBMode eMode, ScGetDBSelection e return pData; } -// Datenbankbereiche aendern (Dialog) +// Datenbankbereiche aendern (Dialog) void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rDelAreaList ) { @@ -222,18 +219,18 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& rStart.Col(), rStart.Row(), rEnd.Col(), rEnd.Row() ); - // Targets am SBA abmelden nicht mehr noetig + // Targets am SBA abmelden nicht mehr noetig } } if (bRecord) pUndoColl = new ScDBCollection( *pOldColl ); - // neue Targets am SBA anmelden nicht mehr noetig + // neue Targets am SBA anmelden nicht mehr noetig - pDoc->CompileDBFormula( TRUE ); // CreateFormulaString + pDoc->CompileDBFormula( TRUE ); // CreateFormulaString pDoc->SetDBCollection( new ScDBCollection( rNewColl ) ); - pDoc->CompileDBFormula( FALSE ); // CompileFormulaString + pDoc->CompileDBFormula( FALSE ); // CompileFormulaString pOldColl = NULL; pDocShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID ); aModificator.SetDocumentModified(); @@ -248,7 +245,7 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const List& } // -// wirkliche Funktionen +// wirkliche Funktionen // // Sortieren @@ -270,13 +267,13 @@ void ScDBFunc::UISort( const ScSortParam& rSortParam, BOOL bRecord ) pDBData->GetSubTotalParam( aSubTotalParam ); if (aSubTotalParam.bGroupActive[0] && !aSubTotalParam.bRemoveOnly) { - // Subtotals wiederholen, mit neuer Sortierung + // Subtotals wiederholen, mit neuer Sortierung DoSubTotals( aSubTotalParam, bRecord, &rSortParam ); } else { - Sort( rSortParam, bRecord ); // nur sortieren + Sort( rSortParam, bRecord ); // nur sortieren } } @@ -288,7 +285,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, BOOL bRecord, BOOL bPaint ) BOOL bSuccess = aDBDocFunc.Sort( nTab, rSortParam, bRecord, bPaint, FALSE ); if ( bSuccess && !rSortParam.bInplace ) { - // Ziel markieren + // Ziel markieren ScRange aDestRange( rSortParam.nDestCol, rSortParam.nDestRow, rSortParam.nDestTab, rSortParam.nDestCol + rSortParam.nCol2 - rSortParam.nCol1, rSortParam.nDestRow + rSortParam.nRow2 - rSortParam.nRow1, @@ -297,7 +294,7 @@ void ScDBFunc::Sort( const ScSortParam& rSortParam, BOOL bRecord, BOOL bPaint ) } } -// Filtern +// Filtern void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource, BOOL bRecord ) { @@ -311,7 +308,7 @@ void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource BOOL bCopy = !rQueryParam.bInplace; if (bCopy) { - // Zielbereich markieren (DB-Bereich wurde ggf. angelegt) + // Zielbereich markieren (DB-Bereich wurde ggf. angelegt) ScDocument* pDoc = pDocSh->GetDocument(); ScDBData* pDestData = pDoc->GetDBAtCursor( rQueryParam.nDestCol, rQueryParam.nDestRow, @@ -334,18 +331,18 @@ void ScDBFunc::Query( const ScQueryParam& rQueryParam, const ScRange* pAdvSource } } -// Autofilter-Knoepfe ein-/ausblenden +// Autofilter-Knoepfe ein-/ausblenden void ScDBFunc::ToggleAutoFilter() { ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScDocShellModificator aModificator( *pDocSh ); - ScQueryParam aParam; - ScDocument* pDoc = GetViewData()->GetDocument(); - ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, SC_DBSEL_ROW_DOWN, false, true); + ScQueryParam aParam; + ScDocument* pDoc = GetViewData()->GetDocument(); + ScDBData* pDBData = GetDBData(false, SC_DB_MAKE, SC_DBSEL_ROW_DOWN, false, true); - pDBData->SetByRow( TRUE ); //! Undo, vorher abfragen ?? + pDBData->SetByRow( TRUE ); //! Undo, vorher abfragen ?? pDBData->GetQueryParam( aParam ); @@ -353,11 +350,11 @@ void ScDBFunc::ToggleAutoFilter() SCROW nRow = aParam.nRow1; SCTAB nTab = GetViewData()->GetTabNo(); INT16 nFlag; - BOOL bHasAuto = TRUE; - BOOL bHeader = pDBData->HasHeader(); - BOOL bPaint = FALSE; + BOOL bHasAuto = TRUE; + BOOL bHeader = pDBData->HasHeader(); + BOOL bPaint = FALSE; - //! stattdessen aus DB-Bereich abfragen? + //! stattdessen aus DB-Bereich abfragen? for (nCol=aParam.nCol1; nCol<=aParam.nCol2 && bHasAuto; nCol++) { @@ -368,9 +365,9 @@ void ScDBFunc::ToggleAutoFilter() bHasAuto = FALSE; } - if (bHasAuto) // aufheben + if (bHasAuto) // aufheben { - // Filterknoepfe ausblenden + // Filterknoepfe ausblenden for (nCol=aParam.nCol1; nCol<=aParam.nCol2; nCol++) { @@ -391,7 +388,7 @@ void ScDBFunc::ToggleAutoFilter() pDBData->SetAutoFilter(FALSE); - // Filter aufheben (incl. Paint / Undo) + // Filter aufheben (incl. Paint / Undo) SCSIZE nEC = aParam.GetEntryCount(); for (SCSIZE i=0; i<nEC; i++) @@ -403,7 +400,7 @@ void ScDBFunc::ToggleAutoFilter() bPaint = TRUE; } - else // Filterknoepfe einblenden + else // Filterknoepfe einblenden { if ( !pDoc->IsBlockEmpty( nTab, aParam.nCol1, aParam.nRow1, @@ -412,11 +409,11 @@ void ScDBFunc::ToggleAutoFilter() if (!bHeader) { if ( MessBox( GetViewData()->GetDialogParent(), WinBits(WB_YES_NO | WB_DEF_YES), - ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), // "StarCalc" - ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // Koepfe aus erster Zeile? + ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ), // "StarCalc" + ScGlobal::GetRscString( STR_MSSG_MAKEAUTOFILTER_0 ) // Koepfe aus erster Zeile? ).Execute() == RET_YES ) { - pDBData->SetHeader( TRUE ); //! Undo ?? + pDBData->SetHeader( TRUE ); //! Undo ?? bHeader = TRUE; } } @@ -456,7 +453,7 @@ void ScDBFunc::ToggleAutoFilter() } } -// nur ausblenden, keine Daten veraendern +// nur ausblenden, keine Daten veraendern void ScDBFunc::HideAutoFilter() { @@ -495,7 +492,7 @@ void ScDBFunc::HideAutoFilter() rBindings.Invalidate( SID_AUTOFILTER_HIDE ); } -// Re-Import +// Re-Import BOOL ScDBFunc::ImportData( const ScImportParam& rParam, BOOL bRecord ) { diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx index f789daea996d..15e5f20c7ac4 100644 --- a/sc/source/ui/view/dbfunc2.cxx +++ b/sc/source/ui/view/dbfunc2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 2c2df72120fa..7381e3599561 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -108,10 +108,10 @@ using ::std::hash_set; //================================================================== // -// Outliner +// Outliner // -// Outline-Gruppierung erzeugen +// Outline-Gruppierung erzeugen void ScDBFunc::MakeOutline( BOOL bColumns, BOOL bRecord ) { @@ -126,7 +126,7 @@ void ScDBFunc::MakeOutline( BOOL bColumns, BOOL bRecord ) ErrorMessage(STR_NOMULTISELECT); } -// Outline-Gruppierung loeschen +// Outline-Gruppierung loeschen void ScDBFunc::RemoveOutline( BOOL bColumns, BOOL bRecord ) { @@ -141,7 +141,7 @@ void ScDBFunc::RemoveOutline( BOOL bColumns, BOOL bRecord ) ErrorMessage(STR_NOMULTISELECT); } -// Menue-Status: Outlines loeschen +// Menue-Status: Outlines loeschen void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow ) { @@ -165,9 +165,9 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow ) BOOL bColMarked = ( nStartRow == 0 && nEndRow == MAXROW ); BOOL bRowMarked = ( nStartCol == 0 && nEndCol == MAXCOL ); - // Spalten + // Spalten - if ( !bRowMarked || bColMarked ) // nicht wenn ganze Zeilen markiert + if ( !bRowMarked || bColMarked ) // nicht wenn ganze Zeilen markiert { pArray = pTable->GetColArray(); ScSubOutlineIterator aColIter( pArray ); @@ -180,9 +180,9 @@ void ScDBFunc::TestRemoveOutline( BOOL& rCol, BOOL& rRow ) } } - // Zeilen + // Zeilen - if ( !bColMarked || bRowMarked ) // nicht wenn ganze Spalten markiert + if ( !bColMarked || bRowMarked ) // nicht wenn ganze Spalten markiert { pArray = pTable->GetRowArray(); ScSubOutlineIterator aRowIter( pArray ); @@ -215,12 +215,12 @@ void ScDBFunc::RemoveAllOutlines( BOOL bRecord ) UpdateScrollBars(); } -// Auto-Outlines +// Auto-Outlines void ScDBFunc::AutoOutline( BOOL bRecord ) { SCTAB nTab = GetViewData()->GetTabNo(); - ScRange aRange( 0,0,nTab, MAXCOL,MAXROW,nTab ); // ganze Tabelle, wenn nichts markiert + ScRange aRange( 0,0,nTab, MAXCOL,MAXROW,nTab ); // ganze Tabelle, wenn nichts markiert ScMarkData& rMark = GetViewData()->GetMarkData(); if ( rMark.IsMarked() || rMark.IsMultiMarked() ) { @@ -233,7 +233,7 @@ void ScDBFunc::AutoOutline( BOOL bRecord ) aFunc.AutoOutline( aRange, bRecord, FALSE ); } -// Outline-Ebene auswaehlen +// Outline-Ebene auswaehlen void ScDBFunc::SelectLevel( BOOL bColumns, USHORT nLevel, BOOL bRecord, BOOL bPaint ) { @@ -249,7 +249,7 @@ void ScDBFunc::SelectLevel( BOOL bColumns, USHORT nLevel, BOOL bRecord, BOOL bPa UpdateScrollBars(); } -// einzelne Outline-Gruppe einblenden +// einzelne Outline-Gruppe einblenden void ScDBFunc::ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint ) { @@ -265,7 +265,7 @@ void ScDBFunc::ShowOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bR UpdateScrollBars(); } -// einzelne Outline-Gruppe ausblenden +// einzelne Outline-Gruppe ausblenden void ScDBFunc::HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bRecord, BOOL bPaint ) { @@ -281,7 +281,7 @@ void ScDBFunc::HideOutline( BOOL bColumns, USHORT nLevel, USHORT nEntry, BOOL bR UpdateScrollBars(); } -// Menue-Status: markierten Bereich ein-/ausblenden +// Menue-Status: markierten Bereich ein-/ausblenden BOOL ScDBFunc::OutlinePossible(BOOL bHide) { @@ -306,7 +306,7 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide) SCCOLROW nStart; SCCOLROW nEnd; - // Spalten + // Spalten pArray = pTable->GetColArray(); ScSubOutlineIterator aColIter( pArray ); @@ -328,7 +328,7 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide) } } - // Zeilen + // Zeilen pArray = pTable->GetRowArray(); ScSubOutlineIterator aRowIter( pArray ); @@ -355,7 +355,7 @@ BOOL ScDBFunc::OutlinePossible(BOOL bHide) return bEnable; } -// markierten Bereich einblenden +// markierten Bereich einblenden void ScDBFunc::ShowMarkedOutlines( BOOL bRecord ) { @@ -374,7 +374,7 @@ void ScDBFunc::ShowMarkedOutlines( BOOL bRecord ) ErrorMessage(STR_NOMULTISELECT); } -// markierten Bereich ausblenden +// markierten Bereich ausblenden void ScDBFunc::HideMarkedOutlines( BOOL bRecord ) { @@ -393,16 +393,16 @@ void ScDBFunc::HideMarkedOutlines( BOOL bRecord ) ErrorMessage(STR_NOMULTISELECT); } -// -------------------------------------------------------------------------- +// -------------------------------------------------------------------------- // -// Teilergebnisse +// Teilergebnisse // void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, const ScSortParam* pForceNewSort ) { - BOOL bDo = !rParam.bRemoveOnly; // FALSE = nur loeschen + BOOL bDo = !rParam.bRemoveOnly; // FALSE = nur loeschen ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScDocument* pDoc = pDocSh->GetDocument(); @@ -429,7 +429,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, if (pDoc->HasAttrib( rParam.nCol1, rParam.nRow1+1, nTab, rParam.nCol2, rParam.nRow2, nTab, HASATTR_MERGED | HASATTR_OVERLAPPED )) { - ErrorMessage(STR_MSSG_INSERTCELLS_0); // nicht in zusammengefasste einfuegen + ErrorMessage(STR_MSSG_INSERTCELLS_0); // nicht in zusammengefasste einfuegen return; } @@ -451,14 +451,14 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, { ScDocShellModificator aModificator( *pDocSh ); - ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert - ScDocument* pUndoDoc = NULL; - ScOutlineTable* pUndoTab = NULL; - ScRangeName* pUndoRange = NULL; + ScSubTotalParam aNewParam( rParam ); // Bereichsende wird veraendert + ScDocument* pUndoDoc = NULL; + ScOutlineTable* pUndoTab = NULL; + ScRangeName* pUndoRange = NULL; ScDBCollection* pUndoDB = NULL; - SCTAB nTabCount = 0; // fuer Referenz-Undo + SCTAB nTabCount = 0; // fuer Referenz-Undo - if (bRecord) // alte Daten sichern + if (bRecord) // alte Daten sichern { BOOL bOldFilter = bDo && rParam.bDoSort; @@ -469,7 +469,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, { pUndoTab = new ScOutlineTable( *pTable ); - SCCOLROW nOutStartCol; // Zeilen/Spaltenstatus + SCCOLROW nOutStartCol; // Zeilen/Spaltenstatus SCCOLROW nOutStartRow; SCCOLROW nOutEndCol; SCCOLROW nOutEndRow; @@ -483,15 +483,15 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, else pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, bOldFilter ); - // Datenbereich sichern - incl. Filter-Ergebnis + // Datenbereich sichern - incl. Filter-Ergebnis pDoc->CopyToDocument( 0,rParam.nRow1+1,nTab, MAXCOL,rParam.nRow2,nTab, IDF_ALL, FALSE, pUndoDoc ); - // alle Formeln wegen Referenzen + // alle Formeln wegen Referenzen pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc ); - // DB- und andere Bereiche + // DB- und andere Bereiche ScRangeName* pDocRange = pDoc->GetRangeName(); if (pDocRange->GetCount()) pUndoRange = new ScRangeName( *pDocRange ); @@ -500,10 +500,10 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, pUndoDB = new ScDBCollection( *pDocDB ); } -// pDoc->SetOutlineTable( nTab, NULL ); - ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab ); +// pDoc->SetOutlineTable( nTab, NULL ); + ScOutlineTable* pOut = pDoc->GetOutlineTable( nTab ); if (pOut) - pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen + pOut->GetRowArray()->RemoveAll(); // nur Zeilen-Outlines loeschen if (rParam.bReplace) pDoc->RemoveSubTotals( nTab, aNewParam ); @@ -515,8 +515,8 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, { pDBData->SetArea( nTab, aNewParam.nCol1,aNewParam.nRow1, aNewParam.nCol2,aNewParam.nRow2 ); - // Teilergebnis-Felder vor die Sortierung setzen - // (doppelte werden weggelassen, kann darum auch wieder aufgerufen werden) + // Teilergebnis-Felder vor die Sortierung setzen + // (doppelte werden weggelassen, kann darum auch wieder aufgerufen werden) ScSortParam aOldSort; pDBData->GetSortParam( aOldSort ); @@ -532,7 +532,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, if (bRecord) { -// ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL; +// ScDBData* pUndoDBData = pDBData ? new ScDBData( *pDBData ) : NULL; pDocSh->GetUndoManager()->AddUndoAction( new ScUndoSubTotals( pDocSh, nTab, rParam, aNewParam.nRow2, @@ -567,7 +567,7 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, BOOL bRecord, } // -// Consolidate +// Consolidate // void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, BOOL bRecord ) @@ -578,7 +578,7 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, BOOL bRecord ) } // -// Pivot +// Pivot // String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber ) @@ -591,8 +591,8 @@ String lcl_MakePivotTabName( const String& rPrefix, SCTAB nNumber ) bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, BOOL bNewTable, const ScDPObject& rSource, BOOL bApi ) { - // #70096# error message if no fields are set - // this must be removed when drag&drop of fields from a toolbox is available + // #70096# error message if no fields are set + // this must be removed when drag&drop of fields from a toolbox is available if ( rData.IsEmpty() && !bApi ) { @@ -600,8 +600,8 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, return false; } - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = GetViewData()->GetDocument(); BOOL bUndo(pDoc->IsUndoEnabled()); ScRange aDestRange = rDest; @@ -658,12 +658,12 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, else aObj.SetSaveData( rData ); - BOOL bAllowMove = ( pDPObj != NULL ); // allow re-positioning when editing existing table + BOOL bAllowMove = ( pDPObj != NULL ); // allow re-positioning when editing existing table ScDBDocFunc aFunc( *pDocSh ); bool bSuccess = aFunc.DataPilotUpdate( pDPObj, &aObj, TRUE, FALSE, bAllowMove ); - CursorPosChanged(); // shells may be switched + CursorPosChanged(); // shells may be switched if ( bNewTable ) { @@ -676,16 +676,16 @@ bool ScDBFunc::MakePivotTable( const ScDPSaveData& rData, const ScRange& rDest, void ScDBFunc::DeletePivotTable() { - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); - ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(), + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); + ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); if ( pDPObj ) { ScDBDocFunc aFunc( *pDocSh ); aFunc.DataPilotUpdate( pDPObj, NULL, TRUE, FALSE ); - CursorPosChanged(); // shells may be switched + CursorPosChanged(); // shells may be switched } else ErrorMessage(STR_PIVOT_NOTFOUND); @@ -718,9 +718,9 @@ ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh, ScDBDocFunc aFunc( * pDocSh ); if ( !aFunc.DataPilotUpdate( (*pDPCollection)[i], (*pDPCollection)[i], bRecord, bApi ) ) break; - } + } } - + return nErrId; } @@ -730,11 +730,11 @@ ULONG RefreshDPObject( ScDPObject *pDPObj, ScDocument *pDoc, ScDocShell *pDocSh, ULONG ScDBFunc::RecalcPivotTable() { ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocument* pDoc = GetViewData()->GetDocument(); - // old pivot not used any more + // old pivot not used any more - ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(), + ScDPObject* pDPObj = pDoc->GetDPAtCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); if ( pDPObj ) @@ -1519,7 +1519,7 @@ void ScDBFunc::DataPilotInput( const ScAddress& rPos, const String& rString ) if (rString.Len()) { if (rString.EqualsIgnoreCaseAscii(aDimName)) - { + { pDim->RemoveLayoutName(); bChange = true; } @@ -1765,7 +1765,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16 // We need to run this to get all members later. if ( pUserListId ) pDPObj->BuildAllDimensionMembers(); - + USHORT nOrientation; long nDimIndex = pDPObj->GetHeaderDim(rPos, nOrientation); if (nDimIndex < 0) @@ -1814,13 +1814,13 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16 ScUserList* pUserList = ScGlobal::GetUserList(); if (!pUserList) return false; - + { sal_uInt16 n = pUserList->GetCount(); if (!n || *pUserListId >= n) return false; } - + ScUserListData* pData = static_cast<ScUserListData*>((*pUserList)[*pUserListId]); if (pData) { @@ -1841,7 +1841,7 @@ bool ScDBFunc::DataPilotSort( const ScAddress& rPos, bool bAscending, sal_uInt16 vector<OUString> aRankedNames(nMemberCount); sal_uInt16 nCurStrId = 0; - for (list<OUString>::const_iterator itr = aMembers.begin(), itrEnd = aMembers.end(); + for (list<OUString>::const_iterator itr = aMembers.begin(), itrEnd = aMembers.end(); itr != itrEnd; ++itr) { OUString aName = *itr; @@ -2201,7 +2201,7 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet } // -// DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen +// DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen // void ScDBFunc::RepeatDB( BOOL bRecord ) @@ -2249,7 +2249,7 @@ void ScDBFunc::RepeatDB( BOOL bRecord ) SCROW nEndRow; pDBData->GetArea( nDummy, nStartCol, nStartRow, nEndCol, nEndRow ); - //! Undo nur benoetigte Daten ? + //! Undo nur benoetigte Daten ? ScDocument* pUndoDoc = NULL; ScOutlineTable* pUndoTab = NULL; @@ -2265,7 +2265,7 @@ void ScDBFunc::RepeatDB( BOOL bRecord ) { pUndoTab = new ScOutlineTable( *pTable ); - SCCOLROW nOutStartCol; // Zeilen/Spaltenstatus + SCCOLROW nOutStartCol; // Zeilen/Spaltenstatus SCCOLROW nOutStartRow; SCCOLROW nOutEndCol; SCCOLROW nOutEndRow; @@ -2279,13 +2279,13 @@ void ScDBFunc::RepeatDB( BOOL bRecord ) else pUndoDoc->InitUndo( pDoc, nTab, nTab, FALSE, TRUE ); - // Datenbereich sichern - incl. Filter-Ergebnis + // Datenbereich sichern - incl. Filter-Ergebnis pDoc->CopyToDocument( 0,nStartRow,nTab, MAXCOL,nEndRow,nTab, IDF_ALL, FALSE, pUndoDoc ); - // alle Formeln wegen Referenzen + // alle Formeln wegen Referenzen pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTabCount-1, IDF_FORMULA, FALSE, pUndoDoc ); - // DB- und andere Bereiche + // DB- und andere Bereiche ScRangeName* pDocRange = pDoc->GetRangeName(); if (pDocRange->GetCount()) pUndoRange = new ScRangeName( *pDocRange ); @@ -2296,20 +2296,20 @@ void ScDBFunc::RepeatDB( BOOL bRecord ) if (bSort && bSubTotal) { - // Sortieren ohne SubTotals + // Sortieren ohne SubTotals - aSubTotalParam.bRemoveOnly = TRUE; // wird unten wieder zurueckgesetzt + aSubTotalParam.bRemoveOnly = TRUE; // wird unten wieder zurueckgesetzt DoSubTotals( aSubTotalParam, FALSE ); } if (bSort) { - pDBData->GetSortParam( aSortParam ); // Bereich kann sich geaendert haben + pDBData->GetSortParam( aSortParam ); // Bereich kann sich geaendert haben Sort( aSortParam, FALSE, FALSE); } if (bQuery) { - pDBData->GetQueryParam( aQueryParam ); // Bereich kann sich geaendert haben + pDBData->GetQueryParam( aQueryParam ); // Bereich kann sich geaendert haben ScRange aAdvSource; if (pDBData->GetAdvancedQuerySource(aAdvSource)) { @@ -2318,17 +2318,17 @@ void ScDBFunc::RepeatDB( BOOL bRecord ) aAdvSource.aEnd.Col(), aAdvSource.aEnd.Row(), aAdvSource.aStart.Tab(), aQueryParam ); Query( aQueryParam, &aAdvSource, FALSE ); - } + } else Query( aQueryParam, NULL, FALSE ); - // bei nicht-inplace kann die Tabelle umgestellt worden sein + // bei nicht-inplace kann die Tabelle umgestellt worden sein if ( !aQueryParam.bInplace && aQueryParam.nDestTab != nTab ) SetTabNo( nTab ); } if (bSubTotal) { - pDBData->GetSubTotalParam( aSubTotalParam ); // Bereich kann sich geaendert haben + pDBData->GetSubTotalParam( aSubTotalParam ); // Bereich kann sich geaendert haben aSubTotalParam.bRemoveOnly = FALSE; DoSubTotals( aSubTotalParam, FALSE ); } @@ -2367,7 +2367,7 @@ void ScDBFunc::RepeatDB( BOOL bRecord ) GetViewData()->GetDocShell()->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID | PAINT_LEFT | PAINT_TOP | PAINT_SIZE ); } - else // "Keine Operationen auszufuehren" + else // "Keine Operationen auszufuehren" ErrorMessage(STR_MSSG_REPEATDB_0); } diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index a96dc2970875..c8ecbbc76382 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx index 36615b14525d..d85c0ccbbb70 100644 --- a/sc/source/ui/view/drawattr.cxx +++ b/sc/source/ui/view/drawattr.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx index 4270170e099a..82fae44d1e4c 100644 --- a/sc/source/ui/view/drawutil.cxx +++ b/sc/source/ui/view/drawutil.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,7 +72,7 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, { SCROW nLastRow = nRow; if (pDoc->RowHidden(nRow, nTab, NULL, &nLastRow)) - { + { nRow = nLastRow; continue; } @@ -85,8 +85,8 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, MapMode aHMMMode( MAP_100TH_MM, Point(), rZoomX, rZoomY ); Point aPixelLog = pDev->PixelToLogic( Point( nPixelX,nPixelY ), aHMMMode ); - // Fraction(double) ctor can be used here (and avoid overflows of PixelLog * Zoom) - // because ReduceInaccurate is called later anyway. + // Fraction(double) ctor can be used here (and avoid overflows of PixelLog * Zoom) + // because ReduceInaccurate is called later anyway. if ( aPixelLog.X() && nTwipsX ) rScaleX = Fraction( ((double)aPixelLog.X()) * @@ -106,8 +106,8 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, else rScaleY = Fraction( 1, 1 ); - // 25 bits of accuracy are needed to always hit the right part of - // cells in the last rows (was 17 before 1M rows). + // 25 bits of accuracy are needed to always hit the right part of + // cells in the last rows (was 17 before 1M rows). rScaleX.ReduceInaccurate( 25 ); rScaleY.ReduceInaccurate( 25 ); } diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx index c047fcdbd6fe..0f44641f33ca 100644 --- a/sc/source/ui/view/drawvie2.cxx +++ b/sc/source/ui/view/drawvie2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,17 +44,17 @@ void ScDrawView::UpdateBrowser() { - // VC's und den Browser dazu gibts nicht mehr... + // VC's und den Browser dazu gibts nicht mehr... } void ScDrawView::VCAddWin( Window* /* pWin */ ) { - // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden + // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } void ScDrawView::VCRemoveWin( Window* /* pWin */ ) { - // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden + // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index 3ef141f2c526..3c9fb33522e0 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ #include "docsh.hxx" void ScIMapDlgSet( const Graphic& rGraphic, const ImageMap* pImageMap, - const TargetList* pTargetList, void* pEditingObj ); // imapwrap + const TargetList* pTargetList, void* pEditingObj ); // imapwrap USHORT ScIMapChildWindowId(); // STATIC DATA ----------------------------------------------------------- @@ -121,7 +121,7 @@ ScAnchorType ScDrawView::GetAnchor() const void __EXPORT ScDrawView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { - if (rHint.ISA(ScTabDeletedHint)) // Tabelle geloescht + if (rHint.ISA(ScTabDeletedHint)) // Tabelle geloescht { SCTAB nDelTab = ((ScTabDeletedHint&)rHint).GetTab(); if (ValidTab(nDelTab)) @@ -131,7 +131,7 @@ void __EXPORT ScDrawView::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) HideSdrPage(); } } - else if (rHint.ISA(ScTabSizeChangedHint)) // Groesse geaendert + else if (rHint.ISA(ScTabSizeChangedHint)) // Groesse geaendert { if ( nTab == ((ScTabSizeChangedHint&)rHint).GetTab() ) UpdateWorkArea(); @@ -146,8 +146,8 @@ void ScDrawView::UpdateIMap( SdrObject* pObj ) pViewData->GetViewShell()->GetViewFrame()->HasChildWindow( ScIMapChildWindowId() ) && pObj && ( pObj->ISA(SdrGrafObj) || pObj->ISA(SdrOle2Obj) ) ) { - Graphic aGraphic; - TargetList aTargetList; + Graphic aGraphic; + TargetList aTargetList; ScIMapInfo* pIMapInfo = ScDrawLayer::GetIMapInfo( pObj ); const ImageMap* pImageMap = NULL; if ( pIMapInfo ) @@ -166,7 +166,7 @@ void ScDrawView::UpdateIMap( SdrObject* pObj ) aGraphic = *pGraphic; } - ScIMapDlgSet( aGraphic, pImageMap, &aTargetList, pObj ); // aus imapwrap + ScIMapDlgSet( aGraphic, pImageMap, &aTargetList, pObj ); // aus imapwrap // TargetListe kann von uns wieder geloescht werden String* pEntry = aTargetList.First(); diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 128ca94be950..8a848fbc341c 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,7 +50,7 @@ #include "document.hxx" #include "docsh.hxx" #include "drwtrans.hxx" -#include "transobj.hxx" // SetDrawClipDoc +#include "transobj.hxx" // SetDrawClipDoc #include "drawutil.hxx" #include "scmod.hxx" #include "globstr.hrc" @@ -64,7 +64,7 @@ Point aDragStartDiff; // ----------------------------------------------------------------------- -//! welche Funktionen aus drawview/drawvie4 muessen wirklich ohne Optimierung sein? +//! welche Funktionen aus drawview/drawvie4 muessen wirklich ohne Optimierung sein? #ifdef _MSC_VER #pragma optimize ( "", off ) @@ -125,17 +125,17 @@ BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos ) ScDocShellRef aDragShellRef; if (bAnyOle) { - aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately + aDragShellRef = new ScDocShell; // DocShell needs a Ref immediately aDragShellRef->DoInitNew(NULL); } ScDrawLayer::SetGlobalDrawPersist(aDragShellRef); SdrModel* pModel = GetAllMarkedModel(); ScDrawLayer::SetGlobalDrawPersist(NULL); - // Charts now always copy their data in addition to the source reference, so - // there's no need to call SchDLL::Update for the charts in the clipboard doc. - // Update with the data (including NumberFormatter) from the live document would - // also store the NumberFormatter in the clipboard chart (#88749#) + // Charts now always copy their data in addition to the source reference, so + // there's no need to call SchDLL::Update for the charts in the clipboard doc. + // Update with the data (including NumberFormatter) from the live document would + // also store the NumberFormatter in the clipboard chart (#88749#) // lcl_RefreshChartData( pModel, pViewData->GetDocument() ); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -149,9 +149,9 @@ BOOL ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos ) uno::Reference<datatransfer::XTransferable> xTransferable( pTransferObj ); pTransferObj->SetDrawPersist( &aDragShellRef ); // keep persist for ole objects alive - pTransferObj->SetDragSource( this ); // copies selection + pTransferObj->SetDragSource( this ); // copies selection - SC_MOD()->SetDragObject( NULL, pTransferObj ); // for internal D&D + SC_MOD()->SetDragObject( NULL, pTransferObj ); // for internal D&D pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK ); } @@ -169,10 +169,10 @@ void ScDrawView::DoCopy() SdrModel* pModel = GetAllMarkedModel(); ScDrawLayer::SetGlobalDrawPersist(NULL); - // Charts now always copy their data in addition to the source reference, so - // there's no need to call SchDLL::Update for the charts in the clipboard doc. - // Update with the data (including NumberFormatter) from the live document would - // also store the NumberFormatter in the clipboard chart (#88749#) + // Charts now always copy their data in addition to the source reference, so + // there's no need to call SchDLL::Update for the charts in the clipboard doc. + // Update with the data (including NumberFormatter) from the live document would + // also store the NumberFormatter in the clipboard chart (#88749#) // lcl_RefreshChartData( pModel, pViewData->GetDocument() ); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -190,8 +190,8 @@ void ScDrawView::DoCopy() pTransferObj->SetDrawPersist( &(*ScGlobal::pDrawClipDocShellRef) ); // keep persist for ole objects alive } - pTransferObj->CopyToClipboard( pViewData->GetActiveWin() ); // system clipboard - SC_MOD()->SetClipObject( NULL, pTransferObj ); // internal clipboard + pTransferObj->CopyToClipboard( pViewData->GetActiveWin() ); // system clipboard + SC_MOD()->SetClipObject( NULL, pTransferObj ); // internal clipboard } uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable() @@ -205,10 +205,10 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable() SdrModel* pModel = GetAllMarkedModel(); ScDrawLayer::SetGlobalDrawPersist(NULL); - // Charts now always copy their data in addition to the source reference, so - // there's no need to call SchDLL::Update for the charts in the clipboard doc. - // Update with the data (including NumberFormatter) from the live document would - // also store the NumberFormatter in the clipboard chart (#88749#) + // Charts now always copy their data in addition to the source reference, so + // there's no need to call SchDLL::Update for the charts in the clipboard doc. + // Update with the data (including NumberFormatter) from the live document would + // also store the NumberFormatter in the clipboard chart (#88749#) // lcl_RefreshChartData( pModel, pViewData->GetDocument() ); ScDocShell* pDocSh = pViewData->GetDocShell(); @@ -229,7 +229,7 @@ uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable() return xTransferable; } -// Korrektur fuer 100% berechnen, unabhaengig von momentanen Einstellungen +// Korrektur fuer 100% berechnen, unabhaengig von momentanen Einstellungen void ScDrawView::CalcNormScale( Fraction& rFractX, Fraction& rFractY ) const { @@ -306,7 +306,7 @@ void ScDrawView::SetMarkedOriginalSize() MapMode aDestMap( MAP_100TH_MM ); if (aSourceMap.GetMapUnit() == MAP_PIXEL) { - // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt + // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt Fraction aNormScaleX, aNormScaleY; CalcNormScale( aNormScaleX, aNormScaleY ); diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 14b2c02fae00..8a8211442b65 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,8 +71,8 @@ using namespace com::sun::star; // ----------------------------------------------------------------------- -#define SC_HANDLESIZE_BIG 9 -#define SC_HANDLESIZE_SMALL 7 +#define SC_HANDLESIZE_BIG 9 +#define SC_HANDLESIZE_SMALL 7 // ----------------------------------------------------------------------- @@ -88,7 +88,7 @@ void ScDrawView::Construct() EnableExtendedCommandEventDispatcher(FALSE); SetFrameDragSingles(TRUE); -// SetSolidMarkHdl(TRUE); // einstellbar -> UpdateUserViewOptions +// SetSolidMarkHdl(TRUE); // einstellbar -> UpdateUserViewOptions SetMinMoveDistancePixel( 2 ); SetHitTolerancePixel( 2 ); @@ -114,7 +114,7 @@ void ScDrawView::Construct() if (pLayer) { SetLayerLocked( pLayer->GetName(), bProt ); - SetActiveLayer( pLayer->GetName() ); // FRONT als aktiven Layer setzen + SetActiveLayer( pLayer->GetName() ); // FRONT als aktiven Layer setzen } pLayer = rAdmin.GetLayerPerID(SC_LAYER_CONTROLS); if (pLayer) @@ -172,7 +172,7 @@ void ScDrawView::AddCustomHdl() if (bNegativePage) { aPos = aBoundRect.TopRight(); - aPos.X() = -aPos.X(); // so the loop below is the same + aPos.X() = -aPos.X(); // so the loop below is the same } else aPos = aBoundRect.TopLeft(); @@ -214,8 +214,8 @@ void ScDrawView::InvalidateDrawTextAttrs() if (!pViewData) return; SfxBindings& rBindings = pViewData->GetBindings(); - // cjk/ctl font items have no configured slots, - // need no invalidate + // cjk/ctl font items have no configured slots, + // need no invalidate rBindings.Invalidate( SID_ATTR_CHAR_FONT ); rBindings.Invalidate( SID_ATTR_CHAR_FONTHEIGHT ); @@ -250,24 +250,24 @@ void ScDrawView::InvalidateDrawTextAttrs() //void ScDrawView::DrawMarks( OutputDevice* pOut ) const //{ -// DBG_ASSERT(pOut, "ScDrawView::DrawMarks: No OutputDevice (!)"); -// SdrPaintWindow* pPaintWindow = FindPaintWindow(*pOut); +// DBG_ASSERT(pOut, "ScDrawView::DrawMarks: No OutputDevice (!)"); +// SdrPaintWindow* pPaintWindow = FindPaintWindow(*pOut); // -// if(pPaintWindow) -// { -// if(pPaintWindow->isXorVisible()) -// { -// ToggleShownXor(pOut, 0L); -// } -// } +// if(pPaintWindow) +// { +// if(pPaintWindow->isXorVisible()) +// { +// ToggleShownXor(pOut, 0L); +// } +// } //} void ScDrawView::SetMarkedToLayer( BYTE nLayerNo ) { if (AreObjectsMarked()) { - // #i11702# use SdrUndoObjectLayerChange for undo - // STR_UNDO_SELATTR is "Attributes" - should use a different text later + // #i11702# use SdrUndoObjectLayerChange for undo + // STR_UNDO_SELATTR is "Attributes" - should use a different text later BegUndo( ScGlobal::GetRscString( STR_UNDO_SELATTR ) ); const SdrMarkList& rMark = GetMarkedObjectList(); @@ -284,11 +284,11 @@ void ScDrawView::SetMarkedToLayer( BYTE nLayerNo ) EndUndo(); - // repaint is done in SetLayer + // repaint is done in SetLayer pViewData->GetDocShell()->SetDrawModified(); - // #84073# check mark list now instead of later in a timer + // #84073# check mark list now instead of later in a timer CheckMarked(); MarkListHasChanged(); } @@ -323,7 +323,7 @@ void ScDrawView::UpdateWorkArea() Rectangle aNewArea( aPos, aPageSize ); if ( aPageSize.Width() < 0 ) { - // RTL: from max.negative (left) to zero (right) + // RTL: from max.negative (left) to zero (right) aNewArea.Right() = 0; aNewArea.Left() = aPageSize.Width() + 1; } @@ -339,7 +339,7 @@ void ScDrawView::DoCut() { DoCopy(); BegUndo( ScGlobal::GetRscString( STR_UNDO_CUT ) ); - DeleteMarked(); // auf dieser View - von der 505f Umstellung nicht betroffen + DeleteMarked(); // auf dieser View - von der 505f Umstellung nicht betroffen EndUndo(); } @@ -403,11 +403,11 @@ void ScDrawView::MarkListHasChanged() { pViewSh->Unmark(); // remove cell selection - // #65379# end cell edit mode if drawing objects are selected + // #65379# end cell edit mode if drawing objects are selected SC_MOD()->InputEnterHandler(); } - // IP deaktivieren + // IP deaktivieren ScModule* pScMod = SC_MOD(); bool bUnoRefDialog = pScMod->IsRefDialogOpen() && pScMod->GetCurRefDlgId() == WID_SIMPLE_REF; @@ -415,14 +415,14 @@ void ScDrawView::MarkListHasChanged() ScClient* pClient = (ScClient*) pViewSh->GetIPClient(); if ( pClient && pClient->IsObjectInPlaceActive() && !bUnoRefDialog ) { - // #41730# beim ViewShell::Activate aus dem Reset2Open nicht die Handles anzeigen + // #41730# beim ViewShell::Activate aus dem Reset2Open nicht die Handles anzeigen //HMHbDisableHdl = TRUE; pClient->DeactivateObject(); //HMHbDisableHdl = FALSE; - // Image-Ole wieder durch Grafik ersetzen passiert jetzt in ScClient::UIActivate + // Image-Ole wieder durch Grafik ersetzen passiert jetzt in ScClient::UIActivate } - // Ole-Objekt selektiert? + // Ole-Objekt selektiert? SdrOle2Obj* pOle2Obj = NULL; SdrGrafObj* pGrafObj = NULL; @@ -433,7 +433,7 @@ void ScDrawView::MarkListHasChanged() if ( nMarkCount == 0 && !pViewData->GetViewShell()->IsDrawSelMode() && !bInConstruct ) { - // relock layers that may have been unlocked before + // relock layers that may have been unlocked before LockBackgroundLayer(); LockInternalLayer(); } @@ -464,9 +464,9 @@ void ScDrawView::MarkListHasChanged() bSubShellSet = TRUE; } else if (pObj->GetObjIdentifier() != OBJ_TEXT // Verhindern, das beim Anlegen - || !pViewSh->IsDrawTextShell()) // eines TextObjekts auf die - { // DrawShell umgeschaltet wird. - pViewSh->SetDrawShell(TRUE); //@#70206# + || !pViewSh->IsDrawTextShell()) // eines TextObjekts auf die + { // DrawShell umgeschaltet wird. + pViewSh->SetDrawShell(TRUE); //@#70206# } } @@ -483,8 +483,8 @@ void ScDrawView::MarkListHasChanged() ULONG nListCount = pLst->GetObjCount(); if ( nListCount == 0 ) { - // #104156# An empty group (may occur during Undo) is no control or graphics object. - // Creating the form shell during undo would lead to problems with the undo manager. + // #104156# An empty group (may occur during Undo) is no control or graphics object. + // Creating the form shell during undo would lead to problems with the undo manager. bOnlyControls = FALSE; bOnlyGraf = FALSE; } @@ -513,7 +513,7 @@ void ScDrawView::MarkListHasChanged() if(bOnlyControls) { - pViewSh->SetDrawFormShell(TRUE); // jetzt UNO-Controls + pViewSh->SetDrawFormShell(TRUE); // jetzt UNO-Controls } else if(bOnlyGraf) { @@ -527,7 +527,7 @@ void ScDrawView::MarkListHasChanged() - // Verben anpassen + // Verben anpassen SfxViewFrame* pViewFrame = pViewSh->GetViewFrame(); BOOL bOle = pViewSh->GetViewFrame()->GetFrame().IsInPlace(); @@ -545,14 +545,14 @@ void ScDrawView::MarkListHasChanged() else pViewSh->SetVerbs( 0 ); - // Image-Map Editor + // Image-Map Editor if ( pOle2Obj ) UpdateIMap( pOle2Obj ); else if ( pGrafObj ) UpdateIMap( pGrafObj ); - InvalidateAttribs(); // nach dem IMap-Editor Update + InvalidateAttribs(); // nach dem IMap-Editor Update InvalidateDrawTextAttrs(); for(sal_uInt32 a(0L); a < PaintWindowCount(); a++) @@ -566,8 +566,8 @@ void ScDrawView::MarkListHasChanged() } } - // uno object for view returns drawing objects as selection, - // so it must notify its SelectionChangeListeners + // uno object for view returns drawing objects as selection, + // so it must notify its SelectionChangeListeners if (pViewFrame) { @@ -581,7 +581,7 @@ void ScDrawView::MarkListHasChanged() } } - // update selection transfer object + // update selection transfer object pViewSh->CheckSelectionTransfer(); @@ -592,10 +592,10 @@ void __EXPORT ScDrawView::ModelHasChanged() SdrObject* pEditObj = GetTextEditObject(); if ( pEditObj && !pEditObj->IsInserted() && pViewData ) { - // #111700# SdrObjEditView::ModelHasChanged will end text edit in this case, - // so make sure the EditEngine's undo manager is no longer used. + // #111700# SdrObjEditView::ModelHasChanged will end text edit in this case, + // so make sure the EditEngine's undo manager is no longer used. pViewData->GetViewShell()->SetDrawTextUndo(NULL); - SetCreateMode(); // don't leave FuText in a funny state + SetCreateMode(); // don't leave FuText in a funny state } FmFormView::ModelHasChanged(); @@ -605,8 +605,8 @@ void __EXPORT ScDrawView::UpdateUserViewOptions() { if (pViewData) { - const ScViewOptions& rOpt = pViewData->GetOptions(); - const ScGridOptions& rGrid = rOpt.GetGridOptions(); + const ScViewOptions& rOpt = pViewData->GetOptions(); + const ScGridOptions& rGrid = rOpt.GetGridOptions(); BOOL bBigHdl = rOpt.GetOption( VOPT_BIGHANDLES ); @@ -618,8 +618,8 @@ void __EXPORT ScDrawView::UpdateUserViewOptions() SetSnapEnabled( rGrid.GetUseGridSnap() ); SetGridSnap( rGrid.GetUseGridSnap() ); - // Snap from grid options is no longer used -// SetSnapGrid( Size( rGrid.GetFldSnapX(), rGrid.GetFldSnapY() ) ); + // Snap from grid options is no longer used +// SetSnapGrid( Size( rGrid.GetFldSnapX(), rGrid.GetFldSnapY() ) ); Fraction aFractX( rGrid.GetFldDrawX(), rGrid.GetFldDivisionX() + 1 ); Fraction aFractY( rGrid.GetFldDrawY(), rGrid.GetFldDivisionY() + 1 ); @@ -642,7 +642,7 @@ BOOL ScDrawView::SelectObject( const String& rName ) SCTAB nObjectTab = 0; SdrObject* pFound = NULL; - SfxObjectShell* pShell = pDoc->GetDocumentShell(); + SfxObjectShell* pShell = pDoc->GetDocumentShell(); if (pShell) { SdrModel* pDrawLayer = GetModel(); @@ -671,7 +671,7 @@ BOOL ScDrawView::SelectObject( const String& rName ) if ( pFound ) { ScTabView* pView = pViewData->GetView(); - if ( nObjectTab != nTab ) // Tabelle umschalten + if ( nObjectTab != nTab ) // Tabelle umschalten pView->SetTabNo( nObjectTab ); DBG_ASSERT( nTab == nObjectTab, "Tabellen umschalten hat nicht geklappt" ); @@ -699,8 +699,8 @@ BOOL ScDrawView::SelectObject( const String& rName ) bool ScDrawView::InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions) { - // Markierung nicht aendern, wenn Ole-Objekt aktiv - // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!) + // Markierung nicht aendern, wenn Ole-Objekt aktiv + // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!) if (pViewData) { @@ -736,8 +736,8 @@ void ScDrawView::LockCalcLayer( SdrLayerID nLayer, bool bLock ) void __EXPORT ScDrawView::MakeVisible( const Rectangle& rRect, Window& rWin ) { - //! rWin richtig auswerten - //! ggf Zoom aendern + //! rWin richtig auswerten + //! ggf Zoom aendern if ( pViewData && pViewData->GetActiveWin() == &rWin ) pViewData->GetView()->MakeVisible( rRect ); @@ -788,7 +788,7 @@ SdrEndTextEditKind ScDrawView::ScEndTextEdit() SdrEndTextEditKind eKind = SdrEndTextEdit(); if ( bIsTextEdit && pViewData ) - pViewData->GetViewShell()->SetDrawTextUndo(NULL); // "normaler" Undo-Manager + pViewData->GetViewShell()->SetDrawTextUndo(NULL); // "normaler" Undo-Manager return eKind; } diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 01e5b5a9a3b1..bc038a01e449 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -107,11 +107,11 @@ SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL)) ScEditShell::ScEditShell(EditView* pView, ScViewData* pData) : - pEditView (pView), - pViewData (pData), - pClipEvtLstnr (NULL), - bPastePossible (FALSE), - bIsInsertMode (TRUE) + pEditView (pView), + pViewData (pData), + pClipEvtLstnr (NULL), + bPastePossible (FALSE), + bIsInsertMode (TRUE) { SetPool( pEditView->GetEditEngine()->GetEmptyItemSet().GetPool() ); SetUndoManager( &pEditView->GetEditEngine()->GetUndoManager() ); @@ -156,7 +156,7 @@ void lcl_RemoveAttribs( EditView& rEditView ) pEngine->GetUndoManager().EnterListAction( aName, aName ); rEditView.RemoveAttribs(TRUE); - pEngine->RepeatDefaults(); // #97226# paragraph attributes from cell formats must be preserved + pEngine->RepeatDefaults(); // #97226# paragraph attributes from cell formats must be preserved pEngine->GetUndoManager().LeaveListAction(); @@ -174,14 +174,14 @@ void lclInsertCharacter( EditView* pTableView, EditView* pTopView, sal_Unicode c void ScEditShell::Execute( SfxRequest& rReq ) { - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); - SfxBindings& rBindings = pViewData->GetBindings(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); + SfxBindings& rBindings = pViewData->GetBindings(); ScInputHandler* pHdl = GetMyInputHdl(); DBG_ASSERT(pHdl,"kein ScInputHandler"); - EditView* pTopView = pHdl->GetTopView(); // hat Eingabezeile den Focus? + EditView* pTopView = pHdl->GetTopView(); // hat Eingabezeile den Focus? EditView* pTableView = pHdl->GetTableView(); DBG_ASSERT(pTableView,"no EditView :-("); @@ -230,7 +230,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) ReplaceTextWithSynonym( *pEditView, aReplaceText ); } break; - + case SID_COPY: pTableView->Copy(); break; @@ -253,7 +253,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) pTopView->DeleteSelected(); break; - case SID_CELL_FORMAT_RESET: // "Standard" + case SID_CELL_FORMAT_RESET: // "Standard" lcl_RemoveAttribs( *pTableView ); if ( pTopView ) lcl_RemoveAttribs( *pTopView ); @@ -384,7 +384,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) if ( aString.Len() ) { - // if string contains WEAK characters, set all fonts + // if string contains WEAK characters, set all fonts BYTE nSetScript; ScDocument* pDoc = pViewData->GetDocument(); if ( pDoc->HasStringWeakCharacters( aString ) ) @@ -397,7 +397,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) aSetItem.PutItemForScriptType( nSetScript, aNewItem ); aSet.Put( aSetItem.GetItemSet(), FALSE ); - // SetAttribs an der View selektiert ein Wort, wenn nichts selektiert ist + // SetAttribs an der View selektiert ein Wort, wenn nichts selektiert ist pTableView->GetEditEngine()->QuickSetAttribs( aSet, pTableView->GetSelection() ); pTableView->InsertText(aString); if (pTopView) @@ -419,7 +419,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) case FID_INSERT_NAME: { - ScDocument* pDoc = pViewData->GetDocument(); + ScDocument* pDoc = pViewData->GetDocument(); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); @@ -488,7 +488,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) if (pEngine->GetParagraphCount() == 1) { String aText = pEngine->GetText(); - ESelection aSel = pEditView->GetSelection(); // aktuelle View + ESelection aSel = pEditView->GetSelection(); // aktuelle View ScRefFinder aFinder( aText, pViewData->GetDocument() ); aFinder.ToggleRel( aSel.nStartPos, aSel.nEndPos ); @@ -505,7 +505,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) } bOk = TRUE; - // Referenz wird selektiert -> beim Tippen nicht ueberschreiben + // Referenz wird selektiert -> beim Tippen nicht ueberschreiben bSetSelIsRef = TRUE; } } @@ -521,9 +521,9 @@ void ScEditShell::Execute( SfxRequest& rReq ) if ( pReqArgs->GetItemState( SID_HYPERLINK_SETLINK, TRUE, &pItem ) == SFX_ITEM_SET ) { const SvxHyperlinkItem* pHyper = (const SvxHyperlinkItem*) pItem; - const String& rName = pHyper->GetName(); - const String& rURL = pHyper->GetURL(); - const String& rTarget = pHyper->GetTargetFrame(); + const String& rName = pHyper->GetName(); + const String& rURL = pHyper->GetURL(); + const String& rTarget = pHyper->GetTargetFrame(); SvxLinkInsertMode eMode = pHyper->GetInsertMode(); BOOL bDone = FALSE; @@ -532,7 +532,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) const SvxURLField* pURLField = GetURLField(); if ( pURLField ) { - // altes Feld selektieren + // altes Feld selektieren ESelection aSel = pTableView->GetSelection(); aSel.Adjust(); @@ -540,15 +540,15 @@ void ScEditShell::Execute( SfxRequest& rReq ) aSel.nEndPos = aSel.nStartPos + 1; pTableView->SetSelection( aSel ); - // neues Feld einfuegen + // neues Feld einfuegen SvxURLField aURLField( rURL, rName, SVXURLFORMAT_REPR ); aURLField.SetTargetFrame( rTarget ); SvxFieldItem aURLItem( aURLField, EE_FEATURE_FIELD ); pTableView->InsertField( aURLItem ); - pTableView->SetSelection( aSel ); // select inserted field + pTableView->SetSelection( aSel ); // select inserted field - // #57254# jetzt doch auch Felder in der Top-View + // #57254# jetzt doch auch Felder in der Top-View if ( pTopView ) { @@ -557,7 +557,7 @@ void ScEditShell::Execute( SfxRequest& rReq ) aSel.nEndPos = aSel.nStartPos + 1; pTopView->SetSelection( aSel ); pTopView->InsertField( aURLItem ); - pTopView->SetSelection( aSel ); // select inserted field + pTopView->SetSelection( aSel ); // select inserted field } bDone = TRUE; @@ -569,8 +569,8 @@ void ScEditShell::Execute( SfxRequest& rReq ) pViewData->GetViewShell()-> InsertURL( rName, rURL, rTarget, (USHORT) eMode ); - // InsertURL an der ViewShell schaltet bei "Button" - // die EditShell ab, darum sofort return + // InsertURL an der ViewShell schaltet bei "Button" + // die EditShell ab, darum sofort return return; } @@ -637,7 +637,7 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet ) return; } - ScInputHandler* pHdl = GetMyInputHdl(); + ScInputHandler* pHdl = GetMyInputHdl(); EditView* pActiveView = pHdl ? pHdl->GetActiveView() : pEditView; SfxWhichIter aIter( rSet ); @@ -646,7 +646,7 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet ) { switch (nWhich) { - case SID_ATTR_INSERT: // Statuszeile + case SID_ATTR_INSERT: // Statuszeile { if ( pActiveView ) rSet.Put( SfxBoolItem( nWhich, pActiveView->IsInsertMode() ) ); @@ -708,7 +708,7 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet ) rSet.DisableItem( SID_THES ); } break; - + } nWhich = aIter.NextWhich(); @@ -717,11 +717,11 @@ void __EXPORT ScEditShell::GetState( SfxItemSet& rSet ) const SvxURLField* ScEditShell::GetURLField() { - ScInputHandler* pHdl = GetMyInputHdl(); + ScInputHandler* pHdl = GetMyInputHdl(); EditView* pActiveView = pHdl ? pHdl->GetActiveView() : pEditView; if ( pActiveView ) { - const SvxFieldItem* pFieldItem = pActiveView->GetFieldAtSelection(); + const SvxFieldItem* pFieldItem = pActiveView->GetFieldAtSelection(); if (pFieldItem) { const SvxFieldData* pField = pFieldItem->GetField(); @@ -806,10 +806,10 @@ void lcl_InvalidateUnder( SfxBindings& rBindings ) void ScEditShell::ExecuteAttr(SfxRequest& rReq) { - SfxItemSet aSet( pEditView->GetEmptyItemSet() ); - SfxBindings& rBindings = pViewData->GetBindings(); - const SfxItemSet* pArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + SfxItemSet aSet( pEditView->GetEmptyItemSet() ); + SfxBindings& rBindings = pViewData->GetBindings(); + const SfxItemSet* pArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); switch ( nSlot ) { @@ -846,7 +846,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) } break; - // Toggles + // Toggles case SID_ATTR_CHAR_WEIGHT: { @@ -899,7 +899,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) lcl_InvalidateUnder( rBindings ); break; - case SID_ATTR_CHAR_UNDERLINE: // Toggles + case SID_ATTR_CHAR_UNDERLINE: // Toggles case SID_ULINE_VAL_SINGLE: case SID_ULINE_VAL_DOUBLE: case SID_ULINE_VAL_DOTTED: @@ -987,7 +987,7 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) } // - // anwenden + // anwenden // EditEngine* pEngine = pEditView->GetEditEngine(); @@ -1016,7 +1016,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) SfxItemSet aAttribs = pEditView->GetAttribs(); rSet.Put( aAttribs ); - // choose font info according to selection script type + // choose font info according to selection script type USHORT nScript = pEditView->GetSelectedScriptType(); if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType(); @@ -1040,7 +1040,7 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) if ( rSet.GetItemState( EE_CHAR_ITALIC ) != SFX_ITEM_UNKNOWN ) ScViewUtil::PutItemScript( rSet, aAttribs, EE_CHAR_ITALIC, nScript ); - // Unterstreichung + // Unterstreichung SfxItemState eState = aAttribs.GetItemState( EE_CHAR_UNDERLINE, TRUE ); if ( eState == SFX_ITEM_DONTCARE ) @@ -1057,19 +1057,19 @@ void ScEditShell::GetAttrState(SfxItemSet &rSet) USHORT nId = SID_ULINE_VAL_NONE; switch (eUnderline) { - case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break; - case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break; - case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break; + case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break; + case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break; + case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break; default: break; } rSet.Put( SfxBoolItem( nId, TRUE ) ); } - //! Testen, ob Klammer-Hervorhebung aktiv ist !!!! + //! Testen, ob Klammer-Hervorhebung aktiv ist !!!! ScInputHandler* pHdl = GetMyInputHdl(); if ( pHdl && pHdl->IsFormulaMode() ) - rSet.ClearItem( EE_CHAR_WEIGHT ); // hervorgehobene Klammern hier nicht + rSet.ClearItem( EE_CHAR_WEIGHT ); // hervorgehobene Klammern hier nicht } String ScEditShell::GetSelectionText( BOOL bWholeWord ) @@ -1099,11 +1099,11 @@ String ScEditShell::GetSelectionText( BOOL bWholeWord ) void ScEditShell::ExecuteUndo(SfxRequest& rReq) { - // #81733# Undo must be handled here because it's called for both EditViews + // #81733# Undo must be handled here because it's called for both EditViews ScInputHandler* pHdl = GetMyInputHdl(); DBG_ASSERT(pHdl,"no ScInputHandler"); - EditView* pTopView = pHdl->GetTopView(); + EditView* pTopView = pHdl->GetTopView(); EditView* pTableView = pHdl->GetTableView(); DBG_ASSERT(pTableView,"no EditView"); @@ -1148,7 +1148,7 @@ void ScEditShell::ExecuteUndo(SfxRequest& rReq) void ScEditShell::GetUndoState(SfxItemSet &rSet) { - // Undo state is taken from normal ViewFrame state function + // Undo state is taken from normal ViewFrame state function SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); if ( pViewFrm && GetUndoManager() ) @@ -1162,7 +1162,7 @@ void ScEditShell::GetUndoState(SfxItemSet &rSet) } } - // disable if no action in input line EditView + // disable if no action in input line EditView ScInputHandler* pHdl = GetMyInputHdl(); DBG_ASSERT(pHdl,"no ScInputHandler"); @@ -1185,7 +1185,7 @@ void ScEditShell::ExecuteTrans( SfxRequest& rReq ) ScInputHandler* pHdl = GetMyInputHdl(); DBG_ASSERT( pHdl, "no ScInputHandler" ); - EditView* pTopView = pHdl->GetTopView(); + EditView* pTopView = pHdl->GetTopView(); EditView* pTableView = pHdl->GetTableView(); DBG_ASSERT( pTableView, "no EditView" ); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 6b71dbc61514..599e800762ce 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,7 +103,7 @@ #define ScFormatShell -#define TableFont +#define TableFont #define FormatForSelection #include "scslots.hxx" @@ -160,7 +160,7 @@ ScFormatShell::ScFormatShell(ScViewData* pData) : SfxShell(pData->GetViewShell()), pViewData(pData) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); SetPool( &pTabViewShell->GetPool() ); SfxUndoManager* pMgr = pViewData->GetSfxDocShell()->GetUndoManager(); @@ -181,19 +181,19 @@ ScFormatShell::~ScFormatShell() void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet ) { - ScDocument* pDoc = GetViewData()->GetDocument(); - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); + ScDocument* pDoc = GetViewData()->GetDocument(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); BOOL bProtected = FALSE; SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB i=0; i<nTabCount; i++) - if (pDoc->IsTabProtected(i)) // ueberhaupt eine Tabelle geschuetzt? + if (pDoc->IsTabProtected(i)) // ueberhaupt eine Tabelle geschuetzt? bProtected = TRUE; - SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); - USHORT nSlotId = 0; + SfxWhichIter aIter(rSet); + USHORT nWhich = aIter.FirstWhich(); + USHORT nSlotId = 0; while ( nWhich ) { @@ -208,7 +208,7 @@ void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet ) rSet.DisableItem( nSlotId ); break; - case SID_STYLE_FAMILY2: // Zellvorlagen + case SID_STYLE_FAMILY2: // Zellvorlagen { SfxStyleSheet* pStyleSheet = (SfxStyleSheet*) pTabViewShell->GetStyleSheetFromMarked(); @@ -220,11 +220,11 @@ void __EXPORT ScFormatShell::GetStyleState( SfxItemSet& rSet ) } break; - case SID_STYLE_FAMILY4: // Seitenvorlagen + case SID_STYLE_FAMILY4: // Seitenvorlagen { - SCTAB nCurTab = GetViewData()->GetTabNo(); - String aPageStyle = pDoc->GetPageStyle( nCurTab ); - SfxStyleSheet* pStyleSheet = (SfxStyleSheet*)pStylePool-> + SCTAB nCurTab = GetViewData()->GetTabNo(); + String aPageStyle = pDoc->GetPageStyle( nCurTab ); + SfxStyleSheet* pStyleSheet = (SfxStyleSheet*)pStylePool-> Find( aPageStyle, SFX_STYLE_FAMILY_PAGE ); if ( pStyleSheet ) @@ -283,17 +283,17 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) } //-------------------------------------------------------------------- - SfxBindings& rBindings = pViewData->GetBindings(); - const SfxItemSet* pArgs = rReq.GetArgs(); - const USHORT nSlotId = rReq.GetSlot(); - const SCTAB nCurTab = GetViewData()->GetTabNo(); - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScTabViewShell* pTabViewShell= GetViewData()->GetViewShell(); - ScDocument* pDoc = pDocSh->GetDocument(); - ScMarkData& rMark = GetViewData()->GetMarkData(); - ScModule* pScMod = SC_MOD(); - String aRefName; - BOOL bUndo = pDoc->IsUndoEnabled(); + SfxBindings& rBindings = pViewData->GetBindings(); + const SfxItemSet* pArgs = rReq.GetArgs(); + const USHORT nSlotId = rReq.GetSlot(); + const SCTAB nCurTab = GetViewData()->GetTabNo(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScTabViewShell* pTabViewShell= GetViewData()->GetViewShell(); + ScDocument* pDoc = pDocSh->GetDocument(); + ScMarkData& rMark = GetViewData()->GetMarkData(); + ScModule* pScMod = SC_MOD(); + String aRefName; + BOOL bUndo = pDoc->IsUndoEnabled(); if ( (nSlotId == SID_STYLE_NEW) || (nSlotId == SID_STYLE_EDIT) @@ -304,13 +304,13 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) || (nSlotId == SID_STYLE_NEW_BY_EXAMPLE) || (nSlotId == SID_STYLE_UPDATE_BY_EXAMPLE) ) { - SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); + SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); SfxStyleSheetBase* pStyleSheet = NULL; BOOL bStyleToMarked = FALSE; BOOL bListAction = FALSE; - BOOL bAddUndo = FALSE; // add ScUndoModifyStyle (style modified) - ScStyleSaveData aOldData; // for undo/redo + BOOL bAddUndo = FALSE; // add ScUndoModifyStyle (style modified) + ScStyleSaveData aOldData; // for undo/redo ScStyleSaveData aNewData; SfxStyleFamily eFamily = SFX_STYLE_FAMILY_PARA; @@ -493,18 +493,18 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) // muss noch darauf geachtet werden, Items aus Vorlagen nicht // zu uebernehmen (GetSelectionPattern sammelt auch Items aus // Vorlagen zusammen) (#44748#) - // pAttrItem = GetSelectionPattern(); + // pAttrItem = GetSelectionPattern(); // ScViewData* pViewData = GetViewData(); - SCCOL nCol = pViewData->GetCurX(); - SCROW nRow = pViewData->GetCurY(); + SCCOL nCol = pViewData->GetCurX(); + SCROW nRow = pViewData->GetCurY(); pAttrItem = pDoc->GetPattern( nCol, nRow, nCurTab ); SfxItemSet aAttrSet = pAttrItem->GetItemSet(); aAttrSet.ClearItem( ATTR_MERGE ); aAttrSet.ClearItem( ATTR_MERGE_FLAG ); - // bedingte Formatierung und Gueltigkeit nicht uebernehmen, - // weil sie in der Vorlage nicht editiert werden koennen + // bedingte Formatierung und Gueltigkeit nicht uebernehmen, + // weil sie in der Vorlage nicht editiert werden koennen aAttrSet.ClearItem( ATTR_VALIDDATA ); aAttrSet.ClearItem( ATTR_CONDITIONAL ); @@ -517,8 +517,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) bListAction = TRUE; } - BOOL bConvertBack = FALSE; - SfxStyleSheet* pSheetInUse = (SfxStyleSheet*) + BOOL bConvertBack = FALSE; + SfxStyleSheet* pSheetInUse = (SfxStyleSheet*) pTabViewShell->GetStyleSheetFromMarked(); // wenn neuer Style vorhanden und in der Selektion @@ -560,8 +560,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) pStyleSheet->GetItemSet().Put( aAttrSet ); pTabViewShell->UpdateStyleSheetInUse( (SfxStyleSheet*)pStyleSheet ); - // call SetStyleSheetToMarked after adding the ScUndoModifyStyle - // (pStyleSheet pointer is used!) + // call SetStyleSheetToMarked after adding the ScUndoModifyStyle + // (pStyleSheet pointer is used!) bStyleToMarked = TRUE; } else // ( nSlotId == SID_STYLE_UPDATE_BY_EXAMPLE ) @@ -582,8 +582,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) pStyleSheet->GetItemSet().Put( aAttrSet ); pTabViewShell->UpdateStyleSheetInUse( (SfxStyleSheet*)pStyleSheet ); - // call SetStyleSheetToMarked after adding the ScUndoModifyStyle - // (pStyleSheet pointer is used!) + // call SetStyleSheetToMarked after adding the ScUndoModifyStyle + // (pStyleSheet pointer is used!) bStyleToMarked = TRUE; } } @@ -664,10 +664,10 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) if ( rStrCurStyle != aStyleName ) { - SfxStyleSheetBase* pCurStyle = pStylePool->Find( rStrCurStyle, eFamily ); - SfxItemSet aAttrSet = pCurStyle->GetItemSet(); - SCTAB nInTab; - BOOL bUsed = pDoc->IsPageStyleInUse( aStyleName, &nInTab ); + SfxStyleSheetBase* pCurStyle = pStylePool->Find( rStrCurStyle, eFamily ); + SfxItemSet aAttrSet = pCurStyle->GetItemSet(); + SCTAB nInTab; + BOOL bUsed = pDoc->IsPageStyleInUse( aStyleName, &nInTab ); // wenn bereits vorhanden, erstmal entfernen... if ( pStyleSheet ) @@ -710,11 +710,11 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { SvxNumberInfoItem* pNumberInfoItem = NULL; - SfxStyleFamily eFam = pStyleSheet->GetFamily(); + SfxStyleFamily eFam = pStyleSheet->GetFamily(); SfxAbstractTabDialog* pDlg = NULL; - USHORT nRsc = 0; + USHORT nRsc = 0; - // #37034#/#37245# alte Items aus der Vorlage merken + // #37034#/#37245# alte Items aus der Vorlage merken SfxItemSet aOldSet = pStyleSheet->GetItemSet(); String aOldName = pStyleSheet->GetName(); @@ -756,14 +756,14 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) pDocSh->PutItem( *pNumberInfoItem ); nRsc = RID_SCDLG_STYLES_PAR; - // auf jeden Fall ein SvxBoxInfoItem mit Table = FALSE im Set: - // (wenn gar kein Item da ist, loescht der Dialog auch das - // BORDER_OUTER SvxBoxItem aus dem Vorlagen-Set) + // auf jeden Fall ein SvxBoxInfoItem mit Table = FALSE im Set: + // (wenn gar kein Item da ist, loescht der Dialog auch das + // BORDER_OUTER SvxBoxItem aus dem Vorlagen-Set) if ( rSet.GetItemState( ATTR_BORDER_INNER, FALSE ) != SFX_ITEM_SET ) { SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER ); - aBoxInfoItem.SetTable(FALSE); // keine inneren Linien + aBoxInfoItem.SetTable(FALSE); // keine inneren Linien aBoxInfoItem.SetDist(TRUE); aBoxInfoItem.SetMinDist(FALSE); rSet.Put( aBoxInfoItem ); @@ -772,18 +772,18 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) break; } - // If GetDefDialogParent is a dialog, it must be used - // (style catalog) + // If GetDefDialogParent is a dialog, it must be used + // (style catalog) Window* pParent = Application::GetDefDialogParent(); if ( !pParent || !pParent->IsDialog() ) { - // #107256# GetDefDialogParent currently doesn't return the window - // that was set with SetDefDialogParent (but dynamically finds the - // topmost parent of the focus window), so IsDialog above is FALSE - // even if called from the style catalog. - // -> Use NULL if a modal dialog is open, to enable the Dialog's - // default parent handling. + // #107256# GetDefDialogParent currently doesn't return the window + // that was set with SetDefDialogParent (but dynamically finds the + // topmost parent of the focus window), so IsDialog above is FALSE + // even if called from the style catalog. + // -> Use NULL if a modal dialog is open, to enable the Dialog's + // default parent handling. if ( Application::IsInModalMode() ) pParent = NULL; else @@ -808,12 +808,12 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { nRetMask = pStyleSheet->GetMask(); - // #37034#/#37245# Attribut-Vergleiche (frueher in ModifyStyleSheet) - // jetzt hier mit den alten Werten (Style ist schon veraendert) + // #37034#/#37245# Attribut-Vergleiche (frueher in ModifyStyleSheet) + // jetzt hier mit den alten Werten (Style ist schon veraendert) if ( SFX_STYLE_FAMILY_PARA == eFam ) { -// pDoc->CellStyleChanged( *pStyleSheet, aOldSet ); +// pDoc->CellStyleChanged( *pStyleSheet, aOldSet ); SfxItemSet& rNewSet = pStyleSheet->GetItemSet(); BOOL bNumFormatChanged; @@ -844,7 +844,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) } else { - //! auch fuer Seitenvorlagen die Abfragen hier + //! auch fuer Seitenvorlagen die Abfragen hier String aNewName = pStyleSheet->GetName(); if ( aNewName != aOldName && @@ -880,8 +880,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) pStylePool->Remove( pStyleSheet ); else { - // falls zwischendurch etwas mit dem temporaer geaenderten - // ItemSet gepainted wurde: + // falls zwischendurch etwas mit dem temporaer geaenderten + // ItemSet gepainted wurde: pDocSh->PostPaintGridAll(); } } @@ -889,7 +889,7 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) } } -// if ( nRetMask != 0xffff )// Irgendein Wert MUSS geliefert werden JN +// if ( nRetMask != 0xffff )// Irgendein Wert MUSS geliefert werden JN rReq.SetReturnValue( SfxUInt16Item( nSlotId, nRetMask ) ); // #96983# only stylist sends focus to sheet @@ -902,8 +902,8 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) if ( bStyleToMarked ) { - // call SetStyleSheetToMarked after adding the ScUndoModifyStyle, - // so redo will find the modified style + // call SetStyleSheetToMarked after adding the ScUndoModifyStyle, + // so redo will find the modified style pTabViewShell->SetStyleSheetToMarked( (SfxStyleSheet*)pStyleSheet ); pTabViewShell->InvalidateAttribs(); } @@ -919,13 +919,13 @@ void __EXPORT ScFormatShell::ExecuteStyle( SfxRequest& rReq ) void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) { - ScModule* pScMod = SC_MOD(); - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + ScModule* pScMod = SC_MOD(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); SfxBindings& rBindings = pTabViewShell->GetViewFrame()->GetBindings(); - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox // Eingabe beenden if ( GetViewData()->HasEditView( GetViewData()->GetActivePart() ) ) @@ -961,7 +961,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) switch ( nSlot ) { case SID_NUMBER_TWODEC: - pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER, 4 ); // Standard+4 = #.##0,00 + pTabViewShell->SetNumberFormat( NUMBERFORMAT_NUMBER, 4 ); // Standard+4 = #.##0,00 rReq.Done(); break; case SID_NUMBER_SCIENTIFIC: @@ -1063,7 +1063,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) //------------------------------------------------------------------ #define APPLY_HOR_JUSTIFY(j) \ - { \ + { \ if ( !pHorJustify || (eHorJustify != (j) ) ) \ pTabViewShell->ApplyAttr( SvxHorJustifyItem( (j) ) ); \ else \ @@ -1071,7 +1071,7 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) } #define APPLY_VER_JUSTIFY(j) \ - { \ + { \ if ( !pVerJustify || (eVerJustify != (j) ) ) \ pTabViewShell->ApplyAttr( SvxVerJustifyItem( (j) ) ); \ else \ @@ -1080,12 +1080,12 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = pViewData->GetBindings(); - const SfxItemSet* pSet = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SfxBindings& rBindings = pViewData->GetBindings(); + const SfxItemSet* pSet = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox switch( nSlot ) { @@ -1170,14 +1170,14 @@ void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = pViewData->GetBindings(); - const ScPatternAttr* pAttrs = pTabViewShell->GetSelectionPattern(); - const SfxItemSet* pSet = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); - SfxAllItemSet* pNewSet = 0; + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SfxBindings& rBindings = pViewData->GetBindings(); + const ScPatternAttr* pAttrs = pTabViewShell->GetSelectionPattern(); + const SfxItemSet* pSet = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); + SfxAllItemSet* pNewSet = 0; - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox if ( (nSlot == SID_ATTR_CHAR_WEIGHT) ||(nSlot == SID_ATTR_CHAR_POSTURE) @@ -1202,7 +1202,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) aSetItem.PutItemForScriptType( nScript, pSet->Get( ATTR_FONT_WEIGHT ) ); else { - // toggle manually + // toggle manually FontWeight eWeight = WEIGHT_BOLD; SvxScriptSetItem aOldSetItem( nSlot, rPool ); @@ -1229,7 +1229,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) aSetItem.PutItemForScriptType( nScript, pSet->Get( ATTR_FONT_POSTURE ) ); else { - // toggle manually + // toggle manually FontItalic eItalic = ITALIC_NORMAL; SvxScriptSetItem aOldSetItem( nSlot, rPool ); @@ -1277,7 +1277,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) case SID_ULINE_VAL_NONE: pTabViewShell->ApplyAttr( SvxUnderlineItem( UNDERLINE_NONE, ATTR_FONT_UNDERLINE ) ); break; - case SID_ULINE_VAL_SINGLE: // Toggles + case SID_ULINE_VAL_SINGLE: // Toggles case SID_ULINE_VAL_DOUBLE: case SID_ULINE_VAL_DOTTED: { @@ -1313,7 +1313,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) * Button ist gedrueckt */ - const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); + const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); const SfxPoolItem* pItem = NULL; const SvxHorJustifyItem* pHorJustify = NULL; const SvxVerJustifyItem* pVerJustify = NULL; @@ -1340,7 +1340,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_HOR_JUSTIFY_LEFT : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_LEFT ); +// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_LEFT ); //break; case SID_ALIGNRIGHT: @@ -1350,7 +1350,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_RIGHT ); +// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_RIGHT ); //break; case SID_ALIGNCENTERHOR: @@ -1360,7 +1360,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_HOR_JUSTIFY_CENTER : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_CENTER ); +// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_CENTER ); //break; case SID_ALIGNBLOCK: @@ -1370,7 +1370,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_HOR_JUSTIFY_BLOCK : SVX_HOR_JUSTIFY_STANDARD, SID_H_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_BLOCK ); +// APPLY_HOR_JUSTIFY( SVX_HOR_JUSTIFY_BLOCK ); //break; case SID_ALIGNTOP: @@ -1380,7 +1380,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_VER_JUSTIFY_TOP : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_TOP ); +// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_TOP ); //break; case SID_ALIGNBOTTOM: @@ -1390,7 +1390,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_VER_JUSTIFY_BOTTOM : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_BOTTOM ); +// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_BOTTOM ); //break; case SID_ALIGNCENTERVER: @@ -1400,7 +1400,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) SVX_VER_JUSTIFY_CENTER : SVX_VER_JUSTIFY_STANDARD, SID_V_ALIGNCELL ) ); ExecuteSlot( rReq, GetInterface() ); return; -// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_CENTER ); +// APPLY_VER_JUSTIFY( SVX_VER_JUSTIFY_CENTER ); //break; default: @@ -1410,7 +1410,7 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) } rBindings.Update(); -// rReq.Done(); +// rReq.Done(); if( pNewSet ) { @@ -1431,11 +1431,11 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SfxBindings& rBindings = pViewData->GetBindings(); - const SfxItemSet* pNewAttrs = rReq.GetArgs(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SfxBindings& rBindings = pViewData->GetBindings(); + const SfxItemSet* pNewAttrs = rReq.GetArgs(); - pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox + pTabViewShell->HideListBox(); // Autofilter-DropDown-Listbox if ( !pNewAttrs ) { @@ -1445,10 +1445,10 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) { case SID_ATTR_CHAR_FONT: case SID_ATTR_CHAR_FONTHEIGHT: - pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONT ); // wenn ToolBar vertikal + pTabViewShell->ExecuteCellFormatDlg( rReq, TP_FONT ); // wenn ToolBar vertikal break; - case SID_ATTR_ALIGN_LINEBREAK: // ohne Parameter als Toggle + case SID_ATTR_ALIGN_LINEBREAK: // ohne Parameter als Toggle { const ScPatternAttr* pAttrs = pTabViewShell->GetSelectionPattern(); BOOL bOld = ((const SfxBoolItem&)pAttrs->GetItem(ATTR_LINEBREAK)).GetValue(); @@ -1465,7 +1465,7 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) case SID_BACKGROUND_COLOR: { - // SID_BACKGROUND_COLOR without arguments -> set transparent background + // SID_BACKGROUND_COLOR without arguments -> set transparent background SvxBrushItem aBrushItem( (const SvxBrushItem&) pTabViewShell->GetSelectionPattern()-> @@ -1602,11 +1602,11 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) if ( pNewAttrs->GetItemState( ATTR_BORDER, TRUE, &pItem ) == SFX_ITEM_SET ) { - // #100959# The SvxFrameToolBoxControl toolbox controller uses a default - // SvxBorderLine (all widths 0) to mark the lines that should be set. - // Macro recording uses a SvxBoxItem with the real values (OutWidth > 0) - // or NULL pointers for no lines. - // -> Substitute existing lines with pDefLine only if widths are 0. + // #100959# The SvxFrameToolBoxControl toolbox controller uses a default + // SvxBorderLine (all widths 0) to mark the lines that should be set. + // Macro recording uses a SvxBoxItem with the real values (OutWidth > 0) + // or NULL pointers for no lines. + // -> Substitute existing lines with pDefLine only if widths are 0. SvxBoxItem aBoxItem ( *(const SvxBoxItem*)pItem ); if ( aBoxItem.GetTop() && aBoxItem.GetTop()->GetOutWidth() == 0 ) aBoxItem.SetLine( pDefLine, BOX_LINE_TOP ); @@ -1696,8 +1696,8 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) void ScFormatShell::GetAttrState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); const SvxBorderLine* pLine = pTabViewShell->GetDefaultFrameLine(); const SvxBrushItem& rBrushItem = (const SvxBrushItem&)rAttrSet.Get( ATTR_BACKGROUND ); SfxWhichIter aIter( rSet ); @@ -1705,8 +1705,8 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( rAttrSet, FALSE ); - // choose font info according to selection script type - BYTE nScript = 0; // GetSelectionScriptType never returns 0 + // choose font info according to selection script type + BYTE nScript = 0; // GetSelectionScriptType never returns 0 if ( rSet.GetItemState( ATTR_FONT ) != SFX_ITEM_UNKNOWN ) { if (!nScript) nScript = pTabViewShell->GetSelectionScriptType(); @@ -1737,7 +1737,7 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) rSet.Put( rBrushItem, GetPool().GetWhich(nWhich) ); } break; -/* case SID_ATTR_ALIGN_LINEBREAK: +/* case SID_ATTR_ALIGN_LINEBREAK: { const SfxBoolItem& rBreakItem = (const SfxBoolItem&)rAttrSet.Get( ATTR_LINEBREAK ); rSet.Put( rBreakItem, GetPool().GetWhich(nWhich) ); @@ -1753,12 +1753,12 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); rSet.Put( rAttrSet, FALSE ); // ItemStates mitkopieren - // choose font info according to selection script type - BYTE nScript = 0; // GetSelectionScriptType never returns 0 + // choose font info according to selection script type + BYTE nScript = 0; // GetSelectionScriptType never returns 0 if ( rSet.GetItemState( ATTR_FONT_WEIGHT ) != SFX_ITEM_UNKNOWN ) { if (!nScript) nScript = pTabViewShell->GetSelectionScriptType(); @@ -1771,7 +1771,7 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) } SfxItemState eState; -// const SfxPoolItem* pItem; +// const SfxPoolItem* pItem; //-------------------------------------------------------------------- // eigene Kontrolle ueber RadioButton-Funktionalitaet: @@ -1794,9 +1794,9 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) USHORT nId = SID_ULINE_VAL_NONE; switch (eUnderline) { - case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break; - case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break; - case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break; + case UNDERLINE_SINGLE: nId = SID_ULINE_VAL_SINGLE; break; + case UNDERLINE_DOUBLE: nId = SID_ULINE_VAL_DOUBLE; break; + case UNDERLINE_DOTTED: nId = SID_ULINE_VAL_DOTTED; break; default: break; } @@ -1811,11 +1811,11 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) const SvxVerJustifyItem* pVerJustify = NULL; SvxCellHorJustify eHorJustify = SVX_HOR_JUSTIFY_STANDARD; SvxCellVerJustify eVerJustify = SVX_VER_JUSTIFY_STANDARD; - USHORT nWhich = 0; - BOOL bJustifyStd = FALSE; - SfxBoolItem aBoolItem ( 0, TRUE ); + USHORT nWhich = 0; + BOOL bJustifyStd = FALSE; + SfxBoolItem aBoolItem ( 0, TRUE ); - eState = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY, TRUE, + eState = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY, TRUE, (const SfxPoolItem**)&pHorJustify ); switch ( eState ) { @@ -1872,10 +1872,10 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) else if ( bJustifyStd ) { aBoolItem.SetValue( FALSE ); - aBoolItem.SetWhich( SID_ALIGNLEFT ); rSet.Put( aBoolItem ); - aBoolItem.SetWhich( SID_ALIGNRIGHT ); rSet.Put( aBoolItem ); + aBoolItem.SetWhich( SID_ALIGNLEFT ); rSet.Put( aBoolItem ); + aBoolItem.SetWhich( SID_ALIGNRIGHT ); rSet.Put( aBoolItem ); aBoolItem.SetWhich( SID_ALIGNCENTERHOR ); rSet.Put( aBoolItem ); - aBoolItem.SetWhich( SID_ALIGNBLOCK ); rSet.Put( aBoolItem ); + aBoolItem.SetWhich( SID_ALIGNBLOCK ); rSet.Put( aBoolItem ); bJustifyStd = FALSE; } @@ -1936,8 +1936,8 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) else if ( bJustifyStd ) { aBoolItem.SetValue( FALSE ); - aBoolItem.SetWhich( SID_ALIGNTOP ); rSet.Put( aBoolItem ); - aBoolItem.SetWhich( SID_ALIGNBOTTOM ); rSet.Put( aBoolItem ); + aBoolItem.SetWhich( SID_ALIGNTOP ); rSet.Put( aBoolItem ); + aBoolItem.SetWhich( SID_ALIGNBOTTOM ); rSet.Put( aBoolItem ); aBoolItem.SetWhich( SID_ALIGNCENTERVER ); rSet.Put( aBoolItem ); } } @@ -1947,9 +1947,9 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) void ScFormatShell::GetBorderState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); - SvxBoxItem aBoxItem( ATTR_BORDER ); - SvxBoxInfoItem aInfoItem( ATTR_BORDER_INNER ); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + SvxBoxItem aBoxItem( ATTR_BORDER ); + SvxBoxInfoItem aInfoItem( ATTR_BORDER_INNER ); pTabViewShell->GetSelectionFrame( aBoxItem, aInfoItem ); @@ -1963,10 +1963,10 @@ void ScFormatShell::GetBorderState( SfxItemSet& rSet ) void ScFormatShell::GetAlignState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); - SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter(rSet); + USHORT nWhich = aIter.FirstWhich(); SvxCellHorJustify eHAlign = SVX_HOR_JUSTIFY_STANDARD; bool bHasHAlign = rAttrSet.GetItemState( ATTR_HOR_JUSTIFY ) != SFX_ITEM_DONTCARE; @@ -2012,7 +2012,7 @@ void ScFormatShell::GetAlignState( SfxItemSet& rSet ) void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) { - ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); + ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); ScDocument* pDoc = pViewData->GetDocument(); short nType = GetCurrentNumberFormatType(); @@ -2024,7 +2024,7 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) { case SID_NUMBER_FORMAT: { - String aFormatCode; // bleibt leer, wenn dont-care + String aFormatCode; // bleibt leer, wenn dont-care const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); if ( rAttrSet.GetItemState( ATTR_VALUE_FORMAT ) != SFX_ITEM_DONTCARE ) @@ -2127,7 +2127,7 @@ void ScFormatShell::GetTextDirectionState( SfxItemSet& rSet ) eBidiDir = EE_HTEXTDIR_L2R; } - SvtLanguageOptions aLangOpt; + SvtLanguageOptions aLangOpt; BOOL bDisableCTLFont = !aLangOpt.IsCTLFontEnabled(); BOOL bDisableVerticalText = !aLangOpt.IsVerticalTextEnabled(); diff --git a/sc/source/ui/view/galwrap.cxx b/sc/source/ui/view/galwrap.cxx index 2e5f8f831bad..ea36d2430d43 100644 --- a/sc/source/ui/view/galwrap.cxx +++ b/sc/source/ui/view/galwrap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -63,7 +63,7 @@ String GalleryGetFullPath() { GalleryExplorer* pGal = SVX_GALLERY(); DBG_ASSERT( pGal, "Wo ist die Gallery?" ); -// return pGal->GetPath().GetFull(); +// return pGal->GetPath().GetFull(); return pGal->GetURL().GetMainURL(INetURLObject::NO_DECODE); // URL as stored in GraphicLink must be encoded } diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx index 31dba191b2fd..2481d4fc18be 100644 --- a/sc/source/ui/view/gridmerg.cxx +++ b/sc/source/ui/view/gridmerg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,8 +44,8 @@ ScGridMerger::ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePix nCount( 0 ), bVertical( FALSE ) { - // optimize (DrawGrid) only for pixel MapMode, - // to avoid rounding errors + // optimize (DrawGrid) only for pixel MapMode, + // to avoid rounding errors bOptimize = ( pDev->GetMapMode().GetMapUnit() == MAP_PIXEL ); } @@ -59,8 +59,8 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos ) { if ( nCount ) { - // not first line - test fix position - // more than one previous line - test distance + // not first line - test fix position + // more than one previous line - test distance if ( nStart != nFixStart || nEnd != nFixEnd ) { @@ -68,8 +68,8 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos ) ( nStart == nFixEnd || nStart == nFixEnd + ( bVertical ? nOneY : nOneX ) ) ) { - // additional optimization: extend connected lines - // keep nCount at 1 + // additional optimization: extend connected lines + // keep nCount at 1 nFixEnd = nEnd; } else @@ -80,7 +80,7 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos ) nVarDiff = nPos - nVarStart; ++nCount; } - else if ( nPos != nVarStart + nCount * nVarDiff ) //! keep VarEnd? + else if ( nPos != nVarStart + nCount * nVarDiff ) //! keep VarEnd? Flush(); else ++nCount; @@ -88,7 +88,7 @@ void ScGridMerger::AddLine( long nStart, long nEnd, long nPos ) if ( !nCount ) { - // first line (or flushed above) - just store + // first line (or flushed above) - just store nFixStart = nStart; nFixEnd = nEnd; @@ -141,9 +141,9 @@ void ScGridMerger::Flush() long nVarEnd = nVarStart + ( nCount - 1 ) * nVarDiff; if ( nVarDiff < 0 ) { - // nVarDiff is negative in RTL layout mode - // Change the positions so DrawGrid is called with a positive distance - // (nVarStart / nVarDiff can be modified, aren't used after Flush) + // nVarDiff is negative in RTL layout mode + // Change the positions so DrawGrid is called with a positive distance + // (nVarStart / nVarDiff can be modified, aren't used after Flush) nVarDiff = -nVarDiff; long nTemp = nVarStart; diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index f0fc67c22b76..e765ebf0997f 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,8 +56,8 @@ #include <sot/formats.hxx> #include <sot/clsids.hxx> -#include <svx/svdview.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) -#include <editeng/outliner.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) +#include <svx/svdview.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) +#include <editeng/outliner.hxx> // fuer Command-Handler (COMMAND_INSERTTEXT) #include <svx/svditer.hxx> #include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx> @@ -92,10 +92,10 @@ #include "editutil.hxx" #include "scresid.hxx" #include "inputhdl.hxx" -#include "uiitems.hxx" // Filter-Dialog - auslagern !!! +#include "uiitems.hxx" // Filter-Dialog - auslagern !!! #include "filtdlg.hxx" -#include "impex.hxx" // Sylk-ID fuer CB -#include "cell.hxx" // fuer Edit-Felder +#include "impex.hxx" // Sylk-ID fuer CB +#include "cell.hxx" // fuer Edit-Felder #include "patattr.hxx" #include "notemark.hxx" #include "rfindlst.hxx" @@ -142,13 +142,13 @@ const BYTE SC_NESTEDBUTTON_NONE = 0; const BYTE SC_NESTEDBUTTON_DOWN = 1; const BYTE SC_NESTEDBUTTON_UP = 2; -#define SC_AUTOFILTER_ALL 0 -#define SC_AUTOFILTER_TOP10 1 -#define SC_AUTOFILTER_CUSTOM 2 +#define SC_AUTOFILTER_ALL 0 +#define SC_AUTOFILTER_TOP10 1 +#define SC_AUTOFILTER_CUSTOM 2 #define SC_AUTOFILTER_EMPTY 3 #define SC_AUTOFILTER_NOTEMPTY 4 -// Modi fuer die FilterListBox +// Modi fuer die FilterListBox enum ScFilterBoxMode { SC_FILTERBOX_FILTER, @@ -157,11 +157,11 @@ enum ScFilterBoxMode SC_FILTERBOX_PAGEFIELD }; -extern SfxViewShell* pScActiveViewShell; // global.cxx -extern USHORT nScClickMouseModifier; // global.cxx -extern USHORT nScFillModeMouseModifier; // global.cxx +extern SfxViewShell* pScActiveViewShell; // global.cxx +extern USHORT nScClickMouseModifier; // global.cxx +extern USHORT nScFillModeMouseModifier; // global.cxx -#define SC_FILTERLISTBOX_LINES 12 +#define SC_FILTERLISTBOX_LINES 12 // ============================================================================ @@ -180,36 +180,36 @@ bool ScGridWindow::VisibleRange::isInside(SCCOL nCol, SCROW nRow) const class ScFilterListBox : public ListBox { private: - ScGridWindow* pGridWin; - SCCOL nCol; - SCROW nRow; - BOOL bButtonDown; - BOOL bInit; - BOOL bCancelled; + ScGridWindow* pGridWin; + SCCOL nCol; + SCROW nRow; + BOOL bButtonDown; + BOOL bInit; + BOOL bCancelled; BOOL bInSelect; bool mbListHasDates; - ULONG nSel; - ScFilterBoxMode eMode; + ULONG nSel; + ScFilterBoxMode eMode; protected: - virtual void LoseFocus(); - void SelectHdl(); + virtual void LoseFocus(); + void SelectHdl(); public: ScFilterListBox( Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ); ~ScFilterListBox(); - virtual long PreNotify( NotifyEvent& rNEvt ); - virtual void Select(); + virtual long PreNotify( NotifyEvent& rNEvt ); + virtual void Select(); - SCCOL GetCol() const { return nCol; } - SCROW GetRow() const { return nRow; } - ScFilterBoxMode GetMode() const { return eMode; } - BOOL IsDataSelect() const { return (eMode == SC_FILTERBOX_DATASELECT); } - void EndInit(); + SCCOL GetCol() const { return nCol; } + SCROW GetRow() const { return nRow; } + ScFilterBoxMode GetMode() const { return eMode; } + BOOL IsDataSelect() const { return (eMode == SC_FILTERBOX_DATASELECT); } + void EndInit(); BOOL IsInInit() const { return bInit; } - void SetCancelled() { bCancelled = TRUE; } + void SetCancelled() { bCancelled = TRUE; } BOOL IsInSelect() const { return bInSelect; } void SetListHasDates(bool b) { mbListHasDates = b; } bool HasDates() const { return mbListHasDates; } @@ -217,7 +217,7 @@ public: //------------------------------------------------------------------- -// ListBox in einem FloatingWindow (pParent) +// ListBox in einem FloatingWindow (pParent) ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ) : ListBox( pParent, WB_AUTOHSCROLL ), @@ -267,17 +267,17 @@ long ScFilterListBox::PreNotify( NotifyEvent& rNEvt ) { KeyEvent aKeyEvt = *rNEvt.GetKeyEvent(); KeyCode aCode = aKeyEvt.GetKeyCode(); - if ( !aCode.GetModifier() ) // ohne alle Modifiers + if ( !aCode.GetModifier() ) // ohne alle Modifiers { USHORT nKey = aCode.GetCode(); if ( nKey == KEY_RETURN ) { - SelectHdl(); // auswaehlen + SelectHdl(); // auswaehlen nDone = 1; } else if ( nKey == KEY_ESCAPE ) { - pGridWin->ClickExtern(); // loescht die List-Box !!! + pGridWin->ClickExtern(); // loescht die List-Box !!! nDone = 1; } } @@ -342,9 +342,9 @@ Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() BOOL lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) { - // wenn es ein editierbarer Bereich ist, und rechts unten eine Matrix-Zelle - // mit Origin links oben liegt, enthaelt der Bereich genau die Matrix. - //! Direkt die MatrixEdges Funktionen von der Column herausreichen ??? + // wenn es ein editierbarer Bereich ist, und rechts unten eine Matrix-Zelle + // mit Origin links oben liegt, enthaelt der Bereich genau die Matrix. + //! Direkt die MatrixEdges Funktionen von der Column herausreichen ??? if ( !pDoc->IsBlockEditable( rRange.aStart.Tab(), rRange.aStart.Col(),rRange.aStart.Row(), rRange.aEnd.Col(),rRange.aEnd.Row() ) ) @@ -385,9 +385,9 @@ sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTA if ( !rpCell || rpCell->GetCellType() == CELLTYPE_NOTE ) { if ( rPosX <= 0 ) - return FALSE; // alles leer bis links + return FALSE; // alles leer bis links else - --rPosX; // weitersuchen + --rPosX; // weitersuchen } else if ( rpCell->GetCellType() == CELLTYPE_EDIT) bFound = TRUE; @@ -395,7 +395,7 @@ sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTA static_cast<ScFormulaCell*>(rpCell)->IsHyperLinkCell()) bFound = TRUE; else - return FALSE; // andere Zelle + return FALSE; // andere Zelle } while ( !bFound ); @@ -403,9 +403,9 @@ sal_Bool lcl_GetHyperlinkCell(ScDocument* pDoc, SCCOL& rPosX, SCROW& rPosY, SCTA } // --------------------------------------------------------------------------- -// WB_DIALOGCONTROL noetig fuer UNO-Controls +// WB_DIALOGCONTROL noetig fuer UNO-Controls ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ) -: Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ), +: Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ), DropTargetHelper( this ), DragSourceHelper( this ), mpOOCursors( NULL ), @@ -422,7 +422,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic pFilterBox( NULL ), pFilterFloat( NULL ), mpDPFieldPopup(NULL), - mpFilterButton(NULL), + mpFilterButton(NULL), nCursorHideCount( 0 ), bMarking( FALSE ), nButtonDown( 0 ), @@ -475,7 +475,7 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic SetBackground(); SetMapMode(pViewData->GetLogicMode(eWhich)); -// EnableDrop(); +// EnableDrop(); EnableChildTransparentMode(); SetDialogControlFlags( WINDOW_DLGCTRL_RETURN | WINDOW_DLGCTRL_WANTFOCUS ); @@ -498,7 +498,7 @@ __EXPORT ScGridWindow::~ScGridWindow() void __EXPORT ScGridWindow::Resize( const Size& ) { - // gar nix + // gar nix } void ScGridWindow::ClickExtern() @@ -512,7 +512,7 @@ void ScGridWindow::ClickExtern() { break; } - + DELETEZ(pFilterBox); DELETEZ(pFilterFloat); } @@ -528,7 +528,7 @@ void ScGridWindow::ClickExtern() IMPL_LINK( ScGridWindow, PopupModeEndHdl, FloatingWindow*, EMPTYARG ) { if (pFilterBox) - pFilterBox->SetCancelled(); // nicht mehr auswaehlen + pFilterBox->SetCancelled(); // nicht mehr auswaehlen GrabFocus(); return 0; } @@ -542,11 +542,11 @@ IMPL_LINK( ScGridWindow, PopupSpellingHdl, SpellCallbackInfo*, pInfo ) void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelection, const String& rStr ) { - //! gridwin2 ? + //! gridwin2 ? ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); - ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); + ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); if ( pDPObj && nCol > 0 ) { // look for the dimension header left of the drop-down arrow @@ -571,7 +571,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelecti aNewObj.SetSaveData( aSaveData ); ScDBDocFunc aFunc( *pViewData->GetDocShell() ); aFunc.DataPilotUpdate( pDPObj, &aNewObj, TRUE, FALSE ); - pViewData->GetView()->CursorPosChanged(); // shells may be switched + pViewData->GetView()->CursorPosChanged(); // shells may be switched } } } @@ -579,7 +579,7 @@ void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, BOOL bHasSelecti void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) { - //! merge position/size handling with DoAutoFilterMenue + //! merge position/size handling with DoAutoFilterMenue delete pFilterBox; delete pFilterFloat; @@ -602,7 +602,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) aPos.X() -= 1; aPos.Y() += nSizeY - 1; - pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // not resizable etc. + pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // not resizable etc. pFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) ); pFilterBox = new ScFilterListBox( pFilterFloat, this, nCol, nRow, SC_FILTERBOX_PAGEFIELD ); if ( bLayoutRTL ) @@ -611,7 +611,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) nSizeX += 1; { - Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() ); + Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() ); MapMode aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL ); nHeight = GetTextHeight(); @@ -621,14 +621,14 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) SetFont( aOldFont ); } - // SetSize comes later + // SetSize comes later TypedScStrCollection aStrings( 128, 128 ); - // get list box entries and selection + // get list box entries and selection BOOL bHasCurrentPage = FALSE; String aCurrentPage; - ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); + ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); if ( pDPObj && nCol > 0 ) { // look for the dimension header left of the drop-down arrow @@ -655,7 +655,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) } } - // include all entry widths for the size of the drop-down + // include all entry widths for the size of the drop-down long nMaxText = 0; USHORT nCount = aStrings.GetCount(); for (i=0; i<nCount; i++) @@ -666,17 +666,17 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) nMaxText = nTextWidth; } - // add scrollbar width if needed (string entries are counted here) - // (scrollbar is shown if the box is exactly full?) + // add scrollbar width if needed (string entries are counted here) + // (scrollbar is shown if the box is exactly full?) if ( nCount >= SC_FILTERLISTBOX_LINES ) nMaxText += GetSettings().GetStyleSettings().GetScrollBarSize(); - nMaxText += 4; // for borders + nMaxText += 4; // for borders if ( nMaxText > nSizeX ) - nSizeX = nMaxText; // just modify width - starting position is unchanged + nSizeX = nMaxText; // just modify width - starting position is unchanged - // adjust position and size to window + // adjust position and size to window Size aParentSize = GetParent()->GetOutputSizePixel(); Size aSize( nSizeX, nHeight ); @@ -687,13 +687,13 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) aPos.Y() = aParentSize.Height() - aSize.Height(); pFilterBox->SetSizePixel( aSize ); - pFilterBox->Show(); // Show must be called before SetUpdateMode + pFilterBox->Show(); // Show must be called before SetUpdateMode pFilterBox->SetUpdateMode(FALSE); pFilterFloat->SetOutputSizePixel( aSize ); pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN|FLOATWIN_POPUPMODE_GRABFOCUS); - // fill the list box + // fill the list box BOOL bWait = ( nCount > 100 ); if (bWait) @@ -718,7 +718,7 @@ void ScGridWindow::LaunchPageFieldMenu( SCCOL nCol, SCROW nRow ) pFilterBox->GrabFocus(); - // call Select after GrabFocus, so the focus rectangle ends up in the right position + // call Select after GrabFocus, so the focus rectangle ends up in the right position if ( nSelPos != LISTBOX_ENTRY_NOTFOUND ) pFilterBox->SelectEntryPos( nSelPos ); @@ -749,13 +749,13 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) delete pFilterBox; delete pFilterFloat; - SCCOL nCol = rScenRange.aEnd.Col(); // Zelle unterhalb des Buttons + SCCOL nCol = rScenRange.aEnd.Col(); // Zelle unterhalb des Buttons SCROW nRow = rScenRange.aStart.Row(); if (nRow == 0) { - nRow = rScenRange.aEnd.Row() + 1; // Bereich ganz oben -> Button unterhalb + nRow = rScenRange.aEnd.Row() + 1; // Bereich ganz oben -> Button unterhalb if (nRow>MAXROW) nRow = MAXROW; - //! Texthoehe addieren (wenn sie an der View gespeichert ist...) + //! Texthoehe addieren (wenn sie an der View gespeichert ist...) } ScDocument* pDoc = pViewData->GetDocument(); @@ -772,10 +772,10 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) Rectangle aCellRect( OutputToScreenPixel(aPos), Size(nSizeX,nSizeY) ); aCellRect.Top() -= nSizeY; aCellRect.Bottom() -= nSizeY - 1; - // Die ListBox direkt unter der schwarzen Linie auf dem Zellgitter - // (wenn die Linie verdeckt wird, sieht es komisch aus...) + // Die ListBox direkt unter der schwarzen Linie auf dem Zellgitter + // (wenn die Linie verdeckt wird, sieht es komisch aus...) - pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc. + pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc. pFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) ); pFilterBox = new ScFilterListBox( pFilterFloat, this, nCol, nRow, SC_FILTERBOX_SCENARIO ); if ( bLayoutRTL ) @@ -784,7 +784,7 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) nSizeX += 1; { - Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() ); + Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() ); MapMode aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL ); nHeight = GetTextHeight(); @@ -794,22 +794,22 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) SetFont( aOldFont ); } - // SetSize spaeter + // SetSize spaeter /* pFilterBox->SetSelectionMode( SINGLE_SELECTION ); pFilterBox->SetTabs( nFilterBoxTabs, MapUnit( MAP_APPFONT )); pFilterBox->SetTabJustify( 1, bLayoutRTL ? AdjustRight : AdjustLeft ); */ - // ParentSize Abfrage fehlt + // ParentSize Abfrage fehlt Size aSize( nSizeX, nHeight ); pFilterBox->SetSizePixel( aSize ); - pFilterBox->Show(); // Show muss vor SetUpdateMode kommen !!! + pFilterBox->Show(); // Show muss vor SetUpdateMode kommen !!! pFilterBox->SetUpdateMode(FALSE); - // SetOutputSizePixel/StartPopupMode erst unten, wenn die Groesse feststeht + // SetOutputSizePixel/StartPopupMode erst unten, wenn die Groesse feststeht - // Listbox fuellen + // Listbox fuellen long nMaxText = 0; String aCurrent; @@ -832,11 +832,11 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) } if (nEntryCount > SC_FILTERLISTBOX_LINES) nMaxText += GetSettings().GetStyleSettings().GetScrollBarSize(); - nMaxText += 4; // fuer Rand + nMaxText += 4; // fuer Rand if ( nMaxText > 300 ) - nMaxText = 300; // auch nicht uebertreiben (Pixel) + nMaxText = 300; // auch nicht uebertreiben (Pixel) - if (nMaxText > nSizeX) // Groesse auf benoetigte Groesse anpassen + if (nMaxText > nSizeX) // Groesse auf benoetigte Groesse anpassen { long nDiff = nMaxText - nSizeX; aSize = Size( nMaxText, nHeight ); @@ -845,7 +845,7 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) if ( !bLayoutRTL ) { - // also move popup position + // also move popup position long nNewX = aCellRect.Left() - nDiff; if ( nNewX < 0 ) nNewX = 0; @@ -859,24 +859,24 @@ void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange ) pFilterBox->SetUpdateMode(TRUE); pFilterBox->GrabFocus(); - // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet -//! SvLBoxEntry* pSelect = NULL; + // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet +//! SvLBoxEntry* pSelect = NULL; USHORT nPos = LISTBOX_ENTRY_NOTFOUND; if (aCurrent.Len()) { nPos = pFilterBox->GetEntryPos( aCurrent ); -//! pSelect = pFilterBox->GetEntry( nPos ); +//! pSelect = pFilterBox->GetEntry( nPos ); } if (/*!pSelect*/ LISTBOX_ENTRY_NOTFOUND == nPos && pFilterBox->GetEntryCount() > 0 ) nPos = 0; -//! pSelect = pFilterBox->GetEntry(0); // einer sollte immer selektiert sein +//! pSelect = pFilterBox->GetEntry(0); // einer sollte immer selektiert sein if (/*pSelect*/ LISTBOX_ENTRY_NOTFOUND != nPos ) pFilterBox->SelectEntryPos(nPos); pFilterBox->EndInit(); // Szenario-Auswahl kommt aus MouseButtonDown: - // der naechste MouseMove auf die Filterbox ist wie ein ButtonDown + // der naechste MouseMove auf die Filterbox ist wie ein ButtonDown nMouseStatus = SC_GM_FILTER; CaptureMouse(); @@ -905,7 +905,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) aPos.X() -= 1; aPos.Y() += nSizeY - 1; - pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc. + pFilterFloat = new ScFilterFloatingWindow( this, WinBits(WB_BORDER) ); // nicht resizable etc. pFilterFloat->SetPopupModeEndHdl( LINK( this, ScGridWindow, PopupModeEndHdl ) ); pFilterBox = new ScFilterListBox( pFilterFloat, this, nCol, nRow, bDataSelect ? SC_FILTERBOX_DATASELECT : SC_FILTERBOX_FILTER ); @@ -915,7 +915,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) nSizeX += 1; { - Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() ); + Font aOldFont = GetFont(); SetFont( pFilterBox->GetFont() ); MapMode aOldMode = GetMapMode(); SetMapMode( MAP_PIXEL ); nHeight = GetTextHeight(); @@ -925,7 +925,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) SetFont( aOldFont ); } - // SetSize spaeter + // SetSize spaeter /* pFilterBox->SetSelectionMode( SINGLE_SELECTION ); pFilterBox->SetTabs( nFilterBoxTabs, MapUnit( MAP_APPFONT )); @@ -934,24 +934,24 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) BOOL bEmpty = FALSE; TypedScStrCollection aStrings( 128, 128 ); - if ( bDataSelect ) // Auswahl-Liste + if ( bDataSelect ) // Auswahl-Liste { - // Liste fuellen + // Liste fuellen aStrings.SetCaseSensitive( TRUE ); pDoc->GetDataEntries( nCol, nRow, nTab, aStrings ); if ( aStrings.GetCount() == 0 ) bEmpty = TRUE; } - else // AutoFilter + else // AutoFilter { - //! wird der Titel ueberhaupt ausgewertet ??? + //! wird der Titel ueberhaupt ausgewertet ??? String aString; pDoc->GetString( nCol, nRow, nTab, aString ); pFilterBox->SetText( aString ); long nMaxText = 0; - // default entries + // default entries static const USHORT nDefIDs[] = { SCSTR_ALLFILTER, SCSTR_TOP10FILTER, SCSTR_STDFILTER, SCSTR_EMPTY, SCSTR_NOTEMPTY }; const USHORT nDefCount = sizeof(nDefIDs) / sizeof(USHORT); for (i=0; i<nDefCount; i++) @@ -964,18 +964,18 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) } pFilterBox->SetSeparatorPos( nDefCount - 1 ); - // get list entries + // get list entries bool bHasDates = false; pDoc->GetFilterEntries( nCol, nRow, nTab, true, aStrings, bHasDates); pFilterBox->SetListHasDates(bHasDates); - // check widths of numerical entries (string entries are not included) - // so all numbers are completely visible + // check widths of numerical entries (string entries are not included) + // so all numbers are completely visible USHORT nCount = aStrings.GetCount(); for (i=0; i<nCount; i++) { TypedStrData* pData = aStrings[i]; - if ( !pData->IsStrData() ) // only numerical entries + if ( !pData->IsStrData() ) // only numerical entries { long nTextWidth = pFilterBox->GetTextWidth( pData->GetString() ); if ( nTextWidth > nMaxText ) @@ -983,21 +983,21 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) } } - // add scrollbar width if needed (string entries are counted here) - // (scrollbar is shown if the box is exactly full?) + // add scrollbar width if needed (string entries are counted here) + // (scrollbar is shown if the box is exactly full?) if ( nCount + nDefCount >= SC_FILTERLISTBOX_LINES ) nMaxText += GetSettings().GetStyleSettings().GetScrollBarSize(); - nMaxText += 4; // for borders + nMaxText += 4; // for borders if ( nMaxText > nSizeX ) - nSizeX = nMaxText; // just modify width - starting position is unchanged + nSizeX = nMaxText; // just modify width - starting position is unchanged } if (!bEmpty) { - // Position und Groesse an Fenster anpassen - //! vorher Abfrage, ob die Eintraege hineinpassen (Breite) + // Position und Groesse an Fenster anpassen + //! vorher Abfrage, ob die Eintraege hineinpassen (Breite) Size aParentSize = GetParent()->GetOutputSizePixel(); Size aSize( nSizeX, nHeight ); @@ -1008,13 +1008,13 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) aPos.Y() = aParentSize.Height() - aSize.Height(); pFilterBox->SetSizePixel( aSize ); - pFilterBox->Show(); // Show muss vor SetUpdateMode kommen !!! + pFilterBox->Show(); // Show muss vor SetUpdateMode kommen !!! pFilterBox->SetUpdateMode(FALSE); pFilterFloat->SetOutputSizePixel( aSize ); pFilterFloat->StartPopupMode( aCellRect, FLOATWIN_POPUPMODE_DOWN|FLOATWIN_POPUPMODE_GRABFOCUS); - // Listbox fuellen + // Listbox fuellen USHORT nCount = aStrings.GetCount(); BOOL bWait = ( nCount > 100 ); @@ -1030,22 +1030,22 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) pFilterBox->SetUpdateMode(TRUE); } -//! SvLBoxEntry* pSelect = NULL; +//! SvLBoxEntry* pSelect = NULL; USHORT nSelPos = LISTBOX_ENTRY_NOTFOUND; - if (!bDataSelect) // AutoFilter: aktiven Eintrag selektieren + if (!bDataSelect) // AutoFilter: aktiven Eintrag selektieren { ScDBData* pDBData = pDoc->GetDBAtCursor( nCol, nRow, nTab ); if (pDBData) { ScQueryParam aParam; - pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben + pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben BOOL bValid = TRUE; - for (SCSIZE j=0; j<MAXQUERY && bValid; j++) // bisherige Filter-Einstellungen + for (SCSIZE j=0; j<MAXQUERY && bValid; j++) // bisherige Filter-Einstellungen if (aParam.GetEntry(j).bDoQuery) { - //! Abfrage mit DrawButtons zusammenfassen! + //! Abfrage mit DrawButtons zusammenfassen! ScQueryEntry& rEntry = aParam.GetEntry(j); if (j>0) @@ -1059,7 +1059,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) if (pStr) { nSelPos = pFilterBox->GetEntryPos( *pStr ); -//! pSelect = pFilterBox->GetEntry( nPos ); +//! pSelect = pFilterBox->GetEntry( nPos ); } } else if (rEntry.eOp == SC_TOPVAL && rEntry.pStr && @@ -1081,7 +1081,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) nCol, nRow, nTab, ATTR_VALIDDATA ))->GetValue(); if ( nIndex ) { - const ScValidationData* pData = pDoc->GetValidationEntry( nIndex ); + const ScValidationData* pData = pDoc->GetValidationEntry( nIndex ); if (pData) { TypedStrData* pNew = NULL; @@ -1107,7 +1107,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) USHORT nCount = aStrings.GetCount(); for (i = 0; ((i < nCount) && ( LISTBOX_ENTRY_NOTFOUND == nSelPos)); i++) { - if ( aStrings.Compare(aStrings[i], pNew)==0 ) + if ( aStrings.Compare(aStrings[i], pNew)==0 ) nSelPos = i; } } @@ -1116,24 +1116,24 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) } } - // neu (309): irgendwas muss immer selektiert sein: + // neu (309): irgendwas muss immer selektiert sein: if ( LISTBOX_ENTRY_NOTFOUND == nSelPos && pFilterBox->GetEntryCount() > 0 && !bDataSelect) nSelPos = 0; - // keine leere Auswahl-Liste anzeigen: + // keine leere Auswahl-Liste anzeigen: if ( bEmpty ) { - DELETEZ(pFilterBox); // war nix + DELETEZ(pFilterBox); // war nix DELETEZ(pFilterFloat); - Sound::Beep(); // bemerkbar machen + Sound::Beep(); // bemerkbar machen } else { -// pFilterBox->Show(); // schon vorne +// pFilterBox->Show(); // schon vorne pFilterBox->GrabFocus(); - // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet + // Select erst nach GrabFocus, damit das Focus-Rechteck richtig landet if ( LISTBOX_ENTRY_NOTFOUND != nSelPos ) pFilterBox->SelectEntryPos( nSelPos ); else @@ -1147,7 +1147,7 @@ void ScGridWindow::DoAutoFilterMenue( SCCOL nCol, SCROW nRow, BOOL bDataSelect ) if (!bDataSelect) { // AutoFilter (aus MouseButtonDown): - // der naechste MouseMove auf die Filterbox ist wie ein ButtonDown + // der naechste MouseMove auf die Filterbox ist wie ein ButtonDown nMouseStatus = SC_GM_FILTER; CaptureMouse(); @@ -1191,7 +1191,7 @@ void ScGridWindow::FilterSelect( ULONG nSel ) if (pFilterFloat) pFilterFloat->EndPopupMode(); - GrabFocus(); // unter OS/2 stimmt der Focus sonst nicht + GrabFocus(); // unter OS/2 stimmt der Focus sonst nicht } void ScGridWindow::ExecDataSelect( SCCOL nCol, SCROW nRow, const String& rStr ) @@ -1219,7 +1219,7 @@ void ScGridWindow::ExecFilter( ULONG nSel, if (pDBData) { ScQueryParam aParam; - pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben + pDBData->GetQueryParam( aParam ); // kann nur MAXQUERY Eintraege ergeben if (SC_AUTOFILTER_CUSTOM == nSel) { @@ -1230,7 +1230,7 @@ void ScGridWindow::ExecFilter( ULONG nSel, SCROW nEndRow; pDBData->GetArea( nAreaTab, nStartCol,nStartRow,nEndCol,nEndRow ); pViewData->GetView()->MarkRange( ScRange( nStartCol,nStartRow,nAreaTab,nEndCol,nEndRow,nAreaTab)); - pViewData->GetView()->SetCursor(nCol,nRow); //! auch ueber Slot ?? + pViewData->GetView()->SetCursor(nCol,nRow); //! auch ueber Slot ?? pViewData->GetDispatcher().Execute( SID_FILTER, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD ); } else @@ -1242,10 +1242,10 @@ void ScGridWindow::ExecFilter( ULONG nSel, bDeleteOld = TRUE; if (aParam.bRegExp) bDeleteOld = TRUE; - for (SCSIZE i=0; i<MAXQUERY && !bDeleteOld; i++) // bisherige Filter-Einstellungen + for (SCSIZE i=0; i<MAXQUERY && !bDeleteOld; i++) // bisherige Filter-Einstellungen if (aParam.GetEntry(i).bDoQuery) { - //! Abfrage mit DrawButtons zusammenfassen! + //! Abfrage mit DrawButtons zusammenfassen! ScQueryEntry& rEntry = aParam.GetEntry(i); if (i>0) @@ -1254,7 +1254,7 @@ void ScGridWindow::ExecFilter( ULONG nSel, if (rEntry.nField == nCol) { - if (bFound) // diese Spalte zweimal? + if (bFound) // diese Spalte zweimal? bDeleteOld = TRUE; nQueryPos = i; bFound = TRUE; @@ -1273,40 +1273,40 @@ void ScGridWindow::ExecFilter( ULONG nSel, aParam.bRegExp = FALSE; } - if ( nQueryPos < MAXQUERY || SC_AUTOFILTER_ALL == nSel ) // loeschen geht immer + if ( nQueryPos < MAXQUERY || SC_AUTOFILTER_ALL == nSel ) // loeschen geht immer { if (nSel) { ScQueryEntry& rNewEntry = aParam.GetEntry(nQueryPos); - rNewEntry.bDoQuery = TRUE; + rNewEntry.bDoQuery = TRUE; rNewEntry.bQueryByString = TRUE; - rNewEntry.nField = nCol; + rNewEntry.nField = nCol; rNewEntry.bQueryByDate = bCheckForDates; if ( nSel == SC_AUTOFILTER_TOP10 ) { - rNewEntry.eOp = SC_TOPVAL; - *rNewEntry.pStr = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("10")); + rNewEntry.eOp = SC_TOPVAL; + *rNewEntry.pStr = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("10")); } else if (nSel == SC_AUTOFILTER_EMPTY) { rNewEntry.pStr->Erase(); rNewEntry.bQueryByString = FALSE; - rNewEntry.eOp = SC_EQUAL; - rNewEntry.nVal = SC_EMPTYFIELDS; + rNewEntry.eOp = SC_EQUAL; + rNewEntry.nVal = SC_EMPTYFIELDS; } else if (nSel == SC_AUTOFILTER_NOTEMPTY) { rNewEntry.pStr->Erase(); rNewEntry.bQueryByString = FALSE; - rNewEntry.eOp = SC_EQUAL; - rNewEntry.nVal = SC_NONEMPTYFIELDS; + rNewEntry.eOp = SC_EQUAL; + rNewEntry.nVal = SC_NONEMPTYFIELDS; } else { - rNewEntry.eOp = SC_EQUAL; - *rNewEntry.pStr = aValue; + rNewEntry.eOp = SC_EQUAL; + *rNewEntry.pStr = aValue; } if (nQueryPos > 0) rNewEntry.eConnect = SC_AND; @@ -1317,7 +1317,7 @@ void ScGridWindow::ExecFilter( ULONG nSel, aParam.DeleteQuery(nQueryPos); } - // #100597# end edit mode - like in ScCellShell::ExecuteDB + // #100597# end edit mode - like in ScCellShell::ExecuteDB if ( pViewData->HasEditView( pViewData->GetActivePart() ) ) { SC_MOD()->InputEnterHandler(); @@ -1326,9 +1326,9 @@ void ScGridWindow::ExecFilter( ULONG nSel, aParam.bUseDynamicRange = true; pViewData->GetView()->Query( aParam, NULL, TRUE ); - pDBData->SetQueryParam( aParam ); // speichern + pDBData->SetQueryParam( aParam ); // speichern } - else // "Zuviele Bedingungen" + else // "Zuviele Bedingungen" pViewData->GetView()->ErrorMessage( STR_FILTER_TOOMANY ); } } @@ -1375,10 +1375,10 @@ void ScGridWindow::MoveMouseStatus( ScGridWindow& rDestWin ) BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction ) { - // MouseEvent buttons must only be checked if bAction==TRUE - // to allow changing the mouse pointer in MouseMove, - // but not start AutoFill with right button (#74229#). - // with bAction==TRUE, SetFillMode / SetDragMode is called + // MouseEvent buttons must only be checked if bAction==TRUE + // to allow changing the mouse pointer in MouseMove, + // but not start AutoFill with right button (#74229#). + // with bAction==TRUE, SetFillMode / SetDragMode is called if ( bAction && !rMEvt.IsLeft() ) return FALSE; @@ -1394,7 +1394,7 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction ) SCTAB nTab = pViewData->GetTabNo(); BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); - // Auto-Fill + // Auto-Fill ScRange aMarkRange; if (pViewData->GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE) @@ -1417,8 +1417,8 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction ) pViewData->SetFillMode( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), nX, nY ); - // #108266# The simple selection must also be recognized when dragging, - // where the Marking flag is set and MarkToSimple won't work anymore. + // #108266# The simple selection must also be recognized when dragging, + // where the Marking flag is set and MarkToSimple won't work anymore. pViewData->GetMarkData().MarkToSimple(); } bNewPointer = TRUE; @@ -1426,7 +1426,7 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction ) } } - // Embedded-Rechteck + // Embedded-Rechteck if (pDoc->IsEmbedded()) { @@ -1464,7 +1464,7 @@ BOOL ScGridWindow::TestMouse( const MouseEvent& rMEvt, BOOL bAction ) if (!bNewPointer && bAction) { -// SetPointer( POINTER_ARROW ); // in Fu... +// SetPointer( POINTER_ARROW ); // in Fu... pViewData->ResetFillMode(); } @@ -1510,11 +1510,11 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) aCurMousePos = rMEvt.GetPosPixel(); - // Filter-Popup beendet sich mit eigenem Mausklick, nicht erst beim Klick - // in das GridWindow, darum ist die folgende Abfrage nicht mehr noetig: - ClickExtern(); // loescht FilterBox, wenn vorhanden + // Filter-Popup beendet sich mit eigenem Mausklick, nicht erst beim Klick + // in das GridWindow, darum ist die folgende Abfrage nicht mehr noetig: + ClickExtern(); // loescht FilterBox, wenn vorhanden - HideNoteMarker(); // Notiz-Anzeige + HideNoteMarker(); // Notiz-Anzeige bEEMouse = FALSE; @@ -1525,24 +1525,24 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) return; } - pScActiveViewShell = pViewData->GetViewShell(); // falls auf Link geklickt wird - nScClickMouseModifier = rMEvt.GetModifier(); // um Control-Klick immer zu erkennen + pScActiveViewShell = pViewData->GetViewShell(); // falls auf Link geklickt wird + nScClickMouseModifier = rMEvt.GetModifier(); // um Control-Klick immer zu erkennen BOOL bDetective = pViewData->GetViewShell()->IsAuditShell(); - BOOL bRefMode = pViewData->IsRefMode(); // Referenz angefangen - BOOL bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz - BOOL bEditMode = pViewData->HasEditView(eWhich); // auch bei Mode==SC_INPUT_TYPE + BOOL bRefMode = pViewData->IsRefMode(); // Referenz angefangen + BOOL bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz + BOOL bEditMode = pViewData->HasEditView(eWhich); // auch bei Mode==SC_INPUT_TYPE BOOL bDouble = (rMEvt.GetClicks() == 2); - // DeactivateIP passiert nur noch bei MarkListHasChanged + // DeactivateIP passiert nur noch bei MarkListHasChanged - // im GrabFocus Aufruf kann eine Fehlermeldung hochkommen - // (z.B. beim Umbenennen von Tabellen per Tab-Reiter) + // im GrabFocus Aufruf kann eine Fehlermeldung hochkommen + // (z.B. beim Umbenennen von Tabellen per Tab-Reiter) if ( !nButtonDown || !bDouble ) // single (first) click is always valid nButtonDown = rMEvt.GetButtons(); // set nButtonDown first, so StopMarking works -// pViewData->GetViewShell()->GetViewFrame()->GetWindow().GrabFocus(); +// pViewData->GetViewShell()->GetViewFrame()->GetWindow().GrabFocus(); if ( ( bEditMode && pViewData->GetActivePart() == eWhich ) || !bFormulaMode ) GrabFocus(); @@ -1555,13 +1555,13 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) return; } - if ( bDetective ) // Detektiv-Fuell-Modus + if ( bDetective ) // Detektiv-Fuell-Modus { if ( rMEvt.IsLeft() && !rMEvt.GetModifier() ) { - Point aPos = rMEvt.GetPosPixel(); - SCsCOL nPosX; - SCsROW nPosY; + Point aPos = rMEvt.GetPosPixel(); + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); SfxInt16Item aPosXItem( SID_RANGE_COL, nPosX ); @@ -1593,14 +1593,14 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) if (bEditMode && (pViewData->GetRefTabNo() == pViewData->GetTabNo())) { - Point aPos = rMEvt.GetPosPixel(); - SCsCOL nPosX; - SCsROW nPosY; + Point aPos = rMEvt.GetPosPixel(); + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); - EditView* pEditView; - SCCOL nEditCol; - SCROW nEditRow; + EditView* pEditView; + SCCOL nEditCol; + SCROW nEditRow; pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow ); SCCOL nEndCol = pViewData->GetEditEndCol(); SCROW nEndRow = pViewData->GetEditEndRow(); @@ -1608,8 +1608,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) if ( nPosX >= (SCsCOL) nEditCol && nPosX <= (SCsCOL) nEndCol && nPosY >= (SCsROW) nEditRow && nPosY <= (SCsROW) nEndRow ) { - // #53966# beim Klick in die Tabellen-EditView immer den Focus umsetzen - if (bFormulaMode) // sonst ist es oben schon passiert + // #53966# beim Klick in die Tabellen-EditView immer den Focus umsetzen + if (bFormulaMode) // sonst ist es oben schon passiert GrabFocus(); pScMod->SetInputMode( SC_INPUT_TABLE ); @@ -1621,7 +1621,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) if (pScMod->GetIsWaterCan()) { - //! was is mit'm Mac ??? + //! was is mit'm Mac ??? if ( rMEvt.GetModifier() + rMEvt.GetButtons() == MOUSE_RIGHT ) { nMouseStatus = SC_GM_WATERUNDO; @@ -1630,14 +1630,14 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) } // Reihenfolge passend zum angezeigten Cursor: - // RangeFinder, AutoFill, PageBreak, Drawing + // RangeFinder, AutoFill, PageBreak, Drawing if ( HitRangeFinder( rMEvt.GetPosPixel(), bRFSize, &nRFIndex, &nRFAddX, &nRFAddY ) ) { - bRFMouse = TRUE; // die anderen Variablen sind oben initialisiert + bRFMouse = TRUE; // die anderen Variablen sind oben initialisiert if ( pViewData->GetActivePart() != eWhich ) - pViewData->GetView()->ActivatePart( eWhich ); //! schon oben immer ??? + pViewData->GetView()->ActivatePart( eWhich ); //! schon oben immer ??? // CaptureMouse(); StartTracking(); @@ -1650,7 +1650,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) if ( bDouble ) pViewData->GetView()->FillCrossDblClick(); else - pScMod->InputEnterHandler(); // Autofill etc. + pScMod->InputEnterHandler(); // Autofill etc. } if ( !bCrossPointer ) @@ -1672,13 +1672,13 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) if ( !bCrossPointer && DrawMouseButtonDown(rMEvt) ) { //if (DrawHasMarkedObj()) - // pViewData->GetViewShell()->SetDrawShellOrSub(); // Draw-Objekt selektiert + // pViewData->GetViewShell()->SetDrawShellOrSub(); // Draw-Objekt selektiert return; } - pViewData->GetViewShell()->SetDrawShell( FALSE ); // kein Draw-Objekt selektiert + pViewData->GetViewShell()->SetDrawShell( FALSE ); // kein Draw-Objekt selektiert - // TestMouse schon oben passiert + // TestMouse schon oben passiert } Point aPos = rMEvt.GetPosPixel(); @@ -1704,7 +1704,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) } if (pAttr->HasButton()) { - DoPushButton( nPosX, nPosY, rMEvt ); // setzt evtl. bPivotMouse / bDPMouse + DoPushButton( nPosX, nPosY, rMEvt ); // setzt evtl. bPivotMouse / bDPMouse return; } @@ -1736,7 +1736,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) } // - // Doppelklick angefangen ? + // Doppelklick angefangen ? // // StopMarking kann aus DrawMouseButtonDown gerufen werden @@ -1753,20 +1753,20 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) } // - // Links in Edit-Zellen + // Links in Edit-Zellen // BOOL bAlt = rMEvt.IsMod2(); if ( !bAlt && rMEvt.IsLeft() && - GetEditUrl(rMEvt.GetPosPixel()) ) // Klick auf Link: Cursor nicht bewegen + GetEditUrl(rMEvt.GetPosPixel()) ) // Klick auf Link: Cursor nicht bewegen { SetPointer( Pointer( POINTER_REFHAND ) ); - nMouseStatus = SC_GM_URLDOWN; // auch nur dann beim ButtonUp ausfuehren + nMouseStatus = SC_GM_URLDOWN; // auch nur dann beim ButtonUp ausfuehren return; } // - // Gridwin - SelectionEngine + // Gridwin - SelectionEngine // if ( rMEvt.IsLeft() ) @@ -1776,13 +1776,13 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt ) pSelEng->SetWhich(eWhich); pSelEng->SetVisibleArea( Rectangle(Point(), GetOutputSizePixel()) ); - // SelMouseButtonDown an der View setzt noch das bMoveIsShift Flag + // SelMouseButtonDown an der View setzt noch das bMoveIsShift Flag if ( pViewData->GetView()->SelMouseButtonDown( rMEvt ) ) { if (IsMouseCaptured()) { - // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann - //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?! + // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann + //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?! ReleaseMouse(); StartTracking(); } @@ -1805,7 +1805,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) nNestedButtonState = SC_NESTEDBUTTON_UP; if (nButtonDown != rMEvt.GetButtons()) - nMouseStatus = SC_GM_IGNORE; // reset und return + nMouseStatus = SC_GM_IGNORE; // reset und return nButtonDown = 0; @@ -1821,7 +1821,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) pViewData->ResetFillMode(); } StopMarking(); - DrawEndAction(); // Markieren/Verschieben auf Drawing-Layer abbrechen + DrawEndAction(); // Markieren/Verschieben auf Drawing-Layer abbrechen ReleaseMouse(); return; } @@ -1844,7 +1844,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } nMouseStatus = SC_GM_NONE; ReleaseMouse(); - return; // da muss nix mehr passieren + return; // da muss nix mehr passieren } ScModule* pScMod = SC_MOD(); @@ -1854,20 +1854,20 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) SfxBindings& rBindings = pViewData->GetBindings(); if (bEEMouse && pViewData->HasEditView( eWhich )) { - EditView* pEditView; - SCCOL nEditCol; - SCROW nEditRow; + EditView* pEditView; + SCCOL nEditCol; + SCROW nEditRow; pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow ); pEditView->MouseButtonUp( rMEvt ); if ( rMEvt.IsMiddle() && GetSettings().GetMouseSettings().GetMiddleButtonAction() == MOUSE_MIDDLE_PASTESELECTION ) { - // EditView may have pasted from selection + // EditView may have pasted from selection pScMod->InputChanged( pEditView ); } else - pScMod->InputSelection( pEditView ); // parentheses etc. + pScMod->InputSelection( pEditView ); // parentheses etc. pViewData->GetView()->InvalidateAttribs(); rBindings.Invalidate( SID_HYPERLINK_GETLINK ); @@ -1877,13 +1877,13 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) if (bDPMouse) { - DPMouseButtonUp( rMEvt ); // resets bDPMouse + DPMouseButtonUp( rMEvt ); // resets bDPMouse return; } if (bRFMouse) { - RFMouseMove( rMEvt, TRUE ); // Range wieder richtigherum + RFMouseMove( rMEvt, TRUE ); // Range wieder richtigherum bRFMouse = FALSE; SetPointer( Pointer( POINTER_ARROW ) ); ReleaseMouse(); @@ -1899,7 +1899,7 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) return; } - if (nMouseStatus == SC_GM_WATERUNDO) // Undo im Giesskannenmodus + if (nMouseStatus == SC_GM_WATERUNDO) // Undo im Giesskannenmodus { SfxUndoManager* pMgr = pViewData->GetDocShell()->GetUndoManager(); if ( pMgr->GetUndoActionCount() && pMgr->GetUndoActionId() == STR_UNDO_APPLYCELLSTYLE ) @@ -1925,15 +1925,15 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) SCCOL nEndCol; SCROW nEndRow; pViewData->GetFillData( nStartCol, nStartRow, nEndCol, nEndRow ); -// DBG_ASSERT( nStartCol==pViewData->GetRefStartX() && nStartRow==pViewData->GetRefStartY(), -// "Block falsch fuer AutoFill" ); +// DBG_ASSERT( nStartCol==pViewData->GetRefStartX() && nStartRow==pViewData->GetRefStartY(), +// "Block falsch fuer AutoFill" ); ScRange aDelRange; BOOL bIsDel = pViewData->GetDelMark( aDelRange ); ScViewFunc* pView = pViewData->GetView(); pView->StopRefMode(); pViewData->ResetFillMode(); - pView->GetFunctionSet()->SetAnchorFlag( FALSE ); // #i5819# don't use AutoFill anchor flag for selection + pView->GetFunctionSet()->SetAnchorFlag( FALSE ); // #i5819# don't use AutoFill anchor flag for selection if ( bIsDel ) { @@ -1987,17 +1987,17 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) pViewData->GetDocShell()->UpdateOle(pViewData); } - BOOL bRefMode = pViewData->IsRefMode(); + BOOL bRefMode = pViewData->IsRefMode(); if (bRefMode) pScMod->EndReference(); // - // Giesskannen-Modus (Gestalter) + // Giesskannen-Modus (Gestalter) // if (pScMod->GetIsWaterCan()) { - // Abfrage auf Undo schon oben + // Abfrage auf Undo schon oben ScStyleSheetPool* pStylePool = (ScStyleSheetPool*) (pViewData->GetDocument()-> @@ -2046,19 +2046,19 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } // - // double click (only left button) + // double click (only left button) // BOOL bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() ); if ( bDouble && !bRefMode && nMouseStatus == SC_GM_DBLDOWN && !pScMod->IsRefDialogOpen() ) { - // data pilot table + // data pilot table Point aPos = rMEvt.GetPosPixel(); SCsCOL nPosX; SCsROW nPosY; SCTAB nTab = pViewData->GetTabNo(); pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); - ScDPObject* pDPObj = pDoc->GetDPAtCursor( nPosX, nPosY, nTab ); + ScDPObject* pDPObj = pDoc->GetDPAtCursor( nPosX, nPosY, nTab ); if ( pDPObj && pDPObj->GetSaveData()->GetDrillDown() ) { ScAddress aCellPos( nPosX, nPosY, pViewData->GetTabNo() ); @@ -2133,20 +2133,20 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } // - // Links in edit cells + // Links in edit cells // BOOL bAlt = rMEvt.IsMod2(); if ( !bAlt && !bRefMode && !bDouble && nMouseStatus == SC_GM_URLDOWN ) { - // beim ButtonUp nur ausfuehren, wenn ButtonDown auch ueber einer URL war + // beim ButtonUp nur ausfuehren, wenn ButtonDown auch ueber einer URL war String aName, aUrl, aTarget; if ( GetEditUrl( rMEvt.GetPosPixel(), &aName, &aUrl, &aTarget ) ) { - nMouseStatus = SC_GM_NONE; // keinen Doppelklick anfangen + nMouseStatus = SC_GM_NONE; // keinen Doppelklick anfangen ScGlobal::OpenURL( aUrl, aTarget ); - + // fire worksheet_followhyperlink event uno::Reference< script::vba::XVBAEventProcessor > xVbaEvents = pDoc->GetVbaEventProcessor(); if( xVbaEvents.is() ) try @@ -2175,48 +2175,48 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } // - // Gridwin - SelectionEngine + // Gridwin - SelectionEngine // - // SelMouseButtonDown is called only for left button, but SelMouseButtonUp would return - // TRUE for any call, so IsLeft must be checked here, too. + // SelMouseButtonDown is called only for left button, but SelMouseButtonUp would return + // TRUE for any call, so IsLeft must be checked here, too. if ( rMEvt.IsLeft() && pViewData->GetView()->GetSelEngine()->SelMouseButtonUp( rMEvt ) ) { -// rMark.MarkToSimple(); +// rMark.MarkToSimple(); pViewData->GetView()->SelectionChanged(); SfxDispatcher* pDisp = pViewData->GetViewShell()->GetDispatcher(); BOOL bFormulaMode = pScMod->IsFormulaMode(); DBG_ASSERT( pDisp || bFormulaMode, "Cursor auf nicht aktiver View bewegen ?" ); - // #i14927# execute SID_CURRENTCELL (for macro recording) only if there is no - // multiple selection, so the argument string completely describes the selection, - // and executing the slot won't change the existing selection (executing the slot - // here and from a recorded macro is treated equally) + // #i14927# execute SID_CURRENTCELL (for macro recording) only if there is no + // multiple selection, so the argument string completely describes the selection, + // and executing the slot won't change the existing selection (executing the slot + // here and from a recorded macro is treated equally) if ( pDisp && !bFormulaMode && !rMark.IsMultiMarked() ) { - String aAddr; // CurrentCell + String aAddr; // CurrentCell if( rMark.IsMarked() ) { -// BOOL bKeep = rMark.IsMultiMarked(); //! wohin damit ??? +// BOOL bKeep = rMark.IsMultiMarked(); //! wohin damit ??? ScRange aScRange; rMark.GetMarkArea( aScRange ); aScRange.Format( aAddr, SCR_ABS ); if ( aScRange.aStart == aScRange.aEnd ) { - // make sure there is a range selection string even for a single cell + // make sure there is a range selection string even for a single cell String aSingle = aAddr; aAddr.Append( (sal_Char) ':' ); aAddr.Append( aSingle ); } - //! SID_MARKAREA gibts nicht mehr ??? - //! was passiert beim Markieren mit dem Cursor ??? + //! SID_MARKAREA gibts nicht mehr ??? + //! was passiert beim Markieren mit dem Cursor ??? } - else // nur Cursor bewegen + else // nur Cursor bewegen { ScAddress aScAddress( pViewData->GetCurX(), pViewData->GetCurY(), 0 ); aScAddress.Format( aAddr, SCA_ABS ); @@ -2240,7 +2240,7 @@ void ScGridWindow::FakeButtonUp() { if ( nButtonDown ) { - MouseEvent aEvent( aCurMousePos ); // nButtons = 0 -> ignore + MouseEvent aEvent( aCurMousePos ); // nButtons = 0 -> ignore MouseButtonUp( aEvent ); } } @@ -2256,8 +2256,8 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) if (pScMod->IsModalMode(pViewData->GetSfxDocShell())) return; - // Ob aus dem Edit-Modus Drag&Drop gestartet wurde, bekommt man leider - // nicht anders mit: + // Ob aus dem Edit-Modus Drag&Drop gestartet wurde, bekommt man leider + // nicht anders mit: if (bEEMouse && nButtonDown && !rMEvt.GetButtons()) { @@ -2270,10 +2270,10 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) if (nMouseStatus == SC_GM_IGNORE) return; - if (nMouseStatus == SC_GM_WATERUNDO) // Undo im Giesskannenmodus -> nur auf Up warten + if (nMouseStatus == SC_GM_WATERUNDO) // Undo im Giesskannenmodus -> nur auf Up warten return; - if ( pViewData->GetViewShell()->IsAuditShell() ) // Detektiv-Fuell-Modus + if ( pViewData->GetViewShell()->IsAuditShell() ) // Detektiv-Fuell-Modus { SetPointer( Pointer( POINTER_FILL ) ); return; @@ -2303,13 +2303,13 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) } } - BOOL bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz + BOOL bFormulaMode = pScMod->IsFormulaMode(); // naechster Klick -> Referenz if (bEEMouse && pViewData->HasEditView( eWhich )) { - EditView* pEditView; - SCCOL nEditCol; - SCROW nEditRow; + EditView* pEditView; + SCCOL nEditCol; + SCROW nEditRow; pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow ); pEditView->MouseMove( rMEvt ); return; @@ -2333,21 +2333,21 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) return; } - // anderen Mauszeiger anzeigen? + // anderen Mauszeiger anzeigen? BOOL bEditMode = pViewData->HasEditView(eWhich); //! Testen ob RefMode-Dragging !!! if ( bEditMode && (pViewData->GetRefTabNo() == pViewData->GetTabNo()) ) { - Point aPos = rMEvt.GetPosPixel(); - SCsCOL nPosX; - SCsROW nPosY; + Point aPos = rMEvt.GetPosPixel(); + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); - EditView* pEditView; - SCCOL nEditCol; - SCROW nEditRow; + EditView* pEditView; + SCCOL nEditCol; + SCROW nEditRow; pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow ); SCCOL nEndCol = pViewData->GetEditEndCol(); SCROW nEndRow = pViewData->GetEditEndRow(); @@ -2355,7 +2355,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) if ( nPosX >= (SCsCOL) nEditCol && nPosX <= (SCsCOL) nEndCol && nPosY >= (SCsROW) nEditRow && nPosY <= (SCsROW) nEndRow ) { - // Field can only be URL field + // Field can only be URL field BOOL bAlt = rMEvt.IsMod2(); if ( !bAlt && !nButtonDown && pEditView && pEditView->GetFieldUnderMousePointer() ) SetPointer( Pointer( POINTER_REFHAND ) ); @@ -2375,7 +2375,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) { BOOL bCross = FALSE; - // Range-Finder + // Range-Finder BOOL bCorner; if ( HitRangeFinder( rMEvt.GetPosPixel(), bCorner ) ) @@ -2387,7 +2387,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) bCross = TRUE; } - // Page-Break-Modus + // Page-Break-Modus USHORT nBreakType; if ( !nButtonDown && pViewData->IsPagebreakMode() && @@ -2419,7 +2419,7 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) bCross = TRUE; } - // Fill-Cursor anzeigen ? + // Fill-Cursor anzeigen ? if ( !bFormulaMode && !nButtonDown ) if (TestMouse( rMEvt, FALSE )) @@ -2429,19 +2429,19 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) { SetPointer( Pointer( POINTER_CROSS ) ); bCross = TRUE; - nScFillModeMouseModifier = rMEvt.GetModifier(); // ausgewertet bei AutoFill und Matrix + nScFillModeMouseModifier = rMEvt.GetModifier(); // ausgewertet bei AutoFill und Matrix } if (!bCross) { BOOL bAlt = rMEvt.IsMod2(); - if (bEditMode) // Edit-Mode muss zuerst kommen! + if (bEditMode) // Edit-Mode muss zuerst kommen! SetPointer( Pointer( POINTER_ARROW ) ); else if ( !bAlt && !nButtonDown && GetEditUrl(rMEvt.GetPosPixel()) ) SetPointer( Pointer( POINTER_REFHAND ) ); - else if ( DrawMouseMove(rMEvt) ) // setzt Pointer um + else if ( DrawMouseMove(rMEvt) ) // setzt Pointer um return; } } @@ -2528,17 +2528,17 @@ long ScGridWindow::PreNotify( NotifyEvent& rNEvt ) void ScGridWindow::Tracking( const TrackingEvent& rTEvt ) { - // Weil die SelectionEngine kein Tracking kennt, die Events nur auf - // die verschiedenen MouseHandler verteilen... + // Weil die SelectionEngine kein Tracking kennt, die Events nur auf + // die verschiedenen MouseHandler verteilen... const MouseEvent& rMEvt = rTEvt.GetMouseEvent(); - if ( rTEvt.IsTrackingCanceled() ) // alles abbrechen... + if ( rTEvt.IsTrackingCanceled() ) // alles abbrechen... { if (!pViewData->GetView()->IsInActivatePart()) { if (bDPMouse) - bDPMouse = FALSE; // gezeichnet wird per bDragRect + bDPMouse = FALSE; // gezeichnet wird per bDragRect if (bDragRect) { // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); @@ -2547,14 +2547,14 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt ) } if (bRFMouse) { - RFMouseMove( rMEvt, TRUE ); // richtig abbrechen geht dabei nicht... + RFMouseMove( rMEvt, TRUE ); // richtig abbrechen geht dabei nicht... bRFMouse = FALSE; } if (nPagebreakMouse) { // if (bPagebreakDrawn) - // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(), - // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); + // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(), + // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); bPagebreakDrawn = FALSE; UpdateDragRectOverlay(); nPagebreakMouse = SC_PD_NONE; @@ -2562,18 +2562,18 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt ) SetPointer( Pointer( POINTER_ARROW ) ); StopMarking(); - MouseButtonUp( rMEvt ); // mit Status SC_GM_IGNORE aus StopMarking + MouseButtonUp( rMEvt ); // mit Status SC_GM_IGNORE aus StopMarking - BOOL bRefMode = pViewData->IsRefMode(); + BOOL bRefMode = pViewData->IsRefMode(); if (bRefMode) - SC_MOD()->EndReference(); // #63148# Dialog nicht verkleinert lassen + SC_MOD()->EndReference(); // #63148# Dialog nicht verkleinert lassen } } else if ( rTEvt.IsTrackingEnded() ) { - // MouseButtonUp immer mit passenden Buttons (z.B. wegen Testtool, #63148#) - // Schliesslich behauptet der Tracking-Event ja, dass normal beendet und nicht - // abgebrochen wurde. + // MouseButtonUp immer mit passenden Buttons (z.B. wegen Testtool, #63148#) + // Schliesslich behauptet der Tracking-Event ja, dass normal beendet und nicht + // abgebrochen wurde. MouseEvent aUpEvt( rMEvt.GetPosPixel(), rMEvt.GetClicks(), rMEvt.GetMode(), nButtonDown, rMEvt.GetModifier() ); @@ -2594,9 +2594,9 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) if (bEEMouse && pViewData->HasEditView( eWhich )) { - EditView* pEditView; - SCCOL nEditCol; - SCROW nEditRow; + EditView* pEditView; + SCCOL nEditCol; + SCROW nEditRow; pViewData->GetEditView( eWhich, pEditView, nEditCol, nEditRow ); // #63263# don't remove the edit view while switching views @@ -2610,13 +2610,13 @@ void ScGridWindow::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) pHdl->DataChanged(); pScMod->SetInEditCommand( FALSE ); - if (!pViewData->IsActive()) // dropped to different view? + if (!pViewData->IsActive()) // dropped to different view? { ScInputHandler* pViewHdl = pScMod->GetInputHdl( pViewData->GetViewShell() ); if ( pViewHdl && pViewData->HasEditView( eWhich ) ) { pViewHdl->CancelHandler(); - ShowCursor(); // missing from KillEditView + ShowCursor(); // missing from KillEditView } } } @@ -2664,7 +2664,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) BOOL bEditView = pViewData->HasEditView( eWhich ); if (!bEditView) { - // only if no cell editview is active, look at drawview + // only if no cell editview is active, look at drawview SdrView* pSdrView = pViewData->GetView()->GetSdrView(); if ( pSdrView ) { @@ -2672,17 +2672,17 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) if ( pOlView && pOlView->GetWindow() == this ) { pOlView->Command( rCEvt ); - return; // done + return; // done } } } if ( nCmd == COMMAND_CURSORPOS && !bEditView ) { - // #88458# CURSORPOS may be called without following text input, - // to set the input method window position - // -> input mode must not be started, - // manually calculate text insert position if not in input mode + // #88458# CURSORPOS may be called without following text input, + // to set the input method window position + // -> input mode must not be started, + // manually calculate text insert position if not in input mode lcl_SetTextCursorPos( pViewData, eWhich, this ); return; @@ -2692,7 +2692,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) if ( pHdl ) { pHdl->InputCommand( rCEvt, TRUE ); - return; // done + return; // done } Window::Command( rCEvt ); @@ -2701,17 +2701,17 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) if ( nCmd == COMMAND_VOICE ) { - // Der Handler wird nur gerufen, wenn ein Text-Cursor aktiv ist, - // also muss es eine EditView oder ein editiertes Zeichenobjekt geben + // Der Handler wird nur gerufen, wenn ein Text-Cursor aktiv ist, + // also muss es eine EditView oder ein editiertes Zeichenobjekt geben ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() ); if ( pHdl && pViewData->HasEditView( eWhich ) ) { - EditView* pEditView = pViewData->GetEditView( eWhich ); // ist dann nicht 0 + EditView* pEditView = pViewData->GetEditView( eWhich ); // ist dann nicht 0 pHdl->DataChanging(); pEditView->Command( rCEvt ); pHdl->DataChanged(); - return; // erledigt + return; // erledigt } SdrView* pSdrView = pViewData->GetView()->GetSdrView(); if ( pSdrView ) @@ -2720,10 +2720,10 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) if ( pOlView && pOlView->GetWindow() == this ) { pOlView->Command( rCEvt ); - return; // erledigt + return; // erledigt } } - Window::Command(rCEvt); // sonst soll sich die Basisklasse drum kuemmern... + Window::Command(rCEvt); // sonst soll sich die Basisklasse drum kuemmern... return; } @@ -2731,8 +2731,8 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) { if ( bEEMouse ) { - // EditEngine handles selection in MouseButtonUp - no action - // needed in command handler + // EditEngine handles selection in MouseButtonUp - no action + // needed in command handler } else { @@ -2807,8 +2807,8 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) // Selecting this cell is not allowed, neither is context menu. return; - // #i18735# First select the item under the mouse pointer. - // This can change the selection, and the view state (edit mode, etc). + // #i18735# First select the item under the mouse pointer. + // This can change the selection, and the view state (edit mode, etc). SelectForContextMenu( aPosPixel, nCellX, nCellY ); } @@ -2819,17 +2819,17 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) // Edit-Zelle mit Spelling-Errors ? if ( bMouse && GetEditUrlOrError( TRUE, aPosPixel ) ) { - // GetEditUrlOrError hat den Cursor schon bewegt + // GetEditUrlOrError hat den Cursor schon bewegt pScMod->SetInputMode( SC_INPUT_TABLE ); - bEdit = pViewData->HasEditView(eWhich); // hat's geklappt ? + bEdit = pViewData->HasEditView(eWhich); // hat's geklappt ? DBG_ASSERT( bEdit, "kann nicht in Edit-Modus schalten" ); } } if ( bEdit ) { - EditView* pEditView = pViewData->GetEditView( eWhich ); // ist dann nicht 0 + EditView* pEditView = pViewData->GetEditView( eWhich ); // ist dann nicht 0 if ( !bMouse ) { @@ -2837,25 +2837,25 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) if ( pCur ) { Point aLogicPos = pCur->GetPos(); - // use the position right of the cursor (spell popup is opened if - // the cursor is before the word, but not if behind it) + // use the position right of the cursor (spell popup is opened if + // the cursor is before the word, but not if behind it) aLogicPos.X() += pCur->GetWidth(); - aLogicPos.Y() += pCur->GetHeight() / 2; // center vertically + aLogicPos.Y() += pCur->GetHeight() / 2; // center vertically aMenuPos = LogicToPixel( aLogicPos ); } } - // if edit mode was just started above, online spelling may be incomplete + // if edit mode was just started above, online spelling may be incomplete pEditView->GetEditEngine()->CompleteOnlineSpelling(); - // IsCursorAtWrongSpelledWord could be used for !bMouse - // if there was a corresponding ExecuteSpellPopup call + // IsCursorAtWrongSpelledWord could be used for !bMouse + // if there was a corresponding ExecuteSpellPopup call if( pEditView->IsWrongSpelledWordAtPos( aMenuPos ) ) { - // Wenn man unter OS/2 neben das Popupmenue klickt, kommt MouseButtonDown - // vor dem Ende des Menue-Execute, darum muss SetModified vorher kommen - // (Bug #40968#) + // Wenn man unter OS/2 neben das Popupmenue klickt, kommt MouseButtonDown + // vor dem Ende des Menue-Execute, darum muss SetModified vorher kommen + // (Bug #40968#) ScInputHandler* pHdl = pScMod->GetInputHdl(); if (pHdl) pHdl->SetModified(); @@ -2868,7 +2868,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) } else if ( !bMouse ) { - // non-edit menu by keyboard -> use lower right of cell cursor position + // non-edit menu by keyboard -> use lower right of cell cursor position SCCOL nCurX = pViewData->GetCurX(); SCROW nCurY = pViewData->GetCurY(); @@ -2884,7 +2884,7 @@ void __EXPORT ScGridWindow::Command( const CommandEvent& rCEvt ) ScTabViewShell* pViewSh = pViewData->GetViewShell(); if (pViewSh) { - // Is a draw object selected? + // Is a draw object selected? SdrView* pDrawView = pViewSh->GetSdrView(); if (pDrawView && pDrawView->AreObjectsMarked()) @@ -3124,8 +3124,8 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt) pViewData->SetPasteMode( SC_PASTE_NONE ); UpdateCopySourceOverlay(); } - // query for existing note marker before calling ViewShell's keyboard handling - // which may remove the marker + // query for existing note marker before calling ViewShell's keyboard handling + // which may remove the marker BOOL bHadKeyMarker = ( pNoteMarker && pNoteMarker->IsByKeyboard() ); ScTabViewShell* pViewSh = pViewData->GetViewShell(); @@ -3135,13 +3135,13 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt) if (DrawKeyInput(rKEvt)) return; - if (!pViewData->GetView()->IsDrawSelMode() && !DrawHasMarkedObj()) // keine Eingaben im Zeichenmodus - { //! DrawShell abfragen !!! + if (!pViewData->GetView()->IsDrawSelMode() && !DrawHasMarkedObj()) // keine Eingaben im Zeichenmodus + { //! DrawShell abfragen !!! if (pViewSh->TabKeyInput(rKEvt)) return; } else - if (pViewSh->SfxViewShell::KeyInput(rKEvt)) // von SfxViewShell + if (pViewSh->SfxViewShell::KeyInput(rKEvt)) // von SfxViewShell return; KeyCode aCode = rKEvt.GetKeyCode(); @@ -3155,11 +3155,11 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt) } if ( aCode.GetCode() == KEY_F1 && aCode.GetModifier() == KEY_MOD1 ) { - // ctrl-F1 shows or hides the note or redlining info for the cursor position - // (hard-coded because F1 can't be configured) + // ctrl-F1 shows or hides the note or redlining info for the cursor position + // (hard-coded because F1 can't be configured) if ( bHadKeyMarker ) - HideNoteMarker(); // hide when previously visible + HideNoteMarker(); // hide when previously visible else ShowNoteMarker( pViewData->GetCurX(), pViewData->GetCurY(), TRUE ); return; @@ -3182,7 +3182,7 @@ void __EXPORT ScGridWindow::KeyInput(const KeyEvent& rKEvt) void ScGridWindow::StopMarking() { - DrawEndAction(); // Markieren/Verschieben auf Drawing-Layer abbrechen + DrawEndAction(); // Markieren/Verschieben auf Drawing-Layer abbrechen if (nButtonDown) { @@ -3196,8 +3196,8 @@ void ScGridWindow::UpdateInputContext() BOOL bReadOnly = pViewData->GetDocShell()->IsReadOnly(); ULONG nOptions = bReadOnly ? 0 : ( INPUTCONTEXT_TEXT | INPUTCONTEXT_EXTTEXTINPUT ); - // when font from InputContext is used, - // it must be taken from the cursor position's cell attributes + // when font from InputContext is used, + // it must be taken from the cursor position's cell attributes InputContext aContext; aContext.SetOptions( nOptions ); @@ -3211,7 +3211,7 @@ void ScGridWindow::UpdateInputContext() BOOL ScGridWindow::DropScroll( const Point& rMousePos ) { -/* doch auch auf nicht aktiven Views... +/* doch auch auf nicht aktiven Views... if ( !pViewData->IsActive() ) return FALSE; */ @@ -3238,16 +3238,16 @@ BOOL ScGridWindow::DropScroll( const Point& rMousePos ) if ( nDx != 0 || nDy != 0 ) { -// if (bDragRect) -// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); +// if (bDragRect) +// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); if ( nDx != 0 ) pViewData->GetView()->ScrollX( nDx, WhichH(eWhich) ); if ( nDy != 0 ) pViewData->GetView()->ScrollY( nDy, WhichV(eWhich) ); -// if (bDragRect) -// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); +// if (bDragRect) +// pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); } return FALSE; @@ -3255,7 +3255,7 @@ BOOL ScGridWindow::DropScroll( const Point& rMousePos ) BOOL lcl_TestScenarioRedliningDrop( ScDocument* pDoc, const ScRange& aDragRange) { - // Testet, ob bei eingeschalteten RedLining, + // Testet, ob bei eingeschalteten RedLining, // bei einem Drop ein Scenario betroffen ist. BOOL bReturn = FALSE; @@ -3305,8 +3305,8 @@ ScRange lcl_MakeDropRange( SCCOL nPosX, SCROW nPosY, SCTAB nTab, const ScRange& //-------------------------------------------------------- -extern BOOL bPasteIsDrop; // viewfun4 -> move to header -extern BOOL bPasteIsMove; // viewfun7 -> move to header +extern BOOL bPasteIsDrop; // viewfun4 -> move to header +extern BOOL bPasteIsMove; // viewfun7 -> move to header //-------------------------------------------------------- @@ -3315,7 +3315,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) if ( rEvt.mbLeaving ) { // if (bDragRect) - // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); + // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); bDragRect = FALSE; UpdateDragRectOverlay(); return rEvt.mnAction; @@ -3343,34 +3343,34 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) { if ( pThisDoc->HasChartAtPoint(pViewData->GetTabNo(), PixelToLogic(aPos)) ) { - if (bDragRect) // Rechteck loeschen + if (bDragRect) // Rechteck loeschen { // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); bDragRect = FALSE; UpdateDragRectOverlay(); } - //! highlight chart? (selection border?) + //! highlight chart? (selection border?) sal_Int8 nRet = rEvt.mnAction; -//! if ( rEvt.GetAction() == DROP_LINK ) -//! bOk = rEvt.SetAction( DROP_COPY ); // can't link onto chart +//! if ( rEvt.GetAction() == DROP_LINK ) +//! bOk = rEvt.SetAction( DROP_COPY ); // can't link onto chart return nRet; } } -//! else -//! if ( rEvt.GetAction() == DROP_MOVE ) -//! rEvt.SetAction( DROP_COPY ); // different doc: default=COPY +//! else +//! if ( rEvt.GetAction() == DROP_MOVE ) +//! rEvt.SetAction( DROP_COPY ); // different doc: default=COPY - if ( rData.pCellTransfer->GetDragSourceFlags() & SC_DROP_TABLE ) // whole sheet? + if ( rData.pCellTransfer->GetDragSourceFlags() & SC_DROP_TABLE ) // whole sheet? { BOOL bOk = pThisDoc->IsDocEditable(); - return bOk ? rEvt.mnAction : 0; // don't draw selection frame + return bOk ? rEvt.mnAction : 0; // don't draw selection frame } - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); ScRange aSourceRange = rData.pCellTransfer->GetRange(); @@ -3382,7 +3382,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) SCROW nSizeY = nSourceEndY - nSourceStartY + 1; if ( rEvt.mnAction != DND_ACTION_MOVE ) - nSizeY = rData.pCellTransfer->GetNonFilteredRows(); // copy/link: no filtered rows + nSizeY = rData.pCellTransfer->GetNonFilteredRows(); // copy/link: no filtered rows SCsCOL nNewDragX = nPosX - rData.pCellTransfer->GetDragHandleX(); if (nNewDragX<0) nNewDragX=0; @@ -3393,7 +3393,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) if (nNewDragY+(nSizeY-1) > MAXROW) nNewDragY = MAXROW-(nSizeY-1); - // don't break scenario ranges, don't drop on filtered + // don't break scenario ranges, don't drop on filtered SCTAB nTab = pViewData->GetTabNo(); ScRange aDropRange = lcl_MakeDropRange( nNewDragX, nNewDragY, nTab, aSourceRange ); if ( lcl_TestScenarioRedliningDrop( pThisDoc, aDropRange ) || @@ -3521,7 +3521,7 @@ sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) !bDragRect || eDragInsertMode != meDragInsertMode ) { // if (bDragRect) - // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); + // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); nDragStartX = nNewDragX; nDragStartY = nNewDragY; @@ -3546,7 +3546,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) { DrawMarkDropObj( NULL ); if ( rData.pCellTransfer ) - return AcceptPrivateDrop( rEvt ); // hide drop marker for internal D&D + return AcceptPrivateDrop( rEvt ); // hide drop marker for internal D&D else return rEvt.mnAction; } @@ -3580,8 +3580,8 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) } else if (rData.aJumpTarget.Len()) { - // internal bookmarks (from Navigator) - // local jumps from an unnamed document are possible only within a document + // internal bookmarks (from Navigator) + // local jumps from an unnamed document are possible only within a document if ( !rData.pJumpLocalDoc || rData.pJumpLocalDoc == pViewData->GetDocument() ) nRet = rEvt.mnAction; @@ -3591,7 +3591,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) sal_Int8 nMyAction = rEvt.mnAction; if ( !rData.pDrawTransfer || - !IsMyModel(rData.pDrawTransfer->GetDragSourceView()) ) // drawing within the document + !IsMyModel(rData.pDrawTransfer->GetDragSourceView()) ) // drawing within the document if ( rEvt.mbDefault && nMyAction == DND_ACTION_MOVE ) nMyAction = DND_ACTION_COPY; @@ -3604,7 +3604,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) || IsDropFormatSupported(SOT_FORMAT_GDIMETAFILE) || IsDropFormatSupported(SOT_FORMAT_BITMAP) ) { - // graphic dragged onto drawing object + // graphic dragged onto drawing object DrawMarkDropObj( pHitObj ); nRet = nMyAction; } @@ -3689,7 +3689,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) } } - // scroll only for accepted formats + // scroll only for accepted formats if (nRet) DropScroll( rEvt.maPosPixel ); } @@ -3703,7 +3703,7 @@ ULONG lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xT if ( !aDataHelper.HasFormat( SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ) ) { - // use bookmark formats if no sba is present + // use bookmark formats if no sba is present if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_SOLK ) ) return SOT_FORMATSTR_ID_SOLK; @@ -3722,7 +3722,7 @@ ULONG lcl_GetDropFormatId( const uno::Reference<datatransfer::XTransferable>& xT nFormatId = SOT_FORMATSTR_ID_SVXB; else if ( aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE ) ) { - // If it's a Writer object, insert RTF instead of OLE + // If it's a Writer object, insert RTF instead of OLE BOOL bDoRtf = FALSE; SotStorageStreamRef xStm; @@ -3814,7 +3814,7 @@ sal_Int8 ScGridWindow::ExecutePrivateDrop( const ExecuteDropEvent& rEvt ) { // hide drop marker // if (bDragRect) - // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); + // pViewData->GetView()->DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, eWhich ); bDragRect = FALSE; UpdateDragRectOverlay(); @@ -3834,7 +3834,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos ScDocument* pSourceDoc = pTransObj->GetSourceDocument(); ScDocShell* pDocSh = pViewData->GetDocShell(); ScDocument* pThisDoc = pViewData->GetDocument(); - ScViewFunc* pView = pViewData->GetView(); + ScViewFunc* pView = pViewData->GetView(); SCTAB nThisTab = pViewData->GetTabNo(); USHORT nFlags = pTransObj->GetDragSourceFlags(); @@ -3853,8 +3853,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos ScRange aSource = pTransObj->GetRange(); - // only use visible tab from source range - when dragging within one table, - // all selected tables at the time of dropping are used (handled in MoveBlockTo) + // only use visible tab from source range - when dragging within one table, + // all selected tables at the time of dropping are used (handled in MoveBlockTo) SCTAB nSourceTab = pTransObj->GetVisibleTab(); aSource.aStart.SetTab( nSourceTab ); aSource.aEnd.SetTab( nSourceTab ); @@ -3894,17 +3894,17 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos if (!bFiltered && pSourceDoc == pThisDoc) { - if ( nFlags & SC_DROP_TABLE ) // whole sheet? + if ( nFlags & SC_DROP_TABLE ) // whole sheet? { if ( pThisDoc->IsDocEditable() ) { SCTAB nSrcTab = aSource.aStart.Tab(); - pViewData->GetDocShell()->MoveTable( nSrcTab, nThisTab, !bIsMove, TRUE ); // with Undo + pViewData->GetDocShell()->MoveTable( nSrcTab, nThisTab, !bIsMove, TRUE ); // with Undo pView->SetTabNo( nThisTab, TRUE ); bDone = TRUE; } } - else // move/copy block + else // move/copy block { String aChartName; if (pThisDoc->HasChartAtPoint( nThisTab, rLogicPos, &aChartName )) @@ -4018,18 +4018,18 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos pDocSh->GetUndoManager()->LeaveListAction(); if (!bDone) - Sound::Beep(); // instead of error message in drop handler + Sound::Beep(); // instead of error message in drop handler } else - bDone = TRUE; // nothing to do + bDone = TRUE; // nothing to do } if (bDone) - pTransObj->SetDragWasInternal(); // don't delete source in DragFinished + pTransObj->SetDragWasInternal(); // don't delete source in DragFinished } - else if ( !bFiltered && pSourceDoc ) // between documents + else if ( !bFiltered && pSourceDoc ) // between documents { - if ( nFlags & SC_DROP_TABLE ) // copy/link sheets between documents + if ( nFlags & SC_DROP_TABLE ) // copy/link sheets between documents { if ( pThisDoc->IsDocEditable() ) { @@ -4037,9 +4037,9 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos SCTAB nTabs[MAXTABCOUNT]; - ScMarkData aMark = pTransObj->GetSourceMarkData(); - SCTAB nTabCount = pSourceDoc->GetTableCount(); - SCTAB nTabSelCount = 0; + ScMarkData aMark = pTransObj->GetSourceMarkData(); + SCTAB nTabCount = pSourceDoc->GetTableCount(); + SCTAB nTabSelCount = 0; for(SCTAB i=0; i<nTabCount; i++) { @@ -4064,8 +4064,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos } else if ( bIsLink ) { - // as in PasteDDE - // (external references might be used instead?) + // as in PasteDDE + // (external references might be used instead?) SfxObjectShell* pSourceSh = pSourceDoc->GetDocumentShell(); DBG_ASSERT(pSourceSh, "drag document has no shell"); @@ -4128,8 +4128,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos } else { - //! HasSelectedBlockMatrixFragment without selected sheet? - //! or don't start dragging on a part of a matrix + //! HasSelectedBlockMatrixFragment without selected sheet? + //! or don't start dragging on a part of a matrix String aUndo = ScGlobal::GetRscString( bIsMove ? STR_UNDO_MOVE : STR_UNDO_COPY ); pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo ); @@ -4160,8 +4160,8 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos pDocSh->GetUndoManager()->LeaveListAction(); - // no longer call ResetMark here - the inserted block has been selected - // and may have been copied to primary selection + // no longer call ResetMark here - the inserted block has been selected + // and may have been copied to primary selection } } @@ -4171,7 +4171,7 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - DrawMarkDropObj( NULL ); // drawing layer + DrawMarkDropObj( NULL ); // drawing layer ScModule* pScMod = SC_MOD(); const ScDragData& rData = pScMod->GetDragData(); @@ -4182,7 +4182,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) if ( rData.aLinkDoc.Len() ) { - // try to insert a link + // try to insert a link BOOL bOk = TRUE; String aThisName; @@ -4190,7 +4190,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) if (pDocSh && pDocSh->HasName()) aThisName = pDocSh->GetMedium()->GetName(); - if ( rData.aLinkDoc == aThisName ) // error - no link within a document + if ( rData.aLinkDoc == aThisName ) // error - no link within a document bOk = FALSE; else { @@ -4200,8 +4200,8 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) rData.aLinkTable ); else if ( rData.aLinkArea.Len() ) { - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); pView->MoveCursorAbs( nPosX, nPosY, SC_FOLLOW_NONE, FALSE, FALSE ); @@ -4215,7 +4215,7 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) } } - return bOk ? rEvt.mnAction : DND_ACTION_NONE; // don't try anything else + return bOk ? rEvt.mnAction : DND_ACTION_NONE; // don't try anything else } Point aLogicPos = PixelToLogic(aPos); @@ -4239,14 +4239,14 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) } - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); if (rData.aJumpTarget.Len()) { - // internal bookmark (from Navigator) - // bookmark clipboard formats are in PasteScDataObject + // internal bookmark (from Navigator) + // bookmark clipboard formats are in PasteScDataObject if ( !rData.pJumpLocalDoc || rData.pJumpLocalDoc == pViewData->GetDocument() ) { @@ -4262,8 +4262,8 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) SdrObject* pHitObj = pThisDoc->GetObjectAtPoint( pViewData->GetTabNo(), PixelToLogic(aPos) ); if ( pHitObj && bIsLink ) { - // dropped on drawing object - // PasteOnDrawObject checks for valid formats + // dropped on drawing object + // PasteOnDrawObject checks for valid formats if ( pViewData->GetView()->PasteOnDrawObject( rEvt.maDropEvent.Transferable, pHitObj, TRUE ) ) return rEvt.mnAction; } @@ -4293,8 +4293,8 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) { Point aLogicPos = PixelToLogic( rPosPixel ); - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( rPosPixel.X(), rPosPixel.Y(), eWhich, nPosX, nPosY ); // If the mouse down was inside a visible note window, ignore it and @@ -4317,7 +4317,7 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) ScSelectionTransferObj* pOwnSelection = SC_MOD()->GetSelectionTransfer(); if ( pOwnSelection ) { - // within Calc + // within Calc ScTransferObj* pCellTransfer = pOwnSelection->GetCellData(); if ( pCellTransfer ) @@ -4334,8 +4334,8 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) // keep a reference to the data in case the selection is changed during paste uno::Reference<datatransfer::XTransferable> xRef( pDrawTransfer ); - // #96821# bSameDocClipboard argument for PasteDraw is needed - // because only DragData is checked directly inside PasteDraw + // #96821# bSameDocClipboard argument for PasteDraw is needed + // because only DragData is checked directly inside PasteDraw pViewData->GetView()->PasteDraw( aLogicPos, pDrawTransfer->GetModel(), FALSE, pDrawTransfer->GetSourceDocID() == pViewData->GetDocument()->GetDocumentID() ); } @@ -4343,7 +4343,7 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) } else { - // get selection from system + // get selection from system TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSelection( this ) ); uno::Reference<datatransfer::XTransferable> xTransferable = aDataHelper.GetTransferable(); @@ -4373,7 +4373,7 @@ void ScGridWindow::UpdateEditViewPos() SCCOL nEndCol = pViewData->GetEditEndCol(); SCROW nEndRow = pViewData->GetEditEndRow(); - // hide EditView? + // hide EditView? BOOL bHide = ( nEndCol<pViewData->GetPosX(eHWhich) || nEndRow<pViewData->GetPosY(eVWhich) ); if ( SC_MOD()->IsFormulaMode() ) @@ -4414,7 +4414,7 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY ) SetMapMode(MAP_PIXEL); Scroll( nDifX, nDifY, SCROLL_CHILDREN ); - SetMapMode( GetDrawMapMode() ); // verschobenen MapMode erzeugen + SetMapMode( GetDrawMapMode() ); // verschobenen MapMode erzeugen UpdateEditViewPos(); @@ -4422,7 +4422,7 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY ) bIsInScroll = FALSE; } -// Formeln neu zeichnen ------------------------------------------------- +// Formeln neu zeichnen ------------------------------------------------- void ScGridWindow::UpdateFormulas() { @@ -4431,18 +4431,18 @@ void ScGridWindow::UpdateFormulas() if ( nPaintCount ) { - // nicht anfangen, verschachtelt zu painten - // (dann wuerde zumindest der MapMode nicht mehr stimmen) + // nicht anfangen, verschachtelt zu painten + // (dann wuerde zumindest der MapMode nicht mehr stimmen) - bNeedsRepaint = TRUE; // -> am Ende vom Paint nochmal Invalidate auf alles - aRepaintPixel = Rectangle(); // alles + bNeedsRepaint = TRUE; // -> am Ende vom Paint nochmal Invalidate auf alles + aRepaintPixel = Rectangle(); // alles return; } - SCCOL nX1 = pViewData->GetPosX( eHWhich ); - SCROW nY1 = pViewData->GetPosY( eVWhich ); - SCCOL nX2 = nX1 + pViewData->VisibleCellsX( eHWhich ); - SCROW nY2 = nY1 + pViewData->VisibleCellsY( eVWhich ); + SCCOL nX1 = pViewData->GetPosX( eHWhich ); + SCROW nY1 = pViewData->GetPosY( eVWhich ); + SCCOL nX2 = nX1 + pViewData->VisibleCellsX( eHWhich ); + SCROW nY2 = nY1 + pViewData->VisibleCellsY( eVWhich ); if (nX2 > MAXCOL) nX2 = MAXCOL; if (nY2 > MAXROW) nY2 = MAXROW; @@ -4579,10 +4579,10 @@ void __EXPORT ScGridWindow::GetFocus() if ( !SC_MOD()->IsFormulaMode() ) { pViewShell->UpdateInputHandler(); -// StopMarking(); // falls Dialog (Fehler), weil dann kein ButtonUp +// StopMarking(); // falls Dialog (Fehler), weil dann kein ButtonUp // MO: nur wenn nicht im RefInput-Modus // -> GetFocus/MouseButtonDown-Reihenfolge - // auf dem Mac + // auf dem Mac } pViewData->GetDocShell()->CheckConfigOptions(); @@ -4623,10 +4623,10 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner, SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( rMouse.X(), rMouse.Y(), eWhich, nPosX, nPosY ); - // zusammengefasste (einzeln/Bereich) ??? + // zusammengefasste (einzeln/Bereich) ??? ScAddress aAddr( nPosX, nPosY, nTab ); -// Point aNext = pViewData->GetScrPos( nPosX+1, nPosY+1, eWhich ); +// Point aNext = pViewData->GetScrPos( nPosX+1, nPosY+1, eWhich ); Point aNext = pViewData->GetScrPos( nPosX, nPosY, eWhich, TRUE ); long nSizeXPix; @@ -4643,19 +4643,19 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner, BOOL bCellCorner = ( bCornerHor && rMouse.Y() >= aNext.Y() - 8 && rMouse.Y() <= aNext.Y() ); - // corner is hit only if the mouse is within the cell + // corner is hit only if the mouse is within the cell USHORT nCount = (USHORT)pRangeFinder->Count(); for (USHORT i=nCount; i;) { - // rueckwaerts suchen, damit der zuletzt gepaintete Rahmen gefunden wird + // rueckwaerts suchen, damit der zuletzt gepaintete Rahmen gefunden wird --i; ScRangeFindData* pData = pRangeFinder->GetObject(i); if ( pData && pData->aRef.In(aAddr) ) { - if (pIndex) *pIndex = i; - if (pAddX) *pAddX = nPosX - pData->aRef.aStart.Col(); - if (pAddY) *pAddY = nPosY - pData->aRef.aStart.Row(); + if (pIndex) *pIndex = i; + if (pAddX) *pAddX = nPosX - pData->aRef.aStart.Col(); + if (pAddY) *pAddY = nPosY - pData->aRef.aStart.Row(); bFound = TRUE; rCorner = ( bCellCorner && aAddr == pData->aRef.aEnd ); break; @@ -4666,15 +4666,15 @@ BOOL ScGridWindow::HitRangeFinder( const Point& rMouse, BOOL& rCorner, return bFound; } -#define SCE_TOP 1 -#define SCE_BOTTOM 2 -#define SCE_LEFT 4 -#define SCE_RIGHT 8 -#define SCE_ALL 15 +#define SCE_TOP 1 +#define SCE_BOTTOM 2 +#define SCE_LEFT 4 +#define SCE_RIGHT 8 +#define SCE_ALL 15 void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges ) { - // der Range ist immer richtigherum + // der Range ist immer richtigherum SCCOL nCol1 = rRange.aStart.Col(); SCROW nRow1 = rRange.aStart.Row(); @@ -4715,8 +4715,8 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges if ( nCol2 > nCol1 + 1 && nRow2 > nRow1 + 1 && !bHiddenEdge ) { - // nur an den Raendern entlang - // (die Ecken werden evtl. zweimal getroffen) + // nur an den Raendern entlang + // (die Ecken werden evtl. zweimal getroffen) if ( nEdges & SCE_TOP ) pDocSh->PostPaint( nCol1, nRow1, nTab1, nCol2, nRow1, nTab2, PAINT_MARKS ); @@ -4727,22 +4727,22 @@ void lcl_PaintOneRange( ScDocShell* pDocSh, const ScRange& rRange, USHORT nEdges if ( nEdges & SCE_BOTTOM ) pDocSh->PostPaint( nCol1, nRow2, nTab1, nCol2, nRow2, nTab2, PAINT_MARKS ); } - else // everything in one call + else // everything in one call pDocSh->PostPaint( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, PAINT_MARKS ); } void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, const ScRange& rNewUn ) { - // Repaint fuer die Teile des Rahmens in Old, die bei New nicht mehr da sind + // Repaint fuer die Teile des Rahmens in Old, die bei New nicht mehr da sind ScRange aOld = rOldUn; ScRange aNew = rNewUn; aOld.Justify(); aNew.Justify(); - if ( aOld.aStart == aOld.aEnd ) //! Tab ignorieren? + if ( aOld.aStart == aOld.aEnd ) //! Tab ignorieren? pDocSh->GetDocument()->ExtendMerge(aOld); - if ( aNew.aStart == aNew.aEnd ) //! Tab ignorieren? + if ( aNew.aStart == aNew.aEnd ) //! Tab ignorieren? pDocSh->GetDocument()->ExtendMerge(aNew); SCCOL nOldCol1 = aOld.aStart.Col(); @@ -4753,7 +4753,7 @@ void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, const ScRan SCROW nNewRow1 = aNew.aStart.Row(); SCCOL nNewCol2 = aNew.aEnd.Col(); SCROW nNewRow2 = aNew.aEnd.Row(); - SCTAB nTab1 = aOld.aStart.Tab(); // Tab aendert sich nicht + SCTAB nTab1 = aOld.aStart.Tab(); // Tab aendert sich nicht SCTAB nTab2 = aOld.aEnd.Tab(); if ( nNewRow2 < nOldRow1 || nNewRow1 > nOldRow2 || @@ -4761,45 +4761,45 @@ void lcl_PaintRefChanged( ScDocShell* pDocSh, const ScRange& rOldUn, const ScRan ( nNewCol1 != nOldCol1 && nNewRow1 != nOldRow1 && nNewCol2 != nOldCol2 && nNewRow2 != nOldRow2 ) ) { - // komplett weggeschoben oder alle Seiten veraendert - // (Abfrage <= statt < geht schief bei einzelnen Zeilen/Spalten) + // komplett weggeschoben oder alle Seiten veraendert + // (Abfrage <= statt < geht schief bei einzelnen Zeilen/Spalten) lcl_PaintOneRange( pDocSh, aOld, SCE_ALL ); } - else // alle vier Kanten einzeln testen + else // alle vier Kanten einzeln testen { - // oberer Teil - if ( nNewRow1 < nOldRow1 ) // nur obere Linie loeschen + // oberer Teil + if ( nNewRow1 < nOldRow1 ) // nur obere Linie loeschen lcl_PaintOneRange( pDocSh, ScRange( nOldCol1, nOldRow1, nTab1, nOldCol2, nOldRow1, nTab2 ), SCE_ALL ); - else if ( nNewRow1 > nOldRow1 ) // den Teil, der oben wegkommt + else if ( nNewRow1 > nOldRow1 ) // den Teil, der oben wegkommt lcl_PaintOneRange( pDocSh, ScRange( nOldCol1, nOldRow1, nTab1, nOldCol2, nNewRow1-1, nTab2 ), SCE_ALL &~ SCE_BOTTOM ); - // unterer Teil - if ( nNewRow2 > nOldRow2 ) // nur untere Linie loeschen + // unterer Teil + if ( nNewRow2 > nOldRow2 ) // nur untere Linie loeschen lcl_PaintOneRange( pDocSh, ScRange( nOldCol1, nOldRow2, nTab1, nOldCol2, nOldRow2, nTab2 ), SCE_ALL ); - else if ( nNewRow2 < nOldRow2 ) // den Teil, der unten wegkommt + else if ( nNewRow2 < nOldRow2 ) // den Teil, der unten wegkommt lcl_PaintOneRange( pDocSh, ScRange( nOldCol1, nNewRow2+1, nTab1, nOldCol2, nOldRow2, nTab2 ), SCE_ALL &~ SCE_TOP ); - // linker Teil - if ( nNewCol1 < nOldCol1 ) // nur linke Linie loeschen + // linker Teil + if ( nNewCol1 < nOldCol1 ) // nur linke Linie loeschen lcl_PaintOneRange( pDocSh, ScRange( nOldCol1, nOldRow1, nTab1, nOldCol1, nOldRow2, nTab2 ), SCE_ALL ); - else if ( nNewCol1 > nOldCol1 ) // den Teil, der links wegkommt + else if ( nNewCol1 > nOldCol1 ) // den Teil, der links wegkommt lcl_PaintOneRange( pDocSh, ScRange( nOldCol1, nOldRow1, nTab1, nNewCol1-1, nOldRow2, nTab2 ), SCE_ALL &~ SCE_RIGHT ); - // rechter Teil - if ( nNewCol2 > nOldCol2 ) // nur rechte Linie loeschen + // rechter Teil + if ( nNewCol2 > nOldCol2 ) // nur rechte Linie loeschen lcl_PaintOneRange( pDocSh, ScRange( nOldCol2, nOldRow1, nTab1, nOldCol2, nOldRow2, nTab2 ), SCE_ALL ); - else if ( nNewCol2 < nOldCol2 ) // den Teil, der rechts wegkommt + else if ( nNewCol2 < nOldCol2 ) // den Teil, der rechts wegkommt lcl_PaintOneRange( pDocSh, ScRange( nNewCol2+1, nOldRow1, nTab1, nOldCol2, nOldRow2, nTab2 ), SCE_ALL &~ SCE_LEFT ); @@ -4818,14 +4818,14 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ) if (!pData) return; - // Mauszeiger + // Mauszeiger if (bRFSize) SetPointer( Pointer( POINTER_CROSS ) ); else SetPointer( Pointer( POINTER_HAND ) ); - // Scrolling + // Scrolling BOOL bTimer = FALSE; Point aPos = rMEvt.GetPosPixel(); @@ -4845,9 +4845,9 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ) bTimer = TRUE; } - // Umschalten bei Fixierung (damit Scrolling funktioniert) + // Umschalten bei Fixierung (damit Scrolling funktioniert) - if ( eWhich == pViewData->GetActivePart() ) //?? + if ( eWhich == pViewData->GetActivePart() ) //?? { if ( pViewData->GetHSplitMode() == SC_SPLIT_FIX ) if ( nDx > 0 ) @@ -4868,10 +4868,10 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ) } } - // Verschieben + // Verschieben - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); ScRange aOld = pData->aRef; @@ -4907,7 +4907,7 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ) } if ( bUp ) - aNew.Justify(); // beim ButtonUp wieder richtigherum + aNew.Justify(); // beim ButtonUp wieder richtigherum if ( aNew != aOld ) { @@ -4915,19 +4915,19 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, BOOL bUp ) ScDocShell* pDocSh = pViewData->GetDocShell(); - // nur das neuzeichnen, was sich veraendert hat... + // nur das neuzeichnen, was sich veraendert hat... lcl_PaintRefChanged( pDocSh, aOld, aNew ); - // neuen Rahmen nur drueberzeichnen (synchron) + // neuen Rahmen nur drueberzeichnen (synchron) pDocSh->Broadcast( ScIndexHint( SC_HINT_SHOWRANGEFINDER, nRFIndex ) ); - Update(); // was man bewegt, will man auch sofort sehen + Update(); // was man bewegt, will man auch sofort sehen } - // Timer fuer Scrolling + // Timer fuer Scrolling if (bTimer) - pViewData->GetView()->SetTimer( this, rMEvt ); // Event wiederholen + pViewData->GetView()->SetTimer( this, rMEvt ); // Event wiederholen else pViewData->GetView()->ResetTimer(); } @@ -4943,7 +4943,7 @@ BOOL ScGridWindow::GetEditUrl( const Point& rPos, BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, String* pName, String* pUrl, String* pTarget ) { - //! nPosX/Y mit uebergeben? + //! nPosX/Y mit uebergeben? SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( rPos.X(), rPos.Y(), eWhich, nPosX, nPosY ); @@ -4957,7 +4957,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, if( !bFound ) return FALSE; - ScHideTextCursor aHideCursor( pViewData, eWhich ); // before GetEditArea (MapMode is changed) + ScHideTextCursor aHideCursor( pViewData, eWhich ); // before GetEditArea (MapMode is changed) const ScPatternAttr* pPattern = pDoc->GetPattern( nPosX, nPosY, nTab ); // bForceToTop = FALSE, use the cell's real position @@ -4965,7 +4965,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, if (rPos.Y() < aEditRect.Top()) return FALSE; - // vertikal kann (noch) nicht angeklickt werden: + // vertikal kann (noch) nicht angeklickt werden: if (pPattern->GetCellOrientation() != SVX_ORIENTATION_STANDARD) return FALSE; @@ -4976,7 +4976,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, SvxCellHorJustify eHorJust = (SvxCellHorJustify)((SvxHorJustifyItem&)pPattern-> GetItem(ATTR_HOR_JUSTIFY)).GetValue(); - // EditEngine + // EditEngine ScFieldEditEngine aEngine( pDoc->GetEditPool() ); ScSizeDeviceProvider aProv(pDocSh); @@ -4988,8 +4988,8 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, switch (eHorJust) { case SVX_HOR_JUSTIFY_LEFT: - case SVX_HOR_JUSTIFY_REPEAT: // nicht implementiert - case SVX_HOR_JUSTIFY_STANDARD: // always Text if an EditCell type + case SVX_HOR_JUSTIFY_REPEAT: // nicht implementiert + case SVX_HOR_JUSTIFY_STANDARD: // always Text if an EditCell type eSvxAdjust = SVX_ADJUST_LEFT; break; case SVX_HOR_JUSTIFY_RIGHT: @@ -5007,7 +5007,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, if (bSpellErr) aEngine.SetControlWord( aEngine.GetControlWord() | EE_CNTRL_ONLINESPELLING ); - MapMode aEditMode = pViewData->GetLogicMode(eWhich); // ohne Drawing-Skalierung + MapMode aEditMode = pViewData->GetLogicMode(eWhich); // ohne Drawing-Skalierung Rectangle aLogicEdit = PixelToLogic( aEditRect, aEditMode ); long nThisColLogic = aLogicEdit.Right() - aLogicEdit.Left() + 1; Size aPaperSize = Size( 1000000, 1000000 ); @@ -5071,23 +5071,23 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, Point aLogicClick = PixelToLogic(rPos,aEditMode); if ( aLogicEdit.IsInside(aLogicClick) ) { -// aEngine.SetUpdateMode(FALSE); +// aEngine.SetUpdateMode(FALSE); EditView aTempView( &aEngine, this ); aTempView.SetOutputArea( aLogicEdit ); BOOL bRet = FALSE; MapMode aOld = GetMapMode(); - SetMapMode(aEditMode); // kein return mehr + SetMapMode(aEditMode); // kein return mehr - if (bSpellErr) // Spelling-Fehler suchen + if (bSpellErr) // Spelling-Fehler suchen { bRet = aTempView.IsWrongSpelledWordAtPos( rPos ); if ( bRet ) - pViewData->GetView()->SetCursor( nPosX, nPosY ); // Cursor setzen + pViewData->GetView()->SetCursor( nPosX, nPosY ); // Cursor setzen } - else // URL suchen + else // URL suchen { - const SvxFieldItem* pFieldItem = aTempView.GetFieldUnderMousePointer(); + const SvxFieldItem* pFieldItem = aTempView.GetFieldUnderMousePointer(); if (pFieldItem) { @@ -5111,7 +5111,7 @@ BOOL ScGridWindow::GetEditUrlOrError( BOOL bSpellErr, const Point& rPos, SetMapMode(aOld); - // text cursor is restored in ScHideTextCursor dtor + // text cursor is restored in ScHideTextCursor dtor return bRet; } @@ -5130,11 +5130,11 @@ BOOL ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang Size aButSize = pViewData->GetScenButSize(); long nBWidth = aButSize.Width(); if (!nBWidth) - return FALSE; // noch kein Button gezeichnet -> da ist auch keiner + return FALSE; // noch kein Button gezeichnet -> da ist auch keiner long nBHeight = aButSize.Height(); long nHSpace = (long)( SC_SCENARIO_HSPACE * pViewData->GetPPTX() ); - //! Ranges an der Table cachen!!!! + //! Ranges an der Table cachen!!!! ScMarkData aMarks; for (SCTAB i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++) @@ -5147,8 +5147,8 @@ BOOL ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang for (ULONG j=0; j<nRangeCount; j++) { ScRange aRange = *aRanges.GetObject(j); - // Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn - // dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden + // Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn + // dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden pDoc->ExtendTotalMerge( aRange ); BOOL bTextBelow = ( aRange.aStart.Row() == 0 ); @@ -5168,7 +5168,7 @@ BOOL ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang if ( bLayoutRTL ) aButtonPos.X() -= nHSpace - 1; else - aButtonPos.X() -= nBWidth - nHSpace; // same for top or bottom + aButtonPos.X() -= nBWidth - nHSpace; // same for top or bottom Rectangle aButRect( aButtonPos, Size(nBWidth,nBHeight) ); if ( aButRect.IsInside( rPosPixel ) ) @@ -5396,7 +5396,7 @@ void ScGridWindow::UpdateCursorOverlay() aCursorColor = SC_MOD()->GetColorConfig().GetColorValue(svtools::CALCPAGEBREAKAUTOMATIC).nColor; std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); - + for(sal_uInt32 a(0); a < aPixelRects.size(); a++) { const Rectangle aRA(aPixelRects[a]); @@ -5404,10 +5404,10 @@ void ScGridWindow::UpdateCursorOverlay() aRB.transform(aTransform); aRanges.push_back(aRB); } - + sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_SOLID, - aCursorColor, + sdr::overlay::OVERLAY_SOLID, + aCursorColor, aRanges, false); @@ -5446,7 +5446,7 @@ void ScGridWindow::UpdateSelectionOverlay() { std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); - + for(sal_uInt32 a(0); a < aPixelRects.size(); a++) { const Rectangle aRA(aPixelRects[a]); @@ -5476,8 +5476,8 @@ void ScGridWindow::UpdateSelectionOverlay() } sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_TRANSPARENT, - aHighlight, + sdr::overlay::OVERLAY_TRANSPARENT, + aHighlight, aRanges, true); @@ -5536,7 +5536,7 @@ void ScGridWindow::UpdateAutoFillOverlay() aFillPos.Y() += nSizeYPix; aFillPos.Y() -= 2; mpAutoFillRect.reset(new Rectangle(aFillPos, Size(6, 6))); - + // #i70788# get the OverlayManager safely ::sdr::overlay::OverlayManager* pOverlayManager = getOverlayManager(); @@ -5549,13 +5549,13 @@ void ScGridWindow::UpdateAutoFillOverlay() std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); basegfx::B2DRange aRB(mpAutoFillRect->Left(), mpAutoFillRect->Top(), mpAutoFillRect->Right() + 1, mpAutoFillRect->Bottom() + 1); - + aRB.transform(aTransform); aRanges.push_back(aRB); - sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_SOLID, - aHandleColor, + sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( + sdr::overlay::OVERLAY_SOLID, + aHandleColor, aRanges, false); @@ -5676,7 +5676,7 @@ void ScGridWindow::UpdateDragRectOverlay() // Color aHighlight = GetSettings().GetStyleSettings().GetHighlightColor(); std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); - + for(sal_uInt32 a(0); a < aPixelRects.size(); a++) { const Rectangle aRA(aPixelRects[a]); @@ -5685,8 +5685,8 @@ void ScGridWindow::UpdateDragRectOverlay() aRanges.push_back(aRB); } - sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_INVERT, + sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( + sdr::overlay::OVERLAY_INVERT, Color(COL_BLACK), aRanges, false); @@ -5727,13 +5727,13 @@ void ScGridWindow::UpdateHeaderOverlay() std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); basegfx::B2DRange aRB(aInvertRect.Left(), aInvertRect.Top(), aInvertRect.Right() + 1, aInvertRect.Bottom() + 1); - + aRB.transform(aTransform); aRanges.push_back(aRB); sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_INVERT, - Color(COL_BLACK), + sdr::overlay::OVERLAY_INVERT, + Color(COL_BLACK), aRanges, false); @@ -5797,13 +5797,13 @@ void ScGridWindow::UpdateShrinkOverlay() std::vector< basegfx::B2DRange > aRanges; const basegfx::B2DHomMatrix aTransform(GetInverseViewTransformation()); basegfx::B2DRange aRB(aPixRect.Left(), aPixRect.Top(), aPixRect.Right() + 1, aPixRect.Bottom() + 1); - + aRB.transform(aTransform); aRanges.push_back(aRB); sdr::overlay::OverlayObject* pOverlay = new sdr::overlay::OverlaySelection( - sdr::overlay::OVERLAY_INVERT, - Color(COL_BLACK), + sdr::overlay::OVERLAY_INVERT, + Color(COL_BLACK), aRanges, false); diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index dd19b66fcf25..ccacee30fe30 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ #include "pagedata.hxx" #include "dpobject.hxx" #include "dpsave.hxx" -#include "dpoutput.hxx" // ScDPPositionData +#include "dpoutput.hxx" // ScDPPositionData #include "dpshttab.hxx" #include "dbdocfun.hxx" #include "dpcontrol.hxx" @@ -176,7 +176,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); - ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); + ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); if (pDPObj) { @@ -190,8 +190,8 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt pDragDPObj = pDPObj; if (DPTestFieldPopupArrow(rMEvt, aPos, pDPObj)) - { - // field name pop up menu has been launched. Don't activate + { + // field name pop up menu has been launched. Don't activate // field move. bDPMouse = false; return; @@ -202,7 +202,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt } else if ( pDPObj->IsFilterButton(aPos) ) { - ReleaseMouse(); // may have been captured in ButtonDown + ReleaseMouse(); // may have been captured in ButtonDown ScQueryParam aQueryParam; SCTAB nSrcTab = 0; @@ -221,7 +221,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); - AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg( pViewData->GetViewShell()->GetDialogParent(), + AbstractScPivotFilterDlg* pDlg = pFact->CreateScPivotFilterDlg( pViewData->GetViewShell()->GetDialogParent(), aArgSet, nSrcTab, RID_SCDLG_PIVOTFILTER); DBG_ASSERT(pDlg, "Dialog create fail!"); @@ -238,7 +238,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt aNewObj.SetSheetDesc( aNewDesc ); ScDBDocFunc aFunc( *pViewData->GetDocShell() ); aFunc.DataPilotUpdate( pDPObj, &aNewObj, TRUE, FALSE ); - pViewData->GetView()->CursorPosChanged(); // shells may be switched + pViewData->GetView()->CursorPosChanged(); // shells may be switched } delete pDlg; } @@ -253,15 +253,15 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt // ----------------------------------------------------------------------- // -// Data Pilot interaction +// Data Pilot interaction // void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ) { DBG_ASSERT(pDragDPObj, "pDragDPObj missing"); - // scroll window if at edges - //! move this to separate method + // scroll window if at edges + //! move this to separate method BOOL bTimer = FALSE; Point aPixel = rMEvt.GetPosPixel(); @@ -289,13 +289,13 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ) bTimer = TRUE; } - // --- + // --- - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aPixel.X(), aPixel.Y(), eWhich, nPosX, nPosY ); - BOOL bMouseLeft; - BOOL bMouseTop; + BOOL bMouseLeft; + BOOL bMouseTop; pViewData->GetMouseQuadrant( aPixel, eWhich, nPosX, nPosY, bMouseLeft, bMouseTop ); ScAddress aPos( nPosX, nPosY, pViewData->GetTabNo() ); @@ -312,7 +312,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ) String aDimName = pDragDPObj->GetDimName( nDPField, bIsDataLayout, &nDimFlags ); bool bAllowed = !bHasRange || ScDPObject::IsOrientationAllowed( nOrient, nDimFlags ); - if (bMove) // set mouse pointer + if (bMove) // set mouse pointer { PointerStyle ePointer = POINTER_PIVOT_DELETE; if ( !bAllowed ) @@ -320,14 +320,14 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ) else if ( bHasRange ) switch (nOrient) { - case sheet::DataPilotFieldOrientation_COLUMN: ePointer = POINTER_PIVOT_COL; break; - case sheet::DataPilotFieldOrientation_ROW: ePointer = POINTER_PIVOT_ROW; break; + case sheet::DataPilotFieldOrientation_COLUMN: ePointer = POINTER_PIVOT_COL; break; + case sheet::DataPilotFieldOrientation_ROW: ePointer = POINTER_PIVOT_ROW; break; case sheet::DataPilotFieldOrientation_PAGE: - case sheet::DataPilotFieldOrientation_DATA: ePointer = POINTER_PIVOT_FIELD; break; + case sheet::DataPilotFieldOrientation_DATA: ePointer = POINTER_PIVOT_FIELD; break; } SetPointer( ePointer ); } - else // execute change + else // execute change { if (!bHasRange) nOrient = sheet::DataPilotFieldOrientation_HIDDEN; @@ -335,7 +335,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ) if ( bIsDataLayout && ( nOrient != sheet::DataPilotFieldOrientation_COLUMN && nOrient != sheet::DataPilotFieldOrientation_ROW ) ) { - // removing data layout is not allowed + // removing data layout is not allowed pViewData->GetView()->ErrorMessage(STR_PIVOT_MOVENOTALLOWED); } else if ( bAllowed ) @@ -350,19 +350,19 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, BOOL bMove ) pDim->SetOrientation( nOrient ); aSaveData.SetPosition( pDim, nDimPos ); - //! docfunc method with ScDPSaveData as argument? + //! docfunc method with ScDPSaveData as argument? ScDPObject aNewObj( *pDragDPObj ); aNewObj.SetSaveData( aSaveData ); ScDBDocFunc aFunc( *pViewData->GetDocShell() ); // when dragging fields, allow re-positioning (bAllowMove) aFunc.DataPilotUpdate( pDragDPObj, &aNewObj, TRUE, FALSE, TRUE ); - pViewData->GetView()->CursorPosChanged(); // shells may be switched + pViewData->GetView()->CursorPosChanged(); // shells may be switched } } if (bTimer && bMove) - pViewData->GetView()->SetTimer( this, rMEvt ); // repeat event + pViewData->GetView()->SetTimer( this, rMEvt ); // repeat event else pViewData->GetView()->ResetTimer(); } @@ -407,7 +407,7 @@ struct DPFieldPopupData : public ScDPFieldPopupWindow::ExtendedData class DPFieldPopupOKAction : public ScMenuFloatingWindow::Action { public: - explicit DPFieldPopupOKAction(ScGridWindow* p) : + explicit DPFieldPopupOKAction(ScGridWindow* p) : mpGridWindow(p) {} virtual void execute() @@ -502,7 +502,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu( // Populate the menus. ScTabViewShell* pViewShell = pViewData->GetViewShell(); mpDPFieldPopup->addMenuItem( - ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_ASC).GetString(), true, + ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_ASC).GetString(), true, new PopupSortAction(rPos, PopupSortAction::ASCENDING, 0, pViewShell)); mpDPFieldPopup->addMenuItem( ScRscStrLoader(RID_POPUP_FILTER, STR_MENU_SORT_DESC).GetString(), true, @@ -514,9 +514,9 @@ void ScGridWindow::DPLaunchFieldPopupMenu( { size_t n = aUserSortNames.size(); for (size_t i = 0; i < n; ++i) - { + { pSubMenu->addMenuItem( - aUserSortNames[i], true, + aUserSortNames[i], true, new PopupSortAction(rPos, PopupSortAction::CUSTOM, static_cast<sal_uInt16>(i), pViewShell)); } } @@ -532,7 +532,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu( } else if (rScrSize.getWidth() > rPopupSize.getWidth()) { - // If the cell width is larger than the popup window width, launch it + // If the cell width is larger than the popup window width, launch it // right-aligned with the cell. long nXOffset = rScrSize.getWidth() - rPopupSize.getWidth(); aCellRect.SetPos(Point(rScrPos.X() + nXOffset, rScrPos.Y())); @@ -636,11 +636,11 @@ void ScGridWindow::UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect ) if ( bShowRange == bDragRect && nDragStartX == nStartX && nDragEndX == nEndX && nDragStartY == nStartY && nDragEndY == nEndY ) { - return; // everything unchanged + return; // everything unchanged } // if ( bDragRect ) - // DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, FALSE ); + // DrawDragRect( nDragStartX, nDragStartY, nDragEndX, nDragEndY, FALSE ); if ( bShowRange ) { nDragStartX = nStartX; @@ -658,12 +658,12 @@ void ScGridWindow::UpdateDragRect( BOOL bShowRange, const Rectangle& rPosRect ) // ----------------------------------------------------------------------- -// Page-Break-Modus +// Page-Break-Modus USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, SCCOLROW* pBreak, SCCOLROW* pPrev ) { - USHORT nFound = SC_PD_NONE; // 0 + USHORT nFound = SC_PD_NONE; // 0 ScRange aSource; SCCOLROW nBreak = 0; SCCOLROW nPrev = 0; @@ -684,7 +684,7 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, Point aTL = pViewData->GetScrPos( nPosX, nPosY, eWhich ); Point aBR = pViewData->GetScrPos( nPosX+1, nPosY+1, eWhich ); - // Horizontal mehr Toleranz als vertikal, weil mehr Platz ist + // Horizontal mehr Toleranz als vertikal, weil mehr Platz ist if ( nMouseX <= aTL.X() + 4 ) { bHori = TRUE; @@ -693,7 +693,7 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, else if ( nMouseX >= aBR.X() - 6 ) { bHori = TRUE; - nHitX = nPosX+1; // linker Rand der naechsten Zelle + nHitX = nPosX+1; // linker Rand der naechsten Zelle } if ( nMouseY <= aTL.Y() + 2 ) { @@ -703,7 +703,7 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, else if ( nMouseY >= aBR.Y() - 4 ) { bVert = TRUE; - nHitY = nPosY+1; // oberer Rand der naechsten Zelle + nHitY = nPosY+1; // oberer Rand der naechsten Zelle } if ( bHori || bVert ) @@ -745,7 +745,7 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, if (nFound) aSource = aRange; - // Umbrueche + // Umbrueche if ( bVert && bInsideH && !nFound ) { @@ -784,20 +784,20 @@ USHORT ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, } if (pSource) - *pSource = aSource; // Druckbereich + *pSource = aSource; // Druckbereich if (pBreak) - *pBreak = nBreak; // X/Y Position des verchobenen Seitenumbruchs + *pBreak = nBreak; // X/Y Position des verchobenen Seitenumbruchs if (pPrev) - *pPrev = nPrev; // X/Y Anfang der Seite, die am Umbruch zuende ist + *pPrev = nPrev; // X/Y Anfang der Seite, die am Umbruch zuende ist return nFound; } void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) { - //! Scrolling und Umschalten mit RFMouseMove zusammenfassen ! - //! (Weginvertieren vor dem Scrolling ist anders) + //! Scrolling und Umschalten mit RFMouseMove zusammenfassen ! + //! (Weginvertieren vor dem Scrolling ist anders) - // Scrolling + // Scrolling BOOL bTimer = FALSE; Point aPos = rMEvt.GetPosPixel(); @@ -812,10 +812,10 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) nDy = 1; if ( nDx != 0 || nDy != 0 ) { - if ( bPagebreakDrawn ) // weginvertieren + if ( bPagebreakDrawn ) // weginvertieren { // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(), - // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); + // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); bPagebreakDrawn = FALSE; UpdateDragRectOverlay(); } @@ -825,9 +825,9 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) bTimer = TRUE; } - // Umschalten bei Fixierung (damit Scrolling funktioniert) + // Umschalten bei Fixierung (damit Scrolling funktioniert) - if ( eWhich == pViewData->GetActivePart() ) //?? + if ( eWhich == pViewData->GetActivePart() ) //?? { if ( pViewData->GetHSplitMode() == SC_SPLIT_FIX ) if ( nDx > 0 ) @@ -848,9 +848,9 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) } } - // ab hier neu + // ab hier neu - // gesucht wird eine Position zwischen den Zellen (vor nPosX / nPosY) + // gesucht wird eine Position zwischen den Zellen (vor nPosX / nPosY) SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); @@ -868,7 +868,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) if ( nPagebreakMouse == SC_PD_BREAK_H ) { if ( nPosX > aPagebreakSource.aStart.Col() && - nPosX <= aPagebreakSource.aEnd.Col() + 1 ) // ans Ende ist auch erlaubt + nPosX <= aPagebreakSource.aEnd.Col() + 1 ) // ans Ende ist auch erlaubt { bToEnd = ( nPosX == aPagebreakSource.aEnd.Col() + 1 ); aDrawRange.aStart.SetCol( nPosX ); @@ -880,7 +880,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) else { if ( nPosY > aPagebreakSource.aStart.Row() && - nPosY <= aPagebreakSource.aEnd.Row() + 1 ) // ans Ende ist auch erlaubt + nPosY <= aPagebreakSource.aEnd.Row() + 1 ) // ans Ende ist auch erlaubt { bToEnd = ( nPosY == aPagebreakSource.aEnd.Row() + 1 ); aDrawRange.aStart.SetRow( nPosY ); @@ -917,13 +917,13 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) if ( !bPagebreakDrawn || bUp || aDrawRange != aPagebreakDrag ) { - // zeichnen... + // zeichnen... if ( bPagebreakDrawn ) { // weginvertieren // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(), - // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); + // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); bPagebreakDrawn = FALSE; } aPagebreakDrag = aDrawRange; @@ -931,13 +931,13 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) { // hininvertieren // DrawDragRect( aPagebreakDrag.aStart.Col(), aPagebreakDrag.aStart.Row(), - // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); + // aPagebreakDrag.aEnd.Col(), aPagebreakDrag.aEnd.Row(), FALSE ); bPagebreakDrawn = TRUE; } UpdateDragRectOverlay(); } - // bei ButtonUp die Aenderung ausfuehren + // bei ButtonUp die Aenderung ausfuehren if ( bUp ) { @@ -967,14 +967,14 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) ScAddress aOldAddr( static_cast<SCCOL>(nPagebreakBreak), nPosY, nTab ); pViewFunc->DeletePageBreak( TRUE, TRUE, &aOldAddr, FALSE ); } - if ( !bHide && !bToEnd ) // am Ende nicht + if ( !bHide && !bToEnd ) // am Ende nicht { ScAddress aNewAddr( static_cast<SCCOL>(nNew), nPosY, nTab ); pViewFunc->InsertPageBreak( TRUE, TRUE, &aNewAddr, FALSE ); } if ( bGrow ) { - // vorigen Break auf hart, und Skalierung aendern + // vorigen Break auf hart, und Skalierung aendern bool bManualBreak = (pDoc->HasColBreak(static_cast<SCCOL>(nPagebreakPrev), nTab) & BREAK_MANUAL); if ( static_cast<SCCOL>(nPagebreakPrev) > aPagebreakSource.aStart.Col() && !bManualBreak ) { @@ -994,14 +994,14 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) ScAddress aOldAddr( nPosX, nPagebreakBreak, nTab ); pViewFunc->DeletePageBreak( FALSE, TRUE, &aOldAddr, FALSE ); } - if ( !bHide && !bToEnd ) // am Ende nicht + if ( !bHide && !bToEnd ) // am Ende nicht { ScAddress aNewAddr( nPosX, nNew, nTab ); pViewFunc->InsertPageBreak( FALSE, TRUE, &aNewAddr, FALSE ); } if ( bGrow ) { - // vorigen Break auf hart, und Skalierung aendern + // vorigen Break auf hart, und Skalierung aendern bool bManualBreak = (pDoc->HasRowBreak(nPagebreakPrev, nTab) & BREAK_MANUAL); if ( nPagebreakPrev > aPagebreakSource.aStart.Row() && !bManualBreak ) { @@ -1020,7 +1020,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) pDocSh->GetUndoManager()->LeaveListAction(); } - if (!bGrow) // sonst in AdjustPrintZoom schon passiert + if (!bGrow) // sonst in AdjustPrintZoom schon passiert { pViewFunc->UpdatePageBreakData( TRUE ); pDocSh->SetDocumentModified(); @@ -1029,7 +1029,7 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) } else if ( bHide || aPagebreakDrag != aPagebreakSource ) { - // Druckbereich setzen + // Druckbereich setzen String aNewRanges; USHORT nOldCount = pDoc->GetPrintRangeCount( nTab ); @@ -1061,10 +1061,10 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, BOOL bUp ) } } - // Timer fuer Scrolling + // Timer fuer Scrolling if (bTimer && !bUp) - pViewData->GetView()->SetTimer( this, rMEvt ); // Event wiederholen + pViewData->GetView()->SetTimer( this, rMEvt ); // Event wiederholen else pViewData->GetView()->ResetTimer(); } diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 4940fba35f82..37673bc035d1 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ BOOL ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt) Point aLogicPos = PixelToLogic(rMEvt.GetPosPixel()); if ( pDraw->IsDetectiveHit( aLogicPos ) ) { - // auf Detektiv-Pfeilen gar nichts (Doppelklick wird bei ButtonUp ausgewertet) + // auf Detektiv-Pfeilen gar nichts (Doppelklick wird bei ButtonUp ausgewertet) bRet = TRUE; } else @@ -75,7 +75,7 @@ BOOL ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt) } } - // bei rechter Taste Draw-Aktion abbrechen + // bei rechter Taste Draw-Aktion abbrechen ScDrawView* pDrView = pViewData->GetScDrawView(); if ( pDrView && !rMEvt.IsLeft() && !bRet ) @@ -143,7 +143,7 @@ void ScGridWindow::DrawEndAction() if (pDraw) pDraw->StopDragTimer(); - // ReleaseMouse beim Aufruf + // ReleaseMouse beim Aufruf } BOOL ScGridWindow::DrawCommand(const CommandEvent& rCEvt) @@ -155,7 +155,7 @@ BOOL ScGridWindow::DrawCommand(const CommandEvent& rCEvt) pDraw->SetWindow( this ); BYTE nUsed = pDraw->Command( rCEvt ); if( nUsed == SC_CMD_USED ) - nButtonDown = 0; // MouseButtonUp wird verschluckt... + nButtonDown = 0; // MouseButtonUp wird verschluckt... if( nUsed || pDrView->IsAction() ) return TRUE; } @@ -183,10 +183,10 @@ BOOL ScGridWindow::DrawKeyInput(const KeyEvent& rKEvt) bLeaveDraw = TRUE; if ( !bOldMarked && rKEvt.GetKeyCode().GetCode() == KEY_DELETE ) - bUsed = FALSE; // nichts geloescht + bUsed = FALSE; // nichts geloescht } if (!bLeaveDraw) - UpdateStatusPosSize(); // #108137# for moving/resizing etc. by keyboard + UpdateStatusPosSize(); // #108137# for moving/resizing etc. by keyboard return bUsed; } } @@ -229,7 +229,7 @@ void ScGridWindow::DrawRedraw( ScOutputData& rOutputData, ScUpdateMode eMode, UL void ScGridWindow::DrawSdrGrid( const Rectangle& rDrawingRect, OutputDevice* pContentDev ) { - // Draw-Gitterlinien + // Draw-Gitterlinien ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); if ( pDrView && pDrView->IsGridVisible() ) @@ -279,7 +279,7 @@ MapMode ScGridWindow::GetDrawMapMode( BOOL bForce ) Point aStartPos = pViewData->GetPixPos(eWhich); if ( bNegativePage ) { - // RTL uses negative positions for drawing objects + // RTL uses negative positions for drawing objects aStartPos.X() = -aStartPos.X() + GetOutputSizePixel().Width() - 1; } aDrawMode.SetOrigin( PixelToLogic( aStartPos, aDrawMode ) ); @@ -289,44 +289,44 @@ MapMode ScGridWindow::GetDrawMapMode( BOOL bForce ) //BOOL ScGridWindow::DrawBeforeScroll() //{ -// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); +// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); // -// BOOL bXor = FALSE; -// if (pDrView) -// { -// bXor=pDrView->IsShownXorVisible(this); -// if (bXor) pDrView->HideShownXor(this); -// } -// return bXor; +// BOOL bXor = FALSE; +// if (pDrView) +// { +// bXor=pDrView->IsShownXorVisible(this); +// if (bXor) pDrView->HideShownXor(this); +// } +// return bXor; //} void ScGridWindow::DrawAfterScroll(/*BOOL bVal*/) { - Update(); // immer, damit das Verhalten mit/ohne DrawingLayer gleich ist + Update(); // immer, damit das Verhalten mit/ohne DrawingLayer gleich ist ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); if (pDrView) { //if (bVal) - // pDrView->ShowShownXor(this); + // pDrView->ShowShownXor(this); OutlinerView* pOlView = pDrView->GetTextEditOutlinerView(); if (pOlView && pOlView->GetWindow() == this) - pOlView->ShowCursor(FALSE); // ist beim Scrollen weggekommen + pOlView->ShowCursor(FALSE); // ist beim Scrollen weggekommen } } //void ScGridWindow::DrawMarks() //{ -// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); -// if (pDrView) -// pDrView->DrawMarks(this); +// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); +// if (pDrView) +// pDrView->DrawMarks(this); //} //BOOL ScGridWindow::NeedDrawMarks() //{ -// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); -// return pDrView && pDrView->IsMarkHdlShown() && pDrView->AreObjectsMarked(); +// ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); +// return pDrView && pDrView->IsMarkHdlShown() && pDrView->AreObjectsMarked(); //} void ScGridWindow::CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress) @@ -362,7 +362,7 @@ void ScGridWindow::UpdateStatusPosSize() { ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); if (!pDrView) - return; // shouldn't be called in that case + return; // shouldn't be called in that case SdrPageView* pPV = pDrView->GetSdrPageView(); if (!pPV) @@ -370,13 +370,13 @@ void ScGridWindow::UpdateStatusPosSize() SfxItemSet aSet(pViewData->GetViewShell()->GetPool(), SID_ATTR_POSITION, SID_ATTR_SIZE); - // Fill items for position and size: - // #108137# show action rectangle during action, - // position and size of selected object(s) if something is selected, - // mouse position otherwise + // Fill items for position and size: + // #108137# show action rectangle during action, + // position and size of selected object(s) if something is selected, + // mouse position otherwise BOOL bActionItem = FALSE; - if ( pDrView->IsAction() ) // action rectangle + if ( pDrView->IsAction() ) // action rectangle { Rectangle aRect; pDrView->TakeActionRect( aRect ); @@ -391,7 +391,7 @@ void ScGridWindow::UpdateStatusPosSize() } if ( !bActionItem ) { - if ( pDrView->AreObjectsMarked() ) // selected objects + if ( pDrView->AreObjectsMarked() ) // selected objects { Rectangle aRect = pDrView->GetAllMarkedRect(); pPV->LogicToPagePos(aRect); @@ -399,7 +399,7 @@ void ScGridWindow::UpdateStatusPosSize() aSet.Put( SvxSizeItem( SID_ATTR_SIZE, Size( aRect.Right() - aRect.Left(), aRect.Bottom() - aRect.Top() ) ) ); } - else // mouse position + else // mouse position { Point aPos = PixelToLogic(aCurMousePos); pPV->LogicToPagePos(aPos); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 66358f6f8907..fb5158ad7363 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -53,11 +53,11 @@ #include "output.hxx" #include "document.hxx" #include "attrib.hxx" -#include "patattr.hxx" // InvertSimple +#include "patattr.hxx" // InvertSimple #include "dbcolect.hxx" #include "docoptio.hxx" #include "notemark.hxx" -#include "dbfunc.hxx" // oder GetPageBreakData an die ViewData +#include "dbfunc.hxx" // oder GetPageBreakData an die ViewData #include "scmod.hxx" #include "inputhdl.hxx" #include "rfindlst.hxx" @@ -65,7 +65,7 @@ #include "pagedata.hxx" #include "docpool.hxx" #include "globstr.hrc" -#include "docsh.hxx" // oder GetSfxInPlaceObject +#include "docsh.hxx" // oder GetSfxInPlaceObject #include "cbutton.hxx" #include "invmerge.hxx" #include "editutil.hxx" @@ -84,9 +84,9 @@ void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) { if ( rRect.Top() < rVisible.Top()-1 ) rRect.Top() = rVisible.Top()-1; -// if ( rRect.Left() < rVisible.Left()-1 ) rRect.Left() = rVisible.Left()-1; +// if ( rRect.Left() < rVisible.Left()-1 ) rRect.Left() = rVisible.Left()-1; if ( rRect.Bottom() > rVisible.Bottom()+1 ) rRect.Bottom() = rVisible.Bottom()+1; -// if ( rRect.Right() > rVisible.Right()+1 ) rRect.Right() = rVisible.Right()+1; +// if ( rRect.Right() > rVisible.Right()+1 ) rRect.Right() = rVisible.Right()+1; // #51122# auch wenn das inner-Rectangle nicht sichtbar ist, muss evtl. // die Titelzeile gezeichnet werden, darum kein Rueckgabewert mehr. @@ -98,8 +98,8 @@ void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, double nPPTX, double nPPTY, const Fraction& rZoomY, ScDocument* pDoc, ScViewData* pButtonViewData, BOOL bLayoutRTL ) { - // pButtonViewData wird nur benutzt, um die Button-Groesse zu setzen, - // darf ansonsten NULL sein! + // pButtonViewData wird nur benutzt, um die Button-Groesse zu setzen, + // darf ansonsten NULL sein! Rectangle aInner = rInnerPixel; if ( bLayoutRTL ) @@ -114,17 +114,17 @@ void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, Rectangle aOuter = aInner; long nHor = (long) ( SC_SCENARIO_HSPACE * nPPTX ); long nVer = (long) ( SC_SCENARIO_VSPACE * nPPTY ); - aOuter.Left() -= nHor; - aOuter.Right() += nHor; - aOuter.Top() -= nVer; - aOuter.Bottom() += nVer; + aOuter.Left() -= nHor; + aOuter.Right() += nHor; + aOuter.Top() -= nVer; + aOuter.Bottom() += nVer; - // use ScPatternAttr::GetFont only for font size + // use ScPatternAttr::GetFont only for font size Font aAttrFont; ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)). GetFont(aAttrFont,SC_AUTOCOL_BLACK,pDev,&rZoomY); - // everything else from application font + // everything else from application font Font aAppFont = pDev->GetSettings().GetStyleSettings().GetAppFont(); aAppFont.SetSize( aAttrFont.GetSize() ); @@ -140,7 +140,7 @@ void lcl_DrawOneFrame( OutputDevice* pDev, const Rectangle& rInnerPixel, pDev->SetLineColor(); pDev->SetFillColor( rColor ); - // links, oben, rechts, unten + // links, oben, rechts, unten pDev->DrawRect( Rectangle( aOuter.Left(), aOuter.Top(), aInner.Left(), aOuter.Bottom() ) ); pDev->DrawRect( Rectangle( aOuter.Left(), aOuter.Top(), aOuter.Right(), aInner.Top() ) ); pDev->DrawRect( Rectangle( aInner.Right(), aOuter.Top(), aOuter.Right(), aOuter.Bottom() ) ); @@ -202,14 +202,14 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP if ( nTab+1<nTabCount && pDoc->IsScenario(nTab+1) && !pDoc->IsScenario(nTab) ) { if ( nX1 > 0 ) --nX1; - if ( nY1>=2 ) nY1 -= 2; // Hack: Titelzeile beruehrt zwei Zellen + if ( nY1>=2 ) nY1 -= 2; // Hack: Titelzeile beruehrt zwei Zellen else if ( nY1 > 0 ) --nY1; if ( nX2 < MAXCOL ) ++nX2; - if ( nY2 < MAXROW-1 ) nY2 += 2; // Hack: Titelzeile beruehrt zwei Zellen + if ( nY2 < MAXROW-1 ) nY2 += 2; // Hack: Titelzeile beruehrt zwei Zellen else if ( nY2 < MAXROW ) ++nY2; ScRange aViewRange( nX1,nY1,nTab, nX2,nY2,nTab ); - //! Ranges an der Table cachen!!!! + //! Ranges an der Table cachen!!!! ScMarkData aMarks; for (SCTAB i=nTab+1; i<nTabCount && pDoc->IsScenario(i); i++) @@ -224,19 +224,19 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP for (USHORT j=0; j<nRangeCount; j++) { ScRange aRange = *xRanges->GetObject(j); - // Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn - // dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden + // Szenario-Rahmen immer dann auf zusammengefasste Zellen erweitern, wenn + // dadurch keine neuen nicht-ueberdeckten Zellen mit umrandet werden pDoc->ExtendTotalMerge( aRange ); - //! -> Repaint beim Zusammenfassen erweitern !!! + //! -> Repaint beim Zusammenfassen erweitern !!! - if ( aRange.Intersects( aViewRange ) ) //! Platz fuer Text/Button? + if ( aRange.Intersects( aViewRange ) ) //! Platz fuer Text/Button? { Point aStartPos = pViewData->GetScrPos( aRange.aStart.Col(), aRange.aStart.Row(), eWhich, TRUE ); Point aEndPos = pViewData->GetScrPos( aRange.aEnd.Col()+1, aRange.aEnd.Row()+1, eWhich, TRUE ); - // on the grid: + // on the grid: aStartPos.X() -= nLayoutSign; aStartPos.Y() -= 1; aEndPos.X() -= nLayoutSign; @@ -258,7 +258,7 @@ void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, ScSplitP if (!aCurrent.Len()) aCurrent = ScGlobal::GetRscString( STR_EMPTYDATA ); - //! eigener Text "(keins)" statt "(leer)" ??? + //! eigener Text "(keins)" statt "(leer)" ??? lcl_DrawOneFrame( pDev, Rectangle( aStartPos, aEndPos ), aCurrent, aColor, bTextBelow, @@ -297,15 +297,15 @@ void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData, void ScGridWindow::DoInvertRect( const Rectangle& rPixel ) { -// Invert( PixelToLogic(rPixel) ); +// Invert( PixelToLogic(rPixel) ); if ( rPixel == aInvertRect ) - aInvertRect = Rectangle(); // aufheben + aInvertRect = Rectangle(); // aufheben else { DBG_ASSERT( aInvertRect.IsEmpty(), "DoInvertRect nicht paarig" ); - aInvertRect = rPixel; // neues Rechteck merken + aInvertRect = rPixel; // neues Rechteck merken } UpdateHeaderOverlay(); // uses aInvertRect @@ -346,19 +346,19 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect ) ScDocument* pDoc = pViewData->GetDocument(); if ( pDoc->IsInInterpreter() ) { - // via Reschedule, interpretierende Zellen nicht nochmal anstossen - // hier kein Invalidate, sonst kommt z.B. eine Error-Box nie an die Reihe - // (Bug 36381). Durch bNeedsRepaint wird spaeter alles nochmal gemalt. + // via Reschedule, interpretierende Zellen nicht nochmal anstossen + // hier kein Invalidate, sonst kommt z.B. eine Error-Box nie an die Reihe + // (Bug 36381). Durch bNeedsRepaint wird spaeter alles nochmal gemalt. if ( bNeedsRepaint ) { - //! Rechtecke zusammenfassen? - aRepaintPixel = Rectangle(); // mehrfach -> alles painten + //! Rechtecke zusammenfassen? + aRepaintPixel = Rectangle(); // mehrfach -> alles painten } else { bNeedsRepaint = TRUE; - aRepaintPixel = LogicToPixel(rRect); // nur betroffenen Bereich + aRepaintPixel = LogicToPixel(rRect); // nur betroffenen Bereich } return; } @@ -381,7 +381,7 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect ) Rectangle aMirroredPixel = aPixRect; if ( pDoc->IsLayoutRTL( nTab ) ) { - // mirror and swap + // mirror and swap long nWidth = GetSizePixel().Width(); aMirroredPixel.Left() = nWidth - 1 - aPixRect.Right(); aMirroredPixel.Right() = nWidth - 1 - aPixRect.Left(); @@ -409,13 +409,13 @@ void __EXPORT ScGridWindow::Paint( const Rectangle& rRect ) ScViewData::AddPixelsWhile( nScrY, aPixRect.Bottom(), nY2, MAXROW, nPPTY, pDoc, nTab); } - Draw( nX1,nY1,nX2,nY2, SC_UPDATE_MARKS ); // nicht weiterzeichnen + Draw( nX1,nY1,nX2,nY2, SC_UPDATE_MARKS ); // nicht weiterzeichnen bIsInPaint = FALSE; } // -// Draw ---------------------------------------------------------------- +// Draw ---------------------------------------------------------------- // void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode ) @@ -919,7 +919,7 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod void ScGridWindow::CheckNeedsRepaint() { - // called at the end of painting, and from timer after background text width calculation + // called at the end of painting, and from timer after background text width calculation if (bNeedsRepaint) { @@ -953,7 +953,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, String aPageStr = ScGlobal::GetRscString( STR_PGNUM ); if ( nPageScript == 0 ) { - // get script type of translated "Page" string only once + // get script type of translated "Page" string only once nPageScript = pDoc->GetStringScriptType( aPageStr ); if (nPageScript == 0) nPageScript = ScGlobal::GetDefaultScriptType(); @@ -964,14 +964,14 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, const ScPatternAttr& rDefPattern = ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)); if ( nPageScript == SCRIPTTYPE_LATIN ) { - // use single font and call DrawText directly + // use single font and call DrawText directly rDefPattern.GetFont( aFont, SC_AUTOCOL_BLACK ); aFont.SetColor( Color( COL_LIGHTGRAY ) ); - // font size is set as needed + // font size is set as needed } else { - // use EditEngine to draw mixed-script string + // use EditEngine to draw mixed-script string pEditEng = new ScEditEngineDefaulter( EditEngine::CreatePool(), TRUE ); pEditEng->SetRefMapMode( pContentDev->GetMapMode() ); SfxItemSet* pEditDefaults = new SfxItemSet( pEditEng->GetEmptyItemSet() ); @@ -988,8 +988,8 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if ( aRange.aStart.Col() <= nX2+1 && aRange.aEnd.Col()+1 >= nX1 && aRange.aStart.Row() <= nY2+1 && aRange.aEnd.Row()+1 >= nY1 ) { - // 3 Pixel Rahmen um den Druckbereich - // (mittlerer Pixel auf den Gitterlinien) + // 3 Pixel Rahmen um den Druckbereich + // (mittlerer Pixel auf den Gitterlinien) pContentDev->SetLineColor(); if (rData.IsAutomatic()) @@ -1004,9 +1004,9 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, aStart.X() -= 2; aStart.Y() -= 2; - // Ueberlaeufe verhindern: - if ( aStart.X() < -10 ) aStart.X() = -10; - if ( aStart.Y() < -10 ) aStart.Y() = -10; + // Ueberlaeufe verhindern: + if ( aStart.X() < -10 ) aStart.X() = -10; + if ( aStart.Y() < -10 ) aStart.Y() = -10; if ( aEnd.X() > aWinSize.Width() + 10 ) aEnd.X() = aWinSize.Width() + 10; if ( aEnd.Y() > aWinSize.Height() + 10 ) @@ -1017,8 +1017,8 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, pContentDev->DrawRect( Rectangle( Point(aStart.X(),aEnd.Y()-2), aEnd ) ); pContentDev->DrawRect( Rectangle( Point(aEnd.X()-2,aStart.Y()), aEnd ) ); - // Seitenumbrueche - //! anders darstellen (gestrichelt ????) + // Seitenumbrueche + //! anders darstellen (gestrichelt ????) size_t nColBreaks = rData.GetPagesX(); const SCCOL* pColEnd = rData.GetPageEndX(); @@ -1058,7 +1058,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, } } - // Seitenzahlen + // Seitenzahlen SCROW nPrStartY = aRange.aStart.Row(); for (nRowPos=0; nRowPos<nRowBreaks; nRowPos++) @@ -1086,7 +1086,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if ( pEditEng ) { - // find right font size with EditEngine + // find right font size with EditEngine long nHeight = 100; pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT ) ); pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT_CJK ) ); @@ -1094,7 +1094,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, pEditEng->SetText( aPageStr ); Size aSize100( pEditEng->CalcTextWidth(), pEditEng->GetTextHeight() ); - // 40% of width or 60% of height + // 40% of width or 60% of height long nSizeX = 40 * ( aPageEnd.X() - aPageStart.X() ) / aSize100.Width(); long nSizeY = 60 * ( aPageEnd.Y() - aPageStart.Y() ) / aSize100.Height(); nHeight = Min(nSizeX,nSizeY); @@ -1102,7 +1102,7 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT_CJK ) ); pEditEng->SetDefaultItem( SvxFontHeightItem( nHeight, 100, EE_CHAR_FONTHEIGHT_CTL ) ); - // centered output with EditEngine + // centered output with EditEngine Size aTextSize( pEditEng->CalcTextWidth(), pEditEng->GetTextHeight() ); Point aPos( (aPageStart.X()+aPageEnd.X()-aTextSize.Width())/2, (aPageStart.Y()+aPageEnd.Y()-aTextSize.Height())/2 ); @@ -1110,18 +1110,18 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, } else { - // find right font size for DrawText + // find right font size for DrawText aFont.SetSize( Size( 0,100 ) ); pContentDev->SetFont( aFont ); Size aSize100( pContentDev->GetTextWidth( aPageStr ), pContentDev->GetTextHeight() ); - // 40% of width or 60% of height + // 40% of width or 60% of height long nSizeX = 40 * ( aPageEnd.X() - aPageStart.X() ) / aSize100.Width(); long nSizeY = 60 * ( aPageEnd.Y() - aPageStart.Y() ) / aSize100.Height(); aFont.SetSize( Size( 0,Min(nSizeX,nSizeY) ) ); pContentDev->SetFont( aFont ); - // centered output with DrawText + // centered output with DrawText Size aTextSize( pContentDev->GetTextWidth( aPageStr ), pContentDev->GetTextHeight() ); Point aPos( (aPageStart.X()+aPageEnd.X()-aTextSize.Width())/2, (aPageStart.Y()+aPageEnd.Y()-aTextSize.Height())/2 ); @@ -1151,16 +1151,16 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2 SCROW nRow; SCSIZE nArrY; SCSIZE nQuery; - SCTAB nTab = pViewData->GetTabNo(); - ScDBData* pDBData = NULL; - ScQueryParam* pQueryParam = NULL; + SCTAB nTab = pViewData->GetTabNo(); + ScDBData* pDBData = NULL; + ScQueryParam* pQueryParam = NULL; RowInfo* pRowInfo = rTabInfo.mpRowInfo; USHORT nArrCount = rTabInfo.mnArrCount; BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); - Point aOldPos = aComboButton.GetPosPixel(); // Zustand fuer MouseDown/Up + Point aOldPos = aComboButton.GetPosPixel(); // Zustand fuer MouseDown/Up Size aOldSize = aComboButton.GetSizePixel(); // merken for (nArrY=1; nArrY+1<nArrCount; nArrY++) @@ -1205,7 +1205,7 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2 } } - // pQueryParam kann nur MAXQUERY Eintraege enthalten + // pQueryParam kann nur MAXQUERY Eintraege enthalten BOOL bSimpleQuery = TRUE; BOOL bColumnFound = FALSE; @@ -1214,8 +1214,8 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2 for (nQuery=0; nQuery<MAXQUERY && bSimpleQuery; nQuery++) if (pQueryParam->GetEntry(nQuery).bDoQuery) { - // hier nicht auf EQUAL beschraenken - // (auch bei ">1" soll der Spaltenkopf blau werden) + // hier nicht auf EQUAL beschraenken + // (auch bei ">1" soll der Spaltenkopf blau werden) if (pQueryParam->GetEntry(nQuery).nField == nCol) bColumnFound = TRUE; @@ -1225,8 +1225,8 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2 } bool bArrowState = bSimpleQuery && bColumnFound; - long nSizeX; - long nSizeY; + long nSizeX; + long nSizeY; pViewData->GetMergeSizePixel( nCol, nRow, nSizeX, nSizeY ); Point aScrPos = pViewData->GetScrPos( nCol, nRow, eWhich ); @@ -1339,9 +1339,9 @@ Rectangle ScGridWindow::GetListValButtonRect( const ScAddress& rButtonPos ) BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ) { - ScDocument* pDoc = pViewData->GetDocument(); - ScDBData* pDBData = pDoc->GetDBAtCursor( nCol, nRow, nTab ); - ScQueryParam aQueryParam; + ScDocument* pDoc = pViewData->GetDocument(); + ScDBData* pDBData = pDoc->GetDBAtCursor( nCol, nRow, nTab ); + ScQueryParam aQueryParam; if ( pDBData ) pDBData->GetQueryParam( aQueryParam ); @@ -1350,14 +1350,14 @@ BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ) DBG_ERROR("Auto-Filter-Button ohne DBData"); } - BOOL bSimpleQuery = TRUE; - BOOL bColumnFound = FALSE; - SCSIZE nQuery; + BOOL bSimpleQuery = TRUE; + BOOL bColumnFound = FALSE; + SCSIZE nQuery; if ( !aQueryParam.bInplace ) bSimpleQuery = FALSE; - // aQueryParam kann nur MAXQUERY Eintraege enthalten + // aQueryParam kann nur MAXQUERY Eintraege enthalten for ( nQuery=0; nQuery<MAXQUERY && bSimpleQuery; nQuery++ ) if ( aQueryParam.GetEntry(nQuery).bDoQuery ) @@ -1373,14 +1373,14 @@ BOOL ScGridWindow::IsAutoFilterActive( SCCOL nCol, SCROW nRow, SCTAB nTab ) return ( bSimpleQuery && bColumnFound ); } -void ScGridWindow::DrawComboButton( const Point& rCellPos, - long nCellSizeX, - long nCellSizeY, +void ScGridWindow::DrawComboButton( const Point& rCellPos, + long nCellSizeX, + long nCellSizeY, BOOL bArrowState, - BOOL bBtnIn ) + BOOL bBtnIn ) { - Point aScrPos = rCellPos; - Size aBtnSize = aComboButton.GetSizePixel(); + Point aScrPos = rCellPos; + Size aBtnSize = aComboButton.GetSizePixel(); if ( nCellSizeX < aBtnSize.Width() || nCellSizeY < aBtnSize.Height() ) { @@ -1411,9 +1411,9 @@ void ScGridWindow::DrawComboButton( const Point& rCellPos, void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, BOOL bTestMerge, BOOL bRepeat ) { - //! if INVERT_HIGHLIGHT swaps foreground and background (like on Mac), - //! use INVERT_HIGHLIGHT only for cells that have no background color set - //! (here and in ScOutputData::DrawMark) + //! if INVERT_HIGHLIGHT swaps foreground and background (like on Mac), + //! use INVERT_HIGHLIGHT only for cells that have no background color set + //! (here and in ScOutputData::DrawMark) PutInOrder( nX1, nX2 ); PutInOrder( nY1, nY2 ); @@ -1433,7 +1433,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, SCCOL nPosX = pViewData->GetPosX( eHWhich ); SCROW nPosY = pViewData->GetPosY( eVWhich ); if (nTestX2 < nPosX || nTestY2 < nPosY) - return; // unsichtbar + return; // unsichtbar SCCOL nRealX1 = nX1; if (nX1 < nPosX) nX1 = nPosX; @@ -1446,11 +1446,11 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if (nYBottom > MAXROW) nYBottom = MAXROW; if (nX1 > nXRight || nY1 > nYBottom) - return; // unsichtbar + return; // unsichtbar if (nX2 > nXRight) nX2 = nXRight; if (nY2 > nYBottom) nY2 = nYBottom; - MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); // erst nach den return's !!! + MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); // erst nach den return's !!! double nPPTX = pViewData->GetPPTX(); double nPPTY = pViewData->GetPPTY(); @@ -1462,16 +1462,16 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, BOOL bWasHidden = FALSE; for (SCROW nY=nY1; nY<=nY2; nY++) { - BOOL bFirstRow = ( nY == nPosY ); // first visible row? - BOOL bDoHidden = FALSE; // versteckte nachholen ? + BOOL bFirstRow = ( nY == nPosY ); // first visible row? + BOOL bDoHidden = FALSE; // versteckte nachholen ? USHORT nHeightTwips = pDoc->GetRowHeight( nY,nTab ); BOOL bDoRow = ( nHeightTwips != 0 ); if (bDoRow) { if (bTestMerge) - if (bWasHidden) // auf versteckte zusammengefasste testen + if (bWasHidden) // auf versteckte zusammengefasste testen { -// --nY; // nY geaendert -> vorherige zeichnen +// --nY; // nY geaendert -> vorherige zeichnen bDoHidden = TRUE; bDoRow = TRUE; } @@ -1483,13 +1483,13 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, bWasHidden = TRUE; if (bTestMerge) if (nY==nY2) - bDoRow = TRUE; // letzte Zeile aus Block + bDoRow = TRUE; // letzte Zeile aus Block } if ( bDoRow ) { SCCOL nLoopEndX = nX2; - if (nX2 < nX1) // Rest von zusammengefasst + if (nX2 < nX1) // Rest von zusammengefasst { SCCOL nStartX = nX1; while ( ((const ScMergeFlagAttr*)pDoc-> @@ -1559,7 +1559,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, } } } - else // !bTestMerge + else // !bTestMerge { if ( rMark.IsCellMarked( nX, nY, TRUE ) == bRepeat && nEndX * nLayoutSign >= nScrX * nLayoutSign && nEndY >= nScrY ) @@ -1575,7 +1575,7 @@ void ScGridWindow::InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, } } - aInvert.Flush(); // before restoring MapMode + aInvert.Flush(); // before restoring MapMode SetMapMode(aOld); @@ -1618,7 +1618,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) SCCOL nPosX = pViewData->GetPosX( eHWhich ); SCROW nPosY = pViewData->GetPosY( eVWhich ); if (nTestX2 < nPosX || nTestY2 < nPosY) - return; // unsichtbar + return; // unsichtbar SCCOL nRealX1 = nX1; if (nX1 < nPosX) nX1 = nPosX; @@ -1631,7 +1631,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) if (nYBottom > MAXROW) nYBottom = MAXROW; if (nX1 > nXRight || nY1 > nYBottom) - return; // unsichtbar + return; // unsichtbar if (nX2 > nXRight) nX2 = nXRight; if (nY2 > nYBottom) nY2 = nYBottom; @@ -1645,14 +1645,14 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) BOOL bWasHidden = FALSE; for (SCROW nY=nY1; nY<=nY2; nY++) { - BOOL bFirstRow = ( nY == nPosY ); // first visible row? - BOOL bDoHidden = FALSE; // versteckte nachholen ? + BOOL bFirstRow = ( nY == nPosY ); // first visible row? + BOOL bDoHidden = FALSE; // versteckte nachholen ? USHORT nHeightTwips = pDoc->GetRowHeight( nY,nTab ); BOOL bDoRow = ( nHeightTwips != 0 ); if (bDoRow) { if (bTestMerge) - if (bWasHidden) // auf versteckte zusammengefasste testen + if (bWasHidden) // auf versteckte zusammengefasste testen { bDoHidden = TRUE; bDoRow = TRUE; @@ -1665,13 +1665,13 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) bWasHidden = TRUE; if (bTestMerge) if (nY==nY2) - bDoRow = TRUE; // letzte Zeile aus Block + bDoRow = TRUE; // letzte Zeile aus Block } if ( bDoRow ) { SCCOL nLoopEndX = nX2; - if (nX2 < nX1) // Rest von zusammengefasst + if (nX2 < nX1) // Rest von zusammengefasst { SCCOL nStartX = nX1; while ( ((const ScMergeFlagAttr*)pDoc-> @@ -1741,7 +1741,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) } } } - else // !bTestMerge + else // !bTestMerge { if ( aMultiMark.IsCellMarked( nX, nY, TRUE ) == bRepeat && nEndX * nLayoutSign >= nScrX * nLayoutSign && nEndY >= nScrY ) @@ -1757,7 +1757,7 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) } } -// aInvert.Flush(); // before restoring MapMode +// aInvert.Flush(); // before restoring MapMode } // ------------------------------------------------------------------------- @@ -1769,122 +1769,122 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) void ScGridWindow::DrawCursor() { // #114409# -// SCTAB nTab = pViewData->GetTabNo(); -// SCCOL nX = pViewData->GetCurX(); -// SCROW nY = pViewData->GetCurY(); +// SCTAB nTab = pViewData->GetTabNo(); +// SCCOL nX = pViewData->GetCurX(); +// SCROW nY = pViewData->GetCurY(); // -// // in verdeckten Zellen nicht zeichnen +// // in verdeckten Zellen nicht zeichnen // -// ScDocument* pDoc = pViewData->GetDocument(); -// const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab); -// const ScMergeFlagAttr& rMerge = (const ScMergeFlagAttr&) pPattern->GetItem(ATTR_MERGE_FLAG); -// if (rMerge.IsOverlapped()) -// return; +// ScDocument* pDoc = pViewData->GetDocument(); +// const ScPatternAttr* pPattern = pDoc->GetPattern(nX,nY,nTab); +// const ScMergeFlagAttr& rMerge = (const ScMergeFlagAttr&) pPattern->GetItem(ATTR_MERGE_FLAG); +// if (rMerge.IsOverlapped()) +// return; // -// // links/oben ausserhalb des Bildschirms ? +// // links/oben ausserhalb des Bildschirms ? // -// BOOL bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) ); -// if (!bVis) -// { -// SCCOL nEndX = nX; -// SCROW nEndY = nY; -// ScDocument* pDoc = pViewData->GetDocument(); -// const ScMergeAttr& rMerge = (const ScMergeAttr&) pPattern->GetItem(ATTR_MERGE); -// if (rMerge.GetColMerge() > 1) -// nEndX += rMerge.GetColMerge()-1; -// if (rMerge.GetRowMerge() > 1) -// nEndY += rMerge.GetRowMerge()-1; -// bVis = ( nEndX>=pViewData->GetPosX(eHWhich) && nEndY>=pViewData->GetPosY(eVWhich) ); -// } +// BOOL bVis = ( nX>=pViewData->GetPosX(eHWhich) && nY>=pViewData->GetPosY(eVWhich) ); +// if (!bVis) +// { +// SCCOL nEndX = nX; +// SCROW nEndY = nY; +// ScDocument* pDoc = pViewData->GetDocument(); +// const ScMergeAttr& rMerge = (const ScMergeAttr&) pPattern->GetItem(ATTR_MERGE); +// if (rMerge.GetColMerge() > 1) +// nEndX += rMerge.GetColMerge()-1; +// if (rMerge.GetRowMerge() > 1) +// nEndY += rMerge.GetRowMerge()-1; +// bVis = ( nEndX>=pViewData->GetPosX(eHWhich) && nEndY>=pViewData->GetPosY(eVWhich) ); +// } // -// if ( bVis ) -// { -// // hier kein Update, da aus Paint gerufen und laut Zaehler Cursor schon da -// // wenn Update noetig, dann bei Hide/Showcursor vor dem Hoch-/Runterzaehlen +// if ( bVis ) +// { +// // hier kein Update, da aus Paint gerufen und laut Zaehler Cursor schon da +// // wenn Update noetig, dann bei Hide/Showcursor vor dem Hoch-/Runterzaehlen // -// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); +// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); // -// Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE ); -// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); +// Point aScrPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE ); +// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); // -// // completely right of/below the screen? -// // (test with logical start position in aScrPos) -// BOOL bMaybeVisible; -// if ( bLayoutRTL ) -// bMaybeVisible = ( aScrPos.X() >= -2 && aScrPos.Y() >= -2 ); -// else -// { -// Size aOutSize = GetOutputSizePixel(); -// bMaybeVisible = ( aScrPos.X() <= aOutSize.Width() + 2 && aScrPos.Y() <= aOutSize.Height() + 2 ); -// } -// if ( bMaybeVisible ) -// { -// long nSizeXPix; -// long nSizeYPix; -// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); +// // completely right of/below the screen? +// // (test with logical start position in aScrPos) +// BOOL bMaybeVisible; +// if ( bLayoutRTL ) +// bMaybeVisible = ( aScrPos.X() >= -2 && aScrPos.Y() >= -2 ); +// else +// { +// Size aOutSize = GetOutputSizePixel(); +// bMaybeVisible = ( aScrPos.X() <= aOutSize.Width() + 2 && aScrPos.Y() <= aOutSize.Height() + 2 ); +// } +// if ( bMaybeVisible ) +// { +// long nSizeXPix; +// long nSizeYPix; +// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); // -// if ( bLayoutRTL ) -// aScrPos.X() -= nSizeXPix - 2; // move instead of mirroring +// if ( bLayoutRTL ) +// aScrPos.X() -= nSizeXPix - 2; // move instead of mirroring // -// BOOL bFix = ( pViewData->GetHSplitMode() == SC_SPLIT_FIX || -// pViewData->GetVSplitMode() == SC_SPLIT_FIX ); -// if ( pViewData->GetActivePart()==eWhich || bFix ) -// { -// // old UNX version with two Invert calls causes flicker. -// // if optimization is needed, a new flag should be added -// // to InvertTracking +// BOOL bFix = ( pViewData->GetHSplitMode() == SC_SPLIT_FIX || +// pViewData->GetVSplitMode() == SC_SPLIT_FIX ); +// if ( pViewData->GetActivePart()==eWhich || bFix ) +// { +// // old UNX version with two Invert calls causes flicker. +// // if optimization is needed, a new flag should be added +// // to InvertTracking // -// aScrPos.X() -= 2; -// aScrPos.Y() -= 2; -// Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) ); +// aScrPos.X() -= 2; +// aScrPos.Y() -= 2; +// Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) ); // -// Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() )); -// Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() )); -// Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 )); -// Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() )); -// } -// else -// { -// Rectangle aRect( aScrPos, Size( nSizeXPix - 1, nSizeYPix - 1 ) ); -// Invert( aRect ); -// } -// } +// Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() )); +// Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() )); +// Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 )); +// Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() )); +// } +// else +// { +// Rectangle aRect( aScrPos, Size( nSizeXPix - 1, nSizeYPix - 1 ) ); +// Invert( aRect ); +// } +// } // -// SetMapMode(aOld); -// } +// SetMapMode(aOld); +// } } - // AutoFill-Anfasser: + // AutoFill-Anfasser: void ScGridWindow::DrawAutoFillMark() { // #114409# -// if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() ) -// { -// SCCOL nX = aAutoMarkPos.Col(); -// SCROW nY = aAutoMarkPos.Row(); -// SCTAB nTab = pViewData->GetTabNo(); -// ScDocument* pDoc = pViewData->GetDocument(); -// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); +// if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() ) +// { +// SCCOL nX = aAutoMarkPos.Col(); +// SCROW nY = aAutoMarkPos.Row(); +// SCTAB nTab = pViewData->GetTabNo(); +// ScDocument* pDoc = pViewData->GetDocument(); +// BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); // -// Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE ); -// long nSizeXPix; -// long nSizeYPix; -// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); -// if ( bLayoutRTL ) -// aFillPos.X() -= nSizeXPix + 3; -// else -// aFillPos.X() += nSizeXPix - 2; +// Point aFillPos = pViewData->GetScrPos( nX, nY, eWhich, TRUE ); +// long nSizeXPix; +// long nSizeYPix; +// pViewData->GetMergeSizePixel( nX, nY, nSizeXPix, nSizeYPix ); +// if ( bLayoutRTL ) +// aFillPos.X() -= nSizeXPix + 3; +// else +// aFillPos.X() += nSizeXPix - 2; // -// aFillPos.Y() += nSizeYPix; -// aFillPos.Y() -= 2; -// Rectangle aFillRect( aFillPos, Size(6,6) ); -// // Anfasser von Zeichenobjekten sind 7*7 +// aFillPos.Y() += nSizeYPix; +// aFillPos.Y() -= 2; +// Rectangle aFillRect( aFillPos, Size(6,6) ); +// // Anfasser von Zeichenobjekten sind 7*7 // -// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); -// Invert( aFillRect ); -// SetMapMode(aOld); -// } +// MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); +// Invert( aFillRect ); +// SetMapMode(aOld); +// } } // ------------------------------------------------------------------------- @@ -1906,20 +1906,20 @@ void ScGridWindow::DataChanged( const DataChangedEvent& rDCEvt ) if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - if ( eWhich == pViewData->GetActivePart() ) // only once for the view + if ( eWhich == pViewData->GetActivePart() ) // only once for the view { ScTabView* pView = pViewData->GetView(); - // update scale in case the UI ScreenZoom has changed + // update scale in case the UI ScreenZoom has changed ScGlobal::UpdatePPT(this); pView->RecalcPPT(); - // RepeatResize in case scroll bar sizes have changed + // RepeatResize in case scroll bar sizes have changed pView->RepeatResize(); pView->UpdateAllOverlays(); - // invalidate cell attribs in input handler, in case the - // EditEngine BackgroundColor has to be changed + // invalidate cell attribs in input handler, in case the + // EditEngine BackgroundColor has to be changed if ( pViewData->IsActive() ) { ScInputHandler* pHdl = SC_MOD()->GetInputHdl(); diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 1e4c09fd8c6b..c3dcba8d8dd5 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,7 +84,7 @@ ScHideTextCursor::~ScHideTextCursor() Window* pWin = pViewData->GetView()->GetWindowByPos( eWhich ); if (pWin) { - // restore text cursor + // restore text cursor if ( pViewData->HasEditView(eWhich) && pWin->HasFocus() ) pViewData->GetEditView(eWhich)->ShowCursor( FALSE, TRUE ); } @@ -97,13 +97,13 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ) BOOL bDone = FALSE; ScDocument* pDoc = pViewData->GetDocument(); - SCTAB nTab = pViewData->GetTabNo(); - ScAddress aCellPos( nPosX, nPosY, nTab ); + SCTAB nTab = pViewData->GetTabNo(); + ScAddress aCellPos( nPosX, nPosY, nTab ); String aTrackText; BOOL bLeftEdge = FALSE; - // Change-Tracking + // Change-Tracking ScChangeTrack* pTrack = pDoc->GetChangeTrack(); ScChangeViewSettings* pSettings = pDoc->GetChangeViewSettings(); @@ -132,7 +132,7 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ) if ( aRange.In( aCellPos ) ) { - pFound = pAction; // der letzte gewinnt + pFound = pAction; // der letzte gewinnt switch ( eType ) { case SC_CAT_CONTENT : @@ -167,13 +167,13 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ) if ( pFound ) { if ( pFoundContent && pFound->GetType() != SC_CAT_CONTENT ) - pFound = pFoundContent; // Content gewinnt + pFound = pFoundContent; // Content gewinnt if ( pFoundMove && pFound->GetType() != SC_CAT_MOVE && pFoundMove->GetActionNumber() > pFound->GetActionNumber() ) - pFound = pFoundMove; // Move gewinnt + pFound = pFoundMove; // Move gewinnt - // bei geloeschten Spalten: Pfeil auf die linke Seite der Zelle + // bei geloeschten Spalten: Pfeil auf die linke Seite der Zelle if ( pFound->GetType() == SC_CAT_DELETE_COLS ) bLeftEdge = TRUE; @@ -198,27 +198,27 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ) } } - // Notiz nur, wenn sie nicht schon auf dem Drawing-Layer angezeigt wird: + // Notiz nur, wenn sie nicht schon auf dem Drawing-Layer angezeigt wird: const ScPostIt* pNote = pDoc->GetNote( aCellPos ); if ( (aTrackText.Len() > 0) || (pNote && !pNote->IsCaptionShown()) ) { BOOL bNew = TRUE; BOOL bFast = FALSE; - if ( pNoteMarker ) // schon eine Notiz angezeigt + if ( pNoteMarker ) // schon eine Notiz angezeigt { - if ( pNoteMarker->GetDocPos() == aCellPos ) // dieselbe - bNew = FALSE; // dann stehenlassen + if ( pNoteMarker->GetDocPos() == aCellPos ) // dieselbe + bNew = FALSE; // dann stehenlassen else - bFast = TRUE; // sonst sofort + bFast = TRUE; // sonst sofort - // marker which was shown for ctrl-F1 isn't removed by mouse events + // marker which was shown for ctrl-F1 isn't removed by mouse events if ( pNoteMarker->IsByKeyboard() && !bKeyboard ) bNew = FALSE; } if ( bNew ) { if ( bKeyboard ) - bFast = TRUE; // keyboard also shows the marker immediately + bFast = TRUE; // keyboard also shows the marker immediately delete pNoteMarker; @@ -247,7 +247,7 @@ BOOL ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, BOOL bKeyboard ) aMapMode, bLeftEdge, bFast, bKeyboard ); } - bDone = TRUE; // something is shown (old or new) + bDone = TRUE; // something is shown (old or new) } return bDone; @@ -265,18 +265,18 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) if (pDrView) bDrawTextEdit = pDrView->IsTextEdit(); - // notes or change tracking + // notes or change tracking if ( bHelpEnabled && !bDrawTextEdit ) { - Point aPosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() ); + Point aPosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() ); SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aPosPixel.X(), aPosPixel.Y(), eWhich, nPosX, nPosY ); if ( ShowNoteMarker( nPosX, nPosY, FALSE ) ) { - Window::RequestHelp( rHEvt ); // alte Tip/Balloon ausschalten + Window::RequestHelp( rHEvt ); // alte Tip/Balloon ausschalten bDone = TRUE; } } @@ -285,21 +285,21 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) { if ( pNoteMarker->IsByKeyboard() ) { - // marker which was shown for ctrl-F1 isn't removed by mouse events + // marker which was shown for ctrl-F1 isn't removed by mouse events } else DELETEZ(pNoteMarker); } - // Image-Map / Text-URL + // Image-Map / Text-URL - if ( bHelpEnabled && !bDone && !nButtonDown ) // nur ohne gedrueckten Button + if ( bHelpEnabled && !bDone && !nButtonDown ) // nur ohne gedrueckten Button { String aHelpText; Rectangle aPixRect; Point aPosPixel = ScreenToOutputPixel( rHEvt.GetMousePosPixel() ); - if ( pDrView ) // URL / Image-Map + if ( pDrView ) // URL / Image-Map { SdrViewEvent aVEvt; MouseEvent aMEvt( aPosPixel, 1, 0, MOUSE_LEFT ); @@ -316,7 +316,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) if ( pIMapObj ) { - // #44990# Bei ImageMaps die Description anzeigen, wenn vorhanden + // #44990# Bei ImageMaps die Description anzeigen, wenn vorhanden aHelpText = pIMapObj->GetAltText(); if (!aHelpText.Len()) aHelpText = pIMapObj->GetURL(); @@ -356,7 +356,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) } } - if ( !aHelpText.Len() ) // Text-URL + if ( !aHelpText.Len() ) // Text-URL { String aUrl; if ( GetEditUrl( aPosPixel, NULL, &aUrl, NULL ) ) @@ -367,11 +367,11 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) ScDocument* pDoc = pViewData->GetDocument(); SCsCOL nPosX; SCsROW nPosY; - SCTAB nTab = pViewData->GetTabNo(); + SCTAB nTab = pViewData->GetTabNo(); pViewData->GetPosFromPixel( aPosPixel.X(), aPosPixel.Y(), eWhich, nPosX, nPosY ); const ScPatternAttr* pPattern = pDoc->GetPattern( nPosX, nPosY, nTab ); - ScHideTextCursor aHideCursor( pViewData, eWhich ); // MapMode is changed in GetEditArea + ScHideTextCursor aHideCursor( pViewData, eWhich ); // MapMode is changed in GetEditArea // bForceToTop = FALSE, use the cell's real position aPixRect = pViewData->GetEditArea( eWhich, nPosX, nPosY, this, pPattern, FALSE ); @@ -392,7 +392,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) } } - // Basic-Controls + // Basic-Controls if ( pDrView && bHelpEnabled && !bDone ) { @@ -402,7 +402,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) bDone = ((ScDrawPage*)pPV->GetPage())->RequestHelp( this, pDrView, rHEvt ); } - // Wenn QuickHelp fuer AutoFill angezeigt wird, nicht wieder wegnehmen lassen + // Wenn QuickHelp fuer AutoFill angezeigt wird, nicht wieder wegnehmen lassen if ( nMouseStatus == SC_GM_TABDOWN && pViewData->GetRefType() == SC_REFTYPE_FILL && Help::IsQuickHelpEnabled() ) diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 1e2d45e4c091..ec21c02ce383 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,42 +42,42 @@ #include "sc.hrc" #include "tabvwsh.hxx" #include "hdrcont.hxx" -#include "scmod.hxx" // Optionen -#include "inputopt.hxx" // Optionen +#include "scmod.hxx" // Optionen +#include "inputopt.hxx" // Optionen #include "gridmerg.hxx" #include "document.hxx" // ----------------------------------------------------------------------- -#define SC_DRAG_MIN 2 +#define SC_DRAG_MIN 2 -// passes in paint -// (selection left/right must be first because the continuous lines -// are partly overwritten later) +// passes in paint +// (selection left/right must be first because the continuous lines +// are partly overwritten later) -#define SC_HDRPAINT_SEL_RIGHT 0 -#define SC_HDRPAINT_SEL_LEFT 1 -#define SC_HDRPAINT_TOP 2 -#define SC_HDRPAINT_SEL_TOP 3 -#define SC_HDRPAINT_SEL_BOTTOM 4 -#define SC_HDRPAINT_BOTTOM 5 -#define SC_HDRPAINT_TEXT 6 -#define SC_HDRPAINT_COUNT 7 +#define SC_HDRPAINT_SEL_RIGHT 0 +#define SC_HDRPAINT_SEL_LEFT 1 +#define SC_HDRPAINT_TOP 2 +#define SC_HDRPAINT_SEL_TOP 3 +#define SC_HDRPAINT_SEL_BOTTOM 4 +#define SC_HDRPAINT_BOTTOM 5 +#define SC_HDRPAINT_TEXT 6 +#define SC_HDRPAINT_COUNT 7 //================================================================== ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine, SCCOLROW nNewSize, USHORT nNewFlags ) : - Window ( pParent ), - pSelEngine ( pSelectionEngine ), - nFlags ( nNewFlags ), - bVertical ( (nNewFlags & HDR_VERTICAL) != 0 ), - nSize ( nNewSize ), - nMarkStart ( 0 ), - nMarkEnd ( 0 ), - bMarkRange ( FALSE ), - bDragging ( FALSE ), - bIgnoreMove ( FALSE ) + Window ( pParent ), + pSelEngine ( pSelectionEngine ), + nFlags ( nNewFlags ), + bVertical ( (nNewFlags & HDR_VERTICAL) != 0 ), + nSize ( nNewSize ), + nMarkStart ( 0 ), + nMarkEnd ( 0 ), + bMarkRange ( FALSE ), + bDragging ( FALSE ), + bIgnoreMove ( FALSE ) { // --- RTL --- no default mirroring for this window, the spreadsheet itself // is also not mirrored @@ -87,7 +87,7 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn EnableRTL( FALSE ); aNormFont = GetFont(); - aNormFont.SetTransparent( TRUE ); //! WEIGHT_NORMAL hart setzen ??? + aNormFont.SetTransparent( TRUE ); //! WEIGHT_NORMAL hart setzen ??? aBoldFont = aNormFont; aBoldFont.SetWeight( WEIGHT_BOLD ); @@ -97,7 +97,7 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn Size aSize = LogicToPixel( Size( GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("8888")) ), GetTextHeight() ) ); - aSize.Width() += 4; // Platz fuer hervorgehobene Umrandung + aSize.Width() += 4; // Platz fuer hervorgehobene Umrandung aSize.Height() += 3; SetSizePixel( aSize ); @@ -105,7 +105,7 @@ ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEn nBigWidth = LogicToPixel( Size( GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("8888888")) ), 0 ) ).Width() + 5; - SetBackground(); // sonst Probleme auf OS/2 !?!?! + SetBackground(); // sonst Probleme auf OS/2 !?!?! } void ScHeaderControl::SetWidth( long nNew ) @@ -113,12 +113,12 @@ void ScHeaderControl::SetWidth( long nNew ) DBG_ASSERT( bVertical, "SetDigits nur fuer Zeilenkoepfe erlaubt" ); if ( nNew != nWidth ) { - Size aSize( nNew, GetSizePixel().Height() ); // Hoehe nicht aendern + Size aSize( nNew, GetSizePixel().Height() ); // Hoehe nicht aendern SetSizePixel( aSize ); nWidth = nNew; - Invalidate(); // neu zentrieren + Invalidate(); // neu zentrieren } } @@ -147,21 +147,21 @@ void ScHeaderControl::DoPaint( SCCOLROW nStart, SCCOLROW nEnd ) void ScHeaderControl::SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEnd ) { - BOOL bEnabled = SC_MOD()->GetInputOptions().GetMarkHeader(); //! cachen? + BOOL bEnabled = SC_MOD()->GetInputOptions().GetMarkHeader(); //! cachen? if (!bEnabled) bNewSet = FALSE; - // Variablen setzen + // Variablen setzen - BOOL bOldSet = bMarkRange; + BOOL bOldSet = bMarkRange; SCCOLROW nOldStart = nMarkStart; - SCCOLROW nOldEnd = nMarkEnd; + SCCOLROW nOldEnd = nMarkEnd; PutInOrder( nNewStart, nNewEnd ); bMarkRange = bNewSet; nMarkStart = nNewStart; nMarkEnd = nNewEnd; - // Paint + // Paint if ( bNewSet ) { @@ -177,20 +177,20 @@ void ScHeaderControl::SetMark( BOOL bNewSet, SCCOLROW nNewStart, SCCOLROW nNewEn DoPaint( Min( nNewStart, nOldStart ), Max( nNewStart, nOldStart ) - 1 ); else if ( nNewStart > nOldEnd || nNewEnd < nOldStart ) { - // zwei Bereiche... + // zwei Bereiche... DoPaint( nOldStart, nOldEnd ); DoPaint( nNewStart, nNewEnd ); } - else // irgendwie ueberlappend... (kommt eh nicht oft vor) + else // irgendwie ueberlappend... (kommt eh nicht oft vor) DoPaint( Min( nNewStart, nOldStart ), Max( nNewEnd, nOldEnd ) ); } else - DoPaint( nNewStart, nNewEnd ); // komplett neu + DoPaint( nNewStart, nNewEnd ); // komplett neu } else if ( bOldSet ) - DoPaint( nOldStart, nOldEnd ); // komplett aufheben + DoPaint( nOldStart, nOldEnd ); // komplett aufheben - // sonst war nix, is nix + // sonst war nix, is nix } long ScHeaderControl::GetScrPos( SCCOLROW nEntryNo ) @@ -261,13 +261,13 @@ void ScHeaderControl::DrawShadedRect( long nStart, long nEnd, const Color& rBase } // -// Paint +// Paint // void ScHeaderControl::Paint( const Rectangle& rRect ) { - // fuer VCL ist es wichtig, wenig Aufrufe zu haben, darum werden die aeusseren - // Linien zusammengefasst + // fuer VCL ist es wichtig, wenig Aufrufe zu haben, darum werden die aeusseren + // Linien zusammengefasst const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); BOOL bHighContrast = rStyleSettings.GetHighContrastMode(); @@ -291,19 +291,19 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) long nLayoutSign = bLayoutRTL ? -1 : 1; BOOL bMirrored = IsMirrored(); -// const FunctionSet* pFuncSet = pSelEngine->GetFunctionSet(); - String aString; - USHORT nBarSize; - Point aScrPos; - Size aTextSize; -// Size aSize = GetOutputSizePixel(); +// const FunctionSet* pFuncSet = pSelEngine->GetFunctionSet(); + String aString; + USHORT nBarSize; + Point aScrPos; + Size aTextSize; +// Size aSize = GetOutputSizePixel(); if (bVertical) nBarSize = (USHORT) GetSizePixel().Width(); else nBarSize = (USHORT) GetSizePixel().Height(); - SCCOLROW nPos = GetPos(); + SCCOLROW nPos = GetPos(); long nPStart = bVertical ? rRect.Top() : rRect.Left(); long nPEnd = bVertical ? rRect.Bottom() : rRect.Right(); @@ -314,22 +314,22 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) long nInitScrPos = 0; if ( bLayoutRTL ) { - long nTemp = nPStart; // swap nPStart / nPEnd + long nTemp = nPStart; // swap nPStart / nPEnd nPStart = nPEnd; nPEnd = nTemp; - nTemp = nTransStart; // swap nTransStart / nTransEnd + nTemp = nTransStart; // swap nTransStart / nTransEnd nTransStart = nTransEnd; nTransEnd = nTemp; - if ( bVertical ) // start loops from the end + if ( bVertical ) // start loops from the end nInitScrPos = GetSizePixel().Height() - 1; else nInitScrPos = GetSizePixel().Width() - 1; } - // aeussere Linien komplett durchzeichnen - // Zuerst Ende der letzten Zelle finden + // aeussere Linien komplett durchzeichnen + // Zuerst Ende der letzten Zelle finden -// long nLineEnd = -1; +// long nLineEnd = -1; long nLineEnd = nInitScrPos - nLayoutSign; for (SCCOLROW i=nPos; i<nSize; i++) @@ -362,7 +362,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) } } - // background is different for entry area and behind the entries + // background is different for entry area and behind the entries Rectangle aFillRect; SetLineColor(); @@ -404,7 +404,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) { if ( bDark ) { - // solid grey background for dark face color is drawn before lines + // solid grey background for dark face color is drawn before lines SetLineColor(); SetFillColor( COL_LIGHTGRAY ); @@ -446,19 +446,19 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) } // - // loop through entries several times to avoid changing the line color too often - // and to allow merging of lines + // loop through entries several times to avoid changing the line color too often + // and to allow merging of lines // ScGridMerger aGrid( this, 1, 1 ); - // start at SC_HDRPAINT_BOTTOM instead of 0 - selection doesn't get different - // borders, light border at top isn't used anymore + // start at SC_HDRPAINT_BOTTOM instead of 0 - selection doesn't get different + // borders, light border at top isn't used anymore // use SC_HDRPAINT_SEL_BOTTOM for different color for (USHORT nPass = SC_HDRPAINT_SEL_BOTTOM; nPass < SC_HDRPAINT_COUNT; nPass++) { - // set line color etc. before entry loop + // set line color etc. before entry loop switch ( nPass ) { case SC_HDRPAINT_SEL_BOTTOM: @@ -472,13 +472,13 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) // DrawSelectionBackground is used only for high contrast on light background if ( nTransEnd * nLayoutSign >= nTransStart * nLayoutSign && bHighContrast && !bDark ) { - // Transparent selection background is drawn after lines, before text. - // #109814# Use DrawSelectionBackground to make sure there is a visible - // difference. The case of a dark face color, where DrawSelectionBackground - // would just paint over the lines, is handled separately (bDark). - // Otherwise, GetHighlightColor is used with 80% transparency. - // The window's background color (SetBackground) has to be the background - // of the cell area, for the contrast comparison in DrawSelectionBackground. + // Transparent selection background is drawn after lines, before text. + // #109814# Use DrawSelectionBackground to make sure there is a visible + // difference. The case of a dark face color, where DrawSelectionBackground + // would just paint over the lines, is handled separately (bDark). + // Otherwise, GetHighlightColor is used with 80% transparency. + // The window's background color (SetBackground) has to be the background + // of the cell area, for the contrast comparison in DrawSelectionBackground. Rectangle aTransRect; if (bVertical) @@ -492,8 +492,8 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) break; } - SCCOLROW nCount=0; - long nScrPos=nInitScrPos; + SCCOLROW nCount=0; + long nScrPos=nInitScrPos; do { if (bVertical) @@ -501,9 +501,9 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) else aScrPos = Point( nScrPos, 0 ); - SCCOLROW nEntryNo = nCount + nPos; - if ( nEntryNo >= nSize ) // MAXCOL/MAXROW - nScrPos = nPEnd + nLayoutSign; // beyond nPEnd -> stop + SCCOLROW nEntryNo = nCount + nPos; + if ( nEntryNo >= nSize ) // MAXCOL/MAXROW + nScrPos = nPEnd + nLayoutSign; // beyond nPEnd -> stop else { USHORT nSizePix = GetEntrySize( nEntryNo ); @@ -552,7 +552,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) break; case SC_HDRPAINT_TEXT: - if ( nSizePix > 1 ) // minimal check for small columns/rows + if ( nSizePix > 1 ) // minimal check for small columns/rows { if ( bMark != bBoldSet ) { @@ -572,7 +572,7 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) aTxtPos.X() += (nBarSize-aTextSize.Width())/2; aTxtPos.Y() += (nSizePix*nLayoutSign-aTextSize.Height())/2; if ( bMirrored ) - aTxtPos.X() += 1; // dark border is left instead of right + aTxtPos.X() += 1; // dark border is left instead of right } else { @@ -584,10 +584,10 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) break; } - // bei Selektion der ganzen Zeile/Spalte: - // InvertRect( Rectangle( aScrPos, aEndPos ) ); + // bei Selektion der ganzen Zeile/Spalte: + // InvertRect( Rectangle( aScrPos, aEndPos ) ); } - nScrPos += nSizePix * nLayoutSign; // also if before the visible area + nScrPos += nSizePix * nLayoutSign; // also if before the visible area } ++nCount; } @@ -598,20 +598,20 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) } // -// Maus - Handling +// Maus - Handling // SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder ) { - BOOL bFound=FALSE; - SCCOLROW nCount = 1; - SCCOLROW nPos = GetPos(); - SCCOLROW nHitNo = nPos; - long nScrPos; - long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X(); - long nDif; - Size aSize = GetOutputSizePixel(); - long nWinSize = bVertical ? aSize.Height() : aSize.Width(); + BOOL bFound=FALSE; + SCCOLROW nCount = 1; + SCCOLROW nPos = GetPos(); + SCCOLROW nHitNo = nPos; + long nScrPos; + long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X(); + long nDif; + Size aSize = GetOutputSizePixel(); + long nWinSize = bVertical ? aSize.Height() : aSize.Width(); BOOL bLayoutRTL = IsLayoutRTL(); long nLayoutSign = bLayoutRTL ? -1 : 1; @@ -622,12 +622,12 @@ SCCOLROW ScHeaderControl::GetMousePos( const MouseEvent& rMEvt, BOOL& rBorder ) { SCCOLROW nEntryNo = nCount + nPos; -// nScrPos = GetScrPos( nEntryNo ) - 1; +// nScrPos = GetScrPos( nEntryNo ) - 1; if (nEntryNo > nSize) nScrPos = nEndPos + nLayoutSign; else - nScrPos += GetEntrySize( nEntryNo - 1 ) * nLayoutSign; //! GetHiddenCount() ?? + nScrPos += GetEntrySize( nEntryNo - 1 ) * nLayoutSign; //! GetHiddenCount() ?? nDif = nMousePos - nScrPos; if (nDif >= -2 && nDif <= 2 && nCount > 0) @@ -661,13 +661,13 @@ bool ScHeaderControl::IsSelectionAllowed(SCCOLROW nPos) const // This sheet is protected. Check if a context menu is allowed on this cell. bool bCellsProtected = false; if (bVertical) - { + { // row header SCROW nRPos = static_cast<SCROW>(nPos); bCellsProtected = pDoc->HasAttrib(0, nRPos, nTab, MAXCOL, nRPos, nTab, HASATTR_PROTECTED); } else - { + { // column header SCCOL nCPos = static_cast<SCCOL>(nPos); bCellsProtected = pDoc->HasAttrib(nCPos, 0, nTab, nCPos, MAXROW, nTab, HASATTR_PROTECTED); @@ -733,18 +733,18 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt ) aVis.Top() = LONG_MIN, aVis.Bottom() = LONG_MAX; pSelEngine->SetVisibleArea( aVis ); - SetMarking( TRUE ); // muss vor SelMouseButtonDown sein + SetMarking( TRUE ); // muss vor SelMouseButtonDown sein pSelEngine->SelMouseButtonDown( rMEvt ); - // #74215# In column/row headers a simple click already is a selection. - // -> Call SelMouseMove to ensure CreateAnchor is called (and DestroyAnchor - // if the next click is somewhere else with Control key). + // #74215# In column/row headers a simple click already is a selection. + // -> Call SelMouseMove to ensure CreateAnchor is called (and DestroyAnchor + // if the next click is somewhere else with Control key). pSelEngine->SelMouseMove( rMEvt ); if (IsMouseCaptured()) { - // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann - //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?! + // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann + //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?! ReleaseMouse(); StartTracking(); } @@ -765,10 +765,10 @@ void ScHeaderControl::MouseButtonUp( const MouseEvent& rMEvt ) { DrawInvert( nDragPos ); ReleaseMouse(); - bDragging = FALSE; + bDragging = FALSE; - long nScrPos = GetScrPos( nDragNo ); - long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X(); + long nScrPos = GetScrPos( nDragNo ); + long nMousePos = bVertical ? rMEvt.GetPosPixel().Y() : rMEvt.GetPosPixel().X(); BOOL bLayoutRTL = IsLayoutRTL(); long nNewWidth = bLayoutRTL ? ( nScrPos - nMousePos + 1 ) : ( nMousePos + 2 - nScrPos ); @@ -783,7 +783,7 @@ void ScHeaderControl::MouseButtonUp( const MouseEvent& rMEvt ) if (nDragNo>0) { --nDragNo; - nNewWidth += GetEntrySize( nDragNo ); //! GetHiddenCount() ??? + nNewWidth += GetEntrySize( nDragNo ); //! GetHiddenCount() ??? } else nNewWidth = 0; @@ -843,8 +843,8 @@ void ScHeaderControl::MouseMove( const MouseEvent& rMEvt ) void ScHeaderControl::Tracking( const TrackingEvent& rTEvt ) { - // Weil die SelectionEngine kein Tracking kennt, die Events nur auf - // die verschiedenen MouseHandler verteilen... + // Weil die SelectionEngine kein Tracking kennt, die Events nur auf + // die verschiedenen MouseHandler verteilen... if ( rTEvt.IsTrackingCanceled() ) StopMarking(); @@ -859,9 +859,9 @@ void ScHeaderControl::Command( const CommandEvent& rCEvt ) USHORT nCmd = rCEvt.GetCommand(); if ( nCmd == COMMAND_CONTEXTMENU ) { - StopMarking(); // Selektion / Dragging beenden + StopMarking(); // Selektion / Dragging beenden - // Popup ausfuehren + // Popup ausfuehren ScTabViewShell* pViewSh = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); @@ -927,8 +927,8 @@ void ScHeaderControl::StopMarking() SetMarking( FALSE ); bIgnoreMove = TRUE; - // #86260# don't call pSelEngine->Reset, so selection across the parts of - // a split/frozen view is possible + // #86260# don't call pSelEngine->Reset, so selection across the parts of + // a split/frozen view is possible ReleaseMouse(); } @@ -937,7 +937,7 @@ void ScHeaderControl::ShowDragHelp() { if (Help::IsQuickHelpEnabled()) { - long nScrPos = GetScrPos( nDragNo ); + long nScrPos = GetScrPos( nDragNo ); BOOL bLayoutRTL = IsLayoutRTL(); long nVal = bLayoutRTL ? ( nScrPos - nDragPos + 1 ) : ( nDragPos + 2 - nScrPos ); @@ -952,21 +952,21 @@ void ScHeaderControl::ShowDragHelp() USHORT nAlign; if (!bVertical) { - // oberhalb + // oberhalb aRect.Left() = aMousePos.X(); - aRect.Top() = aPos.Y() - 4; - nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; + aRect.Top() = aPos.Y() - 4; + nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; } else { - // rechts oben + // rechts oben aRect.Left() = aPos.X() + aSize.Width() + 8; - aRect.Top() = aMousePos.Y() - 2; - nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM; + aRect.Top() = aMousePos.Y() - 2; + nAlign = QUICKHELP_LEFT|QUICKHELP_BOTTOM; } - aRect.Right() = aRect.Left(); - aRect.Bottom() = aRect.Top(); + aRect.Right() = aRect.Left(); + aRect.Bottom() = aRect.Top(); Help::ShowQuickHelp(this, aRect, aHelpStr, nAlign); } @@ -974,8 +974,8 @@ void ScHeaderControl::ShowDragHelp() void ScHeaderControl::RequestHelp( const HelpEvent& rHEvt ) { - // Wenn eigene QuickHelp angezeigt wird, nicht durch RequestHelp - // wieder wegnehmen lassen + // Wenn eigene QuickHelp angezeigt wird, nicht durch RequestHelp + // wieder wegnehmen lassen BOOL bOwn = bDragging && Help::IsQuickHelpEnabled(); if (!bOwn) @@ -983,7 +983,7 @@ void ScHeaderControl::RequestHelp( const HelpEvent& rHEvt ) } // ----------------------------------------------------------------------- -// Dummys fuer virtuelle Methoden +// Dummys fuer virtuelle Methoden // ----------------------------------------------------------------------- SCCOLROW ScHeaderControl::GetHiddenCount( SCCOLROW nEntryNo ) diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index 301ba616e769..de7dc79e0fa8 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,9 +38,9 @@ #include "hintwin.hxx" #include "global.hxx" -#define HINT_LINESPACE 2 -#define HINT_INDENT 3 -#define HINT_MARGIN 4 +#define HINT_LINESPACE 2 +#define HINT_INDENT 3 +#define HINT_MARGIN 4 //================================================================== @@ -51,8 +51,8 @@ ScHintWindow::ScHintWindow( Window* pParent, const String& rTit, const String& r { aMessage.ConvertLineEnd( LINEEND_CR ); - // Hellgelb, wie Notizen in detfunc.cxx - Color aYellow( 255,255,192 ); // hellgelb + // Hellgelb, wie Notizen in detfunc.cxx + Color aYellow( 255,255,192 ); // hellgelb SetBackground( aYellow ); aTextFont = GetFont(); diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx index 88e78ccf1ee6..23e338d30e29 100644 --- a/sc/source/ui/view/imapwrap.cxx +++ b/sc/source/ui/view/imapwrap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,7 +44,7 @@ USHORT ScIMapChildWindowId() SvxIMapDlg* ScGetIMapDlg() { - //! pass view frame here and in SVXIMAPDLG() + //! pass view frame here and in SVXIMAPDLG() SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if( pViewFrm && pViewFrm->HasChildWindow( SvxIMapDlgChildWindow::GetChildWindowId() ) ) @@ -67,7 +67,7 @@ const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg ) return NULL; } -const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ) +const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ) { return pDlg->GetImageMap(); } diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx index cb913677e962..f7722a33870c 100644 --- a/sc/source/ui/view/invmerge.cxx +++ b/sc/source/ui/view/invmerge.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ ScInvertMerger::ScInvertMerger( Window* pWindow ) : pWin( pWindow ), pRects( NULL ) { - // both rectangles empty + // both rectangles empty } ScInvertMerger::ScInvertMerger( ::std::vector< Rectangle >* pRectangles ) : @@ -111,7 +111,7 @@ void ScInvertMerger::Flush() void ScInvertMerger::FlushTotal() { if( aTotalRect.IsEmpty() ) - return; // nothing to do + return; // nothing to do if ( pWin ) pWin->Invert( aTotalRect, INVERT_HIGHLIGHT ); @@ -124,11 +124,11 @@ void ScInvertMerger::FlushTotal() void ScInvertMerger::FlushLine() { if( aLineRect.IsEmpty() ) - return; // nothing to do + return; // nothing to do if ( aTotalRect.IsEmpty() ) { - aTotalRect = aLineRect; // start new total rect + aTotalRect = aLineRect; // start new total rect } else { @@ -141,8 +141,8 @@ void ScInvertMerger::FlushLine() } else { - FlushTotal(); // draw old total rect - aTotalRect = aLineRect; // and start new one + FlushTotal(); // draw old total rect + aTotalRect = aLineRect; // and start new one } } @@ -174,7 +174,7 @@ void ScInvertMerger::AddRect( const Rectangle& rRect ) aLineRect.Right() = aJustified.Right(); bDone = TRUE; } - else if ( aJustified.Right() + 1 == aLineRect.Left() ) // for RTL layout + else if ( aJustified.Right() + 1 == aLineRect.Left() ) // for RTL layout { aLineRect.Left() = aJustified.Left(); bDone = TRUE; @@ -182,8 +182,8 @@ void ScInvertMerger::AddRect( const Rectangle& rRect ) } if (!bDone) { - FlushLine(); // use old line rect for total rect - aLineRect = aJustified; // and start new one + FlushLine(); // use old line rect for total rect + aLineRect = aJustified; // and start new one } } } diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 3ab921f8956e..626853396a01 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ #include "document.hxx" #include "postit.hxx" -#define SC_NOTEMARK_TIME 800 -#define SC_NOTEMARK_SHORT 70 +#define SC_NOTEMARK_TIME 800 +#define SC_NOTEMARK_SHORT 70 // ----------------------------------------------------------------------- @@ -99,8 +99,8 @@ IMPL_LINK( ScNoteMarker, TimeHdl, Timer*, EMPTYARG ) OutputDevice* pPrinter = pDoc->GetRefDevice(); if (pPrinter) { - // Am Outliner des Draw-Model ist auch der Drucker als RefDevice gesetzt, - // und es soll einheitlich aussehen. + // Am Outliner des Draw-Model ist auch der Drucker als RefDevice gesetzt, + // und es soll einheitlich aussehen. Outliner& rOutliner = pModel->GetDrawOutliner(); rOutliner.SetRefDevice(pPrinter); } diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 9fd8e497d3b7..c0baa7ae592c 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -184,8 +184,8 @@ const ScOutlineEntry* ScOutlineWindow::GetOutlineEntry( size_t nLevel, size_t nE bool ScOutlineWindow::IsHidden( SCCOLROW nColRowIndex ) const { - return mbHoriz ? - GetDoc().ColHidden(static_cast<SCCOL>(nColRowIndex), GetTab()) : + return mbHoriz ? + GetDoc().ColHidden(static_cast<SCCOL>(nColRowIndex), GetTab()) : GetDoc().RowHidden(static_cast<SCROW>(nColRowIndex), GetTab()); } diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx index a5f63f5a15bd..fed6f094ada8 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -220,7 +220,7 @@ //#define _VCSBX_HXX //#define _VCBRW_HXX -//#define _SVDATTR_HXX <--- der wars +//#define _SVDATTR_HXX <--- der wars #define _SVDXOUT_HXX #define _SVDEC_HXX //#define _SVDIO_HXX @@ -264,17 +264,17 @@ void ActivateOlk( ScViewData* /* pViewData */ ) { // Browser fuer Virtual Controls fuellen - // VC's und den Browser dazu gibts nicht mehr... + // VC's und den Browser dazu gibts nicht mehr... - // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden + // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } void DeActivateOlk( ScViewData* /* pViewData */ ) { // Browser fuer Virtual Controls fuellen - // VC's und den Browser dazu gibts nicht mehr... + // VC's und den Browser dazu gibts nicht mehr... - // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden + // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index fceb71a335db..292f74f507dc 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,33 +73,33 @@ using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- -// Farben fuer ChangeTracking "nach Autor" wie im Writer (swmodul1.cxx) +// Farben fuer ChangeTracking "nach Autor" wie im Writer (swmodul1.cxx) -#define SC_AUTHORCOLORCOUNT 9 +#define SC_AUTHORCOLORCOUNT 9 static ColorData nAuthorColor[ SC_AUTHORCOLORCOUNT ] = { - COL_LIGHTRED, COL_LIGHTBLUE, COL_LIGHTMAGENTA, - COL_GREEN, COL_RED, COL_BLUE, - COL_BROWN, COL_MAGENTA, COL_CYAN }; + COL_LIGHTRED, COL_LIGHTBLUE, COL_LIGHTMAGENTA, + COL_GREEN, COL_RED, COL_BLUE, + COL_BROWN, COL_MAGENTA, COL_CYAN }; -// Hilfsklasse, fuer die Farbzuordnung, -// um nicht mehrfach hintereinander denselben User aus der Liste zu suchen +// Hilfsklasse, fuer die Farbzuordnung, +// um nicht mehrfach hintereinander denselben User aus der Liste zu suchen class ScActionColorChanger { private: - const ScAppOptions& rOpt; - const ScStrCollection& rUsers; - String aLastUserName; - USHORT nLastUserIndex; - ColorData nColor; + const ScAppOptions& rOpt; + const ScStrCollection& rUsers; + String aLastUserName; + USHORT nLastUserIndex; + ColorData nColor; public: ScActionColorChanger( const ScChangeTrack& rTrack ); ~ScActionColorChanger() {} - void Update( const ScChangeAction& rAction ); - ColorData GetColor() const { return nColor; } + void Update( const ScChangeAction& rAction ); + ColorData GetColor() const { return nColor; } }; //------------------------------------------------------------------ @@ -134,9 +134,9 @@ void ScActionColorChanger::Update( const ScChangeAction& rAction ) nSetColor = rOpt.GetTrackContentColor(); break; } - if ( nSetColor != COL_TRANSPARENT ) // Farbe eingestellt + if ( nSetColor != COL_TRANSPARENT ) // Farbe eingestellt nColor = nSetColor; - else // nach Autor + else // nach Autor { if ( rAction.GetUser() != aLastUserName ) { @@ -164,8 +164,8 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, double nPixelPerTwipsX, double nPixelPerTwipsY, const Fraction* pZoomX, const Fraction* pZoomY ) : pDev( pNewDev ), - pRefDevice( pNewDev ), // default is output device - pFmtDevice( pNewDev ), // default is output device + pRefDevice( pNewDev ), // default is output device + pFmtDevice( pNewDev ), // default is output device mrTabInfo( rTabInfo ), pRowInfo( rTabInfo.mpRowInfo ), nArrCount( rTabInfo.mnArrCount ), @@ -198,7 +198,7 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, bShowNullValues( TRUE ), bShowFormulas( FALSE ), bShowSpellErrors( FALSE ), - bMarkClipped( FALSE ), // FALSE fuer Drucker/Metafile etc. + bMarkClipped( FALSE ), // FALSE fuer Drucker/Metafile etc. bSnapPixel( FALSE ), bAnyRotated( FALSE ), bAnyClipped( FALSE ), @@ -331,10 +331,10 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) Color aManualColor; if (bPagebreakMode) - bPage = FALSE; // keine "normalen" Umbrueche ueber volle Breite/Hoehe + bPage = FALSE; // keine "normalen" Umbrueche ueber volle Breite/Hoehe - //! um den einen Pixel sieht das Metafile (oder die Druck-Ausgabe) anders aus - //! als die Bildschirmdarstellung, aber wenigstens passen Druck und Metafile zusammen + //! um den einen Pixel sieht das Metafile (oder die Druck-Ausgabe) anders aus + //! als die Bildschirmdarstellung, aber wenigstens passen Druck und Metafile zusammen Size aOnePixel = pDev->PixelToLogic(Size(1,1)); long nOneX = aOnePixel.Width(); @@ -361,7 +361,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) ScGridMerger aGrid( pDev, nOneX, nOneY ); // - // Vertikale Linien + // Vertikale Linien // nPosX = nScrX; @@ -379,7 +379,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) if ( bPage ) { - // Seitenumbrueche auch in ausgeblendeten suchen + // Seitenumbrueche auch in ausgeblendeten suchen SCCOL nCol = nXplus1; while (nCol <= MAXCOL) { @@ -400,10 +400,10 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) } } - BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt + BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt USHORT nWidthXplus2 = pRowInfo[0].pCellInfo[nXplus2].nWidth; - bSingle = bSingleGrid; //! in Fillinfo holen !!!!! + bSingle = bSingleGrid; //! in Fillinfo holen !!!!! if ( nX<MAXCOL && !bSingle ) { bSingle = ( nWidthXplus2 == 0 ); @@ -473,7 +473,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) } // - // Horizontale Linien + // Horizontale Linien // bool bHiddenRow = true; @@ -494,12 +494,12 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) { if (i > nHiddenEndRow) bHiddenRow = pDoc->RowHidden(i, nTab, nHiddenEndRow); - /* TODO: optimize the row break thing for large hidden - * segments where HasRowBreak() has to be called - * nevertheless for each row, as a row break is drawn also - * for hidden rows, above them. This needed to be done only - * once per hidden segment, maybe giving manual breaks - * priority. Something like GetNextRowBreak() and + /* TODO: optimize the row break thing for large hidden + * segments where HasRowBreak() has to be called + * nevertheless for each row, as a row break is drawn also + * for hidden rows, above them. This needed to be done only + * once per hidden segment, maybe giving manual breaks + * priority. Something like GetNextRowBreak() and * GetNextManualRowBreak(). */ nBreak = pDoc->HasRowBreak(i, nTab); if (!bHiddenRow || nBreak) @@ -515,10 +515,10 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) } } - BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt + BOOL bDraw = bGrid || nBreakOld; // einfaches Gitter nur wenn eingestellt BOOL bNextYisNextRow = (pRowInfo[nArrYplus1].nRowNo == nYplus1); - bSingle = !bNextYisNextRow; // Hidden + bSingle = !bNextYisNextRow; // Hidden for (SCCOL i=nX1; i<=nX2 && !bSingle; i++) { if (pRowInfo[nArrYplus1].pCellInfo[i+1].bVOverlapped) @@ -539,7 +539,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) for (SCCOL i=nX1; i<=nX2; i++) { nNextX = nPosX + pRowInfo[0].pCellInfo[i+1].nWidth * nLayoutSign; - if (nNextX != nPosX) // sichtbar + if (nNextX != nPosX) // sichtbar { BOOL bVOver; if ( bNextYisNextRow ) @@ -549,7 +549,7 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) bVOver = ((ScMergeFlagAttr*)pDoc->GetAttr( i,nYplus1,nTab,ATTR_MERGE_FLAG)) ->IsVerOverlapped() - && ((ScMergeFlagAttr*)pDoc->GetAttr( + && ((ScMergeFlagAttr*)pDoc->GetAttr( i,nVisY,nTab,ATTR_MERGE_FLAG)) ->IsVerOverlapped(); //! nVisY aus Array ?? @@ -577,16 +577,16 @@ void ScOutputData::DrawGrid( BOOL bGrid, BOOL bPage ) } } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- void ScOutputData::SetPagebreakMode( ScPageBreakData* pPageData ) { bPagebreakMode = TRUE; if (!pPageData) - return; // noch nicht initialisiert -> alles "nicht gedruckt" + return; // noch nicht initialisiert -> alles "nicht gedruckt" - // gedruckten Bereich markieren - // (in FillInfo ist schon alles auf FALSE initialisiert) + // gedruckten Bereich markieren + // (in FillInfo ist schon alles auf FALSE initialisiert) USHORT nRangeCount = sal::static_int_cast<USHORT>(pPageData->GetCount()); for (USHORT nPos=0; nPos<nRangeCount; nPos++) @@ -613,7 +613,7 @@ void ScOutputData::SetPagebreakMode( ScPageBreakData* pPageData ) void ScOutputData::FindRotated() { - //! nRotMax speichern + //! nRotMax speichern SCCOL nRotMax = nX2; for (SCSIZE nRotY=0; nRotY<nArrCount; nRotY++) if (pRowInfo[nRotY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nRotY].nRotMaxCol > nRotMax) @@ -640,7 +640,7 @@ void ScOutputData::FindRotated() pCondSet = pDoc->GetCondResult( nX, nY, nTab ); } - if ( pPattern ) // Spalte nicht ausgeblendet + if ( pPattern ) // Spalte nicht ausgeblendet { BYTE nDir = pPattern->GetRotateDir( pCondSet ); if (nDir != SC_ROTDIR_NONE) @@ -654,7 +654,7 @@ void ScOutputData::FindRotated() } } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- USHORT lcl_GetRotateDir( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) { @@ -675,7 +675,7 @@ USHORT lcl_GetRotateDir( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) nRet = SC_ROTDIR_CENTER; else if ( eRotMode == SVX_ROTATE_MODE_TOP || eRotMode == SVX_ROTATE_MODE_BOTTOM ) { - long nRot180 = nAttrRotate % 18000; // 1/100 Grad + long nRot180 = nAttrRotate % 18000; // 1/100 Grad if ( nRot180 == 9000 ) nRet = SC_ROTDIR_CENTER; else if ( ( eRotMode == SVX_ROTATE_MODE_TOP && nRot180 < 9000 ) || @@ -698,10 +698,10 @@ const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow USHORT nDir = lcl_GetRotateDir( pDoc, nCol, nRow, nTab ); - // CENTER wird wie RIGHT behandelt... + // CENTER wird wie RIGHT behandelt... if ( nDir == SC_ROTDIR_RIGHT || nDir == SC_ROTDIR_CENTER ) { - // Text geht nach rechts -> Hintergrund von links nehmen + // Text geht nach rechts -> Hintergrund von links nehmen while ( nCol > 0 && lcl_GetRotateDir( pDoc, nCol, nRow, nTab ) == nDir && pBackground->GetColor().GetTransparency() != 255 ) { @@ -713,7 +713,7 @@ const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow } else if ( nDir == SC_ROTDIR_LEFT ) { - // Text geht nach links -> Hintergrund von rechts nehmen + // Text geht nach links -> Hintergrund von rechts nehmen while ( nCol < MAXCOL && lcl_GetRotateDir( pDoc, nCol, nRow, nTab ) == nDir && pBackground->GetColor().GetTransparency() != 255 ) { @@ -727,7 +727,7 @@ const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCROW nRow return pBackground; } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- BOOL lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther, SCCOL nX1, SCCOL nX2, BOOL bShowProt, BOOL bPagebreakMode ) @@ -784,7 +784,7 @@ void ScOutputData::DrawDocumentBackground() void ScOutputData::DrawBackground() { - FindRotated(); //! von aussen ? + FindRotated(); //! von aussen ? Rectangle aRect; Size aOnePixel = pDev->PixelToLogic(Size(1,1)); @@ -802,7 +802,7 @@ void ScOutputData::DrawBackground() BOOL bShowProt = bSyntaxMode && pDoc->IsTabProtected(nTab); BOOL bDoAll = bShowProt || bPagebreakMode || bSolidBackground; - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -816,7 +816,7 @@ void ScOutputData::DrawBackground() { if ( ( ( pThisRowInfo->bEmptyBack ) || bSyntaxMode ) && !bDoAll ) { - // nichts + // nichts } else { @@ -827,7 +827,7 @@ void ScOutputData::DrawBackground() nX1, nX2, bShowProt, bPagebreakMode ) ) { ++nSkip; - nRowHeight += pRowInfo[nArrY+nSkip].nHeight; // after incrementing + nRowHeight += pRowInfo[nArrY+nSkip].nHeight; // after incrementing } long nPosX = nScrX; @@ -843,10 +843,10 @@ void ScOutputData::DrawBackground() if (bCellContrast) { - // high contrast for cell borders and backgrounds -> empty background + // high contrast for cell borders and backgrounds -> empty background pBackground = ScGlobal::GetEmptyBrushItem(); } - else if (bShowProt) // show cell protection in syntax mode + else if (bShowProt) // show cell protection in syntax mode { const ScPatternAttr* pP = pInfo->pPatternAttr; if (pP) @@ -878,10 +878,10 @@ void ScOutputData::DrawBackground() if ( pBackground != pOldBackground ) { aRect.Right() = nPosX-nSignedOneX; - if (pOldBackground) // ==0 if hidden + if (pOldBackground) // ==0 if hidden { Color aBackCol = pOldBackground->GetColor(); - if ( !aBackCol.GetTransparency() ) //! partial transparency? + if ( !aBackCol.GetTransparency() ) //! partial transparency? { pDev->SetFillColor( aBackCol ); pDev->DrawRect( aRect ); @@ -896,7 +896,7 @@ void ScOutputData::DrawBackground() if (pOldBackground) { Color aBackCol = pOldBackground->GetColor(); - if ( !aBackCol.GetTransparency() ) //! partial transparency? + if ( !aBackCol.GetTransparency() ) //! partial transparency? { pDev->SetFillColor( aBackCol ); pDev->DrawRect( aRect ); @@ -920,7 +920,7 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot pDev->SetLineColor(); const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode(); Color aAutoTextColor; if ( bCellContrast ) @@ -952,7 +952,7 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot BOOL bCornerX = ( nArrX==nX1 || nArrX==nX2+2 ); BOOL bSkipX = ( nArrX==nX1 && !bLeft ) || ( nArrX==nX2+2 && !bRight ); - for (USHORT nPass=0; nPass<2; nPass++) // horizontal / vertikal + for (USHORT nPass=0; nPass<2; nPass++) // horizontal / vertikal { const SvxShadowItem* pAttr = nPass ? pThisRowInfo->pCellInfo[nArrX].pVShadowOrigin : @@ -974,16 +974,16 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot long nMaxWidth = nThisWidth; if (!nMaxWidth) { - //! direction must depend on shadow location - SCCOL nWx = nArrX; // nX+1 + //! direction must depend on shadow location + SCCOL nWx = nArrX; // nX+1 while (nWx<nX2 && !pRowInfo[0].pCellInfo[nWx+1].nWidth) ++nWx; nMaxWidth = pRowInfo[0].pCellInfo[nWx+1].nWidth; } -// Rectangle aRect( Point(nPosX,nPosY), -// Size( pRowInfo[0].pCellInfo[nArrX].nWidth, -// pRowInfo[nArrY].nHeight ) ); +// Rectangle aRect( Point(nPosX,nPosY), +// Size( pRowInfo[0].pCellInfo[nArrX].nWidth, +// pRowInfo[nArrY].nHeight ) ); // rectangle is in logical orientation Rectangle aRect( nPosX, nPosY, @@ -996,19 +996,19 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot long nSizeY = (long)(nSize*nPPTY); if (nSizeY >= nRowHeight) nSizeY = nRowHeight-1; - nSizeX *= nLayoutSign; // used only to add to rectangle values + nSizeX *= nLayoutSign; // used only to add to rectangle values SvxShadowLocation eLoc = pAttr->GetLocation(); if ( bLayoutRTL ) { - // Shadow location is specified as "visual" (right is always right), - // so the attribute's location value is mirrored here and in FillInfo. + // Shadow location is specified as "visual" (right is always right), + // so the attribute's location value is mirrored here and in FillInfo. switch (eLoc) { - case SVX_SHADOW_BOTTOMRIGHT: eLoc = SVX_SHADOW_BOTTOMLEFT; break; - case SVX_SHADOW_BOTTOMLEFT: eLoc = SVX_SHADOW_BOTTOMRIGHT; break; - case SVX_SHADOW_TOPRIGHT: eLoc = SVX_SHADOW_TOPLEFT; break; - case SVX_SHADOW_TOPLEFT: eLoc = SVX_SHADOW_TOPRIGHT; break; + case SVX_SHADOW_BOTTOMRIGHT: eLoc = SVX_SHADOW_BOTTOMLEFT; break; + case SVX_SHADOW_BOTTOMLEFT: eLoc = SVX_SHADOW_BOTTOMRIGHT; break; + case SVX_SHADOW_TOPRIGHT: eLoc = SVX_SHADOW_TOPLEFT; break; + case SVX_SHADOW_TOPLEFT: eLoc = SVX_SHADOW_TOPRIGHT; break; default: { // added to avoid warnings @@ -1062,7 +1062,7 @@ void ScOutputData::DrawExtraShadow(BOOL bLeft, BOOL bTop, BOOL bRight, BOOL bBot } // -// Loeschen +// Loeschen // void ScOutputData::DrawClear() @@ -1095,7 +1095,7 @@ void ScOutputData::DrawClear() while ( nArrY+nSkip+2<nArrCount && pRowInfo[nArrY+nSkip+1].bChanged ) { ++nSkip; - nRowHeight += pRowInfo[nArrY+nSkip].nHeight; // after incrementing + nRowHeight += pRowInfo[nArrY+nSkip].nHeight; // after incrementing } aRect = Rectangle( Point( nScrX, nPosY ), @@ -1110,7 +1110,7 @@ void ScOutputData::DrawClear() // -// Linien +// Linien // long lclGetSnappedX( OutputDevice& rDev, long nPosX, bool bSnapPixel ) @@ -1135,13 +1135,13 @@ void ScOutputData::DrawFrame() Color aSingleColor; BOOL bUseSingleColor = FALSE; const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode(); - // #107519# if a Calc OLE object is embedded in Draw/Impress, the VCL DrawMode is used - // for display mode / B&W printing. The VCL DrawMode handling doesn't work for lines - // that are drawn with DrawRect, so if the line/background bits are set, the DrawMode - // must be reset and the border colors handled here. + // #107519# if a Calc OLE object is embedded in Draw/Impress, the VCL DrawMode is used + // for display mode / B&W printing. The VCL DrawMode handling doesn't work for lines + // that are drawn with DrawRect, so if the line/background bits are set, the DrawMode + // must be reset and the border colors handled here. if ( ( nOldDrawMode & DRAWMODE_WHITEFILL ) && ( nOldDrawMode & DRAWMODE_BLACKLINE ) ) { @@ -1152,7 +1152,7 @@ void ScOutputData::DrawFrame() else if ( ( nOldDrawMode & DRAWMODE_SETTINGSFILL ) && ( nOldDrawMode & DRAWMODE_SETTINGSLINE ) ) { pDev->SetDrawMode( nOldDrawMode & (~DRAWMODE_SETTINGSFILL) ); - aSingleColor = rStyleSettings.GetWindowTextColor(); // same as used in VCL for DRAWMODE_SETTINGSLINE + aSingleColor = rStyleSettings.GetWindowTextColor(); // same as used in VCL for DRAWMODE_SETTINGSLINE bUseSingleColor = TRUE; } else if ( bCellContrast ) @@ -1164,7 +1164,7 @@ void ScOutputData::DrawFrame() const Color* pForceColor = bUseSingleColor ? &aSingleColor : 0; if (bAnyRotated) - DrawRotatedFrame( pForceColor ); // removes the lines that must not be painted here + DrawRotatedFrame( pForceColor ); // removes the lines that must not be painted here long nInitPosX = nScrX; if ( bLayoutRTL ) @@ -1246,9 +1246,9 @@ void ScOutputData::DrawFrame() pDev->SetDrawMode(nOldDrawMode); } -// ------------------------------------------------------------------------- +// ------------------------------------------------------------------------- -// Linie unter der Zelle +// Linie unter der Zelle const SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nRotDir, @@ -1262,19 +1262,19 @@ const SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, { if ( nRotDir == SC_ROTDIR_LEFT ) { - // Text nach links -> Linie von rechts + // Text nach links -> Linie von rechts if ( nCol < MAXCOL ) ++nCol; else - return NULL; // war nix + return NULL; // war nix } else { - // Text nach rechts -> Linie von links + // Text nach rechts -> Linie von links if ( nCol > 0 ) --nCol; else - return NULL; // war nix + return NULL; // war nix } const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab ); const SfxItemSet* pCondSet = pDoc->GetCondResult( nCol, nRow, nTab ); @@ -1318,8 +1318,8 @@ void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBott rDev.SetLineColor(rColor); // PEN_NULL ??? rDev.SetFillColor(rColor); - // Position oben/unten muss unabhaengig von der Liniendicke sein, - // damit der Winkel stimmt (oder X-Position auch anpassen) + // Position oben/unten muss unabhaengig von der Liniendicke sein, + // damit der Winkel stimmt (oder X-Position auch anpassen) long nTopPos = rTop.Y(); long nBotPos = rBottom.Y(); @@ -1329,7 +1329,7 @@ void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBott long nBotLeft = rBottom.X() + nXOffs; long nBotRight = nBotLeft + nWidth - 1; - // oben abschliessen + // oben abschliessen if ( rTopLine.Prim() ) { @@ -1337,15 +1337,15 @@ void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBott if (nLineW >= 2) { Point aTriangle[3]; - aTriangle[0] = Point( nTopLeft, nTopPos ); // wie aPoints[0] - aTriangle[1] = Point( nTopRight, nTopPos ); // wie aPoints[1] + aTriangle[0] = Point( nTopLeft, nTopPos ); // wie aPoints[0] + aTriangle[1] = Point( nTopRight, nTopPos ); // wie aPoints[1] aTriangle[2] = Point( rTop.X(), nTopPos - (nLineW - 1) / 2 ); Polygon aTriPoly( 3, aTriangle ); rDev.DrawPolygon( aTriPoly ); } } - // unten abschliessen + // unten abschliessen if ( rBottomLine.Prim() ) { @@ -1353,8 +1353,8 @@ void lcl_VertLineEnds( OutputDevice& rDev, const Point& rTop, const Point& rBott if (nLineW >= 2) { Point aTriangle[3]; - aTriangle[0] = Point( nBotLeft, nBotPos ); // wie aPoints[3] - aTriangle[1] = Point( nBotRight, nBotPos ); // wie aPoints[2] + aTriangle[0] = Point( nBotLeft, nBotPos ); // wie aPoints[3] + aTriangle[1] = Point( nBotRight, nBotPos ); // wie aPoints[2] aTriangle[2] = Point( rBottom.X(), nBotPos - (nLineW - 1) / 2 + nLineW - 1 ); Polygon aTriPoly( 3, aTriangle ); rDev.DrawPolygon( aTriPoly ); @@ -1389,20 +1389,20 @@ void lcl_VertLine( OutputDevice& rDev, const Point& rTop, const Point& rBottom, void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) { - //! nRotMax speichern + //! nRotMax speichern SCCOL nRotMax = nX2; for (SCSIZE nRotY=0; nRotY<nArrCount; nRotY++) if (pRowInfo[nRotY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nRotY].nRotMaxCol > nRotMax) nRotMax = pRowInfo[nRotY].nRotMaxCol; const ScPatternAttr* pPattern; - const SfxItemSet* pCondSet; + const SfxItemSet* pCondSet; const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && rStyleSettings.GetHighContrastMode(); - // color (pForceColor) is determined externally, including DrawMode changes + // color (pForceColor) is determined externally, including DrawMode changes long nInitPosX = nScrX; if ( bLayoutRTL ) @@ -1427,8 +1427,8 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) long nPosY = nScrY; for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) { - // Rotated wird auch 1 Zeile ueber/unter Changed gezeichnet, falls Teile - // in die Zeile hineinragen... + // Rotated wird auch 1 Zeile ueber/unter Changed gezeichnet, falls Teile + // in die Zeile hineinragen... RowInfo& rPrevRowInfo = pRowInfo[nArrY-1]; RowInfo& rThisRowInfo = pRowInfo[nArrY]; @@ -1446,7 +1446,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) SCCOL nX; for (nX=0; nX<=nRotMax; nX++) { - if (nX==nX1) nPosX = nInitPosX; // calculated individually for preceding positions + if (nX==nX1) nPosX = nInitPosX; // calculated individually for preceding positions USHORT nArrX = nX + 1; @@ -1465,7 +1465,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) pInfo->pConditionSet = pCondSet; } - //! LastPattern etc. + //! LastPattern etc. long nAttrRotate = pPattern->GetRotateVal( pCondSet ); SvxRotateMode eRotMode = (SvxRotateMode)((const SvxRotateModeItem&) @@ -1473,7 +1473,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) if ( nAttrRotate ) { - if (nX<nX1) // negative Position berechnen + if (nX<nX1) // negative Position berechnen { nPosX = nInitPosX; SCCOL nCol = nX1; @@ -1484,8 +1484,8 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) } } - // Startposition minus 1, damit auch schraege Hintergruende - // zur Umrandung passen (Umrandung ist auf dem Gitter) + // Startposition minus 1, damit auch schraege Hintergruende + // zur Umrandung passen (Umrandung ist auf dem Gitter) long nTop = nPosY - 1; long nBottom = nPosY + nRowHeight - 1; @@ -1494,12 +1494,12 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) long nBotLeft = nTopLeft; long nBotRight = nTopRight; - // inclusion of the sign here hasn't been decided yet - // (if not, the extension of the non-rotated background must also be changed) - double nRealOrient = nLayoutSign * nAttrRotate * F_PI18000; // 1/100th degrees + // inclusion of the sign here hasn't been decided yet + // (if not, the extension of the non-rotated background must also be changed) + double nRealOrient = nLayoutSign * nAttrRotate * F_PI18000; // 1/100th degrees double nCos = cos( nRealOrient ); double nSin = sin( nRealOrient ); - //! begrenzen !!! + //! begrenzen !!! long nSkew = (long) ( nRowHeight * nCos / nSin ); switch (eRotMode) @@ -1537,23 +1537,23 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) ATTR_BACKGROUND, pCondSet ); if (bCellContrast) { - // high contrast for cell borders and backgrounds -> empty background + // high contrast for cell borders and backgrounds -> empty background pBackground = ScGlobal::GetEmptyBrushItem(); } const Color& rColor = pBackground->GetColor(); if ( rColor.GetTransparency() != 255 ) { - // #95879# draw background only for the changed row itself - // (background doesn't extend into other cells). - // For the borders (rotated and normal), clipping should be - // set if the row isn't changed, but at least the borders - // don't cover the cell contents. + // #95879# draw background only for the changed row itself + // (background doesn't extend into other cells). + // For the borders (rotated and normal), clipping should be + // set if the row isn't changed, but at least the borders + // don't cover the cell contents. if ( rThisRowInfo.bChanged ) { Polygon aPoly( 4, aPoints ); - // ohne Pen wird bei DrawPolygon rechts und unten - // ein Pixel weggelassen... + // ohne Pen wird bei DrawPolygon rechts und unten + // ein Pixel weggelassen... if ( rColor.GetTransparency() == 0 ) pDev->SetLineColor(rColor); else @@ -1565,9 +1565,9 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) svx::frame::Style aTopLine, aBottomLine, aLeftLine, aRightLine; - if ( nX < nX1 || nX > nX2 ) // Attribute in FillInfo nicht gesetzt + if ( nX < nX1 || nX > nX2 ) // Attribute in FillInfo nicht gesetzt { - //! Seitengrenzen fuer Druck beruecksichtigen !!!!! + //! Seitengrenzen fuer Druck beruecksichtigen !!!!! const SvxBorderLine* pLeftLine; const SvxBorderLine* pTopLine; const SvxBorderLine* pRightLine; @@ -1601,10 +1601,10 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) nPosX += nColWidth * nLayoutSign; } - // erst hinterher im zweiten Schritt die Linien fuer normale Ausgabe loeschen + // erst hinterher im zweiten Schritt die Linien fuer normale Ausgabe loeschen nX = nX1 > 0 ? (nX1-1) : static_cast<SCCOL>(0); - for (; nX<=nX2+1; nX++) // sichtbarer Teil +- 1 + for (; nX<=nX2+1; nX++) // sichtbarer Teil +- 1 { USHORT nArrX = nX + 1; CellInfo& rInfo = rThisRowInfo.pCellInfo[nArrX]; @@ -1618,8 +1618,8 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) size_t nCol = lclGetArrayColFromCellInfoX( nArrX, nX1, nX2, bLayoutRTL ); - // horizontal: angrenzende Linie verlaengern - // (nur, wenn die gedrehte Zelle eine Umrandung hat) + // horizontal: angrenzende Linie verlaengern + // (nur, wenn die gedrehte Zelle eine Umrandung hat) USHORT nDir = rInfo.nRotateDir; if ( rArray.GetCellStyleTop( nCol, nRow ).Prim() && eRotMode != SVX_ROTATE_MODE_TOP ) { @@ -1665,7 +1665,7 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) pDev->SetClipRegion(); } -// Drucker +// Drucker PolyPolygon ScOutputData::GetChangedArea() { @@ -1675,9 +1675,9 @@ PolyPolygon ScOutputData::GetChangedArea() aDrawingRect.Left() = nScrX; aDrawingRect.Right() = nScrX+nScrW-1; - BOOL bHad = FALSE; - long nPosY = nScrY; - SCSIZE nArrY; + BOOL bHad = FALSE; + long nPosY = nScrY; + SCSIZE nArrY; for (nArrY=1; nArrY+1<nArrCount; nArrY++) { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; @@ -1713,9 +1713,9 @@ BOOL ScOutputData::SetChangedClip() aDrawingRect.Left() = nScrX; aDrawingRect.Right() = nScrX+nScrW-1; - BOOL bHad = FALSE; - long nPosY = nScrY; - SCSIZE nArrY; + BOOL bHad = FALSE; + long nPosY = nScrY; + SCSIZE nArrY; for (nArrY=1; nArrY+1<nArrCount; nArrY++) { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; @@ -1748,8 +1748,8 @@ BOOL ScOutputData::SetChangedClip() void ScOutputData::FindChanged() { - SCCOL nX; - SCSIZE nArrY; + SCCOL nX; + SCSIZE nArrY; BOOL bWasIdleDisabled = pDoc->IsIdleDisabled(); pDoc->DisableIdle( TRUE ); @@ -1803,7 +1803,7 @@ void ScOutputData::DrawMark( Window* pWin ) { Rectangle aRect; ScInvertMerger aInvert( pWin ); - //! additional method AddLineRect for ScInvertMerger? + //! additional method AddLineRect for ScInvertMerger? long nPosY = nScrY; for (SCSIZE nArrY=1; nArrY+1<nArrCount; nArrY++) @@ -1884,12 +1884,12 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, BOOL bTop = FALSE; BOOL bBottom = FALSE; BOOL bLeft = FALSE; - BOOL bRight = FALSE; + BOOL bRight = FALSE; long nPosY = nScrY; BOOL bNoStartY = ( nY1 < nRefStartY ); BOOL bNoEndY = FALSE; - for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check + for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check { SCROW nY = pRowInfo[nArrY].nRowNo; @@ -1915,7 +1915,7 @@ void ScOutputData::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, long nPosX = nScrX; if ( bLayoutRTL ) - nPosX += nMirrorW - 1; // always in pixels + nPosX += nMirrorW - 1; // always in pixels for (SCCOL nX=nX1; nX<=nX2; nX++) { @@ -1973,7 +1973,7 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY, pDoc->ExtendMerge( nRefStartX, nRefStartY, nRefEndX, nRefEndY, nTab ); if ( nRefStartX <= nVisX2 + 1 && nRefEndX >= nVisX1 && - nRefStartY <= nVisY2 + 1 && nRefEndY >= nVisY1 ) // +1 because it touches next cells left/top + nRefStartY <= nVisY2 + 1 && nRefEndY >= nVisY1 ) // +1 because it touches next cells left/top { long nMinX = nScrX; long nMinY = nScrY; @@ -1990,12 +1990,12 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY, BOOL bTop = FALSE; BOOL bBottom = FALSE; BOOL bLeft = FALSE; - BOOL bRight = FALSE; + BOOL bRight = FALSE; long nPosY = nScrY; BOOL bNoStartY = ( nY1 < nRefStartY ); BOOL bNoEndY = FALSE; - for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check + for (SCSIZE nArrY=1; nArrY<nArrCount; nArrY++) // loop to end for bNoEndY check { SCROW nY = pRowInfo[nArrY].nRowNo; @@ -2021,7 +2021,7 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY, long nPosX = nScrX; if ( bLayoutRTL ) - nPosX += nMirrorW - 1; // always in pixels + nPosX += nMirrorW - 1; // always in pixels for (SCCOL nX=nX1; nX<=nX2+1; nX++) { @@ -2042,9 +2042,9 @@ void ScOutputData::DrawOneChange( SCCOL nRefStartX, SCROW nRefStartY, nMaxY >= nMinY ) { if ( nType == SC_CAT_DELETE_ROWS ) - bLeft = bRight = bBottom = FALSE; //! dicke Linie ??? + bLeft = bRight = bBottom = FALSE; //! dicke Linie ??? else if ( nType == SC_CAT_DELETE_COLS ) - bTop = bBottom = bRight = FALSE; //! dicke Linie ??? + bTop = bBottom = bRight = FALSE; //! dicke Linie ??? pDev->SetLineColor( rColor ); if (bTop && bBottom && bLeft && bRight) @@ -2086,17 +2086,17 @@ void ScOutputData::DrawChangeTrack() ScChangeTrack* pTrack = pDoc->GetChangeTrack(); ScChangeViewSettings* pSettings = pDoc->GetChangeViewSettings(); if ( !pTrack || !pTrack->GetFirst() || !pSettings || !pSettings->ShowChanges() ) - return; // nix da oder abgeschaltet + return; // nix da oder abgeschaltet ScActionColorChanger aColorChanger(*pTrack); - // Clipping passiert von aussen - //! ohne Clipping, nur betroffene Zeilen painten ??!??!? + // Clipping passiert von aussen + //! ohne Clipping, nur betroffene Zeilen painten ??!??!? SCCOL nEndX = nX2; SCROW nEndY = nY2; - if ( nEndX < MAXCOL ) ++nEndX; // auch noch von der naechsten Zelle, weil die Markierung - if ( nEndY < MAXROW ) ++nEndY; // in die jeweils vorhergehende Zelle hineinragt + if ( nEndX < MAXCOL ) ++nEndX; // auch noch von der naechsten Zelle, weil die Markierung + if ( nEndY < MAXROW ) ++nEndY; // in die jeweils vorhergehende Zelle hineinragt ScRange aViewRange( nX1, nY1, nTab, nEndX, nEndY, nTab ); const ScChangeAction* pAction = pTrack->GetFirst(); while (pAction) @@ -2152,7 +2152,7 @@ void ScOutputData::DrawNoteMarks() long nInitPosX = nScrX; if ( bLayoutRTL ) - nInitPosX += nMirrorW - 1; // always in pixels + nInitPosX += nMirrorW - 1; // always in pixels long nLayoutSign = bLayoutRTL ? -1 : 1; long nPosY = nScrY; @@ -2199,7 +2199,7 @@ void ScOutputData::DrawNoteMarks() long nMarkX = nPosX + ( pRowInfo[0].pCellInfo[nX+1].nWidth - 4 ) * nLayoutSign; if ( bIsMerged || pInfo->bMerged ) { - // if merged, add widths of all cells + // if merged, add widths of all cells SCCOL nNextX = nX + 1; while ( nNextX <= nX2 + 1 && pThisRowInfo->pCellInfo[nNextX+1].bHOverlapped ) { @@ -2316,15 +2316,15 @@ void ScOutputData::DrawClipMarks() const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); if ( bUseStyleColor && rStyleSettings.GetHighContrastMode() ) { - // use DrawMode to change the arrow's outline color + // use DrawMode to change the arrow's outline color pDev->SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE ); - // use text color also for the fill color + // use text color also for the fill color aArrowFillCol.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); } long nInitPosX = nScrX; if ( bLayoutRTL ) - nInitPosX += nMirrorW - 1; // always in pixels + nInitPosX += nMirrorW - 1; // always in pixels long nLayoutSign = bLayoutRTL ? -1 : 1; Rectangle aCellRect; @@ -2343,7 +2343,7 @@ void ScOutputData::DrawClipMarks() { if (pInfo->bHOverlapped || pInfo->bVOverlapped) { - // merge origin may be outside of visible area - use document functions + // merge origin may be outside of visible area - use document functions SCCOL nOverX = nX; SCROW nOverY = nY; @@ -2405,7 +2405,7 @@ void ScOutputData::DrawClipMarks() Point( nStartPosX+nOutWidth-1, nPosY+nOutHeight-1 ) ); } - aCellRect.Bottom() -= 1; // don't paint over the cell grid + aCellRect.Bottom() -= 1; // don't paint over the cell grid if ( bLayoutRTL ) aCellRect.Left() += 1; else @@ -2416,14 +2416,14 @@ void ScOutputData::DrawClipMarks() if ( pInfo->nClipMark & ( bLayoutRTL ? SC_CLIPMARK_RIGHT : SC_CLIPMARK_LEFT ) ) { - // visually left + // visually left Rectangle aMarkRect = aCellRect; aMarkRect.Right() = aCellRect.Left()+nMarkPixel-1; SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, TRUE ); } if ( pInfo->nClipMark & ( bLayoutRTL ? SC_CLIPMARK_LEFT : SC_CLIPMARK_RIGHT ) ) { - // visually right + // visually right Rectangle aMarkRect = aCellRect; aMarkRect.Left() = aCellRect.Right()-nMarkPixel+1; SvxFont::DrawArrow( *pDev, aMarkRect, aMarkSize, aArrowFillCol, FALSE ); diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index e744023568da..3e8d9a66c2d9 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -81,10 +81,10 @@ #include <math.h> -//! Autofilter-Breite mit column.cxx zusammenfassen +//! Autofilter-Breite mit column.cxx zusammenfassen #define DROPDOWN_BITMAP_SIZE 18 -#define DRAWTEXT_MAX 32767 +#define DRAWTEXT_MAX 32767 const USHORT SC_SHRINKAGAIN_MAX = 7; @@ -95,82 +95,82 @@ const USHORT SC_SHRINKAGAIN_MAX = 7; class ScDrawStringsVars { - ScOutputData* pOutput; // Verbindung + ScOutputData* pOutput; // Verbindung - const ScPatternAttr* pPattern; // Attribute - const SfxItemSet* pCondSet; // aus bedingter Formatierung + const ScPatternAttr* pPattern; // Attribute + const SfxItemSet* pCondSet; // aus bedingter Formatierung - Font aFont; // aus Attributen erzeugt - FontMetric aMetric; - long nAscentPixel; // always pixels - SvxCellOrientation eAttrOrient; - SvxCellHorJustify eAttrHorJust; - SvxCellVerJustify eAttrVerJust; + Font aFont; // aus Attributen erzeugt + FontMetric aMetric; + long nAscentPixel; // always pixels + SvxCellOrientation eAttrOrient; + SvxCellHorJustify eAttrHorJust; + SvxCellVerJustify eAttrVerJust; SvxCellJustifyMethod eAttrHorJustMethod; SvxCellJustifyMethod eAttrVerJustMethod; const SvxMarginItem* pMargin; - USHORT nIndent; - BOOL bRotated; + USHORT nIndent; + BOOL bRotated; - String aString; // Inhalte - Size aTextSize; - long nOriginalWidth; + String aString; // Inhalte + Size aTextSize; + long nOriginalWidth; long nMaxDigitWidth; long nSignWidth; long nDotWidth; long nExpWidth; - ScBaseCell* pLastCell; - ULONG nValueFormat; - BOOL bLineBreak; + ScBaseCell* pLastCell; + ULONG nValueFormat; + BOOL bLineBreak; BOOL bRepeat; BOOL bShrink; - BOOL bPixelToLogic; - BOOL bCellContrast; + BOOL bPixelToLogic; + BOOL bCellContrast; - Color aBackConfigColor; // used for ScPatternAttr::GetFont calls - Color aTextConfigColor; + Color aBackConfigColor; // used for ScPatternAttr::GetFont calls + Color aTextConfigColor; public: ScDrawStringsVars(ScOutputData* pData, BOOL bPTL); ~ScDrawStringsVars(); - // SetPattern = ex-SetVars - // SetPatternSimple: ohne Font + // SetPattern = ex-SetVars + // SetPatternSimple: ohne Font - void SetPattern( const ScPatternAttr* pNew, const SfxItemSet* pSet, ScBaseCell* pCell, BYTE nScript ); - void SetPatternSimple( const ScPatternAttr* pNew, const SfxItemSet* pSet ); + void SetPattern( const ScPatternAttr* pNew, const SfxItemSet* pSet, ScBaseCell* pCell, BYTE nScript ); + void SetPatternSimple( const ScPatternAttr* pNew, const SfxItemSet* pSet ); - BOOL SetText( ScBaseCell* pCell ); // TRUE -> pOldPattern vergessen + BOOL SetText( ScBaseCell* pCell ); // TRUE -> pOldPattern vergessen void SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth ); - void SetAutoText( const String& rAutoText ); + void SetAutoText( const String& rAutoText ); - const ScPatternAttr* GetPattern() const { return pPattern; } - SvxCellOrientation GetOrient() const { return eAttrOrient; } - SvxCellHorJustify GetHorJust() const { return eAttrHorJust; } - SvxCellVerJustify GetVerJust() const { return eAttrVerJust; } + const ScPatternAttr* GetPattern() const { return pPattern; } + SvxCellOrientation GetOrient() const { return eAttrOrient; } + SvxCellHorJustify GetHorJust() const { return eAttrHorJust; } + SvxCellVerJustify GetVerJust() const { return eAttrVerJust; } SvxCellJustifyMethod GetHorJustMethod() const { return eAttrHorJustMethod; } SvxCellJustifyMethod GetVerJustMethod() const { return eAttrVerJustMethod; } - const SvxMarginItem* GetMargin() const { return pMargin; } + const SvxMarginItem* GetMargin() const { return pMargin; } - USHORT GetLeftTotal() const { return pMargin->GetLeftMargin() + nIndent; } + USHORT GetLeftTotal() const { return pMargin->GetLeftMargin() + nIndent; } - const String& GetString() const { return aString; } - const Size& GetTextSize() const { return aTextSize; } - long GetOriginalWidth() const { return nOriginalWidth; } + const String& GetString() const { return aString; } + const Size& GetTextSize() const { return aTextSize; } + long GetOriginalWidth() const { return nOriginalWidth; } - ULONG GetValueFormat() const { return nValueFormat; } - BOOL GetLineBreak() const { return bLineBreak; } + ULONG GetValueFormat() const { return nValueFormat; } + BOOL GetLineBreak() const { return bLineBreak; } BOOL IsRepeat() const { return bRepeat; } BOOL IsShrink() const { return bShrink; } - long GetAscent() const { return nAscentPixel; } - BOOL IsRotated() const { return bRotated; } + long GetAscent() const { return nAscentPixel; } + BOOL IsRotated() const { return bRotated; } void SetShrinkScale( long nScale, BYTE nScript ); - BOOL HasCondHeight() const { return pCondSet && SFX_ITEM_SET == + BOOL HasCondHeight() const { return pCondSet && SFX_ITEM_SET == pCondSet->GetItemState( ATTR_FONT_HEIGHT, TRUE ); } BOOL HasEditCharacters() const; @@ -187,31 +187,31 @@ private: //================================================================== ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, BOOL bPTL) : - pOutput ( pData ), - pPattern ( NULL ), - pCondSet ( NULL ), - eAttrOrient ( SVX_ORIENTATION_STANDARD ), + pOutput ( pData ), + pPattern ( NULL ), + pCondSet ( NULL ), + eAttrOrient ( SVX_ORIENTATION_STANDARD ), eAttrHorJust( SVX_HOR_JUSTIFY_STANDARD ), eAttrVerJust( SVX_VER_JUSTIFY_BOTTOM ), eAttrHorJustMethod( SVX_JUSTIFY_METHOD_AUTO ), eAttrVerJustMethod( SVX_JUSTIFY_METHOD_AUTO ), - pMargin ( NULL ), - nIndent ( 0 ), - bRotated ( FALSE ), + pMargin ( NULL ), + nIndent ( 0 ), + bRotated ( FALSE ), nOriginalWidth( 0 ), nMaxDigitWidth( 0 ), nSignWidth( 0 ), nDotWidth( 0 ), nExpWidth( 0 ), - pLastCell ( NULL ), + pLastCell ( NULL ), nValueFormat( 0 ), - bLineBreak ( FALSE ), + bLineBreak ( FALSE ), bRepeat ( FALSE ), bShrink ( FALSE ), bPixelToLogic( bPTL ) { ScModule* pScMod = SC_MOD(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) bCellContrast = pOutput->bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); @@ -293,13 +293,13 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* pPattern = pNew; pCondSet = pSet; - // pPattern auswerten + // pPattern auswerten OutputDevice* pDev = pOutput->pDev; OutputDevice* pRefDevice = pOutput->pRefDevice; OutputDevice* pFmtDevice = pOutput->pFmtDevice; - // Font + // Font ScAutoFontColorMode eColorMode; if ( pOutput->bUseStyleColor ) @@ -320,11 +320,11 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* &aBackConfigColor, &aTextConfigColor ); aFont.SetAlign(ALIGN_BASELINE); - // Orientierung + // Orientierung eAttrOrient = pPattern->GetCellOrientation( pCondSet ); - // alignment + // alignment eAttrHorJust = (SvxCellHorJustify)((const SvxHorJustifyItem&)pPattern->GetItem( ATTR_HOR_JUSTIFY, pCondSet )).GetValue(); @@ -337,7 +337,7 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* eAttrHorJustMethod = lcl_GetValue<SvxJustifyMethodItem, SvxCellJustifyMethod>(*pPattern, ATTR_HOR_JUSTIFY_METHOD, pCondSet); eAttrVerJustMethod = lcl_GetValue<SvxJustifyMethodItem, SvxCellJustifyMethod>(*pPattern, ATTR_VER_JUSTIFY_METHOD, pCondSet); - // line break + // line break bLineBreak = ((const SfxBoolItem&)pPattern->GetItem( ATTR_LINEBREAK, pCondSet )).GetValue(); @@ -382,7 +382,7 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* } aFont.SetOrientation( nRot ); - // Syntax-Modus + // Syntax-Modus if (pOutput->bSyntaxMode) pOutput->SetSyntaxColor( &aFont, pCell ); @@ -394,8 +394,8 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* aMetric = pFmtDevice->GetFontMetric(); // - // Wenn auf dem Drucker das Leading 0 ist, gibt es Probleme - // -> Metric vom Bildschirm nehmen (wie EditEngine!) + // Wenn auf dem Drucker das Leading 0 ist, gibt es Probleme + // -> Metric vom Bildschirm nehmen (wie EditEngine!) // if ( pFmtDevice->GetOutDevType() == OUTDEV_PRINTER && aMetric.GetIntLeading() == 0 ) @@ -417,16 +417,16 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* Color aOLineColor( ((const SvxOverlineItem&)pPattern->GetItem( ATTR_FONT_OVERLINE, pCondSet )).GetColor() ); pDev->SetOverlineColor( aOLineColor ); - // Zahlenformat + // Zahlenformat // ULONG nOld = nValueFormat; nValueFormat = pPattern->GetNumberFormat( pOutput->pDoc->GetFormatTable(), pCondSet ); -/* s.u. +/* s.u. if (nValueFormat != nOld) - pLastCell = NULL; // immer neu formatieren + pLastCell = NULL; // immer neu formatieren */ - // Raender + // Raender pMargin = (const SvxMarginItem*)&pPattern->GetItem( ATTR_MARGIN, pCondSet ); if ( eAttrHorJust == SVX_HOR_JUSTIFY_LEFT ) @@ -438,8 +438,8 @@ void ScDrawStringsVars::SetPattern( const ScPatternAttr* pNew, const SfxItemSet* bShrink = static_cast<const SfxBoolItem&>(pPattern->GetItem( ATTR_SHRINKTOFIT, pCondSet )).GetValue(); - // zumindest die Text-Groesse muss neu geholt werden - //! unterscheiden, und den Text nicht neu vom Numberformatter holen? + // zumindest die Text-Groesse muss neu geholt werden + //! unterscheiden, und den Text nicht neu vom Numberformatter holen? pLastCell = NULL; } @@ -450,15 +450,15 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt nSignWidth = 0; nDotWidth = 0; nExpWidth = 0; - // wird gerufen, wenn sich die Font-Variablen nicht aendern (!StringDiffer) + // wird gerufen, wenn sich die Font-Variablen nicht aendern (!StringDiffer) pPattern = pNew; - pCondSet = pSet; //! noetig ??? + pCondSet = pSet; //! noetig ??? - // Zahlenformat + // Zahlenformat ULONG nOld = nValueFormat; -// nValueFormat = pPattern->GetNumberFormat( pFormatter ); +// nValueFormat = pPattern->GetNumberFormat( pFormatter ); const SfxPoolItem* pFormItem; if ( !pCondSet || pCondSet->GetItemState(ATTR_VALUE_FORMAT,TRUE,&pFormItem) != SFX_ITEM_SET ) pFormItem = &pPattern->GetItem(ATTR_VALUE_FORMAT); @@ -470,9 +470,9 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt ((SvxLanguageItem*)pLangItem)->GetLanguage() ); if (nValueFormat != nOld) - pLastCell = NULL; // immer neu formatieren + pLastCell = NULL; // immer neu formatieren - // Raender + // Raender pMargin = (const SvxMarginItem*)&pPattern->GetItem( ATTR_MARGIN, pCondSet ); @@ -486,7 +486,7 @@ void ScDrawStringsVars::SetPatternSimple( const ScPatternAttr* pNew, const SfxIt bShrink = static_cast<const SfxBoolItem&>(pPattern->GetItem( ATTR_SHRINKTOFIT, pCondSet )).GetValue(); } -inline BOOL SameValue( ScBaseCell* pCell, ScBaseCell* pOldCell ) // pCell ist != 0 +inline BOOL SameValue( ScBaseCell* pCell, ScBaseCell* pOldCell ) // pCell ist != 0 { return pOldCell && pOldCell->GetCellType() == CELLTYPE_VALUE && pCell->GetCellType() == CELLTYPE_VALUE && @@ -501,7 +501,7 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell ) { if ( !SameValue( pCell, pLastCell ) ) { - pLastCell = pCell; // Zelle merken + pLastCell = pCell; // Zelle merken Color* pColor; ULONG nFormat = GetValueFormat(); @@ -519,14 +519,14 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell ) { OutputDevice* pDev = pOutput->pDev; aFont.SetColor(*pColor); - pDev->SetFont( aFont ); // nur fuer Ausgabe + pDev->SetFont( aFont ); // nur fuer Ausgabe bChanged = TRUE; - pLastCell = NULL; // naechstes Mal wieder hierherkommen + pLastCell = NULL; // naechstes Mal wieder hierherkommen } TextChanged(); } - // sonst String/Groesse behalten + // sonst String/Groesse behalten } else { @@ -579,7 +579,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth ) return; } - double fVal = (eType == CELLTYPE_VALUE) ? + double fVal = (eType == CELLTYPE_VALUE) ? static_cast<ScValueCell*>(pCell)->GetValue() : static_cast<ScFormulaCell*>(pCell)->GetValue(); const SvNumberformat* pNumFormat = pOutput->pDoc->GetFormatTable()->GetEntry(nFormat); @@ -622,7 +622,7 @@ void ScDrawStringsVars::SetTextToWidthOrHash( ScBaseCell* pCell, long nWidth ) if (nDecimalCount || nSignCount || nExpCount) { // Re-calculate. - nNumDigits = static_cast<sal_uInt16>(nWidth / nMaxDigit); + nNumDigits = static_cast<sal_uInt16>(nWidth / nMaxDigit); if (!pNumFormat->GetOutputString(fVal, nNumDigits, aString)) // Failed to get output string. Bail out. return; @@ -667,7 +667,7 @@ void ScDrawStringsVars::SetAutoText( const String& rAutoText ) if ( bPixelToLogic ) aTextSize = pRefDevice->LogicToPixel( aTextSize ); - pLastCell = NULL; // derselbe Text kann in der naechsten Zelle wieder passen + pLastCell = NULL; // derselbe Text kann in der naechsten Zelle wieder passen } long ScDrawStringsVars::GetMaxDigitWidth() @@ -678,7 +678,7 @@ long ScDrawStringsVars::GetMaxDigitWidth() sal_Char cZero = '0'; for (sal_Char i = 0; i < 10; ++i) { - sal_Char cDigit = cZero + i; + sal_Char cDigit = cZero + i; long n = pOutput->pFmtDevice->GetTextWidth(String(cDigit)); nMaxDigitWidth = ::std::max(nMaxDigitWidth, n); } @@ -754,10 +754,10 @@ double ScOutputData::GetStretch() { if ( pRefDevice->IsMapMode() ) { - // #95920# If a non-trivial MapMode is set, its scale is now already - // taken into account in the OutputDevice's font handling - // (OutputDevice::ImplNewFont, see #95414#). - // The old handling below is only needed for pixel output. + // #95920# If a non-trivial MapMode is set, its scale is now already + // taken into account in the OutputDevice's font handling + // (OutputDevice::ImplNewFont, see #95414#). + // The old handling below is only needed for pixel output. return 1.0; } @@ -779,7 +779,7 @@ double ScOutputData::GetStretch() //================================================================== // -// output strings +// output strings // void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, ScBaseCell* pCell ) @@ -879,7 +879,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, bDoMerge = bIsTop; // weiter solange versteckt -/* if (!bDoMerge) +/* if (!bDoMerge) return FALSE; */ @@ -889,7 +889,7 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, BOOL bVOver = pInfo->bVOverlapped; BOOL bHidden; - while (bHOver) // nY konstant + while (bHOver) // nY konstant { --rOverX; bHidden = pDoc->ColHidden(rOverX, nTab); @@ -898,14 +898,14 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, if (rOverX >= nX1 && !bHidden) { -// rVirtPosX -= pRowInfo[0].pCellInfo[rOverX+1].nWidth; +// rVirtPosX -= pRowInfo[0].pCellInfo[rOverX+1].nWidth; bHOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bHOverlapped; bVOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bVOverlapped; } else { -// if (!bClipVirt) -// rVirtPosX -= (long) (pDoc->GetColWidth( rOverX, nTab ) * nPPTX); +// if (!bClipVirt) +// rVirtPosX -= (long) (pDoc->GetColWidth( rOverX, nTab ) * nPPTX); USHORT nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr( rOverX, rOverY, nTab, ATTR_MERGE_FLAG ))->GetValue(); bHOver = ((nOverlap & SC_MF_HOR) != 0); @@ -921,21 +921,21 @@ BOOL ScOutputData::GetMergeOrigin( SCCOL nX, SCROW nY, SCSIZE nArrY, return FALSE; if (nArrY>0) - --nArrY; // lokale Kopie ! + --nArrY; // lokale Kopie ! if (rOverX >= nX1 && rOverY >= nY1 && !pDoc->ColHidden(rOverX, nTab) && !pDoc->RowHidden(rOverY, nTab) && pRowInfo[nArrY].nRowNo == rOverY) { -// rVirtPosY -= pRowInfo[nArrY].nHeight; +// rVirtPosY -= pRowInfo[nArrY].nHeight; bHOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bHOverlapped; bVOver = pRowInfo[nArrY].pCellInfo[rOverX+1].bVOverlapped; } else { -// if (!bClipVirt) -// rVirtPosY -= (long) (pDoc->GetRowHeight( rOverY, nTab ) * nPPTY); +// if (!bClipVirt) +// rVirtPosY -= (long) (pDoc->GetRowHeight( rOverY, nTab ) * nPPTY); USHORT nOverlap = ((ScMergeFlagAttr*)pDoc->GetAttr( rOverX, rOverY, nTab, ATTR_MERGE_FLAG ))->GetValue(); bHOver = ((nOverlap & SC_MF_HOR) != 0); @@ -1015,7 +1015,7 @@ inline BOOL StringDiffer( const ScPatternAttr*& rpOldPattern, const ScPatternAtt else if ( &rpNewPattern->GetItem( ATTR_FONT_RELIEF ) != &rpOldPattern->GetItem( ATTR_FONT_RELIEF ) ) return TRUE; else if ( &rpNewPattern->GetItem( ATTR_BACKGROUND ) != &rpOldPattern->GetItem( ATTR_BACKGROUND ) ) - return TRUE; // needed with automatic text color + return TRUE; // needed with automatic text color else { rpOldPattern = rpNewPattern; @@ -1059,8 +1059,8 @@ BOOL ScOutputData::IsEmptyCellText( RowInfo* pThisRowInfo, SCCOL nX, SCROW nY ) if ( !bEmpty && ( nX < nX1 || nX > nX2 || !pThisRowInfo ) ) { - // for the range nX1..nX2 in RowInfo, cell protection attribute is already evaluated - // into bEmptyCellText in ScDocument::FillInfo / lcl_HidePrint (printfun) + // for the range nX1..nX2 in RowInfo, cell protection attribute is already evaluated + // into bEmptyCellText in ScDocument::FillInfo / lcl_HidePrint (printfun) BOOL bIsPrint = ( eType == OUTTYPE_PRINTER ); @@ -1095,9 +1095,9 @@ void ScOutputData::GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTabP, ScBaseCe BOOL ScOutputData::IsAvailable( SCCOL nX, SCROW nY ) { - // apply the same logic here as in DrawStrings/DrawEdit: - // Stop at non-empty or merged or overlapped cell, - // where a note is empty as well as a cell that's hidden by protection settings + // apply the same logic here as in DrawStrings/DrawEdit: + // Stop at non-empty or merged or overlapped cell, + // where a note is empty as well as a cell that's hidden by protection settings const ScBaseCell* pCell = pDoc->GetCell( ScAddress( nX, nY, nTab ) ); if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE && !IsEmptyCellText( NULL, nX, nY ) ) @@ -1115,15 +1115,15 @@ BOOL ScOutputData::IsAvailable( SCCOL nX, SCROW nY ) return TRUE; } -// nX, nArrY: loop variables from DrawStrings / DrawEdit -// nPosX, nPosY: corresponding positions for nX, nArrY -// nCellX, nCellY: position of the cell that contains the text -// nNeeded: Text width, including margin -// rPattern: cell format at nCellX, nCellY -// nHorJustify: horizontal alignment (visual) to determine which cells to use for long strings -// bCellIsValue: if set, don't extend into empty cells -// bBreak: if set, don't extend, and don't set clip marks (but rLeftClip/rRightClip is set) -// bOverwrite: if set, also extend into non-empty cells (for rotated text) +// nX, nArrY: loop variables from DrawStrings / DrawEdit +// nPosX, nPosY: corresponding positions for nX, nArrY +// nCellX, nCellY: position of the cell that contains the text +// nNeeded: Text width, including margin +// rPattern: cell format at nCellX, nCellY +// nHorJustify: horizontal alignment (visual) to determine which cells to use for long strings +// bCellIsValue: if set, don't extend into empty cells +// bBreak: if set, don't extend, and don't set clip marks (but rLeftClip/rRightClip is set) +// bOverwrite: if set, also extend into non-empty cells (for rotated text) // rParam output: various area parameters. void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY, @@ -1352,7 +1352,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) BOOL bWasIdleDisabled = pDoc->IsIdleDisabled(); pDoc->DisableIdle( TRUE ); - Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird ausgegeben + Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird ausgegeben // UINT32 nMinHeight = aMinSize.Height() / 200; // 1/2 Pixel ScDrawStringsVars aVars( this, bPixelToLogic ); @@ -1361,7 +1361,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) long nInitPosX = nScrX; if ( bLayoutRTL ) - nInitPosX += nMirrorW - 1; // pixels + nInitPosX += nMirrorW - 1; // pixels long nLayoutSign = bLayoutRTL ? -1 : 1; SCCOL nLastContentCol = MAXCOL; @@ -1370,7 +1370,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) nLastContentCol - pDoc->GetEmptyLinesInBlock( nX2+1, nY1, nTab, MAXCOL, nY2, nTab, DIR_RIGHT ) ); SCCOL nLoopStartX = nX1; if ( nX1 > 0 ) - --nLoopStartX; // start before nX1 for rest of long text to the left + --nLoopStartX; // start before nX1 for rest of long text to the left // variables for GetOutputArea OutputAreaParam aAreaParam; @@ -1383,7 +1383,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) const SfxItemSet* pOldCondSet = NULL; BYTE nOldScript = 0; - // alternative pattern instances in case we need to modify the pattern + // alternative pattern instances in case we need to modify the pattern // before processing the cell value. ::boost::ptr_vector<ScPatternAttr> aAltPatterns; @@ -1404,13 +1404,13 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1]; BOOL bEmpty = nX < nX1 || pInfo->bEmptyCellText; - SCCOL nCellX = nX; // position where the cell really starts + SCCOL nCellX = nX; // position where the cell really starts SCROW nCellY = nY; BOOL bDoCell = FALSE; BOOL bNeedEdit = FALSE; // - // Part of a merged cell? + // Part of a merged cell? // BOOL bOverlapped = ( pInfo->bHOverlapped || pInfo->bVOverlapped ); @@ -1418,7 +1418,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) { bEmpty = TRUE; - SCCOL nOverX; // start of the merged cells + SCCOL nOverX; // start of the merged cells SCROW nOverY; BOOL bVisChanged = !pRowInfo[nArrY-1].bChanged; if (GetMergeOrigin( nX,nY, nArrY, nOverX,nOverY, bVisChanged )) @@ -1432,7 +1432,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } // - // Rest of a long text further to the left? + // Rest of a long text further to the left? // if ( bEmpty && !bMergeEmpty && nX < nX1 && !bOverlapped ) @@ -1451,12 +1451,12 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } // - // Rest of a long text further to the right? + // Rest of a long text further to the right? // if ( bEmpty && !bMergeEmpty && nX == nX2 && !bOverlapped ) { - // don't have to look further than nLastContentCol + // don't have to look further than nLastContentCol SCCOL nTempX=nX; while (nTempX < nLastContentCol && IsEmptyCellText( pThisRowInfo, nTempX, nY )) @@ -1472,21 +1472,21 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } // - // normal visible cell + // normal visible cell // if (!bEmpty) bDoCell = TRUE; // - // don't output the cell that's being edited + // don't output the cell that's being edited // if ( bDoCell && bEditMode && nCellX == nEditCol && nCellY == nEditRow ) bDoCell = FALSE; // - // output the cell text + // output the cell text // ScBaseCell* pCell = NULL; @@ -1495,7 +1495,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) if ( nCellY == nY && nCellX == nX && nCellX >= nX1 && nCellX <= nX2 ) pCell = pThisRowInfo->pCellInfo[nCellX+1].pCell; else - GetVisibleCell( nCellX, nCellY, nTab, pCell ); // get from document + GetVisibleCell( nCellX, nCellY, nTab, pCell ); // get from document if ( !pCell ) bDoCell = FALSE; else if ( pCell->GetCellType() == CELLTYPE_EDIT ) @@ -1517,13 +1517,13 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) pCondSet = pDoc->GetCondResult( nCellX, nCellY, nTab ); } } - else // get from document + else // get from document { pPattern = pDoc->GetPattern( nCellX, nCellY, nTab ); pCondSet = pDoc->GetCondResult( nCellX, nCellY, nTab ); } - if (pCell->HasValueData() && + if (pCell->HasValueData() && static_cast<const SfxBoolItem&>( pPattern->GetItem(ATTR_LINEBREAK, pCondSet)).GetValue()) { @@ -1550,7 +1550,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) nOldScript = nScript; } - // use edit engine for rotated, stacked or mixed-script text + // use edit engine for rotated, stacked or mixed-script text if ( aVars.GetOrient() == SVX_ORIENTATION_STACKED || aVars.IsRotated() || IsAmbiguousScript(nScript) ) bNeedEdit = TRUE; @@ -1563,7 +1563,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) if ( aVars.SetText(pCell) ) pOldPattern = NULL; bNeedEdit = aVars.HasEditCharacters() || - (bFormulaCell && ((ScFormulaCell*)pCell)->IsMultilineResult()); + (bFormulaCell && ((ScFormulaCell*)pCell)->IsMultilineResult()); } long nTotalMargin = 0; if (bDoCell && !bNeedEdit) @@ -1581,14 +1581,14 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) ( bCellIsValue ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT ); if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust == SVX_HOR_JUSTIFY_REPEAT ) - eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet implemented + eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet implemented BOOL bBreak = ( aVars.GetLineBreak() || aVars.GetHorJust() == SVX_HOR_JUSTIFY_BLOCK ); BOOL bRepeat = aVars.IsRepeat() && !bBreak; BOOL bShrink = aVars.IsShrink() && !bBreak && !bRepeat; - nTotalMargin = - static_cast<long>(aVars.GetLeftTotal() * nPPTX) + + nTotalMargin = + static_cast<long>(aVars.GetLeftTotal() * nPPTX) + static_cast<long>(aVars.GetMargin()->GetRightMargin() * nPPTX); nNeededWidth = aVars.GetTextSize().Width() + nTotalMargin; @@ -1662,7 +1662,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } } - // use edit engine if automatic line breaks are needed + // use edit engine if automatic line breaks are needed if ( bBreak ) { if ( aVars.GetOrient() == SVX_ORIENTATION_STANDARD ) @@ -1684,13 +1684,13 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } if (bNeedEdit) { - // mark the cell in CellInfo to be drawn in DrawEdit: - // Cells to the left are marked directly, cells to the - // right are handled by the flag for nX2 + // mark the cell in CellInfo to be drawn in DrawEdit: + // Cells to the left are marked directly, cells to the + // right are handled by the flag for nX2 SCCOL nMarkX = ( nCellX <= nX2 ) ? nCellX : nX2; RowInfo* pMarkRowInfo = ( nCellY == nY ) ? pThisRowInfo : &pRowInfo[0]; pMarkRowInfo->pCellInfo[nMarkX+1].bEditEngine = TRUE; - bDoCell = FALSE; // don't draw here + bDoCell = FALSE; // don't draw here } if ( bDoCell ) { @@ -1704,12 +1704,12 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) if ( nNeededWidth <= aAreaParam.maClipRect.GetWidth() ) aAreaParam.mbLeftClip = aAreaParam.mbRightClip = FALSE; - // If the "###" replacement doesn't fit into the cells, no clip marks - // are shown, as the "###" already denotes too little space. - // The rectangles from the first GetOutputArea call remain valid. + // If the "###" replacement doesn't fit into the cells, no clip marks + // are shown, as the "###" already denotes too little space. + // The rectangles from the first GetOutputArea call remain valid. } - long nJustPosX = aAreaParam.maAlignRect.Left(); // "justified" - effect of alignment will be added + long nJustPosX = aAreaParam.maAlignRect.Left(); // "justified" - effect of alignment will be added long nJustPosY = aAreaParam.maAlignRect.Top(); long nAvailWidth = aAreaParam.maAlignRect.GetWidth(); long nOutHeight = aAreaParam.maAlignRect.GetHeight(); @@ -1722,7 +1722,7 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } if ( aAreaParam.maClipRect.Right() > nScrX + nScrW ) { - aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one? + aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one? aAreaParam.mbRightClip = TRUE; } @@ -1741,10 +1741,10 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) } // - // horizontalen Platz testen + // horizontalen Platz testen // - BOOL bRightAdjusted = FALSE; // to correct text width calculation later + BOOL bRightAdjusted = FALSE; // to correct text width calculation later BOOL bNeedEditEngine = FALSE; if ( !bNeedEditEngine && !bOutside ) { @@ -1804,8 +1804,8 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) if ( nTestClipHeight > nOutHeight ) { - // kein vertikales Clipping beim Drucken von Zellen mit - // optimaler Hoehe, ausser bei Groesse in bedingter Formatierung + // kein vertikales Clipping beim Drucken von Zellen mit + // optimaler Hoehe, ausser bei Groesse in bedingter Formatierung if ( eType != OUTTYPE_PRINTER || ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) || ( aVars.HasCondHeight() ) ) @@ -1814,9 +1814,9 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) if ( bHClip || bVClip ) { - // nur die betroffene Dimension clippen, - // damit bei nicht-proportionalem Resize nicht alle - // rechtsbuendigen Zahlen abgeschnitten werden: + // nur die betroffene Dimension clippen, + // damit bei nicht-proportionalem Resize nicht alle + // rechtsbuendigen Zahlen abgeschnitten werden: if (!bHClip) { @@ -1829,8 +1829,8 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) aAreaParam.maClipRect.Bottom() = nScrY+nScrH; } - // aClipRect is not used after SetClipRegion/IntersectClipRegion, - // so it can be modified here + // aClipRect is not used after SetClipRegion/IntersectClipRegion, + // so it can be modified here if (bPixelToLogic) aAreaParam.maClipRect = pRefDevice->PixelToLogic( aAreaParam.maClipRect ); @@ -1869,19 +1869,19 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) Point aDrawTextPos( nJustPosX, nJustPosY ); if ( bPixelToLogic ) { - // undo text width adjustment in pixels + // undo text width adjustment in pixels if (bRightAdjusted) aDrawTextPos.X() += aVars.GetTextSize().Width(); aDrawTextPos = pRefDevice->PixelToLogic( aDrawTextPos ); - // redo text width adjustment in logic units + // redo text width adjustment in logic units if (bRightAdjusted) aDrawTextPos.X() -= aVars.GetOriginalWidth(); } - // in Metafiles immer DrawTextArray, damit die Positionen mit - // aufgezeichnet werden (fuer nicht-proportionales Resize): + // in Metafiles immer DrawTextArray, damit die Positionen mit + // aufgezeichnet werden (fuer nicht-proportionales Resize): String aString = aVars.GetString(); if (bMetaFile || pFmtDevice != pDev || aZoomX != aZoomY) @@ -1932,14 +1932,14 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) pDoc->DisableIdle( bWasIdleDisabled ); } -// ------------------------------------------------------------------------------- +// ------------------------------------------------------------------------------- -void lcl_ClearEdit( EditEngine& rEngine ) // Text und Attribute +void lcl_ClearEdit( EditEngine& rEngine ) // Text und Attribute { rEngine.SetUpdateMode( FALSE ); rEngine.SetText(EMPTY_STRING); - // keine Para-Attribute uebrigbehalten... + // keine Para-Attribute uebrigbehalten... const SfxItemSet& rPara = rEngine.GetParaAttribs(0); if (rPara.Count()) rEngine.SetParaAttribs( 0, @@ -2026,7 +2026,7 @@ long lcl_GetEditSize( EditEngine& rEngine, BOOL bWidth, BOOL bSwap, long nAttrRo // assuming standard mode, otherwise width isn't used - double nRealOrient = nAttrRotate * F_PI18000; // 1/100th degrees + double nRealOrient = nAttrRotate * F_PI18000; // 1/100th degrees double nAbsCos = fabs( cos( nRealOrient ) ); double nAbsSin = fabs( sin( nRealOrient ) ); if ( bWidth ) @@ -2283,9 +2283,9 @@ void EditAlignmentParam::setAlignmentItems(ScFieldEditEngine* pEngine, ScBaseCel } else { - // horizontal alignment now may depend on cell content - // (for values with number formats with mixed script types) - // -> always set adjustment + // horizontal alignment now may depend on cell content + // (for values with number formats with mixed script types) + // -> always set adjustment SvxAdjust eSvxAdjust = SVX_ADJUST_LEFT; if (meOrient == SVX_ORIENTATION_STACKED) @@ -2299,7 +2299,7 @@ void EditAlignmentParam::setAlignmentItems(ScFieldEditEngine* pEngine, ScBaseCel eSvxAdjust = mbCellIsValue ? SVX_ADJUST_RIGHT : SVX_ADJUST_LEFT; break; case SVX_HOR_JUSTIFY_LEFT: - case SVX_HOR_JUSTIFY_REPEAT: // nicht implementiert + case SVX_HOR_JUSTIFY_REPEAT: // nicht implementiert eSvxAdjust = SVX_ADJUST_LEFT; break; case SVX_HOR_JUSTIFY_RIGHT: @@ -2381,19 +2381,19 @@ bool EditAlignmentParam::adjustHorAlignment(ScFieldEditEngine* pEngine) void ScOutputData::DrawEdit(BOOL bPixelToLogic) { vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() ); - Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird ausgegeben + Size aMinSize = pRefDevice->PixelToLogic(Size(0,100)); // erst darueber wird ausgegeben // UINT32 nMinHeight = aMinSize.Height() / 200; // 1/2 Pixel ScModule* pScMod = SC_MOD(); sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); ScFieldEditEngine* pEngine = NULL; BOOL bHyphenatorSet = FALSE; const ScPatternAttr* pOldPattern = NULL; - const SfxItemSet* pOldCondSet = NULL; + const SfxItemSet* pOldCondSet = NULL; ScBaseCell* pCell = NULL; Size aRefOne = pRefDevice->PixelToLogic(Size(1,1)); @@ -2405,32 +2405,32 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } long nLayoutSign = bLayoutRTL ? -1 : 1; - //! store nLastContentCol as member! + //! store nLastContentCol as member! SCCOL nLastContentCol = MAXCOL; if ( nX2 < MAXCOL ) nLastContentCol = sal::static_int_cast<SCCOL>( nLastContentCol - pDoc->GetEmptyLinesInBlock( nX2+1, nY1, nTab, MAXCOL, nY2, nTab, DIR_RIGHT ) ); long nRowPosY = nScrY; - for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von zusammengefassten + for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von zusammengefassten { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; // long nCellHeight = (long) pThisRowInfo->nHeight; - if (nArrY==1) nRowPosY = nScrY; // vorher wird einzeln berechnet + if (nArrY==1) nRowPosY = nScrY; // vorher wird einzeln berechnet if ( pThisRowInfo->bChanged || nArrY==0 ) { long nPosX = 0; - for (SCCOL nX=0; nX<=nX2; nX++) // wegen Ueberhaengen + for (SCCOL nX=0; nX<=nX2; nX++) // wegen Ueberhaengen { - if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually + if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually - CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1]; + CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1]; if (pInfo->bEditEngine) { SCROW nY = pThisRowInfo->nRowNo; - SCCOL nCellX = nX; // position where the cell really starts + SCCOL nCellX = nX; // position where the cell really starts SCROW nCellY = nY; BOOL bDoCell = FALSE; @@ -2439,7 +2439,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) { nPosY = nScrY; nY = pRowInfo[1].nRowNo; - SCCOL nOverX; // start of the merged cells + SCCOL nOverX; // start of the merged cells SCROW nOverY; if (GetMergeOrigin( nX,nY, 1, nOverX,nOverY, TRUE )) { @@ -2450,7 +2450,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } else if ( nX == nX2 && !pThisRowInfo->pCellInfo[nX+1].pCell ) { - // Rest of a long text further to the right? + // Rest of a long text further to the right? SCCOL nTempX=nX; while (nTempX < nLastContentCol && IsEmptyCellText( pThisRowInfo, nTempX, nY )) @@ -2484,7 +2484,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) pCondSet = rCellInfo.pConditionSet; pCell = rCellInfo.pCell; } - else // get from document + else // get from document { pPattern = pDoc->GetPattern( nCellX, nCellY, nTab ); pCondSet = pDoc->GetCondResult( nCellX, nCellY, nTab ); @@ -2498,16 +2498,16 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) BOOL bHidden = FALSE; // - // Create EditEngine + // Create EditEngine // if (!pEngine) { - // Ein RefDevice muss auf jeden Fall gesetzt werden, - // sonst legt sich die EditEngine ein VirtualDevice an! + // Ein RefDevice muss auf jeden Fall gesetzt werden, + // sonst legt sich die EditEngine ein VirtualDevice an! pEngine = new ScFieldEditEngine( pDoc->GetEnginePool() ); pEngine->SetUpdateMode( FALSE ); - pEngine->SetRefDevice( pFmtDevice ); // always set + pEngine->SetRefDevice( pFmtDevice ); // always set ULONG nCtrl = pEngine->GetControlWord(); if ( bShowSpellErrors ) nCtrl |= EE_CNTRL_ONLINESPELLING; @@ -2522,7 +2522,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) (EEHorizontalTextDirection)pDoc->GetEditTextDirection( nTab ) ); } else - lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(FALSE) + lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(FALSE) EditAlignmentParam aAlignParam(pPattern, pCondSet, lcl_SafeIsValue(pCell)); @@ -2543,9 +2543,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } if ( aAlignParam.meOrient==SVX_ORIENTATION_STANDARD && nAttrRotate ) { - //! Flag setzen, um die Zelle in DrawRotated wiederzufinden ? - //! (oder Flag schon bei DrawBackground, dann hier keine Abfrage) - bHidden = TRUE; // gedreht wird getrennt ausgegeben + //! Flag setzen, um die Zelle in DrawRotated wiederzufinden ? + //! (oder Flag schon bei DrawBackground, dann hier keine Abfrage) + bHidden = TRUE; // gedreht wird getrennt ausgegeben } aAlignParam.mbAsianVertical = (aAlignParam.meOrient == SVX_ORIENTATION_STACKED) && @@ -2565,12 +2565,12 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) ( aAlignParam.mbCellIsValue ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT ); if ( eOutHorJust == SVX_HOR_JUSTIFY_BLOCK || eOutHorJust == SVX_HOR_JUSTIFY_REPEAT ) - eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet implemented + eOutHorJust = SVX_HOR_JUSTIFY_LEFT; // repeat is not yet implemented if (!bHidden) { - //! mirror margin values for RTL? - //! move margin down to after final GetOutputArea call + //! mirror margin values for RTL? + //! move margin down to after final GetOutputArea call long nTopM, nLeftM, nBottomM, nRightM; aAlignParam.calcMargins(nTopM, nLeftM, nBottomM, nRightM, nPPTX, nPPTY); @@ -2590,15 +2590,15 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) OutputAreaParam aAreaParam; // - // Initial page size - large for normal text, cell size for automatic line breaks + // Initial page size - large for normal text, cell size for automatic line breaks // Size aPaperSize = Size( 1000000, 1000000 ); if (aAlignParam.hasLineBreak()) { - // call GetOutputArea with nNeeded=0, to get only the cell width + // call GetOutputArea with nNeeded=0, to get only the cell width - //! handle nArrY == 0 + //! handle nArrY == 0 GetOutputArea( nXForPos, nArrYForPos, nPosX, nPosY, nCellX, nCellY, 0, *pPattern, sal::static_int_cast<USHORT>(eOutHorJust), aAlignParam.mbCellIsValue, true, false, aAreaParam ); @@ -2625,7 +2625,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) pEngine->SetPaperSize(aPaperSize); // - // Fill the EditEngine (cell attributes and text) + // Fill the EditEngine (cell attributes and text) // // default alignment for asian vertical mode is top-right @@ -2652,7 +2652,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( !bHyphenatorSet && ((const SfxBoolItem&)pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { - // set hyphenator the first time it is needed + // set hyphenator the first time it is needed com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); pEngine->SetHyphenator( xXHyphenator ); bHyphenatorSet = TRUE; @@ -2667,7 +2667,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) aAlignParam.setAlignmentItems(pEngine, pCell); - // Read content from cell + // Read content from cell BOOL bWrapFields = FALSE; if (pCell) @@ -2683,13 +2683,13 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( aAlignParam.mbBreak && !aAlignParam.mbAsianVertical && pData->HasField() ) { - // Fields aren't wrapped, so clipping is enabled to prevent - // a field from being drawn beyond the cell size + // Fields aren't wrapped, so clipping is enabled to prevent + // a field from being drawn beyond the cell size bWrapFields = TRUE; } } - else + else { DBG_ERROR("pData == 0"); } @@ -2715,17 +2715,17 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( bSyntaxMode ) SetEditSyntaxColor( *pEngine, pCell ); else if ( bUseStyleColor && bForceAutoColor ) - lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine + lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine } else { DBG_ERROR("pCell == NULL"); } - pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight + pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight // - // Get final output area using the calculated width + // Get final output area using the calculated width // long nEngineWidth, nEngineHeight; @@ -2802,7 +2802,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) nNeededPixel = nEngineWidth; nNeededPixel += nLeftM + nRightM; - // No clip marks if "###" doesn't fit (same as in DrawStrings) + // No clip marks if "###" doesn't fit (same as in DrawStrings) } if ( eOutHorJust != SVX_HOR_JUSTIFY_LEFT && aAlignParam.meOrient == SVX_ORIENTATION_STANDARD ) @@ -2823,9 +2823,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( aAlignParam.mbBreak || aAlignParam.meOrient != SVX_ORIENTATION_STANDARD || aAlignParam.mbAsianVertical ) { - // text with automatic breaks is aligned only within the - // edit engine's paper size, the output of the whole area - // is always left-aligned + // text with automatic breaks is aligned only within the + // edit engine's paper size, the output of the whole area + // is always left-aligned nStartX += nLeftM; if (aAlignParam.meOrient == SVX_ORIENTATION_TOPBOTTOM && aAlignParam.meHorJust == SVX_HOR_JUSTIFY_BLOCK) @@ -2849,7 +2849,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } if ( aAreaParam.maClipRect.Right() > nScrX + nScrW ) { - aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one? + aAreaParam.maClipRect.Right() = nScrX + nScrW; //! minus one? aAreaParam.mbRightClip = true; } @@ -2860,7 +2860,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( bWrapFields ) { - // Fields in a cell with automatic breaks: clip to cell width + // Fields in a cell with automatic breaks: clip to cell width bClip = TRUE; } @@ -2875,7 +2875,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) bClip = TRUE; } - Size aCellSize; // output area, excluding margins, in logical units + Size aCellSize; // output area, excluding margins, in logical units if (bPixelToLogic) aCellSize = pRefDevice->PixelToLogic( Size( nOutWidth, nOutHeight ) ); else @@ -2887,9 +2887,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) (ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); BOOL bMerged = pMerge->GetColMerge() > 1 || pMerge->GetRowMerge() > 1; - // Don't clip for text height when printing rows with optimal height, - // except when font size is from conditional formatting. - //! Allow clipping when vertically merged? + // Don't clip for text height when printing rows with optimal height, + // except when font size is from conditional formatting. + //! Allow clipping when vertically merged? if ( eType != OUTTYPE_PRINTER || ( pDoc->GetRowFlags( nCellY, nTab ) & CR_MANUALSIZE ) || ( pCondSet && SFX_ITEM_SET == @@ -2898,12 +2898,12 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) else bSimClip = TRUE; - // Show clip marks if height is at least 5pt too small and - // there are several lines of text. - // Not for asian vertical text, because that would interfere - // with the default right position of the text. - // Only with automatic line breaks, to avoid having to find - // the cells with the horizontal end of the text again. + // Show clip marks if height is at least 5pt too small and + // there are several lines of text. + // Not for asian vertical text, because that would interfere + // with the default right position of the text. + // Only with automatic line breaks, to avoid having to find + // the cells with the horizontal end of the text again. if ( nEngineHeight - aCellSize.Height() > 100 && ( aAlignParam.mbBreak || aAlignParam.meOrient == SVX_ORIENTATION_STACKED ) && !aAlignParam.mbAsianVertical && bMarkClipped && @@ -2912,14 +2912,14 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) CellInfo* pClipMarkCell = NULL; if ( bMerged ) { - // anywhere in the merged area... + // anywhere in the merged area... SCCOL nClipX = ( nX < nX1 ) ? nX1 : nX; pClipMarkCell = &pRowInfo[(nArrY != 0) ? nArrY : 1].pCellInfo[nClipX+1]; } else pClipMarkCell = &pThisRowInfo->pCellInfo[nX+1]; - pClipMarkCell->nClipMark |= SC_CLIPMARK_RIGHT; //! also allow left? + pClipMarkCell->nClipMark |= SC_CLIPMARK_RIGHT; //! also allow left? bAnyClipped = TRUE; long nMarkPixel = (long)( SC_CLIPMARK_SIZE * nPPTX ); @@ -2938,7 +2938,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) else aLogicClip = aAreaParam.maClipRect; - if (bClip) // bei bSimClip nur aClipRect initialisieren + if (bClip) // bei bSimClip nur aClipRect initialisieren { if (bMetaFile) { @@ -2960,7 +2960,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) long nAvailWidth = aCellSize.Width(); // space for AutoFilter is already handled in GetOutputArea - // horizontal alignment + // horizontal alignment if (aAlignParam.meOrient==SVX_ORIENTATION_STANDARD && !aAlignParam.mbAsianVertical) { @@ -2998,7 +2998,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if (aAlignParam.meVerJust==SVX_VER_JUSTIFY_BOTTOM || aAlignParam.meVerJust==SVX_VER_JUSTIFY_STANDARD) { - //! if pRefDevice != pFmtDevice, keep heights in logic units, + //! if pRefDevice != pFmtDevice, keep heights in logic units, //! only converting margin? if (bPixelToLogic) @@ -3019,7 +3019,7 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) else aLogicStart.Y() += nTopM + (aCellSize.Height() - nEngineHeight) / 2; } - else // top + else // top { if (bPixelToLogic) aLogicStart.Y() += pRefDevice->PixelToLogic(Size(0,nTopM)).Height(); @@ -3095,9 +3095,9 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( pEngine->IsRightToLeft( 0 ) ) { - // For right-to-left, EditEngine always calculates its lines - // beginning from the right edge, but EditLine::nStartPosX is - // of USHORT type, so the PaperSize must be limited to USHRT_MAX. + // For right-to-left, EditEngine always calculates its lines + // beginning from the right edge, but EditLine::nStartPosX is + // of USHORT type, so the PaperSize must be limited to USHRT_MAX. Size aLogicPaper = pEngine->GetPaperSize(); if ( aLogicPaper.Width() > USHRT_MAX ) { @@ -3111,8 +3111,8 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) if ( bSimClip && !nOriVal && !aAlignParam.mbAsianVertical ) { - // kein hartes Clipping, aber nur die betroffenen - // Zeilen ausgeben + // kein hartes Clipping, aber nur die betroffenen + // Zeilen ausgeben Point aDocStart = aLogicClip.TopLeft(); aDocStart -= aLogicStart; @@ -3122,8 +3122,8 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) { if (aAlignParam.mbAsianVertical) { - // with SetVertical, the start position is top left of - // the whole output area, not the text itself + // with SetVertical, the start position is top left of + // the whole output area, not the text itself aLogicStart.X() -= pEngine->GetPaperSize().Width(); } pEngine->Draw( pDev, aLogicStart, nOriVal ); @@ -3173,14 +3173,14 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) delete pEngine; if (bAnyRotated) - DrawRotated(bPixelToLogic); //! von aussen rufen ? + DrawRotated(bPixelToLogic); //! von aussen rufen ? } -// ------------------------------------------------------------------------------- +// ------------------------------------------------------------------------------- void ScOutputData::DrawRotated(BOOL bPixelToLogic) { - //! nRotMax speichern + //! nRotMax speichern SCCOL nRotMax = nX2; for (SCSIZE nRotY=0; nRotY<nArrCount; nRotY++) if (pRowInfo[nRotY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nRotY].nRotMaxCol > nRotMax) @@ -3189,16 +3189,16 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) ScModule* pScMod = SC_MOD(); sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); ScFieldEditEngine* pEngine = NULL; BOOL bHyphenatorSet = FALSE; const ScPatternAttr* pPattern; - const SfxItemSet* pCondSet; + const SfxItemSet* pCondSet; const ScPatternAttr* pOldPattern = NULL; - const SfxItemSet* pOldCondSet = NULL; + const SfxItemSet* pOldCondSet = NULL; ScBaseCell* pCell = NULL; long nInitPosX = nScrX; @@ -3209,18 +3209,18 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) long nLayoutSign = bLayoutRTL ? -1 : 1; long nRowPosY = nScrY; - for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von zusammengefassten + for (SCSIZE nArrY=0; nArrY+1<nArrCount; nArrY++) // 0 fuer Reste von zusammengefassten { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; long nCellHeight = (long) pThisRowInfo->nHeight; - if (nArrY==1) nRowPosY = nScrY; // vorher wird einzeln berechnet + if (nArrY==1) nRowPosY = nScrY; // vorher wird einzeln berechnet if ( ( pThisRowInfo->bChanged || nArrY==0 ) && pThisRowInfo->nRotMaxCol != SC_ROTMAX_NONE ) { long nPosX = 0; for (SCCOL nX=0; nX<=nRotMax; nX++) { - if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually + if (nX==nX1) nPosX = nInitPosX; // positions before nX1 are calculated individually CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1]; if ( pInfo->nRotateDir != SC_ROTDIR_NONE ) @@ -3236,11 +3236,11 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) { if (!pEngine) { - // Ein RefDevice muss auf jeden Fall gesetzt werden, - // sonst legt sich die EditEngine ein VirtualDevice an! + // Ein RefDevice muss auf jeden Fall gesetzt werden, + // sonst legt sich die EditEngine ein VirtualDevice an! pEngine = new ScFieldEditEngine( pDoc->GetEnginePool() ); pEngine->SetUpdateMode( FALSE ); - pEngine->SetRefDevice( pFmtDevice ); // always set + pEngine->SetRefDevice( pFmtDevice ); // always set ULONG nCtrl = pEngine->GetControlWord(); if ( bShowSpellErrors ) nCtrl |= EE_CNTRL_ONLINESPELLING; @@ -3255,12 +3255,12 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) (EEHorizontalTextDirection)pDoc->GetEditTextDirection( nTab ) ); } else - lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(FALSE) + lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(FALSE) long nPosY = nRowPosY; BOOL bVisChanged = FALSE; - //! Rest von zusammengefasster Zelle weiter oben funktioniert nicht! + //! Rest von zusammengefasster Zelle weiter oben funktioniert nicht! BOOL bFromDoc = FALSE; pPattern = pInfo->pPatternAttr; @@ -3278,7 +3278,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) GetVisibleCell( nX, nY, nTab, pCell ); if ( !pCell || IsEmptyCellText( pThisRowInfo, nX, nY ) ) - bHidden = TRUE; // nRotateDir is also set without a cell + bHidden = TRUE; // nRotateDir is also set without a cell long nCellWidth = (long) pRowInfo[0].pCellInfo[nX+1].nWidth; @@ -3314,7 +3314,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) } long nCellStartX = nStartX; - // Ersatzdarstellung fuer zu kleinen Text weggelassen + // Ersatzdarstellung fuer zu kleinen Text weggelassen if (!bHidden) { @@ -3325,7 +3325,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) else nOutHeight = (long) ( pDoc->GetRowHeight(nY,nTab) * nPPTY ); - if ( bMerged ) // Zusammengefasst + if ( bMerged ) // Zusammengefasst { SCCOL nCountX = pMerge->GetColMerge(); for (SCCOL i=1; i<nCountX; i++) @@ -3365,7 +3365,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if ( !bHyphenatorSet && ((const SfxBoolItem&)pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { - // set hyphenator the first time it is needed + // set hyphenator the first time it is needed com::sun::star::uno::Reference<com::sun::star::linguistic2::XHyphenator> xXHyphenator( LinguMgr::GetHyphenator() ); pEngine->SetHyphenator( xXHyphenator ); bHyphenatorSet = TRUE; @@ -3378,9 +3378,9 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) pEngine->SetBackgroundColor( aBackCol ); } - // Raender + // Raender - //! Position und Papersize auf EditUtil umstellen !!! + //! Position und Papersize auf EditUtil umstellen !!! const SvxMarginItem* pMargin = (const SvxMarginItem*) &pPattern->GetItem(ATTR_MARGIN, pCondSet); @@ -3389,7 +3389,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) nIndent = ((const SfxUInt16Item&)pPattern-> GetItem(ATTR_INDENT, pCondSet)).GetValue(); - long nTotalHeight = nOutHeight; // ohne Rand abzuziehen + long nTotalHeight = nOutHeight; // ohne Rand abzuziehen if ( bPixelToLogic ) nTotalHeight = pRefDevice->PixelToLogic(Size(0,nTotalHeight)).Height(); @@ -3402,7 +3402,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) nOutWidth -= nLeftM + nRightM; nOutHeight -= nTopM + nBottomM; - // Rotation schon hier, um bei Umbruch auch PaperSize anzupassen + // Rotation schon hier, um bei Umbruch auch PaperSize anzupassen long nAttrRotate = 0; double nSin = 0.0; double nCos = 1.0; @@ -3417,12 +3417,12 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) pPattern->GetItem(ATTR_ROTATE_MODE, pCondSet)).GetValue(); if ( nAttrRotate == 18000 ) - eRotMode = SVX_ROTATE_MODE_STANDARD; // keinen Ueberlauf + eRotMode = SVX_ROTATE_MODE_STANDARD; // keinen Ueberlauf if ( bLayoutRTL ) nAttrRotate = -nAttrRotate; - double nRealOrient = nAttrRotate * F_PI18000; // 1/100 Grad + double nRealOrient = nAttrRotate * F_PI18000; // 1/100 Grad nCos = cos( nRealOrient ); nSin = sin( nRealOrient ); } @@ -3430,15 +3430,15 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) Size aPaperSize = Size( 1000000, 1000000 ); if (eOrient==SVX_ORIENTATION_STACKED) - aPaperSize.Width() = nOutWidth; // zum Zentrieren + aPaperSize.Width() = nOutWidth; // zum Zentrieren else if (bBreak) { if (nAttrRotate) { - //! richtige PaperSize fuer Umbruch haengt von der Zeilenzahl - //! ab, solange die Zeilen nicht einzeln versetzt ausgegeben - //! werden koennen -> darum unbegrenzt, also kein Umbruch. - //! Mit versetzten Zeilen waere das folgende richtig: + //! richtige PaperSize fuer Umbruch haengt von der Zeilenzahl + //! ab, solange die Zeilen nicht einzeln versetzt ausgegeben + //! werden koennen -> darum unbegrenzt, also kein Umbruch. + //! Mit versetzten Zeilen waere das folgende richtig: aPaperSize.Width() = (long)(nOutHeight / fabs(nSin)); } else if (eOrient == SVX_ORIENTATION_STANDARD) @@ -3449,9 +3449,9 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if (bPixelToLogic) pEngine->SetPaperSize(pRefDevice->PixelToLogic(aPaperSize)); else - pEngine->SetPaperSize(aPaperSize); // Scale ist immer 1 + pEngine->SetPaperSize(aPaperSize); // Scale ist immer 1 - // Daten aus Zelle lesen + // Daten aus Zelle lesen if (pCell) { @@ -3488,14 +3488,14 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if ( bSyntaxMode ) SetEditSyntaxColor( *pEngine, pCell ); else if ( bUseStyleColor && bForceAutoColor ) - lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine + lcl_SetEditColor( *pEngine, COL_AUTO ); //! or have a flag at EditEngine } else { DBG_ERROR("pCell == NULL"); } - pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight + pEngine->SetUpdateMode( TRUE ); // after SetText, before CalcTextWidth/GetTextHeight long nEngineWidth = (long) pEngine->CalcTextWidth(); long nEngineHeight = pEngine->GetTextHeight(); @@ -3534,7 +3534,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if (bPixelToLogic) pEngine->SetPaperSize(pRefDevice->PixelToLogic(aPaperSize)); else - pEngine->SetPaperSize(aPaperSize); // Scale ist immer 1 + pEngine->SetPaperSize(aPaperSize); // Scale ist immer 1 //pEngine->QuickFormatDoc( TRUE ); nEngineWidth = (long) pEngine->CalcTextWidth(); nEngineHeight = pEngine->GetTextHeight(); @@ -3545,7 +3545,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) long nRealWidth = nEngineWidth; long nRealHeight = nEngineHeight; - // wenn gedreht, Groesse anpassen + // wenn gedreht, Groesse anpassen if (nAttrRotate) { double nAbsCos = fabs( nCos ); @@ -3556,29 +3556,29 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) nRealHeight * nAbsSin ); else nEngineWidth = (long) ( nRealHeight / nAbsSin ); - //! begrenzen !!! + //! begrenzen !!! nEngineHeight = (long) ( nRealHeight * nAbsCos + nRealWidth * nAbsSin ); } - if (!nAttrRotate) // hier nur gedrehter Text - bHidden = TRUE; //! vorher abfragen !!! + if (!nAttrRotate) // hier nur gedrehter Text + bHidden = TRUE; //! vorher abfragen !!! - //! weglassen, was nicht hereinragt + //! weglassen, was nicht hereinragt if (!bHidden) { BOOL bClip = FALSE; Size aClipSize = Size( nScrX+nScrW-nStartX, nScrY+nScrH-nStartY ); - // weiterschreiben + // weiterschreiben Size aCellSize; if (bPixelToLogic) aCellSize = pRefDevice->PixelToLogic( Size( nOutWidth, nOutHeight ) ); else - aCellSize = Size( nOutWidth, nOutHeight ); // Scale ist 1 + aCellSize = Size( nOutWidth, nOutHeight ); // Scale ist 1 long nGridWidth = nEngineWidth; BOOL bNegative = FALSE; @@ -3600,7 +3600,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) SvxCellHorJustify eOutHorJust = eHorJust; if ( eRotMode != SVX_ROTATE_MODE_STANDARD ) eOutHorJust = bNegative ? SVX_HOR_JUSTIFY_RIGHT : SVX_HOR_JUSTIFY_LEFT; - long nNeededWidth = nGridWidth; // in pixel for GetOutputArea + long nNeededWidth = nGridWidth; // in pixel for GetOutputArea if ( bPixelToLogic ) nNeededWidth = pRefDevice->LogicToPixel(Size(nNeededWidth,0)).Width(); @@ -3645,7 +3645,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) { //! Clipping unnoetig, wenn links am Fenster - bClip = TRUE; // nur Rest ausgeben! + bClip = TRUE; // nur Rest ausgeben! if (nStartX<nScrX) { long nDif = nScrX - nStartX; @@ -3666,15 +3666,15 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) } } - bClip = TRUE; // always clip at the window/page border + bClip = TRUE; // always clip at the window/page border //Rectangle aClipRect; if (bClip) { if ( nAttrRotate /* && eRotMode != SVX_ROTATE_MODE_STANDARD */ ) { - // gedrehten, ausgerichteten Text nur an den - // Seitengrenzen clippen + // gedrehten, ausgerichteten Text nur an den + // Seitengrenzen clippen nClipStartX = nScrX; aClipSize.Width() = nScrW; } @@ -3684,7 +3684,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) Point(nClipStartX,nClipStartY), aClipSize ) ); else aAreaParam.maClipRect = Rectangle(Point(nClipStartX, nClipStartY), - aClipSize ); // Scale = 1 + aClipSize ); // Scale = 1 if (bMetaFile) { @@ -3716,7 +3716,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if (nAvailWidth<nComp) nAvailWidth=nComp; } - // horizontale Ausrichtung + // horizontale Ausrichtung if (eOrient==SVX_ORIENTATION_STANDARD && !nAttrRotate) { @@ -3742,7 +3742,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) } else { - // bei gedrehtem Text ist Standard zentriert + // bei gedrehtem Text ist Standard zentriert if (eHorJust==SVX_HOR_JUSTIFY_RIGHT) aLogicStart.X() += nAvailWidth - nEngineWidth; else if (eHorJust==SVX_HOR_JUSTIFY_CENTER || @@ -3801,7 +3801,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) double nAddY = 0.0; if ( nCos > 0.0 && eRotMode != SVX_ROTATE_MODE_STANDARD ) { - //! begrenzen !!! + //! begrenzen !!! double nH = nRealHeight * nCos; nAddX += nH * ( nCos / fabs(nSin) ); } @@ -3816,7 +3816,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if ( eRotMode != SVX_ROTATE_MODE_STANDARD ) { - //! begrenzen !!! + //! begrenzen !!! double nSkew = nTotalHeight * nCos / fabs(nSin); if ( eRotMode == SVX_ROTATE_MODE_CENTER ) nAddX -= nSkew * 0.5; @@ -3832,7 +3832,7 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) if ( nSin > 0.0 ) nUp = aCellSize.Height() - nEngineHeight; } - else // BOTTOM / STANDARD + else // BOTTOM / STANDARD { if ( nSin < 0.0 ) nUp = aCellSize.Height() - nEngineHeight; @@ -3845,13 +3845,13 @@ void ScOutputData::DrawRotated(BOOL bPixelToLogic) aLogicStart.Y() += (long) nAddY; } - // bSimClip is not used here (because nOriVal is set) + // bSimClip is not used here (because nOriVal is set) if ( pEngine->IsRightToLeft( 0 ) ) { - // For right-to-left, EditEngine always calculates its lines - // beginning from the right edge, but EditLine::nStartPosX is - // of USHORT type, so the PaperSize must be limited to USHRT_MAX. + // For right-to-left, EditEngine always calculates its lines + // beginning from the right edge, but EditLine::nStartPosX is + // of USHORT type, so the PaperSize must be limited to USHRT_MAX. Size aLogicPaper = pEngine->GetPaperSize(); if ( aLogicPaper.Width() > USHRT_MAX ) { diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index b5bb920fb209..2ec9395c2e5f 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -95,7 +95,7 @@ Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY ) aRect.Top() = (long) (aRect.Top() * HMM_PER_TWIPS); aRect.Right() = (long) (aRect.Right() * HMM_PER_TWIPS); aRect.Bottom() = (long) (aRect.Bottom() * HMM_PER_TWIPS); - + if(pViewShell || pDrawView) { SdrView* pLocalDrawView = (pDrawView) ? pDrawView : pViewShell->GetSdrView(); @@ -123,7 +123,7 @@ Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY ) } // #i72502# -void ScOutputData::PostPrintDrawingLayer(const Point& rMMOffset) // #i74768# +void ScOutputData::PostPrintDrawingLayer(const Point& rMMOffset) // #i74768# { // #i74768# just use offset as in PrintDrawingLayer() to also get the form controls // painted with offset @@ -157,14 +157,14 @@ void ScOutputData::PostPrintDrawingLayer(const Point& rMMOffset) // #i74768# void ScOutputData::PrintDrawingLayer(const sal_uInt16 nLayer, const Point& rMMOffset) { bool bHideAllDrawingLayer(false); - + if(pViewShell || pDrawView) { SdrView* pLocalDrawView = (pDrawView) ? pDrawView : pViewShell->GetSdrView(); if(pLocalDrawView) { - bHideAllDrawingLayer = pLocalDrawView->getHideOle() && pLocalDrawView->getHideChart() + bHideAllDrawingLayer = pLocalDrawView->getHideOle() && pLocalDrawView->getHideChart() && pLocalDrawView->getHideDraw() && pLocalDrawView->getHideFormControl(); } } @@ -241,14 +241,14 @@ void ScOutputData::DrawSelectiveObjects(const sal_uInt16 nLayer) return; } -// Teile nur fuer Bildschirm +// Teile nur fuer Bildschirm // #109985# void ScOutputData::DrawingSingle(const sal_uInt16 nLayer) { - BOOL bHad = FALSE; - long nPosY = nScrY; - SCSIZE nArrY; + BOOL bHad = FALSE; + long nPosY = nScrY; + SCSIZE nArrY; for (nArrY=1; nArrY+1<nArrCount; nArrY++) { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx index 5fe990aad697..c9264bc4b618 100644 --- a/sc/source/ui/view/pfuncache.cxx +++ b/sc/source/ui/view/pfuncache.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,8 +50,8 @@ ScPrintFuncCache::ScPrintFuncCache( ScDocShell* pD, const ScMarkData& rMark, nTotalPages( 0 ), bLocInitialized( false ) { - // page count uses the stored cell widths for the printer anyway, - // so ScPrintFunc with the document's printer can be used to count + // page count uses the stored cell widths for the printer anyway, + // so ScPrintFunc with the document's printer can be used to count SfxPrinter* pPrinter = pDocSh->GetPrinter(); @@ -77,7 +77,7 @@ ScPrintFuncCache::ScPrintFuncCache( ScDocShell* pD, const ScMarkData& rMark, ScPrintFunc aFunc( pDocSh, pPrinter, nTab, nAttrPage, 0, pSelRange, &aSelection.GetOptions() ); nThisTab = aFunc.GetTotalPages(); - nFirstAttr[nTab] = aFunc.GetFirstPageNo(); // from page style or previous sheet + nFirstAttr[nTab] = aFunc.GetFirstPageNo(); // from page style or previous sheet } else nFirstAttr[nTab] = nAttrPage; @@ -154,7 +154,7 @@ bool ScPrintFuncCache::FindLocation( const ScAddress& rCell, ScPrintPageLocation return true; } } - return false; // not found + return false; // not found } BOOL ScPrintFuncCache::IsSameSelection( const ScPrintSelectionStatus& rStatus ) const @@ -182,7 +182,7 @@ long ScPrintFuncCache::GetTabStart( SCTAB nTab ) const long ScPrintFuncCache::GetDisplayStart( SCTAB nTab ) const { - //! merge with lcl_GetDisplayStart in preview? + //! merge with lcl_GetDisplayStart in preview? long nDisplayStart = 0; ScDocument* pDoc = pDocSh->GetDocument(); diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index e1d493dd3f24..8516475f9050 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/view/pivotsh.cxx b/sc/source/ui/view/pivotsh.cxx index f23082e1a041..f50feafd98a0 100644 --- a/sc/source/ui/view/pivotsh.cxx +++ b/sc/source/ui/view/pivotsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 3222ef64531c..6e970f318d07 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,7 +62,7 @@ #include "drwlayer.hxx" #include "scmod.hxx" #include "globstr.hrc" -#include "sc.hrc" // fuer ShellInvalidate +#include "sc.hrc" // fuer ShellInvalidate #include "AccessibleDocumentPagePreview.hxx" #include <vcl/lineinfo.hxx> #include <svx/algitem.hxx> @@ -80,7 +80,7 @@ //================================================================== -#define SC_PREVIEW_SHADOWSIZE 2 +#define SC_PREVIEW_SHADOWSIZE 2 long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, long* pPages ) { @@ -150,10 +150,10 @@ __EXPORT ScPreview::~ScPreview() delete pLocationData; } -void ScPreview::UpdateDrawView() // nTab muss richtig sein +void ScPreview::UpdateDrawView() // nTab muss richtig sein { ScDocument* pDoc = pDocShell->GetDocument(); - ScDrawLayer* pModel = pDoc->GetDrawLayer(); // ist nicht 0 + ScDrawLayer* pModel = pDoc->GetDrawLayer(); // ist nicht 0 // #114135# if ( pModel ) @@ -161,12 +161,12 @@ void ScPreview::UpdateDrawView() // nTab muss richtig sein SdrPage* pPage = pModel->GetPage(nTab); if ( pDrawView && ( !pDrawView->GetSdrPageView() || pDrawView->GetSdrPageView()->GetPage() != pPage ) ) { - // die angezeigte Page der DrawView umzustellen (s.u.) funktioniert nicht ?!? + // die angezeigte Page der DrawView umzustellen (s.u.) funktioniert nicht ?!? delete pDrawView; pDrawView = NULL; } - if ( !pDrawView ) // neu anlegen? + if ( !pDrawView ) // neu anlegen? { pDrawView = new FmFormView( pModel, this ); // #55259# die DrawView uebernimmt den Design-Modus vom Model @@ -178,7 +178,7 @@ void ScPreview::UpdateDrawView() // nTab muss richtig sein } else if ( pDrawView ) { - delete pDrawView; // fuer diese Tabelle nicht gebraucht + delete pDrawView; // fuer diese Tabelle nicht gebraucht pDrawView = NULL; } } @@ -192,7 +192,7 @@ void ScPreview::TestLastPage() { nPageNo = nTotalPages - 1; nTab = nTabCount - 1; - while (nTab > 0 && !nPages[nTab]) // letzte nicht leere Tabelle + while (nTab > 0 && !nPages[nTab]) // letzte nicht leere Tabelle --nTab; DBG_ASSERT(nPages[nTab],"alle Tabellen leer?"); nTabPage = nPages[nTab] - 1; @@ -203,7 +203,7 @@ void ScPreview::TestLastPage() ScDocument* pDoc = pDocShell->GetDocument(); nDisplayStart = lcl_GetDisplayStart( nTab, pDoc, nPages ); } - else // leeres Dokument + else // leeres Dokument { nTab = 0; nPageNo = nTabPage = nTabStart = nDisplayStart = 0; @@ -240,8 +240,8 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ ) // instead of a separate progress for each sheet from ScPrintFunc pDocShell->UpdatePendingRowHeights( nAnz-1, true ); - // PrintOptions is passed to PrintFunc for SkipEmpty flag, - // but always all sheets are used (there is no selected sheet) + // PrintOptions is passed to PrintFunc for SkipEmpty flag, + // but always all sheets are used (there is no selected sheet) ScPrintOptions aOptions = SC_MOD()->GetPrintOptions(); ScMarkData aMarkData; @@ -262,7 +262,7 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ ) long nThisTab = aPrintFunc.GetTotalPages(); nPages[i] = nThisTab; nTotalPages += nThisTab; - nFirstAttr[i] = aPrintFunc.GetFirstPageNo(); // behalten oder aus Vorlage + nFirstAttr[i] = aPrintFunc.GetFirstPageNo(); // behalten oder aus Vorlage if (nPageNo>=nThisStart && nPageNo<nTotalPages) { @@ -280,7 +280,7 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ ) if (nAnz > nTabsTested) nTabsTested = nAnz; - // testen, ob hinter letzter Seite + // testen, ob hinter letzter Seite if ( nTabsTested >= nTabCount ) TestLastPage(); @@ -293,10 +293,10 @@ void ScPreview::CalcPages( SCTAB /*nToWhichTab*/ ) } -void ScPreview::RecalcPages() // nur nPageNo geaendert +void ScPreview::RecalcPages() // nur nPageNo geaendert { if (!bValid) - return; // dann wird CalcPages aufgerufen + return; // dann wird CalcPages aufgerufen SCTAB nOldTab = nTab; @@ -321,7 +321,7 @@ void ScPreview::RecalcPages() // nur nPageNo geaendert nTabPage = nPageNo - nThisStart; nTabStart = nThisStart; -// aPageSize = aPrintFunc.GetPageSize(); +// aPageSize = aPrintFunc.GetPageSize(); } } @@ -329,7 +329,7 @@ void ScPreview::RecalcPages() // nur nPageNo geaendert nDisplayStart = lcl_GetDisplayStart( nTab, pDoc, nPages ); } - TestLastPage(); // testen, ob hinter letzter Seite + TestLastPage(); // testen, ob hinter letzter Seite if ( nTab != nOldTab ) bStateValid = FALSE; @@ -344,7 +344,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) { CalcPages(0); RecalcPages(); - UpdateDrawView(); // Tabelle evtl. geaendert + UpdateDrawView(); // Tabelle evtl. geaendert } Fraction aPreviewZoom( nZoom, 100 ); @@ -400,9 +400,9 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) DBG_ASSERT(nPrinted<=1, "was'n nu los?"); SetMapMode(aMMMode); -// USHORT nPrintZoom = pPrintFunc->GetZoom(); +// USHORT nPrintZoom = pPrintFunc->GetZoom(); - if (nPrinted) // wenn nichts, alles grau zeichnen + if (nPrinted) // wenn nichts, alles grau zeichnen { aLocalPageSize = pPrintFunc->GetPageSize(); aLocalPageSize.Width() = (long) (aLocalPageSize.Width() * HMM_PER_TWIPS ); @@ -438,7 +438,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) if (bBottom) { if (bRight) - DrawRect(Rectangle(0,nPageEndY, nPageEndX,aWinEnd.Y())); // Ecke nicht doppelt + DrawRect(Rectangle(0,nPageEndY, nPageEndX,aWinEnd.Y())); // Ecke nicht doppelt else DrawRect(Rectangle(0,nPageEndY, aWinEnd.X(),aWinEnd.Y())); } @@ -448,7 +448,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) { Color aBorderColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); - // draw border + // draw border if ( aOffset.X() <= 0 || aOffset.Y() <= 0 || bRight || bBottom ) { @@ -461,7 +461,7 @@ void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) DrawRect( PixelToLogic( aPixel ) ); } - // draw shadow + // draw shadow SetLineColor(); SetFillColor( aBorderColor ); @@ -753,7 +753,7 @@ String ScPreview::GetPosString() if (!bValid) { CalcPages(nTab); - UpdateDrawView(); // Tabelle evtl. geaendert + UpdateDrawView(); // Tabelle evtl. geaendert } String aString( ScGlobal::GetRscString( STR_PAGE ) ); @@ -780,14 +780,14 @@ void ScPreview::SetZoom(USHORT nNewZoom) { nZoom = nNewZoom; - // apply new MapMode and call UpdateScrollBars to update aOffset + // apply new MapMode and call UpdateScrollBars to update aOffset Fraction aPreviewZoom( nZoom, 100 ); Fraction aHorPrevZoom( (long)( 100 * nZoom / pDocShell->GetOutputFactor() ), 10000 ); MapMode aMMMode( MAP_100TH_MM, Point(), aHorPrevZoom, aPreviewZoom ); SetMapMode( aMMMode ); - bInPaint = TRUE; // don't scroll during SetYOffset in UpdateScrollBars + bInPaint = TRUE; // don't scroll during SetYOffset in UpdateScrollBars pViewShell->UpdateScrollBars(); bInPaint = FALSE; @@ -803,7 +803,7 @@ void ScPreview::SetPageNo( long nPage ) { nPageNo = nPage; RecalcPages(); - UpdateDrawView(); // Tabelle evtl. geaendert + UpdateDrawView(); // Tabelle evtl. geaendert InvalidateLocationData( SC_HINT_DATACHANGED ); Invalidate(); } @@ -819,7 +819,7 @@ long ScPreview::GetFirstPage(SCTAB nTabP) if (nTabP>0) { CalcPages( nTabP ); - UpdateDrawView(); // Tabelle evtl. geaendert + UpdateDrawView(); // Tabelle evtl. geaendert for (SCTAB i=0; i<nTabP; i++) nPage += nPages[i]; @@ -858,9 +858,9 @@ USHORT ScPreview::GetOptimalZoom(BOOL bWidthOnly) double nWinScaleY = ScGlobal::nScreenPPTY; Size aWinSize = GetOutputSizePixel(); - // desired margin is 0.25cm in default MapMode (like Writer), - // but some additional margin is introduced by integer scale values - // -> add only 0.10cm, so there is some margin in all cases. + // desired margin is 0.25cm in default MapMode (like Writer), + // but some additional margin is introduced by integer scale values + // -> add only 0.10cm, so there is some margin in all cases. Size aMarginSize( LogicToPixel( Size( 100, 100 ), MAP_100TH_MM ) ); aWinSize.Width() -= 2 * aMarginSize.Width(); aWinSize.Height() -= 2 * aMarginSize.Height(); @@ -943,19 +943,19 @@ void ScPreview::SetYOffset( long nY ) void ScPreview::DoInvalidate() { - // Wenn das ganze aus dem GetState der Shell gerufen wird, - // muss das Invalidate hinterher asynchron kommen... + // Wenn das ganze aus dem GetState der Shell gerufen wird, + // muss das Invalidate hinterher asynchron kommen... if (bInGetState) Application::PostUserEvent( STATIC_LINK( this, ScPreview, InvalidateHdl ) ); else - StaticInvalidate(); // sofort + StaticInvalidate(); // sofort } void ScPreview::StaticInvalidate() { - // static method, because it's called asynchronously - // -> must use current viewframe + // static method, because it's called asynchronously + // -> must use current viewframe SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (!pViewFrm) @@ -1000,8 +1000,8 @@ void ScPreview::DataChanged( const DataChangedEvent& rDCEvt ) if ( rDCEvt.GetType() == DATACHANGED_SETTINGS && (rDCEvt.GetFlags() & SETTINGS_STYLE) ) { - // scroll bar size may have changed - pViewShell->InvalidateBorder(); // calls OuterResizePixel + // scroll bar size may have changed + pViewShell->InvalidateBorder(); // calls OuterResizePixel } Invalidate(); diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 22e24170fba0..94580c084ca1 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,11 +56,11 @@ enum ScPreviewLocationType struct ScPreviewLocationEntry { - ScPreviewLocationType eType; - Rectangle aPixelRect; - ScRange aCellRange; - BOOL bRepeatCol; - BOOL bRepeatRow; + ScPreviewLocationType eType; + Rectangle aPixelRect; + ScRange aCellRange; + BOOL bRepeatCol; + BOOL bRepeatRow; ScPreviewLocationEntry( ScPreviewLocationType eNewType, const Rectangle& rPixel, const ScRange& rRange, BOOL bRepCol, BOOL bRepRow ) : @@ -113,12 +113,12 @@ void ScPreviewTableInfo::LimitToArea( const Rectangle& rPixelArea ) { if ( pColInfo ) { - // cells completely left of the visible area + // cells completely left of the visible area SCCOL nStart = 0; while ( nStart < nCols && pColInfo[nStart].nPixelEnd < rPixelArea.Left() ) ++nStart; - // cells completely right of the visible area + // cells completely right of the visible area SCCOL nEnd = nCols; while ( nEnd > 0 && pColInfo[nEnd-1].nPixelStart > rPixelArea.Right() ) --nEnd; @@ -134,18 +134,18 @@ void ScPreviewTableInfo::LimitToArea( const Rectangle& rPixelArea ) SetColInfo( nNewCount, pNewInfo ); } else - SetColInfo( 0, NULL ); // all invisible + SetColInfo( 0, NULL ); // all invisible } } if ( pRowInfo ) { - // cells completely above the visible area + // cells completely above the visible area SCROW nStart = 0; while ( nStart < nRows && pRowInfo[nStart].nPixelEnd < rPixelArea.Top() ) ++nStart; - // cells completely below the visible area + // cells completely below the visible area SCROW nEnd = nRows; while ( nEnd > 0 && pRowInfo[nEnd-1].nPixelStart > rPixelArea.Bottom() ) --nEnd; @@ -161,7 +161,7 @@ void ScPreviewTableInfo::LimitToArea( const Rectangle& rPixelArea ) SetRowInfo( nNewCount, pNewInfo ); } else - SetRowInfo( 0, NULL ); // all invisible + SetRowInfo( 0, NULL ); // all invisible } } } @@ -231,7 +231,7 @@ void ScPreviewLocationData::AddCellRange( const Rectangle& rRect, const ScRange& void ScPreviewLocationData::AddColHeaders( const Rectangle& rRect, SCCOL nStartCol, SCCOL nEndCol, BOOL bRepCol ) { - SCTAB nTab = 0; //! ? + SCTAB nTab = 0; //! ? ScRange aRange( nStartCol, 0, nTab, nEndCol, 0, nTab ); Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) ); aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_COLHEADER, aPixelRect, aRange, bRepCol, FALSE ) ); @@ -239,7 +239,7 @@ void ScPreviewLocationData::AddColHeaders( const Rectangle& rRect, SCCOL nStartC void ScPreviewLocationData::AddRowHeaders( const Rectangle& rRect, SCROW nStartRow, SCROW nEndRow, BOOL bRepRow ) { - SCTAB nTab = 0; //! ? + SCTAB nTab = 0; //! ? ScRange aRange( 0, nStartRow, nTab, 0, nEndRow, nTab ); Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) ); aEntries.Insert( new ScPreviewLocationEntry( SC_PLOC_ROWHEADER, aPixelRect, aRange, FALSE, bRepRow ) ); @@ -247,7 +247,7 @@ void ScPreviewLocationData::AddRowHeaders( const Rectangle& rRect, SCROW nStartR void ScPreviewLocationData::AddHeaderFooter( const Rectangle& rRect, BOOL bHeader, BOOL bLeft ) { - ScRange aRange; //! ? + ScRange aRange; //! ? Rectangle aPixelRect( pWindow->LogicToPixel( rRect ) ); ScPreviewLocationType eType = bHeader ? @@ -534,7 +534,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev aMainRect.Top() = pEntry->aPixelRect.Top(); aMainRect.Bottom() = pEntry->aPixelRect.Bottom(); } - nTab = pEntry->aCellRange.aStart.Tab(); //! store separately? + nTab = pEntry->aCellRange.aStart.Tab(); //! store separately? } else if ( pEntry->eType == SC_PLOC_ROWHEADER ) { @@ -553,7 +553,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev } // - // get column info + // get column info // SCCOL nColCount = 0; @@ -623,7 +623,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev rInfo.SetColInfo( 0, NULL ); // - // get row info + // get row info // SCROW nRowCount = 0; @@ -692,7 +692,7 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev rInfo.SetRowInfo( 0, NULL ); // - // limit to visible area + // limit to visible area // rInfo.SetTab( nTab ); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index ec316617e20e..ca75165ebb2b 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -80,12 +80,12 @@ #include "sc.hrc" #include "scabstdlg.hxx" -// fuer Rad-Maus -#define SC_DELTA_ZOOM 10 +// fuer Rad-Maus +#define SC_DELTA_ZOOM 10 #define MINZOOM_SLIDER 10 #define MAXZOOM_SLIDER 400 -#define SC_USERDATA_SEP ';' +#define SC_USERDATA_SEP ';' using namespace com::sun::star; @@ -136,7 +136,7 @@ void ScPreviewShell::Construct( Window* pParent ) if (pDrawBC) StartListening(*pDrawBC); -// pPreview->Show(); // wird vom Sfx angezeigt +// pPreview->Show(); // wird vom Sfx angezeigt pHorScroll->Show(); pVerScroll->Show(); pCorner->Show(); @@ -155,17 +155,17 @@ ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, if ( pOldSh && pOldSh->ISA( ScTabViewShell ) ) { - // store view settings, show table from TabView - //! store live ScViewData instead, and update on ScTablesHint? - //! or completely forget aSourceData on ScTablesHint? + // store view settings, show table from TabView + //! store live ScViewData instead, and update on ScTablesHint? + //! or completely forget aSourceData on ScTablesHint? ScTabViewShell* pTabViewShell = ((ScTabViewShell*)pOldSh); ScViewData* pData = pTabViewShell->GetViewData(); pData->WriteUserDataSequence( aSourceData ); InitStartTable( pData->GetTabNo() ); - // #106334# also have to store the TabView's DesignMode state - // (only if draw view exists) + // #106334# also have to store the TabView's DesignMode state + // (only if draw view exists) SdrView* pDrawView = pTabViewShell->GetSdrView(); if ( pDrawView ) nSourceDesignMode = pDrawView->IsDesignMode(); @@ -190,8 +190,8 @@ __EXPORT ScPreviewShell::~ScPreviewShell() delete pVerScroll; delete pCorner; - // #97612# normal mode of operation is switching back to default view in the same frame, - // so there's no need to activate any other window here anymore + // #97612# normal mode of operation is switching back to default view in the same frame, + // so there's no need to activate any other window here anymore } void ScPreviewShell::InitStartTable(SCTAB nTab) @@ -214,11 +214,11 @@ Size __EXPORT ScPreviewShell::GetOptimalSizePixel() const if ( pViewSh ) { - ScViewData* pViewData = pViewSh->GetViewData(); - SCTAB nCurTab = pViewData->GetTabNo(); - ScDocument* pDoc = pDocShell->GetDocument(); - ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); - SfxStyleSheetBase* pStyleSheet = pStylePool->Find( + ScViewData* pViewData = pViewSh->GetViewData(); + SCTAB nCurTab = pViewData->GetTabNo(); + ScDocument* pDoc = pDocShell->GetDocument(); + ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); + SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nCurTab ), SFX_STYLE_FAMILY_PAGE ); @@ -226,9 +226,9 @@ Size __EXPORT ScPreviewShell::GetOptimalSizePixel() const if ( pStyleSheet ) { - const SfxItemSet& rSet = pStyleSheet->GetItemSet(); - const SvxSizeItem& rItem = (const SvxSizeItem&)rSet.Get( ATTR_PAGE_SIZE ); - const Size& rPageSize = rItem.GetSize(); + const SfxItemSet& rSet = pStyleSheet->GetItemSet(); + const SvxSizeItem& rItem = (const SvxSizeItem&)rSet.Get( ATTR_PAGE_SIZE ); + const Size& rPageSize = rItem.GetSize(); aOptSize.Width() = (long) (rPageSize.Width() * pViewData->GetPPTX()); aOptSize.Height() = (long) (rPageSize.Height() * pViewData->GetPPTY()); @@ -246,8 +246,8 @@ void __EXPORT ScPreviewShell::AdjustPosSizePixel( const Point &rPos, const Size { long nBarW = GetViewFrame()->GetWindow().GetSettings().GetStyleSettings().GetScrollBarSize(); long nBarH = nBarW; -// long nBarW = pVerScroll->GetSizePixel().Width(); -// long nBarH = pHorScroll->GetSizePixel().Height(); +// long nBarW = pVerScroll->GetSizePixel().Width(); +// long nBarH = pHorScroll->GetSizePixel().Height(); Size aOutSize( rSize.Width()-nBarW, rSize.Height()-nBarH ); pPreview->SetPosSizePixel( rPos, aOutSize ); @@ -281,8 +281,8 @@ void ScPreviewShell::UpdateScrollBars() ScDocument* pDoc = pDocShell->GetDocument(); SCTAB nTab = pPreview->GetTab(); - ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); - SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nTab ), + ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); + SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nTab ), SFX_STYLE_FAMILY_PAGE ); DBG_ASSERT(pStyleSheet,"StyleSheet nicht gefunden"); if (!pStyleSheet) return; @@ -292,7 +292,7 @@ void ScPreviewShell::UpdateScrollBars() aPageSize.Width() = (long) (aPageSize.Width() * HMM_PER_TWIPS ); aPageSize.Height() = (long) (aPageSize.Height() * HMM_PER_TWIPS ); - // for centering, page size without the shadow is used + // for centering, page size without the shadow is used Size aWindowSize = pPreview->GetOutputSize(); @@ -308,25 +308,25 @@ void ScPreviewShell::UpdateScrollBars() nMaxPos = aPageSize.Width() - aWindowSize.Width(); if ( nMaxPos<0 ) { - // page smaller than window -> center (but put scrollbar to 0) + // page smaller than window -> center (but put scrollbar to 0) aOfs.X() = 0; pPreview->SetXOffset( nMaxPos / 2 ); } else if (aOfs.X() < 0) { - // page larger than window -> never use negative offset + // page larger than window -> never use negative offset aOfs.X() = 0; pPreview->SetXOffset( 0 ); } else if (aOfs.X() > nMaxPos) { - // limit offset to align with right edge of window + // limit offset to align with right edge of window aOfs.X() = nMaxPos; pPreview->SetXOffset(nMaxPos); } pHorScroll->SetThumbPos( aOfs.X() ); } - + if( pVerScroll ) { long nPageNo = pPreview->GetPageNo(); @@ -338,7 +338,7 @@ void ScPreviewShell::UpdateScrollBars() pVerScroll->SetVisibleSize( aWindowSize.Height() ); if ( nMaxVertPos < 0 ) { - // page smaller than window -> center (but put scrollbar to 0) + // page smaller than window -> center (but put scrollbar to 0) aOfs.Y() = 0; pPreview->SetYOffset( nMaxVertPos / 2 ); pVerScroll->SetThumbPos( nPageNo * aWindowSize.Height() ); @@ -346,7 +346,7 @@ void ScPreviewShell::UpdateScrollBars() } else if (aOfs.Y() < 0) { - // page larger than window -> never use negative offset + // page larger than window -> never use negative offset pVerScroll->SetRange( Range( 0, aPageSize.Height() ) ); aOfs.Y() = 0; pPreview->SetYOffset( 0 ); @@ -354,7 +354,7 @@ void ScPreviewShell::UpdateScrollBars() } else if (aOfs.Y() > nMaxVertPos ) { - // limit offset to align with window bottom + // limit offset to align with window bottom pVerScroll->SetRange( Range( 0, aPageSize.Height() ) ); aOfs.Y() = nMaxVertPos; pPreview->SetYOffset( nMaxVertPos ); @@ -418,7 +418,7 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll ) } else if( nDelta > 0 ) { - BOOL bAllTested = pPreview->AllTested(); + BOOL bAllTested = pPreview->AllTested(); if ( nTotalPages && ( nPageNo < nTotalPages || !bAllTested ) ) pPreview->SetPageNo( nPageNo ); @@ -431,10 +431,10 @@ IMPL_LINK (ScPreviewShell,ScrollHandler, ScrollBar* ,pScroll ) } aRect.Left() = aPos.X() - 8; - aRect.Top() = aMousePos.Y(); - aRect.Right() = aRect.Left(); - aRect.Top() = aRect.Top(); - nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; + aRect.Top() = aMousePos.Y(); + aRect.Right() = aRect.Left(); + aRect.Top() = aRect.Top(); + nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; Help::ShowQuickHelp( pScroll->GetParent(), aRect, aHelpStr, nAlign ); } } @@ -483,15 +483,15 @@ USHORT __EXPORT ScPreviewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDif PrintDialog* __EXPORT ScPreviewShell::CreatePrintDialog( Window* pParent ) { - pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen + pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen (void)GetPrinter(); - const long nCurPage = pPreview->GetPageNo()+1; - const long nDocPageMax = pPreview->GetTotalPages(); + const long nCurPage = pPreview->GetPageNo()+1; + const long nDocPageMax = pPreview->GetTotalPages(); PrintDialog* pDlg = new PrintDialog( pParent, true ); // wenn zu langsam wieder einbauen -// if ( pPreview->AllTested() ) -// nPageMax = pPreview->GetTotalPages(); +// if ( pPreview->AllTested() ) +// nPageMax = pPreview->GetTotalPages(); pDlg->EnableSheetRange( true, PRINTSHEETS_ALL ); pDlg->EnableSheetRange( true, PRINTSHEETS_SELECTED_SHEETS ); @@ -502,13 +502,13 @@ PrintDialog* __EXPORT ScPreviewShell::CreatePrintDialog( Window* pParent ) if ( nDocPageMax > 0 ) pDlg->SetRangeText( String::CreateFromInt32( nCurPage ) ); - pDlg->EnableRange ( PRINTDIALOG_ALL ); - pDlg->EnableRange ( PRINTDIALOG_RANGE ); - pDlg->SetFirstPage ( 1 ); - pDlg->SetMinPage ( 1 ); - pDlg->SetLastPage ( (USHORT)nDocPageMax ); - pDlg->SetMaxPage ( (USHORT)nDocPageMax ); - pDlg->EnableCollate (); + pDlg->EnableRange ( PRINTDIALOG_ALL ); + pDlg->EnableRange ( PRINTDIALOG_RANGE ); + pDlg->SetFirstPage ( 1 ); + pDlg->SetMinPage ( 1 ); + pDlg->SetLastPage ( (USHORT)nDocPageMax ); + pDlg->SetMaxPage ( (USHORT)nDocPageMax ); + pDlg->EnableCollate (); // Selektion hier nicht @@ -519,7 +519,7 @@ SfxTabPage* ScPreviewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); - ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); + ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); if ( ScTpPrintOptionsCreate ) return (*ScTpPrintOptionsCreate)( pParent, rOptions); return 0; @@ -553,7 +553,7 @@ ErrCode ScPreviewShell::DoPrint( SfxPrinter *pPrinter, USHORT __EXPORT ScPreviewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog ) { - pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen + pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen // get the list of affected sheets before SfxViewShell::Print bool bAllTabs = ( pPrintDialog ? ( pPrintDialog->GetCheckedSheetRange() == PRINTSHEETS_ALL ) : SC_MOD()->GetPrintOptions().GetAllSheets() ); @@ -591,12 +591,12 @@ void __EXPORT ScPreviewShell::Activate(BOOL bMDI) { SfxViewShell::Activate(bMDI); - //! Basic etc. -> auslagern in eigene Datei (s. tabvwsh4) + //! Basic etc. -> auslagern in eigene Datei (s. tabvwsh4) if (bMDI) { // InputHdl ist jetzt meistens Null, keine Assertion mehr! - ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); + ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); if ( pInputHdl ) pInputHdl->NotifyChange( NULL ); } @@ -641,7 +641,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) case SID_NEXT_TABLE: // Accelerator case SID_PREVIEW_NEXT: { - BOOL bAllTested = pPreview->AllTested(); + BOOL bAllTested = pPreview->AllTested(); long nPage = pPreview->GetPageNo(); long nTotal = pPreview->GetTotalPages(); if (nTotal && (nPage+1 < nTotal || !bAllTested)) @@ -672,8 +672,8 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) case SID_ATTR_ZOOM: case FID_SCALE: { - USHORT nZoom = 100; - BOOL bCancel = FALSE; + USHORT nZoom = 100; + BOOL bCancel = FALSE; eZoom = SVX_ZOOM_PERCENT; @@ -688,8 +688,8 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) } else { - SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); - SvxZoomItem aZoomItem( SVX_ZOOM_PERCENT, pPreview->GetZoom(), SID_ATTR_ZOOM ); + SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); + SvxZoomItem aZoomItem( SVX_ZOOM_PERCENT, pPreview->GetZoom(), SID_ATTR_ZOOM ); aSet.Put( aZoomItem ); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -703,7 +703,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) if ( !bCancel ) { - const SvxZoomItem& rZoomItem = (const SvxZoomItem&) + const SvxZoomItem& rZoomItem = (const SvxZoomItem&) pDlg->GetOutputItemSet()-> Get( SID_ATTR_ZOOM ); @@ -775,7 +775,7 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) pPreview->SetZoom( nCurrentZoom ); rReq.Done(); } - } + } } break; case SID_PREVIEW_SCALINGFACTOR: @@ -801,9 +801,9 @@ void __EXPORT ScPreviewShell::Execute( SfxRequest& rReq ) break; case SID_PRINTPREVIEW: case SID_PREVIEW_CLOSE: - // print preview is now always in the same frame as the tab view - // -> always switch this frame back to normal view - // (ScTabViewShell ctor reads stored view data) + // print preview is now always in the same frame as the tab view + // -> always switch this frame back to normal view + // (ScTabViewShell ctor reads stored view data) GetViewFrame()->GetDispatcher()->Execute( SID_VIEWSHELL0, SFX_CALLMODE_ASYNCHRON ); break; @@ -831,11 +831,11 @@ void __EXPORT ScPreviewShell::GetState( SfxItemSet& rSet ) { pPreview->SetInGetState(TRUE); - SCTAB nTab = pPreview->GetTab(); - long nPage = pPreview->GetPageNo(); - long nTotal = pPreview->GetTotalPages(); - USHORT nZoom = pPreview->GetZoom(); - BOOL bAllTested = pPreview->AllTested(); + SCTAB nTab = pPreview->GetTab(); + long nPage = pPreview->GetPageNo(); + long nTotal = pPreview->GetTotalPages(); + USHORT nZoom = pPreview->GetZoom(); + BOOL bAllTested = pPreview->AllTested(); SfxWhichIter aIter(rSet); USHORT nWhich = aIter.FirstWhich(); @@ -937,28 +937,28 @@ void ScPreviewShell::FillFieldData( ScHeaderFieldData& rData ) SCTAB nTab = pPreview->GetTab(); pDoc->GetName( nTab, rData.aTabName ); - rData.aTitle = pDocShell->GetTitle(); + rData.aTitle = pDocShell->GetTitle(); const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); - rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); + rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); if ( rData.aLongDocName.Len() ) rData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS ); else rData.aShortDocName = rData.aLongDocName = rData.aTitle; - rData.nPageNo = pPreview->GetPageNo() + 1; + rData.nPageNo = pPreview->GetPageNo() + 1; - BOOL bAllTested = pPreview->AllTested(); + BOOL bAllTested = pPreview->AllTested(); if (bAllTested) rData.nTotalPages = pPreview->GetTotalPages(); else rData.nTotalPages = 99; - // eNumType kennt der Dialog selber + // eNumType kennt der Dialog selber } void __EXPORT ScPreviewShell::WriteUserData(String& rData, BOOL /* bBrowse */) { - // nZoom - // nPageNo + // nZoom + // nPageNo rData = String::CreateFromInt32(pPreview->GetZoom()); rData += (sal_Unicode) SC_USERDATA_SEP; @@ -1024,21 +1024,21 @@ void __EXPORT ScPreviewShell::ReadUserDataSequence(const uno::Sequence < beans:: void ScPreviewShell::DoScroll( USHORT nMode ) { - Point aCurPos, aPrevPos; + Point aCurPos, aPrevPos; - long nHRange = pHorScroll->GetRange().Max(); - long nHLine = pHorScroll->GetLineSize(); - long nHPage = pHorScroll->GetPageSize(); - long nVRange = pVerScroll->GetRange().Max(); - long nVLine = pVerScroll->GetLineSize(); - long nVPage = pVerScroll->GetPageSize(); + long nHRange = pHorScroll->GetRange().Max(); + long nHLine = pHorScroll->GetLineSize(); + long nHPage = pHorScroll->GetPageSize(); + long nVRange = pVerScroll->GetRange().Max(); + long nVLine = pVerScroll->GetLineSize(); + long nVPage = pVerScroll->GetPageSize(); aCurPos.X() = pHorScroll->GetThumbPos(); aCurPos.Y() = pVerScroll->GetThumbPos(); aPrevPos = aCurPos; - long nThumbPos = pVerScroll->GetThumbPos(); - long nRangeMax = pVerScroll->GetRangeMax(); + long nThumbPos = pVerScroll->GetThumbPos(); + long nRangeMax = pVerScroll->GetRangeMax(); switch( nMode ) { @@ -1167,13 +1167,13 @@ void ScPreviewShell::DoScroll( USHORT nMode ) // nHRange-nHPage kann negativ sein, deshalb Abfrage auf < 0 hinterher - if( aCurPos.Y() > (nVRange-nVPage) ) + if( aCurPos.Y() > (nVRange-nVPage) ) aCurPos.Y() = (nVRange-nVPage); - if( aCurPos.Y() < 0 ) + if( aCurPos.Y() < 0 ) aCurPos.Y() = 0; - if( aCurPos.X() > (nHRange-nHPage) ) + if( aCurPos.X() > (nHRange-nHPage) ) aCurPos.X() = (nHRange-nHPage); - if( aCurPos.X() < 0 ) + if( aCurPos.X() < 0 ) aCurPos.X() = 0; if( nMaxVertPos>=0 ) diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index 6677798f9dcf..72a7a7aa4a32 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 8180c1b8ea1e..a3e4832b81b1 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #include <editeng/boxitem.hxx> #include <editeng/brshitem.hxx> #include <svtools/colorcfg.hxx> -#include <editeng/editstat.hxx> // EE_CNTRL_RTFSTYLESHEETS +#include <editeng/editstat.hxx> // EE_CNTRL_RTFSTYLESHEETS #include <svx/fmview.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/lrspitem.hxx> @@ -88,7 +88,7 @@ #include <boost/scoped_ptr.hpp> -#define ZOOM_MIN 10 +#define ZOOM_MIN 10 #define GET_BOOL(set,which) ((const SfxBoolItem&)(set)->Get((which))).GetValue() #define GET_USHORT(set,which) ((const SfxUInt16Item&)(set)->Get((which))).GetValue() @@ -99,7 +99,7 @@ ScPageRowEntry::ScPageRowEntry(const ScPageRowEntry& r) { nStartRow = r.nStartRow; - nEndRow = r.nEndRow; + nEndRow = r.nEndRow; nPagesX = r.nPagesX; if (r.pHidden && nPagesX) { @@ -115,7 +115,7 @@ const ScPageRowEntry& ScPageRowEntry::operator=(const ScPageRowEntry& r) delete[] pHidden; nStartRow = r.nStartRow; - nEndRow = r.nEndRow; + nEndRow = r.nEndRow; nPagesX = r.nPagesX; if (r.pHidden && nPagesX) { @@ -143,7 +143,7 @@ void ScPageRowEntry::SetHidden(size_t nX) { if ( nX < nPagesX ) { - if ( nX+1 == nPagesX ) // letzte Seite? + if ( nX+1 == nPagesX ) // letzte Seite? --nPagesX; else { @@ -159,7 +159,7 @@ void ScPageRowEntry::SetHidden(size_t nX) BOOL ScPageRowEntry::IsHidden(size_t nX) const { - return nX>=nPagesX || ( pHidden && pHidden[nX] ); //! inline? + return nX>=nPagesX || ( pHidden && pHidden[nX] ); //! inline? } size_t ScPageRowEntry::CountVisible() const @@ -188,12 +188,12 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions ) pDocShell->UpdatePendingRowHeights( nPrintTab ); pDoc = pDocShell->GetDocument(); - SfxPrinter* pDocPrinter = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen + SfxPrinter* pDocPrinter = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen if (pDocPrinter) aOldPrinterMode = pDocPrinter->GetMapMode(); - // einheitlicher MapMode ueber alle Aufrufe (z.B. Repaint !!!), - // weil die EditEngine sonst unterschiedliche Texthoehen liefert + // einheitlicher MapMode ueber alle Aufrufe (z.B. Repaint !!!), + // weil die EditEngine sonst unterschiedliche Texthoehen liefert pDev->SetMapMode(MAP_PIXEL); pPageEndX = NULL; @@ -206,7 +206,7 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions ) pEditEngine = NULL; pEditDefaults = NULL; - ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); + ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nPrintTab ), SFX_STYLE_FAMILY_PAGE ); @@ -227,27 +227,27 @@ void ScPrintFunc::Construct( const ScPrintOptions* pOptions ) InitParam(pOptions); - pPageData = NULL; // wird nur zur Initialisierung gebraucht + pPageData = NULL; // wird nur zur Initialisierung gebraucht } ScPrintFunc::ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB nTab, long nPage, long nDocP, const ScRange* pArea, const ScPrintOptions* pOptions, ScPageBreakData* pData ) - : pDocShell ( pShell ), - pPrinter ( pNewPrinter ), - pDrawView ( NULL ), - nPrintTab ( nTab ), - nPageStart ( nPage ), - nDocPages ( nDocP ), - pUserArea ( pArea ), - bState ( FALSE ), - bSourceRangeValid ( FALSE ), - bPrintCurrentTable ( FALSE ), - bMultiArea ( FALSE ), - nTabPages ( 0 ), - nTotalPages ( 0 ), - pPageData ( pData ) + : pDocShell ( pShell ), + pPrinter ( pNewPrinter ), + pDrawView ( NULL ), + nPrintTab ( nTab ), + nPageStart ( nPage ), + nDocPages ( nDocP ), + pUserArea ( pArea ), + bState ( FALSE ), + bSourceRangeValid ( FALSE ), + bPrintCurrentTable ( FALSE ), + bMultiArea ( FALSE ), + nTabPages ( 0 ), + nTotalPages ( 0 ), + pPageData ( pData ) { pDev = pPrinter; aSrcOffset = pPrinter->PixelToLogic( pPrinter->GetPageOffsetPixel(), MAP_100TH_MM ); @@ -257,20 +257,20 @@ ScPrintFunc::ScPrintFunc( ScDocShell* pShell, SfxPrinter* pNewPrinter, SCTAB nTa ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell, SCTAB nTab, long nPage, long nDocP, const ScRange* pArea, const ScPrintOptions* pOptions ) - : pDocShell ( pShell ), - pPrinter ( NULL ), - pDrawView ( NULL ), - nPrintTab ( nTab ), - nPageStart ( nPage ), - nDocPages ( nDocP ), - pUserArea ( pArea ), - bState ( FALSE ), - bSourceRangeValid ( FALSE ), - bPrintCurrentTable ( FALSE ), - bMultiArea ( FALSE ), - nTabPages ( 0 ), - nTotalPages ( 0 ), - pPageData ( NULL ) + : pDocShell ( pShell ), + pPrinter ( NULL ), + pDrawView ( NULL ), + nPrintTab ( nTab ), + nPageStart ( nPage ), + nDocPages ( nDocP ), + pUserArea ( pArea ), + bState ( FALSE ), + bSourceRangeValid ( FALSE ), + bPrintCurrentTable ( FALSE ), + bMultiArea ( FALSE ), + nTabPages ( 0 ), + nTotalPages ( 0 ), + pPageData ( NULL ) { pDev = pOutDev; Construct( pOptions ); @@ -278,30 +278,30 @@ ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell, SCTAB nTab, ScPrintFunc::ScPrintFunc( OutputDevice* pOutDev, ScDocShell* pShell, const ScPrintState& rState, const ScPrintOptions* pOptions ) - : pDocShell ( pShell ), - pPrinter ( NULL ), - pDrawView ( NULL ), - pUserArea ( NULL ), - bSourceRangeValid ( FALSE ), - bPrintCurrentTable ( FALSE ), - bMultiArea ( FALSE ), - pPageData ( NULL ) + : pDocShell ( pShell ), + pPrinter ( NULL ), + pDrawView ( NULL ), + pUserArea ( NULL ), + bSourceRangeValid ( FALSE ), + bPrintCurrentTable ( FALSE ), + bMultiArea ( FALSE ), + pPageData ( NULL ) { pDev = pOutDev; - nPrintTab = rState.nPrintTab; - nStartCol = rState.nStartCol; - nStartRow = rState.nStartRow; - nEndCol = rState.nEndCol; - nEndRow = rState.nEndRow; - nZoom = rState.nZoom; - nPagesX = rState.nPagesX; - nPagesY = rState.nPagesY; - nTabPages = rState.nTabPages; - nTotalPages = rState.nTotalPages; - nPageStart = rState.nPageStart; - nDocPages = rState.nDocPages; - bState = TRUE; + nPrintTab = rState.nPrintTab; + nStartCol = rState.nStartCol; + nStartRow = rState.nStartRow; + nEndCol = rState.nEndCol; + nEndRow = rState.nEndRow; + nZoom = rState.nZoom; + nPagesX = rState.nPagesX; + nPagesY = rState.nPagesY; + nTabPages = rState.nTabPages; + nTotalPages = rState.nTotalPages; + nPageStart = rState.nPageStart; + nDocPages = rState.nDocPages; + bState = TRUE; Construct( pOptions ); } @@ -356,18 +356,18 @@ ScPrintFunc::ScPrintFunc( ScDocShell* pShell, Window* pWindow, void ScPrintFunc::GetPrintState( ScPrintState& rState ) { - rState.nPrintTab = nPrintTab; - rState.nStartCol = nStartCol; - rState.nStartRow = nStartRow; - rState.nEndCol = nEndCol; - rState.nEndRow = nEndRow; - rState.nZoom = nZoom; - rState.nPagesX = nPagesX; - rState.nPagesY = nPagesY; - rState.nTabPages = nTabPages; - rState.nTotalPages = nTotalPages; - rState.nPageStart = nPageStart; - rState.nDocPages = nDocPages; + rState.nPrintTab = nPrintTab; + rState.nStartCol = nStartCol; + rState.nStartRow = nStartRow; + rState.nEndCol = nEndCol; + rState.nEndRow = nEndRow; + rState.nZoom = nZoom; + rState.nPagesX = nPagesX; + rState.nPagesY = nPagesY; + rState.nTabPages = nTabPages; + rState.nTotalPages = nTotalPages; + rState.nPageStart = nPageStart; + rState.nDocPages = nDocPages; } BOOL ScPrintFunc::GetLastSourceRange( ScRange& rRange ) const @@ -381,14 +381,14 @@ void ScPrintFunc::FillPageData() if (pPageData) { USHORT nCount = sal::static_int_cast<USHORT>( pPageData->GetCount() ); - ScPrintRangeData& rData = pPageData->GetData(nCount); // hochzaehlen + ScPrintRangeData& rData = pPageData->GetData(nCount); // hochzaehlen rData.SetPrintRange( ScRange( nStartCol, nStartRow, nPrintTab, nEndCol, nEndRow, nPrintTab ) ); rData.SetPagesX( nPagesX, pPageEndX ); rData.SetPagesY( nTotalY, pPageEndY ); - // Einstellungen + // Einstellungen rData.SetTopDown( aTableParam.bTopDown ); rData.SetAutomatic( !aAreaParam.bPrintArea ); } @@ -410,10 +410,10 @@ ScPrintFunc::~ScPrintFunc() delete pEditDefaults; delete pEditEngine; - // Druckereinstellungen werden jetzt von aussen wiederhergestellt + // Druckereinstellungen werden jetzt von aussen wiederhergestellt - // #64294# Fuer DrawingLayer/Charts muss der MapMode am Drucker (RefDevice) immer stimmen - SfxPrinter* pDocPrinter = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen + // #64294# Fuer DrawingLayer/Charts muss der MapMode am Drucker (RefDevice) immer stimmen + SfxPrinter* pDocPrinter = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen if (pDocPrinter) pDocPrinter->SetMapMode(aOldPrinterMode); } @@ -435,7 +435,7 @@ void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 ) if (((const ScProtectionAttr&)rCellInfo.pPatternAttr-> GetItem(ATTR_PROTECTION, rCellInfo.pConditionSet)).GetHidePrint()) { - pThisRowInfo->pCellInfo[nX+1].pCell = NULL; + pThisRowInfo->pCellInfo[nX+1].pCell = NULL; pThisRowInfo->pCellInfo[nX+1].bEmptyCellText = TRUE; } } @@ -443,17 +443,17 @@ void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 ) } // -// Ausgabe auf Device (static) +// Ausgabe auf Device (static) // -// wird benutzt fuer: -// - Clipboard/Bitmap -// - Ole-Object (DocShell::Draw) -// - Vorschau bei Vorlagen +// wird benutzt fuer: +// - Clipboard/Bitmap +// - Ole-Object (DocShell::Draw) +// - Vorschau bei Vorlagen void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPrintFactor */, const Rectangle& rBound, ScViewData* pViewData, BOOL bMetaFile ) { - //! nPrintFactor auswerten !!! + //! nPrintFactor auswerten !!! SCTAB nTab = 0; if (pViewData) @@ -526,15 +526,15 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr nTwipsSizeX += pDoc->GetColWidth( i, nTab ); long nTwipsSizeY = (long) pDoc->GetRowHeight( nY1, nY2, nTab ); - // wenn keine Linien, dann trotzdem Platz fuer den Aussenrahmen (20 Twips = 1pt) - // (HasLines initalisiert aLines auf 0,0,0,0) + // wenn keine Linien, dann trotzdem Platz fuer den Aussenrahmen (20 Twips = 1pt) + // (HasLines initalisiert aLines auf 0,0,0,0) nTwipsSizeX += aLines.Left() + Max( aLines.Right(), 20L ); nTwipsSizeY += aLines.Top() + Max( aLines.Bottom(), 20L ); double nScaleX = (double) nDevSizeX / nTwipsSizeX; double nScaleY = (double) nDevSizeY / nTwipsSizeY; - //! Flag bei FillInfo uebergeben !!!!! + //! Flag bei FillInfo uebergeben !!!!! ScRange aERange; BOOL bEmbed = pDoc->IsEmbedded(); if (bEmbed) @@ -543,7 +543,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr pDoc->ResetEmbedded(); } - // Daten zusammenstellen + // Daten zusammenstellen ScTableInfo aTabInfo; pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nTab, @@ -553,14 +553,14 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr if (bEmbed) pDoc->SetEmbedded(aERange); -/* if (!bMetaFile) +/* if (!bMetaFile) pDev->SetMapMode(MAP_PIXEL); */ long nScrX = aRect.Left(); long nScrY = aRect.Top(); - // Wenn keine Linien, trotzdem Platz fuer Gitterlinien lassen - // (werden sonst abgeschnitten) + // Wenn keine Linien, trotzdem Platz fuer Gitterlinien lassen + // (werden sonst abgeschnitten) long nAddX = (long)( aLines.Left() * nScaleX ); nScrX += ( nAddX ? nAddX : 1 ); long nAddY = (long)( aLines.Top() * nScaleY ); @@ -584,7 +584,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr aOutputData.SetDrawView( pDrawView ); } - //! SetUseStyleColor ?? + //! SetUseStyleColor ?? if ( bMetaFile && pDev->GetOutDevType() == OUTDEV_VIRDEV ) aOutputData.SetSnapPixel(); @@ -593,7 +593,7 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr long nLogStX = aLogStart.X(); long nLogStY = aLogStart.Y(); - //! nZoom fuer GetFont in OutputData ??? + //! nZoom fuer GetFont in OutputData ??? if (!bMetaFile && pViewData) pDev->SetMapMode(pViewData->GetLogicMode(pViewData->GetActivePart())); @@ -633,13 +633,13 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr if (!bMetaFile && pViewData) pDev->SetMapMode(aMode); - aOutputData.DrawGrid( TRUE, FALSE ); // keine Seitenumbrueche + aOutputData.DrawGrid( TRUE, FALSE ); // keine Seitenumbrueche pDev->SetLineColor( COL_BLACK ); Size aOne = pDev->PixelToLogic( Size(1,1) ); if (bMetaFile) - aOne = Size(1,1); // compatible with DrawGrid + aOne = Size(1,1); // compatible with DrawGrid long nRight = nScrX + aOutputData.GetScrW() - aOne.Width(); long nBottom = nScrY + aOutputData.GetScrH() - aOne.Height(); @@ -664,38 +664,38 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr } // -// Drucken +// Drucken // void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet ) { - // nDistance muss vorher unterschiedlich initalisiert sein + // nDistance muss vorher unterschiedlich initalisiert sein if ( pHFSet == NULL ) { - rParam.bEnable = FALSE; - rParam.pBorder = NULL; - rParam.pBack = NULL; - rParam.pShadow = NULL; + rParam.bEnable = FALSE; + rParam.pBorder = NULL; + rParam.pBack = NULL; + rParam.pShadow = NULL; } else { - rParam.bEnable = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_ON)).GetValue(); - rParam.bDynamic = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_DYNAMIC)).GetValue(); - rParam.bShared = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_SHARED)).GetValue(); - rParam.nHeight = ((const SvxSizeItem&) pHFSet->Get(ATTR_PAGE_SIZE)).GetSize().Height(); + rParam.bEnable = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_ON)).GetValue(); + rParam.bDynamic = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_DYNAMIC)).GetValue(); + rParam.bShared = ((const SfxBoolItem&) pHFSet->Get(ATTR_PAGE_SHARED)).GetValue(); + rParam.nHeight = ((const SvxSizeItem&) pHFSet->Get(ATTR_PAGE_SIZE)).GetSize().Height(); const SvxLRSpaceItem* pHFLR = &(const SvxLRSpaceItem&) pHFSet->Get(ATTR_LRSPACE); long nTmp; nTmp = pHFLR->GetLeft(); rParam.nLeft = nTmp < 0 ? 0 : USHORT(nTmp); nTmp = pHFLR->GetRight(); rParam.nRight = nTmp < 0 ? 0 : USHORT(nTmp); - rParam.pBorder = (const SvxBoxItem*) &pHFSet->Get(ATTR_BORDER); - rParam.pBack = (const SvxBrushItem*) &pHFSet->Get(ATTR_BACKGROUND); - rParam.pShadow = (const SvxShadowItem*)&pHFSet->Get(ATTR_SHADOW);; + rParam.pBorder = (const SvxBoxItem*) &pHFSet->Get(ATTR_BORDER); + rParam.pBack = (const SvxBrushItem*) &pHFSet->Get(ATTR_BACKGROUND); + rParam.pShadow = (const SvxShadowItem*)&pHFSet->Get(ATTR_SHADOW);; -// jetzt doch wieder schon im Dialog: -// rParam.nHeight += rParam.nDistance; // nicht mehr im Dialog ??? +// jetzt doch wieder schon im Dialog: +// rParam.nHeight += rParam.nDistance; // nicht mehr im Dialog ??? if (rParam.pBorder) rParam.nHeight += lcl_LineTotal( rParam.pBorder->GetTop() ) + @@ -708,14 +708,14 @@ void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet ) rParam.nHeight = 0; } -// bNew = TRUE: benutzten Bereich aus dem Dokument suchen -// bNew = FALSE: nur ganze Zeilen/Spalten begrenzen +// bNew = TRUE: benutzten Bereich aus dem Dokument suchen +// bNew = FALSE: nur ganze Zeilen/Spalten begrenzen BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew ) { - SCCOL nOldEndCol = nEndCol; // nur wichtig bei !bNew + SCCOL nOldEndCol = nEndCol; // nur wichtig bei !bNew SCROW nOldEndRow = nEndRow; - BOOL bChangeCol = TRUE; // bei bNew werden beide angepasst + BOOL bChangeCol = TRUE; // bei bNew werden beide angepasst BOOL bChangeRow = TRUE; BOOL bNotes = aTableParam.bNotes; @@ -724,7 +724,7 @@ BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew ) nStartCol = 0; nStartRow = 0; if (!pDoc->GetPrintArea( nPrintTab, nEndCol, nEndRow, bNotes )) - return FALSE; // nix + return FALSE; // nix } else { @@ -761,23 +761,23 @@ BOOL ScPrintFunc::AdjustPrintArea( BOOL bNew ) bFound = pDoc->GetPrintAreaVer( nPrintTab, nStartCol, nEndCol, nEndRow, bNotes ); if (!bFound) - return FALSE; // leer + return FALSE; // leer if (bForcedChangeRow) bChangeRow = TRUE; } pDoc->ExtendMerge( nStartCol,nStartRow, nEndCol,nEndRow, nPrintTab, - FALSE, TRUE ); // kein Refresh, incl. Attrs + FALSE, TRUE ); // kein Refresh, incl. Attrs if ( bChangeCol ) { - OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen - pRefDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize + OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen + pRefDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize pDoc->ExtendPrintArea( pRefDev, nPrintTab, nStartCol, nStartRow, nEndCol, nEndRow ); - // nEndCol wird veraendert + // nEndCol wird veraendert } if ( nEndCol < MAXCOL && pDoc->HasAttrib( @@ -798,14 +798,14 @@ long ScPrintFunc::TextHeight( const EditTextObject* pObject ) if (!pObject) return 0; -// pEditEngine->SetPageNo( nTotalPages ); +// pEditEngine->SetPageNo( nTotalPages ); pEditEngine->SetTextNewDefaults( *pObject, *pEditDefaults, FALSE ); return (long) pEditEngine->GetTextHeight(); } -// nZoom muss gesetzt sein !!! -// und der entsprechende Twip-MapMode eingestellt +// nZoom muss gesetzt sein !!! +// und der entsprechende Twip-MapMode eingestellt void ScPrintFunc::UpdateHFHeight( ScPrintHFParam& rParam ) { @@ -813,7 +813,7 @@ void ScPrintFunc::UpdateHFHeight( ScPrintHFParam& rParam ) if (rParam.bEnable && rParam.bDynamic) { - // nHeight aus Inhalten berechnen + // nHeight aus Inhalten berechnen MakeEditEngine(); long nPaperWidth = ( aPageSize.Width() - nLeftMargin - nRightMargin - @@ -855,7 +855,7 @@ void ScPrintFunc::UpdateHFHeight( ScPrintHFParam& rParam ) rParam.pShadow->CalcShadowSpace(SHADOW_BOTTOM); if (rParam.nHeight < rParam.nManHeight) - rParam.nHeight = rParam.nManHeight; // eingestelltes Minimum + rParam.nHeight = rParam.nManHeight; // eingestelltes Minimum } } @@ -876,9 +876,9 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) nBottomMargin = pULItem->GetLower(); const SvxPageItem* pPageItem = (const SvxPageItem*) &pParamSet->Get( ATTR_PAGE ); - nPageUsage = pPageItem->GetPageUsage(); - bLandscape = pPageItem->IsLandscape(); - aFieldData.eNumType = pPageItem->GetNumType(); + nPageUsage = pPageItem->GetPageUsage(); + bLandscape = pPageItem->IsLandscape(); + aFieldData.eNumType = pPageItem->GetNumType(); bCenterHor = ((const SfxBoolItem&) pParamSet->Get(ATTR_PAGE_HORCENTER)).GetValue(); bCenterVer = ((const SfxBoolItem&) pParamSet->Get(ATTR_PAGE_VERCENTER)).GetValue(); @@ -890,14 +890,14 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) aPageSize = SvxPaperInfo::GetPaperSize( PAPER_A4 ); } - pBorderItem = (const SvxBoxItem*) &pParamSet->Get(ATTR_BORDER); - pBackgroundItem = (const SvxBrushItem*) &pParamSet->Get(ATTR_BACKGROUND); - pShadowItem = (const SvxShadowItem*) &pParamSet->Get(ATTR_SHADOW); + pBorderItem = (const SvxBoxItem*) &pParamSet->Get(ATTR_BORDER); + pBackgroundItem = (const SvxBrushItem*) &pParamSet->Get(ATTR_BACKGROUND); + pShadowItem = (const SvxShadowItem*) &pParamSet->Get(ATTR_SHADOW); // TabPage "Kopfzeile" - aHdr.pLeft = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_HEADERLEFT); // Inhalt - aHdr.pRight = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_HEADERRIGHT); + aHdr.pLeft = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_HEADERLEFT); // Inhalt + aHdr.pRight = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_HEADERRIGHT); const SvxSetItem* pHeaderSetItem; const SfxItemSet* pHeaderSet = NULL; @@ -906,14 +906,14 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) { pHeaderSet = &pHeaderSetItem->GetItemSet(); // Kopfzeile hat unteren Abstand - aHdr.nDistance = ((const SvxULSpaceItem&) pHeaderSet->Get(ATTR_ULSPACE)).GetLower(); + aHdr.nDistance = ((const SvxULSpaceItem&) pHeaderSet->Get(ATTR_ULSPACE)).GetLower(); } lcl_FillHFParam( aHdr, pHeaderSet ); // TabPage "Fusszeile" - aFtr.pLeft = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_FOOTERLEFT); // Inhalt - aFtr.pRight = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_FOOTERRIGHT); + aFtr.pLeft = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_FOOTERLEFT); // Inhalt + aFtr.pRight = (const ScPageHFItem*) &pParamSet->Get(ATTR_PAGE_FOOTERRIGHT); const SvxSetItem* pFooterSetItem; const SfxItemSet* pFooterSet = NULL; @@ -922,7 +922,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) { pFooterSet = &pFooterSetItem->GetItemSet(); // Fusszeile hat oberen Abstand - aFtr.nDistance = ((const SvxULSpaceItem&) pFooterSet->Get(ATTR_ULSPACE)).GetUpper(); + aFtr.nDistance = ((const SvxULSpaceItem&) pFooterSet->Get(ATTR_ULSPACE)).GetUpper(); } lcl_FillHFParam( aFtr, pFooterSet ); @@ -957,47 +957,47 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) DBG_ASSERT( pScaleItem && pScaleToItem && pScaleToPagesItem, "Missing ScaleItem! :-/" ); aTableParam.bCellContent = TRUE; - aTableParam.bNotes = GET_BOOL(pParamSet,ATTR_PAGE_NOTES); - aTableParam.bGrid = GET_BOOL(pParamSet,ATTR_PAGE_GRID); - aTableParam.bHeaders = GET_BOOL(pParamSet,ATTR_PAGE_HEADERS); - aTableParam.bFormulas = GET_BOOL(pParamSet,ATTR_PAGE_FORMULAS); - aTableParam.bNullVals = GET_BOOL(pParamSet,ATTR_PAGE_NULLVALS); - aTableParam.bCharts = GET_SHOW(pParamSet,ATTR_PAGE_CHARTS); - aTableParam.bObjects = GET_SHOW(pParamSet,ATTR_PAGE_OBJECTS); - aTableParam.bDrawings = GET_SHOW(pParamSet,ATTR_PAGE_DRAWINGS); - aTableParam.bTopDown = GET_BOOL(pParamSet,ATTR_PAGE_TOPDOWN); - aTableParam.bLeftRight = !aTableParam.bLeftRight; - aTableParam.nFirstPageNo = GET_USHORT(pParamSet,ATTR_PAGE_FIRSTPAGENO); + aTableParam.bNotes = GET_BOOL(pParamSet,ATTR_PAGE_NOTES); + aTableParam.bGrid = GET_BOOL(pParamSet,ATTR_PAGE_GRID); + aTableParam.bHeaders = GET_BOOL(pParamSet,ATTR_PAGE_HEADERS); + aTableParam.bFormulas = GET_BOOL(pParamSet,ATTR_PAGE_FORMULAS); + aTableParam.bNullVals = GET_BOOL(pParamSet,ATTR_PAGE_NULLVALS); + aTableParam.bCharts = GET_SHOW(pParamSet,ATTR_PAGE_CHARTS); + aTableParam.bObjects = GET_SHOW(pParamSet,ATTR_PAGE_OBJECTS); + aTableParam.bDrawings = GET_SHOW(pParamSet,ATTR_PAGE_DRAWINGS); + aTableParam.bTopDown = GET_BOOL(pParamSet,ATTR_PAGE_TOPDOWN); + aTableParam.bLeftRight = !aTableParam.bLeftRight; + aTableParam.nFirstPageNo = GET_USHORT(pParamSet,ATTR_PAGE_FIRSTPAGENO); if (!aTableParam.nFirstPageNo) - aTableParam.nFirstPageNo = (USHORT) nPageStart; // von vorheriger Tabelle + aTableParam.nFirstPageNo = (USHORT) nPageStart; // von vorheriger Tabelle if ( pScaleItem && pScaleToItem && pScaleToPagesItem ) { - UINT16 nScaleAll = pScaleItem->GetValue(); - UINT16 nScaleToPages = pScaleToPagesItem->GetValue(); + UINT16 nScaleAll = pScaleItem->GetValue(); + UINT16 nScaleToPages = pScaleToPagesItem->GetValue(); - aTableParam.bScaleNone = (nScaleAll == 100); - aTableParam.bScaleAll = (nScaleAll > 0 ); + aTableParam.bScaleNone = (nScaleAll == 100); + aTableParam.bScaleAll = (nScaleAll > 0 ); aTableParam.bScaleTo = pScaleToItem->IsValid(); - aTableParam.bScalePageNum = (nScaleToPages > 0 ); - aTableParam.nScaleAll = nScaleAll; + aTableParam.bScalePageNum = (nScaleToPages > 0 ); + aTableParam.nScaleAll = nScaleAll; aTableParam.nScaleWidth = pScaleToItem->GetWidth(); aTableParam.nScaleHeight = pScaleToItem->GetHeight(); - aTableParam.nScalePageNum = nScaleToPages; + aTableParam.nScalePageNum = nScaleToPages; } else { - aTableParam.bScaleNone = TRUE; - aTableParam.bScaleAll = FALSE; + aTableParam.bScaleNone = TRUE; + aTableParam.bScaleAll = FALSE; aTableParam.bScaleTo = FALSE; - aTableParam.bScalePageNum = FALSE; - aTableParam.nScaleAll = 0; + aTableParam.bScalePageNum = FALSE; + aTableParam.nScaleAll = 0; aTableParam.nScaleWidth = 0; aTableParam.nScaleHeight = 0; - aTableParam.nScalePageNum = 0; + aTableParam.nScalePageNum = 0; } - // skip empty pages only if options with that flag are passed + // skip empty pages only if options with that flag are passed aTableParam.bSkipEmpty = pOptions && pOptions->GetSkipEmpty(); if ( pPageData ) aTableParam.bSkipEmpty = FALSE; @@ -1008,28 +1008,28 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) // TabPage "Bereiche": //------------------------------------------------------ - //! alle PrintAreas der Tabelle durchgehen !!! - const ScRange* pPrintArea = pDoc->GetPrintRange( nPrintTab, 0 ); - const ScRange* pRepeatCol = pDoc->GetRepeatColRange( nPrintTab ); - const ScRange* pRepeatRow = pDoc->GetRepeatRowRange( nPrintTab ); + //! alle PrintAreas der Tabelle durchgehen !!! + const ScRange* pPrintArea = pDoc->GetPrintRange( nPrintTab, 0 ); + const ScRange* pRepeatCol = pDoc->GetRepeatColRange( nPrintTab ); + const ScRange* pRepeatRow = pDoc->GetRepeatRowRange( nPrintTab ); - // ATTR_PAGE_PRINTTABLES wird ignoriert + // ATTR_PAGE_PRINTTABLES wird ignoriert - if ( pUserArea ) // UserArea (Selektion) hat Vorrang + if ( pUserArea ) // UserArea (Selektion) hat Vorrang { bPrintCurrentTable = - aAreaParam.bPrintArea = TRUE; // Selektion + aAreaParam.bPrintArea = TRUE; // Selektion aAreaParam.aPrintArea = *pUserArea; - // Die Tabellen-Abfrage ist schon in DocShell::Print, hier immer + // Die Tabellen-Abfrage ist schon in DocShell::Print, hier immer aAreaParam.aPrintArea.aStart.SetTab(nPrintTab); aAreaParam.aPrintArea.aEnd.SetTab(nPrintTab); -// lcl_LimitRange( aAreaParam.aPrintArea, nPrintTab ); // ganze Zeilen/Spalten... +// lcl_LimitRange( aAreaParam.aPrintArea, nPrintTab ); // ganze Zeilen/Spalten... } else if ( pDoc->HasPrintRange() ) { - if ( pPrintArea ) // mindestens eine gesetzt ? + if ( pPrintArea ) // mindestens eine gesetzt ? { bPrintCurrentTable = aAreaParam.bPrintArea = TRUE; @@ -1046,7 +1046,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) } else { - // #74834# don't print hidden tables if there's no print range defined there + // #74834# don't print hidden tables if there's no print range defined there if ( pDoc->IsVisible( nPrintTab ) ) { aAreaParam.bPrintArea = FALSE; @@ -1054,7 +1054,7 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) } else { - aAreaParam.bPrintArea = TRUE; // otherwise the table is always counted + aAreaParam.bPrintArea = TRUE; // otherwise the table is always counted bPrintCurrentTable = FALSE; } } @@ -1063,8 +1063,8 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) { aAreaParam.bRepeatCol = TRUE; aAreaParam.aRepeatCol = *pRepeatCol; - nRepeatStartCol = pRepeatCol->aStart.Col(); - nRepeatEndCol = pRepeatCol->aEnd .Col(); + nRepeatStartCol = pRepeatCol->aStart.Col(); + nRepeatEndCol = pRepeatCol->aEnd .Col(); } else { @@ -1076,8 +1076,8 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) { aAreaParam.bRepeatRow = TRUE; aAreaParam.aRepeatRow = *pRepeatRow; - nRepeatStartRow = pRepeatRow->aStart.Row(); - nRepeatEndRow = pRepeatRow->aEnd .Row(); + nRepeatStartRow = pRepeatRow->aStart.Row(); + nRepeatEndRow = pRepeatRow->aEnd .Row(); } else { @@ -1086,19 +1086,19 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) } // - // Seiten aufteilen + // Seiten aufteilen // if (!bState) { - nTabPages = CountPages(); // berechnet auch Zoom + nTabPages = CountPages(); // berechnet auch Zoom nTotalPages = nTabPages; nTotalPages += CountNotePages(); } else { - CalcPages(); // nur Umbrueche suchen - CountNotePages(); // Notizen zaehlen, auch wenn Seitenzahl schon bekannt + CalcPages(); // nur Umbrueche suchen + CountNotePages(); // Notizen zaehlen, auch wenn Seitenzahl schon bekannt } if (nDocPages) @@ -1108,15 +1108,15 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) SetDateTime( Date(), Time() ); - aFieldData.aTitle = pDocShell->GetTitle(); + aFieldData.aTitle = pDocShell->GetTitle(); const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); - aFieldData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); + aFieldData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); if ( aFieldData.aLongDocName.Len() ) aFieldData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS ); else aFieldData.aShortDocName = aFieldData.aLongDocName = aFieldData.aTitle; - // Druckereinstellungen (Orientation, Paper) jetzt erst bei DoPrint + // Druckereinstellungen (Orientation, Paper) jetzt erst bei DoPrint } Size ScPrintFunc::GetDataSize() const @@ -1183,7 +1183,7 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi Size aDrawSize = aGrfSize; bool bDraw = TRUE; -// bool bRetouche = TRUE; +// bool bRetouche = TRUE; switch ( ePos ) { case GPOS_LT: aPos = rOrg.TopLeft(); @@ -1218,13 +1218,13 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi case GPOS_AREA: aPos = rOrg.TopLeft(); aDrawSize = rOrg.GetSize(); -// bRetouche = FALSE; +// bRetouche = FALSE; break; case GPOS_TILED: { - // #104004# use GraphicObject::DrawTiled instead of an own loop - // (pixel rounding is handled correctly, and a very small bitmap - // is duplicated into a bigger one for better performance) + // #104004# use GraphicObject::DrawTiled instead of an own loop + // (pixel rounding is handled correctly, and a very small bitmap + // is duplicated into a bigger one for better performance) GraphicObject aObject( *pGraphic ); @@ -1253,10 +1253,10 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi // per bitmap pixel. This is approximately 50 // and 7 for current PDF writer, respectively. // - const double k1( 50 ); - const double k2( 7 ); - const Size aSize( rOrg.GetSize() ); - const double Abitmap( k1/k2 * aSize.Width()*aSize.Height() ); + const double k1( 50 ); + const double k2( 7 ); + const Size aSize( rOrg.GetSize() ); + const double Abitmap( k1/k2 * aSize.Width()*aSize.Height() ); aObject.DrawTiled( pOut, rOrg, aGrfSize, Size(0,0), NULL, GRFMGR_DRAW_STANDARD, @@ -1268,7 +1268,7 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi } bDraw = FALSE; -// bRetouche = FALSE; +// bRetouche = FALSE; } break; @@ -1285,13 +1285,13 @@ void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevi } } -// Rahmen wird nach innen gezeichnet +// Rahmen wird nach innen gezeichnet void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, const SvxBoxItem* pBorderData, const SvxBrushItem* pBackground, const SvxShadowItem* pShadow ) { - //! direkte Ausgabe aus SvxBoxItem !!! + //! direkte Ausgabe aus SvxBoxItem !!! if (pBorderData) if ( !pBorderData->GetTop() && !pBorderData->GetBottom() && !pBorderData->GetLeft() && @@ -1299,25 +1299,25 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, pBorderData = NULL; if (!pBorderData && !pBackground && !pShadow) - return; // nichts zu tun + return; // nichts zu tun long nLeft = 0; long nRight = 0; long nTop = 0; long nBottom = 0; - // aFrameRect - aussen um die Umrandung, ohne Schatten + // aFrameRect - aussen um die Umrandung, ohne Schatten if ( pShadow && pShadow->GetLocation() != SVX_SHADOW_NONE ) { - nLeft += (long) ( pShadow->CalcShadowSpace(SHADOW_LEFT) * nScaleX ); - nRight += (long) ( pShadow->CalcShadowSpace(SHADOW_RIGHT) * nScaleX ); - nTop += (long) ( pShadow->CalcShadowSpace(SHADOW_TOP) * nScaleY ); - nBottom += (long) ( pShadow->CalcShadowSpace(SHADOW_BOTTOM) * nScaleY ); + nLeft += (long) ( pShadow->CalcShadowSpace(SHADOW_LEFT) * nScaleX ); + nRight += (long) ( pShadow->CalcShadowSpace(SHADOW_RIGHT) * nScaleX ); + nTop += (long) ( pShadow->CalcShadowSpace(SHADOW_TOP) * nScaleY ); + nBottom += (long) ( pShadow->CalcShadowSpace(SHADOW_BOTTOM) * nScaleY ); } Rectangle aFrameRect( Point(nScrX+nLeft, nScrY+nTop), Size(nScrW-nLeft-nRight, nScrH-nTop-nBottom) ); - // Mitte der Umrandung, um Linien ueber OutputData zu zeichnen: + // Mitte der Umrandung, um Linien ueber OutputData zu zeichnen: if (pBorderData) { nLeft += (long) ( lcl_LineTotal(pBorderData->GetLeft()) * nScaleX / 2 ); @@ -1328,22 +1328,22 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, long nEffHeight = nScrH - nTop - nBottom; long nEffWidth = nScrW - nLeft - nRight; if (nEffHeight<=0 || nEffWidth<=0) - return; // leer + return; // leer - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) BOOL bCellContrast = bUseStyleColor && Application::GetSettings().GetStyleSettings().GetHighContrastMode(); if ( pBackground && !bCellContrast ) { -// Rectangle aBackRect( Point(nScrX+nLeft, nScrY+nTop), Size(nEffWidth,nEffHeight) ); +// Rectangle aBackRect( Point(nScrX+nLeft, nScrY+nTop), Size(nEffWidth,nEffHeight) ); if (pBackground->GetGraphicPos() != GPOS_NONE) { OutputDevice* pRefDev; if ( bIsRender ) - pRefDev = pDev; // don't use printer for PDF + pRefDev = pDev; // don't use printer for PDF else - pRefDev = pDoc->GetPrinter(); // use printer also for preview + pRefDev = pDoc->GetPrinter(); // use printer also for preview lcl_DrawGraphic( *pBackground, pDev, pRefDev, aFrameRect, aFrameRect ); } @@ -1425,7 +1425,7 @@ void ScPrintFunc::DrawBorder( long nScrX, long nScrY, long nScrW, long nScrH, nScrX+nLeft, nScrY+nTop, 0,0, 0,0, nScaleX, nScaleY ); aOutputData.SetUseStyleColor( bUseStyleColor ); -// pDev->SetMapMode(aTwipMode); +// pDev->SetMapMode(aTwipMode); if (pBorderData) aOutputData.DrawFrame(); @@ -1569,7 +1569,7 @@ void ScPrintFunc::LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, long nScrX, long nScrY, BOOL bRepCol, BOOL bRepRow, ScPreviewLocationData& rLocationData ) { - // get MapMode for drawing objects (same MapMode as in ScOutputData::PrintDrawingLayer) + // get MapMode for drawing objects (same MapMode as in ScOutputData::PrintDrawingLayer) Point aLogPos = OutputDevice::LogicToLogic(Point(nScrX,nScrY), aOffsetMode, aLogicMode); long nLogStX = aLogPos.X(); @@ -1587,7 +1587,7 @@ void ScPrintFunc::LocateArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, aMMOffset += Point( nLogStX, nLogStY ); MapMode aDrawMapMode( MAP_100TH_MM, aMMOffset, aLogicMode.GetScaleX(), aLogicMode.GetScaleY() ); - // get pixel rectangle + // get pixel rectangle Size aOnePixel = pDev->PixelToLogic(Size(1,1)); long nOneX = aOnePixel.Width(); @@ -1617,7 +1617,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if ( nX2 < nX1 || nY2 < nY1 ) return; - //! Flag bei FillInfo uebergeben !!!!! + //! Flag bei FillInfo uebergeben !!!!! ScRange aERange; BOOL bEmbed = pDoc->IsEmbedded(); if (bEmbed) @@ -1630,7 +1630,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, long nLogStX = aPos.X(); long nLogStY = aPos.Y(); - // Daten zusammenstellen + // Daten zusammenstellen ScTableInfo aTabInfo; pDoc->FillInfo( aTabInfo, nX1, nY1, nX2, nY2, nPrintTab, @@ -1654,7 +1654,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if(!bHideAllDrawingLayer) { pDev->SetMapMode(aLogicMode); - // hier kein Clipping setzen (Mapmode wird verschoben) + // hier kein Clipping setzen (Mapmode wird verschoben) // #i72502# aOutputData.PrintDrawingLayer(SC_LAYER_BACK, aMMOffset); @@ -1673,40 +1673,40 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, if ( !pPrinter ) { - OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen - Fraction aPrintFrac( nZoom, 100 ); // ohne nManualZoom - // MapMode, wie er beim Drucken herauskommen wuerde: + OutputDevice* pRefDev = pDoc->GetPrinter(); // auch fuer Preview den Drucker nehmen + Fraction aPrintFrac( nZoom, 100 ); // ohne nManualZoom + // MapMode, wie er beim Drucken herauskommen wuerde: pRefDev->SetMapMode( MapMode( MAP_100TH_MM, Point(), aPrintFrac, aPrintFrac ) ); - // when rendering (PDF), don't use printer as ref device, but printer's MapMode - // has to be set anyway, as charts still use it (#106409#) + // when rendering (PDF), don't use printer as ref device, but printer's MapMode + // has to be set anyway, as charts still use it (#106409#) if ( !bIsRender ) aOutputData.SetRefDevice( pRefDev ); } -// aOutputData.SetMetaFileMode(TRUE); +// aOutputData.SetMetaFileMode(TRUE); if( aTableParam.bCellContent ) aOutputData.DrawBackground(); pDev->SetClipRegion( Rectangle( aPos, Size( aOutputData.GetScrW(), aOutputData.GetScrH() ) ) ); pDev->SetClipRegion(); -// aOutputData.SetMetaFileMode(FALSE); +// aOutputData.SetMetaFileMode(FALSE); if( aTableParam.bCellContent ) { aOutputData.DrawExtraShadow( bShLeft, bShTop, bShRight, bShBottom ); aOutputData.DrawFrame(); aOutputData.DrawStrings(); - // pDev->SetMapMode(aLogicMode); + // pDev->SetMapMode(aLogicMode); aOutputData.DrawEdit(FALSE); } -// pDev->SetMapMode(aOffsetMode); +// pDev->SetMapMode(aOffsetMode); if (aTableParam.bGrid) - aOutputData.DrawGrid( TRUE, FALSE ); // keine Seitenumbrueche + aOutputData.DrawGrid( TRUE, FALSE ); // keine Seitenumbrueche -/*!!!!!!!!!!! Notizen in Tabelle markieren ?????????????????????????? +/*!!!!!!!!!!! Notizen in Tabelle markieren ?????????????????????????? if (aTableParam.bNotes) { @@ -1718,7 +1718,7 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, aOutputData.AddPDFNotes(); // has no effect if not rendering PDF with notes enabled -// pDev->SetMapMode(aDrawMode); +// pDev->SetMapMode(aDrawMode); // test if all paint parts are hidden, then a paint is not necessary at all if(!bHideAllDrawingLayer) @@ -1732,13 +1732,13 @@ void ScPrintFunc::PrintArea( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, aOutputData.PostPrintDrawingLayer(aMMOffset); // #i74768# } -BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ? +BOOL ScPrintFunc::IsMirror( long nPageNo ) // Raender spiegeln ? { SvxPageUsage eUsage = (SvxPageUsage) ( nPageUsage & 0x000f ); return ( eUsage == SVX_PAGE_MIRROR && (nPageNo & 1) ); } -BOOL ScPrintFunc::IsLeft( long nPageNo ) // linke Fussnoten ? +BOOL ScPrintFunc::IsLeft( long nPageNo ) // linke Fussnoten ? { SvxPageUsage eUsage = (SvxPageUsage) ( nPageUsage & 0x000f ); BOOL bLeft; @@ -1760,8 +1760,8 @@ void ScPrintFunc::MakeEditEngine() { if (!pEditEngine) { - // can't use document's edit engine pool here, - // because pool must have twips as default metric + // can't use document's edit engine pool here, + // because pool must have twips as default metric pEditEngine = new ScHeaderEditEngine( EditEngine::CreatePool(), TRUE ); pEditEngine->EnableUndo(FALSE); @@ -1771,42 +1771,42 @@ void ScPrintFunc::MakeEditEngine() pEditEngine->SetControlWord( pEditEngine->GetControlWord() & ~EE_CNTRL_RTFSTYLESHEETS ); pEditEngine->EnableAutoColor( bUseStyleColor ); - // Default-Set fuer Ausrichtung + // Default-Set fuer Ausrichtung pEditDefaults = new SfxItemSet( pEditEngine->GetEmptyItemSet() ); const ScPatternAttr& rPattern = (const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN); rPattern.FillEditItemSet( pEditDefaults ); - // FillEditItemSet adjusts font height to 1/100th mm, - // but for header/footer twips is needed, as in the PatternAttr: + // FillEditItemSet adjusts font height to 1/100th mm, + // but for header/footer twips is needed, as in the PatternAttr: pEditDefaults->Put( rPattern.GetItem(ATTR_FONT_HEIGHT), EE_CHAR_FONTHEIGHT ); pEditDefaults->Put( rPattern.GetItem(ATTR_CJK_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CJK ); pEditDefaults->Put( rPattern.GetItem(ATTR_CTL_FONT_HEIGHT), EE_CHAR_FONTHEIGHT_CTL ); - // #69193# dont use font color, because background color is not used - //! there's no way to set the background for note pages + // #69193# dont use font color, because background color is not used + //! there's no way to set the background for note pages pEditDefaults->ClearItem( EE_CHAR_COLOR ); if (ScGlobal::IsSystemRTL()) pEditDefaults->Put( SvxFrameDirectionItem( FRMDIR_HORI_RIGHT_TOP, EE_PARA_WRITINGDIR ) ); } - pEditEngine->SetData( aFieldData ); // Seitennummer etc. setzen + pEditEngine->SetData( aFieldData ); // Seitennummer etc. setzen } -// nStartY = logic +// nStartY = logic void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, BOOL bDoPrint, ScPreviewLocationData* pLocationData ) { const ScPrintHFParam& rParam = bHeader ? aHdr : aFtr; - pDev->SetMapMode( aTwipMode ); // Kopf-/Fusszeilen in Twips + pDev->SetMapMode( aTwipMode ); // Kopf-/Fusszeilen in Twips BOOL bLeft = IsLeft(nPageNo) && !rParam.bShared; const ScPageHFItem* pHFItem = bLeft ? rParam.pLeft : rParam.pRight; long nLineStartX = aPageRect.Left() + rParam.nLeft; - long nLineEndX = aPageRect.Right() - rParam.nRight; + long nLineEndX = aPageRect.Right() - rParam.nRight; long nLineWidth = nLineEndX - nLineStartX + 1; - // Edit-Engine + // Edit-Engine Point aStart( nLineStartX, nStartY ); Size aPaperSize( nLineWidth, rParam.nHeight-rParam.nDistance ); @@ -1822,8 +1822,8 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, if ( rParam.pShadow && rParam.pShadow->GetLocation() != SVX_SHADOW_NONE ) { - long nLeft = rParam.pShadow->CalcShadowSpace(SHADOW_LEFT); - long nTop = rParam.pShadow->CalcShadowSpace(SHADOW_TOP); + long nLeft = rParam.pShadow->CalcShadowSpace(SHADOW_LEFT); + long nTop = rParam.pShadow->CalcShadowSpace(SHADOW_TOP); aStart.X() += nLeft; aStart.Y() += nTop; aPaperSize.Width() -= nLeft + rParam.pShadow->CalcShadowSpace(SHADOW_RIGHT); @@ -1836,14 +1836,14 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, pEditEngine->SetPaperSize(aPaperSize); const EditTextObject* pObject; - // Rahmen / Hintergrund + // Rahmen / Hintergrund Point aBorderStart( nLineStartX, nStartY ); Size aBorderSize( nLineWidth, rParam.nHeight-rParam.nDistance ); if ( rParam.bDynamic ) { - // hier nochmal anpassen, wegen geraden/ungeraden Kopf/Fusszeilen - // und evtl. anderen Umbruechen durch Variablen (Seitennummer etc.) + // hier nochmal anpassen, wegen geraden/ungeraden Kopf/Fusszeilen + // und evtl. anderen Umbruechen durch Variablen (Seitennummer etc.) long nMaxHeight = 0; nMaxHeight = Max( nMaxHeight, TextHeight( pHFItem->GetLeftArea() ) ); @@ -1859,7 +1859,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, rParam.pShadow->CalcShadowSpace(SHADOW_BOTTOM); if (nMaxHeight < rParam.nManHeight-rParam.nDistance) - nMaxHeight = rParam.nManHeight-rParam.nDistance; // eingestelltes Minimum + nMaxHeight = rParam.nManHeight-rParam.nDistance; // eingestelltes Minimum aBorderSize.Height() = nMaxHeight; } @@ -1868,17 +1868,17 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, { double nOldScaleX = nScaleX; double nOldScaleY = nScaleY; - nScaleX = nScaleY = 1.0; // direkt in Twips ausgeben + nScaleX = nScaleY = 1.0; // direkt in Twips ausgeben DrawBorder( aBorderStart.X(), aBorderStart.Y(), aBorderSize.Width(), aBorderSize.Height(), rParam.pBorder, rParam.pBack, rParam.pShadow ); nScaleX = nOldScaleX; nScaleY = nOldScaleY; - // Clipping fuer Text + // Clipping fuer Text pDev->SetClipRegion( Rectangle( aStart, aPaperSize ) ); - // links + // links pObject = pHFItem->GetLeftArea(); if (pObject) @@ -1892,7 +1892,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, pEditEngine->Draw( pDev, aDraw, 0 ); } - // Mitte + // Mitte pObject = pHFItem->GetCenterArea(); if (pObject) @@ -1906,7 +1906,7 @@ void ScPrintFunc::PrintHF( long nPageNo, BOOL bHeader, long nStartY, pEditEngine->Draw( pDev, aDraw, 0 ); } - // rechts + // rechts pObject = pHFItem->GetRightArea(); if (pObject) @@ -1942,15 +1942,15 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData Font aMarkFont; ScAutoFontColorMode eColorMode = bUseStyleColor ? SC_AUTOCOL_DISPLAY : SC_AUTOCOL_PRINT; ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).GetFont( aMarkFont, eColorMode ); -//? aMarkFont.SetWeight( WEIGHT_BOLD ); +//? aMarkFont.SetWeight( WEIGHT_BOLD ); pDev->SetFont( aMarkFont ); long nMarkLen = pDev->GetTextWidth( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("GW99999:"))); // ohne Space, weil's eh selten so weit kommt Size aDataSize = aPageRect.GetSize(); - if ( nMarkLen > aDataSize.Width() / 2 ) // alles viel zu klein? - nMarkLen = aDataSize.Width() / 2; // Seite bruederlich aufteilen + if ( nMarkLen > aDataSize.Width() / 2 ) // alles viel zu klein? + nMarkLen = aDataSize.Width() / 2; // Seite bruederlich aufteilen aDataSize.Width() -= nMarkLen; pEditEngine->SetPaperSize( aDataSize ); @@ -1981,7 +1981,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData pPos->Format( aMarkStr, SCA_VALID, pDoc, pDoc->GetAddressConvention() ); aMarkStr += ':'; - // Zellposition auch per EditEngine, damit die Position stimmt + // Zellposition auch per EditEngine, damit die Position stimmt pEditEngine->SetText(aMarkStr); pEditEngine->Draw( pDev, Point( aPageRect.Left(), nPosY ), 0 ); } @@ -1995,7 +1995,7 @@ long ScPrintFunc::DoNotes( long nNoteStart, BOOL bDoPrint, ScPreviewLocationData } nPosY += nTextHeight; - nPosY += 200; // Abstand + nPosY += 200; // Abstand ++nCount; bOk = TRUE; } @@ -2014,7 +2014,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr if ( bDoPrint && bClearWin ) { - //! mit PrintPage zusammenfassen !!! + //! mit PrintPage zusammenfassen !!! Color aBackgroundColor( COL_WHITE ); if ( bUseStyleColor ) @@ -2029,7 +2029,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr } - // aPageRect auf linke / rechte Seiten anpassen + // aPageRect auf linke / rechte Seiten anpassen Rectangle aTempRect = Rectangle( Point(), aPageSize ); if (IsMirror(nPageNo)) @@ -2051,7 +2051,7 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, BOOL bDoPrint, ScPr if ( bDoPrint || pLocationData ) { - // Kopf- und Fusszeilen + // Kopf- und Fusszeilen if (aHdr.bEnable) { @@ -2082,11 +2082,11 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO BOOL bLayoutRTL = pDoc->IsLayoutRTL( nPrintTab ); long nLayoutSign = bLayoutRTL ? -1 : 1; - // nPageNo is the page number within all sheets of one "start page" setting + // nPageNo is the page number within all sheets of one "start page" setting if ( bClearWin && bDoPrint ) { - // muss genau zum Zeichnen des Rahmens in preview.cxx passen !!! + // muss genau zum Zeichnen des Rahmens in preview.cxx passen !!! Color aBackgroundColor( COL_WHITE ); if ( bUseStyleColor ) @@ -2101,7 +2101,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO } - // aPageRect auf linke / rechte Seiten anpassen + // aPageRect auf linke / rechte Seiten anpassen Rectangle aTempRect = Rectangle( Point(), aPageSize ); if (IsMirror(nPageNo)) @@ -2139,7 +2139,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO // pPrinter->StartPage(); } - // Kopf- und Fusszeilen (ohne Zentrierung) + // Kopf- und Fusszeilen (ohne Zentrierung) if (aHdr.bEnable) { @@ -2152,9 +2152,9 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO PrintHF( nPageNo, FALSE, nFooterY, bDoPrint, pLocationData ); } - // Position ( Raender / zentrieren ) + // Position ( Raender / zentrieren ) - long nLeftSpace = aPageRect.Left(); // Document-Twips + long nLeftSpace = aPageRect.Left(); // Document-Twips long nTopSpace = aPageRect.Top(); if ( bCenterHor || bLayoutRTL ) { @@ -2169,18 +2169,18 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO nDataWidth += (long) PRINT_HEADER_WIDTH; if (pBorderItem) nDataWidth += pBorderItem->GetDistance(BOX_LINE_LEFT) + - pBorderItem->GetDistance(BOX_LINE_RIGHT); //! Line width? + pBorderItem->GetDistance(BOX_LINE_RIGHT); //! Line width? if (pShadowItem && pShadowItem->GetLocation() != SVX_SHADOW_NONE) nDataWidth += pShadowItem->CalcShadowSpace(SHADOW_LEFT) + pShadowItem->CalcShadowSpace(SHADOW_RIGHT); if ( bCenterHor ) { - nLeftSpace += ( aPageRect.GetWidth() - nDataWidth ) / 2; // LTR or RTL + nLeftSpace += ( aPageRect.GetWidth() - nDataWidth ) / 2; // LTR or RTL if (pBorderItem) nLeftSpace -= lcl_LineTotal(pBorderItem->GetLeft()); } else if ( bLayoutRTL ) - nLeftSpace += aPageRect.GetWidth() - nDataWidth; // align to the right edge of the page + nLeftSpace += aPageRect.GetWidth() - nDataWidth; // align to the right edge of the page } if ( bCenterVer ) { @@ -2192,7 +2192,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO nDataHeight += (long) PRINT_HEADER_HEIGHT; if (pBorderItem) nDataHeight += pBorderItem->GetDistance(BOX_LINE_TOP) + - pBorderItem->GetDistance(BOX_LINE_BOTTOM); //! Line width? + pBorderItem->GetDistance(BOX_LINE_BOTTOM); //! Line width? if (pShadowItem && pShadowItem->GetLocation() != SVX_SHADOW_NONE) nDataHeight += pShadowItem->CalcShadowSpace(SHADOW_TOP) + pShadowItem->CalcShadowSpace(SHADOW_BOTTOM); @@ -2201,14 +2201,14 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO nTopSpace -= lcl_LineTotal(pBorderItem->GetTop()); } - // calculate sizes of the elements for partitioning - // (header, repeat, data) + // calculate sizes of the elements for partitioning + // (header, repeat, data) long nHeaderWidth = 0; long nHeaderHeight = 0; long nRepeatWidth = 0; long nRepeatHeight = 0; - long nContentWidth = 0; // scaled - not the same as nDataWidth above + long nContentWidth = 0; // scaled - not the same as nDataWidth above long nContentHeight = 0; if (aTableParam.bHeaders) { @@ -2226,12 +2226,12 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO nContentHeight += pDoc->GetScaledRowHeight( nY1, nY2, nPrintTab, nScaleY); - // partition the page + // partition the page long nStartX = ((long) ( nLeftSpace * nScaleX )); long nStartY = ((long) ( nTopSpace * nScaleY )); -// nStartX -= aOffset.X(); // schon im MapMode -// nStartY -= aOffset.Y(); +// nStartX -= aOffset.X(); // schon im MapMode +// nStartY -= aOffset.Y(); long nInnerStartX = nStartX; long nInnerStartY = nStartY; @@ -2250,10 +2250,10 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO if ( bLayoutRTL ) { - // arrange elements starting from the right edge + // arrange elements starting from the right edge nInnerStartX += nHeaderWidth + nRepeatWidth + nContentWidth; - // make rounding easier so the elements are really next to each other in preview + // make rounding easier so the elements are really next to each other in preview Size aOffsetOnePixel = pDev->PixelToLogic( Size(1,1), aOffsetMode ); long nOffsetOneX = aOffsetOnePixel.Width(); nInnerStartX += nOffsetOneX / 2; @@ -2262,7 +2262,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO long nFrameStartX = nInnerStartX; long nFrameStartY = nInnerStartY; - long nRepStartX = nInnerStartX + nHeaderWidth * nLayoutSign; // widths/heights are 0 if not used + long nRepStartX = nInnerStartX + nHeaderWidth * nLayoutSign; // widths/heights are 0 if not used long nRepStartY = nInnerStartY + nHeaderHeight; long nDataX = nRepStartX + nRepeatWidth * nLayoutSign; long nDataY = nRepStartY + nRepeatHeight; @@ -2273,19 +2273,19 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO if ( bLayoutRTL ) { - // each element's start position is its left edge - //! subtract one pixel less? - nInnerStartX -= nHeaderWidth; // used for header + // each element's start position is its left edge + //! subtract one pixel less? + nInnerStartX -= nHeaderWidth; // used for header nRepStartX -= nRepeatWidth; nDataX -= nContentWidth; - // continue right of the main elements again + // continue right of the main elements again nEndX += nHeaderWidth + nRepeatWidth + nContentWidth; } - // Seiten-Rahmen / Hintergrund + // Seiten-Rahmen / Hintergrund - //! nEndX/Y anpassen + //! nEndX/Y anpassen long nBorderEndX = nEndX; long nBorderEndY = nEndY; @@ -2313,7 +2313,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO pDev->SetMapMode( aOffsetMode ); - // Wiederholungszeilen/Spalten ausgeben + // Wiederholungszeilen/Spalten ausgeben if (bDoRepCol && bDoRepRow) { @@ -2341,15 +2341,15 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO LocateArea( nX1,nRepeatStartRow, nX2,nRepeatEndRow, nDataX,nRepStartY, FALSE,TRUE, *pLocationData ); } - // Daten ausgeben + // Daten ausgeben if ( bDoPrint ) PrintArea( nX1,nY1, nX2,nY2, nDataX,nDataY, !bDoRepCol,!bDoRepRow,TRUE,TRUE ); if ( pLocationData ) LocateArea( nX1,nY1, nX2,nY2, nDataX,nDataY, FALSE,FALSE, *pLocationData ); - // Spalten-/Zeilenkoepfe ausgeben - // nach den Daten (ueber evtl. weitergezeichneten Schatten) + // Spalten-/Zeilenkoepfe ausgeben + // nach den Daten (ueber evtl. weitergezeichneten Schatten) Color aGridColor( COL_BLACK ); if ( bUseStyleColor ) @@ -2394,7 +2394,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO LocateRowHdr( nY1,nY2, nInnerStartX,nDataY, FALSE, *pLocationData ); } - // einfacher Rahmen + // einfacher Rahmen if ( bDoPrint && ( aTableParam.bGrid || aTableParam.bHeaders ) ) { @@ -2415,7 +2415,7 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO pDev->SetLineColor( aGridColor ); pDev->SetFillColor(); pDev->DrawRect( Rectangle( nLeftX, nTopY, nRightX, nBottomY ) ); - // nEndX/Y ohne Rahmen-Anpassung + // nEndX/Y ohne Rahmen-Anpassung } if ( pPrinter && bDoPrint ) @@ -2452,7 +2452,7 @@ void ScPrintFunc::SetUseStyleColor( BOOL bFlag ) void ScPrintFunc::SetRenderFlag( BOOL bFlag ) { - bIsRender = bFlag; // set when using XRenderable (PDF) + bIsRender = bFlag; // set when using XRenderable (PDF) } void ScPrintFunc::SetExclusivelyDrawOleAndDrawObjects() @@ -2467,8 +2467,8 @@ void ScPrintFunc::SetExclusivelyDrawOleAndDrawObjects() } // -// UpdatePages wird nur von aussen gerufen, um die Umbrueche fuer die Anzeige -// richtig zu setzen - immer ohne UserArea +// UpdatePages wird nur von aussen gerufen, um die Umbrueche fuer die Anzeige +// richtig zu setzen - immer ohne UserArea // BOOL ScPrintFunc::UpdatePages() @@ -2476,11 +2476,11 @@ BOOL ScPrintFunc::UpdatePages() if (!pParamSet) return FALSE; - // Zoom + // Zoom nZoom = 100; if (aTableParam.bScalePageNum || aTableParam.bScaleTo) - nZoom = ZOOM_MIN; // stimmt fuer Umbrueche + nZoom = ZOOM_MIN; // stimmt fuer Umbrueche else if (aTableParam.bScaleAll) { nZoom = aTableParam.nScaleAll; @@ -2493,10 +2493,10 @@ BOOL ScPrintFunc::UpdatePages() for (SCTAB nTab=0; nTab<nTabCount; nTab++) if ( nTab==nPrintTab || pDoc->GetPageStyle(nTab)==aName ) { - // Wiederholungszeilen / Spalten + // Wiederholungszeilen / Spalten pDoc->SetRepeatArea( nTab, nRepeatStartCol,nRepeatEndCol, nRepeatStartRow,nRepeatEndRow ); - // Umbrueche setzen + // Umbrueche setzen ResetBreaks(nTab); pDocShell->PostPaint(0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID); } @@ -2504,32 +2504,32 @@ BOOL ScPrintFunc::UpdatePages() return TRUE; } -long ScPrintFunc::CountPages() // setzt auch nPagesX, nPagesY +long ScPrintFunc::CountPages() // setzt auch nPagesX, nPagesY { BOOL bAreaOk = FALSE; if (pDoc->HasTable( nPrintTab )) { - if (aAreaParam.bPrintArea) // Druckbereich angegeben? + if (aAreaParam.bPrintArea) // Druckbereich angegeben? { if ( bPrintCurrentTable ) { ScRange& rRange = aAreaParam.aPrintArea; - // hier kein Vergleich der Tabellen mehr, die Area gilt immer fuer diese Tabelle - // wenn hier verglichen werden soll, muss die Tabelle der Druckbereiche beim - // Einfuegen von Tabellen etc. angepasst werden ! + // hier kein Vergleich der Tabellen mehr, die Area gilt immer fuer diese Tabelle + // wenn hier verglichen werden soll, muss die Tabelle der Druckbereiche beim + // Einfuegen von Tabellen etc. angepasst werden ! nStartCol = rRange.aStart.Col(); nStartRow = rRange.aStart.Row(); nEndCol = rRange.aEnd .Col(); nEndRow = rRange.aEnd .Row(); - bAreaOk = AdjustPrintArea(FALSE); // begrenzen + bAreaOk = AdjustPrintArea(FALSE); // begrenzen } else bAreaOk = FALSE; } - else // aus Dokument suchen + else // aus Dokument suchen bAreaOk = AdjustPrintArea(TRUE); } @@ -2554,7 +2554,7 @@ long ScPrintFunc::CountPages() // setzt auch nPagesX, n } else { - CalcZoom(RANGENO_NORANGE); // Zoom berechnen + CalcZoom(RANGENO_NORANGE); // Zoom berechnen if ( aTableParam.bSkipEmpty ) for (nY=0; nY<nPagesY; nY++) nPages += pPageRows[nY].CountVisible(); @@ -2567,7 +2567,7 @@ long ScPrintFunc::CountPages() // setzt auch nPagesX, n } else { -// nZoom = 100; // nZoom auf letztem Wert stehenlassen !!! +// nZoom = 100; // nZoom auf letztem Wert stehenlassen !!! nPagesX = nPagesY = nTotalY = 0; return 0; } @@ -2584,9 +2584,9 @@ long ScPrintFunc::CountNotePages() BOOL bError = FALSE; if (!aAreaParam.bPrintArea) - bError = !AdjustPrintArea(TRUE); // komplett aus Dok suchen + bError = !AdjustPrintArea(TRUE); // komplett aus Dok suchen - USHORT nRepeats = 1; // wie oft durchgehen ? + USHORT nRepeats = 1; // wie oft durchgehen ? if (bMultiArea) nRepeats = pDoc->GetPrintRangeCount(nPrintTab); if (bError) @@ -2595,7 +2595,7 @@ long ScPrintFunc::CountNotePages() for (USHORT nStep=0; nStep<nRepeats; nStep++) { BOOL bDoThis = TRUE; - if (bMultiArea) // alle Areas durchgehen + if (bMultiArea) // alle Areas durchgehen { const ScRange* pThisRange = pDoc->GetPrintRange( nPrintTab, nStep ); if ( pThisRange ) @@ -2642,19 +2642,19 @@ long ScPrintFunc::CountNotePages() return nPages; } -void ScPrintFunc::InitModes() // aus nZoom etc. die MapModes setzen +void ScPrintFunc::InitModes() // aus nZoom etc. die MapModes setzen { aOffset = Point( aSrcOffset.X()*100/nZoom, aSrcOffset.Y()*100/nZoom ); long nEffZoom = nZoom * (long) nManualZoom; -// nScaleX = nScaleY = 1.0; // Ausgabe in Twips - nScaleX = nScaleY = HMM_PER_TWIPS; // Ausgabe in 1/100 mm +// nScaleX = nScaleY = 1.0; // Ausgabe in Twips + nScaleX = nScaleY = HMM_PER_TWIPS; // Ausgabe in 1/100 mm Fraction aZoomFract( nEffZoom,10000 ); Fraction aHorFract = aZoomFract; - if ( !pPrinter && !bIsRender ) // adjust scale for preview + if ( !pPrinter && !bIsRender ) // adjust scale for preview { double nFact = pDocShell->GetOutputFactor(); aHorFract = Fraction( (long)( nEffZoom / nFact ), 10000 ); @@ -2676,7 +2676,7 @@ void ScPrintFunc::ApplyPrintSettings() if ( pPrinter ) { // - // Printer zum Drucken umstellen + // Printer zum Drucken umstellen // Size aEnumSize = aPageSize; @@ -2710,9 +2710,9 @@ void ScPrintFunc::ApplyPrintSettings() } //-------------------------------------------------------------------- -// rPageRanges = Range fuer alle Tabellen -// nStartPage = in rPageRanges beginnen bei nStartPage -// nDisplayStart = lfd. Nummer fuer Anzeige der Seitennummer +// rPageRanges = Range fuer alle Tabellen +// nStartPage = in rPageRanges beginnen bei nStartPage +// nDisplayStart = lfd. Nummer fuer Anzeige der Seitennummer long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, long nStartPage, long nDisplayStart, BOOL bDoPrint, @@ -2745,14 +2745,14 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, long nPrinted = 0; long nEndPage = rPageRanges.GetTotalRange().Max(); - USHORT nRepeats = 1; // wie oft durchgehen ? + USHORT nRepeats = 1; // wie oft durchgehen ? if (bMultiArea) nRepeats = pDoc->GetPrintRangeCount(nPrintTab); for (USHORT nStep=0; nStep<nRepeats; nStep++) { - if (bMultiArea) // Bereich neu belegen ? + if (bMultiArea) // Bereich neu belegen ? { - CalcZoom(nStep); // setzt auch nStartCol etc. neu + CalcZoom(nStep); // setzt auch nStartCol etc. neu InitModes(); } @@ -2763,7 +2763,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, size_t nCountX; size_t nCountY; - if (aTableParam.bTopDown) // von oben nach unten + if (aTableParam.bTopDown) // von oben nach unten { nX1 = nStartCol; for (nCountX=0; nCountX<nPagesX; nCountX++) @@ -2793,7 +2793,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, nX1 = nX2 + 1; } } - else // von links nach rechts + else // von links nach rechts { for (nCountY=0; nCountY<nPagesY; nCountY++) { @@ -2847,7 +2847,7 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, if (bPageSelected) { ++nPrinted; - bSourceRangeValid = FALSE; // last page was no cell range + bSourceRangeValid = FALSE; // last page was no cell range } ++nPageNo; } @@ -2858,12 +2858,12 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, while (nNoteAdd); if ( bMultiArea ) - ResetBreaks(nPrintTab); // Breaks fuer Anzeige richtig + ResetBreaks(nPrintTab); // Breaks fuer Anzeige richtig return nPrinted; } -void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom berechnen +void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom berechnen { USHORT nRCount = pDoc->GetPrintRangeCount( nPrintTab ); const ScRange* pThisRange = NULL; @@ -2877,7 +2877,7 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom bere nEndRow = pThisRange->aEnd .Row(); } - if (!AdjustPrintArea(FALSE)) // leer + if (!AdjustPrintArea(FALSE)) // leer { nZoom = 100; nPagesX = nPagesY = nTotalY = 0; @@ -2905,7 +2905,7 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom bere if (nZoom == 100) // If it fits at 100 %, it's good enough for me. break; - + nLastFitZoom = nZoom; nZoom = (nLastNonFitZoom + nZoom) / 2; @@ -2947,7 +2947,7 @@ void ScPrintFunc::CalcZoom( USHORT nRangeNo ) // Zoom bere if (nZoom == 100) // If it fits at 100 %, it's good enough for me. break; - + nLastFitZoom = nZoom; nZoom = (nLastNonFitZoom + nZoom) / 2; @@ -2988,17 +2988,17 @@ Size ScPrintFunc::GetDocPageSize() { // Hoehe Kopf-/Fusszeile anpassen - InitModes(); // aTwipMode aus nZoom initialisieren - pDev->SetMapMode( aTwipMode ); // Kopf-/Fusszeilen in Twips + InitModes(); // aTwipMode aus nZoom initialisieren + pDev->SetMapMode( aTwipMode ); // Kopf-/Fusszeilen in Twips UpdateHFHeight( aHdr ); UpdateHFHeight( aFtr ); // Seitengroesse in Document-Twips - // Berechnung Left / Right auch in PrintPage + // Berechnung Left / Right auch in PrintPage aPageRect = Rectangle( Point(), aPageSize ); - aPageRect.Left() = ( aPageRect.Left() + nLeftMargin ) * 100 / nZoom; - aPageRect.Right() = ( aPageRect.Right() - nRightMargin ) * 100 / nZoom; + aPageRect.Left() = ( aPageRect.Left() + nLeftMargin ) * 100 / nZoom; + aPageRect.Right() = ( aPageRect.Right() - nRightMargin ) * 100 / nZoom; aPageRect.Top() = ( aPageRect.Top() + nTopMargin ) * 100 / nZoom + aHdr.nHeight; aPageRect.Bottom() = ( aPageRect.Bottom() - nBottomMargin ) * 100 / nZoom - aFtr.nHeight; @@ -3029,7 +3029,7 @@ Size ScPrintFunc::GetDocPageSize() return aDocPageSize; } -void ScPrintFunc::ResetBreaks( SCTAB nTab ) // Breaks fuer Anzeige richtig setzen +void ScPrintFunc::ResetBreaks( SCTAB nTab ) // Breaks fuer Anzeige richtig setzen { pDoc->SetPageSize( nTab, GetDocPageSize() ); pDoc->UpdatePageBreaks( nTab, NULL ); @@ -3153,7 +3153,7 @@ void ScPrintFunc::CalcPages() // berechnet aPageRect und Seiten au SCROW nLastRow = -1; if (!pDoc->RowHidden(nRow, nPrintTab, NULL, &nLastRow)) - { + { bVisRow = true; nLastVisibleRow = nLastRow; } @@ -3181,14 +3181,14 @@ void ScPrintFunc::CalcPages() // berechnet aPageRect und Seiten au } //------------------------------------------------------------------------ -// class ScJobSetup +// class ScJobSetup //------------------------------------------------------------------------ ScJobSetup::ScJobSetup( SfxPrinter* pPrinter ) { eOrientation = pPrinter->GetOrientation(); - nPaperBin = pPrinter->GetPaperBin(); - ePaper = pPrinter->GetPaper(); + nPaperBin = pPrinter->GetPaperBin(); + ePaper = pPrinter->GetPaper(); if ( PAPER_USER == ePaper ) { diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 21d66c5a39be..6c31e3b41d32 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -76,18 +76,18 @@ SFX_IMPL_CHILDWINDOW(ScArgumentDlgWrapper, SID_OPENDLG_ARGUMENT ) //SFX_IMPL_MODELESSDIALOG(ScValidityRefChildWin, SID_VALIDITY_REFERENCE ) SFX_IMPL_CHILDWINDOW(ScValidityRefChildWin, SID_VALIDITY_REFERENCE) SfxChildWinInfo __EXPORT ScValidityRefChildWin::GetInfo() const -{ +{ SfxChildWinInfo anInfo = SfxChildWindow::GetInfo(); - + if( Window *pWnd = GetWindow() ) - { + { anInfo.aSize = pWnd->GetSizePixel(); - + if( pWnd->IsDialog() ) if ( static_cast<Dialog*>(pWnd)->IsRollUp() ) anInfo.nFlags |= SFX_CHILDWIN_ZOOMIN; } - + return anInfo; } @@ -95,28 +95,28 @@ namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ); } //<!--Added by PengYunQuan for Validity Cell Range Picker #define IMPL_CHILD_CTOR(Class,sid) \ - Class::Class( Window* pParentP, \ - USHORT nId, \ - SfxBindings* p, \ - SfxChildWinInfo* pInfo ) \ - : SfxChildWindow(pParentP, nId) \ - { \ + Class::Class( Window* pParentP, \ + USHORT nId, \ + SfxBindings* p, \ + SfxChildWinInfo* pInfo ) \ + : SfxChildWindow(pParentP, nId) \ + { \ /*//<!--Added by PengYunQuan for Validity Cell Range Picker*/\ /************************************************************************************/\ - /* When a new document is creating, the SfxViewFrame may be ready, */\ - /* But the ScTabViewShell may have not been activated yet. In this */\ - /* situation, SfxViewShell::Current() does not get the correct shell, */\ - /* and we should lcl_GetTabViewShell( p ) instead of SfxViewShell::Current() */\ + /* When a new document is creating, the SfxViewFrame may be ready, */\ + /* But the ScTabViewShell may have not been activated yet. In this */\ + /* situation, SfxViewShell::Current() does not get the correct shell, */\ + /* and we should lcl_GetTabViewShell( p ) instead of SfxViewShell::Current() */\ /************************************************************************************/\ ScTabViewShell* pViewShell = lcl_GetTabViewShell( p ); \ /*//-->Added by PengYunQuan for Validity Cell Range Picker*/\ if (!pViewShell) \ pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); \ - DBG_ASSERT( pViewShell, "missing view shell :-(" ); \ - pWindow = pViewShell ? \ - pViewShell->CreateRefDialog( p, this, pInfo, pParentP, sid ) : NULL; \ - if (pViewShell && !pWindow) \ - pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \ + DBG_ASSERT( pViewShell, "missing view shell :-(" ); \ + pWindow = pViewShell ? \ + pViewShell->CreateRefDialog( p, this, pInfo, pParentP, sid ) : NULL; \ + if (pViewShell && !pWindow) \ + pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \ } @@ -205,21 +205,21 @@ IMPL_CHILD_CTOR( ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION ) // ScSimpleRefDlgWrapper //------------------------------------------------------------------------- -static BOOL bScSimpleRefFlag; -static long nScSimpleRefHeight; -static long nScSimpleRefWidth; -static long nScSimpleRefX; -static long nScSimpleRefY; -static BOOL bAutoReOpen=TRUE; +static BOOL bScSimpleRefFlag; +static long nScSimpleRefHeight; +static long nScSimpleRefWidth; +static long nScSimpleRefX; +static long nScSimpleRefY; +static BOOL bAutoReOpen=TRUE; ScSimpleRefDlgWrapper::ScSimpleRefDlgWrapper( Window* pParentP, - USHORT nId, - SfxBindings* p, - SfxChildWinInfo* pInfo ) + USHORT nId, + SfxBindings* p, + SfxChildWinInfo* pInfo ) : SfxChildWindow(pParentP, nId) { -// ScTabViewShell* pViewShell = -// PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); +// ScTabViewShell* pViewShell = +// PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); ScTabViewShell* pViewShell = NULL; SfxDispatcher* pDisp = p->GetDispatcher(); @@ -325,7 +325,7 @@ void ScSimpleRefDlgWrapper::StartRefInput() // ScAcceptChgDlgWrapper //Kommentar: sollte in die ViewShell //------------------------------------------------------------------------- -ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP, +ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP, USHORT nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ) : @@ -396,29 +396,29 @@ namespace if( SfxViewFrame *pFrm = pDisp->GetFrame() ) if( SfxViewShell* pViewSh = pFrm->GetViewShell() ) return dynamic_cast<ScTabViewShell*>( pViewSh ); - + return NULL; } } -ScValidityRefChildWin::ScValidityRefChildWin( Window* pParentP, \ - USHORT nId, \ - SfxBindings* p, \ - SfxChildWinInfo* /*pInfo*/ ) \ +ScValidityRefChildWin::ScValidityRefChildWin( Window* pParentP, \ + USHORT nId, \ + SfxBindings* p, \ + SfxChildWinInfo* /*pInfo*/ ) \ : SfxChildWindow(pParentP, nId), m_bVisibleLock( false ), m_bFreeWindowLock( false ), m_pSavedWndParent( NULL ) { SetWantsFocus( FALSE );\ - ScTabViewShell* pViewShell = \ + ScTabViewShell* pViewShell = \ NULL != ( pWindow = ScValidationDlg::Find1AliveObject( pParentP ) ) ? static_cast<ScValidationDlg*>(pWindow)->GetTabViewShell() : lcl_GetTabViewShell( p ); if (!pViewShell) pViewShell = PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); - DBG_ASSERT( pViewShell, "missing view shell :-(" ); \ - if (pViewShell && !pWindow) \ - pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \ + DBG_ASSERT( pViewShell, "missing view shell :-(" ); \ + if (pViewShell && !pWindow) \ + pViewShell->GetViewFrame()->SetChildWindow( nId, FALSE ); \ else if( pWindow /*&& pWindow->ISA(ScValidationDlg)*/ ) {}//pWindow = new Window( pParentP, WB_HIDE ); diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx index c9af56f00d33..1d0fb518e09c 100644 --- a/sc/source/ui/view/scextopt.cxx +++ b/sc/source/ui/view/scextopt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index 52139ccb8f04..cae66699b717 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,19 +46,19 @@ #include "docsh.hxx" #include "tabprotection.hxx" -extern USHORT nScFillModeMouseModifier; // global.cxx +extern USHORT nScFillModeMouseModifier; // global.cxx using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- -static Point aSwitchPos; //! Member +static Point aSwitchPos; //! Member static BOOL bDidSwitch = FALSE; // ----------------------------------------------------------------------- // -// View (Gridwin / Tastatur) +// View (Gridwin / Tastatur) // ScViewFunctionSet::ScViewFunctionSet( ScViewData* pNewViewData ) : @@ -83,7 +83,7 @@ void ScViewFunctionSet::SetSelectionEngine( ScViewSelectionEngine* pSelEngine ) pEngine = pSelEngine; } -// Drag & Drop +// Drag & Drop void __EXPORT ScViewFunctionSet::BeginDrag() { @@ -106,7 +106,7 @@ void __EXPORT ScViewFunctionSet::BeginDrag() BOOL bRefMode = pScMod->IsFormulaMode(); if (!bRefMode) { - pViewData->GetView()->FakeButtonUp( GetWhich() ); // ButtonUp is swallowed + pViewData->GetView()->FakeButtonUp( GetWhich() ); // ButtonUp is swallowed ScMarkData& rMark = pViewData->GetMarkData(); rMark.MarkToSimple(); @@ -143,22 +143,22 @@ void __EXPORT ScViewFunctionSet::BeginDrag() Window* pWindow = pViewData->GetActiveWin(); if ( pWindow->IsTracking() ) - pWindow->EndTracking( ENDTRACK_CANCEL ); // abort selecting + pWindow->EndTracking( ENDTRACK_CANCEL ); // abort selecting - SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D + SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D pTransferObj->StartDrag( pWindow, nDragActions ); - return; // dragging started + return; // dragging started } else delete pClipDoc; } } - Sound::Beep(); // can't drag + Sound::Beep(); // can't drag } -// Selection +// Selection void __EXPORT ScViewFunctionSet::CreateAnchor() { @@ -236,15 +236,15 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO if ( bDidSwitch ) { if ( rPointPixel == aSwitchPos ) - return FALSE; // nicht auf falschem Fenster scrollen + return FALSE; // nicht auf falschem Fenster scrollen else bDidSwitch = FALSE; } - aSwitchPos = rPointPixel; // nur wichtig, wenn bDidSwitch + aSwitchPos = rPointPixel; // nur wichtig, wenn bDidSwitch - // treat position 0 as -1, so scrolling is always possible - // (with full screen and hidden headers, the top left border may be at 0) - // (moved from ScViewData::GetPosFromPixel) + // treat position 0 as -1, so scrolling is always possible + // (with full screen and hidden headers, the top left border may be at 0) + // (moved from ScViewData::GetPosFromPixel) Point aEffPos = rPointPixel; if ( aEffPos.X() == 0 ) @@ -252,7 +252,7 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO if ( aEffPos.Y() == 0 ) aEffPos.Y() = -1; - // Scrolling + // Scrolling Size aWinSize = pEngine->GetWindow()->GetOutputSizePixel(); BOOL bRightScroll = ( aEffPos.X() >= aWinSize.Width() ); @@ -260,13 +260,13 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO BOOL bNegScroll = ( aEffPos.X() < 0 || aEffPos.Y() < 0 ); BOOL bScroll = bRightScroll || bBottomScroll || bNegScroll; - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( aEffPos.X(), aEffPos.Y(), GetWhich(), - nPosX, nPosY, TRUE, TRUE ); // mit Repair + nPosX, nPosY, TRUE, TRUE ); // mit Repair - // fuer AutoFill in der Mitte der Zelle umschalten - // dabei aber nicht das Scrolling nach rechts/unten verhindern + // fuer AutoFill in der Mitte der Zelle umschalten + // dabei aber nicht das Scrolling nach rechts/unten verhindern if ( pViewData->IsFillMode() || pViewData->GetFillMode() == SC_FILL_MATRIX ) { BOOL bLeft, bTop; @@ -284,10 +284,10 @@ BOOL __EXPORT ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, BOO nPosY = -1; } } - // negativ ist erlaubt + // negativ ist erlaubt } - // ueber Fixier-Grenze bewegt? + // ueber Fixier-Grenze bewegt? ScSplitPos eWhich = GetWhich(); if ( eWhich == pViewData->GetActivePart() ) @@ -377,7 +377,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol else if (pViewData->IsFillMode() || (pViewData->GetFillMode() == SC_FILL_MATRIX && (nScFillModeMouseModifier & KEY_MOD1) )) { - // Wenn eine Matrix angefasst wurde, kann mit Ctrl auf AutoFill zurueckgeschaltet werden + // Wenn eine Matrix angefasst wurde, kann mit Ctrl auf AutoFill zurueckgeschaltet werden SCCOL nStartX, nEndX; SCROW nStartY, nEndY; // Block @@ -395,9 +395,9 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol if ( nPosX+1 >= (SCsCOL) nStartX && nPosX <= (SCsCOL) nEndX && nPosY+1 >= (SCsROW) nStartY && nPosY <= (SCsROW) nEndY && - ( nPosX != nEndX || nPosY != nEndY ) ) // verkleinern ? + ( nPosX != nEndX || nPosY != nEndY ) ) // verkleinern ? { - // Richtung (links oder oben) + // Richtung (links oder oben) long nSizeX = 0; for (SCCOL i=nPosX+1; i<=nEndX; i++) @@ -417,7 +417,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol if ( nDelStartY < nStartY ) nDelStartY = nStartY; - // Bereich setzen + // Bereich setzen pViewData->SetDelMark( ScRange( nDelStartX,nDelStartY,nTab, nEndX,nEndY,nTab ) ); @@ -426,10 +426,10 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol pViewData->GetView()-> PaintArea( nStartX,nDelStartY, nEndX,nEndY, SC_UPDATE_MARKS ); - nPosX = nEndX; // roten Rahmen um ganzen Bereich lassen + nPosX = nEndX; // roten Rahmen um ganzen Bereich lassen nPosY = nEndY; - // Referenz wieder richtigherum, falls unten umgedreht + // Referenz wieder richtigherum, falls unten umgedreht if ( nStartX != pViewData->GetRefStartX() || nStartY != pViewData->GetRefStartY() ) { pViewData->GetView()->DoneRefMode(); @@ -450,8 +450,8 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol long nSizeX = 0; if ( bNegX ) { - // #94321# in SetCursorAtPoint hidden columns are skipped. - // They must be skipped here too, or the result will always be the first hidden column. + // #94321# in SetCursorAtPoint hidden columns are skipped. + // They must be skipped here too, or the result will always be the first hidden column. do ++nPosX; while ( nPosX<nStartX && pDoc->ColHidden(nPosX, nTab) ); for (SCCOL i=nPosX; i<nStartX; i++) nSizeX += pDoc->GetColWidth( i, nTab ); @@ -463,8 +463,8 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol long nSizeY = 0; if ( bNegY ) { - // #94321# in SetCursorAtPoint hidden rows are skipped. - // They must be skipped here too, or the result will always be the first hidden row. + // #94321# in SetCursorAtPoint hidden rows are skipped. + // They must be skipped here too, or the result will always be the first hidden row. if (++nPosY < nStartY) { nPosY = pDoc->FirstVisibleRow(nPosY, nStartY-1, nTab); @@ -476,7 +476,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol else nSizeY += pDoc->GetRowHeight( nEndY+1, nPosY, nTab ); - if ( nSizeX > nSizeY ) // Fill immer nur in einer Richtung + if ( nSizeX > nSizeY ) // Fill immer nur in einer Richtung { nPosY = nEndY; bNegY = FALSE; @@ -538,12 +538,12 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol } // else neue Modi } - else // normales Markieren + else // normales Markieren { BOOL bHideCur = bAnchor && ( (SCCOL)nPosX != pViewData->GetCurX() || (SCROW)nPosY != pViewData->GetCurY() ); if (bHideCur) - pView->HideAllCursors(); // sonst zweimal: Block und SetCursor + pView->HideAllCursors(); // sonst zweimal: Block und SetCursor if (bAnchor) { @@ -576,18 +576,18 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol aAnchorPos.Set( nPosX, nPosY, nTab ); bStarted = TRUE; } - // #i3875# *Hack* When a new cell is Ctrl-clicked with no pre-selected cells, - // it highlights that new cell as well as the old cell where the cursor is - // positioned prior to the click. A selection mode via Shift-F8 should also + // #i3875# *Hack* When a new cell is Ctrl-clicked with no pre-selected cells, + // it highlights that new cell as well as the old cell where the cursor is + // positioned prior to the click. A selection mode via Shift-F8 should also // follow the same behavior. else if ( pViewData->IsSelCtrlMouseClick() ) { SCCOL nOldX = pViewData->GetCurX(); SCROW nOldY = pViewData->GetCurY(); - + pView->InitBlockMode( nOldX, nOldY, nTab, TRUE ); pView->MarkCursor( (SCCOL) nOldX, (SCROW) nOldY, nTab ); - + if ( nOldX != nPosX || nOldY != nPosY ) { pView->DoneBlockMode( TRUE ); @@ -595,7 +595,7 @@ BOOL ScViewFunctionSet::SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, BOOL bScrol pView->MarkCursor( (SCCOL) nPosX, (SCROW) nPosY, nTab ); aAnchorPos.Set( nPosX, nPosY, nTab ); } - + bStarted = TRUE; } pView->SetCursor( (SCCOL) nPosX, (SCROW) nPosY ); @@ -624,8 +624,8 @@ BOOL __EXPORT ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) ScMarkData& rMark = pViewData->GetMarkData(); if (bAnchor || !rMark.IsMultiMarked()) { - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( rPointPixel.X(), rPointPixel.Y(), GetWhich(), nPosX, nPosY ); return pViewData->GetMarkData().IsCellMarked( (SCCOL) nPosX, (SCROW) nPosY ); } @@ -635,7 +635,7 @@ BOOL __EXPORT ScViewFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) void __EXPORT ScViewFunctionSet::DeselectAtPoint( const Point& /* rPointPixel */ ) { - // gibt's nicht + // gibt's nicht } void __EXPORT ScViewFunctionSet::DeselectAll() @@ -664,7 +664,7 @@ ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView, SelectionEngine( pWindow, pView->GetFunctionSet() ), eWhich( eSplitPos ) { - // Parameter einstellen + // Parameter einstellen SetSelectionMode( MULTIPLE_SELECTION ); EnableDrag( TRUE ); } @@ -673,7 +673,7 @@ ScViewSelectionEngine::ScViewSelectionEngine( Window* pWindow, ScTabView* pView, //------------------------------------------------------------------------ // -// Spalten- / Zeilenheader +// Spalten- / Zeilenheader // ScHeaderFunctionSet::ScHeaderFunctionSet( ScViewData* pNewViewData ) : @@ -731,14 +731,14 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B { if ( bDidSwitch ) { - // die naechste gueltige Position muss vom anderen Fenster kommen + // die naechste gueltige Position muss vom anderen Fenster kommen if ( rPointPixel == aSwitchPos ) - return FALSE; // nicht auf falschem Fenster scrollen + return FALSE; // nicht auf falschem Fenster scrollen else bDidSwitch = FALSE; } - // Scrolling + // Scrolling Size aWinSize = pViewData->GetActiveWin()->GetOutputSizePixel(); BOOL bScroll; @@ -747,7 +747,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B else bScroll = ( rPointPixel.Y() < 0 || rPointPixel.Y() >= aWinSize.Height() ); - // ueber Fixier-Grenze bewegt? + // ueber Fixier-Grenze bewegt? BOOL bSwitched = FALSE; if ( bColumn ) @@ -763,7 +763,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B } } } - else // Zeilenkoepfe + else // Zeilenkoepfe { if ( pViewData->GetVSplitMode() == SC_SPLIT_FIX ) { @@ -780,13 +780,13 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B { aSwitchPos = rPointPixel; bDidSwitch = TRUE; - return FALSE; // nicht mit falschen Positionen rechnen + return FALSE; // nicht mit falschen Positionen rechnen } // - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( rPointPixel.X(), rPointPixel.Y(), pViewData->GetActivePart(), nPosX, nPosY, FALSE ); if (bColumn) @@ -813,7 +813,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B if ( !bAnchor || !pView->IsBlockMode() ) { pView->DoneBlockMode( TRUE ); - pViewData->GetMarkData().MarkToMulti(); //! wer verstellt das ??? + pViewData->GetMarkData().MarkToMulti(); //! wer verstellt das ??? pView->InitBlockMode( nPosX, nPosY, pViewData->GetTabNo(), TRUE, bColumn, !bColumn ); bAnchor = TRUE; @@ -821,7 +821,7 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B pView->MarkCursor( nPosX, nPosY, pViewData->GetTabNo(), bColumn, !bColumn ); - // SelectionChanged innerhalb von HideCursor wegen UpdateAutoFillMark + // SelectionChanged innerhalb von HideCursor wegen UpdateAutoFillMark pView->SelectionChanged(); if (bHide) @@ -832,8 +832,8 @@ BOOL __EXPORT ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, B BOOL __EXPORT ScHeaderFunctionSet::IsSelectionAtPoint( const Point& rPointPixel ) { - SCsCOL nPosX; - SCsROW nPosY; + SCsCOL nPosX; + SCsROW nPosY; pViewData->GetPosFromPixel( rPointPixel.X(), rPointPixel.Y(), pViewData->GetActivePart(), nPosX, nPosY, FALSE ); @@ -859,7 +859,7 @@ void __EXPORT ScHeaderFunctionSet::DeselectAll() ScHeaderSelectionEngine::ScHeaderSelectionEngine( Window* pWindow, ScHeaderFunctionSet* pFuncSet ) : SelectionEngine( pWindow, pFuncSet ) { - // Parameter einstellen + // Parameter einstellen SetSelectionMode( MULTIPLE_SELECTION ); EnableDrag( FALSE ); } diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx index 3412dd53f03a..0fd4a1720959 100644 --- a/sc/source/ui/view/selectionstate.cxx +++ b/sc/source/ui/view/selectionstate.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index f2100ba6d918..69070bea47f2 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 457395fd9deb..bbfb856848a9 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index daea22b78027..14d0a334caaf 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -155,8 +155,8 @@ void ScTabControl::MouseButtonDown( const MouseEvent& rMEvt ) ScModule* pScMod = SC_MOD(); if ( !pScMod->IsModalMode() && !pScMod->IsFormulaMode() && !IsInEditMode() ) { - // View aktivieren - pViewData->GetViewShell()->SetActive(); // Appear und SetViewFrame + // View aktivieren + pViewData->GetViewShell()->SetActive(); // Appear und SetViewFrame pViewData->GetView()->ActiveGrabFocus(); } @@ -226,9 +226,9 @@ void ScTabControl::Select() SCTAB nCount = pDoc->GetTableCount(); SCTAB i; - if ( pScMod->IsTableLocked() ) // darf jetzt nicht umgeschaltet werden ? + if ( pScMod->IsTableLocked() ) // darf jetzt nicht umgeschaltet werden ? { - // den alten Zustand des TabControls wiederherstellen: + // den alten Zustand des TabControls wiederherstellen: for (i=0; i<nCount; i++) SelectPage( static_cast<sal_uInt16>(i)+1, rMark.GetTableSelect(i) ); @@ -239,14 +239,14 @@ void ScTabControl::Select() } USHORT nCurId = GetCurPageId(); - if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles versteckt ist + if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles versteckt ist USHORT nPage = nCurId - 1; // OLE-inplace deaktivieren if ( nPage != static_cast<sal_uInt16>(pViewData->GetTabNo()) ) pViewData->GetView()->DrawMarkListHasChanged(); - // InputEnterHandler nur wenn nicht Referenzeingabe + // InputEnterHandler nur wenn nicht Referenzeingabe BOOL bRefMode = pScMod->IsFormulaMode(); if (!bRefMode) @@ -255,7 +255,7 @@ void ScTabControl::Select() for (i=0; i<nCount; i++) rMark.SelectTable( i, IsPageSelected(static_cast<sal_uInt16>(i)+1) ); -/* Markierungen werden per Default nicht pro Tabelle gehalten +/* Markierungen werden per Default nicht pro Tabelle gehalten USHORT nSelCnt = GetSelectPageCount(); if (nSelCnt>1) pDoc->ExtendMarksFromTable( nPage ); @@ -266,7 +266,7 @@ void ScTabControl::Select() pViewData->GetView()->SetTabNo( static_cast<SCTAB>(nPage) ); else { - // Tabelle fuer Basic ist 1-basiert + // Tabelle fuer Basic ist 1-basiert SfxUInt16Item aItem( SID_CURRENTTAB, nPage + 1 ); rDisp.Execute( SID_CURRENTTAB, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, (void*) NULL ); @@ -285,9 +285,9 @@ void ScTabControl::Select() rBind.Invalidate( FID_TABLE_HIDE ); rBind.Invalidate( FID_TAB_SET_TAB_BG_COLOR ); - // SetReference nur wenn der Konsolidieren-Dialog offen ist - // (fuer Referenzen ueber mehrere Tabellen) - // bei anderen gibt das nur unnoetiges Gezappel + // SetReference nur wenn der Konsolidieren-Dialog offen ist + // (fuer Referenzen ueber mehrere Tabellen) + // bei anderen gibt das nur unnoetiges Gezappel if ( bRefMode && pViewData->GetRefType() == SC_REFTYPE_REF ) if ( pViewData->GetViewShell()->GetViewFrame()->HasChildWindow(SID_OPENDLG_CONSOLIDATE) ) @@ -296,7 +296,7 @@ void ScTabControl::Select() pViewData->GetRefStartX(), pViewData->GetRefStartY(), pViewData->GetRefStartZ(), pViewData->GetRefEndX(), pViewData->GetRefEndY(), pViewData->GetRefEndZ() ); pScMod->SetReference( aRange, pDoc, &rMark ); - pScMod->EndReference(); // wegen Auto-Hide + pScMod->EndReference(); // wegen Auto-Hide } } @@ -323,7 +323,7 @@ void ScTabControl::UpdateStatus() SCTAB nMaxCnt = Max( nCount, static_cast<SCTAB>(GetMaxId()) ); Color aTabBgColor; - BOOL bModified = FALSE; // Tabellen-Namen + BOOL bModified = FALSE; // Tabellen-Namen for (i=0; i<nMaxCnt && !bModified; i++) { if (pDoc->IsVisible(i)) @@ -366,7 +366,7 @@ void ScTabControl::UpdateStatus() if (bActive) { - bModified = FALSE; // Selektion + bModified = FALSE; // Selektion for (i=0; i<nMaxCnt && !bModified; i++) if ( rMark.GetTableSelect(i) != IsPageSelected(static_cast<sal_uInt16>(i)+1) ) bModified = TRUE; @@ -384,14 +384,14 @@ void ScTabControl::UpdateStatus() void ScTabControl::ActivateView(BOOL bActivate) { -// ScDocument* pDoc = pViewData->GetDocument(); +// ScDocument* pDoc = pViewData->GetDocument(); ScMarkData& rMark = pViewData->GetMarkData(); -// ResetMark direkt in TabView -// pDoc->ResetMark(); +// ResetMark direkt in TabView +// pDoc->ResetMark(); USHORT nCurId = GetCurPageId(); - if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles versteckt ist + if (!nCurId) return; // kann vorkommen, wenn bei Excel-Import alles versteckt ist USHORT nPage = nCurId - 1; // USHORT nCount = GetMaxId(); @@ -421,9 +421,9 @@ void ScTabControl::SetSheetLayoutRTL( BOOL bSheetRTL ) void ScTabControl::Command( const CommandEvent& rCEvt ) { - ScModule* pScMod = SC_MOD(); + ScModule* pScMod = SC_MOD(); ScTabViewShell* pViewSh = pViewData->GetViewShell(); - BOOL bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode(); + BOOL bDisable = pScMod->IsFormulaMode() || pScMod->IsModalMode(); // ViewFrame erstmal aktivieren (Bug 19493): pViewSh->SetActive(); @@ -457,8 +457,8 @@ void ScTabControl::Command( const CommandEvent& rCEvt ) // #i52073# OLE inplace editing has to be stopped before showing the sheet tab context menu pViewSh->DeactivateOle(); - // Popup-Menu: - // get Dispatcher from ViewData (ViewFrame) instead of Shell (Frame), so it can't be null + // Popup-Menu: + // get Dispatcher from ViewData (ViewFrame) instead of Shell (Frame), so it can't be null pViewData->GetDispatcher().ExecutePopup( ScResId(RID_POPUP_TAB) ); } } @@ -472,7 +472,7 @@ void ScTabControl::StartDrag( sal_Int8 /* nAction */, const Point& rPosPixel ) if (!bDisable) { Region aRegion( Rectangle(0,0,0,0) ); - CommandEvent aCEvt( rPosPixel, COMMAND_STARTDRAG, TRUE ); // needed for StartDrag + CommandEvent aCEvt( rPosPixel, COMMAND_STARTDRAG, TRUE ); // needed for StartDrag if (TabBar::StartDrag( aCEvt, aRegion )) DoDrag( aRegion ); } @@ -485,7 +485,7 @@ void ScTabControl::DoDrag( const Region& /* rRegion */ ) SCTAB nTab = pViewData->GetTabNo(); ScMarkData aTabMark = pViewData->GetMarkData(); - aTabMark.ResetMark(); // doesn't change marked table information + aTabMark.ResetMark(); // doesn't change marked table information aTabMark.SetMarkArea( ScRange(0,0,nTab,MAXCOL,MAXROW,nTab) ); ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP ); @@ -505,7 +505,7 @@ void ScTabControl::DoDrag( const Region& /* rRegion */ ) pTransferObj->SetDragSource( pDocSh, aTabMark ); Window* pWindow = pViewData->GetActiveWin(); - SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D + SC_MOD()->SetDragObject( pTransferObj, NULL ); // for internal D&D pTransferObj->StartDrag( pWindow, DND_ACTION_COPYMOVE | DND_ACTION_LINK ); } @@ -586,10 +586,10 @@ sal_Int8 ScTabControl::AcceptDrop( const AcceptDropEvent& rEvt ) return rEvt.mnAction; } } - else // switch sheets for all formats + else // switch sheets for all formats { - SwitchPage( rEvt.maPosPixel ); // switch sheet after timeout - return 0; // nothing can be dropped here + SwitchPage( rEvt.maPosPixel ); // switch sheet after timeout + return 0; // nothing can be dropped here } return 0; @@ -619,16 +619,16 @@ long ScTabControl::AllowRenaming() nRet = TABBAR_RENAMING_YES; else if ( bErrorShown ) { - // if the error message from this TabControl is currently visible, - // don't end edit mode now, to avoid problems when returning to - // the other call (showing the error) - this should not happen + // if the error message from this TabControl is currently visible, + // don't end edit mode now, to avoid problems when returning to + // the other call (showing the error) - this should not happen DBG_ERROR("ScTabControl::AllowRenaming: nested calls"); nRet = TABBAR_RENAMING_NO; } else if ( Application::IsInModalMode() ) { - // #73472# don't show error message above any modal dialog - // instead cancel renaming without error message + // #73472# don't show error message above any modal dialog + // instead cancel renaming without error message nRet = TABBAR_RENAMING_CANCEL; } else diff --git a/sc/source/ui/view/tabpopsh.cxx b/sc/source/ui/view/tabpopsh.cxx index bb610ada84c0..7974bb8acbf4 100644 --- a/sc/source/ui/view/tabpopsh.cxx +++ b/sc/source/ui/view/tabpopsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index 7babaad6d154..eda248c8fcb0 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 58da4e399c5a..d465f80ac9db 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,11 +41,11 @@ // Dieses define entfernt die VCControls aus SI.HXX -#define _SI_HXX // VCControls +#define _SI_HXX // VCControls ////////////////////// Umsetzen der Standard-Defines ////////////////////// -//#define _SVDDRAG_HXX // SdrDragStat +//#define _SVDDRAG_HXX // SdrDragStat #define _SVDPAGE_HXX // SdrPage #ifdef _SDR_NOSURROGATEOBJ @@ -117,7 +117,7 @@ #endif //#ifdef _SDR_NOVIEWS -// #define _SVDDRAG_HXX +// #define _SVDDRAG_HXX //#endif ////////////////////// Ende der SVDRAW-Modifikationen ///////////////////// @@ -155,14 +155,14 @@ #include <string> #include <algorithm> -#define SPLIT_MARGIN 30 -#define SC_ICONSIZE 36 +#define SPLIT_MARGIN 30 +#define SC_ICONSIZE 36 -#define SC_SCROLLBAR_MIN 30 -#define SC_TABBAR_MIN 6 +#define SC_SCROLLBAR_MIN 30 +#define SC_TABBAR_MIN 6 -// fuer Rad-Maus -#define SC_DELTA_ZOOM 10 +// fuer Rad-Maus +#define SC_DELTA_ZOOM 10 using namespace ::com::sun::star; @@ -171,7 +171,7 @@ using namespace ::com::sun::star; //================================================================== -// Corner-Button +// Corner-Button ScCornerButton::ScCornerButton( Window* pParent, ScViewData* pData, BOOL bAdditional ) : Window( pParent, WinBits( 0 ) ), @@ -226,7 +226,7 @@ void __EXPORT ScCornerButton::Paint( const Rectangle& rRect ) DrawRect( Rectangle( 0, nCenterY, nCenterX-1, nPosY ) ); } - // both buttons have the same look now - only dark right/bottom lines + // both buttons have the same look now - only dark right/bottom lines SetLineColor( rStyleSettings.GetDarkShadowColor() ); DrawLine( Point(0,nPosY), Point(nPosX,nPosY) ); DrawLine( Point(nDarkX,0), Point(nDarkX,nPosY) ); @@ -265,7 +265,7 @@ void __EXPORT ScCornerButton::MouseButtonDown( const MouseEvent& rMEvt ) if (!bDisable) { ScTabViewShell* pViewSh = pViewData->GetViewShell(); - pViewSh->SetActive(); // Appear und SetViewFrame + pViewSh->SetActive(); // Appear und SetViewFrame pViewSh->ActiveGrabFocus(); BOOL bControl = rMEvt.IsMod1(); @@ -301,42 +301,42 @@ BOOL lcl_HasRowOutline( const ScViewData& rViewData ) //================================================================== -// Init und Konstruktoren -// ScTabView::Init() in tabview5.cxx wegen out of keys - - -#define TABVIEW_INIT \ - pSelEngine( NULL ), \ - aFunctionSet( &aViewData ), \ - pHdrSelEng( NULL ), \ - aHdrFunc( &aViewData ), \ - pDrawView( NULL ), \ - bDrawSelMode( FALSE ), \ - aVScrollTop( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ), \ - aVScrollBottom( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ), \ - aHScrollLeft( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), \ - aHScrollRight( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), \ - aCornerButton( pFrameWin, &aViewData, FALSE ), \ - aTopButton( pFrameWin, &aViewData, TRUE ), \ - aScrollBarBox( pFrameWin, WB_SIZEABLE ), \ - pInputHintWindow( NULL ), \ - pPageBreakData( NULL ), \ - pHighlightRanges( NULL ), \ +// Init und Konstruktoren +// ScTabView::Init() in tabview5.cxx wegen out of keys + + +#define TABVIEW_INIT \ + pSelEngine( NULL ), \ + aFunctionSet( &aViewData ), \ + pHdrSelEng( NULL ), \ + aHdrFunc( &aViewData ), \ + pDrawView( NULL ), \ + bDrawSelMode( FALSE ), \ + aVScrollTop( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ), \ + aVScrollBottom( pFrameWin, WinBits( WB_VSCROLL | WB_DRAG ) ), \ + aHScrollLeft( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), \ + aHScrollRight( pFrameWin, WinBits( WB_HSCROLL | WB_DRAG ) ), \ + aCornerButton( pFrameWin, &aViewData, FALSE ), \ + aTopButton( pFrameWin, &aViewData, TRUE ), \ + aScrollBarBox( pFrameWin, WB_SIZEABLE ), \ + pInputHintWindow( NULL ), \ + pPageBreakData( NULL ), \ + pHighlightRanges( NULL ), \ pBrushDocument( NULL ), \ pDrawBrushSet( NULL ), \ bLockPaintBrush( FALSE ), \ - pTimerWindow( NULL ), \ - nTipVisible( 0 ), \ - bDragging( FALSE ), \ - bIsBlockMode( FALSE ), \ - bBlockNeg( FALSE ), \ - bBlockCols( FALSE ), \ - bBlockRows( FALSE ), \ + pTimerWindow( NULL ), \ + nTipVisible( 0 ), \ + bDragging( FALSE ), \ + bIsBlockMode( FALSE ), \ + bBlockNeg( FALSE ), \ + bBlockCols( FALSE ), \ + bBlockRows( FALSE ), \ mfPendingTabBarWidth( -1.0 ), \ - bMinimized( FALSE ), \ - bInUpdateHeader( FALSE ), \ - bInActivatePart( FALSE ), \ - bInZoomUpdate( FALSE ), \ + bMinimized( FALSE ), \ + bInUpdateHeader( FALSE ), \ + bInActivatePart( FALSE ), \ + bInZoomUpdate( FALSE ), \ bMoveIsShift( FALSE ) @@ -355,14 +355,14 @@ void ScTabView::InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ) { rScrollBar.SetRange( Range( 0, nMaxVal ) ); rScrollBar.SetLineSize( 1 ); - rScrollBar.SetPageSize( 1 ); // wird getrennt abgefragt - rScrollBar.SetVisibleSize( 10 ); // wird bei Resize neu gesetzt + rScrollBar.SetPageSize( 1 ); // wird getrennt abgefragt + rScrollBar.SetVisibleSize( 10 ); // wird bei Resize neu gesetzt rScrollBar.SetScrollHdl( LINK(this, ScTabView, ScrollHdl) ); rScrollBar.SetEndScrollHdl( LINK(this, ScTabView, EndScrollHdl) ); } -// Scroll-Timer +// Scroll-Timer void ScTabView::SetTimer( ScGridWindow* pWin, const MouseEvent& rMEvt ) { @@ -379,7 +379,7 @@ void ScTabView::ResetTimer() IMPL_LINK( ScTabView, TimerHdl, Timer*, EMPTYARG ) { -// aScrollTimer.Stop(); +// aScrollTimer.Stop(); if (pTimerWindow) pTimerWindow->MouseMove( aTimerMEvt ); @@ -397,8 +397,8 @@ void lcl_SetPosSize( Window& rWindow, const Point& rPos, const Size& rSize, aNewPos.X() = nTotalWidth - rPos.X() - rSize.Width(); if ( aNewPos == rWindow.GetPosPixel() && rSize.Width() != rWindow.GetSizePixel().Width() ) { - // Document windows are manually painted right-to-left, so they need to - // be repainted if the size changes. + // Document windows are manually painted right-to-left, so they need to + // be repainted if the size changes. rWindow.Invalidate(); } } @@ -418,19 +418,19 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) if ( bLayoutRTL ) nTotalWidth += 2*rOffset.X(); - BOOL bVScroll = aViewData.IsVScrollMode(); - BOOL bHScroll = aViewData.IsHScrollMode(); + BOOL bVScroll = aViewData.IsVScrollMode(); + BOOL bHScroll = aViewData.IsHScrollMode(); BOOL bTabControl = aViewData.IsTabMode(); - BOOL bHeaders = aViewData.IsHeaderMode(); - BOOL bOutlMode = aViewData.IsOutlineMode(); - BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); - BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); + BOOL bHeaders = aViewData.IsHeaderMode(); + BOOL bOutlMode = aViewData.IsOutlineMode(); + BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); + BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); - // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden: + // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden: SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode(); if ( eMode == SCROLLING_NO ) bHScroll = bVScroll = FALSE; - else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ??? + else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ??? bHScroll = bVScroll = TRUE; if ( aViewData.GetDocShell()->IsPreview() ) @@ -460,7 +460,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX ) nSplitSizeY = 1; - const long nOverlap = 0; // ScrollBar::GetWindowOverlapPixel(); + const long nOverlap = 0; // ScrollBar::GetWindowOverlapPixel(); aBorderPos = rOffset; aFrameSize = rSize; @@ -472,7 +472,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) if ( WhichH( aViewData.GetActivePart() ) == SC_SPLIT_RIGHT ) ActivatePart( SC_SPLIT_BOTTOMLEFT ); InvalidateSplit(); -// UpdateShow(); +// UpdateShow(); } if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ) if ( aViewData.GetVSplitPos() > nSizeY - SPLIT_MARGIN ) @@ -481,32 +481,32 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) if ( WhichV( aViewData.GetActivePart() ) == SC_SPLIT_TOP ) ActivatePart( SC_SPLIT_BOTTOMLEFT ); InvalidateSplit(); -// UpdateShow(); +// UpdateShow(); } UpdateShow(); - if (bHScroll || bVScroll) // Scrollbars horizontal oder vertikal + if (bHScroll || bVScroll) // Scrollbars horizontal oder vertikal { long nScrollBarSize = pFrameWin->GetSettings().GetStyleSettings().GetScrollBarSize(); if (bVScroll) { -// nBarX = aVScrollBottom.GetSizePixel().Width(); +// nBarX = aVScrollBottom.GetSizePixel().Width(); nBarX = nScrollBarSize; nSizeX -= nBarX - nOverlap; } if (bHScroll) { -// nBarY = aHScrollLeft.GetSizePixel().Height(); +// nBarY = aHScrollLeft.GetSizePixel().Height(); nBarY = nScrollBarSize; nSizeY -= nBarY - nOverlap; } - // window at the bottom right + // window at the bottom right lcl_SetPosSize( aScrollBarBox, Point( nPosX+nSizeX, nPosY+nSizeY ), Size( nBarX, nBarY ), nTotalWidth, bLayoutRTL ); - if (bHScroll) // Scrollbars horizontal + if (bHScroll) // Scrollbars horizontal { long nSizeLt = 0; // left scroll bar long nSizeRt = 0; // right scroll bar @@ -516,7 +516,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) { case SC_SPLIT_NONE: nSizeSp = nSplitSizeX; - nSizeLt = nSizeX - nSizeSp + nOverlap; // Ecke ueberdecken + nSizeLt = nSizeX - nSizeSp + nOverlap; // Ecke ueberdecken break; case SC_SPLIT_NORMAL: nSizeSp = nSplitSizeX; @@ -541,13 +541,13 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) nTabSize = pTabControl->GetSizePixel().Width()-nOverlap; - if ( aViewData.GetHSplitMode() != SC_SPLIT_FIX ) // bei linkem Scrollbar + if ( aViewData.GetHSplitMode() != SC_SPLIT_FIX ) // bei linkem Scrollbar { if (nTabSize > nSizeLt-SC_SCROLLBAR_MIN) nTabSize = nSizeLt-SC_SCROLLBAR_MIN; if (nTabSize < SC_TABBAR_MIN) nTabSize = SC_TABBAR_MIN; nSizeLt -= nTabSize; } - else // bei rechtem Scrollbar + else // bei rechtem Scrollbar { if (nTabSize > nSizeRt-SC_SCROLLBAR_MIN) nTabSize = nSizeRt-SC_SCROLLBAR_MIN; if (nTabSize < SC_TABBAR_MIN) nTabSize = SC_TABBAR_MIN; @@ -567,14 +567,14 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) nPosY+nSizeY), Size(nSizeRt+2*nOverlap, nBarY), nTotalWidth, bLayoutRTL ); - // SetDragRectPixel is done below + // SetDragRectPixel is done below } - if (bVScroll) // Scrollbars vertikal + if (bVScroll) // Scrollbars vertikal { long nSizeUp = 0; // upper scroll bar long nSizeSp = 0; // splitter - long nSizeDn; // unterer Scrollbar + long nSizeDn; // unterer Scrollbar switch (aViewData.GetVSplitMode()) { @@ -601,11 +601,11 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) nPosY+nSizeUp+nSizeSp-nOverlap), Size(nBarX, nSizeDn+2*nOverlap), nTotalWidth, bLayoutRTL ); - // SetDragRectPixel is done below + // SetDragRectPixel is done below } } - // SetDragRectPixel auch ohne Scrollbars etc., wenn schon gesplittet ist + // SetDragRectPixel auch ohne Scrollbars etc., wenn schon gesplittet ist if ( bHScroll || aViewData.GetHSplitMode() != SC_SPLIT_NONE ) pHSplitter->SetDragRectPixel( Rectangle( nPosX, nPosY, nPosX+nSizeX, nPosY+nSizeY ), pFrameWin ); @@ -654,7 +654,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) nPosY += nOutlineY; } - if (bHeaders) // Spalten/Zeilen-Header + if (bHeaders) // Spalten/Zeilen-Header { nBarX = pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width(); nBarY = pColBar[SC_SPLIT_LEFT]->GetSizePixel().Height(); @@ -667,12 +667,12 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) nBarX = nBarY = 0; // - // Splitter auswerten + // Splitter auswerten // long nLeftSize = nSizeX; long nRightSize = 0; - long nTopSize = 0; + long nTopSize = 0; long nBottomSize = nSizeY; long nSplitPosX = nPosX; long nSplitPosY = nPosY; @@ -682,7 +682,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) long nSplitHeight = rSize.Height(); if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX ) { - // Fixier-Splitter nicht mit Scrollbar/TabBar ueberlappen lassen + // Fixier-Splitter nicht mit Scrollbar/TabBar ueberlappen lassen if ( bHScroll ) nSplitHeight -= aHScrollLeft.GetSizePixel().Height(); else if ( bTabControl && pTabControl ) @@ -708,9 +708,9 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) nBottomSize = nSizeY - nTopSize - nSplitSizeY; } - // ShowHide fuer pColOutline / pRowOutline passiert in UpdateShow + // ShowHide fuer pColOutline / pRowOutline passiert in UpdateShow - if (bHOutline) // Outline-Controls + if (bHOutline) // Outline-Controls { if (pColOutline[SC_SPLIT_LEFT]) { @@ -720,7 +720,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) } if (pColOutline[SC_SPLIT_RIGHT]) { - pColOutline[SC_SPLIT_RIGHT]->SetHeaderSize( 0 ); // always call to update RTL flag + pColOutline[SC_SPLIT_RIGHT]->SetHeaderSize( 0 ); // always call to update RTL flag lcl_SetPosSize( *pColOutline[SC_SPLIT_RIGHT], Point(nSplitPosX,nOutPosY), Size(nRightSize,nOutlineY), nTotalWidth, bLayoutRTL ); } @@ -754,7 +754,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) else aTopButton.Hide(); - if (bHeaders) // Spalten/Zeilen-Header + if (bHeaders) // Spalten/Zeilen-Header { lcl_SetPosSize( *pColBar[SC_SPLIT_LEFT], Point(nPosX,nPosY-nBarY), Size(nLeftSize,nBarY), nTotalWidth, bLayoutRTL ); @@ -776,7 +776,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) else { aCornerButton.Hide(); - pColBar[SC_SPLIT_LEFT]->Hide(); // immer da + pColBar[SC_SPLIT_LEFT]->Hide(); // immer da pRowBar[SC_SPLIT_BOTTOM]->Hide(); } @@ -804,21 +804,21 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) } // - // Scrollbars updaten + // Scrollbars updaten // if (!bInUpdateHeader) { - UpdateScrollBars(); // Scrollbars nicht beim Scrollen neu setzen + UpdateScrollBars(); // Scrollbars nicht beim Scrollen neu setzen UpdateHeaderWidth(); - InterpretVisible(); // #69343# have everything calculated before painting + InterpretVisible(); // #69343# have everything calculated before painting } if (bHasHint) - TestHintWindow(); // neu positionieren + TestHintWindow(); // neu positionieren - UpdateVarZoom(); // update variable zoom types (after resizing GridWindows) + UpdateVarZoom(); // update variable zoom types (after resizing GridWindows) if (aViewData.GetViewShell()->HasAccessibilityObjects()) aViewData.GetViewShell()->BroadcastAccessibility(SfxSimpleHint(SC_HINT_ACC_WINDOWRESIZED)); @@ -826,7 +826,7 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, BOOL bInner ) void ScTabView::UpdateVarZoom() { - // update variable zoom types + // update variable zoom types SvxZoomType eZoomType = GetZoomType(); if ( eZoomType != SVX_ZOOM_PERCENT && !bInZoomUpdate ) @@ -885,21 +885,21 @@ void ScTabView::RepeatResize( BOOL bUpdateFix ) DoResize( aBorderPos, aFrameSize ); - //! Border muss neu gesetzt werden ??? + //! Border muss neu gesetzt werden ??? } void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ ) { BOOL bScrollBars = aViewData.IsVScrollMode(); - BOOL bHeaders = aViewData.IsHeaderMode(); - BOOL bOutlMode = aViewData.IsOutlineMode(); - BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); - BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); + BOOL bHeaders = aViewData.IsHeaderMode(); + BOOL bOutlMode = aViewData.IsOutlineMode(); + BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); + BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); rBorder = SvBorder(); - if (bScrollBars) // Scrollbars horizontal oder vertikal + if (bScrollBars) // Scrollbars horizontal oder vertikal { rBorder.Right() += aVScrollBottom.GetSizePixel().Width(); rBorder.Bottom() += aHScrollLeft.GetSizePixel().Height(); @@ -911,7 +911,7 @@ void ScTabView::GetBorderSize( SvBorder& rBorder, const Size& /* rSize */ ) if (bHOutline && pColOutline[SC_SPLIT_LEFT]) rBorder.Top() += pColOutline[SC_SPLIT_LEFT]->GetDepthSize(); - if (bHeaders) // Spalten/Zeilen-Header + if (bHeaders) // Spalten/Zeilen-Header { rBorder.Left() += pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width(); rBorder.Top() += pColBar[SC_SPLIT_LEFT]->GetSizePixel().Height(); @@ -925,16 +925,16 @@ IMPL_LINK( ScTabView, TabBarResize, void*, EMPTYARG ) { BOOL bHScrollMode = aViewData.IsHScrollMode(); - // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden: + // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden: SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode(); if ( eMode == SCROLLING_NO ) bHScrollMode = FALSE; - else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ??? + else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ??? bHScrollMode = TRUE; if( bHScrollMode ) { - const long nOverlap = 0; // ScrollBar::GetWindowOverlapPixel(); + const long nOverlap = 0; // ScrollBar::GetWindowOverlapPixel(); long nSize = pTabControl->GetSplitSize(); if (aViewData.GetHSplitMode() != SC_SPLIT_FIX) @@ -1016,7 +1016,7 @@ void ScTabView::SetActivePointer( const Pointer& rPointer ) if (pGridWin[i]) pGridWin[i]->SetPointer( rPointer ); -/* ScSplitPos ePos = aViewData.GetActivePart(); +/* ScSplitPos ePos = aViewData.GetActivePart(); if (pGridWin[ePos]) pGridWin[ePos]->SetPointer( rPointer ); */ @@ -1033,7 +1033,7 @@ void ScTabView::ActiveGrabFocus() ScSplitPos ScTabView::FindWindow( Window* pWindow ) const { - ScSplitPos eVal = SC_SPLIT_BOTTOMLEFT; // Default + ScSplitPos eVal = SC_SPLIT_BOTTOMLEFT; // Default for (USHORT i=0; i<4; i++) if ( pGridWin[i] == pWindow ) eVal = (ScSplitPos) i; @@ -1047,10 +1047,10 @@ Point ScTabView::GetGridOffset() const // Groessen hier wie in DoResize - BOOL bHeaders = aViewData.IsHeaderMode(); - BOOL bOutlMode = aViewData.IsOutlineMode(); - BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); - BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); + BOOL bHeaders = aViewData.IsHeaderMode(); + BOOL bOutlMode = aViewData.IsOutlineMode(); + BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); + BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); // Outline-Controls if (bVOutline && pRowOutline[SC_SPLIT_BOTTOM]) @@ -1058,7 +1058,7 @@ Point ScTabView::GetGridOffset() const if (bHOutline && pColOutline[SC_SPLIT_LEFT]) aPos.Y() += pColOutline[SC_SPLIT_LEFT]->GetDepthSize(); - if (bHeaders) // Spalten/Zeilen-Header + if (bHeaders) // Spalten/Zeilen-Header { if (pRowBar[SC_SPLIT_BOTTOM]) aPos.X() += pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width(); @@ -1081,8 +1081,8 @@ BOOL ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ) { if ( !aViewData.GetViewShell()->GetViewFrame()->GetFrame().IsInPlace() ) { - // for ole inplace editing, the scale is defined by the visarea and client size - // and can't be changed directly + // for ole inplace editing, the scale is defined by the visarea and client size + // and can't be changed directly const Fraction& rOldY = aViewData.GetZoomY(); long nOld = (long)(( rOldY.GetNumerator() * 100 ) / rOldY.GetDenominator()); @@ -1124,15 +1124,15 @@ BOOL ScTabView::ScrollCommand( const CommandEvent& rCEvt, ScSplitPos ePos ) IMPL_LINK( ScTabView, EndScrollHdl, ScrollBar*, pScroll ) { - BOOL bOnlineScroll = TRUE; //! Optionen + BOOL bOnlineScroll = TRUE; //! Optionen if ( bDragging ) { - if ( bOnlineScroll ) // nur Ranges aktualisieren + if ( bOnlineScroll ) // nur Ranges aktualisieren UpdateScrollBars(); else { - long nScrollMin = 0; // RangeMin simulieren + long nScrollMin = 0; // RangeMin simulieren if ( aViewData.GetHSplitMode()==SC_SPLIT_FIX && pScroll == &aHScrollRight ) nScrollMin = aViewData.GetFixPosX(); if ( aViewData.GetVSplitMode()==SC_SPLIT_FIX && pScroll == &aVScrollBottom ) @@ -1143,9 +1143,9 @@ IMPL_LINK( ScTabView, EndScrollHdl, ScrollBar*, pScroll ) BOOL bMirror = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ) != Application::GetSettings().GetLayoutRTL(); ScHSplitPos eWhich = (pScroll == &aHScrollLeft) ? SC_SPLIT_LEFT : SC_SPLIT_RIGHT; long nDelta = GetScrollBarPos( *pScroll, bMirror ) + nScrollMin - aViewData.GetPosX(eWhich); - if (nDelta) ScrollX( nDelta, eWhich ); + if (nDelta) ScrollX( nDelta, eWhich ); } - else // VScroll... + else // VScroll... { ScVSplitPos eWhich = (pScroll == &aVScrollTop) ? SC_SPLIT_TOP : SC_SPLIT_BOTTOM; long nDelta = GetScrollBarPos( *pScroll, FALSE ) + nScrollMin - aViewData.GetPosY(eWhich); @@ -1159,7 +1159,7 @@ IMPL_LINK( ScTabView, EndScrollHdl, ScrollBar*, pScroll ) IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) { - BOOL bOnlineScroll = TRUE; //! Optionen + BOOL bOnlineScroll = TRUE; //! Optionen BOOL bHoriz = ( pScroll == &aHScrollLeft || pScroll == &aHScrollRight ); long nViewPos; @@ -1182,8 +1182,8 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) nPrevDragPos = nViewPos; } - // Scroll-Position anzeigen - // (nur QuickHelp, in der Statuszeile gibt es keinen Eintrag dafuer) + // Scroll-Position anzeigen + // (nur QuickHelp, in der Statuszeile gibt es keinen Eintrag dafuer) if (Help::IsQuickHelpEnabled()) { @@ -1204,7 +1204,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) Point aPos = pScroll->OutputToNormalizedScreenPixel( Point() ); // get scrollbar scroll position for help text (row number/column name) - long nScrollMin = 0; // RangeMin simulieren + long nScrollMin = 0; // RangeMin simulieren if ( aViewData.GetHSplitMode()==SC_SPLIT_FIX && pScroll == &aHScrollRight ) nScrollMin = aViewData.GetFixPosX(); if ( aViewData.GetVSplitMode()==SC_SPLIT_FIX && pScroll == &aVScrollBottom ) @@ -1221,8 +1221,8 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) aHelpStr += ScColToAlpha((SCCOL) nScrollPos); aRect.Left() = aMousePos.X(); - aRect.Top() = aPos.Y() - 4; - nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; + aRect.Top() = aPos.Y() - 4; + nAlign = QUICKHELP_BOTTOM|QUICKHELP_CENTER; } else { @@ -1232,11 +1232,11 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) // show quicktext always inside sheet area aRect.Left() = bLayoutRTL ? (aPos.X() + aSize.Width() + 8) : (aPos.X() - 8); - aRect.Top() = aMousePos.Y(); + aRect.Top() = aMousePos.Y(); nAlign = (bLayoutRTL ? QUICKHELP_LEFT : QUICKHELP_RIGHT) | QUICKHELP_VCENTER; } - aRect.Right() = aRect.Left(); - aRect.Bottom() = aRect.Top(); + aRect.Right() = aRect.Left(); + aRect.Bottom() = aRect.Top(); Help::ShowQuickHelp(pScroll->GetParent(), aRect, aHelpStr, nAlign); } @@ -1249,10 +1249,10 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) // change scroll type so visible/previous cells calculation below remains the same switch ( eType ) { - case SCROLL_LINEUP: eType = SCROLL_LINEDOWN; break; - case SCROLL_LINEDOWN: eType = SCROLL_LINEUP; break; - case SCROLL_PAGEUP: eType = SCROLL_PAGEDOWN; break; - case SCROLL_PAGEDOWN: eType = SCROLL_PAGEUP; break; + case SCROLL_LINEUP: eType = SCROLL_LINEDOWN; break; + case SCROLL_LINEDOWN: eType = SCROLL_LINEUP; break; + case SCROLL_PAGEUP: eType = SCROLL_PAGEDOWN; break; + case SCROLL_PAGEDOWN: eType = SCROLL_PAGEUP; break; default: { // added to avoid warnings @@ -1284,10 +1284,10 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) break; case SCROLL_DRAG: { - // nur in die richtige Richtung scrollen, nicht um ausgeblendete - // Bereiche herumzittern + // nur in die richtige Richtung scrollen, nicht um ausgeblendete + // Bereiche herumzittern - long nScrollMin = 0; // RangeMin simulieren + long nScrollMin = 0; // RangeMin simulieren if ( aViewData.GetHSplitMode()==SC_SPLIT_FIX && pScroll == &aHScrollRight ) nScrollMin = aViewData.GetFixPosX(); if ( aViewData.GetVSplitMode()==SC_SPLIT_FIX && pScroll == &aVScrollBottom ) @@ -1316,7 +1316,7 @@ IMPL_LINK( ScTabView, ScrollHdl, ScrollBar*, pScroll ) if (nDelta) { - BOOL bUpdate = ( eType != SCROLL_DRAG ); // bei Drag die Ranges nicht aendern + BOOL bUpdate = ( eType != SCROLL_DRAG ); // bei Drag die Ranges nicht aendern if ( bHoriz ) ScrollX( nDelta, (pScroll == &aHScrollLeft) ? SC_SPLIT_LEFT : SC_SPLIT_RIGHT, bUpdate ); else @@ -1353,12 +1353,12 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars ) nNewX+nDir >= 0 && nNewX+nDir <= MAXCOL ) nNewX = sal::static_int_cast<SCsCOL>( nNewX + nDir ); - // Fixierung + // Fixierung if (aViewData.GetHSplitMode() == SC_SPLIT_FIX) { if (eWhich == SC_SPLIT_LEFT) - nNewX = static_cast<SCsCOL>(nOldX); // links immer stehenlassen + nNewX = static_cast<SCsCOL>(nOldX); // links immer stehenlassen else { SCsCOL nFixX = static_cast<SCsCOL>(aViewData.GetFixPosX()); @@ -1375,10 +1375,10 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars ) { SCCOL nTrackX = std::max( nOldX, static_cast<SCCOL>(nNewX) ); - // Mit VCL wirkt Update() im Moment immer auf alle Fenster, beim Update - // nach dem Scrollen des GridWindow's wuerde darum der Col-/RowBar evtl. - // mit schon geaenderter Pos. gepainted werden - - // darum vorher einmal Update am Col-/RowBar + // Mit VCL wirkt Update() im Moment immer auf alle Fenster, beim Update + // nach dem Scrollen des GridWindow's wuerde darum der Col-/RowBar evtl. + // mit schon geaenderter Pos. gepainted werden - + // darum vorher einmal Update am Col-/RowBar if (pColBar[eWhich]) pColBar[eWhich]->Update(); @@ -1399,7 +1399,7 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars ) if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ) pGridWin[SC_SPLIT_TOPRIGHT]->ScrollPixel( nDiff, 0 ); } - if (pColBar[eWhich]) { pColBar[eWhich]->Scroll( nDiff,0 ); pColBar[eWhich]->Update(); } + if (pColBar[eWhich]) { pColBar[eWhich]->Scroll( nDiff,0 ); pColBar[eWhich]->Update(); } if (pColOutline[eWhich]) pColOutline[eWhich]->ScrollPixel( nDiff ); if (bUpdBars) UpdateScrollBars(); @@ -1410,10 +1410,10 @@ void ScTabView::ScrollX( long nDeltaX, ScHSplitPos eWhich, BOOL bUpdBars ) ShowAllCursors(); - SetNewVisArea(); // MapMode muss schon gesetzt sein + SetNewVisArea(); // MapMode muss schon gesetzt sein if (bHasHint) - TestHintWindow(); // neu positionieren + TestHintWindow(); // neu positionieren } void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars ) @@ -1442,12 +1442,12 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars ) nNewY+nDir >= 0 && nNewY+nDir <= MAXROW ) nNewY += nDir; - // Fixierung + // Fixierung if (aViewData.GetVSplitMode() == SC_SPLIT_FIX) { if (eWhich == SC_SPLIT_TOP) - nNewY = static_cast<SCsROW>(nOldY); // oben immer stehenlassen + nNewY = static_cast<SCsROW>(nOldY); // oben immer stehenlassen else { SCsROW nFixY = static_cast<SCsROW>(aViewData.GetFixPosY()); @@ -1464,11 +1464,11 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars ) { SCROW nTrackY = std::max( nOldY, static_cast<SCROW>(nNewY) ); - // Zeilenkoepfe anpassen vor dem eigentlichen Scrolling, damit nicht - // doppelt gepainted werden muss - // PosY darf dann auch noch nicht umgesetzt sein, neuen Wert uebergeben + // Zeilenkoepfe anpassen vor dem eigentlichen Scrolling, damit nicht + // doppelt gepainted werden muss + // PosY darf dann auch noch nicht umgesetzt sein, neuen Wert uebergeben SCROW nUNew = static_cast<SCROW>(nNewY); - UpdateHeaderWidth( &eWhich, &nUNew ); // Zeilenkoepfe anpassen + UpdateHeaderWidth( &eWhich, &nUNew ); // Zeilenkoepfe anpassen if (pRowBar[eWhich]) pRowBar[eWhich]->Update(); @@ -1489,7 +1489,7 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars ) if ( aViewData.GetHSplitMode() != SC_SPLIT_NONE ) pGridWin[SC_SPLIT_BOTTOMRIGHT]->ScrollPixel( 0, nDiff ); } - if (pRowBar[eWhich]) { pRowBar[eWhich]->Scroll( 0,nDiff ); pRowBar[eWhich]->Update(); } + if (pRowBar[eWhich]) { pRowBar[eWhich]->Scroll( 0,nDiff ); pRowBar[eWhich]->Update(); } if (pRowOutline[eWhich]) pRowOutline[eWhich]->ScrollPixel( nDiff ); if (bUpdBars) UpdateScrollBars(); @@ -1500,10 +1500,10 @@ void ScTabView::ScrollY( long nDeltaY, ScVSplitPos eWhich, BOOL bUpdBars ) ShowAllCursors(); - SetNewVisArea(); // MapMode muss schon gesetzt sein + SetNewVisArea(); // MapMode muss schon gesetzt sein if (bHasHint) - TestHintWindow(); // neu positionieren + TestHintWindow(); // neu positionieren } void ScTabView::ScrollLines( long nDeltaX, long nDeltaY ) @@ -1517,9 +1517,9 @@ void ScTabView::ScrollLines( long nDeltaX, long nDeltaY ) SCROW lcl_LastVisible( ScViewData& rViewData ) { - // wenn am Dokumentende viele Zeilen ausgeblendet sind (welcher Trottel macht sowas?), - // soll dadurch nicht auf breite Zeilenkoepfe geschaltet werden - //! als Member ans Dokument ??? + // wenn am Dokumentende viele Zeilen ausgeblendet sind (welcher Trottel macht sowas?), + // soll dadurch nicht auf breite Zeilenkoepfe geschaltet werden + //! als Member ans Dokument ??? ScDocument* pDoc = rViewData.GetDocument(); SCTAB nTab = rViewData.GetTabNo(); @@ -1538,13 +1538,13 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY SCROW nEndPos = MAXROW; if ( !aViewData.GetViewShell()->GetViewFrame()->GetFrame().IsInPlace() ) { - // fuer OLE Inplace immer MAXROW + // fuer OLE Inplace immer MAXROW if ( pWhich && *pWhich == SC_SPLIT_BOTTOM && pPosY ) nEndPos = *pPosY; else nEndPos = aViewData.GetPosY( SC_SPLIT_BOTTOM ); - nEndPos += aViewData.CellsAtY( nEndPos, 1, SC_SPLIT_BOTTOM, SC_SIZE_NONE ); // VisibleCellsY + nEndPos += aViewData.CellsAtY( nEndPos, 1, SC_SPLIT_BOTTOM, SC_SIZE_NONE ); // VisibleCellsY if (nEndPos > MAXROW) nEndPos = lcl_LastVisible( aViewData ); @@ -1570,7 +1570,7 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY if (nEndPos>10000) nEndPos = 10000; - else if (nEndPos<1) // avoid extra step at 0 (when only one row is visible) + else if (nEndPos<1) // avoid extra step at 0 (when only one row is visible) nEndPos = 1; long nWidth = nBig - ( 10000 - nEndPos ) * nDiff / 10000; @@ -1585,7 +1585,7 @@ void ScTabView::UpdateHeaderWidth( const ScVSplitPos* pWhich, const SCROW* pPosY RepeatResize(); // auf VCL gibt's Update ohne Ende (jedes Update gilt fuer alle Fenster) - //aCornerButton.Update(); // der bekommt sonst nie ein Update + //aCornerButton.Update(); // der bekommt sonst nie ein Update bInUpdateHeader = FALSE; } @@ -1602,27 +1602,27 @@ void ScTabView::UpdateShow() { BOOL bHScrollMode = aViewData.IsHScrollMode(); BOOL bVScrollMode = aViewData.IsVScrollMode(); - BOOL bTabMode = aViewData.IsTabMode(); - BOOL bOutlMode = aViewData.IsOutlineMode(); - BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); - BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); - BOOL bHeader = aViewData.IsHeaderMode(); + BOOL bTabMode = aViewData.IsTabMode(); + BOOL bOutlMode = aViewData.IsOutlineMode(); + BOOL bHOutline = bOutlMode && lcl_HasColOutline(aViewData); + BOOL bVOutline = bOutlMode && lcl_HasRowOutline(aViewData); + BOOL bHeader = aViewData.IsHeaderMode(); BOOL bShowH = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE ); BOOL bShowV = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ); - // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden: + // Scrollbar-Einstellungen koennen vom Sfx ueberschrieben werden: SfxScrollingMode eMode = aViewData.GetViewShell()->GetScrollingMode(); if ( eMode == SCROLLING_NO ) bHScrollMode = bVScrollMode = FALSE; - else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ??? + else if ( eMode == SCROLLING_YES || eMode == SCROLLING_AUTO ) //! Auto ??? bHScrollMode = bVScrollMode = TRUE; if ( aViewData.GetDocShell()->IsPreview() ) bHScrollMode = bVScrollMode = bTabMode = bHeader = bOutlMode = bHOutline = bVOutline = FALSE; // - // Windows anlegen + // Windows anlegen // if (bShowH && !pGridWin[SC_SPLIT_BOTTOMRIGHT]) @@ -1659,7 +1659,7 @@ void ScTabView::UpdateShow() &aHdrFunc, pHdrSelEng ); // - // Windows anzeigen + // Windows anzeigen // ShowHide( &aHScrollLeft, bHScrollMode ); @@ -1668,7 +1668,7 @@ void ScTabView::UpdateShow() ShowHide( &aVScrollTop, bShowV && bVScrollMode ); ShowHide( &aScrollBarBox, bVScrollMode || bHScrollMode ); - ShowHide( pHSplitter, bHScrollMode || bShowH ); // immer angelegt + ShowHide( pHSplitter, bHScrollMode || bShowH ); // immer angelegt ShowHide( pVSplitter, bVScrollMode || bShowV ); ShowHide( pTabControl, bTabMode ); @@ -1688,7 +1688,7 @@ void ScTabView::UpdateShow() ShowHide( pRowBar[SC_SPLIT_TOP], bShowV && bHeader ); - //! neue Gridwindows eintragen + //! neue Gridwindows eintragen } void ScTabView::UpdateVisibleRange() @@ -1721,8 +1721,8 @@ IMPL_LINK( ScTabView, SplitHdl, Splitter*, pSplitter ) void ScTabView::DoHSplit(long nSplitPos) { - // nSplitPos is the real pixel position on the frame window, - // mirroring for RTL has to be done here. + // nSplitPos is the real pixel position on the frame window, + // mirroring for RTL has to be done here. BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); if ( bLayoutRTL ) @@ -1749,7 +1749,7 @@ void ScTabView::DoHSplit(long nSplitPos) if ( aNewMode != aOldMode ) { - UpdateShow(); // vor ActivatePart !! + UpdateShow(); // vor ActivatePart !! if ( aNewMode == SC_SPLIT_NONE ) { @@ -1761,7 +1761,7 @@ void ScTabView::DoHSplit(long nSplitPos) else { nOldDelta = aViewData.GetPosX( SC_SPLIT_LEFT ); -// aViewData.SetPosX( SC_SPLIT_LEFT, nOldDelta ); +// aViewData.SetPosX( SC_SPLIT_LEFT, nOldDelta ); long nLeftWidth = nSplitPos - pRowBar[SC_SPLIT_BOTTOM]->GetSizePixel().Width(); if ( nLeftWidth < 0 ) nLeftWidth = 0; nNewDelta = nOldDelta + aViewData.CellsAtX( nOldDelta, 1, SC_SPLIT_LEFT, @@ -1777,8 +1777,8 @@ void ScTabView::DoHSplit(long nSplitPos) SC_SPLIT_BOTTOMRIGHT : SC_SPLIT_TOPRIGHT ); } - // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen - // dafuer muss hier schon der MapMode stimmen + // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen + // dafuer muss hier schon der MapMode stimmen for (USHORT i=0; i<4; i++) if (pGridWin[i]) pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() ); @@ -1814,7 +1814,7 @@ void ScTabView::DoVSplit(long nSplitPos) if ( aNewMode != aOldMode ) { - UpdateShow(); // vor ActivatePart !! + UpdateShow(); // vor ActivatePart !! if ( aNewMode == SC_SPLIT_NONE ) { @@ -1849,8 +1849,8 @@ void ScTabView::DoVSplit(long nSplitPos) SC_SPLIT_BOTTOMLEFT : SC_SPLIT_BOTTOMRIGHT ); } - // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen - // dafuer muss hier schon der MapMode stimmen + // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen + // dafuer muss hier schon der MapMode stimmen for (USHORT i=0; i<4; i++) if (pGridWin[i]) pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() ); @@ -2110,8 +2110,8 @@ BOOL lcl_MouseIsOverWin( const Point& rScreenPosPixel, Window* pWin ) { if (pWin) { - // SPLIT_HANDLE_SIZE draufaddieren, damit das Einrasten genau - // auf dem Splitter nicht aussetzt + // SPLIT_HANDLE_SIZE draufaddieren, damit das Einrasten genau + // auf dem Splitter nicht aussetzt Point aRel = pWin->NormalizedScreenToOutputPixel( rScreenPosPixel ); Size aWinSize = pWin->GetOutputSizePixel(); @@ -2133,7 +2133,7 @@ void ScTabView::SnapSplitPos( Point& rScreenPosPixel ) if (!bOverWin) return; - // #74761# don't snap to cells if the scale will be modified afterwards + // #74761# don't snap to cells if the scale will be modified afterwards if ( GetZoomType() != SVX_ZOOM_PERCENT ) return; @@ -2151,7 +2151,7 @@ void ScTabView::SnapSplitPos( Point& rScreenPosPixel ) Point aMouse = pWin->NormalizedScreenToOutputPixel( rScreenPosPixel ); SCsCOL nPosX; SCsROW nPosY; - // #52949# bNextIfLarge=FALSE: nicht auf naechste Zelle, wenn ausserhalb des Fensters + // #52949# bNextIfLarge=FALSE: nicht auf naechste Zelle, wenn ausserhalb des Fensters aViewData.GetPosFromPixel( aMouse.X(), aMouse.Y(), ePos, nPosX, nPosY, TRUE, FALSE, FALSE ); BOOL bLeft; BOOL bTop; @@ -2225,7 +2225,7 @@ void ScTabView::FreezeSplitters( BOOL bFreeze ) } aSplit = aViewData.GetScrPos( static_cast<SCCOL>(nPosX), static_cast<SCROW>(nPosY), ePos, TRUE ); - if (nPosX > aViewData.GetPosX(SC_SPLIT_LEFT)) // (aSplit.X() > 0) doesn't work for RTL + if (nPosX > aViewData.GetPosX(SC_SPLIT_LEFT)) // (aSplit.X() > 0) doesn't work for RTL { long nSplitPos = aSplit.X() + aWinStart.X(); if ( bLayoutRTL ) @@ -2252,7 +2252,7 @@ void ScTabView::FreezeSplitters( BOOL bFreeze ) else aViewData.SetVSplitMode( SC_SPLIT_NONE ); } - else // Fixierung aufheben + else // Fixierung aufheben { if ( eOldH == SC_SPLIT_FIX ) aViewData.SetHSplitMode( SC_SPLIT_NORMAL ); @@ -2260,8 +2260,8 @@ void ScTabView::FreezeSplitters( BOOL bFreeze ) aViewData.SetVSplitMode( SC_SPLIT_NORMAL ); } - // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen - // dafuer muss hier schon der MapMode stimmen + // #61410# Form-Layer muss den sichtbaren Ausschnitt aller Fenster kennen + // dafuer muss hier schon der MapMode stimmen for (USHORT i=0; i<4; i++) if (pGridWin[i]) pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() ); @@ -2274,7 +2274,7 @@ void ScTabView::FreezeSplitters( BOOL bFreeze ) PaintTop(); PaintGrid(); - // SC_FOLLOW_NONE: only update active part + // SC_FOLLOW_NONE: only update active part AlignToCursor( aViewData.GetCurX(), aViewData.GetCurY(), SC_FOLLOW_NONE ); UpdateAutoFillMark(); @@ -2310,9 +2310,9 @@ void ScTabView::SplitAtCursor() RepeatResize(); } -void ScTabView::SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer ) // fuer API +void ScTabView::SplitAtPixel( const Point& rPixel, BOOL bHor, BOOL bVer ) // fuer API { - // Pixel ist auf die ganze View bezogen, nicht auf das erste GridWin + // Pixel ist auf die ganze View bezogen, nicht auf das erste GridWin if (bHor) { @@ -2343,8 +2343,8 @@ void ScTabView::InvalidateSplit() void ScTabView::SetNewVisArea() { - // #63854# fuer die Controls muss bei VisAreaChanged der Draw-MapMode eingestellt sein - // (auch wenn ansonsten der Edit-MapMode gesetzt ist) + // #63854# fuer die Controls muss bei VisAreaChanged der Draw-MapMode eingestellt sein + // (auch wenn ansonsten der Edit-MapMode gesetzt ist) MapMode aOldMode[4]; MapMode aDrawMode[4]; USHORT i; @@ -2362,7 +2362,7 @@ void ScTabView::SetNewVisArea() aViewData.GetViewShell()->VisAreaChanged( pActive->PixelToLogic(Rectangle(Point(),pActive->GetOutputSizePixel())) ); if (pDrawView) - pDrawView->VisAreaChanged(); // kein Window uebergeben -> alle Fenster + pDrawView->VisAreaChanged(); // kein Window uebergeben -> alle Fenster UpdateAllOverlays(); // #i79909# with drawing MapMode set diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index a3692828c10f..a42cb4667c1a 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -62,9 +62,9 @@ #include "scmod.hxx" #include "tabprotection.hxx" -#define SC_BLOCKMODE_NONE 0 -#define SC_BLOCKMODE_NORMAL 1 -#define SC_BLOCKMODE_OWN 2 +#define SC_BLOCKMODE_NONE 0 +#define SC_BLOCKMODE_NORMAL 1 +#define SC_BLOCKMODE_OWN 2 @@ -104,14 +104,14 @@ void ScTabView::InitOwnBlockMode() { if (!bIsBlockMode) { - // Wenn keine (alte) Markierung mehr da ist, Anker in SelectionEngine loeschen: + // Wenn keine (alte) Markierung mehr da ist, Anker in SelectionEngine loeschen: ScMarkData& rMark = aViewData.GetMarkData(); if (!rMark.IsMarked() && !rMark.IsMultiMarked()) GetSelEngine()->CursorPosChanging( FALSE, FALSE ); -// bIsBlockMode = TRUE; - bIsBlockMode = SC_BLOCKMODE_OWN; //! Variable umbenennen! +// bIsBlockMode = TRUE; + bIsBlockMode = SC_BLOCKMODE_OWN; //! Variable umbenennen! nBlockStartX = 0; nBlockStartY = 0; nBlockStartZ = 0; @@ -119,7 +119,7 @@ void ScTabView::InitOwnBlockMode() nBlockEndY = 0; nBlockEndZ = 0; - SelectionChanged(); // Status wird mit gesetzer Markierung abgefragt + SelectionChanged(); // Status wird mit gesetzer Markierung abgefragt } } @@ -134,7 +134,7 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScMarkData& rMark = aViewData.GetMarkData(); SCTAB nTab = aViewData.GetTabNo(); - // Teil von Markierung aufheben? + // Teil von Markierung aufheben? if (bTestNeg) { if ( bCols ) @@ -148,8 +148,8 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, bBlockNeg = FALSE; rMark.SetMarkNegative(bBlockNeg); -// bIsBlockMode = TRUE; - bIsBlockMode = SC_BLOCKMODE_NORMAL; //! Variable umbenennen! +// bIsBlockMode = TRUE; + bIsBlockMode = SC_BLOCKMODE_NORMAL; //! Variable umbenennen! bBlockCols = bCols; bBlockRows = bRows; nBlockStartX = nBlockStartXOrig = nCurX; @@ -182,9 +182,9 @@ void ScTabView::InitBlockMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, void ScTabView::DoneBlockMode( BOOL bContinue ) // Default FALSE { - // Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird, - // wird evtl. DeselectAll gerufen, weil die andere Engine keinen Anker hat. - // Mit bMoveIsShift wird verhindert, dass dann die Selektion aufgehoben wird. + // Wenn zwischen Tabellen- und Header SelectionEngine gewechselt wird, + // wird evtl. DeselectAll gerufen, weil die andere Engine keinen Anker hat. + // Mit bMoveIsShift wird verhindert, dass dann die Selektion aufgehoben wird. if (bIsBlockMode && !bMoveIsShift) { @@ -199,19 +199,19 @@ void ScTabView::DoneBlockMode( BOOL bContinue ) // Default FALSE rMark.MarkToMulti(); else { - // Die Tabelle kann an dieser Stelle ungueltig sein, weil DoneBlockMode - // aus SetTabNo aufgerufen wird - // (z.B. wenn die aktuelle Tabelle von einer anderen View aus geloescht wird) + // Die Tabelle kann an dieser Stelle ungueltig sein, weil DoneBlockMode + // aus SetTabNo aufgerufen wird + // (z.B. wenn die aktuelle Tabelle von einer anderen View aus geloescht wird) SCTAB nTab = aViewData.GetTabNo(); ScDocument* pDoc = aViewData.GetDocument(); if ( pDoc->HasTable(nTab) ) - PaintBlock( TRUE ); // TRUE -> Block loeschen + PaintBlock( TRUE ); // TRUE -> Block loeschen else rMark.ResetMark(); } -// bIsBlockMode = FALSE; - bIsBlockMode = SC_BLOCKMODE_NONE; //! Variable umbenennen! +// bIsBlockMode = FALSE; + bIsBlockMode = SC_BLOCKMODE_NONE; //! Variable umbenennen! rMark.SetMarking(bFlag); rMark.SetMarkNegative(FALSE); @@ -243,13 +243,13 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ( aMarkRange.aStart.Row() != nBlockStartY && aMarkRange.aEnd.Row() != nBlockStartY ) || ( bIsBlockMode == SC_BLOCKMODE_OWN )) { - // Markierung ist veraendert worden - // (z.B. MarkToSimple, wenn per negativ alles bis auf ein Rechteck geloescht wurde) - // oder nach InitOwnBlockMode wird mit Shift-Klick weitermarkiert... + // Markierung ist veraendert worden + // (z.B. MarkToSimple, wenn per negativ alles bis auf ein Rechteck geloescht wurde) + // oder nach InitOwnBlockMode wird mit Shift-Klick weitermarkiert... BOOL bOldShift = bMoveIsShift; - bMoveIsShift = FALSE; // wirklich umsetzen - DoneBlockMode(FALSE); //! direkt Variablen setzen? (-> kein Geflacker) + bMoveIsShift = FALSE; // wirklich umsetzen + DoneBlockMode(FALSE); //! direkt Variablen setzen? (-> kein Geflacker) bMoveIsShift = bOldShift; InitBlockMode( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), @@ -263,13 +263,13 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, { // Current cursor has moved - SCTAB nTab = nCurZ; + SCTAB nTab = nCurZ; #ifdef OLD_SELECTION_PAINT - SCCOL nDrawStartCol; - SCROW nDrawStartRow; - SCCOL nDrawEndCol; - SCROW nDrawEndRow; + SCCOL nDrawStartCol; + SCROW nDrawStartRow; + SCCOL nDrawEndCol; + SCROW nDrawEndRow; #endif // Set old selection area @@ -380,8 +380,8 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, nDrawEndCol, nDrawEndRow, bCont ); if ( bDraw ) { -//? PutInOrder( nDrawStartCol, nDrawEndCol ); -//? PutInOrder( nDrawStartRow, nDrawEndRow ); +//? PutInOrder( nDrawStartCol, nDrawEndCol ); +//? PutInOrder( nDrawStartRow, nDrawEndRow ); HideAllCursors(); InvertBlockMark( nDrawStartCol, nDrawStartRow, nDrawEndCol, nDrawEndRow ); @@ -399,7 +399,7 @@ void ScTabView::MarkCursor( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, nOldCurY = nCurY; aViewData.GetViewShell()->UpdateInputHandler(); -// InvalidateAttribs(); +// InvalidateAttribs(); } if ( !bCols && !bRows ) @@ -884,7 +884,7 @@ void ScTabView::UpdateAllOverlays() } //! -//! PaintBlock in zwei Methoden aufteilen: RepaintBlock und RemoveBlock o.ae. +//! PaintBlock in zwei Methoden aufteilen: RepaintBlock und RemoveBlock o.ae. //! void ScTabView::PaintBlock( BOOL bReset ) @@ -948,7 +948,7 @@ void ScTabView::PaintBlock( BOOL bReset ) #ifdef OLD_SELECTION_PAINT // (mis)use InvertBlockMark to remove all of the selection // -> set bBlockNeg (like when removing parts of a selection) - // and convert everything to Multi + // and convert everything to Multi rMark.MarkToMulti(); BOOL bOld = bBlockNeg; @@ -966,7 +966,7 @@ void ScTabView::PaintBlock( BOOL bReset ) bDidReset = TRUE; } - // repaint if controls are touched (#69680# in both cases) + // repaint if controls are touched (#69680# in both cases) // #i74768# Forms are rendered by DrawingLayer's EndDrawLayers() static bool bSuppressControlExtraStuff(true); @@ -979,7 +979,7 @@ void ScTabView::PaintBlock( BOOL bReset ) { if (pGridWin[i] && pGridWin[i]->IsVisible()) { - // MapMode muss logischer (1/100mm) sein !!! + // MapMode muss logischer (1/100mm) sein !!! pDoc->InvalidateControls( pGridWin[i], nTab, aMMRect ); pGridWin[i]->Update(); } @@ -1031,8 +1031,8 @@ void ScTabView::SelectAllTables() for (SCTAB i=0; i<nCount; i++) rMark.SelectTable( i, TRUE ); - // Markierungen werden per Default nicht pro Tabelle gehalten -// pDoc->ExtendMarksFromTable( nTab ); + // Markierungen werden per Default nicht pro Tabelle gehalten +// pDoc->ExtendMarksFromTable( nTab ); aViewData.GetDocShell()->PostPaintExtras(); SfxBindings& rBind = aViewData.GetBindings(); @@ -1070,7 +1070,7 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom, SCCOL nCol; for (nCol=0; nCol<nFixPosX; nCol++) { - // for frozen panes, add both parts + // for frozen panes, add both parts USHORT nColTwips = pDoc->GetColWidth( nCol, nTab ); if (nColTwips) { @@ -1096,7 +1096,7 @@ BOOL lcl_FitsInWindow( double fScaleX, double fScaleY, USHORT nZoom, if (pDoc->RowHidden(nRow, nTab)) continue; - // for frozen panes, add both parts + // for frozen panes, add both parts USHORT nRowTwips = pDoc->GetRowHeight(nRow, nTab); if (nRowTwips) { @@ -1129,26 +1129,26 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) nZoom = nOldZoom; break; - case SVX_ZOOM_OPTIMAL: // nZoom entspricht der optimalen Gr"o\se + case SVX_ZOOM_OPTIMAL: // nZoom entspricht der optimalen Gr"o\se { ScMarkData& rMark = aViewData.GetMarkData(); ScDocument* pDoc = aViewData.GetDocument(); if (!rMark.IsMarked() && !rMark.IsMultiMarked()) - nZoom = 100; // nothing selected + nZoom = 100; // nothing selected else { - SCTAB nTab = aViewData.GetTabNo(); + SCTAB nTab = aViewData.GetTabNo(); ScRange aMarkRange; if ( aViewData.GetSimpleArea( aMarkRange ) != SC_MARK_SIMPLE ) rMark.GetMultiMarkArea( aMarkRange ); - SCCOL nStartCol = aMarkRange.aStart.Col(); - SCROW nStartRow = aMarkRange.aStart.Row(); - SCTAB nStartTab = aMarkRange.aStart.Tab(); - SCCOL nEndCol = aMarkRange.aEnd.Col(); - SCROW nEndRow = aMarkRange.aEnd.Row(); - SCTAB nEndTab = aMarkRange.aEnd.Tab(); + SCCOL nStartCol = aMarkRange.aStart.Col(); + SCROW nStartRow = aMarkRange.aStart.Row(); + SCTAB nStartTab = aMarkRange.aStart.Tab(); + SCCOL nEndCol = aMarkRange.aEnd.Col(); + SCROW nEndRow = aMarkRange.aEnd.Row(); + SCTAB nEndTab = aMarkRange.aEnd.Tab(); if ( nTab < nStartTab && nTab > nEndTab ) nTab = nStartTab; @@ -1159,7 +1159,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) SCROW nFixPosY = 0; if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX ) { - // use right part + // use right part eUsedPart = (WhichV(eUsedPart)==SC_SPLIT_TOP) ? SC_SPLIT_TOPRIGHT : SC_SPLIT_BOTTOMRIGHT; nFixPosX = aViewData.GetFixPosX(); if ( nStartCol < nFixPosX ) @@ -1167,7 +1167,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) } if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX ) { - // use bottom part + // use bottom part eUsedPart = (WhichH(eUsedPart)==SC_SPLIT_LEFT) ? SC_SPLIT_BOTTOMLEFT : SC_SPLIT_BOTTOMRIGHT; nFixPosY = aViewData.GetFixPosY(); if ( nStartRow < nFixPosY ) @@ -1176,12 +1176,12 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) if (pGridWin[eUsedPart]) { - // Because scale is rounded to pixels, the only reliable way to find - // the right scale is to check if a zoom fits + // Because scale is rounded to pixels, the only reliable way to find + // the right scale is to check if a zoom fits Size aWinSize = pGridWin[eUsedPart]->GetOutputSizePixel(); - // for frozen panes, use sum of both parts for calculation + // for frozen panes, use sum of both parts for calculation if ( nFixPosX != 0 ) aWinSize.Width() += GetGridWidth( SC_SPLIT_LEFT ); @@ -1223,13 +1223,13 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) } break; - case SVX_ZOOM_WHOLEPAGE: // nZoom entspricht der ganzen Seite oder - case SVX_ZOOM_PAGEWIDTH: // nZoom entspricht der Seitenbreite + case SVX_ZOOM_WHOLEPAGE: // nZoom entspricht der ganzen Seite oder + case SVX_ZOOM_PAGEWIDTH: // nZoom entspricht der Seitenbreite { - SCTAB nCurTab = aViewData.GetTabNo(); - ScDocument* pDoc = aViewData.GetDocument(); - ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); - SfxStyleSheetBase* pStyleSheet = + SCTAB nCurTab = aViewData.GetTabNo(); + ScDocument* pDoc = aViewData.GetDocument(); + ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); + SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nCurTab ), SFX_STYLE_FAMILY_PAGE ); @@ -1243,11 +1243,11 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) Size aPageSize = aPrintFunc.GetDataSize(); - // use the size of the largest GridWin for normal split, - // or both combined for frozen panes, with the (document) size - // of the frozen part added to the page size - // (with frozen panes, the size of the individual parts - // depends on the scale that is to be calculated) + // use the size of the largest GridWin for normal split, + // or both combined for frozen panes, with the (document) size + // of the frozen part added to the page size + // (with frozen panes, the size of the individual parts + // depends on the scale that is to be calculated) if ( !pGridWin[SC_SPLIT_BOTTOMLEFT] ) return 0; Size aWinSize = pGridWin[SC_SPLIT_BOTTOMLEFT]->GetOutputSizePixel(); @@ -1307,7 +1307,7 @@ USHORT ScTabView::CalcZoom( SvxZoomType eType, USHORT nOldZoom ) return nZoom; } -// wird z.B. gerufen, wenn sich das View-Fenster verschiebt: +// wird z.B. gerufen, wenn sich das View-Fenster verschiebt: void ScTabView::StopMarking() { @@ -1337,7 +1337,7 @@ void ScTabView::MakeDrawLayer() { aViewData.GetDocShell()->MakeDrawLayer(); - // pDrawView wird per Notify gesetzt + // pDrawView wird per Notify gesetzt DBG_ASSERT(pDrawView,"ScTabView::MakeDrawLayer funktioniert nicht"); // #114409# @@ -1359,7 +1359,7 @@ void ScTabView::ErrorMessage( USHORT nGlobStrId ) return; } - StopMarking(); // falls per Focus aus MouseButtonDown aufgerufen + StopMarking(); // falls per Focus aus MouseButtonDown aufgerufen Window* pParent = aViewData.GetDialogParent(); ScWaitCursorOff aWaitOff( pParent ); @@ -1413,14 +1413,14 @@ void ScTabView::UpdatePageBreakData( BOOL bForcePaint ) pNewData = new ScPageBreakData(nCount); ScPrintFunc aPrintFunc( pDocSh, pDocSh->GetPrinter(), nTab, 0,0,NULL, NULL, pNewData ); - // ScPrintFunc fuellt im ctor die PageBreakData + // ScPrintFunc fuellt im ctor die PageBreakData if ( nCount > 1 ) { aPrintFunc.ResetBreaks(nTab); pNewData->AddPages(); } - // Druckbereiche veraendert? + // Druckbereiche veraendert? if ( bForcePaint || ( pPageBreakData && !pPageBreakData->IsEqual( *pNewData ) ) ) PaintGrid(); } diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index e9659ef962cd..d5a6f41f4aa7 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -113,7 +113,7 @@ using namespace com::sun::star; // ----------------------------------------------------------------------- // -// --- Public-Funktionen +// --- Public-Funktionen // void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl ) @@ -160,9 +160,9 @@ void ScTabView::UpdateAutoFillMark() pRowBar[i]->SetMark( bMarked, aMarkRange.aStart.Row(), aMarkRange.aEnd.Row() ); } - // selection transfer object is checked together with AutoFill marks, - // because it has the same requirement of a single continuous block. - CheckSelectionTransfer(); // update selection transfer object + // selection transfer object is checked together with AutoFill marks, + // because it has the same requirement of a single continuous block. + CheckSelectionTransfer(); // update selection transfer object } void ScTabView::FakeButtonUp( ScSplitPos eWhich ) @@ -270,13 +270,13 @@ void ScTabView::InvalidateAttribs() rBindings.Invalidate( SID_NUMBER_PERCENT ); rBindings.Invalidate( SID_NUMBER_TIME ); -// rBindings.Invalidate( SID_RANGE_VALUE ); -// rBindings.Invalidate( SID_RANGE_FORMULA ); +// rBindings.Invalidate( SID_RANGE_VALUE ); +// rBindings.Invalidate( SID_RANGE_FORMULA ); } -// SetCursor - Cursor setzen, zeichnen, InputWin updaten -// oder Referenz verschicken -// ohne Optimierung wegen BugId 29307 +// SetCursor - Cursor setzen, zeichnen, InputWin updaten +// oder Referenz verschicken +// ohne Optimierung wegen BugId 29307 #ifdef _MSC_VER #pragma optimize ( "", off ) @@ -287,7 +287,7 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew ) SCCOL nOldX = aViewData.GetCurX(); SCROW nOldY = aViewData.GetCurY(); - // DeactivateIP nur noch bei MarkListHasChanged + // DeactivateIP nur noch bei MarkListHasChanged if ( nPosX != nOldX || nPosY != nOldY || bNew ) { @@ -315,7 +315,7 @@ void ScTabView::SetCursor( SCCOL nPosX, SCROW nPosY, BOOL bNew ) void ScTabView::CheckSelectionTransfer() { - if ( aViewData.IsActive() ) // only for active view + if ( aViewData.IsActive() ) // only for active view { ScModule* pScMod = SC_MOD(); ScSelectionTransferObj* pOld = pScMod->GetSelectionTransfer(); @@ -328,22 +328,22 @@ void ScTabView::CheckSelectionTransfer() ScSelectionTransferObj* pNew = ScSelectionTransferObj::CreateFromView( this ); if ( pNew ) { - // create new selection + // create new selection if (pOld) pOld->ForgetView(); uno::Reference<datatransfer::XTransferable> xRef( pNew ); pScMod->SetSelectionTransfer( pNew ); - pNew->CopyToSelection( GetActiveWin() ); // may delete pOld + pNew->CopyToSelection( GetActiveWin() ); // may delete pOld } else if ( pOld && pOld->GetView() == this ) { - // remove own selection + // remove own selection pOld->ForgetView(); pScMod->SetSelectionTransfer( NULL ); - TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld + TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld } // else: selection from outside: leave unchanged } @@ -351,19 +351,19 @@ void ScTabView::CheckSelectionTransfer() } // Eingabezeile / Menues updaten -// CursorPosChanged ruft SelectionChanged -// SelectionChanged ruft CellContentChanged +// CursorPosChanged ruft SelectionChanged +// SelectionChanged ruft CellContentChanged void ScTabView::CellContentChanged() { SfxBindings& rBindings = aViewData.GetBindings(); - rBindings.Invalidate( SID_ATTR_SIZE ); // -> Fehlermeldungen anzeigen + rBindings.Invalidate( SID_ATTR_SIZE ); // -> Fehlermeldungen anzeigen rBindings.Invalidate( SID_THESAURUS ); rBindings.Invalidate( SID_HYPERLINK_GETLINK ); - InvalidateAttribs(); // Attribut-Updates - TestHintWindow(); // Eingabemeldung (Gueltigkeit) + InvalidateAttribs(); // Attribut-Updates + TestHintWindow(); // Eingabemeldung (Gueltigkeit) aViewData.GetViewShell()->UpdateInputHandler(); } @@ -382,16 +382,16 @@ void ScTabView::SelectionChanged() } } - UpdateAutoFillMark(); // also calls CheckSelectionTransfer + UpdateAutoFillMark(); // also calls CheckSelectionTransfer SfxBindings& rBindings = aViewData.GetBindings(); - rBindings.Invalidate( SID_CURRENTCELL ); // -> Navigator - rBindings.Invalidate( SID_AUTO_FILTER ); // -> Menue + rBindings.Invalidate( SID_CURRENTCELL ); // -> Navigator + rBindings.Invalidate( SID_AUTO_FILTER ); // -> Menue rBindings.Invalidate( FID_NOTE_VISIBLE ); rBindings.Invalidate( SID_DELETE_NOTE ); - // Funktionen, die evtl disabled werden muessen + // Funktionen, die evtl disabled werden muessen rBindings.Invalidate( FID_INS_ROWBRK ); rBindings.Invalidate( FID_INS_COLBRK ); @@ -402,7 +402,7 @@ void ScTabView::SelectionChanged() rBindings.Invalidate( FID_MERGE_TOGGLE ); rBindings.Invalidate( SID_AUTOFILTER_HIDE ); rBindings.Invalidate( SID_UNFILTER ); -// rBindings.Invalidate( SID_IMPORT_DATA ); // jetzt wieder immer moeglich +// rBindings.Invalidate( SID_IMPORT_DATA ); // jetzt wieder immer moeglich rBindings.Invalidate( SID_REIMPORT_DATA ); rBindings.Invalidate( SID_REFRESH_DBAREA ); rBindings.Invalidate( SID_OUTLINE_SHOW ); @@ -426,12 +426,12 @@ void ScTabView::SelectionChanged() rBindings.Invalidate( FID_INS_ROW ); rBindings.Invalidate( FID_INS_COLUMN ); rBindings.Invalidate( FID_INS_CELL ); - rBindings.Invalidate( FID_INS_CELLSDOWN ); + rBindings.Invalidate( FID_INS_CELLSDOWN ); rBindings.Invalidate( FID_INS_CELLSRIGHT ); rBindings.Invalidate( FID_CHG_COMMENT ); - // nur wegen Zellschutz: + // nur wegen Zellschutz: rBindings.Invalidate( SID_CELL_FORMAT_RESET ); rBindings.Invalidate( SID_DELETE ); @@ -442,7 +442,7 @@ void ScTabView::SelectionChanged() rBindings.Invalidate( SID_INSERT_POSTIT ); rBindings.Invalidate( SID_CHARMAP ); rBindings.Invalidate( SID_OPENDLG_FUNCTION ); -// rBindings.Invalidate( FID_CONDITIONAL_FORMAT ); +// rBindings.Invalidate( FID_CONDITIONAL_FORMAT ); rBindings.Invalidate( SID_OPENDLG_CONDFRMT ); rBindings.Invalidate( FID_VALIDATION ); rBindings.Invalidate( SID_EXTERNAL_SOURCE ); @@ -462,14 +462,14 @@ void ScTabView::CursorPosChanged() if ( !bRefMode ) // Abfrage, damit RefMode bei Tabellenwechsel funktioniert aViewData.GetDocShell()->Broadcast( SfxSimpleHint( FID_KILLEDITVIEW ) ); - // Broadcast, damit andere Views des Dokuments auch umschalten + // Broadcast, damit andere Views des Dokuments auch umschalten ScDocument* pDoc = aViewData.GetDocument(); bool bDP = NULL != pDoc->GetDPAtCursor( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo() ); aViewData.GetViewShell()->SetPivotShell(bDP); - // UpdateInputHandler jetzt in CellContentChanged + // UpdateInputHandler jetzt in CellContentChanged SelectionChanged(); @@ -491,12 +491,12 @@ void ScTabView::TestHintWindow() ATTR_VALIDDATA ); if ( pItem->GetValue() ) { - const ScValidationData* pData = pDoc->GetValidationEntry( pItem->GetValue() ); + const ScValidationData* pData = pDoc->GetValidationEntry( pItem->GetValue() ); DBG_ASSERT(pData,"ValidationData nicht gefunden"); String aTitle, aMessage; if ( pData && pData->GetInput( aTitle, aMessage ) && aMessage.Len() > 0 ) { - //! Abfrage, ob an gleicher Stelle !!!! + //! Abfrage, ob an gleicher Stelle !!!! DELETEZ(pInputHintWindow); @@ -506,12 +506,12 @@ void ScTabView::TestHintWindow() SCROW nRow = aViewData.GetCurY(); Point aPos = aViewData.GetScrPos( nCol, nRow, eWhich ); Size aWinSize = pWin->GetOutputSizePixel(); - // Cursor sichtbar? + // Cursor sichtbar? if ( nCol >= aViewData.GetPosX(WhichH(eWhich)) && nRow >= aViewData.GetPosY(WhichV(eWhich)) && aPos.X() < aWinSize.Width() && aPos.Y() < aWinSize.Height() ) { - aPos += pWin->GetPosPixel(); // Position auf Frame + aPos += pWin->GetPosPixel(); // Position auf Frame long nSizeXPix; long nSizeYPix; aViewData.GetMergeSizePixel( nCol, nRow, nSizeXPix, nSizeYPix ); @@ -522,7 +522,7 @@ void ScTabView::TestHintWindow() Size aFrameWinSize = pFrameWin->GetOutputSizePixel(); // passende Position finden - // erster Versuch: unter dem Cursor + // erster Versuch: unter dem Cursor Point aHintPos( aPos.X() + nSizeXPix / 2, aPos.Y() + nSizeYPix + 3 ); if ( aHintPos.Y() + aHintSize.Height() > aFrameWinSize.Height() ) { @@ -543,10 +543,10 @@ void ScTabView::TestHintWindow() } } - // X anpassen + // X anpassen if ( aHintPos.X() + aHintSize.Width() > aFrameWinSize.Width() ) aHintPos.X() = aFrameWinSize.Width() - aHintSize.Width(); - // Y anpassen + // Y anpassen if ( aHintPos.Y() + aHintSize.Height() > aFrameWinSize.Height() ) aHintPos.Y() = aFrameWinSize.Height() - aHintSize.Height(); @@ -582,9 +582,9 @@ void ScTabView::RemoveHintWindow() // find window that should not be over the cursor Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) { - //! auch Spelling ??? (dann beim Aufruf Membervariable setzen) + //! auch Spelling ??? (dann beim Aufruf Membervariable setzen) - // Suchen & Ersetzen + // Suchen & Ersetzen if ( pViewFrm->HasChildWindow(SID_SEARCH_DLG) ) { SfxChildWindow* pChild = pViewFrm->GetChildWindow(SID_SEARCH_DLG); @@ -596,7 +596,7 @@ Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) } } - // Aenderungen uebernehmen + // Aenderungen uebernehmen if ( pViewFrm->HasChildWindow(FID_CHG_ACCEPT) ) { SfxChildWindow* pChild = pViewFrm->GetChildWindow(FID_CHG_ACCEPT); @@ -612,14 +612,14 @@ Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) } // - // Bildschirm an Cursorposition anpassen + // Bildschirm an Cursorposition anpassen // void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, const ScSplitPos* pWhich ) { // - // aktiven Teil umschalten jetzt hier + // aktiven Teil umschalten jetzt hier // ScSplitPos eActive = aViewData.GetActivePart(); @@ -641,7 +641,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, } // - // eigentliches Align + // eigentliches Align // if ( eMode != SC_FOLLOW_NONE ) @@ -668,17 +668,17 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, Size aScrSize = aViewData.GetScrSize(); long nSpaceX = ( aScrSize.Width() - nCellSizeX ) / 2; long nSpaceY = ( aScrSize.Height() - nCellSizeY ) / 2; - // nSpaceY: desired start position of cell for FOLLOW_JUMP, modified if dialog interferes + // nSpaceY: desired start position of cell for FOLLOW_JUMP, modified if dialog interferes - BOOL bForceNew = FALSE; // force new calculation of JUMP position (vertical only) + BOOL bForceNew = FALSE; // force new calculation of JUMP position (vertical only) // 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 + // 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 - //! nicht, wenn schon komplett sichtbar + //! nicht, wenn schon komplett sichtbar if ( eMode == SC_FOLLOW_JUMP ) { @@ -693,21 +693,21 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, { aDlgPixel = pCare->GetWindowExtentsRelative( pWin ); aWinSize = pWin->GetOutputSizePixel(); - // ueberdeckt der Dialog das GridWin? + // ueberdeckt der Dialog das GridWin? if ( aDlgPixel.Right() >= 0 && aDlgPixel.Left() < aWinSize.Width() ) { if ( nCurX < nDeltaX || nCurX >= nDeltaX+nSizeX || nCurY < nDeltaY || nCurY >= nDeltaY+nSizeY ) - bLimit = TRUE; // es wird sowieso gescrollt + bLimit = TRUE; // es wird sowieso gescrollt else { - // Cursor ist auf dem Bildschirm + // Cursor ist auf dem Bildschirm Point aStart = aViewData.GetScrPos( nCurX, nCurY, eAlign ); long nCSX, nCSY; aViewData.GetMergeSizePixel( nCurX, nCurY, nCSX, nCSY ); Rectangle aCursor( aStart, Size( nCSX, nCSY ) ); if ( aCursor.IsOver( aDlgPixel ) ) - bLimit = TRUE; // Zelle vom Dialog ueberdeckt + bLimit = TRUE; // Zelle vom Dialog ueberdeckt } } } @@ -723,10 +723,10 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, SCsCOL nWPosX; SCsROW nWPosY; aViewData.GetPosFromPixel( 0,nDlgBot, eAlign, nWPosX, nWPosY ); - ++nWPosY; // unter der letzten betroffenen Zelle + ++nWPosY; // unter der letzten betroffenen Zelle SCsROW nDiff = nWPosY - nDeltaY; - if ( nCurY >= nDiff ) // Pos. kann nicht negativ werden + if ( nCurY >= nDiff ) // Pos. kann nicht negativ werden { nSpaceY = nDlgBot + ( nBotSpace - nCellSizeY ) / 2; bBottom = TRUE; @@ -781,7 +781,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, nSizeY = (SCsROW) aViewData.CellsAtY( nNewDeltaY, 1, eAlignY ); } - // like old version of SC_FOLLOW_JUMP: + // like old version of SC_FOLLOW_JUMP: if ( nCurX < nNewDeltaX || nCurX >= nNewDeltaX+nSizeX ) { @@ -845,7 +845,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, } // - // nochmal aktiven Teil umschalten + // nochmal aktiven Teil umschalten // if (bHFix) @@ -883,7 +883,7 @@ BOOL ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt ) } // - // MoveCursor - mit Anpassung des Bildausschnitts + // MoveCursor - mit Anpassung des Bildausschnitts // void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, @@ -899,14 +899,14 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, HideAllCursors(); - // aktiven Teil umschalten jetzt in AlignToCursor + // aktiven Teil umschalten jetzt in AlignToCursor AlignToCursor( nCurX, nCurY, eMode ); - //! auf OS/2: SC_FOLLOW_JUMP statt SC_FOLLOW_LINE, um Nachlaufen zu verhindern ??? + //! auf OS/2: SC_FOLLOW_JUMP statt SC_FOLLOW_LINE, um Nachlaufen zu verhindern ??? if (bKeepSel) { - SetCursor( nCurX, nCurY ); // Markierung stehenlassen + SetCursor( nCurX, nCurY ); // Markierung stehenlassen // If the cursor is in existing selection, it's a cursor movement by // ENTER or TAB. If not, then it's a new selection during ADD @@ -935,8 +935,8 @@ void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, bMoveIsShift = FALSE; aFunctionSet.SetCursorAtCell( nCurX, nCurY, FALSE ); - // Wenn der Cursor nicht bewegt wurde, muss das SelectionChanged fuer das - // Aufheben der Selektion hier einzeln passieren: + // Wenn der Cursor nicht bewegt wurde, muss das SelectionChanged fuer das + // Aufheben der Selektion hier einzeln passieren: if (bSame) SelectionChanged(); } @@ -1022,12 +1022,12 @@ void ScTabView::MoveCursorEnd( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode, B SCCOL nUsedX = 0; SCROW nUsedY = 0; if ( nMovX > 0 || nMovY > 0 ) - pDoc->GetPrintArea( nTab, nUsedX, nUsedY ); // Ende holen + pDoc->GetPrintArea( nTab, nUsedX, nUsedY ); // Ende holen if (nMovX<0) nNewX=0; else if (nMovX>0) - nNewX=nUsedX; // letzter benutzter Bereich + nNewX=nUsedX; // letzter benutzter Bereich if (nMovY<0) nNewY=0; @@ -1075,7 +1075,7 @@ void ScTabView::MoveCursorScreen( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode MoveCursorAbs( nNewX, nNewY, eMode, bShift, FALSE, TRUE ); } -void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter +void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter { const ScInputOptions& rOpt = SC_MOD()->GetInputOptions(); if (!rOpt.GetMoveSelection()) @@ -1118,7 +1118,7 @@ void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY, SC_FOLLOW_LINE, FALSE, TRUE ); - // update input line even if cursor was not moved + // update input line even if cursor was not moved if ( nNewX == nCurX && nNewY == nCurY ) aViewData.UpdateInputHandler(TRUE); } @@ -1126,7 +1126,7 @@ void ScTabView::MoveCursorEnter( BOOL bShift ) // bShift -> hoch/runter { if ( nMoveY != 0 && !nMoveX ) { - // nach Tab und Enter wieder zur Ausgangsspalte + // nach Tab und Enter wieder zur Ausgangsspalte SCCOL nTabCol = aViewData.GetTabStartCol(); if (nTabCol != SC_TABSTART_NONE) { @@ -1237,12 +1237,12 @@ void ScTabView::FindNextUnprot( BOOL bShift, BOOL bInSelection ) SCCOL nTabCol = aViewData.GetTabStartCol(); if ( nTabCol == SC_TABSTART_NONE ) - nTabCol = nCurX; // auf diese Spalte zurueck bei Enter + nTabCol = nCurX; // auf diese Spalte zurueck bei Enter MoveCursorRel( ((SCsCOL)nNewX)-(SCsCOL)nCurX, ((SCsROW)nNewY)-(SCsROW)nCurY, SC_FOLLOW_LINE, FALSE, TRUE ); - // in MoveCursorRel wird die TabCol zurueckgesetzt... + // in MoveCursorRel wird die TabCol zurueckgesetzt... aViewData.SetTabStartCol( nTabCol ); } @@ -1327,7 +1327,7 @@ void ScTabView::MarkMatrixFormula() ScRange aMatrix; if ( pDoc->GetMatrixFormulaRange( aCursor, aMatrix ) ) { - MarkRange( aMatrix, FALSE ); // cursor is already within the range + MarkRange( aMatrix, FALSE ); // cursor is already within the range } } @@ -1431,7 +1431,7 @@ void ScTabView::SelectNextTab( short nDir, BOOL bExtendSelection ) } -// SetTabNo - angezeigte Tabelle +// SetTabNo - angezeigte Tabelle void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) { @@ -1443,21 +1443,21 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) if ( nTab != aViewData.GetTabNo() || bNew ) { - // #57724# Die FormShell moechte vor dem Umschalten benachrichtigt werden + // #57724# Die FormShell moechte vor dem Umschalten benachrichtigt werden FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell(); if (pFormSh) { BOOL bAllowed = sal::static_int_cast<BOOL>( pFormSh->PrepareClose( TRUE ) ); if (!bAllowed) { - //! Fehlermeldung? oder macht das die FormShell selber? - //! Fehler-Flag zurueckgeben und Aktionen abbrechen + //! Fehlermeldung? oder macht das die FormShell selber? + //! Fehler-Flag zurueckgeben und Aktionen abbrechen - return; // Die FormShell sagt, es kann nicht umgeschaltet werden + return; // Die FormShell sagt, es kann nicht umgeschaltet werden } } - // nicht InputEnterHandler wegen Referenzeingabe ! + // nicht InputEnterHandler wegen Referenzeingabe ! ScDocument* pDoc = aViewData.GetDocument(); @@ -1469,7 +1469,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) SCTAB nTabCount = pDoc->GetTableCount(); SCTAB nOldPos = nTab; - while (!pDoc->IsVisible(nTab)) // naechste sichtbare suchen + while (!pDoc->IsVisible(nTab)) // naechste sichtbare suchen { BOOL bUp = (nTab>=nOldPos); if (bUp) @@ -1503,7 +1503,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) if ( !bRefMode ) // Abfrage, damit RefMode bei Tabellenwechsel funktioniert { DoneBlockMode(); - pSelEngine->Reset(); // reset all flags, including locked modifiers + pSelEngine->Reset(); // reset all flags, including locked modifiers aViewData.SetRefTabNo( nTab ); } @@ -1511,8 +1511,8 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) BOOL bFocus = pGridWin[eOldActive]->HasFocus(); aViewData.SetTabNo( nTab ); - // UpdateShow noch vor SetCursor, damit UpdateAutoFillMark die richtigen - // Fenster findet (wird aus SetCursor gerufen) + // UpdateShow noch vor SetCursor, damit UpdateAutoFillMark die richtigen + // Fenster findet (wird aus SetCursor gerufen) UpdateShow(); aViewData.ResetOldCursor(); SetCursor( aViewData.GetCurX(), aViewData.GetCurY(), TRUE ); @@ -1565,10 +1565,10 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) pGridWin[i]->UpdateEditViewPos(); } - TabChanged(); // DrawView + TabChanged(); // DrawView UpdateVisibleRange(); - aViewData.GetViewShell()->WindowChanged(); // falls das aktive Fenster anders ist + aViewData.GetViewShell()->WindowChanged(); // falls das aktive Fenster anders ist if ( !bUnoRefDialog ) aViewData.GetViewShell()->DisconnectAllClients(); // important for floating frames else @@ -1606,7 +1606,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) if ( bFocus && aViewData.GetActivePart() != eOldActive && !bRefMode ) ActiveGrabFocus(); // grab focus to the pane that's active now - // Fixierungen + // Fixierungen BOOL bResize = FALSE; if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX ) @@ -1620,10 +1620,10 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) InvalidateSplit(); if ( aViewData.IsPagebreakMode() ) - UpdatePageBreakData(); //! asynchron ?? + UpdatePageBreakData(); //! asynchron ?? - // #53551# Form-Layer muss den sichtbaren Ausschnitt der neuen Tabelle kennen - // dafuer muss hier schon der MapMode stimmen + // #53551# Form-Layer muss den sichtbaren Ausschnitt der neuen Tabelle kennen + // dafuer muss hier schon der MapMode stimmen for (USHORT i=0; i<4; i++) if (pGridWin[i]) pGridWin[i]->SetMapMode( pGridWin[i]->GetDrawMapMode() ); @@ -1635,14 +1635,14 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) PaintExtras(); DoResize( aBorderPos, aFrameSize ); - rBindings.Invalidate( SID_DELETE_PRINTAREA ); // Menue + rBindings.Invalidate( SID_DELETE_PRINTAREA ); // Menue rBindings.Invalidate( FID_DEL_MANUALBREAKS ); rBindings.Invalidate( FID_RESET_PRINTZOOM ); - rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar - rBindings.Invalidate( SID_STATUS_PAGESTYLE ); // Statusbar - rBindings.Invalidate( SID_CURRENTTAB ); // Navigator - rBindings.Invalidate( SID_STYLE_FAMILY2 ); // Gestalter - rBindings.Invalidate( SID_STYLE_FAMILY4 ); // Gestalter + rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar + rBindings.Invalidate( SID_STATUS_PAGESTYLE ); // Statusbar + rBindings.Invalidate( SID_CURRENTTAB ); // Navigator + rBindings.Invalidate( SID_STYLE_FAMILY2 ); // Gestalter + rBindings.Invalidate( SID_STYLE_FAMILY4 ); // Gestalter rBindings.Invalidate( SID_TABLES_COUNT ); if(pScMod->IsRefDialogOpen()) @@ -1660,7 +1660,7 @@ void ScTabView::SetTabNo( SCTAB nTab, BOOL bNew, BOOL bExtendSelection ) } // -// Paint-Funktionen - nur fuer diese View +// Paint-Funktionen - nur fuer diese View // void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow ) @@ -1685,8 +1685,8 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW ( nCol >= nScrX && nCol <= nScrX + aViewData.VisibleCellsX(eHWhich) + 1 && nRow >= nScrY && nRow <= nScrY + aViewData.VisibleCellsY(eVWhich) + 1 ); - // #102421# for the active part, create edit view even if outside the visible area, - // so input isn't lost (and the edit view may be scrolled into the visible area) + // #102421# for the active part, create edit view even if outside the visible area, + // so input isn't lost (and the edit view may be scrolled into the visible area) // #i26433# during spelling, the spelling view must be active if ( bPosVisible || aViewData.GetActivePart() == (ScSplitPos) i || @@ -1708,8 +1708,8 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW if ( !bPosVisible ) { - // move the edit view area to the real (possibly negative) position, - // or hide if completely above or left of the window + // move the edit view area to the real (possibly negative) position, + // or hide if completely above or left of the window pGridWin[i]->UpdateEditViewPos(); } } @@ -1779,13 +1779,13 @@ void ScTabView::KillEditView( BOOL bNoPaint ) if (pDrawView) DrawEnableAnim( TRUE ); - // GrabFocus immer dann, wenn diese View aktiv ist und - // die Eingabezeile den Focus hat + // GrabFocus immer dann, wenn diese View aktiv ist und + // die Eingabezeile den Focus hat BOOL bGrabFocus = FALSE; if (aViewData.IsActive()) { - ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); + ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(); if ( pInputHdl ) { ScInputWindow* pInputWin = pInputHdl->GetInputWindow(); @@ -1796,13 +1796,13 @@ void ScTabView::KillEditView( BOOL bNoPaint ) if (bGrabFocus) { -// So soll es gemacht werden, damit der Sfx es mitbekommt, klappt aber nicht: -//! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus(); -// deshalb erstmal so: +// So soll es gemacht werden, damit der Sfx es mitbekommt, klappt aber nicht: +//! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus(); +// deshalb erstmal so: GetActiveWin()->GrabFocus(); } - // Cursor-Abfrage erst nach GrabFocus + // Cursor-Abfrage erst nach GrabFocus for (i=0; i<4; i++) if (pGridWin[i] && pGridWin[i]->IsVisible()) @@ -1832,16 +1832,16 @@ void ScTabView::UpdateFormulas() pGridWin[i]->UpdateFormulas(); if ( aViewData.IsPagebreakMode() ) - UpdatePageBreakData(); //! asynchron + UpdatePageBreakData(); //! asynchron UpdateHeaderWidth(); - // if in edit mode, adjust edit view area because widths/heights may have changed + // if in edit mode, adjust edit view area because widths/heights may have changed if ( aViewData.HasEditView( aViewData.GetActivePart() ) ) UpdateEditView(); } -// PaintArea -Block neu zeichnen +// PaintArea -Block neu zeichnen void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScUpdateMode eMode ) @@ -1873,10 +1873,10 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO if (nCol1 < nScrX) nCol1 = nScrX; if (nCol2 < nScrX) { - if ( eMode == SC_UPDATE_ALL ) // #91240# for UPDATE_ALL, paint anyway - nCol2 = nScrX; // (because of extending strings to the right) + if ( eMode == SC_UPDATE_ALL ) // #91240# for UPDATE_ALL, paint anyway + nCol2 = nScrX; // (because of extending strings to the right) else - bOut = TRUE; // completely outside the window + bOut = TRUE; // completely outside the window } if (nRow1 < nScrY) nRow1 = nScrY; if (nRow2 < nScrY) bOut = TRUE; @@ -1892,7 +1892,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO { if ( eMode == SC_UPDATE_CHANGED ) pGridWin[i]->Draw( nCol1, nRow1, nCol2, nRow2, eMode ); - else // ALL oder MARKS + else // ALL oder MARKS { BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); long nLayoutSign = bLayoutRTL ? -1 : 1; @@ -1908,26 +1908,26 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO if ( eMode == SC_UPDATE_ALL && nRow2 >= MAXROW ) aEnd.Y() = pGridWin[i]->GetOutputSizePixel().Height(); - BOOL bShowChanges = TRUE; //! ... + BOOL bShowChanges = TRUE; //! ... if (bShowChanges) { - aStart.X() -= nLayoutSign; // include change marks + aStart.X() -= nLayoutSign; // include change marks aStart.Y() -= 1; } BOOL bMarkClipped = aViewData.GetOptions().GetOption( VOPT_CLIPMARKS ); if (bMarkClipped) { - // dazu muesste ScColumn::IsEmptyBlock optimiert werden - // (auf Search() umstellen) + // dazu muesste ScColumn::IsEmptyBlock optimiert werden + // (auf Search() umstellen) //!if ( nCol1 > 0 && !aViewData.GetDocument()->IsBlockEmpty( - //! aViewData.GetTabNo(), - //! 0, nRow1, nCol1-1, nRow2 ) ) + //! aViewData.GetTabNo(), + //! 0, nRow1, nCol1-1, nRow2 ) ) { long nMarkPixel = (long)( SC_CLIPMARK_SIZE * aViewData.GetPPTX() ); aStart.X() -= nMarkPixel * nLayoutSign; if (!bShowChanges) - aStart.X() -= nLayoutSign; // cell grid + aStart.X() -= nLayoutSign; // cell grid } } @@ -1962,9 +1962,9 @@ void ScTabView::PaintRangeFinder( long nNumber ) if (pData) { ScRange aRef = pData->aRef; - aRef.Justify(); // Justify fuer die Abfragen unten + aRef.Justify(); // Justify fuer die Abfragen unten - if ( aRef.aStart == aRef.aEnd ) //! Tab ignorieren? + if ( aRef.aStart == aRef.aEnd ) //! Tab ignorieren? aViewData.GetDocument()->ExtendMerge(aRef); if ( aRef.aStart.Tab() >= nTab && aRef.aEnd.Tab() <= nTab ) @@ -1974,8 +1974,8 @@ void ScTabView::PaintRangeFinder( long nNumber ) SCCOL nCol2 = aRef.aEnd.Col(); SCROW nRow2 = aRef.aEnd.Row(); - // wegnehmen -> Repaint - // SC_UPDATE_MARKS: Invalidate, nicht bis zum Zeilenende + // wegnehmen -> Repaint + // SC_UPDATE_MARKS: Invalidate, nicht bis zum Zeilenende BOOL bHiddenEdge = FALSE; SCROW nTmp; @@ -2010,13 +2010,13 @@ void ScTabView::PaintRangeFinder( long nNumber ) if ( nCol2 - nCol1 > 1 && nRow2 - nRow1 > 1 && !bHiddenEdge ) { - // nur an den Raendern entlang + // nur an den Raendern entlang PaintArea( nCol1, nRow1, nCol2, nRow1, SC_UPDATE_MARKS ); PaintArea( nCol1, nRow1+1, nCol1, nRow2-1, SC_UPDATE_MARKS ); PaintArea( nCol2, nRow1+1, nCol2, nRow2-1, SC_UPDATE_MARKS ); PaintArea( nCol1, nRow2, nCol2, nRow2, SC_UPDATE_MARKS ); } - else // alles am Stueck + else // alles am Stueck PaintArea( nCol1, nRow1, nCol2, nRow2, SC_UPDATE_MARKS ); } } @@ -2025,7 +2025,7 @@ void ScTabView::PaintRangeFinder( long nNumber ) } } -// fuer Chart-Daten-Markierung +// fuer Chart-Daten-Markierung void ScTabView::AddHighlightRange( const ScRange& rRange, const Color& rColor ) { @@ -2044,7 +2044,7 @@ void ScTabView::ClearHighlightRanges() if (pHighlightRanges) { ScHighlightRanges* pTemp = pHighlightRanges; - pHighlightRanges = NULL; // Repaint ohne Highlight + pHighlightRanges = NULL; // Repaint ohne Highlight SCTAB nTab = aViewData.GetTabNo(); ULONG nCount = pTemp->Count(); @@ -2088,7 +2088,7 @@ void ScTabView::DoChartSelection( } } -// PaintGrid - Datenbereiche neu zeichnen +// PaintGrid - Datenbereiche neu zeichnen void ScTabView::PaintGrid() { @@ -2099,7 +2099,7 @@ void ScTabView::PaintGrid() pGridWin[i]->Invalidate(); } -// PaintTop - obere Kontrollelemente neu zeichnen +// PaintTop - obere Kontrollelemente neu zeichnen void ScTabView::PaintTop() { @@ -2131,22 +2131,22 @@ void ScTabView::CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress) void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ) { - // Pixel-Position der linken Kante + // Pixel-Position der linken Kante if ( nStartCol < aViewData.GetPosX(SC_SPLIT_LEFT) || nStartCol < aViewData.GetPosX(SC_SPLIT_RIGHT) ) aViewData.RecalcPixPos(); - // Fixierung anpassen (UpdateFixX setzt HSplitPos neu) + // Fixierung anpassen (UpdateFixX setzt HSplitPos neu) if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX && nStartCol < aViewData.GetFixPosX() ) if (aViewData.UpdateFixX()) RepeatResize(); - // zeichnen + // zeichnen if (nStartCol>0) - --nStartCol; //! allgemeiner ? + --nStartCol; //! allgemeiner ? BOOL bLayoutRTL = aViewData.GetDocument()->IsLayoutRTL( aViewData.GetTabNo() ); long nLayoutSign = bLayoutRTL ? -1 : 1; @@ -2172,7 +2172,7 @@ void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ) } -// PaintLeft - linke Kontrollelemente neu zeichnen +// PaintLeft - linke Kontrollelemente neu zeichnen void ScTabView::PaintLeft() { @@ -2188,19 +2188,19 @@ void ScTabView::PaintLeft() void ScTabView::PaintLeftArea( SCROW nStartRow, SCROW nEndRow ) { - // Pixel-Position der oberen Kante + // Pixel-Position der oberen Kante if ( nStartRow < aViewData.GetPosY(SC_SPLIT_TOP) || nStartRow < aViewData.GetPosY(SC_SPLIT_BOTTOM) ) aViewData.RecalcPixPos(); - // Fixierung anpassen (UpdateFixY setzt VSplitPos neu) + // Fixierung anpassen (UpdateFixY setzt VSplitPos neu) if ( aViewData.GetVSplitMode() == SC_SPLIT_FIX && nStartRow < aViewData.GetFixPosY() ) if (aViewData.UpdateFixY()) RepeatResize(); - // zeichnen + // zeichnen if (nStartRow>0) --nStartRow; @@ -2225,13 +2225,13 @@ void ScTabView::PaintLeftArea( SCROW nStartRow, SCROW nEndRow ) } } -// InvertBlockMark - Block invertieren +// InvertBlockMark - Block invertieren void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY) { if ( !aViewData.IsActive() ) - return; // invertiert wird nur auf aktiver View + return; // invertiert wird nur auf aktiver View PutInOrder( nStartX, nEndX ); PutInOrder( nStartY, nEndY ); @@ -2243,8 +2243,8 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, if ( pDocSh->GetLockCount() ) { - // if paint is locked, avoid repeated inverting - // add repaint areas to paint lock data instead + // if paint is locked, avoid repeated inverting + // add repaint areas to paint lock data instead pDocSh->PostPaint( nStartX,nStartY,nTab, nEndX,nEndY,nTab, PAINT_GRID ); return; } @@ -2274,7 +2274,7 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, if ( pDoc->IsLayoutRTL( nTab ) ) { long nTemp = aStartPoint.X(); - aStartPoint.X() = aEndPoint.X() + 1; // +1 - excluding start of nEndX+1 + aStartPoint.X() = aEndPoint.X() + 1; // +1 - excluding start of nEndX+1 aEndPoint.X() = nTemp; } else @@ -2292,10 +2292,10 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, } // - // wenn Controls betroffen, neu malen + // wenn Controls betroffen, neu malen // - BOOL bHide = TRUE; // wird Teil der Markierung aufgehoben ? + BOOL bHide = TRUE; // wird Teil der Markierung aufgehoben ? if (rMark.IsMarked()) { ScRange aMarkRange; @@ -2303,7 +2303,7 @@ void ScTabView::InvertBlockMark(SCCOL nStartX, SCROW nStartY, if ( aMarkRange.aStart.Col() <= nStartX && aMarkRange.aEnd.Col() >= nEndX && aMarkRange.aStart.Row() <= nStartY && aMarkRange.aEnd.Row() >= nEndY ) { - bHide = FALSE; // der ganze Bereich ist markiert + bHide = FALSE; // der ganze Bereich ist markiert } } } @@ -2313,20 +2313,20 @@ BOOL ScTabView::PaintExtras() BOOL bRet = FALSE; ScDocument* pDoc = aViewData.GetDocument(); SCTAB nTab = aViewData.GetTabNo(); - if (!pDoc->HasTable(nTab)) // Tabelle geloescht ? + if (!pDoc->HasTable(nTab)) // Tabelle geloescht ? { SCTAB nCount = pDoc->GetTableCount(); aViewData.SetTabNo(nCount-1); bRet = TRUE; } - pTabControl->UpdateStatus(); // TRUE = active + pTabControl->UpdateStatus(); // TRUE = active return bRet; } void ScTabView::RecalcPPT() { - // called after changes that require the PPT values to be recalculated - // (currently from detective operations) + // called after changes that require the PPT values to be recalculated + // (currently from detective operations) double nOldX = aViewData.GetPPTX(); double nOldY = aViewData.GetPPTY(); @@ -2337,8 +2337,8 @@ void ScTabView::RecalcPPT() BOOL bChangedY = ( aViewData.GetPPTY() != nOldY ); if ( bChangedX || bChangedY ) { - // call view SetZoom (including draw scale, split update etc) - // and paint only if values changed + // call view SetZoom (including draw scale, split update etc) + // and paint only if values changed Fraction aZoomX = aViewData.GetZoomX(); Fraction aZoomY = aViewData.GetZoomY(); @@ -2356,29 +2356,29 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst ) { if ( bActivate == aViewData.IsActive() && !bFirst ) { - // keine Assertion mehr - kommt vor, wenn vorher im Drag&Drop - // auf ein anderes Dokument umgeschaltet wurde + // keine Assertion mehr - kommt vor, wenn vorher im Drag&Drop + // auf ein anderes Dokument umgeschaltet wurde return; } // wird nur bei MDI-(De)Activate gerufen // aViewData.Activate hinten wegen Cursor-Show bei KillEditView - // Markierung nicht mehr loeschen - wenn an der ViewData Activate(FALSE) gesetzt ist, - // wird die Markierung nicht ausgegeben + // Markierung nicht mehr loeschen - wenn an der ViewData Activate(FALSE) gesetzt ist, + // wird die Markierung nicht ausgegeben if (!bActivate) { ScModule* pScMod = SC_MOD(); BOOL bRefMode = pScMod->IsFormulaMode(); - // Referenzeingabe nicht abbrechen, um Referenzen auf - // andere Dokumente zuzulassen + // Referenzeingabe nicht abbrechen, um Referenzen auf + // andere Dokumente zuzulassen if (!bRefMode) { //pScMod->InputEnterHandler(); - // #80843# pass view to GetInputHdl, this view may not be current anymore + // #80843# pass view to GetInputHdl, this view may not be current anymore ScInputHandler* pHdl = SC_MOD()->GetInputHdl(aViewData.GetViewShell()); if (pHdl) pHdl->EnterHandler(); @@ -2389,15 +2389,15 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst ) aViewData.Activate(bActivate); - PaintBlock(FALSE); // Repaint, Markierung je nach Active-Status + PaintBlock(FALSE); // Repaint, Markierung je nach Active-Status if (!bActivate) - HideAllCursors(); // Cursor + HideAllCursors(); // Cursor else if (!bFirst) ShowAllCursors(); //HMHif (pDrawView) - //HMH DrawShowMarkHdl(bActivate); // Drawing-Markierung + //HMH DrawShowMarkHdl(bActivate); // Drawing-Markierung if (bActivate) { @@ -2416,7 +2416,7 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst ) if ( pGridWin[i] ) { eWin = (ScSplitPos) i; - break; // for + break; // for } } DBG_ASSERT( i<4, "und BUMM" ); @@ -2424,9 +2424,9 @@ void ScTabView::ActivateView( BOOL bActivate, BOOL bFirst ) aViewData.SetActivePart( eWin ); } } - // hier nicht mehr selber GrabFocus rufen! - // Wenn das Doc bearbeitet wird, ruft der Sfx selber GrabFocus am Fenster der Shell. - // Wenn es z.B. ein Mailbody ist, darf es den Focus nicht bekommen (Bug #43638#) + // hier nicht mehr selber GrabFocus rufen! + // Wenn das Doc bearbeitet wird, ruft der Sfx selber GrabFocus am Fenster der Shell. + // Wenn es z.B. ein Mailbody ist, darf es den Focus nicht bekommen (Bug #43638#) UpdateInputContext(); } @@ -2443,7 +2443,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich ) BOOL bRefMode = SC_MOD()->IsFormulaMode(); - // #40565# the HasEditView call during SetCursor would fail otherwise + // #40565# the HasEditView call during SetCursor would fail otherwise if ( aViewData.HasEditView(eOld) && !bRefMode ) UpdateInputLine(); @@ -2474,9 +2474,9 @@ void ScTabView::ActivatePart( ScSplitPos eWhich ) if ( bCapture || pGridWin[eWhich]->IsMouseCaptured() ) { - // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann - // (SelectionEngine ruft CaptureMouse beim SetWindow) - //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?! + // Tracking statt CaptureMouse, damit sauber abgebrochen werden kann + // (SelectionEngine ruft CaptureMouse beim SetWindow) + //! Irgendwann sollte die SelectionEngine selber StartTracking rufen!?! pGridWin[eWhich]->ReleaseMouse(); pGridWin[eWhich]->StartTracking(); } @@ -2507,16 +2507,16 @@ void ScTabView::ActivatePart( ScSplitPos eWhich ) SfxInPlaceClient* pClient = aViewData.GetViewShell()->GetIPClient(); BOOL bOleActive = ( pClient && pClient->IsObjectInPlaceActive() ); - // #103823# don't switch ViewShell's active window during RefInput, because the focus - // might change, and subsequent SetReference calls wouldn't find the right EditView + // #103823# don't switch ViewShell's active window during RefInput, because the focus + // might change, and subsequent SetReference calls wouldn't find the right EditView if ( !bRefMode && !bOleActive ) aViewData.GetViewShell()->SetWindow( pGridWin[eWhich] ); if ( bFocus && !aViewData.IsAnyFillMode() && !bRefMode ) { - // GrabFocus nur, wenn vorher das andere GridWindow den Focus hatte - // (z.B. wegen Suchen & Ersetzen) -//! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus(); + // GrabFocus nur, wenn vorher das andere GridWindow den Focus hatte + // (z.B. wegen Suchen & Ersetzen) +//! aViewData.GetViewShell()->GetViewFrame()->GetWindow().GrabFocus(); pGridWin[eWhich]->GrabFocus(); } @@ -2541,7 +2541,7 @@ void ScTabView::UpdateInputContext() pTabControl->UpdateInputContext(); } -// GetGridWidth - Breite eines Ausgabebereichs (fuer ViewData) +// GetGridWidth - Breite eines Ausgabebereichs (fuer ViewData) long ScTabView::GetGridWidth( ScHSplitPos eWhich ) { @@ -2552,7 +2552,7 @@ long ScTabView::GetGridWidth( ScHSplitPos eWhich ) return 0; } -// GetGridHeight - Hoehe eines Ausgabebereichs (fuer ViewData) +// GetGridHeight - Hoehe eines Ausgabebereichs (fuer ViewData) long ScTabView::GetGridHeight( ScVSplitPos eWhich ) { @@ -2578,7 +2578,7 @@ void ScTabView::ZoomChanged() UpdateScrollBars(); - // VisArea... + // VisArea... // AW: Discussed with NN if there is a reason that new map mode was only set for one window, // but is not. Setting only on one window causes the first repaint to have the old mapMode // in three of four views, so the overlay will save the wrong content e.g. when zooming out. @@ -2599,11 +2599,11 @@ void ScTabView::ZoomChanged() ScGridWindow* pWin = pGridWin[aViewData.GetActivePart()]; if (pWin) { - pWin->SetMapMode( pWin->GetDrawMapMode() ); // mit neuem Zoom - SetNewVisArea(); // benutzt den gesetzten MapMode + pWin->SetMapMode( pWin->GetDrawMapMode() ); // mit neuem Zoom + SetNewVisArea(); // benutzt den gesetzten MapMode } */ - InterpretVisible(); // #69343# have everything calculated before painting + InterpretVisible(); // #69343# have everything calculated before painting SfxBindings& rBindings = aViewData.GetBindings(); rBindings.Invalidate( SID_ATTR_ZOOM ); @@ -2619,8 +2619,8 @@ void ScTabView::ZoomChanged() // flush OverlayManager before changing the MapMode pWin->flushOverlayManager(); - // #93650# make sure the EditView's position and size are updated - // with the right (logic, not drawing) MapMode + // #93650# make sure the EditView's position and size are updated + // with the right (logic, not drawing) MapMode pWin->SetMapMode( aViewData.GetLogicMode() ); UpdateEditView(); } diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 13ef6ca977b0..100e641c396a 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,14 +47,14 @@ #include "cell.hxx" #include "dociter.hxx" -extern USHORT nScFillModeMouseModifier; // global.cxx +extern USHORT nScFillModeMouseModifier; // global.cxx // STATIC DATA ----------------------------------------------------------- //================================================================== // -// --- Referenz-Eingabe / Fill-Cursor +// --- Referenz-Eingabe / Fill-Cursor // void ScTabView::HideTip() @@ -75,7 +75,7 @@ void ScTabView::ShowRefTip() SCROW nStartY = aViewData.GetRefStartY(); SCCOL nEndX = aViewData.GetRefEndX(); SCROW nEndY = aViewData.GetRefEndY(); - if ( nEndX != nStartX || nEndY != nStartY ) // nicht fuer einzelne Zelle + if ( nEndX != nStartX || nEndY != nStartY ) // nicht fuer einzelne Zelle { BOOL bLeft = ( nEndX < nStartX ); BOOL bTop = ( nEndY < nStartY ); @@ -106,14 +106,14 @@ void ScTabView::ShowRefTip() if ( !bTop && aViewData.HasEditView( eWhich ) && nEndY+1 == aViewData.GetEditViewRow() ) { - // dann an der oberen Kante der editierten Zelle ausrichten - aPos.Y() -= 2; // die 3 von oben + // dann an der oberen Kante der editierten Zelle ausrichten + aPos.Y() -= 2; // die 3 von oben nFlags = ( nFlags & ~QUICKHELP_TOP ) | QUICKHELP_BOTTOM; } Rectangle aRect( pWin->OutputToScreenPixel( aPos ), Size(1,1) ); - //! Test, ob geaendert ?? + //! Test, ob geaendert ?? HideTip(); nTipVisible = Help::ShowTip( pWin, aRect, aHelp, nFlags ); @@ -150,7 +150,7 @@ void ScTabView::StopRefMode() } pSelEngine->Reset(); - pSelEngine->SetAddMode( FALSE ); //! sollte das nicht bei Reset passieren? + pSelEngine->SetAddMode( FALSE ); //! sollte das nicht bei Reset passieren? ScSplitPos eOld = pSelEngine->GetWhich(); ScSplitPos eNew = aViewData.GetActivePart(); @@ -164,11 +164,11 @@ void ScTabView::StopRefMode() } } - // AlignToCursor(SC_FOLLOW_NONE): Only switch active part. - // This must also be done if no RefMode was active (for RangeFinder dragging), - // but if RefMode was set, AlignToCursor must be after SelectionEngine reset, - // so the SelectionEngine SetWindow call from AlignToCursor doesn't capture - // the mouse again when called from Tracking/MouseButtonUp (#94562#). + // AlignToCursor(SC_FOLLOW_NONE): Only switch active part. + // This must also be done if no RefMode was active (for RangeFinder dragging), + // but if RefMode was set, AlignToCursor must be after SelectionEngine reset, + // so the SelectionEngine SetWindow call from AlignToCursor doesn't capture + // the mouse again when called from Tracking/MouseButtonUp (#94562#). AlignToCursor( aViewData.GetCurX(), aViewData.GetCurY(), SC_FOLLOW_NONE ); } @@ -184,7 +184,7 @@ void ScTabView::DoneRefMode( BOOL bContinue ) HideTip(); UpdateShrinkOverlay(); - // Paint: + // Paint: if ( bWasRef && aViewData.GetTabNo() >= aViewData.GetRefStartZ() && aViewData.GetTabNo() <= aViewData.GetRefEndZ() ) { @@ -205,8 +205,8 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) if (!aViewData.IsRefMode()) { - // Das kommt vor, wenn bei einem Referenz-Dialog als erstes mit Control in die - // die Tabelle geklickt wird. Dann die neue Referenz an den alten Inhalt anhaengen: + // Das kommt vor, wenn bei einem Referenz-Dialog als erstes mit Control in die + // die Tabelle geklickt wird. Dann die neue Referenz an den alten Inhalt anhaengen: ScModule* pScMod = SC_MOD(); if (pScMod->IsFormulaMode()) @@ -266,7 +266,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) PaintArea( nPaintStartX, nPaintStartY, nPaintEndX, nPaintEndY, SC_UPDATE_MARKS ); } - // Tip-Hilfe fuer Auto-Fill + // Tip-Hilfe fuer Auto-Fill if ( aViewData.GetRefType() == SC_REFTYPE_FILL && Help::IsQuickHelpEnabled() ) { @@ -279,7 +279,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) if ( aViewData.GetFillMode() == SC_FILL_MATRIX && !(nScFillModeMouseModifier & KEY_MOD1) ) { aHelpStr = ScGlobal::GetRscString( STR_TIP_RESIZEMATRIX ); - SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // Reihenfolge ist richtig + SCCOL nCols = nEndX + 1 - aViewData.GetRefStartX(); // Reihenfolge ist richtig SCROW nRows = nEndY + 1 - aViewData.GetRefStartY(); aHelpStr.SearchAndReplace( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("%1")), String::CreateFromInt32(nRows) ); @@ -291,7 +291,7 @@ void ScTabView::UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ) else if ( nEndX != aMarkRange.aEnd.Col() || nEndY != aMarkRange.aEnd.Row() ) aHelpStr = pDoc->GetAutoFillPreview( aMarkRange, nEndX, nEndY ); - // je nach Richtung die obere oder untere Ecke: + // je nach Richtung die obere oder untere Ecke: SCCOL nAddX = ( nEndX >= aMarkRange.aEnd.Col() ) ? 1 : 0; SCROW nAddY = ( nEndY >= aMarkRange.aEnd.Row() ) ? 1 : 0; Point aPos = aViewData.GetScrPos( nEndX+nAddX, nEndY+nAddY, aViewData.GetActivePart() ); @@ -324,10 +324,10 @@ void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eT SCROW nEndY = nCurY; pDoc->ExtendMerge( nStartX, nStartY, nEndX, nEndY, aViewData.GetTabNo() ); - //! nur Markierung ueber Inhalte zeichnen! + //! nur Markierung ueber Inhalte zeichnen! PaintArea( nStartX,nStartY,nEndX,nEndY, SC_UPDATE_MARKS ); - // SetReference ohne Merge-Anpassung + // SetReference ohne Merge-Anpassung ScRange aRef( nCurX,nCurY,nCurZ, nCurX,nCurY,nCurZ ); SC_MOD()->SetReference( aRef, pDoc, &rMark ); } @@ -340,9 +340,9 @@ void ScTabView::SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, if ( nVisible == 0 ) nVisible = 1; // #i59893# don't use visible size 0 - // RTL layout uses a negative range to simulate a mirrored scroll bar. - // SetScrollBar/GetScrollBarPos hide this so outside of these functions normal cell - // addresses can be used. + // RTL layout uses a negative range to simulate a mirrored scroll bar. + // SetScrollBar/GetScrollBarPos hide this so outside of these functions normal cell + // addresses can be used. if ( bLayoutRTL ) { @@ -367,9 +367,9 @@ long ScTabView::GetScrollBarPos( ScrollBar& rScroll, BOOL bLayoutRTL ) return rScroll.GetThumbPos(); } -// UpdateScrollBars - sichtbaren Bereich und Scrollweite der Scrollbars einstellen +// UpdateScrollBars - sichtbaren Bereich und Scrollweite der Scrollbars einstellen -long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (komplette) Zellen +long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (komplette) Zellen { long nOldPos; long nNewPos; @@ -378,7 +378,7 @@ long lcl_UpdateBar( ScrollBar& rScroll, SCCOLROW nSize ) // Size = (kompl rScroll.SetPageSize( static_cast<long>(nSize) ); nNewPos = rScroll.GetThumbPos(); #ifndef UNX - rScroll.SetPageSize( 1 ); // immer moeglich ! + rScroll.SetPageSize( 1 ); // immer moeglich ! #endif return nNewPos - nOldPos; @@ -389,25 +389,25 @@ long lcl_GetScrollRange( SCCOLROW nDocEnd, SCCOLROW nPos, SCCOLROW nVis, SCCOLRO // get the end (positive) of a scroll bar range that always starts at 0 ++nVis; - ++nMax; // for partially visible cells + ++nMax; // for partially visible cells SCCOLROW nEnd = Max(nDocEnd, (SCCOLROW)(nPos+nVis)) + nVis; if (nEnd > nMax) nEnd = nMax; - return ( nEnd - nStart ); // for range starting at 0 + return ( nEnd - nStart ); // for range starting at 0 } void ScTabView::UpdateScrollBars() { - long nDiff; - BOOL bTop = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ); - BOOL bRight = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE ); - ScDocument* pDoc = aViewData.GetDocument(); - SCTAB nTab = aViewData.GetTabNo(); + long nDiff; + BOOL bTop = ( aViewData.GetVSplitMode() != SC_SPLIT_NONE ); + BOOL bRight = ( aViewData.GetHSplitMode() != SC_SPLIT_NONE ); + ScDocument* pDoc = aViewData.GetDocument(); + SCTAB nTab = aViewData.GetTabNo(); BOOL bMirror = pDoc->IsLayoutRTL( nTab ) != Application::GetSettings().GetLayoutRTL(); - SCCOL nUsedX; - SCROW nUsedY; - pDoc->GetTableArea( nTab, nUsedX, nUsedY ); //! cachen !!!!!!!!!!!!!!! + SCCOL nUsedX; + SCROW nUsedY; + pDoc->GetTableArea( nTab, nUsedX, nUsedY ); //! cachen !!!!!!!!!!!!!!! SCCOL nVisXL = 0; SCCOL nVisXR = 0; @@ -443,7 +443,7 @@ void ScTabView::UpdateScrollBars() SetScrollBar( aVScrollTop, nMaxYT, nVisYT, aViewData.GetPosY( SC_SPLIT_TOP ), FALSE ); } - // Bereich testen + // Bereich testen nDiff = lcl_UpdateBar( aHScrollLeft, nVisXL ); if (nDiff) ScrollX( nDiff, SC_SPLIT_LEFT ); @@ -461,7 +461,7 @@ void ScTabView::UpdateScrollBars() if (nDiff) ScrollY( nDiff, SC_SPLIT_TOP ); } - // set visible area for online spelling + // set visible area for online spelling if ( aViewData.IsActive() ) { @@ -476,12 +476,12 @@ void ScTabView::UpdateScrollBars() if ( nEndY > MAXROW ) nEndY = MAXROW; ScRange aVisible( nPosX, nPosY, nTab, nEndX, nEndY, nTab ); if ( pDoc->SetVisibleSpellRange( aVisible ) ) - SC_MOD()->AnythingChanged(); // if visible area has changed + SC_MOD()->AnythingChanged(); // if visible area has changed } } #ifndef HDR_SLIDERSIZE -#define HDR_SLIDERSIZE 2 +#define HDR_SLIDERSIZE 2 #endif void ScTabView::InvertHorizontal( ScVSplitPos eWhich, long nDragPos ) @@ -494,7 +494,7 @@ void ScTabView::InvertHorizontal( ScVSplitPos eWhich, long nDragPos ) { Rectangle aRect( 0,nDragPos, pWin->GetOutputSizePixel().Width()-1,nDragPos+HDR_SLIDERSIZE-1 ); pWin->Update(); - pWin->DoInvertRect( aRect ); // Pixel + pWin->DoInvertRect( aRect ); // Pixel } } } @@ -509,7 +509,7 @@ void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos ) { Rectangle aRect( nDragPos,0, nDragPos+HDR_SLIDERSIZE-1,pWin->GetOutputSizePixel().Height()-1 ); pWin->Update(); - pWin->DoInvertRect( aRect ); // Pixel + pWin->DoInvertRect( aRect ); // Pixel } } } @@ -518,8 +518,8 @@ void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos ) void ScTabView::InterpretVisible() { - // make sure all visible cells are interpreted, - // so the next paint will not execute a macro function + // make sure all visible cells are interpreted, + // so the next paint will not execute a macro function ScDocument* pDoc = aViewData.GetDocument(); if ( !pDoc->GetAutoCalc() ) @@ -528,18 +528,18 @@ void ScTabView::InterpretVisible() SCTAB nTab = aViewData.GetTabNo(); for (USHORT i=0; i<4; i++) { - // rely on gridwin pointers to find used panes - // no IsVisible test in case the whole view is not yet shown + // rely on gridwin pointers to find used panes + // no IsVisible test in case the whole view is not yet shown if (pGridWin[i]) { ScHSplitPos eHWhich = WhichH( ScSplitPos(i) ); ScVSplitPos eVWhich = WhichV( ScSplitPos(i) ); - SCCOL nX1 = aViewData.GetPosX( eHWhich ); - SCROW nY1 = aViewData.GetPosY( eVWhich ); - SCCOL nX2 = nX1 + aViewData.VisibleCellsX( eHWhich ); - SCROW nY2 = nY1 + aViewData.VisibleCellsY( eVWhich ); + SCCOL nX1 = aViewData.GetPosX( eHWhich ); + SCROW nY1 = aViewData.GetPosY( eVWhich ); + SCCOL nX2 = nX1 + aViewData.VisibleCellsX( eHWhich ); + SCROW nY2 = nY1 + aViewData.VisibleCellsY( eVWhich ); if (nX2 > MAXCOL) nX2 = MAXCOL; if (nY2 > MAXROW) nY2 = MAXROW; diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index c77034366c85..0c83060d1649 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -119,31 +119,31 @@ void __EXPORT ScTabView::Init() explicitly because the parent frame window is already RTL disabled. */ pTabControl->EnableRTL( Application::GetSettings().GetLayoutRTL() ); - InitScrollBar( aHScrollLeft, MAXCOL+1 ); - InitScrollBar( aHScrollRight, MAXCOL+1 ); - InitScrollBar( aVScrollTop, MAXROW+1 ); - InitScrollBar( aVScrollBottom, MAXROW+1 ); + InitScrollBar( aHScrollLeft, MAXCOL+1 ); + InitScrollBar( aHScrollRight, MAXCOL+1 ); + InitScrollBar( aVScrollTop, MAXROW+1 ); + InitScrollBar( aVScrollBottom, MAXROW+1 ); /* #i97900# scrollbars remain in correct RTL mode, needed mirroring etc. is now handled correctly at the respective places. */ - // Hier noch nichts anzeigen (Show), weil noch falsch angeordnet ist - // Show kommt dann aus UpdateShow beim ersten Resize - // pTabControl, pGridWin, aHScrollLeft, aVScrollBottom, - // aCornerButton, aScrollBarBox, pHSplitter, pVSplitter + // Hier noch nichts anzeigen (Show), weil noch falsch angeordnet ist + // Show kommt dann aus UpdateShow beim ersten Resize + // pTabControl, pGridWin, aHScrollLeft, aVScrollBottom, + // aCornerButton, aScrollBarBox, pHSplitter, pVSplitter - // Splitter + // Splitter pHSplitter->SetSplitHdl( LINK( this, ScTabView, SplitHdl ) ); pVSplitter->SetSplitHdl( LINK( this, ScTabView, SplitHdl ) ); - // UpdateShow kommt beim Resize, oder bei Kopie einer bestehenden View aus dem ctor + // UpdateShow kommt beim Resize, oder bei Kopie einer bestehenden View aus dem ctor pDrawActual = NULL; - pDrawOld = NULL; + pDrawOld = NULL; - // DrawView darf nicht im TabView - ctor angelegt werden, - // wenn die ViewShell noch nicht konstruiert ist... - // Das gilt auch fuer ViewOptionsHasChanged() + // DrawView darf nicht im TabView - ctor angelegt werden, + // wenn die ViewShell noch nicht konstruiert ist... + // Das gilt auch fuer ViewOptionsHasChanged() TestHintWindow(); } @@ -152,14 +152,14 @@ __EXPORT ScTabView::~ScTabView() { USHORT i; - // remove selection object + // remove selection object ScModule* pScMod = SC_MOD(); ScSelectionTransferObj* pOld = pScMod->GetSelectionTransfer(); if ( pOld && pOld->GetView() == this ) { pOld->ForgetView(); pScMod->SetSelectionTransfer( NULL ); - TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld + TransferableHelper::ClearSelection( GetActiveWin() ); // may delete pOld } DELETEZ(pBrushDocument); @@ -171,7 +171,7 @@ __EXPORT ScTabView::~ScTabView() DELETEZ(pDrawOld); DELETEZ(pDrawActual); - aViewData.KillEditView(); // solange GridWin's noch existieren + aViewData.KillEditView(); // solange GridWin's noch existieren DELETEZ(pInputHintWindow); @@ -231,19 +231,19 @@ void ScTabView::MakeDrawView( BYTE nForceDesignMode ) { pGridWin[i]->SetMapMode(pGridWin[i]->GetDrawMapMode()); - pGridWin[i]->Update(); // wegen Invalidate im DrawView ctor (ShowPage), + pGridWin[i]->Update(); // wegen Invalidate im DrawView ctor (ShowPage), // damit gleich gezeichnet werden kann } SfxRequest aSfxRequest(SID_OBJECT_SELECT, 0,aViewData.GetViewShell()->GetPool()); SetDrawFuncPtr(new FuSelection( aViewData.GetViewShell(), GetActiveWin(), pDrawView, pLayer,aSfxRequest)); - // #106334# used when switching back from page preview: restore saved design mode state - // (otherwise, keep the default from the draw view ctor) + // #106334# used when switching back from page preview: restore saved design mode state + // (otherwise, keep the default from the draw view ctor) if ( nForceDesignMode != SC_FORCEMODE_NONE ) pDrawView->SetDesignMode( (BOOL)nForceDesignMode ); - // an der FormShell anmelden + // an der FormShell anmelden FmFormShell* pFormSh = aViewData.GetViewShell()->GetFormShell(); if (pFormSh) pFormSh->SetView(pDrawView); @@ -272,12 +272,12 @@ void ScTabView::TabChanged() { if (pDrawView) { - DrawDeselectAll(); // beendet auch Text-Edit-Modus + DrawDeselectAll(); // beendet auch Text-Edit-Modus USHORT i; for (i=0; i<4; i++) if (pGridWin[i]) - pDrawView->VCRemoveWin(pGridWin[i]); // fuer alte Page + pDrawView->VCRemoveWin(pGridWin[i]); // fuer alte Page SCTAB nTab = aViewData.GetTabNo(); pDrawView->HideSdrPage(); @@ -286,17 +286,17 @@ void ScTabView::TabChanged() UpdateLayerLocks(); pDrawView->RecalcScale(); - pDrawView->UpdateWorkArea(); // #54782# PageSize ist pro Page unterschiedlich + pDrawView->UpdateWorkArea(); // #54782# PageSize ist pro Page unterschiedlich for (i=0; i<4; i++) if (pGridWin[i]) - pDrawView->VCAddWin(pGridWin[i]); // fuer neue Page + pDrawView->VCAddWin(pGridWin[i]); // fuer neue Page } SfxBindings& rBindings = aViewData.GetBindings(); - // Es gibt keine einfache Moeglichkeit, alle Slots der FormShell zu invalidieren - // (fuer disablete Slots auf geschuetzten Tabellen), darum hier einfach alles... + // Es gibt keine einfache Moeglichkeit, alle Slots der FormShell zu invalidieren + // (fuer disablete Slots auf geschuetzten Tabellen), darum hier einfach alles... rBindings.InvalidateAll(FALSE); if (aViewData.GetViewShell()->HasAccessibilityObjects()) @@ -396,7 +396,7 @@ void ScTabView::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAll aViewData.SetZoom( rNewX, rNewY, bAll ); if (pDrawView) pDrawView->RecalcScale(); - ZoomChanged(); // einzeln wegen CLOOKs + ZoomChanged(); // einzeln wegen CLOOKs } void ScTabView::RefreshZoom() @@ -412,7 +412,7 @@ void ScTabView::SetPagebreakMode( BOOL bSet ) aViewData.SetPagebreakMode(bSet); if (pDrawView) pDrawView->RecalcScale(); - ZoomChanged(); // einzeln wegen CLOOKs + ZoomChanged(); // einzeln wegen CLOOKs } void ScTabView::ResetDrawDragMode() @@ -423,7 +423,7 @@ void ScTabView::ResetDrawDragMode() void ScTabView::ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChanged ) { - // DrawView erzeugen, wenn Gitter angezeigt werden soll + // DrawView erzeugen, wenn Gitter angezeigt werden soll if ( !pDrawView && aViewData.GetOptions().GetGridOptions().GetGridVisible() ) MakeDrawLayer(); @@ -431,7 +431,7 @@ void ScTabView::ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChang pDrawView->UpdateUserViewOptions(); if (bGraphicsChanged) - DrawEnableAnim(TRUE); // DrawEnableAnim checks the options state + DrawEnableAnim(TRUE); // DrawEnableAnim checks the options state // if TabBar is set to visible, make sure its size is not 0 BOOL bGrow = ( aViewData.IsTabMode() && pTabControl->GetSizePixel().Width() <= 0 ); @@ -443,8 +443,8 @@ void ScTabView::ViewOptionsHasChanged( BOOL bHScrollChanged, BOOL bGraphicsChang if ( bGrow || bShrink ) { Size aSize = pTabControl->GetSizePixel(); - aSize.Width() = SC_TABBAR_DEFWIDTH; // initial size - pTabControl->SetSizePixel(aSize); // DoResize is called later... + aSize.Width() = SC_TABBAR_DEFWIDTH; // initial size + pTabControl->SetSizePixel(aSize); // DoResize is called later... } } @@ -475,7 +475,7 @@ void ScTabView::UpdateIMap( SdrObject* pObj ) void ScTabView::DrawMarkRect( const Rectangle& rRect ) { - //! store rectangle for repaint during drag + //! store rectangle for repaint during drag for (USHORT i=0; i<4; i++) { @@ -483,7 +483,7 @@ void ScTabView::DrawMarkRect( const Rectangle& rRect ) { RasterOp aROp = pGridWin[i]->GetRasterOp(); BOOL bHasLine = pGridWin[i]->IsLineColor(); - Color aLine = pGridWin[i]->GetLineColor(); + Color aLine = pGridWin[i]->GetLineColor(); BOOL bHasFill = pGridWin[i]->IsFillColor(); Color aFill = pGridWin[i]->GetFillColor(); @@ -511,15 +511,15 @@ void ScTabView::DrawEnableAnim(BOOL bSet) USHORT i; if ( pDrawView ) { - // #71040# dont start animations if display of graphics is disabled - // graphics are controlled by VOBJ_TYPE_OLE + // #71040# dont start animations if display of graphics is disabled + // graphics are controlled by VOBJ_TYPE_OLE if ( bSet && aViewData.GetOptions().GetObjMode(VOBJ_TYPE_OLE) == VOBJ_MODE_SHOW ) { if ( !pDrawView->IsAnimationEnabled() ) { pDrawView->SetAnimationEnabled(TRUE); - // Animierte GIFs muessen wieder gestartet werden: + // Animierte GIFs muessen wieder gestartet werden: ScDocument* pDoc = aViewData.GetDocument(); for (i=0; i<4; i++) if ( pGridWin[i] && pGridWin[i]->IsVisible() ) @@ -536,15 +536,15 @@ void ScTabView::DrawEnableAnim(BOOL bSet) //HMHvoid ScTabView::DrawShowMarkHdl(BOOL bShow) //HMH{ //HMHif (!pDrawView) - //HMH return; + //HMH return; //HMHif (bShow) //HMH{ - //HMH if (!pDrawView->IsDisableHdl()) - //HMH pDrawView->ShowMarkHdl(); + //HMH if (!pDrawView->IsDisableHdl()) + //HMH pDrawView->ShowMarkHdl(); //HMH} //HMHelse - //HMH pDrawView->HideMarkHdl(); + //HMH pDrawView->HideMarkHdl(); //HMH} void ScTabView::UpdateDrawTextOutliner() @@ -581,25 +581,25 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect ) Rectangle aRect = pWin->LogicToPixel( rHMMRect ); - long nScrollX=0, nScrollY=0; // Pixel + long nScrollX=0, nScrollY=0; // Pixel - if ( aRect.Right() >= aWinSize.Width() ) // rechts raus + if ( aRect.Right() >= aWinSize.Width() ) // rechts raus { - nScrollX = aRect.Right() - aWinSize.Width() + 1; // rechter Rand sichtbar + nScrollX = aRect.Right() - aWinSize.Width() + 1; // rechter Rand sichtbar if ( aRect.Left() < nScrollX ) - nScrollX = aRect.Left(); // links sichtbar (falls zu gross) + nScrollX = aRect.Left(); // links sichtbar (falls zu gross) } - if ( aRect.Bottom() >= aWinSize.Height() ) // unten raus + if ( aRect.Bottom() >= aWinSize.Height() ) // unten raus { - nScrollY = aRect.Bottom() - aWinSize.Height() + 1; // unterer Rand sichtbar + nScrollY = aRect.Bottom() - aWinSize.Height() + 1; // unterer Rand sichtbar if ( aRect.Top() < nScrollY ) - nScrollY = aRect.Top(); // oben sichtbar (falls zu gross) + nScrollY = aRect.Top(); // oben sichtbar (falls zu gross) } - if ( aRect.Left() < 0 ) // links raus - nScrollX = aRect.Left(); // linker Rand sichtbar - if ( aRect.Top() < 0 ) // oben raus - nScrollY = aRect.Top(); // oberer Rand sichtbar + if ( aRect.Left() < 0 ) // links raus + nScrollX = aRect.Left(); // linker Rand sichtbar + if ( aRect.Top() < 0 ) // oben raus + nScrollY = aRect.Top(); // oberer Rand sichtbar if (nScrollX || nScrollY) { @@ -613,7 +613,7 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect ) SCCOL nPosX = aViewData.GetPosX(WhichH(eWhich)); SCROW nPosY = aViewData.GetPosY(WhichV(eWhich)); - long nLinesX=0, nLinesY=0; // Spalten/Zeilen - um mindestens nScrollX/Y scrollen + long nLinesX=0, nLinesY=0; // Spalten/Zeilen - um mindestens nScrollX/Y scrollen if (nScrollX > 0) while (nScrollX > 0 && nPosX < MAXCOL) @@ -645,7 +645,7 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect ) --nLinesY; } - ScrollLines( nLinesX, nLinesY ); // ausfuehren + ScrollLines( nLinesX, nLinesY ); // ausfuehren } } diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx index d5e166d121a7..fdbd07b86cff 100644 --- a/sc/source/ui/view/tabvwsh.cxx +++ b/sc/source/ui/view/tabvwsh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ #define ScTabViewShell #include "scslots.hxx" -#define SearchSettings +#define SearchSettings #include <svx/svxslots.hxx> TYPEINIT2(ScTabViewShell,SfxViewShell,SfxListener); diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 81a011516cbd..c9069b543ad5 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ SdrView* __EXPORT ScTabViewShell::GetDrawView() const { - return ((ScTabViewShell*)this)->GetScDrawView(); // GetScDrawView ist nicht-const + return ((ScTabViewShell*)this)->GetScDrawView(); // GetScDrawView ist nicht-const } void ScTabViewShell::WindowChanged() @@ -84,12 +84,12 @@ void ScTabViewShell::WindowChanged() if (pDrView) pDrView->SetActualWin(pWin); - FuPoor* pFunc = GetDrawFuncPtr(); + FuPoor* pFunc = GetDrawFuncPtr(); if (pFunc) pFunc->SetWindow(pWin); - // when font from InputContext is used, - // this must be moved to change of cursor position: + // when font from InputContext is used, + // this must be moved to change of cursor position: UpdateInputContext(); } @@ -103,9 +103,9 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) ScTabView* pTabView = GetViewData()->GetView(); SfxBindings& rBindings = GetViewFrame()->GetBindings(); - Window* pWin = pTabView->GetActiveWin(); - ScDrawView* pView = pTabView->GetScDrawView(); - SdrModel* pDoc = pView->GetModel(); + Window* pWin = pTabView->GetActiveWin(); + ScDrawView* pView = pTabView->GetScDrawView(); + SdrModel* pDoc = pView->GetModel(); const SfxItemSet *pArgs = rReq.GetArgs(); USHORT nNewId = rReq.GetSlot(); @@ -118,8 +118,8 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) } // - // Pseudo-Slots von Draw-Toolbox auswerten - //! wird das ueberhaupt noch gebraucht ????? + // Pseudo-Slots von Draw-Toolbox auswerten + //! wird das ueberhaupt noch gebraucht ????? // if (nNewId == SID_INSERT_DRAW && pArgs) @@ -131,20 +131,20 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) SvxDrawToolEnum eSel = (SvxDrawToolEnum)((const SvxDrawToolItem*)pItem)->GetValue(); switch (eSel) { - case SVX_SNAP_DRAW_SELECT: nNewId = SID_OBJECT_SELECT; break; - case SVX_SNAP_DRAW_LINE: nNewId = SID_DRAW_LINE; break; - case SVX_SNAP_DRAW_RECT: nNewId = SID_DRAW_RECT; break; - case SVX_SNAP_DRAW_ELLIPSE: nNewId = SID_DRAW_ELLIPSE; break; - case SVX_SNAP_DRAW_POLYGON_NOFILL: nNewId = SID_DRAW_POLYGON_NOFILL; break; - case SVX_SNAP_DRAW_BEZIER_NOFILL: nNewId = SID_DRAW_BEZIER_NOFILL; break; - case SVX_SNAP_DRAW_FREELINE_NOFILL: nNewId = SID_DRAW_FREELINE_NOFILL; break; - case SVX_SNAP_DRAW_ARC: nNewId = SID_DRAW_ARC; break; - case SVX_SNAP_DRAW_PIE: nNewId = SID_DRAW_PIE; break; - case SVX_SNAP_DRAW_CIRCLECUT: nNewId = SID_DRAW_CIRCLECUT; break; - case SVX_SNAP_DRAW_TEXT: nNewId = SID_DRAW_TEXT; break; - case SVX_SNAP_DRAW_TEXT_VERTICAL: nNewId = SID_DRAW_TEXT_VERTICAL; break; - case SVX_SNAP_DRAW_TEXT_MARQUEE: nNewId = SID_DRAW_TEXT_MARQUEE; break; - case SVX_SNAP_DRAW_CAPTION: nNewId = SID_DRAW_CAPTION; break; + case SVX_SNAP_DRAW_SELECT: nNewId = SID_OBJECT_SELECT; break; + case SVX_SNAP_DRAW_LINE: nNewId = SID_DRAW_LINE; break; + case SVX_SNAP_DRAW_RECT: nNewId = SID_DRAW_RECT; break; + case SVX_SNAP_DRAW_ELLIPSE: nNewId = SID_DRAW_ELLIPSE; break; + case SVX_SNAP_DRAW_POLYGON_NOFILL: nNewId = SID_DRAW_POLYGON_NOFILL; break; + case SVX_SNAP_DRAW_BEZIER_NOFILL: nNewId = SID_DRAW_BEZIER_NOFILL; break; + case SVX_SNAP_DRAW_FREELINE_NOFILL: nNewId = SID_DRAW_FREELINE_NOFILL; break; + case SVX_SNAP_DRAW_ARC: nNewId = SID_DRAW_ARC; break; + case SVX_SNAP_DRAW_PIE: nNewId = SID_DRAW_PIE; break; + case SVX_SNAP_DRAW_CIRCLECUT: nNewId = SID_DRAW_CIRCLECUT; break; + case SVX_SNAP_DRAW_TEXT: nNewId = SID_DRAW_TEXT; break; + case SVX_SNAP_DRAW_TEXT_VERTICAL: nNewId = SID_DRAW_TEXT_VERTICAL; break; + case SVX_SNAP_DRAW_TEXT_MARQUEE: nNewId = SID_DRAW_TEXT_MARQUEE; break; + case SVX_SNAP_DRAW_CAPTION: nNewId = SID_DRAW_CAPTION; break; case SVX_SNAP_DRAW_CAPTION_VERTICAL: nNewId = SID_DRAW_CAPTION_VERTICAL; break; } } @@ -176,20 +176,20 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) } bool bSwitchCustom = ( sStringItemValue.Len() && sDrawCustom.Len() && sStringItemValue != sDrawCustom ); - if (nNewId == SID_INSERT_FRAME) // vom Tbx-Button + if (nNewId == SID_INSERT_FRAME) // vom Tbx-Button nNewId = SID_DRAW_TEXT; - // #97016# CTRL-SID_OBJECT_SELECT is used to select the first object, - // but not if SID_OBJECT_SELECT is the result of clicking a create function again, - // so this must be tested before changing nNewId below. + // #97016# CTRL-SID_OBJECT_SELECT is used to select the first object, + // but not if SID_OBJECT_SELECT is the result of clicking a create function again, + // so this must be tested before changing nNewId below. BOOL bSelectFirst = ( nNewId == SID_OBJECT_SELECT && (rReq.GetModifier() & KEY_MOD1) ); BOOL bEx = IsDrawSelMode(); if ( rReq.GetModifier() & KEY_MOD1 ) { - // #97016# always allow keyboard selection also on background layer - // #98185# also allow creation of default objects if the same object type - // was already active + // #97016# always allow keyboard selection also on background layer + // #98185# also allow creation of default objects if the same object type + // was already active bEx = TRUE; } else if ( nNewId == nDrawSfxId && ( nNewId != SID_FM_CREATE_CONTROL || @@ -198,14 +198,14 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) // #i52871# if a different custom shape is selected, the slot id can be the same, // so the custom shape type string has to be compared, too. - // SID_FM_CREATE_CONTROL mit nNewFormId==0 (ohne Parameter) kommt beim Deaktivieren - // aus FuConstruct::SimpleMouseButtonUp - // #59280# Execute fuer die Form-Shell, um im Controller zu deselektieren + // SID_FM_CREATE_CONTROL mit nNewFormId==0 (ohne Parameter) kommt beim Deaktivieren + // aus FuConstruct::SimpleMouseButtonUp + // #59280# Execute fuer die Form-Shell, um im Controller zu deselektieren if ( nNewId == SID_FM_CREATE_CONTROL ) { GetViewData()->GetDispatcher().Execute(SID_FM_LEAVE_CREATE); GetViewFrame()->GetBindings().InvalidateAll(FALSE); - //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen???? + //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen???? } bEx = !bEx; @@ -216,10 +216,10 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) if ( nDrawSfxId == SID_FM_CREATE_CONTROL && nNewId != nDrawSfxId ) { - // Wechsel von Control- zu Zeichenfunktion -> im Control-Controller deselektieren + // Wechsel von Control- zu Zeichenfunktion -> im Control-Controller deselektieren GetViewData()->GetDispatcher().Execute(SID_FM_LEAVE_CREATE); GetViewFrame()->GetBindings().InvalidateAll(FALSE); - //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen???? + //! was fuer einen Slot braucht der komische Controller wirklich, um das anzuzeigen???? } SetDrawSelMode(bEx); @@ -228,7 +228,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) if ( bSelectFirst ) { - // #97016# select first draw object if none is selected yet + // #97016# select first draw object if none is selected yet if(!pView->AreObjectsMarked()) { // select first object @@ -244,7 +244,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) nDrawSfxId = nNewId; sDrawCustom.Erase(); // value is set below for custom shapes - if ( nNewId != SID_DRAW_CHART ) // Chart nicht mit DrawShell + if ( nNewId != SID_DRAW_CHART ) // Chart nicht mit DrawShell { if ( nNewId == SID_DRAW_TEXT || nNewId == SID_DRAW_TEXT_VERTICAL || nNewId == SID_DRAW_TEXT_MARQUEE || nNewId == SID_DRAW_NOTEEDIT ) @@ -361,7 +361,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) // #98185# Create default drawing objects via keyboard // with qualifier construct directly - FuPoor* pFuActual = GetDrawFuncPtr(); + FuPoor* pFuActual = GetDrawFuncPtr(); if(pFuActual && (rReq.GetModifier() & KEY_MOD1)) { @@ -395,9 +395,9 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) if ( nNewId == SID_DRAW_CAPTION || nNewId == SID_DRAW_CAPTION_VERTICAL ) { - // #105815# use KeyInput to start edit mode (FuText is created). - // For FuText objects, edit mode is handled within CreateDefaultObject. - // KEY_F2 is handled in FuDraw::KeyInput. + // #105815# use KeyInput to start edit mode (FuText is created). + // For FuText objects, edit mode is handled within CreateDefaultObject. + // KEY_F2 is handled in FuDraw::KeyInput. pFuActual->KeyInput( KeyEvent( 0, KeyCode( KEY_F2 ) ) ); } @@ -409,8 +409,8 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) void ScTabViewShell::GetDrawState(SfxItemSet &rSet) { - SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter(rSet); + USHORT nWhich = aIter.FirstWhich(); while ( nWhich ) { @@ -418,7 +418,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet) { case SID_INSERT_DRAW: { - // SID_OBJECT_SELECT nur, wenn "harter" Selektionsmodus + // SID_OBJECT_SELECT nur, wenn "harter" Selektionsmodus USHORT nPutId = nDrawSfxId; if ( nPutId == SID_OBJECT_SELECT && !IsDrawSelMode() ) nPutId = USHRT_MAX; @@ -457,7 +457,7 @@ void ScTabViewShell::GetDrawState(SfxItemSet &rSet) } break; - case SID_OBJECT_SELECT: // wichtig fuer den ollen Control-Controller + case SID_OBJECT_SELECT: // wichtig fuer den ollen Control-Controller rSet.Put( SfxBoolItem( nWhich, nDrawSfxId == SID_OBJECT_SELECT && IsDrawSelMode() ) ); break; } diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 7eb78c81d003..d12aa430fbfa 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -119,14 +119,14 @@ USHORT lcl_ParseAddress(ScAddress& rScAddress, const String& aAddress, ScDocumen void ScTabViewShell::Execute( SfxRequest& rReq ) { - SfxViewFrame* pThisFrame = GetViewFrame(); - SfxBindings& rBindings = pThisFrame->GetBindings(); - ScModule* pScMod = SC_MOD(); - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); + SfxViewFrame* pThisFrame = GetViewFrame(); + SfxBindings& rBindings = pThisFrame->GetBindings(); + ScModule* pScMod = SC_MOD(); + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); - if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp - HideListBox(); // Autofilter-DropDown-Listbox + if (nSlot != SID_CURRENTCELL) // der kommt beim MouseButtonUp + HideListBox(); // Autofilter-DropDown-Listbox switch ( nSlot ) { @@ -146,7 +146,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) else aInsertPos = GetInsertPos(); - // als Link? + // als Link? BOOL bAsLink = FALSE; if ( pReqArgs->GetItemState(FN_PARAM_2,TRUE,&pItem) == SFX_ITEM_SET ) @@ -161,7 +161,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case SID_OPENDLG_EDIT_PRINTAREA: { - USHORT nId = ScPrintAreasDlgWrapper::GetChildWindowId(); + USHORT nId = ScPrintAreasDlgWrapper::GetChildWindowId(); SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId ); pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE ); @@ -170,7 +170,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case SID_CHANGE_PRINTAREA: { - if ( pReqArgs ) // OK aus Dialog + if ( pReqArgs ) // OK aus Dialog { String aPrintStr; String aRowStr; @@ -194,7 +194,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) break; case SID_ADD_PRINTAREA: - case SID_DEFINE_PRINTAREA: // Menue oder Basic + case SID_DEFINE_PRINTAREA: // Menue oder Basic { BOOL bAdd = ( nSlot == SID_ADD_PRINTAREA ); if ( pReqArgs ) @@ -232,7 +232,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) break; case FID_RESET_PRINTZOOM: - SetPrintZoom( 100, 0 ); // 100%, nicht auf Seiten + SetPrintZoom( 100, 0 ); // 100%, nicht auf Seiten rReq.Done(); break; @@ -255,10 +255,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) SID_JUMPTOMARK, TRUE, &pItem ) == SFX_ITEM_SET ) aAddress = ((const SfxStringItem*)pItem)->GetValue(); - // #i14927# SID_CURRENTCELL with a single cell must unmark if FN_PARAM_1 - // isn't set (for recorded macros, because IsAPI is no longer available). - // ScGridWindow::MouseButtonUp no longer executes the slot for a single - // cell if there is a multi selection. + // #i14927# SID_CURRENTCELL with a single cell must unmark if FN_PARAM_1 + // isn't set (for recorded macros, because IsAPI is no longer available). + // ScGridWindow::MouseButtonUp no longer executes the slot for a single + // cell if there is a multi selection. BOOL bUnmark = ( nSlot == SID_CURRENTCELL ); if ( pReqArgs->GetItemState( FN_PARAM_1, TRUE, &pItem ) == SFX_ITEM_SET ) bUnmark = ((const SfxBoolItem*)pItem)->GetValue(); @@ -269,7 +269,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) if ( nSlot == SID_JUMPTOMARK ) { - // #106586# URL has to be decoded for escaped characters (%20) + // #106586# URL has to be decoded for escaped characters (%20) aAddress = INetURLObject::decode( aAddress, INET_HEX_ESCAPE, INetURLObject::DECODE_WITH_CHARSET, RTL_TEXTENCODING_UTF8 ); @@ -277,13 +277,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) BOOL bFound = FALSE; ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - ScMarkData& rMark = pViewData->GetMarkData(); - ScRange aScRange; - ScAddress aScAddress; + ScDocument* pDoc = pViewData->GetDocument(); + ScMarkData& rMark = pViewData->GetMarkData(); + ScRange aScRange; + ScAddress aScAddress; USHORT nResult = lcl_ParseRange(aScRange, aAddress, pDoc, nSlot); - SCTAB nTab = pViewData->GetTabNo(); - BOOL bMark = TRUE; + SCTAB nTab = pViewData->GetTabNo(); + BOOL bMark = TRUE; // Is this a range ? if( nResult & SCA_VALID ) @@ -317,9 +317,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) // Ist es benahmster Bereich (erst Namen dann DBBereiche) ? else { - ScRangeUtil aRangeUtil; + ScRangeUtil aRangeUtil; formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - if( aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_NAMES, eConv ) || + if( aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_NAMES, eConv ) || aRangeUtil.MakeRangeFromName( aAddress, pDoc, nTab, aScRange, RUTL_DBASE, eConv ) ) { nResult |= SCA_VALID; @@ -334,13 +334,13 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) sal_Int32 nNumeric = aAddress.ToInt32(); if ( nNumeric > 0 && nNumeric <= MAXROW+1 ) { - // 1-basierte Zeilennummer + // 1-basierte Zeilennummer aScAddress.SetRow( (SCROW)(nNumeric - 1) ); aScAddress.SetCol( pViewData->GetCurX() ); aScAddress.SetTab( nTab ); aScRange = ScRange( aScAddress, aScAddress ); - bMark = FALSE; + bMark = FALSE; nResult = SCA_VALID; } } @@ -359,7 +359,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) // markieren if( bMark ) { - if (rMark.IsMarked()) // ist derselbe Bereich schon markiert? + if (rMark.IsMarked()) // ist derselbe Bereich schon markiert? { ScRange aOldMark; rMark.GetMarkArea( aOldMark ); @@ -372,11 +372,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) bNothing = FALSE; if (!bNothing) - MarkRange( aScRange, FALSE ); // Cursor kommt hinterher... + MarkRange( aScRange, FALSE ); // Cursor kommt hinterher... } else { - // remove old selection, unless bUnmark argument is FALSE (from navigator) + // remove old selection, unless bUnmark argument is FALSE (from navigator) if( bUnmark ) { MoveCursorAbs( nCol, nRow, @@ -389,14 +389,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) // zusammengefasste Zellen beruecksichtigen: pDoc->SkipOverlapped(nCol, nRow, nTab); - // Navigator-Aufrufe sind nicht API!!! + // Navigator-Aufrufe sind nicht API!!! if( bNothing ) { if (rReq.IsAPI()) - rReq.Ignore(); // wenn Makro, dann gar nix + rReq.Ignore(); // wenn Makro, dann gar nix else - rReq.Done(); // sonst wenigstens aufzeichnen + rReq.Done(); // sonst wenigstens aufzeichnen } else { @@ -419,9 +419,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) rReq.SetReturnValue( SfxStringItem( SID_CURRENTCELL, aAddress ) ); } - if (!bFound) // kein gueltiger Bereich + if (!bFound) // kein gueltiger Bereich { - // wenn es ein Tabellenname ist, umschalten (fuer Navigator/URL's) + // wenn es ein Tabellenname ist, umschalten (fuer Navigator/URL's) SCTAB nNameTab; if ( pDoc->GetTable( aAddress, nNameTab ) ) @@ -434,7 +434,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) if ( !bFound && nSlot == SID_JUMPTOMARK ) { - // Grafik-Objekte probieren (nur bei URL's) + // Grafik-Objekte probieren (nur bei URL's) bFound = SelectObject( aAddress ); } @@ -455,7 +455,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case SID_CURRENTTAB: if ( pReqArgs ) { - // Tabelle fuer Basic ist 1-basiert + // Tabelle fuer Basic ist 1-basiert SCTAB nTab = ((const SfxUInt16Item&)pReqArgs->Get(nSlot)).GetValue() - 1; ScDocument* pDoc = GetViewData()->GetDocument(); if ( nTab < pDoc->GetTableCount() ) @@ -466,7 +466,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) if( ! rReq.IsAPI() ) rReq.Done(); } - //! sonst Fehler ? + //! sonst Fehler ? } break; @@ -476,9 +476,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) String aStrDocName( ((const SfxStringItem&)pReqArgs-> Get(nSlot)).GetValue() ); - SfxViewFrame* pViewFrame = NULL; - ScDocShell* pDocSh = (ScDocShell*)SfxObjectShell::GetFirst(); - BOOL bFound = FALSE; + SfxViewFrame* pViewFrame = NULL; + ScDocShell* pDocSh = (ScDocShell*)SfxObjectShell::GetFirst(); + BOOL bFound = FALSE; // zu aktivierenden ViewFrame suchen @@ -507,16 +507,16 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { if ( !pThisFrame->GetFrame().IsInPlace() ) // nicht bei OLE { - // print preview is now always in the same frame as the tab view - // -> always switch this frame back to normal view - // (ScPreviewShell ctor reads view data) + // print preview is now always in the same frame as the tab view + // -> always switch this frame back to normal view + // (ScPreviewShell ctor reads view data) // #102785#; finish input pScMod->InputEnterHandler(); pThisFrame->GetDispatcher()->Execute( SID_VIEWSHELL1, SFX_CALLMODE_ASYNCHRON ); } - // else Fehler (z.B. Ole) + // else Fehler (z.B. Ole) } break; @@ -525,8 +525,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) rReq.Done(); break; - // SID_TABLE_ACTIVATE und SID_MARKAREA werden von Basic aus an der versteckten - // View aufgerufen, um auf der sichtbaren View zu markieren/umzuschalten: + // SID_TABLE_ACTIVATE und SID_MARKAREA werden von Basic aus an der versteckten + // View aufgerufen, um auf der sichtbaren View zu markieren/umzuschalten: case SID_TABLE_ACTIVATE: DBG_ERROR("old slot SID_TABLE_ACTIVATE"); @@ -635,7 +635,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case FID_TOGGLEINPUTLINE: { - USHORT nId = ScInputWindowWrapper::GetChildWindowId(); + USHORT nId = ScInputWindowWrapper::GetChildWindowId(); SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId ); BOOL bSet = ( pWnd == NULL ); const SfxPoolItem* pItem; @@ -653,9 +653,9 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case FID_SCALE: { BOOL bSyncZoom = SC_MOD()->GetAppOptions().GetSynchronizeZoom(); - SvxZoomType eOldZoomType = GetZoomType(); - SvxZoomType eNewZoomType = eOldZoomType; - const Fraction& rOldY = GetViewData()->GetZoomY(); // Y wird angezeigt + SvxZoomType eOldZoomType = GetZoomType(); + SvxZoomType eNewZoomType = eOldZoomType; + const Fraction& rOldY = GetViewData()->GetZoomY(); // Y wird angezeigt USHORT nOldZoom = (USHORT)(( rOldY.GetNumerator() * 100 ) / rOldY.GetDenominator()); USHORT nZoom = nOldZoom; @@ -667,15 +667,15 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pReqArgs->Get(SID_ATTR_ZOOM); eNewZoomType = rZoomItem.GetType(); - nZoom = rZoomItem.GetValue(); + nZoom = rZoomItem.GetValue(); } else { - SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); - SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM ); + SfxItemSet aSet ( GetPool(), SID_ATTR_ZOOM, SID_ATTR_ZOOM ); + SvxZoomItem aZoomItem( eOldZoomType, nOldZoom, SID_ATTR_ZOOM ); AbstractSvxZoomDialog* pDlg = NULL; - ScMarkData& rMark = GetViewData()->GetMarkData(); - USHORT nBtnFlags = SVX_ZOOM_ENABLE_50 + ScMarkData& rMark = GetViewData()->GetMarkData(); + USHORT nBtnFlags = SVX_ZOOM_ENABLE_50 | SVX_ZOOM_ENABLE_75 | SVX_ZOOM_ENABLE_100 | SVX_ZOOM_ENABLE_150 @@ -700,12 +700,12 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) if ( !bCancel ) { - const SvxZoomItem& rZoomItem = (const SvxZoomItem&) + const SvxZoomItem& rZoomItem = (const SvxZoomItem&) pDlg->GetOutputItemSet()-> Get( SID_ATTR_ZOOM ); eNewZoomType = rZoomItem.GetType(); - nZoom = rZoomItem.GetValue(); + nZoom = rZoomItem.GetValue(); } delete pDlg; @@ -715,8 +715,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { if ( eNewZoomType == SVX_ZOOM_PERCENT ) { - if ( nZoom < MINZOOM ) nZoom = MINZOOM; - if ( nZoom > MAXZOOM ) nZoom = MAXZOOM; + if ( nZoom < MINZOOM ) nZoom = MINZOOM; + if ( nZoom > MAXZOOM ) nZoom = MAXZOOM; } else { @@ -899,11 +899,11 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { ScSplitMode eHSplit = GetViewData()->GetHSplitMode(); ScSplitMode eVSplit = GetViewData()->GetVSplitMode(); - if ( eHSplit == SC_SPLIT_NORMAL || eVSplit == SC_SPLIT_NORMAL ) // aufheben + if ( eHSplit == SC_SPLIT_NORMAL || eVSplit == SC_SPLIT_NORMAL ) // aufheben RemoveSplit(); - else if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // normal + else if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // normal FreezeSplitters( FALSE ); - else // erzeugen + else // erzeugen SplitAtCursor(); rReq.Done(); @@ -915,21 +915,21 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { ScSplitMode eHSplit = GetViewData()->GetHSplitMode(); ScSplitMode eVSplit = GetViewData()->GetVSplitMode(); - if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // aufheben + if ( eHSplit == SC_SPLIT_FIX || eVSplit == SC_SPLIT_FIX ) // aufheben RemoveSplit(); else - FreezeSplitters( TRUE ); // erzeugen oder fixieren + FreezeSplitters( TRUE ); // erzeugen oder fixieren rReq.Done(); InvalidateSplit(); } break; - // ---------------------------------------------------------------- + // ---------------------------------------------------------------- case FID_CHG_SHOW: { - USHORT nId = ScHighlightChgDlgWrapper::GetChildWindowId(); + USHORT nId = ScHighlightChgDlgWrapper::GetChildWindowId(); SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId ); pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE ); @@ -943,7 +943,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) rReq.Done (); /* - USHORT nId = ScAcceptChgDlgWrapper::GetChildWindowId(); + USHORT nId = ScAcceptChgDlgWrapper::GetChildWindowId(); SfxChildWindow* pWnd = pThisFrame->GetChildWindow( nId ); pScMod->SetRefDialog( nId, pWnd ? FALSE : TRUE ); @@ -957,7 +957,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) ScAddress aCursorPos( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() ); ScDocShell* pDocSh = pData->GetDocShell(); - ScChangeAction* pAction = pDocSh->GetChangeAction( aCursorPos ); + ScChangeAction* pAction = pDocSh->GetChangeAction( aCursorPos ); if ( pAction ) { const SfxPoolItem* pItem; @@ -979,8 +979,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) break; case SID_CREATE_SW_DRAWVIEW: - // wird von den Forms gerufen, wenn die DrawView mit allem Zubehoer - // angelegt werden muss + // wird von den Forms gerufen, wenn die DrawView mit allem Zubehoer + // angelegt werden muss if (!GetScDrawView()) { GetViewData()->GetDocShell()->MakeDrawLayer(); @@ -990,8 +990,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case FID_PROTECT_DOC: { - ScDocument* pDoc = GetViewData()->GetDocument(); - SfxPasswordDialog* pDlg; + ScDocument* pDoc = GetViewData()->GetDocument(); + SfxPasswordDialog* pDlg; if( pReqArgs ) { @@ -1007,14 +1007,14 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) ScDocProtection* pProtect = pDoc->GetDocProtection(); if (pProtect && pProtect->isProtected()) { - BOOL bCancel = FALSE; - String aPassword; + BOOL bCancel = FALSE; + String aPassword; if (pProtect->isProtectedWithPass()) { - String aText( ScResId(SCSTR_PASSWORD) ); + String aText( ScResId(SCSTR_PASSWORD) ); - pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); + pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_UNPROTECTDOC) ); pDlg->SetMinLen( 0 ); pDlg->SetHelpId( FID_PROTECT_DOC ); @@ -1037,7 +1037,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) { String aText( ScResId(SCSTR_PASSWORDOPT) ); - pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); + pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_PROTECTDOC) ); pDlg->SetMinLen( 0 ); pDlg->SetHelpId( FID_PROTECT_DOC ); @@ -1062,7 +1062,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case FID_PROTECT_TABLE: { ScDocument* pDoc = GetViewData()->GetDocument(); - SCTAB nTab = GetViewData()->GetTabNo(); + SCTAB nTab = GetViewData()->GetTabNo(); bool bOldProtection = pDoc->IsTabProtected(nTab); #if ENABLE_SHEET_PROTECTION @@ -1136,8 +1136,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } #else auto_ptr<SfxPasswordDialog> pDlg; - String aPassword; - BOOL bCancel = FALSE; + String aPassword; + BOOL bCancel = FALSE; bool bNewProtection = ! bOldProtection; if( pReqArgs ) diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 493f45341ff4..e6d047e81e32 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ #include "inputopt.hxx" #include "inputwin.hxx" #include "scresid.hxx" -#include "dbcolect.hxx" // fuer ReImport +#include "dbcolect.hxx" // fuer ReImport #include "reffact.hxx" #include "viewuno.hxx" #include "dispuno.hxx" @@ -102,7 +102,7 @@ void ActivateOlk( ScViewData* pViewData ); void DeActivateOlk( ScViewData* pViewData ); -extern SfxViewShell* pScActiveViewShell; // global.cxx +extern SfxViewShell* pScActiveViewShell; // global.cxx using namespace com::sun::star; @@ -118,28 +118,28 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI) { SfxViewShell::Activate(bMDI); - // hier kein GrabFocus, sonst gibt's Probleme wenn etwas inplace editiert wird! + // hier kein GrabFocus, sonst gibt's Probleme wenn etwas inplace editiert wird! if ( bMDI ) { - // fuer Eingabezeile (ClearCache) + // fuer Eingabezeile (ClearCache) ScModule* pScMod = SC_MOD(); pScMod->ViewShellChanged(); ActivateView( TRUE, bFirstActivate ); ActivateOlk( GetViewData() ); - // #56870# AutoCorrect umsetzen, falls der Writer seins neu angelegt hat + // #56870# AutoCorrect umsetzen, falls der Writer seins neu angelegt hat UpdateDrawTextOutliner(); - // RegisterNewTargetNames gibts nicht mehr + // RegisterNewTargetNames gibts nicht mehr SfxViewFrame* pThisFrame = GetViewFrame(); if ( pInputHandler && pThisFrame->HasChildWindow(FID_INPUTLINE_STATUS) ) { - // eigentlich nur beim Reload (letzte Version) noetig: - // Das InputWindow bleibt stehen, aber die View mitsamt InputHandler wird - // neu angelegt, darum muss der InputHandler am InputWindow gesetzt werden. + // eigentlich nur beim Reload (letzte Version) noetig: + // Das InputWindow bleibt stehen, aber die View mitsamt InputHandler wird + // neu angelegt, darum muss der InputHandler am InputWindow gesetzt werden. SfxChildWindow* pChild = pThisFrame->GetChildWindow(FID_INPUTLINE_STATUS); if (pChild) { @@ -197,7 +197,7 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI) pHdl->SetRefScale( GetViewData()->GetZoomX(), GetViewData()->GetZoomY() ); } - // Aenderungs-Dialog aktualisieren + // Aenderungs-Dialog aktualisieren if ( pThisFrame->HasChildWindow(FID_CHG_ACCEPT) ) { @@ -220,19 +220,19 @@ void __EXPORT ScTabViewShell::Activate(BOOL bMDI) } } - // don't call CheckSelectionTransfer here - activating a view should not change the - // primary selection (may be happening just because the mouse was moved over the window) + // don't call CheckSelectionTransfer here - activating a view should not change the + // primary selection (may be happening just because the mouse was moved over the window) - // Wenn Referenzeingabe-Tip-Hilfe hier wieder angezeigt werden soll (ShowRefTip), - // muss sie beim Verschieben der View angepasst werden (gibt sonst Probleme unter OS/2 - // beim Umschalten zwischen Dokumenten) + // Wenn Referenzeingabe-Tip-Hilfe hier wieder angezeigt werden soll (ShowRefTip), + // muss sie beim Verschieben der View angepasst werden (gibt sonst Probleme unter OS/2 + // beim Umschalten zwischen Dokumenten) } void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI) { HideTip(); - ScDocument* pDoc=GetViewData()->GetDocument(); + ScDocument* pDoc=GetViewData()->GetDocument(); ScChangeTrack* pChanges=pDoc->GetChangeTrack(); @@ -248,8 +248,8 @@ void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI) if( bMDI ) { - // #85421# during shell deactivation, shells must not be switched, or the loop - // through the shell stack (in SfxDispatcher::DoDeactivate_Impl) will not work + // #85421# during shell deactivation, shells must not be switched, or the loop + // through the shell stack (in SfxDispatcher::DoDeactivate_Impl) will not work BOOL bOldDontSwitch = bDontSwitch; bDontSwitch = TRUE; @@ -269,10 +269,10 @@ void __EXPORT ScTabViewShell::Deactivate(BOOL bMDI) } else { - HideNoteMarker(); // Notiz-Anzeige + HideNoteMarker(); // Notiz-Anzeige if ( pHdl ) - pHdl->HideTip(); // Formel-AutoEingabe-Tip abschalten + pHdl->HideTip(); // Formel-AutoEingabe-Tip abschalten } } @@ -323,10 +323,10 @@ Size __EXPORT ScTabViewShell::GetOptimalSizePixel() const { Size aOptSize; - SCTAB nCurTab = GetViewData()->GetTabNo(); - ScDocument* pDoc = GetViewData()->GetDocument(); - ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); - SfxStyleSheetBase* pStyleSheet = pStylePool->Find( + SCTAB nCurTab = GetViewData()->GetTabNo(); + ScDocument* pDoc = GetViewData()->GetDocument(); + ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); + SfxStyleSheetBase* pStyleSheet = pStylePool->Find( pDoc->GetPageStyle( nCurTab ), SFX_STYLE_FAMILY_PAGE ); @@ -334,9 +334,9 @@ Size __EXPORT ScTabViewShell::GetOptimalSizePixel() const if ( pStyleSheet ) { - const SfxItemSet& rSet = pStyleSheet->GetItemSet(); - const SvxSizeItem& rItem = (const SvxSizeItem&)rSet.Get( ATTR_PAGE_SIZE ); - const Size& rPageSize = rItem.GetSize(); + const SfxItemSet& rSet = pStyleSheet->GetItemSet(); + const SvxSizeItem& rItem = (const SvxSizeItem&)rSet.Get( ATTR_PAGE_SIZE ); + const Size& rPageSize = rItem.GetSize(); aOptSize.Width() = (long) (rPageSize.Width() * GetViewData()->GetPPTX()); aOptSize.Height() = (long) (rPageSize.Height() * GetViewData()->GetPPTY()); @@ -347,8 +347,8 @@ Size __EXPORT ScTabViewShell::GetOptimalSizePixel() const //------------------------------------------------------------------ -// Zoom fuer In-Place berechnen -// aus Verhaeltnis von VisArea und Fenstergroesse des GridWin +// Zoom fuer In-Place berechnen +// aus Verhaeltnis von VisArea und Fenstergroesse des GridWin void ScTabViewShell::UpdateOleZoom() { @@ -408,11 +408,11 @@ void __EXPORT ScTabViewShell::InnerResizePixel( const Point &rOfs, const Size &r aNewSize.Height() += aBorder.Top() + aBorder.Bottom(); } - DoResize( rOfs, aNewSize, TRUE ); // rSize = Groesse von gridwin + DoResize( rOfs, aNewSize, TRUE ); // rSize = Groesse von gridwin - UpdateOleZoom(); // Zoom fuer In-Place berechnen + UpdateOleZoom(); // Zoom fuer In-Place berechnen -// GetViewData()->GetDocShell()->UpdateOle( GetViewData() ); +// GetViewData()->GetDocShell()->UpdateOle( GetViewData() ); GetViewData()->GetDocShell()->SetDocumentModified(); } @@ -422,7 +422,7 @@ void __EXPORT ScTabViewShell::OuterResizePixel( const Point &rOfs, const Size &r GetBorderSize( aBorder, rSize ); SetBorderPixel( aBorder ); - DoResize( rOfs, rSize ); // Position und Groesse von tabview wie uebergeben + DoResize( rOfs, rSize ); // Position und Groesse von tabview wie uebergeben // ForceMove als Ersatz fuer den Sfx-Move-Mechanismus // (aWinPos muss aktuell gehalten werden, damit ForceMove beim Ole-Deaktivieren klappt) @@ -432,7 +432,7 @@ void __EXPORT ScTabViewShell::OuterResizePixel( const Point &rOfs, const Size &r void __EXPORT ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fraction &rZoomY ) { - // fuer OLE... + // fuer OLE... Fraction aFrac20( 1,5 ); Fraction aFrac400( 4,1 ); @@ -460,7 +460,7 @@ void __EXPORT ScTabViewShell::SetZoomFactor( const Fraction &rZoomX, const Fract void __EXPORT ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const { - // auf ganze Zellen anpassen (in 1/100 mm) + // auf ganze Zellen anpassen (in 1/100 mm) Size aPixelSize = rRect.GetSize(); Window* pWin = ((ScTabViewShell*)this)->GetActiveWin(); @@ -504,7 +504,7 @@ void __EXPORT ScTabViewShell::Move() void __EXPORT ScTabViewShell::ShowCursor(bool /* bOn */) { -/*!!! ShowCursor wird nicht paarweise wie im gridwin gerufen. +/*!!! ShowCursor wird nicht paarweise wie im gridwin gerufen. Der CursorLockCount am Gridwin muss hier direkt auf 0 gesetzt werden if (bOn) @@ -552,10 +552,10 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper Window* pNewWin = GetActiveWin(); if (pNewWin && pNewWin != pOldWin) { - SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? + SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? if (bFocus) pNewWin->GrabFocus(); - WindowChanged(); // Drawing-Layer (z.B. #56771#) + WindowChanged(); // Drawing-Layer (z.B. #56771#) } if (GetViewData()->GetHSplitMode() == SC_SPLIT_FIX || @@ -568,7 +568,7 @@ void ScTabViewShell::DoReadUserDataSequence( const uno::Sequence < beans::Proper TestHintWindow(); - //! if ViewData has more tables than document, remove tables in ViewData + //! if ViewData has more tables than document, remove tables in ViewData } // DoReadUserData is also called from ctor when switching from print preview @@ -587,10 +587,10 @@ void ScTabViewShell::DoReadUserData( const String& rData ) Window* pNewWin = GetActiveWin(); if (pNewWin && pNewWin != pOldWin) { - SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? + SetWindow( pNewWin ); //! ist diese ViewShell immer aktiv??? if (bFocus) pNewWin->GrabFocus(); - WindowChanged(); // Drawing-Layer (z.B. #56771#) + WindowChanged(); // Drawing-Layer (z.B. #56771#) } if (GetViewData()->GetHSplitMode() == SC_SPLIT_FIX || @@ -603,7 +603,7 @@ void ScTabViewShell::DoReadUserData( const String& rData ) TestHintWindow(); - //! if ViewData has more tables than document, remove tables in ViewData + //! if ViewData has more tables than document, remove tables in ViewData } //------------------------------------------------------------------ @@ -671,12 +671,12 @@ void ScTabViewShell::SetDrawShell( BOOL bActive ) if ( !bActive ) { - ResetDrawDragMode(); // Mirror / Rotate aus + ResetDrawDragMode(); // Mirror / Rotate aus if (bWasDraw && (GetViewData()->GetHSplitMode() == SC_SPLIT_FIX || GetViewData()->GetVSplitMode() == SC_SPLIT_FIX)) { - // Aktiven Teil an Cursor anpassen, etc. + // Aktiven Teil an Cursor anpassen, etc. MoveCursorAbs( GetViewData()->GetCurX(), GetViewData()->GetCurY(), SC_FOLLOW_NONE, FALSE, FALSE, TRUE ); } @@ -705,8 +705,8 @@ void ScTabViewShell::SetPivotShell( BOOL bActive ) { bActivePivotSh = bActive; - // #68771# #76198# SetPivotShell is called from CursorPosChanged every time - // -> don't change anything except switching between cell and pivot shell + // #68771# #76198# SetPivotShell is called from CursorPosChanged every time + // -> don't change anything except switching between cell and pivot shell if ( eCurOST == OST_Pivot || eCurOST == OST_Cell ) { @@ -801,10 +801,10 @@ void ScTabViewShell::SetEditShell(EditView* pView, BOOL bActive ) bActiveEditSh = bActive; } -void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) +void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) { - ScViewData* pViewData = GetViewData(); - ScDocShell* pDocSh = pViewData->GetDocShell(); + ScViewData* pViewData = GetViewData(); + ScDocShell* pDocSh = pViewData->GetDocShell(); if(bDontSwitch) return; @@ -835,14 +835,14 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) switch(eOST) { - case OST_Cell: + case OST_Cell: { AddSubShell(*pCellShell); if(bPgBrk) AddSubShell(*pPageBreakShell); bCellBrush = TRUE; } break; - case OST_Editing: + case OST_Editing: { AddSubShell(*pCellShell); if(bPgBrk) AddSubShell(*pPageBreakShell); @@ -853,7 +853,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } } break; - case OST_DrawText: + case OST_DrawText: { if ( !pDrawTextShell ) { @@ -863,7 +863,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) AddSubShell(*pDrawTextShell); } break; - case OST_Drawing: + case OST_Drawing: { if (svx::checkForSelectedCustomShapes( GetScDrawView(), true /* bOnlyExtruded */ )) { @@ -890,7 +890,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; - case OST_DrawForm: + case OST_DrawForm: { if ( !pDrawFormShell ) { @@ -903,7 +903,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; - case OST_Chart: + case OST_Chart: { if ( !pChartShell ) { @@ -916,7 +916,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; - case OST_OleObject: + case OST_OleObject: { if ( !pOleObjectShell ) { @@ -929,7 +929,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; - case OST_Graphic: + case OST_Graphic: { if ( !pGraphicShell) { @@ -942,7 +942,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; - case OST_Media: + case OST_Media: { if ( !pMediaShell) { @@ -954,7 +954,7 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) } break; - case OST_Pivot: + case OST_Pivot: { AddSubShell(*pCellShell); if(bPgBrk) AddSubShell(*pPageBreakShell); @@ -968,14 +968,14 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, BOOL bForce) bCellBrush = TRUE; } break; - case OST_Auditing: + case OST_Auditing: { AddSubShell(*pCellShell); if(bPgBrk) AddSubShell(*pPageBreakShell); if ( !pAuditingShell ) { - pDocSh->MakeDrawLayer(); // die Wartezeit lieber jetzt als beim Klick + pDocSh->MakeDrawLayer(); // die Wartezeit lieber jetzt als beim Klick pAuditingShell = new ScAuditingShell( GetViewData() ); pAuditingShell->SetRepeatTarget( &aTarget ); @@ -1024,12 +1024,12 @@ ObjectSelectionType ScTabViewShell::GetCurObjectSelectionType() return eCurOST; } -// GetMySubShell / SetMySubShell: altes Verhalten simulieren, -// dass es nur eine SubShell gibt (nur innerhalb der 5 eignenen SubShells) +// GetMySubShell / SetMySubShell: altes Verhalten simulieren, +// dass es nur eine SubShell gibt (nur innerhalb der 5 eignenen SubShells) SfxShell* ScTabViewShell::GetMySubShell() const { - // GetSubShell() war frueher const, und GetSubShell(USHORT) sollte es auch sein... + // GetSubShell() war frueher const, und GetSubShell(USHORT) sollte es auch sein... USHORT nPos = 0; SfxShell* pSub = ((ScTabViewShell*)this)->GetSubShell(nPos); @@ -1037,13 +1037,13 @@ SfxShell* ScTabViewShell::GetMySubShell() const { if ( pSub == pDrawShell || pSub == pDrawTextShell || pSub == pEditShell || pSub == pPivotShell || pSub == pAuditingShell || pSub == pDrawFormShell || - pSub == pCellShell || pSub == pOleObjectShell|| pSub == pChartShell || + pSub == pCellShell || pSub == pOleObjectShell|| pSub == pChartShell || pSub == pGraphicShell || pSub == pMediaShell || pSub == pPageBreakShell) - return pSub; // gefunden + return pSub; // gefunden pSub = ((ScTabViewShell*)this)->GetSubShell(++nPos); } - return NULL; // keine von meinen dabei + return NULL; // keine von meinen dabei } @@ -1090,7 +1090,7 @@ ScTabViewShell* ScTabViewShell::GetActiveViewShell() SfxPrinter* __EXPORT ScTabViewShell::GetPrinter( BOOL bCreate ) { - // Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt) + // Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt) return GetViewData()->GetDocShell()->GetPrinter(bCreate); } @@ -1101,16 +1101,16 @@ USHORT __EXPORT ScTabViewShell::SetPrinter( SfxPrinter *pNewPrinter, USHORT nDif PrintDialog* __EXPORT ScTabViewShell::CreatePrintDialog( Window *pParent ) { - ScDocShell* pDocShell = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocShell->GetDocument(); + ScDocShell* pDocShell = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocShell->GetDocument(); - pDoc->SetPrintOptions(); // Optionen aus OFA am Printer setzen + pDoc->SetPrintOptions(); // Optionen aus OFA am Printer setzen SfxPrinter* pPrinter = GetPrinter(); - String aStrRange; + String aStrRange; PrintDialog* pDlg = new PrintDialog( pParent, true ); - SCTAB nTabCount = pDoc->GetTableCount(); - long nDocPageMax = 0; + SCTAB nTabCount = pDoc->GetTableCount(); + long nDocPageMax = 0; pDlg->EnableSheetRange( true, PRINTSHEETS_ALL ); pDlg->EnableSheetRange( true, PRINTSHEETS_SELECTED_SHEETS ); @@ -1143,14 +1143,14 @@ PrintDialog* __EXPORT ScTabViewShell::CreatePrintDialog( Window *pParent ) } } - pDlg->SetRangeText ( aStrRange ); - pDlg->EnableRange ( PRINTDIALOG_ALL ); - pDlg->EnableRange ( PRINTDIALOG_RANGE ); - pDlg->SetFirstPage ( 1 ); - pDlg->SetMinPage ( 1 ); - pDlg->SetLastPage ( (USHORT)nDocPageMax ); - pDlg->SetMaxPage ( (USHORT)nDocPageMax ); - pDlg->EnableCollate (); + pDlg->SetRangeText ( aStrRange ); + pDlg->EnableRange ( PRINTDIALOG_ALL ); + pDlg->EnableRange ( PRINTDIALOG_RANGE ); + pDlg->SetFirstPage ( 1 ); + pDlg->SetMinPage ( 1 ); + pDlg->SetLastPage ( (USHORT)nDocPageMax ); + pDlg->SetMaxPage ( (USHORT)nDocPageMax ); + pDlg->EnableCollate (); return pDlg; } @@ -1159,7 +1159,7 @@ SfxTabPage* ScTabViewShell::CreatePrintOptionsPage( Window *pParent, const SfxIt { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); - ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); + ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc( RID_SCPAGE_PRINT ); if ( ScTpPrintOptionsCreate ) return (*ScTpPrintOptionsCreate)( pParent, rOptions); return 0; @@ -1176,8 +1176,8 @@ void __EXPORT ScTabViewShell::PreparePrint( PrintDialog* pPrintDialog ) ErrCode ScTabViewShell::DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ) { - // #72527# if SID_PRINTDOCDIRECT is executed and there's a selection, - // ask if only the selection should be printed + // #72527# if SID_PRINTDOCDIRECT is executed and there's a selection, + // ask if only the selection should be printed const ScMarkData& rMarkData = GetViewData()->GetMarkData(); if ( !pPrintDialog && !bSilent && !bIsAPI && ( rMarkData.IsMarked() || rMarkData.IsMultiMarked() ) ) @@ -1229,7 +1229,7 @@ USHORT __EXPORT ScTabViewShell::Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog ) { ScDocShell* pDocShell = GetViewData()->GetDocShell(); - pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen + pDocShell->GetDocument()->SetPrintOptions(); // Optionen aus OFA am Printer setzen SfxViewShell::Print( rProgress, bIsAPI, pPrintDialog ); pDocShell->Print( rProgress, pPrintDialog, &GetViewData()->GetMarkData(), @@ -1347,7 +1347,7 @@ void ScTabViewShell::StopSimpleRefDialog() { Window* pWin = pWnd->GetWindow(); if (pWin && pWin->IsSystemWindow()) - ((SystemWindow*)pWin)->Close(); // calls abort handler + ((SystemWindow*)pWin)->Close(); // calls abort handler } } @@ -1364,14 +1364,14 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) KeyCode aCode = rKEvt.GetKeyCode(); BOOL bShift = aCode.IsShift(); BOOL bControl = aCode.IsMod1(); - BOOL bAlt = aCode.IsMod2(); - USHORT nCode = aCode.GetCode(); - BOOL bUsed = FALSE; - BOOL bInPlace = pScMod->IsEditMode(); // Editengine bekommt alles - BOOL bAnyEdit = pScMod->IsInputMode(); // nur Zeichen & Backspace - BOOL bDraw = IsDrawTextEdit(); + BOOL bAlt = aCode.IsMod2(); + USHORT nCode = aCode.GetCode(); + BOOL bUsed = FALSE; + BOOL bInPlace = pScMod->IsEditMode(); // Editengine bekommt alles + BOOL bAnyEdit = pScMod->IsInputMode(); // nur Zeichen & Backspace + BOOL bDraw = IsDrawTextEdit(); - HideNoteMarker(); // Notiz-Anzeige + HideNoteMarker(); // Notiz-Anzeige // don't do extra HideCursor/ShowCursor calls if EnterHandler will switch to a different sheet BOOL bOnRefSheet = ( GetViewData()->GetRefTabNo() == GetViewData()->GetTabNo() ); @@ -1382,11 +1382,11 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) ScDocument* pDoc = GetViewData()->GetDocument(); if ( pDoc ) - pDoc->KeyInput( rKEvt ); // TimerDelays etc. + pDoc->KeyInput( rKEvt ); // TimerDelays etc. if( bInPlace ) { - bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe + bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe if( !bUsed ) bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt )); // accelerators } @@ -1404,39 +1404,39 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) switch ( nCode ) { case KEY_RETURN: - bIsType = bControl && !bAlt; // Control, Shift-Control-Return + bIsType = bControl && !bAlt; // Control, Shift-Control-Return if ( !bIsType && nModi == 0 ) { - // Will der InputHandler auch ein einfaches Return? + // Will der InputHandler auch ein einfaches Return? ScInputHandler* pHdl = pScMod->GetInputHdl(this); bIsType = pHdl && pHdl->TakesReturn(); } break; case KEY_SPACE: - bIsType = !bControl && !bAlt; // ohne Modifier oder Shift-Space + bIsType = !bControl && !bAlt; // ohne Modifier oder Shift-Space break; case KEY_ESCAPE: case KEY_BACKSPACE: - bIsType = (nModi == 0); // nur ohne Modifier + bIsType = (nModi == 0); // nur ohne Modifier break; default: bIsType = TRUE; } if( bIsType ) - bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe + bUsed = pScMod->InputKeyEvent( rKEvt ); // Eingabe if( !bUsed ) bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt )); // accelerators - if ( !bUsed && !bIsType && nCode != KEY_RETURN ) // Eingabe nochmal hinterher + if ( !bUsed && !bIsType && nCode != KEY_RETURN ) // Eingabe nochmal hinterher bUsed = pScMod->InputKeyEvent( rKEvt ); } else { - // #51889# Spezialfall: Copy/Cut bei Mehrfachselektion -> Fehlermeldung - // (Slot ist disabled, SfxViewShell::KeyInput wuerde also kommentarlos verschluckt) + // #51889# Spezialfall: Copy/Cut bei Mehrfachselektion -> Fehlermeldung + // (Slot ist disabled, SfxViewShell::KeyInput wuerde also kommentarlos verschluckt) KeyFuncType eFunc = aCode.GetFunction(); if ( eFunc == KEYFUNC_CUT ) { @@ -1452,14 +1452,14 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) if (!bUsed) bUsed = sal::static_int_cast<BOOL>(SfxViewShell::KeyInput( rKEvt )); // accelerators - // #74696# during inplace editing, some slots are handled by the - // container app and are executed during Window::KeyInput. - // -> don't pass keys to input handler that would be used there - // but should call slots instead. + // #74696# during inplace editing, some slots are handled by the + // container app and are executed during Window::KeyInput. + // -> don't pass keys to input handler that would be used there + // but should call slots instead. BOOL bParent = ( GetViewFrame()->GetFrame().IsInPlace() && eFunc != KEYFUNC_DONTKNOW ); if( !bUsed && !bDraw && nCode != KEY_RETURN && !bParent ) - bUsed = pScMod->InputKeyEvent( rKEvt, TRUE ); // Eingabe + bUsed = pScMod->InputKeyEvent( rKEvt, TRUE ); // Eingabe } if (!bInPlace && !bUsed && !bDraw) @@ -1471,7 +1471,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) BOOL bNormal = !bControl && !bAlt; if ( !bAnyEdit && bNormal ) { - // je nach Optionen mit Enter in den Edit-Modus schalten + // je nach Optionen mit Enter in den Edit-Modus schalten const ScInputOptions& rOpt = pScMod->GetInputOptions(); if ( rOpt.GetEnterEdit() ) @@ -1481,7 +1481,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) } } - BOOL bEditReturn = bControl && !bShift; // An Edit-Engine weiter + BOOL bEditReturn = bControl && !bShift; // An Edit-Engine weiter if ( !bUsed && !bEditReturn ) { if ( bOnRefSheet ) @@ -1509,9 +1509,9 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) if ( bOnRefSheet ) ShowAllCursors(); - // hier kein UpdateInputHandler, weil bei Referenzeingabe auf ein - // anderes Dokument diese ViewShell nicht die ist, auf der eingegeben - // wird! + // hier kein UpdateInputHandler, weil bei Referenzeingabe auf ein + // anderes Dokument diese ViewShell nicht die ist, auf der eingegeben + // wird! bUsed = TRUE; } @@ -1520,7 +1520,7 @@ BOOL ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) } } - // Alt-Cursortasten hart codiert, weil Alt nicht konfigurierbar ist + // Alt-Cursortasten hart codiert, weil Alt nicht konfigurierbar ist if ( !bUsed && bAlt && !bControl ) { @@ -1570,55 +1570,55 @@ BOOL ScTabViewShell::SfxKeyInput(const KeyEvent& rKeyEvent) bool __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) { -// return SfxViewShell::KeyInput( rKeyEvent ); +// return SfxViewShell::KeyInput( rKeyEvent ); return TabKeyInput( rKeyEvent ); } //------------------------------------------------------------------ #define __INIT_ScTabViewShell \ - eCurOST(OST_NONE), \ - nDrawSfxId(0), \ - nCtrlSfxId(USHRT_MAX), \ - nFormSfxId(USHRT_MAX), \ - pDrawShell(NULL), \ - pDrawTextShell(NULL), \ - pEditShell(NULL), \ - pPivotShell(NULL), \ - pAuditingShell(NULL), \ - pDrawFormShell(NULL), \ - pCellShell(NULL), \ - pOleObjectShell(NULL), \ - pChartShell(NULL), \ - pGraphicShell(NULL), \ - pMediaShell(NULL), \ - pPageBreakShell(NULL), \ - pExtrusionBarShell(NULL), \ - pFontworkBarShell(NULL), \ - pFormShell(NULL), \ - pInputHandler(NULL), \ - pCurFrameLine(NULL), \ - aTarget( this ), \ - pDialogDPObject(NULL), \ + eCurOST(OST_NONE), \ + nDrawSfxId(0), \ + nCtrlSfxId(USHRT_MAX), \ + nFormSfxId(USHRT_MAX), \ + pDrawShell(NULL), \ + pDrawTextShell(NULL), \ + pEditShell(NULL), \ + pPivotShell(NULL), \ + pAuditingShell(NULL), \ + pDrawFormShell(NULL), \ + pCellShell(NULL), \ + pOleObjectShell(NULL), \ + pChartShell(NULL), \ + pGraphicShell(NULL), \ + pMediaShell(NULL), \ + pPageBreakShell(NULL), \ + pExtrusionBarShell(NULL), \ + pFontworkBarShell(NULL), \ + pFormShell(NULL), \ + pInputHandler(NULL), \ + pCurFrameLine(NULL), \ + aTarget( this ), \ + pDialogDPObject(NULL), \ pNavSettings(NULL), \ - bActiveDrawSh(FALSE), \ - bActiveDrawTextSh(FALSE), \ - bActivePivotSh(FALSE), \ - bActiveAuditingSh(FALSE), \ - bActiveDrawFormSh(FALSE), \ - bActiveOleObjectSh(FALSE), \ - bActiveChartSh(FALSE), \ - bActiveGraphicSh(FALSE), \ - bActiveMediaSh(FALSE), \ + bActiveDrawSh(FALSE), \ + bActiveDrawTextSh(FALSE), \ + bActivePivotSh(FALSE), \ + bActiveAuditingSh(FALSE), \ + bActiveDrawFormSh(FALSE), \ + bActiveOleObjectSh(FALSE), \ + bActiveChartSh(FALSE), \ + bActiveGraphicSh(FALSE), \ + bActiveMediaSh(FALSE), \ bActiveEditSh(FALSE), \ bFormShellAtTop(FALSE), \ - bDontSwitch(FALSE), \ - bInFormatDialog(FALSE), \ - bPrintSelected(FALSE), \ - bReadOnly(FALSE), \ - pScSbxObject(NULL), \ - /*bChartDlgIsEdit(FALSE),*/ \ - bChartAreaValid(FALSE), \ + bDontSwitch(FALSE), \ + bInFormatDialog(FALSE), \ + bPrintSelected(FALSE), \ + bReadOnly(FALSE), \ + pScSbxObject(NULL), \ + /*bChartDlgIsEdit(FALSE),*/ \ + bChartAreaValid(FALSE), \ nCurRefDlgId(0), \ pAccessibilityBroadcaster(NULL) @@ -1633,14 +1633,14 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) bReadOnly = pDocSh->IsReadOnly(); - SetName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("View")) ); // fuer SBX + SetName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("View")) ); // fuer SBX Color aColBlack( COL_BLACK ); -// SetPool( &pSfxApp->GetPool() ); +// SetPool( &pSfxApp->GetPool() ); SetPool( &SC_MOD()->GetPool() ); SetWindow( GetActiveWin() ); - pCurFrameLine = new SvxBorderLine( &aColBlack, 20, 0, 0 ); - pPivotSource = new ScArea; + pCurFrameLine = new SvxBorderLine( &aColBlack, 20, 0, 0 ); + pPivotSource = new ScArea; StartListening(*GetViewData()->GetDocShell(),TRUE); StartListening(*GetViewFrame(),TRUE); StartListening(*pSfxApp,TRUE); // #i62045# #i62046# application is needed for Calc's own hints @@ -1667,46 +1667,46 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) if ( GetViewFrame()->GetFrame().IsInPlace() ) // inplace { - pDocSh->SetInplace( TRUE ); // schon so initialisiert + pDocSh->SetInplace( TRUE ); // schon so initialisiert if (pDoc->IsEmbedded()) - pDoc->ResetEmbedded(); // keine blaue Markierung + pDoc->ResetEmbedded(); // keine blaue Markierung } else if ( bFirstView ) { pDocSh->SetInplace( FALSE ); GetViewData()->RefreshZoom(); // recalculate PPT if (!pDoc->IsEmbedded()) - pDoc->SetEmbedded( aVisArea ); // VisArea markieren + pDoc->SetEmbedded( aVisArea ); // VisArea markieren } } // ViewInputHandler - // #48721# jeder Task hat neuerdings sein eigenes InputWindow, - // darum muesste eigentlich entweder jeder Task seinen InputHandler bekommen, - // oder das InputWindow muesste sich beim App-InputHandler anmelden, wenn der - // Task aktiv wird, oder das InputWindow muesste sich den InputHandler selbst - // anlegen (dann immer ueber das InputWindow suchen, und nur wenn das nicht da - // ist, den InputHandler von der App nehmen). - // Als Sofortloesung bekommt erstmal jede View ihren Inputhandler, das gibt - // nur noch Probleme, wenn zwei Views in einem Task-Fenster sind. + // #48721# jeder Task hat neuerdings sein eigenes InputWindow, + // darum muesste eigentlich entweder jeder Task seinen InputHandler bekommen, + // oder das InputWindow muesste sich beim App-InputHandler anmelden, wenn der + // Task aktiv wird, oder das InputWindow muesste sich den InputHandler selbst + // anlegen (dann immer ueber das InputWindow suchen, und nur wenn das nicht da + // ist, den InputHandler von der App nehmen). + // Als Sofortloesung bekommt erstmal jede View ihren Inputhandler, das gibt + // nur noch Probleme, wenn zwei Views in einem Task-Fenster sind. pInputHandler = new ScInputHandler; // Alte Version: - // if ( !GetViewFrame()->ISA(SfxTopViewFrame) ) // OLE oder Plug-In - // pInputHandler = new ScInputHandler; + // if ( !GetViewFrame()->ISA(SfxTopViewFrame) ) // OLE oder Plug-In + // pInputHandler = new ScInputHandler; - // FormShell vor MakeDrawView anlegen, damit die DrawView auf jeden Fall - // an der FormShell angemeldet werden kann - // Gepusht wird die FormShell im ersten Activate + // FormShell vor MakeDrawView anlegen, damit die DrawView auf jeden Fall + // an der FormShell angemeldet werden kann + // Gepusht wird die FormShell im ersten Activate pFormShell = new FmFormShell(this); pFormShell->SetControlActivationHandler( LINK( this, ScTabViewShell, FormControlActivated ) ); - // DrawView darf nicht im TabView - ctor angelegt werden, - // wenn die ViewShell noch nicht kostruiert ist... + // DrawView darf nicht im TabView - ctor angelegt werden, + // wenn die ViewShell noch nicht kostruiert ist... if (pDoc->GetDrawLayer()) MakeDrawView( nForceDesignMode ); - ViewOptionsHasChanged(FALSE); // legt auch evtl. DrawView an + ViewOptionsHasChanged(FALSE); // legt auch evtl. DrawView an SfxUndoManager* pMgr = pDocSh->GetUndoManager(); SetUndoManager( pMgr ); @@ -1719,9 +1719,9 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) pFormShell->SetRepeatTarget( &aTarget ); SetHelpId( HID_SCSHELL_TABVWSH ); - if ( bFirstView ) // first view? + if ( bFirstView ) // first view? { - pDoc->SetDocVisible( TRUE ); // used when creating new sheets + pDoc->SetDocVisible( TRUE ); // used when creating new sheets if ( pDocSh->IsEmpty() ) { // set first sheet's RTL flag (following will already be initialized because of SetDocVisible) @@ -1730,7 +1730,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) // append additional sheets (not for OLE object) if ( pDocSh->GetCreateMode() != SFX_CREATE_MODE_EMBEDDED ) { - SCTAB nInitTabCount = 3; //! konfigurierbar !!! + SCTAB nInitTabCount = 3; //! konfigurierbar !!! // Get the customized initial tab count, we only can set the count by VBA API currently. const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions(); SCTAB nNewTabCount = rAppOpt.GetTabCountInNewSpreadsheet(); @@ -1747,7 +1747,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) // ReadExtOptions is now in Activate - // Link-Update nicht verschachteln + // Link-Update nicht verschachteln if ( pDocSh->GetCreateMode() != SFX_CREATE_MODE_INTERNAL && pDocSh->IsUpdateEnabled() ) // #105575#; update only in the first creation of the ViewShell { @@ -1776,7 +1776,7 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) } } - BOOL bReImport = FALSE; // importierte Daten aktualisieren + BOOL bReImport = FALSE; // importierte Daten aktualisieren ScDBCollection* pDBColl = pDoc->GetDBCollection(); if ( pDBColl ) { @@ -1833,13 +1833,13 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, { RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScTabViewShell::ScTabViewShell" ); - const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions(); + const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions(); - // if switching back from print preview, - // restore the view settings that were active when creating the preview - // #89897# ReadUserData must not happen from ctor, because the view's edit window - // has to be shown by the sfx. ReadUserData is deferred until the first Activate call. - // #106334# old DesignMode state from form layer must be restored, too + // if switching back from print preview, + // restore the view settings that were active when creating the preview + // #89897# ReadUserData must not happen from ctor, because the view's edit window + // has to be shown by the sfx. ReadUserData is deferred until the first Activate call. + // #106334# old DesignMode state from form layer must be restored, too BYTE nForceDesignMode = SC_FORCEMODE_NONE; if ( pOldSh && pOldSh->ISA( ScPreviewShell ) ) @@ -1852,7 +1852,7 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, if ( GetViewData()->GetDocShell()->IsPreview() ) { - // preview for template dialog: always show whole page + // preview for template dialog: always show whole page SetZoomType( SVX_ZOOM_WHOLEPAGE, TRUE ); // zoom value is recalculated at next Resize } else @@ -1890,11 +1890,11 @@ __EXPORT ScTabViewShell::~ScTabViewShell() SC_MOD()->ViewShellGone(this); - RemoveSubShell(); // alle + RemoveSubShell(); // alle SetWindow(0); - // #54104# alles auf NULL, falls aus dem TabView-dtor noch darauf zugegriffen wird - //! (soll eigentlich nicht !??!?!) + // #54104# alles auf NULL, falls aus dem TabView-dtor noch darauf zugegriffen wird + //! (soll eigentlich nicht !??!?!) DELETEZ(pFontworkBarShell); DELETEZ(pExtrusionBarShell); @@ -1940,34 +1940,34 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) SCTAB nTab = GetViewData()->GetTabNo(); pDoc->GetName( nTab, rData.aTabName ); - rData.aTitle = pDocShell->GetTitle(); + rData.aTitle = pDocShell->GetTitle(); const INetURLObject& rURLObj = pDocShell->GetMedium()->GetURLObject(); - rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); + rData.aLongDocName = rURLObj.GetMainURL( INetURLObject::DECODE_UNAMBIGUOUS ); if ( rData.aLongDocName.Len() ) rData.aShortDocName = rURLObj.GetName( INetURLObject::DECODE_UNAMBIGUOUS ); else rData.aShortDocName = rData.aLongDocName = rData.aTitle; - rData.nPageNo = 1; - rData.nTotalPages = 99; + rData.nPageNo = 1; + rData.nTotalPages = 99; - // eNumType kennt der Dialog selber + // eNumType kennt der Dialog selber } //------------------------------------------------------------------ void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest ) { - bChartAreaValid = TRUE; - aChartSource = rSource; - aChartPos = rDest; - nChartDestTab = GetViewData()->GetTabNo(); + bChartAreaValid = TRUE; + aChartSource = rSource; + aChartPos = rDest; + nChartDestTab = GetViewData()->GetTabNo(); } BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const { - rSource = aChartSource; - rDest = aChartPos; - rTab = nChartDestTab; + rSource = aChartSource; + rDest = aChartPos; + rTab = nChartDestTab; return bChartAreaValid; } @@ -2014,7 +2014,7 @@ void ScTabViewShell::GetTbxState( SfxItemSet& rSet ) rSet.Put( SfxUInt16Item( SID_TBXCTL_INSERT, nInsertCtrlState ) ); rSet.Put( SfxUInt16Item( SID_TBXCTL_INSCELLS, nInsCellsCtrlState ) ); - // ohne installiertes Chart darf Chart nicht Default sein... + // ohne installiertes Chart darf Chart nicht Default sein... if ( nInsObjCtrlState == SID_DRAW_CHART && !SvtModuleOptions().IsChart() ) nInsObjCtrlState = SID_INSERT_OBJECT; diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index c6cb9d5cfb37..920a6e3ee18b 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,7 +59,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { - if (rHint.ISA(SfxSimpleHint)) // ohne Parameter + if (rHint.ISA(SfxSimpleHint)) // ohne Parameter { ULONG nSlot = ((SfxSimpleHint&)rHint).GetId(); switch ( nSlot ) @@ -77,7 +77,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint { GetSelEngine()->Reset(); GetFunctionSet()->SetAnchorFlag(TRUE); - // AnchorFlag, damit gleich mit Control angehaengt werden kann + // AnchorFlag, damit gleich mit Control angehaengt werden kann } } break; @@ -104,25 +104,25 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint case SC_HINT_DOC_SAVED: { - // beim "Save as" kann ein vorher schreibgeschuetztes Dokument - // bearbeitbar werden, deshalb die Layer-Locks neu (#39884#) - // (Invalidate etc. passiert schon vom Sfx her) - // #42091# bei SID_EDITDOC kommt kein SFX_HINT_TITLECHANGED, darum - // der eigene Hint aus DoSaveCompleted - //! was ist mit SFX_HINT_SAVECOMPLETED ? + // beim "Save as" kann ein vorher schreibgeschuetztes Dokument + // bearbeitbar werden, deshalb die Layer-Locks neu (#39884#) + // (Invalidate etc. passiert schon vom Sfx her) + // #42091# bei SID_EDITDOC kommt kein SFX_HINT_TITLECHANGED, darum + // der eigene Hint aus DoSaveCompleted + //! was ist mit SFX_HINT_SAVECOMPLETED ? UpdateLayerLocks(); - // #54891# Design-Modus bei jedem Speichern anzupassen, waere zuviel - // (beim Speichern unter gleichem Namen soll er unveraendert bleiben) - // Darum nur bei SFX_HINT_MODECHANGED (vom ViewFrame) + // #54891# Design-Modus bei jedem Speichern anzupassen, waere zuviel + // (beim Speichern unter gleichem Namen soll er unveraendert bleiben) + // Darum nur bei SFX_HINT_MODECHANGED (vom ViewFrame) } break; case SFX_HINT_MODECHANGED: - // #54891#/#58510# Da man sich nicht mehr darauf verlassen kann, woher - // dieser Hint kommt, den Design-Modus immer dann umschalten, wenn der - // ReadOnly-Status sich wirklich geaendert hat: + // #54891#/#58510# Da man sich nicht mehr darauf verlassen kann, woher + // dieser Hint kommt, den Design-Modus immer dann umschalten, wenn der + // ReadOnly-Status sich wirklich geaendert hat: if ( GetViewData()->GetSfxDocShell()->IsReadOnly() != bReadOnly ) { @@ -148,14 +148,14 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint break; } } - else if (rHint.ISA(ScPaintHint)) // neu zeichnen + else if (rHint.ISA(ScPaintHint)) // neu zeichnen { ScPaintHint* pHint = (ScPaintHint*) &rHint; USHORT nParts = pHint->GetParts(); SCTAB nTab = GetViewData()->GetTabNo(); if (pHint->GetStartTab() <= nTab && pHint->GetEndTab() >= nTab) { - if (nParts & PAINT_EXTRAS) // zuerst, falls Tabelle weg ist !!! + if (nParts & PAINT_EXTRAS) // zuerst, falls Tabelle weg ist !!! if (PaintExtras()) nParts = PAINT_ALL; @@ -164,7 +164,7 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint GetViewData()->GetDocShell()->UpdatePendingRowHeights( GetViewData()->GetTabNo() ); if (nParts & PAINT_SIZE) - RepeatResize(); //! InvalidateBorder ??? + RepeatResize(); //! InvalidateBorder ??? if (nParts & PAINT_GRID) PaintArea( pHint->GetStartCol(), pHint->GetStartRow(), pHint->GetEndCol(), pHint->GetEndRow() ); @@ -186,9 +186,9 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint HideNoteMarker(); } } - else if (rHint.ISA(ScEditViewHint)) // Edit-View anlegen + else if (rHint.ISA(ScEditViewHint)) // Edit-View anlegen { - // ScEditViewHint kommt nur an aktiver View an + // ScEditViewHint kommt nur an aktiver View an ScEditViewHint* pHint = (ScEditViewHint*) &rHint; SCTAB nTab = GetViewData()->GetTabNo(); @@ -201,25 +201,25 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint MakeEditView( pHint->GetEngine(), nCol, nRow ); - StopEditShell(); // sollte nicht gesetzt sein + StopEditShell(); // sollte nicht gesetzt sein ScSplitPos eActive = GetViewData()->GetActivePart(); if ( GetViewData()->HasEditView(eActive) ) { - // MakeEditView geht schief, wenn der Cursor ausserhalb des - // Bildschirms steht. GetEditView gibt dann eine nicht aktive - // View zurueck, darum die Abfrage HasEditView. + // MakeEditView geht schief, wenn der Cursor ausserhalb des + // Bildschirms steht. GetEditView gibt dann eine nicht aktive + // View zurueck, darum die Abfrage HasEditView. - EditView* pView = GetViewData()->GetEditView(eActive); // ist nicht 0 + EditView* pView = GetViewData()->GetEditView(eActive); // ist nicht 0 SetEditShell(pView ,TRUE); } } } } - else if (rHint.ISA(ScTablesHint)) // Tabelle eingefuegt / geloescht + else if (rHint.ISA(ScTablesHint)) // Tabelle eingefuegt / geloescht { - // aktuelle Tabelle zuerst holen (kann bei DeleteTab an ViewData geaendert werden) + // aktuelle Tabelle zuerst holen (kann bei DeleteTab an ViewData geaendert werden) SCTAB nActiveTab = GetViewData()->GetTabNo(); const ScTablesHint& rTabHint = (const ScTablesHint&)rHint; @@ -246,43 +246,43 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint DBG_ERROR("unbekannter ScTablesHint"); } - // hier keine Abfrage auf IsActive() mehr, weil die Aktion von Basic ausgehen - // kann und dann auch die aktive View umgeschaltet werden muss. + // hier keine Abfrage auf IsActive() mehr, weil die Aktion von Basic ausgehen + // kann und dann auch die aktive View umgeschaltet werden muss. SCTAB nNewTab = nActiveTab; BOOL bForce = FALSE; switch (nId) { case SC_TAB_INSERTED: - if ( nTab1 <= nNewTab ) // vorher eingefuegt + if ( nTab1 <= nNewTab ) // vorher eingefuegt ++nNewTab; break; case SC_TAB_DELETED: - if ( nTab1 < nNewTab ) // vorher geloescht + if ( nTab1 < nNewTab ) // vorher geloescht --nNewTab; - else if ( nTab1 == nNewTab ) // aktuelle geloescht + else if ( nTab1 == nNewTab ) // aktuelle geloescht bForce = TRUE; break; case SC_TAB_MOVED: - if ( nNewTab == nTab1 ) // verschobene Tabelle + if ( nNewTab == nTab1 ) // verschobene Tabelle nNewTab = nTab2; - else if ( nTab1 < nTab2 ) // nach hinten verschoben + else if ( nTab1 < nTab2 ) // nach hinten verschoben { - if ( nNewTab > nTab1 && nNewTab <= nTab2 ) // nachrueckender Bereich + if ( nNewTab > nTab1 && nNewTab <= nTab2 ) // nachrueckender Bereich --nNewTab; } - else // nach vorne verschoben + else // nach vorne verschoben { - if ( nNewTab >= nTab2 && nNewTab < nTab1 ) // nachrueckender Bereich + if ( nNewTab >= nTab2 && nNewTab < nTab1 ) // nachrueckender Bereich ++nNewTab; } break; case SC_TAB_COPIED: - if ( nNewTab >= nTab2 ) // vorher eingefuegt + if ( nNewTab >= nTab2 ) // vorher eingefuegt ++nNewTab; break; case SC_TAB_HIDDEN: - if ( nTab1 == nNewTab ) // aktuelle ausgeblendet + if ( nTab1 == nNewTab ) // aktuelle ausgeblendet bForce = TRUE; break; } @@ -311,17 +311,17 @@ void __EXPORT ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint //------------------------------------------------------------------ -void ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, - ScViewData* pViewData, +void ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, + ScViewData* pViewData, SvxNumberInfoItem** ppItem ) { //------------------------------ // NumberInfo-Item konstruieren: //------------------------------ - ScBaseCell* pCell = NULL; - SvxNumberValueType eValType = SVX_VALUE_TYPE_UNDEFINED; - double nCellValue = 0; - String aCellString; + ScBaseCell* pCell = NULL; + SvxNumberValueType eValType = SVX_VALUE_TYPE_UNDEFINED; + double nCellValue = 0; + String aCellString; pDoc->GetCell( pViewData->GetCurX(), pViewData->GetCurY(), @@ -404,7 +404,7 @@ void ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, //------------------------------------------------------------------ void ScTabViewShell::UpdateNumberFormatter( - ScDocument* pDoc, + ScDocument* pDoc, const SvxNumberInfoItem& rInfoItem ) { const sal_uInt32 nDelCount = rInfoItem.GetDelCount(); diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx index 2f4ca5c72bab..9ab882efbdba 100644 --- a/sc/source/ui/view/tabvwsh8.cxx +++ b/sc/source/ui/view/tabvwsh8.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,10 +64,10 @@ void ScTabViewShell::SetDefaultFrameLine( const SvxBorderLine* pLine ) BOOL __EXPORT ScTabViewShell::HasSelection( BOOL bText ) const { BOOL bHas = FALSE; - ScViewData* pData = (ScViewData*)GetViewData(); // const weggecasted + ScViewData* pData = (ScViewData*)GetViewData(); // const weggecasted if ( bText ) { - // Text enthalten: Anzahl2 >= 1 + // Text enthalten: Anzahl2 >= 1 ScDocument* pDoc = pData->GetDocument(); ScMarkData& rMark = pData->GetMarkData(); ScAddress aCursor( pData->GetCurX(), pData->GetCurY(), pData->GetTabNo() ); diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 3984465f1f50..e320c5604f99 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,20 +54,20 @@ // forwards -> galwrap.cxx (wg. CLOOKs) -USHORT GallerySGA_FORMAT_GRAPHIC(); -Graphic GalleryGetGraphic (); -BOOL GalleryIsLinkage (); -String GalleryGetFullPath (); -String GalleryGetFilterName (); +USHORT GallerySGA_FORMAT_GRAPHIC(); +Graphic GalleryGetGraphic (); +BOOL GalleryIsLinkage (); +String GalleryGetFullPath (); +String GalleryGetFilterName (); // forwards -> imapwrap.cxx (wg. CLOOKs) class SvxIMapDlg; -USHORT ScIMapChildWindowId(); -SvxIMapDlg* ScGetIMapDlg(); -const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg ); -const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ); +USHORT ScIMapChildWindowId(); +SvxIMapDlg* ScGetIMapDlg(); +const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg ); +const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ); //------------------------------------------------------------------ @@ -84,7 +84,7 @@ void ScTabViewShell::ExecChildWin(SfxRequest& rReq) rReq.Ignore(); } break; - + case SID_AVMEDIA_PLAYER: { SfxViewFrame* pThisFrame = GetViewFrame(); @@ -132,10 +132,10 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq ) MakeDrawLayer(); Graphic aGraphic = GalleryGetGraphic(); - Point aPos = GetInsertPos(); + Point aPos = GetInsertPos(); String aPath, aFilter; - if ( GalleryIsLinkage() ) // als Link einfuegen? + if ( GalleryIsLinkage() ) // als Link einfuegen? { aPath = GalleryGetFullPath(); aFilter = GalleryGetFilterName(); @@ -145,8 +145,8 @@ void ScTabViewShell::ExecGallery( SfxRequest& rReq ) } else if ( nFormats & SGA_FORMAT_SOUND ) { - // #98115# for sounds (linked or not), insert a hyperlink button, - // like in Impress and Writer + // #98115# for sounds (linked or not), insert a hyperlink button, + // like in Impress and Writer GalleryExplorer* pGal = SVX_GALLERY(); if ( pGal ) @@ -191,7 +191,7 @@ void ScTabViewShell::ExecImageMap( SfxRequest& rReq ) if ( pThisFrame->HasChildWindow( nId ) ) { - SvxIMapDlg* pDlg = ScGetIMapDlg(); + SvxIMapDlg* pDlg = ScGetIMapDlg(); if ( pDlg ) { SdrView* pDrView = GetSdrView(); @@ -215,13 +215,13 @@ void ScTabViewShell::ExecImageMap( SfxRequest& rReq ) if ( pMark ) { - SdrObject* pSdrObj = pMark->GetMarkedSdrObj(); - SvxIMapDlg* pDlg = ScGetIMapDlg(); + SdrObject* pSdrObj = pMark->GetMarkedSdrObj(); + SvxIMapDlg* pDlg = ScGetIMapDlg(); if ( ScIMapDlgGetObj(pDlg) == (void*) pSdrObj ) { - const ImageMap& rImageMap = ScIMapDlgGetMap(pDlg); - ScIMapInfo* pIMapInfo = ScDrawLayer::GetIMapInfo( pSdrObj ); + const ImageMap& rImageMap = ScIMapDlgGetMap(pDlg); + ScIMapInfo* pIMapInfo = ScDrawLayer::GetIMapInfo( pSdrObj ); if ( !pIMapInfo ) pSdrObj->InsertUserData( new ScIMapInfo( rImageMap ) ); @@ -246,7 +246,7 @@ void ScTabViewShell::GetImageMapState( SfxItemSet& rSet ) { case SID_IMAP: { - // Disabled wird nicht mehr... + // Disabled wird nicht mehr... BOOL bThere = FALSE; SfxViewFrame* pThisFrame = GetViewFrame(); diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index aaa55a4ad596..0cdce33d3213 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,8 +74,8 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) String aStr; ScSubTotalFunc eFunc = (ScSubTotalFunc) SC_MOD()->GetAppOptions().GetStatusFunc(); - ScViewData* pViewData = GetViewData(); - ScMarkData& rMark = pViewData->GetMarkData(); + ScViewData* pViewData = GetViewData(); + ScMarkData& rMark = pViewData->GetMarkData(); bool bIgnoreError = (rMark.IsMarked() || rMark.IsMultiMarked()); if (bIgnoreError && (eFunc == SUBTOTAL_FUNC_CNT || eFunc == SUBTOTAL_FUNC_CNT2)) @@ -90,12 +90,12 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) USHORT nGlobStrId = 0; switch (eFunc) { - case SUBTOTAL_FUNC_AVE: nGlobStrId = STR_FUN_TEXT_AVG; break; - case SUBTOTAL_FUNC_CNT: nGlobStrId = STR_FUN_TEXT_COUNT; break; + case SUBTOTAL_FUNC_AVE: nGlobStrId = STR_FUN_TEXT_AVG; break; + case SUBTOTAL_FUNC_CNT: nGlobStrId = STR_FUN_TEXT_COUNT; break; case SUBTOTAL_FUNC_CNT2: nGlobStrId = STR_FUN_TEXT_COUNT2; break; - case SUBTOTAL_FUNC_MAX: nGlobStrId = STR_FUN_TEXT_MAX; break; - case SUBTOTAL_FUNC_MIN: nGlobStrId = STR_FUN_TEXT_MIN; break; - case SUBTOTAL_FUNC_SUM: nGlobStrId = STR_FUN_TEXT_SUM; break; + case SUBTOTAL_FUNC_MAX: nGlobStrId = STR_FUN_TEXT_MAX; break; + case SUBTOTAL_FUNC_MIN: nGlobStrId = STR_FUN_TEXT_MIN; break; + case SUBTOTAL_FUNC_SUM: nGlobStrId = STR_FUN_TEXT_SUM; break; default: { // added to avoid warnings @@ -103,10 +103,10 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) } if (nGlobStrId) { - ScDocument* pDoc = pViewData->GetDocument(); - SCCOL nPosX = pViewData->GetCurX(); - SCROW nPosY = pViewData->GetCurY(); - SCTAB nTab = pViewData->GetTabNo(); + ScDocument* pDoc = pViewData->GetDocument(); + SCCOL nPosX = pViewData->GetCurX(); + SCROW nPosY = pViewData->GetCurY(); + SCTAB nTab = pViewData->GetTabNo(); aStr = ScGlobal::GetRscString(nGlobStrId); aStr += '='; @@ -119,12 +119,12 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) aStr += '0'; else { - // Anzahl im Standardformat, die anderen nach Cursorposition + // Anzahl im Standardformat, die anderen nach Cursorposition SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); sal_uInt32 nNumFmt = 0; if ( eFunc != SUBTOTAL_FUNC_CNT && eFunc != SUBTOTAL_FUNC_CNT2 ) { - // Zahlformat aus Attributen oder Formel + // Zahlformat aus Attributen oder Formel pDoc->GetNumberFormat( nPosX, nPosY, nTab, nNumFmt ); if ( (nNumFmt % SV_COUNTRY_LANGUAGE_OFFSET) == 0 ) { @@ -132,12 +132,12 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) pDoc->GetCell( nPosX, nPosY, nTab, pCell ); if (pCell && pCell->GetCellType() == CELLTYPE_FORMULA) { - + nNumFmt = ((ScFormulaCell*)pCell)->GetStandardFormat(*pFormatter, nNumFmt ); } } } - + String aValStr; Color* pDummy; pFormatter->GetOutputString( nVal, nNumFmt, aValStr, &pDummy ); @@ -154,24 +154,24 @@ BOOL ScTabViewShell::GetFunction( String& rFuncStr, sal_uInt16 nErrCode ) -// Funktionen, die je nach Selektion disabled sind -// Default: -// SID_DELETE, -// SID_DELETE_CONTENTS, -// FID_DELETE_CELL -// FID_VALIDATION +// Funktionen, die je nach Selektion disabled sind +// Default: +// SID_DELETE, +// SID_DELETE_CONTENTS, +// FID_DELETE_CELL +// FID_VALIDATION void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) { - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); ScDocShell* pDocShell = pViewData->GetDocShell(); - ScMarkData& rMark = pViewData->GetMarkData(); - SCCOL nPosX = pViewData->GetCurX(); - SCROW nPosY = pViewData->GetCurY(); - SCTAB nTab = pViewData->GetTabNo(); - USHORT nMyId = 0; + ScMarkData& rMark = pViewData->GetMarkData(); + SCCOL nPosX = pViewData->GetCurX(); + SCROW nPosY = pViewData->GetCurY(); + SCTAB nTab = pViewData->GetTabNo(); + USHORT nMyId = 0; SfxViewFrame* pThisFrame = GetViewFrame(); BOOL bOle = GetViewFrame()->GetFrame().IsInPlace(); @@ -179,8 +179,8 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) SCTAB nTabCount = pDoc->GetTableCount(); SCTAB nTabSelCount = rMark.GetSelectCount(); - SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter(rSet); + USHORT nWhich = aIter.FirstWhich(); while ( nWhich ) { @@ -240,7 +240,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) case SID_SEARCH_OPTIONS: { - USHORT nOptions = 0xffff; // alles erlaubt + USHORT nOptions = 0xffff; // alles erlaubt // wenn ReadOnly, kein Ersetzen: if (GetViewData()->GetDocShell()->IsReadOnly()) nOptions &= ~( SEARCH_OPTIONS_REPLACE | SEARCH_OPTIONS_REPLACE_ALL ); @@ -251,16 +251,16 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) case SID_CURRENTCELL: { ScAddress aScAddress( GetViewData()->GetCurX(), GetViewData()->GetCurY(), 0 ); - String aAddr; + String aAddr; aScAddress.Format( aAddr, SCA_ABS, NULL, pDoc->GetAddressConvention() ); - SfxStringItem aPosItem( SID_CURRENTCELL, aAddr ); + SfxStringItem aPosItem( SID_CURRENTCELL, aAddr ); rSet.Put( aPosItem ); } break; case SID_CURRENTTAB: - // Tabelle fuer Basic ist 1-basiert + // Tabelle fuer Basic ist 1-basiert rSet.Put( SfxUInt16Item( nWhich, static_cast<sal_uInt16>(GetViewData()->GetTabNo()) + 1 ) ); break; @@ -289,7 +289,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) case FID_RESET_PRINTZOOM: { - // disablen, wenn schon Default eingestellt + // disablen, wenn schon Default eingestellt String aStyleName = pDoc->GetPageStyle( nTab ); ScStyleSheetPool* pStylePool = pDoc->GetStyleSheetPool(); @@ -458,7 +458,7 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) break; case SID_FORMATPAGE: - //! bei geschuetzten Tabellen ??? + //! bei geschuetzten Tabellen ??? if ( pDocShell && ( pDocShell->IsReadOnly() || pDocShell->IsDocShared() ) ) rSet.DisableItem( nWhich ); break; @@ -485,15 +485,15 @@ void __EXPORT ScTabViewShell::GetState( SfxItemSet& rSet ) //------------------------------------------------------------------ void ScTabViewShell::ExecuteCellFormatDlg( SfxRequest& rReq, USHORT nTabPage ) { - SfxAbstractTabDialog * pDlg = NULL; - ScDocument* pDoc = GetViewData()->GetDocument(); + SfxAbstractTabDialog * pDlg = NULL; + ScDocument* pDoc = GetViewData()->GetDocument(); - SvxBoxItem aLineOuter( ATTR_BORDER ); - SvxBoxInfoItem aLineInner( ATTR_BORDER_INNER ); + SvxBoxItem aLineOuter( ATTR_BORDER ); + SvxBoxInfoItem aLineInner( ATTR_BORDER_INNER ); - SvxNumberInfoItem* pNumberInfoItem = NULL; - const ScPatternAttr* pOldAttrs = GetSelectionPattern(); - SfxItemSet* pOldSet = new SfxItemSet( + SvxNumberInfoItem* pNumberInfoItem = NULL; + const ScPatternAttr* pOldAttrs = GetSelectionPattern(); + SfxItemSet* pOldSet = new SfxItemSet( pOldAttrs->GetItemSet() ); @@ -611,20 +611,20 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd if ( pHdl ) { - String aString; - const EditTextObject* pObject = NULL; - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - CellType eType; - SCCOL nPosX = pViewData->GetCurX(); - SCROW nPosY = pViewData->GetCurY(); - SCTAB nTab = pViewData->GetTabNo(); - SCTAB nStartTab = 0; - SCTAB nEndTab = 0; - SCCOL nStartCol = 0; - SCROW nStartRow = 0; - SCCOL nEndCol = 0; - SCROW nEndRow = 0; + String aString; + const EditTextObject* pObject = NULL; + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); + CellType eType; + SCCOL nPosX = pViewData->GetCurX(); + SCROW nPosY = pViewData->GetCurY(); + SCTAB nTab = pViewData->GetTabNo(); + SCTAB nStartTab = 0; + SCTAB nEndTab = 0; + SCCOL nStartCol = 0; + SCROW nStartRow = 0; + SCCOL nEndCol = 0; + SCROW nEndRow = 0; pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ); @@ -634,7 +634,7 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd PutInOrder( nStartTab, nEndTab ); BOOL bHideFormula = FALSE; - BOOL bHideAll = FALSE; + BOOL bHideAll = FALSE; if (pDoc->IsTabProtected(nTab)) { @@ -642,7 +642,7 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd pDoc->GetAttr( nPosX,nPosY,nTab, ATTR_PROTECTION); bHideFormula = pProt->GetHideFormula(); - bHideAll = pProt->GetHideCell(); + bHideAll = pProt->GetHideCell(); } if (!bHideAll) @@ -664,10 +664,10 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd pDoc->GetInputString( nPosX, nPosY, nTab, aString ); if (eType == CELLTYPE_STRING) { - // Bei Bedarf ein ' vorneweg, damit der String nicht ungewollt - // als Zahl interpretiert wird, und um dem Benutzer zu zeigen, - // dass es ein String ist (#35060#). - //! Auch bei Zahlformat "Text"? -> dann beim Editieren wegnehmen + // Bei Bedarf ein ' vorneweg, damit der String nicht ungewollt + // als Zahl interpretiert wird, und um dem Benutzer zu zeigen, + // dass es ein String ist (#35060#). + //! Auch bei Zahlformat "Text"? -> dann beim Editieren wegnehmen SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); sal_uInt32 nNumFmt; @@ -679,21 +679,21 @@ void ScTabViewShell::UpdateInputHandler( BOOL bForce /* = FALSE */, BOOL bStopEd } } - ScInputHdlState aState( ScAddress( nPosX, nPosY, nTab ), + ScInputHdlState aState( ScAddress( nPosX, nPosY, nTab ), ScAddress( nStartCol, nStartRow, nTab ), - ScAddress( nEndCol, nEndRow, nTab ), + ScAddress( nEndCol, nEndRow, nTab ), aString, pObject ); - // if using the view's local input handler, this view can always be set - // as current view inside NotifyChange. + // if using the view's local input handler, this view can always be set + // as current view inside NotifyChange. ScTabViewShell* pSourceSh = pInputHandler ? this : NULL; pHdl->NotifyChange( &aState, bForce, pSourceSh, bStopEditing ); } SfxBindings& rBindings = GetViewFrame()->GetBindings(); - rBindings.Invalidate( SID_STATUS_SUM ); // immer zusammen mit Eingabezeile + rBindings.Invalidate( SID_STATUS_SUM ); // immer zusammen mit Eingabezeile rBindings.Invalidate( SID_ATTR_SIZE ); rBindings.Invalidate( SID_TABLE_CELL ); } @@ -708,7 +708,7 @@ void ScTabViewShell::UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust ) void __EXPORT ScTabViewShell::ExecuteSave( SfxRequest& rReq ) { - // nur SID_SAVEDOC / SID_SAVEASDOC + // nur SID_SAVEDOC / SID_SAVEASDOC // Eingabe auf jeden Fall abschliessen, auch wenn eine Formel bearbeitet wird SC_MOD()->InputEnterHandler(); @@ -782,8 +782,8 @@ void ScTabViewShell::ExecuteUndo(SfxRequest& rReq) GetViewFrame()->GetBindings().InvalidateAll(sal_False); } break; -// default: -// GetViewFrame()->ExecuteSlot( rReq ); +// default: +// GetViewFrame()->ExecuteSlot( rReq ); } } diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index f650b0bb68cd..e663fbbeb7bc 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -84,12 +84,12 @@ using namespace com::sun::star; void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj ) { - // wird aus dem Paint gerufen + // wird aus dem Paint gerufen uno::Reference < embed::XEmbeddedObject > xObj = pObj->GetObjRef(); Window* pWin = GetActiveWin(); - // #41412# wenn schon connected ist, nicht nochmal SetObjArea/SetSizeScale + // #41412# wenn schon connected ist, nicht nochmal SetObjArea/SetSizeScale SfxInPlaceClient* pClient = FindIPClient( xObj, pWin ); if ( !pClient ) @@ -102,7 +102,7 @@ void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj ) Fraction aScaleWidth (aDrawSize.Width(), aOleSize.Width() ); Fraction aScaleHeight(aDrawSize.Height(), aOleSize.Height() ); - aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj + aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj aScaleHeight.ReduceInaccurate(10); pClient->SetSizeScale(aScaleWidth,aScaleHeight); @@ -126,9 +126,9 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) BOOL bErrorShown = FALSE; // linked objects aren't supported -// if ( xIPObj->IsLink() ) -// nErr = xIPObj->DoVerb(nVerb); // gelinkt -> ohne Client etc. -// else +// if ( xIPObj->IsLink() ) +// nErr = xIPObj->DoVerb(nVerb); // gelinkt -> ohne Client etc. +// else { SfxInPlaceClient* pClient = FindIPClient( xObj, pWin ); if ( !pClient ) @@ -145,7 +145,7 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) if ( pClient->GetAspect() != embed::Aspects::MSOLE_ICON && ( xObj->getStatus( pClient->GetAspect() ) & embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE ) ) { - // scale must always be 1 - change VisArea if different from client size + // scale must always be 1 - change VisArea if different from client size if ( aDrawSize != aOleSize ) { @@ -160,11 +160,11 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) } else { - // calculate scale from client and VisArea size + // calculate scale from client and VisArea size Fraction aScaleWidth (aDrawSize.Width(), aOleSize.Width() ); Fraction aScaleHeight(aDrawSize.Height(), aOleSize.Height() ); - aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj + aScaleWidth.ReduceInaccurate(10); // kompatibel zum SdrOle2Obj aScaleHeight.ReduceInaccurate(10); pClient->SetSizeScale(aScaleWidth,aScaleHeight); } @@ -213,7 +213,7 @@ BOOL ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb ) if (nErr != ERRCODE_NONE && !bErrorShown) ErrorHandler::HandleError(nErr); - //! SetDocumentName sollte schon im Sfx passieren ??? + //! SetDocumentName sollte schon im Sfx passieren ??? //TODO/LATER: how "SetDocumentName"? //xIPObj->SetDocumentName( GetViewData()->GetDocShell()->GetTitle() ); @@ -224,7 +224,7 @@ ErrCode __EXPORT ScTabViewShell::DoVerb(long nVerb) { SdrView* pView = GetSdrView(); if (!pView) - return ERRCODE_SO_NOTIMPL; // soll nicht sein + return ERRCODE_SO_NOTIMPL; // soll nicht sein SdrOle2Obj* pOle2Obj = NULL; SdrGrafObj* pGrafObj = NULL; @@ -276,7 +276,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) UpdateInputHandler(); } - // Rahmen fuer Chart einfuegen wird abgebrochen: + // Rahmen fuer Chart einfuegen wird abgebrochen: FuPoor* pPoor = GetDrawFuncPtr(); if ( pPoor && pPoor->GetSlotID() == SID_DRAW_CHART ) GetViewData()->GetDispatcher().Execute(SID_DRAW_CHART, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD); @@ -284,13 +284,13 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) MakeDrawLayer(); SfxBindings& rBindings = GetViewFrame()->GetBindings(); - ScTabView* pTabView = GetViewData()->GetView(); - Window* pWin = pTabView->GetActiveWin(); - ScDrawView* pView = pTabView->GetScDrawView(); - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); -// SdrModel* pDrModel = pDocSh->MakeDrawLayer(); - SdrModel* pDrModel = pView->GetModel(); + ScTabView* pTabView = GetViewData()->GetView(); + Window* pWin = pTabView->GetActiveWin(); + ScDrawView* pView = pTabView->GetScDrawView(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); +// SdrModel* pDrModel = pDocSh->MakeDrawLayer(); + SdrModel* pDrModel = pView->GetModel(); switch ( nSlot ) { @@ -306,7 +306,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) case SID_INSERT_DIAGRAM: FuInsertChart(this, pWin, pView, pDrModel, rReq); -//? SC_MOD()->SetFunctionDlg( NULL );//XXX +//? SC_MOD()->SetFunctionDlg( NULL );//XXX break; case SID_INSERT_OBJECT: @@ -321,7 +321,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) case SID_OBJECTRESIZE: { - // Der Server moechte die Clientgrosse verandern + // Der Server moechte die Clientgrosse verandern SfxInPlaceClient* pClient = GetIPClient(); @@ -377,7 +377,7 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) if(pDescriptorItem) { - //! merge with ScViewFunc::PasteDataFormat (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE)? + //! merge with ScViewFunc::PasteDataFormat (SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE)? ScDrawView* pDrView = GetScDrawView(); SdrPageView* pPageView = pDrView ? pDrView->GetSdrPageView() : NULL; @@ -471,7 +471,7 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet) break; case SID_INSERT_APPLET: - // wenn SOLAR_JAVA nicht definiert ist, immer disablen + // wenn SOLAR_JAVA nicht definiert ist, immer disablen #ifdef SOLAR_JAVA if (bOle || bTabProt) #endif diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 9bd1efdcd521..7d79c148b403 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -74,8 +74,8 @@ void ScTabViewShell::SetCurRefDlgId( USHORT nNew ) { - // CurRefDlgId is stored in ScModule to find if a ref dialog is open, - // and in the view to identify the view that has opened the dialog + // CurRefDlgId is stored in ScModule to find if a ref dialog is open, + // and in the view to identify the view that has opened the dialog nCurRefDlgId = nNew; } @@ -83,18 +83,18 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( SfxBindings* pB, SfxChildWindow* pCW, SfxChildWinInfo* pInfo, Window* pParent, USHORT nSlotId ) { - // Dialog nur aufmachen, wenn ueber ScModule::SetRefDialog gerufen, damit - // z.B. nach einem Absturz offene Ref-Dialoge nicht wiederkommen (#42341#). + // Dialog nur aufmachen, wenn ueber ScModule::SetRefDialog gerufen, damit + // z.B. nach einem Absturz offene Ref-Dialoge nicht wiederkommen (#42341#). if ( SC_MOD()->GetCurRefDlgId() != nSlotId ) return NULL; if ( nCurRefDlgId != nSlotId ) { - // the dialog has been opened in a different view - // -> lock the dispatcher for this view (modal mode) + // the dialog has been opened in a different view + // -> lock the dispatcher for this view (modal mode) - GetViewData()->GetDispatcher().Lock( TRUE ); // lock is reset when closing dialog + GetViewData()->GetDispatcher().Lock( TRUE ); // lock is reset when closing dialog return NULL; } @@ -129,13 +129,13 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( if ( !pDlgData ) { - ScConsolidateParam aConsParam; + ScConsolidateParam aConsParam; SCCOL nStartCol, nEndCol; SCROW nStartRow, nEndRow; SCTAB nStartTab, nEndTab; GetViewData()->GetSimpleArea( nStartCol, nStartRow, nStartTab, - nEndCol, nEndRow, nEndTab ); + nEndCol, nEndRow, nEndTab ); PutInOrder( nStartCol, nEndCol ); PutInOrder( nStartRow, nEndRow ); @@ -158,7 +158,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_DEFINE_DBNAME: { - // wenn auf einem bestehenden Bereich aufgerufen, den markieren + // wenn auf einem bestehenden Bereich aufgerufen, den markieren GetDBData( TRUE, SC_DB_OLD ); const ScMarkData& rMark = GetViewData()->GetMarkData(); if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) @@ -170,8 +170,8 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_SPECIAL_FILTER: { - ScQueryParam aQueryParam; - SfxItemSet aArgSet( GetPool(), + ScQueryParam aQueryParam; + SfxItemSet aArgSet( GetPool(), SCITEM_QUERYDATA, SCITEM_QUERYDATA ); @@ -196,8 +196,8 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_FILTER: { - ScQueryParam aQueryParam; - SfxItemSet aArgSet( GetPool(), + ScQueryParam aQueryParam; + SfxItemSet aArgSet( GetPool(), SCITEM_QUERYDATA, SCITEM_QUERYDATA ); @@ -218,8 +218,8 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_OPENDLG_TABOP: { - ScViewData* pViewData = GetViewData(); - ScRefAddress aCurPos ( pViewData->GetCurX(), + ScViewData* pViewData = GetViewData(); + ScRefAddress aCurPos ( pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo(), FALSE, FALSE, FALSE ); @@ -230,7 +230,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_OPENDLG_SOLVE: { - ScViewData* pViewData = GetViewData(); + ScViewData* pViewData = GetViewData(); ScAddress aCurPos( pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo()); @@ -248,7 +248,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_OPENDLG_PIVOTTABLE: { - // all settings must be in pDialogDPObject + // all settings must be in pDialogDPObject if( pDialogDPObject ) { @@ -286,7 +286,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case SID_OPENDLG_FUNCTION: { - // Dialog schaut selber, was in der Zelle steht + // Dialog schaut selber, was in der Zelle steht pResult = new ScFormulaDlg( pB, pCW, pParent, GetViewData(),ScGlobal::GetStarCalcFunctionMgr() ); } @@ -294,7 +294,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case FID_CHG_SHOW: { - // Dialog schaut selber, was in der Zelle steht + // Dialog schaut selber, was in der Zelle steht pResult = new ScHighlightChgDlg( pB, pCW, pParent, GetViewData() ); } @@ -302,7 +302,7 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( case WID_SIMPLE_REF: { - // Dialog schaut selber, was in der Zelle steht + // Dialog schaut selber, was in der Zelle steht ScViewData* pViewData = GetViewData(); pViewData->SetRefTabNo( pViewData->GetTabNo() ); @@ -318,9 +318,9 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( if (pResult) { - // Die Dialoge gehen immer mit eingeklapptem Zusaetze-Button auf, - // darum muss die Groesse ueber das Initialize gerettet werden - // (oder den Zusaetze-Status mit speichern !!!) + // Die Dialoge gehen immer mit eingeklapptem Zusaetze-Button auf, + // darum muss die Groesse ueber das Initialize gerettet werden + // (oder den Zusaetze-Status mit speichern !!!) Size aSize = pResult->GetSizePixel(); pResult->Initialize( pInfo ); diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx index 45875808926f..b70237f47265 100644 --- a/sc/source/ui/view/tabvwshd.cxx +++ b/sc/source/ui/view/tabvwshd.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,13 +59,13 @@ #define IS_AVAILABLE(WhichId,ppItem) \ (pReqArgs->GetItemState((WhichId), TRUE, ppItem ) == SFX_ITEM_SET) -//! Parent-Window fuer Dialoge -//! Problem: OLE Server! +//! Parent-Window fuer Dialoge +//! Problem: OLE Server! Window* ScTabViewShell::GetDialogParent() { - // #95513# if a ref-input dialog is open, use it as parent - // (necessary when a slot is executed from the dialog's OK handler) + // #95513# if a ref-input dialog is open, use it as parent + // (necessary when a slot is executed from the dialog's OK handler) if ( nCurRefDlgId && nCurRefDlgId == SC_MOD()->GetCurRefDlgId() ) { SfxViewFrame* pViewFrm = GetViewFrame(); @@ -92,7 +92,7 @@ Window* ScTabViewShell::GetDialogParent() // return pEnv->GetEditWin(); } - return GetActiveWin(); // for normal views, too + return GetActiveWin(); // for normal views, too } diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 2271751a9e48..554611b4dcae 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -92,15 +92,13 @@ String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord ) } else { - // #i111531# with 1M rows it was necessary to limit the range + // #i111531# with 1M rows it was necessary to limit the range // to the actually used data area. SCCOL nCol1, nCol2; SCROW nRow1, nRow2; SCTAB nTab1, nTab2; aRange.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2); - bool bShrunk; - pDoc->ShrinkToUsedDataArea( bShrunk, nTab1, nCol1, nRow1, nCol2, nRow2, false); - if (bShrunk) + if (pDoc->ShrinkToUsedDataArea( nTab1, nCol1, nRow1, nCol2, nRow2, false)) { aRange.aStart.SetCol( nCol1 ); aRange.aStart.SetRow( nRow1 ); @@ -117,10 +115,10 @@ String __EXPORT ScTabViewShell::GetSelectionText( BOOL bWholeWord ) aStrSelection.ConvertLineEnd( LINEEND_CR ); - // Tab/CR durch Space ersetzen, wenn fuer Dialog oder per Basic/SelectionTextExt, - // oder wenn es eine einzelne Zeile ist. - // Sonst mehrzeilig mit Tabs beibehalten (z.B. Mail oder Basic/SelectionText). - // Fuer Mail werden die Tabs dann spaeter in (mehrere) Spaces gewandelt. + // Tab/CR durch Space ersetzen, wenn fuer Dialog oder per Basic/SelectionTextExt, + // oder wenn es eine einzelne Zeile ist. + // Sonst mehrzeilig mit Tabs beibehalten (z.B. Mail oder Basic/SelectionText). + // Fuer Mail werden die Tabs dann spaeter in (mehrere) Spaces gewandelt. if ( bInFormatDialog || bWholeWord || aRange.aEnd.Row() == aRange.aStart.Row() ) { @@ -144,22 +142,22 @@ void ScTabViewShell::InsertURL( const String& rName, const String& rURL, const S USHORT nMode ) { SvxLinkInsertMode eMode = (SvxLinkInsertMode) nMode; - BOOL bAsText = ( eMode != HLINK_BUTTON ); // Default ist jetzt Text + BOOL bAsText = ( eMode != HLINK_BUTTON ); // Default ist jetzt Text if ( bAsText ) { if ( GetViewData()->IsActive() ) { - // if the view is active, always use InsertURLField, which starts EditMode - // and selects the URL, so it can be changed from the URL bar / dialog + // if the view is active, always use InsertURLField, which starts EditMode + // and selects the URL, so it can be changed from the URL bar / dialog InsertURLField( rName, rURL, rTarget ); } else { - // #91216# if the view is not active, InsertURLField doesn't work - // -> use InsertBookmark to directly manipulate cell content - // bTryReplace=TRUE -> if cell contains only one URL, replace it + // #91216# if the view is not active, InsertURLField doesn't work + // -> use InsertBookmark to directly manipulate cell content + // bTryReplace=TRUE -> if cell contains only one URL, replace it SCCOL nPosX = GetViewData()->GetCurX(); SCROW nPosY = GetViewData()->GetCurY(); @@ -182,7 +180,7 @@ void lcl_SelectFieldAfterInsert( EditView& rView ) ESelection aSel = rView.GetSelection(); if ( aSel.nStartPos == aSel.nEndPos && aSel.nStartPos > 0 ) { - // Cursor is behind the inserted field -> extend selection to the left + // Cursor is behind the inserted field -> extend selection to the left --aSel.nStartPos; rView.SetSelection( aSel ); @@ -195,9 +193,9 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co aURLField.SetTargetFrame( rTarget ); SvxFieldItem aURLItem( aURLField, EE_FEATURE_FIELD ); - ScViewData* pViewData = GetViewData(); - ScModule* pScMod = SC_MOD(); - ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() ); + ScViewData* pViewData = GetViewData(); + ScModule* pScMod = SC_MOD(); + ScInputHandler* pHdl = pScMod->GetInputHdl( pViewData->GetViewShell() ); BOOL bSelectFirst = FALSE; if ( !pScMod->IsEditMode() ) @@ -214,8 +212,8 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co pScMod->SetInputMode( SC_INPUT_TABLE ); } - EditView* pTopView = pHdl->GetTopView(); - EditView* pTableView = pHdl->GetTableView(); + EditView* pTopView = pHdl->GetTopView(); + EditView* pTableView = pHdl->GetTableView(); DBG_ASSERT( pTopView || pTableView, "No EditView" ); if ( bSelectFirst ) @@ -244,9 +242,9 @@ void ScTabViewShell::InsertURLField( const String& rName, const String& rURL, co void ScTabViewShell::ExecSearch( SfxRequest& rReq ) { - const SfxItemSet* pReqArgs = rReq.GetArgs(); - USHORT nSlot = rReq.GetSlot(); - const SfxPoolItem* pItem; + const SfxItemSet* pReqArgs = rReq.GetArgs(); + USHORT nSlot = rReq.GetSlot(); + const SfxPoolItem* pItem; switch ( nSlot ) { @@ -269,7 +267,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) if (pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState(SID_SEARCH_ITEM, FALSE, &pItem)) { - // Search-Item merken + // Search-Item merken DBG_ASSERT( pItem->ISA(SvxSearchItem), "falsches Item" ); ScGlobal::SetSearchItem( *(const SvxSearchItem*) pItem ); } @@ -285,11 +283,11 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) { if (pReqArgs && SFX_ITEM_SET == pReqArgs->GetItemState(nSlot, FALSE, &pItem)) { - // SearchItem holen + // SearchItem holen SvxSearchItem aSearchItem = ScGlobal::GetSearchItem(); - // SearchItem fuellen + // SearchItem fuellen aSearchItem.SetSearchString(((SfxStringItem*)pItem)->GetValue()); if(SFX_ITEM_SET == pReqArgs->GetItemState(FN_PARAM_1, FALSE, &pItem)) @@ -304,7 +302,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) else aSearchItem.SetCommand(SVX_SEARCHCMD_FIND_ALL); - // Request ausfuehren (dabei wird das SearchItem gespeichert) + // Request ausfuehren (dabei wird das SearchItem gespeichert) aSearchItem.SetWhich(SID_SEARCH_ITEM); GetViewData()->GetDispatcher().Execute( FID_SEARCH_NOW, @@ -321,7 +319,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) break; case FID_REPEAT_SEARCH: { - // nochmal mit ScGlobal::GetSearchItem() + // nochmal mit ScGlobal::GetSearchItem() SvxSearchItem aSearchItem = ScGlobal::GetSearchItem(); aSearchItem.SetWhich(SID_SEARCH_ITEM); @@ -331,7 +329,7 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) &aSearchItem, 0L ); } break; -// case FID_SEARCH_COUNT: +// case FID_SEARCH_COUNT: } } diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 3baa549f2932..e38cb88d9491 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,15 +69,15 @@ using namespace com::sun::star; void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) { - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); - SCTAB nCurrentTab = pViewData->GetTabNo(); - SCTAB nTabCount = pDoc->GetTableCount(); - USHORT nSlot = rReq.GetSlot(); + SCTAB nCurrentTab = pViewData->GetTabNo(); + SCTAB nTabCount = pDoc->GetTableCount(); + USHORT nSlot = rReq.GetSlot(); const SfxItemSet* pReqArgs = rReq.GetArgs(); - HideListBox(); // Autofilter-DropDown-Listbox + HideListBox(); // Autofilter-DropDown-Listbox switch ( nSlot ) { @@ -94,7 +94,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) bVisible = ((const SfxBoolItem*)pItem)->GetValue(); } - if( ! bVisible ) // ausblenden + if( ! bVisible ) // ausblenden { ScMarkData& rMark = pViewData->GetMarkData(); SCTAB nTabSelCount = rMark.GetSelectCount(); @@ -109,7 +109,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if (pDoc->GetTable( aName, nHideTab )) HideTable( nHideTab ); } - else // einblenden + else // einblenden { ShowTable( aName ); } @@ -138,7 +138,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if (!aName.Len()) { - pDoc->GetName( nCurrentTab, aName ); // aktuelle Tabelle + pDoc->GetName( nCurrentTab, aName ); // aktuelle Tabelle rReq.AppendItem( SfxStringItem( FID_TABLE_HIDE, aName ) ); } @@ -206,24 +206,24 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) case FID_INS_TABLE: case FID_INS_TABLE_EXT: { - ScMarkData& rMark = pViewData->GetMarkData(); - SCTAB nTabSelCount = rMark.GetSelectCount(); - SCTAB nTabNr = nCurrentTab; + ScMarkData& rMark = pViewData->GetMarkData(); + SCTAB nTabSelCount = rMark.GetSelectCount(); + SCTAB nTabNr = nCurrentTab; if ( !pDoc->IsDocEditable() ) - break; // gesperrt + break; // gesperrt - if ( pReqArgs != NULL ) // von Basic + if ( pReqArgs != NULL ) // von Basic { BOOL bOk = FALSE; - const SfxPoolItem* pTabItem; - const SfxPoolItem* pNameItem; - String aName; + const SfxPoolItem* pTabItem; + const SfxPoolItem* pNameItem; + String aName; if ( IS_AVAILABLE( FN_PARAM_1, &pTabItem ) && IS_AVAILABLE( nSlot, &pNameItem ) ) { - // Tabellennr. von Basic: 1-basiert + // Tabellennr. von Basic: 1-basiert aName = ((const SfxStringItem*)pNameItem)->GetValue(); nTabNr = ((const SfxUInt16Item*)pTabItem)->GetValue() - 1; @@ -233,9 +233,9 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if (bOk) rReq.Done( *pReqArgs ); - //! sonst Fehler setzen + //! sonst Fehler setzen } - else // Dialog + else // Dialog { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!"); @@ -267,7 +267,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } else { - SCTAB nTabAfter = nTabNr+1; + SCTAB nTabAfter = nTabNr+1; for(SCTAB j=nCurrentTab+1;j<nTabCount;j++) { @@ -291,7 +291,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if(nCount==1 && pDlg->GetFirstTable()->Len()>0) { rReq.AppendItem( SfxStringItem( FID_INS_TABLE, *pDlg->GetFirstTable() ) ); - rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nTabNr) + 1 ) ); // 1-based + rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nTabNr) + 1 ) ); // 1-based rReq.Done(); InsertTable( *pDlg->GetFirstTable(), nTabNr ); @@ -301,7 +301,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } else { - SCTAB nTabAfter = nTabNr+1; + SCTAB nTabAfter = nTabNr+1; SCTAB nSelHigh=0; for(SCTAB i=0;i<nTabCount;i++) @@ -326,7 +326,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if(nCount==1 && pDlg->GetFirstTable()->Len()>0) { rReq.AppendItem( SfxStringItem( FID_INS_TABLE, *pDlg->GetFirstTable() ) ); - rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nTabAfter) + 1 ) ); // 1-based + rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nTabAfter) + 1 ) ); // 1-based rReq.Done(); InsertTable( *pDlg->GetFirstTable(), nTabAfter); @@ -348,12 +348,12 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) case FID_TAB_RENAME: case FID_TAB_MENU_RENAME: { - // FID_TAB_MENU_RENAME - "umbenennen" im Menu - // FID_TAB_RENAME - "Name"-Property fuer Basic - // Execute ist gleich, aber im GetState wird MENU_RENAME evtl. disabled + // FID_TAB_MENU_RENAME - "umbenennen" im Menu + // FID_TAB_RENAME - "Name"-Property fuer Basic + // Execute ist gleich, aber im GetState wird MENU_RENAME evtl. disabled if ( nSlot == FID_TAB_MENU_RENAME ) - nSlot = FID_TAB_RENAME; // Execute ist gleich + nSlot = FID_TAB_RENAME; // Execute ist gleich SCTAB nTabNr = pViewData->GetTabNo(); ScMarkData& rMark = pViewData->GetMarkData(); @@ -368,9 +368,9 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if( pReqArgs != NULL ) { - BOOL bDone = FALSE; + BOOL bDone = FALSE; const SfxPoolItem* pItem; - String aName; + String aName; if( IS_AVAILABLE( FN_PARAM_1, &pItem ) ) nTabNr = ((const SfxUInt16Item*)pItem)->GetValue(); @@ -395,11 +395,11 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } else { - USHORT nRet = RET_OK; - BOOL bDone = FALSE; - String aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) ); - String aName; - String aDlgTitle; + USHORT nRet = RET_OK; + BOOL bDone = FALSE; + String aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) ); + String aName; + String aDlgTitle; switch ( nSlot ) { @@ -472,7 +472,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) case FID_TAB_MOVE: { if ( pDoc->GetChangeTrack() != NULL ) - break; // bei aktiviertem ChangeTracking kein TabMove + break; // bei aktiviertem ChangeTracking kein TabMove BOOL bDoIt = FALSE; USHORT nDoc = 0; @@ -489,7 +489,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) aDocName = ((const SfxStringItem*)pItem)->GetValue(); if( IS_AVAILABLE( FN_PARAM_1, &pItem ) ) { - // Tabelle ist 1-basiert + // Tabelle ist 1-basiert nTab = ((const SfxUInt16Item*)pItem)->GetValue() - 1; if ( nTab >= nTableCount ) nTab = SC_TAB_APPEND; @@ -499,9 +499,9 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if( aDocName.Len() ) { - SfxObjectShell* pSh = SfxObjectShell::GetFirst(); - ScDocShell* pScSh = NULL; - USHORT i=0; + SfxObjectShell* pSh = SfxObjectShell::GetFirst(); + ScDocShell* pScSh = NULL; + USHORT i=0; while ( pSh ) { @@ -520,7 +520,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) break; } - i++; // nur die ScDocShell's zaehlen + i++; // nur die ScDocShell's zaehlen } pSh = SfxObjectShell::GetNext( *pSh ); } @@ -531,7 +531,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) bDoIt = TRUE; } - if ( bDoIt && nTab >= nTableCount ) // ggf. anhaengen + if ( bDoIt && nTab >= nTableCount ) // ggf. anhaengen nTab = SC_TAB_APPEND; } else @@ -543,8 +543,8 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) DBG_ASSERT(pDlg, "Dialog create fail!"); SCTAB nTableCount = pDoc->GetTableCount(); - ScMarkData& rMark = GetViewData()->GetMarkData(); - SCTAB nTabSelCount = rMark.GetSelectCount(); + ScMarkData& rMark = GetViewData()->GetMarkData(); + SCTAB nTabSelCount = rMark.GetSelectCount(); if(nTableCount==nTabSelCount) @@ -574,7 +574,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } } rReq.AppendItem( SfxStringItem( FID_TAB_MOVE, aFoundDocName ) ); - // Tabelle ist 1-basiert, wenn nicht APPEND + // Tabelle ist 1-basiert, wenn nicht APPEND SCTAB nBasicTab = ( nTab <= MAXTAB ) ? (nTab+1) : nTab; rReq.AppendItem( SfxUInt16Item( FN_PARAM_1, static_cast<sal_uInt16>(nBasicTab) ) ); rReq.AppendItem( SfxBoolItem( FN_PARAM_2, bCpy ) ); @@ -584,7 +584,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) if( bDoIt ) { - rReq.Done(); // aufzeichnen, solange das Dokument noch aktiv ist + rReq.Done(); // aufzeichnen, solange das Dokument noch aktiv ist MoveTable( nDoc, nTab, bCpy ); } @@ -593,12 +593,12 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) case FID_DELETE_TABLE: { - // Parameter war ueberfluessig, weil die Methode an der Table haengt + // Parameter war ueberfluessig, weil die Methode an der Table haengt BOOL bDoIt = rReq.IsAPI(); if( !bDoIt ) { - // wenn's nicht von Basic kommt, nochmal nachfragen: + // wenn's nicht von Basic kommt, nochmal nachfragen: #if ENABLE_LAYOUT // Using layout::QueryBox without client code modification is @@ -614,7 +614,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } if( bDoIt ) { - SCTAB nNewTab = nCurrentTab; + SCTAB nNewTab = nCurrentTab; SCTAB nFirstTab=0; BOOL bTabFlag=FALSE; ScMarkData& rMark = pViewData->GetMarkData(); @@ -648,7 +648,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) const ScMarkData& rMark = pViewData->GetMarkData(); if ( rMark.GetSelectCount() != 0 ) { - // handle several sheets + // handle several sheets SfxUndoManager* pUndoManager = pDocSh->GetUndoManager(); String aUndo = ScGlobal::GetRscString( STR_UNDO_TAB_RTL ); @@ -814,17 +814,17 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) void ScTabViewShell::GetStateTable( SfxItemSet& rSet ) { - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); ScDocShell* pDocShell = pViewData->GetDocShell(); - ScMarkData& rMark = GetViewData()->GetMarkData(); - SCTAB nTab = pViewData->GetTabNo(); + ScMarkData& rMark = GetViewData()->GetMarkData(); + SCTAB nTab = pViewData->GetTabNo(); SCTAB nTabCount = pDoc->GetTableCount(); SCTAB nTabSelCount = rMark.GetSelectCount(); - SfxWhichIter aIter(rSet); - USHORT nWhich = aIter.FirstWhich(); + SfxWhichIter aIter(rSet); + USHORT nWhich = aIter.FirstWhich(); while ( nWhich ) { @@ -893,8 +893,8 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet ) rSet.DisableItem( nWhich ); break; - // FID_TAB_MENU_RENAME - "umbenennen" im Menu - // FID_TAB_RENAME - "Name"-Property fuer Basic + // FID_TAB_MENU_RENAME - "umbenennen" im Menu + // FID_TAB_RENAME - "Name"-Property fuer Basic case FID_TAB_MENU_RENAME: if ( !pDoc->IsDocEditable() || diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index f7aac8b56da4..c937109baa99 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL, const String& rTarget, const Point* pInsPos ) { - // Tabelle geschuetzt ? + // Tabelle geschuetzt ? ScViewData* pViewData = GetViewData(); ScDocument* pDoc = pViewData->GetDocument(); @@ -73,10 +73,10 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL, MakeDrawLayer(); - ScTabView* pView = pViewData->GetView(); -// SdrView* pDrView = pView->GetSdrView(); + ScTabView* pView = pViewData->GetView(); +// SdrView* pDrView = pView->GetSdrView(); ScDrawView* pDrView = pView->GetScDrawView(); - SdrModel* pModel = pDrView->GetModel(); + SdrModel* pModel = pDrView->GetModel(); SdrObject* pObj = SdrObjFactory::MakeNewObject(FmFormInventor, OBJ_FM_BUTTON, pDrView->GetSdrPageView()->GetPage(), pModel); @@ -127,12 +127,12 @@ void ScTabViewShell::InsertURLButton( const String& rName, const String& rURL, aPos.X() -= aSize.Width(); pObj->SetLogicRect(Rectangle(aPos, aSize)); -// pObj->Resize(Point(), Fraction(1, 1), Fraction(1, 1)); +// pObj->Resize(Point(), Fraction(1, 1), Fraction(1, 1)); - // am alten VC-Button musste die Position/Groesse nochmal explizit - // gesetzt werden - das scheint mit UnoControls nicht noetig zu sein + // am alten VC-Button musste die Position/Groesse nochmal explizit + // gesetzt werden - das scheint mit UnoControls nicht noetig zu sein - // nicht markieren wenn Ole + // nicht markieren wenn Ole pDrView->InsertObjectSafe( pObj, *pDrView->GetSdrPageView() ); } diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index c462c48abe9c..e536781a841f 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ #include "document.hxx" #include "docsh.hxx" #include "sc.hrc" -#include "drwlayer.hxx" // GetVisibleName +#include "drwlayer.hxx" // GetVisibleName #include "retypepassdlg.hxx" #include "tabprotection.hxx" @@ -60,13 +60,13 @@ using namespace com::sun::star; void ScTabViewShell::ExecuteSbx( SfxRequest& /* rReq */ ) { - // SID_RANGE_OFFSET (Offset), - // SID_PIVOT_CREATE (DataPilotCreate) - removed (old Basic) + // SID_RANGE_OFFSET (Offset), + // SID_PIVOT_CREATE (DataPilotCreate) - removed (old Basic) } void ScTabViewShell::GetSbxState( SfxItemSet& /* rSet */ ) { - // SID_RANGE_REGION (CurrentRegion) - removed (old Basic) + // SID_RANGE_REGION (CurrentRegion) - removed (old Basic) } //------------------------------------------------------------------ @@ -76,7 +76,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) USHORT nSlotId = rReq.GetSlot(); const SfxItemSet* pReqArgs = rReq.GetArgs(); - // Objekte aktivieren/deaktivieren immer auf der sichtbaren View + // Objekte aktivieren/deaktivieren immer auf der sichtbaren View ScTabViewShell* pVisibleSh = this; if ( nSlotId == SID_OLE_SELECT || nSlotId == SID_OLE_ACTIVATE || nSlotId == SID_OLE_DEACTIVATE ) @@ -89,7 +89,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) case SID_OLE_SELECT: case SID_OLE_ACTIVATE: { - // in beiden Faellen erstmal auf der sichtbaren View selektieren + // in beiden Faellen erstmal auf der sichtbaren View selektieren String aName; SdrView* pDrView = GetSdrView(); @@ -101,7 +101,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) } pVisibleSh->SelectObject( aName ); - // aktivieren + // aktivieren if ( nSlotId == SID_OLE_ACTIVATE ) pVisibleSh->DoVerb( 0 ); @@ -124,7 +124,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) if ( nNewVal < 0 ) nNewVal = 0; - //! von irgendwas in 1/100mm umrechnen ?????? + //! von irgendwas in 1/100mm umrechnen ?????? SdrView* pDrView = GetSdrView(); if ( pDrView ) @@ -152,7 +152,7 @@ void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) } } if (!bDone) - SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler + SbxBase::SetError( SbxERR_BAD_PARAMETER ); // Basic-Fehler } break; @@ -181,7 +181,7 @@ uno::Reference < embed::XEmbeddedObject > lcl_GetSelectedObj( SdrView* pDrView ) void ScTabViewShell::GetObjectState( SfxItemSet& rSet ) { - // SID_OLE_OBJECT - removed (old Basic) + // SID_OLE_OBJECT - removed (old Basic) SfxWhichIter aIter(rSet); USHORT nWhich = aIter.FirstWhich(); @@ -224,7 +224,7 @@ void ScTabViewShell::GetObjectState( SfxItemSet& rSet ) else // if ( nWhich == SID_OBJECT_HEIGHT ) nVal = aRect.GetHeight(); - //! von 1/100mm in irgendwas umrechnen ?????? + //! von 1/100mm in irgendwas umrechnen ?????? rSet.Put( SfxInt32Item( nWhich, nVal ) ); } diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 4ffb4d6db889..a73247266067 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -72,13 +72,13 @@ using namespace com::sun::star; -#define SC_GROWY_SMALL_EXTRA 100 -#define SC_GROWY_BIG_EXTRA 200 +#define SC_GROWY_SMALL_EXTRA 100 +#define SC_GROWY_BIG_EXTRA 200 #define TAG_TABBARWIDTH "tw:" -static BOOL bMoveArea = FALSE; //! Member? -USHORT nEditAdjust = SVX_ADJUST_LEFT; //! Member !!! +static BOOL bMoveArea = FALSE; //! Member? +USHORT nEditAdjust = SVX_ADJUST_LEFT; //! Member !!! ScViewDataTable::ScViewDataTable() : eZoomType( SVX_ZOOM_PERCENT ), @@ -296,40 +296,40 @@ void ScViewDataTable::ReadUserDataSequence(const uno::Sequence <beans::PropertyV } ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) - : pDocShell ( pDocSh ), - pDoc ( NULL ), - pView ( pViewSh ), - pViewShell ( pViewSh ), - pOptions ( new ScViewOptions ), + : pDocShell ( pDocSh ), + pDoc ( NULL ), + pView ( pViewSh ), + pViewShell ( pViewSh ), + pOptions ( new ScViewOptions ), pSpellingView ( NULL ), - aLogicMode ( MAP_100TH_MM ), + aLogicMode ( MAP_100TH_MM ), eDefZoomType( SVX_ZOOM_PERCENT ), aDefZoomX ( 1,1 ), aDefZoomY ( 1,1 ), aDefPageZoomX( 3,5 ), aDefPageZoomY( 3,5 ), - eRefType ( SC_REFTYPE_NONE ), - nTabNo ( 0 ), - nRefTabNo ( 0 ), + eRefType ( SC_REFTYPE_NONE ), + nTabNo ( 0 ), + nRefTabNo ( 0 ), nPasteFlags ( SC_PASTE_NONE ), eEditActivePart( SC_SPLIT_BOTTOMLEFT ), - bActive ( TRUE ), //! wie initialisieren? - bIsRefMode ( FALSE ), + bActive ( TRUE ), //! wie initialisieren? + bIsRefMode ( FALSE ), bDelMarkValid( FALSE ), - nFillMode ( SC_FILL_NONE ), - bPagebreak ( FALSE ), + nFillMode ( SC_FILL_NONE ), + bPagebreak ( FALSE ), bSelCtrlMouseClick( FALSE ) { - SetGridMode ( TRUE ); - SetSyntaxMode ( FALSE ); - SetHeaderMode ( TRUE ); - SetTabMode ( TRUE ); - SetVScrollMode ( TRUE ); - SetHScrollMode ( TRUE ); - SetOutlineMode ( TRUE ); + SetGridMode ( TRUE ); + SetSyntaxMode ( FALSE ); + SetHeaderMode ( TRUE ); + SetTabMode ( TRUE ); + SetVScrollMode ( TRUE ); + SetHScrollMode ( TRUE ); + SetOutlineMode ( TRUE ); - aScrSize = Size( (long) ( STD_COL_WIDTH * PIXEL_PER_TWIPS * OLE_STD_CELLS_X ), + aScrSize = Size( (long) ( STD_COL_WIDTH * PIXEL_PER_TWIPS * OLE_STD_CELLS_X ), (long) ( ScGlobal::nStdRowHeight * PIXEL_PER_TWIPS * OLE_STD_CELLS_Y ) ); pTabData[0] = new ScViewDataTable; for ( SCTAB i = 1; i <= MAXTAB; i++ ) @@ -351,7 +351,7 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) *pOptions = pDoc->GetViewOptions(); } - // keine ausgeblendete Tabelle anzeigen: + // keine ausgeblendete Tabelle anzeigen: if (pDoc && !pDoc->IsVisible(nTabNo)) { while ( !pDoc->IsVisible(nTabNo) && pDoc->HasTable(nTabNo+1) ) @@ -365,37 +365,37 @@ ScViewData::ScViewData( ScDocShell* pDocSh, ScTabViewShell* pViewSh ) } ScViewData::ScViewData( const ScViewData& rViewData ) - : pDocShell ( rViewData.pDocShell ), - pDoc ( rViewData.pDoc ), - pView ( rViewData.pView ), - pViewShell ( rViewData.pViewShell ), - pOptions ( new ScViewOptions( *(rViewData.pOptions) ) ), + : pDocShell ( rViewData.pDocShell ), + pDoc ( rViewData.pDoc ), + pView ( rViewData.pView ), + pViewShell ( rViewData.pViewShell ), + pOptions ( new ScViewOptions( *(rViewData.pOptions) ) ), pSpellingView ( rViewData.pSpellingView ), - aLogicMode ( rViewData.aLogicMode ), + aLogicMode ( rViewData.aLogicMode ), eDefZoomType( rViewData.eDefZoomType ), aDefZoomX ( rViewData.aDefZoomX ), aDefZoomY ( rViewData.aDefZoomY ), aDefPageZoomX( rViewData.aDefPageZoomX ), aDefPageZoomY( rViewData.aDefPageZoomY ), - eRefType ( SC_REFTYPE_NONE ), - nTabNo ( rViewData.nTabNo ), - nRefTabNo ( rViewData.nTabNo ), // kein RefMode + eRefType ( SC_REFTYPE_NONE ), + nTabNo ( rViewData.nTabNo ), + nRefTabNo ( rViewData.nTabNo ), // kein RefMode eEditActivePart( rViewData.eEditActivePart ), - bActive ( TRUE ), //! wie initialisieren? - bIsRefMode ( FALSE ), + bActive ( TRUE ), //! wie initialisieren? + bIsRefMode ( FALSE ), bDelMarkValid( FALSE ), - nFillMode ( SC_FILL_NONE ), - bPagebreak ( rViewData.bPagebreak ), + nFillMode ( SC_FILL_NONE ), + bPagebreak ( rViewData.bPagebreak ), bSelCtrlMouseClick( rViewData.bSelCtrlMouseClick ) { - SetGridMode ( rViewData.IsGridMode() ); - SetSyntaxMode ( rViewData.IsSyntaxMode() ); - SetHeaderMode ( rViewData.IsHeaderMode() ); - SetTabMode ( rViewData.IsTabMode() ); - SetVScrollMode ( rViewData.IsVScrollMode() ); - SetHScrollMode ( rViewData.IsHScrollMode() ); - SetOutlineMode ( rViewData.IsOutlineMode() ); + SetGridMode ( rViewData.IsGridMode() ); + SetSyntaxMode ( rViewData.IsSyntaxMode() ); + SetHeaderMode ( rViewData.IsHeaderMode() ); + SetTabMode ( rViewData.IsTabMode() ); + SetVScrollMode ( rViewData.IsVScrollMode() ); + SetHScrollMode ( rViewData.IsHScrollMode() ); + SetOutlineMode ( rViewData.IsOutlineMode() ); aScrSize = rViewData.aScrSize; for ( SCTAB i = 0; i <= MAXTAB; i++ ) @@ -492,7 +492,7 @@ void ScViewData::DeleteTab( SCTAB nTab ) void ScViewData::CopyTab( SCTAB nSrcTab, SCTAB nDestTab ) { if (nDestTab==SC_TAB_APPEND) - nDestTab = pDoc->GetTableCount() - 1; // am Doc muss vorher kopiert worden sein + nDestTab = pDoc->GetTableCount() - 1; // am Doc muss vorher kopiert worden sein if (nDestTab > MAXTAB) { @@ -537,20 +537,20 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab ) UpdateThis(); aMarkData.DeleteTab( nSrcTab ); - aMarkData.InsertTab( nInsTab ); // ggf. angepasst + aMarkData.InsertTab( nInsTab ); // ggf. angepasst } void ScViewData::SetViewShell( ScTabViewShell* pViewSh ) { if (pViewSh) { - pViewShell = pViewSh; - pView = pViewSh; + pViewShell = pViewSh; + pView = pViewSh; } else { - pViewShell = NULL; - pView = NULL; + pViewShell = NULL; + pView = NULL; } } void ScViewData::CreateTabData( std::vector< SCTAB >& rvTabs ) @@ -574,7 +574,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, std::vector< SCTAB >& tabs ) { if ( pTabData[i] ) pTabData[i]->eZoomType = eNew; - } + } eDefZoomType = eNew; } else @@ -601,7 +601,7 @@ void ScViewData::SetZoomType( SvxZoomType eNew, BOOL bAll ) if ( aMarkData.GetTableSelect(i) ) vTabs.push_back( i ); } - } + } SetZoomType( eNew, vTabs ); } @@ -690,7 +690,7 @@ void ScViewData::SetZoom( const Fraction& rNewX, const Fraction& rNewY, BOOL bAl if ( aMarkData.GetTableSelect(i) ) vTabs.push_back( i ); } - } + } SetZoom( rNewX, rNewY, vTabs ); } @@ -752,10 +752,10 @@ ScMarkType ScViewData::GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) ScMarkType ScViewData::GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab, SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const { - // parameter bMergeMark is no longer needed: The view's selection is never modified - // (a local copy is used), and a multi selection that adds to a single range can always - // be treated like a single selection (#108266# - GetSimpleArea isn't used in selection - // handling itself) + // parameter bMergeMark is no longer needed: The view's selection is never modified + // (a local copy is used), and a multi selection that adds to a single range can always + // be treated like a single selection (#108266# - GetSimpleArea isn't used in selection + // handling itself) ScRange aRange; ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple @@ -766,7 +766,7 @@ ScMarkType ScViewData::GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& ScMarkType ScViewData::GetSimpleArea( ScRange& rRange ) const { - // parameter bMergeMark is no longer needed, see above + // parameter bMergeMark is no longer needed, see above ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple return GetSimpleArea( rRange, aNewMark); @@ -774,9 +774,9 @@ ScMarkType ScViewData::GetSimpleArea( ScRange& rRange ) const void ScViewData::GetMultiArea( ScRangeListRef& rRange ) const { - // parameter bMergeMark is no longer needed, see GetSimpleArea + // parameter bMergeMark is no longer needed, see GetSimpleArea - ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple + ScMarkData aNewMark( aMarkData ); // use a local copy for MarkToSimple BOOL bMulti = aNewMark.IsMultiMarked(); if (bMulti) @@ -843,8 +843,8 @@ void ScViewData::SetFillMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, S nFillMode = SC_FILL_FILL; nFillStartX = nStartCol; nFillStartY = nStartRow; - nFillEndX = nEndCol; - nFillEndY = nEndRow; + nFillEndX = nEndCol; + nFillEndY = nEndRow; } void ScViewData::SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, @@ -853,13 +853,13 @@ void ScViewData::SetDragMode( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, S nFillMode = nMode; nFillStartX = nStartCol; nFillStartY = nStartRow; - nFillEndX = nEndCol; - nFillEndY = nEndRow; + nFillEndX = nEndCol; + nFillEndY = nEndRow; } void ScViewData::ResetFillMode() { - nFillMode = SC_FILL_NONE; + nFillMode = SC_FILL_NONE; } void ScViewData::GetFillData( SCCOL& rStartCol, SCROW& rStartRow, @@ -918,7 +918,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, BOOL bWasThere = FALSE; if (pEditView[eWhich]) { - // Wenn die View schon da ist, nichts aufrufen, was die Cursorposition aendert + // Wenn die View schon da ist, nichts aufrufen, was die Cursorposition aendert if (bEditActive[eWhich]) bWasThere = TRUE; @@ -936,7 +936,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, pEditView[eWhich] = new EditView( pNewEngine, pWin ); } - // bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon weg ist (23576) + // bei IdleFormat wird manchmal ein Cursor gemalt, wenn die View schon weg ist (23576) ULONG nEC = pNewEngine->GetControlWord(); pNewEngine->SetControlWord(nEC & ~EE_CNTRL_DOIDLEFORMAT); @@ -953,14 +953,14 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, BOOL bBreak = ( eJust == SVX_HOR_JUSTIFY_BLOCK ) || ((SfxBoolItem&)pPattern->GetItem(ATTR_LINEBREAK)).GetValue(); - BOOL bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler + BOOL bAsianVertical = pNewEngine->IsVertical(); // set by InputHandler Rectangle aPixRect = ScEditUtil( pDoc, nNewX,nNewY,nTabNo, GetScrPos(nNewX,nNewY,eWhich), pWin, nPPTX,nPPTY,GetZoomX(),GetZoomY() ). GetEditArea( pPattern, TRUE ); - // when right-aligned, leave space for the cursor - // in vertical mode, editing is always right-aligned + // when right-aligned, leave space for the cursor + // in vertical mode, editing is always right-aligned if ( nEditAdjust == SVX_ADJUST_RIGHT || bAsianVertical ) aPixRect.Right() += 1; @@ -973,7 +973,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // switching sheets or reference input on a different part eEditActivePart = eWhich; - // modify members nEditCol etc. only if also extending for needed area + // modify members nEditCol etc. only if also extending for needed area nEditCol = nNewX; nEditRow = nNewY; const ScMergeAttr* pMergeAttr = (ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); @@ -985,49 +985,49 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, nEditEndRow += pMergeAttr->GetRowMerge() - 1; nEditStartCol = nEditCol; - // For growing use only the alignment value from the attribute, numbers - // (existing or started) with default aligment extend to the right. + // For growing use only the alignment value from the attribute, numbers + // (existing or started) with default aligment extend to the right. BOOL bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER ); - BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left - BOOL bGrowBackwards = bGrowToLeft; // logical left + BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left + BOOL bGrowBackwards = bGrowToLeft; // logical left if ( bLayoutRTL ) - bGrowBackwards = !bGrowBackwards; // invert on RTL sheet + bGrowBackwards = !bGrowBackwards; // invert on RTL sheet if ( bAsianVertical ) - bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode + bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode long nSizeXPix; if (bBreak && !bAsianVertical) - nSizeXPix = aPixRect.GetWidth(); // Papersize -> kein H-Scrolling + nSizeXPix = aPixRect.GetWidth(); // Papersize -> kein H-Scrolling else { DBG_ASSERT(pView,"keine View fuer EditView"); if ( bGrowCentered ) { - // growing into both directions until one edge is reached - //! should be limited to whole cells in both directions + // growing into both directions until one edge is reached + //! should be limited to whole cells in both directions long nLeft = aPixRect.Left(); long nRight = pView->GetGridWidth(eHWhich) - aPixRect.Right(); nSizeXPix = aPixRect.GetWidth() + 2 * Min( nLeft, nRight ); } else if ( bGrowToLeft ) - nSizeXPix = aPixRect.Right(); // space that's available in the window when growing to the left + nSizeXPix = aPixRect.Right(); // space that's available in the window when growing to the left else nSizeXPix = pView->GetGridWidth(eHWhich) - aPixRect.Left(); if ( nSizeXPix <= 0 ) - nSizeXPix = aPixRect.GetWidth(); // editing outside to the right of the window -> keep cell width + nSizeXPix = aPixRect.GetWidth(); // editing outside to the right of the window -> keep cell width } DBG_ASSERT(pView,"keine View fuer EditView"); long nSizeYPix = pView->GetGridHeight(WhichV(eWhich)) - aPixRect.Top(); if ( nSizeYPix <= 0 ) - nSizeYPix = aPixRect.GetHeight(); // editing outside below the window -> keep cell height + nSizeYPix = aPixRect.GetHeight(); // editing outside below the window -> keep cell height Size aPaperSize = pView->GetActiveWin()->PixelToLogic( Size( nSizeXPix, nSizeYPix ), GetLogicMode() ); if ( bBreak && !bAsianVertical && SC_MOD()->GetInputOptions().GetTextWysiwyg() ) { - // #95593# if text is formatted for printer, use the exact same paper width - // (and same line breaks) as for output. + // #95593# if text is formatted for printer, use the exact same paper width + // (and same line breaks) as for output. Fraction aFract(1,1); Rectangle aUtilRect = ScEditUtil( pDoc,nNewX,nNewY,nTabNo, Point(0,0), pWin, @@ -1048,7 +1048,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, else if ( nEditAdjust == SVX_ADJUST_CENTER ) { aVis.Right() = ( aPaper.Width() - 1 + nDiff ) / 2; - bMoveArea = TRUE; // always + bMoveArea = TRUE; // always } else { @@ -1063,13 +1063,13 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, // and <PixelToLogic(..)>. This is needed for the correct visibility // of paragraphs in edit mode at the accessibility API. pEditView[eWhich]->SetVisArea(aVis); - // UpdateMode has been disabled in ScInputHandler::StartTable - // must be enabled before EditGrowY (GetTextHeight) + // UpdateMode has been disabled in ScInputHandler::StartTable + // must be enabled before EditGrowY (GetTextHeight) pNewEngine->SetUpdateMode( TRUE ); pNewEngine->SetStatusEventHdl( LINK( this, ScViewData, EditEngineHdl ) ); - EditGrowY( TRUE ); // adjust to existing text content + EditGrowY( TRUE ); // adjust to existing text content EditGrowX(); Point aDocPos = pEditView[eWhich]->GetWindowPosTopLeft(0); @@ -1082,7 +1082,7 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, if (!bWasThere) pNewEngine->InsertView(pEditView[eWhich]); - // Hintergrundfarbe der Zelle + // Hintergrundfarbe der Zelle Color aBackCol = ((const SvxBrushItem&)pPattern->GetItem(ATTR_BACKGROUND)).GetColor(); ScModule* pScMod = SC_MOD(); @@ -1093,8 +1093,8 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich, } pEditView[eWhich]->SetBackgroundColor( aBackCol ); - pEditView[eWhich]->Invalidate(); // noetig ?? - // noetig, wenn Position geaendert + pEditView[eWhich]->Invalidate(); // noetig ?? + // noetig, wenn Position geaendert } IMPL_LINK_INLINE_START( ScViewData, EmptyEditHdl, EditStatus *, EMPTYARG ) @@ -1141,27 +1141,27 @@ void ScViewData::EditGrowX() SCCOL nLeft = GetPosX(eHWhich); SCCOL nRight = nLeft + VisibleCellsX(eHWhich); - Size aSize = pEngine->GetPaperSize(); - Rectangle aArea = pCurView->GetOutputArea(); - long nOldRight = aArea.Right(); + Size aSize = pEngine->GetPaperSize(); + Rectangle aArea = pCurView->GetOutputArea(); + long nOldRight = aArea.Right(); - // Margin ist schon bei der urspruenglichen Breite beruecksichtigt + // Margin ist schon bei der urspruenglichen Breite beruecksichtigt long nTextWidth = pEngine->CalcTextWidth(); BOOL bChanged = FALSE; BOOL bAsianVertical = pEngine->IsVertical(); - // get bGrow... variables the same way as in SetEditEngine + // get bGrow... variables the same way as in SetEditEngine const ScPatternAttr* pPattern = pLocalDoc->GetPattern( nEditCol, nEditRow, nTabNo ); SvxCellHorJustify eJust = (SvxCellHorJustify)((const SvxHorJustifyItem&) pPattern->GetItem( ATTR_HOR_JUSTIFY )).GetValue(); BOOL bGrowCentered = ( eJust == SVX_HOR_JUSTIFY_CENTER ); - BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left - BOOL bGrowBackwards = bGrowToLeft; // logical left + BOOL bGrowToLeft = ( eJust == SVX_HOR_JUSTIFY_RIGHT ); // visual left + BOOL bGrowBackwards = bGrowToLeft; // logical left if ( bLayoutRTL ) - bGrowBackwards = !bGrowBackwards; // invert on RTL sheet + bGrowBackwards = !bGrowBackwards; // invert on RTL sheet if ( bAsianVertical ) - bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode + bGrowCentered = bGrowToLeft = bGrowBackwards = FALSE; // keep old behavior for asian mode BOOL bUnevenGrow = FALSE; if ( bGrowCentered ) @@ -1254,7 +1254,7 @@ void ScViewData::EditGrowX() if ( bGrowCentered ) { - // switch to center-aligned (undo?) and reset VisArea to center + // switch to center-aligned (undo?) and reset VisArea to center pEngine->SetDefaultItem( SvxAdjustItem( SVX_ADJUST_CENTER, EE_PARA_JUST ) ); @@ -1265,16 +1265,16 @@ void ScViewData::EditGrowX() } else if ( bGrowToLeft ) { - // switch to right-aligned (undo?) and reset VisArea to the right + // switch to right-aligned (undo?) and reset VisArea to the right pEngine->SetDefaultItem( SvxAdjustItem( SVX_ADJUST_RIGHT, EE_PARA_JUST ) ); aVis.Right() = aSize.Width() - 1; - aVis.Left() = aSize.Width() - aArea.GetWidth(); // with the new, increased area + aVis.Left() = aSize.Width() - aArea.GetWidth(); // with the new, increased area } else { - // switch to left-aligned (undo?) and reset VisArea to the left + // switch to left-aligned (undo?) and reset VisArea to the left pEngine->SetDefaultItem( SvxAdjustItem( SVX_ADJUST_LEFT, EE_PARA_JUST ) ); @@ -1288,10 +1288,10 @@ void ScViewData::EditGrowX() pCurView->SetOutputArea(aArea); - // In vertical mode, the whole text is moved to the next cell (right-aligned), - // so everything must be repainted. Otherwise, paint only the new area. - // If growing in centered alignment, if the cells left and right have different sizes, - // the whole text will move, and may not even obscure all of the original display. + // In vertical mode, the whole text is moved to the next cell (right-aligned), + // so everything must be repainted. Otherwise, paint only the new area. + // If growing in centered alignment, if the cells left and right have different sizes, + // the whole text will move, and may not even obscure all of the original display. if ( bUnevenGrow ) { aArea.Left() = pWin->PixelToLogic( Point(0,0) ).X(); @@ -1315,10 +1315,10 @@ void ScViewData::EditGrowY( BOOL bInitial ) ULONG nControl = pEditView[eWhich]->GetControlWord(); if ( nControl & EV_CNTRL_AUTOSCROLL ) { - // if end of screen had already been reached and scrolling enabled, - // don't further try to grow the edit area + // if end of screen had already been reached and scrolling enabled, + // don't further try to grow the edit area - pCurView->SetOutputArea( pCurView->GetOutputArea() ); // re-align to pixels + pCurView->SetOutputArea( pCurView->GetOutputArea() ); // re-align to pixels return; } @@ -1327,23 +1327,23 @@ void ScViewData::EditGrowY( BOOL bInitial ) SCROW nBottom = GetPosY(eVWhich) + VisibleCellsY(eVWhich); - Size aSize = pEngine->GetPaperSize(); - Rectangle aArea = pCurView->GetOutputArea(); - long nOldBottom = aArea.Bottom(); - long nTextHeight = pEngine->GetTextHeight(); + Size aSize = pEngine->GetPaperSize(); + Rectangle aArea = pCurView->GetOutputArea(); + long nOldBottom = aArea.Bottom(); + long nTextHeight = pEngine->GetTextHeight(); - // #106635# When editing a formula in a cell with optimal height, allow a larger portion - // to be clipped before extending to following rows, to avoid obscuring cells for - // reference input (next row is likely to be useful in formulas). + // #106635# When editing a formula in a cell with optimal height, allow a larger portion + // to be clipped before extending to following rows, to avoid obscuring cells for + // reference input (next row is likely to be useful in formulas). long nAllowedExtra = SC_GROWY_SMALL_EXTRA; if ( nEditEndRow == nEditRow && !( pDoc->GetRowFlags( nEditRow, nTabNo ) & CR_MANUALSIZE ) && pEngine->GetParagraphCount() <= 1 ) { - // If the (only) paragraph starts with a '=', it's a formula. - // If this is the initial call and the text is empty, allow the larger value, too, - // because this occurs in the normal progress of editing a formula. - // Subsequent calls with empty text might involve changed attributes (including - // font height), so they are treated like normal text. + // If the (only) paragraph starts with a '=', it's a formula. + // If this is the initial call and the text is empty, allow the larger value, too, + // because this occurs in the normal progress of editing a formula. + // Subsequent calls with empty text might involve changed attributes (including + // font height), so they are treated like normal text. String aText = pEngine->GetText( (USHORT) 0 ); if ( ( aText.Len() == 0 && bInitial ) || aText.GetChar(0) == (sal_Unicode)'=' ) nAllowedExtra = SC_GROWY_BIG_EXTRA; @@ -1361,11 +1361,11 @@ void ScViewData::EditGrowY( BOOL bInitial ) if ( aArea.Bottom() > aArea.Top() + aSize.Height() - 1 ) { aArea.Bottom() = aArea.Top() + aSize.Height() - 1; - bMaxReached = TRUE; // don't occupy more cells beyond paper size + bMaxReached = TRUE; // don't occupy more cells beyond paper size } bChanged = TRUE; - nAllowedExtra = SC_GROWY_SMALL_EXTRA; // larger value is only for first row + nAllowedExtra = SC_GROWY_SMALL_EXTRA; // larger value is only for first row } if (bChanged) @@ -1455,8 +1455,8 @@ void ScViewData::SetTabNo( SCTAB nNewTab ) CreateTabData(nTabNo); pThisTab = pTabData[nTabNo]; - CalcPPT(); // for common column width correction - RecalcPixPos(); //! nicht immer noetig! + CalcPPT(); // for common column width correction + RecalcPixPos(); //! nicht immer noetig! } void ScViewData::SetActivePart( ScSplitPos eNewActive ) @@ -1511,8 +1511,8 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, USHORT nTSize; - SCCOL nPosX = GetPosX(eWhichX); - SCCOL nX; + SCCOL nPosX = GetPosX(eWhichX); + SCCOL nX; long nScrPosX=0; if (nWhereX >= nPosX) @@ -1542,8 +1542,8 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, } } - SCROW nPosY = GetPosY(eWhichY); - SCROW nY; + SCROW nPosY = GetPosY(eWhichY); + SCROW nY; long nScrPosY=0; if (nWhereY >= nPosY) @@ -1584,7 +1584,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, if ( pDoc->IsLayoutRTL( nTabNo ) ) { - // mirror horizontal position + // mirror horizontal position nScrPosX = aScrSize.Width() - 1 - nScrPosX; } @@ -1594,7 +1594,7 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, } // -// Anzahl Zellen auf einem Bildschirm +// Anzahl Zellen auf einem Bildschirm // SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHORT nScrSizeX ) const @@ -1604,19 +1604,19 @@ SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, USHO if (pView) ((ScViewData*)this)->aScrSize.Width() = pView->GetGridWidth(eWhichX); - SCsCOL nX; - USHORT nScrPosX = 0; + SCsCOL nX; + USHORT nScrPosX = 0; if (nScrSizeX == SC_SIZE_NONE) nScrSizeX = (USHORT) aScrSize.Width(); if (nDir==1) - nX = nPosX; // vorwaerts + nX = nPosX; // vorwaerts else - nX = nPosX-1; // rueckwaerts + nX = nPosX-1; // rueckwaerts BOOL bOut = FALSE; for ( ; nScrPosX<=nScrSizeX && !bOut; nX = sal::static_int_cast<SCsCOL>(nX + nDir) ) { - SCsCOL nColNo = nX; + SCsCOL nColNo = nX; if ( nColNo < 0 || nColNo > MAXCOL ) bOut = TRUE; else @@ -1656,7 +1656,7 @@ SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHO nY = nPosY; long nScrPosY = 0; AddPixelsWhile( nScrPosY, nScrSizeY, nY, MAXROW, nPPTY, pDoc, nTabNo); - // Original loop ended on last evaluated +1 or if that was MAXROW even + // Original loop ended on last evaluated +1 or if that was MAXROW even // on MAXROW+2. nY += (nY == MAXROW ? 2 : 1); nY -= nPosY; @@ -1667,7 +1667,7 @@ SCROW ScViewData::CellsAtY( SCsROW nPosY, SCsROW nDir, ScVSplitPos eWhichY, USHO nY = nPosY-1; long nScrPosY = 0; AddPixelsWhileBackward( nScrPosY, nScrSizeY, nY, 0, nPPTY, pDoc, nTabNo); - // Original loop ended on last evaluated -1 or if that was 0 even on + // Original loop ended on last evaluated -1 or if that was 0 even on // -2. nY -= (nY == 0 ? 2 : 1); nY = (nPosY-1)-nY; @@ -1714,7 +1714,7 @@ BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& r { SCROW nLastRow = nRow; if (pDoc->RowHidden(nRow, nTabNo, NULL, &nLastRow)) - { + { nRow = nLastRow; continue; } @@ -1739,14 +1739,14 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, SCsCOL& rPosX, SCsROW& rPosY, BOOL bTestMerge, BOOL bRepair, BOOL bNextIfLarge ) { - // special handling of 0 is now in ScViewFunctionSet::SetCursorAtPoint + // special handling of 0 is now in ScViewFunctionSet::SetCursorAtPoint ScHSplitPos eHWhich = WhichH(eWhich); ScVSplitPos eVWhich = WhichV(eWhich); if ( pDoc->IsLayoutRTL( nTabNo ) ) { - // mirror horizontal position + // mirror horizontal position if (pView) aScrSize.Width() = pView->GetGridWidth(eHWhich); nClickX = aScrSize.Width() - 1 - nClickX; @@ -1789,7 +1789,7 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, } } - if (bNextIfLarge) // zu grosse Zellen ? + if (bNextIfLarge) // zu grosse Zellen ? { if ( rPosX == nStartPosX && nClickX > 0 ) { @@ -1814,7 +1814,7 @@ BOOL ScViewData::GetPosFromPixel( long nClickX, long nClickY, ScSplitPos eWhich, if (bTestMerge) { - //! public Methode um Position anzupassen + //! public Methode um Position anzupassen SCCOL nOrigX = rPosX; SCROW nOrigY = rPosY; @@ -1932,7 +1932,7 @@ void ScViewData::SetPosY( ScVSplitPos eWhich, SCROW nNewPosY ) pThisTab->nPosY[eWhich] = 0; } -void ScViewData::RecalcPixPos() // nach Zoom-Aenderungen +void ScViewData::RecalcPixPos() // nach Zoom-Aenderungen { for (USHORT eWhich=0; eWhich<2; eWhich++) { @@ -2052,7 +2052,7 @@ void ScViewData::SetScreen( const Rectangle& rVisArea ) { SetScreenPos( rVisArea.TopLeft() ); - // hier ohne GetOutputFactor(), weil fuer Ausgabe in Metafile + // hier ohne GetOutputFactor(), weil fuer Ausgabe in Metafile aScrSize = rVisArea.GetSize(); aScrSize.Width() = (long) @@ -2125,12 +2125,12 @@ void ScViewData::CalcPPT() { nPPTX = ScGlobal::nScreenPPTX * (double) GetZoomX(); if (pDocShell) - nPPTX = nPPTX / pDocShell->GetOutputFactor(); // Faktor ist Drucker zu Bildschirm + nPPTX = nPPTX / pDocShell->GetOutputFactor(); // Faktor ist Drucker zu Bildschirm nPPTY = ScGlobal::nScreenPPTY * (double) GetZoomY(); - // #83616# if detective objects are present, - // try to adjust horizontal scale so the most common column width has minimal rounding errors, - // to avoid differences between cell and drawing layer output + // #83616# if detective objects are present, + // try to adjust horizontal scale so the most common column width has minimal rounding errors, + // to avoid differences between cell and drawing layer output if ( pDoc && pDoc->HasDetectiveObjects(nTabNo) ) { @@ -2138,7 +2138,7 @@ void ScViewData::CalcPPT() SCROW nDummy = 0; pDoc->GetTableArea( nTabNo, nEndCol, nDummy ); if (nEndCol<20) - nEndCol = 20; // same end position as when determining draw scale + nEndCol = 20; // same end position as when determining draw scale USHORT nTwips = pDoc->GetCommonWidth( nEndCol, nTabNo ); if ( nTwips ) @@ -2146,8 +2146,8 @@ void ScViewData::CalcPPT() double fOriginal = nTwips * nPPTX; if ( fOriginal < static_cast<double>(nEndCol) ) { - // if one column is smaller than the column count, - // rounding errors are likely to add up to a whole column. + // if one column is smaller than the column count, + // rounding errors are likely to add up to a whole column. double fRounded = ::rtl::math::approxFloor( fOriginal + 0.5 ); if ( fRounded > 0.0 ) @@ -2161,18 +2161,18 @@ void ScViewData::CalcPPT() } } -#define SC_OLD_TABSEP '/' -#define SC_NEW_TABSEP '+' +#define SC_OLD_TABSEP '/' +#define SC_NEW_TABSEP '+' void ScViewData::WriteUserData(String& rData) { - // nZoom (bis 364v) oder nZoom/nPageZoom/bPageMode (ab 364w) - // nTab + // nZoom (bis 364v) oder nZoom/nPageZoom/bPageMode (ab 364w) + // nTab // Tab-ControlBreite - // pro Tabelle: - // CursorX/CursorY/HSplitMode/VSplitMode/HSplitPos/VSplitPos/SplitActive/ - // PosX[links]/PosX[rechts]/PosY[oben]/PosY[unten] - // wenn Zeilen groesser 8192, "+" statt "/" + // pro Tabelle: + // CursorX/CursorY/HSplitMode/VSplitMode/HSplitPos/VSplitPos/SplitActive/ + // PosX[links]/PosX[rechts]/PosY[oben]/PosY[unten] + // wenn Zeilen groesser 8192, "+" statt "/" USHORT nZoom = (USHORT)((pThisTab->aZoomY.GetNumerator() * 100) / pThisTab->aZoomY.GetDenominator()); rData = String::CreateFromInt32( nZoom ); @@ -2194,16 +2194,16 @@ void ScViewData::WriteUserData(String& rData) SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB i=0; i<nTabCount; i++) { - rData += ';'; // Numerierung darf auf keinen Fall durcheinanderkommen + rData += ';'; // Numerierung darf auf keinen Fall durcheinanderkommen if (pTabData[i]) { - sal_Unicode cTabSep = SC_OLD_TABSEP; // wie 3.1 + sal_Unicode cTabSep = SC_OLD_TABSEP; // wie 3.1 if ( pTabData[i]->nCurY > MAXROW_30 || pTabData[i]->nPosY[0] > MAXROW_30 || pTabData[i]->nPosY[1] > MAXROW_30 || ( pTabData[i]->eVSplitMode == SC_SPLIT_FIX && pTabData[i]->nFixPosY > MAXROW_30 ) ) { - cTabSep = SC_NEW_TABSEP; // um eine 3.1-Version nicht umzubringen + cTabSep = SC_NEW_TABSEP; // um eine 3.1-Version nicht umzubringen } @@ -2240,14 +2240,14 @@ void ScViewData::WriteUserData(String& rData) void ScViewData::ReadUserData(const String& rData) { - if (!rData.Len()) // Leerer String kommt bei "neu Laden" - return; // dann auch ohne Assertion beenden + if (!rData.Len()) // Leerer String kommt bei "neu Laden" + return; // dann auch ohne Assertion beenden xub_StrLen nCount = rData.GetTokenCount(';'); if ( nCount <= 2 ) { - // #45208# beim Reload in der Seitenansicht sind evtl. die Preview-UserData - // stehengelassen worden. Den Zoom von der Preview will man hier nicht... + // #45208# beim Reload in der Seitenansicht sind evtl. die Preview-UserData + // stehengelassen worden. Den Zoom von der Preview will man hier nicht... DBG_ERROR("ReadUserData: das sind nicht meine Daten"); return; } @@ -2260,19 +2260,19 @@ void ScViewData::ReadUserData(const String& rData) Fraction aZoomX, aZoomY, aPageZoomX, aPageZoomY; //! evaluate (all sheets?) - String aZoomStr = rData.GetToken(0); // Zoom/PageZoom/Modus + String aZoomStr = rData.GetToken(0); // Zoom/PageZoom/Modus USHORT nNormZoom = sal::static_int_cast<USHORT>(aZoomStr.GetToken(0,'/').ToInt32()); if ( nNormZoom >= MINZOOM && nNormZoom <= MAXZOOM ) - aZoomX = aZoomY = Fraction( nNormZoom, 100 ); // "normaler" Zoom (immer) + aZoomX = aZoomY = Fraction( nNormZoom, 100 ); // "normaler" Zoom (immer) USHORT nPageZoom = sal::static_int_cast<USHORT>(aZoomStr.GetToken(1,'/').ToInt32()); if ( nPageZoom >= MINZOOM && nPageZoom <= MAXZOOM ) - aPageZoomX = aPageZoomY = Fraction( nPageZoom, 100 ); // Pagebreak-Zoom, wenn gesetzt - sal_Unicode cMode = aZoomStr.GetToken(2,'/').GetChar(0); // 0 oder "0"/"1" + aPageZoomX = aPageZoomY = Fraction( nPageZoom, 100 ); // Pagebreak-Zoom, wenn gesetzt + sal_Unicode cMode = aZoomStr.GetToken(2,'/').GetChar(0); // 0 oder "0"/"1" SetPagebreakMode( cMode == '1' ); // SetPagebreakMode muss immer gerufen werden wegen CalcPPT / RecalcPixPos() // - // Tabelle kann ungueltig geworden sein (z.B. letzte Version): + // Tabelle kann ungueltig geworden sein (z.B. letzte Version): // SCTAB nNewTab = static_cast<SCTAB>(rData.GetToken(1).ToInt32()); if (pDoc->HasTable( nNewTab )) @@ -2335,15 +2335,15 @@ void ScViewData::ReadUserData(const String& rData) pTabData[nPos]->nPosY[0] = SanitizeRow( aTabOpt.GetToken(9,cTabSep).ToInt32()); pTabData[nPos]->nPosY[1] = SanitizeRow( aTabOpt.GetToken(10,cTabSep).ToInt32()); - // Test, ob der aktive Teil laut SplitMode ueberhaupt existiert - // (Bug #44516#) + // Test, ob der aktive Teil laut SplitMode ueberhaupt existiert + // (Bug #44516#) ScSplitPos eTest = pTabData[nPos]->eWhichActive; if ( ( WhichH( eTest ) == SC_SPLIT_RIGHT && pTabData[nPos]->eHSplitMode == SC_SPLIT_NONE ) || ( WhichV( eTest ) == SC_SPLIT_TOP && pTabData[nPos]->eVSplitMode == SC_SPLIT_NONE ) ) { - // dann wieder auf Default (unten links) + // dann wieder auf Default (unten links) pTabData[nPos]->eWhichActive = SC_SPLIT_BOTTOMLEFT; DBG_ERROR("SplitPos musste korrigiert werden"); } @@ -2894,12 +2894,12 @@ void ScViewData::ReadUserDataSequence(const uno::Sequence <beans::PropertyValue> void ScViewData::SetOptions( const ScViewOptions& rOpt ) { - // if visibility of horiz. ScrollBar is changed, TabBar may have to be resized... + // if visibility of horiz. ScrollBar is changed, TabBar may have to be resized... BOOL bHScrollChanged = ( rOpt.GetOption(VOPT_HSCROLL) != pOptions->GetOption(VOPT_HSCROLL) ); - // if graphics are turned on or off, animation has to be started or stopped - // graphics are controlled by VOBJ_TYPE_OLE - BOOL bGraphicsChanged = ( pOptions->GetObjMode(VOBJ_TYPE_OLE) != + // if graphics are turned on or off, animation has to be started or stopped + // graphics are controlled by VOBJ_TYPE_OLE + BOOL bGraphicsChanged = ( pOptions->GetObjMode(VOBJ_TYPE_OLE) != rOpt.GetObjMode(VOBJ_TYPE_OLE) ); *pOptions = rOpt; @@ -2928,10 +2928,10 @@ BOOL ScViewData::IsOle() return pDocShell && pDocShell->IsOle(); } -BOOL ScViewData::UpdateFixX( SCTAB nTab ) // TRUE = Wert geaendert +BOOL ScViewData::UpdateFixX( SCTAB nTab ) // TRUE = Wert geaendert { - if (!ValidTab(nTab)) // Default - nTab=nTabNo; // akuelle Tabelle + if (!ValidTab(nTab)) // Default + nTab=nTabNo; // akuelle Tabelle if (!pView || pTabData[nTab]->eHSplitMode != SC_SPLIT_FIX) return FALSE; @@ -2956,17 +2956,17 @@ BOOL ScViewData::UpdateFixX( SCTAB nTab ) // TRUE = Wert geaendert { pTabData[nTab]->nHSplitPos = nNewPos; if (nTab == nTabNo) - RecalcPixPos(); //! sollte nicht noetig sein !!! + RecalcPixPos(); //! sollte nicht noetig sein !!! return TRUE; } return FALSE; } -BOOL ScViewData::UpdateFixY( SCTAB nTab ) // TRUE = Wert geaendert +BOOL ScViewData::UpdateFixY( SCTAB nTab ) // TRUE = Wert geaendert { - if (!ValidTab(nTab)) // Default - nTab=nTabNo; // akuelle Tabelle + if (!ValidTab(nTab)) // Default + nTab=nTabNo; // akuelle Tabelle if (!pView || pTabData[nTab]->eVSplitMode != SC_SPLIT_FIX) return FALSE; @@ -2991,7 +2991,7 @@ BOOL ScViewData::UpdateFixY( SCTAB nTab ) // TRUE = Wert geaendert { pTabData[nTab]->nVSplitPos = nNewPos; if (nTab == nTabNo) - RecalcPixPos(); //! sollte nicht noetig sein !!! + RecalcPixPos(); //! sollte nicht noetig sein !!! return TRUE; } @@ -3015,9 +3015,9 @@ void ScViewData::UpdateOutlinerFlags( Outliner& rOutl ) const rOutl.SetCalcFieldValueHdl( LINK( SC_MOD(), ScModule, CalcFieldValueHdl ) ); - // #97417# don't call GetSpellChecker if online spelling isn't enabled. - // The language for AutoCorrect etc. is taken from the pool defaults - // (set in ScDocument::UpdateDrawLanguages) + // #97417# don't call GetSpellChecker if online spelling isn't enabled. + // The language for AutoCorrect etc. is taken from the pool defaults + // (set in ScDocument::UpdateDrawLanguages) if ( bOnlineSpell ) { @@ -3036,7 +3036,7 @@ ScAddress ScViewData::GetCurPos() const // static -void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY, +void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY, SCROW nEndRow, double nPPTY, const ScDocument * pDoc, SCTAB nTabNo ) { SCROW nRow = rPosY; @@ -3077,7 +3077,7 @@ void ScViewData::AddPixelsWhile( long & rScrY, long nEndPixels, SCROW & rPosY, // static void ScViewData::AddPixelsWhileBackward( long & rScrY, long nEndPixels, - SCROW & rPosY, SCROW nStartRow, double nPPTY, const ScDocument * pDoc, + SCROW & rPosY, SCROW nStartRow, double nPPTY, const ScDocument * pDoc, SCTAB nTabNo ) { SCROW nRow = rPosY; diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 49f93c43ffac..04ebe2d42c09 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ using namespace com::sun::star; #include "attrib.hxx" #include "autoform.hxx" -#include "cell.hxx" // EnterAutoSum +#include "cell.hxx" // EnterAutoSum #include "cellmergeoption.hxx" #include "compiler.hxx" #include "docfunc.hxx" @@ -249,7 +249,7 @@ ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, //---------------------------------------------------------------------------- -#define SC_AUTOSUM_MAXCOUNT 20 +#define SC_AUTOSUM_MAXCOUNT 20 ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow, SCTAB nTab, ScDirection eDir, SCCOLROW& nExtend ) @@ -420,11 +420,11 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList ) SCCOL nStartCol = nCol; SCROW nStartRow = nRow; - SCCOL nEndCol = nCol; - SCROW nEndRow = nRow; - SCCOL nSeekCol = nCol; - SCROW nSeekRow = nRow; - SCCOLROW nExtend; // wird per Reference gueltig bei ScAutoSumSum + SCCOL nEndCol = nCol; + SCROW nEndRow = nRow; + SCCOL nSeekCol = nCol; + SCROW nSeekRow = nRow; + SCCOLROW nExtend; // wird per Reference gueltig bei ScAutoSumSum BOOL bCol = FALSE; BOOL bRow = FALSE; @@ -455,19 +455,19 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList ) { if ( bRow ) { - nStartRow = nSeekRow; // nSeekRow evtl. per Reference angepasst + nStartRow = nSeekRow; // nSeekRow evtl. per Reference angepasst if ( eSum == ScAutoSumSum ) - nEndRow = nStartRow; // nur Summen summieren + nEndRow = nStartRow; // nur Summen summieren else - nEndRow = nRow - 1; // Datenbereich evtl. nach unten erweitern + nEndRow = nRow - 1; // Datenbereich evtl. nach unten erweitern } else { - nStartCol = nSeekCol; // nSeekCol evtl. per Reference angepasst + nStartCol = nSeekCol; // nSeekCol evtl. per Reference angepasst if ( eSum == ScAutoSumSum ) - nEndCol = nStartCol; // nur Summen summieren + nEndCol = nStartCol; // nur Summen summieren else - nEndCol = nCol - 1; // Datenbereich evtl. nach rechts erweitern + nEndCol = nCol - 1; // Datenbereich evtl. nach rechts erweitern } BOOL bContinue = FALSE; do @@ -476,7 +476,7 @@ BOOL ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList ) { if ( bRow ) { - while ( nStartRow != 0 && lcl_IsAutoSumData( pDoc, nCol, + while ( nStartRow != 0 && lcl_IsAutoSumData( pDoc, nCol, nStartRow-1, nTab, DIR_TOP, nExtend /*out*/ ) == eSum ) --nStartRow; } @@ -767,7 +767,7 @@ String ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTo void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData ) { - // Mehrfachselektion vorher abfragen... + // Mehrfachselektion vorher abfragen... SCCOL nCol = GetViewData()->GetCurX(); SCROW nRow = GetViewData()->GetCurY(); @@ -777,10 +777,10 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData { rMark.MarkToSimple(); if ( rMark.IsMultiMarked() ) - { // "Einfuegen auf Mehrfachselektion nicht moeglich" + { // "Einfuegen auf Mehrfachselektion nicht moeglich" ErrorMessage(STR_MSSG_PASTEFROMCLIP_0); - // insert into single cell + // insert into single cell if ( pData ) EnterData( nCol, nRow, nTab, pData ); else @@ -805,7 +805,7 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData } } - // Einfuegen per PasteFromClip + // Einfuegen per PasteFromClip WaitObject aWait( GetFrameWin() ); @@ -814,9 +814,9 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData ScDocument* pInsDoc = new ScDocument( SCDOCMODE_CLIP ); pInsDoc->ResetClip( pDoc, nTab ); - if (aNewStr.GetChar(0) == '=') // Formel ? + if (aNewStr.GetChar(0) == '=') // Formel ? { - // SetString geht nicht, weil in Clipboard-Dokumenten nicht kompiliert wird! + // SetString geht nicht, weil in Clipboard-Dokumenten nicht kompiliert wird! ScFormulaCell* pFCell = new ScFormulaCell( pDoc, aPos, aNewStr ); pInsDoc->PutCell( nCol, nRow, nTab, pFCell ); } @@ -833,7 +833,7 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData const SfxUInt32Item* pItem = (SfxUInt32Item*) pInsDoc->GetAttr( nCol, nRow, nTab, ATTR_VALUE_FORMAT ); if ( pItem ) - { // Numberformat setzen wenn inkompatibel + { // Numberformat setzen wenn inkompatibel // MarkData wurde bereits in PasteFromClip MarkToSimple'ed ScRange aRange; rMark.GetMarkArea( aRange ); @@ -851,7 +851,7 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData //---------------------------------------------------------------------------- -// manueller Seitenumbruch +// manueller Seitenumbruch void ScViewFunc::InsertPageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* pPos, BOOL bSetModified ) @@ -867,7 +867,7 @@ void ScViewFunc::InsertPageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* p InsertPageBreak( bColumn, aCursor, bRecord, bSetModified, FALSE ); if ( bSuccess && bSetModified ) - UpdatePageBreakData( TRUE ); // fuer PageBreak-Modus + UpdatePageBreakData( TRUE ); // fuer PageBreak-Modus } @@ -887,7 +887,7 @@ void ScViewFunc::DeletePageBreak( BOOL bColumn, BOOL bRecord, const ScAddress* p RemovePageBreak( bColumn, aCursor, bRecord, bSetModified, FALSE ); if ( bSuccess && bSetModified ) - UpdatePageBreakData( TRUE ); // fuer PageBreak-Modus + UpdatePageBreakData( TRUE ); // fuer PageBreak-Modus } //---------------------------------------------------------------------------- @@ -939,12 +939,12 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, const String* pRepCol, const String* pRepRow, BOOL bAddPrint ) { - // on all selected tables + // on all selected tables - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); - SCTAB nTabCount = pDoc->GetTableCount(); - ScMarkData& rMark = GetViewData()->GetMarkData(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); + SCTAB nTabCount = pDoc->GetTableCount(); + ScMarkData& rMark = GetViewData()->GetMarkData(); SCTAB nTab; BOOL bUndo (pDoc->IsUndoEnabled()); @@ -957,7 +957,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, { ScRange aRange( 0,0,nTab ); - // print ranges + // print ranges if( !bAddPrint ) pDoc->ClearPrintRanges( nTab ); @@ -1005,7 +1005,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, } } - // repeat columns + // repeat columns if ( pRepCol ) { @@ -1016,7 +1016,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, pDoc->SetRepeatColRange( nTab, &aRange ); } - // repeat rows + // repeat rows if ( pRepRow ) { @@ -1028,7 +1028,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, } } - // undo (for all tables) + // undo (for all tables) if (bUndo) { SCTAB nCurTab = GetViewData()->GetTabNo(); @@ -1037,7 +1037,7 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, new ScUndoPrintRange( pDocSh, nCurTab, pOldRanges, pNewRanges ) ); } - // update page breaks + // update page breaks for (nTab=0; nTab<nTabCount; nTab++) if (rMark.GetTableSelect(nTab)) @@ -1050,11 +1050,11 @@ void ScViewFunc::SetPrintRanges( BOOL bEntireSheet, const String* pPrint, } //---------------------------------------------------------------------------- -// Zellen zusammenfassen +// Zellen zusammenfassen -BOOL ScViewFunc::TestMergeCells() // Vorab-Test (fuer Menue) +BOOL ScViewFunc::TestMergeCells() // Vorab-Test (fuer Menue) { - // simple test: TRUE if there's a selection but no multi selection and not filtered + // simple test: TRUE if there's a selection but no multi selection and not filtered const ScMarkData& rMark = GetViewData()->GetMarkData(); if ( rMark.IsMarked() || rMark.IsMultiMarked() ) @@ -1071,8 +1071,8 @@ BOOL ScViewFunc::TestMergeCells() // Vorab-Test (fuer Menue) BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord, BOOL bCenter ) { - // Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc), - // damit dann nicht die Inhalte-QueryBox kommt + // Editable- und Verschachtelungs-Abfrage muss vorneweg sein (auch in DocFunc), + // damit dann nicht die Inhalte-QueryBox kommt ScEditableTester aTester( this ); if (!aTester.IsEditable()) { @@ -1107,7 +1107,7 @@ BOOL ScViewFunc::MergeCells( BOOL bApi, BOOL& rDoContents, BOOL bRecord, BOOL bC if ( pDoc->HasAttrib( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab, HASATTR_MERGED | HASATTR_OVERLAPPED ) ) - { // "Zusammenfassen nicht verschachteln !" + { // "Zusammenfassen nicht verschachteln !" ErrorMessage(STR_MSSG_MERGECELLS_0); return FALSE; } @@ -1263,7 +1263,7 @@ BOOL ScViewFunc::RemoveMerge( BOOL bRecord ) if (bOk) pDocSh->UpdateOle(GetViewData()); } - return TRUE; //! bOk ?? + return TRUE; //! bOk ?? } //---------------------------------------------------------------------------- @@ -1332,7 +1332,7 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, FillAuto( aRange, &rMark, eDir, nCount, bRecord, FALSE ); if (bSuccess) { - MarkRange( aRange, FALSE ); // aRange ist in FillAuto veraendert worden + MarkRange( aRange, FALSE ); // aRange ist in FillAuto veraendert worden pDocSh->UpdateOle(GetViewData()); UpdateScrollBars(); @@ -1405,12 +1405,12 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL aMarkRange = ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(), nTab ); ScDocument* pUndoDoc = NULL; -// if ( bRecord ) +// if ( bRecord ) if (bUndo) { pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); pUndoDoc->InitUndo( pDoc, nTab, nTab ); -// pUndoDoc->SelectTable( nTab, TRUE ); // nur fuer Markierung +// pUndoDoc->SelectTable( nTab, TRUE ); // nur fuer Markierung SCTAB nTabCount = pDoc->GetTableCount(); for (SCTAB i=0; i<nTabCount; i++) @@ -1420,7 +1420,7 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL aMarkRange.aStart.SetTab( i ); aMarkRange.aEnd.SetTab( i ); pDoc->CopyToDocument( aMarkRange, IDF_ALL, bMulti, pUndoDoc ); -// pUndoDoc->SelectTable( i, TRUE ); +// pUndoDoc->SelectTable( i, TRUE ); } } @@ -1433,9 +1433,9 @@ void ScViewFunc::FillTab( USHORT nFlags, USHORT nFunction, BOOL bSkipEmpty, BOOL pDoc->FillTab( aMarkRange, rMark, nFlags, nFunction, bSkipEmpty, bAsLink ); } -// if ( bRecord ) +// if ( bRecord ) if (bUndo) - { //! fuer ChangeTrack erst zum Schluss + { //! fuer ChangeTrack erst zum Schluss pDocSh->GetUndoManager()->AddUndoAction( new ScUndoFillTable( pDocSh, rMark, aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), nTab, @@ -1529,7 +1529,7 @@ void ScViewFunc::TransliterateText( sal_Int32 nType ) ScMarkData aFuncMark = GetViewData()->GetMarkData(); if ( !aFuncMark.IsMarked() && !aFuncMark.IsMultiMarked() ) { - // no selection -> use cursor position + // no selection -> use cursor position ScAddress aCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); aFuncMark.SetMarkArea( ScRange( aCursor ) ); @@ -1544,7 +1544,7 @@ void ScViewFunc::TransliterateText( sal_Int32 nType ) } //---------------------------------------------------------------------------- -// AutoFormat +// AutoFormat ScAutoFormatData* ScViewFunc::CreateAutoFormatData() { @@ -1652,7 +1652,7 @@ void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord ) nEndCol, nEndRow, nEndTab, PAINT_GRID ); } - if ( bRecord ) // Draw-Undo erst jetzt verfuegbar + if ( bRecord ) // Draw-Undo erst jetzt verfuegbar { pDocSh->GetUndoManager()->AddUndoAction( new ScUndoAutoFormat( pDocSh, @@ -1671,7 +1671,7 @@ void ScViewFunc::AutoFormat( USHORT nFormatNo, BOOL bRecord ) //---------------------------------------------------------------------------- -// Suchen & Ersetzen +// Suchen & Ersetzen void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, BOOL bAddUndo, BOOL bIsApi ) @@ -1706,7 +1706,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, } } else - { //! mindestens eine ist immer selektiert + { //! mindestens eine ist immer selektiert nStartTab = nEndTab = rMark.GetFirstSelected(); for ( SCTAB j = nStartTab + 1; j <= nLastTab; j++ ) { @@ -1735,14 +1735,14 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, || nCommand == SVX_SEARCHCMD_FIND_ALL) bAddUndo = FALSE; - //! bAttrib bei Undo beruecksichtigen !!! + //! bAttrib bei Undo beruecksichtigen !!! ScDocument* pUndoDoc = NULL; ScMarkData* pUndoMark = NULL; String aUndoStr; if (bAddUndo) { - pUndoMark = new ScMarkData( rMark ); // Markierung wird veraendert + pUndoMark = new ScMarkData( rMark ); // Markierung wird veraendert if ( nCommand == SVX_SEARCHCMD_REPLACE_ALL ) { pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); @@ -1751,17 +1751,17 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, } if ( bAllTables ) - { //! alles selektieren, erst nachdem pUndoMark erzeugt wurde + { //! alles selektieren, erst nachdem pUndoMark erzeugt wurde for ( SCTAB j = nStartTab; j <= nEndTab; j++ ) { rMark.SelectTable( j, TRUE ); } } - DoneBlockMode(TRUE); // Markierung nicht loeschen! + DoneBlockMode(TRUE); // Markierung nicht loeschen! InitOwnBlockMode(); - // wenn vom Anfang an gesucht wird, nicht nochmal fragen ob vom Anfang gesucht werden soll + // wenn vom Anfang an gesucht wird, nicht nochmal fragen ob vom Anfang gesucht werden soll BOOL bFirst = TRUE; if ( nCol == 0 && nRow == 0 && nTab == nStartTab && !pSearchItem->GetBackward() ) bFirst = FALSE; @@ -1783,7 +1783,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, pUndoDoc = NULL; } - break; // Abbruch while True + break; // Abbruch while True } else if ( bFirst && (nCommand == SVX_SEARCHCMD_FIND || nCommand == SVX_SEARCHCMD_REPLACE) ) @@ -1795,7 +1795,7 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, nRetVal = RET_NO; else { - // Suchen-Dialog als Parent, wenn vorhanden + // Suchen-Dialog als Parent, wenn vorhanden Window* pParent = GetParentOrChild(SID_SEARCH_DLG); USHORT nStrId; if ( pSearchItem->GetBackward() ) @@ -1828,38 +1828,38 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, } else { - break; // Abbruch while True + break; // Abbruch while True } } - else // nichts gefunden + else // nichts gefunden { if ( nCommand == SVX_SEARCHCMD_FIND_ALL || nCommand == SVX_SEARCHCMD_REPLACE_ALL ) { - pDocSh->PostPaintGridAll(); // Markierung + pDocSh->PostPaintGridAll(); // Markierung } GetFrameWin()->LeaveWait(); if (!bIsApi) { - // Suchen-Dialog als Parent, wenn vorhanden + // Suchen-Dialog als Parent, wenn vorhanden Window* pParent = GetParentOrChild(SID_SEARCH_DLG); // "nichts gefunden" InfoBox aBox( pParent, ScGlobal::GetRscString( STR_MSSG_SEARCHANDREPLACE_0 ) ); aBox.Execute(); } - break; // Abbruch while True + break; // Abbruch while True } - } // of while TRUE + } // of while TRUE if ( pOldSelectedTables ) - { // urspruenglich selektierte Tabellen wiederherstellen + { // urspruenglich selektierte Tabellen wiederherstellen for ( SCTAB j = nStartTab; j <= nEndTab; j++ ) { rMark.SelectTable( j, pOldSelectedTables[j] ); } if ( bFound ) - { // durch Fundstelle neu selektierte Tabelle bleibt + { // durch Fundstelle neu selektierte Tabelle bleibt rMark.SelectTable( nTab, TRUE ); // wenn vorher nur eine selektiert war, ist es ein Tausch //! wenn nicht, ist jetzt evtl. eine mehr selektiert @@ -1876,8 +1876,8 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, if ( nTab != GetViewData()->GetTabNo() ) SetTabNo( nTab ); - // wenn nichts markiert ist, DoneBlockMode, damit von hier aus - // direkt per Shift-Cursor markiert werden kann: + // wenn nichts markiert ist, DoneBlockMode, damit von hier aus + // direkt per Shift-Cursor markiert werden kann: if (!rMark.IsMarked() && !rMark.IsMultiMarked()) DoneBlockMode(TRUE); @@ -1894,17 +1894,17 @@ void ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, pDocSh->SetDocumentModified(); } else if ( nCommand == SVX_SEARCHCMD_FIND_ALL ) - pDocSh->PostPaintGridAll(); // Markierung + pDocSh->PostPaintGridAll(); // Markierung GetFrameWin()->LeaveWait(); } - delete pUndoDoc; // loeschen wenn nicht benutzt - delete pUndoMark; // kann immer geloescht werden + delete pUndoDoc; // loeschen wenn nicht benutzt + delete pUndoMark; // kann immer geloescht werden } //---------------------------------------------------------------------------- -// Zielwertsuche +// Zielwertsuche void ScViewFunc::Solve( const ScSolveParam& rParam ) { @@ -1928,12 +1928,12 @@ void ScViewFunc::Solve( const ScSolveParam& rParam ) aTargetValStr = *(rParam.pStrTargetVal); String aMsgStr; - String aResStr; - double nSolveResult; + String aResStr; + double nSolveResult; GetFrameWin()->EnterWait(); - BOOL bExact = + BOOL bExact = pDoc->Solver( rParam.aRefFormulaCell.Col(), rParam.aRefFormulaCell.Row(), @@ -1982,7 +1982,7 @@ void ScViewFunc::Solve( const ScSolveParam& rParam ) //---------------------------------------------------------------------------- -// Mehrfachoperation +// Mehrfachoperation void ScViewFunc::TabOp( const ScTabOpParam& rParam, BOOL bRecord ) { @@ -2003,17 +2003,17 @@ void ScViewFunc::TabOp( const ScTabOpParam& rParam, BOOL bRecord ) void ScViewFunc::MakeScenario( const String& rName, const String& rComment, const Color& rColor, USHORT nFlags ) { - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScMarkData& rMark = GetViewData()->GetMarkData(); - SCTAB nTab = GetViewData()->GetTabNo(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScMarkData& rMark = GetViewData()->GetMarkData(); + SCTAB nTab = GetViewData()->GetTabNo(); SCTAB nNewTab = pDocSh->MakeScenario( nTab, rName, rComment, rColor, nFlags, rMark ); if (nFlags & SC_SCENARIO_COPYALL) - SetTabNo( nNewTab, TRUE ); // SC_SCENARIO_COPYALL -> sichtbar + SetTabNo( nNewTab, TRUE ); // SC_SCENARIO_COPYALL -> sichtbar else { SfxBindings& rBindings = GetViewData()->GetBindings(); - rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar + rBindings.Invalidate( SID_STATUS_DOCPOS ); // Statusbar rBindings.Invalidate( SID_TABLES_COUNT ); rBindings.Invalidate( SID_SELECT_SCENARIO ); rBindings.Invalidate( FID_TABLE_SHOW ); @@ -2032,7 +2032,7 @@ void ScViewFunc::ExtendScenario() return; } - // Undo: Attribute anwenden + // Undo: Attribute anwenden ScDocument* pDoc = GetViewData()->GetDocument(); ScPatternAttr aPattern( pDoc->GetPool() ); @@ -2046,8 +2046,8 @@ void ScViewFunc::ExtendScenario() void ScViewFunc::UseScenario( const String& rName ) { - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - SCTAB nTab = GetViewData()->GetTabNo(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + SCTAB nTab = GetViewData()->GetTabNo(); DoneBlockMode(); InitOwnBlockMode(); @@ -2056,11 +2056,11 @@ void ScViewFunc::UseScenario( const String& rName ) //---------------------------------------------------------------------------- -// Tabelle einfuegen +// Tabelle einfuegen BOOL ScViewFunc::InsertTable( const String& rName, SCTAB nTab, BOOL bRecord ) { - // Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt + // Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc(). InsertTable( nTab, rName, bRecord, FALSE ); if (bSuccess) @@ -2070,13 +2070,13 @@ BOOL ScViewFunc::InsertTable( const String& rName, SCTAB nTab, BOOL bRecord ) } //---------------------------------------------------------------------------- -// Tabellen einfuegen +// Tabellen einfuegen BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab, SCTAB nCount, BOOL bRecord ) { - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; @@ -2087,7 +2087,7 @@ BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab, if (bRecord) { pNameList= new SvStrings; - pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage + pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage } BOOL bFlag=FALSE; @@ -2129,7 +2129,7 @@ BOOL ScViewFunc::InsertTables(SvStrings *pNames, SCTAB nTab, pDocSh->GetUndoManager()->AddUndoAction( new ScUndoInsertTables( pDocSh, nTab, FALSE, pNameList)); - // Views updaten: + // Views updaten: SetTabNo( nTab, TRUE ); pDocSh->PostPaintExtras(); @@ -2156,7 +2156,7 @@ BOOL ScViewFunc::AppendTable( const String& rName, BOOL bRecord ) WaitObject aWait( GetFrameWin() ); if (bRecord) - pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage + pDoc->BeginDrawUndo(); // InsertTab erzeugt ein SdrUndoNewPage if (pDoc->InsertTab( SC_TAB_APPEND, rName )) { @@ -2182,8 +2182,8 @@ BOOL ScViewFunc::AppendTable( const String& rName, BOOL bRecord ) BOOL ScViewFunc::DeleteTable( SCTAB nTab, BOOL bRecord ) { - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); BOOL bSuccess = pDocSh->GetDocFunc().DeleteTable( nTab, bRecord, FALSE ); if (bSuccess) @@ -2198,11 +2198,11 @@ BOOL ScViewFunc::DeleteTable( SCTAB nTab, BOOL bRecord ) BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) { - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); BOOL bVbaEnabled = pDoc ? pDoc->IsInVBAMode() : FALSE; - SCTAB nNewTab = TheTabs[0]; - int i; + SCTAB nNewTab = TheTabs[0]; + int i; WaitObject aWait( GetFrameWin() ); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; @@ -2218,19 +2218,19 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) if (bRecord) { pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); -// pUndoDoc->InitDrawLayer( pDocSh ); +// pUndoDoc->InitDrawLayer( pDocSh ); SCTAB nCount = pDoc->GetTableCount(); -// pUndoDoc->InitUndo( pDoc, 0, nCount-1 ); // incl. Ref. +// pUndoDoc->InitUndo( pDoc, 0, nCount-1 ); // incl. Ref. String aOldName; for(i=0;i<TheTabs.Count();i++) { SCTAB nTab = TheTabs[sal::static_int_cast<USHORT>(i)]; if (i==0) - pUndoDoc->InitUndo( pDoc, nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags + pUndoDoc->InitUndo( pDoc, nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags else - pUndoDoc->AddUndoTab( nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags + pUndoDoc->AddUndoTab( nTab,nTab, TRUE,TRUE ); // incl. Spalten/Zeilenflags pDoc->CopyToDocument(0,0,nTab, MAXCOL,MAXROW,nTab, IDF_ALL,FALSE, pUndoDoc ); pDoc->GetName( nTab, aOldName ); @@ -2261,13 +2261,13 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) if ( pDoc->IsTabProtected( nTab ) ) pUndoDoc->SetTabProtection(nTab, pDoc->GetTabProtection(nTab)); - // Drawing-Layer muss sein Undo selbst in der Hand behalten !!! - // pUndoDoc->TransferDrawPage(pDoc, nTab,nTab); + // Drawing-Layer muss sein Undo selbst in der Hand behalten !!! + // pUndoDoc->TransferDrawPage(pDoc, nTab,nTab); } - pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen + pUndoDoc->AddUndoTab( 0, nCount-1 ); // alle Tabs fuer Referenzen - pDoc->BeginDrawUndo(); // DeleteTab erzeugt ein SdrUndoDelPage + pDoc->BeginDrawUndo(); // DeleteTab erzeugt ein SdrUndoDelPage pUndoData = new ScRefUndoData( pDoc ); } @@ -2308,7 +2308,7 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) if (bWasLinked) { - pDocSh->UpdateLinks(); // Link-Manager updaten + pDocSh->UpdateLinks(); // Link-Manager updaten GetViewData()->GetBindings().Invalidate(SID_LINKS); } @@ -2334,12 +2334,12 @@ BOOL ScViewFunc::DeleteTables(const SvShorts &TheTabs, BOOL bRecord ) BOOL ScViewFunc::RenameTable( const String& rName, SCTAB nTab ) { - // Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt + // Reihenfolge Tabelle/Name ist bei DocFunc umgekehrt BOOL bSuccess = GetViewData()->GetDocShell()->GetDocFunc(). RenameTable( nTab, rName, TRUE, FALSE ); if (bSuccess) { - // Der Tabellenname koennte in einer Formel vorkommen... + // Der Tabellenname koennte in einer Formel vorkommen... GetViewData()->GetViewShell()->UpdateInputHandler(); } return bSuccess; @@ -2398,7 +2398,7 @@ void ScViewFunc::InsertTableLink( const String& rFile, ScDocShell* pSrcSh = aLoader.GetDocShell(); ScDocument* pSrcDoc = pSrcSh->GetDocument(); SCTAB nTab = MAXTAB+1; - if (!rTabName.Len()) // kein Name angegeben -> erste Tabelle + if (!rTabName.Len()) // kein Name angegeben -> erste Tabelle nTab = 0; else { @@ -2420,7 +2420,7 @@ void ScViewFunc::InsertTableLink( const String& rFile, //---------------------------------------------------------------------------- -// Tabellen aus anderem Dokument kopieren / linken +// Tabellen aus anderem Dokument kopieren / linken void ScViewFunc::ImportTables( ScDocShell* pSrcShell, SCTAB nCount, const SCTAB* pSrcTabs, BOOL bLink,SCTAB nTab ) @@ -2440,19 +2440,19 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, pDocSh->MakeDrawLayer(); if (bUndo) - pDoc->BeginDrawUndo(); // drawing layer must do its own undo actions + pDoc->BeginDrawUndo(); // drawing layer must do its own undo actions SCTAB nInsCount = 0; SCTAB i; for( i=0; i<nCount; i++ ) - { // #63304# insert sheets first and update all references + { // #63304# insert sheets first and update all references String aName; pSrcDoc->GetName( pSrcTabs[i], aName ); pDoc->CreateValidTabName( aName ); if ( !pDoc->InsertTab( nTab+i, aName ) ) { - bError = TRUE; // total error - break; // for + bError = TRUE; // total error + break; // for } ++nInsCount; } @@ -2461,11 +2461,11 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, SCTAB nSrcTab = pSrcTabs[i]; SCTAB nDestTab1=nTab+i; ULONG nErrVal = pDocSh->TransferTab( *pSrcShell, nSrcTab, nDestTab1, - FALSE, FALSE ); // no insert + FALSE, FALSE ); // no insert switch (nErrVal) { - case 0: // interner Fehler oder voll Fehler + case 0: // interner Fehler oder voll Fehler bError = TRUE; break; case 2: @@ -2503,7 +2503,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, aFileName, aFilterName, aOptions, aTabStr, nRefresh ); } - if (!bWasThere) // Link pro Quelldokument nur einmal eintragen + if (!bWasThere) // Link pro Quelldokument nur einmal eintragen { ScTableLink* pLink = new ScTableLink( pDocSh, aFileName, aFilterName, aOptions, nRefresh ); pLink->SetInCreate( TRUE ); @@ -2545,13 +2545,13 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, //---------------------------------------------------------------------------- -// Tabelle in anderes Dokument verschieben / kopieren +// Tabelle in anderes Dokument verschieben / kopieren void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) { - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocument* pDoc = GetViewData()->GetDocument(); ScDocShell* pDocShell = GetViewData()->GetDocShell(); - ScDocument* pDestDoc = NULL; + ScDocument* pDestDoc = NULL; ScDocShell* pDestShell = NULL; ScTabViewShell* pDestViewSh = NULL; BOOL bUndo (pDoc->IsUndoEnabled()); @@ -2561,10 +2561,10 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) { nDestTab = 0; // als erstes einfuegen - // ohne SFX_CALLMODE_RECORD ausfuehren, weil schon im Move-Befehl enthalten: + // ohne SFX_CALLMODE_RECORD ausfuehren, weil schon im Move-Befehl enthalten: String aUrl = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("private:factory/")); - aUrl.AppendAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP )); // "scalc" + aUrl.AppendAscii(RTL_CONSTASCII_STRINGPARAM( STRING_SCAPP )); // "scalc" SfxStringItem aItem( SID_FILE_NAME, aUrl ); SfxStringItem aTarget( SID_TARGETNAME, String::CreateFromAscii("_blank") ); @@ -2608,11 +2608,11 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) FALSE ); } - ScMarkData& rMark = GetViewData()->GetMarkData(); - SCTAB nTabCount = pDoc->GetTableCount(); - SCTAB nTabSelCount = rMark.GetSelectCount(); + ScMarkData& rMark = GetViewData()->GetMarkData(); + SCTAB nTabCount = pDoc->GetTableCount(); + SCTAB nTabSelCount = rMark.GetSelectCount(); - SvShorts TheTabs; + SvShorts TheTabs; for(SCTAB i=0;i<nTabCount;i++) { @@ -2640,21 +2640,21 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) pDestShell->MakeDrawLayer(); if (!bNewDoc && bUndo) - pDestDoc->BeginDrawUndo(); // drawing layer must do its own undo actions + pDestDoc->BeginDrawUndo(); // drawing layer must do its own undo actions ULONG nErrVal =1; if(nDestTab==SC_TAB_APPEND) nDestTab=pDestDoc->GetTableCount(); SCTAB nDestTab1=nDestTab; for( USHORT j=0; j<TheTabs.Count(); j++, nDestTab1++ ) - { // #63304# insert sheets first and update all references + { // #63304# insert sheets first and update all references String aName; pDoc->GetName( TheTabs[j], aName ); pDestDoc->CreateValidTabName( aName ); if ( !pDestDoc->InsertTab( nDestTab1, aName ) ) { - nErrVal = 0; // total error - break; // for + nErrVal = 0; // total error + break; // for } } if ( nErrVal > 0 ) @@ -2683,7 +2683,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) GetFrameWin()->LeaveWait(); switch (nErrVal) { - case 0: // interner Fehler oder voll Fehler + case 0: // interner Fehler oder voll Fehler { ErrorMessage(STR_TABINSERT_ERROR); return; @@ -2704,7 +2704,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) default: break; } - //pDestShell->GetUndoManager()->Clear(); //! Undo implementieren !!! + //pDestShell->GetUndoManager()->Clear(); //! Undo implementieren !!! /* String sName; pDestDoc->GetName(nDestTab, sName); @@ -2721,18 +2721,18 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) if (bNewDoc) { - // ChartListenerCollection must be updated before DeleteTab + // ChartListenerCollection must be updated before DeleteTab if ( pDestDoc->IsChartListenerCollectionNeedsUpdate() ) pDestDoc->UpdateChartListenerCollection(); pDestDoc->DeleteTab(static_cast<SCTAB>(TheTabs.Count())); // alte erste Tabelle -//? pDestDoc->SelectTable(0, TRUE); // neue erste Tabelle selektieren +//? pDestDoc->SelectTable(0, TRUE); // neue erste Tabelle selektieren if (pDestViewSh) - pDestViewSh->TabChanged(); // Pages auf dem Drawing-Layer + pDestViewSh->TabChanged(); // Pages auf dem Drawing-Layer pDestShell->PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_TOP | PAINT_LEFT | PAINT_EXTRAS | PAINT_SIZE ); - // PAINT_SIZE fuer Gliederung + // PAINT_SIZE fuer Gliederung } else { @@ -2746,17 +2746,17 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) pDestShell->SetDocumentModified(); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); } - else // innerhalb des Dokuments + else // innerhalb des Dokuments { - ScMarkData& rMark = GetViewData()->GetMarkData(); - SCTAB nTabCount = pDoc->GetTableCount(); + ScMarkData& rMark = GetViewData()->GetMarkData(); + SCTAB nTabCount = pDoc->GetTableCount(); - SvShorts TheTabs; - SvShorts TheDestTabs; - SvStrings TheTabNames; - String aDestName; - String *pString; + SvShorts TheTabs; + SvShorts TheDestTabs; + SvStrings TheTabNames; + String aDestName; + String *pString; for(SCTAB i=0;i<nTabCount;i++) { @@ -2781,14 +2781,14 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) } if (bCopy && bUndo) - pDoc->BeginDrawUndo(); // drawing layer must do its own undo actions + pDoc->BeginDrawUndo(); // drawing layer must do its own undo actions pDoc->GetName( nDestTab, aDestName); SCTAB nDestTab1=nDestTab; SCTAB nMovTab=0; for(int j=0;j<TheTabNames.Count();j++) { - nTabCount = pDoc->GetTableCount(); + nTabCount = pDoc->GetTableCount(); pString=TheTabNames[sal::static_int_cast<USHORT>(j)]; if(!pDoc->GetTable(*pString,nMovTab)) { @@ -2798,7 +2798,7 @@ void ScViewFunc::MoveTable( USHORT nDestDocNo, SCTAB nDestTab, BOOL bCopy ) { nDestTab1=nTabCount; } - pDocShell->MoveTable( nMovTab, nDestTab1, bCopy, FALSE ); // Undo ist hier + pDocShell->MoveTable( nMovTab, nDestTab1, bCopy, FALSE ); // Undo ist hier if(bCopy && pDoc->IsScenario(nMovTab)) { @@ -2921,7 +2921,7 @@ void ScViewFunc::HideTable( SCTAB nTab ) pDocSh->GetUndoManager()->AddUndoAction( new ScUndoShowHideTab( pDocSh, nTab, FALSE ) ); } - // Views updaten: + // Views updaten: pDocSh->Broadcast( ScTablesHint( SC_TAB_HIDDEN, nTab ) ); SetTabNo( nTab, TRUE ); @@ -2945,16 +2945,16 @@ void ScViewFunc::InsertSpecialChar( const String& rStr, const Font& rFont ) return; } - const sal_Unicode* pChar = rStr.GetBuffer(); - ScTabViewShell* pViewShell = GetViewData()->GetViewShell(); - SvxFontItem aFontItem( rFont.GetFamily(), + const sal_Unicode* pChar = rStr.GetBuffer(); + ScTabViewShell* pViewShell = GetViewData()->GetViewShell(); + SvxFontItem aFontItem( rFont.GetFamily(), rFont.GetName(), rFont.GetStyleName(), rFont.GetPitch(), rFont.GetCharSet(), ATTR_FONT ); - // if string contains WEAK characters, set all fonts + // if string contains WEAK characters, set all fonts BYTE nScript; ScDocument* pDoc = GetViewData()->GetDocument(); if ( pDoc->HasStringWeakCharacters( rStr ) ) @@ -2973,44 +2973,44 @@ void ScViewFunc::InsertSpecialChar( const String& rStr, const Font& rFont ) //---------------------------------------------------------------------------- -void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, +void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, const SvxBorderLine* pDestLine, const SvxBorderLine* pSrcLine, - BOOL bColor ) + BOOL bColor ) { if ( pSrcLine && pDestLine ) { if ( bColor ) { - rLine.SetColor ( pSrcLine->GetColor() ); - rLine.SetOutWidth ( pDestLine->GetOutWidth() ); - rLine.SetInWidth ( pDestLine->GetInWidth() ); - rLine.SetDistance ( pDestLine->GetDistance() ); - rLine.SetStyle ( pDestLine->GetStyle() ); + rLine.SetColor ( pSrcLine->GetColor() ); + rLine.SetOutWidth ( pDestLine->GetOutWidth() ); + rLine.SetInWidth ( pDestLine->GetInWidth() ); + rLine.SetDistance ( pDestLine->GetDistance() ); + rLine.SetStyle ( pDestLine->GetStyle() ); } else { - rLine.SetColor ( pDestLine->GetColor() ); - rLine.SetOutWidth ( pSrcLine->GetOutWidth() ); - rLine.SetInWidth ( pSrcLine->GetInWidth() ); - rLine.SetDistance ( pSrcLine->GetDistance() ); - rLine.SetStyle ( pSrcLine->GetStyle() ); + rLine.SetColor ( pDestLine->GetColor() ); + rLine.SetOutWidth ( pSrcLine->GetOutWidth() ); + rLine.SetInWidth ( pSrcLine->GetInWidth() ); + rLine.SetDistance ( pSrcLine->GetDistance() ); + rLine.SetStyle ( pSrcLine->GetStyle() ); } } } #define SET_LINE_ATTRIBUTES(LINE,BOXLINE) \ - pBoxLine = aBoxItem.Get##LINE(); \ - if ( pBoxLine ) \ - { \ - if ( pLine ) \ - { \ - UpdateLineAttrs( aLine, pBoxLine, pLine, bColorOnly ); \ - aBoxItem.SetLine( &aLine, BOXLINE ); \ - } \ - else \ - aBoxItem.SetLine( NULL, BOXLINE ); \ + pBoxLine = aBoxItem.Get##LINE(); \ + if ( pBoxLine ) \ + { \ + if ( pLine ) \ + { \ + UpdateLineAttrs( aLine, pBoxLine, pLine, bColorOnly ); \ + aBoxItem.SetLine( &aLine, BOXLINE ); \ + } \ + else \ + aBoxItem.SetLine( NULL, BOXLINE ); \ } @@ -3027,14 +3027,14 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, return; } - ScDocument* pDoc = GetViewData()->GetDocument(); + ScDocument* pDoc = GetViewData()->GetDocument(); ScMarkData aFuncMark( GetViewData()->GetMarkData() ); // local copy for UnmarkFiltered ScViewUtil::UnmarkFiltered( aFuncMark, pDoc ); - ScDocShell* pDocSh = GetViewData()->GetDocShell(); - const ScPatternAttr* pSelAttrs = GetSelectionPattern(); + ScDocShell* pDocSh = GetViewData()->GetDocShell(); + const ScPatternAttr* pSelAttrs = GetSelectionPattern(); const SfxItemSet& rSelItemSet = pSelAttrs->GetItemSet(); - const SfxPoolItem* pBorderAttr = NULL; + const SfxPoolItem* pBorderAttr = NULL; SfxItemState eItemState = rSelItemSet.GetItemState( ATTR_BORDER, TRUE, &pBorderAttr ); const SfxPoolItem* pTLBRItem = 0; @@ -3049,18 +3049,18 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, // none of the lines don't care? if( (eItemState != SFX_ITEM_DONTCARE) && (eTLBRState != SFX_ITEM_DONTCARE) && (eBLTRState != SFX_ITEM_DONTCARE) ) { - SfxItemSet* pOldSet = new SfxItemSet( + SfxItemSet* pOldSet = new SfxItemSet( *(pDoc->GetPool()), ATTR_PATTERN_START, ATTR_PATTERN_END ); - SfxItemSet* pNewSet = new SfxItemSet( + SfxItemSet* pNewSet = new SfxItemSet( *(pDoc->GetPool()), ATTR_PATTERN_START, ATTR_PATTERN_END ); //------------------------------------------------------------ - const SvxBorderLine* pBoxLine = NULL; - SvxBorderLine aLine; + const SvxBorderLine* pBoxLine = NULL; + SvxBorderLine aLine; // hier wird die pBoxLine benutzt: @@ -3137,10 +3137,10 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, void ScViewFunc::SetConditionalFormat( const ScConditionalFormat& rNew ) { ScDocument* pDoc = GetViewData()->GetDocument(); - ULONG nIndex = pDoc->AddCondFormat(rNew); // dafuer gibt's kein Undo + ULONG nIndex = pDoc->AddCondFormat(rNew); // dafuer gibt's kein Undo SfxUInt32Item aItem( ATTR_CONDITIONAL, nIndex ); - ApplyAttr( aItem ); // mit Paint und Undo... + ApplyAttr( aItem ); // mit Paint und Undo... } @@ -3149,10 +3149,10 @@ void ScViewFunc::SetConditionalFormat( const ScConditionalFormat& rNew ) void ScViewFunc::SetValidation( const ScValidationData& rNew ) { ScDocument* pDoc = GetViewData()->GetDocument(); - ULONG nIndex = pDoc->AddValidationEntry(rNew); // dafuer gibt's kein Undo + ULONG nIndex = pDoc->AddValidationEntry(rNew); // dafuer gibt's kein Undo SfxUInt32Item aItem( ATTR_VALIDDATA, nIndex ); - ApplyAttr( aItem ); // mit Paint und Undo... + ApplyAttr( aItem ); // mit Paint und Undo... } diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index a3096463d544..69d608d4a7ee 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -134,7 +134,7 @@ //#define _SI_NOCONTROL #define _SVBOXITM_HXX -#define _SVCONTNR_HXX // +#define _SVCONTNR_HXX // #define _SDR_NOTRANSFORM @@ -198,7 +198,7 @@ #include "drwtrans.hxx" #include "rangenam.hxx" #include "dbcolect.hxx" -#include "impex.hxx" // Sylk-ID fuer CB +#include "impex.hxx" // Sylk-ID fuer CB #include "chgtrack.hxx" #include "waitoff.hxx" #include "scmod.hxx" @@ -220,33 +220,33 @@ using namespace com::sun::star; //============================================================================ -// GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx +// GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx //---------------------------------------------------------------------------- -// C U T +// C U T void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects ) { UpdateInputLine(); ScEditableTester aTester( this ); - if (!aTester.IsEditable()) // selection editable? + if (!aTester.IsEditable()) // selection editable? { ErrorMessage( aTester.GetMessageId() ); return; } - ScRange aRange; // zu loeschender Bereich + ScRange aRange; // zu loeschender Bereich if ( GetViewData()->GetSimpleArea( aRange ) == SC_MARK_SIMPLE ) { ScDocument* pDoc = GetViewData()->GetDocument(); ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScMarkData& rMark = GetViewData()->GetMarkData(); - const BOOL bRecord(pDoc->IsUndoEnabled()); // Undo/Redo + const BOOL bRecord(pDoc->IsUndoEnabled()); // Undo/Redo ScDocShellModificator aModificator( *pDocSh ); - if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) // mark the range if not marked yet + if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) // mark the range if not marked yet { DoneBlockMode(); InitOwnBlockMode(); @@ -254,9 +254,9 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects ) MarkDataChanged(); } - CopyToClip( pClipDoc, TRUE, FALSE, bIncludeObjects ); // Ab ins Clipboard + CopyToClip( pClipDoc, TRUE, FALSE, bIncludeObjects ); // Ab ins Clipboard - ScAddress aOldEnd( aRange.aEnd ); // Zusammengefasste Zellen im Bereich? + ScAddress aOldEnd( aRange.aEnd ); // Zusammengefasste Zellen im Bereich? pDoc->ExtendMerge( aRange, TRUE ); ScDocument* pUndoDoc = NULL; @@ -275,7 +275,7 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects ) USHORT nExtFlags = 0; pDocSh->UpdatePaintExt( nExtFlags, aRange ); - HideCursor(); // Cursor aendert sich ! + HideCursor(); // Cursor aendert sich ! rMark.MarkToMulti(); pDoc->DeleteSelection( IDF_ALL, rMark ); @@ -286,12 +286,12 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects ) if ( !AdjustRowHeight( aRange.aStart.Row(), aRange.aEnd.Row() ) ) pDocSh->PostPaint( aRange, PAINT_GRID, nExtFlags ); - if ( bRecord ) // erst jetzt ist Draw-Undo verfuegbar + if ( bRecord ) // erst jetzt ist Draw-Undo verfuegbar pDocSh->GetUndoManager()->AddUndoAction( new ScUndoCut( pDocSh, aRange, aOldEnd, rMark, pUndoDoc ) ); aModificator.SetDocumentModified(); - ShowCursor(); // Cursor aendert sich ! + ShowCursor(); // Cursor aendert sich ! pDocSh->UpdateOle(GetViewData()); CellContentChanged(); @@ -302,7 +302,7 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, BOOL bIncludeObjects ) //---------------------------------------------------------------------------- -// C O P Y +// C O P Y BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bIncludeObjects, BOOL bStopEdit ) { @@ -322,17 +322,17 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI rMark ) ) { BOOL bSysClip = FALSE; - if ( !pClipDoc ) // no clip doc specified + if ( !pClipDoc ) // no clip doc specified { - pClipDoc = new ScDocument( SCDOCMODE_CLIP ); // create one (deleted by ScTransferObj) - bSysClip = TRUE; // and copy into system + pClipDoc = new ScDocument( SCDOCMODE_CLIP ); // create one (deleted by ScTransferObj) + bSysClip = TRUE; // and copy into system } if ( !bCut ) { ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack(); if ( pChangeTrack ) - pChangeTrack->ResetLastCut(); // kein CutMode mehr + pChangeTrack->ResetLastCut(); // kein CutMode mehr } if ( bSysClip && bIncludeObjects ) @@ -366,11 +366,11 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI if ( ScGlobal::pDrawClipDocShellRef ) { SfxObjectShellRef aPersistRef( &(*ScGlobal::pDrawClipDocShellRef) ); - pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive + pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive } - pTransferObj->CopyToClipboard( GetActiveWin() ); // system clipboard - SC_MOD()->SetClipObject( pTransferObj, NULL ); // internal clipboard + pTransferObj->CopyToClipboard( GetActiveWin() ); // system clipboard + SC_MOD()->SetClipObject( pTransferObj, NULL ); // internal clipboard } bDone = TRUE; @@ -468,7 +468,7 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack(); if ( pChangeTrack ) - pChangeTrack->ResetLastCut(); // kein CutMode mehr + pChangeTrack->ResetLastCut(); // kein CutMode mehr { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -483,11 +483,11 @@ BOOL ScViewFunc::CopyToClip( ScDocument* pClipDoc, BOOL bCut, BOOL bApi, BOOL bI if ( ScGlobal::pDrawClipDocShellRef ) { SfxObjectShellRef aPersistRef( &(*ScGlobal::pDrawClipDocShellRef) ); - pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive + pTransferObj->SetDrawPersist( aPersistRef ); // keep persist for ole objects alive } - pTransferObj->CopyToClipboard( GetActiveWin() ); // system clipboard - SC_MOD()->SetClipObject( pTransferObj, NULL ); // internal clipboard + pTransferObj->CopyToClipboard( GetActiveWin() ); // system clipboard + SC_MOD()->SetClipObject( pTransferObj, NULL ); // internal clipboard } bSuccess = true; @@ -614,7 +614,7 @@ ScTransferObj* ScViewFunc::CopyToTransferable() } //---------------------------------------------------------------------------- -// P A S T E +// P A S T E void ScViewFunc::PasteDraw() { @@ -644,7 +644,7 @@ void ScViewFunc::PasteFromSystem() uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip ); PasteFromClip( IDF_ALL, pOwnClip->GetDocument(), PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE, - TRUE ); // allow warning dialog + TRUE ); // allow warning dialog } else if (pDrawClip) PasteDraw(); @@ -652,15 +652,15 @@ void ScViewFunc::PasteFromSystem() { TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( pWin ) ); -// if (pClipObj.Is()) +// if (pClipObj.Is()) { ULONG nBiff8 = SotExchange::RegisterFormatName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff8"))); ULONG nBiff5 = SotExchange::RegisterFormatName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff5"))); - // als erstes SvDraw-Model, dann Grafik - // (Grafik darf nur bei einzelner Grafik drinstehen) + // als erstes SvDraw-Model, dann Grafik + // (Grafik darf nur bei einzelner Grafik drinstehen) if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_DRAWING )) { @@ -678,11 +678,11 @@ void ScViewFunc::PasteFromSystem() PasteFromSystem( SOT_FORMATSTR_ID_SVXB ); else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE )) { - // If it's a Writer object, insert RTF instead of OLE + // If it's a Writer object, insert RTF instead of OLE - // Else, if the class id is all-zero, and SYLK is available, - // it probably is spreadsheet cells that have been put - // on the clipboard by OOo, so use the SYLK. (fdo#31077) + // Else, if the class id is all-zero, and SYLK is available, + // it probably is spreadsheet cells that have been put + // on the clipboard by OOo, so use the SYLK. (fdo#31077) BOOL bDoRtf = FALSE; TransferableObjectDescriptor aObjDesc; @@ -729,15 +729,15 @@ void ScViewFunc::PasteFromSystem() PasteFromSystem( SOT_FORMATSTR_ID_EMBED_SOURCE_OLE ); else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_LINK_SOURCE_OLE )) PasteFromSystem( SOT_FORMATSTR_ID_LINK_SOURCE_OLE ); -// else -// ErrorMessage(STR_PASTE_ERROR); +// else +// ErrorMessage(STR_PASTE_ERROR); } -// else -// ErrorMessage(STR_PASTE_ERROR); +// else +// ErrorMessage(STR_PASTE_ERROR); } - // keine Fehlermeldung, weil SID_PASTE in der idl das FastCall-Flag hat, - // also auch gerufen wird, wenn nichts im Clipboard steht (#42531#) + // keine Fehlermeldung, weil SID_PASTE in der idl das FastCall-Flag hat, + // also auch gerufen wird, wenn nichts im Clipboard steht (#42531#) } void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTransferable>& rxTransferable ) @@ -762,7 +762,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran { PasteFromClip( IDF_ALL, pOwnClip->GetDocument(), PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE, - TRUE ); // allow warning dialog + TRUE ); // allow warning dialog } else if (pDrawClip) { @@ -782,8 +782,8 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran ULONG nBiff5 = SotExchange::RegisterFormatName( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Biff5"))); ULONG nFormatId = 0; - // als erstes SvDraw-Model, dann Grafik - // (Grafik darf nur bei einzelner Grafik drinstehen) + // als erstes SvDraw-Model, dann Grafik + // (Grafik darf nur bei einzelner Grafik drinstehen) if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_DRAWING )) nFormatId = SOT_FORMATSTR_ID_DRAWING; @@ -791,7 +791,7 @@ void ScViewFunc::PasteFromTransferable( const uno::Reference<datatransfer::XTran nFormatId = SOT_FORMATSTR_ID_SVXB; else if (aDataHelper.HasFormat( SOT_FORMATSTR_ID_EMBED_SOURCE )) { - // If it's a Writer object, insert RTF instead of OLE + // If it's a Writer object, insert RTF instead of OLE BOOL bDoRtf = FALSE; TransferableObjectDescriptor aObjDesc; if( aDataHelper.GetTransferableObjectDescriptor( SOT_FORMATSTR_ID_OBJECTDESCRIPTOR, aObjDesc ) ) @@ -857,7 +857,7 @@ BOOL ScViewFunc::PasteFromSystem( ULONG nFormatId, BOOL bApi ) uno::Reference<datatransfer::XTransferable> aOwnClipRef( pOwnClip ); PasteFromClip( IDF_ALL, pOwnClip->GetDocument(), PASTE_NOFUNC, FALSE, FALSE, FALSE, INS_NONE, IDF_NONE, - !bApi ); // allow warning dialog + !bApi ); // allow warning dialog } else { @@ -867,7 +867,7 @@ BOOL ScViewFunc::PasteFromSystem( ULONG nFormatId, BOOL bApi ) bRet = PasteDataFormat( nFormatId, aDataHelper.GetTransferable(), GetViewData()->GetCurX(), GetViewData()->GetCurY(), - NULL, FALSE, !bApi ); // allow warning dialog + NULL, FALSE, !bApi ); // allow warning dialog if ( !bRet && !bApi ) ErrorMessage(STR_PASTE_ERROR); @@ -877,7 +877,7 @@ BOOL ScViewFunc::PasteFromSystem( ULONG nFormatId, BOOL bApi ) //---------------------------------------------------------------------------- -// P A S T E +// P A S T E BOOL ScViewFunc::PasteOnDrawObject( const uno::Reference<datatransfer::XTransferable>& rxTransferable, SdrObject* pHitObj, BOOL bLink ) @@ -911,7 +911,7 @@ BOOL ScViewFunc::PasteOnDrawObject( const uno::Reference<datatransfer::XTransfer } else { - // ham' wa noch nich + // ham' wa noch nich } return bRet; } @@ -927,10 +927,10 @@ BOOL lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, } // -// Einfuegen auf Tabelle: +// Einfuegen auf Tabelle: // -// internes Paste +// internes Paste namespace { @@ -969,7 +969,7 @@ bool lcl_checkDestRangeForOverwrite(const ScRange& rDestRange, const ScDocument* ScReplaceWarnBox aBox(pParentWnd); if (aBox.Execute() != RET_YES) { - // changing the configuration is within the ScReplaceWarnBox + // changing the configuration is within the ScReplaceWarnBox return false; } } @@ -990,7 +990,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, return FALSE; } - // fuer Undo etc. immer alle oder keine Inhalte sichern + // fuer Undo etc. immer alle oder keine Inhalte sichern USHORT nContFlags = IDF_NONE; if (nFlags & IDF_CONTENTS) nContFlags |= IDF_CONTENTS; @@ -1009,13 +1009,13 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, nFlags, pClipDoc, nFunction, bSkipEmpty, bTranspose, bAsLink, bAllowDialogs, eMoveMode, nContFlags, nUndoFlags); - BOOL bCutMode = pClipDoc->IsCutMode(); // if transposing, take from original clipdoc + BOOL bCutMode = pClipDoc->IsCutMode(); // if transposing, take from original clipdoc BOOL bIncludeFiltered = bCutMode; // paste drawing: also if IDF_NOTE is set (to create drawing layer for note captions) BOOL bPasteDraw = ( pClipDoc->GetDrawLayer() && ( nFlags & (IDF_OBJECTS|IDF_NOTE) ) ); - ScDocShellRef aTransShellRef; // for objects in xTransClip - must remain valid as long as xTransClip + ScDocShellRef aTransShellRef; // for objects in xTransClip - must remain valid as long as xTransClip ScDocument* pOrigClipDoc = NULL; ::std::auto_ptr< ScDocument > xTransClip; if ( bTranspose ) @@ -1025,16 +1025,16 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, // include filtered rows until TransposeClip can skip them bIncludeFiltered = TRUE; pClipDoc->GetClipArea( nX, nY, TRUE ); - if ( nY > static_cast<sal_Int32>(MAXCOL) ) // zuviele Zeilen zum Transponieren + if ( nY > static_cast<sal_Int32>(MAXCOL) ) // zuviele Zeilen zum Transponieren { ErrorMessage(STR_PASTE_FULL); return FALSE; } - pOrigClipDoc = pClipDoc; // fuer Referenzen + pOrigClipDoc = pClipDoc; // fuer Referenzen if ( bPasteDraw ) { - aTransShellRef = new ScDocShell; // DocShell needs a Ref immediately + aTransShellRef = new ScDocShell; // DocShell needs a Ref immediately aTransShellRef->DoInitNew(NULL); } ScDrawLayer::SetGlobalDrawPersist(aTransShellRef); @@ -1054,9 +1054,9 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, SCTAB nEndTab; SCCOL nClipSizeX; SCROW nClipSizeY; - pClipDoc->GetClipArea( nClipSizeX, nClipSizeY, TRUE ); // size in clipboard doc + pClipDoc->GetClipArea( nClipSizeX, nClipSizeY, TRUE ); // size in clipboard doc - // size in target doc: include filtered rows only if CutMode is set + // size in target doc: include filtered rows only if CutMode is set SCCOL nDestSizeX; SCROW nDestSizeY; pClipDoc->GetClipArea( nDestSizeX, nDestSizeY, bIncludeFiltered ); @@ -1138,10 +1138,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, SCCOL nBlockAddX = nEndCol-nStartCol; SCROW nBlockAddY = nEndRow-nStartRow; - // #58422# Nachfrage, wenn die Selektion groesser als 1 Zeile/Spalte, aber kleiner - // als das Clipboard ist (dann wird ueber die Selektion hinaus eingefuegt) + // #58422# Nachfrage, wenn die Selektion groesser als 1 Zeile/Spalte, aber kleiner + // als das Clipboard ist (dann wird ueber die Selektion hinaus eingefuegt) - // ClipSize is not size, but difference + // ClipSize is not size, but difference if ( ( nBlockAddX != 0 && nBlockAddX < nDestSizeX ) || ( nBlockAddY != 0 && nBlockAddY < nDestSizeY ) || ( bMarkIsFiltered && nUnfilteredRows < nDestSizeY+1 ) ) @@ -1157,12 +1157,12 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, } if (nBlockAddX > nDestSizeX) - nMarkAddX = nBlockAddX - nDestSizeX; // fuer Merge-Test + nMarkAddX = nBlockAddX - nDestSizeX; // fuer Merge-Test else nEndCol = nStartCol + nDestSizeX; if (nBlockAddY > nDestSizeY) - nMarkAddY = nBlockAddY - nDestSizeY; // fuer Merge-Test + nMarkAddY = nBlockAddY - nDestSizeY; // fuer Merge-Test else { nEndRow = nStartRow + nDestSizeY; @@ -1205,26 +1205,26 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, bool bOffLimits = !ValidCol(nEndCol) || !ValidRow(nEndRow); - // Zielbereich, wie er angezeigt wird: + // Zielbereich, wie er angezeigt wird: ScRange aUserRange( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ); - // Sollen Zellen eingefuegt werden? - // (zu grosse nEndCol/nEndRow werden weiter unten erkannt) + // Sollen Zellen eingefuegt werden? + // (zu grosse nEndCol/nEndRow werden weiter unten erkannt) BOOL bInsertCells = ( eMoveMode != INS_NONE && !bOffLimits ); if ( bInsertCells ) { - // #94115# Instead of EnterListAction, the paste undo action is merged into the - // insert action, so Repeat can insert the right cells + // #94115# Instead of EnterListAction, the paste undo action is merged into the + // insert action, so Repeat can insert the right cells - MarkRange( aUserRange ); // wird vor CopyFromClip sowieso gesetzt + MarkRange( aUserRange ); // wird vor CopyFromClip sowieso gesetzt // #72930# CutMode is reset on insertion of cols/rows but needed again on cell move BOOL bCut = pClipDoc->IsCutMode(); - if (!InsertCells( eMoveMode, bRecord, TRUE )) // is inserting possible? + if (!InsertCells( eMoveMode, bRecord, TRUE )) // is inserting possible? { return FALSE; - // #i21036# EnterListAction isn't used, and InsertCells doesn't insert - // its undo action on failure, so no undo handling is needed here + // #i21036# EnterListAction isn't used, and InsertCells doesn't insert + // its undo action on failure, so no undo handling is needed here } if ( bCut ) pClipDoc->SetCutMode( bCut ); @@ -1242,11 +1242,11 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, } } - SCCOL nClipStartX; // Clipboard-Bereich erweitern + SCCOL nClipStartX; // Clipboard-Bereich erweitern SCROW nClipStartY; pClipDoc->GetClipStart( nClipStartX, nClipStartY ); SCCOL nUndoEndCol = nClipStartX + nClipSizeX; - SCROW nUndoEndRow = nClipStartY + nClipSizeY; // end of source area in clipboard document + SCROW nUndoEndRow = nClipStartY + nClipSizeY; // end of source area in clipboard document BOOL bClipOver = FALSE; // #i68690# ExtendMerge for the clip doc must be called with the clipboard's sheet numbers. // The same end column/row can be used for all calls because the clip doc doesn't contain @@ -1256,15 +1256,15 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, if ( pClipDoc->ExtendMerge( nClipStartX,nClipStartY, nUndoEndCol,nUndoEndRow, nClipTab, FALSE ) ) bClipOver = TRUE; nUndoEndCol -= nClipStartX + nClipSizeX; - nUndoEndRow -= nClipStartY + nClipSizeY; // now contains only the difference added by ExtendMerge + nUndoEndRow -= nClipStartY + nClipSizeY; // now contains only the difference added by ExtendMerge nUndoEndCol = sal::static_int_cast<SCCOL>( nUndoEndCol + nEndCol ); nUndoEndRow = sal::static_int_cast<SCROW>( nUndoEndRow + nEndRow ); // destination area, expanded for merged cells -// if (nUndoEndCol < nEndCol) nUndoEndCol = nEndCol; -// if (nUndoEndRow < nEndRow) nUndoEndRow = nEndRow; +// if (nUndoEndCol < nEndCol) nUndoEndCol = nEndCol; +// if (nUndoEndRow < nEndRow) nUndoEndRow = nEndRow; -// nUndoEndCol += nMarkAddX; -// nUndoEndRow += nMarkAddY; +// nUndoEndCol += nMarkAddX; +// nUndoEndRow += nMarkAddY; if (nUndoEndCol>MAXCOL || nUndoEndRow>MAXROW) { @@ -1274,7 +1274,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, pDoc->ExtendMergeSel( nStartCol,nStartRow, nUndoEndCol,nUndoEndRow, aFilteredMark, FALSE ); - // Test auf Zellschutz + // Test auf Zellschutz ScEditableTester aTester( pDoc, nStartTab, nStartCol,nStartRow, nUndoEndCol,nUndoEndRow ); if (!aTester.IsEditable()) @@ -1286,8 +1286,8 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, //! Test auf Ueberlappung //! nur wirkliche Schnittmenge testen !!!!!!! - // pDoc->HasCommonAttr( StartCol,nStartRow, nUndoEndCol,nUndoEndRow, nStartTab, - // pClipDoc, nClipStartX, nClipStartY ); + // pDoc->HasCommonAttr( StartCol,nStartRow, nUndoEndCol,nUndoEndRow, nStartTab, + // pClipDoc, nClipStartX, nClipStartY ); ScDocFunc& rDocFunc = pDocSh->GetDocFunc(); if ( bRecord ) @@ -1324,15 +1324,15 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, { ScChangeTrack* pChangeTrack = pDoc->GetChangeTrack(); if ( pChangeTrack ) - pChangeTrack->ResetLastCut(); // kein CutMode mehr + pChangeTrack->ResetLastCut(); // kein CutMode mehr } BOOL bColInfo = ( nStartRow==0 && nEndRow==MAXROW ); BOOL bRowInfo = ( nStartCol==0 && nEndCol==MAXCOL ); - ScDocument* pUndoDoc = NULL; + ScDocument* pUndoDoc = NULL; ScDocument* pRefUndoDoc = NULL; - ScDocument* pRedoDoc = NULL; + ScDocument* pRedoDoc = NULL; ScRefUndoData* pUndoData = NULL; if ( bRecord ) @@ -1356,7 +1356,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, USHORT nExtFlags = 0; pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab, - nEndCol, nEndRow, nEndTab ); // content before the change + nEndCol, nEndRow, nEndTab ); // content before the change if (GetViewData()->IsActive()) { @@ -1366,11 +1366,11 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, rMark.SetMarkArea( aUserRange ); MarkDataChanged(); - HideCursor(); // Cursor aendert sich ! + HideCursor(); // Cursor aendert sich ! // - // Aus Clipboard kopieren, - // wenn gerechnet werden soll, Originaldaten merken + // Aus Clipboard kopieren, + // wenn gerechnet werden soll, Originaldaten merken // ScDocument* pMixDoc = NULL; @@ -1397,7 +1397,7 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, USHORT nNoObjFlags = nFlags & ~IDF_OBJECTS; if (!bAsLink) { - // copy normally (original range) + // copy normally (original range) pDoc->CopyFromClip( aUserRange, aFilteredMark, nNoObjFlags, pRefUndoDoc, pClipDoc, TRUE, FALSE, bIncludeFiltered, bSkipEmpty, (bMarkIsFiltered ? &aRangeList : NULL) ); @@ -1408,13 +1408,13 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, } else if (!bTranspose) { - // copy with bAsLink=TRUE + // copy with bAsLink=TRUE pDoc->CopyFromClip( aUserRange, aFilteredMark, nNoObjFlags, pRefUndoDoc, pClipDoc, TRUE, TRUE, bIncludeFiltered, bSkipEmpty ); } else { - // alle Inhalte kopieren (im TransClipDoc stehen nur Formeln) + // alle Inhalte kopieren (im TransClipDoc stehen nur Formeln) pDoc->CopyFromClip( aUserRange, aFilteredMark, nContFlags, pRefUndoDoc, pClipDoc ); } @@ -1425,17 +1425,17 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, pDoc->ExtendMergeSel( nStartCol, nStartRow, nEndCol, nEndRow, aFilteredMark, TRUE ); // Refresh // und Bereich neu - if ( pMixDoc ) // Rechenfunktionen mit Original-Daten auszufuehren ? + if ( pMixDoc ) // Rechenfunktionen mit Original-Daten auszufuehren ? { pDoc->MixDocument( aUserRange, nFunction, bSkipEmpty, pMixDoc ); } delete pMixDoc; - AdjustBlockHeight(); // update row heights before pasting objects + AdjustBlockHeight(); // update row heights before pasting objects if ( nFlags & IDF_OBJECTS ) { - // Paste the drawing objects after the row heights have been updated. + // Paste the drawing objects after the row heights have been updated. pDoc->CopyFromClip( aUserRange, aFilteredMark, IDF_OBJECTS, pRefUndoDoc, pClipDoc, TRUE, FALSE, bIncludeFiltered ); @@ -1446,10 +1446,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, // pDocSh->UpdatePaintExt( nExtFlags, nStartCol, nStartRow, nStartTab, - nEndCol, nEndRow, nEndTab ); // content after the change + nEndCol, nEndRow, nEndTab ); // content after the change - // ggf. Autofilter-Koepfe loeschen + // ggf. Autofilter-Koepfe loeschen if (bCutMode) if (pDoc->RefreshAutoFilter( nClipStartX,nClipStartY, nClipStartX+nClipSizeX, nClipStartY+nClipSizeY, nStartTab )) @@ -1457,9 +1457,9 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, nClipStartX+nClipSizeX,nClipStartY,nStartTab, PAINT_GRID ); - ShowCursor(); // Cursor aendert sich ! + ShowCursor(); // Cursor aendert sich ! - //! Block-Bereich bei RefUndoDoc weglassen !!! + //! Block-Bereich bei RefUndoDoc weglassen !!! if ( bRecord ) { @@ -1471,13 +1471,13 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, pRedoDoc = new ScDocument( SCDOCMODE_UNDO ); pRedoDoc->InitUndo( pDoc, nStartTab, nEndTab, bColInfo, bRowInfo ); - // angepasste Referenzen ins Redo-Doc + // angepasste Referenzen ins Redo-Doc SCTAB nTabCount = pDoc->GetTableCount(); pRedoDoc->AddUndoTab( 0, nTabCount-1 ); pDoc->CopyUpdated( pRefUndoDoc, pRedoDoc ); - // alte Referenzen ins Undo-Doc + // alte Referenzen ins Undo-Doc //! Tabellen selektieren ? pUndoDoc->AddUndoTab( 0, nTabCount-1 ); @@ -1487,10 +1487,10 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, delete pRefUndoDoc; } - // DeleteUnchanged for pUndoData is in ScUndoPaste ctor, - // UndoData for redo is made during first undo + // DeleteUnchanged for pUndoData is in ScUndoPaste ctor, + // UndoData for redo is made during first undo - ScUndoPasteOptions aOptions; // store options for repeat + ScUndoPasteOptions aOptions; // store options for repeat aOptions.nFunction = nFunction; aOptions.bSkipEmpty = bSkipEmpty; aOptions.bTranspose = bTranspose; @@ -1502,12 +1502,12 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, nUndoEndCol, nUndoEndRow, nEndTab, aFilteredMark, pUndoDoc, pRedoDoc, nFlags | nUndoFlags, pUndoData, NULL, NULL, NULL, - FALSE, &aOptions ); // FALSE = Redo data not yet copied + FALSE, &aOptions ); // FALSE = Redo data not yet copied if ( bInsertCells ) { - // Merge the paste undo action into the insert action. - // Use ScUndoWrapper so the ScUndoPaste pointer can be stored in the insert action. + // Merge the paste undo action into the insert action. + // Use ScUndoWrapper so the ScUndoPaste pointer can be stored in the insert action. pUndoMgr->AddUndoAction( new ScUndoWrapper( pUndo ), TRUE ); } @@ -1520,12 +1520,12 @@ BOOL ScViewFunc::PasteFromClip( USHORT nFlags, ScDocument* pClipDoc, if (bColInfo) { nPaint |= PAINT_TOP; - nUndoEndCol = MAXCOL; // nur zum Zeichnen ! + nUndoEndCol = MAXCOL; // nur zum Zeichnen ! } if (bRowInfo) { nPaint |= PAINT_LEFT; - nUndoEndRow = MAXROW; // nur zum Zeichnen ! + nUndoEndRow = MAXROW; // nur zum Zeichnen ! } pDocSh->PostPaint( nStartCol, nStartRow, nStartTab, nUndoEndCol, nUndoEndRow, nEndTab, nPaint, nExtFlags ); @@ -1730,22 +1730,22 @@ void ScViewFunc::PostPasteFromClip(const ScRange& rPasteRange, const ScMarkData& //---------------------------------------------------------------------------- -// D R A G A N D D R O P +// D R A G A N D D R O P // -// innerhalb des Dokuments +// innerhalb des Dokuments BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, BOOL bCut, BOOL bRecord, BOOL bPaint, BOOL bApi ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); - HideAllCursors(); // wegen zusammengefassten + HideAllCursors(); // wegen zusammengefassten BOOL bSuccess = TRUE; SCTAB nDestTab = rDestPos.Tab(); const ScMarkData& rMark = GetViewData()->GetMarkData(); if ( rSource.aStart.Tab() == nDestTab && rSource.aEnd.Tab() == nDestTab && rMark.GetSelectCount() > 1 ) { - // moving within one table and several tables selected -> apply to all selected tables + // moving within one table and several tables selected -> apply to all selected tables if ( bRecord ) { @@ -1753,7 +1753,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, pDocSh->GetUndoManager()->EnterListAction( aUndo, aUndo ); } - // collect ranges of consecutive selected tables + // collect ranges of consecutive selected tables ScRange aLocalSource = rSource; ScAddress aLocalDest = rDestPos; @@ -1785,7 +1785,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, } else { - // move the block as specified + // move the block as specified bSuccess = pDocSh->GetDocFunc().MoveBlock( rSource, rDestPos, bCut, bRecord, bPaint, bApi ); } @@ -1793,7 +1793,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, ShowAllCursors(); if (bSuccess) { - // Zielbereich markieren + // Zielbereich markieren ScAddress aDestEnd( rDestPos.Col() + rSource.aEnd.Col() - rSource.aStart.Col(), rDestPos.Row() + rSource.aEnd.Row() - rSource.aStart.Row(), @@ -1811,7 +1811,7 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, aDestEnd.SetRow( rDestPos.Row() + nPastedCount - 1 ); } - MarkRange( ScRange( rDestPos, aDestEnd ), FALSE ); //! FALSE ??? + MarkRange( ScRange( rDestPos, aDestEnd ), FALSE ); //! FALSE ??? pDocSh->UpdateOle(GetViewData()); SelectionChanged(); @@ -1819,11 +1819,11 @@ BOOL ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, return bSuccess; } -// Link innerhalb des Dokuments +// Link innerhalb des Dokuments BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, BOOL bApi ) { - // Test auf Ueberlappung + // Test auf Ueberlappung if ( rSource.aStart.Tab() == rDestPos.Tab() ) { @@ -1839,7 +1839,7 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, B } } - // Ausfuehren per Paste + // Ausfuehren per Paste ScDocument* pDoc = GetViewData()->GetDocument(); ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP ); @@ -1847,16 +1847,16 @@ BOOL ScViewFunc::LinkBlock( const ScRange& rSource, const ScAddress& rDestPos, B rSource.aEnd.Col(), rSource.aEnd.Row(), rSource.aStart.Tab(), pClipDoc ); - // Zielbereich markieren (Cursor setzen, keine Markierung) + // Zielbereich markieren (Cursor setzen, keine Markierung) if ( GetViewData()->GetTabNo() != rDestPos.Tab() ) SetTabNo( rDestPos.Tab() ); MoveCursorAbs( rDestPos.Col(), rDestPos.Row(), SC_FOLLOW_NONE, FALSE, FALSE ); - // Paste + // Paste - PasteFromClip( IDF_ALL, pClipDoc, PASTE_NOFUNC, FALSE, FALSE, TRUE ); // als Link + PasteFromClip( IDF_ALL, pClipDoc, PASTE_NOFUNC, FALSE, FALSE, TRUE ); // als Link delete pClipDoc; diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 52fe04459ad8..58ca33611584 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -207,7 +207,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord ) aMarkRange = ScRange( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); } - ScEditableTester aTester( pDoc, aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), + ScEditableTester aTester( pDoc, aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(),rMark ); if (!aTester.IsEditable()) { @@ -226,7 +226,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord ) pUndoDoc->InitUndo( pDoc, nTab, nTab ); if ( rMark.GetSelectCount() > 1 ) - { + { for (SCTAB i=0; i<nTabCount; i++) if ( rMark.GetTableSelect(i) && i != nTab ) pUndoDoc->AddUndoTab( i, i ); @@ -264,8 +264,8 @@ void ScViewFunc::DoRefConversion( BOOL bRecord ) if (aFinder.GetFound()) { ScAddress aPos = ((ScFormulaCell*)pCell)->aPos; - String aNew = aFinder.GetText(); - ScCompiler aComp( pDoc, aPos); + String aNew = aFinder.GetText(); + ScCompiler aComp( pDoc, aPos); aComp.SetGrammar(pDoc->GetGrammar()); ScTokenArray* pArr = aComp.CompileString( aNew ); ScFormulaCell* pNewCell = new ScFormulaCell( pDoc, aPos, @@ -286,7 +286,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord ) pRedoDoc->InitUndo( pDoc, nTab, nTab ); if ( rMark.GetSelectCount() > 1 ) - { + { for (SCTAB i=0; i<nTabCount; i++) if ( rMark.GetTableSelect(i) && i != nTab ) pRedoDoc->AddUndoTab( i, i ); @@ -309,7 +309,7 @@ void ScViewFunc::DoRefConversion( BOOL bRecord ) if (!bOk) ErrorMessage(STR_ERR_NOREF); } -// Thesaurus - Undo ok +// Thesaurus - Undo ok void ScViewFunc::DoThesaurus( BOOL bRecord ) { SCCOL nCol; @@ -331,12 +331,12 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) BOOL bIsEditMode = GetViewData()->HasEditView(eWhich); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; - if (bIsEditMode) // Edit-Mode aktiv + if (bIsEditMode) // Edit-Mode aktiv { GetViewData()->GetEditView(eWhich, pEditView, nCol, nRow); pEditSel = new ESelection(pEditView->GetSelection()); SC_MOD()->InputEnterHandler(); - GetViewData()->GetBindings().Update(); // sonst kommt der Sfx durcheinander... + GetViewData()->GetBindings().Update(); // sonst kommt der Sfx durcheinander... } else { @@ -361,12 +361,12 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) com::sun::star::uno::Reference<com::sun::star::linguistic2::XSpellChecker1> xSpeller = LinguMgr::GetSpellChecker(); - //! if (...) // thesaurus not available - //! { - //! ErrorMessage(STR_EXPORT_ASCII_WARNING); - //! delete pEditSel; - //! return; - //! } + //! if (...) // thesaurus not available + //! { + //! ErrorMessage(STR_EXPORT_ASCII_WARNING); + //! delete pEditSel; + //! return; + //! } pThesaurusEngine = new ScEditEngineDefaulter( pDoc->GetEnginePool() ); pThesaurusEngine->SetEditTextObjectPool( pDoc->GetEditPool() ); @@ -374,7 +374,7 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) pThesaurusEngine->SetSpeller(xSpeller); MakeEditView(pThesaurusEngine, nCol, nRow ); const ScPatternAttr* pPattern = NULL; - SfxItemSet* pEditDefaults = new SfxItemSet(pThesaurusEngine->GetEmptyItemSet()); + SfxItemSet* pEditDefaults = new SfxItemSet(pThesaurusEngine->GetEmptyItemSet()); pPattern = pDoc->GetPattern(nCol, nRow, nTab); if (pPattern ) { @@ -410,12 +410,12 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) pThesaurusEngine->ClearModifyFlag(); - // language is now in EditEngine attributes -> no longer passed to StartThesaurus + // language is now in EditEngine attributes -> no longer passed to StartThesaurus eState = pEditView->StartThesaurus(); DBG_ASSERT(eState != EE_SPELL_NOSPELLER, "No SpellChecker"); - if (eState == EE_SPELL_ERRORFOUND) // sollte spaeter durch Wrapper geschehen! + if (eState == EE_SPELL_ERRORFOUND) // sollte spaeter durch Wrapper geschehen! { LanguageType eLnge = ScViewUtil::GetEffLanguage( pDoc, ScAddress( nCol, nRow, nTab ) ); SvtLanguageTable aLangTab; @@ -440,7 +440,7 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) pDoc->SetString(nCol, nRow, nTab, sNewString); } // erack! it's broadcasted -// pDoc->SetDirty(); +// pDoc->SetDirty(); pDocSh->SetDocumentModified(); if (bRecord) { @@ -604,7 +604,7 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR } // Pasten von FORMAT_FILE-Items -// wird nicht direkt aus Drop aufgerufen, sondern asynchron -> Dialoge sind erlaubt +// wird nicht direkt aus Drop aufgerufen, sondern asynchron -> Dialoge sind erlaubt BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink ) { @@ -621,7 +621,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink ) &aMediaURLItem, 0L ) ); } - if (!bLink) // bei bLink nur Grafik oder URL + if (!bLink) // bei bLink nur Grafik oder URL { // 1. Kann ich die Datei oeffnen? const SfxFilter* pFlt = NULL; @@ -657,7 +657,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink ) Graphic aGraphic; GraphicFilter* pGraphicFilter = GraphicFilter::GetGraphicFilter(); -// GraphicProgress aGraphicProgress(&aGraphicFilter); +// GraphicProgress aGraphicProgress(&aGraphicFilter); if (!pGraphicFilter->ImportGraphic(aGraphic, aURL, GRFILTER_FORMAT_DONTKNOW, &nFilterFormat )) @@ -674,7 +674,7 @@ BOOL ScViewFunc::PasteFile( const Point& rPos, const String& rFile, BOOL bLink ) } } - if (bLink) // bei bLink alles, was nicht Grafik ist, als URL + if (bLink) // bei bLink alles, was nicht Grafik ist, als URL { Rectangle aRect( rPos, Size(0,0) ); ScRange aRange = GetViewData()->GetDocument()-> @@ -733,7 +733,7 @@ void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL, nPosX >= pViewData->GetEditStartCol() && nPosX <= pViewData->GetEditEndCol() && nPosY >= pViewData->GetEditStartRow() && nPosY <= pViewData->GetEditEndRow() ) { - // in die gerade editierte Zelle einfuegen + // in die gerade editierte Zelle einfuegen String aTargetFrame; if (pTarget) @@ -742,7 +742,7 @@ void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL, return; } - // in nicht editierte Zelle einfuegen + // in nicht editierte Zelle einfuegen ScDocument* pDoc = GetViewData()->GetDocument(); SCTAB nTab = GetViewData()->GetTabNo(); @@ -774,10 +774,10 @@ void ScViewFunc::InsertBookmark( const String& rDescription, const String& rURL, if ( bTryReplace && HasBookmarkAtCursor( NULL ) ) { - // if called from hyperlink slot and cell contains only a URL, - // replace old URL with new one + // if called from hyperlink slot and cell contains only a URL, + // replace old URL with new one - aInsSel = ESelection( 0, 0, 0, 1 ); // replace first character (field) + aInsSel = ESelection( 0, 0, 0, 1 ); // replace first character (field) } SvxURLField aField( rURL, rDescription, SVXURLFORMAT_APPDEFAULT ); diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 5ab159cf7dbc..818b602dad41 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ #include <comphelper/processfactory.hxx> #include <sot/formats.hxx> -#define SOT_FORMATSTR_ID_STARCALC_CURRENT SOT_FORMATSTR_ID_STARCALC_50 +#define SOT_FORMATSTR_ID_STARCALC_CURRENT SOT_FORMATSTR_ID_STARCALC_50 #include "viewfunc.hxx" #include "docsh.hxx" @@ -72,7 +72,7 @@ #include "sc.hrc" #include "filter.hxx" #include "scextopt.hxx" -#include "tabvwsh.hxx" // wegen GetViewFrame +#include "tabvwsh.hxx" // wegen GetViewFrame #include "compiler.hxx" #include "asciiopt.hxx" @@ -93,17 +93,17 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, ScDocument* pDoc = GetViewData()->GetDocument(); pDoc->SetPastingDrawFromOtherDoc( TRUE ); - Point aPos; // inserting position (1/100 mm) + Point aPos; // inserting position (1/100 mm) if (pLogicPos) aPos = *pLogicPos; else { - // inserting position isn't needed for text formats + // inserting position isn't needed for text formats BOOL bIsTextFormat = ( ScImportExport::IsFormatSupported( nFormatId ) || nFormatId == FORMAT_RTF ); if ( !bIsTextFormat ) { - // Window MapMode isn't drawing MapMode if DrawingLayer hasn't been created yet + // Window MapMode isn't drawing MapMode if DrawingLayer hasn't been created yet SCTAB nTab = GetViewData()->GetTabNo(); long nXT = 0; @@ -120,7 +120,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, BOOL bRet = FALSE; // - // handle individual formats + // handle individual formats // if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE || @@ -154,7 +154,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, nSrcTab = 0; ScMarkData aSrcMark; - aSrcMark.SelectOneTable( nSrcTab ); // for CopyToClip + aSrcMark.SelectOneTable( nSrcTab ); // for CopyToClip ScDocument* pClipDoc = new ScDocument( SCDOCMODE_CLIP ); SCCOL nFirstCol, nLastCol; @@ -300,7 +300,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, //TODO/LATER: if format is not available, create picture } } - else if ( nFormatId == SOT_FORMATSTR_ID_LINK ) // LINK is also in ScImportExport + else if ( nFormatId == SOT_FORMATSTR_ID_LINK ) // LINK is also in ScImportExport { bRet = PasteDDE( rxTransferable ); } @@ -308,7 +308,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, { if ( nFormatId == SOT_FORMAT_RTF && aDataHelper.HasFormat( SOT_FORMATSTR_ID_EDITENGINE ) ) { - // use EditView's PasteSpecial / Drop + // use EditView's PasteSpecial / Drop PasteRTF( nPosX, nPosY, rxTransferable ); bRet = TRUE; } @@ -367,7 +367,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } else if (nFormatId == SOT_FORMATSTR_ID_SBA_DATAEXCHANGE) { - // import of database data into table + // import of database data into table String sDataDesc; if ( aDataHelper.GetString( nFormatId, sDataDesc ) ) @@ -377,10 +377,10 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, ScDocShell* pDocSh = GetViewData()->GetDocShell(); SCTAB nTab = GetViewData()->GetTabNo(); - ClickCursor(nPosX, nPosY, FALSE); // set cursor position + ClickCursor(nPosX, nPosY, FALSE); // set cursor position - // Creation of database area "Import1" isn't here, but in the DocShell - // slot execute, so it can be added to the undo action + // Creation of database area "Import1" isn't here, but in the DocShell + // slot execute, so it can be added to the undo action ScDBData* pDBData = pDocSh->GetDBData( ScRange(nPosX,nPosY,nTab), SC_DB_OLD, SC_DBSEL_KEEP ); String sTarget; @@ -406,7 +406,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, pCursorItem.reset(new SfxUsrAnyItem(FN_PARAM_3, aDesc[::svx::daCursor])); } - // asynchronous, to avoid doing the whole import in drop handler + // asynchronous, to avoid doing the whole import in drop handler SfxDispatcher& rDisp = GetViewData()->GetDispatcher(); rDisp.Execute(SID_SBA_IMPORT, SFX_CALLMODE_ASYNCHRON, &aDataDesc, &aTarget, &aAreaNew, pCursorItem.get(), (void*)0 ); @@ -416,7 +416,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } else if (nFormatId == SOT_FORMATSTR_ID_SBA_FIELDDATAEXCHANGE) { - // insert database field control + // insert database field control if ( ::svx::OColumnTransferable::canExtractColumnDescriptor( aDataHelper.GetDataFlavorExVector(), CTF_COLUMN_DESCRIPTOR | CTF_CONTROL_EXCHANGE ) ) { @@ -486,7 +486,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, SotStorageStreamRef xStm; if( aDataHelper.GetSotStorageStream( SOT_FORMATSTR_ID_DRAWING, xStm ) ) { - MakeDrawLayer(); // before loading model, so 3D factory has been created + MakeDrawLayer(); // before loading model, so 3D factory has been created SvtPathOptions aPathOpt; String aPath = aPathOpt.GetPalettePath(); @@ -518,10 +518,10 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, pObject = aIter.Next(); } - nObjCount += pPage->GetObjCount(); // #105888# count group object only once + nObjCount += pPage->GetObjCount(); // #105888# count group object only once } - PasteDraw( aPos, pModel, (nObjCount > 1) ); // grouped if more than 1 object + PasteDraw( aPos, pModel, (nObjCount > 1) ); // grouped if more than 1 object delete pModel; aDragShellRef->DoClose(); bRet = TRUE; @@ -529,13 +529,13 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } else if ( (nFormatId == SOT_FORMATSTR_ID_BIFF_5) || (nFormatId == SOT_FORMATSTR_ID_BIFF_8) ) { - // do excel import into a clipboard document + // do excel import into a clipboard document //TODO/MBA: testing uno::Reference < io::XInputStream > xStm; if( aDataHelper.GetInputStream( nFormatId, xStm ) ) { ScDocument* pInsDoc = new ScDocument( SCDOCMODE_CLIP ); - SCTAB nSrcTab = 0; // Biff5 in clipboard: always sheet 0 + SCTAB nSrcTab = 0; // Biff5 in clipboard: always sheet 0 pInsDoc->ResetClip( pDoc, nSrcTab ); SfxMedium aMed; @@ -557,7 +557,7 @@ BOOL ScViewFunc::PasteDataFormat( ULONG nFormatId, } else { - DBG_ERROR("no dimension"); //! possible? + DBG_ERROR("no dimension"); //! possible? SCCOL nFirstCol, nLastCol; SCROW nFirstRow, nLastRow; if ( pInsDoc->GetDataStart( nSrcTab, nFirstCol, nFirstRow ) ) @@ -639,8 +639,8 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx { TransferableDataHelper aDataHelper( rxTransferable ); - // get link data from transferable before string data, - // so the source knows it will be used for a link + // get link data from transferable before string data, + // so the source knows it will be used for a link uno::Sequence<sal_Int8> aSequence; if ( !aDataHelper.GetSequence( SOT_FORMATSTR_ID_LINK, aSequence ) ) @@ -649,7 +649,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx return FALSE; } - // check size (only if string is available in transferable) + // check size (only if string is available in transferable) USHORT nCols = 1; USHORT nRows = 1; @@ -658,7 +658,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx String aDataStr; if ( aDataHelper.GetString( SOT_FORMAT_STRING, aDataStr ) ) { - // get size from string the same way as in ScDdeLink::DataChanged + // get size from string the same way as in ScDdeLink::DataChanged aDataStr.ConvertLineEnd(LINEEND_LF); xub_StrLen nLen = aDataStr.Len(); @@ -675,7 +675,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx } } - // create formula + // create formula long nSeqLen = aSequence.getLength(); sal_Char* pData = (sal_Char*)aSequence.getConstArray(); @@ -709,7 +709,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx aFormula += aQuote; aFormula += ScCompiler::GetNativeSymbol( ocClose); - // mark range + // mark range SCTAB nTab = GetViewData()->GetTabNo(); SCCOL nCurX = GetViewData()->GetCurX(); @@ -720,7 +720,7 @@ BOOL ScViewFunc::PasteDDE( const uno::Reference<datatransfer::XTransferable>& rx MarkCursor( nCurX+static_cast<SCCOL>(nCols)-1, nCurY+static_cast<SCROW>(nRows)-1, nTab ); ShowAllCursors(); - // enter formula + // enter formula EnterMatrix( aFormula ); CursorPosChanged(); diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 3aaae4e10f0d..13e3da52dc21 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -71,7 +71,7 @@ void ScViewFunc::DetectiveAddPred() if (!bDone) Sound::Beep(); - RecalcPPT(); //! use broadcast in DocFunc instead? + RecalcPPT(); //! use broadcast in DocFunc instead? } void ScViewFunc::DetectiveDelPred() @@ -315,7 +315,7 @@ void ScViewFunc::ShowNote( bool bShow ) void ScViewFunc::EditNote() { - // zum Editieren einblenden und aktivieren + // zum Editieren einblenden und aktivieren ScDocShell* pDocSh = GetViewData()->GetDocShell(); ScDocument* pDoc = pDocSh->GetDocument(); @@ -351,7 +351,7 @@ void ScViewFunc::EditNote() GetViewData()->GetDispatcher().Execute( SID_DRAW_NOTEEDIT, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD ); // jetzt den erzeugten FuText holen und in den EditModus setzen FuPoor* pPoor = GetDrawFuncPtr(); - if ( pPoor && (pPoor->GetSlotID() == SID_DRAW_NOTEEDIT) ) // hat keine RTTI + if ( pPoor && (pPoor->GetSlotID() == SID_DRAW_NOTEEDIT) ) // hat keine RTTI { ScrollToObject( pCaption ); // Objekt komplett sichtbar machen static_cast< FuText* >( pPoor )->SetInEditMode( pCaption ); diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index b01c7c53da35..a081ef3558f0 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/embed/Aspects.hpp> -#include "document.hxx" // fuer MapMode Initialisierung in PasteDraw +#include "document.hxx" // fuer MapMode Initialisierung in PasteDraw #include "viewfunc.hxx" #include "tabvwsh.hxx" #include "drawview.hxx" @@ -70,7 +70,7 @@ using namespace com::sun::star; void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize ) { -// SdrPage* pPage = pData->GetDocument()->GetDrawLayer()->GetPage( pData->GetTabNo() ); +// SdrPage* pPage = pData->GetDocument()->GetDrawLayer()->GetPage( pData->GetTabNo() ); SdrPage* pPage = pData->GetScDrawView()->GetModel()->GetPage( static_cast<sal_uInt16>(pData->GetTabNo()) ); DBG_ASSERT(pPage,"pPage ???"); Size aPgSize( pPage->GetSize() ); @@ -83,7 +83,7 @@ void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize ) rPos.X() += x + 80; if( y < 0 ) rPos.Y() += y + 200; - rPos.X() += rSize.Width() / 2; // Position bei Paste gibt Mittelpunkt an + rPos.X() += rSize.Width() / 2; // Position bei Paste gibt Mittelpunkt an rPos.Y() += rSize.Height() / 2; } @@ -93,8 +93,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, MakeDrawLayer(); Point aPos( rLogicPos ); - // #64184# MapMode am Outliner-RefDevice muss stimmen (wie in FuText::MakeOutliner) - //! mit FuText::MakeOutliner zusammenfassen? + // #64184# MapMode am Outliner-RefDevice muss stimmen (wie in FuText::MakeOutliner) + //! mit FuText::MakeOutliner zusammenfassen? MapMode aOldMapMode; OutputDevice* pRef = GetViewData()->GetDocument()->GetDrawLayer()->GetRefDevice(); if (pRef) @@ -169,7 +169,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, pNeuObj->SetModel(pDrawModel); pNeuObj->SetPage(pDestPage); - // #68787# copy graphics within the same model - always needs new name + // #68787# copy graphics within the same model - always needs new name if ( pNeuObj->ISA(SdrGrafObj) && !bPasteIsMove ) pNeuObj->SetName(((ScDrawLayer*)pDrawModel)->GetNewGraphicName()); @@ -178,8 +178,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, pDestPage->InsertObject( pNeuObj ); pScDrawView->AddUndo(new SdrUndoInsertObj( *pNeuObj )); - // Chart braucht nicht mehr getrennt behandelt zu werden, - // weil es seine Daten jetzt selber hat + // Chart braucht nicht mehr getrennt behandelt zu werden, + // weil es seine Daten jetzt selber hat } } @@ -189,7 +189,7 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, } else { - bPasteIsMove = FALSE; // kein internes Verschieben passiert + bPasteIsMove = FALSE; // kein internes Verschieben passiert SdrView aView(pModel); // #i71529# never create a base class of SdrView directly! SdrPageView* pPv = aView.ShowSdrPage(aView.GetModel()->GetPage(0)); @@ -197,8 +197,8 @@ void ScViewFunc::PasteDraw( const Point& rLogicPos, SdrModel* pModel, Size aSize = aView.GetAllMarkedRect().GetSize(); lcl_AdjustInsertPos( GetViewData(), aPos, aSize ); - // #41333# Markierung nicht aendern, wenn Ole-Objekt aktiv - // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!) + // #41333# Markierung nicht aendern, wenn Ole-Objekt aktiv + // (bei Drop aus Ole-Objekt wuerde sonst mitten im ExecuteDrag deaktiviert!) ULONG nOptions = 0; SfxInPlaceClient* pClient = GetViewData()->GetViewShell()->GetIPClient(); @@ -294,7 +294,7 @@ BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X aSz.Height = aSize.Height(); xObj->setVisualAreaSize( nAspect, aSz ); } - + awt::Size aSz; try { @@ -304,9 +304,9 @@ BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X { // the default size will be set later } - + aSize = Size( aSz.Width, aSz.Height ); - aSize = OutputDevice::LogicToLogic( aSize, aMapObj, aMap100 ); // fuer SdrOle2Obj + aSize = OutputDevice::LogicToLogic( aSize, aMapObj, aMap100 ); // fuer SdrOle2Obj if( aSize.Height() == 0 || aSize.Width() == 0 ) { @@ -330,7 +330,7 @@ BOOL ScViewFunc::PasteObject( const Point& rPos, const uno::Reference < embed::X SdrOle2Obj* pSdrObj = new SdrOle2Obj( aObjRef, aName, aRect ); SdrPageView* pPV = pDrView->GetSdrPageView(); - pDrView->InsertObjectSafe( pSdrObj, *pPV ); // nicht markieren wenn Ole + pDrView->InsertObjectSafe( pSdrObj, *pPV ); // nicht markieren wenn Ole GetViewData()->GetViewShell()->SetDrawShell( TRUE ); return TRUE; } @@ -365,7 +365,7 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic, if (aSourceMap.GetMapUnit() == MAP_PIXEL) { - // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt + // Pixel-Korrektur beruecksichtigen, damit Bitmap auf dem Bildschirm stimmt Fraction aScaleX, aScaleY; pScDrawView->CalcNormScale( aScaleX, aScaleY ); @@ -374,7 +374,7 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic, } Size aSize = pWin->LogicToLogic( rGraphic.GetPrefSize(), &aSourceMap, &aDestMap ); -// lcl_AdjustInsertPos( GetViewData(), aPos, aSize ); +// lcl_AdjustInsertPos( GetViewData(), aPos, aSize ); if ( GetViewData()->GetDocument()->IsNegativePage( GetViewData()->GetTabNo() ) ) aPos.X() -= aSize.Width(); @@ -385,10 +385,10 @@ BOOL ScViewFunc::PasteGraphic( const Point& rPos, const Graphic& rGraphic, // #118522# calling SetGraphicLink here doesn't work - // #49961# Pfad wird nicht mehr als Name der Grafik gesetzt + // #49961# Pfad wird nicht mehr als Name der Grafik gesetzt ScDrawLayer* pLayer = (ScDrawLayer*) pScDrawView->GetModel(); - String aName = pLayer->GetNewGraphicName(); // "Grafik x" + String aName = pLayer->GetNewGraphicName(); // "Grafik x" pGrafObj->SetName(aName); // nicht markieren wenn Ole diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 2997b71822e5..e928f68aa49a 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ #include <vcl/virdev.hxx> #include <vcl/waitobj.hxx> #include <vcl/wrkwin.hxx> -#include <stdlib.h> // qsort +#include <stdlib.h> // qsort #include "viewfunc.hxx" #include "tabvwsh.hxx" @@ -107,11 +107,11 @@ ScViewFunc::~ScViewFunc() void ScViewFunc::StartFormatArea() { - // ueberhaupt aktiviert? + // ueberhaupt aktiviert? if ( !SC_MOD()->GetInputOptions().GetExtendFormat() ) return; - // start only with single cell (marked or cursor position) + // start only with single cell (marked or cursor position) ScRange aMarkRange; BOOL bOk = (GetViewData()->GetSimpleArea( aMarkRange ) == SC_MARK_SIMPLE); if ( bOk && aMarkRange.aStart != aMarkRange.aEnd ) @@ -124,24 +124,24 @@ void ScViewFunc::StartFormatArea() aFormatArea = ScRange( aFormatSource ); } else - bFormatValid = FALSE; // keinen alten Bereich behalten + bFormatValid = FALSE; // keinen alten Bereich behalten } BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrChanged ) { - // ueberhaupt aktiviert? + // ueberhaupt aktiviert? if ( !SC_MOD()->GetInputOptions().GetExtendFormat() ) return FALSE; - // Test: Eingabe mit Zahlformat (bAttrChanged) immer als neue Attributierung behandeln - // (alte Area verwerfen). Wenn das nicht gewollt ist, den if-Teil weglassen: + // Test: Eingabe mit Zahlformat (bAttrChanged) immer als neue Attributierung behandeln + // (alte Area verwerfen). Wenn das nicht gewollt ist, den if-Teil weglassen: if ( bAttrChanged ) { StartFormatArea(); return FALSE; } - //! Abfrage, ob Zelle leer war ??? + //! Abfrage, ob Zelle leer war ??? BOOL bFound = FALSE; ScRange aNewRange = aFormatArea; @@ -149,18 +149,18 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC { if ( nRow >= aFormatArea.aStart.Row() && nRow <= aFormatArea.aEnd.Row() ) { - // innerhalb ? + // innerhalb ? if ( nCol >= aFormatArea.aStart.Col() && nCol <= aFormatArea.aEnd.Col() ) { - bFound = TRUE; // Bereich nicht aendern + bFound = TRUE; // Bereich nicht aendern } - // links ? + // links ? if ( nCol+1 == aFormatArea.aStart.Col() ) { bFound = TRUE; aNewRange.aStart.SetCol( nCol ); } - // rechts ? + // rechts ? if ( nCol == aFormatArea.aEnd.Col()+1 ) { bFound = TRUE; @@ -169,13 +169,13 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC } if ( nCol >= aFormatArea.aStart.Col() && nCol <= aFormatArea.aEnd.Col() ) { - // oben ? + // oben ? if ( nRow+1 == aFormatArea.aStart.Row() ) { bFound = TRUE; aNewRange.aStart.SetRow( nRow ); } - // unten ? + // unten ? if ( nRow == aFormatArea.aEnd.Row()+1 ) { bFound = TRUE; @@ -185,12 +185,12 @@ BOOL ScViewFunc::TestFormatArea( SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bAttrC } if (bFound) - aFormatArea = aNewRange; // erweitern + aFormatArea = aNewRange; // erweitern else { - bFormatValid = FALSE; // ausserhalb -> abbrechen - if ( bAttrChanged ) // Wert mit Zahlformat eingegeben? - StartFormatArea(); // dann ggf. neu starten + bFormatValid = FALSE; // ausserhalb -> abbrechen + if ( bAttrChanged ) // Wert mit Zahlformat eingegeben? + StartFormatArea(); // dann ggf. neu starten } return bFound; @@ -209,7 +209,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, if ( !((const ScMergeAttr&)pSource->GetItem(ATTR_MERGE)).IsMerged() ) { const ScPatternAttr* pDocOld = pDoc->GetPattern( nCol, nRow, nTab ); - // pDocOld ist nur bis zum Apply... gueltig! + // pDocOld ist nur bis zum Apply... gueltig! ScPatternAttr* pOldPattern = NULL; if ( bAddUndo ) @@ -219,7 +219,7 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, if ( pSrcStyle && pSrcStyle != pDocOld->GetStyleSheet() ) pDoc->ApplyStyle( nCol, nRow, nTab, *pSrcStyle ); pDoc->ApplyPattern( nCol, nRow, nTab, *pSource ); - AdjustRowHeight( nRow, nRow, TRUE ); //! nicht doppelt ? + AdjustRowHeight( nRow, nRow, TRUE ); //! nicht doppelt ? if ( bAddUndo ) { @@ -230,17 +230,17 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, pOldPattern, pNewPattern, pSource, TRUE ) ); - delete pOldPattern; // wird im Undo kopiert (Pool) + delete pOldPattern; // wird im Undo kopiert (Pool) } } - if ( bAttrChanged ) // Wert mit Zahlformat eingegeben? - aFormatSource.Set( nCol, nRow, nTab ); // dann als neue Quelle + if ( bAttrChanged ) // Wert mit Zahlformat eingegeben? + aFormatSource.Set( nCol, nRow, nTab ); // dann als neue Quelle } //------------------------------------------------------------------------------------ -// Hilfsroutinen +// Hilfsroutinen USHORT ScViewFunc::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, BOOL bFormula ) { @@ -284,7 +284,7 @@ BOOL ScViewFunc::SelectionEditable( BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ ) return bRet; } -#ifndef LRU_MAX +#ifndef LRU_MAX #define LRU_MAX 10 #endif @@ -307,22 +307,22 @@ BOOL lcl_AddFunction( ScAppOptions& rAppOpt, USHORT nOpCode ) USHORT* pOldList = rAppOpt.GetLRUFuncList(); USHORT nPos; for (nPos=0; nPos<nOldCount; nPos++) - if (pOldList[nPos] == nOpCode) // is the function already in the list? + if (pOldList[nPos] == nOpCode) // is the function already in the list? { if ( nPos == 0 ) - return FALSE; // already at the top -> no change + return FALSE; // already at the top -> no change - // count doesn't change, so the original array is modified + // count doesn't change, so the original array is modified for (USHORT nCopy=nPos; nCopy>0; nCopy--) pOldList[nCopy] = pOldList[nCopy-1]; pOldList[0] = nOpCode; - return TRUE; // list has changed + return TRUE; // list has changed } if ( !lcl_FunctionKnown( nOpCode ) ) - return FALSE; // not in function list -> no change + return FALSE; // not in function list -> no change USHORT nNewCount = Min( (USHORT)(nOldCount + 1), (USHORT)LRU_MAX ); USHORT nNewList[LRU_MAX]; @@ -331,12 +331,12 @@ BOOL lcl_AddFunction( ScAppOptions& rAppOpt, USHORT nOpCode ) nNewList[nPos] = pOldList[nPos-1]; rAppOpt.SetLRUFuncList( nNewList, nNewCount ); - return TRUE; // list has changed + return TRUE; // list has changed } -// eigentliche Funktionen +// eigentliche Funktionen -// Eingabe - Undo OK +// Eingabe - Undo OK void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, BOOL bRecord, const EditTextObject* pData ) @@ -358,18 +358,18 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS BOOL bEditDeleted = FALSE; BYTE nOldScript = 0; - ScBaseCell** ppOldCells = NULL; - BOOL* pHasFormat = NULL; - ULONG* pOldFormats = NULL; - SCTAB* pTabs = NULL; + ScBaseCell** ppOldCells = NULL; + BOOL* pHasFormat = NULL; + ULONG* pOldFormats = NULL; + SCTAB* pTabs = NULL; SCTAB nUndoPos = 0; EditTextObject* pUndoData = NULL; if ( bRecord ) { - ppOldCells = new ScBaseCell*[nSelCount]; - pHasFormat = new BOOL[nSelCount]; - pOldFormats = new ULONG[nSelCount]; - pTabs = new SCTAB[nSelCount]; + ppOldCells = new ScBaseCell*[nSelCount]; + pHasFormat = new BOOL[nSelCount]; + pOldFormats = new ULONG[nSelCount]; + pTabs = new SCTAB[nSelCount]; nUndoPos = 0; for (i=0; i<nTabCount; i++) @@ -454,7 +454,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS BOOL bNumFmtChanged = FALSE; if ( bFormula ) - { // Formel, compile mit AutoCorrection + { // Formel, compile mit AutoCorrection for (i=0; i<nTabCount; i++) if (rMark.GetTableSelect(i)) break; @@ -477,7 +477,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS ScTokenArray* pArrFirst = pArr = aComp.CompileString( aFormula ); BOOL bCorrected = aComp.IsCorrected(); if ( bCorrected ) - { // probieren, mit erster Parser-Korrektur neu zu parsen + { // probieren, mit erster Parser-Korrektur neu zu parsen pArr = aComp.CompileString( aComp.GetCorrectedFormula() ); } if ( !pArr->GetCodeError() ) @@ -498,7 +498,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS aCorrectedFormula = aComp.GetCorrectedFormula(); short nResult; if ( aCorrectedFormula.Len() == 1 ) - nResult = RET_NO; // leere Formel, nur '=' + nResult = RET_NO; // leere Formel, nur '=' else { String aMessage( ScResId( SCSTR_FORMULA_AUTOCORRECTION ) ); @@ -534,8 +534,8 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS USHORT nError = pArr->GetCodeError(); if ( !nError ) { - // #68693# update list of recent functions with all functions that - // are not within parentheses + // #68693# update list of recent functions with all functions that + // are not within parentheses ScModule* pScMod = SC_MOD(); ScAppOptions aAppOpt = pScMod->GetAppOptions(); @@ -602,7 +602,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS } pDoc->PutCell( aPos, pCell ); if ( !bAutoCalc ) - { // einmal nur die Zelle berechnen und wieder dirty setzen + { // einmal nur die Zelle berechnen und wieder dirty setzen pCell->Interpret(); pCell->SetDirtyVar(); pDoc->PutInFormulaTree( pCell ); @@ -620,7 +620,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS bNumFmtChanged = TRUE; } - // row height must be changed if new text has a different script type + // row height must be changed if new text has a different script type for (i=0; i<nTabCount && !bEditDeleted; i++) if (rMark.GetTableSelect(i)) if ( pDoc->GetScriptType( nCol, nRow, i ) != nOldScript ) @@ -636,7 +636,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS DoAutoAttributes(nCol, nRow, nTab, bNumFmtChanged, bRecord); if ( bRecord ) - { // wg. ChangeTrack erst jetzt + { // wg. ChangeTrack erst jetzt pDocSh->GetUndoManager()->AddUndoAction( new ScUndoEnterData( pDocSh, nCol, nRow, nTab, nUndoPos, pTabs, ppOldCells, pHasFormat, pOldFormats, @@ -671,11 +671,11 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rS else { ErrorMessage(aTester.GetMessageId()); - PaintArea( nCol, nRow, nCol, nRow ); // da steht evtl. noch die Edit-Engine + PaintArea( nCol, nRow, nCol, nRow ); // da steht evtl. noch die Edit-Engine } } -// Wert in einzele Zelle eintragen (nur auf nTab) +// Wert in einzele Zelle eintragen (nur auf nTab) void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& rValue ) { @@ -696,7 +696,7 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r || pDoc->HasAttrib( nCol,nRow,nTab, nCol,nRow,nTab, HASATTR_NEEDHEIGHT ); - // Undo + // Undo ScBaseCell* pUndoCell = (bUndo && pOldCell) ? pOldCell->CloneWithoutNote( *pDoc ) : 0; pDoc->SetValue( nCol, nRow, nTab, rValue ); @@ -708,7 +708,7 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r new ScUndoEnterValue( pDocSh, aPos, pUndoCell, rValue, bNeedHeight ) ); } -/*! Zeilenhoehe anpassen? Dann auch bei Undo... +/*! Zeilenhoehe anpassen? Dann auch bei Undo... if (bNeedHeight) AdjustRowHeight(nRow,nRow); */ @@ -737,7 +737,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb if (aTester.IsEditable()) { // - // Test auf Attribute + // Test auf Attribute // BOOL bSimple = FALSE; BOOL bCommon = FALSE; @@ -749,7 +749,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb ScTabEditEngine aEngine( *pOldPattern, pDoc->GetEnginePool() ); aEngine.SetText(*pData); - if (bTestSimple) // Testen, ob einfacher String ohne Attribute + if (bTestSimple) // Testen, ob einfacher String ohne Attribute { ScEditAttrTester aAttrTester( &aEngine ); bSimple = !aAttrTester.NeedsObject(); @@ -765,11 +765,11 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb bSimple = TRUE; } - if (bCommon) // Attribute fuer Tabelle + if (bCommon) // Attribute fuer Tabelle { pCellAttrs = new ScPatternAttr( *pOldPattern ); pCellAttrs->GetFromEditItemSet( &aAttrTester.GetAttribs() ); - //! remove common attributes from EditEngine? + //! remove common attributes from EditEngine? } } @@ -777,20 +777,20 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb aString = ScEditUtil::GetSpaceDelimitedString(aEngine); // - // Undo + // Undo // SCTAB nTabCount = pDoc->GetTableCount(); SCTAB nSelCount = rMark.GetSelectCount(); SCTAB i; - ScBaseCell** ppOldCells = NULL; - SCTAB* pTabs = NULL; + ScBaseCell** ppOldCells = NULL; + SCTAB* pTabs = NULL; SCTAB nPos = 0; EditTextObject* pUndoData = NULL; if (bRecord && !bSimple) { - ppOldCells = new ScBaseCell*[nSelCount]; - pTabs = new SCTAB[nSelCount]; + ppOldCells = new ScBaseCell*[nSelCount]; + pTabs = new SCTAB[nSelCount]; nPos = 0; for (i=0; i<nTabCount; i++) @@ -809,11 +809,11 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb } // - // Daten eintragen + // Daten eintragen // if (bCommon) - pDoc->ApplyPattern(nCol,nRow,nTab,*pCellAttrs); //! Undo + pDoc->ApplyPattern(nCol,nRow,nTab,*pCellAttrs); //! Undo if (bSimple) { @@ -829,7 +829,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb pDoc->PutCell( nCol, nRow, i, new ScEditCell( pData, pDoc, NULL ) ); if ( bRecord ) - { // wg. ChangeTrack erst jetzt + { // wg. ChangeTrack erst jetzt pDocSh->GetUndoManager()->AddUndoAction( new ScUndoEnterData( pDocSh, nCol, nRow, nTab, nPos, pTabs, ppOldCells, NULL, NULL, aString, @@ -872,7 +872,7 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, const EditTextOb else { ErrorMessage(aTester.GetMessageId()); - PaintArea( nCol, nRow, nCol, nRow ); // da steht evtl. noch die Edit-Engine + PaintArea( nCol, nRow, nCol, nRow ); // da steht evtl. noch die Edit-Engine } } @@ -891,8 +891,8 @@ void ScViewFunc::EnterMatrix( const String& rString ) const ScMarkData& rMark = pData->GetMarkData(); if ( !rMark.IsMarked() && !rMark.IsMultiMarked() ) { - // nichts markiert -> automatisch Block mit Groesse des Ergebnisses - // Formel temporaer berechnen, um an die Groesse heranzukommen + // nichts markiert -> automatisch Block mit Groesse des Ergebnisses + // Formel temporaer berechnen, um an die Groesse heranzukommen ScDocument* pDoc = pData->GetDocument(); SCCOL nCol = pData->GetCurX(); @@ -972,7 +972,7 @@ const ScPatternAttr* ScViewFunc::GetSelectionPattern() ScDocument* pDoc = GetViewData()->GetDocument(); if ( rMark.IsMarked() || rMark.IsMultiMarked() ) { - // MarkToMulti is no longer necessary for pDoc->GetSelectionPattern + // MarkToMulti is no longer necessary for pDoc->GetSelectionPattern const ScPatternAttr* pAttr = pDoc->GetSelectionPattern( rMark ); return pAttr; } @@ -982,15 +982,15 @@ const ScPatternAttr* ScViewFunc::GetSelectionPattern() SCROW nRow = GetViewData()->GetCurY(); SCTAB nTab = GetViewData()->GetTabNo(); - ScMarkData aTempMark( rMark ); // copy sheet selection + ScMarkData aTempMark( rMark ); // copy sheet selection aTempMark.SetMarkArea( ScRange( nCol, nRow, nTab ) ); const ScPatternAttr* pAttr = pDoc->GetSelectionPattern( aTempMark ); return pAttr; } } -void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, - SvxBoxInfoItem& rLineInner ) +void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, + SvxBoxInfoItem& rLineInner ) { ScDocument* pDoc = GetViewData()->GetDocument(); const ScMarkData& rMark = GetViewData()->GetMarkData(); @@ -999,8 +999,8 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, { if ( rMark.IsMultiMarked() ) { - ScMarkData aNewMark( rMark ); // use local copy for MarkToSimple - aNewMark.MarkToSimple(); // simple block is needed for GetSelectionFrame + ScMarkData aNewMark( rMark ); // use local copy for MarkToSimple + aNewMark.MarkToSimple(); // simple block is needed for GetSelectionFrame pDoc->GetSelectionFrame( aNewMark, rLineOuter, rLineInner ); } else @@ -1013,7 +1013,7 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); - rLineOuter = (const SvxBoxItem&) (pAttrs->GetItem( ATTR_BORDER )); + rLineOuter = (const SvxBoxItem&) (pAttrs->GetItem( ATTR_BORDER )); rLineInner = (const SvxBoxInfoItem&)(pAttrs->GetItem( ATTR_BORDER_INNER )); rLineInner.SetTable(FALSE); rLineInner.SetDist(TRUE); @@ -1022,14 +1022,14 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, } // -// Attribute anwenden - Undo OK +// Attribute anwenden - Undo OK // -// kompletter Set ( ATTR_STARTINDEX, ATTR_ENDINDEX ) +// kompletter Set ( ATTR_STARTINDEX, ATTR_ENDINDEX ) // void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet, - BOOL bRecord ) + BOOL bRecord ) { // nur wegen Matrix nicht editierbar? Attribute trotzdem ok BOOL bOnlyNotBecauseOfMatrix; @@ -1044,7 +1044,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, aNewAttrs.DeleteUnchanged( &aOldAttrs ); if ( pDialogSet->GetItemState( ATTR_VALUE_FORMAT ) == SFX_ITEM_SET ) - { // #82521# don't reset to default SYSTEM GENERAL if not intended + { // #82521# don't reset to default SYSTEM GENERAL if not intended sal_uInt32 nOldFormat = ((const SfxUInt32Item&)pOldSet->Get( ATTR_VALUE_FORMAT )).GetValue(); sal_uInt32 nNewFormat = @@ -1064,7 +1064,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, aNewAttrs.GetItemSet().Put( SvxLanguageItem( eNewLang, ATTR_LANGUAGE_FORMAT ) ); - // #40606# nur die Sprache geaendert -> Zahlformat-Attribut nicht anfassen + // #40606# nur die Sprache geaendert -> Zahlformat-Attribut nicht anfassen sal_uInt32 nNewMod = nNewFormat % SV_COUNTRY_LANGUAGE_OFFSET; if ( nNewMod == ( nOldFormat % SV_COUNTRY_LANGUAGE_OFFSET ) && nNewMod <= SV_MAX_ANZ_STANDARD_FORMATE ) @@ -1073,14 +1073,14 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, } } - const SvxBoxItem* pOldOuter = (const SvxBoxItem*) &pOldSet->Get( ATTR_BORDER ); - const SvxBoxItem* pNewOuter = (const SvxBoxItem*) &pDialogSet->Get( ATTR_BORDER ); + const SvxBoxItem* pOldOuter = (const SvxBoxItem*) &pOldSet->Get( ATTR_BORDER ); + const SvxBoxItem* pNewOuter = (const SvxBoxItem*) &pDialogSet->Get( ATTR_BORDER ); const SvxBoxInfoItem* pOldInner = (const SvxBoxInfoItem*) &pOldSet->Get( ATTR_BORDER_INNER ); const SvxBoxInfoItem* pNewInner = (const SvxBoxInfoItem*) &pDialogSet->Get( ATTR_BORDER_INNER ); - SfxItemSet& rNewSet = aNewAttrs.GetItemSet(); - SfxItemPool* pNewPool = rNewSet.GetPool(); + SfxItemSet& rNewSet = aNewAttrs.GetItemSet(); + SfxItemPool* pNewPool = rNewSet.GetPool(); - pNewPool->Put( *pNewOuter ); // noch nicht loeschen + pNewPool->Put( *pNewOuter ); // noch nicht loeschen pNewPool->Put( *pNewInner ); rNewSet.ClearItem( ATTR_BORDER ); rNewSet.ClearItem( ATTR_BORDER_INNER ); @@ -1098,7 +1098,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, if ( pNewOuter==pOldOuter && pNewInner==pOldInner ) bFrame = FALSE; - // das sollte doch der Pool abfangen: ?!??!?? + // das sollte doch der Pool abfangen: ?!??!?? if ( bFrame && pNewOuter && pNewInner ) if ( *pNewOuter == *pOldOuter && *pNewInner == *pOldInner ) @@ -1118,7 +1118,7 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, bFrame = FALSE; if (!bFrame) - ApplySelectionPattern( aNewAttrs, bRecord ); // nur normale + ApplySelectionPattern( aNewAttrs, bRecord ); // nur normale else { // wenn neue Items Default-Items sind, so muessen die @@ -1133,10 +1133,10 @@ void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, bRecord ); } - pNewPool->Remove( *pNewOuter ); // freigeben + pNewPool->Remove( *pNewOuter ); // freigeben pNewPool->Remove( *pNewInner ); - // Hoehen anpassen + // Hoehen anpassen AdjustBlockHeight(); // CellContentChanged wird von ApplySelectionPattern / ApplyPatternLines gerufen @@ -1156,7 +1156,7 @@ void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem ) ATTR_PATTERN_START, ATTR_PATTERN_END ) ); aNewAttrs.GetItemSet().Put( rAttrItem ); - // Wenn Ausrichtung eingestellt wird (ueber Buttons), immer Einzug 0 + // Wenn Ausrichtung eingestellt wird (ueber Buttons), immer Einzug 0 if ( rAttrItem.Which() == ATTR_HOR_JUSTIFY ) aNewAttrs.GetItemSet().Put( SfxUInt16Item( ATTR_INDENT, 0 ) ); ApplySelectionPattern( aNewAttrs ); @@ -1167,7 +1167,7 @@ void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem ) } -// Pattern und Rahmen +// Pattern und Rahmen void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem* pNewOuter, const SvxBoxInfoItem* pNewInner, BOOL bRecord ) @@ -1188,7 +1188,7 @@ void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem else { aMarkRange = ScRange( GetViewData()->GetCurX(), - GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); + GetViewData()->GetCurY(), GetViewData()->GetTabNo() ); DoneBlockMode(); InitOwnBlockMode(); aFuncMark.SetMarkArea(aMarkRange); @@ -1240,24 +1240,24 @@ void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem StartFormatArea(); } -// nur Pattern +// nur Pattern void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, BOOL bRecord, BOOL bCursorOnly ) { - ScViewData* pViewData = GetViewData(); - ScDocShell* pDocSh = pViewData->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); + ScViewData* pViewData = GetViewData(); + ScDocShell* pDocSh = pViewData->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); ScMarkData aFuncMark( pViewData->GetMarkData() ); // local copy for UnmarkFiltered ScViewUtil::UnmarkFiltered( aFuncMark, pDoc ); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; - // State from old ItemSet doesn't matter for paint flags, as any change will be - // from SFX_ITEM_SET in the new ItemSet (default is ignored in ApplyPattern). - // New alignment is checked (check in PostPaint isn't enough) in case a right - // alignment is changed to left. + // State from old ItemSet doesn't matter for paint flags, as any change will be + // from SFX_ITEM_SET in the new ItemSet (default is ignored in ApplyPattern). + // New alignment is checked (check in PostPaint isn't enough) in case a right + // alignment is changed to left. const SfxItemSet& rNewSet = rAttr.GetItemSet(); BOOL bSetLines = rNewSet.GetItemState( ATTR_BORDER, TRUE ) == SFX_ITEM_SET || rNewSet.GetItemState( ATTR_SHADOW, TRUE ) == SFX_ITEM_SET; @@ -1341,7 +1341,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, aModificator.SetDocumentModified(); CellContentChanged(); } - else // einzelne Zelle - Undo einfacher + else // einzelne Zelle - Undo einfacher { SCCOL nCol = pViewData->GetCurX(); SCROW nRow = pViewData->GetCurY(); @@ -1373,7 +1373,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, pUndo->SetEditData(pOldEditData, pNewEditData); pDocSh->GetUndoManager()->AddUndoAction(pUndo); } - delete pOldPat; // wird im Undo kopiert (Pool) + delete pOldPat; // wird im Undo kopiert (Pool) pDocSh->PostPaint( nCol,nRow,nTab, nCol,nRow,nTab, PAINT_GRID, nExtFlags | SC_PF_TESTMERGE ); pDocSh->UpdateOle(GetViewData()); @@ -1418,7 +1418,7 @@ void ScViewFunc::ApplySelectionPattern( const ScPatternAttr& rAttr, void ScViewFunc::ApplyUserItemSet( const SfxItemSet& rItemSet ) { - // ItemSet from UI, may have different pool + // ItemSet from UI, may have different pool BOOL bOnlyNotBecauseOfMatrix; if ( !SelectionEditable( &bOnlyNotBecauseOfMatrix ) && !bOnlyNotBecauseOfMatrix ) @@ -1440,13 +1440,13 @@ const SfxStyleSheet* ScViewFunc::GetStyleSheetFromMarked() // Don't use UnmarkFiltered in slot state functions, for performance reasons. // The displayed state is always that of the whole selection including filtered rows. - const ScStyleSheet* pSheet = NULL; - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - ScMarkData& rMark = pViewData->GetMarkData(); + const ScStyleSheet* pSheet = NULL; + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); + ScMarkData& rMark = pViewData->GetMarkData(); if ( rMark.IsMarked() || rMark.IsMultiMarked() ) - pSheet = pDoc->GetSelectionStyle( rMark ); // MarkToMulti isn't necessary + pSheet = pDoc->GetSelectionStyle( rMark ); // MarkToMulti isn't necessary else pSheet = pDoc->GetStyle( pViewData->GetCurX(), pViewData->GetCurY(), @@ -1468,12 +1468,12 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, BOOL bRecord if ( !pStyleSheet) return; // ------------------------------------------------------------------- - ScViewData* pViewData = GetViewData(); - ScDocShell* pDocSh = pViewData->GetDocShell(); - ScDocument* pDoc = pDocSh->GetDocument(); + ScViewData* pViewData = GetViewData(); + ScDocShell* pDocSh = pViewData->GetDocShell(); + ScDocument* pDoc = pDocSh->GetDocument(); ScMarkData aFuncMark( pViewData->GetMarkData() ); // local copy for UnmarkFiltered ScViewUtil::UnmarkFiltered( aFuncMark, pDoc ); - SCTAB nTabCount = pDoc->GetTableCount(); + SCTAB nTabCount = pDoc->GetTableCount(); if (bRecord && !pDoc->IsUndoEnabled()) bRecord = FALSE; @@ -1558,9 +1558,9 @@ void ScViewFunc::RemoveStyleSheetInUse( SfxStyleSheet* pStyleSheet ) if ( !pStyleSheet) return; // ------------------------------------------------------------------- - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - ScDocShell* pDocSh = pViewData->GetDocShell(); + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); + ScDocShell* pDocSh = pViewData->GetDocShell(); ScDocShellModificator aModificator( *pDocSh ); @@ -1585,9 +1585,9 @@ void ScViewFunc::UpdateStyleSheetInUse( SfxStyleSheet* pStyleSheet ) if ( !pStyleSheet) return; // ------------------------------------------------------------------- - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - ScDocShell* pDocSh = pViewData->GetDocShell(); + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); + ScDocShell* pDocSh = pViewData->GetDocShell(); ScDocShellModificator aModificator( *pDocSh ); @@ -1607,7 +1607,7 @@ void ScViewFunc::UpdateStyleSheetInUse( SfxStyleSheet* pStyleSheet ) pHdl->ForgetLastPattern(); } -// Zellen einfuegen - Undo OK +// Zellen einfuegen - Undo OK BOOL ScViewFunc::InsertCells( InsCellCmd eCmd, BOOL bRecord, BOOL bPartOfPaste ) { @@ -1646,7 +1646,7 @@ BOOL ScViewFunc::InsertCells( InsCellCmd eCmd, BOOL bRecord, BOOL bPartOfPaste ) } } -// Zellen loeschen - Undo OK +// Zellen loeschen - Undo OK void ScViewFunc::DeleteCells( DelCellCmd eCmd, BOOL bRecord ) { @@ -1698,7 +1698,7 @@ void ScViewFunc::DeleteCells( DelCellCmd eCmd, BOOL bRecord ) } } - // #58106# Cursor direkt hinter den geloeschten Bereich setzen + // #58106# Cursor direkt hinter den geloeschten Bereich setzen SCCOL nCurX = GetViewData()->GetCurX(); SCROW nCurY = GetViewData()->GetCurY(); if ( eCmd==DEL_CELLSLEFT || eCmd==DEL_DELCOLS ) @@ -1740,7 +1740,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord ) nRangeCnt = 1; } - // Test ob erlaubt + // Test ob erlaubt SCCOLROW* pOneRange = pRanges; USHORT nErrorId = 0; @@ -1807,16 +1807,16 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord ) return; } - // ausfuehren + // ausfuehren - WaitObject aWait( GetFrameWin() ); // wichtig wegen TrackFormulas bei UpdateReference + WaitObject aWait( GetFrameWin() ); // wichtig wegen TrackFormulas bei UpdateReference ScDocument* pUndoDoc = NULL; ScRefUndoData* pUndoData = NULL; if (bRecord) { pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); - pUndoDoc->InitUndo( pDoc, nTab, nTab, !bRows, bRows ); // Zeilenhoehen + pUndoDoc->InitUndo( pDoc, nTab, nTab, !bRows, bRows ); // Zeilenhoehen pOneRange = pRanges; for (nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++) @@ -1831,7 +1831,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord ) IDF_ALL,FALSE,pUndoDoc ); } - // alle Formeln wegen Referenzen + // alle Formeln wegen Referenzen SCTAB nTabCount = pDoc->GetTableCount(); pUndoDoc->AddUndoTab( 0, nTabCount-1, FALSE, FALSE ); pDoc->CopyToDocument( 0,0,0, MAXCOL,MAXROW,MAXTAB, IDF_FORMULA,FALSE,pUndoDoc ); @@ -1841,7 +1841,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord ) pDoc->BeginDrawUndo(); } - pOneRange = &pRanges[2*nRangeCnt]; // rueckwaerts + pOneRange = &pRanges[2*nRangeCnt]; // rueckwaerts for (nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++) { SCCOLROW nEnd = *(--pOneRange); @@ -1884,7 +1884,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord ) CellContentChanged(); - // #58106# Cursor direkt hinter den ersten geloeschten Bereich setzen + // #58106# Cursor direkt hinter den ersten geloeschten Bereich setzen SCCOL nCurX = GetViewData()->GetCurX(); SCROW nCurY = GetViewData()->GetCurY(); if ( bRows ) @@ -1898,7 +1898,7 @@ void ScViewFunc::DeleteMulti( BOOL bRows, BOOL bRecord ) SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREALINKS_CHANGED ) ); } -// Inhalte loeschen +// Inhalte loeschen void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) { @@ -1940,15 +1940,15 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) aMarkRange.aEnd = aMarkRange.aStart; if ( pDoc->HasAttrib( aMarkRange, HASATTR_MERGED ) ) { -// InitOwnBlockMode(); +// InitOwnBlockMode(); aFuncMark.SetMarkArea( aMarkRange ); } else bSimple = TRUE; } - aFuncMark.SetMarking(FALSE); // for MarkToMulti - aFuncMark.MarkToSimple(); // before bMulti test below + aFuncMark.SetMarking(FALSE); // for MarkToMulti + aFuncMark.MarkToSimple(); // before bMulti test below DBG_ASSERT( aFuncMark.IsMarked() || aFuncMark.IsMultiMarked() || bSimple, "delete what?" ); @@ -1977,16 +1977,16 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) bObjects = FALSE; } - USHORT nExtFlags = 0; // extra flags are needed only if attributes are deleted + USHORT nExtFlags = 0; // extra flags are needed only if attributes are deleted if ( nFlags & IDF_ATTRIB ) pDocSh->UpdatePaintExt( nExtFlags, aMarkRange ); - // Reihenfolge: - // 1) BeginDrawUndo - // 2) Objekte loeschen (DrawUndo wird gefuellt) - // 3) Inhalte fuer Undo kopieren - // 4) Inhalte loeschen - // 5) Undo-Aktion anlegen + // Reihenfolge: + // 1) BeginDrawUndo + // 2) Objekte loeschen (DrawUndo wird gefuellt) + // 3) Inhalte fuer Undo kopieren + // 4) Inhalte loeschen + // 5) Undo-Aktion anlegen BOOL bDrawUndo = bObjects || ( nFlags & IDF_NOTE ); // needed for shown notes if ( bDrawUndo && bRecord ) @@ -1998,7 +1998,7 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) pDoc->DeleteObjectsInSelection( aFuncMark ); else pDoc->DeleteObjectsInArea( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), -/*!*/ aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(), +/*!*/ aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(), aFuncMark ); } @@ -2015,21 +2015,21 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) aCopyRange.aStart.SetTab(0); aCopyRange.aEnd.SetTab(nTabCount-1); - // bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument - // nur mit IDF_HARDATTR zu langsam ist: + // bei "Format/Standard" alle Attribute kopieren, weil CopyToDocument + // nur mit IDF_HARDATTR zu langsam ist: USHORT nUndoDocFlags = nFlags; if (nFlags & IDF_ATTRIB) nUndoDocFlags |= IDF_ATTRIB; - if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute - nUndoDocFlags |= IDF_STRING; // -> Zellen werden geaendert + if (nFlags & IDF_EDITATTR) // Edit-Engine-Attribute + nUndoDocFlags |= IDF_STRING; // -> Zellen werden geaendert if (nFlags & IDF_NOTE) - nUndoDocFlags |= IDF_CONTENTS; // #68795# copy all cells with their notes + nUndoDocFlags |= IDF_CONTENTS; // #68795# copy all cells with their notes // do not copy note captions to undo document nUndoDocFlags |= IDF_NOCAPTIONS; pDoc->CopyToDocument( aCopyRange, nUndoDocFlags, bMulti, pUndoDoc, &aFuncMark ); } - HideAllCursors(); // falls Zusammenfassung aufgehoben wird + HideAllCursors(); // falls Zusammenfassung aufgehoben wird if (bSimple) pDoc->DeleteArea( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(), @@ -2077,11 +2077,11 @@ void ScViewFunc::DeleteContents( USHORT nFlags, BOOL bRecord ) if ( nFlags & IDF_CONTENTS ) ForgetFormatArea(); else - StartFormatArea(); // Attribute loeschen ist auch Attributierung + StartFormatArea(); // Attribute loeschen ist auch Attributierung } } -// Spaltenbreiten/Zeilenhoehen (ueber Header) - Undo OK +// Spaltenbreiten/Zeilenhoehen (ueber Header) - Undo OK void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pRanges, ScSizeMode eMode, USHORT nSizeTwips, @@ -2142,13 +2142,13 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR bFormula = rOpts.GetOption( VOPT_FORMULAS ); } - ScDocument* pUndoDoc = NULL; + ScDocument* pUndoDoc = NULL; ScOutlineTable* pUndoTab = NULL; SCCOLROW* pUndoRanges = NULL; if ( bRecord ) { - pDoc->BeginDrawUndo(); // Drawing Updates + pDoc->BeginDrawUndo(); // Drawing Updates pUndoDoc = new ScDocument( SCDOCMODE_UNDO ); for (nTab=0; nTab<nTabCount; nTab++) @@ -2177,7 +2177,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR pUndoRanges = new SCCOLROW[ 2*nRangeCnt ]; memmove( pUndoRanges, pRanges, 2*nRangeCnt*sizeof(SCCOLROW) ); - //! outlines from all tables? + //! outlines from all tables? ScOutlineTable* pTable = pDoc->GetOutlineTable( nCurTab ); if (pTable) pUndoTab = new ScOutlineTable( *pTable ); @@ -2194,22 +2194,22 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR { const SCCOLROW* pTabRanges = pRanges; - pDoc->IncSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln + pDoc->IncSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln pDoc->InitializeNoteCaptions( nTab ); for (SCCOLROW nRangeNo=0; nRangeNo<nRangeCnt; nRangeNo++) { SCCOLROW nStartNo = *(pTabRanges++); SCCOLROW nEndNo = *(pTabRanges++); - if ( !bWidth ) // Hoehen immer blockweise + if ( !bWidth ) // Hoehen immer blockweise { if ( eMode==SC_SIZE_OPTIMAL || eMode==SC_SIZE_VISOPT ) { BOOL bAll = ( eMode==SC_SIZE_OPTIMAL ); if (!bAll) { - // fuer alle eingeblendeten CR_MANUALSIZE loeschen, - // dann SetOptimalHeight mit bShrink = FALSE + // fuer alle eingeblendeten CR_MANUALSIZE loeschen, + // dann SetOptimalHeight mit bShrink = FALSE for (SCROW nRow = nStartNo; nRow <= nEndNo; ++nRow) { SCROW nLastRow = nRow; @@ -2243,15 +2243,15 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR if (bAll) pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE ); - // Manual-Flag wird bei bAll=TRUE schon in SetOptimalHeight gesetzt - // (an bei Extra-Height, sonst aus). + // Manual-Flag wird bei bAll=TRUE schon in SetOptimalHeight gesetzt + // (an bei Extra-Height, sonst aus). } else if ( eMode==SC_SIZE_DIRECT ) { if (nSizeTwips) { pDoc->SetRowHeightRange( nStartNo, nEndNo, nTab, nSizeTwips ); - pDoc->SetManualHeight( nStartNo, nEndNo, nTab, TRUE ); // height was set manually + pDoc->SetManualHeight( nStartNo, nEndNo, nTab, TRUE ); // height was set manually } pDoc->ShowRows( nStartNo, nEndNo, nTab, nSizeTwips != 0 ); } @@ -2260,7 +2260,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR pDoc->ShowRows( nStartNo, nEndNo, nTab, TRUE ); } } - else // Spaltenbreiten + else // Spaltenbreiten { for (SCCOL nCol=static_cast<SCCOL>(nStartNo); nCol<=static_cast<SCCOL>(nEndNo); nCol++) { @@ -2278,7 +2278,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR } } - // Outline anpassen + // Outline anpassen if (bWidth) { @@ -2292,7 +2292,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR bOutline = TRUE; } } - pDoc->DecSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln + pDoc->DecSizeRecalcLevel( nTab ); // nicht fuer jede Spalte einzeln } @@ -2327,7 +2327,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR static_cast<SCCOL>(nEnd),MAXROW,nTab, HASATTR_MERGED | HASATTR_OVERLAPPED )) nStart = 0; - if (nStart > 0) // weiter oben anfangen wegen Linien und Cursor + if (nStart > 0) // weiter oben anfangen wegen Linien und Cursor --nStart; pDocSh->PostPaint( static_cast<SCCOL>(nStart), 0, nTab, MAXCOL, MAXROW, nTab, PAINT_GRID | PAINT_TOP ); @@ -2377,7 +2377,7 @@ void ScViewFunc::SetWidthOrHeight( BOOL bWidth, SCCOLROW nRangeCnt, SCCOLROW* pR } } -// Spaltenbreiten/Zeilenhoehen (ueber Blockmarken) +// Spaltenbreiten/Zeilenhoehen (ueber Blockmarken) void ScViewFunc::SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT nSizeTwips, BOOL bRecord, BOOL bPaint ) @@ -2412,8 +2412,8 @@ void ScViewFunc::SetMarkedWidthOrHeight( BOOL bWidth, ScSizeMode eMode, USHORT n void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal ) { - //! Schrittweiten einstellbar - // Schrittweite ist auch Minimum + //! Schrittweiten einstellbar + // Schrittweite ist auch Minimum USHORT nStepX = STD_COL_WIDTH / 5; USHORT nStepY = ScGlobal::nStdRowHeight; @@ -2443,15 +2443,15 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal ) SCCOLROW nRange[2]; if ( eDir == DIR_LEFT || eDir == DIR_RIGHT ) { - if (bOptimal) // Breite dieser einen Zelle + if (bOptimal) // Breite dieser einen Zelle { if ( bAnyEdit ) { - // beim Editieren die aktuelle Breite der Eingabe + // beim Editieren die aktuelle Breite der Eingabe ScInputHandler* pHdl = pScMod->GetInputHdl( GetViewData()->GetViewShell() ); if (pHdl) { - long nEdit = pHdl->GetTextSize().Width(); // in 1/100mm + long nEdit = pHdl->GetTextSize().Width(); // in 1/100mm const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab ); const SvxMarginItem& rMItem = @@ -2490,7 +2490,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal ) nWidth = STD_COL_WIDTH; } } - else // vergroessern / verkleinern + else // vergroessern / verkleinern { if ( eDir == DIR_RIGHT ) nWidth = sal::static_int_cast<USHORT>( nWidth + nStepX ); @@ -2502,7 +2502,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal ) nRange[0] = nRange[1] = nCol; SetWidthOrHeight( TRUE, 1, nRange, SC_SIZE_DIRECT, nWidth ); - // hier bei Breite auch Hoehe anpassen (nur die eine Zeile) + // hier bei Breite auch Hoehe anpassen (nur die eine Zeile) if (!bAnyEdit) { @@ -2532,7 +2532,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal ) nHeight = sal::static_int_cast<USHORT>( nHeight - nStepY ); if ( nHeight < nStepY ) nHeight = nStepY; if ( nHeight > MAX_COL_HEIGHT ) nHeight = MAX_COL_HEIGHT; - //! MAX_COL_HEIGHT umbenennen in MAX_ROW_HEIGHT in global.hxx !!!!!! + //! MAX_COL_HEIGHT umbenennen in MAX_ROW_HEIGHT in global.hxx !!!!!! } nRange[0] = nRange[1] = nRow; SetWidthOrHeight( FALSE, 1, nRange, eMode, nHeight ); @@ -2545,7 +2545,7 @@ void ScViewFunc::ModifyCellSize( ScDirection eDir, BOOL bOptimal ) { ScInputHandler* pHdl = pScMod->GetInputHdl( GetViewData()->GetViewShell() ); if (pHdl) - pHdl->SetModified(); // damit bei Enter die Hoehe angepasst wird + pHdl->SetModified(); // damit bei Enter die Hoehe angepasst wird } } @@ -2563,7 +2563,7 @@ void ScViewFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ) ScDocFunc aFunc(*pDocSh); bool bUndo(pDoc->IsUndoEnabled()); - // modifying several tables is handled here + // modifying several tables is handled here if (bUndo) { @@ -2579,7 +2579,7 @@ void ScViewFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ) if (bUndo) pDocSh->GetUndoManager()->LeaveListAction(); - UpdateLayerLocks(); //! broadcast to all views + UpdateLayerLocks(); //! broadcast to all views } void ScViewFunc::Protect( SCTAB nTab, const String& rPassword ) @@ -2594,7 +2594,7 @@ void ScViewFunc::Protect( SCTAB nTab, const String& rPassword ) aFunc.Protect( nTab, rPassword, FALSE ); else { - // modifying several tables is handled here + // modifying several tables is handled here if (bUndo) { @@ -2611,7 +2611,7 @@ void ScViewFunc::Protect( SCTAB nTab, const String& rPassword ) pDocSh->GetUndoManager()->LeaveListAction(); } - UpdateLayerLocks(); //! broadcast to all views + UpdateLayerLocks(); //! broadcast to all views } BOOL ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword ) @@ -2627,7 +2627,7 @@ BOOL ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword ) bChanged = aFunc.Unprotect( nTab, rPassword, FALSE ); else { - // modifying several tables is handled here + // modifying several tables is handled here if (bUndo) { @@ -2646,7 +2646,7 @@ BOOL ScViewFunc::Unprotect( SCTAB nTab, const String& rPassword ) } if (bChanged) - UpdateLayerLocks(); //! broadcast to all views + UpdateLayerLocks(); //! broadcast to all views return bChanged; } @@ -2671,14 +2671,14 @@ void ScViewFunc::SetNumberFormat( short nFormatType, ULONG nAdd ) return; } - sal_uInt32 nNumberFormat = 0; - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); - LanguageType eLanguage = ScGlobal::eLnge; - ScPatternAttr aNewAttrs( pDoc->GetPool() ); + sal_uInt32 nNumberFormat = 0; + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); + SvNumberFormatter* pNumberFormatter = pDoc->GetFormatTable(); + LanguageType eLanguage = ScGlobal::eLnge; + ScPatternAttr aNewAttrs( pDoc->GetPool() ); - // #67936# always take language from cursor position, even if there is a selection + // #67936# always take language from cursor position, even if there is a selection sal_uInt32 nCurrentNumberFormat; pDoc->GetNumberFormat( pViewData->GetCurX(), @@ -2687,13 +2687,13 @@ void ScViewFunc::SetNumberFormat( short nFormatType, ULONG nAdd ) nCurrentNumberFormat ); const SvNumberformat* pEntry = pNumberFormatter->GetEntry( nCurrentNumberFormat ); if (pEntry) - eLanguage = pEntry->GetLanguage(); // sonst ScGlobal::eLnge behalten + eLanguage = pEntry->GetLanguage(); // sonst ScGlobal::eLnge behalten - nNumberFormat = pNumberFormatter->GetStandardFormat( nFormatType, eLanguage ) + nAdd; + nNumberFormat = pNumberFormatter->GetStandardFormat( nFormatType, eLanguage ) + nAdd; SfxItemSet& rSet = aNewAttrs.GetItemSet(); rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumberFormat ) ); - // ATTR_LANGUAGE_FORMAT nicht + // ATTR_LANGUAGE_FORMAT nicht ApplySelectionPattern( aNewAttrs, TRUE ); } @@ -2707,11 +2707,11 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode ) return; } - ScViewData* pViewData = GetViewData(); - ScDocument* pDoc = pViewData->GetDocument(); - SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); + ScViewData* pViewData = GetViewData(); + ScDocument* pDoc = pViewData->GetDocument(); + SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); - // Sprache immer von Cursorposition + // Sprache immer von Cursorposition sal_uInt32 nCurrentNumberFormat; pDoc->GetNumberFormat( pViewData->GetCurX(), pViewData->GetCurY(), @@ -2719,21 +2719,21 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode ) const SvNumberformat* pEntry = pFormatter->GetEntry( nCurrentNumberFormat ); LanguageType eLanguage = pEntry ? pEntry->GetLanguage() : ScGlobal::eLnge; - // Index fuer String bestimmen + // Index fuer String bestimmen BOOL bOk = TRUE; sal_uInt32 nNumberFormat = pFormatter->GetEntryKey( rCode, eLanguage ); if ( nNumberFormat == NUMBERFORMAT_ENTRY_NOT_FOUND ) { - // neu eintragen + // neu eintragen - String aFormat = rCode; // wird veraendert - xub_StrLen nErrPos = 0; - short nType = 0; //! ??? + String aFormat = rCode; // wird veraendert + xub_StrLen nErrPos = 0; + short nType = 0; //! ??? bOk = pFormatter->PutEntry( aFormat, nErrPos, nType, nNumberFormat, eLanguage ); } - if ( bOk ) // gueltiges Format? + if ( bOk ) // gueltiges Format? { ScPatternAttr aNewAttrs( pDoc->GetPool() ); SfxItemSet& rSet = aNewAttrs.GetItemSet(); @@ -2742,7 +2742,7 @@ void ScViewFunc::SetNumFmtByStr( const String& rCode ) ApplySelectionPattern( aNewAttrs, TRUE ); } - //! sonst Fehler zuerueckgeben / Meldung ausgeben ??? + //! sonst Fehler zuerueckgeben / Meldung ausgeben ??? } void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) @@ -2755,8 +2755,8 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) return; } - ScDocument* pDoc = GetViewData()->GetDocument(); - SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); + ScDocument* pDoc = GetViewData()->GetDocument(); + SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); SCCOL nCol = GetViewData()->GetCurX(); SCROW nRow = GetViewData()->GetCurY(); @@ -2771,7 +2771,7 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) return; } - // was haben wir denn da? + // was haben wir denn da? sal_uInt32 nNewFormat = nOldFormat; BOOL bError = FALSE; @@ -2785,20 +2785,20 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) if ( 0 == ( nOldType & ( NUMBERFORMAT_NUMBER | NUMBERFORMAT_CURRENCY | NUMBERFORMAT_PERCENT ) ) ) { - // Datum, Zeit, Bruch, logisch, Text kann nicht angepasst werden - //! bei Wisssenschaftlich kann es der Numberformatter auch nicht + // Datum, Zeit, Bruch, logisch, Text kann nicht angepasst werden + //! bei Wisssenschaftlich kann es der Numberformatter auch nicht bError = TRUE; } - //! Das SvNumberformat hat einen Member bStandard, verraet ihn aber nicht + //! Das SvNumberformat hat einen Member bStandard, verraet ihn aber nicht BOOL bWasStandard = ( nOldFormat == pFormatter->GetStandardIndex( eLanguage ) ); if (bWasStandard) { - // bei "Standard" die Nachkommastellen abhaengig vom Zellinhalt - // 0 bei leer oder Text -> keine Nachkommastellen + // bei "Standard" die Nachkommastellen abhaengig vom Zellinhalt + // 0 bei leer oder Text -> keine Nachkommastellen double nVal = pDoc->GetValue( ScAddress( nCol, nRow, nTab ) ); - // Die Wege des Numberformatters sind unergruendlich, darum ausprobieren: + // Die Wege des Numberformatters sind unergruendlich, darum ausprobieren: String aOut; Color* pCol; ((SvNumberformat*)pOldEntry)->GetOutputString( nVal, aOut, &pCol ); @@ -2806,7 +2806,7 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) nPrecision = 0; // 'E' fuer Exponential ist fest im Numberformatter if ( aOut.Search('E') != STRING_NOTFOUND ) - bError = TRUE; // Exponential nicht veraendern + bError = TRUE; // Exponential nicht veraendern else { String aDecSep( pFormatter->GetFormatDecimalSep( nOldFormat ) ); @@ -2822,16 +2822,16 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) if (bIncrement) { if (nPrecision<20) - ++nPrecision; // erhoehen + ++nPrecision; // erhoehen else - bError = TRUE; // 20 ist Maximum + bError = TRUE; // 20 ist Maximum } else { if (nPrecision) - --nPrecision; // vermindern + --nPrecision; // vermindern else - bError = TRUE; // weniger als 0 geht nicht + bError = TRUE; // weniger als 0 geht nicht } } @@ -2859,18 +2859,18 @@ void ScViewFunc::ChangeNumFmtDecimals( BOOL bIncrement ) ScPatternAttr aNewAttrs( pDoc->GetPool() ); SfxItemSet& rSet = aNewAttrs.GetItemSet(); rSet.Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNewFormat ) ); - // ATTR_LANGUAGE_FORMAT nicht + // ATTR_LANGUAGE_FORMAT nicht ApplySelectionPattern( aNewAttrs, TRUE ); } else - Sound::Beep(); // war nix + Sound::Beep(); // war nix } void ScViewFunc::ChangeIndent( BOOL bIncrement ) { ScViewData* pViewData = GetViewData(); - ScDocShell* pDocSh = pViewData->GetDocShell(); - ScMarkData& rMark = pViewData->GetMarkData(); + ScDocShell* pDocSh = pViewData->GetDocShell(); + ScMarkData& rMark = pViewData->GetMarkData(); ScMarkData aWorkMark = rMark; ScViewUtil::UnmarkFiltered( aWorkMark, pDocSh->GetDocument() ); @@ -2894,8 +2894,8 @@ void ScViewFunc::ChangeIndent( BOOL bIncrement ) BOOL ScViewFunc::InsertName( const String& rName, const String& rSymbol, const String& rType ) { - // Type = P,R,C,F (und Kombinationen) - //! Undo... + // Type = P,R,C,F (und Kombinationen) + //! Undo... BOOL bOk = FALSE; ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -2919,32 +2919,32 @@ BOOL ScViewFunc::InsertName( const String& rName, const String& rSymbol, nType |= RT_CRITERIA; pNewEntry->AddType(nType); - if ( !pNewEntry->GetErrCode() ) // Text gueltig? + if ( !pNewEntry->GetErrCode() ) // Text gueltig? { ScDocShellModificator aModificator( *pDocSh ); - pDoc->CompileNameFormula( TRUE ); // CreateFormulaString + pDoc->CompileNameFormula( TRUE ); // CreateFormulaString // Eintrag bereits vorhanden? Dann vorher entfernen (=Aendern) USHORT nFoundAt; if ( pList->SearchName( rName, nFoundAt ) ) - { // alten Index uebernehmen + { // alten Index uebernehmen pNewEntry->SetIndex( ((ScRangeData*)pList->At(nFoundAt))->GetIndex() ); pList->AtFree( nFoundAt ); } if ( pList->Insert( pNewEntry ) ) { - pNewEntry = NULL; // nicht loeschen + pNewEntry = NULL; // nicht loeschen bOk = TRUE; } - pDoc->CompileNameFormula( FALSE ); // CompileFormulaString + pDoc->CompileNameFormula( FALSE ); // CompileFormulaString aModificator.SetDocumentModified(); SFX_APP()->Broadcast( SfxSimpleHint( SC_HINT_AREAS_CHANGED ) ); } - delete pNewEntry; // wenn er nicht eingefuegt wurde + delete pNewEntry; // wenn er nicht eingefuegt wurde return bOk; } @@ -2983,7 +2983,7 @@ USHORT ScViewFunc::GetCreateNameFlags() bOk = FALSE; if (bOk) nFlags |= NAME_TOP; - else // Bottom nur wenn nicht Top + else // Bottom nur wenn nicht Top { bOk = TRUE; for (i=nFirstCol; i<=nLastCol && bOk; i++) @@ -3002,7 +3002,7 @@ USHORT ScViewFunc::GetCreateNameFlags() bOk = FALSE; if (bOk) nFlags |= NAME_LEFT; - else // Right nur wenn nicht Left + else // Right nur wenn nicht Left { bOk = TRUE; for (j=nFirstRow; j<=nLastRow && bOk; j++) diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index 050fb131bfae..68a6f14389a0 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,17 +68,17 @@ //================================================================== -// static +// static void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSet, USHORT nWhichId, USHORT nScript ) { - // take the effective item from rCoreSet according to nScript - // and put in rShellSet under the (base) nWhichId + // take the effective item from rCoreSet according to nScript + // and put in rShellSet under the (base) nWhichId SfxItemPool& rPool = *rShellSet.GetPool(); SvxScriptSetItem aSetItem( rPool.GetSlotId(nWhichId), rPool ); - // use PutExtended with eDefaultAs = SFX_ITEM_SET, so defaults from rCoreSet - // (document pool) are read and put into rShellSet (MessagePool) + // use PutExtended with eDefaultAs = SFX_ITEM_SET, so defaults from rCoreSet + // (document pool) are read and put into rShellSet (MessagePool) aSetItem.GetItemSet().PutExtended( rCoreSet, SFX_ITEM_DONTCARE, SFX_ITEM_SET ); const SfxPoolItem* pI = aSetItem.GetItemOfScript( nScript ); if (pI) @@ -87,10 +87,10 @@ void ScViewUtil::PutItemScript( SfxItemSet& rShellSet, const SfxItemSet& rCoreSe rShellSet.InvalidateItem( nWhichId ); } -// static +// static USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos ) { - // used for thesaurus + // used for thesaurus BYTE nScript = pDoc->GetScriptType( rPos.Col(), rPos.Row(), rPos.Tab() ); USHORT nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? ATTR_CJK_FONT_LANGUAGE : @@ -101,7 +101,7 @@ USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos ) if (pLangIt) { eLnge = (LanguageType) pLangIt->GetValue(); - if (eLnge == LANGUAGE_DONTKNOW) //! can this happen? + if (eLnge == LANGUAGE_DONTKNOW) //! can this happen? { LanguageType eLatin, eCjk, eCtl; pDoc->GetLanguage( eLatin, eCjk, eCtl ); @@ -117,7 +117,7 @@ USHORT ScViewUtil::GetEffLanguage( ScDocument* pDoc, const ScAddress& rPos ) return eLnge; } -// static +// static sal_Int32 ScViewUtil::GetTransliterationType( USHORT nSlotID ) { sal_Int32 nType = 0; @@ -154,7 +154,7 @@ sal_Int32 ScViewUtil::GetTransliterationType( USHORT nSlotID ) return nType; } -// static +// static BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction, const ScChangeViewSettings& rSettings, ScDocument& rDocument ) @@ -172,7 +172,7 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction, { if ( rSettings.IsEveryoneButMe() ) { - // GetUser() am ChangeTrack ist der aktuelle Benutzer + // GetUser() am ChangeTrack ist der aktuelle Benutzer ScChangeTrack* pTrack = rDocument.GetChangeTrack(); if ( !pTrack || rAction.GetUser() == pTrack->GetUser() ) return FALSE; @@ -202,7 +202,7 @@ BOOL ScViewUtil::IsActionShown( const ScChangeAction& rAction, const DateTime& rFirst = rSettings.GetTheFirstDateTime(); const DateTime& rLast = rSettings.GetTheLastDateTime(); switch ( rSettings.GetTheDateMode() ) - { // korrespondiert mit ScHighlightChgDlg::OKBtnHdl + { // korrespondiert mit ScHighlightChgDlg::OKBtnHdl case SCDM_DATE_BEFORE: if ( aDateTime > rFirst ) return FALSE; @@ -366,8 +366,8 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, USH BOOL ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont, SfxViewFrame& rFrame, - SvxFontItem& rNewFont, - String& rString ) + SvxFontItem& rNewFont, + String& rString ) { BOOL bRet = FALSE; SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); diff --git a/sc/source/ui/view/waitoff.cxx b/sc/source/ui/view/waitoff.cxx index a3c768e85418..6d887a5ec8fa 100644 --- a/sc/source/ui/view/waitoff.cxx +++ b/sc/source/ui/view/waitoff.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |