diff options
Diffstat (limited to 'sc/source/ui/miscdlgs')
44 files changed, 678 insertions, 678 deletions
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index ce6473c2b068..a5e94745f2e6 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,12 +58,12 @@ // defines ------------------------------------------------------------------- -#define ABS_SREF SCA_VALID \ +#define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE -#define ABS_DREF ABS_SREF \ +#define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D -#define ABS_DREF3D ABS_DREF | SCA_TAB_3D +#define ABS_SREF3D ABS_SREF | SCA_TAB_3D +#define ABS_DREF3D ABS_DREF | SCA_TAB_3D @@ -77,12 +77,12 @@ inline void EnableDisable( Window& rWin, BOOL bEnable ) rWin.Disable(); } -#define RD_SPECIAL_NONE 0 -#define RD_SPECIAL_CONTENT 1 -#define RD_SPECIAL_VISCONTENT 2 +#define RD_SPECIAL_NONE 0 +#define RD_SPECIAL_CONTENT 1 +#define RD_SPECIAL_VISCONTENT 2 //============================================================================ -// class ScRedlinData +// class ScRedlinData //---------------------------------------------------------------------------- ScRedlinData::ScRedlinData() @@ -111,38 +111,38 @@ ScRedlinData::~ScRedlinData() //============================================================================ -// class ScAcceptChgDlg +// class ScAcceptChgDlg //---------------------------------------------------------------------------- ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData) + ScViewData* ptrViewData) - : SfxModelessDialog( pB, pCW, pParent, ScResId(RID_SCDLG_CHANGES) ), + : SfxModelessDialog( pB, pCW, pParent, ScResId(RID_SCDLG_CHANGES) ), // - aAcceptChgCtr ( this, ScResId( CTR_REDLINING ) ), + aAcceptChgCtr ( this, ScResId( CTR_REDLINING ) ), // - pViewData ( ptrViewData ), - pDoc ( ptrViewData->GetDocument() ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData->GetDocument() ), aLocalRangeName ( *(pDoc->GetRangeName()) ), // - aStrInsertCols ( ScResId( STR_INSERT_COLS)), - aStrInsertRows ( ScResId( STR_INSERT_ROWS)), - aStrInsertTabs ( ScResId( STR_INSERT_TABS)), - aStrDeleteCols ( ScResId( STR_DELETE_COLS)), - aStrDeleteRows ( ScResId( STR_DELETE_ROWS)), - aStrDeleteTabs ( ScResId( STR_DELETE_TABS)), - aStrMove ( ScResId( STR_MOVE )), - aStrContent ( ScResId( STR_CONTENT )), - aStrReject ( ScResId( STR_REJECT )), - aStrAllAccepted ( ScResId( STR_ACCEPTED )), - aStrAllRejected ( ScResId( STR_REJECTED )), - aStrNoEntry ( ScResId( STR_NO_ENTRY )), - aStrContentWithChild ( ScResId( STR_CONTENT_WITH_CHILD)), - aStrChildContent ( ScResId( STR_CHILD_CONTENT)), - aStrChildOrgContent ( ScResId( STR_CHILD_ORGCONTENT)), - aStrEmpty ( ScResId( STR_EMPTY )) + aStrInsertCols ( ScResId( STR_INSERT_COLS)), + aStrInsertRows ( ScResId( STR_INSERT_ROWS)), + aStrInsertTabs ( ScResId( STR_INSERT_TABS)), + aStrDeleteCols ( ScResId( STR_DELETE_COLS)), + aStrDeleteRows ( ScResId( STR_DELETE_ROWS)), + aStrDeleteTabs ( ScResId( STR_DELETE_TABS)), + aStrMove ( ScResId( STR_MOVE )), + aStrContent ( ScResId( STR_CONTENT )), + aStrReject ( ScResId( STR_REJECT )), + aStrAllAccepted ( ScResId( STR_ACCEPTED )), + aStrAllRejected ( ScResId( STR_REJECTED )), + aStrNoEntry ( ScResId( STR_NO_ENTRY )), + aStrContentWithChild ( ScResId( STR_CONTENT_WITH_CHILD)), + aStrChildContent ( ScResId( STR_CHILD_CONTENT)), + aStrChildOrgContent ( ScResId( STR_CHILD_ORGCONTENT)), + aStrEmpty ( ScResId( STR_EMPTY )) { FreeResource(); -// bScAcceptChgDlgIsDead=FALSE; +// bScAcceptChgDlgIsDead=FALSE; bNoSelection=FALSE; bNeedsUpdate=FALSE; bIgnoreMsg=FALSE; @@ -155,8 +155,8 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP aReOpenTimer.SetTimeout(50); aReOpenTimer.SetTimeoutHdl(LINK( this, ScAcceptChgDlg, ReOpenTimerHdl )); - // dialog is now only hidden, not deleted, on switching views, - // so there's no need to restore settings when reopening + // dialog is now only hidden, not deleted, on switching views, + // so there's no need to restore settings when reopening MinSize=aAcceptChgCtr.GetMinSizePixel(); MinSize.Height()+=2; @@ -202,7 +202,7 @@ ScAcceptChgDlg::ScAcceptChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP } ScAcceptChgDlg::~ScAcceptChgDlg() { -// bScAcceptChgDlgIsDead=TRUE; +// bScAcceptChgDlgIsDead=TRUE; ClearView(); ScChangeTrack* pChanges=pDoc->GetChangeTrack(); @@ -233,8 +233,8 @@ void ScAcceptChgDlg::ReInit(ScViewData* ptrViewData) bAcceptEnableFlag=TRUE; bRejectEnableFlag=TRUE; - // #91781# don't call Init here (switching between views), just set link below - // (dialog is just hidden, not deleted anymore, when switching views) + // #91781# don't call Init here (switching between views), just set link below + // (dialog is just hidden, not deleted anymore, when switching views) ClearView(); UpdateView(); @@ -248,7 +248,7 @@ void ScAcceptChgDlg::ReInit(ScViewData* ptrViewData) void __EXPORT ScAcceptChgDlg::Init() { - String aAreaStr; + String aAreaStr; ScRange aRange; DBG_ASSERT( pViewData && pDoc, "ViewData oder Document nicht gefunden!" ); @@ -261,7 +261,7 @@ void __EXPORT ScAcceptChgDlg::Init() aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser()); pTPFilter->ClearAuthors(); ScStrCollection aUserColl=pChanges->GetUserCollection(); - for(USHORT i=0;i<aUserColl.GetCount();i++) + for(USHORT i=0;i<aUserColl.GetCount();i++) pTPFilter->InsertAuthor(aUserColl[i]->GetString()); } @@ -332,25 +332,25 @@ String* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType) switch(eType) { - case SC_CAT_INSERT_COLS: pStr=&aStrInsertCols;break; + case SC_CAT_INSERT_COLS: pStr=&aStrInsertCols;break; - case SC_CAT_INSERT_ROWS: pStr=&aStrInsertRows;break; + case SC_CAT_INSERT_ROWS: pStr=&aStrInsertRows;break; - case SC_CAT_INSERT_TABS: pStr=&aStrInsertTabs;break; + case SC_CAT_INSERT_TABS: pStr=&aStrInsertTabs;break; - case SC_CAT_DELETE_COLS: pStr=&aStrDeleteCols;break; + case SC_CAT_DELETE_COLS: pStr=&aStrDeleteCols;break; - case SC_CAT_DELETE_ROWS: pStr=&aStrDeleteRows;break; + case SC_CAT_DELETE_ROWS: pStr=&aStrDeleteRows;break; - case SC_CAT_DELETE_TABS: pStr=&aStrDeleteTabs;break; + case SC_CAT_DELETE_TABS: pStr=&aStrDeleteTabs;break; - case SC_CAT_MOVE: pStr=&aStrMove;break; + case SC_CAT_MOVE: pStr=&aStrMove;break; - case SC_CAT_CONTENT: pStr=&aStrContent;break; + case SC_CAT_CONTENT: pStr=&aStrContent;break; - case SC_CAT_REJECT: pStr=&aStrReject;break; + case SC_CAT_REJECT: pStr=&aStrReject;break; - default: pStr=&aUnknown;break; + default: pStr=&aUnknown;break; } return pStr; } @@ -446,8 +446,8 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeAction(const ScChangeAction* pScChangeA pNewData->bIsRejectable=pScChangeAction->IsRejectable(); pNewData->bDisabled=!pNewData->bIsAcceptable | bDisabled; pNewData->aDateTime=aDateTime; - pNewData->nRow = aRef.aStart.Row(); - pNewData->nCol = aRef.aStart.Col(); + pNewData->nRow = aRef.aStart.Row(); + pNewData->nCol = aRef.aStart.Col(); pNewData->nTable= aRef.aStart.Tab(); if(eType==SC_CAT_CONTENT) @@ -628,8 +628,8 @@ SvLBoxEntry* ScAcceptChgDlg::InsertFilteredAction(const ScChangeAction* pScChang pNewData->bIsRejectable=pScChangeAction->IsRejectable(); pNewData->bDisabled=!pNewData->bIsAcceptable | bDisabled; pNewData->aDateTime=aDateTime; - pNewData->nRow = aRef.aStart.Row(); - pNewData->nCol = aRef.aStart.Col(); + pNewData->nRow = aRef.aStart.Row(); + pNewData->nCol = aRef.aStart.Col(); pNewData->nTable= aRef.aStart.Tab(); if(eType==SC_CAT_CONTENT) @@ -815,8 +815,8 @@ SvLBoxEntry* ScAcceptChgDlg::InsertChangeActionContent(const ScChangeActionConte pNewData->bIsRejectable=FALSE; pNewData->bDisabled=!pNewData->bIsAcceptable; pNewData->aDateTime=aDateTime; - pNewData->nRow = aRef.aStart.Row(); - pNewData->nCol = aRef.aStart.Col(); + pNewData->nRow = aRef.aStart.Row(); + pNewData->nCol = aRef.aStart.Col(); pNewData->nTable= aRef.aStart.Tab(); if(pTheView->IsValidComment(&aComment) && bFlag) @@ -985,7 +985,7 @@ IMPL_LINK( ScAcceptChgDlg, RefHandle, SvxTPFilter*, EMPTYARG ) if(pWnd!=NULL) { -// bSimpleRefDlgStarted=TRUE; +// bSimpleRefDlgStarted=TRUE; USHORT nAcceptId=ScAcceptChgDlgWrapper::GetChildWindowId(); pViewFrm->ShowChildWindow(nAcceptId,FALSE); pWnd->SetCloseHdl(LINK( this, ScAcceptChgDlg,RefInfoHandle)); @@ -1004,7 +1004,7 @@ IMPL_LINK( ScAcceptChgDlg, RefInfoHandle, String*, pResult) { USHORT nId; -// bSimpleRefDlgStarted=FALSE; +// bSimpleRefDlgStarted=FALSE; ScSimpleRefDlgWrapper::SetAutoReOpen(TRUE); SfxViewFrame* pViewFrm = pViewData->GetViewShell()->GetViewFrame(); @@ -1314,7 +1314,7 @@ BOOL ScAcceptChgDlg::InsertContentChilds(ScChangeActionTable* pActionTable,SvLBo ScRedlinData *pParentData=(ScRedlinData *)(pOriginal->GetUserData()); pParentData->pData=(void *)pScChangeAction; pParentData->nActionNo=pScChangeAction->GetActionNumber(); - pParentData->bIsAcceptable=pScChangeAction->IsRejectable(); // select old value + pParentData->bIsAcceptable=pScChangeAction->IsRejectable(); // select old value pParentData->bIsRejectable=FALSE; pParentData->bDisabled=FALSE; } @@ -1763,13 +1763,13 @@ void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, ULONG nStartAction,U IMPL_LINK( ScAcceptChgDlg, ChgTrackModHdl, ScChangeTrack*, pChgTrack) { -// if(bScAcceptChgDlgIsDead) return 0; +// if(bScAcceptChgDlgIsDead) return 0; ScChangeTrackMsgQueue& aMsgQueue= pChgTrack->GetMsgQueue(); ScChangeTrackMsgInfo* pTrackInfo=aMsgQueue.Get(); - ULONG nStartAction; - ULONG nEndAction; + ULONG nStartAction; + ULONG nEndAction; while(pTrackInfo!=NULL) { @@ -2001,7 +2001,7 @@ void ScAcceptChgDlg::FillInfo(SfxChildWinInfo& rInfo) const SfxModelessDialog::FillInfo(rInfo); rInfo.aExtraString.AppendAscii(RTL_CONSTASCII_STRINGPARAM( "AcceptChgDat:(" )); - USHORT nCount=pTheView->TabCount(); + USHORT nCount=pTheView->TabCount(); rInfo.aExtraString += String::CreateFromInt32(nCount); rInfo.aExtraString += ';'; @@ -2043,8 +2043,8 @@ IMPL_LINK( ScAcceptChgDlg, FilterModified, SvxTPFilter*, EMPTYARG ) return 0; } -#define CALC_DATE 3 -#define CALC_POS 1 +#define CALC_DATE 3 +#define CALC_POS 1 IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData ) { diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src index 4baa9f3d388c..dab2c5d91d2f 100644 --- a/sc/source/ui/miscdlgs/acredlin.src +++ b/sc/source/ui/miscdlgs/acredlin.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 0c46284c77d7..09d4a4d50b52 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,9 +61,9 @@ #include "global.hxx" #include "inputopt.hxx" #include "rangeutl.hxx" + - -ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings) +ScFormulaReferenceHelper::ScFormulaReferenceHelper(IAnyRefDialog* _pDlg,SfxBindings* _pBindings) : m_pDlg(_pDlg) , pRefEdit (NULL) , m_pWindow(NULL) @@ -102,7 +102,7 @@ void ScFormulaReferenceHelper::enableInput( BOOL bEnable ) SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); while( pFrame ) { - // #71577# enable everything except InPlace, including bean frames + // #71577# enable everything except InPlace, including bean frames if ( !pFrame->GetFrame().IsInPlace() ) { SfxViewShell* p = pFrame->GetViewShell(); @@ -138,7 +138,7 @@ void ScFormulaReferenceHelper::ShowSimpleReference( const XubString& rStr ) if ( pViewData ) { ScDocument* pDoc=pViewData->GetDocument(); - ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); + ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); ScRangeList aRangeList; @@ -187,7 +187,7 @@ bool ScFormulaReferenceHelper::ParseWithNames( ScRangeList& rRanges, const Strin else if ( aRangeUtil.MakeRangeFromName( aRangeStr, pDoc, nRefTab, aRange, RUTL_NAMES, aDetails ) ) rRanges.Append( aRange ); else - bError = true; + bError = true; } return !bError; @@ -201,7 +201,7 @@ void ScFormulaReferenceHelper::ShowFormulaReference( const XubString& rStr ) ScViewData* pViewData=ScDocShell::GetViewData(); if ( pViewData && pRefComp.get() ) { - ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); + ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); SCCOL nCol = pViewData->GetCurX(); SCROW nRow = pViewData->GetCurY(); SCTAB nTab = pViewData->GetTabNo(); @@ -260,12 +260,12 @@ void ScFormulaReferenceHelper::HideReference( BOOL bDoneRefMode ) if( pViewData && /*!pRefEdit &&*/ bHighLightRef && bEnableColorRef) { - ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); + ScTabViewShell* pTabViewShell=pViewData->GetViewShell(); if(pTabViewShell!=NULL) { - // bDoneRefMode is FALSE when called from before SetReference. - // In that case, RefMode was just started and must not be ended now. + // bDoneRefMode is FALSE when called from before SetReference. + // In that case, RefMode was just started and must not be ended now. if ( bDoneRefMode ) pTabViewShell->DoneRefMode( FALSE ); @@ -279,7 +279,7 @@ void ScFormulaReferenceHelper::ShowReference( const XubString& rStr ) { if( /*!pRefEdit &&*/ bEnableColorRef ) { - if( rStr.Search('(')!=STRING_NOTFOUND || + if( rStr.Search('(')!=STRING_NOTFOUND || rStr.Search('+')!=STRING_NOTFOUND || rStr.Search('*')!=STRING_NOTFOUND || rStr.Search('-')!=STRING_NOTFOUND || @@ -379,7 +379,7 @@ void ScFormulaReferenceHelper::RefInputDone( BOOL bForced ) if ( CanInputDone( bForced ) )//if (pRefEdit && (bForced || !pRefBtn)) //-->Modified by PengYunQuan for Validity Cell Range Picker { - if (bAccInserted) // Accelerator wieder abschalten + if (bAccInserted) // Accelerator wieder abschalten { Application::RemoveAccel( pAccel.get() ); bAccInserted = FALSE; @@ -441,7 +441,7 @@ void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula:: sNewDialogText += m_pWindow->GetChild(i-1)->GetWindow( WINDOW_CLIENT )->GetText(); } else if (pWin == (Window*)pRefBtn) - ; // do nothing + ; // do nothing else if (pWin->IsVisible()) { pHiddenMarks[i] = TRUE; @@ -527,14 +527,14 @@ BOOL ScFormulaReferenceHelper::DoClose( USHORT nId ) { SfxApplication* pSfxApp = SFX_APP(); - SetDispatcherLock( FALSE ); //! here and in dtor ? + SetDispatcherLock( FALSE ); //! here and in dtor ? SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if ( pViewFrm && pViewFrm->HasChildWindow(FID_INPUTLINE_STATUS) ) { - // Die Eingabezeile wird per ToolBox::Disable disabled, muss darum auch - // per ToolBox::Enable wieder aktiviert werden (vor dem Enable des AppWindow), - // damit die Buttons auch wieder enabled gezeichnet werden. + // Die Eingabezeile wird per ToolBox::Disable disabled, muss darum auch + // per ToolBox::Enable wieder aktiviert werden (vor dem Enable des AppWindow), + // damit die Buttons auch wieder enabled gezeichnet werden. SfxChildWindow* pChild = pViewFrm->GetChildWindow(FID_INPUTLINE_STATUS); if (pChild) { @@ -563,7 +563,7 @@ BOOL ScFormulaReferenceHelper::DoClose( USHORT nId ) } void ScFormulaReferenceHelper::SetDispatcherLock( BOOL bLock ) { - // lock / unlock only the dispatchers of Calc documents + // lock / unlock only the dispatchers of Calc documents TypeId aType(TYPE(ScDocShell)); ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType); @@ -581,9 +581,9 @@ void ScFormulaReferenceHelper::SetDispatcherLock( BOOL bLock ) pDocShell = (ScDocShell*)SfxObjectShell::GetNext(*pDocShell, &aType); } - // if a new view is created while the dialog is open, - // that view's dispatcher is locked when trying to create the dialog - // for that view (ScTabViewShell::CreateRefDialog) + // if a new view is created while the dialog is open, + // that view's dispatcher is locked when trying to create the dialog + // for that view (ScTabViewShell::CreateRefDialog) } // ----------------------------------------------------------------------------- void ScFormulaReferenceHelper::ViewShellChanged(ScTabViewShell* /* pScViewShell */) @@ -601,7 +601,7 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(BOOL bFlag, BOOL bChilds) SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); while( pFrame ) { - // #71577# enable everything except InPlace, including bean frames + // #71577# enable everything except InPlace, including bean frames if ( !pFrame->GetFrame().IsInPlace() ) { SfxViewShell* p = pFrame->GetViewShell(); @@ -641,7 +641,7 @@ void lcl_InvalidateWindows() SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); while( pFrame ) { - // #71577# enable everything except InPlace, including bean frames + // #71577# enable everything except InPlace, including bean frames if ( !pFrame->GetFrame().IsInPlace() ) { SfxViewShell* p = pFrame->GetViewShell(); @@ -678,12 +678,12 @@ void lcl_HideAllReferences() //============================================================================ //The class of ScAnyRefDlg is rewritten by PengYunQuan for Validity Cell Range Picker -// class ScRefHandler +// class ScRefHandler //---------------------------------------------------------------------------- ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pCW, Window* pParent, USHORT nResId*/, bool bBindRef ) - : //SfxModelessDialog ( pB, pCW, pParent, ScResId( nResId ) ), + : //SfxModelessDialog ( pB, pCW, pParent, ScResId( nResId ) ), m_rWindow( rWindow ), m_bInRefMode( false ), m_aHelper(this,pB), @@ -691,8 +691,8 @@ ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pActiveWin(NULL) { m_aHelper.SetWindow(/*this*/&m_rWindow); - if(m_rWindow.GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId - m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und + if(m_rWindow.GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId + m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und //in eine UniqueId gewandelt wird, machen //wir das an dieser Stelle rueckgaengig. aTimer.SetTimeout(200); @@ -729,12 +729,12 @@ bool ScRefHandler::EnterRefMode() } } } - if ( !pParentDoc && pScViewShell ) // use current only if above fails + if ( !pParentDoc && pScViewShell ) // use current only if above fails pParentDoc = pScViewShell->GetObjectShell(); if ( pParentDoc ) aDocName = pParentDoc->GetTitle(); - ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(pScViewShell); + ScInputHandler* pInputHdl = SC_MOD()->GetInputHdl(pScViewShell); DBG_ASSERT( pInputHdl, "Missing input handler :-/" ); @@ -749,8 +749,8 @@ bool ScRefHandler::EnterRefMode() m_aHelper.SetDispatcherLock( TRUE ); //@Test - //SFX_APPWINDOW->Disable(TRUE); //@BugID 54702 - + //SFX_APPWINDOW->Disable(TRUE); //@BugID 54702 + return m_bInRefMode = true; } @@ -769,7 +769,7 @@ bool ScRefHandler::LeaveRefMode() if( Dialog *pDlg = dynamic_cast<Dialog*>( static_cast<Window*>(*this) ) ) pDlg->SetModalInputMode(FALSE); - SetDispatcherLock( FALSE ); //! here and in DoClose ? + SetDispatcherLock( FALSE ); //! here and in DoClose ? ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell(); if( pScViewShell ) @@ -786,9 +786,9 @@ bool ScRefHandler::LeaveRefMode() //SfxBindings& ScRefHandler::GetBindings() //{ -// //! SfxModelessDialog should allow access to pBindings pointer +// //! SfxModelessDialog should allow access to pBindings pointer // -// return *pMyBindings; +// return *pMyBindings; //} //---------------------------------------------------------------------------- @@ -801,7 +801,7 @@ void ScRefHandler::SwitchToDocument() SfxObjectShell* pObjSh = pCurrent->GetObjectShell(); if ( pObjSh && pObjSh->GetTitle() == aDocName ) { - // right document already visible -> nothing to do + // right document already visible -> nothing to do return; } } @@ -813,7 +813,7 @@ void ScRefHandler::SwitchToDocument() SfxObjectShell* pObjSh = pSh->GetObjectShell(); if ( pObjSh && pObjSh->GetTitle() == aDocName ) { - // switch to first TabViewShell for document + // switch to first TabViewShell for document ((ScTabViewShell*)pSh)->SetActive(); return; } @@ -823,14 +823,14 @@ void ScRefHandler::SwitchToDocument() //---------------------------------------------------------------------------- -BOOL ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 +BOOL ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 { - // default: allow only same document (overridden in function dialog) + // default: allow only same document (overridden in function dialog) String aCmpName; if ( pDocSh ) aCmpName = pDocSh->GetTitle(); - // if aDocName isn't initialized, allow + // if aDocName isn't initialized, allow return ( aDocName.Len() == 0 || aDocName == aCmpName ); } @@ -865,7 +865,7 @@ void ScRefHandler::ViewShellChanged(ScTabViewShell* pScViewShell ) void ScRefHandler::AddRefEntry() { - // wenn nicht ueberladen, gibt es keine Mehrfach-Referenzen + // wenn nicht ueberladen, gibt es keine Mehrfach-Referenzen } //---------------------------------------------------------------------------- @@ -879,8 +879,8 @@ BOOL __EXPORT ScRefHandler::IsTableLocked() const //---------------------------------------------------------------------------- // -// RefInputStart/Done: Zoom-In (AutoHide) auf einzelnes Feld -// (per Button oder Bewegung) +// RefInputStart/Done: Zoom-In (AutoHide) auf einzelnes Feld +// (per Button oder Bewegung) // //---------------------------------------------------------------------------- @@ -898,42 +898,42 @@ void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* //The two following function is commentted out by PengYunQuan for Validity Cell Range Picker //long ScAnyRefDlg::PreNotify( NotifyEvent& rNEvt ) //{ -// USHORT nSwitch=rNEvt.GetType(); -// if(nSwitch==EVENT_GETFOCUS) -// { -// pActiveWin=rNEvt.GetWindow(); -// } -// return SfxModelessDialog::PreNotify(rNEvt); +// USHORT nSwitch=rNEvt.GetType(); +// if(nSwitch==EVENT_GETFOCUS) +// { +// pActiveWin=rNEvt.GetWindow(); +// } +// return SfxModelessDialog::PreNotify(rNEvt); //} // //void ScAnyRefDlg::StateChanged( StateChangedType nStateChange ) //{ -// SfxModelessDialog::StateChanged( nStateChange ); +// SfxModelessDialog::StateChanged( nStateChange ); // -// if(nStateChange == STATE_CHANGE_VISIBLE) -// { -// if(IsVisible()) -// { -// m_aHelper.enableInput( FALSE ); -// m_aHelper.EnableSpreadsheets(); -// m_aHelper.SetDispatcherLock( TRUE ); -// aTimer.Start(); -// } -// else -// { -// m_aHelper.enableInput( TRUE ); -// m_aHelper.SetDispatcherLock( FALSE ); //! here and in DoClose ? -// } -// } +// if(nStateChange == STATE_CHANGE_VISIBLE) +// { +// if(IsVisible()) +// { +// m_aHelper.enableInput( FALSE ); +// m_aHelper.EnableSpreadsheets(); +// m_aHelper.SetDispatcherLock( TRUE ); +// aTimer.Start(); +// } +// else +// { +// m_aHelper.enableInput( TRUE ); +// m_aHelper.SetDispatcherLock( FALSE ); //! here and in DoClose ? +// } +// } //} #if defined( _MSC_VER ) #define INTRODUCE_TEMPLATE #else -#define INTRODUCE_TEMPLATE template <> +#define INTRODUCE_TEMPLATE template <> #endif -#define IMPL_TWINDOW_PRENOTIFY( TWindow,bBindRef ) \ +#define IMPL_TWINDOW_PRENOTIFY( TWindow,bBindRef ) \ INTRODUCE_TEMPLATE long ScRefHdlrImplBase<TWindow,bBindRef>::PreNotify( NotifyEvent& rNEvt )\ {\ if( bBindRef || m_bInRefMode )\ @@ -947,7 +947,7 @@ INTRODUCE_TEMPLATE long ScRefHdlrImplBase<TWindow,bBindRef>::PreNotify( NotifyEv return TWindow::PreNotify(rNEvt);\ } -#define IMPL_TWINDOW_STATECHANGED( TWindow,bBindRef ) \ +#define IMPL_TWINDOW_STATECHANGED( TWindow,bBindRef ) \ INTRODUCE_TEMPLATE void ScRefHdlrImplBase<TWindow,bBindRef>::StateChanged( StateChangedType nStateChange )\ {\ TWindow::StateChanged( nStateChange );\ @@ -966,7 +966,7 @@ INTRODUCE_TEMPLATE void ScRefHdlrImplBase<TWindow,bBindRef>::StateChanged( State else\ {\ m_aHelper.enableInput( TRUE );\ - m_aHelper.SetDispatcherLock( FALSE ); /*//! here and in DoClose ?*/\ + m_aHelper.SetDispatcherLock( FALSE ); /*//! here and in DoClose ?*/\ }\ }\ } diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 18013a089306..12a332fd02f9 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,12 +73,12 @@ // ScAutoFmtPreview ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocument* pDoc ) : - Window ( pParent, rRes ), - pCurData ( NULL ), - aVD ( *this ), + Window ( pParent, rRes ), + pCurData ( NULL ), + aVD ( *this ), aScriptedText ( aVD ), xBreakIter ( pDoc->GetBreakIterator() ), - bFitWidth ( FALSE ), + bFitWidth ( FALSE ), mbRTL ( false ), aPrvSize ( GetSizePixel().Width() - 6, GetSizePixel().Height() - 30 ), mnLabelColWidth ( (aPrvSize.Width() - 4) / 4 - 12 ), @@ -92,7 +92,7 @@ ScAutoFmtPreview::ScAutoFmtPreview( Window* pParent, const ResId& rRes, ScDocume aStrMid ( ScResId( STR_MID ) ), aStrSouth ( ScResId( STR_SOUTH ) ), aStrSum ( ScResId( STR_SUM ) ), - pNumFmt ( new SvNumberFormatter( ::comphelper::getProcessServiceFactory(), ScGlobal::eLnge ) ) + pNumFmt ( new SvNumberFormatter( ::comphelper::getProcessServiceFactory(), ScGlobal::eLnge ) ) { Init(); } @@ -205,8 +205,8 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) // Ausgabe des Zelltextes: //------------------------ - String cellString; - BOOL bNumFormat = pCurData->GetIncludeValueFormat(); + String cellString; + BOOL bNumFormat = pCurData->GetIncludeValueFormat(); ULONG nNum; double nVal; Color* pDummy = NULL; @@ -214,14 +214,14 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) switch( nIndex ) { - case 1: cellString = aStrJan; break; - case 2: cellString = aStrFeb; break; - case 3: cellString = aStrMar; break; - case 5: cellString = aStrNorth; break; - case 10: cellString = aStrMid; break; - case 15: cellString = aStrSouth; break; + case 1: cellString = aStrJan; break; + case 2: cellString = aStrFeb; break; + case 3: cellString = aStrMar; break; + case 5: cellString = aStrNorth; break; + case 10: cellString = aStrMid; break; + case 15: cellString = aStrSouth; break; case 4: - case 20: cellString = aStrSum; break; + case 20: cellString = aStrSum; break; case 6: case 8: @@ -260,14 +260,14 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) if ( cellString.Len() > 0 ) { - Size aStrSize; + Size aStrSize; USHORT nFmtIndex = GetFormatIndex( nCol, nRow ); Rectangle cellRect = maArray.GetCellRect( nCol, nRow ); Point aPos = cellRect.TopLeft(); - USHORT nRightX = 0; - BOOL bJustify = pCurData->GetIncludeJustify(); + USHORT nRightX = 0; + BOOL bJustify = pCurData->GetIncludeJustify(); SvxHorJustifyItem aHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY ); - SvxCellHorJustify eJustification; + SvxCellHorJustify eJustification; //------------- // Ausrichtung: @@ -283,7 +283,7 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) MakeFonts( nFmtIndex, aFont, aCJKFont, aCTLFont ); - theMaxStrSize = cellRect.GetSize(); + theMaxStrSize = cellRect.GetSize(); theMaxStrSize.Width() -= FRAME_OFFSET; theMaxStrSize.Height() -= FRAME_OFFSET; @@ -440,7 +440,7 @@ void ScAutoFmtPreview::Init() maArray.SetUseDiagDoubleClipping( false ); CalcCellArray( FALSE ); CalcLineMap(); - + TypeId aType(TYPE(ScDocShell)); ScDocShell* pDocShell = (ScDocShell*)SfxObjectShell::GetFirst(&aType); SfxViewFrame* pFrame = SfxViewFrame::GetFirst( pDocShell ); @@ -529,7 +529,7 @@ void ScAutoFmtPreview::NotifyChange( ScAutoFormatData* pNewData ) void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) { sal_uInt32 nOldDrawMode = aVD.GetDrawMode(); - // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) + // #105733# SvtAccessibilityOptions::GetIsForBorders is no longer used (always assumed TRUE) if( GetSettings().GetStyleSettings().GetHighContrastMode() ) aVD.SetDrawMode( DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); @@ -552,8 +552,8 @@ void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) DrawRect( aRect ); Point aPos( (aWndSize.Width() - aPrvSize.Width()) / 2, (aWndSize.Height() - aPrvSize.Height()) / 2 ); - if (Application::GetSettings().GetLayoutRTL()) - aPos.X() = -aPos.X(); + if (Application::GetSettings().GetLayoutRTL()) + aPos.X() = -aPos.X(); DrawOutDev( aPos, aWndSize, Point(), aWndSize, aVD ); aVD.SetDrawMode( nOldDrawMode ); diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index de40dd9d1868..6e5880a5cf06 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -175,7 +175,7 @@ ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, ULONG nStartShared, ,mrConflictsList( rConflictsList ) { } - + ScConflictsFinder::~ScConflictsFinder() { } diff --git a/sc/source/ui/miscdlgs/conflictsdlg.src b/sc/source/ui/miscdlgs/conflictsdlg.src index 1facf85da95b..dad8abb48780 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.src +++ b/sc/source/ui/miscdlgs/conflictsdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ ModalDialog RID_SCDLG_CONFLICTS Pos = MAP_APPFONT ( 6 , 34 ) ; Size = MAP_APPFONT ( 326 , 104 ) ; Border = TRUE ; - }; + }; PushButton BTN_KEEPMINE { Pos = MAP_APPFONT ( 72 , 145 ) ; @@ -87,7 +87,7 @@ ModalDialog RID_SCDLG_CONFLICTS HelpButton BTN_HELP { Pos = MAP_APPFONT ( 282 , 172 ) ; - Size = MAP_APPFONT ( 50 , 14 ) ; + Size = MAP_APPFONT ( 50 , 14 ) ; }; String STR_TITLE_CONFLICT { diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx index 5100474274df..f9413dda2068 100644 --- a/sc/source/ui/miscdlgs/crdlg.cxx +++ b/sc/source/ui/miscdlgs/crdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,12 +42,12 @@ //================================================================== -ScColOrRowDlg::ScColOrRowDlg( Window* pParent, - const String& rStrTitle, - const String& rStrLabel, - BOOL bColDefault ) +ScColOrRowDlg::ScColOrRowDlg( Window* pParent, + const String& rStrTitle, + const String& rStrLabel, + BOOL bColDefault ) - : ModalDialog ( pParent, ScResId( RID_SCDLG_COLORROW ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_COLORROW ) ), // aFlFrame ( this, ScResId( FL_FRAME ) ), aBtnRows ( this, ScResId( BTN_GROUP_ROWS ) ), diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 7afec7c603b4..0ba1bf1cbe5c 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -59,57 +59,57 @@ const ULONG nEntryDataDelim = 2; //============================================================================ -// class ScColRowNameRangesDlg +// class ScColRowNameRangesDlg /************************************************************************* -#* Member: ScColRowNameRangesDlg Datum:04.09.97 +#* Member: ScColRowNameRangesDlg Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Konstruktor der Klasse ScColRowNameRangesDlg. -#* Initialisieren der Klassen- Mitglieder, -#* Uebernahme der Range- Angaben und Aufruf -#* der eigentlichen Initialisierungsroutine +#* Funktion: Konstruktor der Klasse ScColRowNameRangesDlg. +#* Initialisieren der Klassen- Mitglieder, +#* Uebernahme der Range- Angaben und Aufruf +#* der eigentlichen Initialisierungsroutine #* -#* Input: Sfx- Verknuepfungen -#* Parent- Window -#* SCViewData +#* Input: Sfx- Verknuepfungen +#* Parent- Window +#* SCViewData #* -#* Output: --- +#* Output: --- #* #************************************************************************/ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData ) + ScViewData* ptrViewData ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_COLROWNAMERANGES ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_COLROWNAMERANGES ), // aFlAssign ( this, ScResId( FL_ASSIGN ) ), - aLbRange ( this, ScResId( LB_RANGE ) ), + aLbRange ( this, ScResId( LB_RANGE ) ), aEdAssign ( this, this, ScResId( ED_AREA ) ), - aRbAssign ( this, ScResId( RB_AREA ), &aEdAssign, this ), - aBtnColHead ( this, ScResId( BTN_COLHEAD ) ), - aBtnRowHead ( this, ScResId( BTN_ROWHEAD ) ), - aFtAssign2 ( this, ScResId( FT_DATA_LABEL ) ), + aRbAssign ( this, ScResId( RB_AREA ), &aEdAssign, this ), + aBtnColHead ( this, ScResId( BTN_COLHEAD ) ), + aBtnRowHead ( this, ScResId( BTN_ROWHEAD ) ), + aFtAssign2 ( this, ScResId( FT_DATA_LABEL ) ), aEdAssign2 ( this, this, ScResId( ED_DATA ) ), - aRbAssign2 ( this, ScResId( RB_DATA ), &aEdAssign2, this ), + aRbAssign2 ( this, ScResId( RB_DATA ), &aEdAssign2, this ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnAdd ( this, ScResId( BTN_ADD ) ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnAdd ( this, ScResId( BTN_ADD ) ), + aBtnRemove ( this, ScResId( BTN_REMOVE ) ), - pViewData ( ptrViewData ), - pDoc ( ptrViewData->GetDocument() ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData->GetDocument() ), - pEdActive ( NULL ), - bDlgLostFocus ( FALSE ) + pEdActive ( NULL ), + bDlgLostFocus ( FALSE ) { xColNameRanges = pDoc->GetColNameRanges()->Clone(); xRowNameRanges = pDoc->GetRowNameRanges()->Clone(); @@ -119,16 +119,16 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, /************************************************************************* -#* Member: ~ScColRowNameRangesDlg Datum:04.09.97 +#* Member: ~ScColRowNameRangesDlg Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Destruktor der Klasse +#* Funktion: Destruktor der Klasse #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -138,39 +138,39 @@ __EXPORT ScColRowNameRangesDlg::~ScColRowNameRangesDlg() /************************************************************************* -#* Member: Init Datum:04.09.97 +#* Member: Init Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Initialisierungs- Routine: -#* Umlenken der Event- Handler und einstellen der -#* Startparameter. +#* Funktion: Initialisierungs- Routine: +#* Umlenken der Event- Handler und einstellen der +#* Startparameter. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ void ScColRowNameRangesDlg::Init() { - SCCOL nStartCol = 0; - SCROW nStartRow = 0; - SCTAB nStartTab = 0; - SCCOL nEndCol = 0; - SCROW nEndRow = 0; - SCTAB nEndTab = 0; - - aBtnOk.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, OkBtnHdl ) ); - aBtnCancel.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, CancelBtnHdl ) ); - aBtnAdd.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, AddBtnHdl ) ); - aBtnRemove.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RemoveBtnHdl ) ); - aLbRange.SetSelectHdl ( LINK( this, ScColRowNameRangesDlg, Range1SelectHdl ) ); - aEdAssign.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range1DataModifyHdl ) ); - aBtnColHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, ColClickHdl ) ); - aBtnRowHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RowClickHdl ) ); - aEdAssign2.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range2DataModifyHdl ) ); + SCCOL nStartCol = 0; + SCROW nStartRow = 0; + SCTAB nStartTab = 0; + SCCOL nEndCol = 0; + SCROW nEndRow = 0; + SCTAB nEndTab = 0; + + aBtnOk.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, OkBtnHdl ) ); + aBtnCancel.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, CancelBtnHdl ) ); + aBtnAdd.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, AddBtnHdl ) ); + aBtnRemove.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RemoveBtnHdl ) ); + aLbRange.SetSelectHdl ( LINK( this, ScColRowNameRangesDlg, Range1SelectHdl ) ); + aEdAssign.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range1DataModifyHdl ) ); + aBtnColHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, ColClickHdl ) ); + aBtnRowHead.SetClickHdl ( LINK( this, ScColRowNameRangesDlg, RowClickHdl ) ); + aEdAssign2.SetModifyHdl ( LINK( this, ScColRowNameRangesDlg, Range2DataModifyHdl ) ); Link aLink = LINK( this, ScColRowNameRangesDlg, GetFocusHdl ); aEdAssign.SetGetFocusHdl( aLink ); @@ -191,7 +191,7 @@ void ScColRowNameRangesDlg::Init() if ( pViewData && pDoc ) { pViewData->GetSimpleArea( nStartCol, nStartRow, nStartTab, - nEndCol, nEndRow, nEndTab ); + nEndCol, nEndRow, nEndTab ); SetColRowData( ScRange( ScAddress( nStartCol, nStartRow, nStartTab ), ScAddress( nEndCol, nEndRow, nEndTab ) ) ); } @@ -210,25 +210,25 @@ void ScColRowNameRangesDlg::Init() aEdAssign.GrabFocus(); aRbAssign.Enable(); //@BugID 54702 Enablen/Disablen nur noch in Basisklasse - //SFX_APPWINDOW->Enable(); // Ref-Feld hat Focus + //SFX_APPWINDOW->Enable(); // Ref-Feld hat Focus Range1SelectHdl( 0 ); } /************************************************************************* -#* Member: SetColRowData Datum:04.09.97 +#* Member: SetColRowData Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: zugehoerigen Datenbereich eines Beschriftungsbereiches -#* auf default Werte setzen und beide Referenz-Edit-Felder -#* fuellen. +#* Funktion: zugehoerigen Datenbereich eines Beschriftungsbereiches +#* auf default Werte setzen und beide Referenz-Edit-Felder +#* fuellen. #* -#* Input: Einstellbereich fuer Labels +#* Input: Einstellbereich fuer Labels #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -241,36 +241,36 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef) SCROW nRow1 = theCurArea.aStart.Row(); SCROW nRow2 = theCurArea.aEnd.Row(); if ( (static_cast<SCCOLROW>(nCol2 - nCol1) >= nRow2 - nRow1) || (nCol1 == 0 && nCol2 == MAXCOL) ) - { // Spaltenkoepfe und Grenzfall gesamte Tabelle + { // Spaltenkoepfe und Grenzfall gesamte Tabelle aBtnColHead.Check( TRUE ); aBtnRowHead.Check( FALSE ); if ( nRow2 == MAXROW ) { if ( nRow1 == 0 ) - bValid = FALSE; // Grenzfall gesamte Tabelle + bValid = FALSE; // Grenzfall gesamte Tabelle else - { // Head unten, Data oben + { // Head unten, Data oben theCurData.aStart.SetRow( 0 ); theCurData.aEnd.SetRow( nRow1 - 1 ); } } else - { // Head oben, Data unten + { // Head oben, Data unten theCurData.aStart.SetRow( nRow2 + 1 ); theCurData.aEnd.SetRow( MAXROW ); } } else - { // Zeilenkoepfe + { // Zeilenkoepfe aBtnRowHead.Check( TRUE ); aBtnColHead.Check( FALSE ); if ( nCol2 == MAXCOL ) - { // Head rechts, Data links + { // Head rechts, Data links theCurData.aStart.SetCol( 0 ); theCurData.aEnd.SetCol( nCol2 - 1 ); } else - { // Head links, Data rechts + { // Head links, Data rechts theCurData.aStart.SetCol( nCol2 + 1 ); theCurData.aEnd.SetCol( MAXCOL ); } @@ -318,17 +318,17 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange,BOOL bRef) /************************************************************************* -#* Member: AdjustColRowData Datum:04.09.97 +#* Member: AdjustColRowData Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: zugehoerigen Datenbereich eines Beschriftungsbereiches -#* anpassen und Data-Referenz-Edit-Feld fuellen. +#* Funktion: zugehoerigen Datenbereich eines Beschriftungsbereiches +#* anpassen und Data-Referenz-Edit-Feld fuellen. #* -#* Input: Bereich fuer Labels +#* Input: Bereich fuer Labels #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -336,7 +336,7 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe { theCurData = rDataRange; if ( aBtnColHead.IsChecked() ) - { // Datenbereich gleiche Spalten wie Koepfe + { // Datenbereich gleiche Spalten wie Koepfe theCurData.aStart.SetCol( theCurArea.aStart.Col() ); theCurData.aEnd.SetCol( theCurArea.aEnd.Col() ); if ( theCurData.Intersects( theCurArea ) ) @@ -345,13 +345,13 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe SCROW nRow2 = theCurArea.aEnd.Row(); if ( nRow1 > 0 && (theCurData.aEnd.Row() < nRow2 || nRow2 == MAXROW) ) - { // Data oben + { // Data oben theCurData.aEnd.SetRow( nRow1 - 1 ); if ( theCurData.aStart.Row() > theCurData.aEnd.Row() ) theCurData.aStart.SetRow( theCurData.aEnd.Row() ); } else - { // Data unten + { // Data unten theCurData.aStart.SetRow( nRow2 + 1 ); if ( theCurData.aStart.Row() > theCurData.aEnd.Row() ) theCurData.aEnd.SetRow( theCurData.aStart.Row() ); @@ -359,7 +359,7 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe } } else - { // Datenbereich gleiche Zeilen wie Koepfe + { // Datenbereich gleiche Zeilen wie Koepfe theCurData.aStart.SetRow( theCurArea.aStart.Row() ); theCurData.aEnd.SetRow( theCurArea.aEnd.Row() ); if ( theCurData.Intersects( theCurArea ) ) @@ -368,13 +368,13 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe SCCOL nCol2 = theCurArea.aEnd.Col(); if ( nCol1 > 0 && (theCurData.aEnd.Col() < nCol2 || nCol2 == MAXCOL) ) - { // Data links + { // Data links theCurData.aEnd.SetCol( nCol1 - 1 ); if ( theCurData.aStart.Col() > theCurData.aEnd.Col() ) theCurData.aStart.SetCol( theCurData.aEnd.Col() ); } else - { // Data rechts + { // Data rechts theCurData.aStart.SetCol( nCol2 + 1 ); if ( theCurData.aStart.Col() > theCurData.aEnd.Col() ) theCurData.aEnd.SetCol( theCurData.aStart.Col() ); @@ -394,19 +394,19 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange,BOOL bRe /************************************************************************* -#* Member: SetReference Datum:04.09.97 +#* Member: SetReference Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Uebergabe eines mit der Maus selektierten Tabellen- -#* bereiches, der dann als neue Selektion im Referenz- -#* Fenster angezeigt wird. +#* Funktion: Uebergabe eines mit der Maus selektierten Tabellen- +#* bereiches, der dann als neue Selektion im Referenz- +#* Fenster angezeigt wird. #* -#* Input: Bereich fuer Labels -#* Dokumentklasse +#* Input: Bereich fuer Labels +#* Dokumentklasse #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -431,16 +431,16 @@ void ScColRowNameRangesDlg::SetReference( const ScRange& rRef, ScDocument* /* pD /************************************************************************* -#* Member: Close Datum:04.09.97 +#* Member: Close Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Schliessen des Fensters +#* Funktion: Schliessen des Fensters #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -451,16 +451,16 @@ BOOL __EXPORT ScColRowNameRangesDlg::Close() /************************************************************************* -#* Member: SetActive Datum:04.09.97 +#* Member: SetActive Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Aktivieren des Fensters +#* Funktion: Aktivieren des Fensters #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -485,16 +485,16 @@ void ScColRowNameRangesDlg::SetActive() /************************************************************************* -#* Member: UpdateNames Datum:04.09.97 +#* Member: UpdateNames Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Aktualisieren der Namen +#* Funktion: Aktualisieren der Namen #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -509,8 +509,8 @@ void ScColRowNameRangesDlg::UpdateNames() ULONG nCount, j; USHORT nPos; //@008 Hilfsvariable q eingefuegt - SCCOL nCol1; //@008 04.09.97 - SCROW nRow1; //Erweiterung fuer Bereichsnamen + SCCOL nCol1; //@008 04.09.97 + SCROW nRow1; //Erweiterung fuer Bereichsnamen SCTAB nTab1; SCCOL nCol2; SCROW nRow2; @@ -545,12 +545,12 @@ void ScColRowNameRangesDlg::UpdateNames() if(pDoc!=NULL) { pDoc->GetString(nCol1, nRow1, nTab1,rString); - strShow +=rString; + strShow +=rString; for(SCCOL i=nCol1+1;i<=q;i++) { strShow.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); pDoc->GetString(i, nRow1, nTab1,rString); - strShow += rString; + strShow += rString; } } if(q<nCol2) // Zu lang? Ergaenzen um ",..." @@ -591,12 +591,12 @@ void ScColRowNameRangesDlg::UpdateNames() if(pDoc!=NULL) { pDoc->GetString(nCol1, nRow1, nTab1,rString); - strShow += rString; + strShow += rString; for(SCROW i=nRow1+1;i<=q;i++) { strShow.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", ")); pDoc->GetString(nCol1, i, nTab1,rString); - strShow += rString; + strShow += rString; } } if(q<nRow2) @@ -620,17 +620,17 @@ void ScColRowNameRangesDlg::UpdateNames() /************************************************************************* -#* Member: UpdateRangeData Datum:04.09.97 +#* Member: UpdateRangeData Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Aktualisieren der Bereichsdaten +#* Funktion: Aktualisieren der Bereichsdaten #* -#* Input: Bereichs-String -#* Flag fuer Spalten +#* Input: Bereichs-String +#* Flag fuer Spalten #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -671,17 +671,17 @@ void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, BOOL bColNam /************************************************************************* -#* Member: IsRefInputMode Datum:04.09.97 +#* Member: IsRefInputMode Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Abfragefunktion fuer Referenz- Input- Mode. +#* Funktion: Abfragefunktion fuer Referenz- Input- Mode. #* -#* Input: Bereichs-String -#* Flag fuer Spalten +#* Input: Bereichs-String +#* Flag fuer Spalten #* -#* Output: true, wenn Referenz- Input- Mode +#* Output: true, wenn Referenz- Input- Mode #* #************************************************************************/ @@ -695,18 +695,18 @@ BOOL ScColRowNameRangesDlg::IsRefInputMode() const // ======== /************************************************************************* -#* Handler: OkBtnHdl Datum:04.09.97 +#* Handler: OkBtnHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* #* Funktion: Wird ausgeloest, wenn der OK- Button gedrueckt wurde. -#* Hinzufuegen- Button ausloesen, und die neu einge- -#* stellten Bereiche ans Dokument uebergeben. -#* Fensterschliessen- Anweisung ausloesen. -#* Input: --- +#* Hinzufuegen- Button ausloesen, und die neu einge- +#* stellten Bereiche ans Dokument uebergeben. +#* Fensterschliessen- Anweisung ausloesen. +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -729,16 +729,16 @@ IMPL_LINK( ScColRowNameRangesDlg, OkBtnHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: CancelBtnHdl Datum:04.09.97 +#* Handler: CancelBtnHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Fensterschliessen- Anweisung ausloesen. +#* Funktion: Fensterschliessen- Anweisung ausloesen. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -751,18 +751,18 @@ IMPL_LINK_INLINE_END( ScColRowNameRangesDlg, CancelBtnHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: AddBtnHdl Datum:04.09.97 +#* Handler: AddBtnHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Nach betaetigen des Hinzufuegen- Buttons, werden -#* die Bereichsangaben eingestellt und in der -#* Listbox dargestellt. +#* Funktion: Nach betaetigen des Hinzufuegen- Buttons, werden +#* die Bereichsangaben eingestellt und in der +#* Listbox dargestellt. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -824,17 +824,17 @@ IMPL_LINK( ScColRowNameRangesDlg, AddBtnHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: RemoveBtnHdl Datum:04.09.97 +#* Handler: RemoveBtnHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Nach betaetigen des Loeschen- Buttons, wird -#* die markierte Bereichsangabe geloescht. +#* Funktion: Nach betaetigen des Loeschen- Buttons, wird +#* die markierte Bereichsangabe geloescht. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -858,7 +858,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) if ( bFound ) { String aStrDelMsg = ScGlobal::GetRscString( STR_QUERY_DELENTRY ); - String aMsg = aStrDelMsg.GetToken( 0, '#' ); + String aMsg = aStrDelMsg.GetToken( 0, '#' ); aMsg += aRangeStr; aMsg += aStrDelMsg.GetToken( 1, '#' ); @@ -883,7 +883,7 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) aLbRange.SelectEntryPos( nSelectPos ); if ( nSelectPos && (ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim ) - aLbRange.SelectEntryPos( --nSelectPos ); // ---Zeile--- + aLbRange.SelectEntryPos( --nSelectPos ); // ---Zeile--- aLbRange.GrabFocus(); aBtnAdd.Disable(); @@ -901,18 +901,18 @@ IMPL_LINK( ScColRowNameRangesDlg, RemoveBtnHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: Range1SelectHdl Datum:04.09.97 +#* Handler: Range1SelectHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Wenn Zeile in Listbox ausgewaehlt wird, -#* werden die Eingabefelder entsprechend -#* eingestellt. +#* Funktion: Wenn Zeile in Listbox ausgewaehlt wird, +#* werden die Eingabefelder entsprechend +#* eingestellt. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -923,7 +923,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) USHORT nMoves = 0; while ( nSelectPos < nCnt && (ULONG)aLbRange.GetEntryData( nSelectPos ) == nEntryDataDelim ) - { // skip Delimiter + { // skip Delimiter ++nMoves; aLbRange.SelectEntryPos( ++nSelectPos ); } @@ -931,7 +931,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) if ( nMoves ) { if ( nSelectPos > 1 && nSelectPos >= nCnt ) - { // am Ende nicht auf dem " --- Zeile --- " Delimiter stehenbleiben + { // am Ende nicht auf dem " --- Zeile --- " Delimiter stehenbleiben // wenn davor Eintraege existieren nSelectPos = nCnt - 2; aLbRange.SelectEntryPos( nSelectPos ); @@ -939,7 +939,7 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) } else if ( nSelectPos > 2 && nSelectPos < nCnt && aRangeStr.Len() && aRangeStr == aEdAssign.GetText() ) - { // nach oben wandern statt nach unten auf die vorherige Position + { // nach oben wandern statt nach unten auf die vorherige Position nSelectPos -= 2; aLbRange.SelectEntryPos( nSelectPos ); aRangeStr = aLbRange.GetSelectEntry(); @@ -989,17 +989,17 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1SelectHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: Range1DataModifyHdl Datum:04.09.97 +#* Handler: Range1DataModifyHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Wird ausgeloest, wenn in der Tabelle, der Label- -#* Bereich geaendert wurde. +#* Funktion: Wird ausgeloest, wenn in der Tabelle, der Label- +#* Bereich geaendert wurde. #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1038,17 +1038,17 @@ IMPL_LINK( ScColRowNameRangesDlg, Range1DataModifyHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: Range2DataModifyHdl Datum:04.09.97 +#* Handler: Range2DataModifyHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Wird ausgeloest, wenn in der Tabelle, der Daten- -#* Bereich geaendert wurde +#* Funktion: Wird ausgeloest, wenn in der Tabelle, der Daten- +#* Bereich geaendert wurde #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1075,18 +1075,18 @@ IMPL_LINK( ScColRowNameRangesDlg, Range2DataModifyHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: ColClickHdl Datum:04.09.97 +#* Handler: ColClickHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Radiobutton fuer Spalten wurde betaetigt, -#* die entsprechenden Einstellungen werden -#* vorgenommen +#* Funktion: Radiobutton fuer Spalten wurde betaetigt, +#* die entsprechenden Einstellungen werden +#* vorgenommen #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ @@ -1113,18 +1113,18 @@ IMPL_LINK( ScColRowNameRangesDlg, ColClickHdl, void *, EMPTYARG ) /************************************************************************* -#* Handler: RowClickHdl Datum:04.09.97 +#* Handler: RowClickHdl Datum:04.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScColRowNameRangesDlg +#* Klasse: ScColRowNameRangesDlg #* -#* Funktion: Radiobutton fuer Zeilen wurde betaetigt, -#* die entsprechenden Einstellungen werden -#* vorgenommen +#* Funktion: Radiobutton fuer Zeilen wurde betaetigt, +#* die entsprechenden Einstellungen werden +#* vorgenommen #* -#* Input: --- +#* Input: --- #* -#* Output: --- +#* Output: --- #* #************************************************************************/ diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index 8d20d2ee50e6..6ece4b648d64 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index e8c7dde31443..c98721eb4aff 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,7 +61,7 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, aBtnDelFormulas ( this, ScResId( BTN_DELFORMULAS ) ), aBtnDelNotes ( this, ScResId( BTN_DELNOTES ) ), aBtnDelAttrs ( this, ScResId( BTN_DELATTRS ) ), - aBtnDelObjects ( this, ScResId( BTN_DELOBJECTS ) ), + aBtnDelObjects ( this, ScResId( BTN_DELOBJECTS ) ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 46af2992e4a5..aa70e7cfb7ba 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -55,16 +55,16 @@ //---------------------------------------------------------------------------- ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, - ScDocument& rDocument, + ScDocument& rDocument, FillDir eFillDir, FillCmd eFillCmd, FillDateCmd eFillDateCmd, - String aStartStr, - double fStep, - double fMax, - USHORT nPossDir ) + String aStartStr, + double fStep, + double fMax, + USHORT nPossDir ) - : ModalDialog ( pParent, ScResId( RID_SCDLG_FILLSERIES ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_FILLSERIES ) ), aFlDirection ( this, ScResId( FL_DIRECTION ) ), aBtnDown ( this, ScResId( BTN_BOTTOM ) ), @@ -86,7 +86,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, aFtStartVal ( this, ScResId( FT_START_VALUE ) ), aEdStartVal ( this, ScResId( ED_START_VALUES ) ), - aStartStrVal ( aStartStr), + aStartStrVal ( aStartStr), aFtEndVal ( this, ScResId( FT_END_VALUE ) ), aEdEndVal ( this, ScResId( ED_END_VALUES ) ), aFtIncrement ( this, ScResId( FT_INCREMENT ) ), @@ -96,7 +96,7 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), errMsgInvalidVal( ScResId( STR_VALERR ) ), - rDoc ( rDocument ), + rDoc ( rDocument ), theFillDir ( eFillDir ), theFillCmd ( eFillCmd ), theFillDateCmd ( eFillDateCmd ), @@ -264,9 +264,9 @@ BOOL __EXPORT ScFillSeriesDlg::CheckIncrementVal() BOOL __EXPORT ScFillSeriesDlg::CheckEndVal() { - BOOL bValOk = FALSE; + BOOL bValOk = FALSE; sal_uInt32 nKey = 0; - String aStr( aEdEndVal.GetText() ); + String aStr( aEdEndVal.GetText() ); if ( aStr.Len() == 0 ) { diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index d771e225ffdb..63bf0053b58c 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ //================================================================== ScGroupDlg::ScGroupDlg( Window* pParent, - USHORT nResId, + USHORT nResId, BOOL bUngroup, BOOL bRows ) : ModalDialog ( pParent, ScResId( nResId ) ), diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index d2c2f2c7cf84..aab3a2188c00 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,12 +49,12 @@ // defines ------------------------------------------------------------------- -#define ABS_SREF SCA_VALID \ +#define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE -#define ABS_DREF ABS_SREF \ +#define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D -#define ABS_DREF3D ABS_DREF | SCA_TAB_3D +#define ABS_SREF3D ABS_SREF | SCA_TAB_3D +#define ABS_DREF3D ABS_DREF | SCA_TAB_3D @@ -69,27 +69,27 @@ inline void EnableDisable( Window& rWin, BOOL bEnable ) } //============================================================================ -// class ScHighlightChgDlg +// class ScHighlightChgDlg //---------------------------------------------------------------------------- ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData) + ScViewData* ptrViewData) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_HIGHLIGHT_CHANGES ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_HIGHLIGHT_CHANGES ), // - aHighlightBox ( this, ScResId( CB_HIGHLIGHT)), + aHighlightBox ( this, ScResId( CB_HIGHLIGHT)), aFlFilter ( this, ScResId( FL_FILTER)), - aFilterCtr ( this), - aCbAccept ( this, ScResId( CB_HIGHLIGHT_ACCEPT)), - aCbReject ( this, ScResId( CB_HIGHLIGHT_REJECT)), - aOkButton ( this, ScResId( BTN_OK ) ), - aCancelButton ( this, ScResId( BTN_CANCEL ) ), - aHelpButton ( this, ScResId( BTN_HELP ) ), + aFilterCtr ( this), + aCbAccept ( this, ScResId( CB_HIGHLIGHT_ACCEPT)), + aCbReject ( this, ScResId( CB_HIGHLIGHT_REJECT)), + aOkButton ( this, ScResId( BTN_OK ) ), + aCancelButton ( this, ScResId( BTN_CANCEL ) ), + aHelpButton ( this, ScResId( BTN_HELP ) ), aEdAssign ( this, this, ScResId( ED_ASSIGN ) ), - aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), + aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), // - pViewData ( ptrViewData ), - pDoc ( ptrViewData->GetDocument() ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData->GetDocument() ), aLocalRangeName ( *(pDoc->GetRangeName()) ) { FreeResource(); @@ -119,7 +119,7 @@ ScHighlightChgDlg::~ScHighlightChgDlg() void __EXPORT ScHighlightChgDlg::Init() { - String aAreaStr; + String aAreaStr; ScRange aRange; DBG_ASSERT( pViewData && pDoc, "ViewData oder Document nicht gefunden!" ); @@ -130,7 +130,7 @@ void __EXPORT ScHighlightChgDlg::Init() aChangeViewSet.SetTheAuthorToShow(pChanges->GetUser()); aFilterCtr.ClearAuthors(); ScStrCollection aUserColl=pChanges->GetUserCollection(); - for(USHORT i=0;i<aUserColl.GetCount();i++) + for(USHORT i=0;i<aUserColl.GetCount();i++) aFilterCtr.InsertAuthor(aUserColl[i]->GetString()); } diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src index a244a3e2a44e..ce6409347168 100644 --- a/sc/source/ui/miscdlgs/highred.src +++ b/sc/source/ui/miscdlgs/highred.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index f09513960ae4..99d92f08a106 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 63d55ac6f41e..b96ccb1346a6 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,12 +48,12 @@ USHORT ScInsertContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | IDF_ATTRIB | IDF_OBJECTS); USHORT ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; USHORT ScInsertContentsDlg::nPreviousChecks2 = 0; -USHORT ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd +USHORT ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd //----------------------------------------------------------------------- -ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, - USHORT nCheckDefaults, +ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, + USHORT nCheckDefaults, const String* pStrTitle ) : ModalDialog ( pParent, ScResId( RID_SCDLG_INSCONT ) ), @@ -70,11 +70,11 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, aFlSep1 ( this, ScResId( FL_SEP1 ) ), aFlOptions ( this, ScResId( FL_OPTIONS ) ), aBtnSkipEmptyCells( this, ScResId(BTN_SKIP_EMPTY ) ), - aBtnTranspose ( this, ScResId( BTN_TRANSPOSE ) ), + aBtnTranspose ( this, ScResId( BTN_TRANSPOSE ) ), aBtnLink ( this, ScResId( BTN_LINK ) ), aFlOperation ( this, ScResId( FL_OPERATION ) ), aRbNoOp ( this, ScResId( BTN_OP_NOOP ) ), - aRbAdd ( this, ScResId( BTN_OP_ADD ) ), + aRbAdd ( this, ScResId( BTN_OP_ADD ) ), aRbSub ( this, ScResId( BTN_OP_SUB ) ), aRbMul ( this, ScResId( BTN_OP_MUL ) ), aRbDiv ( this, ScResId( BTN_OP_DIV ) ), @@ -86,9 +86,9 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), - bOtherDoc ( FALSE ), - bFillMode ( FALSE ), - bChangeTrack ( FALSE ), + bOtherDoc ( FALSE ), + bFillMode ( FALSE ), + bChangeTrack ( FALSE ), bMoveDownDisabled( FALSE ), bMoveRightDisabled( FALSE ) { @@ -129,14 +129,14 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, switch( ScInsertContentsDlg::nPreviousMoveMode ) { - case INS_NONE: aRbMoveNone.Check(TRUE); break; - case INS_CELLSDOWN: aRbMoveDown.Check(TRUE); break; + case INS_NONE: aRbMoveNone.Check(TRUE); break; + case INS_CELLSDOWN: aRbMoveDown.Check(TRUE); break; case INS_CELLSRIGHT: aRbMoveRight.Check(TRUE); break; } aBtnSkipEmptyCells.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_NOEMPTY ) != 0); - aBtnTranspose.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_TRANS ) != 0); - aBtnLink.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_LINK ) != 0); + aBtnTranspose.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_TRANS ) != 0); + aBtnLink.Check( ( ScInsertContentsDlg::nPreviousChecks2 & INS_CONT_LINK ) != 0); DisableChecks( aBtnInsAll.IsChecked() ); @@ -213,7 +213,7 @@ void ScInsertContentsDlg::DisableChecks( BOOL bInsAllChecked ) aBtnInsNotes.Enable(); aBtnInsAttrs.Enable(); - // "Objects" is disabled for "Fill Tables" + // "Objects" is disabled for "Fill Tables" if ( bFillMode ) aBtnInsObjects.Disable(); else @@ -338,12 +338,12 @@ __EXPORT ScInsertContentsDlg::~ScInsertContentsDlg() ScInsertContentsDlg::nPreviousChecks2 = 0; if(aBtnSkipEmptyCells.IsChecked()) ScInsertContentsDlg::nPreviousChecks2 |= INS_CONT_NOEMPTY; - if( aBtnTranspose.IsChecked()) + if( aBtnTranspose.IsChecked()) ScInsertContentsDlg::nPreviousChecks2 |= INS_CONT_TRANS; if( aBtnLink.IsChecked() ) ScInsertContentsDlg::nPreviousChecks2 |= INS_CONT_LINK; - if (!bFillMode) // im FillMode ist None gecheckt und alle 3 disabled + if (!bFillMode) // im FillMode ist None gecheckt und alle 3 disabled { if ( aRbMoveNone.IsChecked() ) ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; @@ -354,7 +354,7 @@ __EXPORT ScInsertContentsDlg::~ScInsertContentsDlg() } } -USHORT ScInsertContentsDlg::GetFormulaCmdBits() const +USHORT ScInsertContentsDlg::GetFormulaCmdBits() const { ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; if(aRbAdd.IsChecked()) diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index d3a5cbe4f0dd..5ee5e824e072 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -68,32 +68,32 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile ) - : ModalDialog ( pParent, ScResId( RID_SCDLG_INSERT_TABLE ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_INSERT_TABLE ) ), // - aBtnBefore ( this, ScResId( RB_BEFORE ) ), - aBtnBehind ( this, ScResId( RB_BEHIND ) ), - aFlPos ( this, ScResId( FL_POSITION ) ), - aBtnNew ( this, ScResId( RB_NEW ) ), + aBtnBefore ( this, ScResId( RB_BEFORE ) ), + aBtnBehind ( this, ScResId( RB_BEHIND ) ), + aFlPos ( this, ScResId( FL_POSITION ) ), + aBtnNew ( this, ScResId( RB_NEW ) ), aBtnFromFile ( this, ScResId( RB_FROMFILE ) ), - aFtCount ( this, ScResId( FT_COUNT ) ), - aNfCount ( this, ScResId( NF_COUNT ) ), - aFtName ( this, ScResId( FT_NAME ) ), - aEdName ( this, ScResId( ED_TABNAME ) ), - aLbTables ( this, ScResId( LB_TABLES ) ), - aFtPath ( this, ScResId( FT_PATH ) ), - aBtnBrowse ( this, ScResId( BTN_BROWSE ) ), - aBtnLink ( this, ScResId( CB_LINK ) ), - aFlTable ( this, ScResId( FL_TABLE ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - rViewData ( rData ), - rDoc ( *rData.GetDocument() ), - pDocShTables ( NULL ), + aFtCount ( this, ScResId( FT_COUNT ) ), + aNfCount ( this, ScResId( NF_COUNT ) ), + aFtName ( this, ScResId( FT_NAME ) ), + aEdName ( this, ScResId( ED_TABNAME ) ), + aLbTables ( this, ScResId( LB_TABLES ) ), + aFtPath ( this, ScResId( FT_PATH ) ), + aBtnBrowse ( this, ScResId( BTN_BROWSE ) ), + aBtnLink ( this, ScResId( CB_LINK ) ), + aFlTable ( this, ScResId( FL_TABLE ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + rViewData ( rData ), + rDoc ( *rData.GetDocument() ), + pDocShTables ( NULL ), pDocInserter ( NULL ), bMustClose ( false ), - nSelTabIndex ( 0 ), - nTableCount (nTabCount) + nSelTabIndex ( 0 ), + nTableCount (nTabCount) { #if ENABLE_LAYOUT SetHelpId (SID_INSERT_TABLE); @@ -116,12 +116,12 @@ __EXPORT ScInsertTableDlg::~ScInsertTableDlg() void ScInsertTableDlg::Init_Impl( bool bFromFile ) { - aBtnBrowse .SetClickHdl( LINK( this, ScInsertTableDlg, BrowseHdl_Impl ) ); - aBtnNew .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) ); - aBtnFromFile .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) ); - aLbTables .SetSelectHdl( LINK( this, ScInsertTableDlg, SelectHdl_Impl ) ); - aNfCount .SetModifyHdl( LINK( this, ScInsertTableDlg, CountHdl_Impl)); - aBtnOk .SetClickHdl( LINK( this, ScInsertTableDlg, DoEnterHdl )); + aBtnBrowse .SetClickHdl( LINK( this, ScInsertTableDlg, BrowseHdl_Impl ) ); + aBtnNew .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) ); + aBtnFromFile .SetClickHdl( LINK( this, ScInsertTableDlg, ChoiceHdl_Impl ) ); + aLbTables .SetSelectHdl( LINK( this, ScInsertTableDlg, SelectHdl_Impl ) ); + aNfCount .SetModifyHdl( LINK( this, ScInsertTableDlg, CountHdl_Impl)); + aBtnOk .SetClickHdl( LINK( this, ScInsertTableDlg, DoEnterHdl )); aBtnBefore.Check(); aNfCount.SetText( String::CreateFromInt32(nTableCount) ); @@ -173,7 +173,7 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile ) short __EXPORT ScInsertTableDlg::Execute() { // set Parent of DocumentInserter and Doc-Manager - Window* pOldDefParent = Application::GetDefDialogParent(); + Window* pOldDefParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( LAYOUT_THIS_WINDOW (this) ); if ( aBtnFromFile.IsChecked() ) @@ -190,12 +190,12 @@ void ScInsertTableDlg::SetNewTable_Impl() { if (aBtnNew.IsChecked() ) { - aNfCount .Enable(); - aFtCount .Enable(); - aLbTables .Disable(); - aFtPath .Disable(); - aBtnBrowse .Disable(); - aBtnLink .Disable(); + aNfCount .Enable(); + aFtCount .Enable(); + aLbTables .Disable(); + aFtPath .Disable(); + aBtnBrowse .Disable(); + aBtnLink .Disable(); if(nTableCount==1) { @@ -211,14 +211,14 @@ void ScInsertTableDlg::SetFromTo_Impl() { if (aBtnFromFile.IsChecked() ) { - aEdName .Disable(); - aFtName .Disable(); - aFtCount .Disable(); - aNfCount .Disable(); - aLbTables .Enable(); - aFtPath .Enable(); - aBtnBrowse .Enable(); - aBtnLink .Enable(); + aEdName .Disable(); + aFtName .Disable(); + aFtCount .Disable(); + aNfCount .Disable(); + aLbTables .Enable(); + aFtPath .Enable(); + aBtnBrowse .Enable(); + aBtnLink .Enable(); } } diff --git a/sc/source/ui/miscdlgs/instbdlg.src b/sc/source/ui/miscdlgs/instbdlg.src index 6f64c0de1d62..375dfc24fa4a 100644 --- a/sc/source/ui/miscdlgs/instbdlg.src +++ b/sc/source/ui/miscdlgs/instbdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index f340cab4127c..f2a9a73c7538 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ //================================================================== ScSelEntryDlg::ScSelEntryDlg( Window* pParent, - USHORT nResId, + USHORT nResId, const String& aTitle, const String& aLbTitle, List& aEntryList ) : diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 26bc8cc56dad..f6aea5799417 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,18 +58,18 @@ ScLinkedAreaDlg::ScLinkedAreaDlg( Window* pParent ) : ModalDialog ( pParent, ScResId( RID_SCDLG_LINKAREA ) ), // - aFlLocation ( this, ScResId( FL_LOCATION ) ), - aCbUrl ( this, ScResId( CB_URL ) ), - aBtnBrowse ( this, ScResId( BTN_BROWSE ) ), - aTxtHint ( this, ScResId( FT_HINT ) ), - aFtRanges ( this, ScResId( FT_RANGES ) ), - aLbRanges ( this, ScResId( LB_RANGES ) ), - aBtnReload ( this, ScResId( BTN_RELOAD ) ), - aNfDelay ( this, ScResId( NF_DELAY ) ), - aFtSeconds ( this, ScResId( FT_SECONDS ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aFlLocation ( this, ScResId( FL_LOCATION ) ), + aCbUrl ( this, ScResId( CB_URL ) ), + aBtnBrowse ( this, ScResId( BTN_BROWSE ) ), + aTxtHint ( this, ScResId( FT_HINT ) ), + aFtRanges ( this, ScResId( FT_RANGES ) ), + aLbRanges ( this, ScResId( LB_RANGES ) ), + aBtnReload ( this, ScResId( BTN_RELOAD ) ), + aNfDelay ( this, ScResId( NF_DELAY ) ), + aFtSeconds ( this, ScResId( FT_SECONDS ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), // pSourceShell( NULL ), pDocInserter( NULL ) @@ -77,7 +77,7 @@ ScLinkedAreaDlg::ScLinkedAreaDlg( Window* pParent ) : { FreeResource(); - aCbUrl.SetHelpId( HID_SCDLG_LINKAREAURL ); // SvtURLBox ctor always sets SID_OPENURL + aCbUrl.SetHelpId( HID_SCDLG_LINKAREAURL ); // SvtURLBox ctor always sets SID_OPENURL aCbUrl.SetSelectHdl( LINK( this, ScLinkedAreaDlg, FileHdl ) ); aBtnBrowse.SetClickHdl( LINK( this, ScLinkedAreaDlg, BrowseHdl ) ); aLbRanges.SetSelectHdl( LINK( this, ScLinkedAreaDlg, RangeHdl ) ); @@ -94,7 +94,7 @@ short ScLinkedAreaDlg::Execute() { // set parent for file dialog or filter options - Window* pOldDefParent = Application::GetDefDialogParent(); + Window* pOldDefParent = Application::GetDefDialogParent(); Application::SetDefDialogParent( this ); short nRet = ModalDialog::Execute(); @@ -124,14 +124,14 @@ IMPL_LINK( ScLinkedAreaDlg, FileHdl, ComboBox*, EMPTYARG ) SfxMedium* pMed = pSourceShell->GetMedium(); if ( pMed->GetName() == aEntered ) { - // already loaded - nothing to do + // already loaded - nothing to do return 0; } } String aFilter; String aOptions; - // get filter name by looking at the file content (bWithContent = TRUE) + // get filter name by looking at the file content (bWithContent = TRUE) // Break operation if any error occured inside. if (!ScDocumentLoader::GetFilterName( aEntered, aFilter, aOptions, TRUE, TRUE )) return 0; @@ -151,7 +151,7 @@ void ScLinkedAreaDlg::LoadDocument( const String& rFile, const String& rFilter, { if ( pSourceShell ) { - // unload old document + // unload old document pSourceShell->DoClose(); pSourceShell = NULL; aSourceRef.Clear(); @@ -166,16 +166,16 @@ void ScLinkedAreaDlg::LoadDocument( const String& rFile, const String& rFilter, SfxErrorContext aEc( ERRCTX_SFX_OPENDOC, rFile ); - ScDocumentLoader aLoader( rFile, aNewFilter, aNewOptions, 0, TRUE ); // with interaction + ScDocumentLoader aLoader( rFile, aNewFilter, aNewOptions, 0, TRUE ); // with interaction pSourceShell = aLoader.GetDocShell(); if ( pSourceShell ) { ULONG nErr = pSourceShell->GetErrorCode(); if (nErr) - ErrorHandler::HandleError( nErr ); // including warnings + ErrorHandler::HandleError( nErr ); // including warnings aSourceRef = pSourceShell; - aLoader.ReleaseDocRef(); // don't call DoClose in DocLoader dtor + aLoader.ReleaseDocRef(); // don't call DoClose in DocLoader dtor } } } @@ -362,7 +362,7 @@ ULONG ScLinkedAreaDlg::GetRefresh() if ( aBtnReload.IsChecked() ) return sal::static_int_cast<ULONG>( aNfDelay.GetValue() ); else - return 0; // disabled + return 0; // disabled } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/linkarea.src b/sc/source/ui/miscdlgs/linkarea.src index 715d3fd20766..ec5e3d4b868d 100644 --- a/sc/source/ui/miscdlgs/linkarea.src +++ b/sc/source/ui/miscdlgs/linkarea.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 7bc19c14fa27..510f5785fe83 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,9 +43,9 @@ //================================================================== ScMetricInputDlg::ScMetricInputDlg( Window* pParent, - USHORT nResId, - long nCurrent, - long nDefault, + USHORT nResId, + long nCurrent, + long nDefault, FieldUnit eFUnit, USHORT nDecimals, long nMaximum, @@ -53,11 +53,11 @@ ScMetricInputDlg::ScMetricInputDlg( Window* pParent, long nFirst, long nLast ) - : ModalDialog ( pParent, ScResId( nResId ) ), + : ModalDialog ( pParent, ScResId( nResId ) ), // aFtEditTitle ( this, ScResId( FT_LABEL ) ), aEdValue ( this, ScResId( ED_VALUE ) ), - aBtnDefVal ( this, ScResId( BTN_DEFVAL ) ), + aBtnDefVal ( this, ScResId( BTN_DEFVAL ) ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ) @@ -77,9 +77,9 @@ ScMetricInputDlg::ScMetricInputDlg( Window* pParent, aEdValue.SetFirst ( aEdValue.Normalize( nFirst ), FUNIT_TWIP ); aEdValue.SetSpinSize ( aEdValue.Normalize( 1 ) / 10 ); aEdValue.SetValue ( aEdValue.Normalize( nDefault ), FUNIT_TWIP ); - nDefaultValue = sal::static_int_cast<long>( aEdValue.GetValue() ); + nDefaultValue = sal::static_int_cast<long>( aEdValue.GetValue() ); aEdValue.SetValue ( aEdValue.Normalize( nCurrent ), FUNIT_TWIP ); - nCurrentValue = sal::static_int_cast<long>( aEdValue.GetValue() ); + nCurrentValue = sal::static_int_cast<long>( aEdValue.GetValue() ); aBtnDefVal.Check( nCurrentValue == nDefaultValue ); FreeResource(); @@ -98,9 +98,9 @@ long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const /* mit Nachkommastellen: - double nVal = aEdValue.GetValue( eUnit ); - USHORT nDecs = aEdValue.GetDecimalDigits(); - double nFactor = 0.0; + double nVal = aEdValue.GetValue( eUnit ); + USHORT nDecs = aEdValue.GetDecimalDigits(); + double nFactor = 0.0; // static long ImpPower10( USHORT nDecs ) { diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index b3505aa005ff..a000b1dfd10c 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ ScMoveTableDlg::ScMoveTableDlg( Window* pParent ) - : ModalDialog ( pParent, ScResId( RID_SCDLG_MOVETAB ) ), + : ModalDialog ( pParent, ScResId( RID_SCDLG_MOVETAB ) ), // aFtDoc ( this, ScResId( FT_DEST ) ), aLbDoc ( this, ScResId( LB_DEST ) ), @@ -123,10 +123,10 @@ void __EXPORT ScMoveTableDlg::Init() void ScMoveTableDlg::InitDocListBox() { - SfxObjectShell* pSh = SfxObjectShell::GetFirst(); - ScDocShell* pScSh = NULL; - USHORT nSelPos = 0; - USHORT i = 0; + SfxObjectShell* pSh = SfxObjectShell::GetFirst(); + ScDocShell* pScSh = NULL; + USHORT nSelPos = 0; + USHORT i = 0; aLbDoc.Clear(); aLbDoc.SetUpdateMode( FALSE ); diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx index 269ae78ad21f..67e22dae7b1a 100644 --- a/sc/source/ui/miscdlgs/namecrea.cxx +++ b/sc/source/ui/miscdlgs/namecrea.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,18 +45,18 @@ ScNameCreateDlg::ScNameCreateDlg( Window * pParent, USHORT nFlags ) : ModalDialog( pParent, ScResId(RID_SCDLG_NAMES_CREATE) ), aFixedLine ( this, ScResId( FL_FRAME ) ), - aTopBox ( this, ScResId( BTN_TOP ) ), - aLeftBox ( this, ScResId( BTN_LEFT ) ), - aBottomBox ( this, ScResId( BTN_BOTTOM ) ), - aRightBox ( this, ScResId( BTN_RIGHT ) ), - aOKButton ( this, ScResId( BTN_OK ) ), - aCancelButton ( this, ScResId( BTN_CANCEL ) ), - aHelpButton ( this, ScResId( BTN_HELP ) ) + aTopBox ( this, ScResId( BTN_TOP ) ), + aLeftBox ( this, ScResId( BTN_LEFT ) ), + aBottomBox ( this, ScResId( BTN_BOTTOM ) ), + aRightBox ( this, ScResId( BTN_RIGHT ) ), + aOKButton ( this, ScResId( BTN_OK ) ), + aCancelButton ( this, ScResId( BTN_CANCEL ) ), + aHelpButton ( this, ScResId( BTN_HELP ) ) { - aTopBox.Check ( (nFlags & NAME_TOP) ? TRUE : FALSE ); - aLeftBox.Check ( (nFlags & NAME_LEFT) ? TRUE : FALSE ); + aTopBox.Check ( (nFlags & NAME_TOP) ? TRUE : FALSE ); + aLeftBox.Check ( (nFlags & NAME_LEFT) ? TRUE : FALSE ); aBottomBox.Check( (nFlags & NAME_BOTTOM)? TRUE : FALSE ); - aRightBox.Check ( (nFlags & NAME_RIGHT) ? TRUE : FALSE ); + aRightBox.Check ( (nFlags & NAME_RIGHT) ? TRUE : FALSE ); FreeResource(); } @@ -65,12 +65,12 @@ ScNameCreateDlg::ScNameCreateDlg( Window * pParent, USHORT nFlags ) USHORT ScNameCreateDlg::GetFlags() const { - USHORT nResult = 0; + USHORT nResult = 0; - nResult |= aTopBox.IsChecked() ? NAME_TOP: 0 ; - nResult |= aLeftBox.IsChecked() ? NAME_LEFT: 0 ; - nResult |= aBottomBox.IsChecked() ? NAME_BOTTOM: 0 ; - nResult |= aRightBox.IsChecked() ? NAME_RIGHT: 0 ; + nResult |= aTopBox.IsChecked() ? NAME_TOP: 0 ; + nResult |= aLeftBox.IsChecked() ? NAME_LEFT: 0 ; + nResult |= aBottomBox.IsChecked() ? NAME_BOTTOM: 0 ; + nResult |= aRightBox.IsChecked() ? NAME_RIGHT: 0 ; return nResult; } diff --git a/sc/source/ui/miscdlgs/namepast.cxx b/sc/source/ui/miscdlgs/namepast.cxx index 6e5baea3ed42..543f3bd27005 100644 --- a/sc/source/ui/miscdlgs/namepast.cxx +++ b/sc/source/ui/miscdlgs/namepast.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,12 +45,12 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL bInsList ) : ModalDialog( pParent, ScResId( RID_SCDLG_NAMES_PASTE ) ), - aLabelText ( this, ScResId( FT_LABEL ) ), - aNameList ( this, ScResId( LB_ENTRYLIST ) ), - aOKButton ( this, ScResId( BTN_OK ) ), - aCancelButton ( this, ScResId( BTN_CANCEL ) ), - aHelpButton ( this, ScResId( BTN_HELP ) ), - aInsListButton ( this, ScResId( BTN_ADD ) ) + aLabelText ( this, ScResId( FT_LABEL ) ), + aNameList ( this, ScResId( LB_ENTRYLIST ) ), + aOKButton ( this, ScResId( BTN_OK ) ), + aCancelButton ( this, ScResId( BTN_CANCEL ) ), + aHelpButton ( this, ScResId( BTN_HELP ) ), + aInsListButton ( this, ScResId( BTN_ADD ) ) { if( ! bInsList ) aInsListButton.Disable(); @@ -60,8 +60,8 @@ ScNamePasteDlg::ScNamePasteDlg( Window * pParent, const ScRangeName* pList, BOOL aNameList.SetSelectHdl( LINK( this,ScNamePasteDlg,ListSelHdl) ); aNameList.SetDoubleClickHdl( LINK( this,ScNamePasteDlg,ListDblClickHdl) ); - USHORT nCnt = pList->GetCount(); - String aText; + USHORT nCnt = pList->GetCount(); + String aText; for( USHORT i=0 ; i<nCnt ; i++ ) { diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 4f70376455b5..9dd2e84550ce 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -499,7 +499,7 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { USHORT nFmt = ( aAdr.Tab() == mnCurTab ) ? SCA_ABS : SCA_ABS_3D; if ( bSingle ) - aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() ); + aAdr.Format( aStr, nFmt, pDocP, pDocP->GetAddressConvention() ); else rRef.Format( aStr, nFmt | SCR_ABS, pDocP, pDocP->GetAddressConvention() ); } diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index d66bd541a174..87185fdc75e2 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/protectiondlg.src b/sc/source/ui/miscdlgs/protectiondlg.src index 6b62efb4c784..34ad4063de57 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.src +++ b/sc/source/ui/miscdlgs/protectiondlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index cae6a64ce233..82e2578a5c65 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -75,7 +75,7 @@ ScChangeAction *ScRedComDialog::FindPrev(ScChangeAction *pAction) while(pAction!=NULL) { - if( pAction->GetState()==SC_CAS_VIRGIN && + if( pAction->GetState()==SC_CAS_VIRGIN && pAction->IsDialogRoot() && ScViewUtil::IsActionShown(*pAction,*pSettings,*pDoc)) break; @@ -96,7 +96,7 @@ ScChangeAction *ScRedComDialog::FindNext(ScChangeAction *pAction) while(pAction!=NULL) { - if( pAction->GetState()==SC_CAS_VIRGIN && + if( pAction->GetState()==SC_CAS_VIRGIN && pAction->IsDialogRoot() && ScViewUtil::IsActionShown(*pAction,*pSettings,*pDoc)) break; diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 2a844c784888..36aaa92ef0f2 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src index 794af9d43ebd..20cb3976a328 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.src +++ b/sc/source/ui/miscdlgs/retypepassdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index a7637afc5381..25e97a456af2 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -68,30 +68,30 @@ //======================================================================== // AutoFormat-Dialog: -ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, - ScAutoFormat* pAutoFormat, +ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, + ScAutoFormat* pAutoFormat, const ScAutoFormatData* pSelFormatData, ScDocument* pDoc ) : - ModalDialog ( pParent, ScResId( RID_SCDLG_AUTOFORMAT ) ), + ModalDialog ( pParent, ScResId( RID_SCDLG_AUTOFORMAT ) ), // aFlFormat ( this, ScResId( FL_FORMAT ) ), - aLbFormat ( this, ScResId( LB_FORMAT ) ), + aLbFormat ( this, ScResId( LB_FORMAT ) ), pWndPreview ( new ScAutoFmtPreview( this, ScResId( WND_PREVIEW ), pDoc ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aBtnAdd ( this, ScResId( BTN_ADD ) ), - aBtnRemove ( this, ScResId( BTN_REMOVE ) ), - aBtnMore ( this, ScResId( BTN_MORE ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnAdd ( this, ScResId( BTN_ADD ) ), + aBtnRemove ( this, ScResId( BTN_REMOVE ) ), + aBtnMore ( this, ScResId( BTN_MORE ) ), aFlFormatting ( this, ScResId( FL_FORMATTING ) ), - aBtnNumFormat ( this, ScResId( BTN_NUMFORMAT ) ), - aBtnBorder ( this, ScResId( BTN_BORDER ) ), - aBtnFont ( this, ScResId( BTN_FONT ) ), - aBtnPattern ( this, ScResId( BTN_PATTERN ) ), - aBtnAlignment ( this, ScResId( BTN_ALIGNMENT ) ), - aBtnAdjust ( this, ScResId( BTN_ADJUST ) ), - aBtnRename ( this, ScResId( BTN_RENAME ) ), + aBtnNumFormat ( this, ScResId( BTN_NUMFORMAT ) ), + aBtnBorder ( this, ScResId( BTN_BORDER ) ), + aBtnFont ( this, ScResId( BTN_FONT ) ), + aBtnPattern ( this, ScResId( BTN_PATTERN ) ), + aBtnAlignment ( this, ScResId( BTN_ALIGNMENT ) ), + aBtnAdjust ( this, ScResId( BTN_ADJUST ) ), + aBtnRename ( this, ScResId( BTN_RENAME ) ), aStrTitle ( ScResId( STR_ADD_TITLE ) ), aStrLabel ( ScResId( STR_ADD_LABEL ) ), aStrClose ( ScResId( STR_BTN_CLOSE ) ), @@ -99,11 +99,11 @@ ScAutoFormatDlg::ScAutoFormatDlg( Window* pParent, aStrDelMsg ( ScResId( STR_DEL_MSG ) ) , aStrRename ( ScResId( STR_RENAME_TITLE ) ), // - pFormat ( pAutoFormat ), - pSelFmtData ( pSelFormatData ), - nIndex ( 0 ), + pFormat ( pAutoFormat ), + pSelFmtData ( pSelFormatData ), + nIndex ( 0 ), bCoreDataChanged( FALSE ), - bFmtInserted ( FALSE ) + bFmtInserted ( FALSE ) { Init(); pWndPreview->NotifyChange( (*pFormat)[0] ); @@ -124,19 +124,19 @@ void ScAutoFormatDlg::Init() USHORT nCount; String aEntry; - aLbFormat .SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) ); + aLbFormat .SetSelectHdl( LINK( this, ScAutoFormatDlg, SelFmtHdl ) ); aBtnNumFormat.SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnBorder .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnFont .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); + aBtnBorder .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); + aBtnFont .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); aBtnPattern .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); aBtnAlignment.SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnAdjust .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); - aBtnAdd .SetClickHdl ( LINK( this, ScAutoFormatDlg, AddHdl ) ); - aBtnRemove .SetClickHdl ( LINK( this, ScAutoFormatDlg, RemoveHdl ) ); - aBtnOk .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) ); - aBtnCancel .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) ); - aBtnRename .SetClickHdl ( LINK( this, ScAutoFormatDlg, RenameHdl ) ); - aLbFormat .SetDoubleClickHdl( LINK( this, ScAutoFormatDlg, DblClkHdl ) ); + aBtnAdjust .SetClickHdl ( LINK( this, ScAutoFormatDlg, CheckHdl ) ); + aBtnAdd .SetClickHdl ( LINK( this, ScAutoFormatDlg, AddHdl ) ); + aBtnRemove .SetClickHdl ( LINK( this, ScAutoFormatDlg, RemoveHdl ) ); + aBtnOk .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) ); + aBtnCancel .SetClickHdl ( LINK( this, ScAutoFormatDlg, CloseHdl ) ); + aBtnRename .SetClickHdl ( LINK( this, ScAutoFormatDlg, RenameHdl ) ); + aLbFormat .SetDoubleClickHdl( LINK( this, ScAutoFormatDlg, DblClkHdl ) ); aBtnMore.AddWindow( &aBtnRename ); aBtnMore.AddWindow( &aBtnNumFormat ); @@ -180,11 +180,11 @@ void ScAutoFormatDlg::UpdateChecks() ScAutoFormatData* pData = (*pFormat)[nIndex]; aBtnNumFormat.Check( pData->GetIncludeValueFormat() ); - aBtnBorder .Check( pData->GetIncludeFrame() ); - aBtnFont .Check( pData->GetIncludeFont() ); + aBtnBorder .Check( pData->GetIncludeFrame() ); + aBtnFont .Check( pData->GetIncludeFont() ); aBtnPattern .Check( pData->GetIncludeBackground() ); aBtnAlignment.Check( pData->GetIncludeJustify() ); - aBtnAdjust .Check( pData->GetIncludeWidthHeight() ); + aBtnAdjust .Check( pData->GetIncludeWidthHeight() ); } //------------------------------------------------------------------------ @@ -220,7 +220,7 @@ IMPL_LINK_INLINE_END( ScAutoFormatDlg, DblClkHdl, void *, EMPTYARG ) IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) { ScAutoFormatData* pData = (*pFormat)[nIndex]; - BOOL bCheck = ((CheckBox*)pBtn)->IsChecked(); + BOOL bCheck = ((CheckBox*)pBtn)->IsChecked(); if ( pBtn == &aBtnNumFormat ) pData->SetIncludeValueFormat( bCheck ); @@ -252,10 +252,10 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) { if ( !bFmtInserted && pSelFmtData ) { - String aStrStandard( ScResId(STR_STANDARD) ); - String aFormatName; - ScStringInputDlg* pDlg; - BOOL bOk = FALSE; + String aStrStandard( ScResId(STR_STANDARD) ); + String aFormatName; + ScStringInputDlg* pDlg; + BOOL bOk = FALSE; while ( !bOk ) { @@ -469,7 +469,7 @@ IMPL_LINK( ScAutoFormatDlg, SelFmtHdl, void *, EMPTYARG ) String __EXPORT ScAutoFormatDlg::GetCurrFormatName() { - String aResult; + String aResult; ((*pFormat)[nIndex])->GetName( aResult ); diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 797f29612fe6..7cf5ee1b840f 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/sharedocdlg.src b/sc/source/ui/miscdlgs/sharedocdlg.src index fe55ee58c8e4..13361b216ea5 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.src +++ b/sc/source/ui/miscdlgs/sharedocdlg.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ ModalDialog RID_SCDLG_SHAREDOCUMENT Pos = MAP_APPFONT ( 6 , 82 ) ; Size = MAP_APPFONT ( 192 , 72 ) ; Border = TRUE ; - }; + }; FixedLine FL_END { Pos = MAP_APPFONT ( 1 , 156 ) ; diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 66cf2c8034e7..230920bf71a9 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 732543394634..2a8186f05866 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,18 +43,18 @@ #include "scresid.hxx" #include "globstr.hrc" #include "simpref.hrc" -#include "rangenam.hxx" // IsNameValid +#include "rangenam.hxx" // IsNameValid #include "simpref.hxx" #include "scmod.hxx" //============================================================================ -#define ABS_SREF SCA_VALID \ +#define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE -#define ABS_DREF ABS_SREF \ +#define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE -#define ABS_SREF3D ABS_SREF | SCA_TAB_3D -#define ABS_DREF3D ABS_DREF | SCA_TAB_3D +#define ABS_SREF3D ABS_SREF | SCA_TAB_3D +#define ABS_DREF3D ABS_DREF | SCA_TAB_3D //---------------------------------------------------------------------------- @@ -62,32 +62,32 @@ #define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute() //============================================================================ -// class ScSimpleRefDlg +// class ScSimpleRefDlg //---------------------------------------------------------------------------- ScSimpleRefDlg::ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, - ScViewData* ptrViewData ) + ScViewData* ptrViewData ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SIMPLEREF ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SIMPLEREF ), // - aFtAssign ( this, ScResId( FT_ASSIGN ) ), + aFtAssign ( this, ScResId( FT_ASSIGN ) ), aEdAssign ( this, this, ScResId( ED_ASSIGN ) ), - aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), + aRbAssign ( this, ScResId( RB_ASSIGN ), &aEdAssign, this ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), // - pViewData ( ptrViewData ), - pDoc ( ptrViewData->GetDocument() ), - bRefInputMode ( FALSE ), - bAutoReOpen ( TRUE ), + pViewData ( ptrViewData ), + pDoc ( ptrViewData->GetDocument() ), + bRefInputMode ( FALSE ), + bAutoReOpen ( TRUE ), bCloseOnButtonUp( FALSE ), bSingleCell ( FALSE ), bMultiSelection ( FALSE ) { - // damit die Strings in der Resource bei den FixedTexten bleiben koennen: + // damit die Strings in der Resource bei den FixedTexten bleiben koennen: Init(); FreeResource(); SetDispatcherLock( TRUE ); // Modal-Modus einschalten @@ -115,8 +115,8 @@ void ScSimpleRefDlg::SetRefString(const String &rStr) //---------------------------------------------------------------------------- void ScSimpleRefDlg::Init() { - aBtnOk.SetClickHdl ( LINK( this, ScSimpleRefDlg, OkBtnHdl ) ); - aBtnCancel.SetClickHdl ( LINK( this, ScSimpleRefDlg, CancelBtnHdl ) ); + aBtnOk.SetClickHdl ( LINK( this, ScSimpleRefDlg, OkBtnHdl ) ); + aBtnCancel.SetClickHdl ( LINK( this, ScSimpleRefDlg, CancelBtnHdl ) ); bCloseFlag=FALSE; } @@ -171,9 +171,9 @@ void ScSimpleRefDlg::SetActive() { aEdAssign.GrabFocus(); - // kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen - // (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder angezeigt) - // (der ausgewaehlte DB-Name hat sich auch nicht veraendert) + // kein NameModifyHdl, weil sonst Bereiche nicht geaendert werden koennen + // (nach dem Aufziehen der Referenz wuerde der alte Inhalt wieder angezeigt) + // (der ausgewaehlte DB-Name hat sich auch nicht veraendert) RefInputDone(); } @@ -196,9 +196,9 @@ void ScSimpleRefDlg::SetCloseHdl( const Link& rLink ) void ScSimpleRefDlg::SetUnoLinks( const Link& rDone, const Link& rAbort, const Link& rChange ) { - aDoneHdl = rDone; - aAbortedHdl = rAbort; - aChangeHdl = rChange; + aDoneHdl = rDone; + aAbortedHdl = rAbort; + aChangeHdl = rChange; } void ScSimpleRefDlg::SetFlags( BOOL bSetCloseOnButtonUp, BOOL bSetSingleCell, BOOL bSetMultiSelection ) @@ -234,7 +234,7 @@ IMPL_LINK( ScSimpleRefDlg, OkBtnHdl, void *, EMPTYARG ) bAutoReOpen=FALSE; String aResult=aEdAssign.GetText(); aCloseHdl.Call(&aResult); - Link aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose + Link aUnoLink = aDoneHdl; // stack var because this is deleted in DoClose DoClose( ScSimpleRefDlgWrapper::GetChildWindowId() ); aUnoLink.Call( &aResult ); return 0; @@ -246,7 +246,7 @@ IMPL_LINK( ScSimpleRefDlg, CancelBtnHdl, void *, EMPTYARG ) bAutoReOpen=FALSE; String aResult=aEdAssign.GetText(); aCloseHdl.Call(NULL); - Link aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose + Link aUnoLink = aAbortedHdl; // stack var because this is deleted in DoClose DoClose( ScSimpleRefDlgWrapper::GetChildWindowId() ); aUnoLink.Call( &aResult ); return 0; diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 4ed6eebb07cb..05ccd3553ef5 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -211,7 +211,7 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties( USHORT nItemCount = pEntry->ItemCount(); for (USHORT nItemPos=0; nItemPos<nItemCount && !bHasData; ++nItemPos) { - SvLBoxItem* pItem = pEntry->GetItem( nItemPos ); + SvLBoxItem* pItem = pEntry->GetItem( nItemPos ); ScSolverOptionsString* pStringItem = dynamic_cast<ScSolverOptionsString*>(pItem); if ( pStringItem ) { @@ -231,7 +231,7 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties( { DBG_ERRORFILE( "wrong count" ); } - + return maProperties; } @@ -278,7 +278,7 @@ void ScSolverOptionsDialog::FillListBox() for (sal_Int32 nPos=0; nPos<nCount; nPos++) { rtl::OUString aVisName = aDescriptions[nPos].aDescription; - + uno::Any aValue = maProperties[nPos].Value; uno::TypeClass eClass = aValue.getValueTypeClass(); if ( eClass == uno::TypeClass_BOOLEAN ) @@ -334,7 +334,7 @@ void ScSolverOptionsDialog::EditOption() USHORT nItemCount = pEntry->ItemCount(); for (USHORT nPos=0; nPos<nItemCount; ++nPos) { - SvLBoxItem* pItem = pEntry->GetItem( nPos ); + SvLBoxItem* pItem = pEntry->GetItem( nPos ); ScSolverOptionsString* pStringItem = dynamic_cast<ScSolverOptionsString*>(pItem); if ( pStringItem ) { diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index fbe2cccfc0ba..f216864932ab 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 524fcb8420ed..e718ba7be498 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,42 +50,42 @@ #undef _SOLVERDLG_CXX -#define ERRORBOX(s) ErrorBox( this, WinBits( WB_OK | WB_DEF_OK), s ).Execute() +#define ERRORBOX(s) ErrorBox( this, WinBits( WB_OK | WB_DEF_OK), s ).Execute() //============================================================================ -// class ScSolverDlg +// class ScSolverDlg //---------------------------------------------------------------------------- ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDocument, - ScAddress aCursorPos ) + ScAddress aCursorPos ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SOLVER ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SOLVER ), // aFlVariables ( this, ScResId( FL_VARIABLES ) ), - aFtFormulaCell ( this, ScResId( FT_FORMULACELL ) ), + aFtFormulaCell ( this, ScResId( FT_FORMULACELL ) ), aEdFormulaCell ( this, this, ScResId( ED_FORMULACELL ) ), - aRBFormulaCell ( this, ScResId( RB_FORMULACELL ), &aEdFormulaCell, this ), - aFtTargetVal ( this, ScResId( FT_TARGETVAL ) ), - aEdTargetVal ( this, ScResId( ED_TARGETVAL ) ), - aFtVariableCell ( this, ScResId( FT_VARCELL ) ), + aRBFormulaCell ( this, ScResId( RB_FORMULACELL ), &aEdFormulaCell, this ), + aFtTargetVal ( this, ScResId( FT_TARGETVAL ) ), + aEdTargetVal ( this, ScResId( ED_TARGETVAL ) ), + aFtVariableCell ( this, ScResId( FT_VARCELL ) ), aEdVariableCell ( this, this, ScResId( ED_VARCELL ) ), - aRBVariableCell ( this, ScResId( RB_VARCELL ), &aEdVariableCell, this ), - aBtnOk ( this, ScResId( BTN_OK ) ), - aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), + aRBVariableCell ( this, ScResId( RB_VARCELL ), &aEdVariableCell, this ), + aBtnOk ( this, ScResId( BTN_OK ) ), + aBtnCancel ( this, ScResId( BTN_CANCEL ) ), + aBtnHelp ( this, ScResId( BTN_HELP ) ), // - theFormulaCell ( aCursorPos ), - theVariableCell ( aCursorPos ), - pDoc ( pDocument ), - nCurTab ( aCursorPos.Tab() ), - pEdActive ( NULL ), - bDlgLostFocus ( FALSE ), - errMsgInvalidVar ( ScResId( STR_INVALIDVAR ) ), - errMsgInvalidForm ( ScResId( STR_INVALIDFORM ) ), - errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), - errMsgInvalidVal ( ScResId( STR_INVALIDVAL ) ) + theFormulaCell ( aCursorPos ), + theVariableCell ( aCursorPos ), + pDoc ( pDocument ), + nCurTab ( aCursorPos.Tab() ), + pEdActive ( NULL ), + bDlgLostFocus ( FALSE ), + errMsgInvalidVar ( ScResId( STR_INVALIDVAR ) ), + errMsgInvalidForm ( ScResId( STR_INVALIDFORM ) ), + errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), + errMsgInvalidVal ( ScResId( STR_INVALIDVAL ) ) { Init(); FreeResource(); @@ -101,10 +101,10 @@ __EXPORT ScSolverDlg::~ScSolverDlg() void __EXPORT ScSolverDlg::Init() { - String aStr; + String aStr; - aBtnOk. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) ); - aBtnCancel. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) ); + aBtnOk. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) ); + aBtnCancel. SetClickHdl ( LINK( this, ScSolverDlg, BtnHdl ) ); Link aLink = LINK( this, ScSolverDlg, GetFocusHdl ); aEdFormulaCell. SetGetFocusHdl ( aLink ); @@ -159,9 +159,9 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) if ( rRef.aStart != rRef.aEnd ) RefInputStart(pEdActive); - String aStr; - ScAddress aAdr = rRef.aStart; - USHORT nFmt = ( aAdr.Tab() == nCurTab ) + String aStr; + ScAddress aAdr = rRef.aStart; + USHORT nFmt = ( aAdr.Tab() == nCurTab ) ? SCA_ABS : SCA_ABS_3D; @@ -235,8 +235,8 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) // 3. wurde ein korrekter Zielwert eingegeben const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); - USHORT nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc, eConv ); - USHORT nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv ); + USHORT nRes1 = theFormulaCell .Parse( aEdFormulaCell.GetText(), pDoc, eConv ); + USHORT nRes2 = theVariableCell.Parse( aEdVariableCell.GetText(), pDoc, eConv ); if ( SCA_VALID == ( nRes1 & SCA_VALID ) ) { @@ -255,7 +255,7 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) ScSolveParam aOutParam( theFormulaCell, theVariableCell, theTargetValStr ); - ScSolveItem aOutItem( SCITEM_SOLVEDATA, &aOutParam ); + ScSolveItem aOutItem( SCITEM_SOLVEDATA, &aOutParam ); SetDispatcherLock( FALSE ); diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index f2bcd660bae6..c35b4e9d6ce1 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -71,7 +71,7 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, aEdInput.SetText( rDefault ); aEdInput.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); - // HelpId for Edit different for different uses + // HelpId for Edit different for different uses if ( nHelpId == FID_TAB_APPEND ) aEdInput.SetHelpId( HID_SC_APPEND_NAME ); diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 6154749f16aa..e99c8d98ecfe 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index 2dce5792232d..7fe01494a49f 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,25 +50,25 @@ //============================================================================ -// class ScTabOpDlg +// class ScTabOpDlg //---------------------------------------------------------------------------- ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDocument, - const ScRefAddress& rCursorPos ) + const ScRefAddress& rCursorPos ) - : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_TABOP ), + : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_TABOP ), // aFlVariables ( this, ScResId( FL_VARIABLES ) ), aFtFormulaRange ( this, ScResId( FT_FORMULARANGE ) ), aEdFormulaRange ( this, this, ScResId( ED_FORMULARANGE ) ), - aRBFormulaRange ( this, ScResId( RB_FORMULARANGE ), &aEdFormulaRange, this ), - aFtRowCell ( this, ScResId( FT_ROWCELL ) ), + aRBFormulaRange ( this, ScResId( RB_FORMULARANGE ), &aEdFormulaRange, this ), + aFtRowCell ( this, ScResId( FT_ROWCELL ) ), aEdRowCell ( this, this, ScResId( ED_ROWCELL ) ), - aRBRowCell ( this, ScResId( RB_ROWCELL ), &aEdRowCell, this ), - aFtColCell ( this, ScResId( FT_COLCELL ) ), + aRBRowCell ( this, ScResId( RB_ROWCELL ), &aEdRowCell, this ), + aFtColCell ( this, ScResId( FT_COLCELL ) ), aEdColCell ( this, this, ScResId( ED_COLCELL ) ), - aRBColCell ( this, ScResId( RB_COLCELL ), &aEdColCell, this ), + aRBColCell ( this, ScResId( RB_COLCELL ), &aEdColCell, this ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), @@ -78,12 +78,12 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, nCurTab ( theFormulaCell.Tab() ), pEdActive ( NULL ), bDlgLostFocus ( FALSE ), - errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), - errMsgNoColRow ( ScResId( STR_NOCOLROW ) ), - errMsgWrongFormula ( ScResId( STR_WRONGFORMULA ) ), - errMsgWrongRowCol ( ScResId( STR_WRONGROWCOL ) ), - errMsgNoColFormula ( ScResId( STR_NOCOLFORMULA ) ), - errMsgNoRowFormula ( ScResId( STR_NOROWFORMULA ) ) + errMsgNoFormula ( ScResId( STR_NOFORMULA ) ), + errMsgNoColRow ( ScResId( STR_NOCOLROW ) ), + errMsgWrongFormula ( ScResId( STR_WRONGFORMULA ) ), + errMsgWrongRowCol ( ScResId( STR_WRONGROWCOL ) ), + errMsgNoColFormula ( ScResId( STR_NOCOLFORMULA ) ), + errMsgNoRowFormula ( ScResId( STR_NOROWFORMULA ) ) { Init(); FreeResource(); @@ -100,8 +100,8 @@ __EXPORT ScTabOpDlg::~ScTabOpDlg() void __EXPORT ScTabOpDlg::Init() { - aBtnOk. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); - aBtnCancel. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); + aBtnOk. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); + aBtnCancel. SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); Link aLink = LINK( this, ScTabOpDlg, GetFocusHdl ); aEdFormulaRange.SetGetFocusHdl( aLink ); @@ -160,8 +160,8 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) if ( rRef.aStart != rRef.aEnd ) RefInputStart(pEdActive); - String aStr; - USHORT nFmt = ( rRef.aStart.Tab() == nCurTab ) + String aStr; + USHORT nFmt = ( rRef.aStart.Tab() == nCurTab ) ? SCR_ABS : SCR_ABS_3D; @@ -191,7 +191,7 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) void ScTabOpDlg::RaiseError( ScTabOpErr eError ) { const String* pMsg = &errMsgNoFormula; - Edit* pEd = &aEdFormulaRange; + Edit* pEd = &aEdFormulaRange; switch ( eError ) { @@ -281,7 +281,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) const formula::FormulaGrammar::AddressConvention eConv = pDoc->GetAddressConvention(); if (aEdRowCell.GetText().Len() > 0) { - if (!ConvertSingleRef( pDoc, aEdRowCell.GetText(), nCurTab, + if (!ConvertSingleRef( pDoc, aEdRowCell.GetText(), nCurTab, theRowCell, eConv )) nError = TABOPERR_WRONGROW; else @@ -300,7 +300,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) nError = TABOPERR_WRONGCOL; else { - if (nMode == 1) // beides + if (nMode == 1) // beides { nMode = 2; ConvertSingleRef( pDoc, aEdFormulaRange.GetText(), nCurTab, @@ -323,7 +323,7 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) theRowCell, theColCell, nMode ); - ScTabOpItem aOutItem( SID_TABOP, &aOutParam ); + ScTabOpItem aOutItem( SID_TABOP, &aOutParam ); SetDispatcherLock( FALSE ); SwitchToDocument(); diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 5af55079dda6..a6747798efdb 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -31,7 +31,7 @@ #undef SC_DLLIMPLEMENTATION -// ohne precompiled Headers uebersetzen !!! +// ohne precompiled Headers uebersetzen !!! @@ -53,9 +53,9 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ) : - SfxTabDialog ( pParent, ScResId( RID_SCDLG_CHAR ), pAttr ), - rOutAttrs ( *pAttr ), - rDocShell ( *pDocShell ) + SfxTabDialog ( pParent, ScResId( RID_SCDLG_CHAR ), pAttr ), + rOutAttrs ( *pAttr ), + rDocShell ( *pDocShell ) { FreeResource(); @@ -94,8 +94,8 @@ void __EXPORT ScCharDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) // ----------------------------------------------------------------------- ScParagraphDlg::ScParagraphDlg( Window* pParent, const SfxItemSet* pAttr ) : - SfxTabDialog ( pParent, ScResId( RID_SCDLG_PARAGRAPH ), pAttr ), - rOutAttrs ( *pAttr ) + SfxTabDialog ( pParent, ScResId( RID_SCDLG_PARAGRAPH ), pAttr ), + rOutAttrs ( *pAttr ) { FreeResource(); diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index acf12cf263b0..4aeef5746004 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |