diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:20:47 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:41:10 +0200 |
commit | 37e6631cc5d4147e9d0a4ebefbd0c9d2a8137d24 (patch) | |
tree | 060cf0aafda3f205b3e12508465a5403826d014d /sc/source/ui/dbgui | |
parent | ed6b8a100c1aabb342573f252509573bbe124d29 (diff) |
remove whitespace
Change-Id: Ib15413e73409cc33de01fa92a47b9d1237cfc4b2
Diffstat (limited to 'sc/source/ui/dbgui')
26 files changed, 0 insertions, 162 deletions
diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index de2f4a623faf..1a4954cffca6 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -596,7 +596,6 @@ ScDPLabelData* ScPivotLayoutDialog::GetLabelData(SCCOL nColumn) return &maPivotParameters.maLabelArray[nColumn]; } - void ScPivotLayoutDialog::PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames) { return mpListBoxData->PushDataFieldNames(rDataFieldNames); diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index ef39fdf1d3de..b4a72d10d5fe 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -31,7 +31,6 @@ static const sal_Char pStrFix[] = "FIX"; static const sal_Char pStrMrg[] = "MRG"; - ScAsciiOptions::ScAsciiOptions() : bFixedLen ( false ), aFieldSeps ( OUString(';') ), @@ -49,7 +48,6 @@ ScAsciiOptions::ScAsciiOptions() : { } - ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) : bFixedLen ( rOpt.bFixedLen ), aFieldSeps ( rOpt.aFieldSeps ), @@ -80,14 +78,12 @@ ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) : } } - ScAsciiOptions::~ScAsciiOptions() { delete[] pColStart; delete[] pColFormat; } - void ScAsciiOptions::SetColInfo( sal_uInt16 nCount, const sal_Int32* pStart, const sal_uInt8* pFormat ) { delete[] pColStart; @@ -112,7 +108,6 @@ void ScAsciiOptions::SetColInfo( sal_uInt16 nCount, const sal_Int32* pStart, con } } - void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec ) { delete[] pColStart; @@ -133,7 +128,6 @@ void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec ) } } - ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy ) { SetColInfo( rCpy.nInfoCount, rCpy.pColStart, rCpy.pColFormat ); @@ -150,7 +144,6 @@ ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy ) return *this; } - bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const { if ( bFixedLen == rCmp.bFixedLen && @@ -288,7 +281,6 @@ void ScAsciiOptions::ReadFromString( const OUString& rString ) // 10th token is used for "Save cell formulas" in export options } - OUString ScAsciiOptions::WriteToString() const { OUString aOutStr; diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 67a973255831..fc70a15d9c93 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -36,7 +36,6 @@ #define INFOBOX(id) InfoBox(this, ScGlobal::GetRscString(id)).Execute() - class ScAreaData { public: @@ -59,7 +58,6 @@ public: bool bIsDbArea; }; - ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, const SfxItemSet& rArgSet ) @@ -177,7 +175,6 @@ void ScConsolidateDlg::Init() else pEdDestArea->SetText(OUString()); - // Use the ScAreaData helper class to save those range names from the // RangeNames and database ranges that appear in the ListBoxes. @@ -237,7 +234,6 @@ void ScConsolidateDlg::FillAreaLists() } } - // Handover of a range within a table that has been selected by the mouse. // This range is then shown in the reference window as new selection. @@ -265,13 +261,11 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - bool ScConsolidateDlg::Close() { return DoClose( ScConsolidateDlgWrapper::GetChildWindowId() ); } - void ScConsolidateDlg::SetActive() { if ( bDlgLostFocus ) @@ -290,13 +284,11 @@ void ScConsolidateDlg::SetActive() RefInputDone(); } - void ScConsolidateDlg::Deactivate() { bDlgLostFocus = true; } - bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd ) { if ( !pRangeUtil || !pDoc || @@ -328,7 +320,6 @@ bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd ) return bEditOk; } - // Handler: IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr ) @@ -349,7 +340,6 @@ IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr ) return 0; } - IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) { sal_uInt16 nDataAreaCount = pLbConsAreas->GetEntryCount(); @@ -409,7 +399,6 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) return 0; } - IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn ) { if ( pBtn == pBtnCancel ) @@ -475,7 +464,6 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn ) return 0; } - IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb ) { if ( pLb == pLbConsAreas ) @@ -518,7 +506,6 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd ) { if ( pEd == pEdDataArea ) @@ -538,7 +525,6 @@ IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd ) return 0; } - // TODO: generalize! // Resource of the ListBox and these two conversion methods are also in // tpsubt and everywhere, where StarCalc functions are selectable. diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 2df46a9e00cb..381309dd7efd 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -22,7 +22,6 @@ #include <vcl/settings.hxx> #include "AccessibleCsvControl.hxx" - ScCsvLayoutData::ScCsvLayoutData() : mnPosCount( 1 ), mnPosOffset( 0 ), @@ -57,7 +56,6 @@ ScCsvDiff ScCsvLayoutData::GetDiff( const ScCsvLayoutData& rData ) const return nRet; } - ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : Control( &rParent, WB_TABSTOP | WB_NODIALOGCONTROL ), mrData( rParent.GetLayoutData() ), @@ -80,7 +78,6 @@ ScCsvControl::~ScCsvControl() mpAccessible->dispose(); } - // event handling ------------------------------------------------------------- void ScCsvControl::GetFocus() @@ -137,7 +134,6 @@ void ScCsvControl::AccSendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uInt32 mpAccessible->SendRemoveColumnEvent( nFirstColumn, nLastColumn ); } - // repaint helpers ------------------------------------------------------------ void ScCsvControl::Repaint( bool bInvalidate ) @@ -160,7 +156,6 @@ void ScCsvControl::EnableRepaint( bool bInvalidate ) Repaint( bInvalidate ); } - // command handling ----------------------------------------------------------- void ScCsvControl::Execute( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nParam2 ) @@ -169,7 +164,6 @@ void ScCsvControl::Execute( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nPa maCmdHdl.Call( this ); } - // layout helpers ------------------------------------------------------------- sal_Int32 ScCsvControl::GetVisPosCount() const @@ -252,7 +246,6 @@ sal_Int32 ScCsvControl::GetLineFromY( sal_Int32 nY ) const return (nY - GetHdrHeight()) / GetLineHeight() + GetFirstVisLine(); } - // static helpers ------------------------------------------------------------- void ScCsvControl::ImplInvertRect( OutputDevice& rOutDev, const Rectangle& rRect ) @@ -297,7 +290,6 @@ ScMoveMode ScCsvControl::GetVertDirection( sal_uInt16 nCode, bool bHomeEnd ) return MOVE_NONE; } - // accessibility -------------------------------------------------------------- ScCsvControl::XAccessibleRef ScCsvControl::CreateAccessible() @@ -307,5 +299,4 @@ ScCsvControl::XAccessibleRef ScCsvControl::CreateAccessible() return mxAccessible; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 3bd16a9f74c5..5b2cbc6a0b52 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -44,7 +44,6 @@ #include "editutil.hxx" // *** edit engine *** - struct Func_SetType { sal_Int32 mnType; @@ -61,7 +60,6 @@ struct Func_Select { rState.Select( mbSelect ); } }; - ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) : ScCsvControl( rParent ), mpColorConfig( 0 ), @@ -264,7 +262,6 @@ void ScCsvGrid::InitSizeData() InvalidateGfx(); } - // split handling ------------------------------------------------------------- void ScCsvGrid::InsertSplit( sal_Int32 nPos ) @@ -571,7 +568,6 @@ void ScCsvGrid::ExecutePopup( const Point& rPos ) Execute( CSVCMD_SETCOLUMNTYPE, maPopup.GetItemPos( nItemId ) ); } - // selection handling --------------------------------------------------------- bool ScCsvGrid::IsSelected( sal_uInt32 nColIndex ) const @@ -711,7 +707,6 @@ void ScCsvGrid::DoSelectAction( sal_uInt32 nColIndex, sal_uInt16 nModifier ) Execute( CSVCMD_MOVEGRIDCURSOR, GetColumnPos( nColIndex ) ); } - // cell contents -------------------------------------------------------------- void ScCsvGrid::ImplSetTextLineSep( @@ -815,7 +810,6 @@ const OUString& ScCsvGrid::GetCellText( sal_uInt32 nColIndex, sal_Int32 nLine ) return rStrVec[ nColIndex ]; } - // event handling ------------------------------------------------------------- void ScCsvGrid::Resize() @@ -1004,7 +998,6 @@ void ScCsvGrid::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 Repaint(); } - // painting ------------------------------------------------------------------- void ScCsvGrid::Paint( const Rectangle& ) @@ -1352,7 +1345,6 @@ void ScCsvGrid::ImplDrawTrackingRect( sal_uInt32 nColIndex ) } } - // accessibility ============================================================== ScAccessibleCsvControl* ScCsvGrid::ImplCreateAccessible() @@ -1362,5 +1354,4 @@ ScAccessibleCsvControl* ScCsvGrid::ImplCreateAccessible() return pControl.release(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index bf0b6d7fcb0f..060b03405638 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -20,7 +20,6 @@ #include "csvruler.hxx" #include "AccessibleCsvControl.hxx" - #include <optutil.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -30,12 +29,9 @@ using namespace com::sun::star::uno; - - #define SEP_PATH "Office.Calc/Dialogs/CSVImport" #define FIXED_WIDTH_LIST "FixedWidthList" - static void load_FixedWidthList(ScCsvSplits &aSplits) { OUString sSplits; @@ -108,7 +104,6 @@ ScCsvRuler::~ScCsvRuler() save_FixedWidthList( maSplits ); } - // common ruler handling ------------------------------------------------------ void ScCsvRuler::setPosSizePixel( @@ -247,7 +242,6 @@ void ScCsvRuler::ScrollVertRel( ScMoveMode eDir ) Execute( CSVCMD_SETLINEOFFSET, nLine ); } - // split handling ------------------------------------------------------------- sal_Int32 ScCsvRuler::GetNoScrollPos( sal_Int32 nPos ) const @@ -351,7 +345,6 @@ void ScCsvRuler::MoveCurrSplitRel( ScMoveMode eDir ) } } - // event handling ------------------------------------------------------------- void ScCsvRuler::Resize() @@ -517,7 +510,6 @@ void ScCsvRuler::EndMouseTracking( bool bApply ) mnPosMTStart = CSV_POS_INVALID; } - // painting ------------------------------------------------------------------- void ScCsvRuler::Paint( const Rectangle& ) @@ -654,7 +646,6 @@ void ScCsvRuler::ImplSetMousePointer( sal_Int32 nPos ) SetPointer( Pointer( HasSplit( nPos ) ? POINTER_HSPLIT : POINTER_ARROW ) ); } - // accessibility ============================================================== ScAccessibleCsvControl* ScCsvRuler::ImplCreateAccessible() @@ -662,5 +653,4 @@ ScAccessibleCsvControl* ScCsvRuler::ImplCreateAccessible() return new ScAccessibleCsvRuler( *this ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx index eb8a348c3fca..11ed0bae12a7 100644 --- a/sc/source/ui/dbgui/csvsplits.cxx +++ b/sc/source/ui/dbgui/csvsplits.cxx @@ -21,7 +21,6 @@ #include <algorithm> - bool ScCsvSplits::Insert( sal_Int32 nPos ) { bool bValid = (nPos >= 0); @@ -62,7 +61,6 @@ bool ScCsvSplits::HasSplit( sal_Int32 nPos ) const return GetIndex( nPos ) != CSV_VEC_NOTFOUND; } - sal_uInt32 ScCsvSplits::GetIndex( sal_Int32 nPos ) const { const_iterator aIter = ::std::lower_bound( maVec.begin(), maVec.end(), nPos ); @@ -89,11 +87,9 @@ sal_Int32 ScCsvSplits::GetPos( sal_uInt32 nIndex ) const return (nIndex < Count()) ? maVec[ nIndex ] : CSV_POS_INVALID; } - sal_uInt32 ScCsvSplits::GetIterIndex( const_iterator aIter ) const { return (aIter == maVec.end()) ? CSV_VEC_NOTFOUND : (aIter - maVec.begin()); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 31e9fc96e414..f65704846918 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -183,7 +183,6 @@ void ScCsvTableBox::MakePosVisible( sal_Int32 nPos ) } } - // cell contents -------------------------------------------------------------- void ScCsvTableBox::SetUniStrings( @@ -205,7 +204,6 @@ void ScCsvTableBox::SetUniStrings( EnableRepaint(); } - // column settings ------------------------------------------------------------ void ScCsvTableBox::InitTypes( const ListBox& rListBox ) @@ -225,7 +223,6 @@ void ScCsvTableBox::FillColumnData( ScAsciiOptions& rOptions ) const maGrid.FillColumnDataSep( rOptions ); } - // event handling ------------------------------------------------------------- void ScCsvTableBox::Resize() @@ -409,7 +406,6 @@ IMPL_LINK( ScCsvTableBox, ScrollEndHdl, ScrollBar*, pScrollBar ) return 0; } - // accessibility -------------------------------------------------------------- ScCsvTableBox::XAccessibleRef ScCsvTableBox::CreateAccessible() @@ -423,5 +419,4 @@ ScAccessibleCsvControl* ScCsvTableBox::ImplCreateAccessible() return NULL; // not used, see CreateAccessible() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 0bf9ae87f2a1..a8e4765c49f1 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include <vcl/waitobj.hxx> #include <comphelper/processfactory.hxx> @@ -42,7 +39,6 @@ using namespace com::sun::star; #include "miscuno.hxx" #include "dpsdbtab.hxx" - // entries in the "type" ListBox #define DP_TYPELIST_TABLE 0 #define DP_TYPELIST_QUERY 1 @@ -185,5 +181,4 @@ void ScDataPilotDatabaseDlg::FillObjects() } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 894a56d54945..29c418d0cb30 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "dapitype.hxx" #include "scresid.hxx" #include "sc.hrc" diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index f4c0eb05c2ba..b49a148ecc63 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -32,7 +32,6 @@ #include "globalnames.hxx" #include "dbnamdlg.hxx" - #define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE #define ABS_DREF ABS_SREF \ @@ -45,7 +44,6 @@ static DBSaveData* pSaveObj = NULL; #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() - // class DBSaveData class DBSaveData @@ -85,8 +83,6 @@ private: bool bDirty:1; }; - - void DBSaveData::Save() { aArea = rCurArea; @@ -98,7 +94,6 @@ void DBSaveData::Save() bDirty = true; } - void DBSaveData::Restore() { if ( bDirty ) @@ -164,13 +159,11 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, SynFocusTimer.Start(); } - ScDbNameDlg::~ScDbNameDlg() { DELETEZ( pSaveObj ); } - void ScDbNameDlg::Init() { m_pBtnHeader->Check( true ); // Default: mit Spaltenkoepfen @@ -248,7 +241,6 @@ void ScDbNameDlg::Init() NameModifyHdl( 0 ); } - void ScDbNameDlg::SetInfoStrings( const ScDBData* pDBData ) { OUStringBuffer aBuf; @@ -269,7 +261,6 @@ void ScDbNameDlg::SetInfoStrings( const ScDBData* pDBData ) m_pFTOperations->SetText(aBuf.makeStringAndClear()); } - // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Fenster angezeigt wird. @@ -291,7 +282,6 @@ void ScDbNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - bool ScDbNameDlg::Close() { return DoClose( ScDbNameDlgWrapper::GetChildWindowId() ); @@ -368,16 +358,13 @@ void ScDbNameDlg::UpdateDBData( const OUString& rStrName ) m_pOptions->Enable(); } - bool ScDbNameDlg::IsRefInputMode() const { return bRefInputMode; } - // Handler: - IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) { AddBtnHdl( 0 ); diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 9d82cd9ca963..ce688274b838 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -17,12 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef SC_DLLIMPLEMENTATION #undef SC_DLLIMPLEMENTATION #endif - #include "dpgroupdlg.hxx" #include "scresid.hxx" #include "sc.hrc" @@ -148,7 +146,6 @@ void ScDPDateGroupEditHelper::ImplSetValue( double fValue ) mpEdValue->SetDate( aDate ); } - ScDPNumGroupDlg::ScDPNumGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo ) : ModalDialog ( pParent, "PivotTableGroupByNumber", "modules/scalc/ui/groupbynumber.ui" ), mpRbAutoStart ( get<RadioButton>("auto_start") ), diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 7824f09de579..572e07e6b79d 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -41,7 +41,6 @@ #include <limits> - #define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString(rid) ).Execute() @@ -160,7 +159,6 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, } - ScFilterDlg::~ScFilterDlg() { delete pOptionsMgr; @@ -171,7 +169,6 @@ ScFilterDlg::~ScFilterDlg() delete pTimer; } - void ScFilterDlg::Init( const SfxItemSet& rArgSet ) { const ScQueryItem& rQueryItem = (const ScQueryItem&) @@ -382,7 +379,6 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) // SFX_APPWINDOW->Disable(false); //! general method in ScAnyRefDlg } - bool ScFilterDlg::Close() { if (pViewData) @@ -405,7 +401,6 @@ void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - void ScFilterDlg::SetActive() { if ( bRefInputMode ) @@ -609,7 +604,6 @@ void ScFilterDlg::ClearValueList( size_t nList ) } } - size_t ScFilterDlg::GetFieldSelPos( SCCOL nField ) { if ( nField >= theQueryData.nCol1 && nField <= theQueryData.nCol2 ) @@ -661,7 +655,6 @@ ScQueryItem* ScFilterDlg::GetOutputItem() return pOutItem; } - bool ScFilterDlg::IsRefInputMode() const { return bRefInputMode; @@ -669,7 +662,6 @@ bool ScFilterDlg::IsRefInputMode() const // Handler: - IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) { if ( pBtn == pBtnOk ) @@ -734,7 +726,6 @@ IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) return 0; } - IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) { /* @@ -989,7 +980,6 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { // Column headers: @@ -1028,7 +1018,6 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) return 0; } - IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) { size_t nOffset = GetSliderPos(); @@ -1113,7 +1102,6 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) return 0; } - IMPL_LINK_NOARG(ScFilterDlg, ScrollHdl) { SliderMoved(); diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 3035cd8632c8..4ae721f66544 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -29,10 +29,8 @@ #include "foptmgr.hxx" - // ScFilterOptionsMgr (.ui's option helper) - ScFilterOptionsMgr::ScFilterOptionsMgr( ScViewData* ptrViewData, const ScQueryParam& refQueryData, @@ -68,7 +66,6 @@ ScFilterOptionsMgr::ScFilterOptionsMgr( Init(); } - ScFilterOptionsMgr::~ScFilterOptionsMgr() { sal_uInt16 nEntries = pLbCopyArea->GetEntryCount(); @@ -78,7 +75,6 @@ ScFilterOptionsMgr::~ScFilterOptionsMgr() delete (OUString*)pLbCopyArea->GetEntryData( i ); } - void ScFilterOptionsMgr::Init() { //moggi:TODO @@ -167,7 +163,6 @@ void ScFilterOptionsMgr::Init() pFtDbArea->SetText( OUString() ); } - // Kopierposition: if ( !rQueryData.bInplace ) @@ -213,7 +208,6 @@ bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const return ( SCA_VALID == (nResult & SCA_VALID) ); } - // Handler: IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) @@ -232,7 +226,6 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) { if ( pEd == pEdCopyArea ) @@ -265,7 +258,6 @@ IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) return 0; } - IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox*, pBox ) { if ( pBox == pBtnCopyResult ) diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx index 39c44a3d702b..1f4c7ddf9e49 100644 --- a/sc/source/ui/dbgui/imoptdlg.cxx +++ b/sc/source/ui/dbgui/imoptdlg.cxx @@ -26,11 +26,9 @@ static const sal_Char pStrFix[] = "FIX"; - // Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) // darum ab Version 336 Komma stattdessen - ScImportOptions::ScImportOptions( const OUString& rStr ) { // Use the same string format as ScAsciiOptions, diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 2133fc05f1b8..5ffa9fabadd5 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include <vcl/waitobj.hxx> @@ -408,10 +407,8 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() return *pOutItem; } - // Handler: - IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb ) { /* @@ -551,5 +548,4 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index b253b28d9a78..0d7de73194fd 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scitems.hxx" diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 9d6cb86a753e..512cc5578e3d 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "global.hxx" @@ -40,10 +39,8 @@ //! TODO make dynamic const SCSIZE ASCIIDLG_MAXROWS = MAXROWCOUNT; - using namespace com::sun::star::uno; - // Defines - CSV Import Preserve Options #define FIXED_WIDTH "FixedWidth" #define FROM_ROW "FromRow" @@ -452,13 +449,11 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent, const OUString& aDatName, } } - ScImportAsciiDlg::~ScImportAsciiDlg() { delete[] mpRowPosArray; } - bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText ) { if (nLine >= ASCIIDLG_MAXROWS || !mpDatStream) @@ -527,7 +522,6 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText ) return bRet; } - void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt ) { rOpt.SetCharSet( meCharSet ); @@ -623,7 +617,6 @@ void ScImportAsciiDlg::UpdateVertical() mpDatStream->SetStreamCharSet(meCharSet); } - IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, RadioButton*, pButton ) { OSL_ENSURE( pButton, "ScImportAsciiDlg::RbSepFixHdl - missing sender" ); diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 6333016fc1b9..b7d682a40211 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scuiimoptdlg.hxx" @@ -28,10 +27,8 @@ #include <osl/thread.h> #include <rtl/tencinfo.h> - // ScDelimiterTable - class ScDelimiterTable { public: @@ -99,10 +96,8 @@ OUString ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const return aStrDel; } - // ScImportOptionsDlg - ScImportOptionsDlg::ScImportOptionsDlg( Window* pParent, bool bAscii, diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 98aa0b8f6733..620b54c1658e 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -48,7 +48,6 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi : ScAnyRefDlg ( pB, pCW, pParent, "AdvancedFilterDialog", "modules/scalc/ui/advancedfilterdialog.ui" ), - aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ), pOptionsMgr ( NULL ), nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), @@ -96,7 +95,6 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi pEdCopyArea->SetAccessibleName(pBtnCopyResult->GetText()); } - ScSpecialFilterDlg::~ScSpecialFilterDlg() { sal_uInt16 nEntries = pLbFilterArea->GetEntryCount(); @@ -115,7 +113,6 @@ ScSpecialFilterDlg::~ScSpecialFilterDlg() delete pTimer; } - void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) { const ScQueryItem& rQueryItem = (const ScQueryItem&) @@ -195,7 +192,6 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) //SFX_APPWINDOW->Disable(false); //! allgemeine Methode im ScAnyRefDlg } - bool ScSpecialFilterDlg::Close() { if (pViewData) @@ -226,7 +222,6 @@ void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - void ScSpecialFilterDlg::SetActive() { if ( bRefInputMode ) @@ -249,7 +244,6 @@ void ScSpecialFilterDlg::SetActive() RefInputDone(); } - ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, const ScRange& rSource ) { @@ -260,7 +254,6 @@ ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, return pOutItem; } - bool ScSpecialFilterDlg::IsRefInputMode() const { return bRefInputMode; @@ -268,7 +261,6 @@ bool ScSpecialFilterDlg::IsRefInputMode() const // Handler: - IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) { OSL_ENSURE( pDoc && pViewData, "Document or ViewData not found. :-/" ); @@ -385,7 +377,6 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) return 0; } - IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) { // alle 50ms nachschauen, ob RefInputMode noch stimmt @@ -414,7 +405,6 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) return 0; } - IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) { if ( pLb == pLbFilterArea ) @@ -431,7 +421,6 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd ) { if ( pEd == pEdFilterArea ) diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 3bc234fbe93c..8129dc42cd0d 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - #include <vcl/msgbox.hxx> #include "tpsort.hxx" #include "sortdlg.hxx" @@ -35,7 +33,6 @@ ScSortDlg::ScSortDlg(Window* pParent, const SfxItemSet* pArgSet) AddTabPage("options", ScTabPageSortOptions::Create, 0); } - ScSortWarningDlg::ScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText) : ModalDialog(pParent, "SortWarning", "modules/scalc/ui/sortwarning.ui") @@ -66,5 +63,4 @@ IMPL_LINK( ScSortWarningDlg, BtnHdl, PushButton*, pBtn ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index b5c9900930c2..b1fe324f3dca 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "tpsubt.hxx" #include "scresid.hxx" #include "subtdlg.hxx" - ScSubTotalDlg::ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet) : SfxTabDialog(pParent, "SubTotalDialog", "modules/scalc/ui/subtotaldialog.ui", pArgSet) diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index b9b35823185a..485dc48cbee1 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "textimportoptions.hxx" diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index d10ed8ae545f..5b805a505962 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include <vcl/msgbox.hxx> @@ -206,7 +205,6 @@ void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ ) for ( sal_uInt16 i=0; i<nSortKeyCount; i++ ) maSortKeyItems[i].m_pBtnUp->Check(); - maSortKeyItems[0].EnableField(); maSortKeyItems[1].EnableField(); for ( sal_uInt16 i=2; i<nSortKeyCount; i++ ) @@ -433,10 +431,8 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem ) maSortKeyItems[nItem].m_pLbSort->SelectEntryPos( 0 ); } - // Handler: - IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) { OUString aSelEntry = pLb->GetSelectEntry(); @@ -479,10 +475,8 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) return 0; } - // Sort option Tab Page: - ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage(pParent, "SortOptionsPage", @@ -554,7 +548,6 @@ void ScTabPageSortOptions::Init() OSL_ENSURE( pViewData, "ViewData not found! :-/" ); - if ( pViewData && pDoc ) { ScDBCollection* pDBColl = pDoc->GetDBCollection(); @@ -825,7 +818,6 @@ void ScTabPageSortOptions::FillUserSortListBox() } } - // Handler: IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox ) @@ -949,5 +941,4 @@ IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index d1e7d10c5d17..264c61fe86ed 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -171,7 +171,6 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, && (mpLbFunctions->GetEntryCount() > 0), "Non-initialized Lists" ); - if ( (nGroupNo > 3) || (nGroupNo == 0) || (mpLbGroup->GetEntryCount() == 0) || (mpLbColumns->GetEntryCount() == 0) @@ -334,10 +333,8 @@ sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) } } - // Handler: - IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb ) { if ( (mpLbColumns->GetEntryCount() > 0) @@ -379,7 +376,6 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) return 0; } - // Derived Group TabPages: SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent, @@ -406,7 +402,6 @@ ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgS ScTpSubTotalGroup( pParent, rArgSet ) {} - #define RESET(i) (ScTpSubTotalGroup::DoReset( (i), *rArgSet )) void ScTpSubTotalGroup1::Reset( const SfxItemSet* rArgSet ) { RESET(1); } void ScTpSubTotalGroup2::Reset( const SfxItemSet* rArgSet ) { RESET(2); } @@ -419,7 +414,6 @@ bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(2); bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(3); } #undef FILL - // Optionen-Tabpage: ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, @@ -540,7 +534,6 @@ void ScTpSubTotalOptions::FillUserSortListBox() } } - // Handler: IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox ) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 99b757d5b541..92e8f6848cfb 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef SC_DLLIMPLEMENTATION #undef SC_DLLIMPLEMENTATION #endif @@ -72,7 +71,6 @@ #define SC_VALIDDLG_DATA_VALIDRANGE 6 #define SC_VALIDDLG_DATA_INVALIDRANGE 7 - static const sal_uInt16 pValueRanges[] = { FID_VALID_MODE, FID_VALID_ERRTEXT, @@ -80,7 +78,6 @@ static const sal_uInt16 pValueRanges[] = 0 }; - ScValidationDlg::ScValidationDlg(Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/) : ScValidationDlgBase(pParent ? pParent : SFX_APP()->GetTopWindow(), @@ -273,7 +270,6 @@ void lclGetFormulaFromStringList( OUString& rFmlaStr, const OUString& rStringLis rFmlaStr = "\"\""; } - /** Converts formula with strings separated by semicolons to line feed separated string. @descr Keeps all empty strings. Ignores all empty tokens (multiple semicolons). Example: "abc";;;"def";"";"ghi" -> abc\ndef\n\nghi. @@ -644,7 +640,6 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl) return 0; } - // Input Help Page ScTPValidationHelp::ScTPValidationHelp( Window* pParent, |