diff options
| author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 19:58:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-03 11:04:44 -0600 |
| commit | 84862db95a5e22b9ef89baa2a8a5deeffefbdef6 (patch) | |
| tree | 2682cf093a4a5d513bdedaee8298525c9b57ef6f /sc/source/ui | |
| parent | 7801c94bffdabe669601d23e86f2f2a41447902d (diff) | |
Remove visual noise from sc
Conflicts:
sc/source/ui/inc/docfunc.hxx
Change-Id: I9314437ed3dd60e84d28c08ac0a2d1ed7bd1daf8
Reviewed-on: https://gerrit.libreoffice.org/8301
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui')
304 files changed, 1195 insertions, 1197 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 73432cce6f9e..f476434571f2 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -1435,7 +1435,7 @@ ScAccessibleCsvControl* ScAccessibleCsvGrid::implCreateCellObj( sal_Int32 nRow, } -// ============================================================================ + DBG_NAME( ScAccessibleCsvCell ) @@ -1644,6 +1644,6 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH } SAL_WNODEPRECATED_DECLARATIONS_POP -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx index 6272dadfce61..fba49063987a 100644 --- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx @@ -572,7 +572,7 @@ Rectangle ScAccessibleDataPilotControl::GetBoundingBox(void) const } -//=============================================================================== + ScAccessibleDataPilotButton::ScAccessibleDataPilotButton( const ::com::sun::star::uno::Reference< diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index b5ab757d6b23..ff18c4a88ace 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1398,7 +1398,7 @@ void ScChildrenShapes::VisAreaChanged() const std::for_each(maZOrderedShapes.begin(), maZOrderedShapes.end(), aVisAreaChanged); } -// ============================================================================ + ScAccessibleDocument::ScAccessibleDocument( const uno::Reference<XAccessible>& rxParent, diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 496806294feb..7a538168bcd8 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -62,7 +62,7 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; -//========================================================================= + typedef std::list< uno::Reference< XAccessible > > ScXAccList; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index 5d64347d9155..ba055d14f976 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -51,7 +51,7 @@ using ::com::sun::star::uno::RuntimeException; using ::std::for_each; using ::std::vector; -// ============================================================================ + namespace { @@ -82,7 +82,7 @@ private: } -// ============================================================================ + ScAccessibleFilterMenu::ScAccessibleFilterMenu(const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos) : ScAccessibleContextBase(rxParent, AccessibleRole::MENU), diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 87e533ccc353..923cfeab6811 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -45,7 +45,7 @@ #include <vcl/svapp.hxx> -// ============================================================================ + class ScViewForwarder : public SvxViewForwarder { @@ -144,7 +144,7 @@ void ScViewForwarder::SetInvalid() mpViewShell = NULL; } -// ============================================================================ + class ScEditObjectViewForwarder : public SvxViewForwarder { diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index b283f1abce44..2c93ddf3fed5 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -97,9 +97,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain bDragWasInternal( false ), nSourceDocID( 0 ) { - // + // check what kind of objects are contained - // + SdrPage* pPage = pModel->GetPage(0); if (pPage) @@ -108,9 +108,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain SdrObject* pObject = aIter.Next(); if (pObject && !aIter.Next()) // exactly one object? { - // + // OLE object - // + sal_uInt16 nSdrObjKind = pObject->GetObjIdentifier(); if (nSdrObjKind == OBJ_OLE2) @@ -127,9 +127,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain // aOleData is initialized later } - // + // Graphic object - // + if (nSdrObjKind == OBJ_GRAF) { @@ -138,9 +138,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain bGrIsBit = true; } - // + // URL button - // + SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObject); if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) @@ -202,9 +202,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain } } - // + // get size for object descriptor - // + // #i71538# use complete SdrViews // SdrExchangeView aView(pModel); @@ -223,9 +223,9 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain aObjDesc.maSize = aSrcSize; PrepareOLE( aObjDesc ); - // + // remember a unique ID of the source document - // + if ( pContainerShell ) { ScDocument* pDoc = pContainerShell->GetDocument(); @@ -719,9 +719,9 @@ SdrOle2Obj* ScDrawTransferObj::GetSingleObject() return NULL; } -// + // initialize aDocShellRef with a live document from the ClipDoc -// + void ScDrawTransferObj::InitDocShell() { diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index b629b51a810d..6a1eae25dad7 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -382,7 +382,7 @@ void ScInputHandler::DeleteRangeFinder() } } -//================================================================== + inline OUString GetEditText(EditEngine* pEng) { @@ -492,7 +492,7 @@ static sal_Int32 lcl_MatchParenthesis( const OUString& rStr, sal_Int32 nPos ) return (sal_Int32) (p - p0); } -//================================================================== + ScInputHandler::ScInputHandler() : pInputWin( NULL ), @@ -703,9 +703,9 @@ void ScInputHandler::UpdateSpellSettings( bool bFromStartTab ) } } -// + // Funktionen/Bereichsnamen etc. als Tip-Hilfe -// + // die anderen Typen sind in ScDocument::GetFormulaEntries festgelegt @@ -1303,9 +1303,9 @@ void ScInputHandler::PasteFunctionData() pActiveView->ShowCursor(); } -// + // Selektion berechnen und als Tip-Hilfe anzeigen -// + static OUString lcl_Calculate( const OUString& rFormula, ScDocument* pDoc, const ScAddress &rPos ) { @@ -1511,9 +1511,9 @@ void ScInputHandler::SkipClosingPar() --nAutoPar; } -// + // Auto-Eingabe -// + void ScInputHandler::GetColData() { @@ -1674,9 +1674,9 @@ void ScInputHandler::NextAutoEntry( bool bBack ) pActiveView->ShowCursor(); } -// + // Klammern hervorheben -// + void ScInputHandler::UpdateParenthesis() { @@ -2381,9 +2381,9 @@ void ScInputHandler::InvalidateAttribs() } } -// + // --------------- public Methoden -------------------------------------------- -// + void ScInputHandler::SetMode( ScInputMode eNewMode ) { @@ -3919,9 +3919,9 @@ void ScInputHandler::InputTurnOffWinEngine() bInOwnChange = false; } -//======================================================================== + // ScInputHdlState -//======================================================================== + ScInputHdlState::ScInputHdlState( const ScAddress& rCurPos, const ScAddress& rStartPos, diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index e9d3923fc205..7bda59d42ae4 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -117,9 +117,9 @@ ScTextWndBase::ScTextWndBase( Window* pParent, WinBits nStyle ) } } -//================================================================== + // class ScInputWindowWrapper -//================================================================== + SFX_IMPL_CHILDWINDOW_WITHID(ScInputWindowWrapper,FID_INPUTLINE_STATUS) @@ -148,7 +148,7 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const return aInfo; } -//================================================================== + #define IMAGE(id) pImgMgr->SeekImage(id) static bool lcl_isExperimentalMode() @@ -158,9 +158,9 @@ static bool lcl_isExperimentalMode() return true; } -//================================================================== + // class ScInputWindow -//================================================================== + static ScTextWndBase* lcl_chooseRuntimeImpl( Window* pParent, SfxBindings* pBind ) { @@ -908,9 +908,9 @@ void ScInputWindow::MouseButtonUp( const MouseEvent& rMEvt ) } -//======================================================================== + // ScInputBarGroup -//======================================================================== + ScInputBarGroup::ScInputBarGroup(Window* pParent, ScTabViewShell* pViewSh) : ScTextWndBase ( pParent, WinBits(WB_HIDE | WB_TABSTOP ) ), @@ -1157,9 +1157,9 @@ void ScInputBarGroup::TextGrabFocus() aMultiTextWnd.TextGrabFocus(); } -//======================================================================== + // ScMultiTextWnd -//======================================================================== + ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen, ScTabViewShell* pViewSh ) : @@ -1457,9 +1457,9 @@ void ScMultiTextWnd::SetTextString( const OUString& rNewString ) SetScrollBarRange(); DoScroll(); } -//======================================================================== + // ScTextWnd -//======================================================================== + ScTextWnd::ScTextWnd( Window* pParent, ScTabViewShell* pViewSh ) : ScTextWndBase ( pParent, WinBits(WB_HIDE | WB_BORDER) ), @@ -2081,9 +2081,9 @@ void ScTextWnd::TextGrabFocus() GrabFocus(); } -//======================================================================== + // Positionsfenster -//======================================================================== + ScPosWnd::ScPosWnd( Window* pParent ) : ComboBox ( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ), diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index aa2e77b5bdfd..d52be0e37f7d 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -46,7 +46,7 @@ ScMessagePool::ScMessagePool() : SfxItemPool ( OUString("ScMessagePool"), MSGPOOL_START, MSGPOOL_END, aMsgItemInfos, NULL ), - // + aGlobalStringItem ( SfxStringItem ( SCITEM_STRING, OUString() ) ), aGlobalSearchItem ( SvxSearchItem ( SCITEM_SEARCHDATA ) ), aGlobalSortItem ( ScSortItem ( SCITEM_SORTDATA, NULL ) ), @@ -56,7 +56,7 @@ ScMessagePool::ScMessagePool() aGlobalPivotItem ( ScPivotItem ( SCITEM_PIVOTDATA, NULL, NULL, false ) ), aGlobalSolveItem ( ScSolveItem ( SCITEM_SOLVEDATA, NULL ) ), aGlobalUserListItem ( ScUserListItem ( SCITEM_USERLIST ) ), - // + aPrintWarnItem ( SfxBoolItem ( SCITEM_PRINTWARN, false ) ) { ppPoolDefaults = new SfxPoolItem*[MSGPOOL_END - MSGPOOL_START + 1]; diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx index b3c16f4a5245..febc7e23c55c 100644 --- a/sc/source/ui/app/rfindlst.cxx +++ b/sc/source/ui/app/rfindlst.cxx @@ -27,7 +27,7 @@ static const ColorData aColNames[SC_RANGECOLORS] = { COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN, COL_BLUE, COL_RED, COL_MAGENTA, COL_BROWN }; -//================================================================== + ScRangeFindList::ScRangeFindList(const OUString& rName) : aDocName( rName ), @@ -55,6 +55,6 @@ ColorData ScRangeFindList::GetColorName( const size_t nIndex ) return aColNames[nIndex % SC_RANGECOLORS]; } -//================================================================== + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index b6773b47c007..496062b27629 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -371,9 +371,9 @@ void ScModule::DeleteCfg() } -// + // von der Applikation verschoben: -// + void ScModule::Execute( SfxRequest& rReq ) @@ -973,15 +973,15 @@ sal_uInt16 ScModule::GetOptDigitLanguage() } -// + // Optionen -// -// + + // ModifyOptions - Items aus Calc-Options-Dialog // und SID_AUTOSPELL_CHECK -// + void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) { @@ -1052,9 +1052,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - //============================================ + // DefaultsOptions - //============================================ + if (rOptSet.HasItem(SID_SCDEFAULTSOPTIONS, &pItem)) { @@ -1062,9 +1062,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) SetDefaultsOptions( rOpt ); } - //============================================ + // FormulaOptions - //============================================ + if (rOptSet.HasItem(SID_SCFORMULAOPTIONS, &pItem)) { @@ -1090,9 +1090,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - //============================================ + // ViewOptions - //============================================ + if (rOptSet.HasItem(SID_SCVIEWOPTIONS, &pItem)) { @@ -1125,10 +1125,10 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - //============================================ + // GridOptions, Auswertung nach ViewOptions, // da GridOptions Member der ViewOptions ist! - //============================================ + if ( rOptSet.HasItem(SID_ATTR_GRID_OPTIONS,&pItem) ) { @@ -1160,9 +1160,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } - //============================================ + // DocOptions - //============================================ + if ( rOptSet.HasItem(SID_SCDOCOPTIONS,&pItem) ) { @@ -1246,9 +1246,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) pBindings->Invalidate( SID_AUTOSPELL_CHECK ); } - //============================================ + // InputOptions - //============================================ + if ( rOptSet.HasItem(SID_SC_INPUT_SELECTIONPOS,&pItem) ) { @@ -1308,9 +1308,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) bSaveInputOptions = true; } - //============================================ + // PrintOptions - //============================================ + if ( rOptSet.HasItem(SID_SCPRINTOPTIONS,&pItem) ) { @@ -1418,9 +1418,9 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } -// + // Input-Handler -// + ScInputHandler* ScModule::GetInputHdl( ScTabViewShell* pViewSh, bool bUseRef ) @@ -1603,9 +1603,9 @@ void ScModule::ActivateInputWindow( const OUString* pStrFormula, bool bMatrix ) } -// + // Referenz - Dialoge -// + void ScModule::SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm ) @@ -1911,9 +1911,9 @@ void ScModule::EndReference() } -// + // Idle / Online-Spelling -// + void ScModule::AnythingChanged() @@ -2050,7 +2050,7 @@ SfxItemSet* ScModule::CreateItemSet( sal_uInt16 nId ) SID_SCPRINTOPTIONS, SID_SCPRINTOPTIONS, // TP_GRID: SID_ATTR_GRID_OPTIONS, SID_ATTR_GRID_OPTIONS, - // + SID_ATTR_METRIC, SID_ATTR_METRIC, SID_ATTR_DEFTABSTOP, SID_ATTR_DEFTABSTOP, // TP_COMPATIBILITY diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 350701ef8ae6..47d04da48901 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -130,9 +130,9 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc { OSL_ENSURE(pDoc->IsClipboard(), "wrong document"); - // + // get aBlock from clipboard doc - // + SCCOL nCol1; SCROW nRow1; @@ -586,9 +586,9 @@ ScMarkData ScTransferObj::GetSourceMarkData() return aMarkData; } -// + // initialize aDocShellRef with a live document from the ClipDoc -// + // #i123405# added parameter to allow size calculation without limitation // to PageSize, e.g. used for Metafile creation for clipboard. diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index 449b281c5e44..fca4f6262935 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -105,9 +105,9 @@ const std::vector<editeng::MisspellRanges>* ScInputStatusItem::GetMisspellRanges return mpMisspellRanges; } -// + // ScPaintHint ist nach schints.cxx verschoben -// + // ScTablesHint - Views anpassen, wenn Tabellen eingefuegt / geloescht diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index ca79984636cb..e86b9d884955 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -37,7 +37,7 @@ #include <editeng/flstitem.hxx> #include <sfx2/app.hxx> -//================================================================== + ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet* pCellAttrs) : SfxTabDialog(pFrameP, pParent, "FormatCellsDialog", "modules/scalc/ui/formatcellsdialog.ui", pCellAttrs) diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 1802a4eaac9a..a74674ca8962 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -387,7 +387,7 @@ class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog virtual OUString GetText() const; }; -//------------------------------------------------------------------------ + //AbstractDialogFactory_Impl implementations class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory { diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index e87cf53c5a0b..5e3e436460b2 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -38,9 +38,9 @@ static sal_uInt16 pProtectionRanges[] = 0 }; -//======================================================================== + // Zellschutz-Tabpage: -//======================================================================== + ScTabPageProtection::ScTabPageProtection(Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "CellProtectionPage", diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx index 5bba027c5f8b..9dddba67b4db 100644 --- a/sc/source/ui/cctrl/cbuttonw.cxx +++ b/sc/source/ui/cctrl/cbuttonw.cxx @@ -25,9 +25,9 @@ #include <vcl/settings.hxx> #include "cbutton.hxx" -//======================================================================== + // class ScDDComboBoxButton -//======================================================================== + ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice ) : pOut( pOutputDevice ) diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 4fc7c08ea82b..bf9a61df65a4 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -859,7 +859,7 @@ ScDocument* ScMenuFloatingWindow::getDoc() return mpDoc; } -// ============================================================================ + ScCheckListMenuWindow::Config::Config() : mbAllowEmptySet(true), mbRTL(false) diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index 481eef06571a..8171f97b1f95 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -28,7 +28,7 @@ #include <vcl/builder.hxx> #include "global.hxx" -// ============================================================================ + namespace { @@ -44,7 +44,7 @@ sal_Unicode lclGetGroupSep() } // namespace -// ============================================================================ + ScDoubleField::ScDoubleField( Window* pParent, const ResId& rResId ) : Edit( pParent, rResId ) @@ -82,6 +82,6 @@ void ScDoubleField::SetValue( double fValue, sal_Int32 nDecPlaces, bool bEraseTr nDecPlaces, lclGetDecSep(), bEraseTrailingDecZeros ) ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index f6d1f9047ff6..6ec692a02415 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -39,9 +39,9 @@ SFX_IMPL_TOOLBOX_CONTROL( ScTbxInsertCtrl, SfxUInt16Item); -// + // ToolBox - Controller -// + ScTbxInsertCtrl::ScTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 8d5a26212f7f..6ad81991568e 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -35,9 +35,9 @@ #include "scitems.hxx" #include "printfun.hxx" -//======================================================================== + // class ScZoomSliderControl --------------------------------------- -//======================================================================== + @@ -140,8 +140,8 @@ const long nButtonWidth = 10; const long nButtonHeight = 10; const long nIncDecWidth = 11; const long nIncDecHeight = 11; -const long nSliderHeight = 2; // -const long nSliderWidth = 4; // +const long nSliderHeight = 2; +const long nSliderWidth = 4; const long nSnappingHeight = 4; const long nSliderXOffset = 20; const long nSnappingEpsilon = 5; // snapping epsilon in pixels diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 2720893f1552..83b4eef07ad9 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -146,9 +146,9 @@ IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) return 0; } -// + //condition -// + namespace { void FillStyleListBox( ScDocument* pDoc, ListBox& rLbStyle ) diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index 1072a89b71be..cdfe83a26dd0 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -29,13 +29,13 @@ // ause #include "editutil.hxx" -// ============================================================================ + static const sal_Char pStrFix[] = "FIX"; static const sal_Char pStrMrg[] = "MRG"; -// ============================================================================ + ScAsciiOptions::ScAsciiOptions() : bFixedLen ( false ), diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index e8c188a2dbc5..8277afc4b63e 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -23,7 +23,7 @@ #include "AccessibleCsvControl.hxx" -// ============================================================================ + ScCsvLayoutData::ScCsvLayoutData() : mnPosCount( 1 ), @@ -60,7 +60,7 @@ ScCsvDiff ScCsvLayoutData::GetDiff( const ScCsvLayoutData& rData ) const } -// ============================================================================ + ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : Control( &rParent, WB_TABSTOP | WB_NODIALOGCONTROL ), @@ -312,6 +312,6 @@ ScCsvControl::XAccessibleRef ScCsvControl::CreateAccessible() } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 485021dfe540..d0ee530ab6a7 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -45,7 +45,7 @@ // *** edit engine *** -// ============================================================================ + struct Func_SetType { @@ -64,7 +64,7 @@ struct Func_Select }; -// ============================================================================ + ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) : ScCsvControl( rParent ), @@ -1365,6 +1365,6 @@ ScAccessibleCsvControl* ScCsvGrid::ImplCreateAccessible() } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index 2f31ce13bb6d..e5a08fa6a479 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -33,12 +33,12 @@ using namespace com::sun::star::uno; -// ============================================================================ + #define SEP_PATH "Office.Calc/Dialogs/CSVImport" #define FIXED_WIDTH_LIST "FixedWidthList" -// ============================================================================ + static void load_FixedWidthList(ScCsvSplits &aSplits) { @@ -667,6 +667,6 @@ ScAccessibleCsvControl* ScCsvRuler::ImplCreateAccessible() } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx index 2f9fdc6daf37..49c60d3ec8ad 100644 --- a/sc/source/ui/dbgui/csvsplits.cxx +++ b/sc/source/ui/dbgui/csvsplits.cxx @@ -22,7 +22,7 @@ #include <algorithm> -// ============================================================================ + bool ScCsvSplits::Insert( sal_Int32 nPos ) { @@ -102,6 +102,6 @@ sal_uInt32 ScCsvSplits::GetIterIndex( const_iterator aIter ) const } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 9551630fcb99..5cd4a45caaa8 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -25,7 +25,7 @@ // ause #include "editutil.hxx" -// ============================================================================ + ScCsvTableBox::ScCsvTableBox( Window* pParent, WinBits nBits ) : ScCsvControl( pParent, maData, nBits ), @@ -428,6 +428,6 @@ ScAccessibleCsvControl* ScCsvTableBox::ImplCreateAccessible() } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 63a07ffd13e1..80306d7dfdd0 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -106,7 +106,7 @@ IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn ) ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent, const uno::Sequence<OUString>& rServices ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DAPISERVICE ) ), - // + aFlFrame ( this, ScResId( FL_FRAME ) ), aFtService ( this, ScResId( FT_SERVICE ) ), aLbService ( this, ScResId( LB_SERVICE ) ), diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 019cfe2e2d39..e5b919426340 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -29,7 +29,7 @@ #include "dbnamdlg.hxx" -//============================================================================ + #define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE @@ -45,7 +45,7 @@ static DBSaveData* pSaveObj = NULL; #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() -//============================================================================ + // class DBSaveData class DBSaveData @@ -109,7 +109,7 @@ void DBSaveData::Restore() } -//============================================================================ + // class ScDbNameDlg @@ -389,7 +389,7 @@ bool ScDbNameDlg::IsRefInputMode() const // Handler: -// ======== + IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) { diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index e94e2c50fc95..e545ee175f2f 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -31,7 +31,7 @@ #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> -// ============================================================================ + namespace { @@ -60,7 +60,7 @@ static const sal_uInt16 nDatePartResIds[] = } // namespace -// ============================================================================ + ScDPGroupEditHelper::ScDPGroupEditHelper( RadioButton& rRbAuto, RadioButton& rRbMan, Edit& rEdValue ) : mrRbAuto( rRbAuto ), @@ -157,8 +157,8 @@ void ScDPDateGroupEditHelper::ImplSetValue( double fValue ) mrEdValue.SetDate( aDate ); } -// ============================================================================ -// ============================================================================ + + ScDPNumGroupDlg::ScDPNumGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DPNUMGROUP ) ), @@ -214,7 +214,7 @@ ScDPNumGroupInfo ScDPNumGroupDlg::GetGroupInfo() const return aInfo; } -// ============================================================================ + ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) : @@ -355,6 +355,6 @@ IMPL_LINK( ScDPDateGroupDlg, CheckHdl, SvxCheckListBox*, pListBox ) return 0; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dpgroupdlg.src b/sc/source/ui/dbgui/dpgroupdlg.src index d5426d19a6ff..11715f59f239 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.src +++ b/sc/source/ui/dbgui/dpgroupdlg.src @@ -19,7 +19,7 @@ #include "dpgroupdlg.hrc" -// ---------------------------------------------------------------------------- + ModalDialog RID_SCDLG_DPNUMGROUP { @@ -126,7 +126,7 @@ ModalDialog RID_SCDLG_DPNUMGROUP Text [ en-US ] = "Grouping" ; } ; -// ---------------------------------------------------------------------------- + ModalDialog RID_SCDLG_DPDATEGROUP { @@ -261,6 +261,6 @@ ModalDialog RID_SCDLG_DPDATEGROUP Text [ en-US ] = "Grouping" ; } ; -// ---------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/fieldwnd.cxx b/sc/source/ui/dbgui/fieldwnd.cxx index 65fd7a6cc826..788f029f498f 100644 --- a/sc/source/ui/dbgui/fieldwnd.cxx +++ b/sc/source/ui/dbgui/fieldwnd.cxx @@ -892,7 +892,7 @@ void ScDPFieldControlBase::Resize() CalcSize(); } -//============================================================================= + ScDPHorFieldControl::ScDPHorFieldControl ( Window* pParent ) : ScDPFieldControlBase( pParent ), @@ -1153,7 +1153,7 @@ IMPL_LINK_NOARG(ScDPHorFieldControl, EndScrollHdl) return 0; } -//============================================================================= + ScDPPageFieldControl::ScDPPageFieldControl ( Window* pParent ) : ScDPHorFieldControl( pParent ) @@ -1180,7 +1180,7 @@ OUString ScDPPageFieldControl::GetDescription() const return ScResId(STR_ACC_DATAPILOT_PAGE_DESCR); } -//============================================================================= + ScDPColFieldControl::ScDPColFieldControl ( Window* pParent ) : ScDPHorFieldControl( pParent ) @@ -1206,7 +1206,7 @@ OUString ScDPColFieldControl::GetDescription() const return ScResId(STR_ACC_DATAPILOT_COL_DESCR); } -//============================================================================= + ScDPRowFieldControl::ScDPRowFieldControl ( Window* pParent ) : ScDPFieldControlBase( pParent ), @@ -1442,7 +1442,7 @@ IMPL_LINK_NOARG(ScDPRowFieldControl, EndScrollHdl) return 0; } -//============================================================================= + ScDPSelectFieldControl::ScDPSelectFieldControl( Window* pParent ): ScDPHorFieldControl( pParent ) @@ -1469,7 +1469,7 @@ OUString ScDPSelectFieldControl::GetDescription() const return ScResId(STR_ACC_DATAPILOT_SEL_DESCR); } -//============================================================================= + ScDPDataFieldControl::ScDPDataFieldControl( Window* pParent ): ScDPHorFieldControl( pParent ) diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index ce067fb1c9cc..3581c09c8eac 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -185,7 +185,7 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) pBtnCancel->SetClickHdl ( LINK( this, ScFilterDlg, EndDlgHdl ) ); pBtnHeader->SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) ); pBtnCase->SetClickHdl ( LINK( this, ScFilterDlg, CheckBoxHdl ) ); - // + pLbField1->SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); pLbField2->SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); pLbField3->SetSelectHdl ( LINK( this, ScFilterDlg, LbSelectHdl ) ); @@ -692,7 +692,7 @@ bool ScFilterDlg::IsRefInputMode() const // Handler: -// ======== + IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) { diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 4d1b0100643f..a9aca83417cb 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -44,14 +44,14 @@ #include <svl/zforlist.hxx> #include "svl/sharedstringpool.hxx" -//================================================================== + ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, const SfxItemSet& rArgSet, SCTAB nSourceTab ) : ModalDialog ( pParent, ScResId( RID_SCDLG_PIVOTFILTER ) ), - // + aFlCriteria ( this, ScResId( FL_CRITERIA ) ), aLbField1 ( this, ScResId( LB_FIELD1 ) ), aLbCond1 ( this, ScResId( LB_COND1 ) ), @@ -83,7 +83,7 @@ ScPivotFilterDlg::ScPivotFilterDlg( Window* pParent, aStrEmpty ( SC_RESSTR(SCSTR_FILTER_EMPTY) ), aStrNotEmpty ( SC_RESSTR(SCSTR_FILTER_NOTEMPTY) ), aStrColumn ( SC_RESSTR(SCSTR_COLUMN) ), - // + nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), theQueryData ( ((const ScQueryItem&) rArgSet.Get( nWhichQuery )).GetQueryData() ), diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 04948dd5768b..e7a08189a83d 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -40,14 +40,14 @@ #include <vector> -// ============================================================================ + using namespace ::com::sun::star::sheet; using ::com::sun::star::uno::Sequence; using ::std::vector; -// ============================================================================ + namespace { @@ -154,7 +154,7 @@ static const ScDPListBoxWrapper::MapEntryType spShowFromMap[] = } // namespace -// ============================================================================ + ScDPFunctionListBox::ScDPFunctionListBox(Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) @@ -197,7 +197,7 @@ void ScDPFunctionListBox::FillFunctionNames() InsertEntry( aArr.GetString( nIndex ) ); } -// ============================================================================ + ScDPFunctionDlg::ScDPFunctionDlg( Window* pParent, const ScDPLabelDataVector& rLabelVec, @@ -413,7 +413,7 @@ IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl) return 0; } -// ============================================================================ + ScDPSubtotalDlg::ScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, @@ -519,7 +519,7 @@ IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn ) return 0; } -// ============================================================================ + ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields, @@ -771,7 +771,7 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox ) return 0; } -// ============================================================================ + ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DPSHOWDETAIL ) ), @@ -841,6 +841,6 @@ IMPL_LINK( ScDPShowDetailDlg, DblClickHdl, ListBox*, pLBox ) return 0; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src index 98af0ca57cf7..d2c08c0389f6 100644 --- a/sc/source/ui/dbgui/pvfundlg.src +++ b/sc/source/ui/dbgui/pvfundlg.src @@ -37,7 +37,7 @@ StringArray SCSTR_DPFUNCLISTBOX }; }; -// ---------------------------------------------------------------------------- + ModalDialog RID_SCDLG_DPSHOWDETAIL { @@ -85,6 +85,6 @@ ModalDialog RID_SCDLG_DPSHOWDETAIL Text [ en-US ] = "Show Detail"; }; -// ---------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 09dbf93b7efd..e6cbda50c621 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -39,7 +39,7 @@ #include "scresid.hxx" #include "scendlg.hxx" -//======================================================================== + ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const OUString& rName, bool bEdit, bool bSheetProtected) diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index f36e9b1aed4a..04b2483ac9c1 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -58,7 +58,7 @@ using namespace com::sun::star::uno; #define SEP_PATH_CLPBRD "Office.Calc/Dialogs/ClipboardTextImport" #define SEP_PATH_TEXT2COL "Office.Calc/Dialogs/TextToColumnsImport" -// ============================================================================ + static void lcl_FillCombo( ComboBox& rCombo, const OUString& rList, sal_Unicode cSelect ) { diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index f2d250b292f2..133834bf64e2 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -30,9 +30,9 @@ #include <osl/thread.h> #include <rtl/tencinfo.h> -//======================================================================== + // ScDelimiterTable -//======================================================================== + class ScDelimiterTable { @@ -105,9 +105,9 @@ OUString ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const return aStrDel; } -//======================================================================== + // ScImportOptionsDlg -//======================================================================== + ScImportOptionsDlg::ScImportOptionsDlg( Window* pParent, diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index a17354739c4e..0367f38122d9 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -42,7 +42,7 @@ ScGlobal::GetRscString(rid) ).Execute() -//============================================================================ + // class ScSpecialFilterDialog @@ -51,8 +51,8 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi const SfxItemSet& rArgSet ) : ScAnyRefDlg ( pB, pCW, pParent, "AdvancedFilterDialog", "modules/scalc/ui/advancedfilterdialog.ui" ), - // - // + + aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ), pOptionsMgr ( NULL ), nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), @@ -287,7 +287,7 @@ bool ScSpecialFilterDlg::IsRefInputMode() const // Handler: -// ======== + IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) { diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 10ba466b96f6..3bc234fbe93c 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -35,7 +35,7 @@ ScSortDlg::ScSortDlg(Window* pParent, const SfxItemSet* pArgSet) AddTabPage("options", ScTabPageSortOptions::Create, 0); } -//================================================================== + ScSortWarningDlg::ScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText) : ModalDialog(pParent, "SortWarning", "modules/scalc/ui/sortwarning.ui") @@ -65,6 +65,6 @@ IMPL_LINK( ScSortWarningDlg, BtnHdl, PushButton*, pBtn ) } return 0; } -//========================================================================// + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index 436bd96c6213..39eaa7773c63 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -11,7 +11,7 @@ #include "sortdlg.hxx" #include <vcl/layout.hxx> -// ======================================================================= + ScSortKeyItem::ScSortKeyItem(Window* pParent) { @@ -41,7 +41,7 @@ void ScSortKeyItem::EnableField() m_pFrame->Enable(); } -// ======================================================================= + ScSortKeyWindow::ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& rSortKeyItems) : mrSortKeyItems(rSortKeyItems) @@ -84,7 +84,7 @@ void ScSortKeyWindow::DoScroll(sal_Int32 nNewPos) m_pBox->SetPosPixel(Point(0, nNewPos)); } -// ======================================================================= + ScSortKeyCtrl::ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& rItems) : m_aSortWin(pParent, rItems) diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index ba77cba95248..56c99d66e19e 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -27,7 +27,7 @@ #include "subtdlg.hxx" -//================================================================== + ScSubTotalDlg::ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet) : SfxTabDialog(pParent, "SubTotalDialog", diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 4a8544635b32..899ec67524fb 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -68,8 +68,8 @@ using namespace com::sun::star; * This still needs to be changed! */ -//======================================================================== -//======================================================================== + + // Sort Criteria Tab page ScTabPageSortFields::ScTabPageSortFields(Window* pParent, @@ -77,11 +77,11 @@ ScTabPageSortFields::ScTabPageSortFields(Window* pParent, : SfxTabPage(pParent, "SortCriteriaPage", "modules/scalc/ui/sortcriteriapage.ui", rArgSet) , - // + aStrUndefined ( SC_RESSTR( SCSTR_UNDEFINED ) ), aStrColumn ( SC_RESSTR( SCSTR_COLUMN ) ), aStrRow ( SC_RESSTR( SCSTR_ROW ) ), - // + nWhichSort ( rArgSet.GetPool()->GetWhich( SID_SORT ) ), pDlg ( (ScSortDlg*)(GetParentDialog()) ), pViewData ( NULL ), @@ -501,9 +501,9 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) return 0; } -//======================================================================== + // Sort option Tab Page: -//======================================================================== + ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, const SfxItemSet& rArgSet ) diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 3f74086ecbff..cb728fece561 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -31,7 +31,7 @@ #include "subtdlg.hxx" #include "tpsubt.hxx" -//======================================================================== + // Subtotals group tabpage: ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, @@ -404,7 +404,7 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) return 0; } -//======================================================================== + // Derived Group TabPages: SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent, @@ -454,7 +454,7 @@ sal_Bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET sal_Bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(3); } #undef FILL -//======================================================================== + // Optionen-Tabpage: ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 291b0d618e55..b2d7c2c40602 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -49,7 +49,7 @@ #include <sfx2/childwin.hxx> #include "reffact.hxx" -// ============================================================================ + static sal_uInt16 pValueRanges[] = { @@ -59,7 +59,7 @@ static sal_uInt16 pValueRanges[] = }; -// ============================================================================ + ScValidationDlg::ScValidationDlg(Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/) @@ -166,7 +166,7 @@ ScValidationDlg::~ScValidationDlg() RemoveRefDlg( false ); } -// ============================================================================ + namespace { @@ -674,8 +674,8 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl) } -//======================================================================== -//======================================================================== + + // Input Help Page ScTPValidationHelp::ScTPValidationHelp( Window* pParent, @@ -754,8 +754,8 @@ sal_Bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) return sal_True; } -//======================================================================== -//======================================================================== + + // Error Alert Page ScTPValidationError::ScTPValidationError( Window* pParent, diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 19c1ed176ff2..8a590db78f8d 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -168,7 +168,7 @@ bool ScDBDocFunc::RenameDBRange( const OUString& rOld, const OUString& rNew ) bool bInserted = rDBs.insert(pNewData); if (!bInserted) // Fehler -> alten Zustand wiederherstellen pDoc->SetDBCollection(pUndoColl); // gehoert dann dem Dokument - // + pDoc->CompileDBFormula( false ); // CompileFormulaString if (bInserted) // Einfuegen hat geklappt @@ -1667,8 +1667,8 @@ void ScDBDocFunc::RefreshPivotTableGroups(ScDPObject* pDPObj) } } -//================================================================== -// + + // database import void ScDBDocFunc::UpdateImport( const OUString& rTarget, const svx::ODataAccessDescriptor& rDescriptor ) diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 41c045096300..3b8ee69953d0 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -192,9 +192,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, ScDocument* pImportDoc = new ScDocument( SCDOCMODE_UNDO ); pImportDoc->InitUndo( pDoc, nTab, nTab ); - // + // get data from database into import document - // + try { @@ -216,9 +216,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, OSL_ENSURE( xRowProp.is(), "can't get RowSet" ); if ( xRowProp.is() ) { - // + // set source parameters - // + sal_Int32 nType = rParam.bSql ? sdb::CommandType::COMMAND : ( (rParam.nType == ScDbQuery) ? sdb::CommandType::QUERY : @@ -251,9 +251,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } if ( xRowSet.is() ) { - // + // get column descriptions - // + long nColCount = 0; uno::Reference<sdbc::XResultSetMetaData> xMeta; @@ -401,9 +401,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, OSL_FAIL("Unexpected exception in database"); } - // + // test for cell protection - // + sal_Bool bKeepFormat = !bAddrInsert && pDBData->IsKeepFmt(); sal_Bool bMoveCells = !bAddrInsert && pDBData->IsDoSize(); @@ -449,9 +449,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } } - // + // copy data from import doc into real document - // + if ( bSuccess ) { @@ -489,9 +489,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, pImportDoc->ApplyPatternAreaTab( 0,0,MAXCOL,MAXROW, nTab, aPattern ); } - // + // copy old data for undo - // + SCCOL nUndoEndCol = std::max( nEndCol, rParam.nCol2 ); // rParam = old end SCROW nUndoEndRow = std::max( nEndRow, rParam.nRow2 ); @@ -529,9 +529,9 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nCopyFlags, false, pUndoDoc ); } - // + // move new data - // + if (bMoveCells) { diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index c1deef098d9b..182cf6cd4a20 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -98,7 +98,7 @@ using ::std::vector; // STATIC DATA ----------------------------------------------------------- -//======================================================================== + IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction ) { @@ -2296,9 +2296,9 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, } } - // + // ausfuehren - // + WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference @@ -2660,9 +2660,9 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, sal_uInt16 nDestExt = 0; rDocShell.UpdatePaintExt( nDestExt, nDestCol,nDestRow,nDestTab, nDestEndCol,nDestEndRow,nDestEndTab ); - // + // ausfuehren - // + ScDocument* pUndoDoc = NULL; ScDocument* pRefUndoDoc = NULL; diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 23ce64cc8085..5de3b11dcf53 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -64,9 +64,9 @@ -// + // Redraw - Benachrichtigungen -// + void ScDocShell::PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos ) @@ -732,9 +732,9 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) } -// + // Merge (Aenderungen zusammenfuehren) -// + static inline sal_Bool lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, sal_Bool bIgnore100Sec ) diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index c1ef3e4aa811..c68d39486c1a 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1868,10 +1868,10 @@ void ScDocShell::GetSbxState( SfxItemSet &rSet ) // SID_TABLES_GET (Tables), // SID_PIVOT_GET (DataPilotTables) - removed (old Basic) - // + // Wenn hier Slots von der View-Shell executed werden, muss auch der // GetState weitergeleitet werden! - // + ScTabViewShell* pVisibleSh = GetBestViewShell(); // sichtbare View if ( pVisibleSh ) diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index e901ddb416ed..0366dccae1cf 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -63,9 +63,9 @@ using ::std::vector; -// + // former viewfunc/dbfunc methods -// + void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId ) { diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 73fc57356d4d..a0d29a893948 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -67,9 +67,9 @@ struct ScStylePair -// + // Ole -// + void ScDocShell::SetVisArea( const Rectangle & rVisArea ) { @@ -215,9 +215,9 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, bool bSnapSize ) SetVisAreaOrSize( aNewArea, true ); // hier muss auch der Start angepasst werden } -// + // Style-Krempel fuer Organizer etc. -// + SfxStyleSheetBasePool* ScDocShell::GetStyleSheetPool() { diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index a41ee468e478..5b6384832bb5 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -243,7 +243,7 @@ void removeRangeNamesBySrcDoc(ScRangeName& rRanges, sal_uInt16 nFileId) } -// ============================================================================ + ScExternalRefCache::Table::Table() : meReferenced( REFERENCED_MARKED ) @@ -1228,7 +1228,7 @@ ScExternalRefCache::DocItem* ScExternalRefCache::getDocItem(sal_uInt16 nFileId) return &itrDoc->second; } -// ============================================================================ + ScExternalRefLink::ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId, const OUString& rFilter) : ::sfx2::SvBaseLink(::sfx2::LINKUPDATE_ONCALL, FORMAT_FILE), @@ -1298,7 +1298,7 @@ IMPL_LINK_NOARG(ScExternalRefLink, ExternalRefEndEditHdl) return 0; } -// ============================================================================ + static FormulaToken* convertToToken( ScDocument* pHostDoc, ScDocument* pSrcDoc, ScRefCellValue& rCell ) { @@ -1574,7 +1574,7 @@ ScExternalRefCache::TableTypeRef ScExternalRefManager::getCacheTable( return maRefCache.getCacheTable(nFileId, rTabName, bCreateNew, pnIndex); } -// ============================================================================ + ScExternalRefManager::LinkListener::LinkListener() { diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 3b2928a6121a..46215811392d 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -56,7 +56,7 @@ #include <boost/scoped_ptr.hpp> -//======================================================================== + // We don't want to end up with 2GB read in one line just because of malformed // multiline fields, so chop it _somewhere_, which is twice supported columns @@ -206,7 +206,7 @@ bool ScImportExport::IsFormatSupported( sal_uLong nFormat ) } -////////////////////////////////////////////////////////////////////////////// + // Vorbereitung fuer Undo: Undo-Dokument erzeugen @@ -264,7 +264,7 @@ void ScImportExport::EndPaste(bool bAutoRowHeight) } -///////////////////////////////////////////////////////////////////////////// + bool ScImportExport::ImportData( const OUString& /* rMimeType */, const ::com::sun::star::uno::Any & /* rValue */ ) @@ -862,7 +862,7 @@ static inline void lcl_WriteSimpleString( SvStream& rStrm, const OUString& rStri ScImportExport::WriteUnicodeOrByteString( rStrm, rString ); } -////////////////////////////////////////////////////////////////////////////// + bool ScImportExport::Text2Doc( SvStream& rStrm ) @@ -957,9 +957,9 @@ bool ScImportExport::Text2Doc( SvStream& rStrm ) return bOk; } - // + // erweiterter Ascii-Import - // + static bool lcl_PutString( diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 8b2d75af5f18..9d6efe8cadbf 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -36,7 +36,7 @@ using ::std::list; using ::std::for_each; using ::std::pair; -// ============================================================================ + /** * A simple container to keep track of cells that depend on basic modules @@ -92,7 +92,7 @@ private: }; -// ============================================================================ + ScMacroManager::ScMacroManager(ScDocument* pDoc) : mpDepTracker(new ScUserMacroDepTracker), diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx index 034b61fe14a2..5759666d14da 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -28,7 +28,7 @@ #include "sc.hrc" -//======================================================================== + static void lcl_InvalidateOutliner( SfxBindings* pBindings ) { diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx index 4128244cd6dd..cad02c397574 100644 --- a/sc/source/ui/docshell/pagedata.cxx +++ b/sc/source/ui/docshell/pagedata.cxx @@ -21,7 +21,7 @@ #include "pagedata.hxx" -//============================================================================ + ScPrintRangeData::ScPrintRangeData() { @@ -64,7 +64,7 @@ void ScPrintRangeData::SetPagesY( size_t nCount, const SCROW* pData ) nPagesY = nCount; } -//============================================================================ + ScPageBreakData::ScPageBreakData(size_t nMax) { diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index 93ab7847d891..0117dc47991a 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -29,9 +29,9 @@ #include "tpstat.hxx" -//======================================================================== + // Dokumentinfo-Tabpage: -//======================================================================== + SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet& rSet ) { diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index cc27e2e81713..30e1e7630ec4 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -179,9 +179,9 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) break; } - //===== + return; - //===== + } if( pView->AreObjectsMarked() ) diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index fa2126e5bbcc..1d39426d5025 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -282,9 +282,9 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl svx::FontworkBar::getState( pView, rSet ); } -// + // Attribute fuer Drawing-Objekte -// + void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet ) { diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 4193e80977aa..4370c18e826a 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -244,9 +244,9 @@ sal_uInt16 ScGetFontWorkId(); -// + // Funktionen auf Drawing-Objekten -// + void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) { @@ -258,7 +258,7 @@ void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) //!!! // wer weiss, wie lange das funktioniert? (->vom Abreisscontrol funktioniert es) - // + if (nSlotId == SID_OBJECT_ALIGN && pArgs) nSlotId = SID_OBJECT_ALIGN + ((SfxEnumItem&)pArgs->Get(SID_OBJECT_ALIGN)).GetValue() + 1; diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src index 6d720833445a..0709803f63f5 100644 --- a/sc/source/ui/drawfunc/drformsh.src +++ b/sc/source/ui/drawfunc/drformsh.src @@ -20,9 +20,9 @@ #include "sc.hrc" #include "submenu.hrc" #include <svx/globlmn.hrc> - // + // Defines ------------------------------------------------------------------------------- - // + #define MN_LAYER\ ToolBoxItem\ {\ @@ -167,14 +167,14 @@ // Popup-Menues --------------------------------------------------------------------- - // + String RID_POPUP_DRAWFORM { Text [ en-US ] = "Popup menu for form objects"; }; - // + // Popup-Menue fuer (Uno-) Controls - // + Menu RID_POPUP_DRAWFORM { ItemList = @@ -187,21 +187,21 @@ Menu RID_POPUP_DRAWFORM MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { ITEM_FORM_CONTROL_PROPERTIES }; MenuItem { ITEM_FORM_PROPERTIES }; MenuItem { ITEM_REPLACE_CONTROL }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU }; }; diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 7492bf84390e..db575fc90a27 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -141,11 +141,11 @@ ScDrawTextObjectBar::~ScDrawTextObjectBar() } } -//======================================================================== -// + + // Funktionen -// -//======================================================================== + + void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) { @@ -544,11 +544,11 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet ) } } -//======================================================================== -// + + // Attribute -// -//======================================================================== + + void ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq ) { diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 57f16e9b1570..b8b5e66457fb 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -278,9 +278,9 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) // try to select the clicked object if ( pView->MarkObj( aMDPos, -2, false, rMEvt.IsMod1() ) ) { - //********************************************************* + //Objekt verschieben - //******************************************************** + if (pView->IsMarkedHit(aMDPos)) { // Don't start drag timer if inplace editing of an OLE object @@ -304,9 +304,9 @@ bool FuSelection::MouseButtonDown(const MouseEvent& rMEvt) if (pViewShell->IsDrawSelMode()) { - //********************************************************* + //Objekt selektieren - //******************************************************** + pView->BegMarkObj(aMDPos); bReturn = true; } @@ -523,9 +523,9 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); - // + // OLE: aktivieren - // + if (nSdrObjKind == OBJ_OLE2) { @@ -538,11 +538,11 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) } } - // + // Edit text // not in UNO controls // #i32352# not in media objects - // + else if ( pObj->ISA(SdrTextObj) && !pObj->ISA(SdrUnoObj) && !pObj->ISA(SdrMediaObj) ) { OutlinerParaObject* pOPO = pObj->GetOutlinerParaObject(); diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index b8de82e13cd2..d19236b9991f 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -163,7 +163,7 @@ void FuSelection::ActivateNoteHandles(SdrObject* pObject) } } -//================================================================== + diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index 1c6be53daa81..8ae856d4cb3a 100644 --- a/sc/source/ui/drawfunc/objdraw.src +++ b/sc/source/ui/drawfunc/objdraw.src @@ -20,9 +20,9 @@ #include "sc.hrc" #include "submenu.hrc" #include <svx/globlmn.hrc> - // + // Defines ------------------------------------------------------------------------------- - // + #define MN_RESET\ MenuItem\ {\ @@ -364,40 +364,40 @@ };\ }; - // - // ------------------------------------------------------------------------------ - // - // + + + + // Objekt-Leisten - // + String RID_DRAW_OBJECTBAR { Text [ en-US ] = "Drawing Object Bar" ; }; - // + // Text-Toolbox - // + String RID_TEXT_TOOLBOX { Text [ en-US ] = "Text Object Bar" ; }; - // + // Graphics toolbox - // + String RID_GRAPHIC_OBJECTBAR { Text [ en-US ] = "Image Object Bar"; }; - // + // Popup-Menues --------------------------------------------------------------------- - // + String RID_POPUP_DRAW { Text [ en-US ] = "Pop-up menu for drawing objects" ; }; - // + // Pop-up menu for drawing objects - // + Menu RID_POPUP_DRAW { ItemList = @@ -413,17 +413,17 @@ Menu RID_POPUP_DRAW MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_MIRRORSUB MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB MN_ASSIGNMACRO - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { ITEM_FORMAT_BEZIER_EDIT @@ -434,22 +434,22 @@ Menu RID_POPUP_DRAW { ITEM_FORMAT_FONTWORK }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_EDITLNK MN_DELLNK MenuItem { ITEM_OPEN_HYPERLINK }; }; }; - // + // Popup-Menue fuer (Uno-) Controls - // + Menu RID_POPUP_CONTROL { @@ -463,27 +463,27 @@ Menu RID_POPUP_CONTROL MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { ITEM_FORM_CONTROL_PROPERTIES }; MenuItem { ITEM_FORM_PROPERTIES }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU }; }; - // + // Grafik - // + Menu RID_POPUP_GRAPHIC { @@ -501,21 +501,21 @@ Menu RID_POPUP_GRAPHIC MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_MIRRORSUB MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB MN_ASSIGNMACRO - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_EDITLNK MN_DELLNK MenuItem { ITEM_OPEN_HYPERLINK }; @@ -524,9 +524,9 @@ Menu RID_POPUP_GRAPHIC }; }; - // + // Media - // + Menu RID_POPUP_MEDIA { @@ -540,23 +540,23 @@ Menu RID_POPUP_MEDIA MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_MIRRORSUB MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU }; }; - // + // Ole-Objekt - // + Menu RID_POPUP_OLE { @@ -577,22 +577,22 @@ Menu RID_POPUP_OLE MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU }; }; - // + // Charts - // + Menu RID_POPUP_CHART { @@ -613,15 +613,15 @@ Menu RID_POPUP_CHART MN_RENAME_OBJECT //-#i68101#---------------------- - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MN_ARRANGESUB MN_ALIGNSUB MN_ANCHORSUB - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + ITEM_GROUP_MENU MenuItem { @@ -632,9 +632,9 @@ Menu RID_POPUP_CHART }; }; - // + // PopUpDraw Text - // + String RID_POPUP_DRAWTEXT { diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index ef0928e7ee4c..4b25d2aa6da3 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -991,7 +991,7 @@ IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl ) { DoEnter(); // Uebernimmt die Eingabe } - //... + return 0; } @@ -1027,7 +1027,7 @@ IMPL_LINK( ScFunctionDockWin, SetSplitHdl, ScPrivatSplit*, pCtrl ) aFiFuncDesc.SetPosPixel(aFDTopLeft); aFiFuncDesc.SetSizePixel(aFDSize); } - //... + return 0; } diff --git a/sc/source/ui/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxx index 8b4853566f96..9767be0b8147 100644 --- a/sc/source/ui/formdlg/formdata.cxx +++ b/sc/source/ui/formdlg/formdata.cxx @@ -19,7 +19,7 @@ #include "formdata.hxx" -//============================================================================ + ScFormEditData::ScFormEditData() : formula::FormEditData() { diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index fda461cd58fd..7c3c58ae1531 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -55,7 +55,7 @@ #include <com/sun/star/table/CellAddress.hpp> -//============================================================================ + using namespace formula; using namespace com::sun::star; @@ -64,9 +64,9 @@ ScAddress ScFormulaDlg::aCursorPos; -// -------------------------------------------------------------------------- + // Initialisierung / gemeinsame Funktionen fuer Dialog -// -------------------------------------------------------------------------- + ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* pViewData,formula::IFunctionManager* _pFunctionMgr ) @@ -305,9 +305,9 @@ bool ScFormulaDlg::Close() return true; } -// -------------------------------------------------------------------------- + // Funktionen fuer rechte Seite -// -------------------------------------------------------------------------- + bool ScFormulaDlg::calculateValue( const OUString& rStrExp, OUString& rStrResult ) { boost::scoped_ptr<ScSimpleFormulaCalculator> pFCell( new ScSimpleFormulaCalculator( pDoc, aCursorPos, rStrExp ) ); diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 0ea96cd947f0..28435ab7b0e1 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef _SC_ACCESSIBLECSVCONTROL_HXX #define _SC_ACCESSIBLECSVCONTROL_HXX @@ -34,7 +34,7 @@ #include "AccessibleContextBase.hxx" -// ============================================================================ + class ScCsvControl; namespace utl { class AccessibleStateSetHelper; } @@ -126,7 +126,7 @@ protected: }; -// ============================================================================ + class ScCsvRuler; @@ -299,7 +299,7 @@ private: }; -// ============================================================================ + class ScCsvGrid; @@ -544,7 +544,7 @@ private: }; -// ============================================================================ + /** Accessible class representing a cell of the CSV grid control. */ class ScAccessibleCsvCell : public ScAccessibleCsvControl, public accessibility::AccessibleStaticTextBase @@ -648,7 +648,7 @@ private: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index acea9d87141a..58ab48c97938 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -38,7 +38,7 @@ class ScCsvViewForwarder; class ScAccessibleCell; -// ============================================================================ + class ScAccessibleTextData : public SfxListener { @@ -67,7 +67,7 @@ private: }; -// ============================================================================ + class ScAccessibleCellBaseTextData : public ScAccessibleTextData, public ScCellTextData @@ -85,7 +85,7 @@ public: }; -// ============================================================================ + // ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object @@ -122,7 +122,7 @@ private: }; -// ============================================================================ + class ScAccessibleEditObjectTextData : public ScAccessibleTextData { @@ -155,7 +155,7 @@ protected: }; -// ============================================================================ + class ScAccessibleEditLineTextData : public ScAccessibleEditObjectTextData { @@ -179,7 +179,7 @@ private: }; -// ============================================================================ + class ScAccessiblePreviewCellTextData : public ScAccessibleCellBaseTextData { @@ -208,7 +208,7 @@ private: }; -// ============================================================================ + class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextData { @@ -240,7 +240,7 @@ private: }; -// ============================================================================ + class ScAccessibleHeaderTextData : public ScAccessibleTextData { @@ -273,7 +273,7 @@ private: }; -// ============================================================================ + class ScAccessibleNoteTextData : public ScAccessibleTextData { @@ -306,7 +306,7 @@ private: }; -// ============================================================================ + class ScAccessibleCsvTextData : public ScAccessibleTextData { @@ -345,7 +345,7 @@ public: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 804309b8948b..b736c8c0650a 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -52,7 +52,7 @@ private: OKButton* mpButtonOk; CloseButton* mpButtonClose; - // + formula::RefEdit* mpActiveEdit; // Data diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index c32f3a848a3a..b135e0231475 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -91,7 +91,7 @@ typedef long LExpNum; //@ Expand entrys are ambiguous and therefore removed //DECLARE_TABLE( ScChgTrackExps, LExpNum) -//================================================================== + class ScAcceptChgDlg : public SfxModelessDialog { diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index 751f00dd4ac4..c269390d63e9 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -103,7 +103,7 @@ public: bool CanInputDone( bool bForced ){ return pRefEdit && (bForced || !pRefBtn); } }; -//============================================================================ + class SC_DLLPUBLIC ScRefHandler : public IAnyRefDialog @@ -173,7 +173,7 @@ public: inline bool CanInputDone( bool bForced ); }; -//============================================================================ + class ScRefHdlModalImpl : public ModalDialog, public ScRefHandler @@ -275,7 +275,7 @@ public: const OUString& rUIXMLDescription); }; -//============================================================================ + template<class TDerived, class TBase, bool bBindRef = true> struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef > { @@ -300,7 +300,7 @@ struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef > SC_MOD()->UnregisterRefWindow( static_cast<sal_uInt16>( static_cast<TDerived*>(this)->SLOTID ), this ); } }; -//============================================================================ + struct ScAnyRefDlg : ::ScRefHdlrImpl< ScAnyRefDlg, SfxModelessDialog> { template<class T1, class T2, class T3, class T4> @@ -315,7 +315,7 @@ struct ScAnyRefDlg : ::ScRefHdlrImpl< ScAnyRefDlg, SfxModelessDialog> { } }; -//============================================================================ + inline bool ScRefHandler::CanInputStart( const formula::RefEdit *pEdit ) { diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index 7a344ab2f172..2965b9a871b4 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -30,7 +30,7 @@ class ScDocument; class ScViewData; -//============================================================================ + class ScPrintAreasDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx index c114d389c8a3..8630a4e50b88 100644 --- a/sc/source/ui/inc/asciiopt.hxx +++ b/sc/source/ui/inc/asciiopt.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef SC_ASCIIOPT_HXX #define SC_ASCIIOPT_HXX @@ -33,7 +33,7 @@ #include "csvtablebox.hxx" #include "i18nlangtag/lang.h" -// ============================================================================ + class ScAsciiOptions { diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 111190d6572a..fea35429a65f 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -26,7 +26,7 @@ class Window; class SfxViewFrame; class SfxItemSet; -//================================================================== + class ScAttrDlg : public SfxTabDialog { diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index 4a2a7e1aa4dd..f15e86cee9b8 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -30,7 +30,7 @@ #include <svx/framelinkarray.hxx> #include "scdllapi.h" -//------------------------------------------------------------------------ + class ScAutoFormatData; class SvxBoxItem; @@ -39,11 +39,11 @@ class ScAutoFmtPreview; // s.u. class SvNumberFormatter; class ScDocument; -//------------------------------------------------------------------------ + enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; -//======================================================================== + class SC_DLLPUBLIC ScAutoFmtPreview : public Window { @@ -77,7 +77,7 @@ private: const OUString aStrSouth; const OUString aStrSum; SvNumberFormatter* pNumFmt; - //------------------------------------------- + SAL_DLLPRIVATE void Init (); SAL_DLLPRIVATE void DoPaint ( const Rectangle& rRect ); SAL_DLLPRIVATE void CalcCellArray ( bool bFitWidth ); diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx index 2d7b101fbad8..54f7f07d55f1 100644 --- a/sc/source/ui/inc/cbutton.hxx +++ b/sc/source/ui/inc/cbutton.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -//------------------------------------------------------------------ + #ifndef SC_CBUTTON_HXX #define SC_CBUTTON_HXX @@ -28,7 +28,7 @@ class OutputDevice; -//================================================================== + class ScDDComboBoxButton { diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index a21a7d9c45fd..93a53e7760d0 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -32,7 +32,7 @@ class ScViewData; -//============================================================================= + enum ScConflictAction { @@ -44,9 +44,9 @@ enum ScConflictAction typedef ::std::vector< sal_uLong > ScChangeActionList; -//============================================================================= + // struct ScConflictsListEntry -//============================================================================= + struct ScConflictsListEntry { @@ -59,14 +59,14 @@ struct ScConflictsListEntry }; -//============================================================================= + typedef ::std::vector< ScConflictsListEntry > ScConflictsList; -//============================================================================= + // class ScConflictsListHelper -//============================================================================= + class ScConflictsListHelper { @@ -84,9 +84,9 @@ public: }; -//============================================================================= + // class ScConflictsFinder -//============================================================================= + class ScConflictsFinder { @@ -111,9 +111,9 @@ public: }; -//============================================================================= + // class ScConflictsResolver -//============================================================================= + class ScConflictsResolver { @@ -130,9 +130,9 @@ public: }; -//============================================================================= + // class ScConflictsDlg -//============================================================================= + class ScConflictsDlg : public ModalDialog { diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 51e432588b88..205ba5b4e491 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -34,7 +34,7 @@ class ScRangeUtil; class ScAreaData; -//============================================================================ + class ScConsolidateDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 929ef05d6744..f5c06a695d1a 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -31,7 +31,7 @@ class ScViewData; class ScDocument; -//============================================================================ + class ScColRowNameRangesDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 6898bd2252ad..714a656801a8 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef _SC_CSVCONTROL_HXX #define _SC_CSVCONTROL_HXX @@ -36,7 +36,7 @@ namespace com { namespace sun { namespace star { namespace accessibility { } } } } -// ============================================================================ + /** Minimum character count for a column in separators mode. */ const sal_Int32 CSV_MINCOLWIDTH = 8; @@ -69,7 +69,7 @@ const sal_uInt8 SC_COL_SKIP = 9; const sal_uInt8 SC_COL_ENGLISH = 10; -// ============================================================================ + /** Exported data of a column (data used in the dialog). */ struct ScCsvExpData @@ -85,7 +85,7 @@ struct ScCsvExpData typedef ::std::vector< ScCsvExpData > ScCsvExpDataVec; -// ============================================================================ + /** Specifies which element should be used to perform an action. */ enum ScMoveMode @@ -100,7 +100,7 @@ enum ScMoveMode }; -// ============================================================================ + /** Flags for comparison of old and new control layout data. */ typedef sal_uInt32 ScCsvDiff; @@ -122,7 +122,7 @@ const ScCsvDiff CSV_DIFF_VERTICAL = CSV_DIFF_LINECOUNT | CSV_DIFF_LINEOFFS const ScCsvDiff CSV_DIFF_CURSOR = CSV_DIFF_RULERCURSOR | CSV_DIFF_GRIDCURSOR; -// ---------------------------------------------------------------------------- + /** A structure containing all layout data valid for both ruler and data grid (i.e. scroll position or column width). */ @@ -169,7 +169,7 @@ inline bool operator!=( const ScCsvLayoutData& rData1, const ScCsvLayoutData& rD } -// ============================================================================ + /** Enumeration of possible commands to change any settings of the CSV controls. @descr Controls have to send commands instead of changing their settings directly. @@ -215,7 +215,7 @@ enum ScCsvCmdType }; -// ---------------------------------------------------------------------------- + /** Data for a CSV control command. The stored position data is aways character based, it's never a column index (required for internal consistency). */ @@ -243,7 +243,7 @@ inline void ScCsvCmd::Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nPar } -// ============================================================================ + /** Base class for the CSV ruler and the data grid control. Implements command handling. */ class SC_DLLPUBLIC ScCsvControl : public Control @@ -264,7 +264,7 @@ private: ScAccessibleCsvControl* mpAccessible; /// Pointer to the accessible implementation object. bool mbValidGfx; /// Content of virtual devices valid? - // ------------------------------------------------------------------------ + public: explicit ScCsvControl( ScCsvControl& rParent ); explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ); @@ -417,7 +417,7 @@ protected: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 769d274f235a..d0607cd1224e 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef _SC_CSVGRID_HXX #define _SC_CSVGRID_HXX @@ -33,7 +33,7 @@ #include "csvsplits.hxx" -// ---------------------------------------------------------------------------- + namespace svtools { class ColorConfig; } class EditEngine; @@ -42,7 +42,7 @@ class ScAsciiOptions; class ScAccessibleCsvControl; -// ============================================================================ + const sal_uInt8 CSV_COLFLAG_NONE = 0x00; /// Nothing set. const sal_uInt8 CSV_COLFLAG_SELECT = 0x01; /// Column is selected. @@ -50,7 +50,7 @@ const sal_uInt8 CSV_COLFLAG_SELECT = 0x01; /// Column is selected. const sal_uInt32 CSV_COLUMN_INVALID = CSV_VEC_NOTFOUND; -// ---------------------------------------------------------------------------- + /** This struct contains the state of one table column. */ struct ScCsvColState @@ -78,12 +78,12 @@ inline void ScCsvColState::Select( bool bSel ) } -// ---------------------------------------------------------------------------- + typedef ::std::vector< ScCsvColState > ScCsvColStateVec; -// ============================================================================ + /** A data grid control for the CSV import dialog. The design of this control simulates a Calc spreadsheet with row and column headers. */ @@ -123,7 +123,7 @@ private: sal_uInt32 mnMTCurrCol; /// Current column of mouse tracking. bool mbMTSelecting; /// Mouse tracking: true = select, false = deselect. - // ------------------------------------------------------------------------ + public: explicit ScCsvGrid( ScCsvControl& rParent ); virtual ~ScCsvGrid(); @@ -347,7 +347,7 @@ protected: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx index b7d7eb55b719..ca78c37811f8 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef _SC_CSVRULER_HXX #define _SC_CSVRULER_HXX @@ -30,7 +30,7 @@ class ScAccessibleCsvControl; -// ============================================================================ + /** A ruler control for the CSV import dialog. Supports setting and moving splits (which divide lines of data into several columns). */ @@ -57,7 +57,7 @@ private: Rectangle maActiveRect; /// The active area of the ruler. sal_Int32 mnSplitSize; /// Size of a split circle. - // ------------------------------------------------------------------------ + public: explicit ScCsvRuler( ScCsvControl& rParent ); ~ScCsvRuler(); @@ -185,7 +185,7 @@ protected: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/csvsplits.hxx b/sc/source/ui/inc/csvsplits.hxx index c436801ebf3a..18b8888f4adf 100644 --- a/sc/source/ui/inc/csvsplits.hxx +++ b/sc/source/ui/inc/csvsplits.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef _SC_CSVSPLITS_HXX #define _SC_CSVSPLITS_HXX @@ -27,7 +27,7 @@ #include <vector> -// ============================================================================ + /** Constant for an invalid vector index. */ const sal_uInt32 CSV_VEC_NOTFOUND = SAL_MAX_UINT32; @@ -35,7 +35,7 @@ const sal_uInt32 CSV_VEC_NOTFOUND = SAL_MAX_UINT32; const sal_Int32 CSV_POS_INVALID = -1; -// ---------------------------------------------------------------------------- + /** A vector of column splits that supports inserting, removing and moving splits. */ class ScCsvSplits @@ -89,7 +89,7 @@ private: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 3fb5db70b3d7..8f9d71f82104 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef _SC_CSVTABLEBOX_HXX #define _SC_CSVTABLEBOX_HXX @@ -64,7 +64,7 @@ private: bool mbFixedMode; /// false = Separators, true = Fixed width. - // ------------------------------------------------------------------------ + public: explicit ScCsvTableBox( Window* pParent, WinBits nBits ); @@ -144,7 +144,7 @@ protected: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index f2be47d008a8..899e14cb9bda 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -27,7 +27,7 @@ #include <vcl/lstbox.hxx> #include <com/sun/star/uno/Sequence.hxx> -//------------------------------------------------------------------------ + class ScDataPilotSourceTypeDlg : public ModalDialog { diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 91f17b00591d..704fee82d2a4 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -36,7 +36,7 @@ class ScDPSaveData; struct ScDPNumGroupInfo; struct ScSubTotalParam; -// --------------------------------------------------------------------------- + class ScDBFunc : public ScViewFunc { diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index e893fd4cd47f..7011f7edf735 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -33,7 +33,7 @@ class ScViewData; class ScDocument; -//============================================================================ + class ScDbNameDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx index 56d08968f059..59eaf1dce39d 100644 --- a/sc/source/ui/inc/delcldlg.hxx +++ b/sc/source/ui/inc/delcldlg.hxx @@ -28,7 +28,7 @@ #include "global.hxx" -//------------------------------------------------------------------------ + class ScDeleteCellDlg : public ModalDialog { diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index 34b10253e3d0..35805d95bf5b 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -24,7 +24,7 @@ #include <vcl/button.hxx> #include "global.hxx" -//------------------------------------------------------------------------ + class ScDeleteContentsDlg : public ModalDialog { diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index 36c984aded9c..49c95c8761cf 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -52,8 +52,6 @@ struct ColRowSpan; } -// --------------------------------------------------------------------------- - class ScDocFunc { protected: diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 3e3d143e72fc..49215fd72426 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -76,7 +76,7 @@ struct DocShell_Impl; typedef ::boost::unordered_map< sal_uLong, sal_uLong > ScChangeActionMergeMap; -//================================================================== + //enum ScDBFormat { SC_FORMAT_SDF, SC_FORMAT_DBF }; diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 045997ca88de..ddc2b797624f 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -28,7 +28,7 @@ #include "editfield.hxx" #include "dpgroup.hxx" -// ============================================================================ + class ScDPGroupEditHelper { @@ -56,7 +56,7 @@ private: Edit& mrEdValue; }; -// ---------------------------------------------------------------------------- + class ScDPNumGroupEditHelper : public ScDPGroupEditHelper { @@ -75,7 +75,7 @@ private: ScDoubleField& mrEdValue; }; -// ---------------------------------------------------------------------------- + class ScDPDateGroupEditHelper : public ScDPGroupEditHelper { @@ -95,8 +95,8 @@ private: Date maNullDate; }; -// ============================================================================ -// ============================================================================ + + class ScDPNumGroupDlg : public ModalDialog { @@ -123,7 +123,7 @@ private: ScDPNumGroupEditHelper maEndHelper; }; -// ============================================================================ + class ScDPDateGroupDlg : public ModalDialog { @@ -159,7 +159,7 @@ private: ScDPDateGroupEditHelper maEndHelper; }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx index 97aebe70fcec..bbcdf1390260 100644 --- a/sc/source/ui/inc/editfield.hxx +++ b/sc/source/ui/inc/editfield.hxx @@ -22,7 +22,7 @@ #include <vcl/field.hxx> -// ============================================================================ + /** An edit control that contains a double precision floating-point value. */ class ScDoubleField : public Edit @@ -37,7 +37,7 @@ public: bool bEraseTrailingDecZeros = true ); }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/fieldwnd.hxx b/sc/source/ui/inc/fieldwnd.hxx index e8ec44610607..f6c7f5004b9d 100644 --- a/sc/source/ui/inc/fieldwnd.hxx +++ b/sc/source/ui/inc/fieldwnd.hxx @@ -263,7 +263,7 @@ private: com::sun::star::uno::WeakReference< ::com::sun::star::accessibility::XAccessible > mxAccessible; }; -// ============================================================================ + /** * Base class for field control with a horizontal scroll bar at the bottom. @@ -308,7 +308,7 @@ private: size_t mnFieldBtnColCount; }; -// ============================================================================ + class ScDPPageFieldControl : public ScDPHorFieldControl { @@ -320,7 +320,7 @@ public: virtual OUString GetDescription() const; }; -// ============================================================================ + class ScDPColFieldControl : public ScDPHorFieldControl { @@ -332,7 +332,7 @@ public: virtual OUString GetDescription() const; }; -// ============================================================================ + /** * Row field control with a vertical scroll bar. @@ -375,7 +375,7 @@ private: size_t mnColumnBtnCount; }; -// ============================================================================ + class ScDPSelectFieldControl : public ScDPHorFieldControl { @@ -387,7 +387,7 @@ public: virtual OUString GetDescription() const; }; -// ============================================================================ + class ScDPDataFieldControl : public ScDPHorFieldControl { diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 7fcd1b0ef7fd..96e080744858 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -28,10 +28,10 @@ class ScDocument; -//---------------------------------------------------------------------------- + #include "scui_def.hxx" -//============================================================================ + class ScFillSeriesDlg : public ModalDialog { @@ -88,7 +88,7 @@ private: const OUString aErrMsgInvalidVal; - //---------------------------------------------------------- + ScDocument& rDoc; FillDir theFillDir; diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 8677bbafe231..6ba9480fabb2 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -38,7 +38,7 @@ #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> -//---------------------------------------------------------------------------- + class ScFilterOptionsMgr; class ScViewData; @@ -74,22 +74,22 @@ private: ListBox* pLbField1; ListBox* pLbCond1; ComboBox* pEdVal1; - //---------------------------- + ListBox* pLbConnect2; ListBox* pLbField2; ListBox* pLbCond2; ComboBox* pEdVal2; - //---------------------------- + ListBox* pLbConnect3; ListBox* pLbField3; ListBox* pLbCond3; ComboBox* pEdVal3; - //---------------------------- + ListBox* pLbConnect4; ListBox* pLbField4; ListBox* pLbCond4; ComboBox* pEdVal4; - //---------------------------- + ScrollBar* pScrollBar; VclExpander* pExpander; diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 59ac707bc950..6cfa1cb9fd21 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -25,7 +25,7 @@ #include <vcl/lstbox.hxx> #include <vcl/button.hxx> -//---------------------------------------------------------------------------- + namespace formula { @@ -35,7 +35,7 @@ struct ScQueryParam; class ScDocument; class ScViewData; -//---------------------------------------------------------------------------- + class ScFilterOptionsMgr { diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx index 9fad6707bb9e..475dee99e9cc 100644 --- a/sc/source/ui/inc/formdata.hxx +++ b/sc/source/ui/inc/formdata.hxx @@ -24,7 +24,7 @@ class ScInputHandler; class ScDocShell; -//============================================================================ + class ScFormEditData : public formula::FormEditData { diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 46d829822177..5137ce1852e9 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -40,9 +40,9 @@ class ScInputHandler; class ScDocShell; class ScFormulaCell; -//============================================================================ + typedef ScTabViewShell* PtrTabViewShell; -//============================================================================ + class ScFormulaDlg : public formula::FormulaDlg, public IAnyRefDialog diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 57301c22cd00..04580c9998aa 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -35,11 +35,11 @@ class ScFuncDesc; -//============================================================================ + #define LRU_MAX 10 -//============================================================================ + class ScListBox : public ListBox { protected: @@ -54,7 +54,7 @@ public: -//============================================================================ + class ScFuncPage : public TabPage { private: diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index b862aba4187b..e0319b1cbf22 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -80,7 +80,7 @@ struct SpellCallbackInfo; #define SC_PD_BREAK_V 32 -// --------------------------------------------------------------------------- + // predefines namespace sdr { namespace overlay { class OverlayObjectList; }} diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx index 66806dee5552..beee811022b3 100644 --- a/sc/source/ui/inc/groupdlg.hxx +++ b/sc/source/ui/inc/groupdlg.hxx @@ -25,7 +25,7 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> -//------------------------------------------------------------------------ + class ScGroupDlg : public ModalDialog { diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index cd8335b9658e..8418d756e6d6 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -27,7 +27,7 @@ #include "sc.hrc" -//================================================================== + class ScHFEditDlg : public SfxTabDialog { diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 1927159bfed4..cc113c2dd837 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -48,7 +48,7 @@ class ScDocument; #define FLT_DATE_SAVE 5 #endif -//================================================================== + class ScHighlightChgDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx index 62680fb2964e..40775b9b7fd2 100644 --- a/sc/source/ui/inc/hiranges.hxx +++ b/sc/source/ui/inc/hiranges.hxx @@ -24,7 +24,7 @@ #include "global.hxx" #include "address.hxx" -//================================================================== + struct ScHighlightEntry { diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx index 668e0db0dae9..883dd0078682 100644 --- a/sc/source/ui/inc/imoptdlg.hxx +++ b/sc/source/ui/inc/imoptdlg.hxx @@ -29,7 +29,7 @@ #include "scdllapi.h" #include "global.hxx" -//=================================================================== + class SC_DLLPUBLIC ScImportOptions { diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 10f1f0a01041..a70fb223897c 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -49,9 +49,9 @@ class CommandEvent; struct ESelection; -//======================================================================== + // ScInputHandler -//======================================================================== + class ScInputHandler : boost::noncopyable { @@ -262,9 +262,9 @@ public: static void SetAutoComplete(bool bSet) { bAutoComplete = bSet; } }; -//======================================================================== + // ScInputHdlState -//======================================================================== + class ScInputHdlState { friend class ScInputHandler; diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 4b88ede4bab6..104c03c1bcd6 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -40,7 +40,7 @@ class ScRangeList; class ScTabViewShell; class Accelerator; -//======================================================================== + class ScTextWndBase : public Window { @@ -130,7 +130,7 @@ private: ScTabViewShell* mpViewShell; }; -//======================================================================== + class ScPosWnd : public ComboBox, public SfxListener // Display position { @@ -164,7 +164,7 @@ private: void ReleaseFocus_Impl(); }; -//======================================================================== + class ScInputBarGroup; class ScMultiTextWnd : public ScTextWnd @@ -304,7 +304,7 @@ private: bool mbIsMultiLine; }; -//================================================================== + class ScInputWindowWrapper : public SfxChildWindow { diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index 008206df3f15..7e44c86a5dc9 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.hxx @@ -27,7 +27,7 @@ #include "global.hxx" -//------------------------------------------------------------------------ + class ScInsertCellDlg : public ModalDialog { diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 02402c40db34..cc508f7ec6b8 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -25,7 +25,7 @@ #include <vcl/fixed.hxx> #include "global.hxx" -//------------------------------------------------------------------------ + #include "scui_def.hxx" class ScInsertContentsDlg : public ModalDialog diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 754b03b304d2..6c9791f9305a 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -39,7 +39,7 @@ class ScDocShell; namespace sfx2 { class DocumentInserter; } namespace sfx2 { class FileDialogHelper; } -//------------------------------------------------------------------------ + class ScInsertTableDlg : public ModalDialog { diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index d2c093df81ab..260ff9fbbe31 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -29,7 +29,7 @@ #include <vcl/dialog.hxx> -//------------------------------------------------------------------------ + class ScSelEntryDlg : public ModalDialog { diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 2bf86f07a0ce..17dd3d78a55a 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -34,7 +34,7 @@ namespace sfx2 { class FileDialogHelper; } class ScDocShell; -//------------------------------------------------------------------------ + class ScLinkedAreaDlg : public ModalDialog { diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 960656a0ff0b..982b1f6ee330 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -31,11 +31,11 @@ #include "uiitems.hxx" -//------------------------------------------------------------------------ + class ScDocumentPool; -//------------------------------------------------------------------------ + class ScMessagePool: public SfxItemPool { diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index d49780e74155..448c77345069 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -26,7 +26,7 @@ #include <vcl/fixed.hxx> -//------------------------------------------------------------------------ + class ScMetricInputDlg : public ModalDialog { diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 1bbc2826ff19..1f0d729c8c8f 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -28,7 +28,7 @@ #include <vcl/fixed.hxx> #include <vcl/edit.hxx> -//------------------------------------------------------------------------ + class ScMoveTableDlg : public ModalDialog { @@ -76,7 +76,7 @@ private: bool bRenameTable:1; bool mbEverEdited:1; - //-------------------------------------- + void Init (); void InitBtnRename (); void InitDocListBox (); diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 266133fe703a..93a204bf2648 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -40,7 +40,7 @@ class ScViewData; class ScDocument; -//================================================================== + //logic behind the manage names dialog class ScNameDlg : public ScAnyRefDlg diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx index f97782eb2b0f..ae855327f5eb 100644 --- a/sc/source/ui/inc/navcitem.hxx +++ b/sc/source/ui/inc/navcitem.hxx @@ -24,7 +24,7 @@ #include <sfx2/ctrlitem.hxx> -//================================================================== + class ScNavigatorDlg; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 43135b09fba1..05b0a236bce0 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -41,7 +41,7 @@ class ScNavigatorDialogWrapper; class ScNavigatorDlg; class ScNavigatorSettings; -//======================================================================== + #define SC_DROPMODE_URL 0 #define SC_DROPMODE_LINK 1 @@ -53,9 +53,9 @@ enum NavListMode { NAV_LMODE_NONE = 0x4000, NAV_LMODE_DOCS = 0x800, NAV_LMODE_SCENARIOS = 0x400 }; -//======================================================================== + // class ScScenarioListBox ----------------------------------------------- -//======================================================================== + class ScScenarioListBox : public ListBox { @@ -94,9 +94,9 @@ private: ScenarioList maEntries; }; -//======================================================================== + // class ScScenarioWindow ------------------------------------------------ -//======================================================================== + class ScScenarioWindow : public Window { public: @@ -118,9 +118,9 @@ private: MultiLineEdit aEdComment; }; -//================================================================== + // class ColumnEdit -//================================================================== + class ColumnEdit : public SpinField { public: @@ -151,9 +151,9 @@ private: }; -//================================================================== + // class RowEdit -//================================================================== + class RowEdit : public NumericField { public: @@ -174,9 +174,9 @@ private: }; -//================================================================== + // class ScDocListBox -//================================================================== + class ScDocListBox : public ListBox { public: @@ -191,9 +191,9 @@ private: }; -//================================================================== + // class CommandToolBox -//================================================================== + class CommandToolBox : public ToolBox { public: @@ -216,9 +216,9 @@ private: ScNavigatorDlg& rDlg; }; -//================================================================== + // class ScNavigatorDlg -//================================================================== + class ScNavigatorDlg : public Window, public SfxListener { @@ -334,7 +334,7 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ); }; -//================================================================== + class ScNavigatorDialogWrapper: public SfxChildWindowContext { diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx index 17edeac72e65..fd66ba03966a 100644 --- a/sc/source/ui/inc/olinefun.hxx +++ b/sc/source/ui/inc/olinefun.hxx @@ -26,7 +26,7 @@ class ScDocShell; class ScRange; -// --------------------------------------------------------------------------- + class ScOutlineDocFunc { diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index 92ff757d4a2f..f3cfe8f4dd88 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -26,12 +26,12 @@ class ScOutlineEntry; class ScOutlineArray; -// ============================================================================ + enum ScOutlineMode { SC_OUTLINE_HOR, SC_OUTLINE_VER }; -// ---------------------------------------------------------------------------- + /** The window left of or above the spreadsheet containing the outline groups and controls to expand/collapse them. */ @@ -229,7 +229,7 @@ public: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index a41c2ba06ea7..34d4f83eb0d0 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -34,7 +34,7 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } -//============================================================================ + class ScCursorRefEdit : public formula::RefEdit { diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 890a2a2aa467..915f23a74900 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -50,12 +50,12 @@ class FmFormView; class ScFieldEditEngine; class SdrPaintWindow; -// --------------------------------------------------------------------------- + #define SC_SCENARIO_HSPACE 60 #define SC_SCENARIO_VSPACE 50 -// --------------------------------------------------------------------------- + enum ScOutputType { OUTTYPE_WINDOW, OUTTYPE_PRINTER }; diff --git a/sc/source/ui/inc/pagedata.hxx b/sc/source/ui/inc/pagedata.hxx index fc31e6ea1686..8ed128d1baf8 100644 --- a/sc/source/ui/inc/pagedata.hxx +++ b/sc/source/ui/inc/pagedata.hxx @@ -23,7 +23,7 @@ #include "global.hxx" #include "address.hxx" -//============================================================================ + class ScPrintRangeData { diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index cf4ef4e27543..649f3a53b1db 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -30,14 +30,14 @@ #include "address.hxx" #include "queryparam.hxx" -//------------------------------------------------------------------ + class ScViewData; class ScDocument; class ScQueryItem; class ScTypedStrData; -//================================================================== + class ScPivotFilterDlg : public ModalDialog { @@ -50,21 +50,21 @@ public: private: FixedLine aFlCriteria; - //---------------------------- + ListBox aLbField1; ListBox aLbCond1; ComboBox aEdVal1; - //---------------------------- + ListBox aLbConnect1; ListBox aLbField2; ListBox aLbCond2; ComboBox aEdVal2; - //---------------------------- + ListBox aLbConnect2; ListBox aLbField3; ListBox aLbCond3; ComboBox aEdVal3; - //---------------------------- + FixedText aFtConnect; FixedText aFtField; FixedText aFtCond; diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index af476e3e3c90..524da0bef6f0 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -36,7 +36,7 @@ struct ScHeaderFieldData; class ScPreviewLocationData; class CommandEvent; -//================================================================== + class ScPreviewShell: public SfxViewShell diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index f1de479b2f8a..6bdf14b76154 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -40,13 +40,13 @@ #include <boost/scoped_ptr.hpp> #include <boost/unordered_map.hpp> -// ============================================================================ + typedef sfx::ListBoxWrapper< sal_Int32 > ScDPListBoxWrapper; class ScDPObject; -// ============================================================================ + class ScDPFunctionListBox : public ListBox { @@ -60,7 +60,7 @@ private: void FillFunctionNames(); }; -// ============================================================================ + class ScDPFunctionDlg : public ModalDialog { @@ -103,7 +103,7 @@ private: bool mbEmptyItem; /// true = Empty base item in listbox. }; -// ============================================================================ + class ScDPSubtotalDlg : public ModalDialog { @@ -140,7 +140,7 @@ private: bool mbEnableLayout; /// true = Enable Layout mode controls. }; -// ============================================================================ + class ScDPSubtotalOptDlg : public ModalDialog { @@ -194,7 +194,7 @@ private: NameMapType maDataFieldNameMap; /// Cache for displayed name to field name mapping. }; -// ============================================================================ + class ScDPShowDetailDlg : public ModalDialog { @@ -225,7 +225,7 @@ private: ScDPObject& mrDPObj; }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index 6619fa2adb19..b3849219c814 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -35,7 +35,7 @@ SFX_DECL_CHILDWINDOW_WITHID(Class); \ }; -//================================================================== + DECL_WRAPPER_WITHID(ScNameDlgWrapper) DECL_WRAPPER_WITHID(ScNameDefDlgWrapper) @@ -165,7 +165,7 @@ public: void Show( sal_uInt16 nFlags ){ if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); } }; -//================================================================== + #endif // SC_REFFACT_HXX diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 90c4863ca87b..72cd2e979ec7 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -121,7 +121,7 @@ private: ScPasswordHash meDesiredHash; }; -// ============================================================================ + class ScRetypePassInputDlg : public ModalDialog { diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx index 5ebeff1d0019..066daa363985 100644 --- a/sc/source/ui/inc/rfindlst.hxx +++ b/sc/source/ui/inc/rfindlst.hxx @@ -24,7 +24,7 @@ #include "global.hxx" #include "address.hxx" -//================================================================== + struct ScRangeFindData { diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index b075cf01ddf3..4d7f63e4b541 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -28,7 +28,7 @@ #include <svtools/svmedit.hxx> #include <svtools/ctrlbox.hxx> -//=================================================================== + class ScNewScenarioDlg : public ModalDialog { diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 514bec86a37a..139108376f8e 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef SCUI_ASCIIOPT_HXX #define SCUI_ASCIIOPT_HXX @@ -26,7 +26,7 @@ #include "asciiopt.hxx" #include "svx/langbox.hxx" -// ============================================================================ + class ScImportAsciiDlg : public ModalDialog { diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index fb016b233785..c3da04ee885e 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -57,7 +57,7 @@ private: OUString aStrDelMsg; OUString aStrRename; - //------------------------ + ScAutoFormat* pFormat; const ScAutoFormatData* pSelFmtData; sal_uInt16 nIndex; @@ -66,7 +66,7 @@ private: void Init (); void UpdateChecks (); - //------------------------ + DECL_LINK( CheckHdl, Button * ); DECL_LINK( AddHdl, void * ); DECL_LINK( RemoveHdl, void * ); diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 281c851ae1fb..721dc0fe80aa 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -23,7 +23,7 @@ #include <vcl/layout.hxx> #include "imoptdlg.hxx" -//=================================================================== + class ScDelimiterTable; diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 46f2e3eaf248..bf1b3aac6dc4 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -23,7 +23,7 @@ #include "tphfedit.hxx" //#include <boost/graph/graph_concepts.hpp> -//=================================================================== + enum ScHFEntryId { eNoneEntry , @@ -103,7 +103,7 @@ private: DECL_LINK( MenuHdl, ScExtIButton* ); }; -//=================================================================== + class ScRightHeaderEditPage : public ScHFEditPage { @@ -114,7 +114,7 @@ private: ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); }; -//=================================================================== + class ScLeftHeaderEditPage : public ScHFEditPage { @@ -125,7 +125,7 @@ private: ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); }; -//=================================================================== + class ScRightFooterEditPage : public ScHFEditPage { @@ -136,7 +136,7 @@ private: ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet ); }; -//=================================================================== + class ScLeftFooterEditPage : public ScHFEditPage { diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index 355e1cafb7f5..5c472044ea15 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -24,7 +24,7 @@ #include "viewdata.hxx" -// --------------------------------------------------------------------------- + class ScTabView; class ScViewData; @@ -78,7 +78,7 @@ public: }; -// --------------------------------------------------------------------------- + class ScHeaderFunctionSet : public FunctionSet // Column / row headers diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx index 1a6fcc756ecf..25a2fe0abdc8 100644 --- a/sc/source/ui/inc/selectionstate.hxx +++ b/sc/source/ui/inc/selectionstate.hxx @@ -23,7 +23,7 @@ #include <editeng/editdata.hxx> #include "rangelst.hxx" -// ============================================================================ + /** Enumerates all possible types of selections in a Calc document. */ enum ScSelectionType @@ -35,7 +35,7 @@ enum ScSelectionType SC_SELECTTYPE_EDITDRAW /// Edit mode in drawing object (with or without selection). }; -// ---------------------------------------------------------------------------- + class ScViewData; @@ -65,7 +65,7 @@ private: bool operator==( const ScSelectionState& rL, const ScSelectionState& rR ); inline bool operator!=( const ScSelectionState& rL, const ScSelectionState& rR ) { return !(rL == rR); } -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index bd76d8ebae02..bfc93121df91 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -29,9 +29,9 @@ class ScViewData; class ScDocShell; -//============================================================================= + // class ScShareDocumentDlg -//============================================================================= + class ScShareDocumentDlg : public ModalDialog { diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index c7a12d3fe07b..ce4994b48847 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -25,7 +25,7 @@ #include <vcl/layout.hxx> #include <vcl/lstbox.hxx> -//------------------------------------------------------------------------ + class ScShowTabDlg : public ModalDialog { diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 45074f973556..1ce82043adf1 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -34,7 +34,7 @@ class ScViewData; class ScDocument; -//============================================================================ + class ScSimpleRefDlg: public ScAnyRefDlg { diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index cb23af64d664..fcd5f2d0c654 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -28,7 +28,7 @@ #include <vcl/fixed.hxx> #include <vcl/group.hxx> -//---------------------------------------------------------------------------- + enum ScSolverErr { @@ -39,7 +39,7 @@ enum ScSolverErr }; -//============================================================================ + class ScSolverDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index 849ee46e9b69..a775b791c4d4 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -23,7 +23,7 @@ #include <svtools/stdctrl.hxx> #include <svx/langbox.hxx> -// ======================================================================= + struct ScSortKeyItem : public VclBuilderContainer { @@ -43,7 +43,7 @@ struct ScSortKeyItem : public VclBuilderContainer typedef boost::ptr_vector<ScSortKeyItem> ScSortKeyItems; -// ======================================================================= + class ScSortKeyWindow { @@ -63,7 +63,7 @@ public: sal_Int32 GetTotalHeight() const { return m_pBox->GetSizePixel().Height(); } }; -// ======================================================================= + class ScSortKeyCtrl { diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index 4eaf6566f877..0023d354283d 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.hxx @@ -23,7 +23,7 @@ #include <memory> #include <svx/SpellDialogChildWindow.hxx> -// ============================================================================ + class ScConversionEngineBase; class ScSelectionState; @@ -92,7 +92,7 @@ private: bool mbOldIdleEnabled; }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index e62c2288eb62..fa190bad5bff 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -28,7 +28,7 @@ class ScDocShell; class ScDocument; class SfxItemPool; -// ============================================================================ + /** Base class for special type of edit engines, i.e. for spell checker and text conversion. */ class ScConversionEngineBase : public ScEditEngineDefaulter @@ -92,7 +92,7 @@ private: bool mbFinished; /// true = Entire document/selection finished. }; -// ============================================================================ + /** Edit engine for spell checking. */ class ScSpellingEngine : public ScConversionEngineBase @@ -128,7 +128,7 @@ private: Window* GetDialogParent(); }; -// ============================================================================ + /** Edit engine for text conversion. */ class ScTextConversionEngine : public ScConversionEngineBase @@ -155,7 +155,7 @@ private: ScConversionParam maConvParam; /// Conversion parameters. }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx index 4b62732c94e3..3a11bfac1374 100644 --- a/sc/source/ui/inc/spellparam.hxx +++ b/sc/source/ui/inc/spellparam.hxx @@ -21,7 +21,7 @@ #include <vcl/font.hxx> -// ============================================================================ + /** Specifiers for sheet conversion (functions iterating over the sheet and modifying cells). */ enum ScConversionType @@ -31,7 +31,7 @@ enum ScConversionType SC_CONVERSION_CHINESE_TRANSL /// Chinese simplified/traditional converter. }; -// --------------------------------------------------------------------------- + /** Parameters for conversion. */ class ScConversionParam @@ -73,7 +73,7 @@ private: bool mbIsInteractive; /// True = Text conversion has (specific) dialog that may be raised. }; -// ============================================================================ + #endif diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index 5201fecee35e..f16bfd8649c9 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -22,7 +22,7 @@ #include <sfx2/styledlg.hxx> -//================================================================== + class SfxStyleSheetBase; diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 1a387c8b960c..61efeddfc702 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -24,7 +24,7 @@ #include "scui_def.hxx" -//================================================================== + class ScSubTotalDlg : public SfxTabDialog { diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index fb8330f38b4e..bf363ff009da 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -25,7 +25,7 @@ #include <vcl/button.hxx> #include <svx/SvxColorValueSet.hxx> -//------------------------------------------------------------------------ + class ScTabBgColorDlg : public ModalDialog { diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index e784dcff1eff..06fc4042e575 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -27,7 +27,7 @@ class ScViewData; -// --------------------------------------------------------------------------- + // initial size #define SC_TABBAR_DEFWIDTH 270 diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 8d87cfb27c08..db1fcd58a216 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -27,7 +27,7 @@ #include "anyrefdg.hxx" -//------------------------------------------------------------------------ + enum ScTabOpErr { @@ -40,7 +40,7 @@ enum ScTabOpErr TABOPERR_NOROWFORMULA }; -//======================================================================== + class ScTabOpDlg : public ScAnyRefDlg { diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 4e954d098299..08ce230f2bc4 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -24,7 +24,7 @@ #include <svtools/stdctrl.hxx> #include <sfx2/tabdlg.hxx> -//======================================================================== + class ScTabPageProtection : public SfxTabPage { diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index c188d1a130ae..c05baefffdde 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -60,7 +60,7 @@ namespace chart2 { namespace data { #define SC_FORCEMODE_NONE 0xff -// --------------------------------------------------------------------------- + // Help - Window class ScCornerButton : public Window @@ -82,7 +82,7 @@ public: }; -// --------------------------------------------------------------------------- + class ScTabView : boost::noncopyable { diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index b4b6b682f28f..5fdc286087f1 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -89,7 +89,7 @@ enum ObjectSelectionType OST_Media }; -//================================================================== + class ScTabViewShell: public SfxViewShell, public ScDBFunc @@ -421,7 +421,7 @@ public: void SetForceFocusOnCurCell(bool bFlag) { bForceFocusOnCurCell=bFlag; } }; -//================================================================== + #endif diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 645d98fb0405..886dde6bac05 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -28,7 +28,7 @@ #include <svtools/stdctrl.hxx> #include "editfield.hxx" -//=================================================================== + class ScDocOptions; @@ -75,7 +75,7 @@ private: private: void Init(); - //------------------------------------ + // Handler: DECL_LINK( RadioClickHdl, RadioButton* ); DECL_LINK( CheckClickHdl, CheckBox* ); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 63b068a2fda8..d87eb644df49 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -24,7 +24,7 @@ class ScStyleDlg; -//======================================================================== + class ScHFPage : public SvxHFPage { @@ -62,7 +62,7 @@ private: #endif }; -//======================================================================== + class ScHeaderPage : public ScHFPage { @@ -74,7 +74,7 @@ private: ScHeaderPage( Window* pParent, const SfxItemSet& rSet ); }; -//======================================================================== + class ScFooterPage : public ScHFPage { diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index c4e523c4eb1c..64517b0e5e92 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <cppuhelper/weakref.hxx> -//=================================================================== + class ScHeaderEditEngine; class ScPatternAttr; @@ -98,7 +98,7 @@ private: Link aObjectSelectLink; }; -//=================================================================== + class SC_DLLPUBLIC ScExtIButton : public ImageButton { private: diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 60a0126fd987..ca9a42fc536f 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -23,7 +23,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> -//=================================================================== + class ScTpPrintOptions : public SfxTabPage { diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index cf8412659322..ec3ed8c67629 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -35,7 +35,7 @@ #include "address.hxx" #include "sortparam.hxx" -//------------------------------------------------------------------------ + // +1 because one field is reserved for the "- undefined -" entry #define SC_MAXFIELDS MAXCOLCOUNT+1 @@ -44,7 +44,7 @@ class ScViewData; class ScSortDlg; struct ScSortParam; -//======================================================================== + // Sort Criteria class ScTabPageSortFields : public SfxTabPage @@ -100,7 +100,7 @@ private: DECL_LINK( SelectHdl, ListBox * ); }; -//======================================================================== + // Sort Options class ScDocument; diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 081399a368f4..50b83e56e115 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -27,7 +27,7 @@ -//======================================================================== + class ScDocStatPage: public SfxTabPage { diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index a7ebe1f0cb89..fdc093ca2b7a 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -25,7 +25,7 @@ #include <vcl/fixed.hxx> #include "global.hxx" -//------------------------------------------------------------------------ + // +1 because one field is reserved for the "- none -" entry #define SC_MAXFIELDS MAXCOLCOUNT+1 @@ -34,7 +34,7 @@ class ScViewData; class ScDocument; struct ScSubTotalParam; -//======================================================================== + class ScTpSubTotalGroup : public SfxTabPage { @@ -76,7 +76,7 @@ private: DECL_LINK( CheckHdl, ListBox * ); }; -//------------------------------------------------------------------------ + class ScTpSubTotalGroup1 : public ScTpSubTotalGroup { @@ -93,7 +93,7 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ); }; -//------------------------------------------------------------------------ + class ScTpSubTotalGroup2 : public ScTpSubTotalGroup { @@ -110,7 +110,7 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ); }; -//------------------------------------------------------------------------ + class ScTpSubTotalGroup3 : public ScTpSubTotalGroup { @@ -127,7 +127,7 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ); }; -//======================================================================== + class ScTpSubTotalOptions : public SfxTabPage { diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 827acf03ac4d..bb064000a5e2 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -69,7 +69,7 @@ private: NumericField* m_pEdScalePageNum; private: - //------------------------------------ + // Handler: DECL_LINK(PageDirHdl, void *); DECL_LINK( PageNoHdl, CheckBox* ); diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index bfb77da2f9c7..0879cd0a1dcf 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -25,7 +25,7 @@ #include <vcl/lstbox.hxx> #include <vcl/vclmedit.hxx> -//======================================================================== + class ScUserList; class ScDocument; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 2b99c09d6637..547864673588 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -27,11 +27,11 @@ #include <svtools/ctrlbox.hxx> #include <svx/strarray.hxx> -//======================================================================== + class ScViewOptions; -//======================================================================== + class ScTpContentOptions : public SfxTabPage { @@ -85,7 +85,7 @@ public: }; -//======================================================================== + class ScDocument; class ScTpLayoutOptions : public SfxTabPage @@ -135,7 +135,7 @@ public: void SetDocument(ScDocument* pPtr){pDoc = pPtr;} }; -//======================================================================== + #endif // SC_TPUSRLST_HXX diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 8e6299917ffc..19a045cd787d 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -40,7 +40,7 @@ class ScViewData; class ScDPSaveData; struct ScQueryParam; -// --------------------------------------------------------------------------- + // Items @@ -146,7 +146,7 @@ public: sal_uInt16 GetIndex() const { return nIndex; } }; -//---------------------------------------------------------------------------- + // Parameter item for the sort dialog: class SC_DLLPUBLIC ScSortItem : public SfxPoolItem @@ -174,7 +174,7 @@ private: ScSortParam theSortData; }; -//---------------------------------------------------------------------------- + class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem { @@ -205,7 +205,7 @@ private: bool bIsAdvanced; }; -//---------------------------------------------------------------------------- + class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem { @@ -232,7 +232,7 @@ private: ScSubTotalParam theSubTotalData; }; -//---------------------------------------------------------------------------- + class SC_DLLPUBLIC ScUserListItem : public SfxPoolItem { @@ -253,7 +253,7 @@ private: ScUserList* pUserList; }; -//---------------------------------------------------------------------------- + class ScConsolidateItem : public SfxPoolItem { @@ -274,7 +274,7 @@ private: ScConsolidateParam theConsData; }; -//---------------------------------------------------------------------------- + class ScPivotItem : public SfxPoolItem { @@ -299,7 +299,7 @@ private: bool bNewSheet; }; -//---------------------------------------------------------------------------- + class ScSolveItem : public SfxPoolItem { @@ -320,7 +320,7 @@ private: ScSolveParam theSolveData; }; -//---------------------------------------------------------------------------- + class ScTabOpItem : public SfxPoolItem { diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 87d602825362..b04784928643 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -31,7 +31,7 @@ class SdrUndoAction; class ScRefUndoData; class ScDBData; -//---------------------------------------------------------------------------- + class ScSimpleUndo: public SfxUndoAction { @@ -63,7 +63,7 @@ protected: static void ShowTable( const ScRange& rRange ); }; -//---------------------------------------------------------------------------- + enum ScBlockUndoMode { SC_UNDO_SIMPLE, SC_UNDO_MANUALHEIGHT, SC_UNDO_AUTOHEIGHT }; @@ -110,7 +110,7 @@ protected: void ShowBlock(); }; -//---------------------------------------------------------------------------- + // for functions that act on a database range - takes care of the unnamed database range // (collected separately, before the undo action, for showing dialogs etc.) @@ -135,7 +135,7 @@ public: void EndRedo(); }; -//---------------------------------------------------------------------------- + enum ScMoveUndoMode { SC_UNDO_REFFIRST, SC_UNDO_REFLAST }; @@ -163,7 +163,7 @@ private: void UndoRef(); }; -//---------------------------------------------------------------------------- + class ScUndoWrapper: public SfxUndoAction // for manual merging of actions { diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index e2cb6f6b7f6a..520e2f974696 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -41,7 +41,7 @@ class SvxSearchItem; class SdrUndoAction; class ScEditDataArray; -//---------------------------------------------------------------------------- + class ScUndoInsertCells: public ScMoveUndo { diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 6bda9c7b8c88..199eae3fd021 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -254,7 +254,7 @@ private: void SetChangeTrack( const ScCellValue& rOldCell ); }; -// ============================================================================ + /** Undo action for inserting, removing, and replacing a cell note. */ class ScUndoReplaceNote : public ScSimpleUndo @@ -298,7 +298,7 @@ private: SdrUndoAction* mpDrawUndo; }; -// ============================================================================ + /** Undo action for showing or hiding a cell note caption. */ class ScUndoShowHideNote : public ScSimpleUndo @@ -320,7 +320,7 @@ private: bool mbShown; }; -// ============================================================================ + class ScUndoDetective: public ScSimpleUndo { diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index feb658d1187e..20c6ba836b0e 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -40,7 +40,7 @@ class ScDPObject; class SdrUndoAction; class ScMarkData; -//---------------------------------------------------------------------------- + class ScUndoDoOutline: public ScSimpleUndo { diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index 49e1ab654a44..34d00c043a51 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -26,7 +26,7 @@ class ScDocShell; class SfxStyleSheetBase; -//---------------------------------------------------------------------------- + class ScStyleSaveData { diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index b0276ca67ce5..e24f0d94e66a 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -42,7 +42,7 @@ class ScDocProtection; class ScTableProtection; class ScMarkData; -//---------------------------------------------------------------------------- + class ScUndoInsertTab : public ScSimpleUndo { @@ -351,7 +351,7 @@ private: void DoChange( bool bShow ) const; }; -// ============================================================================ + /** This class implements undo & redo of document protect & unprotect operations. */ @@ -378,7 +378,7 @@ private: void DoProtect(bool bProtect); }; -// ============================================================================ + /** This class implements undo & redo of both protect and unprotect of sheet. */ diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index e6a0a04654f0..9bc029af93ed 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -30,7 +30,7 @@ #include "anyrefdg.hxx" -// ============================================================================ + struct ScRefHandlerCaller{ virtual ~ScRefHandlerCaller(){} @@ -176,7 +176,7 @@ public: }; -// ============================================================================ + /** The tab page "Criteria" from the Validation dialog. */ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage @@ -259,7 +259,7 @@ public: }; -//================================================================== + class ScTPValidationHelp : public SfxTabPage { @@ -283,7 +283,7 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ); }; -//================================================================== + class ScTPValidationError : public SfxTabPage { diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 87c380e7ca9a..d8eb8a2188b2 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -25,7 +25,7 @@ #include <boost/scoped_ptr.hpp> -// --------------------------------------------------------------------------- + #define SC_SMALL3DSHADOW COL_BLACK #define SC_SIZE_NONE 65535 @@ -104,7 +104,7 @@ class ScExtDocOptions; class ScViewData; class ScMarkData; -//-------------------------------------------------------------------------- + class ScViewDataTable // per-sheet data { @@ -154,7 +154,7 @@ public: ~ScViewDataTable(); }; -// --------------------------------------------------------------------------- + class SC_DLLPUBLIC ScViewData { @@ -501,7 +501,7 @@ public: }; -// --------------------------------------------------------------------------- + inline long ScViewData::ToPixel( sal_uInt16 nTwips, double nFactor ) { diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 241a09cdbe56..bc9408bc7070 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -60,7 +60,7 @@ struct ColRowSpan; namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } } -//================================================================== + class ScViewFunc : public ScTabView { diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index 2218abf037b8..d06257872971 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.hxx @@ -23,7 +23,7 @@ #include <vcl/msgbox.hxx> -// ============================================================================ + /** Message box with warning image and "Do not show again" checkbox. */ class ScCbWarningBox : public WarningBox @@ -45,7 +45,7 @@ public: }; -// ---------------------------------------------------------------------------- + /** Warning box for "Replace cell contents?". */ class ScReplaceWarnBox : public ScCbWarningBox @@ -60,7 +60,7 @@ public: }; -// ============================================================================ + #endif diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 547cb9ea8b0e..83d0f488485c 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -52,7 +52,7 @@ #define RD_SPECIAL_CONTENT 1 #define RD_SPECIAL_VISCONTENT 2 -//============================================================================ + // class ScRedlinData ScRedlinData::ScRedlinData() @@ -79,7 +79,7 @@ ScRedlinData::~ScRedlinData() bIsAcceptable=false; } -//============================================================================ + // class ScAcceptChgDlg ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 7d874cce6690..2e29bea0002b 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -763,7 +763,7 @@ static void lcl_HideAllReferences() } } -//============================================================================ + //The class of ScAnyRefDlg is rewritten by PengYunQuan for Validity Cell Range Picker // class ScRefHandler @@ -947,10 +947,10 @@ bool ScRefHandler::IsTableLocked() const } -// + // RefInputStart/Done: Zoom-In (AutoHide) auf einzelnes Feld // (per Button oder Bewegung) -// + void ScRefHandler::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton ) diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 1d3bc2874a0c..6b80b79bd0f0 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -53,7 +53,7 @@ #define FRAME_OFFSET 4 -//======================================================================== + // ScAutoFmtPreview ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocument* pDoc ) : diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 9dafeb60bf32..05b1fbe61067 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -27,9 +27,9 @@ #include "dbfunc.hxx" -//============================================================================= + // struct ScConflictsListEntry -//============================================================================= + bool ScConflictsListEntry::HasSharedAction( sal_uLong nSharedAction ) const { @@ -60,9 +60,9 @@ bool ScConflictsListEntry::HasOwnAction( sal_uLong nOwnAction ) const } -//============================================================================= + // class ScConflictsListHelper -//============================================================================= + bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, sal_uLong nOwnAction ) { @@ -148,9 +148,9 @@ void ScConflictsListHelper::TransformConflictsList( ScConflictsList& rConflictsL } -//============================================================================= + // class ScConflictsFinder -//============================================================================= + ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, sal_uLong nStartShared, sal_uLong nEndShared, sal_uLong nStartOwn, sal_uLong nEndOwn, ScConflictsList& rConflictsList ) @@ -284,9 +284,9 @@ bool ScConflictsFinder::Find() return bReturn; } -//============================================================================= + // class ScConflictsResolver -//============================================================================= + ScConflictsResolver::ScConflictsResolver( ScChangeTrack* pTrack, ScConflictsList& rConflictsList ) :mpTrack ( pTrack ) @@ -380,9 +380,9 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA } } -//============================================================================= + // class ScConflictsDlg -//============================================================================= + ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ) :ModalDialog( pParent, ScResId( RID_SCDLG_CONFLICTS ) ) diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 951d8cf5945a..974063a049ab 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -29,7 +29,7 @@ #include <vcl/msgbox.hxx> -//============================================================================ + #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() #define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute() @@ -39,7 +39,7 @@ const sal_uLong nEntryDataRow = 1; const sal_uLong nEntryDataDelim = 2; -//============================================================================ + // class ScColRowNameRangesDlg @@ -668,7 +668,7 @@ bool ScColRowNameRangesDlg::IsRefInputMode() const // Handler: -// ======== + /************************************************************************* #* Handler: OkBtnHdl diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index 0f5cc7dce2a2..b26a0f87bcfe 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -31,7 +31,7 @@ static sal_uInt8 nDelItemChecked=0; -//================================================================== + ScDeleteCellDlg::ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove) : ModalDialog(pParent, "DeleteCellsDialog", "modules/scalc/ui/deletecells.ui") diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index deb5e2d58a2b..98ea97518511 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -26,7 +26,7 @@ #include "miscdlgs.hrc" -//================================================================== + bool ScDeleteContentsDlg::bPreviousAllCheck = false; sal_uInt16 ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | @@ -38,7 +38,7 @@ sal_uInt16 ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, sal_uInt16 nCheckDefaults ) : ModalDialog ( pParent, "DeleteContentsDialog", "modules/scalc/ui/deletecontents.ui" ), - // + bObjectsDisabled( false ) { get( aBtnDelAll, "deleteall" ); diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 409498d92996..72cf476ab215 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -39,7 +39,7 @@ -//============================================================================ + // class ScFillSeriesDlg diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index f5689f338bdf..2a1388b235cf 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -28,7 +28,7 @@ #include "scresid.hxx" -//================================================================== + ScGroupDlg::ScGroupDlg(Window* pParent, bool bUngroup, bool bRows) : ModalDialog(pParent, diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 58b32da9dd70..29ba0666356f 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -36,7 +36,7 @@ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D -//============================================================================ + // class ScHighlightChgDlg diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index ac7760f6bf2c..b5b59a5f2fd9 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -31,7 +31,7 @@ static sal_uInt8 nInsItemChecked=0; -//================================================================== + ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) : ModalDialog ( pParent, "InsertCellsDialog", "modules/scalc/ui/insertcells.ui") diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 3c979b539e74..08b1a163f6e4 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -29,7 +29,7 @@ #include "miscdlgs.hrc" -//================================================================== + bool ScInsertContentsDlg::bPreviousAllCheck = false; sal_uInt16 ScInsertContentsDlg::nPreviousChecks = (IDF_VALUE | IDF_DATETIME | IDF_STRING); diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index ade61782d536..5ab17d9ea542 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -41,7 +41,7 @@ #define SC_INSTBDLG_CXX #include "instbdlg.hxx" -//================================================================== + ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile ) : ModalDialog(pParent, "InsertSheetDialog", "modules/scalc/ui/insertsheet.ui") diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 71bb8561f00a..6e38b9d547ba 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -30,7 +30,7 @@ #include "scresid.hxx" #include "miscdlgs.hrc" -//================================================================== + ScSelEntryDlg::ScSelEntryDlg(Window* pParent, const std::vector<OUString> &rEntryList) : ModalDialog(pParent, "SelectRangeDialog", "modules/scalc/ui/selectrange.ui") diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 879afd4d1aae..37a814c02182 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -40,7 +40,7 @@ #include "docsh.hxx" #include "tablink.hxx" -//================================================================== + ScLinkedAreaDlg::ScLinkedAreaDlg(Window* pParent) : ModalDialog(pParent, "ExternalDataDialog", "modules/scalc/ui/externaldata.ui") diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 99bcb8ced250..0ef64464f46d 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -29,7 +29,7 @@ #include "miscdlgs.hrc" -//================================================================== + ScMetricInputDlg::ScMetricInputDlg( Window* pParent, OString sDialogName, diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 9e7bda9667ed..54453fa97321 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -34,7 +34,7 @@ #include "scresid.hxx" #include "globstr.hrc" -//================================================================== + ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault) diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index a8f50292ccca..b771e8f67eaf 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -151,7 +151,7 @@ ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bM { } -//============================================================================ + // class ScOptSolverDlg @@ -161,7 +161,7 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP : ScAnyRefDlg(pB, pCW, pParent, "SolverDialog", "modules/scalc/ui/solverdlg.ui") , maInputError(ScGlobal::GetRscString(STR_INVALIDINPUT)) , maConditionError(ScGlobal::GetRscString(STR_INVALIDCONDITION)) - // + , mpDocShell(pDocSh) , mpDoc(pDocSh->GetDocument()) , mnCurTab(aCursorPos.Tab()) diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 8079316fdc65..6f1e6b376757 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -392,7 +392,7 @@ IMPL_LINK_NOARG(ScRetypePassDlg, ScrollHdl) return 0; } -// ============================================================================ + ScRetypePassInputDlg::ScRetypePassInputDlg(Window* pParent, ScPassHashProtectable* pProtected) : ModalDialog(pParent, "RetypePasswordDialog", diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 4b1d4fa7f3c2..7186c5e02a44 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -53,7 +53,7 @@ #include "scresid.hxx" #include "document.hxx" -//======================================================================== + // AutoFormat-Dialog: ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, @@ -62,7 +62,7 @@ ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, ScDocument* pDoc ) : ModalDialog ( pParent, ScResId( RID_SCDLG_AUTOFORMAT ) ), - // + aFlFormat ( this, ScResId( FL_FORMAT ) ), aLbFormat ( this, ScResId( LB_FORMAT ) ), pWndPreview ( new ScAutoFmtPreview( this, ScResId( WND_PREVIEW ), pDoc ) ), @@ -86,7 +86,7 @@ ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, aStrDelTitle ( ScResId( STR_DEL_TITLE ) ), aStrDelMsg ( ScResId( STR_DEL_MSG ) ) , aStrRename ( ScResId( STR_RENAME_TITLE ) ), - // + pFormat ( pAutoFormat ), pSelFmtData ( pSelFormatData ), nIndex ( 0 ), diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index d845ebab89a6..5200e2f9d2b8 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -69,9 +69,9 @@ public: } }; -//============================================================================= + // class ScShareDocumentDlg -//============================================================================= + ScShareDocumentDlg::ScShareDocumentDlg( Window* pParent, ScViewData* pViewData ) : ModalDialog(pParent, "ShareDocumentDialog", "modules/scalc/ui/sharedocumentdlg.ui") diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 7a1f93d39f13..6f511c5139fa 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -31,7 +31,7 @@ #include "miscdlgs.hrc" -//================================================================== + ScShowTabDlg::ScShowTabDlg(Window* pParent) : ModalDialog(pParent, "ShowSheetDialog", "modules/scalc/ui/showsheetdialog.ui") diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index e9ab70bb22cc..07023e96f3fa 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -28,7 +28,7 @@ #include "simpref.hxx" #include "scmod.hxx" -//============================================================================ + #define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE @@ -195,7 +195,7 @@ void ScSimpleRefDlg::RefInputDone( bool bForced) } // Handler: -// ======== + IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl) { bAutoReOpen=false; diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 76ed6391f3ce..97a63b8fd083 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -39,7 +39,7 @@ using namespace com::sun::star; -//================================================================== + /// Helper for sorting properties struct ScSolverOptionsEntry diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 26000471746e..a03a2839fe5a 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -38,7 +38,7 @@ #include <boost/scoped_ptr.hpp> -//================================================================== + #define HDL(hdl) LINK(this,ScTabBgColorDlg,hdl) diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 5c74f8e76b4f..adbfbc8b1c59 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -31,7 +31,7 @@ #include "tabopdlg.hxx" -//============================================================================ + // class ScTabOpDlg diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index 606e4d113c11..acb908faacce 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -25,7 +25,7 @@ #include "sc.hrc" -// ============================================================================ + ScCbWarningBox::ScCbWarningBox( Window* pParent, const OUString& rMsgStr, bool bDefYes ) : WarningBox( pParent, WB_YES_NO | (bDefYes ? WB_DEF_YES : WB_DEF_NO), rMsgStr ) @@ -80,6 +80,6 @@ void ScReplaceWarnBox::DisableDialog() } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 1fb8a11f8412..550ed6b11dae 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -56,7 +56,7 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, , maErrInvalidNameStr(ScGlobal::GetRscString(STR_ERR_NAME_INVALID)) , maErrNameInUse(ScGlobal::GetRscString(STR_ERR_NAME_EXISTS)) , maStrMultiSelect(ScGlobal::GetRscString(STR_MULTI_SELECT)) - // + , mpViewData(ptrViewData) , mpDoc(ptrViewData->GetDocument()) , maCursorPos(aCursorPos) diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index 0bae7989c7b5..3f188c3efe3b 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -32,7 +32,7 @@ #include "viewdata.hxx" -//================================================================== + ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) : ModalDialog( pParent, "InsertNameDialog", "modules/scalc/ui/insertname.ui" ) diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index e145143b87d0..08e19e38b264 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -111,9 +111,9 @@ ScDocShell* ScContentTree::GetManualOrCurrent() return pSh; } -// + // ScContentTree -// + ScContentTree::ScContentTree( Window* pParent, const ResId& rResId ) : SvTreeListBox ( pParent, rResId ), diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index a3be41e53ba7..2f89813ded20 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -89,9 +89,9 @@ void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemStat break; case SID_CURRENTDOC: - // + // gar nix mehr, wird ueber SFX_HINT_DOCCHANGED erledigt - // + break; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 4255ee90d796..56fc3e0d201a 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -78,9 +78,9 @@ void ScNavigatorDlg::ReleaseFocus() } } -//================================================================== + // class ColumnEdit -//================================================================== + ColumnEdit::ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId ) : SpinField ( pParent, rResId ), @@ -281,9 +281,9 @@ SCCOL ColumnEdit::NumToAlpha( SCCOL nColNo, OUString& rStr ) return nColNo; } -//================================================================== + // class RowEdit -//================================================================== + RowEdit::RowEdit( ScNavigatorDlg* pParent, const ResId& rResId ) : NumericField( pParent, rResId ), @@ -337,9 +337,9 @@ void RowEdit::ExecuteRow() rDlg.SetCurrentCell( nCol-1, nRow-1 ); } -//================================================================== + // class ScDocListBox -//================================================================== + ScDocListBox::ScDocListBox( ScNavigatorDlg* pParent, const ResId& rResId ) : ListBox ( pParent, rResId ), @@ -363,9 +363,9 @@ void ScDocListBox::Select() rDlg.aLbEntries.SelectDoc( aDocName ); } -//================================================================== + // class CommandToolBox -//================================================================== + CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId ) : ToolBox ( pParent, rResId ), @@ -526,9 +526,9 @@ void CommandToolBox::DataChanged( const DataChangedEvent& rDCEvt ) ToolBox::DataChanged( rDCEvt ); } -//================================================================== + // class ScNavigatorSettings -//================================================================== + ScNavigatorSettings::ScNavigatorSettings() : maExpandedVec( SC_CONTENT_COUNT, false ), @@ -537,9 +537,9 @@ ScNavigatorSettings::ScNavigatorSettings() : { } -//================================================================== + // class ScNavigatorDlgWrapper -//================================================================== + SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR ) @@ -609,9 +609,9 @@ void ScNavigatorDialogWrapper::Resizing( Size& rSize ) ((ScNavigatorDlg*)GetWindow())->Resizing(rSize); } -//======================================================================== + // class ScNavigatorPI -//======================================================================== + #define CTRL_ITEMS 4 @@ -1309,9 +1309,9 @@ void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize ) -// + // Dokumente fuer Dropdown-Listbox -// + void ScNavigatorDlg::GetDocNames( const OUString* pManualSel ) diff --git a/sc/source/ui/navipi/navipi.src b/sc/source/ui/navipi/navipi.src index d72d00633d94..9a38df0baa86 100644 --- a/sc/source/ui/navipi/navipi.src +++ b/sc/source/ui/navipi/navipi.src @@ -147,12 +147,12 @@ Window RID_SCDLG_NAVIGATOR HelpId = HID_SC_NAVIPI_DOWN ; Text [ en-US ] = "End" ; }; - //-------------------------------------------- + // ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR; }; - //-------------------------------------------- - //---------------------------------------- + + ToolBoxItem { Type = TOOLBOXITEM_BREAK ; }; - //---------------------------------------- + ToolBoxItem { Identifier = IID_ZOOMOUT ; diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index eb88a4b375a9..5b578f0ecffe 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -31,9 +31,9 @@ #include "sc.hrc" #include "globstr.hrc" -//======================================================================== + // class ScScenarioWindow ------------------------------------------------ -//======================================================================== + ScScenarioListBox::ScScenarioListBox( ScScenarioWindow& rParent ) : ListBox( &rParent, WB_BORDER | WB_TABSTOP ), @@ -194,9 +194,9 @@ void ScScenarioListBox::DeleteScenario( bool bQueryBox ) ExecuteScenarioSlot( SID_DELETE_SCENARIO ); } -//======================================================================== + // class ScScenarioWindow ------------------------------------------------ -//======================================================================== + ScScenarioWindow::ScScenarioWindow( Window* pParent, const OUString& aQH_List, const OUString& aQH_Comment) diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 2b9dcbae11e0..5c3a4d6363e5 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -38,7 +38,7 @@ #include <math.h> -//======================================================================== + ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "OptCalculatePage", diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 731073f88ca8..e680b7fa6f47 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -47,7 +47,7 @@ static const sal_Unicode cDelimiter = ','; -//======================================================================== + // Benutzerdefinierte Listen: diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 278dfef35328..da72cedbd1f1 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -52,7 +52,7 @@ const sal_uInt16 SC_AREASDLG_RR_NONE = 0; const sal_uInt16 SC_AREASDLG_RR_USER = 1; const sal_uInt16 SC_AREASDLG_RR_OFFSET = 2; -//============================================================================ + #define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl ) @@ -91,7 +91,7 @@ static void printAddressFlags(sal_uInt16 nFlag) } #endif -//============================================================================ + // class ScPrintAreasDlg @@ -668,7 +668,7 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) } -//============================================================================ + // globale Funktionen: diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 9e04835ba7a7..a4fdbe80f641 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -47,7 +47,7 @@ ((SvxSetItem&)(set).Get(ATTR_PAGE_FOOTERSET)).GetItemSet(). \ Get(ATTR_PAGE_SHARED)).GetValue() -//================================================================== + ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, Window* pParent, diff --git a/sc/source/ui/pagedlg/pagedlg.hrc b/sc/source/ui/pagedlg/pagedlg.hrc index f9060ff5e71d..b8df46eea585 100644 --- a/sc/source/ui/pagedlg/pagedlg.hrc +++ b/sc/source/ui/pagedlg/pagedlg.hrc @@ -21,7 +21,7 @@ #include "sc.hrc" // -> RID_SCPAGE_AREAS -//================================================ + // TabPage: Tabelle #define IMG_LEFTRIGHT (SC_DIALOGS_START + 43 + 23) diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 1847642b2285..0f5c3002e019 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -56,9 +56,9 @@ static ScEditWindow* pActiveEdWnd = NULL; -//======================================================================== + // class ScHFEditPage -// + ScHFEditPage::ScHFEditPage( Window* pParent, const SfxItemSet& rCoreAttrs, @@ -840,9 +840,9 @@ IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn ) return 0; } -//======================================================================== + // class ScRightHeaderEditPage -//======================================================================== + ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, @@ -856,9 +856,9 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScRightHeaderEditPage( pParent, rCoreSet ) ); }; -//======================================================================== + // class ScLeftHeaderEditPage -//======================================================================== + ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, @@ -872,9 +872,9 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScLeftHeaderEditPage( pParent, rCoreSet ) ); }; -//======================================================================== + // class ScRightFooterEditPage -//======================================================================== + ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, @@ -888,9 +888,9 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScRightFooterEditPage( pParent, rCoreSet ) ); }; -//======================================================================== + // class ScLeftFooterEditPage -//======================================================================== + ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 3b566e527545..203102c1e4d6 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -46,9 +46,9 @@ -//================================================================== + // class ScHFPage -//================================================================== + ScHFPage::ScHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) @@ -264,9 +264,9 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl) return 0; } -//================================================================== + // class ScHeaderPage -//================================================================== + ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet ) : ScHFPage( pParent, rSet, SID_ATTR_PAGE_HEADERSET ) @@ -287,9 +287,9 @@ sal_uInt16* ScHeaderPage::GetRanges() return SvxHeaderPage::GetRanges(); } -//================================================================== + // class ScFooterPage -//================================================================== + ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet ) : ScHFPage( pParent, rSet, SID_ATTR_PAGE_FOOTERSET ) diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index 8456893d21ee..a6736a87e02f 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -55,7 +55,7 @@ ScEditWindow* GetScEditWindow () return pActiveEdWnd; } -//======================================================================== + static void lcl_GetFieldData( ScHeaderFieldData& rData ) { @@ -69,9 +69,9 @@ static void lcl_GetFieldData( ScHeaderFieldData& rData ) } } -//======================================================================== + // class ScEditWindow -//======================================================================== + ScEditWindow::ScEditWindow( Window* pParent, WinBits nBits, ScEditWindowLocation eLoc ) : Control( pParent, nBits ), diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index a00819222c89..256fd3aaccf5 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -44,12 +44,12 @@ const char UNO_ALIGNRIGHT[] = ".uno:AlignRight"; const char UNO_ALIGNTOP[] = ".uno:AlignTop"; const char UNO_ALIGNVCENTER[] = ".uno:AlignVCenter"; -////////////////////////////////////////////////////////////////////////////// + // namespace open namespace sc { namespace sidebar { -////////////////////////////////////////////////////////////////////////////// + AlignmentPropertyPanel::AlignmentPropertyPanel( Window* pParent, @@ -87,13 +87,13 @@ AlignmentPropertyPanel::AlignmentPropertyPanel( mpFtRotate->SetBackground(Wallpaper()); } -////////////////////////////////////////////////////////////////////////////// + AlignmentPropertyPanel::~AlignmentPropertyPanel() { } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::Initialize() { @@ -146,7 +146,7 @@ void AlignmentPropertyPanel::Initialize() #endif } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG ) { @@ -168,7 +168,7 @@ IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG ) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG ) { @@ -181,7 +181,7 @@ IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG ) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG ) { @@ -192,7 +192,7 @@ IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG ) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(AlignmentPropertyPanel, TbxHorAlignSelectHdl, ToolBox*, pToolBox) { @@ -232,7 +232,7 @@ IMPL_LINK(AlignmentPropertyPanel, TbxHorAlignSelectHdl, ToolBox*, pToolBox) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(AlignmentPropertyPanel, TbxVerAlignSelectHdl, ToolBox*, pToolBox) { @@ -265,7 +265,7 @@ IMPL_LINK(AlignmentPropertyPanel, TbxVerAlignSelectHdl, ToolBox*, pToolBox) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG) { @@ -277,7 +277,7 @@ IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG) return( 0L ); } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG) { @@ -296,7 +296,7 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG) { @@ -306,7 +306,7 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG) return 0; } -////////////////////////////////////////////////////////////////////////////// + AlignmentPropertyPanel* AlignmentPropertyPanel::Create ( Window* pParent, @@ -326,7 +326,7 @@ AlignmentPropertyPanel* AlignmentPropertyPanel::Create ( pBindings); } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::DataChanged( const DataChangedEvent& rEvent) @@ -334,7 +334,7 @@ void AlignmentPropertyPanel::DataChanged( (void)rEvent; } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::HandleContextChange( const ::sfx2::sidebar::EnumContext aContext) @@ -352,7 +352,7 @@ void AlignmentPropertyPanel::HandleContextChange( // todo } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, @@ -520,14 +520,14 @@ void AlignmentPropertyPanel::NotifyItemUpdate( } } -////////////////////////////////////////////////////////////////////////////// + SfxBindings* AlignmentPropertyPanel::GetBindings() { return mpBindings; } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::FormatDegrees(double& dTmp) { @@ -537,7 +537,7 @@ void AlignmentPropertyPanel::FormatDegrees(double& dTmp) dTmp = 359; } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::UpdateHorAlign() { @@ -589,7 +589,7 @@ void AlignmentPropertyPanel::UpdateHorAlign() } } -////////////////////////////////////////////////////////////////////////////// + void AlignmentPropertyPanel::UpdateVerAlign() { @@ -610,12 +610,12 @@ void AlignmentPropertyPanel::UpdateVerAlign() } } -////////////////////////////////////////////////////////////////////////////// + // namespace close }} // end of namespace ::sc::sidebar -////////////////////////////////////////////////////////////////////////////// + // eof /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index 6149faba9245..2ebc5bfc964c 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -52,7 +52,7 @@ const char UNO_SETBORDERSTYLE[] = ".uno:SetBorderStyle"; const char UNO_LINESTYLE[] = ".uno:LineStyle"; const char UNO_FRAMELINECOLOR[] = ".uno:FrameLineColor"; -////////////////////////////////////////////////////////////////////////////// + // helpers namespace @@ -63,12 +63,12 @@ namespace } } // end of anonymous namespace -////////////////////////////////////////////////////////////////////////////// + // namespace open namespace sc { namespace sidebar { -////////////////////////////////////////////////////////////////////////////// + svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateFillColorPopupControl(svx::sidebar::PopupContainer* pParent) { @@ -94,7 +94,7 @@ void CellAppearancePropertyPanel::SetFillColor( maBackColor = aColor; } -////////////////////////////////////////////////////////////////////////////// + svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateLineColorPopupControl(svx::sidebar::PopupContainer* pParent) { @@ -118,7 +118,7 @@ void CellAppearancePropertyPanel::SetLineColor( maLineColor = aColor; } -////////////////////////////////////////////////////////////////////////////// + svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent) { @@ -133,7 +133,7 @@ void CellAppearancePropertyPanel::EndCellLineStylePopupMode(void) } } -////////////////////////////////////////////////////////////////////////////// + svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent) { @@ -148,7 +148,7 @@ void CellAppearancePropertyPanel::EndCellBorderStylePopupMode(void) } } -////////////////////////////////////////////////////////////////////////////// + CellAppearancePropertyPanel::CellAppearancePropertyPanel( Window* pParent, @@ -230,13 +230,13 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel( Initialize(); } -////////////////////////////////////////////////////////////////////////////// + CellAppearancePropertyPanel::~CellAppearancePropertyPanel() { } -////////////////////////////////////////////////////////////////////////////// + void CellAppearancePropertyPanel::Initialize() { @@ -275,7 +275,7 @@ void CellAppearancePropertyPanel::Initialize() mpTBLineStyle->SetAccessibleRelationLabeledBy(mpTBLineStyle); } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(CellAppearancePropertyPanel, TbxBKColorSelectHdl, ToolBox*, pToolBox) { @@ -289,7 +289,7 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxBKColorSelectHdl, ToolBox*, pToolBox) return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(CellAppearancePropertyPanel, TbxLineColorSelectHdl, ToolBox*, pToolBox) { @@ -303,7 +303,7 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxLineColorSelectHdl, ToolBox*, pToolBox return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox) { @@ -328,7 +328,7 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBo return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox) { @@ -354,7 +354,7 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox return 0; } -////////////////////////////////////////////////////////////////////////////// + IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG) { @@ -364,7 +364,7 @@ IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG) return 0; } -////////////////////////////////////////////////////////////////////////////// + CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create ( Window* pParent, @@ -384,7 +384,7 @@ CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create ( pBindings); } -////////////////////////////////////////////////////////////////////////////// + void CellAppearancePropertyPanel::DataChanged( const DataChangedEvent& rEvent) @@ -392,7 +392,7 @@ void CellAppearancePropertyPanel::DataChanged( (void)rEvent; } -////////////////////////////////////////////////////////////////////////////// + void CellAppearancePropertyPanel::HandleContextChange( const ::sfx2::sidebar::EnumContext aContext) @@ -410,7 +410,7 @@ void CellAppearancePropertyPanel::HandleContextChange( // todo } -////////////////////////////////////////////////////////////////////////////// + void CellAppearancePropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, @@ -690,14 +690,14 @@ void CellAppearancePropertyPanel::NotifyItemUpdate( } } -////////////////////////////////////////////////////////////////////////////// + SfxBindings* CellAppearancePropertyPanel::GetBindings() { return mpBindings; } -////////////////////////////////////////////////////////////////////////////// + void CellAppearancePropertyPanel::SetStyleIcon() { @@ -828,12 +828,12 @@ void CellAppearancePropertyPanel::UpdateControlState() } } -////////////////////////////////////////////////////////////////////////////// + // namespace close }} // end of namespace ::sc::sidebar -////////////////////////////////////////////////////////////////////////////// + // eof /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src index 4542e4cb184f..838cac4ebfe0 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.src +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.src @@ -31,7 +31,7 @@ #define PB_BORDER_MOREBTN 57 #define POPUPPANEL_MARGIN_SMALL_PIXEL 8 -////////////////////////////////////////////////////////////////////////////// + Image IMG_CELL_BORDER { @@ -75,7 +75,7 @@ Image IMG_LINE_STYLE9 ImageBitmap = Bitmap{File = "sidebar/CellBorderLineStyle_750.png";}; }; -////////////////////////////////////////////////////////////////////////////// + // fill color popup Control RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR @@ -101,7 +101,7 @@ Control RID_POPUPPANEL_CELLAPPEARANCE_FILLCOLOR }; }; -////////////////////////////////////////////////////////////////////////////// + // line color popup Control RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR @@ -122,7 +122,7 @@ Control RID_POPUPPANEL_CELLAPPEARANCE_LINECOLOR }; }; -////////////////////////////////////////////////////////////////////////////// + // cell line style popup Control RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE @@ -158,7 +158,7 @@ Control RID_POPUPPANEL_APPEARANCE_CELL_LINESTYLE }; }; -////////////////////////////////////////////////////////////////////////////// + // cell border style popup Control RID_POPUPPANEL_APPEARANCE_CELL_BORDERSTYLE diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 88f3883bae6b..2d0ec3d17645 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -214,7 +214,7 @@ IMPL_LINK(CellBorderStyleControl, TB2SelectHdl, ToolBox *, pToolBox) nValidFlags |= FRM_VALID_LEFT; break; case TBI_BORDER2_RIGHT: - // + if(!Application::GetSettings().GetLayoutRTL()) { pRight = &theDefLine; diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src index 0c37902939b4..9c3c3921b4c4 100644 --- a/sc/source/ui/src/hdrcont.src +++ b/sc/source/ui/src/hdrcont.src @@ -49,16 +49,16 @@ Text [ en-US ] = "~Paste" ; \ }; - //------------------------------------------------------------------------------- + Menu RID_POPUP_ROWHEADER { ItemList = { PART1 - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_ROW_HEIGHT ; @@ -71,9 +71,9 @@ Menu RID_POPUP_ROWHEADER HelpId = CMD_FID_ROW_OPT_HEIGHT ; Text [ en-US ] = "Optimal ~Row Height..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_INS_ROW ; @@ -92,9 +92,9 @@ Menu RID_POPUP_ROWHEADER HelpId = CMD_SID_DELETE ; Text [ en-US ] = "De~lete Row Contents..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_ROW_HIDE ; @@ -107,9 +107,9 @@ Menu RID_POPUP_ROWHEADER HelpId = CMD_FID_ROW_SHOW ; Text [ en-US ] = "~Show" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + PART2 MenuItem { @@ -120,16 +120,16 @@ Menu RID_POPUP_ROWHEADER }; }; - //------------------------------------------------------------------- + Menu RID_POPUP_COLHEADER { ItemList = { PART1 - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_COL_WIDTH ; @@ -142,9 +142,9 @@ Menu RID_POPUP_COLHEADER HelpId = CMD_FID_COL_OPT_WIDTH ; Text [ en-US ] = "O~ptimal Column Width..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_INS_COLUMN ; @@ -163,9 +163,9 @@ Menu RID_POPUP_COLHEADER HelpId = CMD_SID_DELETE ; Text [ en-US ] = "D~elete Column Contents..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_COL_HIDE ; @@ -178,9 +178,9 @@ Menu RID_POPUP_COLHEADER HelpId = CMD_FID_COL_SHOW ; Text [ en-US ] = "~Show" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + PART2 MenuItem { diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src index 4a52c793d1ac..1a7d0d5380ed 100644 --- a/sc/source/ui/src/popup.src +++ b/sc/source/ui/src/popup.src @@ -38,18 +38,18 @@ Menu RID_POPUP_CELLS HelpId = CMD_SID_CELL_FORMAT_RESET ; Text [ en-US ] = "Clear ~Direct Formatting" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_CELL_FORMAT ; HelpId = CMD_FID_CELL_FORMAT ; Text [ en-US ] = "~Format Cells..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_INS_CELL ; @@ -80,9 +80,9 @@ Menu RID_POPUP_CELLS HelpId = CMD_FID_MERGE_OFF ; Text [ en-US ] = "Split Cells..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = SID_INSERT_POSTIT ; @@ -107,9 +107,9 @@ Menu RID_POPUP_CELLS HelpId = CMD_FID_HIDE_NOTE ; Text [ en-US ] = "~Hide Comment" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { @@ -168,9 +168,9 @@ Menu RID_POPUP_CELLS }; }; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = SID_DATA_SELECT ; @@ -237,9 +237,9 @@ Menu RID_POPUP_TAB HelpId = CMD_FID_TAB_EVENTS ; Text [ en-US ] = "Sheet E~vents..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_TABLE_HIDE ; @@ -252,9 +252,9 @@ Menu RID_POPUP_TAB HelpId = CMD_FID_TABLE_SHOW ; Text [ en-US ] = "~Show..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_TAB_SELECTALL ; @@ -365,9 +365,9 @@ Menu RID_POPUP_EDIT HelpId = CMD_SID_CELL_FORMAT_RESET ; Text [ en-US ] = "~Default" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem // Menu-Controller // Menu-Controller // Menu-Controller @@ -444,9 +444,9 @@ Menu RID_POPUP_EDIT }; }; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Text [ en-US ] = "Insert Fields" ; @@ -477,9 +477,9 @@ Menu RID_POPUP_EDIT { ITEM_FORMAT_CHAR_DLG }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { ITEM_OPEN_HYPERLINK @@ -550,18 +550,18 @@ Menu RID_POPUP_PAGEBREAK HelpId = CMD_SID_CELL_FORMAT_RESET ; Text [ en-US ] = "~Default" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_CELL_FORMAT ; HelpId = CMD_FID_CELL_FORMAT ; Text [ en-US ] = "~Format Cells..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_INS_ROWBRK ; @@ -586,9 +586,9 @@ Menu RID_POPUP_PAGEBREAK HelpId = CMD_FID_RESET_PRINTZOOM ; Text [ en-US ] = "Reset Scale" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = SID_DEFINE_PRINTAREA ; @@ -607,18 +607,18 @@ Menu RID_POPUP_PAGEBREAK HelpId = CMD_SID_DELETE_PRINTAREA ; Text [ en-US ] = "Undo Print Range" ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = SID_FORMATPAGE ; HelpId = CMD_SID_FORMATPAGE ; Text [ en-US ] = "Page Format..." ; }; - //------------------------------ + MenuItem { Separator = TRUE ; }; - //------------------------------ + MenuItem { Identifier = FID_SHOW_NOTE ; diff --git a/sc/source/ui/src/scerrors.src b/sc/source/ui/src/scerrors.src index 6cf19a15ec1a..593ac86bfe33 100644 --- a/sc/source/ui/src/scerrors.src +++ b/sc/source/ui/src/scerrors.src @@ -22,9 +22,9 @@ Resource RID_ERRHDLSC { - //------------------------------------------------------------ + // ERRORS ----------------------------------------------------- - //------------------------------------------------------------ + String SCERR_IMPORT_CONNECT & ERRCODE_RES_MASK { Text [ en-US ] = "Impossible to connect to the file." ; @@ -103,9 +103,9 @@ Resource RID_ERRHDLSC { Text [ en-US ] = "Cell $(ARG1) contains a string that is longer in the selected target character set \"$(ARG2)\" than the given field width." ; }; - //------------------------------------------------------------ + // WARNINGS --------------------------------------------------- - //------------------------------------------------------------ + String SCWARN_EXPORT_ASCII & ERRCODE_RES_MASK { Text [ en-US ] = "Only the active sheet was saved." ; diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src index e56680045317..42d650831c07 100644 --- a/sc/source/ui/src/scstring.src +++ b/sc/source/ui/src/scstring.src @@ -106,7 +106,7 @@ String SCSTR_AUDITSHELL Text [ en-US ] = "Detective Fill Mode" ; }; - // ----------------------------------------------------------------------- + String STR_ROWHEIGHT { diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index cfaa6b14a2f6..523adc891643 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -43,7 +43,7 @@ #include <editeng/flstitem.hxx> #include <svl/aeitem.hxx> #include <svx/flagsdef.hxx> -//================================================================== + ScStyleDlg::ScStyleDlg( Window* pParent, SfxStyleSheetBase& rStyleBase, diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index ae5b177673b4..0bea09ef8713 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -35,9 +35,9 @@ TYPEINIT1(ScUndoModifyStyle, ScSimpleUndo); TYPEINIT1(ScUndoApplyPageStyle, ScSimpleUndo); -// + // modify style (cell or page style) -// + ScStyleSaveData::ScStyleSaveData() : pItems( NULL ) @@ -231,9 +231,9 @@ bool ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const } -// + // apply page style -// + ScUndoApplyPageStyle::ApplyStyleEntry::ApplyStyleEntry( SCTAB nTab, const OUString& rOldStyle ) : mnTab( nTab ), maOldStyle( rOldStyle ) diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 46f09484211c..d921aa596d47 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -27,10 +27,10 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <cppuhelper/supportsservice.hxx> -//......................................................................... + namespace calc { -//......................................................................... + #define PROP_HANDLE_RANGE_ADDRESS 1 @@ -44,9 +44,9 @@ namespace calc using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; - //===================================================================== + //= OCellListSource - //===================================================================== + DBG_NAME( OCellListSource ) #ifdef DBG_UTIL @@ -422,8 +422,8 @@ namespace calc m_bInitialized = true; } -//......................................................................... + } // namespace calc -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 6d280c6e604e..3e8039acbfbd 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -35,14 +35,14 @@ #include <com/sun/star/util/XModifyListener.hpp> -//......................................................................... + namespace calc { -//......................................................................... - //===================================================================== + + //= OCellListSource - //===================================================================== + class OCellListSource; // the base for our interfaces typedef ::cppu::WeakAggComponentImplHelper4 < ::com::sun::star::form::binding::XListEntrySource @@ -160,9 +160,9 @@ namespace calc #endif }; -//......................................................................... + } // namespace calc -//......................................................................... + #endif // SC_CELLLISTSOURCE_HXX diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 83a68a8ad6b0..fa46980e3a18 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -5686,9 +5686,9 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe if (xPropSet.is()) lcl_CopyProperties( aImpl, *(beans::XPropertySet*)xPropSet.get() ); - // + // ausfuehren... - // + if (pDocSh) { @@ -9555,9 +9555,9 @@ void ScUniqueCellFormatsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } -// + // Fill the list of formats from the document -// + // hash code to access the range lists by ScPatternAttr pointer struct ScPatternHashCode diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index e51adc65c90f..9d4a9bb7a9ca 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -31,10 +31,10 @@ #include <com/sun/star/util/NumberFormat.hpp> #include <cppuhelper/supportsservice.hxx> -//......................................................................... + namespace calc { -//......................................................................... + #define PROP_HANDLE_BOUND_CELL 1 @@ -48,9 +48,9 @@ namespace calc using namespace ::com::sun::star::util; using namespace ::com::sun::star::form::binding; - //===================================================================== + //= OCellValueBinding - //===================================================================== + DBG_NAME( OCellValueBinding ) #ifdef DBG_UTIL @@ -635,8 +635,8 @@ namespace calc } -//......................................................................... + } // namespace calc -//......................................................................... + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 4562eb6935fe..6a77e0c0b337 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -36,14 +36,14 @@ #include <com/sun/star/lang/XInitialization.hpp> -//......................................................................... + namespace calc { -//......................................................................... - //===================================================================== + + //= OCellValueBinding - //===================================================================== + class OCellValueBinding; // the base for our interfaces typedef ::cppu::WeakAggComponentImplHelper5 < ::com::sun::star::form::binding::XValueBinding @@ -156,9 +156,9 @@ namespace calc #endif }; -//......................................................................... + } // namespace calc -//......................................................................... + #endif // SC_CELLVALUEBINDING_HXX diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 2a3873b56a16..4c2989dc4fbe 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -243,7 +243,7 @@ vector<ScTokenRef>* TokenTable::getAllRanges() const return pTokens.release(); } -// ============================================================================ + typedef std::map<sal_uInt32, FormulaToken*> FormulaTokenMap; typedef std::map<sal_uInt32, FormulaTokenMap*> FormulaTokenMapMap; @@ -830,7 +830,7 @@ void Chart2Positioner::createPositionMap() } } -// ============================================================================ + /** * Function object to create a range string from a token list. @@ -1266,7 +1266,7 @@ bool lcl_addUpperLeftCornerIfMissing(vector<ScTokenRef>& rRefTokens, } // Check if the following conditions are met: - // + // 1) The upper-left corner cell is not included. // 2) The three adjacent cells of that corner cell are included. diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index d8ff144058ef..e2794163e398 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -87,7 +87,7 @@ using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::table::CellAddress; using ::com::sun::star::table::CellRangeAddress; -// ============================================================================ + namespace { @@ -171,7 +171,7 @@ bool lclCheckMinMaxStep( const DataPilotFieldGroupInfo& rInfo ) } // namespace -// ============================================================================ + SC_SIMPLE_SERVICE_INFO( ScDataPilotDescriptor, "ScDataPilotDescriptor", "stardiv::one::sheet::DataPilotDescriptor" ) SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldObj, "ScDataPilotFieldObj", "com.sun.star.sheet.DataPilotField" ) @@ -1407,7 +1407,7 @@ void ScDataPilotTableObj::Refreshed_Impl() pDoc->AddUnoListenerCall( aModifyListeners[n], aEvent ); } -// ============================================================================ + ScDataPilotDescriptor::ScDataPilotDescriptor(ScDocShell* pDocSh) : ScDataPilotDescriptorBase( pDocSh ), @@ -1473,7 +1473,7 @@ void SAL_CALL ScDataPilotDescriptor::setTag( const OUString& aNewTag ) mpDPObject->SetTag( aNewTag ); } -// ============================================================================ + ScDataPilotChildObjBase::ScDataPilotChildObjBase( ScDataPilotDescriptorBase& rParent ) : mrParent( rParent ) @@ -1560,7 +1560,7 @@ ScDocShell* ScDataPilotChildObjBase::GetDocShell() const return mrParent.GetDocShell(); } -// ============================================================================ + ScDataPilotFieldsObj::ScDataPilotFieldsObj( ScDataPilotDescriptorBase& rParent ) : ScDataPilotChildObjBase( rParent ) @@ -2830,7 +2830,7 @@ Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup( con return xRet; } -// ============================================================================ + namespace { @@ -3049,7 +3049,7 @@ ScFieldGroups::iterator ScDataPilotFieldGroupsObj::implFindByName( const OUStrin return maGroups.end(); } -// ============================================================================ + namespace { @@ -3223,7 +3223,7 @@ void SAL_CALL ScDataPilotFieldGroupObj::setName( const OUString& rName ) throw(R maGroupName = rName; } -// ============================================================================ + ScDataPilotFieldGroupItemObj::ScDataPilotFieldGroupItemObj( ScDataPilotFieldGroupObj& rParent, const OUString& rName ) : mrParent( rParent ), @@ -3253,7 +3253,7 @@ void SAL_CALL ScDataPilotFieldGroupItemObj::setName( const OUString& rName ) thr maName = rName; } -// ============================================================================ + ScDataPilotItemsObj::ScDataPilotItemsObj( ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rFieldId ) : ScDataPilotChildObjBase( rParent, rFieldId ) diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index 078112773671..c2ac19067b0d 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -510,9 +510,9 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, ScCompiler aCompiler(pDoc,aAdr); aCompiler.SetGrammar(pDoc->GetGrammar()); - // + // find function - // + ScTokenArray aTokenArr; if ( !lcl_AddFunctionToken( aTokenArr, aName,aCompiler ) ) @@ -521,16 +521,16 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, throw container::NoSuchElementException(); } - // + // set options (null date, etc.) - // + if ( pOptions ) pDoc->SetDocOptions( *pOptions ); - // + // add arguments to token array - // + sal_Bool bArgErr = false; sal_Bool bOverflow = false; @@ -632,9 +632,9 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, aTokenArr.AddOpCode(ocClose); aTokenArr.AddOpCode(ocStop); - // + // execute formula - // + uno::Any aRet; if ( !bArgErr && !bOverflow && nDocRow <= MAXROWCOUNT ) diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 1ad67180df8a..559e538e9814 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -1470,7 +1470,7 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( return xLink; } -// ============================================================================ + ScExternalSheetCacheObj::ScExternalSheetCacheObj(ScDocShell* pDocShell, ScExternalRefCache::TableTypeRef pTable, size_t nIndex) : mpDocShell(pDocShell), @@ -1577,7 +1577,7 @@ sal_Int32 SAL_CALL ScExternalSheetCacheObj::getTokenIndex() return static_cast< sal_Int32 >( mnIndex ); } -// ============================================================================ + ScExternalDocLinkObj::ScExternalDocLinkObj(ScDocShell* pDocShell, ScExternalRefManager* pRefMgr, sal_uInt16 nFileId) : mpDocShell(pDocShell), mpRefMgr(pRefMgr), mnFileId(nFileId) @@ -1713,7 +1713,7 @@ sal_Int32 SAL_CALL ScExternalDocLinkObj::getTokenIndex() return static_cast<sal_Int32>(mnFileId); } -// ============================================================================ + ScExternalDocLinksObj::ScExternalDocLinksObj(ScDocShell* pDocShell) : mpDocShell(pDocShell), diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 13879463915f..d87a197784bd 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -85,7 +85,7 @@ const sal_Char pFilterSylk[] = "SYLK"; // 0x0100: ein Byte ueberlesen (don't care) // 0x02nn: ein Byte aus 0xnn Alternativen folgt // 0x8000: Erkennung abgeschlossen -// + #define M_DC 0x0100 #define M_ALT(ANZ) (0x0200+(ANZ)) diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index d68a162011fe..c1a979ab2f89 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -57,9 +57,9 @@ public: impl_createInstance( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ) throw (com::sun::star::uno::Exception); - //---------------------------------------------------------------------------------- + // XExtendedFilterDetect - //---------------------------------------------------------------------------------- + virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) throw (com::sun::star::uno::RuntimeException, std::exception); }; diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 651854331dae..522f02d15993 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -246,7 +246,7 @@ public: }; -// + struct ProvNamesId_Type { const char * pName; @@ -318,10 +318,10 @@ static const ProvNamesId_Type aProvNamesId[] = { "ooo.vba.VBAGlobals", SC_SERVICE_VBAGLOBALS }, }; -// + // old service names that were in 567 still work in createInstance, // in case some macro is still using them -// + static const sal_Char* aOldNames[SC_SERVICE_COUNT] = { diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 73488df18d76..4a1b148febed 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -188,7 +188,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {OUString(SC_UNO_PAGE_CENTERVER), ATTR_PAGE_VERCENTER,::getBooleanCppuType(), 0, 0 }, {OUString(SC_UNONAME_DISPNAME), SC_WID_UNO_DISPNAME,::getCppuType((OUString*)0), beans::PropertyAttribute::READONLY, 0 }, {OUString(SC_UNO_PAGE_FIRSTPAGE), ATTR_PAGE_FIRSTPAGENO,::getCppuType((const sal_Int16*)0), 0, 0 }, -// + {OUString(SC_UNO_PAGE_FTRBACKCOL), SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0), 0, 0 }, {OUString(SC_UNO_PAGE_FTRGRFFILT), SC_WID_UNO_FOOTERSET,::getCppuType((const OUString*)0), 0, 0 }, {OUString(SC_UNO_PAGE_FTRGRFLOC), SC_WID_UNO_FOOTERSET,::getCppuType((const style::GraphicLocation*)0), 0, 0 }, @@ -215,7 +215,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {OUString(OLD_UNO_PAGE_FTRSHARED), SC_WID_UNO_FOOTERSET,::getBooleanCppuType(), 0, 0 }, {OUString(SC_UNO_PAGE_FTRTOPBOR), SC_WID_UNO_FOOTERSET,::getCppuType((const table::BorderLine*)0), 0, 0 }, {OUString(SC_UNO_PAGE_FTRTOPBDIS), SC_WID_UNO_FOOTERSET,::getCppuType((const sal_Int32*)0), 0, 0 }, -// + {OUString(SC_UNO_PAGE_HDRBACKCOL), SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0), 0, 0 }, {OUString(SC_UNO_PAGE_HDRGRFFILT), SC_WID_UNO_HEADERSET,::getCppuType((const OUString*)0), 0, 0 }, {OUString(SC_UNO_PAGE_HDRGRFLOC), SC_WID_UNO_HEADERSET,::getCppuType((const style::GraphicLocation*)0), 0, 0 }, @@ -242,7 +242,7 @@ static const SfxItemPropertySet * lcl_GetPageStyleSet() {OUString(OLD_UNO_PAGE_HDRSHARED), SC_WID_UNO_HEADERSET,::getBooleanCppuType(), 0, 0 }, {OUString(SC_UNO_PAGE_HDRTOPBOR), SC_WID_UNO_HEADERSET,::getCppuType((const table::BorderLine*)0), 0, 0 }, {OUString(SC_UNO_PAGE_HDRTOPBDIS), SC_WID_UNO_HEADERSET,::getCppuType((const sal_Int32*)0), 0, 0 }, -// + {OUString(SC_UNO_PAGE_HEIGHT), ATTR_PAGE_SIZE, ::getCppuType((const sal_Int32*)0), 0, MID_SIZE_HEIGHT | CONVERT_TWIPS }, {OUString(OLD_UNO_PAGE_BACKTRANS), ATTR_BACKGROUND, ::getBooleanCppuType(), 0, MID_GRAPHIC_TRANSPARENT }, {OUString(SC_UNO_PAGE_LANDSCAPE), ATTR_PAGE, ::getBooleanCppuType(), 0, MID_PAGE_ORIENTATION }, diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index aff414231135..c348635f16f5 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -45,7 +45,7 @@ using namespace ::formula; using namespace ::com::sun::star; -// ============================================================================ + static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() { @@ -63,7 +63,7 @@ static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() SC_SIMPLE_SERVICE_INFO( ScFormulaParserObj, "ScFormulaParserObj", SC_SERVICENAME_FORMULAPARS ) -// ============================================================================ + ScFormulaParserObj::ScFormulaParserObj(ScDocShell* pDocSh) : mpDocShell( pDocSh ), @@ -284,7 +284,7 @@ uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropert SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFormulaParserObj ) -// ============================================================================ + static void lcl_ExternalRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData& rRef ) { @@ -496,7 +496,7 @@ bool ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc, return !bError; } -// ============================================================================ + SAL_WNODEPRECATED_DECLARATIONS_PUSH ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> _pCompiler) @@ -505,6 +505,6 @@ ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::Form } SAL_WNODEPRECATED_DECLARATIONS_POP -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index b18bcab97dbc..cb724e0a99d3 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -43,7 +43,7 @@ namespace ooo { namespace vba { namespace excel { -// ============================================================================ + uno::Reference< sheet::XUnnamedDatabaseRanges > GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) @@ -377,7 +377,7 @@ ScVbaCellRangeAccess::GetDataSet( ScCellRangesBase* pRangeObj ) return pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : 0; } -// ============================================================================ + } // namespace excel } // namespace vba diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 057f306df037..47301b14bc8e 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -36,7 +36,7 @@ namespace ooo { namespace vba { namespace excel { -// ============================================================================ + // nTabs empty means apply zoom to all sheets void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs ); @@ -61,7 +61,7 @@ css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const cs ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException ); void setUpDocumentModules( const css::uno::Reference< css::sheet::XSpreadsheetDocument >& xDoc ); -// ============================================================================ + class ScVbaCellRangeAccess { @@ -82,7 +82,7 @@ template < typename ImplObject > throw css::uno::RuntimeException("Internal error, can't exctract implementation object", rxWrapperIf ); return pObj; } -// ============================================================================ + } // namespace excel } // namespace vba diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx index 76dbc359e736..95d622195a73 100644 --- a/sc/source/ui/vba/service.cxx +++ b/sc/source/ui/vba/service.cxx @@ -21,9 +21,9 @@ #include "com/sun/star/registry/XRegistryKey.hpp" #include "comphelper/servicedecl.hxx" -// ============================================================================= + // component exports -// ============================================================================= + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index a9265b06c37c..01e9f4843c62 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -100,7 +100,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY; -// ============================================================================ + /** Global application settings shared by all open workbooks. */ struct ScVbaAppSettings @@ -128,7 +128,7 @@ ScVbaAppSettings::ScVbaAppSettings() : struct ScVbaStaticAppSettings : public ::rtl::Static< ScVbaAppSettings, ScVbaStaticAppSettings > {}; -// ============================================================================ + ScVbaApplication::ScVbaApplication( const uno::Reference<uno::XComponentContext >& xContext ) : ScVbaApplication_BASE( xContext ), diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 06b4a955add7..cf5d250699fa 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -33,7 +33,7 @@ using namespace ::ooo::vba::excel::XlAxisGroup; // each 'Item' in the Axes collection is indexed via 2 indexes, group and type. // We need to 'flatten' this into a single index in order to be able to wrap // iteration over the set of Axis(s) in a XIndexAccess implementation -// + typedef ::std::pair<sal_Int32, sal_Int32 > AxesCoordinate; // type and group combination typedef ::std::vector< AxesCoordinate > vecAxesIndices; diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 10f3a4bc369f..87e854df89ad 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -47,7 +47,7 @@ using namespace ::com::sun::star::script::vba::VBAEventId; using namespace ::ooo::vba; -// ============================================================================ + namespace { @@ -110,7 +110,7 @@ uno::Reference< awt::XWindow > lclGetWindowForController( const uno::Reference< } // namespace -// ============================================================================ + typedef ::cppu::WeakImplHelper4< awt::XTopWindowListener, awt::XWindowListener, frame::XBorderResizeListener, util::XChangesListener > ScVbaEventListener_BASE; @@ -511,7 +511,7 @@ IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, Window*, EMPTYARG pWind return 0; } -// ============================================================================ + ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& xContext ) : VbaEventsHelperBase( rArgs, xContext ), diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 2412a6c577d5..284eb782f250 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -27,7 +27,7 @@ class ScVbaEventListener; -// ============================================================================ + class ScVbaEventsHelper : public VbaEventsHelperBase { @@ -67,7 +67,7 @@ private: bool mbOpened; }; -// ============================================================================ + #endif diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 7ccc6f4ed363..0634dff631ef 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -253,7 +253,7 @@ ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception ) return ScVbaFont_BASE::getColorIndex(); } -////////////////////////////////////////////////////////////////////////////////////////// + void SAL_CALL ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException, std::exception ) { diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index c9b9aa61e6ba..6c2fb0520a81 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -36,9 +36,9 @@ using namespace ::ooo::vba; -// ============================================================================= + // ScVbaGlobals -// ============================================================================= + //ScVbaGlobals::ScVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext, ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext ) @@ -60,9 +60,9 @@ ScVbaGlobals::~ScVbaGlobals() OSL_TRACE("ScVbaGlobals::~ScVbaGlobals"); } -// ============================================================================= + // XGlobals -// ============================================================================= + uno::Reference<excel::XApplication > ScVbaGlobals::getApplication() throw (uno::RuntimeException) { diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index 5759bcbc4670..f6ced397a255 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -29,9 +29,9 @@ #include "excelvbahelper.hxx" #include <vbahelper/vbaglobalbase.hxx> - // ============================================================================= + // class ScVbaGlobals - // ============================================================================= + typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE; @@ -85,6 +85,6 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc virtual OUString getServiceImplName(); virtual css::uno::Sequence<OUString> getServiceNames(); }; -#endif // +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index dc204fc922d8..420c1a8123ac 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -30,7 +30,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -// ============================================================================ + ScVbaHyperlink::ScVbaHyperlink( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& rxContext ) throw (lang::IllegalArgumentException) : @@ -233,6 +233,6 @@ extern sdecl::ServiceDecl const serviceDecl( "ooo.vba.excel.Hyperlink" ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 776ed4e902fa..c5c02d516e59 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -28,7 +28,7 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; -// ============================================================================ + namespace { @@ -102,7 +102,7 @@ bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& } // namespace -// ============================================================================ + namespace detail { @@ -185,7 +185,7 @@ sal_Bool SAL_CALL ScVbaHlinkContainer::hasElements() throw (uno::RuntimeExceptio return !maHlinks.empty(); } -// ============================================================================ + ScVbaHlinkContainerMember::ScVbaHlinkContainerMember( ScVbaHlinkContainer* pContainer ) : mxContainer( pContainer ) @@ -198,7 +198,7 @@ ScVbaHlinkContainerMember::~ScVbaHlinkContainerMember() } // namespace detail -// ============================================================================ + ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext ) throw (uno::RuntimeException) : @@ -281,6 +281,6 @@ uno::Any ScVbaHyperlinks::createCollectionObject( const uno::Any& rSource ) VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaHyperlinks, "ooo.vba.excel.Hyperlinks" ) -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx index 6b471214ac3e..641dfac13a8a 100644 --- a/sc/source/ui/vba/vbahyperlinks.hxx +++ b/sc/source/ui/vba/vbahyperlinks.hxx @@ -26,7 +26,7 @@ class ScRangeList; -// ============================================================================ + namespace detail { @@ -46,7 +46,7 @@ struct ScVbaHlinkContainerMember } // namespace detail -// ============================================================================ + class ScVbaHyperlinks; typedef ::rtl::Reference< ScVbaHyperlinks > ScVbaHyperlinksRef; @@ -137,7 +137,7 @@ private: ScVbaHyperlinksRef mxSheetHlinks; }; -// ============================================================================ + #endif diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 8750d52126d0..5f1badf94afd 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -// ============================================================================ + ScVbaButtonCharacters::ScVbaButtonCharacters( const uno::Reference< XHelperInterface >& rxParent, @@ -152,7 +152,7 @@ void ScVbaButtonCharacters::setFullString( const OUString& rString ) throw (uno: mxPropSet->setPropertyValue( "Label", uno::Any( rString ) ); } -// ============================================================================ + ScVbaSheetObjectBase::ScVbaSheetObjectBase( const uno::Reference< XHelperInterface >& rxParent, @@ -291,7 +291,7 @@ void ScVbaSheetObjectBase::implSetDefaultProperties() throw (uno::RuntimeExcepti { } -// ============================================================================ + ScVbaControlObjectBase::ScVbaControlObjectBase( const uno::Reference< XHelperInterface >& rxParent, @@ -419,7 +419,7 @@ sal_Int32 ScVbaControlObjectBase::getModelIndexInForm() const throw (uno::Runtim throw uno::RuntimeException(); } -// ============================================================================ + ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& rxParent, @@ -535,6 +535,6 @@ void ScVbaButton::implSetDefaultProperties() throw (uno::RuntimeException) setCaption( getName() ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index 6861ceec15ee..462bc1b4ab64 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -31,7 +31,7 @@ namespace com { namespace sun { namespace star { namespace drawing { class XControlShape; } } } } -// ============================================================================ + typedef InheritedHelperInterfaceImpl1< ov::excel::XCharacters > ScVbaButtonCharacters_BASE; @@ -75,7 +75,7 @@ private: sal_Int32 mnLength; }; -// ============================================================================ + typedef InheritedHelperInterfaceImpl1< ov::excel::XSheetObject > ScVbaSheetObject_BASE; @@ -121,7 +121,7 @@ protected: css::uno::Reference< css::beans::XPropertySet > mxShapeProps; }; -// ============================================================================ + typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectBase, ov::excel::XControlObject > ScVbaControlObject_BASE; @@ -168,7 +168,7 @@ protected: OUString maEventMethod; }; -// ============================================================================ + typedef ::cppu::ImplInheritanceHelper1< ScVbaControlObjectBase, ov::excel::XButton > ScVbaButton_BASE; @@ -206,7 +206,7 @@ protected: virtual void implSetDefaultProperties() throw (css::uno::RuntimeException); }; -// ============================================================================ + #endif diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 50bf20727054..0ffdf3dce4a6 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -35,7 +35,7 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; -// ============================================================================ + namespace { @@ -60,9 +60,9 @@ inline double lclPointsToHmm( const uno::Any& rPoints ) throw (uno::RuntimeExcep } // namespace -// ============================================================================ + // Base implementations -// ============================================================================ + /** Container for a specific type of drawing object in a spreadsheet. @@ -239,7 +239,7 @@ void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XS { } -// ============================================================================ + class ScVbaObjectEnumeration : public SimpleEnumerationBase { @@ -264,7 +264,7 @@ uno::Any ScVbaObjectEnumeration::createCollectionObject( const uno::Any& rSource return mxContainer->createCollectionObject( rSource ); } -// ============================================================================ + ScVbaSheetObjectsBase::ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException) : ScVbaSheetObjects_BASE( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ), @@ -308,9 +308,9 @@ uno::Any ScVbaSheetObjectsBase::getItemByStringIndex( const OUString& rIndex ) t return mxContainer->getItemByStringIndex( rIndex ); } -// ============================================================================ + // Graphic object containers supporting ooo.vba.excel.XGraphicObject -// ============================================================================ + ScVbaGraphicObjectsBase::ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (uno::RuntimeException) : ScVbaGraphicObjects_BASE( rxContainer ) @@ -340,9 +340,9 @@ uno::Any SAL_CALL ScVbaGraphicObjectsBase::Add( const uno::Any& rLeft, const uno return uno::Any( uno::Reference< excel::XSheetObject >( xVbaObject.get() ) ); } -// ============================================================================ + // Drawing controls -// ============================================================================ + class ScVbaControlContainer : public ScVbaObjectContainer { @@ -455,9 +455,9 @@ void ScVbaControlContainer::implOnShapeCreated( const uno::Reference< drawing::X xControlShape->setControl( xControlModel ); } -// ============================================================================ + // Push button -// ============================================================================ + class ScVbaButtonContainer : public ScVbaControlContainer { @@ -501,7 +501,7 @@ bool ScVbaButtonContainer::implCheckProperties( const uno::Reference< beans::XPr return lclGetProperty( bToggle, rxModelProps, "Toggle" ) && !bToggle; } -// ============================================================================ + ScVbaButtons::ScVbaButtons( const uno::Reference< XHelperInterface >& rxParent, @@ -514,6 +514,6 @@ ScVbaButtons::ScVbaButtons( VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaButtons, "ooo.vba.excel.Buttons" ) -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index d0b0aca0d47e..dadfab59057b 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -30,12 +30,12 @@ namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; } } } } -// ============================================================================ + class ScVbaObjectContainer; typedef ::rtl::Reference< ScVbaObjectContainer > ScVbaObjectContainerRef; -// ============================================================================ + typedef CollTestImplHelper< ov::XCollection > ScVbaSheetObjects_BASE; @@ -65,7 +65,7 @@ protected: ScVbaObjectContainerRef mxContainer; }; -// ============================================================================ + typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectsBase, ov::excel::XGraphicObjects > ScVbaGraphicObjects_BASE; @@ -85,7 +85,7 @@ public: const css::uno::Any& rHeight ) throw (css::uno::RuntimeException, std::exception); }; -// ============================================================================ + /** Collection containing all button controls from a sheet (not ActiveX controls). */ class ScVbaButtons : public ScVbaGraphicObjectsBase @@ -100,7 +100,7 @@ public: VBAHELPER_DECL_XHELPERINTERFACE }; -// ============================================================================ + #endif diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 780c08e69f0d..bf9cc0b28d82 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -131,9 +131,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) switch ( nSlot ) { - // + // insert / delete cells / rows / columns - // + case FID_INS_ROW: pTabViewShell->InsertCells(INS_INSROWS); @@ -309,9 +309,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // + // delete contents from cells - // + case SID_DELETE_CONTENTS: pTabViewShell->DeleteContents( IDF_CONTENTS ); @@ -405,9 +405,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // + // fill... - // + case FID_FILL_TO_BOTTOM: pTabViewShell->FillSimple( FILL_TO_BOTTOM ); @@ -640,7 +640,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } - // + OUString aStartStr; // suggest default Startvalue only, when just 1 row or column @@ -985,10 +985,10 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // + // disposal (Outlines) // SID_AUTO_OUTLINE, SID_OUTLINE_DELETEALL in Execute (in docsh.idl) - // + case SID_OUTLINE_HIDE: if ( GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(), @@ -1195,9 +1195,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // + // Clipboard - // + case SID_COPY: // for graphs in DrawShell @@ -1580,9 +1580,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? break; - // + // other - // + case FID_INS_ROWBRK: pTabViewShell->InsertPageBreak( false ); @@ -2415,9 +2415,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // - // - // + + + default: OSL_FAIL("incorrect slot in ExecuteEdit"); diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 5ee73670f36b..1fddad09ab8c 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -886,7 +886,7 @@ void ScCellShell::Execute( SfxRequest& rReq ) } break; - // ---------------------------------------------------------------- + case FID_INPUTLINE_STATUS: OSL_FAIL("Execute von InputLine-Status"); diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index 415bce141e75..1700c0069341 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -32,7 +32,7 @@ // STATIC DATA ----------------------------------------------------------- -//================================================================== + static OUString lcl_MetricString( long nTwips, const OUString& rText ) { @@ -54,7 +54,7 @@ static OUString lcl_MetricString( long nTwips, const OUString& rText ) } } -//================================================================== + ScColBar::ScColBar( Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : @@ -215,7 +215,7 @@ bool ScColBar::IsLayoutRTL() const // overloaded only for columns return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); } -//================================================================== + ScRowBar::ScRowBar( Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index d2d8aad41169..09e32bb30eae 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -37,7 +37,7 @@ #include "queryentry.hxx" #include "markdata.hxx" -//================================================================== + ScDBFunc::ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScViewFunc( pParent, rDocSh, pViewShell ) @@ -48,9 +48,9 @@ ScDBFunc::~ScDBFunc() { } -// + // auxiliary functions -// + void ScDBFunc::GotoDBArea( const OUString& rDBName ) { @@ -240,9 +240,9 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std:: } } -// + // main functions -// + // Sort diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx index 58b5d93993dc..8932146f1562 100644 --- a/sc/source/ui/view/dbfunc2.cxx +++ b/sc/source/ui/view/dbfunc2.cxx @@ -24,7 +24,7 @@ #include "sc.hrc" #include "globstr.hrc" -//================================================================== + void ScDBFunc::UpdateCharts( bool bAllCharts ) { diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index fe69d7f0a0b1..0b1f41a73d65 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -87,11 +87,11 @@ using ::std::vector; // STATIC DATA ----------------------------------------------------------- -//================================================================== -// + + // Outliner -// + // Outline-Gruppierung erzeugen @@ -363,11 +363,11 @@ void ScDBFunc::HideMarkedOutlines( bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } -// -------------------------------------------------------------------------- -// + + // Teilergebnisse -// + void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, const ScSortParam* pForceNewSort ) @@ -539,9 +539,9 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, } } -// + // Consolidate -// + void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, bool bRecord ) { @@ -550,9 +550,9 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, bool bRecord ) SetTabNo( rParam.nTab, true ); } -// + // Pivot -// + static OUString lcl_MakePivotTabName( const OUString& rPrefix, SCTAB nNumber ) { @@ -2074,9 +2074,9 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet pMgr->LeaveListAction(); } -// + // DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen -// + void ScDBFunc::RepeatDB( bool bRecord ) { diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index ec6bd68e6f6f..17492f82927b 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -29,7 +29,7 @@ using namespace com::sun::star; -//================================================================== + sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAllCharts ) { diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx index 8e630933731e..de9f5c4ffd14 100644 --- a/sc/source/ui/view/drawattr.cxx +++ b/sc/source/ui/view/drawattr.cxx @@ -36,7 +36,7 @@ OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const switch (nVal) { case 0 : p = "SVX_SNAP_DRAW_SELECT" ; break; - // + case 1 : p = "SVX_SNAP_DRAW_LINE" ; break; case 2 : p = "SVX_SNAP_DRAW_RECT" ; break; case 3 : p = "SVX_SNAP_DRAW_ELLIPSE" ; break; diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 92c3c4a5cc67..ea82c505cd80 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -662,7 +662,7 @@ SdrObject* ScDrawView::GetObjectByName(const OUString& rName) } //realize multi-selection of objects -//================================================== + bool ScDrawView::SelectCurrentViewObject( const OUString& rName ) { sal_uInt16 nObjectTab = 0; diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index 9ddedd59fa09..00928e562577 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -1035,9 +1035,9 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) break; } - // + // anwenden - // + EditEngine* pEngine = pEditView->GetEditEngine(); sal_Bool bOld = pEngine->GetUpdateMode(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index d05aaa063b70..b482fd92d974 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -173,7 +173,7 @@ struct ScGridWindow::MouseEventState #define SC_FILTERLISTBOX_LINES 12 -// ============================================================================ + ScGridWindow::VisibleRange::VisibleRange() : mnCol1(0), mnCol2(MAXCOL), mnRow1(0), mnRow2(MAXROW) @@ -197,7 +197,7 @@ bool ScGridWindow::VisibleRange::set(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO return bChanged; } -// ============================================================================ + class ScFilterListBox : public ListBox { @@ -333,7 +333,7 @@ void ScFilterListBox::SelectHdl() } } -// ============================================================================ + // use a System floating window for the above filter listbox class ScFilterFloatingWindow : public FloatingWindow @@ -360,7 +360,7 @@ Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() return GetWindow(WINDOW_FIRSTCHILD) ? GetWindow(WINDOW_FIRSTCHILD)->GetPreferredKeyInputWindow() : NULL; // will be the FilterBox } -// ============================================================================ + static sal_Bool lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) { @@ -1897,9 +1897,9 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta } } - // + // scenario selection - // + ScRange aScenRange; if ( rMEvt.IsLeft() && HasScenarioButton( aPos, aScenRange ) ) @@ -1908,9 +1908,9 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta return; } - // + // Doppelklick angefangen ? - // + // StopMarking kann aus DrawMouseButtonDown gerufen werden @@ -1925,9 +1925,9 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta nMouseStatus = SC_GM_TABDOWN; } - // + // Links in Edit-Zellen - // + sal_Bool bAlt = rMEvt.IsMod2(); if ( !bAlt && rMEvt.IsLeft() && @@ -1938,9 +1938,9 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta return; } - // + // Gridwin - SelectionEngine - // + if ( rMEvt.IsLeft() ) { @@ -2159,9 +2159,9 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) if (bRefMode) pScMod->EndReference(); - // + // Giesskannen-Modus (Gestalter) - // + if (pScMod->GetIsWaterCan()) { @@ -2213,9 +2213,9 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) pView->ResetBrushDocument(); // invalidates pBrushDoc pointer } - // + // double click (only left button) - // + sal_Bool bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() ); if ( bDouble && !bRefMode && nMouseStatus == SC_GM_DBLDOWN && !pScMod->IsRefDialogOpen() ) @@ -2298,9 +2298,9 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) return; } - // + // Links in edit cells - // + sal_Bool bAlt = rMEvt.IsMod2(); if ( !bAlt && !bRefMode && !bDouble && nMouseStatus == SC_GM_URLDOWN ) @@ -2383,9 +2383,9 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } } - // + // Gridwin - SelectionEngine - // + // SelMouseButtonDown is called only for left button, but SelMouseButtonUp would return // sal_True for any call, so IsLeft must be checked here, too. @@ -5662,9 +5662,9 @@ void ScGridWindow::UpdateCursorOverlay() std::vector<Rectangle> aPixelRects; - // + // determine the cursor rectangles in pixels (moved from ScGridWindow::DrawCursor) - // + SCTAB nTab = pViewData->GetTabNo(); SCCOL nX = pViewData->GetCurX(); @@ -5839,9 +5839,9 @@ void ScGridWindow::UpdateAutoFillOverlay() DeleteAutoFillOverlay(); - // + // get the AutoFill handle rectangle in pixels - // + if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() && !pViewData->HasEditView(eWhich) && pViewData->IsActive() ) @@ -5916,9 +5916,9 @@ void ScGridWindow::UpdateDragRectOverlay() DeleteDragRectOverlay(); - // + // get the rectangles in pixels (moved from DrawDragRect) - // + if ( bDragRect || bPagebreakDrawn ) { @@ -6092,9 +6092,9 @@ void ScGridWindow::UpdateShrinkOverlay() DeleteShrinkOverlay(); - // + // get the rectangle in pixels - // + Rectangle aPixRect; ScRange aRange; diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 359cf3ae376d..ec917c96888a 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -241,9 +241,9 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent& } -// + // Data Pilot interaction -// + void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) { @@ -278,7 +278,7 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) bTimer = sal_True; } - // --- + SCsCOL nPosX; SCsROW nPosY; diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index 6fdddac99ee2..c1c48d9a29df 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -67,7 +67,7 @@ #include <boost/scoped_ptr.hpp> -//------------------------------------------------------------------------ + static void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) { @@ -387,9 +387,9 @@ void ScGridWindow::Paint( const Rectangle& rRect ) bIsInPaint = false; } -// + // Draw ---------------------------------------------------------------- -// + void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode ) { @@ -873,10 +873,10 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod if ( pNoteMarker ) pNoteMarker->Draw(); // ueber den Cursor, im Drawing-MapMode - // + // Wenn waehrend des Paint etwas invertiert wurde (Selektion geaendert aus Basic-Macro), // ist das jetzt durcheinandergekommen und es muss neu gemalt werden - // + OSL_ENSURE(nPaintCount, "nPaintCount falsch"); --nPaintCount; diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 16039fb5b57a..dcf157e05ee9 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -413,10 +413,10 @@ 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 - // + ScGridMerger aGrid( this, 1, 1 ); diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index a4d662a5c91e..7e23d925731b 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -24,7 +24,7 @@ #define HINT_INDENT 3 #define HINT_MARGIN 4 -//================================================================== + ScHintWindow::ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg ) : Window( pParent, WinBits( WB_BORDER ) ), diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx index ec0a02fb5f0d..d6c73c2d5bbe 100644 --- a/sc/source/ui/view/invmerge.cxx +++ b/sc/source/ui/view/invmerge.cxx @@ -43,9 +43,9 @@ void ScInvertMerger::Flush() if ( pRects ) { - // + // also join vertically if there are non-adjacent columns involved - // + size_t nComparePos = 0; while ( nComparePos < pRects->size() ) diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index 93a44348d9a5..b6bcb4ba784e 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -27,7 +27,7 @@ #include "dbfunc.hxx" #include "sc.hrc" -// ============================================================================ + const long SC_OL_BITMAPSIZE = 12; const long SC_OL_POSOFFSET = 2; @@ -40,7 +40,7 @@ const sal_uInt16 SC_OL_IMAGE_MINUS = SC_OL_IMAGE_PLUS + 1; const sal_uInt16 SC_OL_IMAGE_NOTPRESSED = SC_OL_IMAGE_MINUS + 1; const sal_uInt16 SC_OL_IMAGE_PRESSED = SC_OL_IMAGE_NOTPRESSED + 1; -// ============================================================================ + ScOutlineWindow::ScOutlineWindow( Window* pParent, ScOutlineMode eMode, ScViewData* pViewData, ScSplitPos eWhich ) : Window( pParent ), @@ -1023,6 +1023,6 @@ void ScOutlineWindow::KeyInput( const KeyEvent& rKEvt ) } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 432f2fe44af6..54f977c5faef 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -184,7 +184,7 @@ private: void TextChanged(); }; -//================================================================== + ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, bool bPTL) : pOutput ( pData ), @@ -395,10 +395,10 @@ void ScDrawStringsVars::SetPattern( aMetric = pFmtDevice->GetFontMetric(); - // + // 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 ) { @@ -807,7 +807,7 @@ sal_uLong ScDrawStringsVars::GetResultValueFormat() const return nValueFormat; } -//================================================================== + double ScOutputData::GetStretch() { @@ -835,11 +835,11 @@ double ScOutputData::GetStretch() } } -//================================================================== -// + + // output strings -// + static void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, ScRefCellValue& rCell ) { @@ -1248,9 +1248,9 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY rParam.mnColWidth = nMergeSizeX; // store the actual column width. - // + // construct the rectangles using logical left/right values (justify is called at the end) - // + // rAlignRect is the single cell or merged area, used for alignment. @@ -1505,9 +1505,9 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bool bDoCell = false; bool bNeedEdit = false; - // + // Part of a merged cell? - // + bool bOverlapped = (pInfo->bHOverlapped || pInfo->bVOverlapped); if ( bOverlapped ) @@ -1527,9 +1527,9 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bMergeEmpty = true; } - // + // Rest of a long text further to the left? - // + if ( bEmpty && !bMergeEmpty && nX < nX1 && !bOverlapped ) { @@ -1546,9 +1546,9 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) } } - // + // Rest of a long text further to the right? - // + if ( bEmpty && !bMergeEmpty && nX == nX2 && !bOverlapped ) { @@ -1567,16 +1567,16 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) } } - // + // normal visible cell - // + if (!bEmpty) bDoCell = true; - // + // don't output the cell that's being edited - // + if ( bDoCell && bEditMode && nCellX == nEditCol && nCellY == nEditRow ) bDoCell = false; @@ -1590,9 +1590,9 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bDoCell = false; } - // + // output the cell text - // + ScRefCellValue aCell; if (bDoCell) @@ -1885,9 +1885,9 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bVClip = true; } - // + // horizontalen Platz testen - // + bool bRightAdjusted = false; // to correct text width calculation later bool bNeedEditEngine = false; @@ -2076,7 +2076,7 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) mpDoc->EnableIdle(bWasIdleEnabled); } -// ------------------------------------------------------------------------------- + ScFieldEditEngine* ScOutputData::CreateOutputEditEngine() { @@ -2758,9 +2758,9 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // + // Initial page size - large for normal text, cell size for automatic line breaks - // + Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.mbBreak) @@ -2793,9 +2793,9 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // + // Fill the EditEngine (cell attributes and text) - // + // default alignment for asian vertical mode is top-right if ( rParam.mbAsianVertical && rParam.meVerJust == SVX_VER_JUSTIFY_STANDARD ) @@ -2818,9 +2818,9 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // + // Get final output area using the calculated width - // + long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3261,9 +3261,9 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // + // Initial page size - large for normal text, cell size for automatic line breaks - // + Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.mbBreak) @@ -3286,9 +3286,9 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // + // Fill the EditEngine (cell attributes and text) - // + rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3307,9 +3307,9 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // + // Get final output area using the calculated width - // + long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3527,9 +3527,9 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // + // Initial page size - large for normal text, cell size for automatic line breaks - // + Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.hasLineBreak()) @@ -3552,9 +3552,9 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // + // Fill the EditEngine (cell attributes and text) - // + rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3573,9 +3573,9 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // + // Get final output area using the calculated width - // + long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3800,9 +3800,9 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // + // Initial page size - large for normal text, cell size for automatic line breaks - // + Size aPaperSize = Size( 1000000, 1000000 ); // call GetOutputArea with nNeeded=0, to get only the cell width @@ -3833,9 +3833,9 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // + // Fill the EditEngine (cell attributes and text) - // + rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3854,9 +3854,9 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // + // Get final output area using the calculated width - // + long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -4203,9 +4203,9 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // + // Initial page size - large for normal text, cell size for automatic line breaks - // + Size aPaperSize = Size( 1000000, 1000000 ); // call GetOutputArea with nNeeded=0, to get only the cell width @@ -4236,9 +4236,9 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // + // Fill the EditEngine (cell attributes and text) - // + // default alignment for asian vertical mode is top-right if ( rParam.meVerJust == SVX_VER_JUSTIFY_STANDARD ) @@ -4261,9 +4261,9 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // + // Get final output area using the calculated width - // + long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -4711,7 +4711,7 @@ void ScOutputData::DrawEdit(bool bPixelToLogic) DrawRotated(bPixelToLogic); //! von aussen rufen ? } -// ------------------------------------------------------------------------------- + void ScOutputData::DrawRotated(bool bPixelToLogic) { diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index b64163517f18..5412c0bd604d 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -35,7 +35,7 @@ #include <svx/fmview.hxx> -//================================================================== + // #i72502# Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY ) diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 095ef7226bc9..013d92bdd845 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -63,7 +63,7 @@ // STATIC DATA ----------------------------------------------------------- -//================================================================== + #define SC_PREVIEW_SHADOWSIZE 2 diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 19180d5531f5..08ced7a6c71d 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -535,9 +535,9 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev } } - // + // get column info - // + SCCOL nColCount = 0; SCCOL nCol; @@ -605,9 +605,9 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev else rInfo.SetColInfo( 0, NULL ); - // + // get row info - // + SCROW nRowCount = 0; if ( bHasHeaderRow ) @@ -674,9 +674,9 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev else rInfo.SetRowInfo( 0, NULL ); - // + // limit to visible area - // + rInfo.SetTab( nTab ); rInfo.LimitToArea( rVisiblePixel ); diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index ab56da2b97f4..4ddbf6c21bca 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -391,7 +391,7 @@ static void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 ) } } -// + // output to Device (static) // // us used for: @@ -595,9 +595,9 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr delete pDrawView; } -// + // Printing -// + static void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet ) { @@ -1016,9 +1016,9 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) nRepeatStartRow = nRepeatEndRow = SCROW_REPEAT_NONE; } - // + // Split pages - // + if (!bState) { @@ -1186,7 +1186,7 @@ static void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, Out // operation, and k2 is the number of chars // 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() ); @@ -2371,10 +2371,10 @@ void ScPrintFunc::SetExclusivelyDrawOleAndDrawObjects() aTableParam.bNullVals = false; } -// + // UpdatePages is only called from outside to set the breaks correctly for viewing // - always without UserArea -// + bool ScPrintFunc::UpdatePages() { @@ -2578,9 +2578,9 @@ void ScPrintFunc::ApplyPrintSettings() { if ( pPrinter ) { - // + // Configure Printer to Printing - // + Size aEnumSize = aPageSize; @@ -3015,10 +3015,10 @@ void ScPrintFunc::CalcPages() // calculates aPageRect and pages fr maPageRows.resize(nRealCnt+1, ScPageRowEntry()); } - // + // Page alignment/splitting after breaks in Col/RowFlags // Of several breaks in a hidden area, only one counts. - // + nPagesX = 0; nPagesY = 0; diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx index 3753396d825f..c6b750fb054b 100644 --- a/sc/source/ui/view/scextopt.cxx +++ b/sc/source/ui/view/scextopt.cxx @@ -23,7 +23,7 @@ #include <map> #include <boost/shared_ptr.hpp> -// ============================================================================ + ScExtDocSettings::ScExtDocSettings() : mfTabBarWidth( -1.0 ), @@ -32,7 +32,7 @@ ScExtDocSettings::ScExtDocSettings() : { } -// ============================================================================ + ScExtTabSettings::ScExtTabSettings() : maUsedArea( ScAddress::INITIALIZE_INVALID ), @@ -52,7 +52,7 @@ ScExtTabSettings::ScExtTabSettings() : { } -// ============================================================================ + /** A container for ScExtTabSettings objects. @descr Internally, a std::map with shared pointers to ScExtTabSettings is @@ -123,7 +123,7 @@ void ScExtTabSettingsCont::CopyFromMap( const ScExtTabSettingsMap& rMap ) maMap[ aIt->first ].reset( new ScExtTabSettings( *aIt->second ) ); } -// ============================================================================ + /** Implementation struct for ScExtDocOptions containing all members. */ struct ScExtDocOptionsImpl @@ -223,6 +223,6 @@ void ScExtDocOptions::SetCodeName( SCTAB nTab, const OUString& rCodeName ) } } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx index bbbe313bd0da..3fda4b0dd124 100644 --- a/sc/source/ui/view/selectionstate.cxx +++ b/sc/source/ui/view/selectionstate.cxx @@ -23,7 +23,7 @@ #include "viewdata.hxx" #include "markdata.hxx" -// ============================================================================ + ScSelectionState::ScSelectionState( ScViewData& rViewData ) : meType( SC_SELECTTYPE_NONE ) @@ -76,6 +76,6 @@ bool operator==( const ScSelectionState& rL, const ScSelectionState& rR ) return bEqual; } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index 35a0aa135e56..664be169177e 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -35,7 +35,7 @@ #include "editable.hxx" #include "undoblk.hxx" -// ============================================================================ + SFX_IMPL_CHILDWINDOW_WITHID( ScSpellDialogChildWindow, SID_SPELL_DIALOG ) @@ -272,6 +272,6 @@ bool ScSpellDialogChildWindow::IsSelectionChanged() return (*mxOldRangeList != aCurrentRangeList); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index cd8fd0b55c64..3d9c10eb384f 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -268,7 +268,7 @@ void ScConversionEngineBase::FillFromCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) } } -// ============================================================================ + ScSpellingEngine::ScSpellingEngine( SfxItemPool* pEnginePoolP, ScViewData& rViewData, @@ -335,7 +335,7 @@ Window* ScSpellingEngine::GetDialogParent() return mrDocShell.GetActiveDialogParent(); } -// ============================================================================ + ScConversionParam::ScConversionParam( ScConversionType eConvType ) : meConvType( eConvType ), @@ -408,6 +408,6 @@ bool ScTextConversionEngine::NeedsConversion() return HasConvertibleTextPortion( maConvParam.GetSourceLang() ); } -// ============================================================================ + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 367a80a82b3c..95c6ef66eeec 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -36,7 +36,7 @@ // STATIC DATA ----------------------------------------------------------- -//================================================================== + ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) : TabBar( pParent, diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index a7752b70f3ad..e9913923f791 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -23,7 +23,7 @@ #include <vcl/settings.hxx> -//================================================================== + ScTabSplitter::ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pData ) : Splitter( pParent, nWinStyle ), diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 5bf2db8977bb..c445316ac398 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -162,7 +162,7 @@ void ScCornerButton::MouseButtonDown( const MouseEvent& rMEvt ) } } -//================================================================== + static bool lcl_HasColOutline( const ScViewData& rViewData ) { @@ -531,9 +531,9 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) else nBarX = nBarY = 0; - // + // Splitter auswerten - // + long nLeftSize = nSizeX; long nRightSize = 0; @@ -668,9 +668,9 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) Point(nSplitPosX,nPosY), Size(nRightSize,nTopSize), nTotalWidth, bLayoutRTL ); } - // + // Scrollbars updaten - // + if (!bInUpdateHeader) { @@ -1446,9 +1446,9 @@ void ScTabView::UpdateShow() if ( aViewData.GetDocShell()->IsPreview() ) bHScrollMode = bVScrollMode = bTabMode = bHeader = bOutlMode = bHOutline = bVOutline = false; - // + // Windows anlegen - // + if (bShowH && !pGridWin[SC_SPLIT_BOTTOMRIGHT]) { @@ -1483,9 +1483,9 @@ void ScTabView::UpdateShow() pRowBar[SC_SPLIT_TOP] = new ScRowBar( pFrameWin, &aViewData, SC_SPLIT_TOP, &aHdrFunc, pHdrSelEng ); - // + // Windows anzeigen - // + ShowHide( &aHScrollLeft, bHScrollMode ); ShowHide( &aHScrollRight, bShowH && bHScrollMode ); diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 8cac82a491db..3f1578bf410d 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -96,9 +96,9 @@ using namespace com::sun::star; -// + // --- Public-Funktionen -// + void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, bool bControl ) { @@ -709,16 +709,16 @@ static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) return NULL; } - // + // Bildschirm an Cursorposition anpassen - // + void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, const ScSplitPos* pWhich ) { - // + // aktiven Teil umschalten jetzt hier - // + ScSplitPos eActive = aViewData.GetActivePart(); ScHSplitPos eActiveX = WhichH(eActive); @@ -738,9 +738,9 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, eActiveY = SC_SPLIT_BOTTOM; } - // + // eigentliches Align - // + if ( eMode != SC_FOLLOW_NONE ) { @@ -944,9 +944,9 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, if ( nNewDeltaY != nDeltaY ) ScrollY( nNewDeltaY - nDeltaY, eAlignY ); } - // + // nochmal aktiven Teil umschalten - // + if (bHFix) if (eActiveX == SC_SPLIT_RIGHT && nCurX < (SCsCOL)aViewData.GetFixPosX()) @@ -982,9 +982,9 @@ bool ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt ) return bRet; } - // + // MoveCursor - mit Anpassung des Bildausschnitts - // + void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, bool bShift, bool bControl, bool bKeepOld, bool bKeepSel ) @@ -1769,9 +1769,9 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa } } -// + // Paint-Funktionen - nur fuer diese View -// + void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow ) { diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 4a18e9093076..2f2dd64268ec 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -33,11 +33,11 @@ extern sal_uInt16 nScFillModeMouseModifier; // global.cxx // STATIC DATA ----------------------------------------------------------- -//================================================================== -// + + // --- Referenz-Eingabe / Fill-Cursor -// + void ScTabView::HideTip() { @@ -462,7 +462,7 @@ void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos ) } } -//================================================================== + void ScTabView::InterpretVisible() { diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 04fdf7e8d389..25e771efca61 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -248,7 +248,7 @@ void ScTabView::DoAddWin( ScGridWindow* pWin ) } } -//================================================================== + void ScTabView::TabChanged( bool bSameTabButMoved ) { diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index fca644ab010d..cf0ec07d2990 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -97,10 +97,10 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) return; } - // + // Pseudo-Slots von Draw-Toolbox auswerten //! wird das ueberhaupt noch gebraucht ????? - // + if (nNewId == SID_INSERT_DRAW && pArgs) { diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 76b9e2b5dc2b..c74de5aed9b2 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -904,7 +904,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - // ---------------------------------------------------------------- + case FID_CHG_SHOW: { diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index d8357a03fdba..dbd66ceff488 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -40,7 +40,7 @@ #include "cellvalue.hxx" #include "svl/sharedstring.hxx" -//================================================================== + void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index c593bf695d73..8c1beedbfed6 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -41,7 +41,7 @@ #include <svx/srchdlg.hxx> #include "document.hxx" -//================================================================== + OUString ScTabViewShell::GetSelectionText( bool bWholeWord ) { diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index de4070b4f4d6..bf23d9a3f77b 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -1585,9 +1585,9 @@ Point ScViewData::GetScrPos( SCCOL nWhereX, SCROW nWhereY, ScSplitPos eWhich, return Point( nScrPosX, nScrPosY ); } -// + // Number of cells on a screen -// + SCCOL ScViewData::CellsAtX( SCsCOL nPosX, SCsCOL nDir, ScHSplitPos eWhichX, sal_uInt16 nScrSizeX ) const { diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index e83551516ee1..aea072da40a8 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -71,7 +71,7 @@ using namespace com::sun::star; // STATIC DATA --------------------------------------------------------------- -//============================================================================ + // GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx @@ -764,9 +764,9 @@ static bool lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL return false; } -// + // Einfuegen auf Tabelle: -// + // internes Paste @@ -1207,10 +1207,10 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, rMark.SetMarkArea( aUserRange ); MarkDataChanged(); - // + // Aus Clipboard kopieren, // wenn gerechnet werden soll, Originaldaten merken - // + ScDocument* pMixDoc = NULL; if (nFunction) @@ -1750,7 +1750,7 @@ void ScViewFunc::PostPasteFromClip(const ScRangeList& rPasteRanges, const ScMark // D R A G A N D D R O P -// + // innerhalb des Dokuments bool ScViewFunc::MoveBlockTo( const ScRange& rSource, const ScAddress& rDestPos, diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 352ed4f21352..b892b0ee5108 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -75,7 +75,7 @@ using namespace com::sun::star; bool bPasteIsDrop = false; -//================================================================== + void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, const ::com::sun::star::uno::Reference< diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index ea3595717fe4..3a4457931590 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -107,9 +107,9 @@ bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, TransferableDataHelper aDataHelper( rxTransferable ); bool bRet = false; - // + // handle individual formats - // + if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE || nFormatId == SOT_FORMATSTR_ID_LINK_SOURCE || diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index e897b8e3a47f..e3f617173f95 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -77,7 +77,7 @@ #include "tokenarray.hxx" #include <rowheightcontext.hxx> -//================================================================== + static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDocShell *pDocSh ) { @@ -90,7 +90,7 @@ static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDo } -//================================================================== + ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScTabView( pParent, rDocSh, pViewShell ), @@ -633,9 +633,9 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, ScEditableTester aTester( pDoc, nTab, nCol,nRow, nCol,nRow ); if (aTester.IsEditable()) { - // + // test for attribute - // + bool bSimple = false; bool bCommon = false; ScPatternAttr* pCellAttrs = NULL; @@ -672,9 +672,9 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, // #i97726# always get text for "repeat" of undo action aString = ScEditUtil::GetSpaceDelimitedString(aEngine); - // + // undo - // + EditTextObject* pUndoData = NULL; ScUndoEnterData::ValuesType aOldValues; @@ -693,9 +693,9 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, pUndoData = rData.Clone(); } - // + // enter data - // + if (bCommon) pDoc->ApplyPattern(nCol,nRow,nTab,*pCellAttrs); //! undo @@ -884,11 +884,11 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, } } -// + // apply attribute - undo OK // // complete set ( ATTR_STARTINDEX, ATTR_ENDINDEX ) -// + void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet, |