diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:20:47 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:41:10 +0200 |
| commit | 37e6631cc5d4147e9d0a4ebefbd0c9d2a8137d24 (patch) | |
| tree | 060cf0aafda3f205b3e12508465a5403826d014d /sc/source/ui | |
| parent | ed6b8a100c1aabb342573f252509573bbe124d29 (diff) | |
remove whitespace
Change-Id: Ib15413e73409cc33de01fa92a47b9d1237cfc4b2
Diffstat (limited to 'sc/source/ui')
491 files changed, 0 insertions, 1887 deletions
diff --git a/sc/source/ui/Accessibility/AccessibilityHints.cxx b/sc/source/ui/Accessibility/AccessibilityHints.cxx index e20d234819a7..5dd4f22784fb 100644 --- a/sc/source/ui/Accessibility/AccessibilityHints.cxx +++ b/sc/source/ui/Accessibility/AccessibilityHints.cxx @@ -23,10 +23,8 @@ using namespace ::com::sun::star; TYPEINIT1(ScAccWinFocusLostHint, SfxHint); - // ScAccWinFocusLostHint - the current window lost its focus (to another application, view or document) - ScAccWinFocusLostHint::ScAccWinFocusLostHint( const uno::Reference< uno::XInterface >& xOld ) : @@ -40,10 +38,8 @@ ScAccWinFocusLostHint::~ScAccWinFocusLostHint() TYPEINIT1(ScAccWinFocusGotHint, SfxHint); - // ScAccWinFocusGotHint - the window got the focus (from another application, view or document) - ScAccWinFocusGotHint::ScAccWinFocusGotHint( const uno::Reference< uno::XInterface >& xNew ) : @@ -55,13 +51,10 @@ ScAccWinFocusGotHint::~ScAccWinFocusGotHint() { } - TYPEINIT1(ScAccGridWinFocusLostHint, SfxHint); - // ScAccGridWinFocusLostHint - the current grid window lost its focus (to another application, view or document) - ScAccGridWinFocusLostHint::ScAccGridWinFocusLostHint(ScSplitPos eOld, const uno::Reference< uno::XInterface >& xOld ) : @@ -76,10 +69,8 @@ ScAccGridWinFocusLostHint::~ScAccGridWinFocusLostHint() TYPEINIT1(ScAccGridWinFocusGotHint, SfxHint); - // ScAccGridWinFocusGotHint - the grid window got the focus (from another application, view or document) - ScAccGridWinFocusGotHint::ScAccGridWinFocusGotHint(ScSplitPos eNew, const uno::Reference< uno::XInterface >& xNew ) : diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx index 8022fa6d6893..9fd32a04e7ca 100644 --- a/sc/source/ui/Accessibility/AccessibleCell.cxx +++ b/sc/source/ui/Accessibility/AccessibleCell.cxx @@ -21,7 +21,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include "AccessibleText.hxx" #include "AccessibleDocument.hxx" #include "tabvwsh.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index b8f90b2adb51..1ad86a414267 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -50,7 +50,6 @@ ScAccessibleContextBase::ScAccessibleContextBase( { } - ScAccessibleContextBase::~ScAccessibleContextBase(void) { if (!IsDefunc() && !rBHelper.bInDispose) diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 335d69708bb4..3aa3fbb818f5 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -62,7 +62,6 @@ using ::com::sun::star::lang::IllegalArgumentException; 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; @@ -98,7 +97,6 @@ void SAL_CALL ScAccessibleCsvControl::disposing() ScAccessibleContextBase::disposing(); } - // XAccessibleComponent ------------------------------------------------------- Reference< XAccessible > SAL_CALL ScAccessibleCsvControl::getAccessibleAtPoint( const AwtPoint& /* rPoint */ ) @@ -122,7 +120,6 @@ void SAL_CALL ScAccessibleCsvControl::grabFocus() throw( RuntimeException, std:: implGetControl().GrabFocus(); } - // events --------------------------------------------------------------------- void ScAccessibleCsvControl::SendFocusEvent( bool bFocused ) @@ -169,7 +166,6 @@ void ScAccessibleCsvControl::SendRemoveColumnEvent( sal_uInt32 /* nFirstColumn * OSL_FAIL( "ScAccessibleCsvControl::SendRemoveColumnEvent - Illegal call" ); } - // helpers -------------------------------------------------------------------- Rectangle ScAccessibleCsvControl::GetBoundingBoxOnScreen() const throw( RuntimeException, std::exception ) @@ -260,7 +256,6 @@ Point ScAccessibleCsvControl::implGetAbsPos( const Point& rPos ) const return rPos + implGetControl().GetWindowExtentsRelative( NULL ).TopLeft(); } - // Ruler ====================================================================== /** Converts a ruler cursor position to API text index. */ @@ -404,7 +399,6 @@ Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvRuler::getAccessibleSta return pStateSet; } - // XAccessibleText ------------------------------------------------------------ sal_Int32 SAL_CALL ScAccessibleCsvRuler::getCaretPosition() throw( RuntimeException, std::exception ) @@ -702,7 +696,6 @@ sal_Bool SAL_CALL ScAccessibleCsvRuler::copyText( sal_Int32 /* nStartIndex */, s return false; } - // XInterface ----------------------------------------------------------------- Any SAL_CALL ScAccessibleCsvRuler::queryInterface( const ::com::sun::star::uno::Type& rType ) @@ -722,7 +715,6 @@ void SAL_CALL ScAccessibleCsvRuler::release() throw () ScAccessibleCsvControl::release(); } - // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeException, std::exception ) @@ -730,7 +722,6 @@ OUString SAL_CALL ScAccessibleCsvRuler::getImplementationName() throw( RuntimeEx return OUString( RULER_IMPL_NAME ); } - // XTypeProvider -------------------------------------------------------------- Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvRuler::getTypes() throw( RuntimeException, std::exception ) @@ -745,7 +736,6 @@ Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvRuler::getImplementationId() throw( return css::uno::Sequence<sal_Int8>(); } - // events --------------------------------------------------------------------- void ScAccessibleCsvRuler::SendCaretEvent() @@ -761,7 +751,6 @@ void ScAccessibleCsvRuler::SendCaretEvent() } } - // helpers -------------------------------------------------------------------- OUString SAL_CALL ScAccessibleCsvRuler::createAccessibleName() throw( RuntimeException, std::exception ) @@ -848,7 +837,6 @@ sal_Int32 ScAccessibleCsvRuler::implGetLastEqualFormatted( sal_Int32 nApiPos ) return nApiPos; } - // Grid ======================================================================= /** Converts a grid columnm index to an API column index. */ @@ -873,7 +861,6 @@ ScAccessibleCsvGrid::~ScAccessibleCsvGrid() implDispose(); } - // XAccessibleComponent ------------------------------------------------------- Reference< XAccessible > SAL_CALL ScAccessibleCsvGrid::getAccessibleAtPoint( const AwtPoint& rPoint ) @@ -964,7 +951,6 @@ Reference< XAccessibleStateSet > SAL_CALL ScAccessibleCsvGrid::getAccessibleStat return pStateSet; } - // XAccessibleTable ----------------------------------------------------------- sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleRowCount() throw( RuntimeException, std::exception ) @@ -1126,7 +1112,6 @@ sal_Int32 SAL_CALL ScAccessibleCsvGrid::getAccessibleColumn( sal_Int32 nChildInd return implGetColumn( nChildIndex ); } - // XAccessibleSelection ------------------------------------------------------- void SAL_CALL ScAccessibleCsvGrid::selectAccessibleChild( sal_Int32 nChildIndex ) @@ -1200,7 +1185,6 @@ void SAL_CALL ScAccessibleCsvGrid::deselectAccessibleChild( sal_Int32 nSelectedC implSelectColumn( nColumn, false ); } - // XInterface ----------------------------------------------------------------- Any SAL_CALL ScAccessibleCsvGrid::queryInterface( const ::com::sun::star::uno::Type& rType ) @@ -1220,7 +1204,6 @@ void SAL_CALL ScAccessibleCsvGrid::release() throw () ScAccessibleCsvControl::release(); } - // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeException, std::exception ) @@ -1228,7 +1211,6 @@ OUString SAL_CALL ScAccessibleCsvGrid::getImplementationName() throw( RuntimeExc return OUString( GRID_IMPL_NAME ); } - // XTypeProvider -------------------------------------------------------------- Sequence< ::com::sun::star::uno::Type > SAL_CALL ScAccessibleCsvGrid::getTypes() throw( RuntimeException, std::exception ) @@ -1244,7 +1226,6 @@ Sequence< sal_Int8 > SAL_CALL ScAccessibleCsvGrid::getImplementationId() throw( return css::uno::Sequence<sal_Int8>(); } - // events --------------------------------------------------------------------- void ScAccessibleCsvGrid::SendFocusEvent( bool bFocused ) @@ -1304,7 +1285,6 @@ void ScAccessibleCsvGrid::SendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uI } } - // helpers -------------------------------------------------------------------- OUString SAL_CALL ScAccessibleCsvGrid::createAccessibleName() throw( RuntimeException, std::exception ) @@ -1393,7 +1373,6 @@ OUString ScAccessibleCsvGrid::implGetCellText( sal_Int32 nRow, sal_Int32 nColumn return aCellStr; } - ScAccessibleCsvControl* ScAccessibleCsvGrid::implCreateCellObj( sal_Int32 nRow, sal_Int32 nColumn ) const { return new ScAccessibleCsvCell( implGetGrid(), implGetCellText( nRow, nColumn ), nRow, nColumn ); @@ -1424,7 +1403,6 @@ void SAL_CALL ScAccessibleCsvCell::disposing() ScAccessibleCsvControl::disposing(); } - // XAccessibleComponent ------------------------------------------------------- void SAL_CALL ScAccessibleCsvCell::grabFocus() throw( RuntimeException, std::exception ) diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 981822210371..262eff3314bb 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -884,7 +884,6 @@ void ScChildrenShapes::Deselect(sal_Int32 nChildIndex) } } - SdrPage* ScChildrenShapes::GetDrawPage() const { SCTAB nTab(mpAccessibleDocument->getVisibleTable()); @@ -1268,7 +1267,6 @@ void ScChildrenShapes::AddShape(const uno::Reference<drawing::XShape>& xShape, b } } - if (!xSelectionSupplier.is()) throw uno::RuntimeException(); @@ -1885,7 +1883,6 @@ OUString SAL_CALL if (aFileName.isEmpty()) aFileName = pObjSh->GetTitle(SFX_TITLE_APINAME); - if (!aFileName.isEmpty()) { OUString aReadOnly; diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 8c24d1dd4659..ffa2ba401caa 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleDocumentPagePreview.hxx" #include "AccessiblePreviewTable.hxx" #include "AccessiblePageHeader.hxx" @@ -64,7 +63,6 @@ using namespace ::com::sun::star::accessibility; typedef std::list< uno::Reference< XAccessible > > ScXAccList; - struct ScAccNote { OUString maNoteText; @@ -212,7 +210,6 @@ void ScNotesChildren::Init(const Rectangle& rVisRect, sal_Int32 nOffset) } } - struct ScParaFound { sal_Int32 mnIndex; diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx index b2397905bcdc..cefd8621a1f0 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenu.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleGlobal.hxx" #include "AccessibleFilterMenu.hxx" #include "AccessibleFilterMenuItem.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx index be6e36117580..0aa168eb9f45 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterMenuItem.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleGlobal.hxx" #include "AccessibleFilterMenuItem.hxx" #include "checklistmenu.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx index 69208b601dad..93809679fbcd 100644 --- a/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx +++ b/sc/source/ui/Accessibility/AccessibleFilterTopWindow.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleFilterTopWindow.hxx" #include "AccessibleFilterMenu.hxx" #include "checklistmenu.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleGlobal.cxx b/sc/source/ui/Accessibility/AccessibleGlobal.cxx index 69c91d22f285..16bcb15cffad 100644 --- a/sc/source/ui/Accessibility/AccessibleGlobal.cxx +++ b/sc/source/ui/Accessibility/AccessibleGlobal.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessibleGlobal.hxx" using ::com::sun::star::uno::RuntimeException; diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index b2828b781832..cd202683ba61 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "AccessiblePageHeader.hxx" #include "AccessiblePageHeaderArea.hxx" #include "AccessibilityHints.hxx" diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx index 78f1b3af1fca..f8e0e99726a8 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include "AccessiblePreviewTable.hxx" #include "AccessiblePreviewCell.hxx" diff --git a/sc/source/ui/Accessibility/AccessibleTableBase.cxx b/sc/source/ui/Accessibility/AccessibleTableBase.cxx index 246e09ac0876..be6ab391cb72 100644 --- a/sc/source/ui/Accessibility/AccessibleTableBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleTableBase.cxx @@ -31,7 +31,6 @@ #include <comphelper/servicehelper.hxx> #include <vcl/svapp.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::accessibility; diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index a1c28d3b07ab..a6bf37e629f8 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <editeng/eeitem.hxx> @@ -44,7 +43,6 @@ #include <svx/algitem.hxx> #include <vcl/svapp.hxx> - class ScViewForwarder : public SvxViewForwarder { ScTabViewShell* mpViewShell; @@ -963,7 +961,6 @@ ScDocShell* ScAccessibleCellTextData::GetDocShell(ScTabViewShell* pViewShell) return pDocSh; } - ScAccessibleEditObjectTextData::ScAccessibleEditObjectTextData(EditView* pEditView, Window* pWin, bool isClone) : mpViewForwarder(NULL), @@ -1237,7 +1234,6 @@ void ScAccessibleEditLineTextData::EndEdit() mpEditView = NULL; } - // ScAccessiblePreviewCellTextData: shared data between sub objects of a accessible cell text object ScAccessiblePreviewCellTextData::ScAccessiblePreviewCellTextData(ScPreviewShell* pViewShell, @@ -1312,7 +1308,6 @@ ScDocShell* ScAccessiblePreviewCellTextData::GetDocShell(ScPreviewShell* pViewSh return pDocSh; } - // ScAccessiblePreviewHeaderCellTextData: shared data between sub objects of a accessible cell text object ScAccessiblePreviewHeaderCellTextData::ScAccessiblePreviewHeaderCellTextData(ScPreviewShell* pViewShell, @@ -1644,7 +1639,6 @@ SvxViewForwarder* ScAccessibleNoteTextData::GetViewForwarder() return mpViewForwarder; } - // CSV import ================================================================= class ScCsvViewForwarder : public SvxViewForwarder diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index 35b72f8aed2a..f3e14e7ebb34 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -313,7 +313,6 @@ IMPL_LINK( ScRandomNumberGeneratorDialog, OkClicked, PushButton*, /*pButton*/ ) return 0; } - IMPL_LINK( ScRandomNumberGeneratorDialog, ApplyClicked, PushButton*, /*pButton*/ ) { SelectGeneratorAndGenerateNumbers(); diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index 4c2529b42a24..afe5d64a8081 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -322,5 +322,4 @@ IMPL_LINK_NOARG(ScSamplingDialog, ToggleSamplingMethod) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx index 144be46f57b5..07a61c8c0fa6 100644 --- a/sc/source/ui/StatisticsDialogs/TTestDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/TTestDialog.cxx @@ -80,7 +80,6 @@ ScRange ScTTestDialog::ApplyOutput(ScDocShell* pDocShell) aTemplate.autoReplaceRange(strWildcardVariable1Range, pVariable1Iterator->get()); aTemplate.autoReplaceRange(strWildcardVariable2Range, pVariable2Iterator->get()); - aOutput.writeBoldString(SC_STRLOAD(RID_STATISTICS_DLGS, STR_TTEST_UNDO_NAME)); aOutput.newLine(); diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx index 426763a9b8b7..4195ff60c850 100644 --- a/sc/source/ui/app/drwtrans.cxx +++ b/sc/source/ui/app/drwtrans.cxx @@ -71,15 +71,12 @@ #include <editeng/fhgtitem.hxx> #include <vcl/svapp.hxx> - 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 ), @@ -97,7 +94,6 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain // check what kind of objects are contained - SdrPage* pPage = pModel->GetPage(0); if (pPage) { @@ -108,7 +104,6 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain // OLE object - sal_uInt16 nSdrObjKind = pObject->GetObjIdentifier(); if (nSdrObjKind == OBJ_OLE2) { @@ -124,10 +119,8 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain // aOleData is initialized later } - // Graphic object - if (nSdrObjKind == OBJ_GRAF) { bGraphic = true; @@ -135,10 +128,8 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain bGrIsBit = true; } - // URL button - SdrUnoObj* pUnoCtrl = PTR_CAST(SdrUnoObj, pObject); if (pUnoCtrl && FmFormInventor == pUnoCtrl->GetObjInventor()) { @@ -199,10 +190,8 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain } } - // get size for object descriptor - // #i71538# use complete SdrViews // SdrExchangeView aView(pModel); SdrView aView(pModel); @@ -220,7 +209,6 @@ ScDrawTransferObj::ScDrawTransferObj( SdrModel* pClipModel, ScDocShell* pContain aObjDesc.maSize = aSrcSize; PrepareOLE( aObjDesc ); - // remember a unique ID of the source document if ( pContainerShell ) @@ -729,10 +717,8 @@ void ScDrawTransferObj::CreateOLEData() aOleData = TransferableDataHelper(pEmbedTransfer); } - // initialize aDocShellRef with a live document from the ClipDoc - void ScDrawTransferObj::InitDocShell() { if ( !aDocShellRef.Is() ) @@ -812,5 +798,4 @@ sal_Int64 SAL_CALL ScDrawTransferObj::getSomething( const com::sun::star::uno::S return nRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 819e580e733e..a28ddc76ebb9 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -702,10 +702,8 @@ void ScInputHandler::UpdateSpellSettings( bool bFromStartTab ) } } - // Function/Range names etc. as Tip help - // The other types are defined in ScDocument::GetFormulaEntries void ScInputHandler::GetFormulaData() { @@ -1196,7 +1194,6 @@ void ScInputHandler::PasteFunctionData() pActiveView->ShowCursor(); } - // Calculate selection and display as tip help static OUString lcl_Calculate( const OUString& rFormula, ScDocument* pDoc, const ScAddress &rPos ) { @@ -1397,7 +1394,6 @@ void ScInputHandler::SkipClosingPar() --nAutoPar; } - // Auto input void ScInputHandler::GetColData() @@ -1552,7 +1548,6 @@ void ScInputHandler::NextAutoEntry( bool bBack ) pActiveView->ShowCursor(); } - // Highlight parentheses void ScInputHandler::UpdateParenthesis() { @@ -2244,10 +2239,8 @@ void ScInputHandler::InvalidateAttribs() } } - // --------------- public methods -------------------------------------------- - void ScInputHandler::SetMode( ScInputMode eNewMode, const OUString* pInitText ) { if ( eMode == eNewMode ) @@ -3653,7 +3646,6 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine ) return bRet; } - /** * Methods for FunctionAutoPilot: * InputGetSelection, InputSetSelection, InputReplaceSelection, InputGetFormulaStr @@ -3755,7 +3747,6 @@ void ScInputHandler::InputTurnOffWinEngine() bInOwnChange = false; } - /** * ScInputHdlState */ diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 12fd5728b3ae..57e5bec06e35 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include "scitems.hxx" @@ -91,7 +90,6 @@ using com::sun::star::frame::XFrame; using com::sun::star::frame::XController; using com::sun::star::beans::XPropertySet; - enum ScNameInputType { SC_NAME_INPUT_CELL, @@ -106,7 +104,6 @@ enum ScNameInputType SC_MANAGE_NAMES }; - ScTextWndBase::ScTextWndBase( Window* pParent, WinBits nStyle ) : Window ( pParent, nStyle ) { @@ -117,10 +114,8 @@ ScTextWndBase::ScTextWndBase( Window* pParent, WinBits nStyle ) } } - // class ScInputWindowWrapper - SFX_IMPL_CHILDWINDOW_WITHID(ScInputWindowWrapper,FID_INPUTLINE_STATUS) ScInputWindowWrapper::ScInputWindowWrapper( Window* pParentP, @@ -157,10 +152,8 @@ static bool lcl_isExperimentalMode() return true; } - // class ScInputWindow - static ScTextWndBase* lcl_chooseRuntimeImpl( Window* pParent, SfxBindings* pBind ) { ScTabViewShell* pViewSh = NULL; @@ -902,8 +895,6 @@ void ScInputWindow::MouseButtonUp( const MouseEvent& rMEvt ) ToolBox::MouseButtonUp( rMEvt ); } - - ScInputBarGroup::ScInputBarGroup(Window* pParent, ScTabViewShell* pViewSh) : ScTextWndBase ( pParent, WinBits(WB_HIDE | WB_TABSTOP ) ), aMultiTextWnd ( this, pViewSh ), @@ -1026,13 +1017,11 @@ void ScInputBarGroup::StartEditEngine() aMultiTextWnd.StartEditEngine(); } - void ScInputBarGroup::MakeDialogEditView() { aMultiTextWnd.MakeDialogEditView(); } - EditView* ScInputBarGroup::GetEditView() { return aMultiTextWnd.GetEditView(); @@ -1152,9 +1141,6 @@ void ScInputBarGroup::TextGrabFocus() aMultiTextWnd.TextGrabFocus(); } - - - ScMultiTextWnd::ScMultiTextWnd( ScInputBarGroup* pParen, ScTabViewShell* pViewSh ) : ScTextWnd( pParen, pViewSh ), @@ -1349,7 +1335,6 @@ static void lcl_ModifyRTLVisArea( EditView* pEditView ) pEditView->SetVisArea(aVisArea); } - void ScMultiTextWnd::InitEditEngine() { ScFieldEditEngine* pNew; @@ -1451,8 +1436,6 @@ void ScMultiTextWnd::SetTextString( const OUString& rNewString ) DoScroll(); } - - ScTextWnd::ScTextWnd( Window* pParent, ScTabViewShell* pViewSh ) : ScTextWndBase ( pParent, WinBits(WB_HIDE | WB_BORDER) ), DragSourceHelper( this ), @@ -1720,7 +1703,6 @@ void ScTextWnd::UpdateAutoCorrFlag() } } - void ScTextWnd::StartEditEngine() { // Don't activate if we're a modal ourselves (Doc modal Dialog) @@ -2065,10 +2047,8 @@ void ScTextWnd::TextGrabFocus() GrabFocus(); } - // Position window - ScPosWnd::ScPosWnd( Window* pParent ) : ComboBox ( pParent, WinBits(WB_HIDE | WB_DROPDOWN) ), pAccel ( NULL ), diff --git a/sc/source/ui/app/lnktrans.cxx b/sc/source/ui/app/lnktrans.cxx index 69a5cbe1d4a8..a386cd0bd886 100644 --- a/sc/source/ui/app/lnktrans.cxx +++ b/sc/source/ui/app/lnktrans.cxx @@ -78,5 +78,4 @@ void ScLinkTransferObj::DragFinished( sal_Int8 nDropAction ) TransferableHelper::DragFinished( nDropAction ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/msgpool.cxx b/sc/source/ui/app/msgpool.cxx index 8e4f43f6a43a..9e87642c6f7f 100644 --- a/sc/source/ui/app/msgpool.cxx +++ b/sc/source/ui/app/msgpool.cxx @@ -75,7 +75,6 @@ ScMessagePool::ScMessagePool() SetSecondaryPool( pDocPool ); } - ScMessagePool::~ScMessagePool() { Delete(); @@ -89,7 +88,6 @@ ScMessagePool::~ScMessagePool() SfxItemPool::Free(pDocPool); } - SfxMapUnit ScMessagePool::GetMetric( sal_uInt16 nWhich ) const { // Own attributes: Twips, everything else 1/100 mm diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 7436253dbab9..58da2499be3f 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -19,7 +19,6 @@ #include <editeng/eeitem.hxx> - #include <svx/fmobjfac.hxx> #include <svx/objfac3d.hxx> #include <svx/tbxcolor.hxx> @@ -108,9 +107,6 @@ #include "dwfunctr.hxx" #include "acredlin.hxx" - - - ScResId::ScResId( sal_uInt16 nId ) : ResId( nId, *SC_MOD()->GetResMgr() ) { diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index cfaa93ca15a5..5cd585106fc0 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -207,7 +207,6 @@ ScModule::~ScModule() DeleteCfg(); // Called from Exit() } - void ScModule::ConfigurationChanged( utl::ConfigurationBroadcaster* p, sal_uInt32 ) { if ( p == pColorConfig || p == pAccessOptions ) @@ -615,7 +614,6 @@ void ScModule::GetState( SfxItemSet& rSet ) } } - void ScModule::HideDisabledSlots( SfxItemSet& rSet ) { if( SfxViewFrame* pViewFrm = SfxViewFrame::Current() ) @@ -631,7 +629,6 @@ void ScModule::HideDisabledSlots( SfxItemSet& rSet ) } } - void ScModule::ResetDragObject() { mpDragData->pCellTransfer = NULL; @@ -644,7 +641,6 @@ void ScModule::ResetDragObject() mpDragData->aJumpText = OUString(); } - void ScModule::SetDragObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ) { ResetDragObject(); @@ -671,7 +667,6 @@ void ScModule::SetDragJump( mpDragData->aJumpText = rText; } - void ScModule::SetClipObject( ScTransferObj* pCellObj, ScDrawTransferObj* pDrawObj ) { OSL_ENSURE( !pCellObj || !pDrawObj, "SetClipObject: not allowed to set both objects" ); @@ -1012,7 +1007,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - // DefaultsOptions if (rOptSet.HasItem(SID_SCDEFAULTSOPTIONS, &pItem)) { @@ -1020,7 +1014,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) SetDefaultsOptions( rOpt ); } - // FormulaOptions if (rOptSet.HasItem(SID_SCFORMULAOPTIONS, &pItem)) { @@ -1050,7 +1043,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - // ViewOptions if (rOptSet.HasItem(SID_SCVIEWOPTIONS, &pItem)) { @@ -1082,7 +1074,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) } } - // GridOptions // Evaluate after ViewOptions, as GridOptions is a member of ViewOptions if ( rOptSet.HasItem(SID_ATTR_GRID_OPTIONS,&pItem) ) @@ -1196,7 +1187,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) pBindings->Invalidate( SID_AUTOSPELL_CHECK ); } - // InputOptions if ( rOptSet.HasItem(SID_SC_INPUT_SELECTIONPOS,&pItem) ) { @@ -1256,7 +1246,6 @@ void ScModule::ModifyOptions( const SfxItemSet& rOptSet ) bSaveInputOptions = true; } - // PrintOptions if ( rOptSet.HasItem(SID_SCPRINTOPTIONS,&pItem) ) { @@ -1460,8 +1449,6 @@ void ScModule::SetRefInputHdl( ScInputHandler* pNew ) pRefInputHandler = pNew; } - - void ScModule::InputGetSelection( sal_Int32& rStart, sal_Int32& rEnd ) { ScInputHandler* pHdl = GetInputHdl(); @@ -2053,7 +2040,6 @@ SfxItemSet* ScModule::CreateItemSet( sal_uInt16 nId ) pRet->Put( SfxBoolItem( SID_SC_INPUT_LEGACY_CELL_SELECTION, rInpOpt.GetLegacyCellSelection() ) ); - // RID_SC_TP_PRINT pRet->Put( ScTpPrintItem( SID_SCPRINTOPTIONS, GetPrintOptions() ) ); diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx index 04c32072217d..813935134cdc 100644 --- a/sc/source/ui/app/seltrans.cxx +++ b/sc/source/ui/app/seltrans.cxx @@ -67,7 +67,6 @@ static bool lcl_IsURLButton( SdrObject* pObject ) return bRet; } - ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView ) { ScSelectionTransferObj* pRet = NULL; @@ -140,7 +139,6 @@ ScSelectionTransferObj* ScSelectionTransferObj::CreateFromView( ScTabView* pView return pRet; } - ScSelectionTransferObj::ScSelectionTransferObj( ScTabView* pSource, ScSelectionTransferMode eNewMode ) : pView( pSource ), eMode( eNewMode ), @@ -338,7 +336,6 @@ void ScSelectionTransferObj::CreateDrawData() const SdrMarkList& rMarkList = pDrawView->GetMarkedObjectList(); ScDrawView::CheckOle( rMarkList, bAnyOle, bOneOle ); - ScDocShellRef aDragShellRef; if (bAnyOle) { @@ -346,7 +343,6 @@ void ScSelectionTransferObj::CreateDrawData() aDragShellRef->DoInitNew(NULL); } - ScDrawLayer::SetGlobalDrawPersist(aDragShellRef); SdrModel* pModel = pDrawView->GetMarkedObjModel(); ScDrawLayer::SetGlobalDrawPersist(NULL); @@ -437,5 +433,4 @@ void ScSelectionTransferObj::ObjectReleased() TransferableHelper::ObjectReleased(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/transobj.cxx b/sc/source/ui/app/transobj.cxx index f0c6c73e20bf..36759531bfbd 100644 --- a/sc/source/ui/app/transobj.cxx +++ b/sc/source/ui/app/transobj.cxx @@ -21,7 +21,6 @@ #include <editeng/eeitem.hxx> #include <editeng/justifyitem.hxx> - #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/embed/XTransactedObject.hpp> @@ -124,10 +123,8 @@ ScTransferObj::ScTransferObj( ScDocument* pClipDoc, const TransferableObjectDesc { OSL_ENSURE(pDoc->IsClipboard(), "wrong document"); - // get aBlock from clipboard doc - SCCOL nCol1; SCROW nRow1; SCCOL nCol2; @@ -580,7 +577,6 @@ ScMarkData ScTransferObj::GetSourceMarkData() return aMarkData; } - // initialize aDocShellRef with a live document from the ClipDoc // #i123405# added parameter to allow size calculation without limitation @@ -694,7 +690,6 @@ void ScTransferObj::InitDocShell(bool bLimitToPageSize) nPosX = (long) ( nPosX * HMM_PER_TWIPS ); nPosY = (long) ( nPosY * HMM_PER_TWIPS ); - aPaperSize.Width() *= 2; // limit OLE object to double of page size aPaperSize.Height() *= 2; @@ -860,5 +855,4 @@ sal_Int64 SAL_CALL ScTransferObj::getSomething( const com::sun::star::uno::Seque return nRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index c011a673a13f..6a7e0887e5bf 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -41,7 +41,6 @@ TYPEINIT1(ScTablesHint, SfxHint); TYPEINIT1(ScEditViewHint, SfxHint); TYPEINIT1(ScIndexHint, SfxHint); - /** * Status update for entry field */ @@ -100,8 +99,6 @@ void ScInputStatusItem::SetMisspellRanges( const std::vector<editeng::MisspellRa mpMisspellRanges = pRanges; } - - // ScPaintHint was moved to schints.cxx /** @@ -141,7 +138,6 @@ ScEditViewHint::~ScEditViewHint() { } - /** * Data for the sorting dialog */ @@ -200,7 +196,6 @@ bool ScSortItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nMembe return true; } - /** * Data for the Filter dialog */ @@ -288,7 +283,6 @@ SfxPoolItem* ScQueryItem::Clone( SfxItemPool * ) const return new ScQueryItem( *this ); } - /** * Data for the SubTotal dialog */ @@ -347,7 +341,6 @@ bool ScSubTotalItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 /* nM return true; } - /** * Transporter for the UserLIst dialog */ @@ -391,7 +384,6 @@ bool ScUserListItem::operator==( const SfxPoolItem& rItem ) const return bEqual; } - SfxPoolItem* ScUserListItem::Clone( SfxItemPool * ) const { return new ScUserListItem( *this ); @@ -403,7 +395,6 @@ void ScUserListItem::SetUserList( const ScUserList& rUserList ) pUserList = new ScUserList( rUserList ); } - /** * Data for the Consolidate dialog */ @@ -534,7 +525,6 @@ SfxPoolItem* ScSolveItem::Clone( SfxItemPool * ) const return new ScSolveItem( *this ); } - /** * Data for the TabOp dialog */ diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx index 6dbe9a593f33..797916315f7a 100644 --- a/sc/source/ui/attrdlg/attrdlg.cxx +++ b/sc/source/ui/attrdlg/attrdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scitems.hxx" @@ -96,5 +95,4 @@ IMPL_LINK_NOARG(ScAttrDlg, OkHandler) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/attrdlg/scabstdlg.cxx b/sc/source/ui/attrdlg/scabstdlg.cxx index 5da68976143e..0717705b77fa 100644 --- a/sc/source/ui/attrdlg/scabstdlg.cxx +++ b/sc/source/ui/attrdlg/scabstdlg.cxx @@ -24,7 +24,6 @@ #include <osl/module.hxx> #include <rtl/ustrbuf.hxx> - typedef ScAbstractDialogFactory* (SAL_CALL *ScFuncPtrCreateDialogFactory)(); #ifndef DISABLE_DYNLOADING diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 8e60fd943664..70c90006f78f 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -387,7 +387,6 @@ class ScAbstractTabDialog_Impl : public SfxAbstractTabDialog virtual OUString GetText() const SAL_OVERRIDE; }; - //AbstractDialogFactory_Impl implementations class ScAbstractDialogFactory_Impl : public ScAbstractDialogFactory { diff --git a/sc/source/ui/attrdlg/scuiexp.cxx b/sc/source/ui/attrdlg/scuiexp.cxx index 8d93952ba22b..f3e026f24ff2 100644 --- a/sc/source/ui/attrdlg/scuiexp.cxx +++ b/sc/source/ui/attrdlg/scuiexp.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scdlgfact.hxx" diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 8c728c512d19..88814f3fdfb1 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - #include "global.hxx" #include "document.hxx" #include "attrib.hxx" @@ -38,10 +36,8 @@ static const sal_uInt16 pProtectionRanges[] = 0 }; - // Zellschutz-Tabpage: - ScTabPageProtection::ScTabPageProtection(Window* pParent, const SfxItemSet& rCoreAttrs) : SfxTabPage(pParent, "CellProtectionPage", "modules/scalc/ui/cellprotectionpage.ui", &rCoreAttrs) diff --git a/sc/source/ui/cctrl/cbuttonw.cxx b/sc/source/ui/cctrl/cbuttonw.cxx index 6fa60e56684b..08c278482ead 100644 --- a/sc/source/ui/cctrl/cbuttonw.cxx +++ b/sc/source/ui/cctrl/cbuttonw.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/outdev.hxx> #include <vcl/window.hxx> #include <vcl/decoview.hxx> @@ -25,10 +24,8 @@ #include <vcl/settings.hxx> #include "cbutton.hxx" - // class ScDDComboBoxButton - ScDDComboBoxButton::ScDDComboBoxButton( OutputDevice* pOutputDevice ) : pOut( pOutputDevice ) { @@ -81,7 +78,6 @@ void ScDDComboBoxButton::Draw( const Point& rAt, aInnerRect=aDecoView.DrawButton( aBtnRect, nButtonStyle ); - aInnerRect.Left() += 1; aInnerRect.Top() += 1; aInnerRect.Right() -= 1; @@ -95,7 +91,6 @@ void ScDDComboBoxButton::Draw( const Point& rAt, ImpDrawArrow( aInnerRect, bState ); - // restore old state pOut->EnableMapMode( bOldEnable ); if (bHadLine) @@ -152,6 +147,4 @@ void ScDDComboBoxButton::ImpDrawArrow( const Rectangle& rRect, Point( aCenter.X() + aSize3.Width(), aPos1.Y()+1 ) ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 2e2413b367f6..99ca3a6c0630 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -428,7 +428,6 @@ void ScMenuFloatingWindow::drawAllMenuItems() } } - void ScMenuFloatingWindow::executeMenuItem(size_t nPos) { if (nPos >= maMenuItems.size()) @@ -472,7 +471,6 @@ void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool bSubMenuTimer, fireMenuHighlightedEvent(); } - void ScMenuFloatingWindow::handleMenuTimeout(SubMenuItemData* pTimer) { if (pTimer == &maOpenTimer) @@ -652,7 +650,6 @@ void ScMenuFloatingWindow::setName(const OUString& rName) maName = rName; } - void ScMenuFloatingWindow::highlightMenuItem(size_t nPos, bool bSelected) { if (nPos == MENU_NOT_SELECTED) @@ -729,7 +726,6 @@ void ScMenuFloatingWindow::getMenuItemPosSize(size_t nPos, Point& rPos, Size& rS rSize = Size(aWndSize.Width() - nLeftMargin*2, nH); } - size_t ScMenuFloatingWindow::getEnclosingMenuItem(const Point& rPos) const { size_t n = maMenuItems.size(); @@ -834,7 +830,6 @@ void ScMenuFloatingWindow::terminateAllPopupMenus() mpParentMenu->terminateAllPopupMenus(); } - ScCheckListMenuWindow::Config::Config() : mbAllowEmptySet(true), mbRTL(false) { diff --git a/sc/source/ui/cctrl/dpcontrol.cxx b/sc/source/ui/cctrl/dpcontrol.cxx index 5c1d41563b7e..6cb40c185ed4 100644 --- a/sc/source/ui/cctrl/dpcontrol.cxx +++ b/sc/source/ui/cctrl/dpcontrol.cxx @@ -27,7 +27,6 @@ #include "docpool.hxx" #include "patattr.hxx" - ScDPFieldButton::ScDPFieldButton(OutputDevice* pOutDev, const StyleSettings* pStyle, const Fraction* pZoomX, const Fraction* pZoomY, ScDocument* pDoc) : mpDoc(pDoc), mpOutDev(pOutDev), diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index d784d51d85d8..6c8755cfe4fd 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef SC_DLLIMPLEMENTATION #undef SC_DLLIMPLEMENTATION #endif diff --git a/sc/source/ui/cctrl/tbinsert.cxx b/sc/source/ui/cctrl/tbinsert.cxx index a4250caed0a2..ac679ef4edb1 100644 --- a/sc/source/ui/cctrl/tbinsert.cxx +++ b/sc/source/ui/cctrl/tbinsert.cxx @@ -115,5 +115,4 @@ void ScTbxInsertCtrl::Select( sal_Bool /* bMod1 */ ) pDispatch->Execute(nLastSlotId); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 260edebbc265..9cd27838a2fe 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -35,10 +35,8 @@ #include "scitems.hxx" #include "printfun.hxx" - // class ScZoomSliderControl --------------------------------------- - SFX_IMPL_TOOLBOX_CONTROL( ScZoomSliderControl, SvxZoomSliderItem ); ScZoomSliderControl::ScZoomSliderControl( @@ -133,7 +131,6 @@ const long nSliderXOffset = 20; 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(); @@ -219,7 +216,6 @@ long ScZoomSliderWnd::Zoom2Offset( sal_uInt16 nCurrentZoom ) const return nRect; } - 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 ), diff --git a/sc/source/ui/condformat/condformatdlg.cxx b/sc/source/ui/condformat/condformatdlg.cxx index 9c0a6d9de25a..fd4efc5c42ca 100644 --- a/sc/source/ui/condformat/condformatdlg.cxx +++ b/sc/source/ui/condformat/condformatdlg.cxx @@ -390,10 +390,8 @@ IMPL_LINK_NOARG( ScCondFormatList, ScrollHdl ) return 0; } - //ScCondFormatDlg - ScCondFormatDlg::ScCondFormatDlg(Window* pParent, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType) diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx index 0810ea2bbb41..9065ff4ff9d0 100644 --- a/sc/source/ui/condformat/condformatdlgentry.cxx +++ b/sc/source/ui/condformat/condformatdlgentry.cxx @@ -124,7 +124,6 @@ void ScCondFrmtEntry::Deselect() SetHeight(); } - IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) { OUString aFormula = pEdit->GetText(); @@ -142,7 +141,6 @@ IMPL_LINK(ScCondFrmtEntry, EdModifyHdl, Edit*, pEdit) return 0; } - //condition namespace { diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx index 888d7e4c810a..92e2bca67baa 100644 --- a/sc/source/ui/condformat/condformatmgr.cxx +++ b/sc/source/ui/condformat/condformatmgr.cxx @@ -146,7 +146,6 @@ ScConditionalFormatList* ScCondFormatManagerDlg::GetConditionalFormatList() return pList; } - IMPL_LINK_NOARG(ScCondFormatManagerDlg, RemoveBtnHdl) { m_pCtrlManager->DeleteSelection(); diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index de2f4a623faf..1a4954cffca6 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -596,7 +596,6 @@ ScDPLabelData* ScPivotLayoutDialog::GetLabelData(SCCOL nColumn) return &maPivotParameters.maLabelArray[nColumn]; } - void ScPivotLayoutDialog::PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames) { return mpListBoxData->PushDataFieldNames(rDataFieldNames); diff --git a/sc/source/ui/dbgui/asciiopt.cxx b/sc/source/ui/dbgui/asciiopt.cxx index ef39fdf1d3de..b4a72d10d5fe 100644 --- a/sc/source/ui/dbgui/asciiopt.cxx +++ b/sc/source/ui/dbgui/asciiopt.cxx @@ -31,7 +31,6 @@ static const sal_Char pStrFix[] = "FIX"; static const sal_Char pStrMrg[] = "MRG"; - ScAsciiOptions::ScAsciiOptions() : bFixedLen ( false ), aFieldSeps ( OUString(';') ), @@ -49,7 +48,6 @@ ScAsciiOptions::ScAsciiOptions() : { } - ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) : bFixedLen ( rOpt.bFixedLen ), aFieldSeps ( rOpt.aFieldSeps ), @@ -80,14 +78,12 @@ ScAsciiOptions::ScAsciiOptions(const ScAsciiOptions& rOpt) : } } - ScAsciiOptions::~ScAsciiOptions() { delete[] pColStart; delete[] pColFormat; } - void ScAsciiOptions::SetColInfo( sal_uInt16 nCount, const sal_Int32* pStart, const sal_uInt8* pFormat ) { delete[] pColStart; @@ -112,7 +108,6 @@ void ScAsciiOptions::SetColInfo( sal_uInt16 nCount, const sal_Int32* pStart, con } } - void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec ) { delete[] pColStart; @@ -133,7 +128,6 @@ void ScAsciiOptions::SetColumnInfo( const ScCsvExpDataVec& rDataVec ) } } - ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy ) { SetColInfo( rCpy.nInfoCount, rCpy.pColStart, rCpy.pColFormat ); @@ -150,7 +144,6 @@ ScAsciiOptions& ScAsciiOptions::operator=( const ScAsciiOptions& rCpy ) return *this; } - bool ScAsciiOptions::operator==( const ScAsciiOptions& rCmp ) const { if ( bFixedLen == rCmp.bFixedLen && @@ -288,7 +281,6 @@ void ScAsciiOptions::ReadFromString( const OUString& rString ) // 10th token is used for "Save cell formulas" in export options } - OUString ScAsciiOptions::WriteToString() const { OUString aOutStr; diff --git a/sc/source/ui/dbgui/consdlg.cxx b/sc/source/ui/dbgui/consdlg.cxx index 67a973255831..fc70a15d9c93 100644 --- a/sc/source/ui/dbgui/consdlg.cxx +++ b/sc/source/ui/dbgui/consdlg.cxx @@ -36,7 +36,6 @@ #define INFOBOX(id) InfoBox(this, ScGlobal::GetRscString(id)).Execute() - class ScAreaData { public: @@ -59,7 +58,6 @@ public: bool bIsDbArea; }; - ScConsolidateDlg::ScConsolidateDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, const SfxItemSet& rArgSet ) @@ -177,7 +175,6 @@ void ScConsolidateDlg::Init() else pEdDestArea->SetText(OUString()); - // Use the ScAreaData helper class to save those range names from the // RangeNames and database ranges that appear in the ListBoxes. @@ -237,7 +234,6 @@ void ScConsolidateDlg::FillAreaLists() } } - // Handover of a range within a table that has been selected by the mouse. // This range is then shown in the reference window as new selection. @@ -265,13 +261,11 @@ void ScConsolidateDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - bool ScConsolidateDlg::Close() { return DoClose( ScConsolidateDlgWrapper::GetChildWindowId() ); } - void ScConsolidateDlg::SetActive() { if ( bDlgLostFocus ) @@ -290,13 +284,11 @@ void ScConsolidateDlg::SetActive() RefInputDone(); } - void ScConsolidateDlg::Deactivate() { bDlgLostFocus = true; } - bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd ) { if ( !pRangeUtil || !pDoc || @@ -328,7 +320,6 @@ bool ScConsolidateDlg::VerifyEdit( formula::RefEdit* pEd ) return bEditOk; } - // Handler: IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr ) @@ -349,7 +340,6 @@ IMPL_LINK( ScConsolidateDlg, GetFocusHdl, Control*, pCtr ) return 0; } - IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) { sal_uInt16 nDataAreaCount = pLbConsAreas->GetEntryCount(); @@ -409,7 +399,6 @@ IMPL_LINK_NOARG(ScConsolidateDlg, OkHdl) return 0; } - IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn ) { if ( pBtn == pBtnCancel ) @@ -475,7 +464,6 @@ IMPL_LINK( ScConsolidateDlg, ClickHdl, PushButton*, pBtn ) return 0; } - IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb ) { if ( pLb == pLbConsAreas ) @@ -518,7 +506,6 @@ IMPL_LINK( ScConsolidateDlg, SelectHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd ) { if ( pEd == pEdDataArea ) @@ -538,7 +525,6 @@ IMPL_LINK( ScConsolidateDlg, ModifyHdl, formula::RefEdit*, pEd ) return 0; } - // TODO: generalize! // Resource of the ListBox and these two conversion methods are also in // tpsubt and everywhere, where StarCalc functions are selectable. diff --git a/sc/source/ui/dbgui/csvcontrol.cxx b/sc/source/ui/dbgui/csvcontrol.cxx index 2df46a9e00cb..381309dd7efd 100644 --- a/sc/source/ui/dbgui/csvcontrol.cxx +++ b/sc/source/ui/dbgui/csvcontrol.cxx @@ -22,7 +22,6 @@ #include <vcl/settings.hxx> #include "AccessibleCsvControl.hxx" - ScCsvLayoutData::ScCsvLayoutData() : mnPosCount( 1 ), mnPosOffset( 0 ), @@ -57,7 +56,6 @@ ScCsvDiff ScCsvLayoutData::GetDiff( const ScCsvLayoutData& rData ) const return nRet; } - ScCsvControl::ScCsvControl( ScCsvControl& rParent ) : Control( &rParent, WB_TABSTOP | WB_NODIALOGCONTROL ), mrData( rParent.GetLayoutData() ), @@ -80,7 +78,6 @@ ScCsvControl::~ScCsvControl() mpAccessible->dispose(); } - // event handling ------------------------------------------------------------- void ScCsvControl::GetFocus() @@ -137,7 +134,6 @@ void ScCsvControl::AccSendRemoveColumnEvent( sal_uInt32 nFirstColumn, sal_uInt32 mpAccessible->SendRemoveColumnEvent( nFirstColumn, nLastColumn ); } - // repaint helpers ------------------------------------------------------------ void ScCsvControl::Repaint( bool bInvalidate ) @@ -160,7 +156,6 @@ void ScCsvControl::EnableRepaint( bool bInvalidate ) Repaint( bInvalidate ); } - // command handling ----------------------------------------------------------- void ScCsvControl::Execute( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nParam2 ) @@ -169,7 +164,6 @@ void ScCsvControl::Execute( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nPa maCmdHdl.Call( this ); } - // layout helpers ------------------------------------------------------------- sal_Int32 ScCsvControl::GetVisPosCount() const @@ -252,7 +246,6 @@ sal_Int32 ScCsvControl::GetLineFromY( sal_Int32 nY ) const return (nY - GetHdrHeight()) / GetLineHeight() + GetFirstVisLine(); } - // static helpers ------------------------------------------------------------- void ScCsvControl::ImplInvertRect( OutputDevice& rOutDev, const Rectangle& rRect ) @@ -297,7 +290,6 @@ ScMoveMode ScCsvControl::GetVertDirection( sal_uInt16 nCode, bool bHomeEnd ) return MOVE_NONE; } - // accessibility -------------------------------------------------------------- ScCsvControl::XAccessibleRef ScCsvControl::CreateAccessible() @@ -307,5 +299,4 @@ ScCsvControl::XAccessibleRef ScCsvControl::CreateAccessible() return mxAccessible; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx index 3bd16a9f74c5..5b2cbc6a0b52 100644 --- a/sc/source/ui/dbgui/csvgrid.cxx +++ b/sc/source/ui/dbgui/csvgrid.cxx @@ -44,7 +44,6 @@ #include "editutil.hxx" // *** edit engine *** - struct Func_SetType { sal_Int32 mnType; @@ -61,7 +60,6 @@ struct Func_Select { rState.Select( mbSelect ); } }; - ScCsvGrid::ScCsvGrid( ScCsvControl& rParent ) : ScCsvControl( rParent ), mpColorConfig( 0 ), @@ -264,7 +262,6 @@ void ScCsvGrid::InitSizeData() InvalidateGfx(); } - // split handling ------------------------------------------------------------- void ScCsvGrid::InsertSplit( sal_Int32 nPos ) @@ -571,7 +568,6 @@ void ScCsvGrid::ExecutePopup( const Point& rPos ) Execute( CSVCMD_SETCOLUMNTYPE, maPopup.GetItemPos( nItemId ) ); } - // selection handling --------------------------------------------------------- bool ScCsvGrid::IsSelected( sal_uInt32 nColIndex ) const @@ -711,7 +707,6 @@ void ScCsvGrid::DoSelectAction( sal_uInt32 nColIndex, sal_uInt16 nModifier ) Execute( CSVCMD_MOVEGRIDCURSOR, GetColumnPos( nColIndex ) ); } - // cell contents -------------------------------------------------------------- void ScCsvGrid::ImplSetTextLineSep( @@ -815,7 +810,6 @@ const OUString& ScCsvGrid::GetCellText( sal_uInt32 nColIndex, sal_Int32 nLine ) return rStrVec[ nColIndex ]; } - // event handling ------------------------------------------------------------- void ScCsvGrid::Resize() @@ -1004,7 +998,6 @@ void ScCsvGrid::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 Repaint(); } - // painting ------------------------------------------------------------------- void ScCsvGrid::Paint( const Rectangle& ) @@ -1352,7 +1345,6 @@ void ScCsvGrid::ImplDrawTrackingRect( sal_uInt32 nColIndex ) } } - // accessibility ============================================================== ScAccessibleCsvControl* ScCsvGrid::ImplCreateAccessible() @@ -1362,5 +1354,4 @@ ScAccessibleCsvControl* ScCsvGrid::ImplCreateAccessible() return pControl.release(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvruler.cxx b/sc/source/ui/dbgui/csvruler.cxx index bf0b6d7fcb0f..060b03405638 100644 --- a/sc/source/ui/dbgui/csvruler.cxx +++ b/sc/source/ui/dbgui/csvruler.cxx @@ -20,7 +20,6 @@ #include "csvruler.hxx" #include "AccessibleCsvControl.hxx" - #include <optutil.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -30,12 +29,9 @@ using namespace com::sun::star::uno; - - #define SEP_PATH "Office.Calc/Dialogs/CSVImport" #define FIXED_WIDTH_LIST "FixedWidthList" - static void load_FixedWidthList(ScCsvSplits &aSplits) { OUString sSplits; @@ -108,7 +104,6 @@ ScCsvRuler::~ScCsvRuler() save_FixedWidthList( maSplits ); } - // common ruler handling ------------------------------------------------------ void ScCsvRuler::setPosSizePixel( @@ -247,7 +242,6 @@ void ScCsvRuler::ScrollVertRel( ScMoveMode eDir ) Execute( CSVCMD_SETLINEOFFSET, nLine ); } - // split handling ------------------------------------------------------------- sal_Int32 ScCsvRuler::GetNoScrollPos( sal_Int32 nPos ) const @@ -351,7 +345,6 @@ void ScCsvRuler::MoveCurrSplitRel( ScMoveMode eDir ) } } - // event handling ------------------------------------------------------------- void ScCsvRuler::Resize() @@ -517,7 +510,6 @@ void ScCsvRuler::EndMouseTracking( bool bApply ) mnPosMTStart = CSV_POS_INVALID; } - // painting ------------------------------------------------------------------- void ScCsvRuler::Paint( const Rectangle& ) @@ -654,7 +646,6 @@ void ScCsvRuler::ImplSetMousePointer( sal_Int32 nPos ) SetPointer( Pointer( HasSplit( nPos ) ? POINTER_HSPLIT : POINTER_ARROW ) ); } - // accessibility ============================================================== ScAccessibleCsvControl* ScCsvRuler::ImplCreateAccessible() @@ -662,5 +653,4 @@ ScAccessibleCsvControl* ScCsvRuler::ImplCreateAccessible() return new ScAccessibleCsvRuler( *this ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvsplits.cxx b/sc/source/ui/dbgui/csvsplits.cxx index eb8a348c3fca..11ed0bae12a7 100644 --- a/sc/source/ui/dbgui/csvsplits.cxx +++ b/sc/source/ui/dbgui/csvsplits.cxx @@ -21,7 +21,6 @@ #include <algorithm> - bool ScCsvSplits::Insert( sal_Int32 nPos ) { bool bValid = (nPos >= 0); @@ -62,7 +61,6 @@ bool ScCsvSplits::HasSplit( sal_Int32 nPos ) const return GetIndex( nPos ) != CSV_VEC_NOTFOUND; } - sal_uInt32 ScCsvSplits::GetIndex( sal_Int32 nPos ) const { const_iterator aIter = ::std::lower_bound( maVec.begin(), maVec.end(), nPos ); @@ -89,11 +87,9 @@ sal_Int32 ScCsvSplits::GetPos( sal_uInt32 nIndex ) const return (nIndex < Count()) ? maVec[ nIndex ] : CSV_POS_INVALID; } - sal_uInt32 ScCsvSplits::GetIterIndex( const_iterator aIter ) const { return (aIter == maVec.end()) ? CSV_VEC_NOTFOUND : (aIter - maVec.begin()); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/csvtablebox.cxx b/sc/source/ui/dbgui/csvtablebox.cxx index 31e9fc96e414..f65704846918 100644 --- a/sc/source/ui/dbgui/csvtablebox.cxx +++ b/sc/source/ui/dbgui/csvtablebox.cxx @@ -183,7 +183,6 @@ void ScCsvTableBox::MakePosVisible( sal_Int32 nPos ) } } - // cell contents -------------------------------------------------------------- void ScCsvTableBox::SetUniStrings( @@ -205,7 +204,6 @@ void ScCsvTableBox::SetUniStrings( EnableRepaint(); } - // column settings ------------------------------------------------------------ void ScCsvTableBox::InitTypes( const ListBox& rListBox ) @@ -225,7 +223,6 @@ void ScCsvTableBox::FillColumnData( ScAsciiOptions& rOptions ) const maGrid.FillColumnDataSep( rOptions ); } - // event handling ------------------------------------------------------------- void ScCsvTableBox::Resize() @@ -409,7 +406,6 @@ IMPL_LINK( ScCsvTableBox, ScrollEndHdl, ScrollBar*, pScrollBar ) return 0; } - // accessibility -------------------------------------------------------------- ScCsvTableBox::XAccessibleRef ScCsvTableBox::CreateAccessible() @@ -423,5 +419,4 @@ ScAccessibleCsvControl* ScCsvTableBox::ImplCreateAccessible() return NULL; // not used, see CreateAccessible() } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dapidata.cxx b/sc/source/ui/dbgui/dapidata.cxx index 0bf9ae87f2a1..a8e4765c49f1 100644 --- a/sc/source/ui/dbgui/dapidata.cxx +++ b/sc/source/ui/dbgui/dapidata.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include <vcl/waitobj.hxx> #include <comphelper/processfactory.hxx> @@ -42,7 +39,6 @@ using namespace com::sun::star; #include "miscuno.hxx" #include "dpsdbtab.hxx" - // entries in the "type" ListBox #define DP_TYPELIST_TABLE 0 #define DP_TYPELIST_QUERY 1 @@ -185,5 +181,4 @@ void ScDataPilotDatabaseDlg::FillObjects() } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 894a56d54945..29c418d0cb30 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "dapitype.hxx" #include "scresid.hxx" #include "sc.hrc" diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index f4c0eb05c2ba..b49a148ecc63 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -32,7 +32,6 @@ #include "globalnames.hxx" #include "dbnamdlg.hxx" - #define ABS_SREF SCA_VALID \ | SCA_COL_ABSOLUTE | SCA_ROW_ABSOLUTE | SCA_TAB_ABSOLUTE #define ABS_DREF ABS_SREF \ @@ -45,7 +44,6 @@ static DBSaveData* pSaveObj = NULL; #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() - // class DBSaveData class DBSaveData @@ -85,8 +83,6 @@ private: bool bDirty:1; }; - - void DBSaveData::Save() { aArea = rCurArea; @@ -98,7 +94,6 @@ void DBSaveData::Save() bDirty = true; } - void DBSaveData::Restore() { if ( bDirty ) @@ -164,13 +159,11 @@ ScDbNameDlg::ScDbNameDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, SynFocusTimer.Start(); } - ScDbNameDlg::~ScDbNameDlg() { DELETEZ( pSaveObj ); } - void ScDbNameDlg::Init() { m_pBtnHeader->Check( true ); // Default: mit Spaltenkoepfen @@ -248,7 +241,6 @@ void ScDbNameDlg::Init() NameModifyHdl( 0 ); } - void ScDbNameDlg::SetInfoStrings( const ScDBData* pDBData ) { OUStringBuffer aBuf; @@ -269,7 +261,6 @@ void ScDbNameDlg::SetInfoStrings( const ScDBData* pDBData ) m_pFTOperations->SetText(aBuf.makeStringAndClear()); } - // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Fenster angezeigt wird. @@ -291,7 +282,6 @@ void ScDbNameDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - bool ScDbNameDlg::Close() { return DoClose( ScDbNameDlgWrapper::GetChildWindowId() ); @@ -368,16 +358,13 @@ void ScDbNameDlg::UpdateDBData( const OUString& rStrName ) m_pOptions->Enable(); } - bool ScDbNameDlg::IsRefInputMode() const { return bRefInputMode; } - // Handler: - IMPL_LINK_NOARG(ScDbNameDlg, OkBtnHdl) { AddBtnHdl( 0 ); diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 9d82cd9ca963..ce688274b838 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -17,12 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef SC_DLLIMPLEMENTATION #undef SC_DLLIMPLEMENTATION #endif - #include "dpgroupdlg.hxx" #include "scresid.hxx" #include "sc.hrc" @@ -148,7 +146,6 @@ void ScDPDateGroupEditHelper::ImplSetValue( double fValue ) mpEdValue->SetDate( aDate ); } - ScDPNumGroupDlg::ScDPNumGroupDlg( Window* pParent, const ScDPNumGroupInfo& rInfo ) : ModalDialog ( pParent, "PivotTableGroupByNumber", "modules/scalc/ui/groupbynumber.ui" ), mpRbAutoStart ( get<RadioButton>("auto_start") ), diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 7824f09de579..572e07e6b79d 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -41,7 +41,6 @@ #include <limits> - #define ERRORBOX(rid) ErrorBox( this, WinBits( WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString(rid) ).Execute() @@ -160,7 +159,6 @@ ScFilterDlg::ScFilterDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, } - ScFilterDlg::~ScFilterDlg() { delete pOptionsMgr; @@ -171,7 +169,6 @@ ScFilterDlg::~ScFilterDlg() delete pTimer; } - void ScFilterDlg::Init( const SfxItemSet& rArgSet ) { const ScQueryItem& rQueryItem = (const ScQueryItem&) @@ -382,7 +379,6 @@ void ScFilterDlg::Init( const SfxItemSet& rArgSet ) // SFX_APPWINDOW->Disable(false); //! general method in ScAnyRefDlg } - bool ScFilterDlg::Close() { if (pViewData) @@ -405,7 +401,6 @@ void ScFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - void ScFilterDlg::SetActive() { if ( bRefInputMode ) @@ -609,7 +604,6 @@ void ScFilterDlg::ClearValueList( size_t nList ) } } - size_t ScFilterDlg::GetFieldSelPos( SCCOL nField ) { if ( nField >= theQueryData.nCol1 && nField <= theQueryData.nCol2 ) @@ -661,7 +655,6 @@ ScQueryItem* ScFilterDlg::GetOutputItem() return pOutItem; } - bool ScFilterDlg::IsRefInputMode() const { return bRefInputMode; @@ -669,7 +662,6 @@ bool ScFilterDlg::IsRefInputMode() const // Handler: - IMPL_LINK( ScFilterDlg, EndDlgHdl, Button*, pBtn ) { if ( pBtn == pBtnOk ) @@ -734,7 +726,6 @@ IMPL_LINK( ScFilterDlg, TimeOutHdl, Timer*, _pTimer ) return 0; } - IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) { /* @@ -989,7 +980,6 @@ IMPL_LINK( ScFilterDlg, LbSelectHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) { // Column headers: @@ -1028,7 +1018,6 @@ IMPL_LINK( ScFilterDlg, CheckBoxHdl, CheckBox*, pBox ) return 0; } - IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) { size_t nOffset = GetSliderPos(); @@ -1113,7 +1102,6 @@ IMPL_LINK( ScFilterDlg, ValModifyHdl, ComboBox*, pEd ) return 0; } - IMPL_LINK_NOARG(ScFilterDlg, ScrollHdl) { SliderMoved(); diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index 3035cd8632c8..4ae721f66544 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -29,10 +29,8 @@ #include "foptmgr.hxx" - // ScFilterOptionsMgr (.ui's option helper) - ScFilterOptionsMgr::ScFilterOptionsMgr( ScViewData* ptrViewData, const ScQueryParam& refQueryData, @@ -68,7 +66,6 @@ ScFilterOptionsMgr::ScFilterOptionsMgr( Init(); } - ScFilterOptionsMgr::~ScFilterOptionsMgr() { sal_uInt16 nEntries = pLbCopyArea->GetEntryCount(); @@ -78,7 +75,6 @@ ScFilterOptionsMgr::~ScFilterOptionsMgr() delete (OUString*)pLbCopyArea->GetEntryData( i ); } - void ScFilterOptionsMgr::Init() { //moggi:TODO @@ -167,7 +163,6 @@ void ScFilterOptionsMgr::Init() pFtDbArea->SetText( OUString() ); } - // Kopierposition: if ( !rQueryData.bInplace ) @@ -213,7 +208,6 @@ bool ScFilterOptionsMgr::VerifyPosStr( const OUString& rPosStr ) const return ( SCA_VALID == (nResult & SCA_VALID) ); } - // Handler: IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) @@ -232,7 +226,6 @@ IMPL_LINK( ScFilterOptionsMgr, LbAreaSelHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) { if ( pEd == pEdCopyArea ) @@ -265,7 +258,6 @@ IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, Edit*, pEd ) return 0; } - IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, CheckBox*, pBox ) { if ( pBox == pBtnCopyResult ) diff --git a/sc/source/ui/dbgui/imoptdlg.cxx b/sc/source/ui/dbgui/imoptdlg.cxx index 39c44a3d702b..1f4c7ddf9e49 100644 --- a/sc/source/ui/dbgui/imoptdlg.cxx +++ b/sc/source/ui/dbgui/imoptdlg.cxx @@ -26,11 +26,9 @@ static const sal_Char pStrFix[] = "FIX"; - // Der Options-String darf kein Semikolon mehr enthalten (wegen Pickliste) // darum ab Version 336 Komma stattdessen - ScImportOptions::ScImportOptions( const OUString& rStr ) { // Use the same string format as ScAsciiOptions, diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 2133fc05f1b8..5ffa9fabadd5 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include <vcl/waitobj.hxx> @@ -408,10 +407,8 @@ const ScQueryItem& ScPivotFilterDlg::GetOutputItem() return *pOutItem; } - // Handler: - IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, ListBox*, pLb ) { /* @@ -551,5 +548,4 @@ IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, ComboBox*, pEd ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index b253b28d9a78..0d7de73194fd 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scitems.hxx" diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 9d6cb86a753e..512cc5578e3d 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "global.hxx" @@ -40,10 +39,8 @@ //! TODO make dynamic const SCSIZE ASCIIDLG_MAXROWS = MAXROWCOUNT; - using namespace com::sun::star::uno; - // Defines - CSV Import Preserve Options #define FIXED_WIDTH "FixedWidth" #define FROM_ROW "FromRow" @@ -452,13 +449,11 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent, const OUString& aDatName, } } - ScImportAsciiDlg::~ScImportAsciiDlg() { delete[] mpRowPosArray; } - bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText ) { if (nLine >= ASCIIDLG_MAXROWS || !mpDatStream) @@ -527,7 +522,6 @@ bool ScImportAsciiDlg::GetLine( sal_uLong nLine, OUString &rText ) return bRet; } - void ScImportAsciiDlg::GetOptions( ScAsciiOptions& rOpt ) { rOpt.SetCharSet( meCharSet ); @@ -623,7 +617,6 @@ void ScImportAsciiDlg::UpdateVertical() mpDatStream->SetStreamCharSet(meCharSet); } - IMPL_LINK( ScImportAsciiDlg, RbSepFixHdl, RadioButton*, pButton ) { OSL_ENSURE( pButton, "ScImportAsciiDlg::RbSepFixHdl - missing sender" ); diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 6333016fc1b9..b7d682a40211 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scuiimoptdlg.hxx" @@ -28,10 +27,8 @@ #include <osl/thread.h> #include <rtl/tencinfo.h> - // ScDelimiterTable - class ScDelimiterTable { public: @@ -99,10 +96,8 @@ OUString ScDelimiterTable::GetDelimiter( sal_Unicode nCode ) const return aStrDel; } - // ScImportOptionsDlg - ScImportOptionsDlg::ScImportOptionsDlg( Window* pParent, bool bAscii, diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index 98aa0b8f6733..620b54c1658e 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -48,7 +48,6 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi : ScAnyRefDlg ( pB, pCW, pParent, "AdvancedFilterDialog", "modules/scalc/ui/advancedfilterdialog.ui" ), - aStrUndefined ( SC_RESSTR(SCSTR_UNDEFINED) ), pOptionsMgr ( NULL ), nWhichQuery ( rArgSet.GetPool()->GetWhich( SID_QUERY ) ), @@ -96,7 +95,6 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi pEdCopyArea->SetAccessibleName(pBtnCopyResult->GetText()); } - ScSpecialFilterDlg::~ScSpecialFilterDlg() { sal_uInt16 nEntries = pLbFilterArea->GetEntryCount(); @@ -115,7 +113,6 @@ ScSpecialFilterDlg::~ScSpecialFilterDlg() delete pTimer; } - void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) { const ScQueryItem& rQueryItem = (const ScQueryItem&) @@ -195,7 +192,6 @@ void ScSpecialFilterDlg::Init( const SfxItemSet& rArgSet ) //SFX_APPWINDOW->Disable(false); //! allgemeine Methode im ScAnyRefDlg } - bool ScSpecialFilterDlg::Close() { if (pViewData) @@ -226,7 +222,6 @@ void ScSpecialFilterDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - void ScSpecialFilterDlg::SetActive() { if ( bRefInputMode ) @@ -249,7 +244,6 @@ void ScSpecialFilterDlg::SetActive() RefInputDone(); } - ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, const ScRange& rSource ) { @@ -260,7 +254,6 @@ ScQueryItem* ScSpecialFilterDlg::GetOutputItem( const ScQueryParam& rParam, return pOutItem; } - bool ScSpecialFilterDlg::IsRefInputMode() const { return bRefInputMode; @@ -268,7 +261,6 @@ bool ScSpecialFilterDlg::IsRefInputMode() const // Handler: - IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) { OSL_ENSURE( pDoc && pViewData, "Document or ViewData not found. :-/" ); @@ -385,7 +377,6 @@ IMPL_LINK( ScSpecialFilterDlg, EndDlgHdl, Button*, pBtn ) return 0; } - IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) { // alle 50ms nachschauen, ob RefInputMode noch stimmt @@ -414,7 +405,6 @@ IMPL_LINK( ScSpecialFilterDlg, TimeOutHdl, Timer*, _pTimer ) return 0; } - IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) { if ( pLb == pLbFilterArea ) @@ -431,7 +421,6 @@ IMPL_LINK( ScSpecialFilterDlg, FilterAreaSelHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScSpecialFilterDlg, FilterAreaModHdl, formula::RefEdit*, pEd ) { if ( pEd == pEdFilterArea ) diff --git a/sc/source/ui/dbgui/sortdlg.cxx b/sc/source/ui/dbgui/sortdlg.cxx index 3bc234fbe93c..8129dc42cd0d 100644 --- a/sc/source/ui/dbgui/sortdlg.cxx +++ b/sc/source/ui/dbgui/sortdlg.cxx @@ -17,10 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - #include <vcl/msgbox.hxx> #include "tpsort.hxx" #include "sortdlg.hxx" @@ -35,7 +33,6 @@ ScSortDlg::ScSortDlg(Window* pParent, const SfxItemSet* pArgSet) AddTabPage("options", ScTabPageSortOptions::Create, 0); } - ScSortWarningDlg::ScSortWarningDlg(Window* pParent, const OUString& rExtendText, const OUString& rCurrentText) : ModalDialog(pParent, "SortWarning", "modules/scalc/ui/sortwarning.ui") @@ -66,5 +63,4 @@ IMPL_LINK( ScSortWarningDlg, BtnHdl, PushButton*, pBtn ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/subtdlg.cxx b/sc/source/ui/dbgui/subtdlg.cxx index b5c9900930c2..b1fe324f3dca 100644 --- a/sc/source/ui/dbgui/subtdlg.cxx +++ b/sc/source/ui/dbgui/subtdlg.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "tpsubt.hxx" #include "scresid.hxx" #include "subtdlg.hxx" - ScSubTotalDlg::ScSubTotalDlg(Window* pParent, const SfxItemSet* pArgSet) : SfxTabDialog(pParent, "SubTotalDialog", "modules/scalc/ui/subtotaldialog.ui", pArgSet) diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index b9b35823185a..485dc48cbee1 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "textimportoptions.hxx" diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index d10ed8ae545f..5b805a505962 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include <vcl/msgbox.hxx> @@ -206,7 +205,6 @@ void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ ) for ( sal_uInt16 i=0; i<nSortKeyCount; i++ ) maSortKeyItems[i].m_pBtnUp->Check(); - maSortKeyItems[0].EnableField(); maSortKeyItems[1].EnableField(); for ( sal_uInt16 i=2; i<nSortKeyCount; i++ ) @@ -433,10 +431,8 @@ void ScTabPageSortFields::SetLastSortKey( sal_uInt16 nItem ) maSortKeyItems[nItem].m_pLbSort->SelectEntryPos( 0 ); } - // Handler: - IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) { OUString aSelEntry = pLb->GetSelectEntry(); @@ -479,10 +475,8 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, ListBox *, pLb ) return 0; } - // Sort option Tab Page: - ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, const SfxItemSet& rArgSet ) : SfxTabPage(pParent, "SortOptionsPage", @@ -554,7 +548,6 @@ void ScTabPageSortOptions::Init() OSL_ENSURE( pViewData, "ViewData not found! :-/" ); - if ( pViewData && pDoc ) { ScDBCollection* pDBColl = pDoc->GetDBCollection(); @@ -825,7 +818,6 @@ void ScTabPageSortOptions::FillUserSortListBox() } } - // Handler: IMPL_LINK( ScTabPageSortOptions, EnableHdl, CheckBox *, pBox ) @@ -949,5 +941,4 @@ IMPL_LINK_NOARG(ScTabPageSortOptions, FillAlgorHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index d1e7d10c5d17..264c61fe86ed 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -171,7 +171,6 @@ bool ScTpSubTotalGroup::DoFillItemSet( sal_uInt16 nGroupNo, && (mpLbFunctions->GetEntryCount() > 0), "Non-initialized Lists" ); - if ( (nGroupNo > 3) || (nGroupNo == 0) || (mpLbGroup->GetEntryCount() == 0) || (mpLbColumns->GetEntryCount() == 0) @@ -334,10 +333,8 @@ sal_uInt16 ScTpSubTotalGroup::FuncToLbPos( ScSubTotalFunc eFunc ) } } - // Handler: - IMPL_LINK( ScTpSubTotalGroup, SelectHdl, ListBox *, pLb ) { if ( (mpLbColumns->GetEntryCount() > 0) @@ -379,7 +376,6 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, ListBox *, pLb ) return 0; } - // Derived Group TabPages: SfxTabPage* ScTpSubTotalGroup1::Create( Window* pParent, @@ -406,7 +402,6 @@ ScTpSubTotalGroup3::ScTpSubTotalGroup3( Window* pParent, const SfxItemSet& rArgS ScTpSubTotalGroup( pParent, rArgSet ) {} - #define RESET(i) (ScTpSubTotalGroup::DoReset( (i), *rArgSet )) void ScTpSubTotalGroup1::Reset( const SfxItemSet* rArgSet ) { RESET(1); } void ScTpSubTotalGroup2::Reset( const SfxItemSet* rArgSet ) { RESET(2); } @@ -419,7 +414,6 @@ bool ScTpSubTotalGroup2::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(2); bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(3); } #undef FILL - // Optionen-Tabpage: ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, @@ -540,7 +534,6 @@ void ScTpSubTotalOptions::FillUserSortListBox() } } - // Handler: IMPL_LINK( ScTpSubTotalOptions, CheckHdl, CheckBox *, pBox ) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 99b757d5b541..92e8f6848cfb 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifdef SC_DLLIMPLEMENTATION #undef SC_DLLIMPLEMENTATION #endif @@ -72,7 +71,6 @@ #define SC_VALIDDLG_DATA_VALIDRANGE 6 #define SC_VALIDDLG_DATA_INVALIDRANGE 7 - static const sal_uInt16 pValueRanges[] = { FID_VALID_MODE, FID_VALID_ERRTEXT, @@ -80,7 +78,6 @@ static const sal_uInt16 pValueRanges[] = 0 }; - ScValidationDlg::ScValidationDlg(Window* pParent, const SfxItemSet* pArgSet, ScTabViewShell *pTabViewSh, SfxBindings *pB /*= NULL*/) : ScValidationDlgBase(pParent ? pParent : SFX_APP()->GetTopWindow(), @@ -273,7 +270,6 @@ void lclGetFormulaFromStringList( OUString& rFmlaStr, const OUString& rStringLis rFmlaStr = "\"\""; } - /** Converts formula with strings separated by semicolons to line feed separated string. @descr Keeps all empty strings. Ignores all empty tokens (multiple semicolons). Example: "abc";;;"def";"";"ghi" -> abc\ndef\n\nghi. @@ -644,7 +640,6 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl) return 0; } - // Input Help Page ScTPValidationHelp::ScTPValidationHelp( Window* pParent, diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx index 6bfb499821ae..7239ad0bf9e4 100644 --- a/sc/source/ui/docshell/arealink.cxx +++ b/sc/source/ui/docshell/arealink.cxx @@ -482,7 +482,6 @@ bool ScAreaLink::Refresh( const OUString& rNewFile, const OUString& rNewFilter, return bCanDo; } - IMPL_LINK_NOARG(ScAreaLink, RefreshHdl) { return long( diff --git a/sc/source/ui/docshell/autostyl.cxx b/sc/source/ui/docshell/autostyl.cxx index 5c9bdd8b2672..7873310fd4c5 100644 --- a/sc/source/ui/docshell/autostyl.cxx +++ b/sc/source/ui/docshell/autostyl.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <time.h> #include "attrib.hxx" @@ -216,5 +215,4 @@ IMPL_LINK_NOARG(ScAutoStyleList, TimerHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/datastream.cxx b/sc/source/ui/docshell/datastream.cxx index 84f4db54704f..5a196d406248 100644 --- a/sc/source/ui/docshell/datastream.cxx +++ b/sc/source/ui/docshell/datastream.cxx @@ -377,8 +377,6 @@ ScRange DataStream::GetRange() const return aRange; } - - void DataStream::Decode(const OUString& rURL, const ScRange& rRange, sal_Int32 nLimit, MoveType eMove, const sal_uInt32 nSettings) { diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx index d6c9a0df990a..0c8e5d1dc63c 100644 --- a/sc/source/ui/docshell/dbdocfun.cxx +++ b/sc/source/ui/docshell/dbdocfun.cxx @@ -485,7 +485,6 @@ bool ScDBDocFunc::Sort( SCTAB nTab, const ScSortParam& rSortParam, return false; } - // ausfuehren WaitObject aWait( rDocShell.GetActiveDialogParent() ); @@ -990,7 +989,6 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam, pOld, bDoSize, pAdvSource ) ); } - if (bCopy) { SCCOL nEndX = aLocalParam.nCol2; @@ -1739,5 +1737,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 8aec5c0c9feb..702b239da276 100644 --- a/sc/source/ui/docshell/dbdocimp.cxx +++ b/sc/source/ui/docshell/dbdocimp.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> - #include "dbdocfun.hxx" #include "docsh.hxx" #include "globstr.hrc" @@ -189,10 +188,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, ScDocument* pImportDoc = new ScDocument( SCDOCMODE_UNDO ); pImportDoc->InitUndo( &rDoc, nTab, nTab ); - // get data from database into import document - try { // progress bar @@ -216,7 +213,6 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, // set source parameters - sal_Int32 nType = rParam.bSql ? sdb::CommandType::COMMAND : ( (rParam.nType == ScDbQuery) ? sdb::CommandType::QUERY : sdb::CommandType::TABLE ); @@ -251,7 +247,6 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, // get column descriptions - long nColCount = 0; uno::Reference<sdbc::XResultSetMetaData> xMeta; uno::Reference<sdbc::XResultSetMetaDataSupplier> xMetaSupp( xRowSet, uno::UNO_QUERY ); @@ -398,10 +393,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, OSL_FAIL("Unexpected exception in database"); } - // test for cell protection - bool bKeepFormat = !bAddrInsert && pDBData->IsKeepFmt(); bool bMoveCells = !bAddrInsert && pDBData->IsDoSize(); SCCOL nFormulaCols = 0; // columns to be filled with formulas @@ -446,10 +439,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, } } - // copy data from import doc into real document - if ( bSuccess ) { if (bKeepFormat) @@ -486,10 +477,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, pImportDoc->ApplyPatternAreaTab( 0,0,MAXCOL,MAXROW, nTab, aPattern ); } - // copy old data for undo - SCCOL nUndoEndCol = std::max( nEndCol, rParam.nCol2 ); // rParam = old end SCROW nUndoEndRow = std::max( nEndRow, rParam.nRow2 ); @@ -526,10 +515,8 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, nCopyFlags, false, pUndoDoc ); } - // move new data - if (bMoveCells) { // clear only the range without the formulas, @@ -660,5 +647,4 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam, return bSuccess; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index fbac2b51c6ef..f45db67ef0b9 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -96,7 +96,6 @@ using namespace com::sun::star; using ::com::sun::star::uno::Sequence; using ::std::vector; - // STATIC DATA ----------------------------------------------------------- IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction ) @@ -162,7 +161,6 @@ bool ScDocFunc::AdjustRowHeight( const ScRange& rRange, bool bPaint ) return bChanged; } - bool ScDocFunc::DetectiveAddPred(const ScAddress& rPos) { ScDocShellModificator aModificator( rDocShell ); @@ -1113,7 +1111,6 @@ bool ScDocFunc::PutData( const ScAddress& rPos, ScEditEngineDefaulter& rEngine, return bRet; } - static ScTokenArray* lcl_ScDocFunc_CreateTokenArrayXML( const OUString& rText, const OUString& rFormulaNmsp, const formula::FormulaGrammar::Grammar eGrammar ) { ScTokenArray* pCode = new ScTokenArray; @@ -1341,7 +1338,6 @@ bool ScDocFunc::ApplyAttributes( const ScMarkData& rMark, const ScPatternAttr& r return true; } - bool ScDocFunc::ApplyStyle( const ScMarkData& rMark, const OUString& rStyleName, bool bRecord, bool bApi ) { @@ -2275,10 +2271,8 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark, } } - // ausfuehren - WaitObject aWait( rDocShell.GetActiveDialogParent() ); // wichtig wegen TrackFormulas bei UpdateReference ScDocument* pUndoDoc = NULL; @@ -2639,10 +2633,8 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, sal_uInt16 nDestExt = 0; rDocShell.UpdatePaintExt( nDestExt, nDestCol,nDestRow,nDestTab, nDestEndCol,nDestEndRow,nDestEndTab ); - // ausfuehren - ScDocument* pUndoDoc = NULL; ScDocument* pRefUndoDoc = NULL; ScRefUndoData* pUndoData = NULL; @@ -2728,7 +2720,6 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, rDoc.CopyFromClip( aPasteDest, aDestMark, IDF_ALL & ~(IDF_OBJECTS), NULL, pClipDoc, true, false, bIncludeFiltered ); - // skipped rows and merged cells don't mix if ( !bIncludeFiltered && pClipDoc->HasClipFilteredRows() ) UnmergeCells( aPasteDest, false ); @@ -2855,7 +2846,6 @@ bool ScDocFunc::MoveBlock( const ScRange& rSource, const ScAddress& rDestPos, return true; } - uno::Reference< uno::XInterface > GetDocModuleObject( SfxObjectShell& rDocSh, OUString& sCodeName ) { uno::Reference< lang::XMultiServiceFactory> xSF(rDocSh.GetModel(), uno::UNO_QUERY); @@ -2954,7 +2944,6 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ) } } - bool ScDocFunc::InsertTable( SCTAB nTab, const OUString& rName, bool bRecord, bool bApi ) { bool bSuccess = false; @@ -2964,7 +2953,6 @@ bool ScDocFunc::InsertTable( SCTAB nTab, const OUString& rName, bool bRecord, bo ScDocument& rDoc = rDocShell.GetDocument(); - // Strange loop, also basic is loaded too early ( InsertTable ) // is called via the xml import for sheets in described in ODF bool bInsertDocModule = false; @@ -3514,7 +3502,6 @@ bool ScDocFunc::SetWidthOrHeight( return bSuccess; } - bool ScDocFunc::InsertPageBreak( bool bColumn, const ScAddress& rPos, bool bRecord, bool bSetModified, bool /* bApi */ ) { @@ -4520,7 +4507,6 @@ bool ScDocFunc::FillAuto( ScRange& rRange, const ScMarkData* pTabMark, FillDir e ScRange aSourceArea = rRange; ScRange aDestArea = rRange; - switch (eDir) { case FILL_TO_BOTTOM: diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 8c1ea5b0b2db..1e5e4486c6c2 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -169,7 +169,6 @@ static const sal_Char pFilterRtf[] = "Rich Text Format (StarCalc)"; #define ScDocShell #include "scslots.hxx" - SFX_IMPL_INTERFACE(ScDocShell,SfxObjectShell, ScResId(SCSTR_DOCSHELL)) void ScDocShell::InitInterface_Impl() @@ -315,7 +314,6 @@ void ScDocShell::AfterXMLLoading(bool bRet) ++pNameBuffer; } - if( *pNameBuffer == SC_COMPILER_FILE_TAB_SEP ) // after the last quote of the docname should be the # char { sal_Int32 nIndex = nNameLength - nLinkTabNameLength; @@ -1503,7 +1501,6 @@ bool ScDocShell::ConvertFrom( SfxMedium& rMedium ) } FinishedLoading( SFX_LOADED_MAINDOCUMENT | SFX_LOADED_IMAGES ); - // invalidate eventually temporary table areas if ( bRet ) aDocument.InvalidateTableArea(); @@ -1554,7 +1551,6 @@ bool ScDocShell::LoadExternal( SfxMedium& rMed ) return false; } - ScDocShell::PrepareSaveGuard::PrepareSaveGuard( ScDocShell& rDocShell ) : mrDocShell( rDocShell) { @@ -1592,7 +1588,6 @@ ScDocShell::PrepareSaveGuard::~PrepareSaveGuard() } } - bool ScDocShell::Save() { ScRefreshTimerProtector aProt( aDocument.GetRefreshTimerControlAddress() ); @@ -1672,7 +1667,6 @@ bool ScDocShell::SaveAs( SfxMedium& rMedium ) return false; } - ScRefreshTimerProtector aProt( aDocument.GetRefreshTimerControlAddress() ); PrepareSaveGuard aPrepareGuard( *this); @@ -1696,7 +1690,6 @@ bool ScDocShell::SaveAs( SfxMedium& rMedium ) return bRet; } - bool ScDocShell::IsInformationLost() { //FIXME: If we have time build a correct own way how to handle this @@ -1717,7 +1710,6 @@ sal_Int32 lcl_ScDocShell_GetColWidthInChars( sal_uInt16 nWidth ) return sal_Int32( f ); } - void lcl_ScDocShell_GetFixedWidthString( OUString& rStr, const ScDocument& rDoc, SCTAB nTab, SCCOL nCol, bool bValue, SvxCellHorJustify eHorJust ) { @@ -1771,7 +1763,6 @@ void lcl_ScDocShell_GetFixedWidthString( OUString& rStr, const ScDocument& rDoc, rStr = aString; } - void lcl_ScDocShell_WriteEmptyFixedWidthString( SvStream& rStream, const ScDocument& rDoc, SCTAB nTab, SCCOL nCol ) { @@ -2452,7 +2443,6 @@ bool ScDocShell::SaveCompleted( const uno::Reference < embed::XStorage >& xStor return SfxObjectShell::SaveCompleted( xStor ); } - bool ScDocShell::DoSaveCompleted( SfxMedium * pNewStor ) { bool bRet = SfxObjectShell::DoSaveCompleted( pNewStor ); @@ -2462,7 +2452,6 @@ bool ScDocShell::DoSaveCompleted( SfxMedium * pNewStor ) return bRet; } - bool ScDocShell::QuerySlotExecutable( sal_uInt16 nSlotId ) { // #i112634# ask VBA event handlers whether to save or print the document @@ -2501,7 +2490,6 @@ bool ScDocShell::QuerySlotExecutable( sal_uInt16 nSlotId ) return bSlotExecutable; } - bool ScDocShell::PrepareClose( bool bUI ) { if(SC_MOD()->GetCurRefDlgId()>0) @@ -2568,7 +2556,6 @@ void ScDocShell::PrepareReload() aDocument.GetDocLinkManager().disconnectDdeLinks(); } - OUString ScDocShell::GetOwnFilterName() { return OUString(pFilterSc50); @@ -2777,7 +2764,6 @@ void ScDocShell::SetModified( bool bModified ) } } - void ScDocShell::SetDocumentModified( bool bIsModified /* = true */ ) { // BroadcastUno must also happen right away with pPaintLockData @@ -2880,7 +2866,6 @@ void ScDocShell::SetInUndo(bool bSet) bIsInUndo = bSet; } - void ScDocShell::GetDocStat( ScDocStat& rDocStat ) { SfxPrinter* pPrinter = GetPrinter(); @@ -2894,7 +2879,6 @@ void ScDocShell::GetDocStat( ScDocStat& rDocStat ) (sal_uInt16) ScPrintFunc( this, pPrinter, i ).GetTotalPages() ); } - SfxDocumentInfoDialog* ScDocShell::CreateDocumentInfoDialog( Window *pParent, const SfxItemSet &rSet ) { @@ -3077,7 +3061,6 @@ ScDocShellModificator::ScDocShellModificator( ScDocShell& rDS ) rDoc.EnableIdle(false); } - ScDocShellModificator::~ScDocShellModificator() { ScDocument& rDoc = rDocShell.GetDocument(); @@ -3087,7 +3070,6 @@ ScDocShellModificator::~ScDocShellModificator() rDoc.EnableIdle(bIdleEnabled); } - void ScDocShellModificator::SetDocumentModified() { ScDocument& rDoc = rDocShell.GetDocument(); @@ -3114,7 +3096,6 @@ bool ScDocShell::IsChangeRecording() const return pChangeTrack != NULL; } - bool ScDocShell::HasChangeRecordProtection() const { bool bRes = false; @@ -3124,7 +3105,6 @@ bool ScDocShell::HasChangeRecordProtection() const return bRes; } - void ScDocShell::SetChangeRecording( bool bActivate ) { bool bOldChangeRecording = IsChangeRecording(); @@ -3152,7 +3132,6 @@ void ScDocShell::SetChangeRecording( bool bActivate ) } } - bool ScDocShell::SetProtectionPassword( const OUString &rNewPassword ) { bool bRes = false; @@ -3186,7 +3165,6 @@ bool ScDocShell::SetProtectionPassword( const OUString &rNewPassword ) return bRes; } - bool ScDocShell::GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) { bool bRes = false; diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 216599f8c43b..a7047fa504f3 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -60,8 +60,6 @@ bool ScDocShell::InitNew( const uno::Reference < embed::XStorage >& xStor ) return bRet; } - - void ScDocShell::SetEmpty(bool bSet) { bIsEmpty = bSet; @@ -146,12 +144,10 @@ void ScDocShell::Activate() { } - 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 d7862d17195e..e3eb97b3ecf5 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -127,7 +127,6 @@ void ScDocShell::PostPaint( const ScRangeList& rRanges, sal_uInt16 nPart, sal_uI continue; } - if (nExtFlags & SC_PF_LINES) // Platz fuer Linien beruecksichtigen { //! Abfrage auf versteckte Spalten/Zeilen! @@ -802,7 +801,6 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck //! Abfrage, ob die Dokumente vor dem Change-Tracking gleich waren !!! - const ScChangeAction* pFirstMergeAction = pSourceAction; const ScChangeAction* pFirstSearchAction = pThisAction; diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 04751134d07b..0f5a9cffdab5 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -112,7 +112,6 @@ using namespace ::com::sun::star; #define SC_PREVIEW_SIZE_X 10000 #define SC_PREVIEW_SIZE_Y 12400 - void ScDocShell::Execute( SfxRequest& rReq ) { // SID_SC_RANGE (Range), @@ -542,7 +541,6 @@ void ScDocShell::Execute( SfxRequest& rReq ) } break; - case SID_AUTO_STYLE: OSL_FAIL("use ScAutoStyleHint instead of SID_AUTO_STYLE"); break; @@ -1105,7 +1103,6 @@ void ScDocShell::Execute( SfxRequest& rReq ) } } - void UpdateAcceptChangesDialog() { // update "accept changes" dialog @@ -1182,7 +1179,6 @@ bool ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, bool bJustQuer return bDone; } - void ScDocShell::DoRecalc( bool bApi ) { bool bDone = false; @@ -1849,11 +1845,9 @@ void ScDocShell::GetSbxState( SfxItemSet &rSet ) // SID_TABLES_GET (Tables), // SID_PIVOT_GET (DataPilotTables) - removed (old Basic) - // Wenn hier Slots von der View-Shell executed werden, muss auch der // GetState weitergeleitet werden! - ScTabViewShell* pVisibleSh = GetBestViewShell(); // sichtbare View if ( pVisibleSh ) pVisibleSh->GetState( rSet ); @@ -1998,7 +1992,6 @@ void SnapVer( const ScDocument& rDoc, SCTAB nTab, long& rVal, SCROW& rStartRow ) rStartRow = nRow; } - } void ScDocShell::SnapVisArea( Rectangle& rRect ) const diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 88cab9572471..d9ba6d37c5e8 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -66,10 +66,8 @@ using com::sun::star::uno::UNO_QUERY; using ::std::auto_ptr; using ::std::vector; - // former viewfunc/dbfunc methods - void ScDocShell::ErrorMessage( sal_uInt16 nGlobStrId ) { //! StopMarking an der (aktiven) View? @@ -367,7 +365,6 @@ void ScDocShell::CancelAutoDBRange() } } - // Hoehen anpassen //! mit docfunc zusammenfassen @@ -986,7 +983,6 @@ bool ScDocShell::MoveTable( SCTAB nSrcTab, SCTAB nDestTab, bool bCopy, bool bRec return true; } - IMPL_LINK( ScDocShell, RefreshDBDataHdl, ScRefreshTimer*, pRefreshTimer ) { ScDBDocFunc aFunc(*this); diff --git a/sc/source/ui/docshell/docsh6.cxx b/sc/source/ui/docshell/docsh6.cxx index 1e21b7541ea7..c6b3dc600c20 100644 --- a/sc/source/ui/docshell/docsh6.cxx +++ b/sc/source/ui/docshell/docsh6.cxx @@ -66,10 +66,8 @@ struct ScStylePair // STATIC DATA ----------------------------------------------------------- - // Ole - void ScDocShell::SetVisArea( const Rectangle & rVisArea ) { // with the SnapVisArea call in SetVisAreaOrSize, it's safe to always @@ -214,16 +212,13 @@ void ScDocShell::UpdateOle( const ScViewData* pViewData, bool bSnapSize ) SetVisAreaOrSize( aNewArea, true ); // hier muss auch der Start angepasst werden } - // Style-Krempel fuer Organizer etc. - SfxStyleSheetBasePool* ScDocShell::GetStyleSheetPool() { return (SfxStyleSheetBasePool*)aDocument.GetStyleSheetPool(); } - // nach dem Laden von Vorlagen aus einem anderen Dokment (LoadStyles, Insert) // muessen die SetItems (ATTR_PAGE_HEADERSET, ATTR_PAGE_FOOTERSET) auf den richtigen // Pool umgesetzt werden, bevor der Quell-Pool geloescht wird. @@ -336,7 +331,6 @@ void ScDocShell::LoadStylesArgs( ScDocShell& rSource, bool bReplace, bool bCellS PostPaint( 0,0,0, MAXCOL,MAXROW,MAXTAB, PAINT_GRID | PAINT_LEFT ); // Paint } - void ScDocShell::ReconnectDdeLink(SfxObjectShell& rServer) { ::sfx2::LinkManager* pLinkManager = aDocument.GetLinkManager(); diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index a37f78fdbc30..570e0d605dc0 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -152,7 +152,6 @@ namespace #endif // HAVE_FEATURE_DBCONNECTIVITY - // MoveFile/KillFile/IsDocument: similar to SfxContentHelper bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& rDestObj ) @@ -199,7 +198,6 @@ bool ScDocShell::MoveFile( const INetURLObject& rSourceObj, const INetURLObject& return bRet; } - bool ScDocShell::KillFile( const INetURLObject& rURL ) { bool bRet = true; diff --git a/sc/source/ui/docshell/externalrefmgr.cxx b/sc/source/ui/docshell/externalrefmgr.cxx index 5269d78b58c4..f251164af674 100644 --- a/sc/source/ui/docshell/externalrefmgr.cxx +++ b/sc/source/ui/docshell/externalrefmgr.cxx @@ -274,7 +274,6 @@ void ScExternalRefCache::Table::setReferenced( bool bReferenced ) meReferenced = (bReferenced ? REFERENCED_MARKED : UNREFERENCED); } - bool ScExternalRefCache::Table::isReferenced() const { return meReferenced != UNREFERENCED; @@ -1103,7 +1102,6 @@ void ScExternalRefCache::addCacheDocToReferenced( sal_uInt16 nFileId ) } } - void ScExternalRefCache::getAllCachedDataSpans( sal_uInt16 nFileId, sc::ColumnSpanSet& rSet ) const { const DocItem* pDocItem = getDocItem(nFileId); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 9882966a1992..4b252823c549 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2140,7 +2140,6 @@ bool ScImportExport::RTF2Doc( SvStream& rStrm, const OUString& rBaseURL ) return bOk; } - bool ScImportExport::HTML2Doc( SvStream& rStrm, const OUString& rBaseURL ) { ScEEAbsImport *pImp = ScFormatFilter::Get().CreateHTMLImport( pDoc, rBaseURL, aRange, true); diff --git a/sc/source/ui/docshell/macromgr.cxx b/sc/source/ui/docshell/macromgr.cxx index b4e0e336d82c..c17c0b7563f9 100644 --- a/sc/source/ui/docshell/macromgr.cxx +++ b/sc/source/ui/docshell/macromgr.cxx @@ -89,7 +89,6 @@ private: ModuleCellMap maCells; }; - 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 3aa5cf6b0c64..9def268ed97a 100644 --- a/sc/source/ui/docshell/olinefun.cxx +++ b/sc/source/ui/docshell/olinefun.cxx @@ -27,7 +27,6 @@ #include "globstr.hrc" #include "sc.hrc" - static void lcl_InvalidateOutliner( SfxBindings* pBindings ) { if ( pBindings ) @@ -752,6 +751,4 @@ bool ScOutlineDocFunc::HideOutline( SCTAB nTab, bool bColumns, sal_uInt16 nLevel return true; //! immer ??? } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/pntlock.cxx b/sc/source/ui/docshell/pntlock.cxx index 58a31495fbfa..81813b71567e 100644 --- a/sc/source/ui/docshell/pntlock.cxx +++ b/sc/source/ui/docshell/pntlock.cxx @@ -40,5 +40,4 @@ void ScPaintLockData::AddRange( const ScRange& rRange, sal_uInt16 nP ) nParts |= 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 416e6359311e..b23f9c751930 100644 --- a/sc/source/ui/docshell/servobj.cxx +++ b/sc/source/ui/docshell/servobj.cxx @@ -254,6 +254,4 @@ void ScServerObject::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SvLinkSource::NotifyDataChanged(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index a13a09fa0527..892cc1d2008f 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "document.hxx" @@ -28,7 +27,6 @@ // Dokumentinfo-Tabpage: - SfxTabPage* ScDocStatPage::Create( Window *pParent, const SfxItemSet* rSet ) { return new ScDocStatPage( pParent, *rSet ); @@ -69,5 +67,4 @@ 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 3cc796f5e057..aec10e8b2905 100644 --- a/sc/source/ui/drawfunc/drawsh.cxx +++ b/sc/source/ui/drawfunc/drawsh.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> @@ -182,7 +181,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) break; } - return; } @@ -291,7 +289,6 @@ void ScDrawShell::ExecDrawAttr( SfxRequest& rReq ) } } - } else pView->SetGeoAttrToMarked( *pArgs ); @@ -417,7 +414,6 @@ void ScDrawShell::ExecuteAreaDlg( SfxRequest& rReq, sal_uInt16 nTabPage ) if( bHasMarked ) pView->MergeAttrFromMarked( aNewAttr, false ); - SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); boost::scoped_ptr<AbstractSvxAreaTabDialog> pDlg(pFact->CreateSvxAreaTabDialog( pViewData->GetDialogParent(), &aNewAttr, diff --git a/sc/source/ui/drawfunc/drawsh2.cxx b/sc/source/ui/drawfunc/drawsh2.cxx index afc1ecde5308..311c1f129865 100644 --- a/sc/source/ui/drawfunc/drawsh2.cxx +++ b/sc/source/ui/drawfunc/drawsh2.cxx @@ -51,12 +51,10 @@ #include <boost/bind.hpp> - sal_uInt16 ScGetFontWorkId(); // in drtxtob using namespace com::sun::star; - ScDrawShell::ScDrawShell( ScViewData* pData ) : SfxShell(pData->GetViewShell()), pViewData( pData ), @@ -281,10 +279,8 @@ void ScDrawShell::GetDrawFuncState( SfxItemSet& rSet ) // Funktionen disabl svx::FontworkBar::getState( pView, rSet ); } - // Attribute fuer Drawing-Objekte - void ScDrawShell::GetDrawAttrState( SfxItemSet& rSet ) { Point aMousePos = pViewData->GetMousePosPixel(); @@ -396,7 +392,6 @@ void ScDrawShell::GetDrawAttrStateForIFBX( SfxItemSet& rSet ) } } - void ScDrawShell::Activate (const bool bMDI) { (void)bMDI; @@ -407,7 +402,6 @@ void ScDrawShell::Activate (const bool bMDI) GetSidebarContextName())); } - ::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 16976c0b2489..0f59e0597951 100644 --- a/sc/source/ui/drawfunc/drawsh4.cxx +++ b/sc/source/ui/drawfunc/drawsh4.cxx @@ -31,7 +31,6 @@ #include "tabvwsh.hxx" #include "sc.hrc" - void ScDrawShell::GetFormTextState(SfxItemSet& rSet) { const SdrObject* pObj = NULL; diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx index 62417f593359..77058fa448c3 100644 --- a/sc/source/ui/drawfunc/drawsh5.cxx +++ b/sc/source/ui/drawfunc/drawsh5.cxx @@ -241,10 +241,8 @@ void ScDrawShell::ExecuteHLink( SfxRequest& rReq ) sal_uInt16 ScGetFontWorkId(); - // Funktionen auf Drawing-Objekten - void ScDrawShell::ExecDrawFunc( SfxRequest& rReq ) { SfxBindings& rBindings = pViewData->GetBindings(); @@ -700,5 +698,4 @@ ScDrawView* ScDrawShell::GetDrawView() return pViewData->GetView()->GetScDrawView(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx index 6842f494f750..8c93b92a417c 100644 --- a/sc/source/ui/drawfunc/drformsh.cxx +++ b/sc/source/ui/drawfunc/drformsh.cxx @@ -40,7 +40,6 @@ #define ScDrawFormShell #include "scslots.hxx" - SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell, ScResId(SCSTR_DRAWFORMSHELL)) void ScDrawFormShell::InitInterface_Impl() diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx index a437078f74f8..b88b982fce42 100644 --- a/sc/source/ui/drawfunc/drtxtob1.cxx +++ b/sc/source/ui/drawfunc/drtxtob1.cxx @@ -41,7 +41,6 @@ #include "scabstdlg.hxx" #include <boost/scoped_ptr.hpp> - bool ScDrawTextObjectBar::ExecuteCharDlg( const SfxItemSet& rArgs, SfxItemSet& rOutSet , sal_uInt16 nSlot) { @@ -135,5 +134,4 @@ void ScDrawTextObjectBar::ExecutePasteContents( SfxRequest & /* rReq */ ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/drtxtob2.cxx b/sc/source/ui/drawfunc/drtxtob2.cxx index dc9d1ba1179e..1aaebbfc58ac 100644 --- a/sc/source/ui/drawfunc/drtxtob2.cxx +++ b/sc/source/ui/drawfunc/drtxtob2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <editeng/adjustitem.hxx> #include <svx/drawitem.hxx> @@ -265,5 +264,4 @@ void ScDrawTextObjectBar::GetFormTextState(SfxItemSet& rSet) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx index 7d602becbe51..1ded6ea6741d 100644 --- a/sc/source/ui/drawfunc/fuconarc.cxx +++ b/sc/source/ui/drawfunc/fuconarc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconarc.hxx" #include "sc.hrc" #include "tabvwsh.hxx" @@ -217,5 +216,4 @@ SdrObject* FuConstArc::CreateDefaultObject(const sal_uInt16 nID, const Rectangle return pObj; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 8be1cc551d81..9acf314744d7 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconcustomshape.hxx" #include <editeng/svxenum.hxx> #include <svx/gallery.hxx> diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx index 12183dd164bf..250e54cc6322 100644 --- a/sc/source/ui/drawfunc/fuconpol.cxx +++ b/sc/source/ui/drawfunc/fuconpol.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconpol.hxx" #include "tabvwsh.hxx" #include "sc.hrc" diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx index 0ece581285ef..7d08431a6145 100644 --- a/sc/source/ui/drawfunc/fuconrec.cxx +++ b/sc/source/ui/drawfunc/fuconrec.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconrec.hxx" #include "tabvwsh.hxx" #include "sc.hrc" @@ -32,7 +31,6 @@ #include "scresid.hxx" - /************************************************************************* |* |* Konstruktor diff --git a/sc/source/ui/drawfunc/fuconstr.cxx b/sc/source/ui/drawfunc/fuconstr.cxx index 2aff287c54b2..4d7f695cd499 100644 --- a/sc/source/ui/drawfunc/fuconstr.cxx +++ b/sc/source/ui/drawfunc/fuconstr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <editeng/outliner.hxx> #include <editeng/outlobj.hxx> #include <svx/svdotext.hxx> @@ -364,5 +363,4 @@ void FuConstruct::Deactivate() FuDraw::Deactivate(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuconuno.cxx b/sc/source/ui/drawfunc/fuconuno.cxx index d9bb3a57fb8f..94419c60eb51 100644 --- a/sc/source/ui/drawfunc/fuconuno.cxx +++ b/sc/source/ui/drawfunc/fuconuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "fuconuno.hxx" #include "tabvwsh.hxx" #include "sc.hrc" @@ -184,5 +183,4 @@ SdrObject* FuConstUnoControl::CreateDefaultObject(const sal_uInt16 /* nID */, co return pObj; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx index 1c44ded93288..df225de294d3 100644 --- a/sc/source/ui/drawfunc/fuins1.cxx +++ b/sc/source/ui/drawfunc/fuins1.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/opengrf.hxx> #include <svx/svdograf.hxx> #include <svx/svdomedia.hxx> @@ -42,7 +41,6 @@ #include "sc.hrc" #include "globstr.hrc" - using namespace ::com::sun::star; void SC_DLLPUBLIC ScLimitSizeOnDrawPage( Size& rSize, Point& rPos, const Size& rPage ) diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index f91725ff81f1..306500176f09 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -212,7 +212,6 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie OUString aIconMediaType; uno::Reference< io::XInputStream > xIconMetaFile; - sal_uInt16 nSlot = rReq.GetSlot(); SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, false ); if ( nSlot == SID_INSERT_OBJECT && pNameItem ) @@ -485,7 +484,6 @@ FuInsertChart::FuInsertChart(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pViewSh->GetViewData().GetView()->Unmark(); } - // adapted old code pView->UnmarkAll(); @@ -838,5 +836,4 @@ void FuInsertChartFromFile::Deactivate() FuPoor::Deactivate(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 07ce80ef9831..5d5b4ebd8867 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <editeng/outliner.hxx> #include <svx/svditer.hxx> #include <svx/svdobj.hxx> diff --git a/sc/source/ui/drawfunc/fusel.cxx b/sc/source/ui/drawfunc/fusel.cxx index 904ef4e301fb..c2e87ef4dc7e 100644 --- a/sc/source/ui/drawfunc/fusel.cxx +++ b/sc/source/ui/drawfunc/fusel.cxx @@ -519,10 +519,8 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) { sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier(); - // OLE: aktivieren - if (nSdrObjKind == OBJ_OLE2) { if (!bOle) @@ -534,7 +532,6 @@ bool FuSelection::MouseButtonUp(const MouseEvent& rMEvt) } } - // Edit text // not in UNO controls // #i32352# not in media objects @@ -613,7 +610,6 @@ bool FuSelection::KeyInput(const KeyEvent& rKEvt) return FuDraw::KeyInput(rKEvt); } - /************************************************************************* |* |* Function aktivieren diff --git a/sc/source/ui/drawfunc/fusel2.cxx b/sc/source/ui/drawfunc/fusel2.cxx index 75efe90b36ab..82cb880c0ab9 100644 --- a/sc/source/ui/drawfunc/fusel2.cxx +++ b/sc/source/ui/drawfunc/fusel2.cxx @@ -161,7 +161,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 8afd5210c215..d191218ccb5a 100644 --- a/sc/source/ui/drawfunc/futext.cxx +++ b/sc/source/ui/drawfunc/futext.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svddef.hxx> #include <svx/svdoutl.hxx> #include <editeng/outlobj.hxx> @@ -344,7 +343,6 @@ bool FuText::MouseButtonDown(const MouseEvent& rMEvt) } } - if (!bIsInDragMode) { pWindow->CaptureMouse(); @@ -616,7 +614,6 @@ void FuText::Activate() FuConstruct::Activate(); } - /************************************************************************* |* |* Function deaktivieren @@ -630,7 +627,6 @@ void FuText::Deactivate() StopEditMode(); } - /************************************************************************* |* |* Selektion hat sich geaendert diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx index 884d89fbf965..02bce31804f2 100644 --- a/sc/source/ui/drawfunc/futext3.cxx +++ b/sc/source/ui/drawfunc/futext3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <editeng/editeng.hxx> #include <editeng/outlobj.hxx> #include <svx/svdocapt.hxx> @@ -44,13 +43,11 @@ #include "drawview.hxx" #include "undocell.hxx" - // Editieren von Notiz-Legendenobjekten muss immer ueber StopEditMode beendet werden, // damit die Aenderungen ins Dokument uebernommen werden! // (Fontwork-Execute in drawsh und drtxtob passiert nicht fuer Legendenobjekte) // bTextDirection=sal_True means that this function is called from SID_TEXTDIRECTION_XXX(drtxtob.cxx). - void FuText::StopEditMode(bool /*bTextDirection*/) { SdrObject* pObject = pView->GetTextEditObject(); diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx index ac8ef7f6ebd5..a7c4e22546ab 100644 --- a/sc/source/ui/drawfunc/mediash.cxx +++ b/sc/source/ui/drawfunc/mediash.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/app.hxx> #include <sfx2/objface.hxx> #include <sfx2/request.hxx> diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx index 99d9f03dec1d..86212211291e 100644 --- a/sc/source/ui/drawfunc/oleobjsh.cxx +++ b/sc/source/ui/drawfunc/oleobjsh.cxx @@ -40,7 +40,6 @@ #define ScOleObjectShell #include "scslots.hxx" - SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell, ScResId(SCSTR_OLEOBJECTSHELL)) void ScOleObjectShell::InitInterface_Impl() diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 7099fa37ea14..cfa8ee599ceb 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/string.hxx> #include <editeng/editview.hxx> #include <sfx2/bindings.hxx> @@ -193,7 +192,6 @@ void ScFunctionDockWin::InitLRUList() ScFunctionMgr* pFuncMgr = ScGlobal::GetStarCalcFunctionMgr(); pFuncMgr->fillLastRecentlyUsedFunctions(aLRUList); - sal_Int32 nSelPos = aCatBox.GetSelectEntryPos(); if(nSelPos == 0) @@ -223,7 +221,6 @@ void ScFunctionDockWin::UpdateLRUList() } } - /************************************************************************* #* Member: SetSize #*------------------------------------------------------------------------ @@ -253,7 +250,6 @@ void ScFunctionDockWin::SetSize() case SFX_ALIGN_TOOLBOXTOP: case SFX_ALIGN_TOOLBOXBOTTOM: - nNewDockMode=1; if(nDockMode!=nNewDockMode) { @@ -334,7 +330,6 @@ void ScFunctionDockWin::SetLeftRightSize() GetOutputSizePixel().Height()-2*aTxtSize.Height()); aPrivatSplit.SetYRange(aYRange); - if(aOldSize.Width()!=aNewSize.Width()) SetMyWidthLeRi(aNewSize); @@ -642,7 +637,6 @@ bool ScFunctionDockWin::Close() return true; } - /************************************************************************* #* Member: CheckAlignment #*------------------------------------------------------------------------ @@ -723,7 +717,6 @@ void ScFunctionDockWin::Notify( SfxBroadcaster&, const SfxHint& /* rHint */ ) { } - /************************************************************************* #* Member: Resize #*------------------------------------------------------------------------ @@ -928,7 +921,6 @@ void ScFunctionDockWin::DoEnter() pShellWnd->GrabFocus(); } - } /************************************************************************* @@ -959,7 +951,6 @@ IMPL_LINK( ScFunctionDockWin, SelHdl, ListBox*, pLb ) SetDescription(); } - //SetSize(); return 0; } @@ -987,7 +978,6 @@ IMPL_LINK( ScFunctionDockWin, SetSelectionHdl, void*, pCtrl ) DoEnter(); // Uebernimmt die Eingabe } - return 0; } @@ -1023,7 +1013,6 @@ IMPL_LINK( ScFunctionDockWin, SetSplitHdl, ScPrivatSplit*, pCtrl ) aFiFuncDesc.SetSizePixel(aFDSize); } - return 0; } @@ -1122,5 +1111,4 @@ void ScFunctionDockWin::StateChanged( StateChangedType nStateChange ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 3dbe12584259..e12f796451e4 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -55,17 +55,14 @@ #include <com/sun/star/table/CellAddress.hpp> - using namespace formula; using namespace com::sun::star; ScDocument* ScFormulaDlg::pDoc = NULL; ScAddress ScFormulaDlg::aCursorPos; - // Initialisierung / gemeinsame Funktionen fuer Dialog - ScFormulaDlg::ScFormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* pViewData,formula::IFunctionManager* _pFunctionMgr ) : formula::FormulaDlg( pB, pCW, pParent, true,true,true, _pFunctionMgr,this) @@ -292,18 +289,15 @@ ScInputHandler* ScFormulaDlg::GetNextInputHandler(ScDocShell* pDocShell,PtrTabVi pFrame = SfxViewFrame::GetNext( *pFrame, pDocShell ); } - return pHdl; } - bool ScFormulaDlg::Close() { DoEnter(false); return true; } - // Funktionen fuer rechte Seite bool ScFormulaDlg::calculateValue( const OUString& rStrExp, OUString& rStrResult ) diff --git a/sc/source/ui/formdlg/privsplt.cxx b/sc/source/ui/formdlg/privsplt.cxx index 2b8e5ab61d2f..b61c2af24842 100644 --- a/sc/source/ui/formdlg/privsplt.cxx +++ b/sc/source/ui/formdlg/privsplt.cxx @@ -65,7 +65,6 @@ ScPrivatSplit::ScPrivatSplit(Window* pParent, const ResId& rResId, SetPointer(aWinPointer); } - /************************************************************************* #* Member: MouseButtonDown #*------------------------------------------------------------------------ @@ -336,7 +335,6 @@ void ScPrivatSplit::MoveSplitTo(Point aPos) CtrModified(); } - void ScPrivatSplit::ImplInitSettings( bool bFont, bool bForeground, bool bBackground ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); @@ -403,5 +401,4 @@ void ScPrivatSplit::DataChanged( const DataChangedEvent& rDCEvt ) Window::DataChanged( rDCEvt ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleCell.hxx b/sc/source/ui/inc/AccessibleCell.hxx index 540f8231ffc9..01cfd99f858b 100644 --- a/sc/source/ui/inc/AccessibleCell.hxx +++ b/sc/source/ui/inc/AccessibleCell.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLECELL_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLECELL_HXX @@ -186,7 +185,6 @@ private: bool IsDropdown(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleCellBase.hxx b/sc/source/ui/inc/AccessibleCellBase.hxx index 8445a52ea116..09781152d7c2 100644 --- a/sc/source/ui/inc/AccessibleCellBase.hxx +++ b/sc/source/ui/inc/AccessibleCellBase.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLECELLBASE_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLECELLBASE_HXX diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 8fa0a696525b..04d867e227e3 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLECONTEXTBASE_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLECONTEXTBASE_HXX @@ -36,7 +35,6 @@ #include <osl/mutex.hxx> #include <cppuhelper/interfacecontainer.h> - #include <svl/lstner.hxx> #include <cppuhelper/compbase5.hxx> #include <cppuhelper/implbase1.hxx> @@ -326,7 +324,6 @@ private: sal_Int16 maRole; }; - #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 1c95dfbf2155..fc0b6ce0244c 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -31,7 +31,6 @@ #include <comphelper/uno3.hxx> #include "AccessibleContextBase.hxx" - class ScCsvControl; namespace utl { class AccessibleStateSetHelper; } @@ -121,7 +120,6 @@ protected: Point implGetAbsPos( const Point& rPos ) const; }; - class ScCsvRuler; typedef ::cppu::ImplHelper1< @@ -292,7 +290,6 @@ private: sal_Int32 implGetLastEqualFormatted( sal_Int32 nApiPos ); }; - class ScCsvGrid; typedef ::cppu::ImplHelper2< @@ -535,7 +532,6 @@ private: ScAccessibleCsvControl* implCreateCellObj( sal_Int32 nRow, sal_Int32 nColumn ) const; }; - /** Accessible class representing a cell of the CSV grid control. */ class ScAccessibleCsvCell : public ScAccessibleCsvControl, public accessibility::AccessibleStaticTextBase { @@ -637,7 +633,6 @@ private: ::std::auto_ptr< SvxEditSource > implCreateEditSource(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleDocument.hxx b/sc/source/ui/inc/AccessibleDocument.hxx index f1da4604a879..8865fcf8ec9f 100644 --- a/sc/source/ui/inc/AccessibleDocument.hxx +++ b/sc/source/ui/inc/AccessibleDocument.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEDOCUMENT_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEDOCUMENT_HXX @@ -66,7 +65,6 @@ public: virtual void Init() SAL_OVERRIDE; - DECL_LINK( WindowChildEventListener, VclSimpleEvent* ); protected: virtual ~ScAccessibleDocument(void); @@ -338,7 +336,6 @@ protected: void SwitchViewFireFocus() SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleDocumentBase.hxx b/sc/source/ui/inc/AccessibleDocumentBase.hxx index 1162f2ab5116..7ab210daf913 100644 --- a/sc/source/ui/inc/AccessibleDocumentBase.hxx +++ b/sc/source/ui/inc/AccessibleDocumentBase.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEDOCUMENTBASE_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEDOCUMENTBASE_HXX @@ -36,7 +35,6 @@ protected: virtual ~ScAccessibleDocumentBase (void); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx index 5c90451eacef..6aa038504325 100644 --- a/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx +++ b/sc/source/ui/inc/AccessibleDocumentPagePreview.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEDOCUMENTPAGEPREVIEW_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEDOCUMENTPAGEPREVIEW_HXX @@ -144,7 +143,6 @@ private: ScShapeChildren* GetShapeChildren(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index afe5c93a4b7c..2339a7b35d4a 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEEDITOBJECT_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEEDITOBJECT_HXX @@ -201,7 +200,6 @@ private: ScDocument *m_pScDoc; ScAddress m_curCellAddress; - ///===== XAccessibleComponent ============================================ virtual sal_Int32 SAL_CALL getForeground( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; @@ -212,7 +210,6 @@ private: sal_Int32 GetFgBgColor( const rtl::OUString &strPropColor) ; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessiblePageHeader.hxx b/sc/source/ui/inc/AccessiblePageHeader.hxx index 2a744f7bc3a9..2e1739db3757 100644 --- a/sc/source/ui/inc/AccessiblePageHeader.hxx +++ b/sc/source/ui/inc/AccessiblePageHeader.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPAGEHEADER_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPAGEHEADER_HXX @@ -99,7 +98,6 @@ private: void AddChild(const EditTextObject* pArea, sal_uInt32 nIndex, SvxAdjust eAdjust); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx index 05a5db06f65a..91f955e75f36 100644 --- a/sc/source/ui/inc/AccessiblePageHeaderArea.hxx +++ b/sc/source/ui/inc/AccessiblePageHeaderArea.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPAGEHEADERAREA_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPAGEHEADERAREA_HXX @@ -123,7 +122,6 @@ private: void CreateTextHelper(); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index f9d4e59a1b09..cc0d8ca15b44 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPREVIEWCELL_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPREVIEWCELL_HXX diff --git a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx index 6357a12c41c9..c399e4ebb098 100644 --- a/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPREVIEWHEADERCELL_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPREVIEWHEADERCELL_HXX @@ -140,7 +139,6 @@ private: void FillTableInfo() const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessiblePreviewTable.hxx b/sc/source/ui/inc/AccessiblePreviewTable.hxx index aadece14dd7b..ba281afb8867 100644 --- a/sc/source/ui/inc/AccessiblePreviewTable.hxx +++ b/sc/source/ui/inc/AccessiblePreviewTable.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPREVIEWTABLE_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLEPREVIEWTABLE_HXX @@ -191,7 +190,6 @@ private: void FillTableInfo() const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AccessibleSpreadsheet.hxx b/sc/source/ui/inc/AccessibleSpreadsheet.hxx index 7264baac0f17..55983fcf0be8 100644 --- a/sc/source/ui/inc/AccessibleSpreadsheet.hxx +++ b/sc/source/ui/inc/AccessibleSpreadsheet.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLESPREADSHEET_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLESPREADSHEET_HXX diff --git a/sc/source/ui/inc/AccessibleTableBase.hxx b/sc/source/ui/inc/AccessibleTableBase.hxx index 32eb852c92ac..d506b75660d9 100644 --- a/sc/source/ui/inc/AccessibleTableBase.hxx +++ b/sc/source/ui/inc/AccessibleTableBase.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLETABLEBASE_HXX #define INCLUDED_SC_SOURCE_UI_INC_ACCESSIBLETABLEBASE_HXX @@ -317,7 +316,6 @@ protected: void CommitTableModelChange(sal_Int32 nStartRow, sal_Int32 nStartCol, sal_Int32 nEndRow, sal_Int32 nEndCol, sal_uInt16 nId); }; - #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 2658cd5d8ffe..923187da0f55 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -38,7 +38,6 @@ class EditTextObject; class ScCsvViewForwarder; class ScAccessibleCell; - class ScAccessibleTextData : public SfxListener { public: @@ -65,7 +64,6 @@ private: ScCellEditSource* GetOriginalSource() { return NULL; } }; - class ScAccessibleCellBaseTextData : public ScAccessibleTextData, public ScCellTextData { @@ -81,7 +79,6 @@ public: virtual bool IsDirty() const SAL_OVERRIDE { return ScCellTextData::IsDirty(); } }; - // ScAccessibleCellTextData: shared data between sub objects of a accessible cell text object class ScAccessibleCellTextData : public ScAccessibleCellBaseTextData @@ -116,7 +113,6 @@ private: ScDocShell* GetDocShell(ScTabViewShell* pViewShell); }; - class ScAccessibleEditObjectTextData : public ScAccessibleTextData { public: @@ -147,7 +143,6 @@ protected: bool mbIsCloned; }; - class ScAccessibleEditLineTextData : public ScAccessibleEditObjectTextData { public: @@ -169,7 +164,6 @@ private: bool mbEditEngineCreated; }; - class ScAccessiblePreviewCellTextData : public ScAccessibleCellBaseTextData { public: @@ -196,7 +190,6 @@ private: ScDocShell* GetDocShell(ScPreviewShell* pViewShell); }; - class ScAccessiblePreviewHeaderCellTextData : public ScAccessibleCellBaseTextData { public: @@ -226,7 +219,6 @@ private: ScDocShell* GetDocShell(ScPreviewShell* pViewShell); }; - class ScAccessibleHeaderTextData : public ScAccessibleTextData { public: @@ -257,7 +249,6 @@ private: SvxAdjust meAdjust; }; - class ScAccessibleNoteTextData : public ScAccessibleTextData { public: @@ -288,7 +279,6 @@ private: bool mbDataValid; }; - class ScAccessibleCsvTextData : public ScAccessibleTextData { private: @@ -325,7 +315,6 @@ public: virtual bool IsDirty() const SAL_OVERRIDE { return false; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index 48ddafd9fc01..e033be5f0dd1 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -65,5 +65,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/CorrelationDialog.hxx b/sc/source/ui/inc/CorrelationDialog.hxx index 492e9ed9e8c9..42747a31ba14 100644 --- a/sc/source/ui/inc/CorrelationDialog.hxx +++ b/sc/source/ui/inc/CorrelationDialog.hxx @@ -27,8 +27,6 @@ protected: virtual const OUString getTemplate() SAL_OVERRIDE; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/CovarianceDialog.hxx b/sc/source/ui/inc/CovarianceDialog.hxx index 4f154cee694b..6d97dfdab752 100644 --- a/sc/source/ui/inc/CovarianceDialog.hxx +++ b/sc/source/ui/inc/CovarianceDialog.hxx @@ -30,5 +30,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx index 5a2b117cdf69..380a75719e0f 100644 --- a/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx +++ b/sc/source/ui/inc/DescriptiveStatisticsDialog.hxx @@ -39,5 +39,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/DrawModelBroadcaster.hxx b/sc/source/ui/inc/DrawModelBroadcaster.hxx index 18d50e48a76d..847dff59fa4a 100644 --- a/sc/source/ui/inc/DrawModelBroadcaster.hxx +++ b/sc/source/ui/inc/DrawModelBroadcaster.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_DRAWMODELBROADCASTER_HXX #define INCLUDED_SC_SOURCE_UI_INC_DRAWMODELBROADCASTER_HXX - #include <svl/lstner.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/implbase1.hxx> diff --git a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx index 8416c7fda530..4572ac3e14f1 100644 --- a/sc/source/ui/inc/ExponentialSmoothingDialog.hxx +++ b/sc/source/ui/inc/ExponentialSmoothingDialog.hxx @@ -42,5 +42,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/FTestDialog.hxx b/sc/source/ui/inc/FTestDialog.hxx index 1f1dbda47830..1dce57264dd3 100644 --- a/sc/source/ui/inc/FTestDialog.hxx +++ b/sc/source/ui/inc/FTestDialog.hxx @@ -31,5 +31,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx index d1ccdf884cac..b6819102c502 100644 --- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx +++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx @@ -41,5 +41,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/MovingAverageDialog.hxx b/sc/source/ui/inc/MovingAverageDialog.hxx index a703817d53bc..7183453925d3 100644 --- a/sc/source/ui/inc/MovingAverageDialog.hxx +++ b/sc/source/ui/inc/MovingAverageDialog.hxx @@ -42,5 +42,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index 290773a317ff..e3e8e747fca7 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -131,7 +131,6 @@ public: void PushDataFieldNames(std::vector<ScDPName>& rDataFieldNames); }; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ #endif diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index ffb95d57bdfa..66163925a37f 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -84,5 +84,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_RANDOMNUMBERGENERATORDIALOG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 9cebb6cba546..8e4269f004d7 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -80,5 +80,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index d54ac00afb2f..ee879f584b4d 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -86,5 +86,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 87c1d6bec1c7..99d0f98b46cb 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -89,5 +89,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/TTestDialog.hxx b/sc/source/ui/inc/TTestDialog.hxx index b296999648f2..d90519c4ca98 100644 --- a/sc/source/ui/inc/TTestDialog.hxx +++ b/sc/source/ui/inc/TTestDialog.hxx @@ -31,5 +31,4 @@ protected: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx index d45e3a9446dd..8a80bb201bee 100644 --- a/sc/source/ui/inc/TableFillingAndNavigationTools.hxx +++ b/sc/source/ui/inc/TableFillingAndNavigationTools.hxx @@ -160,5 +160,4 @@ 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 a3511e729795..4f2041931ed9 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -44,7 +44,6 @@ class ScDocument; #define FLT_DATE_BETWEEN 4 #define FLT_DATE_SAVE 5 - class ScViewEntryPtr { private: @@ -92,7 +91,6 @@ typedef long LExpNum; //@ Expand entrys are ambiguous and therefore removed //DECLARE_TABLE( ScChgTrackExps, LExpNum) - class ScAcceptChgDlg : public SfxModelessDialog { private: @@ -218,7 +216,6 @@ public: }; - #endif // INCLUDED_SC_SOURCE_UI_INC_ACREDLIN_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index dcdbc7936c90..18d19a3ae3d7 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -126,7 +126,6 @@ private: DECL_LINK( UpdateFocusHdl, void* ); - protected: virtual bool DoClose( sal_uInt16 nId ); @@ -171,7 +170,6 @@ public: inline bool CanInputDone( bool bForced ); }; - class ScRefHdlModalImpl : public ModalDialog, public ScRefHandler { public: @@ -246,7 +244,6 @@ ScRefHdlrImplBase<TWindow,bBindRef>::ScRefHdlrImplBase( TParentWindow* pParent, { } - template<class TWindow, bool bBindRef > ScRefHdlrImplBase<TWindow,bBindRef>::~ScRefHdlrImplBase(){} @@ -271,7 +268,6 @@ public: const OUString& rUIXMLDescription); }; - template<class TDerived, class TBase, bool bBindRef = true> struct ScRefHdlrImpl: ScRefHdlrImplBase< TBase, bBindRef > { @@ -312,7 +308,6 @@ struct ScAnyRefDlg : ::ScRefHdlrImpl< ScAnyRefDlg, SfxModelessDialog> } }; - inline bool ScRefHandler::CanInputStart( const formula::RefEdit *pEdit ) { return m_aHelper.CanInputStart( pEdit ); diff --git a/sc/source/ui/inc/areasave.hxx b/sc/source/ui/inc/areasave.hxx index 89d4094f19ec..7448b7aa6560 100644 --- a/sc/source/ui/inc/areasave.hxx +++ b/sc/source/ui/inc/areasave.hxx @@ -27,7 +27,6 @@ class ScDocument; class ScAreaLink; - class ScAreaLinkSaver { private: @@ -50,7 +49,6 @@ public: void InsertNewLink( ScDocument* pDoc ); }; - class ScAreaLinkSaveCollection { typedef ::boost::ptr_vector<ScAreaLinkSaver> DataType; @@ -60,7 +58,6 @@ public: ScAreaLinkSaveCollection( const ScAreaLinkSaveCollection& r ); ~ScAreaLinkSaveCollection(); - bool IsEqual( const ScDocument* pDoc ) const; void Restore( ScDocument* pDoc ); @@ -73,7 +70,6 @@ public: void push_back(ScAreaLinkSaver* p); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index d7c6789865bb..430c1d8a2733 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -30,7 +30,6 @@ class ScDocument; class ScViewData; - class ScPrintAreasDlg : public ScAnyRefDlg { public: diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx index ef6e380a4604..852685349be7 100644 --- a/sc/source/ui/inc/attrdlg.hxx +++ b/sc/source/ui/inc/attrdlg.hxx @@ -45,5 +45,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_ATTRDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/auditsh.hxx b/sc/source/ui/inc/auditsh.hxx index 7e0945130e08..9081f7df0ebe 100644 --- a/sc/source/ui/inc/auditsh.hxx +++ b/sc/source/ui/inc/auditsh.hxx @@ -51,5 +51,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index 614c2c0d4643..e0903ee60fdf 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -113,5 +113,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_AUTOFMT_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/cbutton.hxx b/sc/source/ui/inc/cbutton.hxx index b89439bfdb86..f6b15a68ccea 100644 --- a/sc/source/ui/inc/cbutton.hxx +++ b/sc/source/ui/inc/cbutton.hxx @@ -25,7 +25,6 @@ class OutputDevice; - class ScDDComboBoxButton { public: @@ -66,8 +65,6 @@ protected: Size aBtnSize; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_CBUTTON_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/cellmergeoption.hxx b/sc/source/ui/inc/cellmergeoption.hxx index fc2c0ec94808..b838ddf03772 100644 --- a/sc/source/ui/inc/cellmergeoption.hxx +++ b/sc/source/ui/inc/cellmergeoption.hxx @@ -35,7 +35,6 @@ struct ScCellMergeOption ScRange getFirstSingleRange() const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index b23da9aab1a3..d319d86f7d67 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -186,7 +186,6 @@ private: ScMenuFloatingWindow* mpParentMenu; }; - class ScCheckListBox : public SvTreeListBox { SvLBoxButtonData* mpCheckButton; diff --git a/sc/source/ui/inc/colrowba.hxx b/sc/source/ui/inc/colrowba.hxx index 1054ff769419..e52c6fd03b65 100644 --- a/sc/source/ui/inc/colrowba.hxx +++ b/sc/source/ui/inc/colrowba.hxx @@ -58,7 +58,6 @@ public: bool UseNumericHeader() const; }; - class ScRowBar : public ScHeaderControl { ScViewData* pViewData; diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index 12b522ff67c9..123d9ea3ad1b 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -110,7 +110,6 @@ protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; - public: SC_DLLPUBLIC ScCondFormatDlg(Window* pWindow, ScDocument* pDoc, const ScConditionalFormat* pFormat, const ScRangeList& rRange, const ScAddress& rPos, condformat::dialog::ScCondFormatDialogType eType); diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 84bd2e6a57aa..6123dbc79c62 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -31,7 +31,6 @@ class ScViewData; - enum ScConflictAction { SC_CONFLICT_ACTION_NONE, @@ -43,7 +42,6 @@ typedef ::std::vector< sal_uLong > ScChangeActionList; // struct ScConflictsListEntry - struct ScConflictsListEntry { ScConflictAction meConflictAction; @@ -54,12 +52,10 @@ struct ScConflictsListEntry bool HasOwnAction( sal_uLong nOwnAction ) const; }; - typedef ::std::vector< ScConflictsListEntry > ScConflictsList; // class ScConflictsListHelper - class ScConflictsListHelper { private: @@ -77,7 +73,6 @@ public: // class ScConflictsFinder - class ScConflictsFinder { private: @@ -102,7 +97,6 @@ public: // class ScConflictsResolver - class ScConflictsResolver { private: @@ -119,7 +113,6 @@ public: // class ScConflictsDlg - class ScConflictsDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx index 95bae7849df9..80b862cf9be7 100644 --- a/sc/source/ui/inc/consdlg.hxx +++ b/sc/source/ui/inc/consdlg.hxx @@ -33,7 +33,6 @@ class ScDocument; class ScRangeUtil; class ScAreaData; - class ScConsolidateDlg : public ScAnyRefDlg { public: diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index caa5dd973605..20aaab6f5fdb 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -158,7 +158,6 @@ public: static bool IsInDrag() { return bIsInDrag; } }; - #endif // INCLUDED_SC_SOURCE_UI_INC_CONTENT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx index e09ebd4207ab..488d9a48930b 100644 --- a/sc/source/ui/inc/crdlg.hxx +++ b/sc/source/ui/inc/crdlg.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_CRDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_CRDLG_HXX - #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/layout.hxx> diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 5337886961ce..8bdeda1442af 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -30,7 +30,6 @@ class ScViewData; class ScDocument; - class ScColRowNameRangesDlg : public ScAnyRefDlg { public: diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index 0e17900a6c84..f8db0c894928 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -27,13 +27,11 @@ #include "csvsplits.hxx" #include <com/sun/star/uno/Reference.hxx> - class ScAccessibleCsvControl; namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } - /** Minimum character count for a column in separators mode. */ const sal_Int32 CSV_MINCOLWIDTH = 8; /** Maximum length of a cell string. */ @@ -64,7 +62,6 @@ const sal_uInt8 SC_COL_YMD = 5; 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 { @@ -78,7 +75,6 @@ struct ScCsvExpData typedef ::std::vector< ScCsvExpData > ScCsvExpDataVec; - /** Specifies which element should be used to perform an action. */ enum ScMoveMode { @@ -91,7 +87,6 @@ enum ScMoveMode MOVE_NEXTPAGE /// Next page relative to current context. }; - /** Flags for comparison of old and new control layout data. */ typedef sal_uInt32 ScCsvDiff; @@ -111,7 +106,6 @@ const ScCsvDiff CSV_DIFF_HORIZONTAL = CSV_DIFF_POSCOUNT | CSV_DIFF_POSOFFSET const ScCsvDiff CSV_DIFF_VERTICAL = CSV_DIFF_LINECOUNT | CSV_DIFF_LINEOFFSET | CSV_DIFF_HDRHEIGHT | CSV_DIFF_LINEHEIGHT; 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 @@ -156,7 +150,6 @@ inline bool operator!=( const ScCsvLayoutData& rData1, const ScCsvLayoutData& rD return !(rData1 == rData2); } - /** 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. @@ -200,7 +193,6 @@ enum ScCsvCmdType CSVCMD_REMOVEALLSPLITS /// Remove all splits. [-] }; - /** 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 @@ -226,7 +218,6 @@ inline void ScCsvCmd::Set( ScCsvCmdType eType, sal_Int32 nParam1, sal_Int32 nPar meType = eType; mnParam1 = nParam1; mnParam2 = nParam2; } - /** Base class for the CSV ruler and the data grid control. Implements command handling. */ class SC_DLLPUBLIC ScCsvControl : public Control { @@ -246,7 +237,6 @@ private: ScAccessibleCsvControl* mpAccessible; /// Pointer to the accessible implementation object. bool mbValidGfx; /// Content of virtual devices valid? - public: explicit ScCsvControl( ScCsvControl& rParent ); explicit ScCsvControl( Window* pParent, const ScCsvLayoutData& rData, WinBits nBits ); @@ -398,7 +388,6 @@ protected: virtual ScAccessibleCsvControl* ImplCreateAccessible() = 0; }; - #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 79a4a0455a0d..d01f5f0a0b37 100644 --- a/sc/source/ui/inc/csvgrid.hxx +++ b/sc/source/ui/inc/csvgrid.hxx @@ -30,20 +30,17 @@ #include "csvcontrol.hxx" #include "csvsplits.hxx" - namespace svtools { class ColorConfig; } class EditEngine; class ScEditEngineDefaulter; 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 { @@ -69,10 +66,8 @@ inline void ScCsvColState::Select( bool bSel ) if( bSel ) mnFlags |= CSV_COLFLAG_SELECT; else mnFlags &= ~CSV_COLFLAG_SELECT; } - 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 @@ -111,7 +106,6 @@ private: sal_uInt32 mnMTCurrCol; /// Current column of mouse tracking. bool mbMTSelecting; /// Mouse tracking: true = select, false = deselect. - public: explicit ScCsvGrid( ScCsvControl& rParent ); virtual ~ScCsvGrid(); @@ -334,7 +328,6 @@ protected: virtual ScAccessibleCsvControl* ImplCreateAccessible() SAL_OVERRIDE; }; - #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 afa63d211e5b..ef73cae674c4 100644 --- a/sc/source/ui/inc/csvruler.hxx +++ b/sc/source/ui/inc/csvruler.hxx @@ -27,7 +27,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 @@ -53,7 +52,6 @@ private: Rectangle maActiveRect; /// The active area of the ruler. sal_Int32 mnSplitSize; /// Size of a split circle. - public: explicit ScCsvRuler( ScCsvControl& rParent ); virtual ~ScCsvRuler(); @@ -180,7 +178,6 @@ protected: virtual ScAccessibleCsvControl* ImplCreateAccessible() SAL_OVERRIDE; }; - #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 2d9979b54f5c..a53be066543f 100644 --- a/sc/source/ui/inc/csvsplits.hxx +++ b/sc/source/ui/inc/csvsplits.hxx @@ -24,13 +24,11 @@ #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 { @@ -82,7 +80,6 @@ private: sal_uInt32 GetIterIndex( const_iterator aIter ) const; }; - #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 602e854676d4..789f7c234e58 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -27,11 +27,9 @@ #include "csvruler.hxx" #include "csvgrid.hxx" - class ListBox; class ScAsciiOptions; - /* ============================================================================ Position: Positions between the characters (the dots in the ruler). Character: The characters (the range from one position to the next). @@ -62,7 +60,6 @@ private: bool mbFixedMode; /// false = Separators, true = Fixed width. - public: explicit ScCsvTableBox( Window* pParent, WinBits nBits ); @@ -141,7 +138,6 @@ protected: virtual ScAccessibleCsvControl* ImplCreateAccessible() SAL_OVERRIDE; }; - #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 0fd03ec60546..2ab44ba0d661 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -50,7 +50,6 @@ private: DECL_LINK( RadioClickHdl, RadioButton * ); }; - class ScDataPilotServiceDlg : public ModalDialog { private: @@ -81,8 +80,6 @@ public: OUString GetParPass() const; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/datastream.hxx b/sc/source/ui/inc/datastream.hxx index 6450bb579d2b..753cae67774f 100644 --- a/sc/source/ui/inc/datastream.hxx +++ b/sc/source/ui/inc/datastream.hxx @@ -34,7 +34,6 @@ namespace datastreams { class ReaderThread; } - class DataStream : boost::noncopyable { public: diff --git a/sc/source/ui/inc/dbnamdlg.hxx b/sc/source/ui/inc/dbnamdlg.hxx index 58dba0e851c3..5dd4ab1885bd 100644 --- a/sc/source/ui/inc/dbnamdlg.hxx +++ b/sc/source/ui/inc/dbnamdlg.hxx @@ -32,7 +32,6 @@ class ScViewData; class ScDocument; - class ScDbNameDlg : public ScAnyRefDlg { public: diff --git a/sc/source/ui/inc/delcldlg.hxx b/sc/source/ui/inc/delcldlg.hxx index 8da41e241a3b..2898be599fe9 100644 --- a/sc/source/ui/inc/delcldlg.hxx +++ b/sc/source/ui/inc/delcldlg.hxx @@ -20,12 +20,10 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_DELCLDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_DELCLDLG_HXX - #include <vcl/dialog.hxx> #include <vcl/button.hxx> #include <vcl/fixed.hxx> - #include "global.hxx" class ScDeleteCellDlg : public ModalDialog @@ -42,8 +40,6 @@ public: DelCellCmd GetDelCellCmd() const; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_DELCLDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index 548f4a15241a..fcc4acb9ecbc 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -54,7 +54,6 @@ public: sal_uInt16 GetDelContentsCmdBits() const; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_DELCODLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index dc0a0f2d3117..e603841e5b33 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -231,7 +231,6 @@ public: virtual ~ScDocFuncDirect() {} }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index 2f8c1ee40870..36731fedb73c 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_DOCSH_HXX #define INCLUDED_SC_SOURCE_UI_INC_DOCSH_HXX - #include <sfx2/objsh.hxx> #include <sfx2/docfac.hxx> @@ -436,11 +435,9 @@ public: virtual bool SetProtectionPassword( const OUString &rPassword ) SAL_OVERRIDE; virtual bool GetProtectionHash( /*out*/ ::com::sun::star::uno::Sequence< sal_Int8 > &rPasswordHash ) SAL_OVERRIDE; - void SnapVisArea( Rectangle& rRect ) const; }; - void UpdateAcceptChangesDialog(); class ScDocShell; @@ -509,8 +506,6 @@ namespace HelperNotifyChanges } }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 3d7b6a16d02f..dd5c6dbe2b2b 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -42,7 +42,6 @@ public: protected: ~ScDPGroupEditHelper() {} - private: virtual bool ImplGetValue( double& rfValue ) const = 0; virtual void ImplSetValue( double fValue ) = 0; @@ -90,7 +89,6 @@ private: Date maNullDate; }; - class ScDPNumGroupDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/drawsh.hxx b/sc/source/ui/inc/drawsh.hxx index 61eb936cafb5..713cd21fbd48 100644 --- a/sc/source/ui/inc/drawsh.hxx +++ b/sc/source/ui/inc/drawsh.hxx @@ -93,5 +93,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index d7df9a196f15..21c785aff16d 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -164,7 +164,6 @@ public: virtual void SyncForGrid( SdrObject* pObj ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx index efca06767e1c..a74d4ae3a673 100644 --- a/sc/source/ui/inc/drwtrans.hxx +++ b/sc/source/ui/inc/drwtrans.hxx @@ -29,7 +29,6 @@ #include "charthelper.hxx" #include "rangelst.hxx" - class SdrModel; class ScDocShell; class INetBookmark; diff --git a/sc/source/ui/inc/dwfunctr.hxx b/sc/source/ui/inc/dwfunctr.hxx index 52d639c04245..34e173d2eb0a 100644 --- a/sc/source/ui/inc/dwfunctr.hxx +++ b/sc/source/ui/inc/dwfunctr.hxx @@ -95,7 +95,6 @@ protected: virtual void ToggleFloatingMode() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE; - virtual SfxChildAlignment CheckAlignment(SfxChildAlignment, SfxChildAlignment eAlign) SAL_OVERRIDE; @@ -118,5 +117,4 @@ public: #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 cc8710d91f7d..a1df80ebc9d0 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -30,7 +30,6 @@ class ScDocument; #include "scui_def.hxx" - class ScFillSeriesDlg : public ModalDialog { public: diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 2a8f9e12cf44..fae7f16a8520 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -82,7 +82,6 @@ private: DECL_LINK( BtnCopyResultHdl, CheckBox* ); }; - #endif // INCLUDED_SC_SOURCE_UI_INC_FOPTMGR_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx index 1057a077c50b..a87ec89872c2 100644 --- a/sc/source/ui/inc/formdata.hxx +++ b/sc/source/ui/inc/formdata.hxx @@ -36,14 +36,12 @@ public: void SetInputHandler(ScInputHandler* pHdl) { pInputHandler=pHdl;} void SetDocShell(ScDocShell* pSds) { pScDocShell=pSds;} - virtual void SaveValues() SAL_OVERRIDE; private: ScFormEditData( const ScFormEditData& ); // const ScFormEditData& operator=( const ScFormEditData& r ); - ScInputHandler* pInputHandler; ScDocShell* pScDocShell; }; diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index b5ad534c91e3..70d795968d4a 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -40,10 +40,8 @@ class ScInputHandler; class ScDocShell; class ScFormulaCell; - typedef ScTabViewShell* PtrTabViewShell; - class ScFormulaDlg : public formula::FormulaDlg, public IAnyRefDialog { diff --git a/sc/source/ui/inc/fuconpol.hxx b/sc/source/ui/inc/fuconpol.hxx index ed58368d9e04..0051ed185e60 100644 --- a/sc/source/ui/inc/fuconpol.hxx +++ b/sc/source/ui/inc/fuconpol.hxx @@ -45,7 +45,6 @@ class FuConstPolygon : public FuConstruct virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) SAL_OVERRIDE; }; - #endif // _FUCONPOL_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 1d135afb29e0..60c6d6472aa8 100644 --- a/sc/source/ui/inc/fuconstr.hxx +++ b/sc/source/ui/inc/fuconstr.hxx @@ -22,7 +22,6 @@ #include "fudraw.hxx" - /** Draw rectangle */ class FuConstruct : public FuDraw { diff --git a/sc/source/ui/inc/fuconuno.hxx b/sc/source/ui/inc/fuconuno.hxx index 926e4b2ae5fa..407c9b593e69 100644 --- a/sc/source/ui/inc/fuconuno.hxx +++ b/sc/source/ui/inc/fuconuno.hxx @@ -22,7 +22,6 @@ #include "fuconstr.hxx" - /** Draw Control */ class FuConstUnoControl : public FuConstruct { diff --git a/sc/source/ui/inc/fuinsert.hxx b/sc/source/ui/inc/fuinsert.hxx index 2d89091d8710..a93dd0495dea 100644 --- a/sc/source/ui/inc/fuinsert.hxx +++ b/sc/source/ui/inc/fuinsert.hxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #ifndef INCLUDED_SC_SOURCE_UI_INC_FUINSERT_HXX #define INCLUDED_SC_SOURCE_UI_INC_FUINSERT_HXX diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 59106821be5e..1226d1b5ef85 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -37,7 +37,6 @@ class ScFuncDesc; #define LRU_MAX 10 - class ScListBox : public ListBox { protected: @@ -49,8 +48,6 @@ public: ScListBox( Window* pParent, const ResId& rResId ); }; - - class ScFuncPage : public TabPage { private: @@ -65,7 +62,6 @@ private: const ScFuncDesc* aLRUList[LRU_MAX]; - DECL_LINK( SelHdl, ListBox* ); DECL_LINK( DblClkHdl, ListBox* ); @@ -74,7 +70,6 @@ protected: void UpdateFunctionList(); void InitLRUList(); - public: ScFuncPage( Window* pParent); @@ -98,7 +93,6 @@ public: }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/gridmerg.hxx b/sc/source/ui/inc/gridmerg.hxx index 8f7a00cb716f..f98d76fd8982 100644 --- a/sc/source/ui/inc/gridmerg.hxx +++ b/sc/source/ui/inc/gridmerg.hxx @@ -49,5 +49,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx index 6b7d44904d4a..5d1f64574c5b 100644 --- a/sc/source/ui/inc/hfedtdlg.hxx +++ b/sc/source/ui/inc/hfedtdlg.hxx @@ -23,10 +23,8 @@ #include <sfx2/tabdlg.hxx> #include <svx/pageitem.hxx> - #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 991542261b09..9dae49bc8e10 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -73,7 +73,6 @@ private: DECL_LINK(HighlightHandle, CheckBox*); DECL_LINK(OKBtnHdl, PushButton*); - protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; @@ -91,7 +90,6 @@ public: }; - #endif // INCLUDED_SC_SOURCE_UI_INC_HIGHRED_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/hiranges.hxx b/sc/source/ui/inc/hiranges.hxx index ecea01ea75e8..60e38877ef40 100644 --- a/sc/source/ui/inc/hiranges.hxx +++ b/sc/source/ui/inc/hiranges.hxx @@ -33,8 +33,6 @@ struct ScHighlightEntry aRef(rR), aColor(rC) {} }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/imoptdlg.hxx b/sc/source/ui/inc/imoptdlg.hxx index 93c24b2fe63c..261b3c4ea78a 100644 --- a/sc/source/ui/inc/imoptdlg.hxx +++ b/sc/source/ui/inc/imoptdlg.hxx @@ -99,7 +99,6 @@ public: bool bSaveFormulas; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_IMOPTDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/impex.hxx b/sc/source/ui/inc/impex.hxx index 9faa1a69ac52..7bd391456d49 100644 --- a/sc/source/ui/inc/impex.hxx +++ b/sc/source/ui/inc/impex.hxx @@ -159,7 +159,6 @@ public: void SetExportTextOptions( const ScExportTextOptions& options ) { mExportTextOptions = options; } }; - inline bool ScImportExport::IsEndianSwap( const SvStream& rStrm ) { #ifdef OSL_BIGENDIAN @@ -178,7 +177,6 @@ inline void ScImportExport::SetNoEndianSwap( SvStream& rStrm ) #endif } - // Helper class for importing clipboard strings as streams. class ScImportStringStream : public SvMemoryStream { diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 70e455443e90..c34d7629a3c7 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -49,10 +49,8 @@ class CommandEvent; struct ESelection; - // ScInputHandler - class ScInputHandler : boost::noncopyable { private: @@ -266,7 +264,6 @@ public: static void SetAutoComplete(bool bSet) { bAutoComplete = bSet; } }; - // ScInputHdlState class ScInputHdlState @@ -303,5 +300,4 @@ private: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 68d39e422676..0463eb3bc21f 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -160,7 +160,6 @@ private: void ReleaseFocus_Impl(); }; - class ScInputBarGroup; class ScMultiTextWnd : public ScTextWnd @@ -234,7 +233,6 @@ private: }; - class ScInputWindow : public ToolBox // Parent toolbox { public: @@ -311,7 +309,6 @@ public: SFX_DECL_CHILDWINDOW_WITHID(ScInputWindowWrapper); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/inscldlg.hxx b/sc/source/ui/inc/inscldlg.hxx index cd7a4b59b549..8ce7449a5cc9 100644 --- a/sc/source/ui/inc/inscldlg.hxx +++ b/sc/source/ui/inc/inscldlg.hxx @@ -24,7 +24,6 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> - #include "global.hxx" class ScInsertCellDlg : public ModalDialog @@ -42,8 +41,6 @@ public: InsCellCmd GetInsCellCmd() const; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_INSCLDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index 0fe1a5a2a28f..3fd40080c94b 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -25,7 +25,6 @@ #include <vcl/fixed.hxx> #include "global.hxx" - #include "scui_def.hxx" class ScInsertContentsDlg : public ModalDialog @@ -92,8 +91,6 @@ private: DECL_LINK( LinkBtnHdl, void* ); }; - #endif // INCLUDED_SC_SOURCE_UI_INC_INSCODLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/invmerge.hxx b/sc/source/ui/inc/invmerge.hxx index 4efc564d6681..952b8d7d58af 100644 --- a/sc/source/ui/inc/invmerge.hxx +++ b/sc/source/ui/inc/invmerge.hxx @@ -44,5 +44,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index cc51394fac6b..5b09058cc091 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -20,13 +20,11 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_LBSELDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_LBSELDLG_HXX - #include <vcl/fixed.hxx> #include <vcl/lstbox.hxx> #include <vcl/button.hxx> - #include <vcl/dialog.hxx> class ScSelEntryDlg : public ModalDialog @@ -42,8 +40,6 @@ public: OUString GetSelectEntry() const; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_LBSELDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/msgpool.hxx b/sc/source/ui/inc/msgpool.hxx index 81f885422ca2..85376ac273c3 100644 --- a/sc/source/ui/inc/msgpool.hxx +++ b/sc/source/ui/inc/msgpool.hxx @@ -23,14 +23,12 @@ #include "scitems.hxx" #include <svl/srchitem.hxx> - #include <svl/itempool.hxx> #include <svl/stritem.hxx> #include <svl/eitem.hxx> #include "uiitems.hxx" - class ScDocumentPool; class ScMessagePool: public SfxItemPool diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index fa9eb5ab4cf4..0337f9dfcc11 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -25,7 +25,6 @@ #include <vcl/button.hxx> #include <vcl/fixed.hxx> - class ScMetricInputDlg : public ModalDialog { public: @@ -54,6 +53,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_MTRINDLG_HXX - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 9a59e93b5832..2b703ec612bb 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_MVTABDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_MVTABDLG_HXX - #include "address.hxx" #include <vcl/dialog.hxx> #include <vcl/button.hxx> @@ -74,7 +73,6 @@ private: bool bRenameTable:1; bool mbEverEdited:1; - void Init (); void InitBtnRename (); void InitDocListBox (); @@ -86,5 +84,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_MVTABDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/namecrea.hxx b/sc/source/ui/inc/namecrea.hxx index d664267a9d9e..7757bf265bcd 100644 --- a/sc/source/ui/inc/namecrea.hxx +++ b/sc/source/ui/inc/namecrea.hxx @@ -38,7 +38,6 @@ public: sal_uInt16 GetFlags() const; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_NAMECREA_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index c0ad147f789d..63c749778afb 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -39,7 +39,6 @@ class ScViewData; class ScDocument; - //logic behind the manage names dialog class ScNameDlg : public ScAnyRefDlg, public ScRangeManagerTable::InitListener { diff --git a/sc/source/ui/inc/namepast.hxx b/sc/source/ui/inc/namepast.hxx index 2ece360fbd35..44910754d2f0 100644 --- a/sc/source/ui/inc/namepast.hxx +++ b/sc/source/ui/inc/namepast.hxx @@ -54,7 +54,6 @@ public: bool IsAllSelected() const; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_NAMEPAST_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 a2fdb3222f79..f2ca715191b1 100644 --- a/sc/source/ui/inc/navcitem.hxx +++ b/sc/source/ui/inc/navcitem.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_NAVCITEM_HXX #define INCLUDED_SC_SOURCE_UI_INC_NAVCITEM_HXX - #include <sfx2/ctrlitem.hxx> - class ScNavigatorDlg; class ScNavigatorControllerItem : public SfxControllerItem @@ -40,7 +38,6 @@ private: ScNavigatorDlg& rNavigatorDlg; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_NAVCITEM_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index e3d20201373f..4cc39795b60c 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -31,7 +31,6 @@ #include "content.hxx" #include <svtools/svmedit.hxx> - class ScTabViewShell; class ScViewData; class ScArea; @@ -51,10 +50,8 @@ enum NavListMode { NAV_LMODE_NONE = 0x4000, NAV_LMODE_DOCS = 0x800, NAV_LMODE_SCENARIOS = 0x400 }; - // class ScScenarioListBox ----------------------------------------------- - class ScScenarioListBox : public ListBox { public: @@ -92,7 +89,6 @@ private: ScenarioList maEntries; }; - // class ScScenarioWindow ------------------------------------------------ class ScScenarioWindow : public Window @@ -116,7 +112,6 @@ private: MultiLineEdit aEdComment; }; - // class ColumnEdit class ColumnEdit : public SpinField @@ -208,10 +203,8 @@ private: ScNavigatorDlg& rDlg; }; - // class ScNavigatorDlg - class ScNavigatorDlg : public Window, public SfxListener { friend class ScNavigatorControllerItem; diff --git a/sc/source/ui/inc/navsett.hxx b/sc/source/ui/inc/navsett.hxx index 4049347fcd83..66d307af759b 100644 --- a/sc/source/ui/inc/navsett.hxx +++ b/sc/source/ui/inc/navsett.hxx @@ -46,7 +46,6 @@ public: inline sal_uLong GetChildSelected() const { return mnChildSelected; } }; - #endif // INCLUDED_SC_SOURCE_UI_INC_NAVSETT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/olinefun.hxx b/sc/source/ui/inc/olinefun.hxx index c1f08fc3d4c8..3695934b4ee2 100644 --- a/sc/source/ui/inc/olinefun.hxx +++ b/sc/source/ui/inc/olinefun.hxx @@ -25,7 +25,6 @@ class ScDocShell; class ScRange; - class ScOutlineDocFunc { private: diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index 891b4f67dbe9..ecc83948550c 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -25,10 +25,8 @@ 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 @@ -224,7 +222,6 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 5cbb52f234e6..56129165239e 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -43,7 +43,6 @@ class ScRedlineOptionsTabPage : public SfxTabPage OUString aAuthorStr; DECL_LINK(ColorHdl, void *); - public: ScRedlineOptionsTabPage( Window* pParent, const SfxItemSet& rSet ); @@ -56,5 +55,4 @@ 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 769bb1998292..1ae4aa78d913 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -47,7 +47,6 @@ protected: virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; }; - /// The dialog's content for a row, not yet parsed struct ScOptConditionRow { @@ -201,7 +200,6 @@ private: DECL_LINK( SelectHdl, void* ); }; - class ScSolverProgressDialog : public ModelessDialog { FixedText* m_pFtTime; @@ -233,7 +231,6 @@ public: ScSolverSuccessDialog( Window* pParent, const OUString& rSolution ); }; - #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 7dfe935b7fe4..8651c8f1384b 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -95,7 +95,6 @@ private: DECL_LINK( CheckBoxHdl, CheckBox* ); }; - #endif // INCLUDED_SC_SOURCE_UI_INC_PFILTDLG_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/pfuncache.hxx b/sc/source/ui/inc/pfuncache.hxx index 05d829a807c0..7e43372fd795 100644 --- a/sc/source/ui/inc/pfuncache.hxx +++ b/sc/source/ui/inc/pfuncache.hxx @@ -28,7 +28,6 @@ class ScDocShell; class ScMarkData; - /** Possible types of selection for print functions */ enum ScPrintSelectionMode @@ -40,7 +39,6 @@ enum ScPrintSelectionMode SC_PRINTSEL_RANGE_EXCLUSIVELY_OLE_AND_DRAW_OBJECTS }; - /** Stores the selection in the ScPrintFuncCache so it is only used for the same selection again. */ @@ -65,7 +63,6 @@ public: const ScPrintOptions& GetOptions() const { return aOptions; } }; - /** The range that is printed on a page (excluding repeated columns/rows), and its position on the page, used to find hyperlink targets. */ @@ -82,7 +79,6 @@ struct ScPrintPageLocation nPage(nP), aCellRange(rRange), aRectangle(rRect) {} }; - /** Stores the data for printing that is needed from several sheets, so it doesn't have to be calculated for rendering each page. */ diff --git a/sc/source/ui/inc/pivotsh.hxx b/sc/source/ui/inc/pivotsh.hxx index a519171c9a08..7d80511679fa 100644 --- a/sc/source/ui/inc/pivotsh.hxx +++ b/sc/source/ui/inc/pivotsh.hxx @@ -53,5 +53,4 @@ private: #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 bb5c79874979..4a57af5759bc 100644 --- a/sc/source/ui/inc/preview.hxx +++ b/sc/source/ui/inc/preview.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_PREVIEW_HXX #define INCLUDED_SC_SOURCE_UI_INC_PREVIEW_HXX - #include <vcl/window.hxx> #include "printfun.hxx" #include "markdata.hxx" @@ -135,7 +134,6 @@ public: void DrawInvert( long nDragPos, sal_uInt16 nFlags ); void DragMove( long nDragMovePos, sal_uInt16 nFlags ); - const ScPreviewLocationData& GetLocationData(); OUString GetPosString(); diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx index ff8ca2fd4a8e..3a4b5bbbefee 100644 --- a/sc/source/ui/inc/prevloc.hxx +++ b/sc/source/ui/inc/prevloc.hxx @@ -80,7 +80,6 @@ public: void LimitToArea( const Rectangle& rPixelArea ); }; - class ScPreviewLocationData { OutputDevice* pWindow; diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index a28c2f18f4a2..4ae03f6ef50e 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -36,7 +36,6 @@ struct ScHeaderFieldData; class ScPreviewLocationData; class CommandEvent; - class ScPreviewShell: public SfxViewShell { ScDocShell* pDocShell; diff --git a/sc/source/ui/inc/printfun.hxx b/sc/source/ui/inc/printfun.hxx index c83a234c9898..264ee8d9c367 100644 --- a/sc/source/ui/inc/printfun.hxx +++ b/sc/source/ui/inc/printfun.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_PRINTFUN_HXX #define INCLUDED_SC_SOURCE_UI_INC_PRINTFUN_HXX - #include "pagepar.hxx" #include "editutil.hxx" @@ -49,7 +48,6 @@ class FmFormView; #define PRINT_HEADER_HEIGHT (12.8 * TWIPS_PER_POINT) #define PRINT_HEADER_FONTHEIGHT 200 - // Settings for headers/footers struct ScPrintHFParam { @@ -68,7 +66,6 @@ struct ScPrintHFParam const SvxShadowItem* pShadow; }; - struct ScPrintState // Save Variables from ScPrintFunc { SCTAB nPrintTab; diff --git a/sc/source/ui/inc/privsplt.hxx b/sc/source/ui/inc/privsplt.hxx index ddef1ad02303..c4e53a92203f 100644 --- a/sc/source/ui/inc/privsplt.hxx +++ b/sc/source/ui/inc/privsplt.hxx @@ -70,7 +70,6 @@ class ScPrivatSplit : public Control const Link& GetCtrModifiedHdl() const { return aCtrModifiedLink; } }; - #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 2625a7b20358..f2f23effa63e 100644 --- a/sc/source/ui/inc/reffact.hxx +++ b/sc/source/ui/inc/reffact.hxx @@ -170,7 +170,6 @@ public: void Show( sal_uInt16 nFlags ) SAL_OVERRIDE { if( !m_bVisibleLock ) SfxChildWindow::Show( nFlags ); } }; - #endif // INCLUDED_SC_SOURCE_UI_INC_REFFACT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/rfindlst.hxx b/sc/source/ui/inc/rfindlst.hxx index b0b10125ef19..7159b108f6b1 100644 --- a/sc/source/ui/inc/rfindlst.hxx +++ b/sc/source/ui/inc/rfindlst.hxx @@ -60,5 +60,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index 8812a148bb3e..80b22a5b284c 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_SCENDLG_HXX #define INCLUDED_SC_SOURCE_UI_INC_SCENDLG_HXX - #include <vcl/dialog.hxx> #include <vcl/edit.hxx> #include <vcl/fixed.hxx> @@ -55,8 +54,6 @@ private: DECL_LINK( EnableHdl, CheckBox * ); }; - #endif // INCLUDED_SC_SOURCE_UI_INC_SCENDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 23de9df7cd98..1fff0a436b4b 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_SCUIASCIIOPT_HXX #define INCLUDED_SC_SOURCE_UI_INC_SCUIASCIIOPT_HXX - #include "asciiopt.hxx" #include <svx/langbox.hxx> @@ -96,7 +95,6 @@ private: /** Enables or disables all separator checkboxes and edit fields. */ void SetupSeparatorCtrls(); - bool GetLine( sal_uLong nLine, OUString &rText ); void UpdateVertical(); inline bool Seek( sal_uLong nPos ); // synced to and from mnStreamPos @@ -110,7 +108,6 @@ private: DECL_LINK( ColTypeHdl, ScCsvTableBox* ); }; - inline bool ScImportAsciiDlg::Seek(sal_uLong nPos) { bool bSuccess = true; diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 495ec50c8005..66508e84fae4 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -52,7 +52,6 @@ private: OUString aStrDelMsg; OUString aStrRename; - ScAutoFormat* pFormat; const ScAutoFormatData* pSelFmtData; sal_uInt16 nIndex; diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 271d183adcd9..4ab267d299bd 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -23,7 +23,6 @@ #include <vcl/layout.hxx> #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 f66414175b94..f3720363e2c1 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -22,7 +22,6 @@ #include "tphfedit.hxx" - enum ScHFEntryId { eNoneEntry , diff --git a/sc/source/ui/inc/select.hxx b/sc/source/ui/inc/select.hxx index 9d98904fc5ad..4f2988436c8b 100644 --- a/sc/source/ui/inc/select.hxx +++ b/sc/source/ui/inc/select.hxx @@ -27,7 +27,6 @@ class ScTabView; class ScViewData; - class ScViewSelectionEngine : public SelectionEngine { private: @@ -40,7 +39,6 @@ public: void SetWhich(ScSplitPos eNew) { eWhich = eNew; } }; - class ScViewFunctionSet : public FunctionSet // View (Gridwin / keyboard) { private: @@ -75,8 +73,6 @@ public: bool SetCursorAtCell( SCsCOL nPosX, SCsROW nPosY, bool bScroll ); }; - - class ScHeaderFunctionSet : public FunctionSet // Column / row headers { private: @@ -104,7 +100,6 @@ public: void SetAnchorFlag(bool bSet) { bAnchor = bSet; } }; - class ScHeaderSelectionEngine : public SelectionEngine { public: diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index ad2121c6108a..cb4c6b27c480 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -30,7 +30,6 @@ class ScDocShell; // class ScShareDocumentDlg - class ScShareDocumentDlg : public ModalDialog { private: diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 2346f0dac2d1..75e56b1afea7 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -49,8 +49,6 @@ public: sal_Int32 GetSelectEntryPos(sal_Int32 nPos) const; }; - #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index 50669e33c6de..a45de80bcd6a 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -33,7 +33,6 @@ class ScViewData; class ScDocument; - class ScSimpleRefDlg: public ScAnyRefDlg { private: @@ -63,7 +62,6 @@ private: DECL_LINK( CancelBtnHdl, void * ); DECL_LINK( OkBtnHdl, void * ); - protected: virtual void RefInputDone( bool bForced = false ) SAL_OVERRIDE; diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 5b041b5062a5..b2db7ac5a709 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -67,7 +67,6 @@ public: const com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& GetProperties(); }; - class ScSolverIntegerDialog : public ModalDialog { VclFrame* m_pFrame; diff --git a/sc/source/ui/inc/solverutil.hxx b/sc/source/ui/inc/solverutil.hxx index 7f910c640f4d..37107d04e1e7 100644 --- a/sc/source/ui/inc/solverutil.hxx +++ b/sc/source/ui/inc/solverutil.hxx @@ -28,7 +28,6 @@ namespace com { namespace sun { namespace star { namespace sheet { class XSolver; } } } } - class ScSolverUtil { public: diff --git a/sc/source/ui/inc/solvrdlg.hxx b/sc/source/ui/inc/solvrdlg.hxx index e0a728791f6d..5c6ff014b2b6 100644 --- a/sc/source/ui/inc/solvrdlg.hxx +++ b/sc/source/ui/inc/solvrdlg.hxx @@ -24,7 +24,6 @@ #include "address.hxx" #include "anyrefdg.hxx" - #include <vcl/fixed.hxx> #include <vcl/group.hxx> @@ -36,7 +35,6 @@ enum ScSolverErr SOLVERR_INVALID_TARGETVALUE }; - class ScSolverDlg : public ScAnyRefDlg { public: @@ -88,5 +86,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_SOLVRDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index a62e62e201ef..2b4703de824f 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.hxx @@ -45,5 +45,4 @@ private: #endif // INCLUDED_SC_SOURCE_UI_INC_STRINDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx index 43e0f3ebfb9d..d49365b62060 100644 --- a/sc/source/ui/inc/styledlg.hxx +++ b/sc/source/ui/inc/styledlg.hxx @@ -52,8 +52,6 @@ private: sal_uInt16 m_nSheetId; }; - #endif // INCLUDED_SC_SOURCE_UI_INC_STYLEDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/subtdlg.hxx b/sc/source/ui/inc/subtdlg.hxx index 738e5f94c9d9..4c08dad42737 100644 --- a/sc/source/ui/inc/subtdlg.hxx +++ b/sc/source/ui/inc/subtdlg.hxx @@ -33,8 +33,6 @@ private: DECL_LINK( RemoveHdl, PushButton * ); }; - #endif // INCLUDED_SC_SOURCE_UI_INC_SUBTDLG_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tabcont.hxx b/sc/source/ui/inc/tabcont.hxx index 644a2f9a8750..02ce3e0cb221 100644 --- a/sc/source/ui/inc/tabcont.hxx +++ b/sc/source/ui/inc/tabcont.hxx @@ -24,13 +24,11 @@ #include <svtools/tabbar.hxx> #include <svtools/transfer.hxx> - class ScViewData; // initial size #define SC_TABBAR_DEFWIDTH 270 - class ScTabControl : public TabBar, public DropTargetHelper, public DragSourceHelper { private: diff --git a/sc/source/ui/inc/tabopdlg.hxx b/sc/source/ui/inc/tabopdlg.hxx index eed62e4d5f59..3b6cf707babd 100644 --- a/sc/source/ui/inc/tabopdlg.hxx +++ b/sc/source/ui/inc/tabopdlg.hxx @@ -26,7 +26,6 @@ #include "address.hxx" #include "anyrefdg.hxx" - enum ScTabOpErr { TABOPERR_NOFORMULA = 1, diff --git a/sc/source/ui/inc/tabsplit.hxx b/sc/source/ui/inc/tabsplit.hxx index 8e29dc29b7f1..ee889bdec6d4 100644 --- a/sc/source/ui/inc/tabsplit.hxx +++ b/sc/source/ui/inc/tabsplit.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_TABSPLIT_HXX #define INCLUDED_SC_SOURCE_UI_INC_TABSPLIT_HXX - #include <vcl/split.hxx> class ScViewData; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index b44db7012d11..a5d739289099 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -62,7 +62,6 @@ namespace chart2 { namespace data { #define SC_FORCEMODE_NONE 0xff - // Help - Window class ScCornerButton : public Window @@ -83,7 +82,6 @@ public: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; }; - class ScTabView : boost::noncopyable { private: @@ -246,7 +244,6 @@ public: void RemoveHintWindow(); void TestHintWindow(); - DECL_LINK( TabBarResize, void* ); /** Sets an absolute tab bar width (in pixels). */ void SetTabBarWidth( long nNewWidth ); @@ -463,7 +460,6 @@ public: void KillEditView( bool bNoPaint ); void UpdateEditView(); - // Blocks void SelectAll( bool bContinue = false ); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index aa22c2ffabb9..346f66fcef65 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -89,7 +89,6 @@ enum ObjectSelectionType OST_Media }; - class ScTabViewShell: public SfxViewShell, public ScDBFunc { private: @@ -152,7 +151,6 @@ private: bool bFormShellAtTop; // does the FormShell need to be on top? - bool bDontSwitch; // Don't turn off EditShell bool bInFormatDialog; // for GetSelectionText bool bPrintSelected; // for result of SvxPrtQryBox @@ -315,7 +313,6 @@ public: bool GetDontSwitch(){return bDontSwitch;} void SetDontSwitch(bool bFlag){bDontSwitch=bFlag;} - void SetAuditShell( bool bActive ); void SetDrawFormShell( bool bActive ); void SetEditShell(EditView* pView, bool bActive ); @@ -324,7 +321,6 @@ public: void SetGraphicShell( bool bActive ); void SetMediaShell( bool bActive ); - void SetDrawShellOrSub(); void SetCurSubShell( ObjectSelectionType eOST, bool bForce = false ); @@ -424,7 +420,6 @@ public: void SetForceFocusOnCurCell(bool bFlag) { bForceFocusOnCurCell=bFlag; } }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index 1d93da4cb2f8..83c3b4bef254 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <svx/zoomslideritem.hxx> - class ScZoomSliderControl: public SfxToolBoxControl { public: diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index 0fd2f39a2b38..3cdfa31dcada 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -55,7 +55,6 @@ private: DECL_LINK( RadioHdl, RadioButton* ); }; - #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 7ca20de74cd3..2b47c7869ff4 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_TPCALC_HXX #define INCLUDED_SC_SOURCE_UI_INC_TPCALC_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> @@ -73,13 +72,11 @@ private: private: void Init(); - // Handler: DECL_LINK( RadioClickHdl, RadioButton* ); DECL_LINK( CheckClickHdl, CheckBox* ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index a9bbd9ac5c92..fac10841d727 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -81,7 +81,6 @@ private: sal_Unicode mnDecSep; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 995ab4524140..15acb7d8b256 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -77,7 +77,6 @@ private: ScFooterPage( Window* pParent, const SfxItemSet& rSet ); }; - #endif // INCLUDED_SC_SOURCE_UI_INC_TPHF_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tphfedit.hxx b/sc/source/ui/inc/tphfedit.hxx index 3e60f12636da..9f0f28d0d91a 100644 --- a/sc/source/ui/inc/tphfedit.hxx +++ b/sc/source/ui/inc/tphfedit.hxx @@ -96,7 +96,6 @@ private: Link aObjectSelectLink; }; - class SC_DLLPUBLIC ScExtIButton : public ImageButton { private: diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 8f6c794c2aee..7a900e70aec3 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -42,7 +42,6 @@ class ScViewData; class ScSortDlg; struct ScSortParam; - // Sort Criteria class ScTabPageSortFields : public SfxTabPage @@ -98,7 +97,6 @@ private: DECL_LINK( SelectHdl, ListBox * ); }; - // Sort Options class ScDocument; diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index b91179e1c88a..b661f85321e9 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -20,13 +20,10 @@ #ifndef INCLUDED_SC_SOURCE_UI_INC_TPSTAT_HXX #define INCLUDED_SC_SOURCE_UI_INC_TPSTAT_HXX - #include <sfx2/tabdlg.hxx> #include <vcl/fixed.hxx> #include <svtools/stdctrl.hxx> - - class ScDocStatPage: public SfxTabPage { public: diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 41248196d03b..b5560e258616 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -78,7 +78,6 @@ public: virtual void ActivatePage( const SfxItemSet& ) SAL_OVERRIDE; virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE; - }; class ScDocument; @@ -130,7 +129,6 @@ public: }; - #endif // INCLUDED_SC_SOURCE_UI_INC_TPVIEW_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 976d54b30f20..0cbbbb221204 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -86,7 +86,6 @@ public: const std::vector<editeng::MisspellRanges>* GetMisspellRanges() const { return mpMisspellRanges;} }; - #define SC_TAB_INSERTED 1 #define SC_TAB_DELETED 2 #define SC_TAB_MOVED 3 @@ -144,7 +143,6 @@ public: sal_uInt16 GetIndex() const { return nIndex; } }; - // Parameter item for the sort dialog: class SC_DLLPUBLIC ScSortItem : public SfxPoolItem diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx index 85726c8a2b1e..845d1978434c 100644 --- a/sc/source/ui/inc/undobase.hxx +++ b/sc/source/ui/inc/undobase.hxx @@ -192,7 +192,6 @@ public: virtual sal_uInt16 GetId() const SAL_OVERRIDE; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/undoblk.hxx b/sc/source/ui/inc/undoblk.hxx index 257c470e5615..3444eb895404 100644 --- a/sc/source/ui/inc/undoblk.hxx +++ b/sc/source/ui/inc/undoblk.hxx @@ -73,7 +73,6 @@ private: void SetChangeTrack(); }; - class ScUndoDeleteCells: public ScMoveUndo { public: @@ -103,7 +102,6 @@ private: void SetChangeTrack(); }; - class ScUndoDeleteMulti: public ScMoveUndo { public: @@ -135,7 +133,6 @@ private: void SetChangeTrack(); }; - class ScUndoCut: public ScBlockUndo { public: @@ -165,7 +162,6 @@ private: void SetChangeTrack(); }; - struct ScUndoPasteOptions { sal_uInt16 nFunction; @@ -219,7 +215,6 @@ private: void SetChangeTrack(); }; - class ScUndoDragDrop: public ScMoveUndo { public: @@ -254,7 +249,6 @@ private: void SetChangeTrack(); }; - class ScUndoDeleteContents: public ScSimpleUndo { public: @@ -291,7 +285,6 @@ private: void SetChangeTrack(); }; - class ScUndoFillTable: public ScSimpleUndo { public: @@ -328,7 +321,6 @@ private: void SetChangeTrack(); }; - class ScUndoSelectionAttr: public ScSimpleUndo { public: @@ -365,7 +357,6 @@ private: void ChangeEditData( const bool bUndo ); }; - class ScUndoWidthOrHeight: public ScSimpleUndo { public: @@ -403,7 +394,6 @@ private: SdrUndoAction* pDrawUndo; }; - class ScUndoAutoFill: public ScBlockUndo { public: @@ -439,7 +429,6 @@ private: void SetChangeTrack(); }; - class ScUndoMerge: public ScSimpleUndo { public: @@ -464,7 +453,6 @@ private: void DoChange( bool bUndo ) const; }; - class ScUndoAutoFormat: public ScBlockUndo { public: @@ -489,7 +477,6 @@ private: sal_uInt16 nFormatNo; }; - class ScUndoReplace: public ScSimpleUndo { public: @@ -520,7 +507,6 @@ private: void SetChangeTrack(); }; - class ScUndoTabOp: public ScSimpleUndo { public: @@ -553,7 +539,6 @@ private: ScTabOpParam::Mode meMode; }; - class ScUndoConversion : public ScSimpleUndo { public: @@ -661,7 +646,6 @@ private: ScRange maRange; }; - class ScUndoUseScenario: public ScSimpleUndo { public: @@ -686,7 +670,6 @@ private: OUString aName; }; - class ScUndoSelectionStyle: public ScSimpleUndo { public: @@ -715,7 +698,6 @@ private: void DoChange( const bool bUndo ); }; - class ScUndoRefreshLink: public ScSimpleUndo { public: @@ -736,7 +718,6 @@ private: ScDocument* pRedoDoc; }; - class ScUndoEnterMatrix: public ScBlockUndo { public: @@ -763,7 +744,6 @@ private: void SetChangeTrack(); }; - class ScUndoInsertAreaLink : public ScSimpleUndo { public: @@ -791,7 +771,6 @@ private: sal_uLong nRefreshDelay; }; - class ScUndoRemoveAreaLink : public ScSimpleUndo { public: @@ -819,7 +798,6 @@ private: sal_uLong nRefreshDelay; }; - class ScUndoUpdateAreaLink : public ScSimpleUndo //! also change BlockUndo? { public: @@ -864,7 +842,6 @@ private: void DoChange( const bool bUndo ) const; }; - class ScUndoIndent: public ScBlockUndo { public: @@ -886,7 +863,6 @@ private: bool bIsIncrement; }; - class ScUndoTransliterate: public ScBlockUndo { public: @@ -908,7 +884,6 @@ private: sal_Int32 nTransliterationType; }; - class ScUndoClearItems: public ScBlockUndo { public: @@ -930,7 +905,6 @@ private: sal_uInt16* pWhich; }; - class ScUndoRemoveBreaks: public ScSimpleUndo { public: @@ -951,7 +925,6 @@ private: ScDocument* pUndoDoc; }; - class ScUndoRemoveMerge: public ScBlockUndo { public: @@ -975,7 +948,6 @@ private: ScDocument* pUndoDoc; }; - class ScUndoBorder: public ScBlockUndo { public: @@ -1001,7 +973,6 @@ private: SvxBoxInfoItem* pInner; }; - #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 6995bf3ef325..edce6bc1f22b 100644 --- a/sc/source/ui/inc/undocell.hxx +++ b/sc/source/ui/inc/undocell.hxx @@ -79,7 +79,6 @@ private: void DoChange( const ScPatternAttr* pWhichPattern, const ::boost::shared_ptr<EditTextObject>& pEditData ) const; }; - class ScUndoEnterData: public ScSimpleUndo { public: @@ -122,7 +121,6 @@ private: void SetChangeTrack(); }; - class ScUndoEnterValue: public ScSimpleUndo { public: @@ -340,7 +338,6 @@ private: SdrUndoAction* pDrawUndo; }; - class ScUndoRangeNames: public ScSimpleUndo { public: diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 1830c055d2f3..00388d71b6a3 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -68,7 +68,6 @@ private: bool bShow; }; - class ScUndoMakeOutline: public ScSimpleUndo { public: @@ -95,7 +94,6 @@ private: bool bMake; }; - class ScUndoOutlineLevel: public ScSimpleUndo { public: @@ -123,7 +121,6 @@ private: sal_uInt16 nLevel; }; - class ScUndoOutlineBlock: public ScSimpleUndo { public: @@ -150,7 +147,6 @@ private: bool bShow; }; - class ScUndoRemoveAllOutlines: public ScSimpleUndo { public: @@ -175,7 +171,6 @@ private: ScOutlineTable* pUndoTable; }; - class ScUndoAutoOutline: public ScSimpleUndo { public: @@ -200,7 +195,6 @@ private: ScOutlineTable* pUndoTable; }; - class ScUndoSubTotals: public ScDBFuncUndo { public: @@ -230,7 +224,6 @@ private: ScDBCollection* pUndoDB; }; - class ScUndoSort: public ScDBFuncUndo { public: @@ -257,7 +250,6 @@ private: ScRange aDestRange; }; - class ScUndoQuery: public ScDBFuncUndo { public: @@ -288,7 +280,6 @@ private: bool bDoSize; }; - class ScUndoAutoFilter: public ScDBFuncUndo { private: @@ -311,7 +302,6 @@ public: virtual OUString GetComment() const SAL_OVERRIDE; }; - class ScUndoDBData: public ScSimpleUndo { public: @@ -332,7 +322,6 @@ private: ScDBCollection* pRedoColl; }; - class ScUndoImportData: public ScSimpleUndo { public: @@ -364,7 +353,6 @@ private: bool bRedoFilled; }; - class ScUndoRepeatDB: public ScSimpleUndo { public: @@ -398,7 +386,6 @@ private: bool bQuerySize; }; - class ScUndoDataPilot: public ScSimpleUndo { public: @@ -424,7 +411,6 @@ private: bool bAllowMove; }; - class ScUndoConsolidate: public ScSimpleUndo { public: @@ -453,7 +439,6 @@ private: ScDBData* pUndoData; }; - class ScUndoChartData: public ScSimpleUndo { public: @@ -524,7 +509,6 @@ private: void SetChangeTrack(); }; - #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 b0bc9202a7d6..7487f9076838 100644 --- a/sc/source/ui/inc/undostyl.hxx +++ b/sc/source/ui/inc/undostyl.hxx @@ -102,7 +102,6 @@ private: OUString maNewStyle; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 515e46c54574..b9f573b3955b 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -98,7 +98,6 @@ private: void SetChangeTrack(); }; - class ScUndoDeleteTab: public ScMoveUndo { public: @@ -125,7 +124,6 @@ private: void SetChangeTrack(); }; - class ScUndoRenameTab: public ScSimpleUndo { public: @@ -152,7 +150,6 @@ private: void DoChange( SCTAB nTab, const OUString& rName ) const; }; - class ScUndoMoveTab: public ScSimpleUndo { public: @@ -182,7 +179,6 @@ private: void DoChange( bool bUndo ) const; }; - class ScUndoCopyTab: public ScSimpleUndo { public: @@ -268,7 +264,6 @@ private: SdrUndoAction* pDrawUndo; }; - class ScUndoImportTab : public ScSimpleUndo { public: @@ -294,7 +289,6 @@ private: void DoChange() const; }; - class ScUndoRemoveLink : public ScSimpleUndo { public: @@ -324,7 +318,6 @@ private: void DoChange( bool bLink ) const; }; - class ScUndoShowHideTab : public ScSimpleUndo { public: @@ -401,7 +394,6 @@ private: void DoProtect(bool bProtect); }; - class ScUndoPrintRange : public ScSimpleUndo { public: @@ -425,7 +417,6 @@ private: void DoChange( bool bUndo ); }; - class ScUndoScenarioFlags: public ScSimpleUndo { public: @@ -458,7 +449,6 @@ private: sal_uInt16 nNewFlags; }; - class ScUndoRenameObject: public ScSimpleUndo { public: @@ -484,7 +474,6 @@ private: SdrObject* GetObject(); }; - class ScUndoLayoutRTL : public ScSimpleUndo { public: diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 76f00c0b49a8..edda7dc26bad 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -172,7 +172,6 @@ public: bool Close() SAL_OVERRIDE; }; - /** The tab page "Criteria" from the Validation dialog. */ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage { @@ -258,7 +257,6 @@ public: void RemoveRefDlg(); }; - class ScTPValidationHelp : public SfxTabPage { private: diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index 34c62927bc87..bcbca5620004 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -495,7 +495,6 @@ public: const ScDocument * pDoc, SCTAB nTabNo ); }; - inline long ScViewData::ToPixel( sal_uInt16 nTwips, double nFactor ) { long nRet = (long)( nTwips * nFactor ); diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 6cf382509c19..28b7a2e8bf29 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -255,7 +255,6 @@ public: bool InsertTable( const OUString& rName, SCTAB nTabNr, bool bRecord = true ); bool InsertTables(std::vector<OUString>& aNames, SCTAB nTab, SCTAB nCount, bool bRecord = true); - bool AppendTable( const OUString& rName, bool bRecord = true ); bool DeleteTable( SCTAB nTabNr, bool bRecord = true ); @@ -345,7 +344,6 @@ protected: const ::editeng::SvxBorderLine* pSrcLine, bool bColor ); - private: void PasteRTF( SCCOL nCol, SCROW nStartRow, const ::com::sun::star::uno::Reference< diff --git a/sc/source/ui/inc/warnbox.hxx b/sc/source/ui/inc/warnbox.hxx index 641f4a0c7e3a..3111fa511cad 100644 --- a/sc/source/ui/inc/warnbox.hxx +++ b/sc/source/ui/inc/warnbox.hxx @@ -22,7 +22,6 @@ #include <vcl/msgbox.hxx> - /** Message box with warning image and "Do not show again" checkbox. */ class ScCbWarningBox : public WarningBox { @@ -42,7 +41,6 @@ public: virtual void DisableDialog(); }; - /** Warning box for "Replace cell contents?". */ class ScReplaceWarnBox : public ScCbWarningBox { @@ -55,7 +53,6 @@ public: virtual void DisableDialog() SAL_OVERRIDE; }; - #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 34c80387222a..bfbd4f53fd5e 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <comphelper/string.hxx> #include <svl/undo.hxx> #include <unotools/textsearch.hxx> @@ -52,7 +51,6 @@ #define RD_SPECIAL_CONTENT 1 #define RD_SPECIAL_VISCONTENT 2 - // class ScRedlinData ScRedlinData::ScRedlinData() @@ -79,7 +77,6 @@ ScRedlinData::~ScRedlinData() bIsAcceptable=false; } - // class ScAcceptChgDlg ScAcceptChgDlg::ScAcceptChgDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, @@ -291,7 +288,6 @@ OUString* ScAcceptChgDlg::MakeTypeString(ScChangeActionType eType) return pStr; } - bool ScAcceptChgDlg::IsValidAction(const ScChangeAction* pScChangeAction) { if(pScChangeAction==NULL) return false; @@ -761,7 +757,6 @@ bool ScAcceptChgDlg::PreNotify( NotifyEvent& rNEvt ) return SfxModelessDialog::PreNotify(rNEvt); } - void ScAcceptChgDlg::UpdateView() { bNeedsUpdate=false; @@ -1410,7 +1405,6 @@ IMPL_LINK( ScAcceptChgDlg, ExpandingHandle, SvxRedlinTable*, pTable ) return (sal_uLong) true; } - void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartAction, sal_uLong nEndAction, sal_uLong /* nPos */) { @@ -1435,7 +1429,6 @@ void ScAcceptChgDlg::AppendChanges(ScChangeTrack* pChanges,sal_uLong nStartActio pScChangeAction=pChanges->GetAction(i); if(pScChangeAction==NULL) continue; - switch(pScChangeAction->GetState()) { case SC_CAS_VIRGIN: @@ -1524,7 +1517,6 @@ void ScAcceptChgDlg::RemoveEntrys(sal_uLong nStartAction,sal_uLong nEndAction) if(nStartAction<=nAction && nAction<=nEndAction) bRemove=true; - } SvTreeListEntry* pPrevEntry = pTheView->Prev(pEntry); @@ -1749,7 +1741,6 @@ IMPL_LINK_NOARG(ScAcceptChgDlg, CommandHdl) sal_uInt16 nCommand=aPopup.Execute( this, GetPointerPosPixel() ); - if(nCommand) { if(nCommand==SC_CHANGES_COMMENT) @@ -1951,7 +1942,6 @@ IMPL_LINK( ScAcceptChgDlg, ColCompareHdl, SvSortData*, pSortData ) } } - } return nCompare; } diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 7e9a2f40ba29..4d284152d3ec 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -206,7 +206,6 @@ void ScFormulaReferenceHelper::ShowFormulaReference(const OUString& rStr) { bool bDoubleRef=(pToken->GetType()==formula::svDoubleRef); - if(pToken->GetType()==formula::svSingleRef || bDoubleRef) { ScRange aRange; @@ -444,7 +443,6 @@ namespace } } - void ScFormulaReferenceHelper::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* pButton ) { if (!pRefEdit) @@ -716,8 +714,6 @@ void ScFormulaReferenceHelper::EnableSpreadsheets(bool bFlag, bool bChildren) } } - - static void lcl_InvalidateWindows() { TypeId aType(TYPE(ScDocShell)); @@ -750,7 +746,6 @@ static void lcl_InvalidateWindows() } } - static void lcl_HideAllReferences() { TypeId aScType = TYPE(ScTabViewShell); @@ -762,11 +757,9 @@ static void lcl_HideAllReferences() } } - //The class of ScAnyRefDlg is rewritten by PengYunQuan for Validity Cell Range Picker // class ScRefHandler - ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB, bool bBindRef ): m_rWindow( rWindow ), m_bInRefMode( false ), @@ -937,7 +930,6 @@ void ScRefHandler::RefInputStart( formula::RefEdit* pEdit, formula::RefButton* p m_aHelper.RefInputStart( pEdit, pButton ); } - void ScRefHandler::ToggleCollapsed( formula::RefEdit* pEdit, formula::RefButton* pButton ) { m_aHelper.ToggleCollapsed( pEdit, pButton ); diff --git a/sc/source/ui/miscdlgs/autofmt.cxx b/sc/source/ui/miscdlgs/autofmt.cxx index 239efd81f79d..653663f9e1c0 100644 --- a/sc/source/ui/miscdlgs/autofmt.cxx +++ b/sc/source/ui/miscdlgs/autofmt.cxx @@ -187,7 +187,6 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) // Ausgabe des Zelltextes: - OUString cellString; bool bNumFormat = pCurData->GetIncludeValueFormat(); sal_uLong nNum; @@ -252,7 +251,6 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) SvxHorJustifyItem aHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY ); SvxCellHorJustify eJustification; - // Ausrichtung: eJustification = mbRTL ? SVX_HOR_JUSTIFY_RIGHT : bJustify ? @@ -305,12 +303,10 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) - aStrSize.Width() - FRAME_OFFSET ); - // vertikal (immer zentrieren): aPos.Y() += (mnRowHeight - (sal_uInt16)aStrSize.Height()) / 2; - // horizontal if ( eJustification != SVX_HOR_JUSTIFY_STANDARD ) @@ -354,7 +350,6 @@ void ScAutoFmtPreview::DrawString( size_t nCol, size_t nRow ) } } - aScriptedText.DrawText( aPos ); } diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 7c10fab2cb87..63a6fd02036b 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -28,7 +28,6 @@ // struct ScConflictsListEntry - bool ScConflictsListEntry::HasSharedAction( sal_uLong nSharedAction ) const { ScChangeActionList::const_iterator aEnd = maSharedActions.end(); @@ -59,7 +58,6 @@ bool ScConflictsListEntry::HasOwnAction( sal_uLong nOwnAction ) const // class ScConflictsListHelper - bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, sal_uLong nOwnAction ) { ScConflictsList::const_iterator aEnd = rConflictsList.end(); @@ -145,7 +143,6 @@ void ScConflictsListHelper::TransformConflictsList( ScConflictsList& rConflictsL // class ScConflictsFinder - ScConflictsFinder::ScConflictsFinder( ScChangeTrack* pTrack, sal_uLong nStartShared, sal_uLong nEndShared, sal_uLong nStartOwn, sal_uLong nEndOwn, ScConflictsList& rConflictsList ) :mpTrack( pTrack ) @@ -278,10 +275,8 @@ bool ScConflictsFinder::Find() return bReturn; } - // class ScConflictsResolver - ScConflictsResolver::ScConflictsResolver( ScChangeTrack* pTrack, ScConflictsList& rConflictsList ) :mpTrack ( pTrack ) ,mrConflictsList ( rConflictsList ) @@ -374,10 +369,8 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA } } - // class ScConflictsDlg - ScConflictsDlg::ScConflictsDlg( Window* pParent, ScViewData* pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList ) :ModalDialog( pParent, ScResId( RID_SCDLG_CONFLICTS ) ) ,maFtConflicts ( this, ScResId( FT_CONFLICTS ) ) diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index ea118ed27f8e..dc4a3b83eea4 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -35,7 +35,6 @@ const sal_uLong nEntryDataDelim = 2; // class ScColRowNameRangesDlg - /************************************************************************* #* Member: ScColRowNameRangesDlg #*------------------------------------------------------------------------ @@ -91,7 +90,6 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, Init(); } - /************************************************************************* #* Member: ~ScColRowNameRangesDlg #*------------------------------------------------------------------------ @@ -110,7 +108,6 @@ ScColRowNameRangesDlg::~ScColRowNameRangesDlg() { } - /************************************************************************* #* Member: Init #*------------------------------------------------------------------------ @@ -188,7 +185,6 @@ void ScColRowNameRangesDlg::Init() Range1SelectHdl( 0 ); } - /************************************************************************* #* Member: SetColRowData #*------------------------------------------------------------------------ @@ -288,7 +284,6 @@ void ScColRowNameRangesDlg::SetColRowData( const ScRange& rLabelRange, bool bRef } } - /************************************************************************* #* Member: AdjustColRowData #*------------------------------------------------------------------------ @@ -363,7 +358,6 @@ void ScColRowNameRangesDlg::AdjustColRowData( const ScRange& rDataRange, bool bR pEdAssign2->SetSelection( Selection( SELECTION_MAX, SELECTION_MAX ) ); } - /************************************************************************* #* Member: SetReference #*------------------------------------------------------------------------ @@ -399,7 +393,6 @@ void ScColRowNameRangesDlg::SetReference( const ScRange& rRef, ScDocument* /* pD } } - /************************************************************************* #* Member: Close #*------------------------------------------------------------------------ @@ -419,7 +412,6 @@ bool ScColRowNameRangesDlg::Close() return DoClose( ScColRowNameRangesDlgWrapper::GetChildWindowId() ); } - /************************************************************************* #* Member: SetActive #*------------------------------------------------------------------------ @@ -453,7 +445,6 @@ void ScColRowNameRangesDlg::SetActive() RefInputDone(); } - /************************************************************************* #* Member: UpdateNames #*------------------------------------------------------------------------ @@ -580,7 +571,6 @@ void ScColRowNameRangesDlg::UpdateNames() pLbRange->Invalidate(); } - /************************************************************************* #* Member: UpdateRangeData #*------------------------------------------------------------------------ @@ -630,7 +620,6 @@ void ScColRowNameRangesDlg::UpdateRangeData( const ScRange& rRange, bool bColNam pRbAssign2->Enable(); } - /************************************************************************* #* Member: IsRefInputMode #*------------------------------------------------------------------------ @@ -651,10 +640,8 @@ bool ScColRowNameRangesDlg::IsRefInputMode() const return (pEdActive != NULL); } - // Handler: - /************************************************************************* #* Handler: OkBtnHdl #*------------------------------------------------------------------------ @@ -688,7 +675,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, OkBtnHdl) return 0; } - /************************************************************************* #* Handler: CancelBtnHdl #*------------------------------------------------------------------------ @@ -710,7 +696,6 @@ IMPL_LINK_NOARG_INLINE_START(ScColRowNameRangesDlg, CancelBtnHdl) } IMPL_LINK_NOARG_INLINE_END(ScColRowNameRangesDlg, CancelBtnHdl) - /************************************************************************* #* Handler: AddBtnHdl #*------------------------------------------------------------------------ @@ -783,7 +768,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, AddBtnHdl) return 0; } - /************************************************************************* #* Handler: RemoveBtnHdl #*------------------------------------------------------------------------ @@ -860,7 +844,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RemoveBtnHdl) return 0; } - /************************************************************************* #* Handler: Range1SelectHdl #*------------------------------------------------------------------------ @@ -946,7 +929,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1SelectHdl) return 0; } - /************************************************************************* #* Handler: Range1DataModifyHdl #*------------------------------------------------------------------------ @@ -995,7 +977,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range1DataModifyHdl) return 0; } - /************************************************************************* #* Handler: Range2DataModifyHdl #*------------------------------------------------------------------------ @@ -1032,7 +1013,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl) return 0; } - /************************************************************************* #* Handler: ColClickHdl #*------------------------------------------------------------------------ @@ -1069,7 +1049,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColClickHdl) return 0; } - /************************************************************************* #* Handler: RowClickHdl #*------------------------------------------------------------------------ @@ -1106,7 +1085,6 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, RowClickHdl) return 0; } - IMPL_LINK( ScColRowNameRangesDlg, GetFocusHdl, Control*, pCtrl ) { if( (pCtrl == (Control*)pEdAssign) || (pCtrl == (Control*)pRbAssign) ) @@ -1122,7 +1100,6 @@ IMPL_LINK( ScColRowNameRangesDlg, GetFocusHdl, Control*, pCtrl ) return 0; } - IMPL_LINK_NOARG(ScColRowNameRangesDlg, LoseFocusHdl) { bDlgLostFocus = !IsActive(); diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx index 433d1946a306..3c91496db987 100644 --- a/sc/source/ui/miscdlgs/datafdlg.cxx +++ b/sc/source/ui/miscdlgs/datafdlg.cxx @@ -20,7 +20,6 @@ #define HDL(hdl) LINK( this, ScDataFormDlg, hdl ) - ScDataFormDlg::ScDataFormDlg(Window* pParent, ScTabViewShell* pTabViewShellOri) : ModalDialog(pParent, "DataFormDialog", "modules/scalc/ui/dataform.ui") , pTabViewShell(pTabViewShellOri) diff --git a/sc/source/ui/miscdlgs/delcldlg.cxx b/sc/source/ui/miscdlgs/delcldlg.cxx index 1bcc3532b31a..e63c58cc142b 100644 --- a/sc/source/ui/miscdlgs/delcldlg.cxx +++ b/sc/source/ui/miscdlgs/delcldlg.cxx @@ -17,16 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "delcldlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - static sal_uInt8 nDelItemChecked=0; ScDeleteCellDlg::ScDeleteCellDlg(Window* pParent, bool bDisallowCellMove) diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index dd1d0cdc38ce..d0da98af6339 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -23,7 +23,6 @@ #include "scresid.hxx" #include "miscdlgs.hrc" - bool ScDeleteContentsDlg::bPreviousAllCheck = false; sal_uInt16 ScDeleteContentsDlg::nPreviousChecks = (IDF_DATETIME | IDF_STRING | IDF_NOTE | IDF_FORMULA | diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index c9b51ad81d86..3b057dab871f 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -74,7 +74,6 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, Init( nPossDir ); } - ScFillSeriesDlg::~ScFillSeriesDlg() { } @@ -180,7 +179,6 @@ void ScFillSeriesDlg::Init( sal_uInt16 nPossDir ) bStartValFlag = false; } - bool ScFillSeriesDlg::CheckStartVal() { bool bValOk = false; @@ -199,7 +197,6 @@ bool ScFillSeriesDlg::CheckStartVal() return bValOk; } - bool ScFillSeriesDlg::CheckIncrementVal() { sal_uInt32 nKey = 0; @@ -208,7 +205,6 @@ bool ScFillSeriesDlg::CheckIncrementVal() return rDoc.GetFormatTable()->IsNumberFormat( aStr, nKey, fIncrement ); } - bool ScFillSeriesDlg::CheckEndVal() { bool bValOk = false; @@ -229,7 +225,6 @@ bool ScFillSeriesDlg::CheckEndVal() // Handler: - IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) { if ( pBtn == m_pBtnDate ) @@ -266,7 +261,6 @@ IMPL_LINK( ScFillSeriesDlg, DisableHdl, Button *, pBtn ) return 0; } - IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) { if ( m_pBtnLeft->IsChecked() ) theFillDir = FILL_TO_LEFT; @@ -315,5 +309,4 @@ IMPL_LINK_NOARG(ScFillSeriesDlg, OKHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index 43ddb4e9f7b9..31dff0c2f333 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -17,15 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "groupdlg.hxx" #include "scresid.hxx" - ScGroupDlg::ScGroupDlg(Window* pParent, bool bUngroup, bool bRows) : ModalDialog(pParent, bUngroup ? diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 6cd7829128e1..631e8bb5d348 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -36,10 +36,8 @@ | SCA_COL2_ABSOLUTE | SCA_ROW2_ABSOLUTE | SCA_TAB2_ABSOLUTE #define ABS_DREF3D ABS_DREF | SCA_TAB_3D - // class ScHighlightChgDlg - ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScViewData* ptrViewData) : ScAnyRefDlg(pB, pCW, pParent, "ShowChangesDialog", @@ -92,7 +90,6 @@ void ScHighlightChgDlg::Init() m_pFilterCtr->InsertAuthor(*it); } - ScChangeViewSettings* pViewSettings=pDoc->GetChangeViewSettings(); if(pViewSettings!=NULL) @@ -133,7 +130,6 @@ void ScHighlightChgDlg::Init() HighlightHandle(m_pHighlightBox); } - // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Edit angezeigt wird. @@ -149,7 +145,6 @@ void ScHighlightChgDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) } } - bool ScHighlightChgDlg::Close() { return DoClose( ScHighlightChgDlgWrapper::GetChildWindowId() ); diff --git a/sc/source/ui/miscdlgs/inscldlg.cxx b/sc/source/ui/miscdlgs/inscldlg.cxx index 3a44f7b264af..3d1f338cd75c 100644 --- a/sc/source/ui/miscdlgs/inscldlg.cxx +++ b/sc/source/ui/miscdlgs/inscldlg.cxx @@ -17,16 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "inscldlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - static sal_uInt8 nInsItemChecked=0; ScInsertCellDlg::ScInsertCellDlg( Window* pParent,bool bDisallowCellMove) : diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 0e967b4b5ccb..18426b0da703 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -17,16 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #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; @@ -112,7 +108,6 @@ ScInsertContentsDlg::ScInsertContentsDlg( Window* pParent, DisableChecks( mpBtnInsAll->IsChecked() ); - mpBtnInsAll->SetClickHdl( LINK( this, ScInsertContentsDlg, InsAllHdl ) ); mpBtnLink->SetClickHdl( LINK( this, ScInsertContentsDlg, LinkBtnHdl ) ); @@ -272,7 +267,6 @@ void ScInsertContentsDlg::SetCellShiftDisabled( int nDisable ) } } - IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl) { DisableChecks( mpBtnInsAll->IsChecked() ); diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 22e2c47d82b8..f48035515bf6 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -227,7 +227,6 @@ const OUString* ScInsertTableDlg::GetNextTable( sal_uInt16* pN ) // Handler: - IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) { nTableCount = static_cast<SCTAB>(m_pNfCount->GetValue()); @@ -250,7 +249,6 @@ IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl) return 0; } - IMPL_LINK_NOARG(ScInsertTableDlg, ChoiceHdl_Impl) { if ( m_pBtnNew->IsChecked() ) diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 88be94c04b74..69ef6f032c1e 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include <vcl/msgbox.hxx> #include "lbseldlg.hxx" diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 8d413077173d..1228a3f51f1b 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include <comphelper/string.hxx> diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 359230d5cc64..bfa3eff1e350 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -17,16 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "mtrindlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - ScMetricInputDlg::ScMetricInputDlg( Window* pParent, const OString& sDialogName, long nCurrent, @@ -86,7 +82,6 @@ long ScMetricInputDlg::GetInputValue( FieldUnit eUnit ) const return sal::static_int_cast<long>( m_pEdValue->Denormalize( m_pEdValue->GetValue( eUnit ) ) ); } - // Handler: IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl) diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index 46311bdb201b..65dc45acd880 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include <vcl/msgbox.hxx> #include "mvtabdlg.hxx" @@ -70,10 +67,6 @@ ScMoveTableDlg::~ScMoveTableDlg() { } - - - - void ScMoveTableDlg::GetTabNameString( OUString& rString ) const { rString = pEdTabName->GetText(); @@ -255,7 +248,6 @@ void ScMoveTableDlg::InitDocListBox() pLbDoc->SelectEntryPos( nSelPos ); } - // Handler: IMPL_LINK( ScMoveTableDlg, CheckBtnHdl, void *, pBtn ) diff --git a/sc/source/ui/miscdlgs/namecrea.cxx b/sc/source/ui/miscdlgs/namecrea.cxx index 722a39500ca7..72308b838371 100644 --- a/sc/source/ui/miscdlgs/namecrea.cxx +++ b/sc/source/ui/miscdlgs/namecrea.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "namecrea.hxx" diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 7844e5ef49d1..db7d9f103f08 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -143,10 +143,8 @@ ScOptSolverSave::ScOptSolverSave( const OUString& rObjective, bool bMax, bool bM { } - // class ScOptSolverDlg - ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocShell* pDocSh, ScAddress aCursorPos ) @@ -511,7 +509,6 @@ bool ScOptSolverDlg::IsRefInputMode() const return mpEdActive != NULL; } - // Handler: IMPL_LINK( ScOptSolverDlg, BtnHdl, PushButton*, pBtn ) diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index 8e8245509ec2..f82217514d79 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "protectiondlg.hxx" #include "scresid.hxx" #include "tabprotection.hxx" @@ -25,7 +24,6 @@ #include <sal/macros.h> #include <vcl/msgbox.hxx> - // The order must match that of the list box. static const ScTableProtection::Option aOptions[] = { ScTableProtection::SELECT_LOCKED_CELLS, @@ -33,7 +31,6 @@ static const ScTableProtection::Option aOptions[] = { }; static const sal_uInt16 nOptionCount = sizeof(aOptions) / sizeof (aOptions[0]); - ScTableProtectionDlg::ScTableProtectionDlg(Window* pParent) : ModalDialog( pParent, "ProtectSheetDialog", "modules/scalc/ui/protectsheetdlg.ui" ) { diff --git a/sc/source/ui/miscdlgs/redcom.cxx b/sc/source/ui/miscdlgs/redcom.cxx index 2a69e4ba013a..158376a8be8b 100644 --- a/sc/source/ui/miscdlgs/redcom.cxx +++ b/sc/source/ui/miscdlgs/redcom.cxx @@ -26,7 +26,6 @@ #include <svx/svxdlg.hxx> #include <svx/dialogs.hrc> - ScRedComDialog::ScRedComDialog( Window* pParent, const SfxItemSet& rCoreSet, ScDocShell *pShell, ScChangeAction *pAction, bool bPrevNext) : pChangeAction(NULL) diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index f2d16f32c478..164e413c4be8 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "retypepassdlg.hxx" #include "retypepassdlg.hrc" #include "scresid.hxx" diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 1b7f9f3db5b6..381ce874b72c 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <svx/algitem.hxx> #include <editeng/boxitem.hxx> @@ -52,7 +49,6 @@ #include "document.hxx" #include <boost/scoped_ptr.hpp> - // AutoFormat-Dialog: ScAutoFormatDlg::ScAutoFormatDlg(Window* pParent, @@ -143,10 +139,8 @@ void ScAutoFormatDlg::UpdateChecks() m_pBtnAdjust->Check( pData->GetIncludeWidthHeight() ); } - // Handler: - IMPL_LINK( ScAutoFormatDlg, CloseHdl, PushButton *, pBtn ) { if (pBtn == m_pBtnOk || pBtn == m_pBtnCancel) @@ -368,7 +362,6 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, RenameHdl) bCoreDataChanged = true; } - SelFmtHdl( 0 ); bOk = true; bFmtRenamed = true; diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index ca0e15810a2d..ef79599353a4 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -27,12 +27,10 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> - #include "sharedocdlg.hxx" #include "scresid.hxx" #include "viewdata.hxx" - using namespace ::com::sun::star; class ScShareTable : public SvSimpleTable @@ -69,10 +67,8 @@ public: } }; - // class ScShareDocumentDlg - ScShareDocumentDlg::ScShareDocumentDlg( Window* pParent, ScViewData* pViewData ) : ModalDialog(pParent, "ShareDocumentDialog", "modules/scalc/ui/sharedocumentdlg.ui") , mpViewData(pViewData) diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index e144a7ae3263..72db862fd30c 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -17,18 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include <vcl/msgbox.hxx> #include "shtabdlg.hxx" #include "scresid.hxx" #include "miscdlgs.hrc" - ScShowTabDlg::ScShowTabDlg(Window* pParent) : ModalDialog(pParent, "ShowSheetDialog", "modules/scalc/ui/showsheetdialog.ui") { diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index b99ba1d67c67..35c33486ead2 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -59,26 +59,22 @@ ScSimpleRefDlg::ScSimpleRefDlg(SfxBindings* pB, SfxChildWindow* pCW, Window* pPa SetDispatcherLock( true ); // Modal-Modus einschalten } - ScSimpleRefDlg::~ScSimpleRefDlg() { SetDispatcherLock( false ); // Modal-Modus einschalten } - void ScSimpleRefDlg::FillInfo(SfxChildWinInfo& rWinInfo) const { ScAnyRefDlg::FillInfo(rWinInfo); rWinInfo.bVisible=bAutoReOpen; } - void ScSimpleRefDlg::SetRefString(const OUString &rStr) { m_pEdAssign->SetText(rStr); } - void ScSimpleRefDlg::Init() { m_pBtnOk->SetClickHdl ( LINK( this, ScSimpleRefDlg, OkBtnHdl ) ); @@ -86,7 +82,6 @@ void ScSimpleRefDlg::Init() bCloseFlag=false; } - // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als // neue Selektion im Referenz-Fenster angezeigt wird. void ScSimpleRefDlg::SetReference( const ScRange& rRef, ScDocument* pDocP ) @@ -129,7 +124,6 @@ bool ScSimpleRefDlg::Close() return true; } - void ScSimpleRefDlg::SetActive() { m_pEdAssign->GrabFocus(); @@ -198,7 +192,6 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, OkBtnHdl) return 0; } - IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) { bAutoReOpen=false; @@ -210,6 +203,4 @@ IMPL_LINK_NOARG(ScSimpleRefDlg, CancelBtnHdl) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index d6cae3ac54a7..0e93c2f9337c 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -181,7 +181,6 @@ bool ScSolverDlg::CheckTargetValue( const OUString& rStrVal ) return pDoc->GetFormatTable()->IsNumberFormat( rStrVal, n1, n2 ); } - // Handler: IMPL_LINK( ScSolverDlg, BtnHdl, PushButton*, pBtn ) @@ -266,5 +265,4 @@ IMPL_LINK_NOARG(ScSolverDlg, LoseFocusHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index d3214ce7ec5d..1953b79225e9 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "tabbgcolordlg.hxx" diff --git a/sc/source/ui/miscdlgs/tabopdlg.cxx b/sc/source/ui/miscdlgs/tabopdlg.cxx index cd1b77c19953..c651e6155473 100644 --- a/sc/source/ui/miscdlgs/tabopdlg.cxx +++ b/sc/source/ui/miscdlgs/tabopdlg.cxx @@ -32,7 +32,6 @@ // class ScTabOpDlg - ScTabOpDlg::ScTabOpDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, ScDocument* pDocument, const ScRefAddress& rCursorPos ) @@ -224,7 +223,6 @@ static bool lcl_Parse( const OUString& rString, ScDocument* pDoc, SCTAB nCurTab, return bRet; } - // Handler: IMPL_LINK( ScTabOpDlg, BtnHdl, PushButton*, pBtn ) @@ -330,6 +328,4 @@ IMPL_LINK_NOARG(ScTabOpDlg, LoseFocusHdl) return 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx index a6f301f38803..1cfb3cfbb7e7 100644 --- a/sc/source/ui/miscdlgs/textdlgs.cxx +++ b/sc/source/ui/miscdlgs/textdlgs.cxx @@ -31,7 +31,6 @@ #include <svl/intitem.hxx> #include <svx/flagsdef.hxx> - ScCharDlg::ScCharDlg( Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell ) : SfxTabDialog(pParent, "CharDialog", diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index 41e75b7c87c4..6a5863182d37 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -24,7 +24,6 @@ #include "scresid.hxx" #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 ) { @@ -55,7 +54,6 @@ void ScCbWarningBox::DisableDialog() { } - ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) : ScCbWarningBox( pParent, OUString( ScResId( STR_REPLCELLSWARN ) ), true ) { @@ -75,5 +73,4 @@ void ScReplaceWarnBox::DisableDialog() pScMod->SetInputOptions( aInputOpt ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index 4a0d4a11ab94..daa5cf3005bb 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -208,7 +208,6 @@ void ScNameDlg::CheckForEmptyTable() m_pEdName->Enable(); m_pLbScope->Enable(); - m_pBtnCriteria->Enable(); m_pBtnPrintArea->Enable(); m_pBtnColHeader->Enable(); @@ -316,7 +315,6 @@ void ScNameDlg::ShowOptions(const ScRangeNameLine& rLine) } } - bool ScNameDlg::AddPushed() { mbCloseWithoutUndo = true; diff --git a/sc/source/ui/namedlg/namemgrtable.cxx b/sc/source/ui/namedlg/namemgrtable.cxx index 98d7653e4614..a024b72cb7fd 100644 --- a/sc/source/ui/namedlg/namemgrtable.cxx +++ b/sc/source/ui/namedlg/namemgrtable.cxx @@ -26,7 +26,6 @@ #define MINSIZE 80 - static OUString createEntryString(const ScRangeNameLine& rLine) { OUString aRet = rLine.aName + "\t" + rLine.aExpression + "\t" + rLine.aScope; @@ -304,5 +303,4 @@ IMPL_LINK_NOARG(ScRangeManagerTable, ScrollHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/namedlg/namepast.cxx b/sc/source/ui/namedlg/namepast.cxx index 85cb1e55d8ef..b03ccf4dfa26 100644 --- a/sc/source/ui/namedlg/namepast.cxx +++ b/sc/source/ui/namedlg/namepast.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "namepast.hxx" #include "scresid.hxx" #include "docsh.hxx" @@ -29,7 +26,6 @@ #include "rangenam.hxx" #include "viewdata.hxx" - ScNamePasteDlg::ScNamePasteDlg( Window * pParent, ScDocShell* pShell, bool ) : ModalDialog( pParent, "InsertNameDialog", "modules/scalc/ui/insertname.ui" ) { @@ -105,5 +101,4 @@ bool ScNamePasteDlg::IsAllSelected() const return false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 3441da2dcce4..ee6d14a1cb1a 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -80,7 +80,6 @@ static const sal_uInt16 pTypeList[SC_CONTENT_COUNT] = bool ScContentTree::bIsInDrag = false; - ScDocShell* ScContentTree::GetManualOrCurrent() { ScDocShell* pSh = NULL; @@ -111,10 +110,8 @@ ScDocShell* ScContentTree::GetManualOrCurrent() return pSh; } - // ScContentTree - ScContentTree::ScContentTree( Window* pParent, const ResId& rResId ) : SvTreeListBox ( pParent, rResId ), aEntryImages ( ScResId( RID_IMAGELIST_NAVCONT ) ), diff --git a/sc/source/ui/navipi/navcitem.cxx b/sc/source/ui/navipi/navcitem.cxx index 9481a26ac91a..12dd5994acf6 100644 --- a/sc/source/ui/navipi/navcitem.cxx +++ b/sc/source/ui/navipi/navcitem.cxx @@ -27,7 +27,6 @@ // STATIC DATA ----------------------------------------------------------- - ScNavigatorControllerItem::ScNavigatorControllerItem( sal_uInt16 nIdP, ScNavigatorDlg& rDlg, SfxBindings& rBindings ) @@ -90,7 +89,6 @@ void ScNavigatorControllerItem::StateChanged( sal_uInt16 /* nSID */, SfxItemStat break; - case SID_SELECT_SCENARIO: rNavigatorDlg.aWndScenarios.NotifyState( pItem ); break; diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 7d0696b5b2ed..9da736c2c130 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -76,10 +76,8 @@ void ScNavigatorDlg::ReleaseFocus() } } - // class ColumnEdit - ColumnEdit::ColumnEdit( ScNavigatorDlg* pParent, const ResId& rResId ) : SpinField ( pParent, rResId ), rDlg ( *pParent ), @@ -128,7 +126,6 @@ void ColumnEdit::LoseFocus() EvalText(); } - void ColumnEdit::Up() { nCol++; @@ -158,7 +155,6 @@ void ColumnEdit::Last() SetText( aStr ); } - void ColumnEdit::EvalText() { OUString aStrCol = GetText(); @@ -253,10 +249,8 @@ SCCOL ColumnEdit::NumToAlpha( SCCOL nColNo, OUString& rStr ) return nColNo; } - // class RowEdit - RowEdit::RowEdit( ScNavigatorDlg* pParent, const ResId& rResId ) : NumericField( pParent, rResId ), rDlg ( *pParent ) @@ -301,10 +295,8 @@ void RowEdit::ExecuteRow() rDlg.SetCurrentCell( nCol-1, nRow-1 ); } - // class ScDocListBox - ScDocListBox::ScDocListBox( ScNavigatorDlg* pParent, const ResId& rResId ) : ListBox ( pParent, rResId ), rDlg ( *pParent ) @@ -323,10 +315,8 @@ void ScDocListBox::Select() rDlg.aLbEntries.SelectDoc( aDocName ); } - // class CommandToolBox - CommandToolBox::CommandToolBox( ScNavigatorDlg* pParent, const ResId& rResId ) : ToolBox ( pParent, rResId ), rDlg ( *pParent ) @@ -476,10 +466,8 @@ void CommandToolBox::DataChanged( const DataChangedEvent& rDCEvt ) ToolBox::DataChanged( rDCEvt ); } - // class ScNavigatorSettings - ScNavigatorSettings::ScNavigatorSettings() : maExpandedVec( SC_CONTENT_COUNT, false ), mnRootSelected( SC_CONTENT_ROOT ), @@ -487,10 +475,8 @@ ScNavigatorSettings::ScNavigatorSettings() : { } - // class ScNavigatorDlgWrapper - SFX_IMPL_CHILDWINDOWCONTEXT( ScNavigatorDialogWrapper, SID_NAVIGATOR ) ScNavigatorDialogWrapper::ScNavigatorDialogWrapper( @@ -559,10 +545,8 @@ void ScNavigatorDialogWrapper::Resizing( Size& rSize ) ((ScNavigatorDlg*)GetWindow())->Resizing(rSize); } - // class ScNavigatorPI - #define CTRL_ITEMS 4 #define REGISTER_SLOT(i,id) \ @@ -1211,7 +1195,6 @@ void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize ) } } - // Dokumente fuer Dropdown-Listbox void ScNavigatorDlg::GetDocNames( const OUString* pManualSel ) diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index c8a6b02395b7..e415d09d48ec 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -31,10 +31,8 @@ #include "sc.hrc" #include "globstr.hrc" - // class ScScenarioWindow ------------------------------------------------ - ScScenarioListBox::ScScenarioListBox( ScScenarioWindow& rParent ) : ListBox( &rParent, WB_BORDER | WB_TABSTOP ), mrParent( rParent ) @@ -194,10 +192,8 @@ void ScScenarioListBox::DeleteScenario( bool bQueryBox ) ExecuteScenarioSlot( SID_DELETE_SCENARIO ); } - // class ScScenarioWindow ------------------------------------------------ - ScScenarioWindow::ScScenarioWindow( Window* pParent, const OUString& aQH_List, const OUString& aQH_Comment) : Window ( pParent, WB_TABSTOP | WB_DIALOGCONTROL ), @@ -283,5 +279,4 @@ void ScScenarioWindow::SetSizePixel( const Size& rNewSize ) aEdComment.SetPosSizePixel( Point( 0, nHeight+4 ), aSize ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index 0a996e54b574..7a433dfe3a5b 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -188,7 +188,6 @@ ScCalcOptionsDialog::ScCalcOptionsDialog(Window* pParent, const ScCalcConfig& rC ScCalcOptionsDialog::~ScCalcOptionsDialog() {} - SvTreeListEntry *ScCalcOptionsDialog::createBoolItem(const OUString &rCaption, bool bValue) const { SvTreeListEntry* pEntry = new SvTreeListEntry; @@ -261,7 +260,6 @@ void ScCalcOptionsDialog::fillOpenclList() #endif - namespace { void addOption( SvTreeList* pModel, OptionString* pItem ) { @@ -631,5 +629,4 @@ IMPL_LINK_NOARG(ScCalcOptionsDialog, DeviceSelHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 42c259d03581..a8080ef5ee70 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include <svx/dlgutil.hxx> @@ -157,7 +156,6 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ ) m_pInsertColorLB->SetUpdateMode( true ); m_pRemoveColorLB->SetUpdateMode( true ); - ScAppOptions aAppOptions=SC_MOD()->GetAppOptions(); sal_uLong nColor = aAppOptions.GetTrackContentColor(); @@ -172,14 +170,12 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ ) else m_pMoveColorLB->SelectEntry(Color(nColor)); - nColor = aAppOptions.GetTrackInsertColor(); if (nColor == COL_TRANSPARENT) m_pInsertColorLB->SelectEntryPos(0); else m_pInsertColorLB->SelectEntry(Color(nColor)); - nColor = aAppOptions.GetTrackDeleteColor(); if (nColor == COL_TRANSPARENT) m_pRemoveColorLB->SelectEntryPos(0); @@ -188,7 +184,6 @@ void ScRedlineOptionsTabPage::Reset( const SfxItemSet* /* rSet */ ) } - IMPL_LINK_NOARG(ScRedlineOptionsTabPage, ColorHdl) { return 0; diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 85edefbe3805..68d2952d0525 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -132,7 +132,6 @@ void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ ) CheckClickHdl(m_pBtnIterate); } - bool ScTpCalcOptions::FillItemSet( SfxItemSet* rCoreAttrs ) { // alle weiteren Optionen werden in den Handlern aktualisiert @@ -184,7 +183,6 @@ int ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) return nReturn; } - // Handler: IMPL_LINK( ScTpCalcOptions, RadioClickHdl, RadioButton*, pBtn ) @@ -239,5 +237,4 @@ IMPL_LINK( ScTpCalcOptions, CheckClickHdl, CheckBox*, pBtn ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 1d7fd90c2324..5e7c302965bd 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #undef SC_DLLIMPLEMENTATION #include "tpdefaults.hxx" @@ -17,7 +16,6 @@ #include "defaultsoptions.hxx" #include "document.hxx" - ScTpDefaultsOptions::ScTpDefaultsOptions(Window *pParent, const SfxItemSet &rCoreSet) : SfxTabPage(pParent, "OptDefaultPage", "modules/scalc/ui/optdefaultpage.ui", &rCoreSet) @@ -47,7 +45,6 @@ bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet) SCTAB nTabCount = static_cast<SCTAB>(m_pEdNSheets->GetValue()); OUString aSheetPrefix = m_pEdSheetPrefix->GetText(); - if ( m_pEdNSheets->IsValueChangedFromSaved() || m_pEdSheetPrefix->GetSavedValue() != aSheetPrefix ) { @@ -117,7 +114,6 @@ void ScTpDefaultsOptions::OnFocusPrefixInput(Edit* pEdit) maOldPrefixValue = pEdit->GetText(); } - IMPL_LINK_NOARG(ScTpDefaultsOptions, NumModifiedHdl) { CheckNumSheets(); @@ -136,5 +132,4 @@ IMPL_LINK( ScTpDefaultsOptions, PrefixEditOnFocusHdl, Edit*, pEdit ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 015165530dc1..e7b7a8c5e4e3 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include <svl/eitem.hxx> diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index b1d78151b3ad..1713aa0c75bf 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -42,10 +42,8 @@ static const sal_Unicode cDelimiter = ','; - // Benutzerdefinierte Listen: - ScTpUserLists::ScTpUserLists( Window* pParent, const SfxItemSet& rCoreAttrs ) @@ -439,10 +437,8 @@ void ScTpUserLists::RemoveList( size_t nList ) } } - // Handler: - IMPL_LINK( ScTpUserLists, LbSelectHdl, ListBox*, pLb ) { if ( pLb == mpLbLists ) @@ -608,7 +604,6 @@ IMPL_LINK( ScTpUserLists, BtnClickHdl, PushButton*, pBtn ) aMsg += mpLbLists->GetEntry( nRemovePos ); aMsg += aStrQueryRemove.getToken( 1, '#' ); - if ( RET_YES == QueryBox( this, WinBits( WB_YES_NO | WB_DEF_YES ), aMsg diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 9d8a16370b5c..8e50d5d535fb 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scitems.hxx" @@ -36,7 +35,6 @@ #include <svx/drawitem.hxx> #include <svx/xtable.hxx> - // STATIC DATA ----------------------------------------------------------- ScTpContentOptions::ScTpContentOptions( Window* pParent, @@ -144,7 +142,6 @@ bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet ) bRet = true; } - return bRet; } @@ -257,7 +254,6 @@ IMPL_LINK( ScTpContentOptions, CBHdl, CheckBox*, pBtn ) pLocalOptions->SetOption( eOption, bChecked ); - return 0; } @@ -380,7 +376,6 @@ ScTpLayoutOptions::ScTpLayoutOptions( Window* pParent, m_pAlignCB->SetClickHdl(LINK(this, ScTpLayoutOptions, AlignHdl)); - for ( sal_uInt16 i = 0; i < aUnitArr.Count(); ++i ) { OUString sMetric = aUnitArr.GetStringByPos( i ); @@ -487,7 +482,6 @@ bool ScTpLayoutOptions::FillItemSet( SfxItemSet* rCoreSet ) bRet = true; } - if(m_pExpRefCB->IsValueChangedFromSaved()) { rCoreSet->Put(SfxBoolItem(SID_SC_INPUT_REF_EXPAND, m_pExpRefCB->IsChecked())); @@ -584,7 +578,6 @@ void ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet ) if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_FMT_EXPAND, false, &pItem)) m_pFormatCB->Check(((const SfxBoolItem*)pItem)->GetValue()); - if(SFX_ITEM_SET == rCoreSet->GetItemState(SID_SC_INPUT_REF_EXPAND, false, &pItem)) m_pExpRefCB->Check(((const SfxBoolItem*)pItem)->GetValue()); @@ -600,7 +593,6 @@ void ScTpLayoutOptions::Reset( const SfxItemSet* rCoreSet ) if( SFX_ITEM_SET == rCoreSet->GetItemState( SID_SC_INPUT_LEGACY_CELL_SELECTION, false, &pItem ) ) m_pLegacyCellSelectionCB->Check( ( (const SfxBoolItem*)pItem)->GetValue() ); - m_pAlignCB ->SaveValue(); m_pAlignLB ->SaveValue(); m_pEditModeCB ->SaveValue(); @@ -652,5 +644,4 @@ IMPL_LINK( ScTpLayoutOptions, AlignHdl, CheckBox*, pBox ) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 88f652c98732..fe7a88e4ee1f 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -49,7 +49,6 @@ const sal_uInt16 SC_AREASDLG_RR_NONE = 0; const sal_uInt16 SC_AREASDLG_RR_USER = 1; const sal_uInt16 SC_AREASDLG_RR_OFFSET = 2; - #define HDL(hdl) LINK( this, ScPrintAreasDlg, hdl ) #define ERRORBOX(nId) ErrorBox( this, WinBits(WB_OK|WB_DEF_OK), \ ScGlobal::GetRscString( nId ) ).Execute() @@ -86,7 +85,6 @@ static void printAddressFlags(sal_uInt16 nFlag) } #endif - // class ScPrintAreasDlg ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ) @@ -137,7 +135,6 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* //SFX_APPWINDOW->Enable(); } - ScPrintAreasDlg::~ScPrintAreasDlg() { // Extra-Data an ListBox-Entries abraeumen @@ -151,13 +148,11 @@ ScPrintAreasDlg::~ScPrintAreasDlg() } } - bool ScPrintAreasDlg::Close() { return DoClose( ScPrintAreasDlgWrapper::GetChildWindowId() ); } - bool ScPrintAreasDlg::IsTableLocked() const { // Druckbereiche gelten pro Tabelle, darum macht es keinen Sinn, @@ -166,7 +161,6 @@ bool ScPrintAreasDlg::IsTableLocked() const return true; } - void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ ) { if ( pRefInputEdit ) @@ -198,7 +192,6 @@ void ScPrintAreasDlg::SetReference( const ScRange& rRef, ScDocument* /* pDoc */ } } - void ScPrintAreasDlg::AddRefEntry() { if ( pRefInputEdit == pEdPrintArea ) @@ -215,13 +208,11 @@ void ScPrintAreasDlg::AddRefEntry() } } - void ScPrintAreasDlg::Deactivate() { bDlgLostFocus = true; } - void ScPrintAreasDlg::SetActive() { if ( bDlgLostFocus ) @@ -240,7 +231,6 @@ void ScPrintAreasDlg::SetActive() RefInputDone(); } - void ScPrintAreasDlg::Impl_Reset() { OUString aStrRange; @@ -264,7 +254,6 @@ void ScPrintAreasDlg::Impl_Reset() Impl_FillLists(); - // Druckbereich aStrRange = ""; @@ -285,13 +274,11 @@ void ScPrintAreasDlg::Impl_Reset() } pEdPrintArea->SetText( aStrRange ); - // Wiederholungszeile lcl_GetRepeatRangeString(pRepeatRowRange, pDoc, true, aStrRange); pEdRepeatRow->SetText( aStrRange ); - // Wiederholungsspalte lcl_GetRepeatRangeString(pRepeatColRange, pDoc, false, aStrRange); @@ -308,7 +295,6 @@ void ScPrintAreasDlg::Impl_Reset() pEdRepeatCol->SaveValue(); } - bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) { OUString aRangeStr = pEd->GetText(); @@ -327,7 +313,6 @@ bool ScPrintAreasDlg::Impl_GetItem( Edit* pEd, SfxStringItem& rItem ) return bDataChanged; } - bool ScPrintAreasDlg::Impl_CheckRefStrings() { bool bOk = false; @@ -390,7 +375,6 @@ bool ScPrintAreasDlg::Impl_CheckRefStrings() return bOk; } - void ScPrintAreasDlg::Impl_FillLists() { @@ -416,7 +400,6 @@ void ScPrintAreasDlg::Impl_FillLists() pLbPrintArea->SetEntryData( SC_AREASDLG_PR_SELECT, new OUString( aStrRange ) ); - // Ranges holen und in ListBoxen merken ScRangeName* pRangeNames = pDoc->GetRangeName(); @@ -465,7 +448,6 @@ void ScPrintAreasDlg::Impl_FillLists() // Handler: - IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) { if ( pBtnOk == pBtn ) @@ -477,10 +459,8 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) SfxStringItem aRepeatRow( FN_PARAM_2, aStr ); SfxStringItem aRepeatCol( FN_PARAM_3, aStr ); - // Druckbereich veraendert? - // first try the list box, if "Entite sheet" is selected bool bEntireSheet = (pLbPrintArea->GetSelectEntryPos() == SC_AREASDLG_PR_ENTIRE); SfxBoolItem aEntireSheet( FN_PARAM_4, bEntireSheet ); @@ -492,12 +472,10 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) bDataChanged |= Impl_GetItem( pEdPrintArea, aPrintArea ); } - // Wiederholungszeile veraendert? bDataChanged |= Impl_GetItem( pEdRepeatRow, aRepeatRow ); - // Wiederholungsspalte veraendert? bDataChanged |= Impl_GetItem( pEdRepeatCol, aRepeatCol ); @@ -520,7 +498,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_BtnHdl, PushButton*, pBtn ) return 0; } - IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) { if ( pCtr ==(Control *) pEdPrintArea || @@ -545,7 +522,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_GetFocusHdl, Control*, pCtr ) return 0; } - IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb ) { sal_uInt16 nSelPos = pLb->GetSelectEntryPos(); @@ -582,7 +558,6 @@ IMPL_LINK( ScPrintAreasDlg, Impl_SelectHdl, ListBox*, pLb ) return 0; } - IMPL_LINK( ScPrintAreasDlg, Impl_ModifyHdl, formula::RefEdit*, pEd ) { ListBox* pLb = NULL; diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx index 567f7e1435ad..07d835cb649d 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.cxx +++ b/sc/source/ui/pagedlg/hfedtdlg.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <svl/eitem.hxx> @@ -31,7 +28,6 @@ #include "scresid.hxx" #include "scuitphfedit.hxx" - // macros from docsh4.cxx //! use SIDs? @@ -204,5 +200,4 @@ void ScHFEditDlg::PageCreated( sal_uInt16 /* nId */, SfxTabPage& rPage ) ((ScHFEditPage&)rPage).SetNumType(eNumType); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 70eaac6545f0..6feb8f595fe2 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION #include "scitems.hxx" @@ -54,10 +53,8 @@ static ScEditWindow* pActiveEdWnd = NULL; - // class ScHFEditPage - ScHFEditPage::ScHFEditPage( Window* pParent, const SfxItemSet& rCoreAttrs, sal_uInt16 nWhichId, @@ -91,7 +88,6 @@ ScHFEditPage::ScHFEditPage( Window* pParent, get(m_pFtCreatedBy,"labelSTR_HF_CREATED_BY"); get(m_pFtCustomized,"labelSTR_HF_CUSTOMIZED"); - //! use default style from current document? //! if font color is used, header/footer background color must be set @@ -348,7 +344,6 @@ void ScHFEditPage::SetSelectDefinedList() } break; - //TODO case ePagesEntry: { @@ -745,10 +740,8 @@ void ScHFEditPage::ClearTextAreas() m_pWndRight->Invalidate(); } - // Handler: - IMPL_LINK( ScHFEditPage, ListHdl_Impl, ListBox*, pList ) { if ( pList && pList == m_pLbDefined ) @@ -832,10 +825,8 @@ IMPL_LINK( ScHFEditPage, MenuHdl, ScExtIButton*, pBtn ) return 0; } - // class ScRightHeaderEditPage - ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, @@ -846,10 +837,8 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( Window* pParent, const SfxItemSet& SfxTabPage* ScRightHeaderEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScRightHeaderEditPage( pParent, *rCoreSet ) ); }; - // class ScLeftHeaderEditPage - ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, @@ -860,10 +849,8 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( Window* pParent, const SfxItemSet& r SfxTabPage* ScLeftHeaderEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScLeftHeaderEditPage( pParent, *rCoreSet ) ); }; - // class ScRightFooterEditPage - ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, @@ -874,10 +861,8 @@ ScRightFooterEditPage::ScRightFooterEditPage( Window* pParent, const SfxItemSet& SfxTabPage* ScRightFooterEditPage::Create( Window* pParent, const SfxItemSet* rCoreSet ) { return ( new ScRightFooterEditPage( pParent, *rCoreSet ) ); }; - // class ScLeftFooterEditPage - ScLeftFooterEditPage::ScLeftFooterEditPage( Window* pParent, const SfxItemSet& rCoreSet ) : ScHFEditPage( pParent, rCoreSet, diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 3e8ac5cd7724..d5e80c0c5399 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -40,7 +40,6 @@ // class ScHFPage - ScHFPage::ScHFPage( Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : SvxHFPage ( pParent, rSet, nSetId ), @@ -138,10 +137,8 @@ void ScHFPage::DeactivatePage() { } - // Handler: - IMPL_LINK_NOARG(ScHFPage, TurnOnHdl) { SvxHFPage::TurnOnHdl( m_pTurnOnBox ); @@ -154,7 +151,6 @@ IMPL_LINK_NOARG(ScHFPage, TurnOnHdl) return 0; } - IMPL_LINK_NOARG(ScHFPage, BtnHdl) { // When the Edit-Dialog is directly called from the Button's Click-Handler, @@ -182,7 +178,6 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl) ? RID_SCDLG_HFED_HEADER : RID_SCDLG_HFED_FOOTER; - ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); @@ -237,10 +232,8 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl) return 0; } - // class ScHeaderPage - ScHeaderPage::ScHeaderPage( Window* pParent, const SfxItemSet& rSet ) : ScHFPage( pParent, rSet, SID_ATTR_PAGE_HEADERSET ) { @@ -256,10 +249,8 @@ const sal_uInt16* ScHeaderPage::GetRanges() return SvxHeaderPage::GetRanges(); } - // class ScFooterPage - ScFooterPage::ScFooterPage( Window* pParent, const SfxItemSet& rSet ) : ScHFPage( pParent, rSet, SID_ATTR_PAGE_FOOTERSET ) { @@ -275,5 +266,4 @@ const 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 faf5c4eb18ba..da94badf402e 100644 --- a/sc/source/ui/pagedlg/tphfedit.cxx +++ b/sc/source/ui/pagedlg/tphfedit.cxx @@ -20,7 +20,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <editeng/editobj.hxx> #include <editeng/editstat.hxx> #include <editeng/editview.hxx> @@ -47,7 +46,6 @@ #include "scabstdlg.hxx" #include <boost/scoped_ptr.hpp> - // STATIC DATA ----------------------------------------------------------- static ScEditWindow* pActiveEdWnd = NULL; @@ -68,10 +66,8 @@ static void lcl_GetFieldData( ScHeaderFieldData& rData ) } } - // class ScEditWindow - ScEditWindow::ScEditWindow( Window* pParent, WinBits nBits, ScEditWindowLocation eLoc ) : Control( pParent, nBits ), eLocation(eLoc), @@ -189,7 +185,6 @@ void ScEditWindow::SetCharAttriutes() ScTabViewShell* pTabViewSh = PTR_CAST(ScTabViewShell, SfxViewShell::Current()); - OSL_ENSURE( pDocSh, "Current DocShell not found" ); OSL_ENSURE( pViewSh, "Current ViewShell not found" ); @@ -350,8 +345,6 @@ void ScExtIButton::SetPopupMenu(PopupMenu* pPopUp) pPopupMenu=pPopUp; } - - void ScExtIButton::MouseButtonDown( const MouseEvent& rMEvt ) { if(!aTimer.IsActive()) @@ -418,5 +411,4 @@ IMPL_LINK_NOARG(ScExtIButton, TimerHdl) return 0; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 51ad4c9e3110..fa74838e152c 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -30,7 +30,6 @@ #include "sc.hrc" #include "pagedlg.hrc" - // Static Data static const sal_uInt16 pPageTableRanges[] = @@ -66,7 +65,6 @@ static bool lcl_PutBoolItem( sal_uInt16 nWhich, bool bIsChecked, bool bSavedValue ); - #define PAGENO_HDL LINK(this,ScTablePage,PageNoHdl) #define PAGEDIR_HDL LINK(this,ScTablePage,PageDirHdl) #define SCALE_HDL LINK(this,ScTablePage,ScaleHdl) @@ -81,7 +79,6 @@ static bool lcl_PutBoolItem( sal_uInt16 nWhich, #define SC_TPTABLE_SCALE_TO 1 #define SC_TPTABLE_SCALE_TO_PAGES 2 - ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) : SfxTabPage( pParent, "SheetPrintPage","modules/scalc/ui/sheetprintpage.ui", &rCoreAttrs ) @@ -433,7 +430,6 @@ static bool lcl_PutScaleItem( sal_uInt16 nWhich, return bDataChanged; } - static bool lcl_PutScaleItem2( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index 5545c03d1131..8c612976c80b 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -372,7 +372,6 @@ void AlignmentPropertyPanel::NotifyItemUpdate( } } - void AlignmentPropertyPanel::FormatDegrees(double& dTmp) { while(dTmp<0) diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx index d6c091448a80..2a1a3374881f 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx @@ -52,7 +52,6 @@ const char UNO_SETBORDERSTYLE[] = ".uno:SetBorderStyle"; const char UNO_LINESTYLE[] = ".uno:LineStyle"; const char UNO_FRAMELINECOLOR[] = ".uno:FrameLineColor"; - // helpers namespace @@ -63,7 +62,6 @@ namespace } } // end of anonymous namespace - // namespace open namespace sc { namespace sidebar { @@ -656,7 +654,6 @@ void CellAppearancePropertyPanel::NotifyItemUpdate( } } - void CellAppearancePropertyPanel::SetStyleIcon() { const sal_uInt16 nIdBorderLineStyle = mpTBLineStyle->GetItemId( UNO_LINESTYLE ); @@ -786,7 +783,6 @@ void CellAppearancePropertyPanel::UpdateControlState() } } - // namespace close }} // end of namespace ::sc::sidebar diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 6fda69ac8b7d..724413f91414 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -316,7 +316,6 @@ void NumberFormatPropertyPanel::NotifyItemUpdate( } } - }} // end of namespace ::sc::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/sidebar/ScPanelFactory.cxx b/sc/source/ui/sidebar/ScPanelFactory.cxx index c9d247946892..04b0bb97bb91 100644 --- a/sc/source/ui/sidebar/ScPanelFactory.cxx +++ b/sc/source/ui/sidebar/ScPanelFactory.cxx @@ -36,24 +36,20 @@ #include <boost/bind.hpp> - using namespace css; using namespace cssu; using ::rtl::OUString; - namespace sc { namespace sidebar { #define IMPLEMENTATION_NAME "org.apache.openoffice.comp.sc.sidebar.ScPanelFactory" #define SERVICE_NAME "com.sun.star.ui.UIElementFactory" - ::rtl::OUString SAL_CALL ScPanelFactory::getImplementationName (void) { return OUString(IMPLEMENTATION_NAME); } - cssu::Reference<cssu::XInterface> SAL_CALL ScPanelFactory::createInstance( const uno::Reference<lang::XMultiServiceFactory>& ) { @@ -62,7 +58,6 @@ cssu::Reference<cssu::XInterface> SAL_CALL ScPanelFactory::createInstance( return xService; } - cssu::Sequence<OUString> SAL_CALL ScPanelFactory::getSupportedServiceNames (void) { cssu::Sequence<OUString> aServiceNames (1); @@ -71,18 +66,15 @@ cssu::Sequence<OUString> SAL_CALL ScPanelFactory::getSupportedServiceNames (void } - ScPanelFactory::ScPanelFactory (void) : PanelFactoryInterfaceBase(m_aMutex) { } - ScPanelFactory::~ScPanelFactory (void) { } - Reference<ui::XUIElement> SAL_CALL ScPanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, const ::cssu::Sequence<css::beans::PropertyValue>& rArguments) diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx index 89e52dfad3cc..0722fc818f56 100644 --- a/sc/source/ui/styleui/styledlg.cxx +++ b/sc/source/ui/styleui/styledlg.cxx @@ -17,11 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #undef SC_DLLIMPLEMENTATION - - #include "scitems.hxx" #include <svx/numinf.hxx> #include <sfx2/objsh.hxx> @@ -42,7 +39,6 @@ #include <svl/aeitem.hxx> #include <svx/flagsdef.hxx> - ScStyleDlg::ScStyleDlg( Window* pParent, SfxStyleSheetBase& rStyleBase, sal_uInt16 nRscId ) @@ -177,7 +173,6 @@ void ScStyleDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage ) } } - const SfxItemSet* ScStyleDlg::GetRefreshedSet() { SfxItemSet* pItemSet = GetInputSetImpl(); diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx index 55d80ad42a7c..8740c6b31077 100644 --- a/sc/source/ui/undo/undobase.cxx +++ b/sc/source/ui/undo/undobase.cxx @@ -34,7 +34,6 @@ #include <rowheightcontext.hxx> #include <column.hxx> - TYPEINIT1(ScSimpleUndo, SfxUndoAction); TYPEINIT1(ScBlockUndo, ScSimpleUndo); TYPEINIT1(ScMultiBlockUndo, ScSimpleUndo); diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx index 65e4875b97d7..71281465b35a 100644 --- a/sc/source/ui/undo/undoblk.cxx +++ b/sc/source/ui/undo/undoblk.cxx @@ -324,7 +324,6 @@ bool ScUndoInsertCells::CanRepeat(SfxRepeatTarget& rTarget) const return rTarget.ISA(ScTabViewTarget); } - ScUndoDeleteCells::ScUndoDeleteCells( ScDocShell* pNewDocShell, const ScRange& rRange, SCTAB nNewCount, SCTAB* pNewTabs, SCTAB* pNewScenarios, DelCellCmd eNewCmd, ScDocument* pUndoDocument, ScRefUndoData* pRefData ) : @@ -738,7 +737,6 @@ bool ScUndoDeleteMulti::CanRepeat(SfxRepeatTarget& rTarget) const return rTarget.ISA(ScTabViewTarget); } - ScUndoCut::ScUndoCut( ScDocShell* pNewDocShell, ScRange aRange, ScAddress aOldEnd, const ScMarkData& rMark, ScDocument* pNewUndoDoc ) : @@ -1498,7 +1496,6 @@ bool ScUndoConditionalFormat::CanRepeat(SfxRepeatTarget& ) const return false; } - ScUndoUseScenario::ScUndoUseScenario( ScDocShell* pNewDocShell, const ScMarkData& rMark, /*C*/ const ScArea& rDestArea, diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx index aa8497870598..8e6c7cfb391a 100644 --- a/sc/source/ui/undo/undocell.cxx +++ b/sc/source/ui/undo/undocell.cxx @@ -325,7 +325,6 @@ bool ScUndoEnterData::CanRepeat(SfxRepeatTarget& rTarget) const return rTarget.ISA(ScTabViewTarget); } - ScUndoEnterValue::ScUndoEnterValue( ScDocShell* pNewDocShell, const ScAddress& rNewPos, const ScCellValue& rUndoCell, double nVal ) : diff --git a/sc/source/ui/undo/undocell2.cxx b/sc/source/ui/undo/undocell2.cxx index 0aa39a56fa01..125b9a767f38 100644 --- a/sc/source/ui/undo/undocell2.cxx +++ b/sc/source/ui/undo/undocell2.cxx @@ -54,7 +54,6 @@ OUString UndoSetCells::GetComment() const return ScGlobal::GetRscString(STR_UNDO_ENTERDATA); } - void UndoSetCells::SetNewValues( const std::vector<double>& rVals ) { maNewValues.assign(rVals); diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 94c0df4a5598..4d6111befdae 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -660,7 +660,6 @@ void ScUndoSubTotals::Undo() rDoc.InsertRow( 0,nTab, MAXCOL,nTab, nNewEndRow+1, static_cast<SCSIZE>(aParam.nRow2-nNewEndRow) ); } - // Original Outline table rDoc.SetOutlineTable( nTab, pUndoTable ); @@ -1380,7 +1379,6 @@ bool ScUndoImportData::CanRepeat(SfxRepeatTarget& rTarget) const return false; // Address book } - ScUndoRepeatDB::ScUndoRepeatDB( ScDocShell* pNewDocShell, SCTAB nNewTab, SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, SCROW nResultEndRow, SCCOL nCurX, SCROW nCurY, diff --git a/sc/source/ui/undo/undorangename.cxx b/sc/source/ui/undo/undorangename.cxx index 13da03bd9200..4c06b2948b4c 100644 --- a/sc/source/ui/undo/undorangename.cxx +++ b/sc/source/ui/undo/undorangename.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "undorangename.hxx" #include "globstr.hrc" #include "global.hxx" diff --git a/sc/source/ui/undo/undostyl.cxx b/sc/source/ui/undo/undostyl.cxx index 68d3510d7bd8..f09971fcd820 100644 --- a/sc/source/ui/undo/undostyl.cxx +++ b/sc/source/ui/undo/undostyl.cxx @@ -34,7 +34,6 @@ TYPEINIT1(ScUndoApplyPageStyle, ScSimpleUndo); // modify style (cell or page style) - ScStyleSaveData::ScStyleSaveData() : pItems( NULL ) { @@ -284,5 +283,4 @@ bool ScUndoApplyPageStyle::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index 1a3b9f6c276b..67772dc5d1a0 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -723,7 +723,6 @@ bool ScUndoCopyTab::CanRepeat(SfxRepeatTarget& /* rTarget */) const return false; } - ScUndoTabColor::ScUndoTabColor( ScDocShell* pNewDocShell, SCTAB nT, const Color& aOTabBgColor, const Color& aNTabBgColor) : ScSimpleUndo( pNewDocShell ) diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx index 0e0891cb29b8..806e8eda77a0 100644 --- a/sc/source/ui/undo/undoutil.cxx +++ b/sc/source/ui/undo/undoutil.cxx @@ -51,7 +51,6 @@ void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell, } } - void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell, const ScAddress& rBlockStart, const ScAddress& rBlockEnd ) @@ -60,7 +59,6 @@ void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell, rBlockEnd.Col(), rBlockEnd.Row(), rBlockEnd.Tab() ); } - void ScUndoUtil::MarkSimpleBlock( ScDocShell* pDocShell, const ScRange& rRange ) { @@ -97,7 +95,6 @@ ScDBData* ScUndoUtil::GetOldDBData( ScDBData* pUndoData, ScDocument* pDoc, SCTAB return pRet; } - void ScUndoUtil::PaintMore( ScDocShell* pDocShell, const ScRange& rRange ) { diff --git a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx index 23fa617affcc..d46429204041 100644 --- a/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx +++ b/sc/source/ui/unoobj/ChartRangeSelectionListener.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "ChartRangeSelectionListener.hxx" #include <com/sun/star/chart2/data/XRangeHighlighter.hpp> diff --git a/sc/source/ui/unoobj/afmtuno.cxx b/sc/source/ui/unoobj/afmtuno.cxx index e08e22519477..17b0a2f69361 100644 --- a/sc/source/ui/unoobj/afmtuno.cxx +++ b/sc/source/ui/unoobj/afmtuno.cxx @@ -840,6 +840,4 @@ uno::Any SAL_CALL ScAutoFormatFieldObj::getPropertyValue( const OUString& aPrope 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 efddd0ad354f..4d165df38136 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "appluno.hxx" #include <sal/types.h> #include <osl/diagnose.h> @@ -684,7 +683,6 @@ uno::Sequence<OUString> ScFunctionListObj::getSupportedServiceNames_Static() return aRet; } - static void lcl_FillSequence( uno::Sequence<beans::PropertyValue>& rSequence, const ScFuncDesc& rDesc ) { rDesc.initArgumentInfo(); // full argument info is needed @@ -897,7 +895,4 @@ sal_Bool SAL_CALL ScFunctionListObj::hasByName( const OUString& aName ) return false; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/celllistsource.cxx b/sc/source/ui/unoobj/celllistsource.cxx index 4b41c4e92119..574cfdaa6ad3 100644 --- a/sc/source/ui/unoobj/celllistsource.cxx +++ b/sc/source/ui/unoobj/celllistsource.cxx @@ -27,11 +27,9 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <cppuhelper/supportsservice.hxx> - namespace calc { - #define PROP_HANDLE_RANGE_ADDRESS 1 using namespace ::com::sun::star::uno; @@ -60,7 +58,6 @@ namespace calc } #endif - OCellListSource::OCellListSource( const Reference< XSpreadsheetDocument >& _rxDocument ) :OCellListSource_Base( m_aMutex ) ,OCellListSource_PBase( OCellListSource_Base::rBHelper ) @@ -81,7 +78,6 @@ namespace calc ); } - OCellListSource::~OCellListSource( ) { if ( !OCellListSource_Base::rBHelper.bDisposed ) @@ -91,13 +87,10 @@ namespace calc } } - IMPLEMENT_FORWARD_XINTERFACE2( OCellListSource, OCellListSource_Base, OCellListSource_PBase ) - IMPLEMENT_FORWARD_XTYPEPROVIDER2( OCellListSource, OCellListSource_Base, OCellListSource_PBase ) - void SAL_CALL OCellListSource::disposing() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -116,19 +109,16 @@ namespace calc // TODO: clean up here whatever you need to clean up (e.g. revoking listeners etc.) } - Reference< XPropertySetInfo > SAL_CALL OCellListSource::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return createPropertySetInfo( getInfoHelper() ) ; } - ::cppu::IPropertyArrayHelper& SAL_CALL OCellListSource::getInfoHelper() { return *OCellListSource_PABase::getArrayHelper(); } - ::cppu::IPropertyArrayHelper* OCellListSource::createArrayHelper( ) const { Sequence< Property > aProps; @@ -136,7 +126,6 @@ namespace calc return new ::cppu::OPropertyArrayHelper(aProps); } - void SAL_CALL OCellListSource::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { OSL_ENSURE( _nHandle == PROP_HANDLE_RANGE_ADDRESS, "OCellListSource::getFastPropertyValue: invalid handle!" ); @@ -146,7 +135,6 @@ namespace calc _rValue <<= getRangeAddress( ); } - void OCellListSource::checkDisposed( ) const { if ( OCellListSource_Base::rBHelper.bInDispose || OCellListSource_Base::rBHelper.bDisposed ) @@ -190,7 +178,6 @@ namespace calc return aAddress; } - OUString OCellListSource::getCellTextContent_noCheck( sal_Int32 _nRangeRelativeColumn, sal_Int32 _nRangeRelativeRow ) { OSL_PRECOND( m_xRange.is(), "OCellListSource::getRangeAddress: invalid range!" ); @@ -204,7 +191,6 @@ namespace calc return sText; } - sal_Int32 SAL_CALL OCellListSource::getListEntryCount( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -215,7 +201,6 @@ namespace calc return aAddress.EndRow - aAddress.StartRow + 1; } - OUString SAL_CALL OCellListSource::getListEntry( sal_Int32 _nPosition ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -228,7 +213,6 @@ namespace calc return getCellTextContent_noCheck( 0, _nPosition ); } - Sequence< OUString > SAL_CALL OCellListSource::getAllListEntries( ) throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -245,7 +229,6 @@ namespace calc return aAllEntries; } - void SAL_CALL OCellListSource::addListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -258,7 +241,6 @@ namespace calc m_aListEntryListeners.addInterface( _rxListener ); } - void SAL_CALL OCellListSource::removeListEntryListener( const Reference< XListEntryListener >& _rxListener ) throw (NullPointerException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -271,13 +253,11 @@ namespace calc m_aListEntryListeners.removeInterface( _rxListener ); } - void SAL_CALL OCellListSource::modified( const EventObject& /* aEvent */ ) throw (RuntimeException, std::exception) { notifyModified(); } - void OCellListSource::notifyModified() { EventObject aEvent; @@ -302,7 +282,6 @@ namespace calc } - void SAL_CALL OCellListSource::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception) { Reference<XInterface> xRangeInt( m_xRange, UNO_QUERY ); @@ -313,7 +292,6 @@ namespace calc } } - void SAL_CALL OCellListSource::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) { if ( m_bInitialized ) @@ -374,7 +352,6 @@ namespace calc OSL_FAIL( "OCellListSource::initialize: caught an exception while retrieving the cell object!" ); } - if ( !m_xRange.is() ) throw Exception(); // TODO error message @@ -401,8 +378,6 @@ namespace calc m_bInitialized = true; } - } // namespace calc - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/celllistsource.hxx b/sc/source/ui/unoobj/celllistsource.hxx index 558a5b7c4b15..fc8a1a90a34f 100644 --- a/sc/source/ui/unoobj/celllistsource.hxx +++ b/sc/source/ui/unoobj/celllistsource.hxx @@ -154,10 +154,8 @@ namespace calc #endif }; - } // namespace calc - #endif // INCLUDED_SC_SOURCE_UI_UNOOBJ_CELLLISTSOURCE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/cellsuno.cxx b/sc/source/ui/unoobj/cellsuno.cxx index 77321977bf36..3a94df0175ab 100644 --- a/sc/source/ui/unoobj/cellsuno.cxx +++ b/sc/source/ui/unoobj/cellsuno.cxx @@ -953,7 +953,6 @@ const ::editeng::SvxBorderLine* ScHelperFunctions::GetBorderLine( return lcl_getBorderLine( rLine, rStruct); } - namespace { template<typename TableBorderType> void lcl_fillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner, const TableBorderType& rBorder ) @@ -987,7 +986,6 @@ void ScHelperFunctions::FillBoxItems( SvxBoxItem& rOuter, SvxBoxInfoItem& rInner lcl_fillBoxItems( rOuter, rInner, rBorder); } - void ScHelperFunctions::FillBorderLine( table::BorderLine& rStruct, const ::editeng::SvxBorderLine* pLine ) { // Convert from Twips to 1/100mm. @@ -1000,7 +998,6 @@ void ScHelperFunctions::FillBorderLine( table::BorderLine2& rStruct, const ::edi rStruct = SvxBoxItem::SvxLineToLine( pLine, true); } - namespace { template<typename TableBorderItem> void lcl_fillTableBorder( TableBorderItem& rBorder, const SvxBoxItem& rOuter, const SvxBoxInfoItem& rInner, @@ -5636,10 +5633,8 @@ void SAL_CALL ScCellRangeObj::filter( const uno::Reference<sheet::XSheetFilterDe if (xPropSet.is()) lcl_CopyProperties( aImpl, *(beans::XPropertySet*)xPropSet.get() ); - // ausfuehren... - if (pDocSh) { ScQueryParam aParam = aImpl.GetParam(); @@ -9438,10 +9433,8 @@ void ScUniqueCellFormatsObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - // Fill the list of formats from the document - // hash code to access the range lists by ScPatternAttr pointer struct ScPatternHashCode { diff --git a/sc/source/ui/unoobj/cellvaluebinding.cxx b/sc/source/ui/unoobj/cellvaluebinding.cxx index 3aee78f04be6..b2f60843e4c2 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.cxx +++ b/sc/source/ui/unoobj/cellvaluebinding.cxx @@ -31,11 +31,9 @@ #include <com/sun/star/util/NumberFormat.hpp> #include <cppuhelper/supportsservice.hxx> - namespace calc { - #define PROP_HANDLE_BOUND_CELL 1 using namespace ::com::sun::star::uno; @@ -67,7 +65,6 @@ namespace calc } #endif - OCellValueBinding::OCellValueBinding( const Reference< XSpreadsheetDocument >& _rxDocument, bool _bListPos ) :OCellValueBinding_Base( m_aMutex ) ,OCellValueBinding_PBase( OCellValueBinding_Base::rBHelper ) @@ -90,7 +87,6 @@ namespace calc // which probably maps to the cell being locked } - OCellValueBinding::~OCellValueBinding( ) { if ( !OCellValueBinding_Base::rBHelper.bDisposed ) @@ -100,13 +96,10 @@ namespace calc } } - IMPLEMENT_FORWARD_XINTERFACE2( OCellValueBinding, OCellValueBinding_Base, OCellValueBinding_PBase ) - IMPLEMENT_FORWARD_XTYPEPROVIDER2( OCellValueBinding, OCellValueBinding_Base, OCellValueBinding_PBase ) - void SAL_CALL OCellValueBinding::disposing() { Reference<XModifyBroadcaster> xBroadcaster( m_xCell, UNO_QUERY ); @@ -121,19 +114,16 @@ namespace calc // for the cell) } - Reference< XPropertySetInfo > SAL_CALL OCellValueBinding::getPropertySetInfo( ) throw(RuntimeException, std::exception) { return createPropertySetInfo( getInfoHelper() ) ; } - ::cppu::IPropertyArrayHelper& SAL_CALL OCellValueBinding::getInfoHelper() { return *OCellValueBinding_PABase::getArrayHelper(); } - ::cppu::IPropertyArrayHelper* OCellValueBinding::createArrayHelper( ) const { Sequence< Property > aProps; @@ -141,7 +131,6 @@ namespace calc return new ::cppu::OPropertyArrayHelper(aProps); } - void SAL_CALL OCellValueBinding::getFastPropertyValue( Any& _rValue, sal_Int32 _nHandle ) const { OSL_ENSURE( _nHandle == PROP_HANDLE_BOUND_CELL, "OCellValueBinding::getFastPropertyValue: invalid handle!" ); @@ -154,7 +143,6 @@ namespace calc _rValue <<= xCellAddress->getCellAddress( ); } - Sequence< Type > SAL_CALL OCellValueBinding::getSupportedValueTypes( ) throw (RuntimeException, std::exception) { checkDisposed( ); @@ -185,7 +173,6 @@ namespace calc return aTypes; } - sal_Bool SAL_CALL OCellValueBinding::supportsType( const Type& aType ) throw (RuntimeException, std::exception) { checkDisposed( ); @@ -202,7 +189,6 @@ namespace calc return false; } - Any SAL_CALL OCellValueBinding::getValue( const Type& aType ) throw (IncompatibleTypesException, RuntimeException, std::exception) { checkDisposed( ); @@ -288,7 +274,6 @@ namespace calc return aReturn; } - void SAL_CALL OCellValueBinding::setValue( const Any& aValue ) throw (IncompatibleTypesException, NoSupportException, RuntimeException, std::exception) { checkDisposed( ); @@ -418,7 +403,6 @@ namespace calc } } - void OCellValueBinding::checkDisposed( ) const { if ( OCellValueBinding_Base::rBHelper.bInDispose || OCellValueBinding_Base::rBHelper.bDisposed ) @@ -426,7 +410,6 @@ namespace calc // TODO: is it worth having an error message here? } - void OCellValueBinding::checkInitialized() { if ( !m_bInitialized ) @@ -434,7 +417,6 @@ namespace calc // TODO: error message } - void OCellValueBinding::checkValueType( const Type& _rType ) const { OCellValueBinding* pNonConstThis = const_cast< OCellValueBinding* >( this ); @@ -476,14 +458,12 @@ namespace calc m_aModifyListeners.addInterface( _rxListener ); } - void SAL_CALL OCellValueBinding::removeModifyListener( const Reference< XModifyListener >& _rxListener ) throw (RuntimeException, std::exception) { if ( _rxListener.is() ) m_aModifyListeners.removeInterface( _rxListener ); } - void OCellValueBinding::notifyModified() { EventObject aEvent; @@ -507,13 +487,11 @@ namespace calc } } - void SAL_CALL OCellValueBinding::modified( const EventObject& /* aEvent */ ) throw (RuntimeException, std::exception) { notifyModified(); } - void SAL_CALL OCellValueBinding::disposing( const EventObject& aEvent ) throw (RuntimeException, std::exception) { Reference<XInterface> xCellInt( m_xCell, UNO_QUERY ); @@ -525,7 +503,6 @@ namespace calc } } - void SAL_CALL OCellValueBinding::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) { if ( m_bInitialized ) @@ -611,5 +588,4 @@ namespace calc } // namespace calc - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/cellvaluebinding.hxx b/sc/source/ui/unoobj/cellvaluebinding.hxx index 9a3c34b4a8c6..2e19ac9e2f69 100644 --- a/sc/source/ui/unoobj/cellvaluebinding.hxx +++ b/sc/source/ui/unoobj/cellvaluebinding.hxx @@ -149,10 +149,8 @@ namespace calc #endif }; - } // namespace calc - #endif // INCLUDED_SC_SOURCE_UI_UNOOBJ_CELLVALUEBINDING_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index ed9c2dc8d9e9..41a18192d53c 100644 --- a/sc/source/ui/unoobj/chart2uno.cxx +++ b/sc/source/ui/unoobj/chart2uno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "chart2uno.hxx" #include "miscuno.hxx" #include "document.hxx" @@ -1016,7 +1015,6 @@ ScChart2DataProvider::~ScChart2DataProvider() m_pDocument->RemoveUnoObject( *this); } - void ScChart2DataProvider::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint) { if ( rHint.ISA( SfxSimpleHint ) && @@ -1088,7 +1086,6 @@ Reference< chart2::data::XLabeledDataSequence > lcl_createLabeledDataSequenceFro } SAL_WNODEPRECATED_DECLARATIONS_POP - /** * Check the current list of reference tokens, and add the upper left * corner of the minimum range that encloses all ranges if certain @@ -2325,7 +2322,6 @@ ScChart2DataProvider::getPropertySetInfo() throw( uno::RuntimeException, std::ex return aRef; } - void SAL_CALL ScChart2DataProvider::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, @@ -2342,7 +2338,6 @@ void SAL_CALL ScChart2DataProvider::setPropertyValue( throw beans::UnknownPropertyException(); } - uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( const OUString& rPropertyName) throw( beans::UnknownPropertyException, @@ -2361,7 +2356,6 @@ uno::Any SAL_CALL ScChart2DataProvider::getPropertyValue( return aRet; } - void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) @@ -2371,7 +2365,6 @@ void SAL_CALL ScChart2DataProvider::addPropertyChangeListener( OSL_FAIL( "Not yet implemented" ); } - void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) @@ -2381,7 +2374,6 @@ void SAL_CALL ScChart2DataProvider::removePropertyChangeListener( OSL_FAIL( "Not yet implemented" ); } - void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) @@ -2391,7 +2383,6 @@ void SAL_CALL ScChart2DataProvider::addVetoableChangeListener( OSL_FAIL( "Not yet implemented" ); } - void SAL_CALL ScChart2DataProvider::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/ ) @@ -2410,14 +2401,12 @@ ScChart2DataSource::ScChart2DataSource( ScDocument* pDoc) m_pDocument->AddUnoObject( *this); } - ScChart2DataSource::~ScChart2DataSource() { if ( m_pDocument ) m_pDocument->RemoveUnoObject( *this); } - void ScChart2DataSource::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint) { if ( rHint.ISA( SfxSimpleHint ) && @@ -2427,7 +2416,6 @@ void ScChart2DataSource::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint) } } - uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence> > SAL_CALL ScChart2DataSource::getDataSequences() throw ( uno::RuntimeException, std::exception) { @@ -2956,7 +2944,6 @@ void ScChart2DataSequence::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint } } - IMPL_LINK( ScChart2DataSequence, ValueListenerHdl, SfxHint*, pHint ) { if ( m_pDocument && pHint && pHint->ISA( SfxSimpleHint ) && @@ -3016,7 +3003,6 @@ void ScChart2DataSequence::ExternalRefListener::removeFileId(sal_uInt16 nFileId) maFileIds.erase(nFileId); } - uno::Sequence< uno::Any> SAL_CALL ScChart2DataSequence::getData() throw (uno::RuntimeException, std::exception) { @@ -3475,7 +3461,6 @@ ScChart2DataSequence::getPropertySetInfo() throw( uno::RuntimeException, std::ex return aRef; } - void SAL_CALL ScChart2DataSequence::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue) throw( beans::UnknownPropertyException, @@ -3507,7 +3492,6 @@ void SAL_CALL ScChart2DataSequence::setPropertyValue( // TODO: support optional properties } - uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rPropertyName) throw(beans::UnknownPropertyException, lang::WrappedTargetException, @@ -3548,7 +3532,6 @@ uno::Any SAL_CALL ScChart2DataSequence::getPropertyValue(const OUString& rProper return aRet; } - void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*xListener*/) @@ -3559,7 +3542,6 @@ void SAL_CALL ScChart2DataSequence::addPropertyChangeListener( OSL_FAIL( "Not yet implemented" ); } - void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XPropertyChangeListener>& /*rListener*/) @@ -3570,7 +3552,6 @@ void SAL_CALL ScChart2DataSequence::removePropertyChangeListener( OSL_FAIL( "Not yet implemented" ); } - void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) @@ -3581,7 +3562,6 @@ void SAL_CALL ScChart2DataSequence::addVetoableChangeListener( OSL_FAIL( "Not yet implemented" ); } - void SAL_CALL ScChart2DataSequence::removeVetoableChangeListener( const OUString& /*rPropertyName*/, const uno::Reference< beans::XVetoableChangeListener>& /*rListener*/) diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx index a0c70540f14d..e5d73213f71d 100644 --- a/sc/source/ui/unoobj/chartuno.cxx +++ b/sc/source/ui/unoobj/chartuno.cxx @@ -789,6 +789,4 @@ uno::Reference< beans::XPropertySetInfo > ScChartObj::getPropertySetInfo() throw return createPropertySetInfo( getInfoHelper() ) ; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/confuno.cxx b/sc/source/ui/unoobj/confuno.cxx index 4f849aec5df3..9b838fe8b2a0 100644 --- a/sc/source/ui/unoobj/confuno.cxx +++ b/sc/source/ui/unoobj/confuno.cxx @@ -40,7 +40,6 @@ using namespace com::sun::star; #define SCSAVEVERSION "SaveVersionOnClose" - static const SfxItemPropertyMapEntry* lcl_GetConfigPropertyMap() { static const SfxItemPropertyMapEntry aConfigPropertyMap_Impl[] = diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx index bd203db8ecf9..3031a13f4136 100644 --- a/sc/source/ui/unoobj/cursuno.cxx +++ b/sc/source/ui/unoobj/cursuno.cxx @@ -481,5 +481,4 @@ uno::Sequence<OUString> SAL_CALL ScCellCursorObj::getSupportedServiceNames() return aTotalSeq; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index ff3d54b1f3e2..5cc6f06a6a12 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <algorithm> #include <svl/smplhint.hxx> #include <vcl/svapp.hxx> @@ -57,7 +56,6 @@ using namespace com::sun::star; using namespace com::sun::star::sheet; - using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Exception; using ::com::sun::star::uno::Reference; @@ -1140,7 +1138,6 @@ Sequence<sal_Int8> SAL_CALL ScDataPilotTableObj::getImplementationId() return css::uno::Sequence<sal_Int8>(); } - ScDPObject* ScDataPilotTableObj::GetDPObject() const { return lcl_GetDPObject(GetDocShell(), nTab, aName); @@ -3504,7 +3501,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 d1afe899dd3c..ac260c732b2b 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -126,8 +126,6 @@ static const SfxItemPropertyMapEntry* lcl_GetDBRangePropertyMap() return aDBRangePropertyMap_Impl; } - - 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" ) @@ -2253,7 +2251,6 @@ ScDatabaseRangeObj* ScDatabaseRangesObj::GetObjectByName_Impl(const OUString& aN return NULL; } - void SAL_CALL ScDatabaseRangesObj::addNewByName( const OUString& aName, const table::CellRangeAddress& aRange ) throw(uno::RuntimeException, std::exception) @@ -2480,5 +2477,4 @@ sal_Bool ScUnnamedDatabaseRangesObj::hasByTable( sal_Int32 nTab ) return false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/defltuno.cxx b/sc/source/ui/unoobj/defltuno.cxx index 1a2527d6b5ea..155f24f54e72 100644 --- a/sc/source/ui/unoobj/defltuno.cxx +++ b/sc/source/ui/unoobj/defltuno.cxx @@ -346,5 +346,4 @@ uno::Any SAL_CALL ScDocDefaultsObj::getPropertyDefault( const OUString& aPropert return aRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/detreg.cxx b/sc/source/ui/unoobj/detreg.cxx index 21edc1b21774..cc4941a992f7 100644 --- a/sc/source/ui/unoobj/detreg.cxx +++ b/sc/source/ui/unoobj/detreg.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scdetect.hxx" #include "exceldetect.hxx" #include <cppuhelper/implementationentry.hxx> diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index b87ad9be3358..c1c178ad8397 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -50,7 +50,6 @@ static uno::Reference<view::XSelectionSupplier> lcl_GetSelectionSupplier( SfxVie return uno::Reference<view::XSelectionSupplier>(); } - ScDispatchProviderInterceptor::ScDispatchProviderInterceptor(ScTabViewShell* pViewSh) : pViewShell( pViewSh ) { diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 131f9b7db07d..16d50edfff07 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -923,7 +923,6 @@ bool ScModelObj::FillRenderMarkData( const uno::Any& aSelection, return bDone; } - sal_Int32 SAL_CALL ScModelObj::getRendererCount(const uno::Any& aSelection, const uno::Sequence<beans::PropertyValue>& rOptions) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) @@ -2376,7 +2375,6 @@ uno::Sequence< sheet::opencl::OpenCLPlatform > ScModelObj::getOpenCLPlatforms() return aRet; } - ScDrawPagesObj::ScDrawPagesObj(ScDocShell* pDocSh) : pDocShell( pDocSh ) { @@ -3824,6 +3822,4 @@ sal_Bool SAL_CALL ScScenariosObj::hasByName( const OUString& aName ) return GetScenarioIndex_Impl( aName, nIndex ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/drdefuno.cxx b/sc/source/ui/unoobj/drdefuno.cxx index b382b17da612..1604dc437ef7 100644 --- a/sc/source/ui/unoobj/drdefuno.cxx +++ b/sc/source/ui/unoobj/drdefuno.cxx @@ -73,5 +73,4 @@ SfxItemPool* ScDrawDefaultsObj::getModelPool( bool bReadOnly ) throw() return pRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index 85ab77eb3e02..2f6e9a955b1d 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "editsrc.hxx" #include "scitems.hxx" diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 14a7af9eaf8e..ab62b5397a50 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "eventuno.hxx" #include "miscuno.hxx" #include "docsh.hxx" diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index a43e5448e7e1..1eb650134bda 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -31,7 +31,6 @@ #include <svl/smplhint.hxx> #include <vcl/svapp.hxx> - #include <editeng/eeitem.hxx> #include <editeng/editeng.hxx> @@ -145,7 +144,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" ) @@ -1187,7 +1185,6 @@ SvxFieldItem ScEditFieldObj::CreateFieldItem() return SvxFieldItem(*getData(), EE_FEATURE_FIELD); } - void ScEditFieldObj::DeleteField() { if (mpEditSource) diff --git a/sc/source/ui/unoobj/filtuno.cxx b/sc/source/ui/unoobj/filtuno.cxx index ee29b0f41649..6c42c814b9e5 100644 --- a/sc/source/ui/unoobj/filtuno.cxx +++ b/sc/source/ui/unoobj/filtuno.cxx @@ -32,7 +32,6 @@ #include "docsh.hxx" #include "globstr.hrc" - #include "sc.hrc" #include "scabstdlg.hxx" #include <i18nlangtag/lang.h> @@ -42,7 +41,6 @@ #include <com/sun/star/uno/Sequence.hxx> #include <boost/scoped_ptr.hpp> - using namespace ::com::sun::star; using namespace rtl; using namespace com::sun::star::uno; @@ -57,7 +55,6 @@ SC_SIMPLE_SERVICE_INFO( ScFilterOptionsObj, SCFILTEROPTIONSOBJ_IMPLNAME, SCFILTE #define SC_UNONAME_FILTEROPTIONS "FilterOptions" #define SC_UNONAME_INPUTSTREAM "InputStream" - #define DBF_CHAR_SET "CharSet" #define DBF_SEP_PATH_IMPORT "Office.Calc/Dialogs/DBFImport" #define DBF_SEP_PATH_EXPORT "Office.Calc/Dialogs/DBFExport" diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 2ffacb4c7888..3120b284a672 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <boost/bind.hpp> #include <vcl/svapp.hxx> @@ -1027,7 +1026,4 @@ ScTableValidationObj* ScTableValidationObj::getImplementation( return pRet; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index c5a2e4805c84..b171bf69a637 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -498,10 +498,8 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, ScCompiler aCompiler(pDoc,aAdr); aCompiler.SetGrammar(pDoc->GetGrammar()); - // find function - ScTokenArray aTokenArr; if ( !lcl_AddFunctionToken( aTokenArr, aName,aCompiler ) ) { @@ -509,17 +507,13 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, throw container::NoSuchElementException(); } - // set options (null date, etc.) - if ( pOptions ) pDoc->SetDocOptions( *pOptions ); - // add arguments to token array - bool bArgErr = false; bool bOverflow = false; long nDocRow = 0; @@ -621,10 +615,8 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, aTokenArr.AddOpCode(ocClose); aTokenArr.AddOpCode(ocStop); - // execute formula - uno::Any aRet; if ( !bArgErr && !bOverflow && nDocRow <= MAXROWCOUNT ) { @@ -683,5 +675,4 @@ uno::Any SAL_CALL ScFunctionAccess::callFunction( const OUString& aName, return aRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index b5d18a97ad1c..d73c00f4402d 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -239,8 +239,6 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const OUString& ServiceNa return aRet; } - - ScNameToIndexAccess::ScNameToIndexAccess( const com::sun::star::uno::Reference< com::sun::star::container::XNameAccess>& rNameObj ) : xNameAccess( rNameObj ) @@ -289,6 +287,4 @@ sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(::com::sun::star::u return getCount() > 0; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/nameuno.cxx b/sc/source/ui/unoobj/nameuno.cxx index edceecf35013..cc6fdeaa92bf 100644 --- a/sc/source/ui/unoobj/nameuno.cxx +++ b/sc/source/ui/unoobj/nameuno.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; - #include "nameuno.hxx" #include "miscuno.hxx" #include "cellsuno.hxx" @@ -208,7 +207,6 @@ void ScNamedRangeObj::Modify_Impl( const OUString* pNewName, const ScTokenArray* } } - OUString SAL_CALL ScNamedRangeObj::getName() throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -346,7 +344,6 @@ void SAL_CALL ScNamedRangeObj::setTokens( const uno::Sequence<sheet::FormulaToke } } - // XCellRangeSource uno::Reference<table::XCellRange> SAL_CALL ScNamedRangeObj::getReferredCells() @@ -442,7 +439,6 @@ uno::Sequence<OUString> SAL_CALL ScNamedRangeObj::getSupportedServiceNames() return aRet; } - // XUnoTunnel sal_Int64 SAL_CALL ScNamedRangeObj::getSomething( @@ -491,7 +487,6 @@ void ScNamedRangesObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - // sheet::XNamedRanges void SAL_CALL ScNamedRangesObj::addNewByName( const OUString& aName, @@ -1210,6 +1205,4 @@ sal_Bool SAL_CALL ScLabelRangesObj::hasElements() throw(uno::RuntimeException, s return ( getCount() != 0 ); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/notesuno.cxx b/sc/source/ui/unoobj/notesuno.cxx index d8dcbcec9679..ca70be593a2a 100644 --- a/sc/source/ui/unoobj/notesuno.cxx +++ b/sc/source/ui/unoobj/notesuno.cxx @@ -90,7 +90,6 @@ void ScAnnotationObj::Notify( SfxBroadcaster&, const SfxHint& rHint ) } } - // XChild uno::Reference<uno::XInterface> SAL_CALL ScAnnotationObj::getParent() throw(uno::RuntimeException, std::exception) diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index cab74069f1a2..c7734966d1cc 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -28,7 +28,6 @@ using namespace com::sun::star; - const SfxItemPropertyMapEntry* ScDocOptionsHelper::GetPropertyMap() { static const SfxItemPropertyMapEntry aMap[] = diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx index 83075860c2ea..63ff9a642d44 100644 --- a/sc/source/ui/unoobj/scdetect.cxx +++ b/sc/source/ui/unoobj/scdetect.cxx @@ -48,7 +48,6 @@ const sal_Char pFilterSylk[] = "SYLK"; // 0x02nn: ein Byte aus 0xnn Alternativen folgt // 0x8000: Erkennung abgeschlossen - #define M_DC 0x0100 #define M_ALT(ANZ) (0x0200+(ANZ)) #define M_ENDE 0x8000 diff --git a/sc/source/ui/unoobj/scdetect.hxx b/sc/source/ui/unoobj/scdetect.hxx index 1b78f7244ce6..097e4d2febf5 100644 --- a/sc/source/ui/unoobj/scdetect.hxx +++ b/sc/source/ui/unoobj/scdetect.hxx @@ -36,7 +36,6 @@ namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } }}} - class ScFilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo > { public: @@ -57,7 +56,6 @@ public: impl_createInstance( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext ) throw (com::sun::star::uno::Exception); - // XExtendedFilterDetect virtual OUString SAL_CALL detect( com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>& lDescriptor ) diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index e9bf1d5d158b..d4836851eefa 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sal/macros.h> #include <svtools/unoimap.hxx> #include <svx/unofill.hxx> @@ -308,11 +307,9 @@ static const ProvNamesId_Type aProvNamesId[] = { "ooo.vba.VBAGlobals", SC_SERVICE_VBAGLOBALS }, }; - // old service names that were in 567 still work in createInstance, // in case some macro is still using them - static const sal_Char* aOldNames[SC_SERVICE_COUNT] = { "", // SC_SERVICE_SHEET @@ -364,12 +361,8 @@ static const sal_Char* aOldNames[SC_SERVICE_COUNT] = "", // SC_SERVICE_EXT_TIMEFIELD }; - - - // alles static - sal_uInt16 ScServiceProvider::GetProviderType(const OUString& rServiceName) { if (!rServiceName.isEmpty()) @@ -650,5 +643,4 @@ uno::Sequence<OUString> ScServiceProvider::GetAllServiceNames() return aRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/srchuno.cxx b/sc/source/ui/unoobj/srchuno.cxx index 84f686b8f3e9..d9d800660d96 100644 --- a/sc/source/ui/unoobj/srchuno.cxx +++ b/sc/source/ui/unoobj/srchuno.cxx @@ -241,7 +241,4 @@ ScCellSearchObj* ScCellSearchObj::getImplementation( return pRet; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index 357d06dbf51e..a694d1c8c68f 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -365,7 +365,6 @@ static const SfxItemPropertyMap* lcl_GetFooterStyleMap() return &aFooterStyleMap; } - // Index-Access auf die Style-Typen: 0 = Cell, 1 = Page #define SC_STYLE_FAMILY_COUNT 2 @@ -1992,5 +1991,4 @@ uno::Sequence<OUString> SAL_CALL ScStyleObj::getSupportedServiceNames() return aRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 48238e41bd5d..4bbf90522451 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -174,7 +174,6 @@ ScHeaderFooterContentObj* ScHeaderFooterContentObj::getImplementation( return pRet; } - ScHeaderFooterTextData::ScHeaderFooterTextData( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : mpTextObj(pTextObj ? pTextObj->Clone() : NULL), @@ -253,7 +252,6 @@ void ScHeaderFooterTextData::UpdateData(EditEngine& rEditEngine) bDataValid = false; } - ScHeaderFooterTextObj::ScHeaderFooterTextObj( ScHeaderFooterContentObj& rContent, sal_uInt16 nP, const EditTextObject* pTextObj) : aTextData(rContent, nP, pTextObj) diff --git a/sc/source/ui/unoobj/tokenuno.cxx b/sc/source/ui/unoobj/tokenuno.cxx index 738d33d8a5be..f739a5ef4d14 100644 --- a/sc/source/ui/unoobj/tokenuno.cxx +++ b/sc/source/ui/unoobj/tokenuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "tokenuno.hxx" #include <sal/macros.h> diff --git a/sc/source/ui/unoobj/unodoc.cxx b/sc/source/ui/unoobj/unodoc.cxx index db9d9a00fc79..2da8ce21016b 100644 --- a/sc/source/ui/unoobj/unodoc.cxx +++ b/sc/source/ui/unoobj/unodoc.cxx @@ -52,5 +52,4 @@ uno::Reference< uno::XInterface > SAL_CALL ScDocument_createInstance( return uno::Reference< uno::XInterface >( pShell->GetModel() ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 65dcffabfedc..b2c825786e76 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/drawing/ShapeCollection.hpp> #include <com/sun/star/script/vba/VBAEventId.hpp> @@ -713,7 +712,6 @@ sal_Bool SAL_CALL ScTabViewObj::select( const uno::Any& aSelection ) if (bRet) return bRet; - ScCellRangesBase* pRangesImp = ScCellRangesBase::getImplementation( xInterface ); uno::Reference<drawing::XShapes> xShapeColl( xInterface, uno::UNO_QUERY ); uno::Reference<drawing::XShape> xShapeSel( xInterface, uno::UNO_QUERY ); @@ -1792,7 +1790,6 @@ void ScTabViewObj::SelectionChanged() } } - // XPropertySet (View-Optionen) //! auch an der Applikation anbieten? diff --git a/sc/source/ui/unoobj/warnpassword.cxx b/sc/source/ui/unoobj/warnpassword.cxx index df022b2b4330..02e59aef4184 100644 --- a/sc/source/ui/unoobj/warnpassword.cxx +++ b/sc/source/ui/unoobj/warnpassword.cxx @@ -29,7 +29,6 @@ #include <com/sun/star/ucb/XContent.hpp> #include <svx/svxerr.hxx> - using ::com::sun::star::uno::makeAny; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/sc/source/ui/vba/excelvbahelper.cxx b/sc/source/ui/vba/excelvbahelper.cxx index 96c76a725612..5c379294f6fe 100644 --- a/sc/source/ui/vba/excelvbahelper.cxx +++ b/sc/source/ui/vba/excelvbahelper.cxx @@ -156,7 +156,6 @@ implnPaste( const uno::Reference< frame::XModel>& xModel ) } } - void implnCopy( const uno::Reference< frame::XModel>& xModel ) { diff --git a/sc/source/ui/vba/excelvbahelper.hxx b/sc/source/ui/vba/excelvbahelper.hxx index 6e08ea20b829..cd6590c5402a 100644 --- a/sc/source/ui/vba/excelvbahelper.hxx +++ b/sc/source/ui/vba/excelvbahelper.hxx @@ -79,7 +79,6 @@ template < typename ImplObject > return pObj; } - } // namespace excel } // namespace vba } // namespace ooo diff --git a/sc/source/ui/vba/service.cxx b/sc/source/ui/vba/service.cxx index 1187ce82c82e..64222f5acf7a 100644 --- a/sc/source/ui/vba/service.cxx +++ b/sc/source/ui/vba/service.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <comphelper/servicedecl.hxx> - // component exports using namespace ::com::sun::star; diff --git a/sc/source/ui/vba/vbaapplication.cxx b/sc/source/ui/vba/vbaapplication.cxx index c050f1153c53..81aafa2bc0a7 100644 --- a/sc/source/ui/vba/vbaapplication.cxx +++ b/sc/source/ui/vba/vbaapplication.cxx @@ -502,7 +502,6 @@ ScVbaApplication::Names( const css::uno::Any& aIndex ) throw ( uno::RuntimeExcep return uno::Any( xNames->Item( aIndex, uno::Any() ) ); } - uno::Reference< excel::XWorksheet > SAL_CALL ScVbaApplication::getActiveSheet() throw (uno::RuntimeException, std::exception) { @@ -923,7 +922,6 @@ ScVbaApplication::getPathSeparator() throw (uno::RuntimeException, std::exceptio return OUString( (sal_Unicode) SAL_PATHDELIMITER ); } - // Helpers for Intersect and Union namespace { diff --git a/sc/source/ui/vba/vbaapplication.hxx b/sc/source/ui/vba/vbaapplication.hxx index 14e39a812849..0e69474248e9 100644 --- a/sc/source/ui/vba/vbaapplication.hxx +++ b/sc/source/ui/vba/vbaapplication.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAAPPLICATION_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAAPPLICATION_HXX - #include <ooo/vba/excel/XWorksheetFunction.hpp> #include <ooo/vba/excel/XApplication.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/sc/source/ui/vba/vbaassistant.cxx b/sc/source/ui/vba/vbaassistant.cxx index e8d02fd3c741..efd90a35f2b6 100644 --- a/sc/source/ui/vba/vbaassistant.cxx +++ b/sc/source/ui/vba/vbaassistant.cxx @@ -23,7 +23,6 @@ #include"vbaassistant.hxx" - using namespace com::sun::star; using namespace ooo::vba; @@ -62,7 +61,6 @@ void SAL_CALL ScVbaAssistant::setOn( sal_Bool bOn ) throw (uno::RuntimeException setVisible( bOn ); } - ::sal_Int32 SAL_CALL ScVbaAssistant::getTop() throw (css::uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx index 999a7ee49bde..9d3624925b31 100644 --- a/sc/source/ui/vba/vbaaxes.cxx +++ b/sc/source/ui/vba/vbaaxes.cxx @@ -58,7 +58,6 @@ public: } }; - uno::Reference< excel::XAxis > ScVbaAxes::createAxis( const uno::Reference< excel::XChart >& xChart, const uno::Reference< uno::XComponentContext >& xContext, sal_Int32 nType, sal_Int32 nAxisGroup ) throw ( uno::RuntimeException, script::BasicErrorException ) { diff --git a/sc/source/ui/vba/vbaaxis.cxx b/sc/source/ui/vba/vbaaxis.cxx index 939bc1493ac9..8ed9bfe398d3 100644 --- a/sc/source/ui/vba/vbaaxis.cxx +++ b/sc/source/ui/vba/vbaaxis.cxx @@ -466,7 +466,6 @@ ScVbaAxis::setMaximumScaleIsAuto( sal_Bool _bMaximumScaleIsAuto ) throw (script: } } - sal_Bool SAL_CALL ScVbaAxis::getMaximumScaleIsAuto( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbaaxistitle.cxx b/sc/source/ui/vba/vbaaxistitle.cxx index 4715d8e8e409..42813da67025 100644 --- a/sc/source/ui/vba/vbaaxistitle.cxx +++ b/sc/source/ui/vba/vbaaxistitle.cxx @@ -46,5 +46,4 @@ ScVbaAxisTitle::getServiceNames() return aServiceNames; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbaborders.cxx b/sc/source/ui/vba/vbaborders.cxx index dd363406b387..8d76d3915b55 100644 --- a/sc/source/ui/vba/vbaborders.cxx +++ b/sc/source/ui/vba/vbaborders.cxx @@ -34,7 +34,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; using namespace ::ooo::vba::excel; - typedef ::cppu::WeakImplHelper1<container::XIndexAccess > RangeBorders_Base; typedef InheritedHelperInterfaceImpl1<excel::XBorder > ScVbaBorder_Base; @@ -404,7 +403,6 @@ ScVbaBorders::getItemByIntIndex( const sal_Int32 nIndex ) throw (uno::RuntimeEx return createCollectionObject( m_xIndexAccess->getByIndex( nIndex ) ); } - uno::Any SAL_CALL ScVbaBorders::getColor() throw (uno::RuntimeException, std::exception) { sal_Int32 count = getCount(); @@ -545,7 +543,6 @@ void SAL_CALL ScVbaBorders::setWeight( const uno::Any& _weight ) throw (uno::Run } } - OUString ScVbaBorders::getServiceImplName() { diff --git a/sc/source/ui/vba/vbaborders.hxx b/sc/source/ui/vba/vbaborders.hxx index e1c4a4a75047..fe8f7ed08fb2 100644 --- a/sc/source/ui/vba/vbaborders.hxx +++ b/sc/source/ui/vba/vbaborders.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/beans/XPropertySet.hpp> - #include <vbahelper/vbacollectionimpl.hxx> typedef CollTestImplHelper< ov::excel::XBorders > ScVbaBorders_BASE; @@ -45,7 +44,6 @@ public: virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - // XBorders // ScVbaCollectionBaseImpl diff --git a/sc/source/ui/vba/vbacharacters.cxx b/sc/source/ui/vba/vbacharacters.cxx index 5eb7b9f1caef..0a0ad615135e 100644 --- a/sc/source/ui/vba/vbacharacters.cxx +++ b/sc/source/ui/vba/vbacharacters.cxx @@ -21,7 +21,6 @@ #include "vbaglobals.hxx" #include "vbafont.hxx" - using namespace ::ooo::vba; using namespace ::com::sun::star; @@ -90,7 +89,6 @@ ScVbaCharacters::setFont( const uno::Reference< excel::XFont >& /*_font*/ ) thro throw uno::RuntimeException("Not Implemented" ); } - // Methods void SAL_CALL ScVbaCharacters::Insert( const OUString& rString ) throw (css::uno::RuntimeException, std::exception) @@ -106,7 +104,6 @@ ScVbaCharacters::Delete( ) throw (css::uno::RuntimeException, std::exception) m_xSimpleText->setString(OUString()); } - OUString ScVbaCharacters::getServiceImplName() { diff --git a/sc/source/ui/vba/vbacharacters.hxx b/sc/source/ui/vba/vbacharacters.hxx index 147d493e6ebb..7548a96a0afc 100644 --- a/sc/source/ui/vba/vbacharacters.hxx +++ b/sc/source/ui/vba/vbacharacters.hxx @@ -56,7 +56,6 @@ public: virtual void SAL_CALL Insert( const OUString& String ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL Delete( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XHelperInterface virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; diff --git a/sc/source/ui/vba/vbachart.cxx b/sc/source/ui/vba/vbachart.cxx index 18214850e401..4f495e669da3 100644 --- a/sc/source/ui/vba/vbachart.cxx +++ b/sc/source/ui/vba/vbachart.cxx @@ -380,7 +380,6 @@ try break; } - switch (_nChartType) { case xlConeColClustered: @@ -953,7 +952,6 @@ ScVbaChart::getSolidType(sal_Int32 _nDeep, sal_Int32 _nVertiStacked, sal_Int32 _ } } - sal_Int32 ScVbaChart::getStockUpDownValue(sal_Int32 _nUpDown, sal_Int32 _nNotUpDown) throw (script::BasicErrorException) { @@ -1014,7 +1012,6 @@ ScVbaChart::assignDiagramAttributes() xTwoAxisYSupplier.set( mxDiagramPropertySet, uno::UNO_QUERY_THROW ); } - uno::Reference< beans::XPropertySet > ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) throw ( script::BasicErrorException, uno::RuntimeException ) { @@ -1047,7 +1044,6 @@ ScVbaChart::getAxisPropertySet(sal_Int32 _nAxisType, sal_Int32 _nAxisGroup) thro return xAxisProps; } - OUString ScVbaChart::getServiceImplName() { diff --git a/sc/source/ui/vba/vbachartobject.cxx b/sc/source/ui/vba/vbachartobject.cxx index 863233ed8063..a4a39e67581f 100644 --- a/sc/source/ui/vba/vbachartobject.cxx +++ b/sc/source/ui/vba/vbachartobject.cxx @@ -83,7 +83,6 @@ ScVbaChartObject::setName( const OUString& sName ) throw (css::uno::RuntimeExcep xNamedShape->setName(sName); } - OUString SAL_CALL ScVbaChartObject::getName() throw (css::uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbachartobjects.cxx b/sc/source/ui/vba/vbachartobjects.cxx index 935ddbaf2e9e..cdb300e84fb6 100644 --- a/sc/source/ui/vba/vbachartobjects.cxx +++ b/sc/source/ui/vba/vbachartobjects.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <ooo/vba/excel/XlChartType.hpp> - #include "vbachartobjects.hxx" #include "vbachartobject.hxx" #include "vbaglobals.hxx" @@ -35,7 +34,6 @@ using namespace ::com::sun::star; using namespace ::ooo::vba; - class ChartObjectEnumerationImpl : public EnumerationHelperImpl { uno::Reference< drawing::XDrawPageSupplier > xDrawPageSupplier; @@ -51,7 +49,6 @@ public: } }; - ScVbaChartObjects::ScVbaChartObjects( const css::uno::Reference< ov::XHelperInterface >& _xParent, const css::uno::Reference< css::uno::XComponentContext >& _xContext, const css::uno::Reference< css::table::XTableCharts >& _xTableCharts, const uno::Reference< drawing::XDrawPageSupplier >& _xDrawPageSupplier ) : ChartObjects_BASE(_xParent, _xContext, css::uno::Reference< css::container::XIndexAccess >( _xTableCharts, css::uno::UNO_QUERY ) ), xTableCharts( _xTableCharts ) , xDrawPageSupplier( _xDrawPageSupplier ) { diff --git a/sc/source/ui/vba/vbacharttitle.cxx b/sc/source/ui/vba/vbacharttitle.cxx index d0def76e4f4d..7b4f64fc49ef 100644 --- a/sc/source/ui/vba/vbacharttitle.cxx +++ b/sc/source/ui/vba/vbacharttitle.cxx @@ -46,5 +46,4 @@ ScVbaChartTitle::getServiceNames() return aServiceNames; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbacharttitle.hxx b/sc/source/ui/vba/vbacharttitle.hxx index 084e2c3333c5..95bb635e985e 100644 --- a/sc/source/ui/vba/vbacharttitle.hxx +++ b/sc/source/ui/vba/vbacharttitle.hxx @@ -22,7 +22,6 @@ #include <cppuhelper/implbase1.hxx> #include <ooo/vba/excel/XChartTitle.hpp> - typedef TitleImpl< cppu::WeakImplHelper1< ov::excel::XChartTitle > > ChartTitleBase; class ScVbaChartTitle : public ChartTitleBase diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index c4c42a1c30f8..a0cb6d060a67 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -46,7 +46,6 @@ using namespace ::com::sun::star; 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. diff --git a/sc/source/ui/vba/vbafont.cxx b/sc/source/ui/vba/vbafont.cxx index 72dabbe69a15..873650bd3642 100644 --- a/sc/source/ui/vba/vbafont.cxx +++ b/sc/source/ui/vba/vbafont.cxx @@ -58,7 +58,6 @@ ScVbaFont::~ScVbaFont() { } - static uno::Reference< beans::XPropertySet > lcl_TextProperties( uno::Reference< table::XCell >& xIf ) throw ( uno::RuntimeException ) { uno::Reference< text::XTextRange > xTxtRange( xIf, uno::UNO_QUERY_THROW ); @@ -243,7 +242,6 @@ ScVbaFont::setColorIndex( const uno::Any& _colorindex ) throw( uno::RuntimeExcep ScVbaFont_BASE::setColorIndex( _colorindex ); } - uno::Any SAL_CALL ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception ) { @@ -253,7 +251,6 @@ ScVbaFont::getColorIndex() throw ( uno::RuntimeException, std::exception ) return ScVbaFont_BASE::getColorIndex(); } - void SAL_CALL ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException, std::exception ) { @@ -263,7 +260,6 @@ ScVbaFont::setStandardFontSize( const uno::Any& /*aValue*/ ) throw( uno::Runtime "setStandardFontSize not supported" ); } - uno::Any SAL_CALL ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException, std::exception ) { @@ -272,7 +268,6 @@ ScVbaFont::getStandardFontSize() throw ( uno::RuntimeException, std::exception ) // return uno::Any(); } - void SAL_CALL ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeException, std::exception ) { @@ -280,7 +275,6 @@ ScVbaFont::setStandardFont( const uno::Any& /*aValue*/ ) throw( uno::RuntimeExce throw uno::RuntimeException("setStandardFont not supported" ); } - uno::Any SAL_CALL ScVbaFont::getStandardFont() throw ( uno::RuntimeException, std::exception ) { @@ -320,7 +314,6 @@ ScVbaFont::setFontStyle( const uno::Any& aValue ) throw( uno::RuntimeException, setItalic( uno::makeAny( bItalic ) ); } - uno::Any SAL_CALL ScVbaFont::getFontStyle() throw ( uno::RuntimeException, std::exception ) { diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx index 90bd2ca71dab..b914ab6b735e 100644 --- a/sc/source/ui/vba/vbaformat.cxx +++ b/sc/source/ui/vba/vbaformat.cxx @@ -807,9 +807,7 @@ ScVbaFormat<Ifc1>::getCurrentDataSet( ) throw ( uno::RuntimeException ) return pDataSet; } - template class ScVbaFormat< excel::XStyle >; template class ScVbaFormat< excel::XRange >; - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbaformatcondition.cxx b/sc/source/ui/vba/vbaformatcondition.cxx index 28e5e30aeea4..623d6ea7e265 100644 --- a/sc/source/ui/vba/vbaformatcondition.cxx +++ b/sc/source/ui/vba/vbaformatcondition.cxx @@ -48,7 +48,6 @@ ScVbaFormatCondition::ScVbaFormatCondition( const uno::Reference< XHelperInterfa msStyleName = mxStyle->getName(); } - void SAL_CALL ScVbaFormatCondition::Delete( ) throw (script::BasicErrorException, uno::RuntimeException, std::exception) { @@ -132,7 +131,6 @@ ScVbaFormatCondition::Type( ) throw ( script::BasicErrorException, uno::Runtime return nReturnType; } - ::sal_Int32 ScVbaFormatCondition::Operator( sal_Bool bVal ) throw (script::BasicErrorException ) { diff --git a/sc/source/ui/vba/vbaformatconditions.cxx b/sc/source/ui/vba/vbaformatconditions.cxx index 54323da6eb58..0aca5596c18f 100644 --- a/sc/source/ui/vba/vbaformatconditions.cxx +++ b/sc/source/ui/vba/vbaformatconditions.cxx @@ -66,7 +66,6 @@ ScVbaFormatConditions::getElementType() throw (css::uno::RuntimeException) return cppu::UnoType<excel::XFormatCondition>::get(); } - uno::Any xSheetConditionToFormatCondition( const uno::Reference< XHelperInterface >& xRangeParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< excel::XStyles >& xStyles, const uno::Reference< excel::XFormatConditions >& xFormatConditions, const uno::Reference< beans::XPropertySet >& xRangeProps, const uno::Any& aObject ) { uno::Reference< sheet::XSheetConditionalEntry > xSheetConditionalEntry; @@ -190,14 +189,12 @@ ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any& _aOperator, cons return xFormatCondition; } - uno::Reference< container::XEnumeration > SAL_CALL ScVbaFormatConditions::createEnumeration() throw (uno::RuntimeException) { return new EnumWrapper( m_xIndexAccess, mxRangeParent, mxContext, mxStyles, this, mxParentRangePropertySet ); } - void ScVbaFormatConditions::notifyRange() throw ( script::BasicErrorException ) { diff --git a/sc/source/ui/vba/vbaglobals.cxx b/sc/source/ui/vba/vbaglobals.cxx index 70055e15543d..f6477be468c9 100644 --- a/sc/source/ui/vba/vbaglobals.cxx +++ b/sc/source/ui/vba/vbaglobals.cxx @@ -34,10 +34,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::ooo::vba; - // ScVbaGlobals - //ScVbaGlobals::ScVbaGlobals( css::uno::Reference< css::uno::XComponentContext >const& rxContext, ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext ) ScVbaGlobals::ScVbaGlobals( uno::Sequence< uno::Any > const& aArgs, uno::Reference< uno::XComponentContext >const& rxContext ) : ScVbaGlobals_BASE( uno::Reference< XHelperInterface >(), rxContext, "ExcelDocumentContext" ) @@ -58,7 +56,6 @@ ScVbaGlobals::~ScVbaGlobals() OSL_TRACE("ScVbaGlobals::~ScVbaGlobals"); } - // XGlobals uno::Reference<excel::XApplication > @@ -70,7 +67,6 @@ ScVbaGlobals::getApplication() throw (uno::RuntimeException) return mxApplication; } - uno::Reference<excel::XApplication > SAL_CALL ScVbaGlobals::getExcel() throw (uno::RuntimeException, std::exception) { @@ -90,7 +86,6 @@ ScVbaGlobals::getActiveWorkbook() throw (uno::RuntimeException, std::exception) throw uno::RuntimeException( "No activeWorkbook available" ); } - uno::Reference< excel::XWindow > SAL_CALL ScVbaGlobals::getActiveWindow() throw (uno::RuntimeException, std::exception) { @@ -215,7 +210,6 @@ ScVbaGlobals::Rows( const uno::Any& aIndex ) throw (uno::RuntimeException, std:: } - uno::Any SAL_CALL ScVbaGlobals::getDebug() throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbaglobals.hxx b/sc/source/ui/vba/vbaglobals.hxx index 11b5e0cab891..3510b90c729c 100644 --- a/sc/source/ui/vba/vbaglobals.hxx +++ b/sc/source/ui/vba/vbaglobals.hxx @@ -32,7 +32,6 @@ // class ScVbaGlobals - typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > ScVbaGlobals_BASE; class ScVbaGlobals : public ScVbaGlobals_BASE @@ -78,7 +77,6 @@ typedef ::cppu::ImplInheritanceHelper1< VbaGlobalsBase, ov::excel::XGlobals > Sc virtual css::uno::Any SAL_CALL getDebug() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual css::uno::Any SAL_CALL MenuBars( const css::uno::Any& aIndex ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; - // XMultiServiceFactory virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XHelperInterface diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index 039d767358cf..662ffec00358 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XURLTransformer.hpp> - #include <comphelper/processfactory.hxx> #include <sfx2/objsh.hxx> @@ -59,7 +58,6 @@ using namespace ::ooo::vba; #define POINTTO100THMILLIMETERFACTOR 35.27778 - namespace ooo { namespace vba @@ -180,7 +178,6 @@ implnPaste() } } - void implnCopy() { @@ -255,7 +252,6 @@ getCurrentDocument() throw (uno::RuntimeException) basicChosen = pParent; } - uno::Any aModel; SbxVariable *pCompVar = basicChosen->Find( "ThisComponent", SbxCLASS_OBJECT ); @@ -520,7 +516,6 @@ OUString getAnyAsString( const uno::Any& pvargItem ) throw ( uno::RuntimeExcepti return sString; } - OUString ContainerUtilities::getUniqueName( const uno::Sequence< OUString >& _slist, const OUString& _sElementName, const OUString& _sSuffixSeparator) { diff --git a/sc/source/ui/vba/vbamenubars.cxx b/sc/source/ui/vba/vbamenubars.cxx index 5387427533e1..265f9a1d7e84 100644 --- a/sc/source/ui/vba/vbamenubars.cxx +++ b/sc/source/ui/vba/vbamenubars.cxx @@ -13,7 +13,6 @@ using namespace com::sun::star; using namespace ooo::vba; - typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuBarEnumeration_BASE; class MenuBarEnumeration : public MenuBarEnumeration_BASE diff --git a/sc/source/ui/vba/vbamenuitems.cxx b/sc/source/ui/vba/vbamenuitems.cxx index 20a13b98625e..2d6c20a1e572 100644 --- a/sc/source/ui/vba/vbamenuitems.cxx +++ b/sc/source/ui/vba/vbamenuitems.cxx @@ -14,7 +14,6 @@ using namespace com::sun::star; using namespace ooo::vba; - typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuEnumeration_BASE; class MenuEnumeration : public MenuEnumeration_BASE diff --git a/sc/source/ui/vba/vbamenus.cxx b/sc/source/ui/vba/vbamenus.cxx index a0b663838bba..16068af9fcba 100644 --- a/sc/source/ui/vba/vbamenus.cxx +++ b/sc/source/ui/vba/vbamenus.cxx @@ -13,7 +13,6 @@ using namespace com::sun::star; using namespace ooo::vba; - typedef ::cppu::WeakImplHelper1< container::XEnumeration > MenuEnumeration_BASE; class MenuEnumeration : public MenuEnumeration_BASE diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx index 8cf18ec2183e..4d64a43bcf55 100644 --- a/sc/source/ui/vba/vbanames.cxx +++ b/sc/source/ui/vba/vbanames.cxx @@ -55,7 +55,6 @@ public: }; - ScVbaNames::ScVbaNames(const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::sheet::XNamedRanges >& xNames, @@ -82,7 +81,6 @@ ScVbaNames::getScDocument() return rViewData.GetDocument(); } - css::uno::Any ScVbaNames::Add( const css::uno::Any& Name , const css::uno::Any& RefersTo, @@ -268,5 +266,4 @@ ScVbaNames::getServiceNames() return aServiceNames; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/vba/vbapagebreak.hxx b/sc/source/ui/vba/vbapagebreak.hxx index d3cef1eaa52f..e80c4acb98f9 100644 --- a/sc/source/ui/vba/vbapagebreak.hxx +++ b/sc/source/ui/vba/vbapagebreak.hxx @@ -55,7 +55,6 @@ public: virtual css::uno::Sequence<OUString> getServiceNames(); }; - typedef ScVbaPageBreak < ov::excel::XHPageBreak > ScVbaHPageBreak_BASE; class ScVbaHPageBreak : public ScVbaHPageBreak_BASE diff --git a/sc/source/ui/vba/vbapagebreaks.cxx b/sc/source/ui/vba/vbapagebreaks.cxx index a06161684547..0f4c6d4ccd0e 100644 --- a/sc/source/ui/vba/vbapagebreaks.cxx +++ b/sc/source/ui/vba/vbapagebreaks.cxx @@ -179,7 +179,6 @@ uno::Any RangePageBreaks::Add( const css::uno::Any& Before ) throw ( css::script return uno::makeAny( uno::Reference< excel::XHPageBreak >( new ScVbaHPageBreak( mxParent, mxContext, xRowColPropertySet, aTablePageBreakData) )); } - class RangePageBreaksEnumWrapper : public EnumerationHelper_BASE { uno::Reference<container::XIndexAccess > m_xIndexAccess; diff --git a/sc/source/ui/vba/vbapivotcache.cxx b/sc/source/ui/vba/vbapivotcache.cxx index 9923a78177f2..fff859362c9d 100644 --- a/sc/source/ui/vba/vbapivotcache.cxx +++ b/sc/source/ui/vba/vbapivotcache.cxx @@ -18,7 +18,6 @@ */ #include "vbapivotcache.hxx" - using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/sc/source/ui/vba/vbapivottable.cxx b/sc/source/ui/vba/vbapivottable.cxx index 53fe0bab95f0..2e3758f7f388 100644 --- a/sc/source/ui/vba/vbapivottable.cxx +++ b/sc/source/ui/vba/vbapivottable.cxx @@ -19,7 +19,6 @@ #include "vbapivottable.hxx" #include "vbapivotcache.hxx" - using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/sc/source/ui/vba/vbapivottables.cxx b/sc/source/ui/vba/vbapivottables.cxx index 1af9df7e6060..8be41a0f66f2 100644 --- a/sc/source/ui/vba/vbapivottables.cxx +++ b/sc/source/ui/vba/vbapivottables.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/sheet/XDataPilotTable.hpp> #include <ooo/vba/excel/XPivotTable.hpp> - using namespace ::com::sun::star; using namespace ::ooo::vba; diff --git a/sc/source/ui/vba/vbapivottables.hxx b/sc/source/ui/vba/vbapivottables.hxx index f5c50f1d215d..afe2a33c88a6 100644 --- a/sc/source/ui/vba/vbapivottables.hxx +++ b/sc/source/ui/vba/vbapivottables.hxx @@ -29,7 +29,6 @@ #include <vbahelper/vbahelperinterface.hxx> #include <vbahelper/vbacollectionimpl.hxx> - typedef CollTestImplHelper< ov::excel::XPivotTables > ScVbaPivotTables_BASE; class ScVbaPivotTables : public ScVbaPivotTables_BASE @@ -44,7 +43,6 @@ public: virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - // XPivotTables // ScVbaPivotTables_BASE diff --git a/sc/source/ui/vba/vbapropvalue.hxx b/sc/source/ui/vba/vbapropvalue.hxx index 0cdd5fb836a9..f557bb25960a 100644 --- a/sc/source/ui/vba/vbapropvalue.hxx +++ b/sc/source/ui/vba/vbapropvalue.hxx @@ -32,7 +32,6 @@ public: virtual css::uno::Any getValueEvent() = 0; }; - class ScVbaPropValue : public PropValueImpl_BASE { PropListener* m_pListener; diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 57d3ec747257..521f224e8d40 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -350,7 +350,6 @@ public: } }; - class ScVbaRangeAreas : public ScVbaCollectionBaseImpl { bool mbIsRows; @@ -492,7 +491,6 @@ const ScRangeList& ScVbaRange::getScRangeList( const uno::Reference< excel::XRan throw uno::RuntimeException("Cannot obtain VBA range implementation object" ); } - class NumFormatHelper { uno::Reference< util::XNumberFormatsSupplier > mxSupplier; @@ -549,7 +547,6 @@ public: return OUString(); } - uno::Reference< beans::XPropertySet > xNumberProps( getNumberProps(), uno::UNO_QUERY_THROW ); OUString aFormatString; uno::Any aString = xNumberProps->getPropertyValue( "FormatString" ); @@ -692,7 +689,6 @@ public: } }; - const static OUString ISVISIBLE( "IsVisible"); const static OUString POSITION( "Position"); const static OUString EQUALS( "=" ); @@ -801,7 +797,6 @@ CellValueSetter::processValue( const uno::Any& aValue, const uno::Reference< tab } - class CellValueGetter : public ValueGetter { protected: @@ -955,7 +950,6 @@ public: }; - class Dim2ArrayValueGetter : public ArrayVisitor { protected: @@ -1241,7 +1235,6 @@ bool getScRangeListForAddress( const OUString& sName, ScDocShell* pDocSh, ScRang return true; } - ScVbaRange* getRangeForName( const uno::Reference< uno::XComponentContext >& xContext, const OUString& sName, ScDocShell* pDocSh, table::CellRangeAddress& pAddr, formula::FormulaGrammar::AddressConvention eConv = formula::FormulaGrammar::CONV_XL_A1 ) throw ( uno::RuntimeException ) { @@ -1533,7 +1526,6 @@ ScVbaRange::getValue() throw (uno::RuntimeException, std::exception) } - void ScVbaRange::setValue( const uno::Any& aValue, ValueSetter& valueSetter, bool bFireEvent ) throw (uno::RuntimeException) { @@ -1619,7 +1611,6 @@ ScVbaRange::ClearContents( sal_Int32 nFlags, bool bFireEvent ) throw (uno::Runti return; } - uno::Reference< sheet::XSheetOperation > xSheetOperation(mxRange, uno::UNO_QUERY_THROW); xSheetOperation->clearContents( nFlags ); if( bFireEvent ) fireChangeEvent(); @@ -1879,7 +1870,6 @@ ScVbaRange::Offset( const ::uno::Any &nRowOff, const uno::Any &nColOff ) throw ( ScRangeList aCellRanges = pUnoRangesBase->GetRangeList(); - for ( size_t i = 0, nRanges = aCellRanges.size(); i < nRanges; ++i ) { ScRange* pRange = aCellRanges[ i ]; @@ -3376,7 +3366,6 @@ void updateTableSortField( const uno::Reference< table::XCellRange >& xParentRan else throw uno::RuntimeException("Illegal Key param" ); - } void SAL_CALL @@ -4116,7 +4105,6 @@ ScVbaRange::getLeft() throw (uno::RuntimeException, std::exception) return uno::makeAny( lcl_hmmToPoints( aPoint.X ) ); } - uno::Any SAL_CALL ScVbaRange::getTop() throw (uno::RuntimeException, std::exception) { @@ -4127,7 +4115,6 @@ ScVbaRange::getTop() throw (uno::RuntimeException, std::exception) return uno::makeAny( lcl_hmmToPoints( aPoint.Y ) ); } - uno::Reference< sheet::XCellRangeReferrer > getNamedRange( const uno::Reference< uno::XInterface >& xIf, const uno::Reference< table::XCellRange >& thisRange ) { uno::Reference< beans::XPropertySet > xProps( xIf, uno::UNO_QUERY_THROW ); @@ -4467,7 +4454,6 @@ ScVbaRange::AutoFilter( const uno::Any& aField, const uno::Any& Criteria1, const xFiltProps->setPropertyValue( "ContainsHeader", uno::Any( bHasColHeader ) ); } - sal_Int32 nField = 0; // *IS* 1 based OUString sCriteria1; sal_Int32 nOperator = excel::XlAutoFilterOperator::xlAnd; diff --git a/sc/source/ui/vba/vbarange.hxx b/sc/source/ui/vba/vbarange.hxx index 5fe1c664b412..8d0035b7c5df 100644 --- a/sc/source/ui/vba/vbarange.hxx +++ b/sc/source/ui/vba/vbarange.hxx @@ -65,7 +65,6 @@ class ValueSetter : public ArrayVisitor public: virtual bool processValue( const css::uno::Any& aValue, const css::uno::Reference< css::table::XCell >& xCell ) = 0; - }; class ValueGetter : public ArrayVisitor @@ -280,7 +279,6 @@ public: // XDefaultProperty OUString SAL_CALL getDefaultPropertyName( ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE { return OUString("Value"); } - // #TODO completely rewrite ScVbaRange, its become a hackfest // it needs to be closer to ScCellRangeBase in that the underlying // object model should probably be a ScRangelst. diff --git a/sc/source/ui/vba/vbasheetobjects.cxx b/sc/source/ui/vba/vbasheetobjects.cxx index 05ec0f23a8d0..9a71a7cb3c69 100644 --- a/sc/source/ui/vba/vbasheetobjects.cxx +++ b/sc/source/ui/vba/vbasheetobjects.cxx @@ -58,10 +58,8 @@ inline double lclPointsToHmm( const uno::Any& rPoints ) throw (uno::RuntimeExcep } // namespace - // Base implementations - /** Container for a specific type of drawing object in a spreadsheet. Derived classes provide all required functionality specific to the type of @@ -298,10 +296,8 @@ uno::Any ScVbaSheetObjectsBase::getItemByStringIndex( const OUString& rIndex ) t return mxContainer->getItemByStringIndex( rIndex ); } - // Graphic object containers supporting ooo.vba.excel.XGraphicObject - ScVbaGraphicObjectsBase::ScVbaGraphicObjectsBase( const ScVbaObjectContainerRef& rxContainer ) throw (uno::RuntimeException) : ScVbaGraphicObjects_BASE( rxContainer ) { @@ -330,10 +326,8 @@ uno::Any SAL_CALL ScVbaGraphicObjectsBase::Add( const uno::Any& rLeft, const uno return uno::Any( uno::Reference< excel::XSheetObject >( xVbaObject.get() ) ); } - // Drawing controls - class ScVbaControlContainer : public ScVbaObjectContainer { public: @@ -443,10 +437,8 @@ void ScVbaControlContainer::implOnShapeCreated( const uno::Reference< drawing::X xControlShape->setControl( xControlModel ); } - // Push button - class ScVbaButtonContainer : public ScVbaControlContainer { public: diff --git a/sc/source/ui/vba/vbastyle.cxx b/sc/source/ui/vba/vbastyle.cxx index 932cda0a61a5..16d05e70ab62 100644 --- a/sc/source/ui/vba/vbastyle.cxx +++ b/sc/source/ui/vba/vbastyle.cxx @@ -41,7 +41,6 @@ lcl_getStyleProps( const OUString& sStyleName, const uno::Reference< frame::XMod return xStyleProps; } - void ScVbaStyle::initialise() throw ( uno::RuntimeException, script::BasicErrorException ) { if (!mxModel.is() ) @@ -82,7 +81,6 @@ ScVbaStyle::ScVbaStyle( const uno::Reference< XHelperInterface >& xParent, const } } - sal_Bool SAL_CALL ScVbaStyle::BuiltIn() throw (script::BasicErrorException, uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbastyle.hxx b/sc/source/ui/vba/vbastyle.hxx index 98f42a6e32cc..26f43a8392e3 100644 --- a/sc/source/ui/vba/vbastyle.hxx +++ b/sc/source/ui/vba/vbastyle.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/container/XNameContainer.hpp> #include "vbaformat.hxx" - typedef ScVbaFormat< ov::excel::XStyle > ScVbaStyle_BASE; class ScVbaStyle : public ScVbaStyle_BASE diff --git a/sc/source/ui/vba/vbastyles.cxx b/sc/source/ui/vba/vbastyles.cxx index 2ee6a02a71f9..87f852e2d398 100644 --- a/sc/source/ui/vba/vbastyles.cxx +++ b/sc/source/ui/vba/vbastyles.cxx @@ -32,7 +32,6 @@ lcl_createAPIStyleToVBAObject( const css::uno::Any& aObject, const uno::Referenc return uno::makeAny( xStyle ); } - ScVbaStyles::ScVbaStyles( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< css::uno::XComponentContext > & xContext, const uno::Reference< frame::XModel >& xModel ) throw ( script::BasicErrorException ) : ScVbaStyles_BASE( xParent, xContext, uno::Reference< container::XIndexAccess >( ScVbaStyle::getStylesNameContainer( xModel ), uno::UNO_QUERY_THROW ) ), mxModel( xModel ), mxParent( xParent ) { try @@ -52,7 +51,6 @@ ScVbaStyles::getStyleNames() throw ( uno::RuntimeException ) return mxNameContainerCellStyles->getElementNames(); } - uno::Any ScVbaStyles::createCollectionObject(const uno::Any& aObject) { diff --git a/sc/source/ui/vba/vbavalidation.cxx b/sc/source/ui/vba/vbavalidation.cxx index edb3b9d72eac..b40de14bedd1 100644 --- a/sc/source/ui/vba/vbavalidation.cxx +++ b/sc/source/ui/vba/vbavalidation.cxx @@ -202,7 +202,6 @@ ScVbaValidation::setErrorMessage( const OUString& _errormessage ) throw (uno::Ru lcl_setValidationProps( m_xRange, xProps ); } - void SAL_CALL ScVbaValidation::Delete( ) throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx index 3f383c6da532..417a425c04a1 100644 --- a/sc/source/ui/vba/vbawindow.cxx +++ b/sc/source/ui/vba/vbawindow.cxx @@ -61,7 +61,6 @@ typedef ::cppu::WeakImplHelper3< container::XEnumerationAccess , com::sun::star::container::XNameAccess > SelectedSheets_BASE; - class SelectedSheetsEnum : public Enumeration_BASE { public: @@ -89,7 +88,6 @@ public: return uno::makeAny( uno::Reference< excel::XWorksheet > ( new ScVbaWorksheet( uno::Reference< XHelperInterface >(), m_xContext, *(m_it++), m_xModel ) ) ); } - }; class SelectedSheetsEnumAccess : public SelectedSheets_BASE @@ -185,7 +183,6 @@ public: return (it != namesToIndices.end()); } - }; ScVbaWindow::ScVbaWindow( @@ -500,7 +497,6 @@ ScVbaWindow::getDisplayGridlines() throw (uno::RuntimeException, std::exception) return bGrid; } - void SAL_CALL ScVbaWindow::setDisplayGridlines( sal_Bool _displaygridlines ) throw (uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbawindows.cxx b/sc/source/ui/vba/vbawindows.cxx index dfb12bfb9710..25928acfea89 100644 --- a/sc/source/ui/vba/vbawindows.cxx +++ b/sc/source/ui/vba/vbawindows.cxx @@ -34,7 +34,6 @@ typedef boost::unordered_map< OUString, sal_Int32, OUStringHash, ::std::equal_to< OUString > > NameIndexHash; - static uno::Reference< XHelperInterface > lcl_createWorkbookHIParent( const uno::Reference< frame::XModel >& xModel, const uno::Reference< uno::XComponentContext >& xContext, const uno::Any& aApplication ) { return new ScVbaWorkbook( uno::Reference< XHelperInterface >( aApplication, uno::UNO_QUERY_THROW ), xContext, xModel ); @@ -216,14 +215,12 @@ ScVbaWindows::getElementType() throw (uno::RuntimeException) return cppu::UnoType<excel::XWindows>::get(); } - void SAL_CALL ScVbaWindows::Arrange( ::sal_Int32 /*ArrangeStyle*/, const uno::Any& /*ActiveWorkbook*/, const uno::Any& /*SyncHorizontal*/, const uno::Any& /*SyncVertical*/ ) throw (uno::RuntimeException, std::exception) { //#TODO #FIXME see what can be done for an implementation here } - OUString ScVbaWindows::getServiceImplName() { diff --git a/sc/source/ui/vba/vbawindows.hxx b/sc/source/ui/vba/vbawindows.hxx index 00136d7f97f4..cef6f5699e4b 100644 --- a/sc/source/ui/vba/vbawindows.hxx +++ b/sc/source/ui/vba/vbawindows.hxx @@ -27,7 +27,6 @@ #include "excelvbahelper.hxx" #include <vbahelper/vbacollectionimpl.hxx> - typedef CollTestImplHelper< ov::excel::XWindows > ScVbaWindows_BASE; class ScVbaWindows : public ScVbaWindows_BASE @@ -40,7 +39,6 @@ public: virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - // XWindows virtual void SAL_CALL Arrange( ::sal_Int32 ArrangeStyle, const css::uno::Any& ActiveWorkbook, const css::uno::Any& SyncHorizontal, const css::uno::Any& SyncVertical ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // ScVbaCollectionBaseImpl diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx index d78bdde29f80..a72abd3642f3 100644 --- a/sc/source/ui/vba/vbaworkbook.cxx +++ b/sc/source/ui/vba/vbaworkbook.cxx @@ -64,7 +64,6 @@ void ScVbaWorkbook::initColorData( const uno::Sequence< sal_Int32 >& sColors ) *pDest = *pSource; } - void SAL_CALL ScVbaWorkbook::ResetColors( ) throw (::script::BasicErrorException, ::uno::RuntimeException, std::exception) { diff --git a/sc/source/ui/vba/vbaworkbooks.cxx b/sc/source/ui/vba/vbaworkbooks.cxx index 9c01a17d5cb1..cb052fbb7e92 100644 --- a/sc/source/ui/vba/vbaworkbooks.cxx +++ b/sc/source/ui/vba/vbaworkbooks.cxx @@ -121,7 +121,6 @@ ScVbaWorkbooks::createCollectionObject( const css::uno::Any& aSource ) return getWorkbook( mxContext, xDoc, mxParent ); } - uno::Any SAL_CALL ScVbaWorkbooks::Add( const uno::Any& Template ) throw (uno::RuntimeException, std::exception) { @@ -242,7 +241,6 @@ ScVbaWorkbooks::Open( const OUString& rFileName, const uno::Any& /*UpdateLinks*/ OUString sFormat; sal_Int16 nFormat = 0; // default indicator - if ( Format.hasValue() ) { Format >>= nFormat; // val of nFormat overwritten if extracted diff --git a/sc/source/ui/vba/vbaworkbooks.hxx b/sc/source/ui/vba/vbaworkbooks.hxx index 01c3e43bf7f3..c7240e580354 100644 --- a/sc/source/ui/vba/vbaworkbooks.hxx +++ b/sc/source/ui/vba/vbaworkbooks.hxx @@ -19,14 +19,12 @@ #ifndef INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOKS_HXX #define INCLUDED_SC_SOURCE_UI_VBA_VBAWORKBOOKS_HXX - #include <vbahelper/vbacollectionimpl.hxx> #include <ooo/vba/excel/XWorkbooks.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <vbahelper/vbadocumentsbase.hxx> #include "excelvbahelper.hxx" - typedef cppu::ImplInheritanceHelper1< VbaDocumentsBase, ov::excel::XWorkbooks > ScVbaWorkbooks_BASE; class ScVbaWorkbooks : public ScVbaWorkbooks_BASE diff --git a/sc/source/ui/vba/vbaworksheet.cxx b/sc/source/ui/vba/vbaworksheet.cxx index 4b5d2d4a62a1..ad5a4a3e1c9c 100644 --- a/sc/source/ui/vba/vbaworksheet.cxx +++ b/sc/source/ui/vba/vbaworksheet.cxx @@ -363,7 +363,6 @@ ScVbaWorksheet::getEnableSelection() throw (uno::RuntimeException, std::exceptio throw uno::RuntimeException("Sheet Name does not exist." ); } - void ScVbaWorksheet::setEnableSelection( sal_Int32 nSelection ) throw (uno::RuntimeException, std::exception) { @@ -598,7 +597,6 @@ ScVbaWorksheet::Copy( const uno::Any& Before, const uno::Any& After ) throw (uno xNewSheet->Activate(); } - void ScVbaWorksheet::Paste( const uno::Any& Destination, const uno::Any& /*Link*/ ) throw (uno::RuntimeException, std::exception) { @@ -656,7 +654,6 @@ ScVbaWorksheet::getPrevious() throw (uno::RuntimeException, std::exception) return getSheetAtOffset(-1); } - void ScVbaWorksheet::Protect( const uno::Any& Password, const uno::Any& /*DrawingObjects*/, const uno::Any& /*Contents*/, const uno::Any& /*Scenarios*/, const uno::Any& /*UserInterfaceOnly*/ ) throw (uno::RuntimeException, std::exception) { @@ -919,7 +916,6 @@ ScVbaWorksheet::Evaluate( const OUString& Name ) throw (uno::RuntimeException, s return uno::Any( Range( uno::Any( Name ), aVoid ) ); } - uno::Reference< beans::XIntrospectionAccess > SAL_CALL ScVbaWorksheet::getIntrospection( ) throw (uno::RuntimeException, std::exception) { @@ -1022,7 +1018,6 @@ ScVbaWorksheet::getControlShape( const OUString& sName ) return uno::Any(); } - OUString ScVbaWorksheet::getServiceImplName() { diff --git a/sc/source/ui/vba/vbaworksheets.cxx b/sc/source/ui/vba/vbaworksheets.cxx index 038b3f052bd4..38b944bbddd5 100644 --- a/sc/source/ui/vba/vbaworksheets.cxx +++ b/sc/source/ui/vba/vbaworksheets.cxx @@ -52,14 +52,12 @@ using namespace ::ooo::vba; using namespace ::com::sun::star; - typedef ::cppu::WeakImplHelper1< container::XEnumeration > SheetEnumeration_BASE; typedef ::cppu::WeakImplHelper3< container::XNameAccess, container::XIndexAccess, container::XEnumerationAccess > SheetCollectionHelper_BASE; // a map ( or hashmap ) wont do as we need also to preserve the order // (as added ) of the items typedef std::vector< uno::Reference< sheet::XSpreadsheet > > SheetMap; - // #FIXME #TODO the implementation of the Sheets collections sucks, // e.g. there is no support for tracking sheets added/removed from the collection @@ -391,7 +389,6 @@ ScVbaWorksheets::Select( const uno::Any& Replace ) throw (uno::RuntimeException, rMarkData.SelectTable( static_cast< SCTAB >( pSheet->getSheetID() ), true ); } - } void SAL_CALL diff --git a/sc/source/ui/vba/vbaworksheets.hxx b/sc/source/ui/vba/vbaworksheets.hxx index c3101cd98ec0..c3b2e20b7600 100644 --- a/sc/source/ui/vba/vbaworksheets.hxx +++ b/sc/source/ui/vba/vbaworksheets.hxx @@ -31,7 +31,6 @@ #include "address.hxx" - typedef CollTestImplHelper< ov::excel::XWorksheets > ScVbaWorksheets_BASE; class ScVbaWorksheets : public ScVbaWorksheets_BASE @@ -52,7 +51,6 @@ public: virtual css::uno::Type SAL_CALL getElementType() throw (css::uno::RuntimeException) SAL_OVERRIDE; virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw (css::uno::RuntimeException) SAL_OVERRIDE; - // XWorksheets virtual css::uno::Any SAL_CALL getVisible() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL setVisible( const css::uno::Any& _visible ) throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/sc/source/ui/view/cellmergeoption.cxx b/sc/source/ui/view/cellmergeoption.cxx index db8400bb05f8..42b5862e4248 100644 --- a/sc/source/ui/view/cellmergeoption.cxx +++ b/sc/source/ui/view/cellmergeoption.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "cellmergeoption.hxx" #include "address.hxx" diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx index ac091beea9c6..3a9f22d07c51 100644 --- a/sc/source/ui/view/cellsh.cxx +++ b/sc/source/ui/view/cellsh.cxx @@ -74,7 +74,6 @@ void ScCellShell::InitInterface_Impl() GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_CELLS)); } - ScCellShell::ScCellShell(ScViewData* pData) : ScFormatShell(pData), pImpl( new CellShell_Impl() ), @@ -1067,6 +1066,4 @@ void ScCellShell::GetState(SfxItemSet &rSet) } // while ( nWitch ) } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 5e59b6cac486..233a46f6fd60 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -100,7 +100,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::uno; - void ScCellShell::ExecuteEdit( SfxRequest& rReq ) { ScModule* pScMod = SC_MOD(); @@ -140,7 +139,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // insert / delete cells / rows / columns - case FID_INS_ROW: pTabViewShell->InsertCells(INS_INSROWS); rReq.Done(); @@ -313,10 +311,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // delete contents from cells - case SID_DELETE_CONTENTS: pTabViewShell->DeleteContents( IDF_CONTENTS ); rReq.Done(); @@ -408,10 +404,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // fill... - case FID_FILL_TO_BOTTOM: pTabViewShell->FillSimple( FILL_TO_BOTTOM ); rReq.Done(); @@ -642,7 +636,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } } - OUString aStartStr; // suggest default Startvalue only, when just 1 row or column @@ -654,7 +647,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pDoc->GetInputString( nStartCol, nStartRow, nStartTab, aStartStr); pDoc->GetValue( nStartCol, nStartRow, nStartTab, fStartVal ); - if(eFillDir==FILL_TO_BOTTOM && nStartRow < nEndRow ) { pDoc->GetInputString( nStartCol, nStartRow+1, nStartTab, aEndStr); @@ -1017,7 +1009,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) // disposal (Outlines) // SID_AUTO_OUTLINE, SID_OUTLINE_DELETEALL in Execute (in docsh.idl) - case SID_OUTLINE_HIDE: if ( GetViewData()->GetDocument()->GetDPAtCursor( GetViewData()->GetCurX(), GetViewData()->GetCurY(), GetViewData()->GetTabNo() ) ) @@ -1221,7 +1212,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - // Clipboard case SID_COPY: // for graphs in DrawShell @@ -1601,10 +1591,8 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pTabViewShell->CellContentChanged(); // => PasteFromSystem() ??? break; - // other - case FID_INS_ROWBRK: pTabViewShell->InsertPageBreak( false ); rReq.Done(); @@ -2024,7 +2012,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) pScMod->SetRefDialog( nId, false ); - } break; @@ -2062,7 +2049,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - case SID_TABOP: if (pReqArgs) { @@ -2433,8 +2419,6 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq ) } break; - - 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 55fa4be7083d..0375c96731ce 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -1042,7 +1042,6 @@ void ScCellShell::GetDBState( SfxItemSet& rSet ) } break; - //in case of Redlining and multiselection disable case SID_SORT_ASCENDING: case SID_SORT_DESCENDING: diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx index 9a5cd3f2dfee..32912761193e 100644 --- a/sc/source/ui/view/cellsh3.cxx +++ b/sc/source/ui/view/cellsh3.cxx @@ -514,7 +514,6 @@ void ScCellShell::Execute( SfxRequest& rReq ) } break; - case SID_SELECTALL: { pTabViewShell->SelectAll(); @@ -707,7 +706,6 @@ void ScCellShell::Execute( SfxRequest& rReq ) rReq.Done(); break; - case SID_CELL_FORMAT_RESET: { pTabViewShell->DeleteContents( IDF_HARDATTR | IDF_EDITATTR ); diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx index a2a30f84e48d..5c6640b64408 100644 --- a/sc/source/ui/view/cellsh4.cxx +++ b/sc/source/ui/view/cellsh4.cxx @@ -444,5 +444,4 @@ void ScCellShell::ExecutePage( SfxRequest& rReq ) rReq.Done(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 4356a354111d..3472140c0cb3 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -46,10 +46,8 @@ ScDBFunc::~ScDBFunc() { } - // auxiliary functions - void ScDBFunc::GotoDBArea( const OUString& rDBName ) { ScDocument* pDoc = GetViewData().GetDocument(); @@ -238,10 +236,8 @@ void ScDBFunc::NotifyCloseDbNameDlg( const ScDBCollection& rNewColl, const std:: } } - // main functions - // Sort void ScDBFunc::UISort( const ScSortParam& rSortParam, bool bRecord ) @@ -341,7 +337,6 @@ void ScDBFunc::ToggleAutoFilter() pDBData->SetByRow( true ); //! undo, retrieve beforehand ?? pDBData->GetQueryParam( aParam ); - SCCOL nCol; SCROW nRow = aParam.nRow1; SCTAB nTab = GetViewData().GetTabNo(); diff --git a/sc/source/ui/view/dbfunc2.cxx b/sc/source/ui/view/dbfunc2.cxx index 0e3012a4c712..9a9b32e57fe4 100644 --- a/sc/source/ui/view/dbfunc2.cxx +++ b/sc/source/ui/view/dbfunc2.cxx @@ -41,7 +41,4 @@ void ScDBFunc::UpdateCharts( bool bAllCharts ) ErrorMessage(STR_NOCHARTATCURSOR); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx index f60471e57491..09293c01589e 100644 --- a/sc/source/ui/view/dbfunc3.cxx +++ b/sc/source/ui/view/dbfunc3.cxx @@ -86,11 +86,8 @@ using ::std::vector; // STATIC DATA ----------------------------------------------------------- - - // Outliner - // Outline-Gruppierung erzeugen void ScDBFunc::MakeOutline( bool bColumns, bool bRecord ) @@ -359,10 +356,8 @@ void ScDBFunc::HideMarkedOutlines( bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } - // Teilergebnisse - void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, const ScSortParam* pForceNewSort ) { @@ -533,10 +528,8 @@ void ScDBFunc::DoSubTotals( const ScSubTotalParam& rParam, bool bRecord, } } - // Consolidate - void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, bool bRecord ) { ScDocShell* pDocShell = GetViewData().GetDocShell(); @@ -544,10 +537,8 @@ void ScDBFunc::Consolidate( const ScConsolidateParam& rParam, bool bRecord ) SetTabNo( rParam.nTab, true ); } - // Pivot - static OUString lcl_MakePivotTabName( const OUString& rPrefix, SCTAB nNumber ) { OUString aName = rPrefix + OUString::number( nNumber ); @@ -2068,10 +2059,8 @@ void ScDBFunc::ShowDataPilotSourceData( ScDPObject& rDPObj, const Sequence<sheet pMgr->LeaveListAction(); } - // DB-Operationen (Sortieren, Filtern, Teilergebnisse) wiederholen - void ScDBFunc::RepeatDB( bool bRecord ) { SCCOL nCurX = GetViewData().GetCurX(); diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx index b3523335dcb4..08ae2b8c6a88 100644 --- a/sc/source/ui/view/dbfunc4.cxx +++ b/sc/source/ui/view/dbfunc4.cxx @@ -69,7 +69,4 @@ sal_uInt16 ScDBFunc::DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, bo return nFound; } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawutil.cxx b/sc/source/ui/view/drawutil.cxx index 8bcdc8810fd2..668337aac0da 100644 --- a/sc/source/ui/view/drawutil.cxx +++ b/sc/source/ui/view/drawutil.cxx @@ -24,7 +24,6 @@ #include "global.hxx" #include "viewdata.hxx" - void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, OutputDevice* pDev, @@ -87,5 +86,4 @@ void ScDrawUtil::CalcScale( ScDocument* pDoc, SCTAB nTab, rScaleY.ReduceInaccurate( 25 ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie2.cxx b/sc/source/ui/view/drawvie2.cxx index 3d1b90c81d82..5c4396d5e8aa 100644 --- a/sc/source/ui/view/drawvie2.cxx +++ b/sc/source/ui/view/drawvie2.cxx @@ -21,7 +21,6 @@ // STATIC DATA ----------------------------------------------------------- - // UpdateBrowser in MarkListHasChanged gerufen void ScDrawView::UpdateBrowser() @@ -39,6 +38,4 @@ void ScDrawView::VCRemoveWin( Window* /* pWin */ ) // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index abbb48c92bd2..cfdc4f9f4087 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -217,5 +217,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 ab48a9ceec16..841d23863e17 100644 --- a/sc/source/ui/view/drawvie4.cxx +++ b/sc/source/ui/view/drawvie4.cxx @@ -164,7 +164,6 @@ void getRangeFromDataSource( uno::Reference< chart2::data::XDataSource > xDataSo } } - void getRangeFromErrorBar(const uno::Reference< chart2::XChartDocument > xChartDoc, std::vector<OUString>& rRangeRep) { uno::Reference <chart2::XDiagram > xDiagram = xChartDoc->getFirstDiagram(); @@ -553,5 +552,4 @@ void ScDrawView::SetMarkedOriginalSize() delete pUndoGroup; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 77d7941c63cf..7f4ef96f6ae9 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -566,7 +566,6 @@ bool ScDrawView::SdrBeginTextEdit( return bRet; } - SdrEndTextEditKind ScDrawView::SdrEndTextEdit( bool bDontDeleteReally ) { const SdrEndTextEditKind eRet = FmFormView::SdrEndTextEdit( bDontDeleteReally ); @@ -587,7 +586,6 @@ SdrEndTextEditKind ScDrawView::SdrEndTextEdit( bool bDontDeleteReally ) return eRet; } - void ScDrawView::ModelHasChanged() { SdrObject* pEditObj = GetTextEditObject(); diff --git a/sc/source/ui/view/editsh.cxx b/sc/source/ui/view/editsh.cxx index fed79b5a8d8a..d79de14e17d5 100644 --- a/sc/source/ui/view/editsh.cxx +++ b/sc/source/ui/view/editsh.cxx @@ -80,7 +80,6 @@ using namespace ::com::sun::star; - TYPEINIT1( ScEditShell, SfxShell ); SFX_IMPL_INTERFACE(ScEditShell, SfxShell, ScResId(SCSTR_EDITSHELL)) @@ -402,7 +401,6 @@ void ScEditShell::Execute( SfxRequest& rReq ) rReq.AppendItem( aStringItem ); rReq.Done(); - } if (pTopView) @@ -1031,10 +1029,8 @@ void ScEditShell::ExecuteAttr(SfxRequest& rReq) break; } - // anwenden - EditEngine* pEngine = pEditView->GetEditEngine(); bool bOld = pEngine->GetUpdateMode(); pEngine->SetUpdateMode(false); diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 900b21d9b345..f7780135fb93 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -72,7 +72,6 @@ #include "markdata.hxx" #include "markarr.hxx" - #define ScFormatShell #define TableFont #define FormatForSelection @@ -257,7 +256,6 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq ) return; } - SfxBindings& rBindings = pViewData->GetBindings(); const SfxItemSet* pArgs = rReq.GetArgs(); const sal_uInt16 nSlotId = rReq.GetSlot(); @@ -1251,7 +1249,6 @@ void ScFormatShell::ExecuteNumFormat( SfxRequest& rReq ) } } - void ScFormatShell::ExecuteAlignment( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -2162,12 +2159,10 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) SfxItemState eState; // const SfxPoolItem* pItem; - // eigene Kontrolle ueber RadioButton-Funktionalitaet: // Unterstreichung - eState = rAttrSet.GetItemState( ATTR_FONT_UNDERLINE, true ); if ( eState == SFX_ITEM_DONTCARE ) { @@ -2192,10 +2187,8 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) rSet.Put( SfxBoolItem( nId, true ) ); } - // horizontale Ausrichtung - const SvxHorJustifyItem* pHorJustify = NULL; const SvxVerJustifyItem* pVerJustify = NULL; SvxCellVerJustify eVerJustify = SVX_VER_JUSTIFY_STANDARD; @@ -2265,10 +2258,8 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) bJustifyStd = false; } - // vertikale Ausrichtung - nWhich = 0; aBoolItem.SetValue( true ); @@ -2328,7 +2319,6 @@ void ScFormatShell::GetTextAttrState( SfxItemSet& rSet ) } } - void ScFormatShell::GetBorderState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); @@ -2560,7 +2550,6 @@ void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) } } - void ScFormatShell::ExecuteTextDirection( SfxRequest& rReq ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 20d2558439a1..f5615b5cb185 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <memory> @@ -422,7 +421,6 @@ static bool lcl_GetHyperlinkCell( return bFound; } - // WB_DIALOGCONTROL noetig fuer UNO-Controls ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhichPos ) : Window( pParent, WB_CLIPCHILDREN | WB_DIALOGCONTROL ), @@ -1925,10 +1923,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta } } - // scenario selection - ScRange aScenRange; if ( rMEvt.IsLeft() && HasScenarioButton( aPos, aScenRange ) ) { @@ -1936,10 +1932,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta return; } - // Doppelklick angefangen ? - // StopMarking kann aus DrawMouseButtonDown gerufen werden if ( nMouseStatus != SC_GM_IGNORE && !bRefMode ) @@ -1953,10 +1947,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta nMouseStatus = SC_GM_TABDOWN; } - // Links in Edit-Zellen - bool bAlt = rMEvt.IsMod2(); if ( !bAlt && rMEvt.IsLeft() && GetEditUrl(rMEvt.GetPosPixel()) ) // Klick auf Link: Cursor nicht bewegen @@ -1966,10 +1958,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta return; } - // Gridwin - SelectionEngine - if ( rMEvt.IsLeft() ) { ScViewSelectionEngine* pSelEng = pViewData->GetView()->GetSelEngine(); @@ -2187,10 +2177,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) if (bRefMode) pScMod->EndReference(); - // Giesskannen-Modus (Gestalter) - if (pScMod->GetIsWaterCan()) { // Abfrage auf Undo schon oben @@ -2241,10 +2229,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) pView->ResetBrushDocument(); // invalidates pBrushDoc pointer } - // double click (only left button) - bool bDouble = ( rMEvt.GetClicks() == 2 && rMEvt.IsLeft() ); if ( bDouble && !bRefMode && nMouseStatus == SC_GM_DBLDOWN && !pScMod->IsRefDialogOpen() ) { @@ -2326,10 +2312,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) return; } - // Links in edit cells - bool bAlt = rMEvt.IsMod2(); if ( !bAlt && !bRefMode && !bDouble && nMouseStatus == SC_GM_URLDOWN ) { @@ -2411,10 +2395,8 @@ void ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) } } - // Gridwin - SelectionEngine - // SelMouseButtonDown is called only for left button, but SelMouseButtonUp would return // sal_True for any call, so IsLeft must be checked here, too. @@ -3747,7 +3729,6 @@ sal_Int8 ScGridWindow::AcceptDrop( const AcceptDropEvent& rEvt ) if ( pViewData->GetDocShell()->IsReadOnly() ) return DND_ACTION_NONE; - sal_Int8 nRet = DND_ACTION_NONE; if (rData.pCellTransfer) @@ -4013,7 +3994,6 @@ static sal_uLong lcl_GetDropLinkId( const uno::Reference<datatransfer::XTransfer return nFormatId; } - sal_Int8 ScGridWindow::ExecutePrivateDrop( const ExecuteDropEvent& rEvt ) { // hide drop marker @@ -4067,7 +4047,6 @@ sal_Int8 ScGridWindow::DropTransferObj( ScTransferObj* pTransObj, SCCOL nDestPos ScRange aDest( nDestPosX, nDestPosY, nThisTab, nDestPosX + nSizeX - 1, nDestPosY + nSizeY - 1, nThisTab ); - /* NOTE: AcceptPrivateDrop() already checked for filtered conditions during * dragging and adapted drawing of the selection frame. We check here * (again) because this may actually also be called from PasteSelection(), @@ -4443,7 +4422,6 @@ sal_Int8 ScGridWindow::ExecuteDrop( const ExecuteDropEvent& rEvt ) return rEvt.mnAction; } - SCsCOL nPosX; SCsROW nPosY; pViewData->GetPosFromPixel( aPos.X(), aPos.Y(), eWhich, nPosX, nPosY ); @@ -4754,7 +4732,6 @@ void ScGridWindow::GetFocus() if (pViewShell->HasAccessibilityObjects()) pViewShell->BroadcastAccessibility(ScAccGridWinFocusGotHint(eWhich, GetAccessible())); - if ( !SC_MOD()->IsFormulaMode() ) { pViewShell->UpdateInputHandler(); @@ -4779,7 +4756,6 @@ void ScGridWindow::LoseFocus() Window::LoseFocus(); } - bool ScGridWindow::HitRangeFinder( const Point& rMouse, RfCorner& rCorner, sal_uInt16* pIndex, SCsCOL* pAddX, SCsROW* pAddY) { @@ -5342,7 +5318,6 @@ bool ScGridWindow::GetEditUrl( const Point& rPos, } aLogicEdit.Bottom() = aLogicEdit.Top() + nTextHeight; - Point aLogicClick = PixelToLogic(rPos,aEditMode); if ( aLogicEdit.IsInside(aLogicClick) ) { @@ -5438,7 +5413,6 @@ bool ScGridWindow::HasScenarioButton( const Point& rPosPixel, ScRange& rScenRang ScRangeList aRanges; aMarks.FillRangeListWithMarks( &aRanges, false ); - size_t nRangeCount = aRanges.size(); for (size_t j=0; j< nRangeCount; ++j) { @@ -5766,7 +5740,6 @@ void ScGridWindow::UpdateCopySourceOverlay() Rectangle aRect( aClipStartScrPos, Size(nSizeXPix, nSizeYPix) ); - Color aHighlight = GetSettings().GetStyleSettings().GetHighlightColor(); Rectangle aLogic = PixelToLogic(aRect, aDrawMode); @@ -5794,10 +5767,8 @@ void ScGridWindow::UpdateCursorOverlay() std::vector<Rectangle> aPixelRects; - // determine the cursor rectangles in pixels (moved from ScGridWindow::DrawCursor) - SCTAB nTab = pViewData->GetTabNo(); SCCOL nX = pViewData->GetCurX(); SCROW nY = pViewData->GetCurY(); @@ -5971,10 +5942,8 @@ void ScGridWindow::UpdateAutoFillOverlay() DeleteAutoFillOverlay(); - // get the AutoFill handle rectangle in pixels - if ( bAutoMarkVisible && aAutoMarkPos.Tab() == pViewData->GetTabNo() && !pViewData->HasEditView(eWhich) && pViewData->IsActive() ) { @@ -6048,10 +6017,8 @@ void ScGridWindow::UpdateDragRectOverlay() DeleteDragRectOverlay(); - // get the rectangles in pixels (moved from DrawDragRect) - if ( bDragRect || bPagebreakDrawn ) { std::vector<Rectangle> aPixelRects; @@ -6224,10 +6191,8 @@ void ScGridWindow::UpdateShrinkOverlay() DeleteShrinkOverlay(); - // get the rectangle in pixels - Rectangle aPixRect; ScRange aRange; SCTAB nTab = pViewData->GetTabNo(); diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 9c79f0c7372e..6578bd62963d 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -239,7 +239,6 @@ void ScGridWindow::DoPushPivotButton( SCCOL nCol, SCROW nRow, const MouseEvent& // Data Pilot interaction - void ScGridWindow::DPTestMouse( const MouseEvent& rMEvt, bool bMove ) { OSL_ENSURE(pDragDPObj, "pDragDPObj missing"); @@ -1052,5 +1051,4 @@ void ScGridWindow::PagebreakMove( const MouseEvent& rMEvt, bool bUp ) pViewData->GetView()->ResetTimer(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 22d9c435527c..e9ac6ca2054a 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <editeng/eeitem.hxx> @@ -44,7 +43,6 @@ #include "unitconv.hxx" #include <svx/svdpage.hxx> - bool ScGridWindow::DrawMouseButtonDown(const MouseEvent& rMEvt) { bool bRet = false; diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index d31da8a24148..24a6fb54ec07 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -375,10 +375,8 @@ void ScGridWindow::Paint( const Rectangle& rRect ) bIsInPaint = false; } - // Draw ---------------------------------------------------------------- - void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMode eMode ) { ScModule* pScMod = SC_MOD(); @@ -859,11 +857,9 @@ void ScGridWindow::Draw( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, ScUpdateMod if ( pNoteMarker ) pNoteMarker->Draw(); // ueber den Cursor, im Drawing-MapMode - // Wenn waehrend des Paint etwas invertiert wurde (Selektion geaendert aus Basic-Macro), // ist das jetzt durcheinandergekommen und es muss neu gemalt werden - OSL_ENSURE(nPaintCount, "nPaintCount falsch"); --nPaintCount; if (!nPaintCount) @@ -1127,7 +1123,6 @@ void ScGridWindow::DrawButtons( SCCOL nX1, SCCOL nX2, ScTableInfo& rTabInfo, Out nRow = pThisRowInfo->nRowNo; - for (nCol=nX1; nCol<=nX2; nCol++) { CellInfo* pInfo = &pThisRowInfo->pCellInfo[nCol+1]; diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index a85a5497549d..bed697b2db5b 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -54,7 +54,6 @@ #include "global.hxx" #include "globstr.hrc" - bool ScGridWindow::ShowNoteMarker( SCsCOL nPosX, SCsROW nPosY, bool bKeyboard ) { bool bDone = false; @@ -383,7 +382,6 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) aHelpText = aClickHlinkStr + aHelpText; } - ScDocument* pDoc = pViewData->GetDocument(); SCsCOL nPosX; SCsROW nPosY; diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 44643d60062b..40997f2da53e 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -413,11 +413,9 @@ void ScHeaderControl::Paint( const Rectangle& rRect ) } } - // loop through entries several times to avoid changing the line color too often // and to allow merging of lines - ScGridMerger aGrid( this, 1, 1 ); // start at SC_HDRPAINT_BOTTOM instead of 0 - selection doesn't get different @@ -934,10 +932,8 @@ void ScHeaderControl::RequestHelp( const HelpEvent& rHEvt ) Window::RequestHelp(rHEvt); } - // Dummys fuer virtuelle Methoden - SCCOLROW ScHeaderControl::GetHiddenCount( SCCOLROW nEntryNo ) const { SCCOLROW nHidden = 0; diff --git a/sc/source/ui/view/hintwin.cxx b/sc/source/ui/view/hintwin.cxx index 9c670b83d648..e07cd4aa0b4d 100644 --- a/sc/source/ui/view/hintwin.cxx +++ b/sc/source/ui/view/hintwin.cxx @@ -64,12 +64,10 @@ ScHintWindow::ScHintWindow( Window* pParent, const OUString& rTit, const OUStrin SetOutputSizePixel( aWinSize ); } - ScHintWindow::~ScHintWindow() { } - void ScHintWindow::Paint( const Rectangle& /* rRect */ ) { SetFont( aHeadFont ); diff --git a/sc/source/ui/view/imapwrap.cxx b/sc/source/ui/view/imapwrap.cxx index 959ada7a33ba..9ef97dca4298 100644 --- a/sc/source/ui/view/imapwrap.cxx +++ b/sc/source/ui/view/imapwrap.cxx @@ -57,5 +57,4 @@ const ImageMap& ScIMapDlgGetMap( SvxIMapDlg* pDlg ) return pDlg->GetImageMap(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/invmerge.cxx b/sc/source/ui/view/invmerge.cxx index 01f960010ac2..8ac68bffeec5 100644 --- a/sc/source/ui/view/invmerge.cxx +++ b/sc/source/ui/view/invmerge.cxx @@ -44,7 +44,6 @@ void ScInvertMerger::Flush() // also join vertically if there are non-adjacent columns involved - size_t nComparePos = 0; while ( nComparePos < pRects->size() ) { @@ -161,5 +160,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 faec9a910545..f7171048f552 100644 --- a/sc/source/ui/view/notemark.cxx +++ b/sc/source/ui/view/notemark.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svdoutl.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> @@ -187,5 +186,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 be76dde7a1b1..165e488d8cf3 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -900,7 +900,6 @@ void ScOutlineWindow::LoseFocus() Window::LoseFocus(); } - // mouse ---------------------------------------------------------------------- void ScOutlineWindow::StartMouseTracking( size_t nLevel, size_t nEntry ) @@ -969,7 +968,6 @@ void ScOutlineWindow::MouseButtonDown( const MouseEvent& rMEvt ) } } - // keyboard ------------------------------------------------------------------- void ScOutlineWindow::KeyInput( const KeyEvent& rKEvt ) @@ -1019,5 +1017,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 17e98b13a90b..c96ee1b4528d 100644 --- a/sc/source/ui/view/olkact.cxx +++ b/sc/source/ui/view/olkact.cxx @@ -45,6 +45,4 @@ void DeActivateOlk( ScViewData* /* pViewData */ ) // GetSbxForm gibt's nicht mehr, muss auch nichts mehr angemeldet werden } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index 5fd547f15a19..a3f0a7c0abb3 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -84,7 +84,6 @@ static const ColorData nAuthorColor[ SC_AUTHORCOLORCOUNT ] = { COL_GREEN, COL_RED, COL_BLUE, COL_BROWN, COL_MAGENTA, COL_CYAN }; - // Helper class for color assignment to avoid repeated lookups for the same user ScActionColorChanger::ScActionColorChanger( const ScChangeTrack& rTrack ) : @@ -141,7 +140,6 @@ void ScActionColorChanger::Update( const ScChangeAction& rAction ) } } - ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType, ScTableInfo& rTabInfo, ScDocument* pNewDoc, SCTAB nNewTab, long nNewScrX, long nNewScrY, @@ -700,7 +698,6 @@ static const SvxBrushItem* lcl_FindBackground( ScDocument* pDoc, SCCOL nCol, SCR return pBackground; } - static bool lcl_EqualBack( const RowInfo& rFirst, const RowInfo& rOther, SCCOL nX1, SCCOL nX2, bool bShowProt, bool bPagebreakMode ) { @@ -1249,7 +1246,6 @@ void ScOutputData::DrawClear() } } - // Lines long lclGetSnappedX( OutputDevice& rDev, long nPosX, bool bSnapPixel ) @@ -1313,7 +1309,6 @@ void ScOutputData::DrawFrame() } long nLayoutSign = bLayoutRTL ? -1 : 1; - // *** set column and row sizes of the frame border array *** svx::frame::Array& rArray = mrTabInfo.maArray; @@ -1389,7 +1384,6 @@ void ScOutputData::DrawFrame() mpDev->SetDrawMode(nOldDrawMode); } - // Line below the cell static const ::editeng::SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, @@ -1445,7 +1439,6 @@ static const ::editeng::SvxBorderLine* lcl_FindHorLine( ScDocument* pDoc, return pNextTop; } - static long lcl_getRotate( ScDocument* pDoc, SCTAB nTab, SCCOL nX, SCROW nY ) { long nRotate = 0; diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 9381ffeee91e..1493e34c341b 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -82,7 +82,6 @@ const sal_uInt16 SC_SHRINKAGAIN_MAX = 7; // STATIC DATA ----------------------------------------------------------- - class ScDrawStringsVars { ScOutputData* pOutput; // Verbindung @@ -392,11 +391,9 @@ void ScDrawStringsVars::SetPattern( aMetric = pFmtDevice->GetFontMetric(); - // Wenn auf dem Drucker das Leading 0 ist, gibt es Probleme // -> Metric vom Bildschirm nehmen (wie EditEngine!) - if ( pFmtDevice->GetOutDevType() == OUTDEV_PRINTER && aMetric.GetIntLeading() == 0 ) { OutputDevice* pDefaultDev = Application::GetDefaultDevice(); @@ -822,10 +819,8 @@ double ScOutputData::GetStretch() } } - // output strings - static void lcl_DoHyperlinkResult( OutputDevice* pDev, const Rectangle& rRect, ScRefCellValue& rCell ) { vcl::PDFExtOutDevData* pPDFData = PTR_CAST( vcl::PDFExtOutDevData, pDev->GetExtOutDevData() ); @@ -1236,7 +1231,6 @@ void ScOutputData::GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY // construct the rectangles using logical left/right values (justify is called at the end) - // rAlignRect is the single cell or merged area, used for alignment. rParam.maAlignRect.Left() = nCellPosX; @@ -1494,10 +1488,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bool bDoCell = false; bool bNeedEdit = false; - // Part of a merged cell? - bool bOverlapped = (pInfo->bHOverlapped || pInfo->bVOverlapped); if ( bOverlapped ) { @@ -1516,10 +1508,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bMergeEmpty = true; } - // Rest of a long text further to the left? - if ( bEmpty && !bMergeEmpty && nX < nX1 && !bOverlapped ) { SCCOL nTempX=nX1; @@ -1535,10 +1525,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) } } - // Rest of a long text further to the right? - if ( bEmpty && !bMergeEmpty && nX == nX2 && !bOverlapped ) { // don't have to look further than nLastContentCol @@ -1556,17 +1544,13 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) } } - // normal visible cell - if (!bEmpty) bDoCell = true; - // don't output the cell that's being edited - if ( bDoCell && bEditMode && nCellX == nEditCol && nCellY == nEditRow ) bDoCell = false; @@ -1579,10 +1563,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bDoCell = false; } - // output the cell text - ScRefCellValue aCell; if (bDoCell) { @@ -1878,10 +1860,8 @@ void ScOutputData::DrawStrings( bool bPixelToLogic ) bVClip = true; } - // horizontalen Platz testen - bool bRightAdjusted = false; // to correct text width calculation later bool bNeedEditEngine = false; if ( !bNeedEditEngine && !bOutside ) @@ -2227,7 +2207,6 @@ static long lcl_GetEditSize( EditEngine& rEngine, bool bWidth, bool bSwap, long return rEngine.GetTextHeight(); } - void ScOutputData::ShrinkEditEngine( EditEngine& rEngine, const Rectangle& rAlignRect, long nLeftM, long nTopM, long nRightM, long nBottomM, bool bWidth, sal_uInt16 nOrient, long nAttrRotate, bool bPixelToLogic, @@ -2787,10 +2766,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.mbBreak) { @@ -2822,10 +2799,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - // default alignment for asian vertical mode is top-right if ( rParam.mbAsianVertical && rParam.meVerJust == SVX_VER_JUSTIFY_STANDARD ) rParam.meVerJust = SVX_VER_JUSTIFY_TOP; @@ -2847,10 +2822,8 @@ void ScOutputData::DrawEditStandard(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3290,10 +3263,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.mbBreak) { @@ -3315,10 +3286,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3336,10 +3305,8 @@ void ScOutputData::DrawEditBottomTop(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3556,10 +3523,8 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); if (rParam.hasLineBreak()) { @@ -3581,10 +3546,8 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3602,10 +3565,8 @@ void ScOutputData::DrawEditTopBottom(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -3829,10 +3790,8 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); // call GetOutputArea with nNeeded=0, to get only the cell width @@ -3862,10 +3821,8 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - rParam.setPatternToEngine(mbUseStyleColor); rParam.setAlignmentToEngine(); @@ -3883,10 +3840,8 @@ void ScOutputData::DrawEditStacked(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -4191,10 +4146,8 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) OutputAreaParam aAreaParam; - // Initial page size - large for normal text, cell size for automatic line breaks - Size aPaperSize = Size( 1000000, 1000000 ); // call GetOutputArea with nNeeded=0, to get only the cell width @@ -4224,10 +4177,8 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) else rParam.mpEngine->SetPaperSize(aPaperSize); - // Fill the EditEngine (cell attributes and text) - // default alignment for asian vertical mode is top-right if ( rParam.meVerJust == SVX_VER_JUSTIFY_STANDARD ) rParam.meVerJust = SVX_VER_JUSTIFY_TOP; @@ -4249,10 +4200,8 @@ void ScOutputData::DrawEditAsianVertical(DrawEditParam& rParam) rParam.mpEngine->SetUpdateMode( true ); // after SetText, before CalcTextWidth/GetTextHeight - // Get final output area using the calculated width - long nEngineWidth, nEngineHeight; rParam.getEngineSize(rParam.mpEngine, nEngineWidth, nEngineHeight); @@ -4668,7 +4617,6 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) if (pRowInfo[nRotY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nRotY].nRotMaxCol > nRotMax) nRotMax = pRowInfo[nRotY].nRotMaxCol; - ScModule* pScMod = SC_MOD(); sal_Int32 nConfBackColor = pScMod->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor; bool bCellContrast = mbUseStyleColor && diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx index f949c9dd90c1..4cdcd5017ed9 100644 --- a/sc/source/ui/view/output3.cxx +++ b/sc/source/ui/view/output3.cxx @@ -247,5 +247,4 @@ void ScOutputData::DrawingSingle(const sal_uInt16 nLayer) DrawSelectiveObjects( 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 404d4dc3a1c1..556cd2f42935 100644 --- a/sc/source/ui/view/pfuncache.cxx +++ b/sc/source/ui/view/pfuncache.cxx @@ -189,5 +189,4 @@ long ScPrintFuncCache::GetDisplayStart( SCTAB nTab ) const return nDisplayStart; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/pgbrksh.cxx b/sc/source/ui/view/pgbrksh.cxx index d98f8e9ba24c..8f2e7da70792 100644 --- a/sc/source/ui/view/pgbrksh.cxx +++ b/sc/source/ui/view/pgbrksh.cxx @@ -58,10 +58,8 @@ ScPageBreakShell::ScPageBreakShell( ScTabViewShell* pViewSh ) : SetName(OUString("PageBreak")); } - ScPageBreakShell::~ScPageBreakShell() { } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index cc9f8eb2b00e..a642991cbabd 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -20,7 +20,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <svtools/colorcfg.hxx> #include <svx/fmview.hxx> #include <editeng/sizeitem.hxx> @@ -84,7 +83,6 @@ static long lcl_GetDisplayStart( SCTAB nTab, ScDocument* pDoc, std::vector<long> return nDisplayStart; } - ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pViewSh ) : Window( pParent ), nPageNo( 0 ), @@ -143,7 +141,6 @@ ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pView nRight[i] = 0; // initialized with actual positions when markers are drawn } - ScPreview::~ScPreview() { delete pDrawView; @@ -184,7 +181,6 @@ void ScPreview::UpdateDrawView() // nTab must be right } } - void ScPreview::TestLastPage() { if (nPageNo >= nTotalPages) @@ -219,7 +215,6 @@ void ScPreview::TestLastPage() } } - void ScPreview::CalcPages() { WaitObject aWait( this ); @@ -298,7 +293,6 @@ void ScPreview::CalcPages() DoInvalidate(); } - void ScPreview::RecalcPages() // only nPageNo is changed { if (!bValid) @@ -341,7 +335,6 @@ void ScPreview::RecalcPages() // only nPageNo is changed DoInvalidate(); } - void ScPreview::DoPrint( ScPreviewLocationData* pFillLocation ) { if (!bValid) @@ -653,7 +646,6 @@ void ScPreview::Command( const CommandEvent& rCEvt ) Window::Command( rCEvt ); } - void ScPreview::KeyInput( const KeyEvent& rKEvt ) { // The + and - keys can't be configured as accelerator entries, so they must be handled directly @@ -682,7 +674,6 @@ void ScPreview::KeyInput( const KeyEvent& rKEvt ) Window::KeyInput(rKEvt); } - const ScPreviewLocationData& ScPreview::GetLocationData() { if ( !pLocationData ) @@ -699,7 +690,6 @@ const ScPreviewLocationData& ScPreview::GetLocationData() return *pLocationData; } - void ScPreview::DataChanged(bool bNewTime) { if (bNewTime) @@ -713,7 +703,6 @@ void ScPreview::DataChanged(bool bNewTime) Invalidate(); } - OUString ScPreview::GetPosString() { if (!bValid) @@ -731,7 +720,6 @@ OUString ScPreview::GetPosString() return aString; } - void ScPreview::SetZoom(sal_uInt16 nNewZoom) { if (nNewZoom < 20) @@ -760,7 +748,6 @@ void ScPreview::SetZoom(sal_uInt16 nNewZoom) } } - void ScPreview::SetPageNo( long nPage ) { nPageNo = nPage; @@ -770,7 +757,6 @@ void ScPreview::SetPageNo( long nPage ) Invalidate(); } - long ScPreview::GetFirstPage(SCTAB nTabP) { SCTAB nDocTabCount = pDocShell->GetDocument().GetTableCount(); @@ -797,7 +783,6 @@ long ScPreview::GetFirstPage(SCTAB nTabP) return nPage; } - static Size lcl_GetDocPageSize( ScDocument* pDoc, SCTAB nTab ) { OUString aName = pDoc->GetPageStyle( nTab ); @@ -815,7 +800,6 @@ static Size lcl_GetDocPageSize( ScDocument* pDoc, SCTAB nTab ) } } - sal_uInt16 ScPreview::GetOptimalZoom(bool bWidthOnly) { double nWinScaleX = ScGlobal::nScreenPPTX / pDocShell->GetOutputFactor(); @@ -850,7 +834,6 @@ sal_uInt16 ScPreview::GetOptimalZoom(bool bWidthOnly) return nZoom; } - void ScPreview::SetXOffset( long nX ) { if ( aOffset.X() == nX ) @@ -877,7 +860,6 @@ void ScPreview::SetXOffset( long nX ) Paint(Rectangle()); } - void ScPreview::SetYOffset( long nY ) { if ( aOffset.Y() == nY ) @@ -904,7 +886,6 @@ void ScPreview::SetYOffset( long nY ) Paint(Rectangle()); } - void ScPreview::DoInvalidate() { // If the whole GetState of the shell is called @@ -1076,7 +1057,6 @@ void ScPreview::MouseButtonUp( const MouseEvent& rMEvt ) { SetPointer( Pointer( POINTER_ARROW ) ); - ScDocument& rDoc = pDocShell->GetDocument(); OUString aOldName = rDoc.GetPageStyle( nTab ); bool bUndo = rDoc.IsUndoEnabled(); diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 08ced7a6c71d..7da573bbbe1f 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <vcl/outdev.hxx> #include "prevloc.hxx" @@ -278,7 +277,6 @@ static ScPreviewLocationEntry* lcl_GetEntryByAddress( const boost::ptr_list<ScPr return NULL; } - Rectangle ScPreviewLocationData::GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const { const double nScaleX = HMM_PER_TWIPS; @@ -535,10 +533,8 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev } } - // get column info - SCCOL nColCount = 0; SCCOL nCol; if ( bHasHeaderCol ) @@ -605,10 +601,8 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev else rInfo.SetColInfo( 0, NULL ); - // get row info - SCROW nRowCount = 0; if ( bHasHeaderRow ) ++nRowCount; @@ -674,10 +668,8 @@ void ScPreviewLocationData::GetTableInfo( const Rectangle& rVisiblePixel, ScPrev else rInfo.SetRowInfo( 0, NULL ); - // limit to visible area - rInfo.SetTab( nTab ); rInfo.LimitToArea( rVisiblePixel ); } diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index a1ad80126ae1..691d2b0b17a6 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -267,7 +267,6 @@ void ScPreviewShell::UpdateNeededScrollBars( bool bFromZoom ) long aHeightOffSet = pDevice ? pDevice->PixelToLogic( Size( nBarW, nBarH ), pPreview->GetMapMode() ).Height() : 0; long aWidthOffSet = aHeightOffSet; - if (!GetPageSize( aPageSize )) return; @@ -1205,5 +1204,4 @@ ScDocument& ScPreviewShell::GetDocument() return pDocShell->GetDocument(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/prevwsh2.cxx b/sc/source/ui/view/prevwsh2.cxx index f33443f49ac0..136c797939b2 100644 --- a/sc/source/ui/view/prevwsh2.cxx +++ b/sc/source/ui/view/prevwsh2.cxx @@ -70,6 +70,4 @@ void ScPreviewShell::Notify( SfxBroadcaster&, const SfxHint& rHint ) pPreview->DataChanged(true); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 9362c0838244..129486f07c0b 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -312,7 +312,6 @@ void ScPrintFunc::GetPrintState( ScPrintState& rState ) rState.nDocPages = nDocPages; } - bool ScPrintFunc::GetLastSourceRange( ScRange& rRange ) const { rRange = aLastSourceRange; @@ -391,7 +390,6 @@ static void lcl_HidePrint( ScTableInfo& rTabInfo, SCCOL nX1, SCCOL nX2 ) } } - // output to Device (static) // // us used for: @@ -592,10 +590,8 @@ void ScPrintFunc::DrawToDev( ScDocument* pDoc, OutputDevice* pDev, double /* nPr aOutputData.PostPrintDrawingLayer(aMMOffset); // #i74768# } - // Printing - static void lcl_FillHFParam( ScPrintHFParam& rParam, const SfxItemSet* pHFSet ) { // nDistance must be initialized differently before @@ -854,7 +850,6 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) } lcl_FillHFParam( aFtr, pFooterSet ); - // Compile Table-/Area-Params from single Items // TabPage "Table" @@ -934,10 +929,8 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) aTableParam.bForceBreaks = pOptions && pOptions->GetForceBreaks(); - // TabPage "Parts": - //! walk throuch all PrintAreas of the table !!! const ScRange* pPrintArea = pDoc->GetPrintRange( nPrintTab, 0 ); const ScRange* pRepeatCol = pDoc->GetRepeatColRange( nPrintTab ); @@ -1020,10 +1013,8 @@ void ScPrintFunc::InitParam( const ScPrintOptions* pOptions ) nRepeatStartRow = nRepeatEndRow = SCROW_REPEAT_NONE; } - // Split pages - if (!bState) { nTabPages = CountPages(); // also calculates zoom @@ -1943,7 +1934,6 @@ long ScPrintFunc::PrintNotes( long nPageNo, long nNoteStart, bool bDoPrint, ScPr (long)(aPageSize.Height() * nScaleY * 100 / nZoom)))); } - // adjust aPageRect for left/right page Rectangle aTempRect = Rectangle( Point(), aPageSize ); @@ -2013,7 +2003,6 @@ void ScPrintFunc::PrintPage( long nPageNo, SCCOL nX1, SCROW nY1, SCCOL nX2, SCRO (long)(aPageSize.Height() * nScaleY * 100 / nZoom)))); } - // adjust aPageRect for left/right page Rectangle aTempRect = Rectangle( Point(), aPageSize ); @@ -2373,11 +2362,9 @@ void ScPrintFunc::SetExclusivelyDrawOleAndDrawObjects() aTableParam.bNullVals = false; } - // UpdatePages is only called from outside to set the breaks correctly for viewing // - always without UserArea - bool ScPrintFunc::UpdatePages() { if (!pParamSet) @@ -2581,10 +2568,8 @@ void ScPrintFunc::ApplyPrintSettings() // Configure Printer to Printing - Size aEnumSize = aPageSize; - pPrinter->SetOrientation( bLandscape ? ORIENTATION_LANDSCAPE : ORIENTATION_PORTRAIT ); if ( bLandscape ) { @@ -2612,7 +2597,6 @@ void ScPrintFunc::ApplyPrintSettings() } } - // rPageRanges = range for all tables // nStartPage = rPageRanges starts at nStartPage // nDisplayStart = continuous number for displaying the page number @@ -3011,11 +2995,9 @@ void ScPrintFunc::CalcPages() // calculates aPageRect and pages fr maPageRows.resize(nRealCnt+1, ScPageRowEntry()); } - // Page alignment/splitting after breaks in Col/RowFlags // Of several breaks in a hidden area, only one counts. - nPagesX = 0; nPagesY = 0; nTotalY = 0; diff --git a/sc/source/ui/view/reffact.cxx b/sc/source/ui/view/reffact.cxx index 3d1481cacf5c..6d2bca2183f3 100644 --- a/sc/source/ui/view/reffact.cxx +++ b/sc/source/ui/view/reffact.cxx @@ -123,10 +123,8 @@ IMPL_CHILD_CTOR( ScPrintAreasDlgWrapper, SID_OPENDLG_EDIT_PRINTAREA ) IMPL_CHILD_CTOR( ScFormulaDlgWrapper, SID_OPENDLG_FUNCTION ) - // ScSimpleRefDlgWrapper - static bool bScSimpleRefFlag; static long nScSimpleRefHeight; static long nScSimpleRefWidth; @@ -182,7 +180,6 @@ void ScSimpleRefDlgWrapper::SetDefaultPosSize(Point aPos, Size aSize, bool bSet) } } - void ScSimpleRefDlgWrapper::SetAutoReOpen(bool bFlag) { bAutoReOpen=bFlag; @@ -229,10 +226,8 @@ void ScSimpleRefDlgWrapper::StartRefInput() } } - // ScAcceptChgDlgWrapper //FIXME: should be moved into ViewShell - ScAcceptChgDlgWrapper::ScAcceptChgDlgWrapper( Window* pParentP, sal_uInt16 nId, SfxBindings* pBindings, @@ -265,13 +260,10 @@ void ScAcceptChgDlgWrapper::ReInitDlg() } } - // ScHighlightChgDlgWrapper - IMPL_CHILD_CTOR( ScHighlightChgDlgWrapper, FID_CHG_SHOW ) - namespace { ScTabViewShell * lcl_GetTabViewShell( SfxBindings *pBindings ) diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx index 602f9fbd26ea..0bd7d90c9561 100644 --- a/sc/source/ui/view/spelleng.cxx +++ b/sc/source/ui/view/spelleng.cxx @@ -23,7 +23,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <editeng/langitem.hxx> #include <editeng/editobj.hxx> #include <editeng/editview.hxx> diff --git a/sc/source/ui/view/tabsplit.cxx b/sc/source/ui/view/tabsplit.cxx index 67fabedf2a4f..80419ee58acd 100644 --- a/sc/source/ui/view/tabsplit.cxx +++ b/sc/source/ui/view/tabsplit.cxx @@ -31,7 +31,6 @@ ScTabSplitter::ScTabSplitter( Window* pParent, WinBits nWinStyle, ScViewData* pD EnableRTL( false ); } - ScTabSplitter::~ScTabSplitter() { } @@ -72,7 +71,6 @@ void ScTabSplitter::Splitting( Point& rSplitPos ) rSplitPos.Y() = aNew.Y(); } - void ScTabSplitter::SetFixed(bool bSet) { bFixed = bSet; diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 88d623b95570..aafd1144d333 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -141,7 +141,6 @@ void ScCornerButton::DataChanged( const DataChangedEvent& rDCEvt ) Invalidate(); } - void ScCornerButton::Resize() { Invalidate(); @@ -235,7 +234,6 @@ ScTabView::ScTabView( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pView Init(); } - void ScTabView::InitScrollBar( ScrollBar& rScrollBar, long nMaxVal ) { rScrollBar.SetRange( Range( 0, nMaxVal ) ); @@ -540,10 +538,8 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) else nBarX = nBarY = 0; - // Splitter auswerten - long nLeftSize = nSizeX; long nRightSize = 0; long nTopSize = 0; @@ -654,7 +650,6 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) pRowBar[SC_SPLIT_BOTTOM]->Hide(); } - // Grid-Windows if (bInner) @@ -677,10 +672,8 @@ void ScTabView::DoResize( const Point& rOffset, const Size& rSize, bool bInner ) Point(nSplitPosX,nPosY), Size(nRightSize,nTopSize), nTotalWidth, bLayoutRTL ); } - // Scrollbars updaten - if (!bInUpdateHeader) { UpdateScrollBars(); // Scrollbars nicht beim Scrollen neu setzen @@ -858,7 +851,6 @@ double ScTabView::GetRelTabBarWidth() const return 0.0; } - ScGridWindow* ScTabView::GetActiveWin() { ScSplitPos ePos = aViewData.GetActivePart(); @@ -873,7 +865,6 @@ void ScTabView::SetActivePointer( const Pointer& rPointer ) pGridWin[i]->SetPointer( rPointer ); } - void ScTabView::ActiveGrabFocus() { ScSplitPos ePos = aViewData.GetActivePart(); @@ -881,7 +872,6 @@ void ScTabView::ActiveGrabFocus() pGridWin[ePos]->GrabFocus(); } - ScSplitPos ScTabView::FindWindow( Window* pWindow ) const { ScSplitPos eVal = SC_SPLIT_BOTTOMLEFT; // Default @@ -1417,10 +1407,8 @@ void ScTabView::UpdateShow() if ( aViewData.GetDocShell()->IsPreview() ) bHScrollMode = bVScrollMode = bTabMode = bHeader = bOutlMode = bHOutline = bVOutline = false; - // Windows anlegen - if (bShowH && !pGridWin[SC_SPLIT_BOTTOMRIGHT]) { pGridWin[SC_SPLIT_BOTTOMRIGHT] = new ScGridWindow( pFrameWin, &aViewData, SC_SPLIT_BOTTOMRIGHT ); @@ -1454,10 +1442,8 @@ void ScTabView::UpdateShow() pRowBar[SC_SPLIT_TOP] = new ScRowBar( pFrameWin, &aViewData, SC_SPLIT_TOP, &aHdrFunc, pHdrSelEng ); - // Windows anzeigen - ShowHide( &aHScrollLeft, bHScrollMode ); ShowHide( &aHScrollRight, bShowH && bHScrollMode ); ShowHide( &aVScrollBottom, bVScrollMode ); @@ -1483,7 +1469,6 @@ void ScTabView::UpdateShow() ShowHide( pColBar[SC_SPLIT_RIGHT], bShowH && bHeader ); ShowHide( pRowBar[SC_SPLIT_TOP], bShowV && bHeader ); - //! neue Gridwindows eintragen } diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx index 54b0ec871946..93452fd1d844 100644 --- a/sc/source/ui/view/tabview2.cxx +++ b/sc/source/ui/view/tabview2.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <editeng/eeitem.hxx> #include <vcl/timer.hxx> diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index 9589c102fa73..7053037e60a3 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -21,7 +21,6 @@ #include "scitems.hxx" #include <editeng/eeitem.hxx> - #include <editeng/brushitem.hxx> #include <editeng/editview.hxx> #include <svx/fmshell.hxx> @@ -94,10 +93,8 @@ ScRange lcl_getSubRangeByIndex( const ScRange& rRange, sal_Int32 nIndex ) using namespace com::sun::star; - // --- Public-Funktionen - void ScTabView::ClickCursor( SCCOL nPosX, SCROW nPosY, bool bControl ) { ScDocument* pDoc = aViewData.GetDocument(); @@ -675,7 +672,6 @@ void ScTabView::RemoveHintWindow() mpInputHintWindow.reset(); } - // find window that should not be over the cursor static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) { @@ -708,17 +704,14 @@ static Window* lcl_GetCareWin(SfxViewFrame* pViewFrm) return NULL; } - // Bildschirm an Cursorposition anpassen - void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, const ScSplitPos* pWhich ) { // aktiven Teil umschalten jetzt hier - ScSplitPos eActive = aViewData.GetActivePart(); ScHSplitPos eActiveX = WhichH(eActive); ScVSplitPos eActiveY = WhichV(eActive); @@ -737,10 +730,8 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, eActiveY = SC_SPLIT_BOTTOM; } - // eigentliches Align - if ( eMode != SC_FOLLOW_NONE ) { ScSplitPos eAlign; @@ -771,7 +762,6 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, // VisibleCellsY == CellsAtY( GetPosY( eWhichY ), 1, eWhichY ) - // falls z.B. Suchen-Dialog offen ist, Cursor nicht hinter den Dialog stellen // wenn moeglich, die Zeile mit dem Cursor oberhalb oder unterhalb des Dialogs @@ -839,7 +829,6 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, } } - SCsCOL nNewDeltaX = nDeltaX; SCsROW nNewDeltaY = nDeltaY; bool bDoLine = false; @@ -943,10 +932,8 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, if ( nNewDeltaY != nDeltaY ) ScrollY( nNewDeltaY - nDeltaY, eAlignY ); } - // nochmal aktiven Teil umschalten - if (bHFix) if (eActiveX == SC_SPLIT_RIGHT && nCurX < (SCsCOL)aViewData.GetFixPosX()) { @@ -981,10 +968,8 @@ bool ScTabView::SelMouseButtonDown( const MouseEvent& rMEvt ) return bRet; } - // MoveCursor - mit Anpassung des Bildausschnitts - void ScTabView::MoveCursorAbs( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode, bool bShift, bool bControl, bool bKeepOld, bool bKeepSel ) { @@ -1250,7 +1235,6 @@ void ScTabView::MoveCursorEnter( bool bShift ) // bShift -> hoch/runter } } - bool ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) { const KeyCode& rKCode = rKeyEvent.GetKeyCode(); @@ -1325,7 +1309,6 @@ bool ScTabView::MoveCursorKeyInput( const KeyEvent& rKeyEvent ) return false; } - // naechste/vorherige nicht geschuetzte Zelle void ScTabView::FindNextUnprot( bool bShift, bool bInSelection ) { @@ -1539,7 +1522,6 @@ void ScTabView::SelectNextTab( short nDir, bool bExtendSelection ) PaintExtras(); } - // SetTabNo - angezeigte Tabelle void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSameTabButMoved ) @@ -1769,10 +1751,8 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa } } - // Paint-Funktionen - nur fuer diese View - void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW nRow ) { DrawDeselectAll(); @@ -2282,7 +2262,6 @@ void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ) } } - // PaintLeft - linke Kontrollelemente neu zeichnen void ScTabView::PaintLeft() diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index e5370806c354..2f72a20a53be 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -33,10 +33,8 @@ extern sal_uInt16 nScFillModeMouseModifier; // global.cxx // STATIC DATA ----------------------------------------------------------- - // --- Referenz-Eingabe / Fill-Cursor - void ScTabView::HideTip() { if ( nTipVisible ) @@ -496,6 +494,4 @@ void ScTabView::InterpretVisible() CheckNeedsRepaint(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 563bd2cf5657..e553fc1b0891 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -55,7 +55,6 @@ using namespace com::sun::star; // STATIC DATA ----------------------------------------------------------- - void ScTabView::Init() { /* RTL layout of the view windows is done manually, because it depends on @@ -646,5 +645,4 @@ void ScTabView::ResetBrushDocument() } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 064c120a2f9c..197e952b1ef0 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -95,11 +95,9 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) return; } - // Pseudo-Slots von Draw-Toolbox auswerten //! wird das ueberhaupt noch gebraucht ????? - if (nNewId == SID_INSERT_DRAW && pArgs) { const SfxPoolItem* pItem; diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 8e7b24e4e642..21a8a21a4853 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -476,7 +476,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) case SID_ATTR_SIZE://XXX ??? break; - case SID_PRINTPREVIEW: { if ( !pThisFrame->GetFrame().IsInPlace() ) // nicht bei OLE @@ -558,7 +557,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - case FID_TOGGLESYNTAX: { bool bSet = !GetViewData().IsSyntaxMode(); @@ -858,7 +856,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - case SID_OUTLINE_DELETEALL: RemoveAllOutlines(); rReq.Done(); @@ -869,7 +866,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) rReq.Done(); break; - case SID_WINDOW_SPLIT: { ScSplitMode eHSplit = GetViewData().GetHSplitMode(); @@ -1027,7 +1023,6 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) } break; - case FID_PROTECT_TABLE: { ScDocument* pDoc = GetViewData().GetDocument(); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 6067ac1600b1..ed254f05b2d6 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -862,7 +862,6 @@ void ScTabViewShell::SetCurSubShell(ObjectSelectionType eOST, bool bForce) pPageBreakShell->SetRepeatTarget( &aTarget ); } - if ( eOST!=eCurOST || bForce ) { bool bCellBrush = false; // "format paint brush" allowed for cells @@ -1059,7 +1058,6 @@ IMPL_LINK_NOARG(ScTabViewShell, FormControlActivated) return 0; } - // GetMySubShell / SetMySubShell: altes Verhalten simulieren, // dass es nur eine SubShell gibt (nur innerhalb der 5 eignenen SubShells) @@ -1082,7 +1080,6 @@ SfxShell* ScTabViewShell::GetMySubShell() const return NULL; // keine von meinen dabei } - bool ScTabViewShell::IsDrawTextShell() const { return ( pDrawTextShell && ( GetMySubShell() == pDrawTextShell ) ); @@ -1567,7 +1564,6 @@ bool ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) pAccessibilityBroadcaster(NULL), \ mbInSwitch(false) - void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) { SfxApplication* pSfxApp = SFX_APP(); @@ -1766,9 +1762,6 @@ void ScTabViewShell::Construct( sal_uInt8 nForceDesignMode ) SetBorderPixel( aBorder ); } - - - ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, SfxViewShell* pOldSh ) : SfxViewShell( pViewFrame, SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), @@ -1921,7 +1914,6 @@ ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings() return pNavSettings; } - 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 43bd5976df8b..53223c4e5853 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -389,7 +389,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 9b348188d49c..927527094ef9 100644 --- a/sc/source/ui/view/tabvwsh8.cxx +++ b/sc/source/ui/view/tabvwsh8.cxx @@ -23,7 +23,6 @@ #include "tabvwsh.hxx" #include "document.hxx" - void ScTabViewShell::SetDefaultFrameLine( const ::editeng::SvxBorderLine* pLine ) { if ( pLine ) @@ -79,5 +78,4 @@ void ScTabViewShell::UIDeactivated( SfxInPlaceClient* pClient ) SfxViewShell::UIDeactivated( pClient ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwsh9.cxx b/sc/source/ui/view/tabvwsh9.cxx index 83d7530a49d8..6283fd772efa 100644 --- a/sc/source/ui/view/tabvwsh9.cxx +++ b/sc/source/ui/view/tabvwsh9.cxx @@ -98,7 +98,6 @@ void ScTabViewShell::GetGalleryState( SfxItemSet& /* rSet */ ) { } - OUString ScTabViewShell::GetDescription() const { return OUString(" ** Test ** "); @@ -218,5 +217,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 c01343fe3ff2..0d90705a650f 100644 --- a/sc/source/ui/view/tabvwsha.cxx +++ b/sc/source/ui/view/tabvwsha.cxx @@ -143,7 +143,6 @@ bool ScTabViewShell::GetFunction( OUString& rFuncStr, sal_uInt16 nErrCode ) // FID_DELETE_CELL // FID_VALIDATION - void ScTabViewShell::GetState( SfxItemSet& rSet ) { ScViewData& rViewData = GetViewData(); @@ -455,7 +454,6 @@ void ScTabViewShell::GetState( SfxItemSet& rSet ) } // while ( nWitch ) } - void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName) { ScDocument* pDoc = GetViewData().GetDocument(); @@ -795,5 +793,4 @@ void ScTabViewShell::GetDrawOptState( SfxItemSet& rSet ) rSet.Put( aBool ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 6db2356d9130..b3fb6a345b34 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -492,7 +492,6 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet) } } - void ScTabViewShell::ExecuteUndo(SfxRequest& rReq) { SfxShell* pSh = GetViewData().GetDispatcher().GetShell(0); diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 99da797cda2e..35a6089c9ee3 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -444,7 +444,6 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( } break; - default: OSL_FAIL( "ScTabViewShell::CreateRefDialog: unbekannte ID" ); break; diff --git a/sc/source/ui/view/tabvwshd.cxx b/sc/source/ui/view/tabvwshd.cxx index 828b3e0fd8b5..22be8e158d5e 100644 --- a/sc/source/ui/view/tabvwshd.cxx +++ b/sc/source/ui/view/tabvwshd.cxx @@ -30,7 +30,6 @@ #include "sc.hrc" #include <gridwin.hxx> - // STATIC DATA ----------------------------------------------------------- //! Parent-Window fuer Dialoge @@ -69,6 +68,4 @@ Window* ScTabViewShell::GetDialogParent() return GetActiveWin(); // for normal views, too } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx index 6904328d25d4..5a58806d589f 100644 --- a/sc/source/ui/view/tabvwshe.cxx +++ b/sc/source/ui/view/tabvwshe.cxx @@ -345,7 +345,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 06701689f913..5a6725663839 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <boost/scoped_ptr.hpp> #include "scitems.hxx" @@ -386,7 +385,6 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) { aName = pDlg->GetInputString(); - switch ( nSlot ) { case FID_TAB_APPEND: @@ -506,7 +504,6 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) ScMarkData& rMark = GetViewData().GetMarkData(); SCTAB nTabSelCount = rMark.GetSelectCount(); - if(nTableCount==nTabSelCount) { pDlg->SetForceCopyTable(); @@ -911,5 +908,4 @@ void ScTabViewShell::GetStateTable( SfxItemSet& rSet ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx index e38b495f9fe7..1f61bdfb509c 100644 --- a/sc/source/ui/view/tabvwshg.cxx +++ b/sc/source/ui/view/tabvwshg.cxx @@ -114,5 +114,4 @@ void ScTabViewShell::InsertURLButton( const OUString& rName, const OUString& rUR pDrView->InsertObjectSafe( pObj, *pDrView->GetSdrPageView() ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx index 5ce836ce3b64..4ece0051951a 100644 --- a/sc/source/ui/view/tabvwshh.cxx +++ b/sc/source/ui/view/tabvwshh.cxx @@ -269,5 +269,4 @@ bool ScTabViewShell::ExecuteRetypePassDlg(ScPasswordHash eDesiredHash) return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index a1a5c709ff98..95fadbac6fad 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -725,7 +725,6 @@ void ScViewData::SetPagebreakMode( bool bSet ) RefreshZoom(); } - ScMarkType ScViewData::GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) const { ScMarkType eMarkType = SC_MARK_NONE; @@ -755,7 +754,6 @@ ScMarkType ScViewData::GetSimpleArea( ScRange & rRange, ScMarkData & rNewMark ) return eMarkType; } - ScMarkType ScViewData::GetSimpleArea( SCCOL& rStartCol, SCROW& rStartRow, SCTAB& rStartTab, SCCOL& rEndCol, SCROW& rEndRow, SCTAB& rEndTab ) const { @@ -2221,7 +2219,6 @@ void ScViewData::WriteUserData(OUString& rData) cTabSep = OUString(SC_NEW_TABSEP); // in order to not kill a 3.1-version } - rData += OUString::number( maTabData[i]->nCurX ) + cTabSep + OUString::number( maTabData[i]->nCurY ) + cTabSep + OUString::number( maTabData[i]->eHSplitMode ) + cTabSep + diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 3a9724ccef62..5cdb61095d98 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -100,7 +100,6 @@ void VBA_DeleteModule( ScDocShell& rDocSh, const OUString& sModuleName ); // STATIC DATA --------------------------------------------------------------- - bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -160,7 +159,6 @@ bool ScViewFunc::AdjustBlockHeight( bool bPaint, ScMarkData* pMarkData ) return bAnyChanged; } - bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -198,7 +196,6 @@ bool ScViewFunc::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, bool bPaint ) return bChanged; } - enum ScAutoSum { ScAutoSumNone = 0, @@ -206,7 +203,6 @@ enum ScAutoSum ScAutoSumSum }; - static ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab, ScDirection eDir, SCCOLROW& nExtend ) { @@ -229,7 +225,6 @@ static ScAutoSum lcl_IsAutoSumData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, return ScAutoSumNone; } - #define SC_AUTOSUM_MAXCOUNT 20 static ScAutoSum lcl_SeekAutoSumData( ScDocument* pDoc, SCCOL& nCol, SCROW& nRow, @@ -835,7 +830,6 @@ void ScViewFunc::InsertPageBreak( bool bColumn, bool bRecord, const ScAddress* p UpdatePageBreakData( true ); // for PageBreak-Mode } - void ScViewFunc::DeletePageBreak( bool bColumn, bool bRecord, const ScAddress* pPos, bool bSetModified ) { @@ -1002,7 +996,6 @@ void ScViewFunc::SetPrintRanges( bool bEntireSheet, const OUString* pPrint, pDocSh->SetDocumentModified(); } - // Merge cells bool ScViewFunc::TestMergeCells() // pre-test (for menu) @@ -1019,7 +1012,6 @@ bool ScViewFunc::TestMergeCells() // pre-test (for menu) return false; } - bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bCenter ) { // Editable- and Being-Nested- test must be at the beginning (in DocFunc too), @@ -1114,7 +1106,6 @@ bool ScViewFunc::MergeCells( bool bApi, bool& rDoContents, bool bRecord, bool bC return bOk; } - bool ScViewFunc::TestRemoveMerge() { bool bMerged = false; @@ -1128,7 +1119,6 @@ bool ScViewFunc::TestRemoveMerge() return bMerged; } - static bool lcl_extendMergeRange(ScCellMergeOption& rOption, const ScRange& rRange) { bool bExtended = false; @@ -1446,7 +1436,6 @@ void ScViewFunc::TransliterateText( sal_Int32 nType ) } } - // AutoFormat ScAutoFormatData* ScViewFunc::CreateAutoFormatData() @@ -1470,7 +1459,6 @@ ScAutoFormatData* ScViewFunc::CreateAutoFormatData() return pData; } - void ScViewFunc::AutoFormat( sal_uInt16 nFormatNo, bool bRecord ) { ScRange aRange; @@ -1802,7 +1790,6 @@ void ScViewFunc::TabOp( const ScTabOpParam& rParam, bool bRecord ) ErrorMessage(STR_NOMULTISELECT); } - void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment, const Color& rColor, sal_uInt16 nFlags ) { @@ -1824,7 +1811,6 @@ void ScViewFunc::MakeScenario( const OUString& rName, const OUString& rComment, } } - void ScViewFunc::ExtendScenario() { ScEditableTester aTester( this ); @@ -1843,7 +1829,6 @@ void ScViewFunc::ExtendScenario() ApplySelectionPattern(aPattern); } - void ScViewFunc::UseScenario( const OUString& rName ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -1867,7 +1852,6 @@ bool ScViewFunc::InsertTable( const OUString& rName, SCTAB nTab, bool bRecord ) return bSuccess; } - // Insert tables bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, @@ -1917,7 +1901,6 @@ bool ScViewFunc::InsertTables(std::vector<OUString>& aNames, SCTAB nTab, } } - bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -1949,7 +1932,6 @@ bool ScViewFunc::AppendTable( const OUString& rName, bool bRecord ) } } - bool ScViewFunc::DeleteTable( SCTAB nTab, bool bRecord ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -2108,7 +2090,6 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) pUndoDoc, pUndoData )); } - if (bDelDone) { if ( nNewTab >= rDoc.GetTableCount() ) @@ -2125,7 +2106,6 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) pDocSh->PostPaintExtras(); pDocSh->SetDocumentModified(); - SfxApplication* pSfxApp = SFX_APP(); // Navigator pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_TABLES_CHANGED ) ); pSfxApp->Broadcast( SfxSimpleHint( SC_HINT_DBAREAS_CHANGED ) ); @@ -2139,7 +2119,6 @@ bool ScViewFunc::DeleteTables(const vector<SCTAB> &TheTabs, bool bRecord ) return bDelDone; } - bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) { // order Table/Name is inverted for DocFunc @@ -2153,7 +2132,6 @@ bool ScViewFunc::RenameTable( const OUString& rName, SCTAB nTab ) return bSuccess; } - bool ScViewFunc::SetTabBgColor( const Color& rColor, SCTAB nTab ) { bool bSuccess = GetViewData().GetDocShell()->GetDocFunc().SetTabBgColor( nTab, rColor, true, false ); @@ -2187,7 +2165,6 @@ void ScViewFunc::InsertAreaLink( const OUString& rFile, pDocSh->GetDocFunc().InsertAreaLink( rFile, rFilter, rOptions, rSource, aPos, nRefresh, false, false ); } - void ScViewFunc::InsertTableLink( const OUString& rFile, const OUString& rFilter, const OUString& rOptions, const OUString& rTabName ) @@ -2316,7 +2293,6 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell, } } - if (bUndo) { pDocSh->GetUndoManager()->AddUndoAction( @@ -2697,7 +2673,6 @@ void ScViewFunc::MoveTable( } } - void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -2735,7 +2710,6 @@ void ScViewFunc::ShowTable( const std::vector<OUString>& rNames ) } } - void ScViewFunc::HideTable( const ScMarkData& rMark ) { ScDocShell* pDocSh = GetViewData().GetDocShell(); @@ -2784,7 +2758,6 @@ void ScViewFunc::HideTable( const ScMarkData& rMark ) } } - void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont ) { ScEditableTester aTester( this ); @@ -2819,7 +2792,6 @@ void ScViewFunc::InsertSpecialChar( const OUString& rStr, const Font& rFont ) pViewShell->TabKeyInput( KeyEvent( *(pChar++), KeyCode() ) ); } - void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, const SvxBorderLine* pDestLine, const SvxBorderLine* pSrcLine, @@ -2842,7 +2814,6 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, } } - #define SET_LINE_ATTRIBUTES(LINE,BOXLINE) \ pBoxLine = aBoxItem.Get##LINE(); \ if ( pBoxLine ) \ @@ -2856,7 +2827,6 @@ void ScViewFunc::UpdateLineAttrs( SvxBorderLine& rLine, aBoxItem.SetLine( NULL, BOXLINE ); \ } - void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, bool bColorOnly ) { @@ -2899,7 +2869,6 @@ void ScViewFunc::SetSelectionFrameLines( const SvxBorderLine* pLine, ATTR_PATTERN_START, ATTR_PATTERN_END )); - const SvxBorderLine* pBoxLine = NULL; SvxBorderLine aLine; @@ -2978,5 +2947,4 @@ void ScViewFunc::SetValidation( const ScValidationData& rNew ) ApplyAttr( aItem ); // with Paint and Undo... } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx index 627e870e519e..b00ab735f6c8 100644 --- a/sc/source/ui/view/viewfun3.cxx +++ b/sc/source/ui/view/viewfun3.cxx @@ -72,10 +72,8 @@ using namespace com::sun::star; // STATIC DATA --------------------------------------------------------------- - // GlobalName der Writer-DocShell kommt jetzt aus comphelper/classids.hxx - // C U T void ScViewFunc::CutToClip( ScDocument* pClipDoc, bool bIncludeObjects ) @@ -434,7 +432,6 @@ ScTransferObj* ScViewFunc::CopyToTransferable() return NULL; } - // P A S T E void ScViewFunc::PasteDraw() @@ -765,10 +762,8 @@ static bool lcl_SelHasAttrib( ScDocument* pDoc, SCCOL nCol1, SCROW nRow1, SCCOL return false; } - // Einfuegen auf Tabelle: - // internes Paste namespace { @@ -1208,11 +1203,9 @@ bool ScViewFunc::PasteFromClip( sal_uInt16 nFlags, ScDocument* pClipDoc, rMark.SetMarkArea( aUserRange ); MarkDataChanged(); - // Aus Clipboard kopieren, // wenn gerechnet werden soll, Originaldaten merken - boost::scoped_ptr<ScDocument> pMixDoc; if (nFunction) { @@ -1959,5 +1952,4 @@ void ScViewFunc::DataFormPutData( SCROW nCurrentRow , } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index 9298b6913a71..05efdf5a0b10 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -86,7 +86,6 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow, { HideAllCursors(); - ScDocShell* pDocSh = GetViewData().GetDocShell(); ScDocument& rDoc = pDocSh->GetDocument(); SCTAB nTab = GetViewData().GetTabNo(); @@ -619,7 +618,6 @@ bool ScViewFunc::PasteFile( const Point& rPos, const OUString& rFile, bool bLink Graphic aGraphic; GraphicFilter& rGraphicFilter = GraphicFilter::GetGraphicFilter(); - if (!rGraphicFilter.ImportGraphic(aGraphic, aURL, GRFILTER_FORMAT_DONTKNOW, &nFilterFormat )) { @@ -781,5 +779,4 @@ bool ScViewFunc::HasBookmarkAtCursor( SvxHyperlinkItem* pContent ) return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun5.cxx b/sc/source/ui/view/viewfun5.cxx index 9ee7fa5dbcea..f5481b8ff0f8 100644 --- a/sc/source/ui/view/viewfun5.cxx +++ b/sc/source/ui/view/viewfun5.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/MSOLEObjectSystemCreator.hpp> - #include <svx/unomodel.hxx> #include <unotools/streamwrap.hxx> @@ -104,10 +103,8 @@ bool ScViewFunc::PasteDataFormat( sal_uLong nFormatId, TransferableDataHelper aDataHelper( rxTransferable ); bool bRet = false; - // handle individual formats - if ( nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE || nFormatId == SOT_FORMATSTR_ID_LINK_SOURCE || nFormatId == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE || @@ -741,5 +738,4 @@ bool ScViewFunc::PasteLink( const uno::Reference<datatransfer::XTransferable>& r return true; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx index 74fe5592d660..f6addba08c3d 100644 --- a/sc/source/ui/view/viewfun6.cxx +++ b/sc/source/ui/view/viewfun6.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svx/svdundo.hxx> #include <svx/svdocapt.hxx> #include <sfx2/bindings.hxx> diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx index 77093e4b12c1..68bf8097556c 100644 --- a/sc/source/ui/view/viewfun7.cxx +++ b/sc/source/ui/view/viewfun7.cxx @@ -54,7 +54,6 @@ bool bPasteIsMove = false; using namespace com::sun::star; - static void lcl_AdjustInsertPos( ScViewData* pData, Point& rPos, Size& rSize ) { SdrPage* pPage = pData->GetScDrawView()->GetModel()->GetPage( static_cast<sal_uInt16>(pData->GetTabNo()) ); diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index a996f3735bcd..ed0d0f5e91e0 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -88,7 +88,6 @@ static void lcl_PostRepaintCondFormat( const ScConditionalFormat *pCondFmt, ScDo } } - ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ) : ScTabView( pParent, rDocSh, pViewShell ), bFormatValid( false ) @@ -660,10 +659,8 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, // #i97726# always get text for "repeat" of undo action aString = ScEditUtil::GetSpaceDelimitedString(aEngine); - // undo - EditTextObject* pUndoData = NULL; ScUndoEnterData::ValuesType aOldValues; @@ -681,10 +678,8 @@ void ScViewFunc::EnterData( SCCOL nCol, SCROW nRow, SCTAB nTab, pUndoData = rData.Clone(); } - // enter data - if (bCommon) rDoc.ApplyPattern(nCol,nRow,nTab,*pCellAttrs); //! undo @@ -870,12 +865,10 @@ void ScViewFunc::GetSelectionFrame( SvxBoxItem& rLineOuter, } } - // apply attribute - undo OK // // complete set ( ATTR_STARTINDEX, ATTR_ENDINDEX ) - void ScViewFunc::ApplyAttributes( const SfxItemSet* pDialogSet, const SfxItemSet* pOldSet, bool bRecord ) @@ -1014,7 +1007,6 @@ void ScViewFunc::ApplyAttr( const SfxPoolItem& rAttrItem ) // CellContentChanged is called in ApplySelectionPattern } - // patterns and borders void ScViewFunc::ApplyPatternLines( const ScPatternAttr& rAttr, const SvxBoxItem* pNewOuter, @@ -1312,7 +1304,6 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, bool bRecord if ( !pStyleSheet) return; - ScViewData& rViewData = GetViewData(); ScDocShell* pDocSh = rViewData.GetDocShell(); ScDocument& rDoc = pDocSh->GetDocument(); @@ -1399,12 +1390,10 @@ void ScViewFunc::SetStyleSheetToMarked( SfxStyleSheet* pStyleSheet, bool bRecord StartFormatArea(); } - void ScViewFunc::RemoveStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet ) { if ( !pStyleSheet) return; - ScViewData& rViewData = GetViewData(); ScDocument* pDoc = rViewData.GetDocument(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -1431,7 +1420,6 @@ void ScViewFunc::UpdateStyleSheetInUse( const SfxStyleSheetBase* pStyleSheet ) { if ( !pStyleSheet) return; - ScViewData& rViewData = GetViewData(); ScDocument* pDoc = rViewData.GetDocument(); ScDocShell* pDocSh = rViewData.GetDocShell(); @@ -2162,7 +2150,6 @@ void ScViewFunc::SetWidthOrHeight( rDoc.SetDrawPageSize(nTab); } - if (!bOutline) DELETEZ(pUndoTab); diff --git a/sc/source/ui/view/viewutil.cxx b/sc/source/ui/view/viewutil.cxx index c7535a1789fb..17f6008421f2 100644 --- a/sc/source/ui/view/viewutil.cxx +++ b/sc/source/ui/view/viewutil.cxx @@ -274,7 +274,6 @@ void ScViewUtil::UnmarkFiltered( ScMarkData& rMark, ScDocument* pDoc ) rMark.MarkToSimple(); } - bool ScViewUtil::FitToUnfilteredRows( ScRange & rRange, ScDocument * pDoc, size_t nRows ) { SCTAB nTab = rRange.aStart.Tab(); @@ -339,7 +338,6 @@ void ScViewUtil::HideDisabledSlot( SfxItemSet& rSet, SfxBindings& rBindings, sal rSet.DisableItem( nSlotId ); } - bool ScViewUtil::ExecuteCharMap( const SvxFontItem& rOldFont, SfxViewFrame& rFrame, SvxFontItem& rNewFont, @@ -389,7 +387,6 @@ void ScViewUtil::SetFullScreen( SfxViewShell& rViewShell, bool bSet ) } } - ScUpdateRect::ScUpdateRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ) : nNewStartX(0) , nNewStartY(0) diff --git a/sc/source/ui/view/waitoff.cxx b/sc/source/ui/view/waitoff.cxx index e3139ea18745..e0c3a6e8f9a4 100644 --- a/sc/source/ui/view/waitoff.cxx +++ b/sc/source/ui/view/waitoff.cxx @@ -48,5 +48,4 @@ ScWaitCursorOff::~ScWaitCursorOff() } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |