diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 17:13:43 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2014-04-06 17:19:54 +0200 |
| commit | c4c51709eaa02a5c9a2af3e5d436790307109813 (patch) | |
| tree | c67362b4f2c3d3f34655ca65ec10d54e1509cf73 /sc/source/ui | |
| parent | c78f918a7cb267a713804b8feacc3425196d4428 (diff) | |
whitespace cleanup in sc
Change-Id: Id1dcadcac179c52977e48a6912ce4d5fd542f60c
Diffstat (limited to 'sc/source/ui')
414 files changed, 0 insertions, 3494 deletions
diff --git a/sc/source/ui/Accessibility/AccessibilityHints.cxx b/sc/source/ui/Accessibility/AccessibilityHints.cxx index 1b72fe1220af..e20d234819a7 100644 --- a/sc/source/ui/Accessibility/AccessibilityHints.cxx +++ b/sc/source/ui/Accessibility/AccessibilityHints.cxx @@ -21,8 +21,6 @@ using namespace ::com::sun::star; - - TYPEINIT1(ScAccWinFocusLostHint, SfxHint); @@ -40,8 +38,6 @@ ScAccWinFocusLostHint::~ScAccWinFocusLostHint() { } - - TYPEINIT1(ScAccWinFocusGotHint, SfxHint); @@ -78,8 +74,6 @@ ScAccGridWinFocusLostHint::~ScAccGridWinFocusLostHint() { } - - TYPEINIT1(ScAccGridWinFocusGotHint, SfxHint); diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 728f8709e5d6..698b86518b8a 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -64,8 +64,6 @@ using ::com::sun::star::beans::PropertyValue; using namespace ::com::sun::star::accessibility; - - const sal_uInt16 nRulerRole = AccessibleRole::TEXT; const sal_uInt16 nGridRole = AccessibleRole::TABLE; const sal_uInt16 nCellRole = AccessibleRole::TEXT; @@ -1605,6 +1603,4 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH } SAL_WNODEPRECATED_DECLARATIONS_POP - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 1ac5dfc244cb..734d4e3fa3a0 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1403,8 +1403,6 @@ void ScChildrenShapes::VisAreaChanged() const std::for_each(maZOrderedShapes.begin(), maZOrderedShapes.end(), aVisAreaChanged); } - - ScAccessibleDocument::ScAccessibleDocument( const uno::Reference<XAccessible>& rxParent, ScTabViewShell* pViewShell, diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 6d473b61999e..6c2a66f7f3d2 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -62,8 +62,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; - - typedef std::list< uno::Reference< XAccessible > > ScXAccList; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index fdd8d547f246..f35e70f9f9f2 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -51,8 +51,6 @@ using ::com::sun::star::uno::RuntimeException; using ::std::for_each; using ::std::vector; - - namespace { class AddRemoveEventListener : public ::std::unary_function<void, Reference<XAccessible> > @@ -82,8 +80,6 @@ private: } - - ScAccessibleFilterMenu::ScAccessibleFilterMenu(const Reference<XAccessible>& rxParent, ScMenuFloatingWindow* pWin, const OUString& rName, size_t nMenuPos) : ScAccessibleContextBase(rxParent, AccessibleRole::MENU), mnMenuPos(nMenuPos), diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 3a6f2c18fac0..f6be4b81d227 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -45,8 +45,6 @@ #include <vcl/svapp.hxx> - - class ScViewForwarder : public SvxViewForwarder { ScTabViewShell* mpViewShell; @@ -144,8 +142,6 @@ void ScViewForwarder::SetInvalid() mpViewShell = NULL; } - - class ScEditObjectViewForwarder : public SvxViewForwarder { Window* mpWindow; diff --git a/sc/source/ui/app/client.cxx b/sc/source/ui/app/client.cxx index 15364d81c102..2c69a7e3afca 100644 --- a/sc/source/ui/app/client.cxx +++ b/sc/source/ui/app/client.cxx @@ -38,8 +38,6 @@ using namespace com::sun::star; - - ScClient::ScClient( ScTabViewShell* pViewShell, Window* pDraw, SdrModel* pSdrModel, SdrOle2Obj* pObj ) : SfxInPlaceClient( pViewShell, pDraw, pObj->GetAspect() ), pModel( pSdrModel ), diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 319c88b056f5..52e21e1ea2f4 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -74,16 +74,12 @@ using namespace com::sun::star; - - #define SCDRAWTRANS_TYPE_EMBOBJ 1 #define SCDRAWTRANS_TYPE_DRAWMODEL 2 #define SCDRAWTRANS_TYPE_DOCUMENT 3 - - ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContainerShell, const TransferableObjectDescriptor& rDesc ) : pModel( pClipModel ), diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 6a1eae25dad7..700f2b399c31 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -382,8 +382,6 @@ void ScInputHandler::DeleteRangeFinder() } } - - inline OUString GetEditText(EditEngine* pEng) { return ScEditUtil::GetSpaceDelimitedString(*pEng); @@ -492,8 +490,6 @@ static sal_Int32 lcl_MatchParenthesis( const OUString& rStr, sal_Int32 nPos ) return (sal_Int32) (p - p0); } - - ScInputHandler::ScInputHandler() : pInputWin( NULL ), pEngine( NULL ), @@ -2460,8 +2456,6 @@ void ScInputHandler::SetMode( ScInputMode eNewMode ) bInOwnChange = false; } - - // lcl_IsNumber - true, wenn nur Ziffern (dann keine Autokorrektur) static bool lcl_IsNumber(const OUString& rString) @@ -3822,8 +3816,6 @@ void ScInputHandler::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd ) rEnd = nFormSelEnd; } - - EditView* ScInputHandler::GetFuncEditView() { UpdateActiveView(); // wegen pTableView @@ -3850,8 +3842,6 @@ EditView* ScInputHandler::GetFuncEditView() return pView; } - - void ScInputHandler::InputSetSelection( sal_Int32 nStart, sal_Int32 nEnd ) { if ( nStart <= nEnd ) @@ -3872,8 +3862,6 @@ void ScInputHandler::InputSetSelection( sal_Int32 nStart, sal_Int32 nEnd ) bModified = true; } - - void ScInputHandler::InputReplaceSelection( const OUString& rStr ) { if (!pRefViewSh) @@ -3936,23 +3924,17 @@ ScInputHdlState::ScInputHdlState( const ScAddress& rCurPos, { } - - ScInputHdlState::ScInputHdlState( const ScInputHdlState& rCpy ) : pEditData ( NULL ) { *this = rCpy; } - - ScInputHdlState::~ScInputHdlState() { delete pEditData; } - - bool ScInputHdlState::operator==( const ScInputHdlState& r ) const { return ( (aStartPos == r.aStartPos) @@ -3962,8 +3944,6 @@ bool ScInputHdlState::operator==( const ScInputHdlState& r ) const && ScGlobal::EETextObjEqual( pEditData, r.pEditData ) ); } - - ScInputHdlState& ScInputHdlState::operator=( const ScInputHdlState& r ) { delete pEditData; diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index f448a9aa0bb6..3b91d53b1567 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -148,8 +148,6 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const return aInfo; } - - #define IMAGE(id) pImgMgr->SeekImage(id) static bool lcl_isExperimentalMode() { @@ -907,8 +905,6 @@ void ScInputWindow::MouseButtonUp( const MouseEvent& rMEvt ) ToolBox::MouseButtonUp( rMEvt ); } - - // ScInputBarGroup @@ -2062,8 +2058,6 @@ void ScTextWnd::RemoveAccessibleTextData( ScAccessibleEditLineTextData& rTextDat maAccTextDatas.erase( aIt ); } - - void ScTextWnd::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && @@ -2567,6 +2561,4 @@ void ScPosWnd::ReleaseFocus_Impl() - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx index 0640de5fdc58..734d9b718a5c 100644 --- a/sc/source/ui/app/lnktrans.cxx +++ b/sc/source/ui/app/lnktrans.cxx @@ -24,8 +24,6 @@ using namespace com::sun::star; - - ScLinkTransferObj::ScLinkTransferObj() { } diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index d52be0e37f7d..aa83fd577656 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -24,8 +24,6 @@ #include "docpool.hxx" #include "msgpool.hxx" - - static SfxItemInfo const aMsgItemInfos[] = { { 0, SFX_ITEM_POOLABLE }, // SCITEM_STRING @@ -40,8 +38,6 @@ static SfxItemInfo const aMsgItemInfos[] = { SID_PRINTER_NOTFOUND_WARN, SFX_ITEM_POOLABLE } // SCITEM_PRINTWARN }; - - ScMessagePool::ScMessagePool() : SfxItemPool ( OUString("ScMessagePool"), MSGPOOL_START, MSGPOOL_END, @@ -106,6 +102,4 @@ SfxMapUnit ScMessagePool::GetMetric( sal_uInt16 nWhich ) const - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/rfindlst.cxx b/sc/source/ui/app/rfindlst.cxx index febc7e23c55c..90c426ed0336 100644 --- a/sc/source/ui/app/rfindlst.cxx +++ b/sc/source/ui/app/rfindlst.cxx @@ -27,8 +27,6 @@ static const ColorData aColNames[SC_RANGECOLORS] = { COL_LIGHTBLUE, COL_LIGHTRED, COL_LIGHTMAGENTA, COL_GREEN, COL_BLUE, COL_RED, COL_MAGENTA, COL_BROWN }; - - ScRangeFindList::ScRangeFindList(const OUString& rName) : aDocName( rName ), bHidden( false ) @@ -55,6 +53,4 @@ ColorData ScRangeFindList::GetColorName( const size_t nIndex ) return aColNames[nIndex % SC_RANGECOLORS]; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 4a7f1828e195..6d97e2f2863e 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -119,15 +119,11 @@ - - ScResId::ScResId( sal_uInt16 nId ) : ResId( nId, *SC_MOD()->GetResMgr() ) { } - - void ScDLL::Init() { ScModule **ppShlPtr = (ScModule**) GetAppData(SHL_CALC); diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index b32a280b3862..87174c10e1e8 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -119,8 +119,6 @@ static sal_uInt16 nIdleCount = 0; - - SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) ) { SFX_OBJECTBAR_REGISTRATION( SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER, @@ -128,8 +126,6 @@ SFX_IMPL_INTERFACE( ScModule, SfxShell, ScResId(RID_APPTITLE) ) SFX_STATUSBAR_REGISTRATION( ScResId(SCCFG_STATUSBAR) ); // nur ID wichtig } - - ScModule::ScModule( SfxObjectFactory* pFact ) : SfxModule( SfxApplication::CreateResManager( "sc" ), false, pFact, NULL ), mpDragData(new ScDragData), @@ -335,8 +331,6 @@ void ScModule::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - - void ScModule::DeleteCfg() { DELETEZ( pViewCfg ); // Speichern passiert vor Exit() automatisch @@ -370,12 +364,8 @@ void ScModule::DeleteCfg() } } - - // von der Applikation verschoben: - - void ScModule::Execute( SfxRequest& rReq ) { SfxViewFrame* pViewFrm = SfxViewFrame::Current(); @@ -644,8 +634,6 @@ void ScModule::HideDisabledSlots( SfxItemSet& rSet ) } - - void ScModule::ResetDragObject() { mpDragData->pCellTransfer = NULL; @@ -713,15 +701,11 @@ ScDocument* ScModule::GetClipDoc() return NULL; } - - void ScModule::SetSelectionTransfer( ScSelectionTransferObj* pNew ) { pSelTransfer = pNew; } - - void ScModule::InitFormEditData() { pFormEditData = new ScFormEditData; @@ -732,8 +716,6 @@ void ScModule::ClearFormEditData() DELETEZ( pFormEditData ); } - - void ScModule::SetViewOptions( const ScViewOptions& rOpt ) { if ( !pViewCfg ) @@ -972,13 +954,9 @@ sal_uInt16 ScModule::GetOptDigitLanguage() LANGUAGE_SYSTEM; } - - // Optionen - - // ModifyOptions - Items aus Calc-Options-Dialog // und SID_AUTOSPELL_CHECK @@ -997,8 +975,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) GetInputOptions(); OSL_ENSURE( pInputCfg, "InputOptions not initialised :-(" ); - - SfxViewFrame* pViewFrm = SfxViewFrame::Current(); SfxBindings* pBindings = pViewFrm ? &pViewFrm->GetBindings() : NULL; @@ -1014,8 +990,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) bool bSaveInputOptions = false; bool bCompileErrorCells = false; - - // SFX_APP()->SetOptions( rOptSet ); // Linguistik nicht mehr @@ -1162,8 +1136,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - - // DocOptions @@ -1324,8 +1296,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) SFX_APP()->Broadcast( SfxSimpleHint( SID_SCPRINTOPTIONS ) ); } - - if ( bSaveAppOptions ) pAppCfg->OptionsChanged(); @@ -1420,12 +1390,8 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - - // Input-Handler - - ScInputHandler* ScModule::GetInputHdl( ScTabViewShell* pViewSh, bool bUseRef ) { if ( pRefInputHandler && bUseRef ) @@ -1605,12 +1571,8 @@ void ScModule::ActivateInputWindow( const OUString* pStrFormula, bool bMatrix ) } } - - // Referenz - Dialoge - - void ScModule::SetRefDialog( sal_uInt16 nId, bool bVis, SfxViewFrame* pViewFrm ) { //! move reference dialog handling to view @@ -1933,12 +1895,8 @@ void ScModule::EndReference() } } - - // Idle / Online-Spelling - - void ScModule::AnythingChanged() { sal_uLong nOldTime = aIdleTimer.GetTimeout(); diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index fd90579d352e..f7e5b73704ed 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -39,8 +39,6 @@ using namespace com::sun::star; - - static sal_Bool lcl_IsURLButton( SdrObject* pObject ) { sal_Bool bRet = false; diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index 95f7e9056ea8..6d265df27410 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -66,15 +66,11 @@ using namespace com::sun::star; - - #define SCTRANS_TYPE_IMPEX 1 #define SCTRANS_TYPE_EDIT_RTF 2 #define SCTRANS_TYPE_EDIT_BIN 3 #define SCTRANS_TYPE_EMBOBJ 4 - - void ScTransferObj::GetAreaSize( ScDocument* pDoc, SCTAB nTab1, SCTAB nTab2, SCROW& nRow, SCCOL& nCol ) { SCCOL nMaxCol = 0; @@ -115,8 +111,6 @@ void ScTransferObj::PaintToDev( OutputDevice* pDev, ScDocument* pDoc, double nPr ScPrintFunc::DrawToDev( pDoc, pDev, nPrintFactor, aBound, &aViewData, bMetaFile ); } - - ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDescriptor& rDesc ) : pDoc( pClipDoc ), nNonFiltered(0), diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index fca4f6262935..0c87ab51bf68 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -108,8 +108,6 @@ const std::vector<editeng::MisspellRanges>* ScInputStatusItem::GetMisspellRanges // ScPaintHint ist nach schints.cxx verschoben - - // ScTablesHint - Views anpassen, wenn Tabellen eingefuegt / geloescht @@ -124,8 +122,6 @@ ScTablesHint::~ScTablesHint() { } - - // ScIndexHint @@ -139,8 +135,6 @@ ScIndexHint::~ScIndexHint() { } - - // ScEditViewHint - neue EditView fuer Cursorposition anlegen @@ -167,8 +161,6 @@ ScSortItem::ScSortItem( sal_uInt16 nWhichP, if ( pSortData ) theSortData = *pSortData; } - - ScSortItem::ScSortItem( sal_uInt16 nWhichP, const ScSortParam* pSortData ) : SfxPoolItem ( nWhichP ), @@ -177,8 +169,6 @@ ScSortItem::ScSortItem( sal_uInt16 nWhichP, if ( pSortData ) theSortData = *pSortData; } - - ScSortItem::ScSortItem( const ScSortItem& rItem ) : SfxPoolItem ( rItem ), pViewData ( rItem.pViewData ), @@ -190,15 +180,11 @@ ScSortItem::~ScSortItem() { } - - OUString ScSortItem::GetValueText() const { return OUString("SortItem"); } - - bool ScSortItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -209,15 +195,11 @@ bool ScSortItem::operator==( const SfxPoolItem& rItem ) const && (theSortData == rOther.theSortData) ); } - - SfxPoolItem* ScSortItem::Clone( SfxItemPool * ) const { return new ScSortItem( *this ); } - - bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const { // Return empty value as there is no useful conversion @@ -243,8 +225,6 @@ ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, mpQueryData.reset(new ScQueryParam); } - - ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, const ScQueryParam* pQueryData ) : SfxPoolItem ( nWhichP ), @@ -258,8 +238,6 @@ ScQueryItem::ScQueryItem( sal_uInt16 nWhichP, mpQueryData.reset(new ScQueryParam); } - - ScQueryItem::ScQueryItem( const ScQueryItem& rItem ) : SfxPoolItem ( rItem ), mpQueryData(new ScQueryParam(*rItem.mpQueryData)), @@ -273,8 +251,6 @@ ScQueryItem::~ScQueryItem() { } - - void ScQueryItem::SetAdvancedQuerySource(const ScRange* pSource) { if (pSource) @@ -297,15 +273,11 @@ bool ScQueryItem::GetAdvancedQuerySource(ScRange& rSource) const return bIsAdvanced; } - - OUString ScQueryItem::GetValueText() const { return OUString("QueryItem"); } - - bool ScQueryItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -318,8 +290,6 @@ bool ScQueryItem::operator==( const SfxPoolItem& rItem ) const && (*mpQueryData == *rQueryItem.mpQueryData) ); } - - SfxPoolItem* ScQueryItem::Clone( SfxItemPool * ) const { return new ScQueryItem( *this ); @@ -338,8 +308,6 @@ ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP, if ( pSubTotalData ) theSubTotalData = *pSubTotalData; } - - ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP, const ScSubTotalParam* pSubTotalData ) : SfxPoolItem ( nWhichP ), @@ -348,8 +316,6 @@ ScSubTotalItem::ScSubTotalItem( sal_uInt16 nWhichP, if ( pSubTotalData ) theSubTotalData = *pSubTotalData; } - - ScSubTotalItem::ScSubTotalItem( const ScSubTotalItem& rItem ) : SfxPoolItem ( rItem ), pViewData ( rItem.pViewData ), @@ -361,15 +327,11 @@ ScSubTotalItem::~ScSubTotalItem() { } - - OUString ScSubTotalItem::GetValueText() const { return OUString("SubTotalItem"); } - - bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -380,15 +342,11 @@ bool ScSubTotalItem::operator==( const SfxPoolItem& rItem ) const && (theSubTotalData == rSTItem.theSubTotalData) ); } - - SfxPoolItem* ScSubTotalItem::Clone( SfxItemPool * ) const { return new ScSubTotalItem( *this ); } - - bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMemberUd */ ) const { // Return empty value as there is no useful conversion @@ -406,8 +364,6 @@ ScUserListItem::ScUserListItem( sal_uInt16 nWhichP ) { } - - ScUserListItem::ScUserListItem( const ScUserListItem& rItem ) : SfxPoolItem ( rItem ) { @@ -422,15 +378,11 @@ ScUserListItem::~ScUserListItem() delete pUserList; } - - OUString ScUserListItem::GetValueText() const { return OUString("ScUserListItem"); } - - bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -447,15 +399,11 @@ bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const } - - SfxPoolItem* ScUserListItem::Clone( SfxItemPool * ) const { return new ScUserListItem( *this ); } - - void ScUserListItem::SetUserList( const ScUserList& rUserList ) { delete pUserList; @@ -474,29 +422,21 @@ ScConsolidateItem::ScConsolidateItem( if ( pConsolidateData ) theConsData = *pConsolidateData; } - - ScConsolidateItem::ScConsolidateItem( const ScConsolidateItem& rItem ) : SfxPoolItem ( rItem ), theConsData ( rItem.theConsData ) { } - - ScConsolidateItem::~ScConsolidateItem() { } - - OUString ScConsolidateItem::GetValueText() const { return OUString("ScConsolidateItem"); } - - bool ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -506,15 +446,11 @@ bool ScConsolidateItem::operator==( const SfxPoolItem& rItem ) const return ( theConsData == rCItem.theConsData); } - - SfxPoolItem* ScConsolidateItem::Clone( SfxItemPool * ) const { return new ScConsolidateItem( *this ); } - - // ScPivotItem - Daten fuer den Pivot-Dialog @@ -531,8 +467,6 @@ ScPivotItem::ScPivotItem( sal_uInt16 nWhichP, const ScDPSaveData* pData, bNewSheet = bNew; } - - ScPivotItem::ScPivotItem( const ScPivotItem& rItem ) : SfxPoolItem ( rItem ), aDestRange ( rItem.aDestRange ), @@ -542,22 +476,16 @@ ScPivotItem::ScPivotItem( const ScPivotItem& rItem ) : pSaveData = new ScDPSaveData(*rItem.pSaveData); } - - ScPivotItem::~ScPivotItem() { delete pSaveData; } - - OUString ScPivotItem::GetValueText() const { return OUString("ScPivotItem"); } - - bool ScPivotItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -569,15 +497,11 @@ bool ScPivotItem::operator==( const SfxPoolItem& rItem ) const bNewSheet == rPItem.bNewSheet ); } - - SfxPoolItem* ScPivotItem::Clone( SfxItemPool * ) const { return new ScPivotItem( *this ); } - - // ScSolveItem - Daten fuer den Solver-Dialog @@ -588,29 +512,21 @@ ScSolveItem::ScSolveItem( sal_uInt16 nWhichP, if ( pSolveData ) theSolveData = *pSolveData; } - - ScSolveItem::ScSolveItem( const ScSolveItem& rItem ) : SfxPoolItem ( rItem ), theSolveData ( rItem.theSolveData ) { } - - ScSolveItem::~ScSolveItem() { } - - OUString ScSolveItem::GetValueText() const { return OUString("ScSolveItem"); } - - bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -620,8 +536,6 @@ bool ScSolveItem::operator==( const SfxPoolItem& rItem ) const return ( theSolveData == rPItem.theSolveData ); } - - SfxPoolItem* ScSolveItem::Clone( SfxItemPool * ) const { return new ScSolveItem( *this ); @@ -638,29 +552,21 @@ ScTabOpItem::ScTabOpItem( sal_uInt16 nWhichP, if ( pTabOpData ) theTabOpData = *pTabOpData; } - - ScTabOpItem::ScTabOpItem( const ScTabOpItem& rItem ) : SfxPoolItem ( rItem ), theTabOpData ( rItem.theTabOpData ) { } - - ScTabOpItem::~ScTabOpItem() { } - - OUString ScTabOpItem::GetValueText() const { return OUString("ScTabOpItem"); } - - bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const { OSL_ENSURE( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); @@ -670,8 +576,6 @@ bool ScTabOpItem::operator==( const SfxPoolItem& rItem ) const return ( theTabOpData == rPItem.theTabOpData ); } - - SfxPoolItem* ScTabOpItem::Clone( SfxItemPool * ) const { return new ScTabOpItem( *this ); diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index e86b9d884955..6dbe9a593f33 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <sfx2/objsh.hxx> @@ -37,8 +35,6 @@ #include <editeng/flstitem.hxx> #include <sfx2/app.hxx> - - ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet* pCellAttrs) : SfxTabDialog(pFrameP, pParent, "FormatCellsDialog", "modules/scalc/ui/formatcellsdialog.ui", pCellAttrs) { @@ -69,14 +65,10 @@ ScAttrDlg::ScAttrDlg(SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet* p AddTabPage( "cellprotection" , ScTabPageProtection::Create, 0 ); } - - ScAttrDlg::~ScAttrDlg() { } - - void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) { SfxObjectShell* pDocSh = SfxObjectShell::Current(); @@ -97,8 +89,6 @@ void ScAttrDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) } } - - IMPL_LINK_NOARG(ScAttrDlg, OkHandler) { ((Link&)GetOKButton().GetClickHdl()).Call( NULL ); diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 9931208e1943..0b20eee29e08 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -68,15 +68,11 @@ sal_uInt16* ScTabPageProtection::GetRanges() return pProtectionRanges; } - - SfxTabPage* ScTabPageProtection::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTabPageProtection( pParent, rAttrSet ) ); } - - void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) { // Initialize variables @@ -120,8 +116,6 @@ void ScTabPageProtection::Reset( const SfxItemSet& rCoreAttrs ) UpdateButtons(); } - - bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) { sal_Bool bAttrsChanged = false; @@ -144,8 +138,6 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) bAttrsChanged = !pOldItem || !( aProtAttr == *(const ScProtectionAttr*)pOldItem ); } - - if ( bAttrsChanged ) rCoreAttrs.Put( aProtAttr ); else if ( eItemState == SFX_ITEM_DEFAULT ) @@ -154,8 +146,6 @@ bool ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs ) return bAttrsChanged; } - - int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) @@ -164,8 +154,6 @@ int ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } - - IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox ) { TriState eState = pBox->GetState(); @@ -195,8 +183,6 @@ IMPL_LINK( ScTabPageProtection, ButtonClickHdl, TriStateBox*, pBox ) return 0; } - - void ScTabPageProtection::UpdateButtons() { if ( bDontCare ) diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx index 9dddba67b4db..d73d64aeaa8d 100644 --- a/sc/source/ui/cctrl/cbuttonw.cxx +++ b/sc/source/ui/cctrl/cbuttonw.cxx @@ -35,21 +35,15 @@ ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice ) SetOptSizePixel(); } - - ScDDComboBoxButton::~ScDDComboBoxButton() { } - - void ScDDComboBoxButton::SetOutputDevice( OutputDevice* pOutputDevice ) { pOut = pOutputDevice; } - - void ScDDComboBoxButton::SetOptSizePixel() { aBtnSize = pOut->LogicToPixel( Size(0,11), MAP_APPFONT ); @@ -57,8 +51,6 @@ void ScDDComboBoxButton::SetOptSizePixel() aBtnSize.Width() = pOut->GetSettings().GetStyleSettings().GetScrollBarSize(); } - - void ScDDComboBoxButton::Draw( const Point& rAt, const Size& rSize, bool bState, @@ -116,8 +108,6 @@ void ScDDComboBoxButton::Draw( const Point& rAt, pOut->SetFillColor(); } - - void ScDDComboBoxButton::ImpDrawArrow( const Rectangle& rRect, bool bState ) { @@ -164,6 +154,4 @@ void ScDDComboBoxButton::ImpDrawArrow( const Rectangle& rRect, - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index a418e4850de9..59cf40fd02c2 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -47,8 +47,6 @@ ScMenuFloatingWindow::MenuItemData::MenuItemData() : { } - - ScMenuFloatingWindow::SubMenuItemData::SubMenuItemData(ScMenuFloatingWindow* pParent) : mpSubMenu(NULL), mnMenuPos(MENU_NOT_SELECTED), @@ -71,8 +69,6 @@ IMPL_LINK_NOARG(ScMenuFloatingWindow::SubMenuItemData, TimeoutHdl) return 0; } - - size_t ScMenuFloatingWindow::MENU_NOT_SELECTED = 999; ScMenuFloatingWindow::ScMenuFloatingWindow(Window* pParent, ScDocument* pDoc, sal_uInt16 nMenuStackLevel) : @@ -859,8 +855,6 @@ ScDocument* ScMenuFloatingWindow::getDoc() return mpDoc; } - - ScCheckListMenuWindow::Config::Config() : mbAllowEmptySet(true), mbRTL(false) { @@ -871,8 +865,6 @@ ScCheckListMenuWindow::Member::Member() : { } - - ScCheckListMenuWindow::CancelButton::CancelButton(ScCheckListMenuWindow* pParent) : ::CancelButton(pParent), mpParent(pParent) {} @@ -882,8 +874,6 @@ void ScCheckListMenuWindow::CancelButton::Click() ::CancelButton::Click(); } - - ScCheckListMenuWindow::ScCheckListMenuWindow(Window* pParent, ScDocument* pDoc) : ScMenuFloatingWindow(pParent, pDoc), maChecks(this, WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT ), diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index 3156ab9a5779..d784d51d85d8 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -28,8 +28,6 @@ #include <vcl/builder.hxx> #include "global.hxx" - - namespace { sal_Unicode lclGetDecSep() @@ -75,6 +73,4 @@ void ScDoubleField::SetValue( double fValue, sal_Int32 nDecPlaces, bool bEraseTr nDecPlaces, lclGetDecSep(), bEraseTrailingDecZeros ) ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/popmenu.cxx b/sc/source/ui/cctrl/popmenu.cxx index e6fb1dcce058..47b2b88f8334 100644 --- a/sc/source/ui/cctrl/popmenu.cxx +++ b/sc/source/ui/cctrl/popmenu.cxx @@ -19,14 +19,10 @@ #include "popmenu.hxx" - - void ScPopupMenu::Select() { nSel = GetCurItemId(); bHit = true; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index 6ec692a02415..a4250caed0a2 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -34,16 +34,10 @@ #include "scresid.hxx" #include "sc.hrc" - - SFX_IMPL_TOOLBOX_CONTROL( ScTbxInsertCtrl, SfxUInt16Item); - - // ToolBox - Controller - - ScTbxInsertCtrl::ScTbxInsertCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ) : SfxToolBoxControl( nSlotId, nId, rTbx ), nLastSlotId(0) diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 6ad81991568e..260edebbc265 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -39,12 +39,8 @@ // class ScZoomSliderControl --------------------------------------- - - SFX_IMPL_TOOLBOX_CONTROL( ScZoomSliderControl, SvxZoomSliderItem ); - - ScZoomSliderControl::ScZoomSliderControl( sal_uInt16 nSlotId, sal_uInt16 nId, @@ -54,15 +50,11 @@ ScZoomSliderControl::ScZoomSliderControl( rTbx.Invalidate(); } - - ScZoomSliderControl::~ScZoomSliderControl() { } - - void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState ) { @@ -89,8 +81,6 @@ void ScZoomSliderControl::StateChanged( sal_uInt16 /*nSID*/, SfxItemState eState } } - - Window* ScZoomSliderControl::CreateItemWindow( Window *pParent ) { // #i98000# Don't try to get a value via SfxViewFrame::Current here. @@ -101,8 +91,6 @@ Window* ScZoomSliderControl::CreateItemWindow( Window *pParent ) return pSlider; } - - struct ScZoomSliderWnd::ScZoomSliderWnd_Impl { sal_uInt16 mnCurrentZoom; @@ -134,8 +122,6 @@ struct ScZoomSliderWnd::ScZoomSliderWnd_Impl } }; - - const long nButtonWidth = 10; const long nButtonHeight = 10; const long nIncDecWidth = 11; @@ -148,8 +134,6 @@ const long nSnappingEpsilon = 5; // snapping epsilon in pixels const long nSnappingPointsMinDist = nSnappingEpsilon; // minimum distance of two adjacent snapping points - - sal_uInt16 ScZoomSliderWnd::Offset2Zoom( long nOffset ) const { Size aSliderWindowSize = GetOutputSizePixel(); @@ -209,8 +193,6 @@ sal_uInt16 ScZoomSliderWnd::Offset2Zoom( long nOffset ) const return nRet; } - - long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const { Size aSliderWindowSize = GetOutputSizePixel(); @@ -238,8 +220,6 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const } - - ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& rDispatchProvider, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _xFrame , sal_uInt16 nCurrentZoom ): Window( pParent ), @@ -255,15 +235,11 @@ ScZoomSliderWnd::ScZoomSliderWnd( Window* pParent, const ::com::sun::star::uno:: SetSizePixel( Size( aSliderSize.Width() * nSliderWidth-1, aSliderSize.Height() + nSliderHeight ) ); } - - ScZoomSliderWnd::~ScZoomSliderWnd() { delete mpImpl; } - - void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) { if ( !mpImpl->mbValuesSet ) @@ -320,8 +296,6 @@ void ScZoomSliderWnd::MouseButtonDown( const MouseEvent& rMEvt ) mpImpl->mbOmitPaint = false; } - - void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) { if ( !mpImpl->mbValuesSet ) @@ -362,8 +336,6 @@ void ScZoomSliderWnd::MouseMove( const MouseEvent& rMEvt ) } } - - void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) { if( pZoomSliderItem ) @@ -414,15 +386,11 @@ void ScZoomSliderWnd::UpdateFromItem( const SvxZoomSliderItem* pZoomSliderItem ) Paint(aRect); } - - void ScZoomSliderWnd::Paint( const Rectangle& rRect ) { DoPaint( rRect ); } - - void ScZoomSliderWnd::DoPaint( const Rectangle& /*rRect*/ ) { if( mpImpl->mbOmitPaint ) @@ -519,6 +487,4 @@ void ScZoomSliderWnd::DoPaint( const Rectangle& /*rRect*/ ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index cdfe83a26dd0..7c44b239638c 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -29,14 +29,10 @@ // ause #include "editutil.hxx" - - static const sal_Char pStrFix[] = "FIX"; static const sal_Char pStrMrg[] = "MRG"; - - ScAsciiOptions::ScAsciiOptions() : bFixedLen ( false ), aFieldSeps ( OUString(';') ), diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 8277afc4b63e..2df46a9e00cb 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -23,8 +23,6 @@ #include "AccessibleCsvControl.hxx" - - ScCsvLayoutData::ScCsvLayoutData() : mnPosCount( 1 ), mnPosOffset( 0 ), @@ -60,8 +58,6 @@ ScCsvDiff ScCsvLayoutData::GetDiff( const ScCsvLayoutData& rData ) const } - - ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : Control( &rParent, WB_TABSTOP | WB_NODIALOGCONTROL ), mrData( rParent.GetLayoutData() ), @@ -312,6 +308,4 @@ ScCsvControl::XAccessibleRef ScCsvControl::CreateAccessible() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index d0ee530ab6a7..3a1b2cdf85b8 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -45,8 +45,6 @@ // *** edit engine *** - - struct Func_SetType { sal_Int32 mnType; @@ -64,8 +62,6 @@ struct Func_Select }; - - ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) : ScCsvControl( rParent ), mpColorConfig( 0 ), @@ -1365,6 +1361,4 @@ ScAccessibleCsvControl* ScCsvGrid::ImplCreateAccessible() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index e5a08fa6a479..bf0b6d7fcb0f 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -32,14 +32,10 @@ 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; @@ -667,6 +663,4 @@ ScAccessibleCsvControl* ScCsvRuler::ImplCreateAccessible() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx index 49c60d3ec8ad..eb8a348c3fca 100644 --- a/sc/source/ui/dbgui/csvsplits.cxx +++ b/sc/source/ui/dbgui/csvsplits.cxx @@ -22,8 +22,6 @@ #include <algorithm> - - bool ScCsvSplits::Insert( sal_Int32 nPos ) { bool bValid = (nPos >= 0); @@ -65,8 +63,6 @@ bool ScCsvSplits::HasSplit( sal_Int32 nPos ) const } - - sal_uInt32 ScCsvSplits::GetIndex( sal_Int32 nPos ) const { const_iterator aIter = ::std::lower_bound( maVec.begin(), maVec.end(), nPos ); @@ -94,14 +90,10 @@ sal_Int32 ScCsvSplits::GetPos( sal_uInt32 nIndex ) const } - - 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 5cd4a45caaa8..8600dec42a06 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -25,8 +25,6 @@ // ause #include "editutil.hxx" - - ScCsvTableBox::ScCsvTableBox( Window* pParent, WinBits nBits ) : ScCsvControl( pParent, maData, nBits ), maRuler( *this ), @@ -428,6 +426,4 @@ ScAccessibleCsvControl* ScCsvTableBox::ImplCreateAccessible() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 09af5929ba41..0bf9ae87f2a1 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -22,8 +22,6 @@ - - #include <vcl/waitobj.hxx> #include <comphelper/processfactory.hxx> @@ -45,15 +43,11 @@ using namespace com::sun::star; #include "dpsdbtab.hxx" - - // entries in the "type" ListBox #define DP_TYPELIST_TABLE 0 #define DP_TYPELIST_QUERY 1 #define DP_TYPELIST_SQLNAT 3 - - ScDataPilotDatabaseDlg::ScDataPilotDatabaseDlg( Window* pParent ) : ModalDialog(pParent, "SelectDataSourceDialog", "modules/scalc/ui/selectdatasource.ui") @@ -192,6 +186,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 80306d7dfdd0..894a56d54945 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -22,8 +22,6 @@ - - #include "dapitype.hxx" #include "scresid.hxx" #include "sc.hrc" @@ -31,8 +29,6 @@ using namespace com::sun::star; - - ScDataPilotSourceTypeDlg::ScDataPilotSourceTypeDlg(Window* pParent, bool bEnableExternal) : ModalDialog( pParent, "SelectSourceDialog", "modules/scalc/ui/selectsource.ui" ) { @@ -101,8 +97,6 @@ IMPL_LINK( ScDataPilotSourceTypeDlg, RadioClickHdl, RadioButton*, pBtn ) return 0; } - - ScDataPilotServiceDlg::ScDataPilotServiceDlg( Window* pParent, const uno::Sequence<OUString>& rServices ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DAPISERVICE ) ), @@ -163,6 +157,4 @@ OUString ScDataPilotServiceDlg::GetParPass() const return aEdPasswd.GetText(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index ba4e781af7e1..c8b43853da29 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -33,16 +33,12 @@ #include "dbnamdlg.hxx" - - #define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE #define ABS_DREF ABS_SREF \ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D - - class DBSaveData; static DBSaveData* pSaveObj = NULL; @@ -91,8 +87,6 @@ private: - - void DBSaveData::Save() { aArea = rCurArea; @@ -105,8 +99,6 @@ void DBSaveData::Save() } - - void DBSaveData::Restore() { if ( bDirty ) @@ -121,12 +113,8 @@ void DBSaveData::Restore() } } - - // class ScDbNameDlg - - ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData) : ScAnyRefDlg(pB, pCW, pParent, @@ -177,16 +165,12 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, } - - ScDbNameDlg::~ScDbNameDlg() { DELETEZ( pSaveObj ); } - - void ScDbNameDlg::Init() { m_pBtnHeader->Check( true ); // Default: mit Spaltenkoepfen @@ -308,15 +292,11 @@ void ScDbNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } - - bool ScDbNameDlg::Close() { return DoClose( ScDbNameDlgWrapper::GetChildWindowId() ); } - - void ScDbNameDlg::SetActive() { m_pEdAssign->GrabFocus(); @@ -328,8 +308,6 @@ void ScDbNameDlg::SetActive() RefInputDone(); } - - void ScDbNameDlg::UpdateNames() { typedef ScDBCollection::NamedDBs DBsType; @@ -358,8 +336,6 @@ void ScDbNameDlg::UpdateNames() m_pEdName->Invalidate(); } - - void ScDbNameDlg::UpdateDBData( const OUString& rStrName ) { @@ -393,8 +369,6 @@ void ScDbNameDlg::UpdateDBData( const OUString& rStrName ) } - - bool ScDbNameDlg::IsRefInputMode() const { return bRefInputMode; @@ -419,8 +393,6 @@ IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) return 0; } - - IMPL_LINK_NOARG_INLINE_START(ScDbNameDlg, CancelBtnHdl) { Close(); @@ -428,8 +400,6 @@ IMPL_LINK_NOARG_INLINE_START(ScDbNameDlg, CancelBtnHdl) } IMPL_LINK_NOARG_INLINE_END(ScDbNameDlg, CancelBtnHdl) - - IMPL_LINK_NOARG(ScDbNameDlg, AddBtnHdl) { OUString aNewName = comphelper::string::strip(m_pEdName->GetText(), ' '); @@ -578,8 +548,6 @@ IMPL_LINK_NOARG(ScDbNameDlg, RemoveBtnHdl) return 0; } - - IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl) { OUString theName = m_pEdName->GetText(); @@ -644,8 +612,6 @@ IMPL_LINK_NOARG(ScDbNameDlg, NameModifyHdl) return 0; } - - IMPL_LINK_NOARG(ScDbNameDlg, AssModifyHdl) { // hier parsen fuer Save() etc. diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 03a9c631acd6..9d82cd9ca963 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -30,8 +30,6 @@ #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> - - namespace { /** Date part flags in order of the list box entries. */ @@ -59,8 +57,6 @@ static const sal_uInt16 nDatePartResIds[] = } // namespace - - ScDPGroupEditHelper::ScDPGroupEditHelper( RadioButton* pRbAuto, RadioButton* pRbMan, Edit* pEdValue ) : mpRbAuto( pRbAuto ), mpRbMan( pRbMan ), @@ -114,8 +110,6 @@ IMPL_LINK( ScDPGroupEditHelper, ClickHdl, RadioButton*, pButton ) return 0; } - - ScDPNumGroupEditHelper::ScDPNumGroupEditHelper( RadioButton* pRbAuto, RadioButton* pRbMan, ScDoubleField* pEdValue ) : ScDPGroupEditHelper( pRbAuto, pRbMan, pEdValue ), @@ -133,8 +127,6 @@ void ScDPNumGroupEditHelper::ImplSetValue( double fValue ) mpEdValue->SetValue( fValue ); } - - ScDPDateGroupEditHelper::ScDPDateGroupEditHelper( RadioButton* pRbAuto, RadioButton* pRbMan, DateField* pEdValue, const Date& rNullDate ) : ScDPGroupEditHelper( pRbAuto, pRbMan, pEdValue ), @@ -157,8 +149,6 @@ void ScDPDateGroupEditHelper::ImplSetValue( double fValue ) } - - ScDPNumGroupDlg::ScDPNumGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo ) : ModalDialog ( pParent, "PivotTableGroupByNumber", "modules/scalc/ui/groupbynumber.ui" ), mpRbAutoStart ( get<RadioButton>("auto_start") ), @@ -207,8 +197,6 @@ ScDPNumGroupInfo ScDPNumGroupDlg::GetGroupInfo() const return aInfo; } - - ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo, sal_Int32 nDatePart, const Date& rNullDate ) : ModalDialog( pParent, "PivotTableGroupByDate", "modules/scalc/ui/groupbydate.ui" ), @@ -339,6 +327,4 @@ IMPL_LINK( ScDPDateGroupDlg, CheckHdl, SvxCheckListBox*, pListBox ) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 3581c09c8eac..3b9e968387d4 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -161,8 +161,6 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, } - - ScFilterDlg::~ScFilterDlg() { delete pOptionsMgr; @@ -174,8 +172,6 @@ ScFilterDlg::~ScFilterDlg() } - - void ScFilterDlg::Init( const SfxItemSet& rArgSet ) { const ScQueryItem& rQueryItem = (const ScQueryItem&) @@ -204,8 +200,6 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) pDoc = pViewData ? pViewData->GetDocument() : NULL; nSrcTab = pViewData ? pViewData->GetTabNo() : static_cast<SCTAB>(0); - - // for easier access: maFieldLbArr.reserve(QUERY_ENTRY_COUNT); maFieldLbArr.push_back(pLbField1); @@ -389,8 +383,6 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) } - - bool ScFilterDlg::Close() { if (pViewData) @@ -399,8 +391,6 @@ bool ScFilterDlg::Close() return DoClose( ScFilterDlgWrapper::GetChildWindowId() ); } - - // Mouse-selected cell area becomes the new selection and is shown in the // reference text box @@ -416,8 +406,6 @@ void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } - - void ScFilterDlg::SetActive() { if ( bRefInputMode ) @@ -432,8 +420,6 @@ void ScFilterDlg::SetActive() RefInputDone(); } - - void ScFilterDlg::FillFieldLists() { pLbField1->Clear(); @@ -611,8 +597,6 @@ void ScFilterDlg::UpdateHdrInValueList( size_t nList ) } } - - void ScFilterDlg::ClearValueList( size_t nList ) { if (nList > 0 && nList <= QUERY_ENTRY_COUNT) @@ -626,8 +610,6 @@ void ScFilterDlg::ClearValueList( size_t nList ) } - - size_t ScFilterDlg::GetFieldSelPos( SCCOL nField ) { if ( nField >= theQueryData.nCol1 && nField <= theQueryData.nCol2 ) @@ -636,8 +618,6 @@ size_t ScFilterDlg::GetFieldSelPos( SCCOL nField ) return 0; } - - ScQueryItem* ScFilterDlg::GetOutputItem() { ScAddress theCopyPos; @@ -682,15 +662,11 @@ ScQueryItem* ScFilterDlg::GetOutputItem() } - - bool ScFilterDlg::IsRefInputMode() const { return bRefInputMode; } - - // Handler: @@ -731,8 +707,6 @@ IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) return 0; } - - IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl) { if ( pExpander->get_expanded() ) @@ -747,8 +721,6 @@ IMPL_LINK_NOARG(ScFilterDlg, MoreExpandedHdl) return 0; } - - IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) { // Check if RefInputMode is still true every 50ms @@ -763,8 +735,6 @@ IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) } - - IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) { /* @@ -1020,8 +990,6 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) } - - IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { // Column headers: @@ -1061,8 +1029,6 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) } - - IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) { size_t nOffset = GetSliderPos(); diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 58d540974438..e17538145153 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -69,8 +69,6 @@ ScFilterOptionsMgr::ScFilterOptionsMgr( } - - ScFilterOptionsMgr::~ScFilterOptionsMgr() { sal_uInt16 nEntries = pLbCopyArea->GetEntryCount(); @@ -81,8 +79,6 @@ ScFilterOptionsMgr::~ScFilterOptionsMgr() } - - void ScFilterOptionsMgr::Init() { //moggi:TODO @@ -204,8 +200,6 @@ void ScFilterOptionsMgr::Init() pEdCopyArea->SetText( EMPTY_OUSTRING ); } - - bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const { OUString aPosStr( rPosStr ); @@ -222,8 +216,6 @@ bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const // Handler: - - IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) { if ( pLb == pLbCopyArea ) @@ -241,8 +233,6 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) } - - IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) { if ( pEd == pEdCopyArea ) @@ -276,8 +266,6 @@ IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) } - - 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 778d018f6899..4dbc1d45b5d4 100644 --- a/sc/source/ui/dbgui/imoptdlg.cxx +++ b/sc/source/ui/dbgui/imoptdlg.cxx @@ -76,8 +76,6 @@ ScImportOptions::ScImportOptions( const OUString& rStr ) } } - - OUString ScImportOptions::BuildString() const { OUString aResult; @@ -98,8 +96,6 @@ OUString ScImportOptions::BuildString() const return aResult; } - - void ScImportOptions::SetTextEncoding( rtl_TextEncoding nEnc ) { eCharSet = (nEnc == RTL_TEXTENCODING_DONTKNOW ? diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 43d9e871d0f9..04680f162804 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include <vcl/waitobj.hxx> #include "viewdata.hxx" @@ -240,8 +238,6 @@ void ScPivotFilterDlg::Init( const SfxItemSet& rArgSet ) } } - - void ScPivotFilterDlg::FillFieldLists() { m_pLbField1->Clear(); @@ -277,8 +273,6 @@ void ScPivotFilterDlg::FillFieldLists() } } - - void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList ) { if ( pDoc && nList>0 && nList<=3 ) @@ -323,8 +317,6 @@ void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList ) } } - - void ScPivotFilterDlg::ClearValueList( sal_uInt16 nList ) { if ( nList>0 && nList<=3 ) @@ -337,8 +329,6 @@ void ScPivotFilterDlg::ClearValueList( sal_uInt16 nList ) } } - - sal_uInt16 ScPivotFilterDlg::GetFieldSelPos( SCCOL nField ) { if ( nField >= theQueryData.nCol1 && nField <= theQueryData.nCol2 ) @@ -347,8 +337,6 @@ sal_uInt16 ScPivotFilterDlg::GetFieldSelPos( SCCOL nField ) return 0; } - - const ScQueryItem& ScPivotFilterDlg::GetOutputItem() { ScQueryParam theParam( theQueryData ); @@ -517,8 +505,6 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb ) return 0; } - - IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { // bei Gross-/Kleinschreibung die Werte-Listen aktualisieren @@ -542,8 +528,6 @@ IMPL_LINK( ScPivotFilterDlg, CheckBoxHdl, CheckBox*, pBox ) return 0; } - - IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) { if ( pEd ) diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 9bc0b1ce8e9e..59cf31e53d47 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -40,15 +40,11 @@ #include <vector> - - using namespace ::com::sun::star::sheet; using ::com::sun::star::uno::Sequence; using ::std::vector; - - namespace { /** Appends all strings from the Sequence to the list box. @@ -154,8 +150,6 @@ static const ScDPListBoxWrapper::MapEntryType spShowFromMap[] = } // namespace - - ScDPFunctionListBox::ScDPFunctionListBox(Window* pParent, WinBits nStyle) : ListBox(pParent, nStyle) { @@ -197,8 +191,6 @@ void ScDPFunctionListBox::FillFunctionNames() InsertEntry( aArr.GetString( nIndex ) ); } - - ScDPFunctionDlg::ScDPFunctionDlg( Window* pParent, const ScDPLabelDataVector& rLabelVec, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData) @@ -413,8 +405,6 @@ IMPL_LINK_NOARG(ScDPFunctionDlg, DblClickHdl) return 0; } - - ScDPSubtotalDlg::ScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScPivotFuncData& rFuncData, const ScDPNameVec& rDataFields, bool bEnableLayout ) @@ -493,8 +483,6 @@ void ScDPSubtotalDlg::Init( const ScDPLabelData& rLabelData, const ScPivotFuncDa mpBtnOptions->SetClickHdl( LINK( this, ScDPSubtotalDlg, ClickHdl ) ); } - - IMPL_LINK( ScDPSubtotalDlg, RadioClickHdl, RadioButton*, pBtn ) { mpLbFunc->Enable( pBtn == mpRbUser ); @@ -519,8 +507,6 @@ IMPL_LINK( ScDPSubtotalDlg, ClickHdl, PushButton*, pBtn ) return 0; } - - ScDPSubtotalOptDlg::ScDPSubtotalOptDlg( Window* pParent, ScDPObject& rDPObj, const ScDPLabelData& rLabelData, const ScDPNameVec& rDataFields, bool bEnableLayout ) @@ -771,8 +757,6 @@ IMPL_LINK( ScDPSubtotalOptDlg, SelectHdl, ListBox*, pLBox ) return 0; } - - ScDPShowDetailDlg::ScDPShowDetailDlg( Window* pParent, ScDPObject& rDPObj, sal_uInt16 nOrient ) : ModalDialog ( pParent, ScResId( RID_SCDLG_DPSHOWDETAIL ) ), maFtDims ( this, ScResId( FT_DIMS ) ), @@ -841,6 +825,4 @@ IMPL_LINK( ScDPShowDetailDlg, DblClickHdl, ListBox*, pLBox ) 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 e6cbda50c621..60dd912d4eb5 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <comphelper/string.hxx> #include <svx/drawitem.hxx> @@ -39,8 +37,6 @@ #include "scresid.hxx" #include "scendlg.hxx" - - ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const OUString& rName, bool bEdit, bool bSheetProtected) : ModalDialog(pParent, "ScenarioDialog", @@ -113,8 +109,6 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const OUString& rName, bool m_pCbProtect->Enable(false); } - - void ScNewScenarioDlg::GetScenarioData( OUString& rName, OUString& rComment, Color& rColor, sal_uInt16& rFlags ) const { @@ -151,8 +145,6 @@ void ScNewScenarioDlg::SetScenarioData( const OUString& rName, const OUString& r m_pCbProtect->Check ( (nFlags & SC_SCENARIO_PROTECT) != 0 ); } - - IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl) { OUString aName = comphelper::string::strip(m_pEdName->GetText(), ' '); @@ -177,8 +169,6 @@ IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl) //! beim Editieren testen, ob eine andere Tabelle den Namen hat! } - - IMPL_LINK( ScNewScenarioDlg, EnableHdl, CheckBox *, pBox ) { if (pBox == m_pCbShowFrame) diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 5de5e123e37a..95355a15c5b2 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -58,8 +58,6 @@ using namespace com::sun::star::uno; #define SEP_PATH_CLPBRD "Office.Calc/Dialogs/ClipboardTextImport" #define SEP_PATH_TEXT2COL "Office.Calc/Dialogs/TextToColumnsImport" - - static void lcl_FillCombo( ComboBox& rCombo, const OUString& rList, sal_Unicode cSelect ) { sal_Int32 i; @@ -233,8 +231,6 @@ static void save_Separators( aItem.PutProperties(aNames, aValues); } - - ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent, const OUString& aDatName, SvStream* pInStream, ScImportAsciiCall eCall ) : ModalDialog (pParent, "TextImportCsvDialog", @@ -463,8 +459,6 @@ ScImportAsciiDlg::~ScImportAsciiDlg() } - - bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText ) { if (nLine >= ASCIIDLG_MAXROWS || !mpDatStream) @@ -630,8 +624,6 @@ void ScImportAsciiDlg::UpdateVertical() } - - 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 133834bf64e2..6b0d32278741 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "scuiimoptdlg.hxx" #include "tabvwsh.hxx" #include "scresid.hxx" @@ -57,8 +55,6 @@ private: sal_Int32 nIter; }; - - sal_uInt16 ScDelimiterTable::GetCode( const OUString& rDel ) const { sal_Unicode nCode = 0; @@ -81,8 +77,6 @@ sal_uInt16 ScDelimiterTable::GetCode( const OUString& rDel ) const return nCode; } - - OUString ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const { OUString aStrDel; @@ -249,16 +243,12 @@ ScImportOptionsDlg::ScImportOptionsDlg( SetText( *pStrTitle ); } - - ScImportOptionsDlg::~ScImportOptionsDlg() { delete pFieldSepTab; delete pTextSepTab; } - - void ScImportOptionsDlg::GetImportOptions( ScImportOptions& rOptions ) const { rOptions.SetTextEncoding( m_pLbCharset->GetSelectTextEncoding() ); @@ -274,8 +264,6 @@ void ScImportOptionsDlg::GetImportOptions( ScImportOptions& rOptions ) const } } - - sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const { ScDelimiterTable* pTab; @@ -302,8 +290,6 @@ sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo( const ComboBox& rEd ) const return nCode; } - - IMPL_LINK( ScImportOptionsDlg, FixedWidthHdl, CheckBox*, pCheckBox ) { if (pCheckBox == m_pCbFixed) diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 0367f38122d9..e217a4cebfb7 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -41,12 +41,8 @@ #define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK),\ ScGlobal::GetRscString(rid) ).Execute() - - // class ScSpecialFilterDialog - - ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, const SfxItemSet& rArgSet ) @@ -101,8 +97,6 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi } - - ScSpecialFilterDlg::~ScSpecialFilterDlg() { sal_uInt16 nEntries = pLbFilterArea->GetEntryCount(); @@ -122,8 +116,6 @@ ScSpecialFilterDlg::~ScSpecialFilterDlg() } - - void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) { const ScQueryItem& rQueryItem = (const ScQueryItem&) @@ -204,8 +196,6 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) } - - bool ScSpecialFilterDlg::Close() { if (pViewData) @@ -214,8 +204,6 @@ bool ScSpecialFilterDlg::Close() return DoClose( ScSpecialFilterDlgWrapper::GetChildWindowId() ); } - - // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Edit angezeigt wird. @@ -239,8 +227,6 @@ void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } - - void ScSpecialFilterDlg::SetActive() { if ( bRefInputMode ) @@ -264,8 +250,6 @@ void ScSpecialFilterDlg::SetActive() } - - ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, const ScRange& rSource ) { @@ -277,15 +261,11 @@ ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, } - - bool ScSpecialFilterDlg::IsRefInputMode() const { return bRefInputMode; } - - // Handler: @@ -406,8 +386,6 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) } - - IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) { // alle 50ms nachschauen, ob RefInputMode noch stimmt @@ -437,8 +415,6 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) } - - IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) { if ( pLb == pLbFilterArea ) @@ -456,8 +432,6 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) } - - IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd ) { if ( pEd == pEdFilterArea ) diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx index 39eaa7773c63..f82f72ae6045 100644 --- a/sc/source/ui/dbgui/sortkeydlg.cxx +++ b/sc/source/ui/dbgui/sortkeydlg.cxx @@ -11,8 +11,6 @@ #include "sortdlg.hxx" #include <vcl/layout.hxx> - - ScSortKeyItem::ScSortKeyItem(Window* pParent) { m_pUIBuilder = new VclBuilder(pParent, getUIRootDir(), "modules/scalc/ui/sortkey.ui"); @@ -34,15 +32,11 @@ void ScSortKeyItem::DisableField() m_pFrame->Disable(); } - - void ScSortKeyItem::EnableField() { m_pFrame->Enable(); } - - ScSortKeyWindow::ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& rSortKeyItems) : mrSortKeyItems(rSortKeyItems) { @@ -56,15 +50,11 @@ ScSortKeyWindow::ScSortKeyWindow(SfxTabPage* pParent, ScSortKeyItems& rSortKeyIt } } - - ScSortKeyWindow::~ScSortKeyWindow() { mrSortKeyItems.clear(); } - - void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber ) { ScSortKeyItem* pSortKeyItem = new ScSortKeyItem(m_pBox); @@ -77,15 +67,11 @@ void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber ) mrSortKeyItems.push_back(pSortKeyItem); } - - void ScSortKeyWindow::DoScroll(sal_Int32 nNewPos) { m_pBox->SetPosPixel(Point(0, nNewPos)); } - - ScSortKeyCtrl::ScSortKeyCtrl(SfxTabPage* pParent, ScSortKeyItems& rItems) : m_aSortWin(pParent, rItems) , m_rScrolledWindow(*pParent->get<VclScrolledWindow>("SortCriteriaPage")) @@ -126,8 +112,6 @@ void ScSortKeyCtrl::setScrollRange() checkAutoVScroll(); } - - IMPL_LINK( ScSortKeyCtrl, ScrollHdl, ScrollBar*, pScrollBar ) { sal_Int32 nOffset = m_aSortWin.GetItemHeight(); @@ -136,8 +120,6 @@ IMPL_LINK( ScSortKeyCtrl, ScrollHdl, ScrollBar*, pScrollBar ) return 0; } - - void ScSortKeyCtrl::AddSortKey( sal_uInt16 nItem ) { m_rVertScroll.SetRangeMax( nItem ); diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index 56c99d66e19e..b5c9900930c2 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -20,15 +20,11 @@ #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) @@ -42,8 +38,6 @@ ScSubTotalDlg::ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet) m_pBtnRemove->SetClickHdl( LINK( this, ScSubTotalDlg, RemoveHdl ) ); } - - IMPL_LINK_INLINE_START( ScSubTotalDlg, RemoveHdl, PushButton *, pBtn ) { if (pBtn == m_pBtnRemove) diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index f6c4e75c712e..fc4190a9efe0 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "textimportoptions.hxx" #include "vcl/svapp.hxx" #include "vcl/msgbox.hxx" diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 20c4609a3948..63eff99e4da3 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -48,8 +48,6 @@ using namespace com::sun::star; - - /* * Since the settings on the second Tab Page (Options) effects * the first Tab Page, there must be a way for it to communicate with the @@ -68,8 +66,6 @@ using namespace com::sun::star; * This still needs to be changed! */ - - // Sort Criteria Tab page ScTabPageSortFields::ScTabPageSortFields(Window* pParent, @@ -116,14 +112,10 @@ void ScTabPageSortFields::SetPosPixel(const Point& rAllocPos) maSortKeyCtrl.setScrollRange(); } - - ScTabPageSortFields::~ScTabPageSortFields() { } - - void ScTabPageSortFields::Init() { const ScSortItem& rSortItem = (const ScSortItem&) @@ -144,16 +136,12 @@ void ScTabPageSortFields::Init() } } - - SfxTabPage* ScTabPageSortFields::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTabPageSortFields( pParent, rArgSet ) ); } - - void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) { bSortByRows = aSortData.bByRow; @@ -236,8 +224,6 @@ void ScTabPageSortFields::Reset( const SfxItemSet& /* rArgSet */ ) SetLastSortKey( nSortKeyCount ); } - - bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) { ScSortParam aNewSortData = aSortData; @@ -302,8 +288,6 @@ bool ScTabPageSortFields::FillItemSet( SfxItemSet& rArgSet ) return true; } - - // for data exchange without dialogue detour: void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet ) { @@ -328,8 +312,6 @@ void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet ) } } - - int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) { if ( pDlg ) @@ -347,8 +329,6 @@ int ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP ) return SfxTabPage::LEAVE_PAGE; } - - void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) { if ( pViewData ) @@ -417,8 +397,6 @@ void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField ) } } - - sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField ) { sal_uInt16 nFieldPos = 0; @@ -542,8 +520,6 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, m_pLbSortUser->SetAccessibleName(m_pBtnSortUser->GetText()); } - - ScTabPageSortOptions::~ScTabPageSortOptions() { sal_uInt16 nEntries = m_pLbOutPos->GetEntryCount(); @@ -555,8 +531,6 @@ ScTabPageSortOptions::~ScTabPageSortOptions() delete pColWrap; //! not if from document } - - void ScTabPageSortOptions::Init() { // CollatorResource has user-visible names for sort algorithms @@ -640,8 +614,6 @@ void ScTabPageSortOptions::Init() m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM ); } - - SfxTabPage* ScTabPageSortOptions::Create( Window* pParent, const SfxItemSet& rArgSet ) @@ -649,8 +621,6 @@ SfxTabPage* ScTabPageSortOptions::Create( return ( new ScTabPageSortOptions( pParent, rArgSet ) ); } - - void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) { if ( aSortData.bUserDef ) @@ -718,8 +688,6 @@ void ScTabPageSortOptions::Reset( const SfxItemSet& /* rArgSet */ ) } } - - bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) { // Create local copy of ScParam @@ -767,8 +735,6 @@ bool ScTabPageSortOptions::FillItemSet( SfxItemSet& rArgSet ) return true; } - - // for data exchange without dialogue detour: void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet ) { @@ -793,8 +759,6 @@ void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet ) } } - - int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) { sal_Bool bPosInputOk = sal_True; @@ -847,8 +811,6 @@ int ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP ) return bPosInputOk ? SfxTabPage::LEAVE_PAGE : SfxTabPage::KEEP_PAGE; } - - void ScTabPageSortOptions::FillUserSortListBox() { ScUserList* pUserLists = ScGlobal::GetUserList(); @@ -895,8 +857,6 @@ IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox ) return 0; } - - IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) { if (pLb == m_pLbOutPos) @@ -912,8 +872,6 @@ IMPL_LINK( ScTabPageSortOptions, SelOutPosHdl, ListBox *, pLb ) return 0; } - - IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn ) { if (pBtn == m_pBtnTopDown) @@ -927,8 +885,6 @@ IMPL_LINK( ScTabPageSortOptions, SortDirHdl, RadioButton *, pBtn ) return 0; } - - void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) { if (pEd == m_pEdOutPos) @@ -957,8 +913,6 @@ void ScTabPageSortOptions::EdOutPosModHdl( Edit* pEd ) } } - - IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl) { m_pLbAlgorithm->SetUpdateMode( false ); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 3958ee6e287f..d2c53569f760 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -65,8 +65,6 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent, Init (); } - - ScTpSubTotalGroup::~ScTpSubTotalGroup() { sal_uLong nCount = mpLbColumns->GetEntryCount(); @@ -85,8 +83,6 @@ ScTpSubTotalGroup::~ScTpSubTotalGroup() } } - - void ScTpSubTotalGroup::Init() { const ScSubTotalItem& rSubTotalItem = (const ScSubTotalItem&) @@ -106,8 +102,6 @@ void ScTpSubTotalGroup::Init() FillListBoxes(); } - - bool ScTpSubTotalGroup::DoReset( sal_uInt16 nGroupNo, const SfxItemSet& rArgSet ) { @@ -120,8 +114,6 @@ bool ScTpSubTotalGroup::DoReset( sal_uInt16 nGroupNo, else nGroupIdx = nGroupNo-1; - - // first we have to clear the listboxes... for ( sal_uLong nLbEntry = 0; nLbEntry < mpLbColumns->GetEntryCount(); ++nLbEntry ) { @@ -168,8 +160,6 @@ bool ScTpSubTotalGroup::DoReset( sal_uInt16 nGroupNo, return true; } - - bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, SfxItemSet& rArgSet ) { @@ -191,8 +181,6 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, else nGroupIdx = nGroupNo-1; - - ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt SfxTabDialog* pDlg = GetTabDialog(); if ( pDlg ) @@ -249,8 +237,6 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, return true; } - - void ScTpSubTotalGroup::FillListBoxes() { OSL_ENSURE( pViewData && pDoc, "ViewData or Document not found :-/" ); @@ -287,8 +273,6 @@ void ScTpSubTotalGroup::FillListBoxes() } } - - sal_uInt16 ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField ) { sal_uInt16 nFieldPos = 0; @@ -306,8 +290,6 @@ sal_uInt16 ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField ) return nFieldPos; } - - ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( sal_uInt16 nPos ) { switch ( nPos ) @@ -330,8 +312,6 @@ ScSubTotalFunc ScTpSubTotalGroup::LbPosToFunc( sal_uInt16 nPos ) } } - - sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) { switch ( eFunc ) @@ -384,8 +364,6 @@ IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb ) return 0; } - - IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) { if ( ((SvxCheckListBox*)pLb) == mpLbColumns ) @@ -408,20 +386,14 @@ SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup1( pParent, rArgSet ) ); } - - SfxTabPage* ScTpSubTotalGroup2::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup2( pParent, rArgSet ) ); } - - SfxTabPage* ScTpSubTotalGroup3::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalGroup3( pParent, rArgSet ) ); } - - ScTpSubTotalGroup1::ScTpSubTotalGroup1( Window* pParent, const SfxItemSet& rArgSet ) : ScTpSubTotalGroup( pParent, rArgSet ) {} @@ -435,16 +407,12 @@ ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgS {} - - #define RESET(i) (ScTpSubTotalGroup::DoReset( (i), rArgSet )) void ScTpSubTotalGroup1::Reset( const SfxItemSet& rArgSet ) { RESET(1); } void ScTpSubTotalGroup2::Reset( const SfxItemSet& rArgSet ) { RESET(2); } void ScTpSubTotalGroup3::Reset( const SfxItemSet& rArgSet ) { RESET(3); } #undef RESET - - #define FILLSET(i) (ScTpSubTotalGroup::DoFillItemSet( (i), rArgSet )) bool ScTpSubTotalGroup1::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(1); } bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet& rArgSet ) { return FILLSET(2); } @@ -480,14 +448,10 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, Init(); } - - ScTpSubTotalOptions::~ScTpSubTotalOptions() { } - - void ScTpSubTotalOptions::Init() { const ScSubTotalItem& rSubTotalItem = (const ScSubTotalItem&) @@ -504,16 +468,12 @@ void ScTpSubTotalOptions::Init() FillUserSortListBox(); } - - SfxTabPage* ScTpSubTotalOptions::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTpSubTotalOptions( pParent, rArgSet ) ); } - - void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) { pBtnPagebreak->Check ( rSubTotalData.bPagebreak ); @@ -539,8 +499,6 @@ void ScTpSubTotalOptions::Reset( const SfxItemSet& /* rArgSet */ ) CheckHdl( pBtnSort ); } - - bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) { ScSubTotalParam theSubTotalData; // auslesen, wenn schon teilweise gefuellt @@ -569,8 +527,6 @@ bool ScTpSubTotalOptions::FillItemSet( SfxItemSet& rArgSet ) return true; } - - void ScTpSubTotalOptions::FillUserSortListBox() { ScUserList* pUserLists = ScGlobal::GetUserList(); diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index bcac2499a434..b53301e1d81d 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -49,8 +49,6 @@ #include <sfx2/childwin.hxx> #include "reffact.hxx" - - static sal_uInt16 pValueRanges[] = { FID_VALID_MODE, FID_VALID_ERRTEXT, @@ -59,8 +57,6 @@ static sal_uInt16 pValueRanges[] = }; - - ScValidationDlg::ScValidationDlg(Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/) : ScValidationDlgBase(pParent ? pParent : SFX_APP()->GetTopWindow(), @@ -166,8 +162,6 @@ ScValidationDlg::~ScValidationDlg() RemoveRefDlg( false ); } - - namespace { /** Converts the passed ScValidationMode to the position in the list box. */ @@ -301,8 +295,6 @@ bool lclGetStringListFromFormula( OUString& rStringList, const OUString& rFmlaSt } // namespace - - ScTPValidationValue::ScTPValidationValue( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage( pParent, ScResId( TP_VALIDATION_VALUES ), rArgSet ), maFtAllow ( this, ScResId( FT_ALLOW ) ), @@ -611,8 +603,6 @@ IMPL_LINK( ScTPValidationValue, KillFocusHdl, Window *, pWnd ) return 0; } - - IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl) { sal_uInt16 nLbPos = maLbAllow.GetSelectEntryPos(); @@ -674,8 +664,6 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl) } - - // Input Help Page ScTPValidationHelp::ScTPValidationHelp( Window* pParent, @@ -693,36 +681,26 @@ ScTPValidationHelp::ScTPValidationHelp( Window* pParent, Init(); } - - ScTPValidationHelp::~ScTPValidationHelp() { } - - void ScTPValidationHelp::Init() { pTsbHelp->EnableTriState( false ); } - - sal_uInt16* ScTPValidationHelp::GetRanges() { return pValueRanges; } - - SfxTabPage* ScTPValidationHelp::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTPValidationHelp( pParent, rArgSet ) ); } - - void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) { const SfxPoolItem* pItem; @@ -743,8 +721,6 @@ void ScTPValidationHelp::Reset( const SfxItemSet& rArgSet ) pEdInputHelp->SetText( EMPTY_OUSTRING ); } - - bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) { rArgSet.Put( SfxBoolItem( FID_VALID_SHOWHELP, pTsbHelp->GetState() == TRISTATE_TRUE ) ); @@ -754,8 +730,6 @@ bool ScTPValidationHelp::FillItemSet( SfxItemSet& rArgSet ) return true; } - - // Error Alert Page ScTPValidationError::ScTPValidationError( Window* pParent, @@ -776,14 +750,10 @@ ScTPValidationError::ScTPValidationError( Window* pParent, Init(); } - - ScTPValidationError::~ScTPValidationError() { } - - void ScTPValidationError::Init() { m_pLbAction->SetSelectHdl( LINK( this, ScTPValidationError, SelectActionHdl ) ); @@ -795,23 +765,17 @@ void ScTPValidationError::Init() SelectActionHdl( NULL ); } - - sal_uInt16* ScTPValidationError::GetRanges() { return pValueRanges; } - - SfxTabPage* ScTPValidationError::Create( Window* pParent, const SfxItemSet& rArgSet ) { return ( new ScTPValidationError( pParent, rArgSet ) ); } - - void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) { const SfxPoolItem* pItem; @@ -839,8 +803,6 @@ void ScTPValidationError::Reset( const SfxItemSet& rArgSet ) SelectActionHdl( NULL ); } - - bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) { rArgSet.Put( SfxBoolItem( FID_VALID_SHOWERR, m_pTsbShow->GetState() == TRISTATE_TRUE ) ); @@ -851,8 +813,6 @@ bool ScTPValidationError::FillItemSet( SfxItemSet& rArgSet ) return true; } - - IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl) { ScValidErrorStyle eStyle = (ScValidErrorStyle) m_pLbAction->GetSelectEntryPos(); @@ -865,8 +825,6 @@ IMPL_LINK_NOARG(ScTPValidationError, SelectActionHdl) return( 0L ); } - - IMPL_LINK_NOARG(ScTPValidationError, ClickSearchHdl) { Window* pOld = Application::GetDefDialogParent(); diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index bfda73213579..d74983558519 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -56,8 +56,6 @@ struct AreaLink_Impl TYPEINIT1(ScAreaLink,::sfx2::SvBaseLink); - - ScAreaLink::ScAreaLink( SfxObjectShell* pShell, const OUString& rFile, const OUString& rFilter, const OUString& rOpt, const OUString& rArea, const ScRange& rDest, diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 5e031faec11e..5c9bdd8b2672 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -217,6 +217,4 @@ IMPL_LINK_NOARG(ScAutoStyleList, TimerHdl) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index 1698b621a1c5..364f9bb2aae5 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -53,8 +53,6 @@ using namespace ::com::sun::star; - - bool ScDBDocFunc::AddDBRange( const OUString& rName, const ScRange& rRange, bool /* bApi */ ) { @@ -242,8 +240,6 @@ bool ScDBDocFunc::ModifyDBData( const ScDBData& rNewData ) return bDone; } - - bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bool bIsUnnamed, SCTAB aTab ) { //! auch fuer ScDBFunc::RepeatDB benutzen! @@ -426,8 +422,6 @@ bool ScDBDocFunc::RepeatDB( const OUString& rDBName, bool bRecord, bool bApi, bo return bDone; } - - bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, bool bRecord, bool bPaint, bool bApi ) { @@ -669,8 +663,6 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, return true; } - - bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, const ScRange* pAdvSource, bool bRecord, bool bApi ) { @@ -1010,8 +1002,6 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, return true; } - - bool ScDBDocFunc::DoSubTotals( SCTAB nTab, const ScSubTotalParam& rParam, const ScSortParam* pForceNewSort, bool bRecord, bool bApi ) { @@ -1670,8 +1660,6 @@ void ScDBDocFunc::RefreshPivotTableGroups(ScDPObject* pDPObj) } } - - // database import void ScDBDocFunc::UpdateImport( const OUString& rTarget, const svx::ODataAccessDescriptor& rDescriptor ) @@ -1737,6 +1725,4 @@ void ScDBDocFunc::UpdateImport( const OUString& rTarget, const svx::ODataAccessD } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx index 62e4e51e1f53..270cad2bdf8e 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -101,8 +101,6 @@ void ScDBDocFunc::ShowInBeamer( const ScImportParam& rParam, SfxViewFrame* pFram } } - - bool ScDBDocFunc::DoImportUno( const ScAddress& rPos, const uno::Sequence<beans::PropertyValue>& aArgs ) { @@ -118,8 +116,6 @@ bool ScDBDocFunc::DoImportUno( const ScAddress& rPos, return true; } - - bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, const svx::ODataAccessDescriptor* pDescriptor, bool bRecord, bool bAddrInsert ) { @@ -665,6 +661,4 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index e4b080b317ca..74c34673531f 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -99,8 +99,6 @@ using ::std::vector; // STATIC DATA ----------------------------------------------------------- - - IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction ) { // #i101118# if drawing layer collects the undo actions, add it there @@ -121,8 +119,6 @@ IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction ) return 0; } - - // Zeile ueber dem Range painten (fuer Linien nach AdjustRowHeight) static void lcl_PaintAbove( ScDocShell& rDocShell, const ScRange& rRange ) @@ -136,8 +132,6 @@ static void lcl_PaintAbove( ScDocShell& rDocShell, const ScRange& rRange ) } } - - bool ScDocFunc::AdjustRowHeight( const ScRange& rRange, bool bPaint ) { ScDocument* pDoc = rDocShell.GetDocument(); @@ -169,8 +163,6 @@ bool ScDocFunc::AdjustRowHeight( const ScRange& rRange, bool bPaint ) } - - bool ScDocFunc::DetectiveAddPred(const ScAddress& rPos) { ScDocShellModificator aModificator( rDocShell ); @@ -565,8 +557,6 @@ void ScDocFunc::DetectiveCollectAllSuccs(const ScRangeList& rSrcRanges, vector<S lcl_collectAllPredOrSuccRanges(rSrcRanges, rRefTokens, rDocShell, false); } - - bool ScDocFunc::DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags, bool bRecord, bool bApi ) { @@ -678,8 +668,6 @@ bool ScDocFunc::DeleteContents( const ScMarkData& rMark, sal_uInt16 nFlags, return true; } - - bool ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType, bool bRecord, bool bApi ) { @@ -734,8 +722,6 @@ bool ScDocFunc::TransliterateText( const ScMarkData& rMark, sal_Int32 nType, return true; } - - bool ScDocFunc::SetNormalString( bool& o_rbNumFmtSet, const ScAddress& rPos, const OUString& rText, bool bApi ) { ScDocShellModificator aModificator( rDocShell ); @@ -1185,8 +1171,6 @@ bool ScDocFunc::SetCellText( return bSet; } - - bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow ) { ScDocument& rDoc = *rDocShell.GetDocument(); @@ -1206,8 +1190,6 @@ bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow ) return true; } - - bool ScDocFunc::SetNoteText( const ScAddress& rPos, const OUString& rText, bool bApi ) { ScDocShellModificator aModificator( rDocShell ); @@ -1237,8 +1219,6 @@ bool ScDocFunc::SetNoteText( const ScAddress& rPos, const OUString& rText, bool return true; } - - bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, const OUString* pAuthor, const OUString* pDate, bool bApi ) { bool bDone = false; @@ -1299,8 +1279,6 @@ bool ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, c return bDone; } - - bool ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& rPattern, bool bRecord, bool bApi ) { @@ -3347,8 +3325,6 @@ bool ScDocFunc::SetTabBgColor( return bSuccess; } - - //! SetWidthOrHeight - noch doppelt zu ViewFunc !!!!!! //! Probleme: //! - Optimale Hoehe fuer Edit-Zellen ist unterschiedlich zwischen Drucker und Bildschirm @@ -3667,8 +3643,6 @@ bool ScDocFunc::RemovePageBreak( bool bColumn, const ScAddress& rPos, return true; } - - void ScDocFunc::ProtectSheet( SCTAB nTab, const ScTableProtection& rProtect ) { ScDocument* pDoc = rDocShell.GetDocument(); @@ -3831,8 +3805,6 @@ bool ScDocFunc::Unprotect( SCTAB nTab, const OUString& rPassword, bool bApi ) return true; } - - bool ScDocFunc::ClearItems( const ScMarkData& rMark, const sal_uInt16* pWhich, bool bApi ) { ScDocShellModificator aModificator( rDocShell ); @@ -4050,8 +4022,6 @@ bool ScDocFunc::AutoFormat( const ScRange& rRange, const ScMarkData* pTabMark, return bSuccess; } - - bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark, const ScTokenArray* pTokenArray, const OUString& rString, bool bApi, bool bEnglish, const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) @@ -4139,8 +4109,6 @@ bool ScDocFunc::EnterMatrix( const ScRange& rRange, const ScMarkData* pTabMark, return bSuccess; } - - bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark, const ScTabOpParam& rParam, bool bRecord, bool bApi ) { @@ -4200,8 +4168,6 @@ bool ScDocFunc::TabOp( const ScRange& rRange, const ScMarkData* pTabMark, return bSuccess; } - - inline ScDirection DirFromFillDir( FillDir eDir ) { if (eDir==FILL_TO_BOTTOM) @@ -4655,8 +4621,6 @@ bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e return true; } - - bool ScDocFunc::MergeCells( const ScCellMergeOption& rOption, bool bContents, bool bRecord, bool bApi ) { using ::std::set; @@ -4846,8 +4810,6 @@ bool ScDocFunc::UnmergeCells( const ScCellMergeOption& rOption, bool bRecord ) return true; } - - bool ScDocFunc::ModifyRangeNames( const ScRangeName& rNewRanges, SCTAB nTab ) { return SetNewRangeNames( new ScRangeName(rNewRanges), true, nTab ); @@ -4925,8 +4887,6 @@ void ScDocFunc::ModifyAllRangeNames( const boost::ptr_map<OUString, ScRangeName> SFX_APP()->Broadcast(SfxSimpleHint(SC_HINT_AREAS_CHANGED)); } - - void ScDocFunc::CreateOneName( ScRangeName& rList, SCCOL nPosX, SCROW nPosY, SCTAB nTab, SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, @@ -5081,8 +5041,6 @@ bool ScDocFunc::CreateNames( const ScRange& rRange, sal_uInt16 nFlags, bool bApi return bDone; } - - bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, bool bApi ) { ScDocShellModificator aModificator( rDocShell ); @@ -5193,8 +5151,6 @@ bool ScDocFunc::InsertNameList( const ScAddress& rStartPos, bool bApi ) return bDone; } - - bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd, bool bApi ) { ScDocument* pDoc = rDocShell.GetDocument(); @@ -5239,8 +5195,6 @@ bool ScDocFunc::ResizeMatrix( const ScRange& rOldRange, const ScAddress& rNewEnd return bRet; } - - bool ScDocFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, const ScRange& rDestRange, sal_uLong nRefresh, diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 329e38e9634f..0c2b700a8f57 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -166,8 +166,6 @@ static const sal_Char pFilterHtml[] = "HTML (StarCalc)"; static const sal_Char pFilterHtmlWebQ[] = "calc_HTML_WebQuery"; static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)"; - - #define ScDocShell #include "scslots.hxx" @@ -181,8 +179,6 @@ SFX_IMPL_OBJECTFACTORY( ScDocShell, SvGlobalName(SO3_SC_CLASSID), SFXOBJECTSHELL TYPEINIT1( ScDocShell, SfxObjectShell ); // SfxInPlaceObject: No TypeInfo? - - void ScDocShell::FillClass( SvGlobalName* pClassName, sal_uInt32* pFormat, OUString* /* pAppName */, @@ -211,8 +207,6 @@ void ScDocShell::FillClass( SvGlobalName* pClassName, } } - - void ScDocShell::DoEnterHandler() { ScTabViewShell* pViewSh = ScTabViewShell::GetActiveViewShell(); @@ -221,8 +215,6 @@ void ScDocShell::DoEnterHandler() SC_MOD()->InputEnterHandler(); } - - SCTAB ScDocShell::GetSaveTab() { SCTAB nTab = 0; @@ -2683,8 +2675,6 @@ ScDocShell::ScDocShell( const ScDocShell& rShell ) : // InitItems and CalcOutputFactor are called now in Load/ConvertFrom/InitNew } - - ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : SfxObjectShell( i_nSfxCreationFlags ), aDocument ( SCDOCMODE_DOCUMENT, this ), @@ -2732,8 +2722,6 @@ ScDocShell::ScDocShell( const sal_uInt64 i_nSfxCreationFlags ) : // InitItems and CalcOutputFactor are called now in Load/ConvertFrom/InitNew } - - ScDocShell::~ScDocShell() { ResetDrawObjectShell(); // If the Drawing Layer still tries to access it, access it @@ -2770,8 +2758,6 @@ ScDocShell::~ScDocShell() #endif } - - ::svl::IUndoManager* ScDocShell::GetUndoManager() { return aDocument.GetUndoManager(); diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index bbda71a56c23..cbf967aaf74c 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -32,8 +32,6 @@ using namespace com::sun::star; - - bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) { bool bRet = SfxObjectShell::InitNew( xStor ); @@ -62,8 +60,6 @@ bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) return bRet; } - - bool ScDocShell::IsEmpty() const { return bIsEmpty; @@ -75,8 +71,6 @@ void ScDocShell::SetEmpty(bool bSet) bIsEmpty = bSet; } - - void ScDocShell::InitItems() { // Fill AllItemSet for Controller with needed Items: @@ -145,8 +139,6 @@ void ScDocShell::InitItems() } } - - void ScDocShell::ResetDrawObjectShell() { ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer(); @@ -154,8 +146,6 @@ void ScDocShell::ResetDrawObjectShell() pDrawLayer->SetObjectShell( NULL ); } - - void ScDocShell::Activate() { } @@ -166,8 +156,6 @@ void ScDocShell::Deactivate() } - - ScDrawLayer* ScDocShell::MakeDrawLayer() { ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer(); diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 5de3b11dcf53..4d9580dea59e 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -63,12 +63,8 @@ #include "markdata.hxx" - - // Redraw - Benachrichtigungen - - void ScDocShell::PostEditView( ScEditEngineDefaulter* pEditEngine, const ScAddress& rCursorPos ) { // Broadcast( ScEditViewHint( pEditEngine, rCursorPos ) ); @@ -216,8 +212,6 @@ void ScDocShell::UpdatePaintExt( sal_uInt16& rExtFlags, SCCOL nStartCol, SCROW n UpdatePaintExt( rExtFlags, ScRange( nStartCol, nStartRow, nStartTab, nEndCol, nEndRow, nEndTab ) ); } - - void ScDocShell::LockPaint_Impl(bool bDoc) { if ( !pPaintLockData ) @@ -337,8 +331,6 @@ void ScDocShell::UnlockDocument() } } - - void ScDocShell::SetInplace( bool bInplace ) { if (bIsInplace != bInplace) @@ -403,8 +395,6 @@ double ScDocShell::GetOutputFactor() const return nPrtToScreenFactor; } - - void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and Load { // Einstellungen aus dem SpellCheckCfg kommen in Doc- und ViewOptions @@ -439,8 +429,6 @@ void ScDocShell::InitOptions(bool bForLoading) // called from InitNew and L aDocument.SetLanguage( (LanguageType) nDefLang, (LanguageType) nCjkLang, (LanguageType) nCtlLang ); } - - Printer* ScDocShell::GetDocumentPrinter() // fuer OLE { return aDocument.GetPrinter(); @@ -568,8 +556,6 @@ sal_uInt16 ScDocShell::SetPrinter( SfxPrinter* pNewPrinter, sal_uInt16 nDiffFlag return 0; } - - ScChangeAction* ScDocShell::GetChangeAction( const ScAddress& rPos ) { ScChangeTrack* pTrack = GetDocument()->GetChangeTrack(); @@ -668,8 +654,6 @@ void ScDocShell::ExecuteChangeCommentDialog( ScChangeAction* pAction, Window* pP delete pDlg; } - - void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) { ScChangeTrack* pTrack = aDocument.GetChangeTrack(); @@ -731,12 +715,8 @@ void ScDocShell::CompareDocument( ScDocument& rOtherDoc ) SetDocumentModified(); } - - // Merge (Aenderungen zusammenfuehren) - - static inline sal_Bool lcl_Equal( const ScChangeAction* pA, const ScChangeAction* pB, sal_Bool bIgnore100Sec ) { return pA && pB && diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index c0941fece774..c993c1127d1e 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -98,8 +98,6 @@ using namespace ::com::sun::star; #include "sheetevents.hxx" #include <documentlinkmgr.hxx> - - #define IS_SHARE_HEADER(set) \ ((SfxBoolItem&) \ ((SvxSetItem&)(set).Get(ATTR_PAGE_HEADERSET)).GetItemSet(). \ @@ -114,8 +112,6 @@ using namespace ::com::sun::star; #define SC_PREVIEW_SIZE_Y 12400 - - void ScDocShell::Execute( SfxRequest& rReq ) { // SID_SC_RANGE (Range), @@ -1114,8 +1110,6 @@ void ScDocShell::Execute( SfxRequest& rReq ) } - - void UpdateAcceptChangesDialog() { // update "accept changes" dialog @@ -1129,8 +1123,6 @@ void UpdateAcceptChangesDialog() } } - - bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQueryIfProtected ) { bool bDone = false; @@ -1195,8 +1187,6 @@ bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQuer } - - void ScDocShell::DoRecalc( bool bApi ) { bool bDone = false; @@ -1272,8 +1262,6 @@ void ScDocShell::DoHardRecalc( bool /* bApi */ ) PostPaintGridAll(); } - - void ScDocShell::DoAutoStyle( const ScRange& rRange, const OUString& rStyle ) { ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool(); @@ -1297,8 +1285,6 @@ void ScDocShell::DoAutoStyle( const ScRange& rRange, const OUString& rStyle ) } } - - void ScDocShell::NotifyStyle( const SfxStyleSheetHint& rHint ) { sal_uInt16 nId = rHint.GetHint(); @@ -2198,8 +2184,6 @@ bool ScDocShell::DdeSetData( const OUString& rItem, return pObj; } - - ScViewData* ScDocShell::GetViewData() { SfxViewShell* pCur = SfxViewShell::Current(); @@ -2207,8 +2191,6 @@ ScViewData* ScDocShell::GetViewData() return pViewSh ? pViewSh->GetViewData() : NULL; } - - SCTAB ScDocShell::GetCurTab() { //! this must be made non-static and use a ViewShell from this document! @@ -2248,8 +2230,6 @@ SfxBindings* ScDocShell::GetViewBindings() return NULL; } - - ScDocShell* ScDocShell::GetShellByNum( sal_uInt16 nDocNo ) // static { ScDocShell* pFound = NULL; @@ -2271,8 +2251,6 @@ ScDocShell* ScDocShell::GetShellByNum( sal_uInt16 nDocNo ) // static return pFound; } - - IMPL_LINK( ScDocShell, DialogClosedHdl, sfx2::FileDialogHelper*, _pFileDlg ) { OSL_ENSURE( _pFileDlg, "ScDocShell::DialogClosedHdl(): no file dialog" ); diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 5ad9284e79d9..a743c3def4ad 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -67,8 +67,6 @@ using ::std::auto_ptr; using ::std::vector; - - // former viewfunc/dbfunc methods @@ -291,8 +289,6 @@ ScDBData* ScDocShell::GetDBData( const ScRange& rMarked, ScGetDBMode eMode, ScGe aDocument.SetAnonymousDBData(nTab, pNoNameData); } - - if ( pUndoColl ) { aDocument.CompileDBFormula( false ); // CompileFormulaString diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 4c573f4cfe7e..6853ff2ea99e 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -66,8 +66,6 @@ struct ScStylePair // STATIC DATA ----------------------------------------------------------- - - // Ole diff --git a/sc/source/ui/docshell/docsh7.cxx b/sc/source/ui/docshell/docsh7.cxx index 2c21ac0b9206..3400001d3561 100644 --- a/sc/source/ui/docshell/docsh7.cxx +++ b/sc/source/ui/docshell/docsh7.cxx @@ -19,13 +19,9 @@ #include "docsh.hxx" - - void ScDocShell::GetDrawObjState( SfxItemSet & /* rSet */ ) { // SID_SC_ACTIVEOBJECT (SelectedObject) - removed (old Basic) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index e35989354207..28bbecac3eeb 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -79,8 +79,6 @@ using namespace com::sun::star; using ::std::vector; - - #define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" //! move to a header file? @@ -239,8 +237,6 @@ bool ScDocShell::IsDocument( const INetURLObject& rURL ) return bRet; } - - #ifndef DISABLE_DBCONNECTIVITY static void lcl_setScalesToColumns(ScDocument& rDoc, const vector<long>& rScales) diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx index 2a575aa02611..aab817d0d04e 100644 --- a/sc/source/ui/docshell/editable.cxx +++ b/sc/source/ui/docshell/editable.cxx @@ -67,8 +67,6 @@ ScEditableTester::ScEditableTester( ScViewFunc* pView ) : TestView( pView ); } - - void ScEditableTester::TestBlock( ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) { @@ -134,8 +132,6 @@ void ScEditableTester::TestView( ScViewFunc* pView ) } } - - sal_uInt16 ScEditableTester::GetMessageId() const { if (mbIsEditable) diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 76b394939bfa..257291248d18 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -243,8 +243,6 @@ void removeRangeNamesBySrcDoc(ScRangeName& rRanges, sal_uInt16 nFileId) } - - ScExternalRefCache::Table::Table() : meReferenced( REFERENCED_MARKED ) // Prevent accidental data loss due to lack of knowledge. @@ -472,22 +470,16 @@ ScExternalRefCache::TokenRef ScExternalRefCache::Table::getEmptyOrNullToken( return TokenRef(); } - - ScExternalRefCache::TableName::TableName(const OUString& rUpper, const OUString& rReal) : maUpperName(rUpper), maRealName(rReal) { } - - ScExternalRefCache::CellFormat::CellFormat() : mbIsSet(false), mnType(NUMBERFORMAT_ALL), mnIndex(0) { } - - ScExternalRefCache::ScExternalRefCache() {} ScExternalRefCache::~ScExternalRefCache() {} @@ -1228,8 +1220,6 @@ ScExternalRefCache::DocItem* ScExternalRefCache::getDocItem(sal_uInt16 nFileId) return &itrDoc->second; } - - ScExternalRefLink::ScExternalRefLink(ScDocument* pDoc, sal_uInt16 nFileId, const OUString& rFilter) : ::sfx2::SvBaseLink(::sfx2::LINKUPDATE_ONCALL, FORMAT_FILE), mnFileId(nFileId), @@ -1298,8 +1288,6 @@ IMPL_LINK_NOARG(ScExternalRefLink, ExternalRefEndEditHdl) return 0; } - - static FormulaToken* convertToToken( ScDocument* pHostDoc, ScDocument* pSrcDoc, ScRefCellValue& rCell ) { if (rCell.hasEmptyValue()) @@ -1574,8 +1562,6 @@ ScExternalRefCache::TableTypeRef ScExternalRefManager::getCacheTable( return maRefCache.getCacheTable(nFileId, rTabName, bCreateNew, pnIndex); } - - ScExternalRefManager::LinkListener::LinkListener() { } @@ -1584,8 +1570,6 @@ ScExternalRefManager::LinkListener::~LinkListener() { } - - ScExternalRefManager::ApiGuard::ApiGuard(ScDocument* pDoc) : mpMgr(pDoc->GetExternalRefManager()), mbOldInteractionEnabled(mpMgr->mbUserInteractionEnabled) @@ -1600,8 +1584,6 @@ ScExternalRefManager::ApiGuard::~ApiGuard() mpMgr->mbUserInteractionEnabled = mbOldInteractionEnabled; } - - void ScExternalRefManager::getAllCachedTableNames(sal_uInt16 nFileId, vector<OUString>& rTabNames) const { maRefCache.getAllTableNames(nFileId, rTabNames); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 6fa8b4fac2a5..e048ffef0f9a 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -56,8 +56,6 @@ #include <boost/scoped_ptr.hpp> - - // We don't want to end up with 2GB read in one line just because of malformed // multiline fields, so chop it _somewhere_, which is twice supported columns // times maximum cell content length, 2*1024*64K=128M, and because it's @@ -206,8 +204,6 @@ bool ScImportExport::IsFormatSupported( sal_uLong nFormat ) } - - // Vorbereitung fuer Undo: Undo-Dokument erzeugen @@ -264,8 +260,6 @@ void ScImportExport::EndPaste(bool bAutoRowHeight) } - - bool ScImportExport::ImportData( const OUString& /* rMimeType */, const ::com::sun::star::uno::Any & /* rValue */ ) { @@ -863,8 +857,6 @@ static inline void lcl_WriteSimpleString( SvStream& rStrm, const OUString& rStri } - - bool ScImportExport::Text2Doc( SvStream& rStrm ) { bool bOk = true; @@ -960,8 +952,6 @@ bool ScImportExport::Text2Doc( SvStream& rStrm ) // erweiterter Ascii-Import - - static bool lcl_PutString( ScDocumentImport& rDocImport, SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rStr, sal_uInt8 nColFormat, SvNumberFormatter* pFormatter, bool bDetectNumFormat, diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index 9d31d398c850..6de5358fd9f2 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -36,8 +36,6 @@ using ::std::list; using ::std::for_each; using ::std::pair; - - /** * A simple container to keep track of cells that depend on basic modules * changes. We don't check for duplicates at insertion time; instead, we @@ -92,8 +90,6 @@ private: }; - - ScMacroManager::ScMacroManager(ScDocument* pDoc) : mpDepTracker(new ScUserMacroDepTracker), mpDoc(pDoc) diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx index 5759666d14da..240b1ad7b71c 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -28,8 +28,6 @@ #include "sc.hrc" - - static void lcl_InvalidateOutliner( SfxBindings* pBindings ) { if ( pBindings ) @@ -43,8 +41,6 @@ static void lcl_InvalidateOutliner( SfxBindings* pBindings ) } } - - //! PaintWidthHeight zur DocShell verschieben? static void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab, @@ -78,8 +74,6 @@ static void lcl_PaintWidthHeight( ScDocShell& rDocShell, SCTAB nTab, rDocShell.PostPaint( nStartCol,nStartRow,nTab, MAXCOL,MAXROW,nTab, nParts ); } - - bool ScOutlineDocFunc::MakeOutline( const ScRange& rRange, bool bColumns, bool bRecord, bool bApi ) { bool bSuccess = false; @@ -265,8 +259,6 @@ bool ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, bool bRecord ) return bSuccess; } - - bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, bool bRecord ) { SCCOL nStartCol = rRange.aStart.Col(); @@ -331,8 +323,6 @@ bool ScOutlineDocFunc::AutoOutline( const ScRange& rRange, bool bRecord ) return true; } - - bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, bool bRecord, bool bPaint ) { @@ -426,8 +416,6 @@ bool ScOutlineDocFunc::SelectLevel( SCTAB nTab, bool bColumns, sal_uInt16 nLevel return true; } - - bool ScOutlineDocFunc::ShowMarkedOutlines( const ScRange& rRange, bool bRecord ) { bool bDone = false; @@ -624,8 +612,6 @@ bool ScOutlineDocFunc::HideMarkedOutlines( const ScRange& rRange, bool bRecord ) return bDone; } - - bool ScOutlineDocFunc::ShowOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel, sal_uInt16 nEntry, bool bRecord, bool bPaint ) { @@ -771,6 +757,4 @@ bool ScOutlineDocFunc::HideOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/pagedata.cxx b/sc/source/ui/docshell/pagedata.cxx index cad02c397574..b0c6110490db 100644 --- a/sc/source/ui/docshell/pagedata.cxx +++ b/sc/source/ui/docshell/pagedata.cxx @@ -21,8 +21,6 @@ #include "pagedata.hxx" - - ScPrintRangeData::ScPrintRangeData() { nPagesX = nPagesY = 0; @@ -64,8 +62,6 @@ void ScPrintRangeData::SetPagesY( size_t nCount, const SCROW* pData ) nPagesY = nCount; } - - ScPageBreakData::ScPageBreakData(size_t nMax) { nUsed = 0; @@ -121,6 +117,4 @@ void ScPageBreakData::AddPages() } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx index 9db2dfe7a594..58a31495fbfa 100644 --- a/sc/source/ui/docshell/pntlock.cxx +++ b/sc/source/ui/docshell/pntlock.cxx @@ -19,8 +19,6 @@ #include "pntlock.hxx" - - ScPaintLockData::ScPaintLockData() : nLevel( 0 ), nDocLevel( 0 ), @@ -43,6 +41,4 @@ void ScPaintLockData::AddRange( const ScRange& rRange, sal_uInt16 nP ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/servobj.cxx b/sc/source/ui/docshell/servobj.cxx index 5f1d8d18d8e9..71d1368c3872 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -29,8 +29,6 @@ using namespace formula; - - static bool lcl_FillRangeFromName( ScRange& rRange, ScDocShell* pDocSh, const OUString& rName ) { if (pDocSh) @@ -258,6 +256,4 @@ void ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/sizedev.cxx b/sc/source/ui/docshell/sizedev.cxx index 3b73fc9e41d2..1a9da440b651 100644 --- a/sc/source/ui/docshell/sizedev.cxx +++ b/sc/source/ui/docshell/sizedev.cxx @@ -25,8 +25,6 @@ #include "scmod.hxx" #include "inputopt.hxx" - - ScSizeDeviceProvider::ScSizeDeviceProvider( ScDocShell* pDocSh ) { sal_Bool bTextWysiwyg = SC_MOD()->GetInputOptions().GetTextWysiwyg(); diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index c67fada503dd..cf28198beffb 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -56,8 +56,6 @@ struct TableLink_Impl TYPEINIT1(ScTableLink, ::sfx2::SvBaseLink); - - ScTableLink::ScTableLink(ScDocShell* pDocSh, const OUString& rFile, const OUString& rFilter, const OUString& rOpt, sal_uLong nRefresh ): diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index de9afa62bd45..d1dbac731dc3 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -20,16 +20,12 @@ #undef SC_DLLIMPLEMENTATION - - #include "document.hxx" #include "docsh.hxx" #include "scresid.hxx" #include "tpstat.hxx" - - // Dokumentinfo-Tabpage: @@ -38,8 +34,6 @@ SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet& rSet ) return new ScDocStatPage( pParent, rSet ); } - - ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) : SfxTabPage( pParent, "StatisticsInfoPage", "modules/scalc/ui/statisticsinfopage.ui", rSet ) { @@ -62,26 +56,18 @@ ScDocStatPage::ScDocStatPage( Window *pParent, const SfxItemSet& rSet ) } - - ScDocStatPage::~ScDocStatPage() { } - - bool ScDocStatPage::FillItemSet( SfxItemSet& /* rSet */ ) { return false; } - - void ScDocStatPage::Reset( const SfxItemSet& /* rSet */ ) { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx index e908d75dae95..faa86dd3fc4f 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -59,8 +59,6 @@ #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/frame/XFrame.hpp> - - TYPEINIT1( ScDrawShell, SfxShell ); SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL) ) diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index 99beae50b91c..29872c588e37 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -56,8 +56,6 @@ sal_uInt16 ScGetFontWorkId(); // in drtxtob using namespace com::sun::star; - - ScDrawShell::ScDrawShell( ScViewData* pData ) : SfxShell(pData->GetViewShell()), pViewData( pData ), @@ -398,8 +396,6 @@ void ScDrawShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet ) } - - void ScDrawShell::Activate (const bool bMDI) { (void)bMDI; @@ -411,8 +407,6 @@ void ScDrawShell::Activate (const bool bMDI) } - - ::rtl::OUString ScDrawShell::GetSidebarContextName (void) { return sfx2::sidebar::EnumContext::GetContextName( diff --git a/sc/source/ui/drawfunc/drawsh4.cxx b/sc/source/ui/drawfunc/drawsh4.cxx index 85f481984244..16976c0b2489 100644 --- a/sc/source/ui/drawfunc/drawsh4.cxx +++ b/sc/source/ui/drawfunc/drawsh4.cxx @@ -32,8 +32,6 @@ #include "sc.hrc" - - void ScDrawShell::GetFormTextState(SfxItemSet& rSet) { const SdrObject* pObj = NULL; @@ -99,6 +97,4 @@ void ScDrawShell::GetFormTextState(SfxItemSet& rSet) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 52e524dcf3a6..d6e0366a2305 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -60,8 +60,6 @@ using namespace com::sun::star; - - void ScDrawShell::GetHLinkState( SfxItemSet& rSet ) // Hyperlink { ScDrawView* pView = pViewData->GetScDrawView(); @@ -243,8 +241,6 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) sal_uInt16 ScGetFontWorkId(); - - // Funktionen auf Drawing-Objekten @@ -649,8 +645,6 @@ IMPL_LINK( ScDrawShell, NameObjectHdl, AbstractSvxNameDialog*, pDialog ) return 1; // name is valid } - - void ScDrawShell::ExecFormText(SfxRequest& rReq) { ScDrawView* pDrView = pViewData->GetScDrawView(); @@ -667,8 +661,6 @@ void ScDrawShell::ExecFormText(SfxRequest& rReq) } } - - void ScDrawShell::ExecFormatPaintbrush( SfxRequest& rReq ) { ScViewFunc* pView = pViewData->GetView(); @@ -712,6 +704,4 @@ ScDrawView* ScDrawShell::GetDrawView() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx index 6085d42134ac..28028af7f1f7 100644 --- a/sc/source/ui/drawfunc/drtxtob.cxx +++ b/sc/source/ui/drawfunc/drtxtob.cxx @@ -90,8 +90,6 @@ SFX_IMPL_INTERFACE( ScDrawTextObjectBar, SfxShell, ScResId(SCSTR_DRAWTEXTSHELL) TYPEINIT1( ScDrawTextObjectBar, SfxShell ); - - // abschalten der nicht erwuenschten Acceleratoren: void ScDrawTextObjectBar::StateDisableItems( SfxItemSet &rSet ) @@ -141,12 +139,8 @@ ScDrawTextObjectBar::~ScDrawTextObjectBar() } } - - // Funktionen - - void ScDrawTextObjectBar::Execute( SfxRequest &rReq ) { ScDrawView* pView = pViewData->GetScDrawView(); @@ -544,12 +538,8 @@ void ScDrawTextObjectBar::GetClipState( SfxItemSet& rSet ) } } - - // Attribute - - void ScDrawTextObjectBar::ExecuteToggle( SfxRequest &rReq ) { // Unterstreichung diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index 24b6d15ce46b..9e5dbb736a0d 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -45,8 +45,6 @@ #include "drwtrans.hxx" #include "drwlayer.hxx" - - sal_uInt16 ScGetFontWorkId() { return SvxFontWorkChildWindow::GetChildWindowId(); @@ -268,6 +266,4 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 369aa8cc9393..ab6ca7ea287b 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -36,8 +36,6 @@ #include <math.h> - - FuConstCustomShape::FuConstCustomShape( ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewP, SdrModel* pDoc, SfxRequest& rReq ) : FuConstruct( pViewSh, pWin, pViewP, pDoc, rReq ) { diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 4b8bfcbd6a7f..23591c7b74d0 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -33,8 +33,6 @@ #include "scresid.hxx" - - /************************************************************************* |* |* Konstruktor diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 407b39a0bd75..09c368ef6a42 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -37,8 +37,6 @@ //! fusel,fuconstr,futext - zusammenfassen! #define SC_MAXDRAGMOVE 3 - - /************************************************************************* |* |* Konstruktor @@ -367,6 +365,4 @@ void FuConstruct::Deactivate() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index ab88c9df3ff5..57c75dfd8890 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -45,8 +45,6 @@ using namespace ::com::sun::star; - - void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& rPage ) { if ( !rPage.Width() || !rPage.Height() ) @@ -92,8 +90,6 @@ void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& r rPos.X() = -rPos.X() - rSize.Width(); // back to real position } - - static void lcl_InsertGraphic( const Graphic& rGraphic, const OUString& rFileName, const OUString& rFilterName, sal_Bool bAsLink, sal_Bool bApi, ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView ) @@ -180,8 +176,6 @@ static void lcl_InsertGraphic( const Graphic& rGraphic, pObj->SetGraphicLink( rFileName, ""/*TODO?*/, rFilterName ); } - - static void lcl_InsertMedia( const OUString& rMediaURL, bool bApi, ScTabViewShell* pViewSh, Window* pWindow, SdrView* pView, const Size& rPrefSize, bool const bLink ) diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 6de0e8ab62e8..a369d39affc8 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -21,8 +21,6 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/beans/XPropertySet.hpp> - - #include <toolkit/helper/vclunohelper.hxx> #include <sot/exchange.hxx> #include <svl/globalnameitem.hxx> diff --git a/sc/source/ui/drawfunc/fumark.cxx b/sc/source/ui/drawfunc/fumark.cxx index e620d98b1b07..19313d8ebc96 100644 --- a/sc/source/ui/drawfunc/fumark.cxx +++ b/sc/source/ui/drawfunc/fumark.cxx @@ -31,8 +31,6 @@ #include "drawview.hxx" #include "markdata.hxx" - - /************************************************************************* |* |* Funktion zum Aufziehen eines Rechtecks @@ -257,6 +255,4 @@ void FuMarkRect::ForcePointer(const MouseEvent* /* pMEvt */) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index feedc55d5f3f..85fae0274822 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -48,16 +48,12 @@ #include "docuno.hxx" #include "docsh.hxx" - - // Maximal erlaubte Mausbewegung um noch Drag&Drop zu starten //! fusel,fuconstr,futext - zusammenfassen! #define SC_MAXDRAGMOVE 3 // Min necessary mouse motion for normal dragging #define SC_MINDRAGMOVE 2 - - using namespace com::sun::star; /************************************************************************* diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index d19236b9991f..8f753aae6d3d 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -37,8 +37,6 @@ #include "drawview.hxx" #include <svx/sdrhittesthelper.hxx> - - inline long Diff( const Point& rP1, const Point& rP2 ) { long nX = rP1.X() - rP2.X(); @@ -166,6 +164,4 @@ void FuSelection::ActivateNoteHandles(SdrObject* pObject) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx index fed6aa1b2324..c3409a4daef9 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -46,8 +46,6 @@ //! fusel,fuconstr,futext - zusammenfassen! #define SC_MAXDRAGMOVE 3 - - static void lcl_InvalidateAttribs( SfxBindings& rBindings ) { rBindings.Invalidate( SID_ATTR_CHAR_WEIGHT ); @@ -567,8 +565,6 @@ void FuText::ForcePointer(const MouseEvent* /* pMEvt */) pViewShell->SetActivePointer( aNewPointer ); } - - /************************************************************************* |* |* Tastaturereignisse bearbeiten @@ -595,8 +591,6 @@ bool FuText::KeyInput(const KeyEvent& rKEvt) return bReturn; } - - /************************************************************************* |* |* Function aktivieren diff --git a/sc/source/ui/drawfunc/futext2.cxx b/sc/source/ui/drawfunc/futext2.cxx index e043ec1a8374..86e5c515f8e6 100644 --- a/sc/source/ui/drawfunc/futext2.cxx +++ b/sc/source/ui/drawfunc/futext2.cxx @@ -24,8 +24,6 @@ #include "futext.hxx" #include "tabvwsh.hxx" - - SdrOutliner* FuText::MakeOutliner() { ScViewData* pViewData = pViewShell->GetViewData(); @@ -45,6 +43,4 @@ SdrOutliner* FuText::MakeOutliner() return pOutl; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index fcbeada6a061..c59927b80223 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -40,8 +40,6 @@ #include "dwfunctr.hrc" #include "dwfunctr.hxx" - - SFX_IMPL_DOCKINGWINDOW_WITHID( ScFunctionChildWindow, FID_FUNCTION_BOX ) /************************************************************************* @@ -801,8 +799,6 @@ void ScFunctionDockWin::UpdateFunctionList() } } - - pAllFuncList->SetUpdateMode( true ); if ( pAllFuncList->GetEntryCount() > 0 ) @@ -935,8 +931,6 @@ void ScFunctionDockWin::DoEnter() } - - /************************************************************************* #* Handle: SelHdl #*------------------------------------------------------------------------ @@ -1100,8 +1094,6 @@ void ScFunctionDockWin::Initialize(SfxChildWinInfo *pInfo) } } - - void ScFunctionDockWin::FillInfo(SfxChildWinInfo& rInfo) const { SfxDockingWindow::FillInfo(rInfo); diff --git a/sc/source/ui/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxx index 4ed9680305dc..c97fa2bf2def 100644 --- a/sc/source/ui/formdlg/formdata.cxx +++ b/sc/source/ui/formdlg/formdata.cxx @@ -19,8 +19,6 @@ #include "formdata.hxx" - - ScFormEditData::ScFormEditData() : formula::FormEditData() , pInputHandler(NULL) @@ -46,6 +44,4 @@ void ScFormEditData::SaveValues() pParent = pTemp; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 7c3c58ae1531..f8bd44e21607 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -63,8 +63,6 @@ ScDocument* ScFormulaDlg::pDoc = NULL; ScAddress ScFormulaDlg::aCursorPos; - - // Initialisierung / gemeinsame Funktionen fuer Dialog @@ -365,8 +363,6 @@ bool ScFormulaDlg::calculateValue( const OUString& rStrExp, OUString& rStrResult return true; } - - // virtuelle Methoden von ScAnyRefDlg: void ScFormulaDlg::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton ) { diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx index 8ed0dce25906..2b8e5ab61d2f 100644 --- a/sc/source/ui/formdlg/privsplt.cxx +++ b/sc/source/ui/formdlg/privsplt.cxx @@ -236,8 +236,6 @@ void ScPrivatSplit::SetYRange(Range cRgeY) aYMovingRange=cRgeY; } - - /************************************************************************* #* Member: GetDeltaY #*------------------------------------------------------------------------ @@ -371,8 +369,6 @@ void ScPrivatSplit::ImplInitSettings( bool bFont, bool bForeground, bool bBackgr Invalidate(); } - - void ScPrivatSplit::StateChanged( StateChangedType nType ) { if ( (nType == STATE_CHANGE_ZOOM) || @@ -395,8 +391,6 @@ void ScPrivatSplit::StateChanged( StateChangedType nType ) Control::StateChanged( nType ); } - - void ScPrivatSplit::DataChanged( const DataChangedEvent& rDCEvt ) { if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 2780f3571d3f..0afd3fd4c31c 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -152,8 +152,6 @@ public: bool IsCellInChangeTrack(const ScAddress &cell,Color *pColCellBoder); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 153f3c1b9d94..bd061e4a8f0b 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef _SC_ACCESSIBLECSVCONTROL_HXX #define _SC_ACCESSIBLECSVCONTROL_HXX @@ -34,8 +32,6 @@ #include "AccessibleContextBase.hxx" - - class ScCsvControl; namespace utl { class AccessibleStateSetHelper; } @@ -126,8 +122,6 @@ protected: }; - - class ScCsvRuler; typedef ::cppu::ImplHelper1< @@ -299,8 +293,6 @@ private: }; - - class ScCsvGrid; typedef ::cppu::ImplHelper2< @@ -544,8 +536,6 @@ private: }; - - /** Accessible class representing a cell of the CSV grid control. */ class ScAccessibleCsvCell : public ScAccessibleCsvControl, public accessibility::AccessibleStaticTextBase { @@ -648,8 +638,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index cac2365084a8..e01ee9d0a2ff 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -38,8 +38,6 @@ class ScCsvViewForwarder; class ScAccessibleCell; - - class ScAccessibleTextData : public SfxListener { public: @@ -67,8 +65,6 @@ private: }; - - class ScAccessibleCellBaseTextData : public ScAccessibleTextData, public ScCellTextData { @@ -85,8 +81,6 @@ public: }; - - // ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object class ScAccessibleCellTextData : public ScAccessibleCellBaseTextData @@ -122,8 +116,6 @@ private: }; - - class ScAccessibleEditObjectTextData : public ScAccessibleTextData { public: @@ -155,8 +147,6 @@ protected: }; - - class ScAccessibleEditLineTextData : public ScAccessibleEditObjectTextData { public: @@ -179,8 +169,6 @@ private: }; - - class ScAccessiblePreviewCellTextData : public ScAccessibleCellBaseTextData { public: @@ -208,8 +196,6 @@ private: }; - - class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextData { public: @@ -240,8 +226,6 @@ private: }; - - class ScAccessibleHeaderTextData : public ScAccessibleTextData { public: @@ -273,8 +257,6 @@ private: }; - - class ScAccessibleNoteTextData : public ScAccessibleTextData { public: @@ -306,8 +288,6 @@ private: }; - - class ScAccessibleCsvTextData : public ScAccessibleTextData { private: @@ -345,8 +325,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index d590cf5e4cb6..ba0621630b31 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -156,8 +156,6 @@ private: DECL_LINK( ReOpenTimerHdl, void*); DECL_LINK( ColCompareHdl, SvSortData*); - - protected: void RejectFiltered(); diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index e272aefa09df..af1a3aa71048 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -103,8 +103,6 @@ public: bool CanInputDone( bool bForced ){ return pRefEdit && (bForced || !pRefBtn); } }; - - class SC_DLLPUBLIC ScRefHandler : public IAnyRefDialog { @@ -174,8 +172,6 @@ public: }; - - class ScRefHdlModalImpl : public ModalDialog, public ScRefHandler { public: diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index e0bf70b956fe..1c2c681075f4 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -30,8 +30,6 @@ class ScDocument; class ScViewData; - - class ScPrintAreasDlg : public ScAnyRefDlg { public: @@ -84,8 +82,6 @@ private: #endif }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/asciiopt.hxx b/sc/source/ui/inc/asciiopt.hxx index 8630a4e50b88..8e7c6a2e9218 100644 --- a/sc/source/ui/inc/asciiopt.hxx +++ b/sc/source/ui/inc/asciiopt.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef SC_ASCIIOPT_HXX #define SC_ASCIIOPT_HXX @@ -33,8 +31,6 @@ #include "csvtablebox.hxx" #include "i18nlangtag/lang.h" - - class ScAsciiOptions { private: diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index 6d4854d40e8c..3023be44eac2 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -26,8 +26,6 @@ class Window; class SfxViewFrame; class SfxItemSet; - - class ScAttrDlg : public SfxTabDialog { public: diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx index a553941121f3..3efcc6b2f110 100644 --- a/sc/source/ui/inc/auditsh.hxx +++ b/sc/source/ui/inc/auditsh.hxx @@ -44,8 +44,6 @@ public: void GetState(SfxItemSet& rSet); }; - - #endif diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index aa96dbcf29e8..f75480ce3ec9 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -38,12 +38,8 @@ class ScAutoFmtPreview; // s.u. class SvNumberFormatter; class ScDocument; - - enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE }; - - class SC_DLLPUBLIC ScAutoFmtPreview : public Window { public: diff --git a/sc/source/ui/inc/autostyl.hxx b/sc/source/ui/inc/autostyl.hxx index d6db458abdfb..34651cbb2b9e 100644 --- a/sc/source/ui/inc/autostyl.hxx +++ b/sc/source/ui/inc/autostyl.hxx @@ -57,8 +57,6 @@ public: void ExecuteAllNow(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx index 54f7f07d55f1..5222ab42b8f8 100644 --- a/sc/source/ui/inc/cbutton.hxx +++ b/sc/source/ui/inc/cbutton.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef SC_CBUTTON_HXX #define SC_CBUTTON_HXX @@ -28,8 +26,6 @@ class OutputDevice; - - class ScDDComboBoxButton { public: diff --git a/sc/source/ui/inc/client.hxx b/sc/source/ui/inc/client.hxx index 879c6feac487..fd723aae4107 100644 --- a/sc/source/ui/inc/client.hxx +++ b/sc/source/ui/inc/client.hxx @@ -47,8 +47,6 @@ public: SdrOle2Obj* GetDrawObj(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 7cc7628e3be2..f0e3513523b4 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -32,8 +32,6 @@ class ScViewData; - - enum ScConflictAction { SC_CONFLICT_ACTION_NONE, @@ -43,8 +41,6 @@ enum ScConflictAction typedef ::std::vector< sal_uLong > ScChangeActionList; - - // struct ScConflictsListEntry @@ -59,12 +55,8 @@ struct ScConflictsListEntry }; - - typedef ::std::vector< ScConflictsListEntry > ScConflictsList; - - // class ScConflictsListHelper @@ -83,8 +75,6 @@ public: ScChangeActionMergeMap* pSharedMap, ScChangeActionMergeMap* pOwnMap ); }; - - // class ScConflictsFinder @@ -110,8 +100,6 @@ public: bool Find(); }; - - // class ScConflictsResolver @@ -129,8 +117,6 @@ public: bool bHandleContentAction, bool bHandleNonContentAction ); }; - - // class ScConflictsDlg diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 38571b998cd7..9066c4ddb37a 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -34,8 +34,6 @@ class ScRangeUtil; class ScAreaData; - - class ScConsolidateDlg : public ScAnyRefDlg { public: @@ -106,8 +104,6 @@ private: #endif // _CONSDLG_CXX }; - - #endif // SC_CONSDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 4c91760e8fc5..2bca85f758eb 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -159,8 +159,6 @@ public: }; - - #endif // SC_NAVIPI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index cd3adc52b097..3acd915a88c2 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -31,8 +31,6 @@ class ScViewData; class ScDocument; - - class ScColRowNameRangesDlg : public ScAnyRefDlg { public: @@ -95,8 +93,6 @@ private: #endif }; - - #endif // SC_CRNRDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 3537f629920c..9f5ab5c33587 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef _SC_CSVCONTROL_HXX #define _SC_CSVCONTROL_HXX @@ -36,8 +34,6 @@ namespace com { namespace sun { namespace star { namespace accessibility { } } } } - - /** Minimum character count for a column in separators mode. */ const sal_Int32 CSV_MINCOLWIDTH = 8; /** Maximum length of a cell string. */ @@ -69,8 +65,6 @@ const sal_uInt8 SC_COL_SKIP = 9; const sal_uInt8 SC_COL_ENGLISH = 10; - - /** Exported data of a column (data used in the dialog). */ struct ScCsvExpData { @@ -85,8 +79,6 @@ struct ScCsvExpData typedef ::std::vector< ScCsvExpData > ScCsvExpDataVec; - - /** Specifies which element should be used to perform an action. */ enum ScMoveMode { @@ -100,8 +92,6 @@ enum ScMoveMode }; - - /** Flags for comparison of old and new control layout data. */ typedef sal_uInt32 ScCsvDiff; @@ -122,8 +112,6 @@ const ScCsvDiff CSV_DIFF_VERTICAL = CSV_DIFF_LINECOUNT | CSV_DIFF_LINEOFFS const ScCsvDiff CSV_DIFF_CURSOR = CSV_DIFF_RULERCURSOR | CSV_DIFF_GRIDCURSOR; - - /** A structure containing all layout data valid for both ruler and data grid (i.e. scroll position or column width). */ struct ScCsvLayoutData @@ -169,8 +157,6 @@ inline bool operator!=( const ScCsvLayoutData& rData1, const ScCsvLayoutData& rD } - - /** Enumeration of possible commands to change any settings of the CSV controls. @descr Controls have to send commands instead of changing their settings directly. This helps to keep the different controls consistent to each other. @@ -215,8 +201,6 @@ enum ScCsvCmdType }; - - /** Data for a CSV control command. The stored position data is aways character based, it's never a column index (required for internal consistency). */ class ScCsvCmd @@ -243,8 +227,6 @@ inline void ScCsvCmd::Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nPar } - - /** Base class for the CSV ruler and the data grid control. Implements command handling. */ class SC_DLLPUBLIC ScCsvControl : public Control { @@ -417,8 +399,6 @@ protected: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvgrid.hxx b/sc/source/ui/inc/csvgrid.hxx index 55a374ff6ea6..c8a6b0553dcd 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef _SC_CSVGRID_HXX #define _SC_CSVGRID_HXX @@ -33,8 +31,6 @@ #include "csvsplits.hxx" - - namespace svtools { class ColorConfig; } class EditEngine; class ScEditEngineDefaulter; @@ -42,16 +38,12 @@ class ScAsciiOptions; class ScAccessibleCsvControl; - - const sal_uInt8 CSV_COLFLAG_NONE = 0x00; /// Nothing set. const sal_uInt8 CSV_COLFLAG_SELECT = 0x01; /// Column is selected. const sal_uInt32 CSV_COLUMN_INVALID = CSV_VEC_NOTFOUND; - - /** This struct contains the state of one table column. */ struct ScCsvColState { @@ -78,13 +70,9 @@ inline void ScCsvColState::Select( bool bSel ) } - - typedef ::std::vector< ScCsvColState > ScCsvColStateVec; - - /** A data grid control for the CSV import dialog. The design of this control simulates a Calc spreadsheet with row and column headers. */ class SC_DLLPUBLIC ScCsvGrid : public ScCsvControl, public utl::ConfigurationListener @@ -347,8 +335,6 @@ protected: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvruler.hxx b/sc/source/ui/inc/csvruler.hxx index be81d3db8a54..e3cfd831d888 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef _SC_CSVRULER_HXX #define _SC_CSVRULER_HXX @@ -30,8 +28,6 @@ class ScAccessibleCsvControl; - - /** A ruler control for the CSV import dialog. Supports setting and moving splits (which divide lines of data into several columns). */ class SC_DLLPUBLIC ScCsvRuler : public ScCsvControl @@ -185,8 +181,6 @@ protected: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvsplits.hxx b/sc/source/ui/inc/csvsplits.hxx index 18b8888f4adf..662082d5370a 100644 --- a/sc/source/ui/inc/csvsplits.hxx +++ b/sc/source/ui/inc/csvsplits.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef _SC_CSVSPLITS_HXX #define _SC_CSVSPLITS_HXX @@ -27,16 +25,12 @@ #include <vector> - - /** Constant for an invalid vector index. */ const sal_uInt32 CSV_VEC_NOTFOUND = SAL_MAX_UINT32; /** Constant for an invalid ruler position. */ const sal_Int32 CSV_POS_INVALID = -1; - - /** A vector of column splits that supports inserting, removing and moving splits. */ class ScCsvSplits { @@ -89,8 +83,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index c5e33311887c..27b1d8099330 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef _SC_CSVTABLEBOX_HXX #define _SC_CSVTABLEBOX_HXX @@ -144,8 +142,6 @@ protected: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index c4aa3ca6a97a..2992ab38ab59 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -27,8 +27,6 @@ #include <vcl/lstbox.hxx> #include <com/sun/star/uno/Sequence.hxx> - - class ScDataPilotSourceTypeDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/dbdocfun.hxx b/sc/source/ui/inc/dbdocfun.hxx index a0b39fc6f58b..98385b147f03 100644 --- a/sc/source/ui/inc/dbdocfun.hxx +++ b/sc/source/ui/inc/dbdocfun.hxx @@ -107,8 +107,6 @@ public: void RefreshPivotTableGroups(ScDPObject* pDPObj); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 704fee82d2a4..5d4b8f0572d2 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -36,8 +36,6 @@ class ScDPSaveData; struct ScDPNumGroupInfo; struct ScSubTotalParam; - - class ScDBFunc : public ScViewFunc { private: @@ -122,8 +120,6 @@ public: static sal_uInt16 DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAllCharts ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 85b66f6a1b23..7900f8cb183b 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -33,8 +33,6 @@ class ScViewData; class ScDocument; - - class ScDbNameDlg : public ScAnyRefDlg { public: @@ -102,8 +100,6 @@ private: DECL_LINK( AssModifyHdl, void * ); }; - - #endif // SC_DBNAMDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx index 59eaf1dce39d..f39913c2b7a1 100644 --- a/sc/source/ui/inc/delcldlg.hxx +++ b/sc/source/ui/inc/delcldlg.hxx @@ -28,8 +28,6 @@ #include "global.hxx" - - class ScDeleteCellDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index 1833a10117a5..4831a3eb910d 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -24,8 +24,6 @@ #include <vcl/button.hxx> #include "global.hxx" - - class ScDeleteContentsDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 9da6caf6b715..623a507ad432 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -76,8 +76,6 @@ struct DocShell_Impl; typedef ::boost::unordered_map< sal_uLong, sal_uLong > ScChangeActionMergeMap; - - //enum ScDBFormat { SC_FORMAT_SDF, SC_FORMAT_DBF }; // Extra flags for Repaint diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index dfdca9c8f03f..e0ee7348016d 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -28,8 +28,6 @@ #include "editfield.hxx" #include "dpgroup.hxx" - - class ScDPGroupEditHelper { public: @@ -57,8 +55,6 @@ private: Edit* mpEdValue; }; - - class ScDPNumGroupEditHelper : public ScDPGroupEditHelper { public: @@ -76,8 +72,6 @@ private: ScDoubleField* mpEdValue; }; - - class ScDPDateGroupEditHelper : public ScDPGroupEditHelper { public: @@ -97,8 +91,6 @@ private: }; - - class ScDPNumGroupDlg : public ModalDialog { public: @@ -119,8 +111,6 @@ private: ScDPNumGroupEditHelper maEndHelper; }; - - class ScDPDateGroupDlg : public ModalDialog { public: @@ -150,8 +140,6 @@ private: ScDPDateGroupEditHelper maEndHelper; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 8b9ad3dcf48d..166a40f6b3c3 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -86,8 +86,6 @@ public: ::rtl::OUString GetSidebarContextName (void); }; - - #endif diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index a2acb1b69690..717a32f80318 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -165,8 +165,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/drtxtob.hxx b/sc/source/ui/inc/drtxtob.hxx index 97f916ea0659..1930a23bc774 100644 --- a/sc/source/ui/inc/drtxtob.hxx +++ b/sc/source/ui/inc/drtxtob.hxx @@ -73,8 +73,6 @@ private: bool IsNoteEdit(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx index 7f7534c735d7..62ac77705fff 100644 --- a/sc/source/ui/inc/editfield.hxx +++ b/sc/source/ui/inc/editfield.hxx @@ -22,8 +22,6 @@ #include <vcl/field.hxx> - - /** An edit control that contains a double precision floating-point value. */ class ScDoubleField : public Edit { @@ -36,8 +34,6 @@ public: bool bEraseTrailingDecZeros = true ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/editsh.hxx b/sc/source/ui/inc/editsh.hxx index 154babd12315..d77d991d50c4 100644 --- a/sc/source/ui/inc/editsh.hxx +++ b/sc/source/ui/inc/editsh.hxx @@ -72,8 +72,6 @@ public: OUString GetSelectionText( bool bWholeWord ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 3604f467dff3..dde1c3826599 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -28,8 +28,6 @@ class ScDocument; - - #include "scui_def.hxx" @@ -88,8 +86,6 @@ private: const OUString aErrMsgInvalidVal; - - ScDocument& rDoc; FillDir theFillDir; FillCmd theFillCmd; @@ -112,8 +108,6 @@ private: #endif }; - - #endif // SC_FILLDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 7e1c1f57b4fd..8e5455d58249 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -38,8 +38,6 @@ #include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> - - class ScFilterOptionsMgr; class ScViewData; class ScDocument; @@ -227,8 +225,6 @@ private: DECL_LINK( TimeOutHdl, Timer* ); }; - - #endif // SC_FILTDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 6cfa1cb9fd21..21f8fd818a99 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -25,8 +25,6 @@ #include <vcl/lstbox.hxx> #include <vcl/button.hxx> - - namespace formula { class RefButton; @@ -35,8 +33,6 @@ struct ScQueryParam; class ScDocument; class ScViewData; - - class ScFilterOptionsMgr { public: diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx index 9606b7237400..5c8fb87ef90e 100644 --- a/sc/source/ui/inc/formdata.hxx +++ b/sc/source/ui/inc/formdata.hxx @@ -24,8 +24,6 @@ class ScInputHandler; class ScDocShell; - - class ScFormEditData : public formula::FormEditData { public: @@ -50,8 +48,6 @@ private: ScDocShell* pScDocShell; }; - - #endif // SC_CRNRDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index 8a18ba8fa9a8..8109f1f0ff78 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -109,8 +109,6 @@ protected: ScInputHandler* GetNextInputHandler(ScDocShell* pDocShell,PtrTabViewShell* ppViewSh); }; - - #endif // SC_CRNRDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconarc.hxx b/sc/source/ui/inc/fuconarc.hxx index bc1bdb2a7599..bb2bd35b0fca 100644 --- a/sc/source/ui/inc/fuconarc.hxx +++ b/sc/source/ui/inc/fuconarc.hxx @@ -43,8 +43,6 @@ class FuConstArc : public FuConstruct virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; }; - - #endif // _SD_FUCONARC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconrec.hxx b/sc/source/ui/inc/fuconrec.hxx index ba87384056fd..c4ba01050c35 100644 --- a/sc/source/ui/inc/fuconrec.hxx +++ b/sc/source/ui/inc/fuconrec.hxx @@ -43,8 +43,6 @@ class FuConstRectangle : public FuConstruct virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; }; - - #endif // _SD_FUCONREC_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconstr.hxx b/sc/source/ui/inc/fuconstr.hxx index 1ef2c8c2c228..c92dc192ab79 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -48,8 +48,6 @@ class FuConstruct : public FuDraw Point CurrentGridSyncOffsetAndPos( Point& rInOutPos); }; - - #endif // _SD_FUCONSTR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 643346952154..1e29a62e07c2 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -48,8 +48,6 @@ public: virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; }; - - #endif // _SD_FUCONCTL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fudraw.hxx b/sc/source/ui/inc/fudraw.hxx index 03cc69342024..8effb122fd2c 100644 --- a/sc/source/ui/inc/fudraw.hxx +++ b/sc/source/ui/inc/fudraw.hxx @@ -57,8 +57,6 @@ class FuDraw : public FuPoor void ResetModifiers(); }; - - #endif // _SD_FUDRAW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fumark.hxx b/sc/source/ui/inc/fumark.hxx index b92d49f8c045..947891bfce8a 100644 --- a/sc/source/ui/inc/fumark.hxx +++ b/sc/source/ui/inc/fumark.hxx @@ -52,8 +52,6 @@ class FuMarkRect : public FuPoor virtual sal_uInt8 Command(const CommandEvent& rCEvt) SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 04580c9998aa..d37123f6e66a 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -35,8 +35,6 @@ class ScFuncDesc; - - #define LRU_MAX 10 @@ -53,8 +51,6 @@ public: - - class ScFuncPage : public TabPage { private: diff --git a/sc/source/ui/inc/fupoor.hxx b/sc/source/ui/inc/fupoor.hxx index 3315da55340b..3f87873d826b 100644 --- a/sc/source/ui/inc/fupoor.hxx +++ b/sc/source/ui/inc/fupoor.hxx @@ -114,8 +114,6 @@ public: virtual bool doConstructOrthogonal() const; }; - - #endif // _SD_FUPOOR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/fusel.hxx b/sc/source/ui/inc/fusel.hxx index dbfd90c0ba03..58da6f2d9214 100644 --- a/sc/source/ui/inc/fusel.hxx +++ b/sc/source/ui/inc/fusel.hxx @@ -54,8 +54,6 @@ private: bool IsNoteCaptionClicked( const Point& rPos ) const; }; - - #endif // _SD_FUSEL_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/futext.hxx b/sc/source/ui/inc/futext.hxx index 3475f54b3ce4..bf72c5866e3d 100644 --- a/sc/source/ui/inc/futext.hxx +++ b/sc/source/ui/inc/futext.hxx @@ -26,8 +26,6 @@ class SdrObject; class SdrTextObj; class SdrOutliner; - - /** Base class for Text functions */ class FuText : public FuConstruct { @@ -64,8 +62,6 @@ private: SdrOutliner* MakeOutliner(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 6fa24d70ae20..92743039a1e4 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -79,8 +79,6 @@ struct SpellCallbackInfo; #define SC_PD_BREAK_H 16 #define SC_PD_BREAK_V 32 - - // predefines namespace sdr { namespace overlay { class OverlayObjectList; }} @@ -416,8 +414,6 @@ protected: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx index 4038b4d9a641..122ae01d76d0 100644 --- a/sc/source/ui/inc/groupdlg.hxx +++ b/sc/source/ui/inc/groupdlg.hxx @@ -25,8 +25,6 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> - - class ScGroupDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index ea5ec9e42dc3..0ee89c46e64b 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -27,8 +27,6 @@ #include "sc.hrc" - - class ScHFEditDlg : public SfxTabDialog { SvxNumType eNumType; diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index ea6b85e9c08e..5c76c0e34454 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -48,8 +48,6 @@ class ScDocument; #define FLT_DATE_SAVE 5 #endif - - class ScHighlightChgDlg : public ScAnyRefDlg { private: diff --git a/sc/source/ui/inc/hintwin.hxx b/sc/source/ui/inc/hintwin.hxx index 5c0640377ccb..c5908cae8d11 100644 --- a/sc/source/ui/inc/hintwin.hxx +++ b/sc/source/ui/inc/hintwin.hxx @@ -40,8 +40,6 @@ public: virtual ~ScHintWindow(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx index 40775b9b7fd2..e1ed0824faca 100644 --- a/sc/source/ui/inc/hiranges.hxx +++ b/sc/source/ui/inc/hiranges.hxx @@ -24,8 +24,6 @@ #include "global.hxx" #include "address.hxx" - - struct ScHighlightEntry { ScRange aRef; diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx index 883dd0078682..612da9d44d6d 100644 --- a/sc/source/ui/inc/imoptdlg.hxx +++ b/sc/source/ui/inc/imoptdlg.hxx @@ -29,8 +29,6 @@ #include "scdllapi.h" #include "global.hxx" - - class SC_DLLPUBLIC ScImportOptions { public: @@ -104,6 +102,4 @@ public: #endif // SC_IMOPTDLG_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index c10fdb4da73b..36b5d803c950 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -40,8 +40,6 @@ class ScRangeList; class ScTabViewShell; class Accelerator; - - class ScTextWndBase : public Window { public: @@ -130,8 +128,6 @@ private: ScTabViewShell* mpViewShell; }; - - class ScPosWnd : public ComboBox, public SfxListener // Display position { private: @@ -304,8 +300,6 @@ private: bool mbIsMultiLine; }; - - class ScInputWindowWrapper : public SfxChildWindow { public: diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index 3e4d2bcc1c93..314d9faacd33 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.hxx @@ -27,8 +27,6 @@ #include "global.hxx" - - class ScInsertCellDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 17cfedc43a87..0067cb02bd54 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -39,8 +39,6 @@ class ScDocShell; namespace sfx2 { class DocumentInserter; } namespace sfx2 { class FileDialogHelper; } - - class ScInsertTableDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/invmerge.hxx b/sc/source/ui/inc/invmerge.hxx index f3fd2c34bed6..e54b3ffad55f 100644 --- a/sc/source/ui/inc/invmerge.hxx +++ b/sc/source/ui/inc/invmerge.hxx @@ -42,8 +42,6 @@ public: void Flush(); }; - - #endif diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index 260ff9fbbe31..bc51e98c499e 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -29,8 +29,6 @@ #include <vcl/dialog.hxx> - - class ScSelEntryDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 45f53c41f7e0..5932ea4cdabe 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -34,8 +34,6 @@ namespace sfx2 { class FileDialogHelper; } class ScDocShell; - - class ScLinkedAreaDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 504e53af47d4..976a067971b8 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -31,12 +31,8 @@ #include "uiitems.hxx" - - class ScDocumentPool; - - class ScMessagePool: public SfxItemPool { SfxStringItem aGlobalStringItem; @@ -63,8 +59,6 @@ public: virtual SfxMapUnit GetMetric( sal_uInt16 nWhich ) const SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index 4c845afe1dea..6e087c15fa5b 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -26,8 +26,6 @@ #include <vcl/fixed.hxx> - - class ScMetricInputDlg : public ModalDialog { public: @@ -58,6 +56,4 @@ private: - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 8906d0a250e5..093a7590fe06 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -28,8 +28,6 @@ #include <vcl/fixed.hxx> #include <vcl/edit.hxx> - - class ScMoveTableDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 12597276fe0f..8c9cb91df19d 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -40,8 +40,6 @@ class ScViewData; class ScDocument; - - //logic behind the manage names dialog class ScNameDlg : public ScAnyRefDlg { @@ -138,8 +136,6 @@ public: }; - - #endif // SC_NAMEDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/navcitem.hxx b/sc/source/ui/inc/navcitem.hxx index d07b0ba6a51e..147b00ea40ce 100644 --- a/sc/source/ui/inc/navcitem.hxx +++ b/sc/source/ui/inc/navcitem.hxx @@ -24,8 +24,6 @@ #include <sfx2/ctrlitem.hxx> - - class ScNavigatorDlg; class ScNavigatorControllerItem : public SfxControllerItem diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 736da5b47dee..dfe0eb9cf092 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -41,8 +41,6 @@ class ScNavigatorDialogWrapper; class ScNavigatorDlg; class ScNavigatorSettings; - - #define SC_DROPMODE_URL 0 #define SC_DROPMODE_LINK 1 #define SC_DROPMODE_COPY 2 @@ -150,8 +148,6 @@ private: SCCOL NumToAlpha ( SCCOL nColNo, OUString& rStr ); }; - - // class RowEdit class RowEdit : public NumericField @@ -173,8 +169,6 @@ private: void ExecuteRow(); }; - - // class ScDocListBox class ScDocListBox : public ListBox @@ -190,8 +184,6 @@ private: ScNavigatorDlg& rDlg; }; - - // class CommandToolBox class CommandToolBox : public ToolBox @@ -334,8 +326,6 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; - - class ScNavigatorDialogWrapper: public SfxChildWindowContext { public: @@ -352,8 +342,6 @@ private: ScNavigatorDlg* pNavigator; }; - - #endif // SC_NAVIPI_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/notemark.hxx b/sc/source/ui/inc/notemark.hxx index ed459cb47a33..245ad62acdc3 100644 --- a/sc/source/ui/inc/notemark.hxx +++ b/sc/source/ui/inc/notemark.hxx @@ -65,8 +65,6 @@ public: void SetGridOff( const Point& rOff ) { aGridOff = rOff; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx index fd66ba03966a..85e617c2bf3a 100644 --- a/sc/source/ui/inc/olinefun.hxx +++ b/sc/source/ui/inc/olinefun.hxx @@ -26,8 +26,6 @@ class ScDocShell; class ScRange; - - class ScOutlineDocFunc { private: @@ -54,8 +52,6 @@ public: bool bRecord, bool bPaint ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index e8069a1bf76f..7d5a1ac2c30a 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -26,13 +26,9 @@ class ScOutlineEntry; class ScOutlineArray; - - enum ScOutlineMode { SC_OUTLINE_HOR, SC_OUTLINE_VER }; - - /** The window left of or above the spreadsheet containing the outline groups and controls to expand/collapse them. */ class ScOutlineWindow : public Window @@ -229,8 +225,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index cb7ba6ee34b6..11793ce338c1 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -34,8 +34,6 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } - - class ScCursorRefEdit : public formula::RefEdit { Link maCursorUpLink; diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 915f23a74900..0aee29fdc55f 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -50,13 +50,9 @@ class FmFormView; class ScFieldEditEngine; class SdrPaintWindow; - - #define SC_SCENARIO_HSPACE 60 #define SC_SCENARIO_VSPACE 50 - - enum ScOutputType { OUTTYPE_WINDOW, OUTTYPE_PRINTER }; class ScFieldEditEngine; @@ -341,8 +337,6 @@ public: void AddPDFNotes(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/pagedata.hxx b/sc/source/ui/inc/pagedata.hxx index 8ed128d1baf8..3f3f01481c17 100644 --- a/sc/source/ui/inc/pagedata.hxx +++ b/sc/source/ui/inc/pagedata.hxx @@ -23,8 +23,6 @@ #include "global.hxx" #include "address.hxx" - - class ScPrintRangeData { private: @@ -79,8 +77,6 @@ public: void AddPages(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 8d7c701a418a..2c7d29be95e7 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -30,15 +30,11 @@ #include "address.hxx" #include "queryparam.hxx" - - class ScViewData; class ScDocument; class ScQueryItem; class ScTypedStrData; - - class ScPivotFilterDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/pgbrksh.hxx b/sc/source/ui/inc/pgbrksh.hxx index 79ac5e9257e4..3718cbcfe614 100644 --- a/sc/source/ui/inc/pgbrksh.hxx +++ b/sc/source/ui/inc/pgbrksh.hxx @@ -38,8 +38,6 @@ public: }; - - #endif diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx index cfc708c50696..d52259f95254 100644 --- a/sc/source/ui/inc/pivotsh.hxx +++ b/sc/source/ui/inc/pivotsh.hxx @@ -46,8 +46,6 @@ private: ScDPObject* GetCurrDPObject(); }; - - #endif diff --git a/sc/source/ui/inc/popmenu.hxx b/sc/source/ui/inc/popmenu.hxx index a37ad3c38e37..2d237c0ddc2b 100644 --- a/sc/source/ui/inc/popmenu.hxx +++ b/sc/source/ui/inc/popmenu.hxx @@ -39,8 +39,6 @@ public: bool WasHit() const { return bHit; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/preview.hxx b/sc/source/ui/inc/preview.hxx index 00787a050eed..a8826933c727 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -166,8 +166,6 @@ public: SC_DLLPUBLIC const ScMarkData::MarkedTabsType& GetSelectedTabs() const; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index a980a0412710..851824d15289 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -37,8 +37,6 @@ class ScPreviewLocationData; class CommandEvent; - - class ScPreviewShell: public SfxViewShell { ScDocShell* pDocShell; @@ -122,8 +120,6 @@ public: SC_DLLPUBLIC ScPreview* GetPreview() { return pPreview; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index 47a2a4e0a29b..fc8eb6403997 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.hxx @@ -331,8 +331,6 @@ private: void FillPageData(); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index 153eed4ca1e5..88b7f50c7531 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -44,8 +44,6 @@ class ScPrivatSplit : public Control using Control::ImplInitSettings; void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); - - protected: virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 451a75818520..03feaa6ced33 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -40,14 +40,10 @@ #include <boost/scoped_ptr.hpp> #include <boost/unordered_map.hpp> - - typedef sfx::ListBoxWrapper< sal_Int32 > ScDPListBoxWrapper; class ScDPObject; - - class ScDPFunctionListBox : public ListBox { public: @@ -60,8 +56,6 @@ private: void FillFunctionNames(); }; - - class ScDPFunctionDlg : public ModalDialog { typedef ::boost::unordered_map< OUString, OUString, OUStringHash > NameMapType; @@ -103,8 +97,6 @@ private: bool mbEmptyItem; /// true = Empty base item in listbox. }; - - class ScDPSubtotalDlg : public ModalDialog { public: @@ -140,8 +132,6 @@ private: bool mbEnableLayout; /// true = Enable Layout mode controls. }; - - class ScDPSubtotalOptDlg : public ModalDialog { public: @@ -194,8 +184,6 @@ private: NameMapType maDataFieldNameMap; /// Cache for displayed name to field name mapping. }; - - class ScDPShowDetailDlg : public ModalDialog { public: @@ -225,8 +213,6 @@ private: ScDPObject& mrDPObj; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/reffact.hxx b/sc/source/ui/inc/reffact.hxx index f0e697ae10f0..7fed20a2c615 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -35,8 +35,6 @@ SFX_DECL_CHILDWINDOW_WITHID(Class); \ }; - - DECL_WRAPPER_WITHID(ScNameDlgWrapper) DECL_WRAPPER_WITHID(ScNameDefDlgWrapper) DECL_WRAPPER_WITHID(ScSolverDlgWrapper) @@ -166,8 +164,6 @@ public: }; - - #endif // SC_REFFACT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 3b0d2c99573d..41c0843b1a43 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -121,8 +121,6 @@ private: ScPasswordHash meDesiredHash; }; - - class ScRetypePassInputDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx index 066daa363985..eaf9da07219e 100644 --- a/sc/source/ui/inc/rfindlst.hxx +++ b/sc/source/ui/inc/rfindlst.hxx @@ -24,8 +24,6 @@ #include "global.hxx" #include "address.hxx" - - struct ScRangeFindData { ScRange aRef; @@ -60,8 +58,6 @@ public: static ColorData GetColorName(const size_t nIndex); }; - - #endif diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 4d7f63e4b541..8768350a1dfe 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -28,8 +28,6 @@ #include <svtools/svmedit.hxx> #include <svtools/ctrlbox.hxx> - - class ScNewScenarioDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 796348f9d600..60a51efc233e 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - - #ifndef SCUI_ASCIIOPT_HXX #define SCUI_ASCIIOPT_HXX @@ -26,8 +24,6 @@ #include "asciiopt.hxx" #include "svx/langbox.hxx" - - class ScImportAsciiDlg : public ModalDialog { SvStream* mpDatStream; diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index a6c7dbd94d89..193a2a855e85 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -24,8 +24,6 @@ #include "imoptdlg.hxx" - - class ScDelimiterTable; class ScImportOptionsDlg : public ModalDialog diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index f2a07c12dcbc..6cb77c0b478b 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -103,8 +103,6 @@ private: DECL_LINK( MenuHdl, ScExtIButton* ); }; - - class ScRightHeaderEditPage : public ScHFEditPage { public: @@ -114,8 +112,6 @@ private: ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); }; - - class ScLeftHeaderEditPage : public ScHFEditPage { public: @@ -125,8 +121,6 @@ private: ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rSet ); }; - - class ScRightFooterEditPage : public ScHFEditPage { public: @@ -136,8 +130,6 @@ private: ScRightFooterEditPage( Window* pParent, const SfxItemSet& rSet ); }; - - class ScLeftFooterEditPage : public ScHFEditPage { public: diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index ec9818801e26..9f8fc1b43d19 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -24,8 +24,6 @@ #include "viewdata.hxx" - - class ScTabView; class ScViewData; @@ -79,8 +77,6 @@ public: - - class ScHeaderFunctionSet : public FunctionSet // Column / row headers { private: @@ -115,8 +111,6 @@ public: ScHeaderSelectionEngine( Window* pWindow, ScHeaderFunctionSet* pFuncSet ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/selectionstate.hxx b/sc/source/ui/inc/selectionstate.hxx index 25a2fe0abdc8..92147c8ef96b 100644 --- a/sc/source/ui/inc/selectionstate.hxx +++ b/sc/source/ui/inc/selectionstate.hxx @@ -23,8 +23,6 @@ #include <editeng/editdata.hxx> #include "rangelst.hxx" - - /** Enumerates all possible types of selections in a Calc document. */ enum ScSelectionType { @@ -35,8 +33,6 @@ enum ScSelectionType SC_SELECTTYPE_EDITDRAW /// Edit mode in drawing object (with or without selection). }; - - class ScViewData; /** Contains all available data about any possible selection in a Calc document. */ @@ -65,8 +61,6 @@ private: bool operator==( const ScSelectionState& rL, const ScSelectionState& rR ); inline bool operator!=( const ScSelectionState& rL, const ScSelectionState& rR ) { return !(rL == rR); } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index 35b66bdf3b0b..304634d1a749 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -28,8 +28,6 @@ class ScViewData; class ScDocShell; - - // class ScShareDocumentDlg diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index db8fe9a3baae..3a765b68b177 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -25,8 +25,6 @@ #include <vcl/layout.hxx> #include <vcl/lstbox.hxx> - - class ScShowTabDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 6d20fe916f83..e33dd6dddae5 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -34,8 +34,6 @@ class ScViewData; class ScDocument; - - class ScSimpleRefDlg: public ScAnyRefDlg { private: @@ -95,8 +93,6 @@ public: void SetAutoReOpen(bool bFlag) {bAutoReOpen=bFlag;} }; - - #endif // SC_DBNAMDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 39a92d864258..e5d1989181f9 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -33,8 +33,6 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } - - class ScSolverOptionsDialog : public ModalDialog { ListBox* m_pLbEngine; diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index 69fdfe5f576d..33d7f9cfa843 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -28,8 +28,6 @@ #include <vcl/fixed.hxx> #include <vcl/group.hxx> - - enum ScSolverErr { SOLVERR_NOFORMULA, @@ -39,8 +37,6 @@ enum ScSolverErr }; - - class ScSolverDlg : public ScAnyRefDlg { public: diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index a775b791c4d4..5a9f39699f1e 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -23,8 +23,6 @@ #include <svtools/stdctrl.hxx> #include <svx/langbox.hxx> - - struct ScSortKeyItem : public VclBuilderContainer { VclFrame* m_pFrame; @@ -43,8 +41,6 @@ struct ScSortKeyItem : public VclBuilderContainer typedef boost::ptr_vector<ScSortKeyItem> ScSortKeyItems; - - class ScSortKeyWindow { private: @@ -63,8 +59,6 @@ public: sal_Int32 GetTotalHeight() const { return m_pBox->GetSizePixel().Height(); } }; - - class ScSortKeyCtrl { private: diff --git a/sc/source/ui/inc/spelldialog.hxx b/sc/source/ui/inc/spelldialog.hxx index 17bb964e21b6..a60e2151b952 100644 --- a/sc/source/ui/inc/spelldialog.hxx +++ b/sc/source/ui/inc/spelldialog.hxx @@ -23,8 +23,6 @@ #include <memory> #include <svx/SpellDialogChildWindow.hxx> - - class ScConversionEngineBase; class ScSelectionState; class ScTabViewShell; @@ -92,8 +90,6 @@ private: bool mbOldIdleEnabled; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/spelleng.hxx b/sc/source/ui/inc/spelleng.hxx index f90fce409eaa..a69a5f9bbd35 100644 --- a/sc/source/ui/inc/spelleng.hxx +++ b/sc/source/ui/inc/spelleng.hxx @@ -28,8 +28,6 @@ class ScDocShell; class ScDocument; class SfxItemPool; - - /** Base class for special type of edit engines, i.e. for spell checker and text conversion. */ class ScConversionEngineBase : public ScEditEngineDefaulter { @@ -92,8 +90,6 @@ private: bool mbFinished; /// true = Entire document/selection finished. }; - - /** Edit engine for spell checking. */ class ScSpellingEngine : public ScConversionEngineBase { @@ -128,8 +124,6 @@ private: Window* GetDialogParent(); }; - - /** Edit engine for text conversion. */ class ScTextConversionEngine : public ScConversionEngineBase { @@ -155,8 +149,6 @@ private: ScConversionParam maConvParam; /// Conversion parameters. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/spellparam.hxx b/sc/source/ui/inc/spellparam.hxx index 3a11bfac1374..2a38f367259f 100644 --- a/sc/source/ui/inc/spellparam.hxx +++ b/sc/source/ui/inc/spellparam.hxx @@ -21,8 +21,6 @@ #include <vcl/font.hxx> - - /** Specifiers for sheet conversion (functions iterating over the sheet and modifying cells). */ enum ScConversionType { @@ -31,8 +29,6 @@ enum ScConversionType SC_CONVERSION_CHINESE_TRANSL /// Chinese simplified/traditional converter. }; - - /** Parameters for conversion. */ class ScConversionParam { @@ -73,8 +69,6 @@ private: bool mbIsInteractive; /// True = Text conversion has (specific) dialog that may be raised. }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index 8294cec46c30..134cf5483bb6 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -22,8 +22,6 @@ #include <sfx2/styledlg.hxx> - - class SfxStyleSheetBase; class ScStyleDlg : public SfxStyleDialog diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 61efeddfc702..f28b203c85f9 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -24,8 +24,6 @@ #include "scui_def.hxx" - - class ScSubTotalDlg : public SfxTabDialog { public: diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 6bf180393fef..ff5b44278e33 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -25,8 +25,6 @@ #include <vcl/button.hxx> #include <svx/SvxColorValueSet.hxx> - - class ScTabBgColorDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index 87cbd2f44fe5..e19cc574172b 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -27,8 +27,6 @@ class ScViewData; - - // initial size #define SC_TABBAR_DEFWIDTH 270 @@ -77,8 +75,6 @@ public: void SetSheetLayoutRTL( bool bSheetRTL ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index 14126effd5ea..7de0c5753ea5 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -27,8 +27,6 @@ #include "anyrefdg.hxx" - - enum ScTabOpErr { TABOPERR_NOFORMULA = 1, @@ -40,8 +38,6 @@ enum ScTabOpErr TABOPERR_NOROWFORMULA }; - - class ScTabOpDlg : public ScAnyRefDlg { public: @@ -98,6 +94,4 @@ private: #endif // SC_TABOPDLG_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index ecdcbb545cc2..cc548d588b57 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -24,8 +24,6 @@ #include <svtools/stdctrl.hxx> #include <sfx2/tabdlg.hxx> - - class ScTabPageProtection : public SfxTabPage { public: @@ -60,8 +58,6 @@ private: void UpdateButtons(); }; - - #endif // SC_TABPAGES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index 045dfa2bb43e..0fde64c08fb3 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.hxx @@ -46,8 +46,6 @@ public: virtual void Paint( const Rectangle& rPaintRect ) SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index b4fb5b350564..ce968e5330e5 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -82,8 +82,6 @@ public: }; - - class ScTabView : boost::noncopyable { private: @@ -537,8 +535,6 @@ public: void SetAutoSpellData( SCCOL nPosX, SCROW nPosY, const std::vector<editeng::MisspellRanges>* pRanges ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index fea48f5c3f78..bd5f0a20b1f7 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -90,8 +90,6 @@ enum ObjectSelectionType }; - - class ScTabViewShell: public SfxViewShell, public ScDBFunc { private: @@ -422,8 +420,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/target.hxx b/sc/source/ui/inc/target.hxx index 7d128d07fd99..a3a76158a5ef 100644 --- a/sc/source/ui/inc/target.hxx +++ b/sc/source/ui/inc/target.hxx @@ -38,8 +38,6 @@ public: ScTabViewShell* GetViewShell() const { return pViewShell; } }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 135b1c3254f5..628c10bcd347 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -28,8 +28,6 @@ #include <svtools/stdctrl.hxx> #include "editfield.hxx" - - class ScDocOptions; class ScTpCalcOptions : public SfxTabPage diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 0dc893890571..eb4688c3b6b7 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -24,8 +24,6 @@ class ScStyleDlg; - - class ScHFPage : public SvxHFPage { public: @@ -62,8 +60,6 @@ private: #endif }; - - class ScHeaderPage : public ScHFPage { public: @@ -74,8 +70,6 @@ private: ScHeaderPage( Window* pParent, const SfxItemSet& rSet ); }; - - class ScFooterPage : public ScHFPage { public: diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 51ee0e72ad05..c85141e7d323 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -33,8 +33,6 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <cppuhelper/weakref.hxx> - - class ScHeaderEditEngine; class ScPatternAttr; class EditView; diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 9d9f3bfb1624..743b1a5be16a 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -23,8 +23,6 @@ #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> - - class ScTpPrintOptions : public SfxTabPage { CheckBox* m_pSkipEmptyPagesCB; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 5284b6534aae..96f21b49633b 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -35,8 +35,6 @@ #include "address.hxx" #include "sortparam.hxx" - - // +1 because one field is reserved for the "- undefined -" entry #define SC_MAXFIELDS MAXCOLCOUNT+1 diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 452237d2a010..4029d65347c4 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -27,8 +27,6 @@ - - class ScDocStatPage: public SfxTabPage { public: @@ -48,8 +46,6 @@ private: FixedText* m_pFtPages; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index e2bda75455f1..99174bb57479 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -26,8 +26,6 @@ #include <vcl/lstbox.hxx> #include "global.hxx" - - // +1 because one field is reserved for the "- none -" entry #define SC_MAXFIELDS MAXCOLCOUNT+1 @@ -35,8 +33,6 @@ class ScViewData; class ScDocument; struct ScSubTotalParam; - - class ScTpSubTotalGroup : public SfxTabPage { protected: @@ -77,8 +73,6 @@ private: DECL_LINK( CheckHdl, ListBox * ); }; - - class ScTpSubTotalGroup1 : public ScTpSubTotalGroup { protected: @@ -94,8 +88,6 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; - - class ScTpSubTotalGroup2 : public ScTpSubTotalGroup { protected: @@ -111,8 +103,6 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; - - class ScTpSubTotalGroup3 : public ScTpSubTotalGroup { protected: @@ -128,8 +118,6 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; - - class ScTpSubTotalOptions : public SfxTabPage { protected: @@ -168,8 +156,6 @@ private: DECL_LINK( CheckHdl, CheckBox * ); }; - - #endif // SC_TPSORT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 4b9b20c4366d..c2fbe3af2338 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -25,8 +25,6 @@ #include <vcl/lstbox.hxx> #include <vcl/vclmedit.hxx> - - class ScUserList; class ScDocument; class ScViewData; @@ -103,8 +101,6 @@ private: #endif }; - - #endif // SC_TPUSRLST_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 0861c17e18e4..c935b7d96e88 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -27,12 +27,8 @@ #include <svtools/ctrlbox.hxx> #include <svx/strarray.hxx> - - class ScViewOptions; - - class ScTpContentOptions : public SfxTabPage { ListBox* pGridLB; @@ -85,8 +81,6 @@ public: }; - - class ScDocument; class ScTpLayoutOptions : public SfxTabPage { diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 6124de524fa4..5baf06a8d207 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -40,8 +40,6 @@ class ScViewData; class ScDPSaveData; struct ScQueryParam; - - // Items class ScInputStatusItem : public SfxPoolItem @@ -174,8 +172,6 @@ private: ScSortParam theSortData; }; - - class SC_DLLPUBLIC ScQueryItem : public SfxPoolItem { public: @@ -205,8 +201,6 @@ private: bool bIsAdvanced; }; - - class SC_DLLPUBLIC ScSubTotalItem : public SfxPoolItem { public: @@ -232,8 +226,6 @@ private: ScSubTotalParam theSubTotalData; }; - - class SC_DLLPUBLIC ScUserListItem : public SfxPoolItem { public: @@ -253,8 +245,6 @@ private: ScUserList* pUserList; }; - - class ScConsolidateItem : public SfxPoolItem { public: @@ -274,8 +264,6 @@ private: ScConsolidateParam theConsData; }; - - class ScPivotItem : public SfxPoolItem { public: @@ -299,8 +287,6 @@ private: bool bNewSheet; }; - - class ScSolveItem : public SfxPoolItem { public: @@ -320,8 +306,6 @@ private: ScSolveParam theSolveData; }; - - class ScTabOpItem : public SfxPoolItem { public: diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 766bc808511e..d3ab144e9e1a 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -31,8 +31,6 @@ class SdrUndoAction; class ScRefUndoData; class ScDBData; - - class ScSimpleUndo: public SfxUndoAction { ScSimpleUndo(const ScSimpleUndo&); // disabled @@ -63,8 +61,6 @@ protected: static void ShowTable( const ScRange& rRange ); }; - - enum ScBlockUndoMode { SC_UNDO_SIMPLE, SC_UNDO_MANUALHEIGHT, SC_UNDO_AUTOHEIGHT }; class ScBlockUndo: public ScSimpleUndo @@ -110,8 +106,6 @@ protected: void ShowBlock(); }; - - // for functions that act on a database range - takes care of the unnamed database range // (collected separately, before the undo action, for showing dialogs etc.) @@ -135,8 +129,6 @@ public: void EndRedo(); }; - - enum ScMoveUndoMode { SC_UNDO_REFFIRST, SC_UNDO_REFLAST }; class ScMoveUndo: public ScSimpleUndo // mit Referenzen @@ -163,8 +155,6 @@ private: void UndoRef(); }; - - class ScUndoWrapper: public SfxUndoAction // for manual merging of actions { SfxUndoAction* pWrappedUndo; diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index c67affc28210..5eef2fe4105e 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -41,8 +41,6 @@ class SvxSearchItem; class SdrUndoAction; class ScEditDataArray; - - class ScUndoInsertCells: public ScMoveUndo { public: @@ -979,8 +977,6 @@ private: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/undocell.hxx b/sc/source/ui/inc/undocell.hxx index 2ace5366e306..6ab912528c5b 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -254,8 +254,6 @@ private: void SetChangeTrack( const ScCellValue& rOldCell ); }; - - /** Undo action for inserting, removing, and replacing a cell note. */ class ScUndoReplaceNote : public ScSimpleUndo { @@ -298,8 +296,6 @@ private: SdrUndoAction* mpDrawUndo; }; - - /** Undo action for showing or hiding a cell note caption. */ class ScUndoShowHideNote : public ScSimpleUndo { @@ -320,8 +316,6 @@ private: bool mbShown; }; - - class ScUndoDetective: public ScSimpleUndo { public: diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 9b9d4ad7dfdd..c5678e9e0eca 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -40,8 +40,6 @@ class ScDPObject; class SdrUndoAction; class ScMarkData; - - class ScUndoDoOutline: public ScSimpleUndo { public: diff --git a/sc/source/ui/inc/undodraw.hxx b/sc/source/ui/inc/undodraw.hxx index 3c28fa9a9508..beb76b0d217c 100644 --- a/sc/source/ui/inc/undodraw.hxx +++ b/sc/source/ui/inc/undodraw.hxx @@ -51,8 +51,6 @@ public: virtual sal_uInt16 GetId() const SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/undostyl.hxx b/sc/source/ui/inc/undostyl.hxx index b2adb32f79fb..13042eafae50 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -26,8 +26,6 @@ class ScDocShell; class SfxStyleSheetBase; - - class ScStyleSaveData { private: diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 60161d037672..ea0932c9919f 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -42,8 +42,6 @@ class ScDocProtection; class ScTableProtection; class ScMarkData; - - class ScUndoInsertTab : public ScSimpleUndo { public: @@ -351,8 +349,6 @@ private: void DoChange( bool bShow ) const; }; - - /** This class implements undo & redo of document protect & unprotect operations. */ class ScUndoDocProtect : public ScSimpleUndo @@ -378,8 +374,6 @@ private: void DoProtect(bool bProtect); }; - - /** This class implements undo & redo of both protect and unprotect of sheet. */ class ScUndoTabProtect : public ScSimpleUndo diff --git a/sc/source/ui/inc/undoutil.hxx b/sc/source/ui/inc/undoutil.hxx index 532fe66c23d2..d6edb17d99b8 100644 --- a/sc/source/ui/inc/undoutil.hxx +++ b/sc/source/ui/inc/undoutil.hxx @@ -49,8 +49,6 @@ public: SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index e7f8e52da356..c33a890a13f5 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -30,8 +30,6 @@ #include "anyrefdg.hxx" - - struct ScRefHandlerCaller{ virtual ~ScRefHandlerCaller(){} }; @@ -176,8 +174,6 @@ public: }; - - /** The tab page "Criteria" from the Validation dialog. */ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage { @@ -259,8 +255,6 @@ public: }; - - class ScTPValidationHelp : public SfxTabPage { private: @@ -283,8 +277,6 @@ public: virtual void Reset ( const SfxItemSet& rArgSet ) SAL_OVERRIDE; }; - - class ScTPValidationError : public SfxTabPage { private: diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index d8eb8a2188b2..0ec932d6b602 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -25,8 +25,6 @@ #include <boost/scoped_ptr.hpp> - - #define SC_SMALL3DSHADOW COL_BLACK #define SC_SIZE_NONE 65535 const SCCOL SC_TABSTART_NONE = SCCOL_MAX; @@ -104,8 +102,6 @@ class ScExtDocOptions; class ScViewData; class ScMarkData; - - class ScViewDataTable // per-sheet data { friend class ScViewData; @@ -154,8 +150,6 @@ public: ~ScViewDataTable(); }; - - class SC_DLLPUBLIC ScViewData { private: @@ -501,8 +495,6 @@ public: }; - - inline long ScViewData::ToPixel( sal_uInt16 nTwips, double nFactor ) { long nRet = (long)( nTwips * nFactor ); @@ -549,8 +541,6 @@ inline ScSplitPos Which( ScVSplitPos eVPos ) SC_SPLIT_TOPLEFT : SC_SPLIT_BOTTOMLEFT; } - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index bc9408bc7070..f53495e8dc67 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -60,8 +60,6 @@ struct ColRowSpan; namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } } - - class ScViewFunc : public ScTabView { private: @@ -373,8 +371,6 @@ private: void MarkAndJumpToRanges(const ScRangeList& rRanges); }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index 62981f4296aa..4c025c8041bf 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.hxx @@ -23,8 +23,6 @@ #include <vcl/msgbox.hxx> - - /** Message box with warning image and "Do not show again" checkbox. */ class ScCbWarningBox : public WarningBox { @@ -45,8 +43,6 @@ public: }; - - /** Warning box for "Replace cell contents?". */ class ScReplaceWarnBox : public ScCbWarningBox { @@ -60,8 +56,6 @@ public: }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index fa7660706d24..c98935af4ac4 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -1827,8 +1827,6 @@ void ScAcceptChgDlg::Initialize(SfxChildWinInfo *pInfo) } } - - void ScAcceptChgDlg::FillInfo(SfxChildWinInfo& rInfo) const { SfxModelessDialog::FillInfo(rInfo); diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 2e29bea0002b..5b435f0f8f57 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -717,8 +717,6 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren) - - static void lcl_InvalidateWindows() { TypeId aType(TYPE(ScDocShell)); @@ -833,8 +831,6 @@ bool ScRefHandler::EnterRefMode() return m_bInRefMode = true; } - - ScRefHandler::~ScRefHandler() { LeaveRefMode(); @@ -860,8 +856,6 @@ bool ScRefHandler::LeaveRefMode() return true; } - - void ScRefHandler::SwitchToDocument() { ScTabViewShell* pCurrent = ScTabViewShell::GetActiveViewShell(); @@ -890,8 +884,6 @@ void ScRefHandler::SwitchToDocument() } } - - bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be 0 { // default: allow only same document (overridden in function dialog) @@ -903,15 +895,11 @@ bool ScRefHandler::IsDocAllowed(SfxObjectShell* pDocSh) const // pDocSh may be return ( aDocName.isEmpty() || aDocName == aCmpName ); } - - bool ScRefHandler::IsRefInputMode() const { return m_rWindow.IsVisible(); // nur wer sichtbar ist kann auch Referenzen bekommen } - - bool ScRefHandler::DoClose( sal_uInt16 nId ) { m_aHelper.DoClose(nId); @@ -923,22 +911,16 @@ void ScRefHandler::SetDispatcherLock( bool bLock ) m_aHelper.SetDispatcherLock( bLock ); } - - void ScRefHandler::ViewShellChanged() { m_aHelper.ViewShellChanged(); } - - void ScRefHandler::AddRefEntry() { // wenn nicht ueberladen, gibt es keine Mehrfach-Referenzen } - - bool ScRefHandler::IsTableLocked() const { // per Default kann bei Referenzeingabe auch die Tabelle umgeschaltet werden @@ -946,13 +928,9 @@ bool ScRefHandler::IsTableLocked() const return false; } - - // RefInputStart/Done: Zoom-In (AutoHide) auf einzelnes Feld // (per Button oder Bewegung) - - void ScRefHandler::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton ) { m_aHelper.RefInputStart( pEdit, pButton ); @@ -1031,8 +1009,6 @@ void ScRefHandler::RefInputDone( bool bForced ) m_aHelper.RefInputDone( bForced ); } - - ScRefHdlModalImpl::ScRefHdlModalImpl(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : ModalDialog( pParent, rID, rUIXMLDescription) diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 281acd237a58..67920b735475 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -52,8 +52,6 @@ #define FRAME_OFFSET 4 - - // ScAutoFmtPreview ScAutoFmtPreview::ScAutoFmtPreview(Window* pParent) @@ -157,8 +155,6 @@ rFont.MethodName( Value ); rCJKFont.MethodName( Value ); rCTLFont.MethodName( Va } } - - sal_uInt16 ScAutoFmtPreview::GetFormatIndex( size_t nCol, size_t nRow ) const { static const sal_uInt16 pnFmtMap[] = @@ -184,8 +180,6 @@ const SvxLineItem& ScAutoFmtPreview::GetDiagItem( size_t nCol, size_t nRow, bool return *static_cast< const SvxLineItem* >( pCurData->GetItem( GetFormatIndex( nCol, nRow ), bTLBR ? ATTR_BORDER_TLBR : ATTR_BORDER_BLTR ) ); } - - void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) { if ( pCurData ) @@ -369,8 +363,6 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) #undef FRAME_OFFSET - - void ScAutoFmtPreview::DrawStrings() { for( size_t nRow = 0; nRow < 5; ++nRow ) @@ -378,8 +370,6 @@ void ScAutoFmtPreview::DrawStrings() DrawString( nCol, nRow ); } - - void ScAutoFmtPreview::DrawBackground() { if( pCurData ) @@ -401,8 +391,6 @@ void ScAutoFmtPreview::DrawBackground() } } - - void ScAutoFmtPreview::PaintCells() { if ( pCurData ) @@ -451,8 +439,6 @@ void ScAutoFmtPreview::CalcCellArray( bool bFitWidthP ) aPrvSize.Height() = maArray.GetHeight() + 4; } - - inline void lclSetStyleFromBorder( svx::frame::Style& rStyle, const ::editeng::SvxBorderLine* pBorder ) { rStyle.Set( pBorder, 1.0 / TWIPS_PER_POINT, 5 ); @@ -531,8 +517,6 @@ void ScAutoFmtPreview::DoPaint( const Rectangle& /* rRect */ ) aVD.SetDrawMode( nOldDrawMode ); } - - void ScAutoFmtPreview::Paint( const Rectangle& rRect ) { DoPaint( rRect ); diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 732caafeaa8e..3d0024219fda 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -26,8 +26,6 @@ #include "viewdata.hxx" #include "dbfunc.hxx" - - // struct ScConflictsListEntry @@ -59,8 +57,6 @@ bool ScConflictsListEntry::HasOwnAction( sal_uLong nOwnAction ) const return false; } - - // class ScConflictsListHelper @@ -147,8 +143,6 @@ void ScConflictsListHelper::TransformConflictsList( ScConflictsList& rConflictsL } } - - // class ScConflictsFinder diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 93538409e5b6..aea36217f07f 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -29,8 +29,6 @@ #include <vcl/msgbox.hxx> #include <boost/scoped_array.hpp> - - #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() #define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute() @@ -38,8 +36,6 @@ const sal_uLong nEntryDataCol = 0; const sal_uLong nEntryDataRow = 1; const sal_uLong nEntryDataDelim = 2; - - // class ScColRowNameRangesDlg diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 94ea4e734932..f9e4639b89d6 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -9,8 +9,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "datafdlg.hxx" #include "scresid.hxx" #include "viewdata.hxx" diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index b26a0f87bcfe..1bcc3532b31a 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -22,8 +22,6 @@ - - #include "delcldlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" @@ -31,8 +29,6 @@ static sal_uInt8 nDelItemChecked=0; - - ScDeleteCellDlg::ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove) : ModalDialog(pParent, "DeleteCellsDialog", "modules/scalc/ui/deletecells.ui") { @@ -65,8 +61,6 @@ ScDeleteCellDlg::ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove) } } - - DelCellCmd ScDeleteCellDlg::GetDelCellCmd() const { DelCellCmd nReturn = DEL_NONE; diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 98ea97518511..dd1d0cdc38ce 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -19,22 +19,16 @@ #undef SC_DLLIMPLEMENTATION - - #include "delcodlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - - bool ScDeleteContentsDlg::bPreviousAllCheck = false; sal_uInt16 ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA | IDF_VALUE); - - ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, sal_uInt16 nCheckDefaults ) : ModalDialog ( pParent, "DeleteContentsDialog", "modules/scalc/ui/deletecontents.ui" ), @@ -78,8 +72,6 @@ ScDeleteContentsDlg::ScDeleteContentsDlg( Window* pParent, aBtnDelAll->SetClickHdl( LINK( this, ScDeleteContentsDlg, DelAllHdl ) ); } - - sal_uInt16 ScDeleteContentsDlg::GetDelContentsCmdBits() const { ScDeleteContentsDlg::nPreviousChecks = 0; @@ -106,8 +98,6 @@ sal_uInt16 ScDeleteContentsDlg::GetDelContentsCmdBits() const : ScDeleteContentsDlg::nPreviousChecks ); } - - void ScDeleteContentsDlg::DisableChecks( bool bDelAllChecked ) { if ( bDelAllChecked ) @@ -135,8 +125,6 @@ void ScDeleteContentsDlg::DisableChecks( bool bDelAllChecked ) } } - - void ScDeleteContentsDlg::DisableObjects() { bObjectsDisabled = true; @@ -144,8 +132,6 @@ void ScDeleteContentsDlg::DisableObjects() aBtnDelObjects->Disable(); } - - IMPL_LINK_NOARG_INLINE_START(ScDeleteContentsDlg, DelAllHdl) { DisableChecks( aBtnDelAll->IsChecked() ); diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 72cf476ab215..92240884d089 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -22,8 +22,6 @@ - - #include <svl/zforlist.hxx> #include <vcl/msgbox.hxx> #include <limits.h> @@ -38,12 +36,8 @@ #undef _FILLDLG_CXX - - // class ScFillSeriesDlg - - ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, ScDocument& rDocument, FillDir eFillDir, @@ -88,14 +82,10 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, } - - ScFillSeriesDlg::~ScFillSeriesDlg() { } - - void ScFillSeriesDlg::SetEdStartValEnabled(bool bFlag) { bStartValFlag=bFlag; @@ -111,8 +101,6 @@ void ScFillSeriesDlg::SetEdStartValEnabled(bool bFlag) } } - - void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) { m_pBtnOk->SetClickHdl ( LINK( this, ScFillSeriesDlg, OKHdl ) ); @@ -200,8 +188,6 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) } - - bool ScFillSeriesDlg::CheckStartVal() { bool bValOk = false; @@ -221,8 +207,6 @@ bool ScFillSeriesDlg::CheckStartVal() } - - bool ScFillSeriesDlg::CheckIncrementVal() { sal_uInt32 nKey = 0; @@ -232,8 +216,6 @@ bool ScFillSeriesDlg::CheckIncrementVal() } - - bool ScFillSeriesDlg::CheckEndVal() { bool bValOk = false; @@ -252,8 +234,6 @@ bool ScFillSeriesDlg::CheckEndVal() return bValOk; } - - // Handler: @@ -294,8 +274,6 @@ IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) } - - IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) { if ( m_pBtnLeft->IsChecked() ) theFillDir = FILL_TO_LEFT; @@ -345,6 +323,4 @@ IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index 2a1388b235cf..43ddb4e9f7b9 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -22,14 +22,10 @@ - - #include "groupdlg.hxx" #include "scresid.hxx" - - ScGroupDlg::ScGroupDlg(Window* pParent, bool bUngroup, bool bRows) : ModalDialog(pParent, bUngroup ? @@ -50,19 +46,13 @@ ScGroupDlg::ScGroupDlg(Window* pParent, bool bUngroup, bool bRows) m_pBtnRows->GrabFocus(); } - - bool ScGroupDlg::GetColsChecked() const { return m_pBtnCols->IsChecked(); } - - ScGroupDlg::~ScGroupDlg() { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 29ba0666356f..6cd7829128e1 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -242,6 +242,4 @@ IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn ) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index b5b59a5f2fd9..37e864c38ab1 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -22,8 +22,6 @@ - - #include "inscldlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" @@ -31,8 +29,6 @@ static sal_uInt8 nInsItemChecked=0; - - ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) : ModalDialog ( pParent, "InsertCellsDialog", "modules/scalc/ui/insertcells.ui") { @@ -66,8 +62,6 @@ ScInsertCellDlg::ScInsertCellDlg( Window* pParent,sal_Bool bDisallowCellMove) : } } - - InsCellCmd ScInsertCellDlg::GetInsCellCmd() const { InsCellCmd nReturn = INS_NONE; @@ -100,6 +94,4 @@ ScInsertCellDlg::~ScInsertCellDlg() { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 08b1a163f6e4..0e967b4b5ccb 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -22,23 +22,17 @@ - - #include "inscodlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - - bool ScInsertContentsDlg::bPreviousAllCheck = false; sal_uInt16 ScInsertContentsDlg::nPreviousChecks = (IDF_VALUE | IDF_DATETIME | IDF_STRING); sal_uInt16 ScInsertContentsDlg::nPreviousFormulaChecks = PASTE_NOFUNC; sal_uInt16 ScInsertContentsDlg::nPreviousChecks2 = 0; sal_uInt16 ScInsertContentsDlg::nPreviousMoveMode = INS_NONE; // enum InsCellCmd - - ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, sal_uInt16 nCheckDefaults, const OUString* pStrTitle ) @@ -124,8 +118,6 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, } - - sal_uInt16 ScInsertContentsDlg::GetInsContentsCmdBits() const { ScInsertContentsDlg::nPreviousChecks = 0; @@ -152,8 +144,6 @@ sal_uInt16 ScInsertContentsDlg::GetInsContentsCmdBits() const : ScInsertContentsDlg::nPreviousChecks ); } - - InsCellCmd ScInsertContentsDlg::GetMoveMode() { if ( mpRbMoveDown->IsChecked() ) @@ -164,8 +154,6 @@ InsCellCmd ScInsertContentsDlg::GetMoveMode() return INS_NONE; } - - void ScInsertContentsDlg::DisableChecks( bool bInsAllChecked ) { if ( bInsAllChecked ) @@ -285,8 +273,6 @@ void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable ) } - - IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl) { DisableChecks( mpBtnInsAll->IsChecked() ); @@ -337,6 +323,4 @@ sal_uInt16 ScInsertContentsDlg::GetFormulaCmdBits() const return ScInsertContentsDlg::nPreviousFormulaChecks; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 970165618224..7b6571a13b12 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -22,8 +22,6 @@ - - #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> #include <sfx2/docinsert.hxx> @@ -41,8 +39,6 @@ #define SC_INSTBDLG_CXX #include "instbdlg.hxx" - - ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nTabCount, bool bFromFile ) : ModalDialog(pParent, "InsertSheetDialog", "modules/scalc/ui/insertsheet.ui") , rViewData(rData) @@ -71,8 +67,6 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT Init_Impl( bFromFile ); } - - ScInsertTableDlg::~ScInsertTableDlg() { if (pDocShTables) @@ -80,8 +74,6 @@ ScInsertTableDlg::~ScInsertTableDlg() delete pDocInserter; } - - void ScInsertTableDlg::Init_Impl( bool bFromFile ) { m_pLbTables->EnableMultiSelection(true); @@ -130,8 +122,6 @@ void ScInsertTableDlg::Init_Impl( bool bFromFile ) } } - - short ScInsertTableDlg::Execute() { // set Parent of DocumentInserter and Doc-Manager @@ -146,8 +136,6 @@ short ScInsertTableDlg::Execute() return nRet; } - - void ScInsertTableDlg::SetNewTable_Impl() { if (m_pBtnNew->IsChecked() ) @@ -167,8 +155,6 @@ void ScInsertTableDlg::SetNewTable_Impl() } } - - void ScInsertTableDlg::SetFromTo_Impl() { if (m_pBtnFromFile->IsChecked() ) @@ -184,8 +170,6 @@ void ScInsertTableDlg::SetFromTo_Impl() } } - - void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) { m_pLbTables->SetUpdateMode( false ); @@ -209,8 +193,6 @@ void ScInsertTableDlg::FillTables_Impl( ScDocument* pSrcDoc ) m_pLbTables->SelectEntryPos(0); } - - const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN ) { const OUString* pStr = NULL; @@ -232,8 +214,6 @@ const OUString* ScInsertTableDlg::GetFirstTable( sal_uInt16* pN ) return pStr; } - - const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) { const OUString* pStr = NULL; @@ -250,8 +230,6 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) return pStr; } - - // Handler: @@ -289,8 +267,6 @@ IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) return 0; } - - IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) { if ( pDocInserter ) @@ -301,16 +277,12 @@ IMPL_LINK_NOARG(ScInsertTableDlg, BrowseHdl_Impl) return 0; } - - IMPL_LINK_NOARG(ScInsertTableDlg, SelectHdl_Impl) { DoEnable_Impl(); return 0; } - - void ScInsertTableDlg::DoEnable_Impl() { if ( m_pBtnNew->IsChecked() || ( pDocShTables && m_pLbTables->GetSelectEntryCount() ) ) diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 6e38b9d547ba..88be94c04b74 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -22,16 +22,12 @@ - - #include <vcl/msgbox.hxx> #include "lbseldlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - - ScSelEntryDlg::ScSelEntryDlg(Window* pParent, const std::vector<OUString> &rEntryList) : ModalDialog(pParent, "SelectRangeDialog", "modules/scalc/ui/selectrange.ui") { @@ -48,15 +44,11 @@ ScSelEntryDlg::ScSelEntryDlg(Window* pParent, const std::vector<OUString> &rEnt m_pLb->SelectEntryPos( 0 ); } - - OUString ScSelEntryDlg::GetSelectEntry() const { return m_pLb->GetSelectEntry(); } - - IMPL_LINK_NOARG_INLINE_START(ScSelEntryDlg, DblClkHdl) { EndDialog( RET_OK ); diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 01a4b5fa79a0..2fb4a91ab9f4 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include <comphelper/string.hxx> #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> @@ -40,8 +38,6 @@ #include "docsh.hxx" #include "tablink.hxx" - - ScLinkedAreaDlg::ScLinkedAreaDlg(Window* pParent) : ModalDialog(pParent, "ExternalDataDialog", "modules/scalc/ui/externaldata.ui") , pSourceShell(NULL) diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 1626febd0888..359230d5cc64 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -22,15 +22,11 @@ - - #include "mtrindlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - - ScMetricInputDlg::ScMetricInputDlg( Window* pParent, const OString& sDialogName, long nCurrent, @@ -66,8 +62,6 @@ ScMetricInputDlg::ScMetricInputDlg( Window* pParent, m_pBtnDefVal->Check( nCurrentValue == nDefaultValue ); } - - long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const { /* @@ -107,8 +101,6 @@ IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) return 0; } - - IMPL_LINK_NOARG_INLINE_START(ScMetricInputDlg, ModifyHdl) { m_pBtnDefVal->Check( nDefaultValue == m_pEdValue->GetValue() ); @@ -116,6 +108,4 @@ IMPL_LINK_NOARG_INLINE_START(ScMetricInputDlg, ModifyHdl) } IMPL_LINK_NOARG_INLINE_END(ScMetricInputDlg, ModifyHdl) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 1e6a40eaa838..ecf5b609bf9f 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -22,8 +22,6 @@ - - #include <vcl/msgbox.hxx> #include "mvtabdlg.hxx" @@ -34,8 +32,6 @@ #include "scresid.hxx" #include "globstr.hrc" - - ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault) : ModalDialog ( pParent, "MoveCopySheetDialog", "modules/scalc/ui/movecopysheet.ui" ), @@ -70,14 +66,10 @@ ScMoveTableDlg::ScMoveTableDlg(Window* pParent, const OUString& rDefault) Init(); } - - ScMoveTableDlg::~ScMoveTableDlg() { } - - sal_uInt16 ScMoveTableDlg::GetSelectedDocument () const { return nDocument; } SCTAB ScMoveTableDlg::GetSelectedTable () const { return nTable; } @@ -214,8 +206,6 @@ bool ScMoveTableDlg::IsCurrentDocSelected() const return pLbDoc->GetSelectEntryPos() == mnCurrentDocPos; } - - void ScMoveTableDlg::Init() { pBtnOk->SetClickHdl ( LINK( this, ScMoveTableDlg, OkHdl ) ); @@ -230,8 +220,6 @@ void ScMoveTableDlg::Init() SelHdl( pLbDoc ); } - - void ScMoveTableDlg::InitDocListBox() { SfxObjectShell* pSh = SfxObjectShell::GetFirst(); @@ -355,6 +343,4 @@ IMPL_LINK( ScMoveTableDlg, CheckNameHdl, Edit *, pEdt ) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index b771e8f67eaf..3423988e890c 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -65,8 +65,6 @@ void ScSolverProgressDialog::SetTimeLimit( sal_Int32 nSeconds ) m_pFtTime->SetText( aNew ); } - - ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* pParent, const OUString& rErrorText ) : ModalDialog(pParent, "NoSolutionDialog", "modules/scalc/ui/nosolutiondialog.ui") { @@ -74,8 +72,6 @@ ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( Window* pParent, const OUStr m_pFtErrorText->SetText(rErrorText); } - - ScSolverSuccessDialog::ScSolverSuccessDialog( Window* pParent, const OUString& rSolution ) : ModalDialog(pParent, "SolverSuccessDialog", "modules/scalc/ui/solversuccessdialog.ui") { @@ -97,8 +93,6 @@ IMPL_LINK( ScSolverSuccessDialog, ClickHdl, PushButton*, pBtn ) return 0; } - - ScCursorRefEdit::ScCursorRefEdit( Window* pParent, Window *pLabel ) : formula::RefEdit( pParent, pLabel ) { @@ -132,8 +126,6 @@ void ScCursorRefEdit::KeyInput( const KeyEvent& rKEvt ) formula::RefEdit::KeyInput( rKEvt ); } - - ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bMin, bool bValue, const OUString& rTarget, const OUString& rVariable, const std::vector<ScOptConditionRow>& rConditions, @@ -275,14 +267,10 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP Init( aCursorPos ); } - - ScOptSolverDlg::~ScOptSolverDlg() { } - - void ScOptSolverDlg::Init(const ScAddress& rCursorPos) { // Get the "Delete Rows" commandimagelist images from sfx instead of @@ -390,8 +378,6 @@ void ScOptSolverDlg::Init(const ScAddress& rCursorPos) mpEdActive = m_pEdObjectiveCell; } - - void ScOptSolverDlg::ReadConditions() { for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow ) @@ -449,15 +435,11 @@ void ScOptSolverDlg::EnableButtons() } } - - bool ScOptSolverDlg::Close() { return DoClose( ScOptSolverDlgWrapper::GetChildWindowId() ); } - - void ScOptSolverDlg::SetActive() { if ( mbDlgLostFocus ) @@ -473,8 +455,6 @@ void ScOptSolverDlg::SetActive() RefInputDone(); } - - void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if( mpEdActive ) @@ -526,8 +506,6 @@ void ScOptSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - - bool ScOptSolverDlg::IsRefInputMode() const { return mpEdActive != NULL; @@ -581,8 +559,6 @@ IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) return 0; } - - IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control*, pCtrl ) { Edit* pEdit = NULL; @@ -612,16 +588,12 @@ IMPL_LINK( ScOptSolverDlg, GetFocusHdl, Control*, pCtrl ) return 0; } - - IMPL_LINK_NOARG(ScOptSolverDlg, LoseFocusHdl) { mbDlgLostFocus = !IsActive(); return 0; } - - IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) { for ( sal_uInt16 nRow = 0; nRow < EDIT_ROW_COUNT; ++nRow ) @@ -650,8 +622,6 @@ IMPL_LINK( ScOptSolverDlg, DelBtnHdl, PushButton*, pBtn ) return 0; } - - IMPL_LINK_NOARG(ScOptSolverDlg, TargetModifyHdl) { // modify handler for the target edit: @@ -751,8 +721,6 @@ IMPL_LINK( ScOptSolverDlg, CursorDownHdl, ScCursorRefEdit*, pEdit ) return 0; } - - void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus ) { OUString aMessage = bCondition ? maConditionError : maInputError; @@ -764,8 +732,6 @@ void ScOptSolverDlg::ShowError( bool bCondition, formula::RefEdit* pFocus ) } } - - bool ScOptSolverDlg::ParseRef( ScRange& rRange, const OUString& rInput, bool bAllowRange ) { ScRangeUtil aRangeUtil; diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 6f1e6b376757..f2d16f32c478 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -392,8 +392,6 @@ IMPL_LINK_NOARG(ScRetypePassDlg, ScrollHdl) return 0; } - - ScRetypePassInputDlg::ScRetypePassInputDlg(Window* pParent, ScPassHashProtectable* pProtected) : ModalDialog(pParent, "RetypePasswordDialog", "modules/scalc/ui/retypepassworddialog.ui") diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 6a53ff903459..83c97b4c3d05 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -22,8 +22,6 @@ - - #include "scitems.hxx" #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> @@ -160,8 +158,6 @@ IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) return 0; } - - IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl) { if ( bCoreDataChanged ) @@ -172,8 +168,6 @@ IMPL_LINK_NOARG_INLINE_START(ScAutoFormatDlg, DblClkHdl) } IMPL_LINK_NOARG_INLINE_END(ScAutoFormatDlg, DblClkHdl) - - IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) { ScAutoFormatData* pData = pFormat->findByIndex(nIndex); @@ -203,8 +197,6 @@ IMPL_LINK( ScAutoFormatDlg, CheckHdl, Button *, pBtn ) return 0; } - - IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) { if ( !bFmtInserted && pSelFmtData ) @@ -277,8 +269,6 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, AddHdl) return 0; } - - IMPL_LINK_NOARG(ScAutoFormatDlg, RemoveHdl) { if ( (nIndex > 0) && (m_pLbFormat->GetEntryCount() > 0) ) @@ -402,8 +392,6 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) return 0; } - - IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) { nIndex = m_pLbFormat->GetSelectEntryPos(); @@ -426,8 +414,6 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, SelFmtHdl) return 0; } - - OUString ScAutoFormatDlg::GetCurrFormatName() { const ScAutoFormatData* p = pFormat->findByIndex(nIndex); diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 1f04f4f30649..e144a7ae3263 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -22,8 +22,6 @@ - - #include <vcl/msgbox.hxx> #include "shtabdlg.hxx" @@ -31,8 +29,6 @@ #include "miscdlgs.hrc" - - ScShowTabDlg::ScShowTabDlg(Window* pParent) : ModalDialog(pParent, "ShowSheetDialog", "modules/scalc/ui/showsheetdialog.ui") { @@ -45,8 +41,6 @@ ScShowTabDlg::ScShowTabDlg(Window* pParent) m_pLb->SetDoubleClickHdl( LINK( this, ScShowTabDlg, DblClkHdl ) ); } - - void ScShowTabDlg::SetDescription( const OUString& rTitle, const OUString& rFixedText, const OString& rDlgHelpId, const OString& sLbHelpId ) diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 384d22e34c20..b99ba1d67c67 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -28,8 +28,6 @@ #include "simpref.hxx" #include "scmod.hxx" - - #define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE #define ABS_DREF ABS_SREF \ @@ -125,8 +123,6 @@ void ScSimpleRefDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - - bool ScSimpleRefDlg::Close() { CancelBtnHdl(m_pBtnCancel); @@ -216,6 +212,4 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 9d8af3909f21..cabc77454d9c 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -39,8 +39,6 @@ using namespace com::sun::star; - - /// Helper for sorting properties struct ScSolverOptionsEntry { @@ -55,8 +53,6 @@ struct ScSolverOptionsEntry } }; - - class ScSolverOptionsString : public SvLBoxString { bool mbIsDouble; @@ -106,8 +102,6 @@ void ScSolverOptionsString::Paint( const Point& rPos, SvTreeListBox& rDev, const rDev.SetFont( aOldFont ); } - - ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, const uno::Sequence<OUString>& rImplNames, const uno::Sequence<OUString>& rDescriptions, @@ -392,8 +386,6 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl) return 0; } - - ScSolverIntegerDialog::ScSolverIntegerDialog(Window * pParent) : ModalDialog( pParent, "IntegerDialog", "modules/scalc/ui/integerdialog.ui" ) @@ -422,8 +414,6 @@ sal_Int32 ScSolverIntegerDialog::GetValue() const return (sal_Int32) nValue; } - - ScSolverValueDialog::ScSolverValueDialog( Window * pParent ) : ModalDialog( pParent, "DoubleDialog", "modules/scalc/ui/doubledialog.ui" ) diff --git a/sc/source/ui/miscdlgs/solverutil.cxx b/sc/source/ui/miscdlgs/solverutil.cxx index bf9859269962..1f18e178897f 100644 --- a/sc/source/ui/miscdlgs/solverutil.cxx +++ b/sc/source/ui/miscdlgs/solverutil.cxx @@ -31,8 +31,6 @@ using namespace com::sun::star; - - #define SCSOLVER_SERVICE "com.sun.star.sheet.Solver" void ScSolverUtil::GetImplementations( uno::Sequence<OUString>& rImplNames, diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 718e22517696..c1cb88a94a1e 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -74,14 +74,10 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, Init(); } - - ScSolverDlg::~ScSolverDlg() { } - - void ScSolverDlg::Init() { m_pBtnOk->SetClickHdl( LINK( this, ScSolverDlg, BtnHdl ) ); @@ -107,15 +103,11 @@ void ScSolverDlg::Init() pEdActive = m_pEdFormulaCell; } - - bool ScSolverDlg::Close() { return DoClose( ScSolverDlgWrapper::GetChildWindowId() ); } - - void ScSolverDlg::SetActive() { if ( bDlgLostFocus ) @@ -131,8 +123,6 @@ void ScSolverDlg::SetActive() RefInputDone(); } - - void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if( pEdActive ) @@ -155,8 +145,6 @@ void ScSolverDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - - void ScSolverDlg::RaiseError( ScSolverErr eError ) { switch ( eError ) @@ -183,15 +171,11 @@ void ScSolverDlg::RaiseError( ScSolverErr eError ) } } - - bool ScSolverDlg::IsRefInputMode() const { return pEdActive != NULL; } - - bool ScSolverDlg::CheckTargetValue( const OUString& rStrVal ) { sal_uInt32 n1 = 0; @@ -261,8 +245,6 @@ IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) return 0; } - - IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) { Edit* pEdit = NULL; @@ -281,8 +263,6 @@ IMPL_LINK( ScSolverDlg, GetFocusHdl, Control*, pCtrl ) return 0; } - - IMPL_LINK_NOARG(ScSolverDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index a03a2839fe5a..d3214ce7ec5d 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "tabbgcolordlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" @@ -38,8 +36,6 @@ #include <boost/scoped_ptr.hpp> - - #define HDL(hdl) LINK(this,ScTabBgColorDlg,hdl) ScTabBgColorDlg::ScTabBgColorDlg(Window* pParent, const OUString& rTitle, @@ -65,8 +61,6 @@ ScTabBgColorDlg::ScTabBgColorDlg(Window* pParent, const OUString& rTitle, m_pBtnOk->SetClickHdl( HDL(TabBgColorOKHdl_Impl) ); } - - void ScTabBgColorDlg::GetSelectedColor( Color& rColor ) const { rColor = this->m_aTabBgColor; diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index adbfbc8b1c59..5d6c82ad1986 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -30,8 +30,6 @@ #include "tabopdlg.hxx" - - // class ScTabOpDlg @@ -77,15 +75,11 @@ ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, Init(); } - - ScTabOpDlg::~ScTabOpDlg() { Hide(); } - - void ScTabOpDlg::Init() { m_pBtnOk->SetClickHdl ( LINK( this, ScTabOpDlg, BtnHdl ) ); @@ -114,15 +108,11 @@ void ScTabOpDlg::Init() //SFX_APPWINDOW->Enable(); } - - bool ScTabOpDlg::Close() { return DoClose( ScTabOpDlgWrapper::GetChildWindowId() ); } - - void ScTabOpDlg::SetActive() { if ( bDlgLostFocus ) @@ -137,8 +127,6 @@ void ScTabOpDlg::SetActive() RefInputDone(); } - - void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) { if ( pEdActive ) @@ -174,8 +162,6 @@ void ScTabOpDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - - void ScTabOpDlg::RaiseError( ScTabOpErr eError ) { const OUString* pMsg = &errMsgNoFormula; @@ -223,8 +209,6 @@ void ScTabOpDlg::RaiseError( ScTabOpErr eError ) pEd->GrabFocus(); } - - static sal_Bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCurTab, ScRefAddress& rStart, ScRefAddress& rEnd ) { @@ -323,8 +307,6 @@ IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) return 0; } - - IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl ) { if( (pCtrl == (Control*)m_pEdFormulaRange) || (pCtrl == (Control*)m_pRBFormulaRange) ) @@ -342,8 +324,6 @@ IMPL_LINK( ScTabOpDlg, GetFocusHdl, Control*, pCtrl ) return 0; } - - IMPL_LINK_NOARG(ScTabOpDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); @@ -352,6 +332,4 @@ IMPL_LINK_NOARG(ScTabOpDlg, LoseFocusHdl) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index 27f505a9ac7e..a6f301f38803 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -45,8 +45,6 @@ ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, AddTabPage("position", RID_SVXPAGE_CHAR_POSITION); } - - void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); @@ -65,8 +63,6 @@ void ScCharDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } - - ScParagraphDlg::ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr) : SfxTabDialog(pParent, "ParagraphDialog", "modules/scalc/ui/paradialog.ui", pAttr) @@ -82,8 +78,6 @@ ScParagraphDlg::ScParagraphDlg(Window* pParent, const SfxItemSet* pAttr) m_nTabPageId = AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR); } - - void ScParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) { if (nId == m_nTabPageId) @@ -95,6 +89,4 @@ void ScParagraphDlg::PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index acb908faacce..41e75b7c87c4 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -25,8 +25,6 @@ #include "sc.hrc" - - ScCbWarningBox::ScCbWarningBox( Window* pParent, const OUString& rMsgStr, bool bDefYes ) : WarningBox( pParent, WB_YES_NO | (bDefYes ? WB_DEF_YES : WB_DEF_NO), rMsgStr ) { @@ -58,8 +56,6 @@ void ScCbWarningBox::DisableDialog() } - - ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) : ScCbWarningBox( pParent, OUString( ScResId( STR_REPLCELLSWARN ) ), true ) { @@ -80,6 +76,4 @@ void ScReplaceWarnBox::DisableDialog() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 550ed6b11dae..89ab3196985e 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -145,8 +145,6 @@ void ScNameDlg::Init() m_pLbScope->InsertEntry(aTabName); } - - if (m_pRangeManagerTable->GetSelectionCount()) { SelectionChanged(); diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 6654205ce9ca..f4a0a7a68edc 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -160,8 +160,6 @@ const ScRangeData* ScRangeManagerTable::findRangeData(const ScRangeNameLine& rLi return pRangeName->findByUpperName(ScGlobal::pCharClass->uppercase(rLine.aName)); } - - void ScRangeManagerTable::CheckForFormulaString() { for (SvTreeListEntry* pEntry = GetFirstEntryInView(); pEntry ; pEntry = GetNextEntryInView(pEntry)) diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index 3f188c3efe3b..8d8e4d841ce3 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -22,8 +22,6 @@ - - #include "namepast.hxx" #include "scresid.hxx" #include "docsh.hxx" @@ -32,8 +30,6 @@ #include "viewdata.hxx" - - ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) : ModalDialog( pParent, "InsertNameDialog", "modules/scalc/ui/insertname.ui" ) { @@ -76,8 +72,6 @@ ScNamePasteDlg::~ScNamePasteDlg() delete mpTable; } - - IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton ) { if( pButton == m_pBtnPasteAll ) @@ -101,8 +95,6 @@ IMPL_LINK( ScNamePasteDlg, ButtonHdl, Button *, pButton ) return 0; } - - std::vector<OUString> ScNamePasteDlg::GetSelectedNames() const { return maSelectedNames; diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index 2f89813ded20..9481a26ac91a 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -28,8 +28,6 @@ // STATIC DATA ----------------------------------------------------------- - - ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16 nIdP, ScNavigatorDlg& rDlg, SfxBindings& rBindings ) @@ -38,8 +36,6 @@ ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16 nIdP, { } - - void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemState /* eState */, const SfxPoolItem* pItem ) { @@ -104,6 +100,4 @@ void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemStat } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 58aedee2ccec..20b88d024166 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -64,8 +64,6 @@ static const sal_Int32 SCNAV_COLLETTERS = ::ScColToAlpha(SCNAV_MAXCOL).getLength #define SCNAV_MAXROW (MAXROWCOUNT) - - void ScNavigatorDlg::ReleaseFocus() { SfxViewShell* pCurSh = SfxViewShell::Current(); @@ -91,14 +89,10 @@ ColumnEdit::ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId ) SetMaxTextLen( SCNAV_COLDIGITS ); // 1...256...18278 or A...IV...ZZZ } - - ColumnEdit::~ColumnEdit() { } - - bool ColumnEdit::Notify( NotifyEvent& rNEvt ) { bool nHandled = SpinField::Notify( rNEvt ); @@ -129,16 +123,12 @@ bool ColumnEdit::Notify( NotifyEvent& rNEvt ) return nHandled; } - - void ColumnEdit::LoseFocus() { EvalText(); } - - void ColumnEdit::Up() { nCol++; @@ -149,24 +139,18 @@ void ColumnEdit::Up() nCol--; } - - void ColumnEdit::Down() { if ( nCol>1 ) SetCol( nCol-1 ); } - - void ColumnEdit::First() { nCol = 1; SetText(OUString('A')); } - - void ColumnEdit::Last() { OUString aStr; @@ -175,8 +159,6 @@ void ColumnEdit::Last() } - - void ColumnEdit::EvalText() { OUString aStrCol = GetText(); @@ -197,8 +179,6 @@ void ColumnEdit::EvalText() nKeyGroup = KEYGROUP_ALPHA; } - - void ColumnEdit::ExecuteCol() { SCROW nRow = rDlg.aEdRow.GetRow(); @@ -209,8 +189,6 @@ void ColumnEdit::ExecuteCol() rDlg.SetCurrentCell( nCol-1, nRow-1 ); } - - void ColumnEdit::SetCol( SCCOL nColNo ) { OUString aStr; @@ -228,8 +206,6 @@ void ColumnEdit::SetCol( SCCOL nColNo ) } } - - SCCOL ColumnEdit::AlphaToNum( OUString& rStr ) { SCCOL nColumn = 0; @@ -253,8 +229,6 @@ SCCOL ColumnEdit::AlphaToNum( OUString& rStr ) return nColumn; } - - SCCOL ColumnEdit::NumStrToAlpha( OUString& rStr ) { SCCOL nColumn = 0; @@ -267,8 +241,6 @@ SCCOL ColumnEdit::NumStrToAlpha( OUString& rStr ) return nColumn; } - - SCCOL ColumnEdit::NumToAlpha( SCCOL nColNo, OUString& rStr ) { if ( nColNo > SCNAV_MAXCOL ) @@ -293,14 +265,10 @@ RowEdit::RowEdit( ScNavigatorDlg* pParent, const ResId& rResId ) SetLast( SCNAV_MAXROW); } - - RowEdit::~RowEdit() { } - - bool RowEdit::Notify( NotifyEvent& rNEvt ) { bool nHandled = NumericField::Notify( rNEvt ); @@ -320,14 +288,10 @@ bool RowEdit::Notify( NotifyEvent& rNEvt ) return nHandled; } - - void RowEdit::LoseFocus() { } - - void RowEdit::ExecuteRow() { SCCOL nCol = rDlg.aEdCol.GetCol(); @@ -347,14 +311,10 @@ ScDocListBox::ScDocListBox( ScNavigatorDlg* pParent, const ResId& rResId ) { } - - ScDocListBox::~ScDocListBox() { } - - void ScDocListBox::Select() { ScNavigatorDlg::ReleaseFocus(); @@ -378,14 +338,10 @@ CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId ) SetItemBits( IID_DROPMODE, GetItemBits( IID_DROPMODE ) | TIB_DROPDOWNONLY ); } - - CommandToolBox::~CommandToolBox() { } - - void CommandToolBox::Select( sal_uInt16 nSelId ) { // Modus umschalten ? @@ -436,14 +392,10 @@ void CommandToolBox::Select() Select( GetCurItemId() ); } - - void CommandToolBox::Click() { } - - IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl) { // Das Popupmenue fuer den Dropmodus muss im Click (Button Down) @@ -470,8 +422,6 @@ IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl) return 1; } - - void CommandToolBox::UpdateButtons() { NavListMode eMode = rDlg.eListMode; @@ -745,8 +695,6 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win aLbEntries.SetNavigatorDlgFlag(true); } - - ScNavigatorDlg::~ScNavigatorDlg() { aContentTimer.Stop(); @@ -762,8 +710,6 @@ ScNavigatorDlg::~ScNavigatorDlg() EndListening( rBindings ); } - - void ScNavigatorDlg::Resizing( Size& rNewSize ) // Size = Outputsize? { FloatingWindow* pFloat = pContextWin!=NULL ? pContextWin->GetFloatingWindow() : NULL; @@ -784,8 +730,6 @@ void ScNavigatorDlg::Resizing( Size& rNewSize ) // Size = Outputsize? } } - - void ScNavigatorDlg::Paint( const Rectangle& rRect ) { if (mbUseStyleSettingsBackground) @@ -818,15 +762,11 @@ void ScNavigatorDlg::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } - - void ScNavigatorDlg::Resize() { DoResize(); } - - void ScNavigatorDlg::DoResize() { Size aNewSize = GetOutputSizePixel(); @@ -884,8 +824,6 @@ void ScNavigatorDlg::DoResize() } } - - void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) { if ( rHint.ISA(SfxSimpleHint) ) @@ -957,8 +895,6 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - - IMPL_LINK( ScNavigatorDlg, TimeHdl, Timer*, pTimer ) { if ( pTimer != &aContentTimer ) @@ -968,8 +904,6 @@ IMPL_LINK( ScNavigatorDlg, TimeHdl, Timer*, pTimer ) return 0; } - - void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew) { nDropMode = nNew; @@ -979,8 +913,6 @@ void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew) rCfg.SetDragMode(nDropMode); } - - void ScNavigatorDlg::CursorPosChanged() { //! Eintraege selektieren ??? @@ -989,8 +921,6 @@ void ScNavigatorDlg::CursorPosChanged() // if ( GetAreaAtCursor( aStrAreaName ) ) } - - void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo ) { if ( (nColNo+1 != nCurCol) || (nRowNo+1 != nCurRow) ) @@ -1025,8 +955,6 @@ void ScNavigatorDlg::SetCurrentCellStr( const OUString& rName ) &aNameItem, 0L ); } - - void ScNavigatorDlg::SetCurrentTable( SCTAB nTabNo ) { if ( nTabNo != nCurTab ) @@ -1058,8 +986,6 @@ void ScNavigatorDlg::SetCurrentTableStr( const OUString& rName ) } } - - void ScNavigatorDlg::SetCurrentObject( const OUString& rName ) { SfxStringItem aNameItem( SID_CURRENTOBJECT, rName ); @@ -1068,8 +994,6 @@ void ScNavigatorDlg::SetCurrentObject( const OUString& rName ) &aNameItem, 0L ); } - - void ScNavigatorDlg::SetCurrentDoc( const OUString& rDocName ) // aktivieren { SfxStringItem aDocItem( SID_CURRENTDOC, rDocName ); @@ -1078,15 +1002,11 @@ void ScNavigatorDlg::SetCurrentDoc( const OUString& rDocName ) // aktivie &aDocItem, 0L ); } - - ScTabViewShell* ScNavigatorDlg::GetTabViewShell() const { return PTR_CAST( ScTabViewShell, SfxViewShell::Current() ); } - - ScNavigatorSettings* ScNavigatorDlg::GetNavigatorSettings() { // Don't store the settings pointer here, because the settings belong to @@ -1098,8 +1018,6 @@ ScNavigatorSettings* ScNavigatorDlg::GetNavigatorSettings() return pViewSh ? pViewSh->GetNavigatorSettings() : NULL; } - - bool ScNavigatorDlg::GetViewData() { ScTabViewShell* pViewSh = GetTabViewShell(); @@ -1108,8 +1026,6 @@ bool ScNavigatorDlg::GetViewData() return ( pViewData != NULL ); } - - void ScNavigatorDlg::UpdateColumn( const SCCOL* pCol ) { if ( pCol ) @@ -1121,8 +1037,6 @@ void ScNavigatorDlg::UpdateColumn( const SCCOL* pCol ) CheckDataArea(); } - - void ScNavigatorDlg::UpdateRow( const SCROW* pRow ) { if ( pRow ) @@ -1134,8 +1048,6 @@ void ScNavigatorDlg::UpdateRow( const SCROW* pRow ) CheckDataArea(); } - - void ScNavigatorDlg::UpdateTable( const SCTAB* pTab ) { if ( pTab ) @@ -1146,8 +1058,6 @@ void ScNavigatorDlg::UpdateTable( const SCTAB* pTab ) CheckDataArea(); } - - void ScNavigatorDlg::UpdateAll() { switch ( eListMode ) @@ -1169,8 +1079,6 @@ void ScNavigatorDlg::UpdateAll() aContentTimer.Stop(); // dann nicht nochmal } - - void ScNavigatorDlg::SetListMode( NavListMode eMode, bool bSetSize ) { if ( eMode != eListMode ) @@ -1211,8 +1119,6 @@ void ScNavigatorDlg::SetListMode( NavListMode eMode, bool bSetSize ) UnmarkDataArea(); } - - void ScNavigatorDlg::ShowList( bool bShow, bool bSetSize ) { FloatingWindow* pFloat = pContextWin!=NULL ? pContextWin->GetFloatingWindow() : NULL; @@ -1259,8 +1165,6 @@ void ScNavigatorDlg::ShowList( bool bShow, bool bSetSize ) } } - - void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize ) { FloatingWindow* pFloat = pContextWin!=NULL ? pContextWin->GetFloatingWindow() : NULL; @@ -1308,12 +1212,8 @@ void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize ) } - - // Dokumente fuer Dropdown-Listbox - - void ScNavigatorDlg::GetDocNames( const OUString* pManualSel ) { aLbDocuments.Clear(); @@ -1361,8 +1261,6 @@ void ScNavigatorDlg::GetDocNames( const OUString* pManualSel ) aLbDocuments.SelectEntry( aSelEntry ); } - - void ScNavigatorDlg::MarkDataArea() { ScTabViewShell* pViewSh = GetTabViewShell(); @@ -1383,8 +1281,6 @@ void ScNavigatorDlg::MarkDataArea() } } - - void ScNavigatorDlg::UnmarkDataArea() { ScTabViewShell* pViewSh = GetTabViewShell(); @@ -1396,8 +1292,6 @@ void ScNavigatorDlg::UnmarkDataArea() } } - - void ScNavigatorDlg::CheckDataArea() { if ( aTbxCmd.IsItemChecked( IID_DATA ) && pMarkArea ) @@ -1414,8 +1308,6 @@ void ScNavigatorDlg::CheckDataArea() } } - - void ScNavigatorDlg::StartOfDataArea() { // pMarkArea auswerten ??? @@ -1434,8 +1326,6 @@ void ScNavigatorDlg::StartOfDataArea() } } - - void ScNavigatorDlg::EndOfDataArea() { // pMarkArea auswerten ??? @@ -1454,8 +1344,6 @@ void ScNavigatorDlg::EndOfDataArea() } } - - SfxChildAlignment ScNavigatorDlg::CheckAlignment( SfxChildAlignment eActAlign, SfxChildAlignment eAlign ) { diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 5b578f0ecffe..c8a6b02395b7 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -228,8 +228,6 @@ ScScenarioWindow::ScScenarioWindow( Window* pParent, const OUString& aQH_List, } } - - ScScenarioWindow::~ScScenarioWindow() { } @@ -244,8 +242,6 @@ void ScScenarioWindow::Paint( const Rectangle& rRect ) Window::Paint( rRect ); } - - void ScScenarioWindow::NotifyState( const SfxPoolItem* pState ) { if( pState ) @@ -273,8 +269,6 @@ void ScScenarioWindow::NotifyState( const SfxPoolItem* pState ) } } - - void ScScenarioWindow::SetSizePixel( const Size& rNewSize ) { Size aSize( rNewSize ); @@ -290,6 +284,4 @@ void ScScenarioWindow::SetSizePixel( const Size& rNewSize ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 8e7459cac8a3..c9988b8f91be 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -22,8 +22,6 @@ - - #include <svx/dlgutil.hxx> #include <svx/drawitem.hxx> #include <svx/xtable.hxx> @@ -44,8 +42,6 @@ #include "opredlin.hxx" - - ScRedlineOptionsTabPage::ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ) : SfxTabPage(pParent,"OptChangesPage", "modules/scalc/ui/optchangespage.ui", rSet), diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 55db49230b47..71401ed06741 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -19,8 +19,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <vcl/msgbox.hxx> @@ -38,8 +36,6 @@ #include <math.h> - - ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "OptCalculatePage", "modules/scalc/ui/optcalculatepage.ui", rCoreAttrs) @@ -69,16 +65,12 @@ ScTpCalcOptions::ScTpCalcOptions(Window* pParent, const SfxItemSet& rCoreAttrs) SetExchangeSupport(); } - - ScTpCalcOptions::~ScTpCalcOptions() { delete pOldOptions; delete pLocalOptions; } - - void ScTpCalcOptions::Init() { m_pBtnIterate->SetClickHdl( LINK( this, ScTpCalcOptions, CheckClickHdl ) ); @@ -88,15 +80,11 @@ void ScTpCalcOptions::Init() m_pBtnDate1904->SetClickHdl( LINK( this, ScTpCalcOptions, RadioClickHdl ) ); } - - SfxTabPage* ScTpCalcOptions::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTpCalcOptions( pParent, rAttrSet ) ); } - - void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) { sal_uInt16 d,m,y; @@ -146,8 +134,6 @@ void ScTpCalcOptions::Reset( const SfxItemSet& /* rCoreAttrs */ ) } - - bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { // alle weiteren Optionen werden in den Handlern aktualisiert @@ -173,8 +159,6 @@ bool ScTpCalcOptions::FillItemSet( SfxItemSet& rCoreAttrs ) return false; } - - int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) { int nReturn = KEEP_PAGE; @@ -222,8 +206,6 @@ IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn ) return 0; } - - IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn ) { if (pBtn == m_pBtnGeneralPrec) @@ -259,6 +241,4 @@ IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 9c7f8dc552b5..2b79c99f370b 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -19,8 +19,6 @@ #undef SC_DLLIMPLEMENTATION - - #include <scmod.hxx> #include <svl/eitem.hxx> #include <svl/stritem.hxx> diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index c2108ab6cd2f..27c70d4ad663 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -29,8 +29,6 @@ #include "sc.hrc" #include "optdlg.hrc" - - ScTpPrintOptions::ScTpPrintOptions( Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage ( pParent, @@ -60,8 +58,6 @@ int ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } - - void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) { ScPrintOptions aOptions; @@ -92,8 +88,6 @@ void ScTpPrintOptions::Reset( const SfxItemSet& rCoreSet ) m_pForceBreaksCB->SaveValue(); } - - bool ScTpPrintOptions::FillItemSet( SfxItemSet& rCoreAttrs ) { rCoreAttrs.ClearItem( SID_PRINT_SELECTEDSHEET ); diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 5eab46a9811b..da438c025a91 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -89,16 +89,12 @@ ScTpUserLists::ScTpUserLists( Window* pParent, Reset(rCoreAttrs); } - - ScTpUserLists::~ScTpUserLists() { delete pUserLists; delete pRangeUtil; } - - void ScTpUserLists::Init() { SfxViewShell* pSh = SfxViewShell::Current(); @@ -146,15 +142,11 @@ void ScTpUserLists::Init() } - - SfxTabPage* ScTpUserLists::Create( Window* pParent, const SfxItemSet& rAttrSet ) { return ( new ScTpUserLists( pParent, rAttrSet ) ); } - - void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) { const ScUserListItem& rUserListItem = (const ScUserListItem&) @@ -205,8 +197,6 @@ void ScTpUserLists::Reset( const SfxItemSet& rCoreAttrs ) } } - - bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) { // Modifikationen noch nicht uebernommen? @@ -246,8 +236,6 @@ bool ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs ) return bDataModified; } - - int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) { if ( pSetP ) @@ -256,16 +244,12 @@ int ScTpUserLists::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } - - size_t ScTpUserLists::UpdateUserListBox() { mpLbLists->Clear(); if ( !pUserLists ) return 0; - - size_t nCount = pUserLists->size(); OUString aEntry; @@ -279,14 +263,10 @@ size_t ScTpUserLists::UpdateUserListBox() return nCount; } - - void ScTpUserLists::UpdateEntries( size_t nList ) { if ( !pUserLists ) return; - - if ( nList < pUserLists->size() ) { const ScUserListData* pList = (*pUserLists)[nList]; @@ -308,8 +288,6 @@ void ScTpUserLists::UpdateEntries( size_t nList ) } } - - void ScTpUserLists::MakeListStr( OUString& rListStr ) { OUString aStr; @@ -346,8 +324,6 @@ void ScTpUserLists::MakeListStr( OUString& rListStr ) } - - void ScTpUserLists::AddNewList( const OUString& rEntriesStr ) { OUString theEntriesStr( rEntriesStr ); @@ -360,15 +336,11 @@ void ScTpUserLists::AddNewList( const OUString& rEntriesStr ) pUserLists->push_back(new ScUserListData(theEntriesStr)); } - - void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, const ScRefAddress& rEndPos ) { if ( bCopyDone ) return; - - SCTAB nTab = rStartPos.Tab(); SCCOL nStartCol = rStartPos.Col(); SCROW nStartRow = rStartPos.Row(); @@ -446,21 +418,15 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& rStartPos, } } - - bCopyDone = true; } - - void ScTpUserLists::ModifyList( size_t nSelList, const OUString& rEntriesStr ) { if ( !pUserLists ) return; - - OUString theEntriesStr( rEntriesStr ); MakeListStr( theEntriesStr ); @@ -468,8 +434,6 @@ void ScTpUserLists::ModifyList( size_t nSelList, (*pUserLists)[nSelList]->SetString( theEntriesStr ); } - - void ScTpUserLists::RemoveList( size_t nList ) { if (pUserLists && nList < pUserLists->size()) @@ -507,8 +471,6 @@ IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb ) return 0; } - - IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) { if ( pBtn == mpBtnNew || pBtn == mpBtnDiscard ) @@ -692,8 +654,6 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) if ( bCopyDone ) return 0; - - ScRefAddress theStartPos; ScRefAddress theEndPos; OUString theAreaStr( mpEdCopyFrom->GetText() ); @@ -744,15 +704,11 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) return 0; } - - IMPL_LINK( ScTpUserLists, EdEntriesModHdl, VclMultiLineEdit*, pEd ) { if ( pEd != mpEdEntries ) return 0; - - if ( mpBtnCopy->IsEnabled() ) { mpBtnCopy->Disable(); @@ -797,6 +753,4 @@ IMPL_LINK( ScTpUserLists, EdEntriesModHdl, VclMultiLineEdit*, pEd ) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index a1edc469210e..d7132592867b 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -22,8 +22,6 @@ - - #include "scitems.hxx" #include "tpview.hxx" #include "global.hxx" @@ -44,8 +42,6 @@ // STATIC DATA ----------------------------------------------------------- - - ScTpContentOptions::ScTpContentOptions( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage(pParent, "TpViewPage", "modules/scalc/ui/tpviewpage.ui", rArgSet), @@ -309,8 +305,6 @@ void ScTpContentOptions::InitGridOpt() if ( !pColorList.is() ) return; - - pColorLB->SetUpdateMode( false ); // items from ColorTable diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index da72cedbd1f1..f53d2a3a3ffe 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -53,8 +53,6 @@ const sal_uInt16 SC_AREASDLG_RR_USER = 1; const sal_uInt16 SC_AREASDLG_RR_OFFSET = 2; - - #define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl ) #define ERRORBOX(nId) ErrorBox( this, WinBits(WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString( nId ) ).Execute() @@ -94,8 +92,6 @@ static void printAddressFlags(sal_uInt16 nFlag) // class ScPrintAreasDlg - - ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ) : ScAnyRefDlg(pB, pCW, pParent, "PrintAreasDialog", "modules/scalc/ui/printareasdialog.ui") , bDlgLostFocus(false) @@ -145,8 +141,6 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* } - - ScPrintAreasDlg::~ScPrintAreasDlg() { // Extra-Data an ListBox-Entries abraeumen @@ -161,16 +155,12 @@ ScPrintAreasDlg::~ScPrintAreasDlg() } - - bool ScPrintAreasDlg::Close() { return DoClose( ScPrintAreasDlgWrapper::GetChildWindowId() ); } - - bool ScPrintAreasDlg::IsTableLocked() const { // Druckbereiche gelten pro Tabelle, darum macht es keinen Sinn, @@ -180,8 +170,6 @@ bool ScPrintAreasDlg::IsTableLocked() const } - - void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ ) { if ( pRefInputEdit ) @@ -214,8 +202,6 @@ void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ } - - void ScPrintAreasDlg::AddRefEntry() { if ( pRefInputEdit == pEdPrintArea ) @@ -233,16 +219,12 @@ void ScPrintAreasDlg::AddRefEntry() } - - void ScPrintAreasDlg::Deactivate() { bDlgLostFocus = true; } - - void ScPrintAreasDlg::SetActive() { if ( bDlgLostFocus ) @@ -262,8 +244,6 @@ void ScPrintAreasDlg::SetActive() } - - void ScPrintAreasDlg::Impl_Reset() { OUString aStrRange; @@ -332,8 +312,6 @@ void ScPrintAreasDlg::Impl_Reset() } - - bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) { OUString aRangeStr = pEd->GetText(); @@ -353,8 +331,6 @@ bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) } - - bool ScPrintAreasDlg::Impl_CheckRefStrings() { bool bOk = false; @@ -418,8 +394,6 @@ bool ScPrintAreasDlg::Impl_CheckRefStrings() } - - void ScPrintAreasDlg::Impl_FillLists() { @@ -492,8 +466,6 @@ void ScPrintAreasDlg::Impl_FillLists() } } - - // Handler: @@ -553,8 +525,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) } - - IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) { if ( pCtr ==(Control *) pEdPrintArea || @@ -580,8 +550,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) } - - IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb ) { sal_uInt16 nSelPos = pLb->GetSelectEntryPos(); @@ -619,8 +587,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb ) } - - IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) { ListBox* pLb = NULL; @@ -667,12 +633,8 @@ IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) return 0; } - - // globale Funktionen: - - // TODO: It might make sense to move these functions to address.?xx. -kohei static bool lcl_CheckOne_OOO( const OUString& rStr, bool bIsRow, SCCOLROW& rVal ) @@ -854,8 +816,6 @@ static bool lcl_CheckRepeatString( const OUString& rStr, ScDocument* pDoc, bool return true; } - - static void lcl_GetRepeatRangeString( const ScRange* pRange, ScDocument* pDoc, bool bIsRow, OUString& rStr ) { rStr = ""; diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index a4fdbe80f641..a1a7a7aea816 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -22,8 +22,6 @@ - - #include "scitems.hxx" #include <svl/eitem.hxx> @@ -47,8 +45,6 @@ ((SvxSetItem&)(set).Get(ATTR_PAGE_FOOTERSET)).GetItemSet(). \ Get(ATTR_PAGE_SHARED)).GetValue() - - ScHFEditDlg::ScHFEditDlg( SfxViewFrame* pFrameP, Window* pParent, const SfxItemSet& rCoreSet, @@ -201,8 +197,6 @@ ScHFEditActiveDlg::ScHFEditActiveDlg( SfxViewFrame* pFrameP, } } - - void ScHFEditDlg::PageCreated( sal_uInt16 /* nId */, SfxTabPage& rPage ) { // kann ja nur ne ScHFEditPage sein... @@ -211,6 +205,4 @@ void ScHFEditDlg::PageCreated( sal_uInt16 /* nId */, SfxTabPage& rPage ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index cc42477cdc0a..dcbcedac8c81 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -20,8 +20,6 @@ #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <editeng/eeitem.hxx> @@ -156,8 +154,6 @@ IMPL_LINK( ScHFEditPage, ObjectSelectHdl, ScEditWindow*, pEdit ) return 0; } - - ScHFEditPage::~ScHFEditPage() { } @@ -206,16 +202,12 @@ bool ScHFEditPage::FillItemSet( SfxItemSet& rCoreSet ) return true; } - - #define SET_CMD(i,id) \ aCmd = aDel; \ aCmd += ScGlobal::GetRscString( id ); \ aCmd += aDel; \ aCmdArr[i] = aCmd; - - void ScHFEditPage::FillCmdArr() { OUString aDel( ScGlobal::GetRscString( STR_HFCMD_DELIMITER ) ); @@ -851,8 +843,6 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& true ) {} - - SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScRightHeaderEditPage( pParent, rCoreSet ) ); }; @@ -867,8 +857,6 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r true ) {} - - SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScLeftHeaderEditPage( pParent, rCoreSet ) ); }; @@ -883,8 +871,6 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& false ) {} - - SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScRightFooterEditPage( pParent, rCoreSet ) ); }; @@ -899,8 +885,6 @@ ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& r false ) {} - - SfxTabPage* ScLeftFooterEditPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScLeftFooterEditPage( pParent, rCoreSet ) ); }; diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index a50a731d88aa..c382b413ec77 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -22,8 +22,6 @@ - - #define _TPHF_CXX #include "scitems.hxx" #include <sfx2/basedlgs.hxx> @@ -45,8 +43,6 @@ #undef _TPHF_CXX - - // class ScHFPage @@ -86,22 +82,16 @@ ScHFPage::ScHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) m_pBtnEdit->SetHelpId( HID_SC_FOOTER_EDIT ); } - - ScHFPage::~ScHFPage() { } - - void ScHFPage::Reset( const SfxItemSet& rSet ) { SvxHFPage::Reset( rSet ); TurnOnHdl( 0 ); } - - bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) { sal_Bool bResult = SvxHFPage::FillItemSet( rOutSet ); @@ -120,8 +110,6 @@ bool ScHFPage::FillItemSet( SfxItemSet& rOutSet ) return bResult; } - - void ScHFPage::ActivatePage( const SfxItemSet& rSet ) { sal_uInt16 nPageWhich = GetWhich( SID_ATTR_PAGE ); @@ -138,8 +126,6 @@ void ScHFPage::ActivatePage( const SfxItemSet& rSet ) SvxHFPage::ActivatePage( rSet ); } - - int ScHFPage::DeactivatePage( SfxItemSet* pSetP ) { if ( LEAVE_PAGE == SvxHFPage::DeactivatePage( pSetP ) ) @@ -149,8 +135,6 @@ int ScHFPage::DeactivatePage( SfxItemSet* pSetP ) return LEAVE_PAGE; } - - void ScHFPage::ActivatePage() { } @@ -176,8 +160,6 @@ IMPL_LINK_NOARG(ScHFPage, TurnOnHdl) } - - IMPL_LINK_NOARG(ScHFPage, BtnHdl) { // When the Edit-Dialog is directly called from the Button's Click-Handler, @@ -273,15 +255,11 @@ ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet ) { } - - SfxTabPage* ScHeaderPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScHeaderPage( pParent, rCoreSet ) ); } - - sal_uInt16* ScHeaderPage::GetRanges() { return SvxHeaderPage::GetRanges(); @@ -296,21 +274,15 @@ ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet ) { } - - SfxTabPage* ScFooterPage::Create( Window* pParent, const SfxItemSet& rCoreSet ) { return ( new ScFooterPage( pParent, rCoreSet ) ); } - - sal_uInt16* ScFooterPage::GetRanges() { return SvxHeaderPage::GetRanges(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/tphfedit.cxx b/sc/source/ui/pagedlg/tphfedit.cxx index a6736a87e02f..b7b00018ea77 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -55,8 +55,6 @@ ScEditWindow* GetScEditWindow () return pActiveEdWnd; } - - static void lcl_GetFieldData( ScHeaderFieldData& rData ) { SfxViewShell* pShell = SfxViewShell::Current(); @@ -121,8 +119,6 @@ void ScEditWindow::Resize() Control::Resize(); } - - ScEditWindow::~ScEditWindow() { // delete Accessible object before deleting EditEngine and EditView @@ -141,16 +137,12 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeScEditWindow(Window *pParen return new ScEditWindow (pParent, WB_BORDER|WB_TABSTOP, Left); } - - void ScEditWindow::SetNumType(SvxNumType eNumType) { pEdEngine->SetNumType(eNumType); pEdEngine->UpdateFields(); } - - EditTextObject* ScEditWindow::CreateTextObject() { // Absatzattribute zuruecksetzen @@ -164,8 +156,6 @@ EditTextObject* ScEditWindow::CreateTextObject() return pEdEngine->CreateTextObject(); } - - void ScEditWindow::SetFont( const ScPatternAttr& rPattern ) { SfxItemSet* pSet = new SfxItemSet( pEdEngine->GetEmptyItemSet() ); @@ -180,22 +170,16 @@ void ScEditWindow::SetFont( const ScPatternAttr& rPattern ) pEdEngine->SetDefaults( pSet ); } - - void ScEditWindow::SetText( const EditTextObject& rTextObject ) { pEdEngine->SetText( rTextObject ); } - - void ScEditWindow::InsertField( const SvxFieldItem& rFld ) { pEdView->InsertField( rFld ); } - - void ScEditWindow::SetCharAttriutes() { SfxObjectShell* pDocSh = SfxObjectShell::Current(); @@ -233,8 +217,6 @@ void ScEditWindow::SetCharAttriutes() } } - - void ScEditWindow::Paint( const Rectangle& rRect ) { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); @@ -252,15 +234,11 @@ void ScEditWindow::Paint( const Rectangle& rRect ) pEdView->ShowCursor(true,true); } - - void ScEditWindow::MouseMove( const MouseEvent& rMEvt ) { pEdView->MouseMove( rMEvt ); } - - void ScEditWindow::MouseButtonDown( const MouseEvent& rMEvt ) { if ( !HasFocus() ) @@ -269,15 +247,11 @@ void ScEditWindow::MouseButtonDown( const MouseEvent& rMEvt ) pEdView->MouseButtonDown( rMEvt ); } - - void ScEditWindow::MouseButtonUp( const MouseEvent& rMEvt ) { pEdView->MouseButtonUp( rMEvt ); } - - void ScEditWindow::KeyInput( const KeyEvent& rKEvt ) { sal_uInt16 nKey = rKEvt.GetKeyCode().GetModifier() @@ -299,15 +273,11 @@ void ScEditWindow::KeyInput( const KeyEvent& rKEvt ) } } - - void ScEditWindow::Command( const CommandEvent& rCEvt ) { pEdView->Command( rCEvt ); } - - void ScEditWindow::GetFocus() { pEdView->ShowCursor(true,true); @@ -333,8 +303,6 @@ void ScEditWindow::LoseFocus() pAcc = NULL; } - - ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > ScEditWindow::CreateAccessible() { OUString sName; diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 256fd3aaccf5..7d35b067a199 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -49,8 +49,6 @@ const char UNO_ALIGNVCENTER[] = ".uno:AlignVCenter"; namespace sc { namespace sidebar { - - AlignmentPropertyPanel::AlignmentPropertyPanel( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, @@ -87,14 +85,10 @@ AlignmentPropertyPanel::AlignmentPropertyPanel( mpFtRotate->SetBackground(Wallpaper()); } - - AlignmentPropertyPanel::~AlignmentPropertyPanel() { } - - void AlignmentPropertyPanel::Initialize() { Link aLink = LINK(this, AlignmentPropertyPanel, TbxHorAlignSelectHdl); @@ -146,8 +140,6 @@ void AlignmentPropertyPanel::Initialize() #endif } - - IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG ) { OUString sTmp = mpMtrAngle->GetText(); @@ -168,8 +160,6 @@ IMPL_LINK( AlignmentPropertyPanel, AngleModifiedHdl, void *, EMPTYARG ) return 0; } - - IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG ) { sal_Int32 nTmp = mpCtrlDial->GetRotation(); @@ -181,8 +171,6 @@ IMPL_LINK( AlignmentPropertyPanel, RotationHdl, void *, EMPTYARG ) return 0; } - - IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG ) { bool bVertical = mpCbStacked->IsChecked() ? true : false; @@ -192,8 +180,6 @@ IMPL_LINK( AlignmentPropertyPanel, ClickStackHdl, void *, EMPTYARG ) return 0; } - - IMPL_LINK(AlignmentPropertyPanel, TbxHorAlignSelectHdl, ToolBox*, pToolBox) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -232,8 +218,6 @@ IMPL_LINK(AlignmentPropertyPanel, TbxHorAlignSelectHdl, ToolBox*, pToolBox) return 0; } - - IMPL_LINK(AlignmentPropertyPanel, TbxVerAlignSelectHdl, ToolBox*, pToolBox) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -265,8 +249,6 @@ IMPL_LINK(AlignmentPropertyPanel, TbxVerAlignSelectHdl, ToolBox*, pToolBox) return 0; } - - IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG) { mpCBXWrapText->EnableTriState(false); @@ -277,8 +259,6 @@ IMPL_LINK(AlignmentPropertyPanel, MFLeftIndentMdyHdl, void*, EMPTYARG) return( 0L ); } - - IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG) { bool bState = mpCBXMergeCell->IsChecked(); @@ -296,8 +276,6 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXMergnCellClkHdl, void*, EMPTYARG) return 0; } - - IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG) { bool bState = mpCBXWrapText->IsChecked(); @@ -306,8 +284,6 @@ IMPL_LINK(AlignmentPropertyPanel, CBOXWrapTextClkHdl, void*, EMPTYARG) return 0; } - - AlignmentPropertyPanel* AlignmentPropertyPanel::Create ( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, @@ -326,16 +302,12 @@ AlignmentPropertyPanel* AlignmentPropertyPanel::Create ( pBindings); } - - void AlignmentPropertyPanel::DataChanged( const DataChangedEvent& rEvent) { (void)rEvent; } - - void AlignmentPropertyPanel::HandleContextChange( const ::sfx2::sidebar::EnumContext aContext) { @@ -347,13 +319,9 @@ void AlignmentPropertyPanel::HandleContextChange( maContext = aContext; - - // todo } - - void AlignmentPropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, @@ -520,15 +488,11 @@ void AlignmentPropertyPanel::NotifyItemUpdate( } } - - SfxBindings* AlignmentPropertyPanel::GetBindings() { return mpBindings; } - - void AlignmentPropertyPanel::FormatDegrees(double& dTmp) { while(dTmp<0) @@ -537,8 +501,6 @@ void AlignmentPropertyPanel::FormatDegrees(double& dTmp) dTmp = 359; } - - void AlignmentPropertyPanel::UpdateHorAlign() { const sal_uInt16 nIdLeft = mpTBHorizontal->GetItemId(UNO_ALIGNLEFT); @@ -589,8 +551,6 @@ void AlignmentPropertyPanel::UpdateHorAlign() } } - - void AlignmentPropertyPanel::UpdateVerAlign() { const sal_uInt16 nIdTop = mpTBVertical->GetItemId(UNO_ALIGNTOP); diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index adc77f8bb98a..66e28c30f6f8 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -68,8 +68,6 @@ namespace namespace sc { namespace sidebar { - - svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateFillColorPopupControl(svx::sidebar::PopupContainer* pParent) { const ScResId aResId(VS_NOFILLCOLOR); @@ -94,8 +92,6 @@ void CellAppearancePropertyPanel::SetFillColor( maBackColor = aColor; } - - svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateLineColorPopupControl(svx::sidebar::PopupContainer* pParent) { return new svx::sidebar::ColorControl( @@ -118,8 +114,6 @@ void CellAppearancePropertyPanel::SetLineColor( maLineColor = aColor; } - - svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellLineStylePopupControl(svx::sidebar::PopupContainer* pParent) { return new CellLineStyleControl(pParent, *this); @@ -133,8 +127,6 @@ void CellAppearancePropertyPanel::EndCellLineStylePopupMode(void) } } - - svx::sidebar::PopupControl* CellAppearancePropertyPanel::CreateCellBorderStylePopupControl(svx::sidebar::PopupContainer* pParent) { return new CellBorderStyleControl(pParent, *this); @@ -148,8 +140,6 @@ void CellAppearancePropertyPanel::EndCellBorderStylePopupMode(void) } } - - CellAppearancePropertyPanel::CellAppearancePropertyPanel( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, @@ -230,14 +220,10 @@ CellAppearancePropertyPanel::CellAppearancePropertyPanel( Initialize(); } - - CellAppearancePropertyPanel::~CellAppearancePropertyPanel() { } - - void CellAppearancePropertyPanel::Initialize() { const sal_uInt16 nIdBkColor = mpTBFillColor->GetItemId( UNO_BACKGROUNDCOLOR ); @@ -275,8 +261,6 @@ void CellAppearancePropertyPanel::Initialize() mpTBLineStyle->SetAccessibleRelationLabeledBy(mpTBLineStyle); } - - IMPL_LINK(CellAppearancePropertyPanel, TbxBKColorSelectHdl, ToolBox*, pToolBox) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -289,8 +273,6 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxBKColorSelectHdl, ToolBox*, pToolBox) return 0; } - - IMPL_LINK(CellAppearancePropertyPanel, TbxLineColorSelectHdl, ToolBox*, pToolBox) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -303,8 +285,6 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxLineColorSelectHdl, ToolBox*, pToolBox return 0; } - - IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBox) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -328,8 +308,6 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, ToolBox*, pToolBo return 0; } - - IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox) { const OUString aCommand(pToolBox->GetItemCommand(pToolBox->GetCurItemId())); @@ -354,8 +332,6 @@ IMPL_LINK(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, ToolBox*, pToolBox return 0; } - - IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG) { bool bState = mpCBXShowGrid->IsChecked(); @@ -364,8 +340,6 @@ IMPL_LINK(CellAppearancePropertyPanel, CBOXGridShowClkHdl, void*, EMPTYARG) return 0; } - - CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create ( Window* pParent, const cssu::Reference<css::frame::XFrame>& rxFrame, @@ -384,16 +358,12 @@ CellAppearancePropertyPanel* CellAppearancePropertyPanel::Create ( pBindings); } - - void CellAppearancePropertyPanel::DataChanged( const DataChangedEvent& rEvent) { (void)rEvent; } - - void CellAppearancePropertyPanel::HandleContextChange( const ::sfx2::sidebar::EnumContext aContext) { @@ -405,13 +375,9 @@ void CellAppearancePropertyPanel::HandleContextChange( maContext = aContext; - - // todo } - - void CellAppearancePropertyPanel::NotifyItemUpdate( sal_uInt16 nSID, SfxItemState eState, @@ -690,15 +656,11 @@ void CellAppearancePropertyPanel::NotifyItemUpdate( } } - - SfxBindings* CellAppearancePropertyPanel::GetBindings() { return mpBindings; } - - void CellAppearancePropertyPanel::SetStyleIcon() { const sal_uInt16 nIdBorderLineStyle = mpTBLineStyle->GetItemId( UNO_LINESTYLE ); diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index 523adc891643..89e52dfad3cc 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -22,8 +22,6 @@ - - #include "scitems.hxx" #include <svx/numinf.hxx> #include <sfx2/objsh.hxx> @@ -130,8 +128,6 @@ ScStyleDlg::ScStyleDlg( Window* pParent, } } - - void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) { if ( nDlgRsc == RID_SCDLG_STYLES_PAR ) @@ -182,8 +178,6 @@ void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) } - - const SfxItemSet* ScStyleDlg::GetRefreshedSet() { SfxItemSet* pItemSet = GetInputSetImpl(); diff --git a/sc/source/ui/undo/areasave.cxx b/sc/source/ui/undo/areasave.cxx index 4409ab9ba93d..55eb288a0ec4 100644 --- a/sc/source/ui/undo/areasave.cxx +++ b/sc/source/ui/undo/areasave.cxx @@ -24,8 +24,6 @@ #include "document.hxx" #include <documentlinkmgr.hxx> - - ScAreaLinkSaver::ScAreaLinkSaver( const ScAreaLink& rSource ) : aFileName ( rSource.GetFile() ), aFilterName ( rSource.GetFilter() ), diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index bebe48cdf342..59845fa4a057 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -44,8 +44,6 @@ #include "refundo.hxx" #include "markdata.hxx" - - TYPEINIT1(ScUndoDoOutline, ScSimpleUndo); TYPEINIT1(ScUndoMakeOutline, ScSimpleUndo); TYPEINIT1(ScUndoOutlineLevel, ScSimpleUndo); diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 0bea09ef8713..811e85e54596 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -29,13 +29,9 @@ #include "inputhdl.hxx" #include "globstr.hrc" - - TYPEINIT1(ScUndoModifyStyle, ScSimpleUndo); TYPEINIT1(ScUndoApplyPageStyle, ScSimpleUndo); - - // modify style (cell or page style) @@ -86,8 +82,6 @@ void ScStyleSaveData::InitFromStyle( const SfxStyleSheetBase* pSource ) *this = ScStyleSaveData(); // empty } - - ScUndoModifyStyle::ScUndoModifyStyle( ScDocShell* pDocSh, SfxStyleFamily eFam, const ScStyleSaveData& rOld, const ScStyleSaveData& rNew ) : ScSimpleUndo( pDocSh ), @@ -230,8 +224,6 @@ bool ScUndoModifyStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; // no repeat possible } - - // apply page style ScUndoApplyPageStyle::ApplyStyleEntry::ApplyStyleEntry( SCTAB nTab, const OUString& rOldStyle ) : diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index ce2794f619dc..51ba554e5439 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -68,8 +68,6 @@ void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell, rRange.aEnd.Col(), rRange.aEnd.Row(), rRange.aEnd.Tab() ); } - - ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx index 2a89cd8b7311..1ddc4877ba68 100644 --- a/sc/source/ui/unoobj/addruno.cxx +++ b/sc/source/ui/unoobj/addruno.cxx @@ -32,8 +32,6 @@ using namespace com::sun::star; - - ScAddressConversionObj::ScAddressConversionObj(ScDocShell* pDocSh, bool _bIsRange) : pDocShell( pDocSh ), nRefSheet( 0 ), diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index 34de4c4035ca..9193aa148bb7 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -60,13 +60,9 @@ using namespace ::com::sun::star; - - // ein AutoFormat hat immer 16 Eintraege #define SC_AF_FIELD_COUNT 16 - - // AutoFormat-Map nur fuer PropertySetInfo, ohne Which-IDs static const SfxItemPropertyMapEntry* lcl_GetAutoFormatMap() @@ -143,16 +139,12 @@ static const SfxItemPropertyMapEntry* lcl_GetAutoFieldMap() return aAutoFieldMap_Impl; } - - #define SCAUTOFORMATSOBJ_SERVICE "com.sun.star.sheet.TableAutoFormats" SC_SIMPLE_SERVICE_INFO( ScAutoFormatFieldObj, "ScAutoFormatFieldObj", "com.sun.star.sheet.TableAutoFormatField" ) SC_SIMPLE_SERVICE_INFO( ScAutoFormatObj, "ScAutoFormatObj", "com.sun.star.sheet.TableAutoFormat" ) SC_SIMPLE_SERVICE_INFO( ScAutoFormatsObj, "ScAutoFormatsObj", SCAUTOFORMATSOBJ_SERVICE ) - - static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUString& rName, sal_uInt16& rOutIndex ) { ScAutoFormat::const_iterator itBeg = rFormats.begin(), itEnd = rFormats.end(); @@ -170,8 +162,6 @@ static bool lcl_FindAutoFormatIndex( const ScAutoFormat& rFormats, const OUStrin return false; // is nich } - - ScAutoFormatsObj::ScAutoFormatsObj() { //! Dieses Objekt darf es nur einmal geben, und es muss an den Auto-Format-Daten @@ -392,8 +382,6 @@ sal_Bool SAL_CALL ScAutoFormatsObj::hasByName( const OUString& aName ) *ScGlobal::GetOrCreateAutoFormat(), aString, nDummy ); } - - ScAutoFormatObj::ScAutoFormatObj(sal_uInt16 nIndex) : aPropSet( lcl_GetAutoFormatMap() ), nFormatIndex( nIndex ) @@ -657,8 +645,6 @@ uno::Any SAL_CALL ScAutoFormatObj::getPropertyValue( const OUString& aPropertyNa SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAutoFormatObj ) - - ScAutoFormatFieldObj::ScAutoFormatFieldObj(sal_uInt16 nFormat, sal_uInt16 nField) : aPropSet( lcl_GetAutoFieldMap() ), nFormatIndex( nFormat ), @@ -856,6 +842,4 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAutoFormatFieldObj ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index 905b06998c67..f55c40a072c5 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -42,8 +42,6 @@ using namespace com::sun::star; - - // Calc document extern uno::Sequence< OUString > SAL_CALL ScDocument_getSupportedServiceNames() throw(); extern OUString SAL_CALL ScDocument_getImplementationName() throw(); @@ -126,8 +124,6 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_crea const uno::Reference< lang::XMultiServiceFactory > & rSMgr ) throw (uno::Exception, std::exception); - - // Anzahl der Funktionen, die als zuletzt benutzt gespeichert werden //! Define mit funcpage.hxx und dwfunctr.hxx zusammenfassen !!! #define LRU_MAX 10 @@ -141,8 +137,6 @@ extern uno::Reference< uno::XInterface > SAL_CALL ScXMLOasisExport_Settings_crea // Anzahl der PropertyValues in einer Function-Description #define SC_FUNCDESC_PROPCOUNT 5 - - // alles ohne Which-ID, Map nur fuer PropertySetInfo static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() @@ -172,8 +166,6 @@ static const SfxItemPropertyMapEntry* lcl_GetSettingsPropertyMap() return aSettingsPropertyMap_Impl; } - - #define SCFUNCTIONLISTOBJ_SERVICE "com.sun.star.sheet.FunctionDescriptions" #define SCRECENTFUNCTIONSOBJ_SERVICE "com.sun.star.sheet.RecentFunctions" #define SCSPREADSHEETSETTINGS_SERVICE "com.sun.star.sheet.GlobalSheetSettings" @@ -182,8 +174,6 @@ SC_SIMPLE_SERVICE_INFO( ScFunctionListObj, "ScFunctionListObj", SCFUNCTIONLISTOB SC_SIMPLE_SERVICE_INFO( ScRecentFunctionsObj, "ScRecentFunctionsObj", SCRECENTFUNCTIONSOBJ_SERVICE ) SC_SIMPLE_SERVICE_INFO( ScSpreadsheetSettings, "ScSpreadsheetSettings", SCSPREADSHEETSETTINGS_SERVICE ) - - extern "C" { SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory( @@ -391,8 +381,6 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL sc_component_getFactory( } // extern C - - ScSpreadsheetSettings::ScSpreadsheetSettings() : aPropSet( lcl_GetSettingsPropertyMap() ) { @@ -668,8 +656,6 @@ uno::Any SAL_CALL ScSpreadsheetSettings::getPropertyValue( const OUString& aProp SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSpreadsheetSettings ) - - ScRecentFunctionsObj::ScRecentFunctionsObj() { } @@ -749,8 +735,6 @@ sal_Int32 SAL_CALL ScRecentFunctionsObj::getMaxRecentFunctions() throw(uno::Runt return LRU_MAX; } - - ScFunctionListObj::ScFunctionListObj() { } @@ -999,6 +983,4 @@ sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index a138f6bbcdde..647725cf0c2e 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -34,13 +34,9 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/util/XModifyListener.hpp> - - namespace calc { - - //= OCellListSource class OCellListSource; diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 5bb1309831f3..f9c9fc9aef0d 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -131,8 +131,6 @@ using namespace com::sun::star; - - class ScNamedEntry { OUString aName; @@ -146,8 +144,6 @@ public: const ScRange& GetRange() const { return aRange; } }; - - // The names in the maps must be sorted according to strcmp! //! Instead of Which-ID 0 use special IDs and do not compare via names! @@ -856,13 +852,9 @@ static const SvxItemPropertySet* lcl_GetEditPropertySet() return &aEditPropertySet; } - - using sc::HMMToTwips; using sc::TwipsToHMM; - - #define SCCHARPROPERTIES_SERVICE "com.sun.star.style.CharacterProperties" #define SCPARAPROPERTIES_SERVICE "com.sun.star.style.ParagraphProperties" #define SCCELLPROPERTIES_SERVICE "com.sun.star.table.CellProperties" @@ -883,8 +875,6 @@ SC_SIMPLE_SERVICE_INFO( ScCellsObj, "ScCellsObj", "com.sun.star.sheet.Cells" ) SC_SIMPLE_SERVICE_INFO( ScTableColumnObj, "ScTableColumnObj", "com.sun.star.table.TableColumn" ) SC_SIMPLE_SERVICE_INFO( ScTableRowObj, "ScTableRowObj", "com.sun.star.table.TableRow" ) - - //! ScLinkListener in anderes File verschieben !!! ScLinkListener::~ScLinkListener() @@ -896,8 +886,6 @@ void ScLinkListener::Notify( const SfxHint& rHint ) aLink.Call( (SfxHint*)&rHint ); } - - static void lcl_CopyProperties( beans::XPropertySet& rDest, beans::XPropertySet& rSource ) { uno::Reference<beans::XPropertySetInfo> xInfo(rSource.getPropertySetInfo()); @@ -1051,8 +1039,6 @@ void ScHelperFunctions::AssignTableBorder2ToAny( uno::Any& rAny, rAny <<= aBorder; } - - //! lcl_ApplyBorder nach docfunc verschieben! void ScHelperFunctions::ApplyBorder( ScDocShell* pDocShell, const ScRangeList& rRanges, @@ -1403,8 +1389,6 @@ static OUString lcl_GetInputString( ScDocument* pDoc, const ScAddress& rPos, sal return aVal; } - - ScCellRangesBase::ScCellRangesBase(ScDocShell* pDocSh, const ScRange& rR) : pPropSet(lcl_GetCellsPropertySet()), pDocShell( pDocSh ), @@ -1802,8 +1786,6 @@ uno::Sequence<sal_Int8> SAL_CALL ScCellRangesBase::getImplementationId() return css::uno::Sequence<sal_Int8>(); } - - void ScCellRangesBase::PaintRanges_Impl( sal_uInt16 nPart ) { for (size_t i = 0, nCount = aRanges.size(); i < nCount; ++i) @@ -4141,8 +4123,6 @@ ScCellRangesBase* ScCellRangesBase::getImplementation( const uno::Reference<uno: return pRet; } - - typedef boost::ptr_vector<ScNamedEntry> ScNamedEntryArr_Impl; struct ScCellRangesObj::Impl @@ -4773,8 +4753,6 @@ uno::Reference<table::XCellRange> ScCellRangeObj::CreateRangeFromDoc( ScDocument return NULL; } - - ScCellRangeObj::ScCellRangeObj(ScDocShell* pDocSh, const ScRange& rR) : ScCellRangesBase( pDocSh, rR ), pRangePropSet( lcl_GetRangePropertySet() ), @@ -6049,8 +6027,6 @@ uno::Sequence<OUString> SAL_CALL ScCellRangeObj::getSupportedServiceNames() return aRet; } - - const SvxItemPropertySet* ScCellObj::GetEditPropertySet() { return lcl_GetEditPropertySet(); @@ -6859,8 +6835,6 @@ sal_Int16 SAL_CALL ScCellObj::resetActionLocks() throw(uno::RuntimeException, st return nRet; } - - ScTableSheetObj::ScTableSheetObj( ScDocShell* pDocSh, SCTAB nTab ) : ScCellRangeObj( pDocSh, ScRange(0,0,nTab, MAXCOL,MAXROW,nTab) ), pSheetPropSet(lcl_GetSheetPropertySet()) @@ -8710,8 +8684,6 @@ ScTableSheetObj* ScTableSheetObj::getImplementation( const uno::Reference<uno::X return pRet; } - - ScTableColumnObj::ScTableColumnObj( ScDocShell* pDocSh, SCCOL nCol, SCTAB nTab ) : ScCellRangeObj( pDocSh, ScRange(nCol,0,nTab, nCol,MAXROW,nTab) ), pColPropSet(lcl_GetColumnPropertySet()) @@ -8913,8 +8885,6 @@ const SfxItemPropertyMap& ScTableColumnObj::GetItemPropertyMap() return pColPropSet->getPropertyMap(); } - - ScTableRowObj::ScTableRowObj(ScDocShell* pDocSh, SCROW nRow, SCTAB nTab) : ScCellRangeObj( pDocSh, ScRange(0,nRow,nTab, MAXCOL,nRow,nTab) ), pRowPropSet(lcl_GetRowPropertySet()) @@ -9068,8 +9038,6 @@ const SfxItemPropertyMap& ScTableRowObj::GetItemPropertyMap() return pRowPropSet->getPropertyMap(); } - - ScCellsObj::ScCellsObj(ScDocShell* pDocSh, const ScRangeList& rR) : pDocShell( pDocSh ), aRanges( rR ) @@ -9129,8 +9097,6 @@ sal_Bool SAL_CALL ScCellsObj::hasElements() throw(uno::RuntimeException, std::ex return bHas; } - - ScCellsEnumeration::ScCellsEnumeration(ScDocShell* pDocSh, const ScRangeList& rR) : pDocShell( pDocSh ), aRanges( rR ), @@ -9261,8 +9227,6 @@ uno::Any SAL_CALL ScCellsEnumeration::nextElement() throw(container::NoSuchEleme throw container::NoSuchElementException(); // no more elements } - - ScCellFormatsObj::ScCellFormatsObj(ScDocShell* pDocSh, const ScRange& rRange) : pDocShell( pDocSh ), aTotalRange( rRange ) @@ -9383,8 +9347,6 @@ uno::Reference<container::XEnumeration> SAL_CALL ScCellFormatsObj::createEnumera return NULL; } - - ScCellFormatsEnumeration::ScCellFormatsEnumeration(ScDocShell* pDocSh, const ScRange& rRange) : pDocShell( pDocSh ), nTab( rRange.aStart.Tab() ), @@ -9491,8 +9453,6 @@ uno::Any SAL_CALL ScCellFormatsEnumeration::nextElement() throw(container::NoSuc return uno::makeAny(uno::Reference<table::XCellRange> (NextObject_Impl())); } - - ScUniqueCellFormatsObj::ScUniqueCellFormatsObj(ScDocShell* pDocSh, const ScRange& rRange) : pDocShell( pDocSh ), aTotalRange( rRange ), @@ -9761,8 +9721,6 @@ uno::Reference<container::XEnumeration> SAL_CALL ScUniqueCellFormatsObj::createE return NULL; } - - ScUniqueCellFormatsEnumeration::ScUniqueCellFormatsEnumeration(ScDocShell* pDocSh, const ScMyRangeLists& rRangeLists) : aRangeLists(rRangeLists), pDocShell( pDocSh ), diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 953b2a3a0544..a6c1958e21b0 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -609,8 +609,6 @@ namespace calc // TODO: place your code here } - - } // namespace calc diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 805f24a07f22..d3ea255dd599 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -35,13 +35,9 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> - - namespace calc { - - //= OCellValueBinding class OCellValueBinding; diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 48e04c9049c7..29a979e8691d 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -243,8 +243,6 @@ vector<ScTokenRef>* TokenTable::getAllRanges() const return pTokens.release(); } - - typedef std::map<sal_uInt32, FormulaToken*> FormulaTokenMap; typedef std::map<sal_uInt32, FormulaTokenMap*> FormulaTokenMapMap; @@ -433,8 +431,6 @@ vector<ScTokenRef>* Chart2PositionMap::getDataRowRanges(SCROW nRow) const return maData.getRowRanges( nRow); } - - /** * Designed to be a drop-in replacement for ScChartPositioner, in order to * handle external references. @@ -830,8 +826,6 @@ void Chart2Positioner::createPositionMap() } } - - /** * Function object to create a range string from a token list. */ @@ -2970,8 +2964,6 @@ IMPL_LINK( ScChart2DataSequence, ValueListenerHdl, SfxHint*, pHint ) return 0; } - - ScChart2DataSequence::ExternalRefListener::ExternalRefListener( ScChart2DataSequence& rParent, ScDocument* pDoc) : ScExternalRefManager::LinkListener(), @@ -3022,8 +3014,6 @@ const boost::unordered_set<sal_uInt16>& ScChart2DataSequence::ExternalRefListene return maFileIds; } - - uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index 2e125d936b06..2560d5c075e0 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -49,13 +49,9 @@ using namespace com::sun::star; #define PROP_HANDLE_RELATED_CELLRANGES 1 - - SC_SIMPLE_SERVICE_INFO( ScChartObj, "ScChartObj", "com.sun.star.table.TableChart" ) SC_SIMPLE_SERVICE_INFO( ScChartsObj, "ScChartsObj", "com.sun.star.table.TableCharts" ) - - static SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, SCTAB nTab, const OUString& rName ) { if (pDocShell) @@ -90,8 +86,6 @@ static SdrOle2Obj* lcl_FindChartObj( ScDocShell* pDocShell, SCTAB nTab, const OU return NULL; } - - ScChartsObj::ScChartsObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), nTab( nT ) @@ -443,8 +437,6 @@ sal_Bool SAL_CALL ScChartsObj::hasByName( const OUString& aName ) return ( lcl_FindChartObj( pDocShell, nTab, aName ) != NULL ); } - - ScChartObj::ScChartObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN) :ScChartObj_Base( m_aMutex ) ,ScChartObj_PBase( ScChartObj_Base::rBHelper ) @@ -797,6 +789,4 @@ uno::Reference< beans::XPropertySetInfo > ScChartObj::getPropertySetInfo() throw - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 4bd06eec23f5..717ff353358f 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -81,8 +81,6 @@ static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() return aConfigPropertyMap_Impl; } - - ScDocumentConfiguration::ScDocumentConfiguration(ScDocShell* pDocSh) : pDocShell(pDocSh) , aPropSet ( lcl_GetConfigPropertyMap() ) diff --git a/sc/source/ui/unoobj/convuno.cxx b/sc/source/ui/unoobj/convuno.cxx index ea9c55144c07..c161e37d3ed7 100644 --- a/sc/source/ui/unoobj/convuno.cxx +++ b/sc/source/ui/unoobj/convuno.cxx @@ -24,8 +24,6 @@ using namespace com::sun::star; - - // everything is static... LanguageType ScUnoConversion::GetLanguage( const lang::Locale& rLocale ) @@ -46,6 +44,4 @@ void ScUnoConversion::FillLocale( lang::Locale& rLocale, LanguageType eLang ) rLocale = LanguageTag::convertToLocale( eLang ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index b02f1bf975e4..4f69c25005fa 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -34,13 +34,9 @@ using namespace com::sun::star; - - #define SCSHEETCELLCURSOR_SERVICE "com.sun.star.sheet.SheetCellCursor" #define SCCELLCURSOR_SERVICE "com.sun.star.table.CellCursor" - - ScCellCursorObj::ScCellCursorObj(ScDocShell* pDocSh, const ScRange& rR) : ScCellRangeObj( pDocSh, rR ) { @@ -486,6 +482,4 @@ uno::Sequence<OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index 9af780d25144..6845eec59551 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -87,8 +87,6 @@ using ::com::sun::star::lang::WrappedTargetException; using ::com::sun::star::table::CellAddress; using ::com::sun::star::table::CellRangeAddress; - - namespace { const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap() @@ -110,8 +108,6 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotDescriptorBaseMap() return aDataPilotDescriptorBaseMap_Impl; } - - const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap() { using namespace ::com::sun::star::beans::PropertyAttribute; @@ -138,8 +134,6 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotFieldMap() return aDataPilotFieldMap_Impl; } - - const SfxItemPropertyMapEntry* lcl_GetDataPilotItemMap() { static const SfxItemPropertyMapEntry aDataPilotItemMap_Impl[] = @@ -152,8 +146,6 @@ const SfxItemPropertyMapEntry* lcl_GetDataPilotItemMap() return aDataPilotItemMap_Impl; } - - inline bool lclCheckValidDouble( double fValue, sal_Bool bAuto ) { return bAuto || ::rtl::math::isFinite( fValue ); @@ -171,8 +163,6 @@ bool lclCheckMinMaxStep( const DataPilotFieldGroupInfo& rInfo ) } // namespace - - SC_SIMPLE_SERVICE_INFO( ScDataPilotDescriptor, "ScDataPilotDescriptor", "stardiv::one::sheet::DataPilotDescriptor" ) SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldObj, "ScDataPilotFieldObj", "com.sun.star.sheet.DataPilotField" ) SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldsObj, "ScDataPilotFieldsObj", "com.sun.star.sheet.DataPilotFields" ) @@ -185,13 +175,9 @@ SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupsObj, "ScDataPilotFieldGroupsObj", SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupObj, "ScDataPilotFieldGroupObj", "com.sun.star.sheet.DataPilotFieldGroup" ) SC_SIMPLE_SERVICE_INFO( ScDataPilotFieldGroupItemObj, "ScDataPilotFieldGroupItemObj", "com.sun.star.sheet.DataPilotFieldGroupItem" ) - - // name that is used in the API for the data layout field #define SC_DATALAYOUT_NAME "Data" - - GeneralFunction ScDataPilotConversion::FirstFunc( sal_uInt16 nBits ) { if ( nBits & PIVOT_FUNC_SUM ) return GeneralFunction_SUM; @@ -244,8 +230,6 @@ void ScDataPilotConversion::FillGroupInfo( DataPilotFieldGroupInfo& rInfo, const rInfo.Step = rGroupInfo.mfStep; } - - static ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const OUString& rName ) { if (pDocShell) @@ -296,8 +280,6 @@ static sal_Int32 lcl_GetObjectIndex( ScDPObject* pDPObj, const ScFieldIdentifier return -1; // none } - - ScDataPilotTablesObj::ScDataPilotTablesObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), nTab( nT ) @@ -593,8 +575,6 @@ sal_Bool SAL_CALL ScDataPilotTablesObj::hasByName( const OUString& aName ) return false; } - - ScDataPilotDescriptorBase::ScDataPilotDescriptorBase(ScDocShell* pDocSh) : maPropSet( lcl_GetDataPilotDescriptorBaseMap() ), pDocShell( pDocSh ) @@ -1100,8 +1080,6 @@ ScDataPilotDescriptorBase* ScDataPilotDescriptorBase::getImplementation( return pRet; } - - ScDataPilotTableObj::ScDataPilotTableObj(ScDocShell* pDocSh, SCTAB nT, const OUString& rN) : ScDataPilotDescriptorBase( pDocSh ), nTab( nT ), @@ -1400,8 +1378,6 @@ void ScDataPilotTableObj::Refreshed_Impl() pDoc->AddUnoListenerCall( aModifyListeners[n], aEvent ); } - - ScDataPilotDescriptor::ScDataPilotDescriptor(ScDocShell* pDocSh) : ScDataPilotDescriptorBase( pDocSh ), mpDPObject(new ScDPObject(pDocSh ? pDocSh->GetDocument() : NULL) ) @@ -1466,8 +1442,6 @@ void SAL_CALL ScDataPilotDescriptor::setTag( const OUString& aNewTag ) mpDPObject->SetTag( aNewTag ); } - - ScDataPilotChildObjBase::ScDataPilotChildObjBase( ScDataPilotDescriptorBase& rParent ) : mrParent( rParent ) { @@ -1553,8 +1527,6 @@ ScDocShell* ScDataPilotChildObjBase::GetDocShell() const return mrParent.GetDocShell(); } - - ScDataPilotFieldsObj::ScDataPilotFieldsObj( ScDataPilotDescriptorBase& rParent ) : ScDataPilotChildObjBase( rParent ) { @@ -1817,8 +1789,6 @@ sal_Bool SAL_CALL ScDataPilotFieldsObj::hasByName( const OUString& aName ) return GetObjectByName_Impl(aName) != NULL; } - - ScDataPilotFieldObj::ScDataPilotFieldObj( ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rFieldId ) : ScDataPilotChildObjBase( rParent, rFieldId ), @@ -2823,8 +2793,6 @@ Reference < XDataPilotField > SAL_CALL ScDataPilotFieldObj::createDateGroup( con return xRet; } - - namespace { bool lclExtractGroupMembers( ScFieldGroupMembers& rMembers, const Any& rElement ) @@ -2867,8 +2835,6 @@ bool lclExtractGroupMembers( ScFieldGroupMembers& rMembers, const Any& rElement } // namespace - - ScDataPilotFieldGroupsObj::ScDataPilotFieldGroupsObj( const ScFieldGroups& rGroups ) : maGroups( rGroups ) { @@ -3042,8 +3008,6 @@ ScFieldGroups::iterator ScDataPilotFieldGroupsObj::implFindByName( const OUStrin return maGroups.end(); } - - namespace { OUString lclExtractMember( const Any& rElement ) @@ -3060,8 +3024,6 @@ OUString lclExtractMember( const Any& rElement ) } // namespace - - ScDataPilotFieldGroupObj::ScDataPilotFieldGroupObj( ScDataPilotFieldGroupsObj& rParent, const OUString& rGroupName ) : mrParent( rParent ), maGroupName( rGroupName ) @@ -3216,8 +3178,6 @@ void SAL_CALL ScDataPilotFieldGroupObj::setName( const OUString& rName ) throw(R maGroupName = rName; } - - ScDataPilotFieldGroupItemObj::ScDataPilotFieldGroupItemObj( ScDataPilotFieldGroupObj& rParent, const OUString& rName ) : mrParent( rParent ), maName( rName ) @@ -3246,8 +3206,6 @@ void SAL_CALL ScDataPilotFieldGroupItemObj::setName( const OUString& rName ) thr maName = rName; } - - ScDataPilotItemsObj::ScDataPilotItemsObj( ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rFieldId ) : ScDataPilotChildObjBase( rParent, rFieldId ) { @@ -3363,8 +3321,6 @@ sal_Bool SAL_CALL ScDataPilotItemsObj::hasElements() throw(RuntimeException, std return ( getCount() != 0 ); } - - ScDataPilotItemObj::ScDataPilotItemObj( ScDataPilotDescriptorBase& rParent, const ScFieldIdentifier& rFieldId, sal_Int32 nIndex ) : ScDataPilotChildObjBase( rParent, rFieldId ), maPropSet( lcl_GetDataPilotItemMap() ), @@ -3551,6 +3507,4 @@ void SAL_CALL ScDataPilotItemObj::removeVetoableChangeListener( - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index ea5ffce0f32e..13e41ea20b36 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -61,8 +61,6 @@ using namespace com::sun::star; - - // alles ohne Which-ID, Map nur fuer PropertySetInfo static const SfxItemPropertyMapEntry* lcl_GetSubTotalPropertyMap() @@ -129,8 +127,6 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() - - SC_SIMPLE_SERVICE_INFO( ScConsolidationDescriptor, "ScConsolidationDescriptor", "com.sun.star.sheet.ConsolidationDescriptor" ) SC_SIMPLE_SERVICE_INFO( ScDatabaseRangesObj, "ScDatabaseRangesObj", "com.sun.star.sheet.DatabaseRanges" ) SC_SIMPLE_SERVICE_INFO( ScFilterDescriptorBase, "ScFilterDescriptorBase", "com.sun.star.sheet.SheetFilterDescriptor" ) @@ -162,8 +158,6 @@ sheet::GeneralFunction ScDataUnoConversion::SubTotalToGeneral( ScSubTotalFunc e return eGeneral; } - - // ScImportDescriptor: alles static long ScImportDescriptor::GetPropertyCount() @@ -270,8 +264,6 @@ void ScImportDescriptor::FillImportParam( ScImportParam& rParam, const uno::Sequ } } - - // ScSortDescriptor: alles static //! SortAscending muss aus der SheetSortDescriptor service-Beschreibung raus @@ -467,8 +459,6 @@ void ScSortDescriptor::FillSortParam( ScSortParam& rParam, const uno::Sequence<b } } - - ScSubTotalFieldObj::ScSubTotalFieldObj( ScSubTotalDescriptorBase* pDesc, sal_uInt16 nP ) : xRef( pDesc ), // Objekt festhalten rParent( *pDesc ), @@ -558,8 +548,6 @@ void SAL_CALL ScSubTotalFieldObj::setSubTotalColumns( rParent.PutData(aParam); } - - ScSubTotalDescriptorBase::ScSubTotalDescriptorBase() : aPropSet( lcl_GetSubTotalPropertyMap() ) { @@ -813,8 +801,6 @@ ScSubTotalDescriptorBase* ScSubTotalDescriptorBase::getImplementation( return pRet; } - - ScSubTotalDescriptor::ScSubTotalDescriptor() { } @@ -838,8 +824,6 @@ void ScSubTotalDescriptor::SetParam( const ScSubTotalParam& rNew ) aStoredParam = rNew; // von aussen gesetzt } - - ScRangeSubTotalDescriptor::ScRangeSubTotalDescriptor(ScDatabaseRangeObj* pPar) : pParent(pPar) { @@ -865,8 +849,6 @@ void ScRangeSubTotalDescriptor::PutData( const ScSubTotalParam& rParam ) pParent->SetSubTotalParam( rParam ); } - - ScConsolidationDescriptor::ScConsolidationDescriptor() { } @@ -1557,8 +1539,6 @@ uno::Any SAL_CALL ScFilterDescriptorBase::getPropertyValue( const OUString& aPro SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFilterDescriptorBase ) - - ScFilterDescriptor::ScFilterDescriptor(ScDocShell* pDocShell) : ScFilterDescriptorBase(pDocShell) @@ -1584,8 +1564,6 @@ void ScFilterDescriptor::SetParam( const ScQueryParam& rNew ) aStoredParam = rNew; // von aussen gesetzt } - - ScRangeFilterDescriptor::ScRangeFilterDescriptor(ScDocShell* pDocShell, ScDatabaseRangeObj* pPar) : ScFilterDescriptorBase(pDocShell), pParent(pPar) @@ -1612,8 +1590,6 @@ void ScRangeFilterDescriptor::PutData( const ScQueryParam& rParam ) pParent->SetQueryParam( rParam ); } - - ScDataPilotFilterDescriptor::ScDataPilotFilterDescriptor(ScDocShell* pDocShell, ScDataPilotDescriptorBase* pPar) : ScFilterDescriptorBase(pDocShell), pParent(pPar) @@ -1655,8 +1631,6 @@ void ScDataPilotFilterDescriptor::PutData( const ScQueryParam& rParam ) } } - - ScDatabaseRangeObj::ScDatabaseRangeObj(ScDocShell* pDocSh, const OUString& rNm) : pDocShell( pDocSh ), aName( rNm ), @@ -2226,8 +2200,6 @@ uno::Sequence<OUString> SAL_CALL ScDatabaseRangeObj::getSupportedServiceNames() return aRet; } - - ScDatabaseRangesObj::ScDatabaseRangesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -2424,8 +2396,6 @@ sal_Bool SAL_CALL ScDatabaseRangesObj::hasByName( const OUString& aName ) return false; } - - ScUnnamedDatabaseRangesObj::ScUnnamedDatabaseRangesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -2511,6 +2481,4 @@ sal_Bool ScUnnamedDatabaseRangesObj::hasByTable( sal_Int32 nTab ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index d02cf443cf52..302aa3a579a2 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -38,8 +38,6 @@ using namespace ::com::sun::star; - - static const SfxItemPropertyMapEntry* lcl_GetDocDefaultsMap() { static const SfxItemPropertyMapEntry aDocDefaultsMap_Impl[] = @@ -73,12 +71,8 @@ using sc::HMMToTwips; using sc::TwipsToHMM; using sc::TwipsToEvenHMM; - - SC_SIMPLE_SERVICE_INFO( ScDocDefaultsObj, "ScDocDefaultsObj", "com.sun.star.sheet.Defaults" ) - - ScDocDefaultsObj::ScDocDefaultsObj(ScDocShell* pDocSh) : pDocShell( pDocSh ), aPropertyMap(lcl_GetDocDefaultsMap()) diff --git a/sc/source/ui/unoobj/detreg.cxx b/sc/source/ui/unoobj/detreg.cxx index 6edc743bc1ca..21edc1b21774 100644 --- a/sc/source/ui/unoobj/detreg.cxx +++ b/sc/source/ui/unoobj/detreg.cxx @@ -57,6 +57,4 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL scd_component_getFactory( } // extern "C" - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index c3731ce944fc..242361618c77 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -34,13 +34,9 @@ using namespace com::sun::star; - - static const char* cURLInsertColumns = ".uno:DataSourceBrowser/InsertColumns"; //data into text static const char* cURLDocDataSource = ".uno:DataSourceBrowser/DocumentDataSource"; - - static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxViewShell* pViewShell ) { if ( pViewShell ) @@ -55,8 +51,6 @@ static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxVie } - - ScDispatchProviderInterceptor::ScDispatchProviderInterceptor(ScTabViewShell* pViewSh) : pViewShell( pViewSh ) { @@ -194,8 +188,6 @@ void SAL_CALL ScDispatchProviderInterceptor::disposing( const lang::EventObject& m_xIntercepted = NULL; } - - ScDispatch::ScDispatch(ScTabViewShell* pViewSh) : pViewShell( pViewSh ), bListeningToView( false ) diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 41ff1053113d..be5e7db7f6f0 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -193,8 +193,6 @@ static const SfxItemPropertyMapEntry* lcl_GetRowsPropertyMap() using sc::HMMToTwips; using sc::TwipsToHMM; - - #define SCMODELOBJ_SERVICE "com.sun.star.sheet.SpreadsheetDocument" #define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings" #define SCDOC_SERVICE "com.sun.star.document.OfficeDocument" @@ -207,8 +205,6 @@ SC_SIMPLE_SERVICE_INFO( ScTableColumnsObj, "ScTableColumnsObj", "com.sun.star.ta SC_SIMPLE_SERVICE_INFO( ScTableRowsObj, "ScTableRowsObj", "com.sun.star.table.TableRows" ) SC_SIMPLE_SERVICE_INFO( ScTableSheetsObj, "ScTableSheetsObj", "com.sun.star.sheet.Spreadsheets" ) - - class ScPrintUIOptions : public vcl::PrinterOptionsHelper { public: @@ -2381,8 +2377,6 @@ uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms() } - - ScDrawPagesObj::ScDrawPagesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -2493,8 +2487,6 @@ sal_Bool SAL_CALL ScDrawPagesObj::hasElements() throw(uno::RuntimeException, std return ( getCount() != 0 ); } - - ScTableSheetsObj::ScTableSheetsObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -2900,8 +2892,6 @@ sal_Bool SAL_CALL ScTableSheetsObj::hasByName( const OUString& aName ) return false; } - - ScTableColumnsObj::ScTableColumnsObj(ScDocShell* pDocSh, SCTAB nT, SCCOL nSC, SCCOL nEC) : pDocShell( pDocSh ), nTab ( nT ), @@ -3168,8 +3158,6 @@ uno::Any SAL_CALL ScTableColumnsObj::getPropertyValue( const OUString& aProperty SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableColumnsObj ) - - ScTableRowsObj::ScTableRowsObj(ScDocShell* pDocSh, SCTAB nT, SCROW nSR, SCROW nER) : pDocShell( pDocSh ), nTab ( nT ), @@ -3454,8 +3442,6 @@ uno::Any SAL_CALL ScTableRowsObj::getPropertyValue( const OUString& aPropertyNam SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableRowsObj ) - - ScSpreadsheetSettingsObj::~ScSpreadsheetSettingsObj() { if (pDocShell) @@ -3501,8 +3487,6 @@ uno::Any SAL_CALL ScSpreadsheetSettingsObj::getPropertyValue( const OUString& /* SC_IMPL_DUMMY_PROPERTY_LISTENER( ScSpreadsheetSettingsObj ) - - ScAnnotationsObj::ScAnnotationsObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), nTab( nT ) @@ -3633,8 +3617,6 @@ sal_Bool SAL_CALL ScAnnotationsObj::hasElements() throw(uno::RuntimeException, s return ( getCount() != 0 ); } - - ScScenariosObj::ScScenariosObj(ScDocShell* pDocSh, SCTAB nT) : pDocShell( pDocSh ), nTab ( nT ) @@ -3844,6 +3826,4 @@ sal_Bool SAL_CALL ScScenariosObj::hasByName( const OUString& aName ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx index a6f5ed09359d..8aa8fda0ed5f 100644 --- a/sc/source/ui/unoobj/drdefuno.cxx +++ b/sc/source/ui/unoobj/drdefuno.cxx @@ -23,8 +23,6 @@ using namespace ::com::sun::star; - - ScDrawDefaultsObj::ScDrawDefaultsObj(ScDocShell* pDocSh) : SvxUnoDrawPool( NULL ), pDocShell( pDocSh ) diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index de0f08766d09..ff1fa5e33c2b 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -66,8 +66,6 @@ void ScHeaderFooterEditSource::UpdateData() mrTextData.UpdateData(); } - - ScCellEditSource::ScCellEditSource(ScDocShell* pDocSh, const ScAddress& rP) : pCellTextData(new ScCellTextData(pDocSh, rP)) {} @@ -106,8 +104,6 @@ ScEditEngineDefaulter* ScCellEditSource::GetEditEngine() return pCellTextData->GetEditEngine(); } - - ScAnnotationEditSource::ScAnnotationEditSource(ScDocShell* pDocSh, const ScAddress& rP) : pDocShell( pDocSh ), aCellPos( rP ), @@ -216,8 +212,6 @@ void ScAnnotationEditSource::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - - ScSimpleEditSource::ScSimpleEditSource( SvxTextForwarder* pForw ) : pForwarder( pForw ) { @@ -245,8 +239,6 @@ void ScSimpleEditSource::UpdateData() // nothing } - - SAL_WNODEPRECATED_DECLARATIONS_PUSH ScAccessibilityEditSource::ScAccessibilityEditSource( ::std::auto_ptr < ScAccessibleTextData > pAccessibleCellTextData ) : mpAccessibleTextData(pAccessibleCellTextData) diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 41b58d9fab99..969f680f955d 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -27,12 +27,8 @@ using namespace ::com::sun::star; - - SC_SIMPLE_SERVICE_INFO( ScSheetEventsObj, "ScSheetEventsObj", "com.sun.star.document.Events" ) - - ScSheetEventsObj::ScSheetEventsObj(ScDocShell* pDocSh, SCTAB nT) : mpDocShell( pDocSh ), mnTab( nT ) @@ -184,6 +180,4 @@ sal_Bool SAL_CALL ScSheetEventsObj::hasElements() throw(uno::RuntimeException, s return false; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index a84e8b885c13..0f6febfe9dc9 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -149,8 +149,6 @@ sal_Int16 lcl_SvxToUnoFileFormat( SvxFileFormat nSvxValue ) SC_SIMPLE_SERVICE_INFO( ScCellFieldsObj, "ScCellFieldsObj", "com.sun.star.text.TextFields" ) SC_SIMPLE_SERVICE_INFO( ScHeaderFieldsObj, "ScHeaderFieldsObj", "com.sun.star.text.TextFields" ) - - // ScUnoEditEngine nur um aus einer EditEngine die Felder herauszubekommen... enum ScUnoCollectMode @@ -281,8 +279,6 @@ SvxFieldData* ScUnoEditEngine::FindByPos(sal_Int32 nPar, sal_Int32 nPos, sal_Int return pFound; } - - ScCellFieldsObj::ScCellFieldsObj( const uno::Reference<text::XTextRange>& xContent, ScDocShell* pDocSh, const ScAddress& rPos) : diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index 5b5eca7488d5..68fb7d7a02c0 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -46,8 +46,6 @@ using namespace ::com::sun::star; using namespace rtl; using namespace com::sun::star::uno; - - #define SCFILTEROPTIONSOBJ_SERVICE "com.sun.star.ui.dialogs.FilterOptionsDialog" #define SCFILTEROPTIONSOBJ_IMPLNAME "com.sun.star.comp.Calc.FilterOptionsDialog" @@ -63,8 +61,6 @@ SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj, SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTE #define DBF_SEP_PATH_IMPORT "Office.Calc/Dialogs/DBFImport" #define DBF_SEP_PATH_EXPORT "Office.Calc/Dialogs/DBFExport" - - static void load_CharSet( rtl_TextEncoding &nCharSet, bool bExport ) { Sequence<Any> aValues; @@ -109,8 +105,6 @@ static void save_CharSet( rtl_TextEncoding nCharSet, bool bExport ) aItem.PutProperties(aNames, aValues); } - - ScFilterOptionsObj::ScFilterOptionsObj() : bExport( false ) { diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index d60a5f6afb15..ce1a2b4afe4e 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -40,8 +40,6 @@ using namespace ::com::sun::star; using namespace ::formula; - - // Map nur fuer PropertySetInfo static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() @@ -63,14 +61,10 @@ static const SfxItemPropertyMapEntry* lcl_GetValidatePropertyMap() return aValidatePropertyMap_Impl; } - - SC_SIMPLE_SERVICE_INFO( ScTableConditionalEntry, "ScTableConditionalEntry", "com.sun.star.sheet.TableConditionalEntry" ) SC_SIMPLE_SERVICE_INFO( ScTableConditionalFormat, "ScTableConditionalFormat", "com.sun.star.sheet.TableConditionalFormat" ) SC_SIMPLE_SERVICE_INFO( ScTableValidationObj, "ScTableValidationObj", "com.sun.star.sheet.TableValidation" ) - - static sal_Int32 lcl_ConditionModeToOperatorNew( ScConditionMode eMode ) { sal_Int32 eOper = sheet::ConditionOperator2::NONE; @@ -138,8 +132,6 @@ static ScConditionMode lcl_ConditionOperatorToMode( sheet::ConditionOperator eOp return eMode; } - - ScCondFormatEntryItem::ScCondFormatEntryItem() : meGrammar1( FormulaGrammar::GRAM_UNSPECIFIED ), meGrammar2( FormulaGrammar::GRAM_UNSPECIFIED ), @@ -147,8 +139,6 @@ ScCondFormatEntryItem::ScCondFormatEntryItem() : { } - - ScTableConditionalFormat::ScTableConditionalFormat( ScDocument* pDoc, sal_uLong nKey, SCTAB nTab, FormulaGrammar::Grammar eGrammar) { @@ -511,8 +501,6 @@ ScTableConditionalFormat* ScTableConditionalFormat::getImplementation( return pRet; } - - ScTableConditionalEntry::ScTableConditionalEntry(const ScCondFormatEntryItem& aItem) : aData( aItem ) { @@ -616,8 +604,6 @@ void SAL_CALL ScTableConditionalEntry::setStyleName( const OUString& aStyleName aData.maStyle = ScStyleNameConversion::ProgrammaticToDisplayName( aStyleName, SFX_STYLE_FAMILY_PARA ); } - - ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, sal_uLong nKey, const formula::FormulaGrammar::Grammar eGrammar) : aPropSet( lcl_GetValidatePropertyMap() ) @@ -1044,6 +1030,4 @@ ScTableValidationObj* ScTableValidationObj::getImplementation( - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/forbiuno.cxx b/sc/source/ui/unoobj/forbiuno.cxx index 031ccdf7f3b3..e6843c0f94e0 100644 --- a/sc/source/ui/unoobj/forbiuno.cxx +++ b/sc/source/ui/unoobj/forbiuno.cxx @@ -24,8 +24,6 @@ using namespace ::com::sun::star; - - static rtl::Reference<SvxForbiddenCharactersTable> lcl_GetForbidden( ScDocShell* pDocSh ) { rtl::Reference<SvxForbiddenCharactersTable> xRet; diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index c2ac19067b0d..45e15db08e7c 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -48,16 +48,12 @@ using namespace com::sun::star; - - // registered as implementation for service FunctionAccess, // also supports service SpreadsheetDocumentSettings (to set null date etc.) #define SCFUNCTIONACCESS_SERVICE "com.sun.star.sheet.FunctionAccess" #define SCDOCSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetDocumentSettings" - - // helper to use cached document if not in use, temporary document otherwise class ScTempDocSource @@ -75,8 +71,6 @@ public: ScDocument* GetDocument(); }; - - ScDocument* ScTempDocSource::CreateDocument() { ScDocument* pDoc = new ScDocument; // SCDOCMODE_DOCUMENT @@ -114,8 +108,6 @@ ScDocument* ScTempDocSource::GetDocument() return rCache.GetDocument(); } - - ScTempDocCache::ScTempDocCache() : pDoc( NULL ), bInUse( false ) @@ -141,8 +133,6 @@ void ScTempDocCache::Clear() pDoc = NULL; } - - // copy results from one document into another //! merge this with ScAreaLink::Refresh //! copy directly without a clipboard document? @@ -183,8 +173,6 @@ static sal_Bool lcl_CopyData( ScDocument* pSrcDoc, const ScRange& rSrcRange, return sal_True; } - - ScFunctionAccess::ScFunctionAccess() : pOptions( NULL ), aPropertyMap( ScDocOptionsHelper::GetPropertyMap() ), diff --git a/sc/source/ui/unoobj/linkuno.cxx b/sc/source/ui/unoobj/linkuno.cxx index 559e538e9814..bf1bf8f455ed 100644 --- a/sc/source/ui/unoobj/linkuno.cxx +++ b/sc/source/ui/unoobj/linkuno.cxx @@ -50,8 +50,6 @@ using ::com::sun::star::lang::IllegalArgumentException; using ::com::sun::star::uno::RuntimeException; using ::std::vector; - - // fuer Sheet- und Area-Links benutzt: static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() { @@ -67,8 +65,6 @@ static const SfxItemPropertyMapEntry* lcl_GetSheetLinkMap() return aSheetLinkMap_Impl; } - - SC_SIMPLE_SERVICE_INFO( ScAreaLinkObj, "ScAreaLinkObj", "com.sun.star.sheet.CellAreaLink" ) SC_SIMPLE_SERVICE_INFO( ScAreaLinksObj, "ScAreaLinksObj", "com.sun.star.sheet.CellAreaLinks" ) SC_SIMPLE_SERVICE_INFO( ScDDELinkObj, "ScDDELinkObj", "com.sun.star.sheet.DDELink" ) @@ -76,8 +72,6 @@ SC_SIMPLE_SERVICE_INFO( ScDDELinksObj, "ScDDELinksObj", "com.sun.star.sheet.DDEL SC_SIMPLE_SERVICE_INFO( ScSheetLinkObj, "ScSheetLinkObj", "com.sun.star.sheet.SheetLink" ) SC_SIMPLE_SERVICE_INFO( ScSheetLinksObj, "ScSheetLinksObj", "com.sun.star.sheet.SheetLinks" ) - - ScSheetLinkObj::ScSheetLinkObj(ScDocShell* pDocSh, const OUString& rName) : aPropSet( lcl_GetSheetLinkMap() ), pDocShell( pDocSh ), @@ -377,8 +371,6 @@ void ScSheetLinkObj::setRefreshDelay(sal_Int32 nRefreshDelay) ModifyRefreshDelay_Impl( nRefreshDelay ); } - - ScSheetLinksObj::ScSheetLinksObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -583,8 +575,6 @@ uno::Sequence<OUString> SAL_CALL ScSheetLinksObj::getElementNames() throw(uno::R return aSeq; } - - static ScAreaLink* lcl_GetAreaLink( ScDocShell* pDocShell, size_t nPos ) { if (pDocShell) @@ -923,8 +913,6 @@ void SAL_CALL ScAreaLinkObj::setDestArea( const table::CellRangeAddress& aDestAr Modify_Impl( NULL, NULL, NULL, NULL, &aDestArea ); } - - ScAreaLinksObj::ScAreaLinksObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -1047,8 +1035,6 @@ sal_Bool SAL_CALL ScAreaLinksObj::hasElements() throw(uno::RuntimeException, std return ( getCount() != 0 ); } - - ScDDELinkObj::ScDDELinkObj(ScDocShell* pDocSh, const OUString& rA, const OUString& rT, const OUString& rI) : pDocShell( pDocSh ), @@ -1257,8 +1243,6 @@ void ScDDELinkObj::Refreshed_Impl() aRefreshListeners[n]->refreshed( aEvent ); } - - ScDDELinksObj::ScDDELinksObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -1470,8 +1454,6 @@ uno::Reference< sheet::XDDELink > ScDDELinksObj::addDDELink( return xLink; } - - ScExternalSheetCacheObj::ScExternalSheetCacheObj(ScDocShell* pDocShell, ScExternalRefCache::TableTypeRef pTable, size_t nIndex) : mpDocShell(pDocShell), mpTable(pTable), @@ -1577,8 +1559,6 @@ sal_Int32 SAL_CALL ScExternalSheetCacheObj::getTokenIndex() return static_cast< sal_Int32 >( mnIndex ); } - - ScExternalDocLinkObj::ScExternalDocLinkObj(ScDocShell* pDocShell, ScExternalRefManager* pRefMgr, sal_uInt16 nFileId) : mpDocShell(pDocShell), mpRefMgr(pRefMgr), mnFileId(nFileId) { @@ -1713,8 +1693,6 @@ sal_Int32 SAL_CALL ScExternalDocLinkObj::getTokenIndex() return static_cast<sal_Int32>(mnFileId); } - - ScExternalDocLinksObj::ScExternalDocLinksObj(ScDocShell* pDocShell) : mpDocShell(pDocShell), mpRefMgr(pDocShell->GetDocument()->GetExternalRefManager()) diff --git a/sc/source/ui/unoobj/listenercalls.cxx b/sc/source/ui/unoobj/listenercalls.cxx index 359307ad2139..b488e4ff4efa 100644 --- a/sc/source/ui/unoobj/listenercalls.cxx +++ b/sc/source/ui/unoobj/listenercalls.cxx @@ -23,8 +23,6 @@ using namespace com::sun::star; - - ScUnoListenerCalls::ScUnoListenerCalls() { } diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index 112bb73b1939..b5d18a97ad1c 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -26,12 +26,8 @@ using namespace com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; - - SC_SIMPLE_SERVICE_INFO( ScNameToIndexAccess, "ScNameToIndexAccess", "stardiv.unknown" ) - - uno::Reference<uno::XInterface> ScUnoHelpFunctions::AnyToInterface( const uno::Any& rAny ) { if ( rAny.getValueTypeClass() == uno::TypeClass_INTERFACE ) @@ -185,8 +181,6 @@ void ScUnoHelpFunctions::SetOptionalPropertyValue( } } - - ScIndexEnumeration::ScIndexEnumeration(const uno::Reference<container::XIndexAccess>& rInd, const OUString& rServiceName) : xIndex( rInd ), @@ -247,8 +241,6 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceNa - - ScNameToIndexAccess::ScNameToIndexAccess( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess>& rNameObj ) : xNameAccess( rNameObj ) @@ -299,6 +291,4 @@ sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(::com::sun::star::u - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index 1f5725c9512f..14f8a56803d6 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -46,8 +46,6 @@ using ::com::sun::star::uno::Any; #include "scui_def.hxx" - - static const SfxItemPropertyMapEntry* lcl_GetNamedRangeMap() { static const SfxItemPropertyMapEntry aNamedRangeMap_Impl[] = @@ -71,8 +69,6 @@ static const SfxItemPropertyMapEntry* lcl_GetNamedRangesMap() return aNamedRangesMap_Impl; } - - #define SCNAMEDRANGEOBJ_SERVICE "com.sun.star.sheet.NamedRange" SC_SIMPLE_SERVICE_INFO( ScLabelRangeObj, "ScLabelRangeObj", "com.sun.star.sheet.LabelRange" ) @@ -471,8 +467,6 @@ const uno::Sequence<sal_Int8>& ScNamedRangeObj::getUnoTunnelId() return theScNamedRangeObjUnoTunnelId::get().getSeq(); } - - ScNamedRangesObj::ScNamedRangesObj(ScDocShell* pDocSh) : mbModifyAndBroadcast(true), pDocShell( pDocSh ) @@ -827,8 +821,6 @@ sal_Int16 ScNamedRangesObj::resetActionLocks() throw(uno::RuntimeException, std: return nLockCount; } - - ScGlobalNamedRangesObj::ScGlobalNamedRangesObj(ScDocShell* pDocSh) : ScNamedRangesObj(pDocSh) { @@ -880,8 +872,6 @@ SCTAB ScGlobalNamedRangesObj::GetTab_Impl() return -1; } - - ScLocalNamedRangesObj::ScLocalNamedRangesObj( ScDocShell* pDocSh, uno::Reference<container::XNamed> xSheet ) : ScNamedRangesObj(pDocSh), mxSheet(xSheet) @@ -943,8 +933,6 @@ SCTAB ScLocalNamedRangesObj::GetTab_Impl() return nTab; } - - ScLabelRangeObj::ScLabelRangeObj(ScDocShell* pDocSh, bool bCol, const ScRange& rR) : pDocShell( pDocSh ), bColumn( bCol ), @@ -1064,8 +1052,6 @@ void SAL_CALL ScLabelRangeObj::setDataArea( const table::CellRangeAddress& aData Modify_Impl( NULL, &aDataRange ); } - - ScLabelRangesObj::ScLabelRangesObj(ScDocShell* pDocSh, bool bCol) : pDocShell( pDocSh ), bColumn( bCol ) @@ -1230,6 +1216,4 @@ sal_Bool SAL_CALL ScLabelRangesObj::hasElements() throw(uno::RuntimeException, s - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index 68a9bc2c5fd5..c0bcef6d3fcc 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -38,8 +38,6 @@ using namespace com::sun::star; - - static const SvxItemPropertySet* lcl_GetAnnotationPropertySet() { static const SfxItemPropertyMapEntry aAnnotationPropertyMap_Impl[] = @@ -54,13 +52,9 @@ static const SvxItemPropertySet* lcl_GetAnnotationPropertySet() return &aAnnotationPropertySet_Impl; } - - SC_SIMPLE_SERVICE_INFO( ScAnnotationObj, "ScAnnotationObj", "com.sun.star.sheet.CellAnnotation" ) //SC_SIMPLE_SERVICE_INFO( ScAnnotationShapeObj, "ScAnnotationShapeObj", "com.sun.star.sheet.CellAnnotationShape" ) - - ScAnnotationObj::ScAnnotationObj(ScDocShell* pDocSh, const ScAddress& rPos) : pDocShell( pDocSh ), aCellPos( rPos ), diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index ea2901c2f8d9..9c9730494a6c 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -179,8 +179,6 @@ uno::Any ScDocOptionsHelper::getPropertyValue( return aRet; } - - ScDocOptionsObj::ScDocOptionsObj( const ScDocOptions& rOpt ) : ScModelObj( NULL ), aOptions( rOpt ) diff --git a/sc/source/ui/unoobj/pageuno.cxx b/sc/source/ui/unoobj/pageuno.cxx index a90d841f8240..7cb1392df075 100644 --- a/sc/source/ui/unoobj/pageuno.cxx +++ b/sc/source/ui/unoobj/pageuno.cxx @@ -24,8 +24,6 @@ using namespace ::com::sun::star; - - ScPageObj::ScPageObj( SdrPage* pPage ) : SvxFmDrawPage( pPage ) { diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 0d7935a1f462..ea7f9f7695a5 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -245,8 +245,6 @@ public: } }; - - struct ProvNamesId_Type { const char * pName; @@ -377,8 +375,6 @@ static const sal_Char* aOldNames[SC_SERVICE_COUNT] = - - // alles static @@ -663,6 +659,4 @@ uno::Sequence<OUString> ScServiceProvider::GetAllServiceNames() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index 9fa68ec23c5c..bc470f6b0862 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -80,8 +80,6 @@ ScMacroInfo* ScShapeObj_getShapeHyperMacroInfo( ScShapeObj* pShape, sal_Bool bCr return 0; } - - namespace { void lcl_initializeNotifier( SdrObject& _rSdrObj, ::cppu::OWeakObject& _rShape ) @@ -91,8 +89,6 @@ namespace } } - - ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) : pShapePropertySet(NULL), pShapePropertyState(NULL), diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index b1038803536f..80ca0da2af81 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -34,8 +34,6 @@ using namespace com::sun::star; - - //! SearchWords sucht in ganzen Zellen - umbenennen ??? // SfxItemPropertyMapEntry nur fuer GetPropertySetInfo @@ -61,13 +59,9 @@ static const SfxItemPropertyMapEntry* lcl_GetSearchPropertyMap() return aSearchPropertyMap_Impl; } - - #define SCSEARCHDESCRIPTOR_SERVICE "com.sun.star.util.SearchDescriptor" #define SCREPLACEDESCRIPTOR_SERVICE "com.sun.star.util.ReplaceDescriptor" - - ScCellSearchObj::ScCellSearchObj() : aPropSet(lcl_GetSearchPropertyMap()) { @@ -250,8 +244,4 @@ ScCellSearchObj* ScCellSearchObj::getImplementation( - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 4a1b148febed..579e6a776f67 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -68,8 +68,6 @@ using namespace ::com::sun::star; - - static const SfxItemPropertySet* lcl_GetCellStyleSet() { static const SfxItemPropertyMapEntry aCellStyleMap_Impl[] = @@ -368,8 +366,6 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() } - - // Index-Access auf die Style-Typen: 0 = Cell, 1 = Page #define SC_STYLE_FAMILY_COUNT 2 @@ -379,13 +375,9 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() static const sal_uInt16 aStyleFamilyTypes[SC_STYLE_FAMILY_COUNT] = { SFX_STYLE_FAMILY_PARA, SFX_STYLE_FAMILY_PAGE }; - - using sc::HMMToTwips; using sc::TwipsToHMM; - - #define SCSTYLE_SERVICE "com.sun.star.style.Style" #define SCCELLSTYLE_SERVICE "com.sun.star.style.CellStyle" #define SCPAGESTYLE_SERVICE "com.sun.star.style.PageStyle" @@ -393,12 +385,8 @@ using sc::TwipsToHMM; SC_SIMPLE_SERVICE_INFO( ScStyleFamiliesObj, "ScStyleFamiliesObj", "com.sun.star.style.StyleFamilies" ) SC_SIMPLE_SERVICE_INFO( ScStyleFamilyObj, "ScStyleFamilyObj", "com.sun.star.style.StyleFamily" ) - - #define SC_PAPERBIN_DEFAULTNAME "[From printer settings]" - - static bool lcl_AnyTabProtected( ScDocument& rDoc ) { SCTAB nTabCount = rDoc.GetTableCount(); @@ -408,8 +396,6 @@ static bool lcl_AnyTabProtected( ScDocument& rDoc ) return false; } - - ScStyleFamiliesObj::ScStyleFamiliesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -598,8 +584,6 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO return aSequence; } - - ScStyleFamilyObj::ScStyleFamilyObj(ScDocShell* pDocSh, SfxStyleFamily eFam) : pDocShell( pDocSh ), eFamily( eFam ) @@ -939,8 +923,6 @@ void SAL_CALL ScStyleFamilyObj::removeVetoableChangeListener( const OUString&, c OSL_FAIL( "###unexpected!" ); } - - // Default-ctor wird fuer die Reflection gebraucht ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const OUString& rName) : @@ -2013,6 +1995,4 @@ uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/targuno.cxx b/sc/source/ui/unoobj/targuno.cxx index 1b4054c0c3cd..be358a8d45c4 100644 --- a/sc/source/ui/unoobj/targuno.cxx +++ b/sc/source/ui/unoobj/targuno.cxx @@ -39,8 +39,6 @@ using namespace ::com::sun::star; - - sal_uInt16 nTypeResIds[SC_LINKTARGETTYPE_COUNT] = { SCSTR_CONTENT_TABLE, // SC_LINKTARGETTYPE_SHEET @@ -59,8 +57,6 @@ static const SfxItemPropertyMapEntry* lcl_GetLinkTargetMap() return aLinkTargetMap_Impl; } - - // service for ScLinkTargetTypeObj is not defined // must not support document::LinkTarget because the target type cannot be used as a target @@ -68,8 +64,6 @@ SC_SIMPLE_SERVICE_INFO( ScLinkTargetTypesObj, "ScLinkTargetTypesObj", "com.sun.s SC_SIMPLE_SERVICE_INFO( ScLinkTargetTypeObj, "ScLinkTargetTypeObj", "com.sun.star.document.LinkTargetSupplier" ) SC_SIMPLE_SERVICE_INFO( ScLinkTargetsObj, "ScLinkTargetsObj", "com.sun.star.document.LinkTargets" ) - - ScLinkTargetTypesObj::ScLinkTargetTypesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -137,8 +131,6 @@ sal_Bool SAL_CALL ScLinkTargetTypesObj::hasElements(void) throw( uno::RuntimeExc return sal_True; } - - ScLinkTargetTypeObj::ScLinkTargetTypeObj(ScDocShell* pDocSh, sal_uInt16 nT) : pDocShell( pDocSh ), nType( nT ) @@ -249,8 +241,6 @@ uno::Any SAL_CALL ScLinkTargetTypeObj::getPropertyValue(const OUString& Property SC_IMPL_DUMMY_PROPERTY_LISTENER( ScLinkTargetTypeObj ) - - ScLinkTargetsObj::ScLinkTargetsObj( const uno::Reference< container::XNameAccess > & rColl ) : xCollection( rColl ) { @@ -296,6 +286,4 @@ sal_Bool SAL_CALL ScLinkTargetsObj::hasElements(void) throw( uno::RuntimeExcepti return xCollection->hasElements(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 7a80e857bf18..ee57462ebc2c 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -49,8 +49,6 @@ using namespace com::sun::star; - - static const SvxItemPropertySet * lcl_GetHdFtPropertySet() { static SfxItemPropertyMapEntry aHdFtPropertyMap_Impl[] = @@ -87,13 +85,9 @@ static const SvxItemPropertySet * lcl_GetHdFtPropertySet() return &aHdFtPropertySet_Impl; } - - SC_SIMPLE_SERVICE_INFO( ScHeaderFooterContentObj, "ScHeaderFooterContentObj", "com.sun.star.sheet.HeaderFooterContent" ) SC_SIMPLE_SERVICE_INFO( ScHeaderFooterTextObj, "ScHeaderFooterTextObj", "stardiv.one.Text.Text" ) - - ScHeaderFooterContentObj::ScHeaderFooterContentObj( const EditTextObject* pLeft, const EditTextObject* pCenter, const EditTextObject* pRight ) : @@ -181,8 +175,6 @@ ScHeaderFooterContentObj* ScHeaderFooterContentObj::getImplementation( } - - ScHeaderFooterTextData::ScHeaderFooterTextData( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : mpTextObj(pTextObj ? pTextObj->Clone() : NULL), @@ -266,8 +258,6 @@ const EditTextObject* ScHeaderFooterTextData::GetTextObject() const return mpTextObj; } - - ScHeaderFooterTextObj::ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : aTextData(rContent, nP, pTextObj) @@ -578,8 +568,6 @@ sal_Bool SAL_CALL ScHeaderFooterTextObj::hasElements() throw(uno::RuntimeExcepti return mxUnoText->hasElements(); } - - ScCellTextCursor::ScCellTextCursor(const ScCellTextCursor& rOther) : SvxUnoTextCursor( rOther ), rTextObj( rOther.rTextObj ) @@ -674,8 +662,6 @@ ScCellTextCursor* ScCellTextCursor::getImplementation( const uno::Reference<uno: return pRet; } - - ScHeaderFooterTextCursor::ScHeaderFooterTextCursor(const ScHeaderFooterTextCursor& rOther) : SvxUnoTextCursor( rOther ), rTextObj( rOther.rTextObj ) @@ -771,8 +757,6 @@ ScHeaderFooterTextCursor* ScHeaderFooterTextCursor::getImplementation( return pRet; } - - ScDrawTextCursor::ScDrawTextCursor(const ScDrawTextCursor& rOther) : SvxUnoTextCursor( rOther ), xParentText( rOther.xParentText ) @@ -866,8 +850,6 @@ ScDrawTextCursor* ScDrawTextCursor::getImplementation( const uno::Reference<uno: return pRet; } - - ScSimpleEditSourceHelper::ScSimpleEditSourceHelper() { SfxItemPool* pEnginePool = EditEngine::CreatePool(); @@ -911,8 +893,6 @@ EditTextObject* ScEditEngineTextObj::CreateTextObject() return GetEditEngine()->CreateTextObject(); } - - ScCellTextData::ScCellTextData(ScDocShell* pDocSh, const ScAddress& rP) : pDocShell( pDocSh ), aCellPos( rP ), diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index c348635f16f5..98d81532c185 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -45,8 +45,6 @@ using namespace ::formula; using namespace ::com::sun::star; - - static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() { static const SfxItemPropertyMapEntry aFormulaParserMap_Impl[] = @@ -63,8 +61,6 @@ static const SfxItemPropertyMapEntry* lcl_GetFormulaParserMap() SC_SIMPLE_SERVICE_INFO( ScFormulaParserObj, "ScFormulaParserObj", SC_SERVICENAME_FORMULAPARS ) - - ScFormulaParserObj::ScFormulaParserObj(ScDocShell* pDocSh) : mpDocShell( pDocSh ), mnConv( sheet::AddressConvention::UNSPECIFIED ), @@ -284,8 +280,6 @@ uno::Any SAL_CALL ScFormulaParserObj::getPropertyValue( const OUString& aPropert SC_IMPL_DUMMY_PROPERTY_LISTENER( ScFormulaParserObj ) - - static void lcl_ExternalRefToApi( sheet::SingleReference& rAPI, const ScSingleRefData& rRef ) { rAPI.Column = 0; @@ -496,8 +490,6 @@ bool ScTokenConversion::ConvertToTokenSequence( const ScDocument& rDoc, return !bError; } - - SAL_WNODEPRECATED_DECLARATIONS_PUSH ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::FormulaCompiler> _pCompiler) : formula::FormulaOpCodeMapperObj(_pCompiler) @@ -505,6 +497,4 @@ ScFormulaOpCodeMapperObj::ScFormulaOpCodeMapperObj(::std::auto_ptr<formula::Form } SAL_WNODEPRECATED_DECLARATIONS_POP - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/unoreflist.cxx b/sc/source/ui/unoobj/unoreflist.cxx index aa78b4124473..c9689a0017d7 100644 --- a/sc/source/ui/unoobj/unoreflist.cxx +++ b/sc/source/ui/unoobj/unoreflist.cxx @@ -20,8 +20,6 @@ #include "unoreflist.hxx" #include "document.hxx" - - ScUnoRefList::ScUnoRefList() { } @@ -46,8 +44,6 @@ void ScUnoRefList::Undo( ScDocument* pDoc ) } } - - TYPEINIT1(ScUnoRefUndoHint, SfxHint); ScUnoRefUndoHint::ScUnoRefUndoHint( const ScUnoRefEntry& rRefEntry ) : diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 2eff3710c8ae..d7935889c76c 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -74,8 +74,6 @@ using namespace com::sun::star; - - //! Clipping-Markierungen // alles ohne Which-ID, Map nur fuer PropertySetInfo @@ -117,15 +115,11 @@ static const SfxItemPropertyMapEntry* lcl_GetViewOptPropertyMap() return aViewOptPropertyMap_Impl; } - - #define SCTABVIEWOBJ_SERVICE "com.sun.star.sheet.SpreadsheetView" #define SCVIEWSETTINGS_SERVICE "com.sun.star.sheet.SpreadsheetViewSettings" SC_SIMPLE_SERVICE_INFO( ScViewPaneBase, "ScViewPaneObj", "com.sun.star.sheet.SpreadsheetViewPane" ) - - ScViewPaneBase::ScViewPaneBase(ScTabViewShell* pViewSh, sal_uInt16 nP) : pViewShell( pViewSh ), nPane( nP ) @@ -419,8 +413,6 @@ awt::Rectangle ScViewPaneBase::GetVisArea() const return aVisArea; } - - ScViewPaneObj::ScViewPaneObj(ScTabViewShell* pViewSh, sal_uInt16 nP) : ScViewPaneBase( pViewSh, nP ) { @@ -451,8 +443,6 @@ void SAL_CALL ScViewPaneObj::release() throw() OWeakObject::release(); } - - // Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) : diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index cb724e0a99d3..8bf4ba9e19a1 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -43,8 +43,6 @@ namespace ooo { namespace vba { namespace excel { - - uno::Reference< sheet::XUnnamedDatabaseRanges > GetUnnamedDataBaseRanges( ScDocShell* pShell ) throw ( uno::RuntimeException ) { @@ -377,8 +375,6 @@ ScVbaCellRangeAccess::GetDataSet( ScCellRangesBase* pRangeObj ) return pRangeObj ? pRangeObj->GetCurrentDataSet( true ) : 0; } - - } // namespace excel } // namespace vba } // namespace ooo diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 47301b14bc8e..a59bee0fd1db 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -36,8 +36,6 @@ namespace ooo { namespace vba { namespace excel { - - // nTabs empty means apply zoom to all sheets void implSetZoom( const css::uno::Reference< css::frame::XModel >& xModel, sal_Int16 nZoom, std::vector< SCTAB >& nTabs ); void implnCopy( const css::uno::Reference< css::frame::XModel>& xModel ); @@ -61,8 +59,6 @@ css::uno::Reference< ooo::vba::XHelperInterface > getUnoSheetModuleObj( const cs ScDocShell* GetDocShellFromRange( const css::uno::Reference< css::uno::XInterface >& xRange ) throw ( css::uno::RuntimeException ); void setUpDocumentModules( const css::uno::Reference< css::sheet::XSpreadsheetDocument >& xDoc ); - - class ScVbaCellRangeAccess { public: diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index 93c9fa50ce07..1953f704fb85 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -100,8 +100,6 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY_THROW; using ::com::sun::star::uno::UNO_QUERY; - - /** Global application settings shared by all open workbooks. */ struct ScVbaAppSettings { @@ -128,8 +126,6 @@ ScVbaAppSettings::ScVbaAppSettings() : struct ScVbaStaticAppSettings : public ::rtl::Static< ScVbaAppSettings, ScVbaStaticAppSettings > {}; - - ScVbaApplication::ScVbaApplication( const uno::Reference<uno::XComponentContext >& xContext ) : ScVbaApplication_BASE( xContext ), mrAppSettings( ScVbaStaticAppSettings::get() ) @@ -1113,8 +1109,6 @@ uno::Reference< excel::XRange > lclCreateVbaRange( } // namespace - - uno::Reference< excel::XRange > SAL_CALL ScVbaApplication::Intersect( const uno::Reference< excel::XRange >& rArg1, const uno::Reference< excel::XRange >& rArg2, const uno::Any& rArg3, const uno::Any& rArg4, const uno::Any& rArg5, const uno::Any& rArg6, diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index e48e25764714..607a1cba58ca 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -47,8 +47,6 @@ using namespace ::com::sun::star::script::vba::VBAEventId; using namespace ::ooo::vba; - - namespace { /** Extracts a sheet index from the specified element of the passed sequence. @@ -110,8 +108,6 @@ uno::Reference< awt::XWindow > lclGetWindowForController( const uno::Reference< } // namespace - - typedef ::cppu::WeakImplHelper4< awt::XTopWindowListener, awt::XWindowListener, frame::XBorderResizeListener, util::XChangesListener > ScVbaEventListener_BASE; // This class is to process Workbook window related event @@ -180,8 +176,6 @@ private: bool mbDisposed; }; - - ScVbaEventListener::ScVbaEventListener( ScVbaEventsHelper& rVbaEvents, const uno::Reference< frame::XModel >& rxModel, ScDocShell* pDocShell ) : mrVbaEvents( rVbaEvents ), mxModel( rxModel ), @@ -511,8 +505,6 @@ IMPL_LINK( ScVbaEventListener, processWindowResizeEvent, Window*, EMPTYARG pWind return 0; } - - ScVbaEventsHelper::ScVbaEventsHelper( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& xContext ) : VbaEventsHelperBase( rArgs, xContext ), mbOpened( false ) diff --git a/sc/source/ui/vba/vbaeventshelper.hxx b/sc/source/ui/vba/vbaeventshelper.hxx index 16d226041a55..be75085e1ddc 100644 --- a/sc/source/ui/vba/vbaeventshelper.hxx +++ b/sc/source/ui/vba/vbaeventshelper.hxx @@ -27,8 +27,6 @@ class ScVbaEventListener; - - class ScVbaEventsHelper : public VbaEventsHelperBase { public: @@ -67,8 +65,6 @@ private: bool mbOpened; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbafont.hxx b/sc/source/ui/vba/vbafont.hxx index e0ebb059aa31..8edd73f4cce0 100644 --- a/sc/source/ui/vba/vbafont.hxx +++ b/sc/source/ui/vba/vbafont.hxx @@ -75,8 +75,6 @@ public: }; - - #endif /* SC_VBA_FONT_HXX */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 6c2fb0520a81..30983e5579fb 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -35,8 +35,6 @@ using namespace ::com::sun::star::uno; using namespace ::ooo::vba; - - // ScVbaGlobals @@ -79,8 +77,6 @@ ScVbaGlobals::getExcel() throw (uno::RuntimeException, std::exception) return getApplication(); } - - uno::Reference< excel::XWorkbook > SAL_CALL ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbahyperlink.cxx b/sc/source/ui/vba/vbahyperlink.cxx index 420c1a8123ac..af6fbec8a7bd 100644 --- a/sc/source/ui/vba/vbahyperlink.cxx +++ b/sc/source/ui/vba/vbahyperlink.cxx @@ -30,8 +30,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; - - ScVbaHyperlink::ScVbaHyperlink( const uno::Sequence< uno::Any >& rArgs, const uno::Reference< uno::XComponentContext >& rxContext ) throw (lang::IllegalArgumentException) : HyperlinkImpl_BASE( getXSomethingFromArgs< XHelperInterface >( rArgs, 0 ), rxContext ), @@ -233,6 +231,4 @@ extern sdecl::ServiceDecl const serviceDecl( "ooo.vba.excel.Hyperlink" ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahyperlinks.cxx b/sc/source/ui/vba/vbahyperlinks.cxx index 68185d8ed7f8..bad71e7c81ae 100644 --- a/sc/source/ui/vba/vbahyperlinks.cxx +++ b/sc/source/ui/vba/vbahyperlinks.cxx @@ -28,8 +28,6 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; - - namespace { /** Returns true, if every range of rxInner is contained in any range of rScOuter. */ @@ -45,8 +43,6 @@ bool lclContains( const ScRangeList& rScOuter, const uno::Reference< excel::XRan return true; } - - /** Functor to decide whether the anchors of two Hyperlink objects are equal. */ struct EqualAnchorFunctor { @@ -102,8 +98,6 @@ bool EqualAnchorFunctor::operator()( const uno::Reference< excel::XHyperlink >& } // namespace - - namespace detail { class ScVbaHlinkContainer : public ::cppu::WeakImplHelper1< container::XIndexAccess > @@ -130,8 +124,6 @@ private: HyperlinkVector maHlinks; }; - - ScVbaHlinkContainer::ScVbaHlinkContainer() throw (uno::RuntimeException) { // TODO FIXME: fill with existing hyperlinks @@ -185,8 +177,6 @@ sal_Bool SAL_CALL ScVbaHlinkContainer::hasElements() throw (uno::RuntimeExceptio return !maHlinks.empty(); } - - ScVbaHlinkContainerMember::ScVbaHlinkContainerMember( ScVbaHlinkContainer* pContainer ) : mxContainer( pContainer ) { @@ -198,8 +188,6 @@ ScVbaHlinkContainerMember::~ScVbaHlinkContainerMember() } // namespace detail - - ScVbaHyperlinks::ScVbaHyperlinks( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext ) throw (uno::RuntimeException) : detail::ScVbaHlinkContainerMember( new detail::ScVbaHlinkContainer ), @@ -281,6 +269,4 @@ uno::Any ScVbaHyperlinks::createCollectionObject( const uno::Any& rSource ) VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaHyperlinks, "ooo.vba.excel.Hyperlinks" ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbahyperlinks.hxx b/sc/source/ui/vba/vbahyperlinks.hxx index baeca71f49a6..32d082b9564c 100644 --- a/sc/source/ui/vba/vbahyperlinks.hxx +++ b/sc/source/ui/vba/vbahyperlinks.hxx @@ -26,8 +26,6 @@ class ScRangeList; - - namespace detail { class ScVbaHlinkContainer; @@ -46,8 +44,6 @@ struct ScVbaHlinkContainerMember } // namespace detail - - class ScVbaHyperlinks; typedef ::rtl::Reference< ScVbaHyperlinks > ScVbaHyperlinksRef; @@ -137,8 +133,6 @@ private: ScVbaHyperlinksRef mxSheetHlinks; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 05cdda11d05f..d71551fb2fbd 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -339,8 +339,6 @@ public: }; - - class RangesEnumerationImpl : public EnumerationHelperImpl { bool mbIsRows; @@ -1015,8 +1013,6 @@ public: } }; - - class Dim2ArrayValueSetter : public ArrayVisitor { uno::Sequence< uno::Sequence< uno::Any > > aMatrix; @@ -1276,8 +1272,6 @@ getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const return new ScVbaRange( xFixThisParent, xContext, xRanges ); } - - namespace { template< typename RangeType > @@ -1382,8 +1376,6 @@ util::TriState lclGetMergedState( const uno::Reference< table::XCellRange >& rxC } // namespace - - css::uno::Reference< excel::XRange > ScVbaRange::getRangeObjectForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sRangeName, diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 800a59de9f96..9f37431c40de 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -76,8 +76,6 @@ public: virtual const css::uno::Any& getValue() const = 0; }; - - class ScVbaRange : public ScVbaRange_BASE { css::uno::Reference< ov::XCollection > m_Areas; diff --git a/sc/source/ui/vba/vbasheetobject.cxx b/sc/source/ui/vba/vbasheetobject.cxx index 5f1badf94afd..582bb9797d45 100644 --- a/sc/source/ui/vba/vbasheetobject.cxx +++ b/sc/source/ui/vba/vbasheetobject.cxx @@ -36,8 +36,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - - ScVbaButtonCharacters::ScVbaButtonCharacters( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -152,8 +150,6 @@ void ScVbaButtonCharacters::setFullString( const OUString& rString ) throw (uno: mxPropSet->setPropertyValue( "Label", uno::Any( rString ) ); } - - ScVbaSheetObjectBase::ScVbaSheetObjectBase( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -291,8 +287,6 @@ void ScVbaSheetObjectBase::implSetDefaultProperties() throw (uno::RuntimeExcepti { } - - ScVbaControlObjectBase::ScVbaControlObjectBase( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -419,8 +413,6 @@ sal_Int32 ScVbaControlObjectBase::getModelIndexInForm() const throw (uno::Runtim throw uno::RuntimeException(); } - - ScVbaButton::ScVbaButton( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -535,6 +527,4 @@ void ScVbaButton::implSetDefaultProperties() throw (uno::RuntimeException) setCaption( getName() ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobject.hxx b/sc/source/ui/vba/vbasheetobject.hxx index 6a8f6f11d5e9..5987576871ac 100644 --- a/sc/source/ui/vba/vbasheetobject.hxx +++ b/sc/source/ui/vba/vbasheetobject.hxx @@ -31,8 +31,6 @@ namespace com { namespace sun { namespace star { namespace drawing { class XControlShape; } } } } - - typedef InheritedHelperInterfaceImpl1< ov::excel::XCharacters > ScVbaButtonCharacters_BASE; /** Simple implementation of the Characters symbol for drawing button objects. */ @@ -75,8 +73,6 @@ private: sal_Int32 mnLength; }; - - typedef InheritedHelperInterfaceImpl1< ov::excel::XSheetObject > ScVbaSheetObject_BASE; /** Base class for drawing objects embedded in sheets. */ @@ -121,8 +117,6 @@ protected: css::uno::Reference< css::beans::XPropertySet > mxShapeProps; }; - - typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectBase, ov::excel::XControlObject > ScVbaControlObject_BASE; class ScVbaControlObjectBase : public ScVbaControlObject_BASE @@ -168,8 +162,6 @@ protected: OUString maEventMethod; }; - - typedef ::cppu::ImplInheritanceHelper1< ScVbaControlObjectBase, ov::excel::XButton > ScVbaButton_BASE; class ScVbaButton : public ScVbaButton_BASE @@ -206,8 +198,6 @@ protected: virtual void implSetDefaultProperties() throw (css::uno::RuntimeException) SAL_OVERRIDE; }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 25878d962a75..05ec0f23a8d0 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -35,8 +35,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - - namespace { template< typename Type > @@ -134,8 +132,6 @@ private: ShapeVector maShapes; }; - - ScVbaObjectContainer::ScVbaObjectContainer( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -239,8 +235,6 @@ void ScVbaObjectContainer::implOnShapeCreated( const uno::Reference< drawing::XS { } - - class ScVbaObjectEnumeration : public SimpleEnumerationBase { public: @@ -251,8 +245,6 @@ private: ScVbaObjectContainerRef mxContainer; }; - - ScVbaObjectEnumeration::ScVbaObjectEnumeration( const ScVbaObjectContainerRef& rxContainer ) : SimpleEnumerationBase( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ), mxContainer( rxContainer ) @@ -264,8 +256,6 @@ uno::Any ScVbaObjectEnumeration::createCollectionObject( const uno::Any& rSource return mxContainer->createCollectionObject( rSource ); } - - ScVbaSheetObjectsBase::ScVbaSheetObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (css::uno::RuntimeException) : ScVbaSheetObjects_BASE( rxContainer->getParent(), rxContainer->getContext(), rxContainer.get() ), mxContainer( rxContainer ) @@ -371,8 +361,6 @@ protected: sal_Int16 mnComponentType; }; - - ScVbaControlContainer::ScVbaControlContainer( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -473,8 +461,6 @@ protected: virtual bool implCheckProperties( const uno::Reference< beans::XPropertySet >& rxModelProps ) const SAL_OVERRIDE; }; - - ScVbaButtonContainer::ScVbaButtonContainer( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -501,8 +487,6 @@ bool ScVbaButtonContainer::implCheckProperties( const uno::Reference< beans::XPr return lclGetProperty( bToggle, rxModelProps, "Toggle" ) && !bToggle; } - - ScVbaButtons::ScVbaButtons( const uno::Reference< XHelperInterface >& rxParent, const uno::Reference< uno::XComponentContext >& rxContext, @@ -514,6 +498,4 @@ ScVbaButtons::ScVbaButtons( VBAHELPER_IMPL_XHELPERINTERFACE( ScVbaButtons, "ooo.vba.excel.Buttons" ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbasheetobjects.hxx b/sc/source/ui/vba/vbasheetobjects.hxx index 5a5489840761..152c6d6f0727 100644 --- a/sc/source/ui/vba/vbasheetobjects.hxx +++ b/sc/source/ui/vba/vbasheetobjects.hxx @@ -30,13 +30,9 @@ namespace com { namespace sun { namespace star { namespace sheet { class XSpreadsheet; } } } } - - class ScVbaObjectContainer; typedef ::rtl::Reference< ScVbaObjectContainer > ScVbaObjectContainerRef; - - typedef CollTestImplHelper< ov::XCollection > ScVbaSheetObjects_BASE; /** Base class for collections containing a specific type of drawing object @@ -65,8 +61,6 @@ protected: ScVbaObjectContainerRef mxContainer; }; - - typedef ::cppu::ImplInheritanceHelper1< ScVbaSheetObjectsBase, ov::excel::XGraphicObjects > ScVbaGraphicObjects_BASE; /** Base class for collections containing a specific type of graphic object @@ -85,8 +79,6 @@ public: const css::uno::Any& rHeight ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; }; - - /** Collection containing all button controls from a sheet (not ActiveX controls). */ class ScVbaButtons : public ScVbaGraphicObjectsBase { @@ -100,8 +92,6 @@ public: VBAHELPER_DECL_XHELPERINTERFACE }; - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index a930bc3327a8..3a9f8b6cd38d 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -25,8 +25,6 @@ using namespace ::com::sun::star; static OUString DISPLAYNAME("DisplayName"); - - uno::Reference< container::XNameAccess > ScVbaStyle::getStylesNameContainer( const uno::Reference< frame::XModel >& xModel ) throw ( uno::RuntimeException ) { diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx index 193bdfed4b41..fd4e9d1704a5 100644 --- a/sc/source/ui/view/auditsh.cxx +++ b/sc/source/ui/view/auditsh.cxx @@ -31,13 +31,9 @@ #include "sc.hrc" #include "document.hxx" - - #define ScAuditingShell #include "scslots.hxx" - - TYPEINIT1( ScAuditingShell, SfxShell ); SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL)) @@ -46,8 +42,6 @@ SFX_IMPL_INTERFACE(ScAuditingShell, SfxShell, ScResId(SCSTR_AUDITSHELL)) } - - ScAuditingShell::ScAuditingShell(ScViewData* pData) : SfxShell(pData->GetViewShell()), pViewData( pData ), @@ -65,14 +59,10 @@ ScAuditingShell::ScAuditingShell(ScViewData* pData) : SfxShell::SetContextName(sfx2::sidebar::EnumContext::GetContextName(sfx2::sidebar::EnumContext::Context_Auditing)); } - - ScAuditingShell::~ScAuditingShell() { } - - void ScAuditingShell::Execute( SfxRequest& rReq ) { SfxBindings& rBindings = pViewData->GetBindings(); @@ -132,8 +122,6 @@ void ScAuditingShell::Execute( SfxRequest& rReq ) } } - - void ScAuditingShell::GetState( SfxItemSet& rSet ) { rSet.Put( SfxBoolItem( nFunction, true ) ); // aktive Funktion markieren diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index 253cf2c26045..87038194612b 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -57,8 +57,6 @@ #include "clipparam.hxx" #include "markdata.hxx" - - #define ScCellShell #define CellMovement #include "scslots.hxx" @@ -102,8 +100,6 @@ ScCellShell::~ScCellShell() delete pImpl; } - - void ScCellShell::GetBlockState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -1068,6 +1064,4 @@ void ScCellShell::GetState(SfxItemSet &rSet) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index bf9cc0b28d82..eb8440680ae6 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -1198,8 +1198,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // Clipboard - - case SID_COPY: // for graphs in DrawShell { WaitObject aWait( GetViewData()->GetDialogParent() ); @@ -2417,8 +2415,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) - - default: OSL_FAIL("incorrect slot in ExecuteEdit"); break; diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index a43b85d7a0f1..b3e1de0781a0 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -1201,6 +1201,4 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 25d2c1005674..36025b4119df 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -54,8 +54,6 @@ using sc::HMMToTwips; using sc::TwipsToHMM; using sc::TwipsToEvenHMM; - - void ScCellShell::Execute( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -523,8 +521,6 @@ void ScCellShell::Execute( SfxRequest& rReq ) } break; - - case FID_ROW_HEIGHT: { if ( pReqArgs ) @@ -715,8 +711,6 @@ void ScCellShell::Execute( SfxRequest& rReq ) break; - - case SID_CELL_FORMAT_RESET: { pTabViewShell->DeleteContents( IDF_HARDATTR | IDF_EDITATTR ); @@ -886,8 +880,6 @@ void ScCellShell::Execute( SfxRequest& rReq ) } break; - - case FID_INPUTLINE_STATUS: OSL_FAIL("Execute von InputLine-Status"); break; diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx index 99d2b0a433dd..3d4fc2fa4e9f 100644 --- a/sc/source/ui/view/cellsh4.cxx +++ b/sc/source/ui/view/cellsh4.cxx @@ -445,6 +445,4 @@ void ScCellShell::ExecutePage( SfxRequest& rReq ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index 1700c0069341..3bc9c474d707 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -32,8 +32,6 @@ // STATIC DATA ----------------------------------------------------------- - - static OUString lcl_MetricString( long nTwips, const OUString& rText ) { if ( nTwips <= 0 ) @@ -54,8 +52,6 @@ static OUString lcl_MetricString( long nTwips, const OUString& rText ) } } - - ScColBar::ScColBar( Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : ScHeaderControl( pParent, pEng, MAXCOL+1, false ), @@ -215,8 +211,6 @@ bool ScColBar::IsLayoutRTL() const // overloaded only for columns return pViewData->GetDocument()->IsLayoutRTL( pViewData->GetTabNo() ); } - - ScRowBar::ScRowBar( Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos, ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) : ScHeaderControl( pParent, pEng, MAXROW+1, true ), diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 09e32bb30eae..82a4743a2594 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -37,8 +37,6 @@ #include "queryentry.hxx" #include "markdata.hxx" - - ScDBFunc::ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScViewFunc( pParent, rDocSh, pViewShell ) { @@ -507,6 +505,4 @@ bool ScDBFunc::ImportData( const ScImportParam& rParam, bool bRecord ) return aDBDocFunc.DoImport( GetViewData()->GetTabNo(), rParam, NULL, bRecord ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx index 8932146f1562..6261a5460d70 100644 --- a/sc/source/ui/view/dbfunc2.cxx +++ b/sc/source/ui/view/dbfunc2.cxx @@ -24,8 +24,6 @@ #include "sc.hrc" #include "globstr.hrc" - - void ScDBFunc::UpdateCharts( bool bAllCharts ) { sal_uInt16 nFound = 0; @@ -46,6 +44,4 @@ void ScDBFunc::UpdateCharts( bool bAllCharts ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index 0b1f41a73d65..f3d3671b2f59 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -88,8 +88,6 @@ using ::std::vector; - - // Outliner @@ -364,8 +362,6 @@ void ScDBFunc::HideMarkedOutlines( bool bRecord ) } - - // Teilergebnisse diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index 17492f82927b..b3523335dcb4 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -25,12 +25,8 @@ #include "drwlayer.hxx" #include "document.hxx" - - using namespace com::sun::star; - - sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bool bAllCharts ) { ScDrawLayer* pModel = pDoc->GetDrawLayer(); @@ -76,6 +72,4 @@ sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bo - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawattr.cxx b/sc/source/ui/view/drawattr.cxx index de9f5c4ffd14..653b1b8ec20e 100644 --- a/sc/source/ui/view/drawattr.cxx +++ b/sc/source/ui/view/drawattr.cxx @@ -20,15 +20,11 @@ #include "drawattr.hxx" #include "global.hxx" - - OUString SvxDrawToolItem::GetValueText() const { return GetValueText(GetValue()); } - - OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const { const sal_Char* p; @@ -50,15 +46,11 @@ OUString SvxDrawToolItem::GetValueText( sal_uInt16 nVal ) const return OUString::createFromAscii( p ); } - - SfxPoolItem* SvxDrawToolItem::Clone( SfxItemPool * ) const { return new SvxDrawToolItem(*this); } - - SfxPoolItem* SvxDrawToolItem::Create( SvStream& rStream, sal_uInt16 nVer ) const { sal_uInt16 nVal; @@ -66,6 +58,4 @@ SfxPoolItem* SvxDrawToolItem::Create( SvStream& rStream, sal_uInt16 nVer ) const return new SvxDrawToolItem(nVal); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx index 7fbb4982e45f..8bcdc8810fd2 100644 --- a/sc/source/ui/view/drawutil.cxx +++ b/sc/source/ui/view/drawutil.cxx @@ -88,6 +88,4 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx index dec25bc19cfe..3d1b90c81d82 100644 --- a/sc/source/ui/view/drawvie2.cxx +++ b/sc/source/ui/view/drawvie2.cxx @@ -22,8 +22,6 @@ // STATIC DATA ----------------------------------------------------------- - - // UpdateBrowser in MarkListHasChanged gerufen void ScDrawView::UpdateBrowser() @@ -43,6 +41,4 @@ void ScDrawView::VCRemoveWin( Window* /* pWin */ ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index 6d38e04b6fe4..866949d4d00d 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -223,6 +223,4 @@ void ScDrawView::UpdateIMap( SdrObject* pObj ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx index 3dbc28da822b..138b94842984 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -54,8 +54,6 @@ using namespace com::sun::star; Point aDragStartDiff; - - void ScDrawView::CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rOneOle ) { rAnyOle = rOneOle = false; diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index c2def963ea64..022cc3f92a93 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -58,12 +58,8 @@ using namespace com::sun::star; - - #define SC_HANDLESIZE_BIG 9 - - void ScDrawView::Construct() { EnableExtendedKeyInputDispatcher(false); @@ -482,8 +478,6 @@ void ScDrawView::MarkListHasChanged() } } - - // Verben anpassen SfxViewFrame* pViewFrame = pViewSh->GetViewFrame(); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 9d9d9b34dae5..dff4d44f6461 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -150,8 +150,6 @@ ScFormatShell::~ScFormatShell() { } - - void ScFormatShell::GetStyleState( SfxItemSet& rSet ) { ScDocument* pDoc = GetViewData()->GetDocument(); @@ -246,8 +244,6 @@ void ScFormatShell::GetStyleState( SfxItemSet& rSet ) } } - - void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) { // in case of vertical toolbar @@ -1252,8 +1248,6 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) } - - void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -1604,8 +1598,6 @@ void ScFormatShell::ExecuteTextAttr( SfxRequest& rReq ) } - - void ScFormatShell::ExecuteAttr( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -2149,8 +2141,6 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) Invalidate(SID_ATTR_ALIGN_STACKED); } - - void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -2340,8 +2330,6 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) } - - void ScFormatShell::GetBorderState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -2356,8 +2344,6 @@ void ScFormatShell::GetBorderState( SfxItemSet& rSet ) rSet.Put( aInfoItem ); } - - void ScFormatShell::GetAlignState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); diff --git a/sc/source/ui/view/gridmerg.cxx b/sc/source/ui/view/gridmerg.cxx index 20d85945bc8d..caf79990ae27 100644 --- a/sc/source/ui/view/gridmerg.cxx +++ b/sc/source/ui/view/gridmerg.cxx @@ -21,8 +21,6 @@ #include "gridmerg.hxx" - - ScGridMerger::ScGridMerger( OutputDevice* pOutDev, long nOnePixelX, long nOnePixelY ) : pDev( pOutDev ), nOneX( nOnePixelX ), @@ -157,6 +155,4 @@ void ScGridMerger::Flush() } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 5e5a4292102b..5f3764e7c557 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -173,8 +173,6 @@ struct ScGridWindow::MouseEventState #define SC_FILTERLISTBOX_LINES 12 - - ScGridWindow::VisibleRange::VisibleRange() : mnCol1(0), mnCol2(MAXCOL), mnRow1(0), mnRow2(MAXROW) { @@ -197,8 +195,6 @@ bool ScGridWindow::VisibleRange::set(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCRO return bChanged; } - - class ScFilterListBox : public ListBox { private: @@ -237,8 +233,6 @@ public: bool HasDates() const { return mbListHasDates; } }; - - // ListBox in einem FloatingWindow (pParent) ScFilterListBox::ScFilterListBox( Window* pParent, ScGridWindow* pGrid, SCCOL nNewCol, SCROW nNewRow, ScFilterBoxMode eNewMode ) : @@ -280,8 +274,6 @@ void ScFilterListBox::LoseFocus() #endif } - - bool ScFilterListBox::PreNotify( NotifyEvent& rNEvt ) { bool nDone = false; @@ -333,8 +325,6 @@ void ScFilterListBox::SelectHdl() } } - - // use a System floating window for the above filter listbox class ScFilterFloatingWindow : public FloatingWindow { @@ -360,8 +350,6 @@ Window* ScFilterFloatingWindow::GetPreferredKeyInputWindow() return GetWindow(WINDOW_FIRSTCHILD) ? GetWindow(WINDOW_FIRSTCHILD)->GetPreferredKeyInputWindow() : NULL; // will be the FilterBox } - - static sal_Bool lcl_IsEditableMatrix( ScDocument* pDoc, const ScRange& rRange ) { // wenn es ein editierbarer Bereich ist, und rechts unten eine Matrix-Zelle @@ -3370,8 +3358,6 @@ void ScGridWindow::UpdateInputContext() SetInputContext( aContext ); } - - // sensitiver Bereich (Pixel) #define SCROLL_SENSITIVE 20 @@ -3459,13 +3445,9 @@ static ScRange lcl_MakeDropRange( SCCOL nPosX, SCROW nPosY, SCTAB nTab, const Sc return ScRange( nCol1, nRow1, nTab, nCol2, nRow2, nTab ); } - - extern bool bPasteIsDrop; // viewfun4 -> move to header extern bool bPasteIsMove; // viewfun7 -> move to header - - sal_Int8 ScGridWindow::AcceptPrivateDrop( const AcceptDropEvent& rEvt ) { if ( rEvt.mbLeaving ) @@ -4438,8 +4420,6 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) return nRet; } - - void ScGridWindow::PasteSelection( const Point& rPosPixel ) { Point aLogicPos = PixelToLogic( rPosPixel ); @@ -4511,8 +4491,6 @@ void ScGridWindow::PasteSelection( const Point& rPosPixel ) } } - - void ScGridWindow::UpdateEditViewPos() { if (pViewData->HasEditView(eWhich)) @@ -4732,8 +4710,6 @@ void ScGridWindow::LoseFocus() Point ScGridWindow::GetMousePosPixel() const { return aCurMousePos; } - - bool ScGridWindow::HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex, SCsCOL* pAddX, SCsROW* pAddY) { @@ -5115,8 +5091,6 @@ void ScGridWindow::RFMouseMove( const MouseEvent& rMEvt, bool bUp ) pViewData->GetView()->ResetTimer(); } - - bool ScGridWindow::GetEditUrl( const Point& rPos, OUString* pName, OUString* pUrl, OUString* pTarget ) { diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 96727ae6761b..a07f268c2f69 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -57,8 +57,6 @@ using ::boost::unordered_map; // STATIC DATA ----------------------------------------------------------- - - DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW nRow ) const { using namespace ::com::sun::star::sheet; @@ -239,8 +237,6 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent& } } - - // Data Pilot interaction @@ -277,8 +273,6 @@ void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) bTimer = sal_True; } - - SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aPixel.X(), aPixel.Y(), eWhich, nPosX, nPosY ); @@ -626,8 +620,6 @@ void ScGridWindow::DPMouseButtonUp( const MouseEvent& rMEvt ) SetPointer( Pointer( POINTER_ARROW ) ); } - - void ScGridWindow::UpdateDragRect( bool bShowRange, const Rectangle& rPosRect ) { SCCOL nStartX = ( rPosRect.Left() >= 0 ) ? static_cast<SCCOL>(rPosRect.Left()) : SCCOL_MAX; @@ -655,8 +647,6 @@ void ScGridWindow::UpdateDragRect( bool bShowRange, const Rectangle& rPosRect ) UpdateDragRectOverlay(); } - - // Page-Break-Modus sal_uInt16 ScGridWindow::HitPageBreak( const Point& rMouse, ScRange* pSource, @@ -1063,6 +1053,4 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 8a646ff8e0c7..5a7f6662fc40 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -396,6 +396,4 @@ void ScGridWindow::DrawMarkDropObj( SdrObject* pObj ) pDrView->MarkDropObj(pObj); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index c1c48d9a29df..d928cc1fc890 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -67,8 +67,6 @@ #include <boost/scoped_ptr.hpp> - - static void lcl_LimitRect( Rectangle& rRect, const Rectangle& rVisible ) { if ( rRect.Top() < rVisible.Top()-1 ) rRect.Top() = rVisible.Top()-1; @@ -254,8 +252,6 @@ static void lcl_DrawScenarioFrames( OutputDevice* pDev, ScViewData* pViewData, S } } - - static void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData, const std::vector<ScHighlightEntry>& rHighlightRanges ) { @@ -274,8 +270,6 @@ static void lcl_DrawHighlight( ScOutputData& rOutputData, ScViewData* pViewData, } } - - void ScGridWindow::DoInvertRect( const Rectangle& rPixel ) { if ( rPixel == aInvertRect ) @@ -290,8 +284,6 @@ void ScGridWindow::DoInvertRect( const Rectangle& rPixel ) UpdateHeaderOverlay(); // uses aInvertRect } - - void ScGridWindow::PrePaint() { // forward PrePaint to DrawingLayer @@ -308,8 +300,6 @@ void ScGridWindow::PrePaint() } } - - void ScGridWindow::Paint( const Rectangle& rRect ) { ScDocument* pDoc = pViewData->GetDocument(); @@ -482,8 +472,6 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod nPPTX, nPPTY, false, bFormulaMode, &pViewData->GetMarkData() ); - - Fraction aZoomX = pViewData->GetZoomX(); Fraction aZoomY = pViewData->GetZoomY(); ScOutputData aOutputData( this, OUTTYPE_WINDOW, aTabInfo, pDoc, nTab, @@ -1527,8 +1515,6 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) } } - - void ScGridWindow::DataChanged( const DataChangedEvent& rDCEvt ) { Window::DataChanged(rDCEvt); diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index b35783c0e397..fba79cc17e2a 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -237,8 +237,6 @@ bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard ) return bDone; } - - void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) { //To know whether to prefix STR_CTRLCLICKHYERLINK or STR_CLICKHYPERLINK diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index 7e23d925731b..9c670b83d648 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -24,8 +24,6 @@ #define HINT_INDENT 3 #define HINT_MARGIN 4 - - ScHintWindow::ScHintWindow( Window* pParent, const OUString& rTit, const OUString& rMsg ) : Window( pParent, WinBits( WB_BORDER ) ), aTitle( rTit ), diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx index 043058ce5c15..e648ffaf1b27 100644 --- a/sc/source/ui/view/imapwrap.cxx +++ b/sc/source/ui/view/imapwrap.cxx @@ -57,6 +57,4 @@ const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx index d6c73c2d5bbe..432c2382fbfe 100644 --- a/sc/source/ui/view/invmerge.cxx +++ b/sc/source/ui/view/invmerge.cxx @@ -21,8 +21,6 @@ #include "invmerge.hxx" - - ScInvertMerger::ScInvertMerger( ::std::vector< Rectangle >* pRectangles ) : pRects( pRectangles ) { @@ -164,6 +162,4 @@ void ScInvertMerger::AddRect( const Rectangle& rRect ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/notemark.cxx b/sc/source/ui/view/notemark.cxx index 75e5cec3533a..b0071fad92a8 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -35,8 +35,6 @@ #define SC_NOTEMARK_TIME 800 #define SC_NOTEMARK_SHORT 70 - - ScNoteMarker::ScNoteMarker( Window* pWin, Window* pRight, Window* pBottom, Window* pDiagonal, ScDocument* pD, ScAddress aPos, const OUString& rUser, const MapMode& rMap, bool bLeftEdge, bool bForce, bool bKeyboard ) : @@ -190,6 +188,4 @@ void ScNoteMarker::InvalidateWin() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index b6bcb4ba784e..525df555779a 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -27,8 +27,6 @@ #include "dbfunc.hxx" #include "sc.hrc" - - const long SC_OL_BITMAPSIZE = 12; const long SC_OL_POSOFFSET = 2; @@ -40,8 +38,6 @@ const sal_uInt16 SC_OL_IMAGE_MINUS = SC_OL_IMAGE_PLUS + 1; const sal_uInt16 SC_OL_IMAGE_NOTPRESSED = SC_OL_IMAGE_MINUS + 1; const sal_uInt16 SC_OL_IMAGE_PRESSED = SC_OL_IMAGE_NOTPRESSED + 1; - - ScOutlineWindow::ScOutlineWindow( Window* pParent, ScOutlineMode eMode, ScViewData* pViewData, ScSplitPos eWhich ) : Window( pParent ), mrViewData( *pViewData ), @@ -1023,6 +1019,4 @@ void ScOutlineWindow::KeyInput( const KeyEvent& rKEvt ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/olkact.cxx b/sc/source/ui/view/olkact.cxx index b79e5b7129ee..2f79de731f8a 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.cxx @@ -28,8 +28,6 @@ // STATIC DATA ----------------------------------------------------------- - - void ActivateOlk( ScViewData* /* pViewData */ ) { // Browser fuer Virtual Controls fuellen @@ -48,6 +46,4 @@ void DeActivateOlk( ScViewData* /* pViewData */ ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index fff66e521180..9e329ebb5421 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -2551,6 +2551,4 @@ void ScOutputData::DrawClipMarks() mpDev->SetDrawMode(nOldDrawMode); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 18e3e8153e8d..c4b76cfc7eb8 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -82,8 +82,6 @@ const sal_uInt16 SC_SHRINKAGAIN_MAX = 7; // STATIC DATA ----------------------------------------------------------- - - class ScDrawStringsVars { ScOutputData* pOutput; // Verbindung @@ -184,8 +182,6 @@ private: void TextChanged(); }; - - ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, bool bPTL) : pOutput ( pData ), pPattern ( NULL ), @@ -807,8 +803,6 @@ sal_uLong ScDrawStringsVars::GetResultValueFormat() const return nValueFormat; } - - double ScOutputData::GetStretch() { if ( mpRefDevice->IsMapMode() ) @@ -836,8 +830,6 @@ double ScOutputData::GetStretch() } - - // output strings @@ -2079,8 +2071,6 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) mpDoc->EnableIdle(bWasIdleEnabled); } - - ScFieldEditEngine* ScOutputData::CreateOutputEditEngine() { ScFieldEditEngine* pEngine = new ScFieldEditEngine(mpDoc, mpDoc->GetEnginePool()); @@ -4634,8 +4624,6 @@ void ScOutputData::DrawEdit(bool bPixelToLogic) DrawRotated(bPixelToLogic); //! von aussen rufen ? } - - void ScOutputData::DrawRotated(bool bPixelToLogic) { //! nRotMax speichern @@ -5308,6 +5296,4 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) delete pEngine; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index 5412c0bd604d..67ce197b3eb2 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -35,8 +35,6 @@ #include <svx/fmview.hxx> - - // #i72502# Point ScOutputData::PrePrintDrawingLayer(long nLogStX, long nLogStY ) { @@ -250,6 +248,4 @@ void ScOutputData::DrawingSingle(const sal_uInt16 nLayer) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/pfuncache.cxx b/sc/source/ui/view/pfuncache.cxx index 2b70ae011759..062716a3a2da 100644 --- a/sc/source/ui/view/pfuncache.cxx +++ b/sc/source/ui/view/pfuncache.cxx @@ -25,8 +25,6 @@ #include "markdata.hxx" #include "prevloc.hxx" - - ScPrintFuncCache::ScPrintFuncCache( ScDocShell* pD, const ScMarkData& rMark, const ScPrintSelectionStatus& rStatus ) : aSelection( rStatus ), diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index 79c0759e0bad..d9f55f47c7c2 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -31,13 +31,9 @@ #include "document.hxx" #include "sc.hrc" - - #define ScPageBreakShell #include "scslots.hxx" - - TYPEINIT1( ScPageBreakShell, SfxShell ); SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell, ScResId(SCSTR_PAGEBREAKSHELL)) @@ -45,8 +41,6 @@ SFX_IMPL_INTERFACE(ScPageBreakShell, SfxShell, ScResId(SCSTR_PAGEBREAKSHELL)) SFX_POPUPMENU_REGISTRATION( ScResId(RID_POPUP_PAGEBREAK) ); } - - ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) : SfxShell(pViewSh) { diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 49a1e7b7facf..3380ebc4893d 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -69,8 +69,6 @@ // STATIC DATA ----------------------------------------------------------- - - #define SC_PREVIEW_SHADOWSIZE 2 static long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, std::vector<long>& nPages ) diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index bbfe54601f61..77dc60f3d426 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -78,8 +78,6 @@ using namespace com::sun::star; - - #define ScPreviewShell #include "scslots.hxx" @@ -98,8 +96,6 @@ SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" ) SFX_VIEW_REGISTRATION(ScDocShell); } - - void ScPreviewShell::Construct( Window* pParent ) { // Find the top-most window, and set the close window handler to intercept @@ -209,8 +205,6 @@ void ScPreviewShell::InitStartTable(SCTAB nTab) pPreview->SetPageNo( pPreview->GetFirstPage(nTab) ); } - - OUString ScPreviewShell::GetDescription() const { return OUString(" ** Test ** "); @@ -572,8 +566,6 @@ void ScPreviewShell::Deactivate(bool bMDI) } } - - void ScPreviewShell::Execute( SfxRequest& rReq ) { sal_uInt16 nSlot = rReq.GetSlot(); diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index f223eeb3061c..5478ec25bfb6 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -28,8 +28,6 @@ // STATIC DATA ----------------------------------------------------------- - - void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) { sal_Bool bDataChanged = false; @@ -74,6 +72,4 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 034ef3bf13af..a2030da5cbf2 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -79,8 +79,6 @@ #define GET_USHORT(set,which) ((const SfxUInt16Item&)(set)->Get((which))).GetValue() #define GET_SHOW(set,which) ( VOBJ_MODE_SHOW == ScVObjMode( ((const ScViewObjectModeItem&)(set)->Get((which))).GetValue()) ) - - ScPageRowEntry::ScPageRowEntry(const ScPageRowEntry& r) { nStartRow = r.nStartRow; @@ -161,8 +159,6 @@ size_t ScPageRowEntry::CountVisible() const return nPagesX; } - - static long lcl_LineTotal(const ::editeng::SvxBorderLine* pLine) { return pLine ? ( pLine->GetScaledWidth() ) : 0; @@ -2587,8 +2583,6 @@ void ScPrintFunc::InitModes() // set MapModes from nZoom etc. aTwipMode = MapMode( MAP_TWIP, aTwipsOfs, aHorFract, aZoomFract ); } - - void ScPrintFunc::ApplyPrintSettings() { if ( pPrinter ) @@ -2643,8 +2637,6 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, if ( pPrinter && bDoPrint ) ApplyPrintSettings(); - - InitModes(); if ( pLocationData ) { @@ -2654,8 +2646,6 @@ long ScPrintFunc::DoPrint( const MultiSelection& rPageRanges, MakeTableString(); - - long nPageNo = 0; long nPrinted = 0; long nEndPage = rPageRanges.GetTotalRange().Max(); diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 842908cf98c8..66012a845943 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -31,8 +31,6 @@ #include "scmod.hxx" #include "validate.hxx" - - SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDlgWrapper, FID_DEFINE_NAME ) SFX_IMPL_MODELESSDIALOG_WITHID(ScNameDefDlgWrapper, FID_ADD_NAME ) SFX_IMPL_MODELESSDIALOG_WITHID(ScSolverDlgWrapper, SID_OPENDLG_SOLVE ) @@ -232,8 +230,6 @@ void ScSimpleRefDlgWrapper::StartRefInput() } - - // ScAcceptChgDlgWrapper //FIXME: should be moved into ViewShell diff --git a/sc/source/ui/view/scextopt.cxx b/sc/source/ui/view/scextopt.cxx index c6b750fb054b..1dad56395ffc 100644 --- a/sc/source/ui/view/scextopt.cxx +++ b/sc/source/ui/view/scextopt.cxx @@ -23,8 +23,6 @@ #include <map> #include <boost/shared_ptr.hpp> - - ScExtDocSettings::ScExtDocSettings() : mfTabBarWidth( -1.0 ), mnLinkCnt( 0 ), @@ -32,8 +30,6 @@ ScExtDocSettings::ScExtDocSettings() : { } - - ScExtTabSettings::ScExtTabSettings() : maUsedArea( ScAddress::INITIALIZE_INVALID ), maCursor( ScAddress::INITIALIZE_INVALID ), @@ -52,8 +48,6 @@ ScExtTabSettings::ScExtTabSettings() : { } - - /** A container for ScExtTabSettings objects. @descr Internally, a std::map with shared pointers to ScExtTabSettings is used. The copy constructor and assignment operator make deep copies of the @@ -80,8 +74,6 @@ private: ScExtTabSettingsMap maMap; }; - - ScExtTabSettingsCont::ScExtTabSettingsCont() { } @@ -123,8 +115,6 @@ void ScExtTabSettingsCont::CopyFromMap( const ScExtTabSettingsMap& rMap ) maMap[ aIt->first ].reset( new ScExtTabSettings( *aIt->second ) ); } - - /** Implementation struct for ScExtDocOptions containing all members. */ struct ScExtDocOptionsImpl { @@ -143,8 +133,6 @@ ScExtDocOptionsImpl::ScExtDocOptionsImpl() : { } - - ScExtDocOptions::ScExtDocOptions() : mxImpl( new ScExtDocOptionsImpl ) { @@ -223,6 +211,4 @@ void ScExtDocOptions::SetCodeName( SCTAB nTab, const OUString& rCodeName ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx index faee3443df1d..af96c758714b 100644 --- a/sc/source/ui/view/select.cxx +++ b/sc/source/ui/view/select.cxx @@ -44,8 +44,6 @@ using namespace com::sun::star; static Point aSwitchPos; //! Member static bool bDidSwitch = false; - - // View (Gridwin / keyboard) ScViewFunctionSet::ScViewFunctionSet( ScViewData* pNewViewData ) : pViewData( pNewViewData ), diff --git a/sc/source/ui/view/selectionstate.cxx b/sc/source/ui/view/selectionstate.cxx index 3fda4b0dd124..d45969fb200b 100644 --- a/sc/source/ui/view/selectionstate.cxx +++ b/sc/source/ui/view/selectionstate.cxx @@ -23,8 +23,6 @@ #include "viewdata.hxx" #include "markdata.hxx" - - ScSelectionState::ScSelectionState( ScViewData& rViewData ) : meType( SC_SELECTTYPE_NONE ) { @@ -76,6 +74,4 @@ bool operator==( const ScSelectionState& rL, const ScSelectionState& rR ) return bEqual; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx index 9c37e661e724..ae2849a254c2 100644 --- a/sc/source/ui/view/spelldialog.cxx +++ b/sc/source/ui/view/spelldialog.cxx @@ -274,6 +274,4 @@ bool ScSpellDialogChildWindow::IsSelectionChanged() return (*mxOldRangeList != aCurrentRangeList); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 3d9c10eb384f..e243cc829493 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -268,8 +268,6 @@ void ScConversionEngineBase::FillFromCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) } } - - ScSpellingEngine::ScSpellingEngine( SfxItemPool* pEnginePoolP, ScViewData& rViewData, ScDocument* pUndoDoc, ScDocument* pRedoDoc, @@ -335,8 +333,6 @@ Window* ScSpellingEngine::GetDialogParent() return mrDocShell.GetActiveDialogParent(); } - - ScConversionParam::ScConversionParam( ScConversionType eConvType ) : meConvType( eConvType ), meSourceLang( LANGUAGE_NONE ), @@ -375,8 +371,6 @@ ScConversionParam::ScConversionParam( ScConversionType eConvType, mnOptions = i18n::TextConversionOption::CHARACTER_BY_CHARACTER; } - - ScTextConversionEngine::ScTextConversionEngine( SfxItemPool* pEnginePoolP, ScViewData& rViewData, const ScConversionParam& rConvParam, @@ -408,6 +402,4 @@ bool ScTextConversionEngine::NeedsConversion() return HasConvertibleTextPortion( maConvParam.GetSourceLang() ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 95c6ef66eeec..8875b360a452 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -36,8 +36,6 @@ // STATIC DATA ----------------------------------------------------------- - - ScTabControl::ScTabControl( Window* pParent, ScViewData* pData ) : TabBar( pParent, WinBits(WB_BORDER | WB_3DLOOK | WB_SCROLL | WB_RANGESELECT | @@ -646,6 +644,4 @@ void ScTabControl::Mirror() } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index e9913923f791..67fabedf2a4f 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -23,8 +23,6 @@ #include <vcl/settings.hxx> - - ScTabSplitter::ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pData ) : Splitter( pParent, nWinStyle ), pViewData(pData) diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index b9307f8f62ee..aff402412a1d 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -162,8 +162,6 @@ void ScCornerButton::MouseButtonDown( const MouseEvent& rMEvt ) } } - - static bool lcl_HasColOutline( const ScViewData& rViewData ) { const ScOutlineTable* pTable = rViewData.GetDocument()->GetOutlineTable(rViewData.GetTabNo()); diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 84e7740065b9..501459f3211a 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -1461,6 +1461,4 @@ void ScTabView::UpdatePageBreakData( bool bForcePaint ) pPageBreakData = pNewData; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 6bf03238df86..8b7e0a1c5044 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -95,8 +95,6 @@ ScRange lcl_getSubRangeByIndex( const ScRange& rRange, sal_Int32 nIndex ) using namespace com::sun::star; - - // --- Public-Funktionen diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 2f2dd64268ec..4f1ae9f74dbf 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -34,8 +34,6 @@ extern sal_uInt16 nScFillModeMouseModifier; // global.cxx // STATIC DATA ----------------------------------------------------------- - - // --- Referenz-Eingabe / Fill-Cursor @@ -462,8 +460,6 @@ void ScTabView::InvertVertical( ScHSplitPos eWhich, long nDragPos ) } } - - void ScTabView::InterpretVisible() { // make sure all visible cells are interpreted, @@ -502,6 +498,4 @@ void ScTabView::InterpretVisible() - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 3564485d21ab..551497636af7 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -248,8 +248,6 @@ void ScTabView::DoAddWin( ScGridWindow* pWin ) } } - - void ScTabView::TabChanged( bool bSameTabButMoved ) { if (pDrawView) @@ -533,8 +531,6 @@ void ScTabView::DigitLanguageChanged() pGridWin[i]->SetDigitLanguage( eNewLang ); } - - void ScTabView::ScrollToObject( SdrObject* pDrawObj ) { if ( pDrawObj ) @@ -620,8 +616,6 @@ void ScTabView::MakeVisible( const Rectangle& rHMMRect ) } } - - void ScTabView::SetBrushDocument( ScDocument* pNew, bool bLock ) { delete pBrushDocument; diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 7b6855398080..76ea68ec958f 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -49,8 +49,6 @@ #include <svx/svdpage.hxx> #include <fuconcustomshape.hxx> - - SdrView* ScTabViewShell::GetDrawView() const { return ((ScTabViewShell*)this)->GetScDrawView(); // GetScDrawView ist nicht-const @@ -457,6 +455,4 @@ bool ScTabViewShell::SelectObject( const OUString& rName ) return bFound; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index cabe51135f86..2b66df4b4800 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -68,8 +68,6 @@ #include <boost/scoped_ptr.hpp> - - /** Try to parse the given range using Calc-style syntax first, then Excel-style if that fails. */ static sal_uInt16 lcl_ParseRange(ScRange& rScRange, const OUString& aAddress, ScDocument* pDoc, sal_uInt16 /* nSlot */) @@ -767,8 +765,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - - case FID_TAB_SELECTALL: SelectAllTables(); rReq.Done(); @@ -906,8 +902,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - - case FID_CHG_SHOW: { sal_uInt16 nId = ScHighlightChgDlgWrapper::GetChildWindowId(); @@ -1132,6 +1126,4 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 6d0a6e6a8179..4c0f3742f6fb 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -101,8 +101,6 @@ sal_uInt16 ScTabViewShell::nInsertCtrlState = SID_INSERT_GRAPHIC; sal_uInt16 ScTabViewShell::nInsCellsCtrlState = 0; sal_uInt16 ScTabViewShell::nInsObjCtrlState = SID_INSERT_DIAGRAM; - - void ScTabViewShell::Activate(bool bMDI) { SfxViewShell::Activate(bMDI); @@ -314,8 +312,6 @@ bool ScTabViewShell::PrepareClose(bool bUI) return SfxViewShell::PrepareClose(bUI); } - - // Zoom fuer In-Place berechnen // aus Verhaeltnis von VisArea und Fenstergroesse des GridWin @@ -455,8 +451,6 @@ void ScTabViewShell::QueryObjAreaPixel( Rectangle& rRect ) const rRect.SetSize( pWin->LogicToPixel( aLogicRect.GetSize() ) ); } - - void ScTabViewShell::Move() { Point aNewPos = GetViewFrame()->GetWindow().OutputToScreenPixel(Point()); @@ -468,8 +462,6 @@ void ScTabViewShell::Move() } } - - void ScTabViewShell::ShowCursor(bool /* bOn */) { /*!!! ShowCursor wird nicht paarweise wie im gridwin gerufen. @@ -482,8 +474,6 @@ void ScTabViewShell::ShowCursor(bool /* bOn */) */ } - - void ScTabViewShell::WriteUserData(OUString& rData, bool /* bBrowse */) { GetViewData()->WriteUserData(rData); @@ -574,8 +564,6 @@ void ScTabViewShell::DoReadUserData( const OUString& rData ) //! if ViewData has more tables than document, remove tables in ViewData } - - void ScTabViewShell::UpdateDrawShell() { // Called after user interaction that may delete the selected drawing object. @@ -1056,15 +1044,11 @@ void ScTabViewShell::SetDrawTextUndo( ::svl::IUndoManager* pNewUndoMgr ) } } - - ScTabViewShell* ScTabViewShell::GetActiveViewShell() { return PTR_CAST(ScTabViewShell,Current()); } - - SfxPrinter* ScTabViewShell::GetPrinter( bool bCreate ) { // Drucker ist immer da (wird fuer die FontListe schon beim Starten angelegt) @@ -1097,8 +1081,6 @@ void ScTabViewShell::StopEditShell() SetEditShell(NULL, false ); } - - // close handler to ensure function of dialog: IMPL_LINK_NOARG(ScTabViewShell, SimpleRefClose) @@ -1205,8 +1187,6 @@ void ScTabViewShell::StopSimpleRefDialog() } } - - bool ScTabViewShell::TabKeyInput(const KeyEvent& rKEvt) { ScModule* pScMod = SC_MOD(); @@ -1469,8 +1449,6 @@ bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) return TabKeyInput( rKeyEvent ); } - - #define __INIT_ScTabViewShell \ eCurOST(OST_NONE), \ nDrawSfxId(0), \ @@ -1519,8 +1497,6 @@ bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) mbInSwitch(false) - - void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) { SfxApplication* pSfxApp = SFX_APP(); @@ -1722,8 +1698,6 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) - - ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, SfxViewShell* pOldSh ) : SfxViewShell( pViewFrame, SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), @@ -1776,8 +1750,6 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, #undef __INIT_ScTabViewShell - - ScTabViewShell::~ScTabViewShell() { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -1820,8 +1792,6 @@ ScTabViewShell::~ScTabViewShell() DELETEZ(pAccessibilityBroadcaster); } - - void ScTabViewShell::SetDialogDPObject( const ScDPObject* pObj ) { delete pDialogDPObject; @@ -1831,8 +1801,6 @@ void ScTabViewShell::SetDialogDPObject( const ScDPObject* pObj ) pDialogDPObject = NULL; } - - void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) { ScDocShell* pDocShell = GetViewData()->GetDocShell(); @@ -1859,8 +1827,6 @@ void ScTabViewShell::FillFieldData( ScHeaderFieldData& rData ) // eNumType kennt der Dialog selber } - - void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest ) { bChartAreaValid = true; @@ -1885,8 +1851,6 @@ ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings() } - - void ScTabViewShell::ExecTbx( SfxRequest& rReq ) { const SfxItemSet* pReqArgs = rReq.GetArgs(); diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index 53ecb8bbe56d..56112f30bce0 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -40,8 +40,6 @@ #include "cellvalue.hxx" #include "svl/sharedstring.hxx" - - void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { if (rHint.ISA(SfxSimpleHint)) // ohne Parameter @@ -306,8 +304,6 @@ void ScTabViewShell::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SfxViewShell::Notify( rBC, rHint ); } - - SvxNumberInfoItem* ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, ScViewData* pViewData ) { @@ -379,8 +375,6 @@ SvxNumberInfoItem* ScTabViewShell::MakeNumberInfoItem( ScDocument* pDoc, ScViewD pDoc->GetFormatTable(), static_cast<const sal_uInt16>(SID_ATTR_NUMBERFORMAT_INFO)); } - - void ScTabViewShell::UpdateNumberFormatter( const SvxNumberInfoItem& rInfoItem ) { @@ -398,6 +392,4 @@ void ScTabViewShell::UpdateNumberFormatter( - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh8.cxx b/sc/source/ui/view/tabvwsh8.cxx index fa3f31cbc069..65a310fd0798 100644 --- a/sc/source/ui/view/tabvwsh8.cxx +++ b/sc/source/ui/view/tabvwsh8.cxx @@ -24,8 +24,6 @@ #include "document.hxx" - - void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine ) { if ( pLine ) @@ -42,8 +40,6 @@ void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine } } - - bool ScTabViewShell::HasSelection( bool bText ) const { bool bHas = false; @@ -70,8 +66,6 @@ bool ScTabViewShell::HasSelection( bool bText ) const return bHas; } - - void ScTabViewShell::UIDeactivated( SfxInPlaceClient* pClient ) { ClearHighlightRanges(); diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 72a38f273161..d6b7fd9341de 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -45,8 +45,6 @@ SvxIMapDlg* ScGetIMapDlg(); const void* ScIMapDlgGetObj( SvxIMapDlg* pDlg ); const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ); - - void ScTabViewShell::ExecChildWin(SfxRequest& rReq) { sal_uInt16 nSlot = rReq.GetSlot(); @@ -72,8 +70,6 @@ void ScTabViewShell::GetChildWinState( SfxItemSet& rSet ) } } - - void ScTabViewShell::ExecGallery( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); @@ -106,15 +102,11 @@ void ScTabViewShell::GetGalleryState( SfxItemSet& /* rSet */ ) { } - - ScInputHandler* ScTabViewShell::GetInputHandler() const { return pInputHandler; } - - OUString ScTabViewShell::GetDescription() const { return OUString(" ** Test ** "); @@ -235,6 +227,4 @@ void ScTabViewShell::GetImageMapState( SfxItemSet& rSet ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx index c2de24009154..8cb4244e8f9a 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -136,8 +136,6 @@ bool ScTabViewShell::GetFunction( OUString& rFuncStr, sal_uInt16 nErrCode ) return false; } - - // Functions that are disabled, depending on the selection // Default: // SID_DELETE, @@ -551,8 +549,6 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName } } - - bool ScTabViewShell::IsRefInputMode() const { ScModule* pScMod = SC_MOD(); @@ -598,8 +594,6 @@ bool ScTabViewShell::IsRefInputMode() const return false; } - - void ScTabViewShell::ExecuteInputDirect() { if ( !IsRefInputMode() ) @@ -612,8 +606,6 @@ void ScTabViewShell::ExecuteInputDirect() } } - - void ScTabViewShell::UpdateInputHandler( bool bForce /* = sal_False */, bool bStopEditing /* = sal_True */ ) { ScInputHandler* pHdl = pInputHandler ? pInputHandler : SC_MOD()->GetInputHdl(); @@ -712,8 +704,6 @@ void ScTabViewShell::UpdateInputHandlerCellAdjust( SvxCellHorJustify eJust ) pHdl->UpdateCellAdjust( eJust ); } - - void ScTabViewShell::ExecuteSave( SfxRequest& rReq ) { // only SID_SAVEDOC / SID_SAVEASDOC @@ -809,6 +799,4 @@ void ScTabViewShell::GetDrawOptState( SfxItemSet& rSet ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 8a8c5df576dd..e831738dc009 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -487,8 +487,6 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet) } - - void ScTabViewShell::ExecuteUndo(SfxRequest& rReq) { SfxShell* pSh = GetViewData()->GetDispatcher().GetShell(0); @@ -581,6 +579,4 @@ void ScTabViewShell::GetUndoState(SfxItemSet &rSet) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index ad3d4742fb68..758db9b68850 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -72,8 +72,6 @@ #include <config_orcus.h> - - void ScTabViewShell::SetCurRefDlgId( sal_uInt16 nNew ) { // CurRefDlgId is stored in ScModule to find if a ref dialog is open, @@ -459,6 +457,4 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( return pResult; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx index 77dcfcc463e5..e3a5a786e3ec 100644 --- a/sc/source/ui/view/tabvwshd.cxx +++ b/sc/source/ui/view/tabvwshd.cxx @@ -70,6 +70,4 @@ Window* ScTabViewShell::GetDialogParent() - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 8c1beedbfed6..7072292e1142 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -41,8 +41,6 @@ #include <svx/srchdlg.hxx> #include "document.hxx" - - OUString ScTabViewShell::GetSelectionText( bool bWholeWord ) { OUString aStrSelection; @@ -118,8 +116,6 @@ OUString ScTabViewShell::GetSelectionText( bool bWholeWord ) return aStrSelection; } - - void ScTabViewShell::InsertURL( const OUString& rName, const OUString& rURL, const OUString& rTarget, sal_uInt16 nMode ) { @@ -153,8 +149,6 @@ void ScTabViewShell::InsertURL( const OUString& rName, const OUString& rURL, con } } - - static void lcl_SelectFieldAfterInsert( EditView& rView ) { ESelection aSel = rView.GetSelection(); @@ -353,8 +347,4 @@ void ScTabViewShell::ExecSearch( SfxRequest& rReq ) - - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 61e826702189..84c77e5c4af8 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -781,8 +781,6 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } } - - void ScTabViewShell::GetStateTable( SfxItemSet& rSet ) { ScViewData* pViewData = GetViewData(); @@ -920,6 +918,4 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index 85f335e005b4..53ede02ca239 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -36,8 +36,6 @@ using namespace com::sun::star; #include "globstr.hrc" #include <avmedia/mediawindow.hxx> - - void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rURL, const OUString& rTarget, const Point* pInsPos ) @@ -116,6 +114,4 @@ void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rUR } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 4be04c6e49ee..3853aad088f3 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -40,8 +40,6 @@ using namespace com::sun::star; - - void ScTabViewShell::ExecuteSbx( SfxRequest& /* rReq */ ) { // SID_RANGE_OFFSET (Offset), @@ -53,8 +51,6 @@ void ScTabViewShell::GetSbxState( SfxItemSet& /* rSet */ ) // SID_RANGE_REGION (CurrentRegion) - removed (old Basic) } - - void ScTabViewShell::ExecuteObject( SfxRequest& rReq ) { sal_uInt16 nSlotId = rReq.GetSlot(); @@ -274,6 +270,4 @@ bool ScTabViewShell::ExecuteRetypePassDlg(ScPasswordHash eDesiredHash) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 22bdc79ca58c..a6d5420212b0 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -101,8 +101,6 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ); // STATIC DATA --------------------------------------------------------------- - - bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -163,8 +161,6 @@ bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData ) } - - bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -203,8 +199,6 @@ bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint ) } - - enum ScAutoSum { ScAutoSumNone = 0, @@ -236,8 +230,6 @@ static ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, } - - #define SC_AUTOSUM_MAXCOUNT 20 static ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow, @@ -271,8 +263,6 @@ static ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow #undef SC_AUTOSUM_MAXCOUNT - - static bool lcl_FindNextSumEntryInColumn( ScDocument* pDoc, SCCOL nCol, SCROW& nRow, SCTAB nTab, SCCOLROW& nExtend, SCROW nMinRow ) { @@ -290,8 +280,6 @@ static bool lcl_FindNextSumEntryInColumn( ScDocument* pDoc, SCCOL nCol, SCROW& n return false; } - - static bool lcl_FindNextSumEntryInRow( ScDocument* pDoc, SCCOL& nCol, SCROW nRow, SCTAB nTab, SCCOLROW& nExtend, SCROW nMinCol ) { @@ -309,8 +297,6 @@ static bool lcl_FindNextSumEntryInRow( ScDocument* pDoc, SCCOL& nCol, SCROW nRow return false; } - - static bool lcl_GetAutoSumForColumnRange( ScDocument* pDoc, ScRangeList& rRangeList, const ScRange& rRange ) { const ScAddress aStart = rRange.aStart; @@ -353,8 +339,6 @@ static bool lcl_GetAutoSumForColumnRange( ScDocument* pDoc, ScRangeList& rRangeL return true; } - - static bool lcl_GetAutoSumForRowRange( ScDocument* pDoc, ScRangeList& rRangeList, const ScRange& rRange ) { const ScAddress aStart = rRange.aStart; @@ -397,8 +381,6 @@ static bool lcl_GetAutoSumForRowRange( ScDocument* pDoc, ScRangeList& rRangeList return true; } - - bool ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList ) { ScDocument* pDoc = GetViewData()->GetDocument(); @@ -503,16 +485,12 @@ bool ScViewFunc::GetAutoSumArea( ScRangeList& rRangeList ) return false; } - - void ScViewFunc::EnterAutoSum(const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr) { OUString aFormula = GetAutoSumFormula( rRangeList, bSubTotal, rAddr ); EnterBlock( aFormula, NULL ); } - - bool ScViewFunc::AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor, bool bContinue ) { ScDocument* pDoc = GetViewData()->GetDocument(); @@ -712,8 +690,6 @@ bool ScViewFunc::AutoSum( const ScRange& rRange, bool bSubTotal, bool bSetCursor return true; } - - OUString ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSubTotal, const ScAddress& rAddr ) { ScViewData* pViewData = GetViewData(); @@ -757,8 +733,6 @@ OUString ScViewFunc::GetAutoSumFormula( const ScRangeList& rRangeList, bool bSub return aBuf.makeStringAndClear(); } - - void ScViewFunc::EnterBlock( const OUString& rString, const EditTextObject* pData ) { // test for multi selection @@ -845,8 +819,6 @@ void ScViewFunc::EnterBlock( const OUString& rString, const EditTextObject* pDat delete pInsDoc; } - - // manual page break void ScViewFunc::InsertPageBreak( bool bColumn, bool bRecord, const ScAddress* pPos, @@ -867,8 +839,6 @@ void ScViewFunc::InsertPageBreak( bool bColumn, bool bRecord, const ScAddress* p } - - void ScViewFunc::DeletePageBreak( bool bColumn, bool bRecord, const ScAddress* pPos, bool bSetModified ) { @@ -886,8 +856,6 @@ void ScViewFunc::DeletePageBreak( bool bColumn, bool bRecord, const ScAddress* p UpdatePageBreakData( true ); // for PageBreak-Mode } - - void ScViewFunc::RemoveManualBreaks() { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -912,8 +880,6 @@ void ScViewFunc::RemoveManualBreaks() pDocSh->PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PAINT_GRID ); } - - void ScViewFunc::SetPrintZoom(sal_uInt16 nScale, sal_uInt16 nPages) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -929,8 +895,6 @@ void ScViewFunc::AdjustPrintZoom() GetViewData()->GetDocShell()->AdjustPrintZoom( aRange ); } - - void ScViewFunc::SetPrintRanges( bool bEntireSheet, const OUString* pPrint, const OUString* pRepCol, const OUString* pRepRow, bool bAddPrint ) @@ -1059,8 +1023,6 @@ bool ScViewFunc::TestMergeCells() // pre-test (for menu) } - - bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bCenter ) { // Editable- and Being-Nested- test must be at the beginning (in DocFunc too), @@ -1156,8 +1118,6 @@ bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bC } - - bool ScViewFunc::TestRemoveMerge() { bool bMerged = false; @@ -1172,8 +1132,6 @@ bool ScViewFunc::TestRemoveMerge() } - - static bool lcl_extendMergeRange(ScCellMergeOption& rOption, const ScRange& rRange) { bool bExtended = false; @@ -1248,8 +1206,6 @@ bool ScViewFunc::RemoveMerge( bool bRecord ) return true; //! bOk ?? } - - void ScViewFunc::FillSimple( FillDir eDir, bool bRecord ) { ScRange aRange; @@ -1268,8 +1224,6 @@ void ScViewFunc::FillSimple( FillDir eDir, bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } - - void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, double fStart, double fStep, double fMax, bool bRecord ) { @@ -1293,8 +1247,6 @@ void ScViewFunc::FillSeries( FillDir eDir, FillCmd eCmd, FillDateCmd eDateCmd, ErrorMessage(STR_NOMULTISELECT); } - - void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_uLong nCount, bool bRecord ) { @@ -1338,8 +1290,6 @@ void ScViewFunc::FillAuto( FillDir eDir, SCCOL nStartCol, SCROW nStartRow, } } - - void ScViewFunc::FillTab( sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bAsLink ) { //! allow source sheet to be protected @@ -1407,8 +1357,6 @@ void ScViewFunc::FillTab( sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmp pDocSh->PostDataChanged(); } - - /** Downward fill of selected cell(s) by double-clicking cross-hair cursor Extends a current selection down to the last non-empty cell of an adjacent @@ -1482,8 +1430,6 @@ void ScViewFunc::FillCrossDblClick() } } - - void ScViewFunc::TransliterateText( sal_Int32 nType ) { ScMarkData aFuncMark = GetViewData()->GetMarkData(); @@ -1528,8 +1474,6 @@ ScAutoFormatData* ScViewFunc::CreateAutoFormatData() } - - void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord ) { ScRange aRange; @@ -1546,8 +1490,6 @@ void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } - - // Suchen & Ersetzen bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, @@ -1764,8 +1706,6 @@ bool ScViewFunc::SearchAndReplace( const SvxSearchItem* pSearchItem, return bFound; } - - // Zielwertsuche void ScViewFunc::Solve( const ScSolveParam& rParam ) @@ -1840,8 +1780,6 @@ void ScViewFunc::Solve( const ScSolveParam& rParam ) } } - - // multi operation void ScViewFunc::TabOp( const ScTabOpParam& rParam, bool bRecord ) @@ -1858,8 +1796,6 @@ void ScViewFunc::TabOp( const ScTabOpParam& rParam, bool bRecord ) } - - void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) { @@ -1882,8 +1818,6 @@ void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment, } - - void ScViewFunc::ExtendScenario() { ScEditableTester aTester( this ); @@ -1903,8 +1837,6 @@ void ScViewFunc::ExtendScenario() } - - void ScViewFunc::UseScenario( const OUString& rName ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -1915,8 +1847,6 @@ void ScViewFunc::UseScenario( const OUString& rName ) pDocSh->UseScenario( nTab, rName ); } - - // Insert table bool ScViewFunc::InsertTable( const OUString& rName, SCTAB nTab, bool bRecord ) @@ -1981,8 +1911,6 @@ bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, } - - bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -2015,8 +1943,6 @@ bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) } - - bool ScViewFunc::DeleteTable( SCTAB nTab, bool bRecord ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -2207,8 +2133,6 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) } - - bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) { // order Table/Name is inverted for DocFunc @@ -2223,8 +2147,6 @@ bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) } - - bool ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab ) { bool bSuccess = GetViewData()->GetDocShell()->GetDocFunc().SetTabBgColor( nTab, rColor, true, false ); @@ -2245,8 +2167,6 @@ bool ScViewFunc::SetTabBgColor( ScUndoTabColorInfo::List& rUndoSetTabBgColorInfo return bSuccess; } - - void ScViewFunc::InsertAreaLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rSource, sal_uLong nRefresh ) @@ -2261,8 +2181,6 @@ void ScViewFunc::InsertAreaLink( const OUString& rFile, } - - void ScViewFunc::InsertTableLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rTabName ) @@ -2296,8 +2214,6 @@ void ScViewFunc::InsertTableLink( const OUString& rFile, } } - - // Copy/link tables from another document void ScViewFunc::ImportTables( ScDocShell* pSrcShell, @@ -2420,8 +2336,6 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, ErrorMessage(STR_NAMECONFLICT); } - - // Move/Copy table to another document void ScViewFunc::MoveTable( @@ -2777,8 +2691,6 @@ void ScViewFunc::MoveTable( } - - void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -2817,8 +2729,6 @@ void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) } - - void ScViewFunc::HideTable( const ScMarkData& rMark ) { ScDocShell* pDocSh = GetViewData()->GetDocShell(); @@ -2868,8 +2778,6 @@ void ScViewFunc::HideTable( const ScMarkData& rMark ) } - - void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont ) { ScEditableTester aTester( this ); @@ -2905,8 +2813,6 @@ void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont ) } - - void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, const SvxBorderLine* pDestLine, const SvxBorderLine* pSrcLine, @@ -2944,8 +2850,6 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, } - - void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, bool bColorOnly ) { @@ -3061,8 +2965,6 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, #undef SET_LINE_ATTRIBUTES - - void ScViewFunc::SetValidation( const ScValidationData& rNew ) { ScDocument* pDoc = GetViewData()->GetDocument(); diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index aea072da40a8..b54831328443 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -71,8 +71,6 @@ using namespace com::sun::star; // STATIC DATA --------------------------------------------------------------- - - // GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx @@ -150,8 +148,6 @@ void ScViewFunc::CutToClip( ScDocument* pClipDoc, bool bIncludeObjects ) ErrorMessage( STR_NOMULTISELECT ); } - - // C O P Y bool ScViewFunc::CopyToClip( ScDocument* pClipDoc, bool bCut, bool bApi, bool bIncludeObjects, bool bStopEdit ) @@ -688,8 +684,6 @@ bool ScViewFunc::PasteFromSystem( sal_uLong nFormatId, bool bApi ) return bRet; } - - // P A S T E bool ScViewFunc::PasteOnDrawObjectLinked( @@ -1747,8 +1741,6 @@ void ScViewFunc::PostPasteFromClip(const ScRangeList& rPasteRanges, const ScMark HelperNotifyChanges::Notify(*pModelObj, aChangeRanges); } - - // D R A G A N D D R O P // innerhalb des Dokuments diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 8cef91a85c99..55937e03e1a4 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -76,8 +76,6 @@ using namespace com::sun::star; bool bPasteIsDrop = false; - - void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& rxTransferable ) diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index c4107ffc6ad4..311db7473c14 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -25,8 +25,6 @@ #include <svx/unomodel.hxx> #include <unotools/streamwrap.hxx> - - #include <svx/fmmodel.hxx> #include <svx/svdetc.hxx> #include <svx/svditer.hxx> @@ -72,8 +70,6 @@ using namespace com::sun::star; - - bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, const uno::Reference<datatransfer::XTransferable>& rxTransferable, SCCOL nPosX, SCROW nPosY, Point* pLogicPos, bool bLink, bool bAllowDialogs ) diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 6a017ef5773c..3eddb54742a7 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -77,8 +77,6 @@ #include "tokenarray.hxx" #include <rowheightcontext.hxx> - - static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDocShell *pDocSh ) { if( pCondFmt ) @@ -90,8 +88,6 @@ static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDo } - - ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScTabView( pParent, rDocSh, pViewShell ), bFormatValid( false ) @@ -102,8 +98,6 @@ ScViewFunc::~ScViewFunc() { } - - void ScViewFunc::StartFormatArea() { // anything to do? @@ -222,8 +216,6 @@ void ScViewFunc::DoAutoAttributes( SCCOL nCol, SCROW nRow, SCTAB nTab, aFormatSource.Set( nCol, nRow, nTab ); // then set a new source } - - // additional routines sal_uInt16 ScViewFunc::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, bool bFormula ) @@ -2906,6 +2898,4 @@ void ScViewFunc::UpdateSelectionArea( const ScMarkData& rSel, ScPatternAttr* pAt pTabViewShell->AdjustBlockHeight(false, const_cast<ScMarkData*>(&rSel)); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/waitoff.cxx b/sc/source/ui/view/waitoff.cxx index e9a63b0d4338..e3139ea18745 100644 --- a/sc/source/ui/view/waitoff.cxx +++ b/sc/source/ui/view/waitoff.cxx @@ -21,8 +21,6 @@ #include "waitoff.hxx" - - ScWaitCursorOff::ScWaitCursorOff( Window* pWinP ) : pWin( pWinP ), @@ -51,6 +49,4 @@ ScWaitCursorOff::~ScWaitCursorOff() } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |