diff options
Diffstat (limited to 'sc/source/ui')
125 files changed, 1164 insertions, 2886 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx index bff135d41..efde03901 100644 --- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx +++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleContextBase.cxx,v $ - * $Revision: 1.33 $ + * $Revision: 1.33.32.1 $ * * This file is part of OpenOffice.org. * @@ -584,16 +584,6 @@ void ScAccessibleContextBase::ChangeName() CommitChange(aEvent); } -void ScAccessibleContextBase::CommitDefunc() const -{ - AccessibleEventObject aEvent; - aEvent.EventId = AccessibleEventId::STATE_CHANGED; - aEvent.Source = uno::Reference< XAccessibleContext >(const_cast<ScAccessibleContextBase*>(this)); - aEvent.NewValue <<= AccessibleStateType::DEFUNC; - - CommitChange(aEvent); -} - void ScAccessibleContextBase::CommitFocusGained() const { AccessibleEventObject aEvent; diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx index 498d72e62..5cd0b17b8 100644 --- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx +++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleCsvControl.cxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.22.32.2 $ * * This file is part of OpenOffice.org. * @@ -300,11 +300,6 @@ void ScAccessibleCsvControl::implDispose() } } -Point ScAccessibleCsvControl::implGetRelPos( const Point& rPos ) const -{ - return rPos - implGetControl().GetWindowExtentsRelative( NULL ).TopLeft(); -} - Point ScAccessibleCsvControl::implGetAbsPos( const Point& rPos ) const { return rPos + implGetControl().GetWindowExtentsRelative( NULL ).TopLeft(); diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 28e7f6aa5..e33a9ab34 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleDocumentPagePreview.cxx,v $ - * $Revision: 1.38 $ + * $Revision: 1.38.32.2 $ * * This file is part of OpenOffice.org. * @@ -740,7 +740,8 @@ private: ::accessibility::AccessibleShape* GetAccShape(const ScShapeChild& rShape) const; ::accessibility::AccessibleShape* GetAccShape(const ScShapeChildVec& rShapes, sal_Int32 nIndex) const; void FillShapes(const Rectangle& aPixelPaintRect, const MapMode& aMapMode, sal_uInt8 nRangeId); - sal_Bool FindShape(ScShapeChildVec& rShapes, const uno::Reference <drawing::XShape>& xShape, ScShapeChildVec::iterator& rItr) const; +//UNUSED2008-05 sal_Bool FindShape(ScShapeChildVec& rShapes, const uno::Reference <drawing::XShape>& xShape, ScShapeChildVec::iterator& rItr) const; + // void AddShape(const uno::Reference<drawing::XShape>& xShape, SdrLayerID aLayerID); // void RemoveShape(const uno::Reference<drawing::XShape>& xShape, SdrLayerID aLayerID); SdrPage* GetDrawPage() const; @@ -1205,21 +1206,21 @@ void ScShapeChilds::FillShapes(const Rectangle& aPixelPaintRect, const MapMode& } } -sal_Bool ScShapeChilds::FindShape(ScShapeChildVec& rShapes, const uno::Reference <drawing::XShape>& xShape, ScShapeChildVec::iterator& rItr) const -{ - sal_Bool bResult(sal_False); - ScShapeChild aShape; - aShape.mxShape = xShape; - rItr = std::lower_bound(rShapes.begin(), rShapes.end(), aShape, ScShapeChildLess()); - if (rItr->mxShape.get() == xShape.get()) - bResult = sal_True; // if the shape is found - -/*#ifndef PRODUCT // test whether it finds truly the correct shape (perhaps it is not really sorted) - ScShapeChildVec::iterator aDebugItr = std::find(rShapes.begin(), rShapes.end(), aShape); - DBG_ASSERT(rItr == aDebugItr, "wrong Shape found"); -#endif*/ - return bResult; -} +//UNUSED2008-05 sal_Bool ScShapeChilds::FindShape(ScShapeChildVec& rShapes, const uno::Reference <drawing::XShape>& xShape, ScShapeChildVec::iterator& rItr) const +//UNUSED2008-05 { +//UNUSED2008-05 sal_Bool bResult(sal_False); +//UNUSED2008-05 ScShapeChild aShape; +//UNUSED2008-05 aShape.mxShape = xShape; +//UNUSED2008-05 rItr = std::lower_bound(rShapes.begin(), rShapes.end(), aShape, ScShapeChildLess()); +//UNUSED2008-05 if (rItr->mxShape.get() == xShape.get()) +//UNUSED2008-05 bResult = sal_True; // if the shape is found +//UNUSED2008-05 +//UNUSED2008-05 /*#ifndef PRODUCT // test whether it finds truly the correct shape (perhaps it is not really sorted) +//UNUSED2008-05 ScShapeChildVec::iterator aDebugItr = std::find(rShapes.begin(), rShapes.end(), aShape); +//UNUSED2008-05 DBG_ASSERT(rItr == aDebugItr, "wrong Shape found"); +//UNUSED2008-05 #endif*/ +//UNUSED2008-05 return bResult; +//UNUSED2008-05 } /*void ScShapeChilds::AddShape(const uno::Reference<drawing::XShape>& xShape, SdrLayerID aLayerID) { diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx index f38cff41a..31849fdbc 100644 --- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx +++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessiblePreviewCell.cxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.21.32.1 $ * * This file is part of OpenOffice.org. * @@ -299,11 +299,6 @@ sal_Bool ScAccessiblePreviewCell::IsOpaque( return bOpaque; } -sal_Bool ScAccessiblePreviewCell::IsSelected(const uno::Reference<XAccessibleStateSet>& /* rxParentStates */) -{ - return sal_False; -} - void ScAccessiblePreviewCell::CreateTextHelper() { if (!mpTextHelper) diff --git a/sc/source/ui/Accessibility/AccessibleText.cxx b/sc/source/ui/Accessibility/AccessibleText.cxx index 79f802af1..3dc1f2305 100644 --- a/sc/source/ui/Accessibility/AccessibleText.cxx +++ b/sc/source/ui/Accessibility/AccessibleText.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleText.cxx,v $ - * $Revision: 1.44 $ + * $Revision: 1.42.32.3 $ * * This file is part of OpenOffice.org. * @@ -284,7 +284,6 @@ public: void SetInvalid(); Rectangle GetVisRect() const; - void FillTableInfo() const; // clips the VisArea and calculates with the negativ coordinates Rectangle CorrectVisArea(const Rectangle& rVisArea) const; @@ -376,15 +375,6 @@ Rectangle ScPreviewViewForwarder::GetVisRect() const return Rectangle(); } -void ScPreviewViewForwarder::FillTableInfo() const -{ - if ( mpViewShell && !mpTableInfo ) - { - mpTableInfo = new ScPreviewTableInfo; - mpViewShell->GetLocationData().GetTableInfo( GetVisRect(), *mpTableInfo ); - } -} - Rectangle ScPreviewViewForwarder::CorrectVisArea(const Rectangle& rVisArea) const { Rectangle aVisArea(rVisArea); @@ -1312,18 +1302,18 @@ SvxViewForwarder* ScAccessiblePreviewCellTextData::GetViewForwarder() return mpViewForwarder; } -IMPL_LINK(ScAccessiblePreviewCellTextData, NotifyHdl, EENotify*, aNotify) -{ - if( aNotify ) - { - ::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify); - - if( aHint.get() ) - GetBroadcaster().Broadcast( *aHint.get() ); - } - - return 0; -} +//UNUSED2008-05 IMPL_LINK(ScAccessiblePreviewCellTextData, NotifyHdl, EENotify*, aNotify) +//UNUSED2008-05 { +//UNUSED2008-05 if( aNotify ) +//UNUSED2008-05 { +//UNUSED2008-05 ::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify); +//UNUSED2008-05 +//UNUSED2008-05 if( aHint.get() ) +//UNUSED2008-05 GetBroadcaster().Broadcast( *aHint.get() ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 return 0; +//UNUSED2008-05 } ScDocShell* ScAccessiblePreviewCellTextData::GetDocShell(ScPreviewShell* pViewShell) { @@ -1440,18 +1430,18 @@ SvxViewForwarder* ScAccessiblePreviewHeaderCellTextData::GetViewForwarder() return mpViewForwarder; } -IMPL_LINK(ScAccessiblePreviewHeaderCellTextData, NotifyHdl, EENotify*, aNotify) -{ - if( aNotify ) - { - ::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify); - - if( aHint.get() ) - GetBroadcaster().Broadcast( *aHint.get() ); - } - - return 0; -} +//UNUSED2008-05 IMPL_LINK(ScAccessiblePreviewHeaderCellTextData, NotifyHdl, EENotify*, aNotify) +//UNUSED2008-05 { +//UNUSED2008-05 if( aNotify ) +//UNUSED2008-05 { +//UNUSED2008-05 ::std::auto_ptr< SfxHint > aHint = SvxEditSourceHelper::EENotification2Hint( aNotify); +//UNUSED2008-05 +//UNUSED2008-05 if( aHint.get() ) +//UNUSED2008-05 GetBroadcaster().Broadcast( *aHint.get() ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 return 0; +//UNUSED2008-05 } ScDocShell* ScAccessiblePreviewHeaderCellTextData::GetDocShell(ScPreviewShell* pViewShell) { diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 08ba72036..3715c8606 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: inputhdl.cxx,v $ - * $Revision: 1.77 $ + * $Revision: 1.77.32.1 $ * * This file is part of OpenOffice.org. * @@ -1333,14 +1333,6 @@ void ScInputHandler::StopInputWinEngine( BOOL bAll ) pTopView = NULL; // invalid now } -void ScInputHandler::ActivateInputWindow( const String& rText, - const ESelection& rSel ) -{ - if ( pInputWin ) - if ( !pInputWin->IsInputActive() ) - pTopView = pInputWin->ActivateEdit( rText, rSel ); -} - EditView* ScInputHandler::GetActiveView() { UpdateActiveView(); @@ -1676,12 +1668,6 @@ void ScInputHandler::SyncViews( EditView* pSourceView ) } } -void ScInputHandler::SetAllUpdateMode( BOOL bUpdate ) -{ - ImplCreateEditEngine(); - pEngine->SetUpdateMode( bUpdate ); -} - IMPL_LINK( ScInputHandler, ModifyHdl, void *, EMPTYARG ) { if ( !bInOwnChange && ( eMode==SC_INPUT_TYPE || eMode==SC_INPUT_TABLE ) && diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 6b3533eda..1698ee668 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: inputwin.cxx,v $ - * $Revision: 1.58 $ + * $Revision: 1.57.22.3 $ * * This file is part of OpenOffice.org. * @@ -548,11 +548,6 @@ void ScInputWindow::SetTextString( const String& rString ) } } -const String& ScInputWindow::GetTextString() -{ - return aTextWindow.GetTextString(); -} - void ScInputWindow::SetOkCancelMode() { //! new method at ScModule to query if function autopilot is open @@ -621,19 +616,19 @@ String __EXPORT ScInputWindow::GetText() const } -EditView* ScInputWindow::ActivateEdit( const String& rText, - const ESelection& rSel ) -{ - if ( !aTextWindow.IsInputActive() ) - { - aTextWindow.StartEditEngine(); - aTextWindow.GrabFocus(); - aTextWindow.SetTextString( rText ); - aTextWindow.GetEditView()->SetSelection( rSel ); - } - - return aTextWindow.GetEditView(); -} +//UNUSED2008-05 EditView* ScInputWindow::ActivateEdit( const String& rText, +//UNUSED2008-05 const ESelection& rSel ) +//UNUSED2008-05 { +//UNUSED2008-05 if ( !aTextWindow.IsInputActive() ) +//UNUSED2008-05 { +//UNUSED2008-05 aTextWindow.StartEditEngine(); +//UNUSED2008-05 aTextWindow.GrabFocus(); +//UNUSED2008-05 aTextWindow.SetTextString( rText ); +//UNUSED2008-05 aTextWindow.GetEditView()->SetSelection( rSel ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 return aTextWindow.GetEditView(); +//UNUSED2008-05 } BOOL ScInputWindow::IsInputActive() { diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 8502700a8..fe9e85052 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: scdll.cxx,v $ - * $Revision: 1.44 $ + * $Revision: 1.44.32.2 $ * * This file is part of OpenOffice.org. * @@ -130,32 +130,31 @@ //------------------------------------------------------------------ -// filter detection can't use ScFilterOptions (in sc-dll), -// so access to wk3 flag must be implemented here again - -class ScLibOptions : public utl::ConfigItem -{ - BOOL bWK3Flag; - -public: - ScLibOptions(); - BOOL GetWK3Flag() const { return bWK3Flag; } -}; - -#define CFGPATH_LIBFILTER "Office.Calc/Filter/Import/Lotus123" -#define ENTRYSTR_WK3 "WK3" - -ScLibOptions::ScLibOptions() : - ConfigItem( rtl::OUString::createFromAscii( CFGPATH_LIBFILTER ) ), - bWK3Flag( FALSE ) -{ - com::sun::star::uno::Sequence<rtl::OUString> aNames(1); - aNames[0] = rtl::OUString::createFromAscii( ENTRYSTR_WK3 ); - com::sun::star::uno::Sequence<com::sun::star::uno::Any> aValues = GetProperties(aNames); - if ( aValues.getLength() == 1 && aValues[0].hasValue() ) - bWK3Flag = comphelper::getBOOL( aValues[0] ); -} - +//UNUSED2008-05 // filter detection can't use ScFilterOptions (in sc-dll), +//UNUSED2008-05 // so access to wk3 flag must be implemented here again +//UNUSED2008-05 +//UNUSED2008-05 class ScLibOptions : public utl::ConfigItem +//UNUSED2008-05 { +//UNUSED2008-05 BOOL bWK3Flag; +//UNUSED2008-05 +//UNUSED2008-05 public: +//UNUSED2008-05 ScLibOptions(); +//UNUSED2008-05 BOOL GetWK3Flag() const { return bWK3Flag; } +//UNUSED2008-05 }; +//UNUSED2008-05 +//UNUSED2008-05 #define CFGPATH_LIBFILTER "Office.Calc/Filter/Import/Lotus123" +//UNUSED2008-05 #define ENTRYSTR_WK3 "WK3" +//UNUSED2008-05 +//UNUSED2008-05 ScLibOptions::ScLibOptions() : +//UNUSED2008-05 ConfigItem( rtl::OUString::createFromAscii( CFGPATH_LIBFILTER ) ), +//UNUSED2008-05 bWK3Flag( FALSE ) +//UNUSED2008-05 { +//UNUSED2008-05 com::sun::star::uno::Sequence<rtl::OUString> aNames(1); +//UNUSED2008-05 aNames[0] = rtl::OUString::createFromAscii( ENTRYSTR_WK3 ); +//UNUSED2008-05 com::sun::star::uno::Sequence<com::sun::star::uno::Any> aValues = GetProperties(aNames); +//UNUSED2008-05 if ( aValues.getLength() == 1 && aValues[0].hasValue() ) +//UNUSED2008-05 bWK3Flag = comphelper::getBOOL( aValues[0] ); +//UNUSED2008-05 } //------------------------------------------------------------------ @@ -366,51 +365,51 @@ void ScDLL::Exit() #define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s)) -void ScDLL::FillStatusBar(StatusBar &rStatusBar) -{ - // Dokumentposition (Tabelle x / y) - rStatusBar.InsertItem( SID_STATUS_DOCPOS, - TEXT_WIDTH( String().Fill( 10, 'X' ) ), - SIB_LEFT|SIB_AUTOSIZE ); - - // Seitenvorlage - rStatusBar.InsertItem( SID_STATUS_PAGESTYLE, - TEXT_WIDTH( String().Fill( 15, 'X' ) ), - SIB_LEFT|SIB_AUTOSIZE ); - - // Ma"sstab - rStatusBar.InsertItem( SID_ATTR_ZOOM, - SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar), - SIB_CENTER ); - - // Einfuege-/Ueberschreibmodus - rStatusBar.InsertItem( SID_ATTR_INSERT, - SvxInsertStatusBarControl::GetDefItemWidth(rStatusBar), - SIB_CENTER ); - - // Selektionsmodus - rStatusBar.InsertItem( SID_STATUS_SELMODE, - SvxSelectionModeControl::GetDefItemWidth(rStatusBar), - SIB_CENTER ); - - // Dokument geaendert - rStatusBar.InsertItem( SID_DOC_MODIFIED, - SvxModifyControl::GetDefItemWidth(rStatusBar)); - - // signatures - rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); - rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); - - // Mail - rStatusBar.InsertItem( SID_MAIL_NOTIFY, - TEXT_WIDTH( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Mail")) ), - SIB_CENTER ); - - // den aktuellen Kontext anzeigen Uhrzeit / FramePos / TabellenInfo / Errors - rStatusBar.InsertItem( SID_ATTR_SIZE, - SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar), - SIB_AUTOSIZE|SIB_LEFT|SIB_USERDRAW); -} +//UNUSED2008-05 void ScDLL::FillStatusBar(StatusBar &rStatusBar) +//UNUSED2008-05 { +//UNUSED2008-05 // Dokumentposition (Tabelle x / y) +//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_DOCPOS, +//UNUSED2008-05 TEXT_WIDTH( String().Fill( 10, 'X' ) ), +//UNUSED2008-05 SIB_LEFT|SIB_AUTOSIZE ); +//UNUSED2008-05 +//UNUSED2008-05 // Seitenvorlage +//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_PAGESTYLE, +//UNUSED2008-05 TEXT_WIDTH( String().Fill( 15, 'X' ) ), +//UNUSED2008-05 SIB_LEFT|SIB_AUTOSIZE ); +//UNUSED2008-05 +//UNUSED2008-05 // Ma"sstab +//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_ZOOM, +//UNUSED2008-05 SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar), +//UNUSED2008-05 SIB_CENTER ); +//UNUSED2008-05 +//UNUSED2008-05 // Einfuege-/Ueberschreibmodus +//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_INSERT, +//UNUSED2008-05 SvxInsertStatusBarControl::GetDefItemWidth(rStatusBar), +//UNUSED2008-05 SIB_CENTER ); +//UNUSED2008-05 +//UNUSED2008-05 // Selektionsmodus +//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_SELMODE, +//UNUSED2008-05 SvxSelectionModeControl::GetDefItemWidth(rStatusBar), +//UNUSED2008-05 SIB_CENTER ); +//UNUSED2008-05 +//UNUSED2008-05 // Dokument geaendert +//UNUSED2008-05 rStatusBar.InsertItem( SID_DOC_MODIFIED, +//UNUSED2008-05 SvxModifyControl::GetDefItemWidth(rStatusBar)); +//UNUSED2008-05 +//UNUSED2008-05 // signatures +//UNUSED2008-05 rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); +//UNUSED2008-05 rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); +//UNUSED2008-05 +//UNUSED2008-05 // Mail +//UNUSED2008-05 rStatusBar.InsertItem( SID_MAIL_NOTIFY, +//UNUSED2008-05 TEXT_WIDTH( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Mail")) ), +//UNUSED2008-05 SIB_CENTER ); +//UNUSED2008-05 +//UNUSED2008-05 // den aktuellen Kontext anzeigen Uhrzeit / FramePos / TabellenInfo / Errors +//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_SIZE, +//UNUSED2008-05 SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar), +//UNUSED2008-05 SIB_AUTOSIZE|SIB_LEFT|SIB_USERDRAW); +//UNUSED2008-05 } #undef TEXT_WIDTH diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 43766d7e0..25a4e4281 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: scmod.cxx,v $ - * $Revision: 1.58 $ + * $Revision: 1.58.32.1 $ * * This file is part of OpenOffice.org. * @@ -1576,13 +1576,6 @@ void ScModule::InputChanged( EditView* pView ) pHdl->InputChanged( pView ); } -void ScModule::SetInputWindow( ScInputWindow* pWin ) -{ - ScInputHandler* pHdl = GetInputHdl(); - if ( pHdl ) - pHdl->SetInputWindow( pWin ); -} - void ScModule::ViewShellGone( ScTabViewShell* pViewSh ) { ScInputHandler* pHdl = GetInputHdl(); @@ -1678,12 +1671,6 @@ void ScModule::ActivateInputWindow( const String* pStrFormula, BOOL bMatrix ) // //------------------------------------------------------------------ -void ScModule::CloseDialogs() -{ - if( nCurRefDlgId ) - SetRefDialog( nCurRefDlgId, FALSE ); -} - void ScModule::SetRefDialog( USHORT nId, BOOL bVis, SfxViewFrame* pViewFrm ) { //! move reference dialog handling to view diff --git a/sc/source/ui/app/uiitems.cxx b/sc/source/ui/app/uiitems.cxx index fc8a0e3e9..d91090036 100644 --- a/sc/source/ui/app/uiitems.cxx +++ b/sc/source/ui/app/uiitems.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: uiitems.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.32.2 $ * * This file is part of OpenOffice.org. * @@ -60,21 +60,21 @@ TYPEINIT1(ScIndexHint, SfxHint); // ScInputStatusItem - Status-Update fuer Eingabezeile // ----------------------------------------------------------------------- -ScInputStatusItem::ScInputStatusItem( USHORT nWhichP, - SCTAB nTab, - SCCOL nCol, SCROW nRow, - SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nEndRow, - const String& rString, const EditTextObject* pData ) - - : SfxPoolItem ( nWhichP ), - aCursorPos ( nCol, nRow, nTab ), - aStartPos ( nStartCol, nStartRow, nTab ), - aEndPos ( nEndCol, nEndRow, nTab ), - aString ( rString ), - pEditData ( pData ? pData->Clone() : NULL ) -{ -} +//UNUSED2008-05 ScInputStatusItem::ScInputStatusItem( USHORT nWhichP, +//UNUSED2008-05 SCTAB nTab, +//UNUSED2008-05 SCCOL nCol, SCROW nRow, +//UNUSED2008-05 SCCOL nStartCol, SCROW nStartRow, +//UNUSED2008-05 SCCOL nEndCol, SCROW nEndRow, +//UNUSED2008-05 const String& rString, const EditTextObject* pData ) +//UNUSED2008-05 +//UNUSED2008-05 : SfxPoolItem ( nWhichP ), +//UNUSED2008-05 aCursorPos ( nCol, nRow, nTab ), +//UNUSED2008-05 aStartPos ( nStartCol, nStartRow, nTab ), +//UNUSED2008-05 aEndPos ( nEndCol, nEndRow, nTab ), +//UNUSED2008-05 aString ( rString ), +//UNUSED2008-05 pEditData ( pData ? pData->Clone() : NULL ) +//UNUSED2008-05 { +//UNUSED2008-05 } ScInputStatusItem::ScInputStatusItem( USHORT nWhichP, const ScAddress& rCurPos, @@ -166,12 +166,6 @@ ScIndexHint::~ScIndexHint() // ScEditViewHint - neue EditView fuer Cursorposition anlegen // ----------------------------------------------------------------------- -ScEditViewHint::ScEditViewHint() : - pEditEngine( NULL ), - aCursorPos( 0,0,0 ) -{ -} - ScEditViewHint::ScEditViewHint( ScEditEngineDefaulter* pEngine, const ScAddress& rCurPos ) : pEditEngine( pEngine ), aCursorPos( rCurPos ) diff --git a/sc/source/ui/cctrl/editfield.cxx b/sc/source/ui/cctrl/editfield.cxx index 10d44d649..907a7ff84 100644 --- a/sc/source/ui/cctrl/editfield.cxx +++ b/sc/source/ui/cctrl/editfield.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: editfield.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.1 $ * * This file is part of OpenOffice.org. * @@ -57,11 +57,6 @@ sal_Unicode lclGetGroupSep() // ============================================================================ -ScDoubleField::ScDoubleField( Window* pParent, WinBits nStyle ) : - Edit( pParent, nStyle ) -{ -} - ScDoubleField::ScDoubleField( Window* pParent, const ResId& rResId ) : Edit( pParent, rResId ) { diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 4198cecbb..b520b5797 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dapitype.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.1 $ * * This file is part of OpenOffice.org. * @@ -69,11 +69,6 @@ ScDataPilotSourceTypeDlg::~ScDataPilotSourceTypeDlg() { } -BOOL ScDataPilotSourceTypeDlg::IsSelection() const -{ - return aBtnSelection.IsChecked(); -} - BOOL ScDataPilotSourceTypeDlg::IsDatabase() const { return aBtnDatabase.IsChecked(); diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index 359e14090..80d35536a 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbnamdlg.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.9.30.2 $ * * This file is part of OpenOffice.org. * @@ -81,7 +81,6 @@ public: rBtnHeader(rHdr), rBtnSize(rSize), rBtnFormat(rFmt), rBtnStrip(rStrip), rCurArea(rArea), bHeader(FALSE), bSize(FALSE), bFormat(FALSE), bDirty(FALSE) {} - void Clear(); void Save(); void Restore(); @@ -105,16 +104,6 @@ private: //---------------------------------------------------------------------------- -void DBSaveData::Clear() -{ - aStr.Erase(); - aArea = ScRange(); - bHeader = bSize = bFormat = bStrip = bDirty = FALSE; -} - - -//---------------------------------------------------------------------------- - void DBSaveData::Save() { aArea = rCurArea; diff --git a/sc/source/ui/dbgui/expftext.cxx b/sc/source/ui/dbgui/expftext.cxx index de79fc07a..dfd15013d 100644 --- a/sc/source/ui/dbgui/expftext.cxx +++ b/sc/source/ui/dbgui/expftext.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: expftext.cxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.32.1 $ * * This file is part of OpenOffice.org. * @@ -40,28 +40,6 @@ #* Member: ScExpandedFixedText Datum:18.09.97 #*------------------------------------------------------------------------ #* -#* Klasse: ScExpandedFixedText -#* -#* Funktion: Konstruktor der Klasse ScExpandedFixedText -#* -#* Input: Parent- Window, Fenster-Attribute -#* -#* Output: --- -#* -#************************************************************************/ - -ScExpandedFixedText::ScExpandedFixedText( Window* pParent, - WinBits nWinStyle) : - - FixedText( pParent, nWinStyle ) -{ - -} - -/************************************************************************* -#* Member: ScExpandedFixedText Datum:18.09.97 -#*------------------------------------------------------------------------ -#* #* Klasse: MD_Test #* #* Funktion: Konstruktor der Klasse SvxCtrDial diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 6e80be58e..24947d8f2 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: pvfundlg.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.32.1 $ * * This file is part of OpenOffice.org. * @@ -162,12 +162,6 @@ ScDPFunctionListBox::ScDPFunctionListBox( Window* pParent, const ResId& rResId ) FillFunctionNames(); } -ScDPFunctionListBox::ScDPFunctionListBox( Window* pParent, WinBits nStyle ) : - MultiListBox( pParent, nStyle ) -{ - FillFunctionNames(); -} - void ScDPFunctionListBox::SetSelection( USHORT nFuncMask ) { if( (nFuncMask == PIVOT_FUNC_NONE) || (nFuncMask == PIVOT_FUNC_AUTO) ) diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx index d67e2e07d..8ed796001 100644 --- a/sc/source/ui/docshell/docfunc.cxx +++ b/sc/source/ui/docshell/docfunc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docfunc.cxx,v $ - * $Revision: 1.70 $ + * $Revision: 1.69.28.2 $ * * This file is part of OpenOffice.org. * diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx index 52a94479e..dbb9df9eb 100644 --- a/sc/source/ui/docshell/docsh.cxx +++ b/sc/source/ui/docshell/docsh.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docsh.cxx,v $ - * $Revision: 1.103 $ + * $Revision: 1.100.30.2 $ * * This file is part of OpenOffice.org. * @@ -241,242 +241,6 @@ SCTAB ScDocShell::GetSaveTab() return nTab; } -//------------------------------------------------------------------ -/* -BOOL ScDocShell::LoadCalc( SotStorage* pStor ) // StarCalc 3, 4 or 5 file -{ - // MacroCallMode is no longer needed, state is kept in SfxObjectShell now - - BOOL bRet = TRUE; - - SotStorageStreamRef aPoolStm = pStor->OpenStream( String::CreateFromAscii(pStyleName), STREAM_STD_READ ); - SotStorageStreamRef aDocStm = pStor->OpenStream( String::CreateFromAscii(pStarCalcDoc), STREAM_STD_READ ); - ULONG nPoolErr = aPoolStm->GetError(); - ULONG nDocErr = aDocStm->GetError(); - - ScProgress* pProgress = NULL; - SfxObjectCreateMode eShellMode = GetCreateMode(); - if ( eShellMode == SFX_CREATE_MODE_STANDARD && !nDocErr ) - { - ULONG nCurPos = aDocStm->Tell(); - ULONG nEndPos = aDocStm->Seek( STREAM_SEEK_TO_END ); - aDocStm->Seek( nCurPos ); - ULONG nRange = nEndPos - nCurPos; - pProgress = new ScProgress( this, ScGlobal::GetRscString(STR_LOAD_DOC), nRange ); - } - - if ( nPoolErr == ERRCODE_IO_NOTEXISTS && nDocErr == ERRCODE_IO_NOTEXISTS ) - { - // leerer Storage = leeres Dokument -> wie InitNew - - aDocument.MakeTable(0); - Size aSize( (long) ( STD_COL_WIDTH * HMM_PER_TWIPS * OLE_STD_CELLS_X ), - (long) ( ScGlobal::nStdRowHeight * HMM_PER_TWIPS * OLE_STD_CELLS_Y ) ); - // hier muss auch der Start angepasst werden - SetVisAreaOrSize( Rectangle( Point(), aSize ), TRUE ); - aDocument.GetStyleSheetPool()->CreateStandardStyles(); - aDocument.UpdStlShtPtrsFrmNms(); - } - else if ( !nPoolErr && !nDocErr ) - { - aPoolStm->SetVersion(pStor->GetVersion()); - aDocStm->SetVersion(pStor->GetVersion()); - - aDocument.Clear(); // keine Referenzen auf Pool behalten! - - RemoveItem( SID_ATTR_CHAR_FONTLIST ); - RemoveItem( ITEMID_COLOR_TABLE ); - RemoveItem( ITEMID_GRADIENT_LIST ); - RemoveItem( ITEMID_HATCH_LIST ); - RemoveItem( ITEMID_BITMAP_LIST ); - RemoveItem( ITEMID_DASH_LIST ); - RemoveItem( ITEMID_LINEEND_LIST ); - - aDocument.LoadPool( *aPoolStm, FALSE ); // FALSE: RefCounts nicht laden - bRet = (aPoolStm->GetError() == 0); - - if ( !bRet ) - { - pStor->SetError( aPoolStm->GetError() ); - DBG_ERROR( "Fehler im Pool-Stream" ); - } - else if (eShellMode != SFX_CREATE_MODE_ORGANIZER) - { - // ViewOptions are not completely stored (to avoid warnings), - // so must be initialized from global settings. - //! This can be removed if a new file format loads all ViewOptions !!! - - aDocument.SetViewOptions( SC_MOD()->GetViewOptions() ); - - ULONG nErrCode = aPoolStm->GetErrorCode(); - const ByteString aStrKey = pStor->GetKey(); - const BOOL bKeySet = (aStrKey.Len() > 0); - - if ( bKeySet ) - aDocStm->SetKey( aStrKey ); // Passwort setzen - - bRet = aDocument.Load( *aDocStm, pProgress ); - - if ( !bRet && bKeySet ) // Passwort falsch - { - SetError( ERRCODE_SFX_WRONGPASSWORD ); - pStor->SetError( ERRCODE_SFX_WRONGPASSWORD ); - } - - if ( aDocStm->GetError() ) - { - // Zeile-8192-Meldung braucht nur zu kommen, wenn die Zeilen - // beschraenkt sind, sonst ist "falsches Format" besser -#ifdef SC_LIMIT_ROWS - if ( aDocument.HasLostData() ) // zuviele Zeilen? - pStor->SetError( SCERR_IMPORT_8K_LIMIT ); - else -#endif - pStor->SetError( aDocStm->GetError() ); - bRet = FALSE; - DBG_ERROR( "Fehler im Document-Stream" ); - } - else - { - if ( !(nErrCode & ERRCODE_WARNING_MASK) ) - nErrCode = aDocStm->GetErrorCode(); - if ( nErrCode & ERRCODE_WARNING_MASK ) - SetError( nErrCode ); - } - - if (bRet) - { - aDocument.UpdateFontCharSet(); - - UpdateLinks(); // verknuepfte Tabellen in Link-Manager - RemoveUnknownObjects(); // unbekannte Ole-Objekte loeschen - } - } - else // SFX_CREATE_MODE_ORGANIZER - { - // UpdateStdNames is called from ScDocument::Load, but is also needed - // if only the styles are loaded! - ScStyleSheetPool* pStylePool = aDocument.GetStyleSheetPool(); - if (pStylePool) - pStylePool->UpdateStdNames(); // correct style names for different languages - } - - if (bRet) - aDocument.GetPool()->MyLoadCompleted(); - } - else - { - DBG_ERROR( "Stream-Fehler"); - bRet = FALSE; - } - - if (!aDocument.HasTable(0)) - aDocument.MakeTable(0); - - if (eShellMode == SFX_CREATE_MODE_EMBEDDED) - { - SCTAB nVisTab = aDocument.GetVisibleTab(); - BOOL bHasVis = aDocument.HasTable(nVisTab); - if ( SfxInPlaceObject::GetVisArea().IsEmpty() || !bHasVis ) - { - if (!bHasVis) - { - nVisTab = 0; - aDocument.SetVisibleTab(nVisTab); - } - SCCOL nStartCol; - SCROW nStartRow; - aDocument.GetDataStart( nVisTab, nStartCol, nStartRow ); - SCCOL nEndCol; - SCROW nEndRow; - aDocument.GetPrintArea( nVisTab, nEndCol, nEndRow ); - if (nStartCol>nEndCol) - nStartCol = nEndCol; - if (nStartRow>nEndRow) - nStartRow = nEndRow; - // hier muss auch der Start angepasst werden - SetVisAreaOrSize( aDocument.GetMMRect( nStartCol,nStartRow, nEndCol,nEndRow, nVisTab ), - TRUE ); - } - } - - delete pProgress; - - return bRet; -} - - -BOOL ScDocShell::SaveCalc( SotStorage* pStor ) // Calc 3, 4 or 5 file -{ - BOOL bRet = TRUE; - - ScProgress* pProgress = NULL; - SfxObjectCreateMode eShellMode = GetCreateMode(); - if ( eShellMode == SFX_CREATE_MODE_STANDARD ) - { - ULONG nRange = aDocument.GetWeightedCount() + 1; - pProgress = new ScProgress( this, ScGlobal::GetRscString(STR_SAVE_DOC), nRange ); - } - - SotStorageStreamRef aPoolStm = pStor->OpenStream( String::CreateFromAscii(pStyleName) ); - if( !aPoolStm->GetError() ) - { - aPoolStm->SetVersion(pStor->GetVersion()); - aPoolStm->SetSize(0); - bRet = aDocument.SavePool( *aPoolStm ); - if ( aPoolStm->GetErrorCode() && !pStor->GetErrorCode() ) - pStor->SetError(aPoolStm->GetErrorCode()); - } - else - { - DBG_ERROR( "Stream Error" ); - bRet = FALSE; - } - - if ( bRet && eShellMode != SFX_CREATE_MODE_ORGANIZER ) - { - SotStorageStreamRef aDocStm = pStor->OpenStream( String::CreateFromAscii(pStarCalcDoc) ); - if( !aDocStm->GetError() ) - { - aDocStm->SetVersion(pStor->GetVersion()); - aDocStm->SetKey(pStor->GetKey()); // Passwort setzen - aDocStm->SetSize(0); - bRet = aDocument.Save( *aDocStm, pProgress ); - DBG_ASSERT( bRet, "Error while saving" ); - - if ( aDocument.HasLostData() ) - { - // Warnung, dass nicht alles gespeichert wurde - - if (!pStor->GetError()) - pStor->SetError(SCWARN_EXPORT_MAXROW); - } - else if ( aDocStm->GetErrorCode() && !pStor->GetErrorCode() ) - pStor->SetError(aDocStm->GetErrorCode()); - else if ( SvtFilterOptions::Get()->IsLoadExcelBasicStorage() ) - { - // #75497# warning if MS VBA macros are lost - // GetSaveWarningOfMSVBAStorage checks if sub-storage with VBA macros is present - // (only possible when editing Excel documents -- storage is not copied to - // StarCalc files) - ULONG nVBAWarn = SvxImportMSVBasic::GetSaveWarningOfMSVBAStorage( *this ); - if ( nVBAWarn && !pStor->GetErrorCode() ) - pStor->SetError( nVBAWarn ); - } - } - else - { - DBG_ERROR( "Stream Error" ); - bRet = FALSE; - } - } - - delete pProgress; - - return bRet; -} -*/ - sal_uInt16 ScDocShell::GetHiddenInformationState( sal_uInt16 nStates ) { // get global state like HIDDENINFORMATION_DOCUMENTVERSIONS diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index 28533b6ff..c3a429980 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docsh2.cxx,v $ - * $Revision: 1.25 $ + * $Revision: 1.25.32.1 $ * * This file is part of OpenOffice.org. * @@ -240,54 +240,3 @@ ScDrawLayer* ScDocShell::MakeDrawLayer() } return pDrawLayer; } - -//------------------------------------------------------------------ - - -void ScDocShell::RemoveUnknownObjects() -{ - // OLE-Objekte loeschen, wenn kein Drawing-Objekt dazu existiert - // Loeschen wie in SvPersist::CleanUp - - ScDrawLayer* pDrawLayer = aDocument.GetDrawLayer(); - uno::Sequence < rtl::OUString > aNames = GetEmbeddedObjectContainer().GetObjectNames(); - - for( sal_Int32 i=0; i<aNames.getLength(); i++ ) - { - String aObjName = aNames[i]; - BOOL bFound = FALSE; - if ( pDrawLayer ) - { - SCTAB nTabCount = static_cast<sal_Int16>(pDrawLayer->GetPageCount()); - for (SCTAB nTab=0; nTab<nTabCount && !bFound; nTab++) - { - SdrPage* pPage = pDrawLayer->GetPage(static_cast<sal_uInt16>(nTab)); - DBG_ASSERT(pPage,"Page ?"); - if (pPage) - { - SdrObjListIter aIter( *pPage, IM_DEEPNOGROUPS ); - SdrObject* pObject = aIter.Next(); - while (pObject && !bFound) - { - // name from InfoObject is PersistName - if ( pObject->ISA(SdrOle2Obj) && - static_cast<SdrOle2Obj*>(pObject)->GetPersistName() == aObjName ) - bFound = TRUE; - pObject = aIter.Next(); - } - } - } - } - - if (!bFound) - { - //TODO/LATER: hacks not supported anymore - //DBG_ASSERT(pEle->GetRefCount()==2, "Loeschen von referenziertem Storage"); - GetEmbeddedObjectContainer().RemoveEmbeddedObject( aObjName ); - } - else - i++; - } -} - - diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index e97b20d62..7ee2110c3 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docsh3.cxx,v $ - * $Revision: 1.38 $ + * $Revision: 1.37.32.2 $ * * This file is part of OpenOffice.org. * @@ -1172,19 +1172,6 @@ void ScDocShell::MergeDocument( ScDocument& rOtherDoc, bool bShared, bool bCheck UnlockPaint(); } -void lcl_MergeActionStates( ScChangeTrack* pOwnTrack, ScChangeTrack* pSharedTrack ) -{ - BOOL bIgnore100Sec = !pOwnTrack->IsTime100thSeconds() || !pSharedTrack->IsTime100thSeconds(); - ScChangeAction* pOwnAction = pOwnTrack->GetFirst(); - ScChangeAction* pSharedAction = pSharedTrack->GetFirst(); - while ( lcl_Equal( pOwnAction, pSharedAction, bIgnore100Sec ) ) - { - pOwnTrack->MergeActionState( pOwnAction, pSharedAction ); - pOwnAction = pOwnAction->GetNext(); - pSharedAction = pSharedAction->GetNext(); - } -} - bool ScDocShell::MergeSharedDocument( ScDocShell* pSharedDocShell ) { if ( !pSharedDocShell ) diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 462aa24a6..78eeb5ed6 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docsh4.cxx,v $ - * $Revision: 1.64 $ + * $Revision: 1.61.30.2 $ * * This file is part of OpenOffice.org. * @@ -147,36 +147,6 @@ using namespace ::com::sun::star; //------------------------------------------------------------------ -BOOL ScDocShell::GetTabParam( const SfxItemSet* pArgs, USHORT nId, SCTAB& rTab ) -{ - BOOL bOk = TRUE; - rTab = 0; // zur Sicherheit... - - const SfxPoolItem* pTabItem; - if ( pArgs && pArgs->GetItemState( nId, TRUE, &pTabItem ) == SFX_ITEM_SET ) - { - // Parameter sind 1-based !!! - SCTAB nItemTab = ((const SfxUInt16Item*)pTabItem)->GetValue(); - SCTAB nTabCount = aDocument.GetTableCount(); - if (nItemTab>0 && nItemTab<=nTabCount) - rTab = nItemTab-1; - else - bOk = FALSE; - } - else // nichts angegeben -> sichtbare - { - ScTabViewShell* pVisibleSh = GetBestViewShell(); - if ( pVisibleSh ) - rTab = pVisibleSh->GetViewData()->GetTabNo(); - else - bOk = FALSE; - } - - return bOk; -} - -//------------------------------------------------------------------ - void ScDocShell::Execute( SfxRequest& rReq ) { // SID_SC_RANGE (Range), diff --git a/sc/source/ui/docshell/docsh5.cxx b/sc/source/ui/docshell/docsh5.cxx index 01c381117..fff3837f2 100644 --- a/sc/source/ui/docshell/docsh5.cxx +++ b/sc/source/ui/docshell/docsh5.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docsh5.cxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.20.30.2 $ * * This file is part of OpenOffice.org. * @@ -402,10 +402,12 @@ void ScDocShell::UpdateAllRowHeights() aDocument.UpdateAllRowHeights( aProv.GetDevice(), aProv.GetPPTX(), aProv.GetPPTY(), aZoom, aZoom ); } +#if OLD_PIVOT_IMPLEMENTATION void ScDocShell::PivotUpdate( ScPivot*, ScPivot*, BOOL, BOOL ) { DBG_ERRORFILE("PivotUpdate is obsolete!"); } +#endif void ScDocShell::RefreshPivotTables( const ScRange& rSource ) { diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx index 90362d104..50df646e5 100644 --- a/sc/source/ui/docshell/docsh8.cxx +++ b/sc/source/ui/docshell/docsh8.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docsh8.cxx,v $ - * $Revision: 1.28 $ + * $Revision: 1.27.32.2 $ * * This file is part of OpenOffice.org. * @@ -192,44 +192,6 @@ BOOL ScDocShell::IsDocument( const INetURLObject& rURL ) // ----------------------------------------------------------------------- -long lcl_GetRowCount( const uno::Reference<sdbc::XConnection>& xConnection, - const String& rTabName ) -{ - try - { - uno::Reference<sdbc::XStatement> xStatement = xConnection->createStatement(); - DBG_ASSERT( xStatement.is(), "can't get Statement" ); - if (!xStatement.is()) return SC_ROWCOUNT_ERROR; - - String aQuoteStr; - uno::Reference<sdbc::XDatabaseMetaData> xDBMeta = xConnection->getMetaData(); - if (xDBMeta.is()) - aQuoteStr = xDBMeta->getIdentifierQuoteString(); - - String aSql = String::CreateFromAscii("SELECT COUNT ( * ) FROM "); - aSql += aQuoteStr; - aSql += rTabName; - aSql += aQuoteStr; - - uno::Reference<sdbc::XResultSet> xResSet = xStatement->executeQuery( aSql ); - uno::Reference<sdbc::XRow> xRow( xResSet, uno::UNO_QUERY ); - DBG_ASSERT( xRow.is(), "can't get Row" ); - if (!xRow.is()) return SC_ROWCOUNT_ERROR; - - if ( xResSet->next() ) - return xRow->getInt( 1 ); - } - catch ( sdbc::SQLException& ) - { - } - catch ( uno::Exception& ) - { - DBG_ERROR("Unexpected exception in database"); - } - - return SC_ROWCOUNT_ERROR; -} - ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet, BOOL bSimpleColWidth[MAXCOLCOUNT] ) { @@ -281,7 +243,6 @@ ULONG ScDocShell::DBaseImport( const String& rFullFileName, CharSet eCharSet, DBG_ASSERT( xConnection.is(), "can't get Connection" ); if (!xConnection.is()) return SCERR_IMPORT_CONNECT; -//! long nRowCount = lcl_GetRowCount( xConnection, aTabName ); long nRowCount = 0; if ( nRowCount < 0 ) { diff --git a/sc/source/ui/docshell/editable.cxx b/sc/source/ui/docshell/editable.cxx index 21224b12d..21d6c2cd6 100644 --- a/sc/source/ui/docshell/editable.cxx +++ b/sc/source/ui/docshell/editable.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: editable.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.1 $ * * This file is part of OpenOffice.org. * @@ -46,11 +46,6 @@ ScEditableTester::ScEditableTester() : { } -void ScEditableTester::Reset() -{ - bIsEditable = bOnlyMatrix = TRUE; -} - ScEditableTester::ScEditableTester( ScDocument* pDoc, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) : bIsEditable( TRUE ), diff --git a/sc/source/ui/docshell/tablink.cxx b/sc/source/ui/docshell/tablink.cxx index a882bc1c4..d2655c39f 100644 --- a/sc/source/ui/docshell/tablink.cxx +++ b/sc/source/ui/docshell/tablink.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tablink.cxx,v $ - * $Revision: 1.31 $ + * $Revision: 1.31.32.1 $ * * This file is part of OpenOffice.org. * @@ -311,7 +311,6 @@ BOOL ScTableLink::Refresh(const String& rNewFile, const String& rNewFilter, else { pDoc->DeleteAreaTab( 0,0,MAXCOL,MAXROW, nTab, IDF_ALL ); -// pDoc->ClearDrawPage(nTab); bool bShowError = true; if ( nMode == SC_LINK_VALUE ) diff --git a/sc/source/ui/formdlg/formdata.cxx b/sc/source/ui/formdlg/formdata.cxx index f99415cca..c6ff11905 100644 --- a/sc/source/ui/formdlg/formdata.cxx +++ b/sc/source/ui/formdlg/formdata.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: formdata.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.1 $ * * This file is part of OpenOffice.org. * @@ -93,17 +93,5 @@ void ScFormEditData::SaveValues() pParent = pTemp; } -void ScFormEditData::RestoreValues() -{ - ScFormEditData* pTemp = pParent; - DBG_ASSERT(pTemp,"RestoreValues ohne Parent"); - if (pTemp) - { - *this = *pTemp; - pTemp->pParent = NULL; // sonst wird der auch geloescht! - delete pTemp; - } -} - diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx index 52b8fbeaf..225e976d4 100644 --- a/sc/source/ui/formdlg/formula.cxx +++ b/sc/source/ui/formdlg/formula.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: formula.cxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.18.30.3 $ * * This file is part of OpenOffice.org. * @@ -763,72 +763,26 @@ IMPL_LINK( ScFormulaDlg, BtnHdl, PushButton*, pBtn ) // Funktionen fuer 1. Seite // -------------------------------------------------------------------------- -void ScFormulaDlg::ResizeArgArr( const ScFuncDesc* pNewFunc ) -{ - if ( pFuncDesc != pNewFunc ) - { - DeleteArgs(); - - if ( pNewFunc ) - { - nArgs = pNewFunc->GetSuppressedArgCount(); - if ( nArgs > 0 ) - { - pArgArr = new String*[nArgs]; - for ( USHORT i=0; i<nArgs; i++ ) - pArgArr[i] = new String; - } - } - - pFuncDesc = pNewFunc; - } -} - -void ScFormulaDlg::UpdateFunctionDesc() -{ - ScModule* pScMod = SC_MOD(); - - ScFormEditData* pData = pScMod->GetFormEditData(); - if (!pData) return; - USHORT nCat = pScFuncPage->GetCategory(); - if ( nCat == LISTBOX_ENTRY_NOTFOUND ) nCat = 0; - pData->SetCatSel( nCat ); - USHORT nFunc = pScFuncPage->GetFunction(); - if ( nFunc == LISTBOX_ENTRY_NOTFOUND ) nFunc = 0; - pData->SetFuncSel( nFunc ); - - if ( (pScFuncPage->GetFunctionEntryCount() > 0) - && (pScFuncPage->GetFunction() != LISTBOX_ENTRY_NOTFOUND) ) - { - const ScFuncDesc* pDesc =pScFuncPage->GetFuncDesc( - pScFuncPage->GetFunction() ); - if (pDesc) - { - pDesc->InitArgumentInfo(); // full argument info is needed - - String aSig = pDesc->GetSignature(); - - aFtFuncName.SetText( aSig ); - if(pDesc->pFuncDesc) - aFtFuncDesc.SetText( *(pDesc->pFuncDesc) ); - else - aFtFuncDesc.SetText(EMPTY_STRING ); - ResizeArgArr( pDesc ); - - if ( pArgArr && pArgArr[0] && pArgArr[0]->Len() ) // noch Argumente da? - aSig = pDesc->GetFormulaString( pArgArr ); // fuer Eingabezeile - //@ pScMod->InputReplaceSelection( aSig ); - } - } - else - { - aFtFuncName.SetText( EMPTY_STRING ); - aFtFuncDesc.SetText( EMPTY_STRING ); - - //ResizeArgArr( NULL ); - pScMod->InputReplaceSelection( EMPTY_STRING ); - } -} +//UNUSED2008-05 void ScFormulaDlg::ResizeArgArr( const ScFuncDesc* pNewFunc ) +//UNUSED2008-05 { +//UNUSED2008-05 if ( pFuncDesc != pNewFunc ) +//UNUSED2008-05 { +//UNUSED2008-05 DeleteArgs(); +//UNUSED2008-05 +//UNUSED2008-05 if ( pNewFunc ) +//UNUSED2008-05 { +//UNUSED2008-05 nArgs = pNewFunc->GetSuppressedArgCount(); +//UNUSED2008-05 if ( nArgs > 0 ) +//UNUSED2008-05 { +//UNUSED2008-05 pArgArr = new String*[nArgs]; +//UNUSED2008-05 for ( USHORT i=0; i<nArgs; i++ ) +//UNUSED2008-05 pArgArr[i] = new String; +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 pFuncDesc = pNewFunc; +//UNUSED2008-05 } +//UNUSED2008-05 } // Handler fuer Listboxen @@ -993,65 +947,20 @@ void ScFormulaDlg::EditNextFunc( BOOL bForward, xub_StrLen nFStart ) } } -void ScFormulaDlg::EditFuncParas(xub_StrLen nEditPos) -{ - if(pFuncDesc!=NULL) - { - ScModule* pScMod = SC_MOD(); - ScFormEditData* pData = pScMod->GetFormEditData(); - if (!pData) return; - - String aFormula = pScMod->InputGetFormulaStr(); - aFormula +=')'; - xub_StrLen nFStart = pData->GetFStart(); - - DeleteArgs(); - - nArgs = pFuncDesc->GetSuppressedArgCount(); - - xub_StrLen nArgPos=ScFormulaUtil::GetArgStart( aFormula, nFStart, 0 ); - pArgArr = ScFormulaUtil::GetArgStrings( aFormula, nFStart, nArgs ); - - USHORT nActiv=aScParaWin.GetSliderPos(); - BOOL bFlag=FALSE; - for(USHORT i=0;i<nArgs;i++) - { - xub_StrLen nLength=(pArgArr[i])->Len(); - aScParaWin.SetArgument(i,*(pArgArr[i])); - if(nArgPos<=nEditPos && nEditPos<nArgPos+nLength) - { - nActiv=i; - bFlag=TRUE; - } - nArgPos+=nLength+1; - } - - if(bFlag) - { - aScParaWin.SetSliderPos(nActiv); - } - - aScParaWin.UpdateParas(); - UpdateValues(); - } - -} - - -IMPL_LINK( ScFormulaDlg, ScrollHdl, ScParaWin*, EMPTYARG ) -{ - ScModule* pScMod = SC_MOD(); - ScFormEditData* pData = pScMod->GetFormEditData(); - if (!pData) return 0; - USHORT nOffset = aScParaWin.GetSliderPos(); - pData->SetOffset( nOffset ); - - aScParaWin.UpdateParas(); - - UpdateValues(); - - return 0; -} +//UNUSED2008-05 IMPL_LINK( ScFormulaDlg, ScrollHdl, ScParaWin*, EMPTYARG ) +//UNUSED2008-05 { +//UNUSED2008-05 ScModule* pScMod = SC_MOD(); +//UNUSED2008-05 ScFormEditData* pData = pScMod->GetFormEditData(); +//UNUSED2008-05 if (!pData) return 0; +//UNUSED2008-05 USHORT nOffset = aScParaWin.GetSliderPos(); +//UNUSED2008-05 pData->SetOffset( nOffset ); +//UNUSED2008-05 +//UNUSED2008-05 aScParaWin.UpdateParas(); +//UNUSED2008-05 +//UNUSED2008-05 UpdateValues(); +//UNUSED2008-05 +//UNUSED2008-05 return 0; +//UNUSED2008-05 } BOOL ScFormulaDlg::CalcValue( const String& rStrExp, String& rStrResult ) { diff --git a/sc/source/ui/formdlg/funcpage.cxx b/sc/source/ui/formdlg/funcpage.cxx index 2c19263e1..bd73e9d21 100644 --- a/sc/source/ui/formdlg/funcpage.cxx +++ b/sc/source/ui/formdlg/funcpage.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: funcpage.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.1 $ * * This file is part of OpenOffice.org. * @@ -58,10 +58,6 @@ //============================================================================ -ScListBox::ScListBox( Window* pParent, WinBits nWinStyle): - ListBox(pParent,nWinStyle) -{} - ScListBox::ScListBox( Window* pParent, const ResId& rResId ): ListBox(pParent,rResId) {} diff --git a/sc/source/ui/formdlg/funcutl.cxx b/sc/source/ui/formdlg/funcutl.cxx index 695ff8879..bc4d20860 100644 --- a/sc/source/ui/formdlg/funcutl.cxx +++ b/sc/source/ui/formdlg/funcutl.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: funcutl.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.9.32.2 $ * * This file is part of OpenOffice.org. * @@ -345,46 +345,6 @@ void ArgInput::SetArgSelection (const Selection& rSel ) } /************************************************************************* -#* Member: SetArgSelection Datum:13.01.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: ArgInput -#* -#* Funktion: Liefert die Selection fuer die EditBox zurueck. -#* -#* Input: String -#* -#* Output: --- -#* -#************************************************************************/ -Selection ArgInput::GetArgSelection () -{ - Selection aSel; - if(pEdArg !=NULL) aSel=pEdArg ->GetSelection(); - return aSel; -} - -/************************************************************************* -#* Member: SetArgSelection Datum:13.01.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: ArgInput -#* -#* Funktion: Ersetzt die Selection in der EditBox. -#* -#* Input: String -#* -#* Output: --- -#* -#************************************************************************/ -void ArgInput::ReplaceSelOfArg(const String& rStr ) -{ - if(pEdArg !=NULL) pEdArg ->ReplaceSelected(rStr ); -} - - - -/************************************************************************* #* Member: SetArgVal Datum:13.01.97 #*------------------------------------------------------------------------ #* @@ -712,29 +672,6 @@ IMPL_LINK( ArgInput, EdModifyHdl,ArgEdit*, pEd ) #* #* Funktion: Konstruktor der Klasse ArgInput #* -#* Input: Parent, Window-Style -#* -#* Output: --- -#* -#************************************************************************/ -ScEditBox::ScEditBox( Window* pParent,WinBits nWinStyle) - :Control(pParent,nWinStyle|WB_DIALOGCONTROL) -{ - pMEdit=new MultiLineEdit(this,WB_LEFT | WB_VSCROLL | nWinStyle & WB_TABSTOP| - WB_NOBORDER | WB_NOHIDESELECTION |WB_IGNORETAB); - - pMEdit->Show(); - aOldSel=pMEdit->GetSelection(); -} - -/************************************************************************* -#* Member: ScEditBox Datum:20.01.97 -#*------------------------------------------------------------------------ -#* -#* Klasse: ScEditBox -#* -#* Funktion: Konstruktor der Klasse ArgInput -#* #* Input: Parent, Resource #* #* Output: --- diff --git a/sc/source/ui/inc/AccessibleContextBase.hxx b/sc/source/ui/inc/AccessibleContextBase.hxx index 9dcd73909..c504b1e52 100644 --- a/sc/source/ui/inc/AccessibleContextBase.hxx +++ b/sc/source/ui/inc/AccessibleContextBase.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleContextBase.hxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.23.32.1 $ * * This file is part of OpenOffice.org. * @@ -303,9 +303,6 @@ public: ChangeName(); protected: - /// Calls all Listener to tell they that the object is now DEFUNC - void CommitDefunc() const; - /// Calls all FocusListener to tell they that the focus is gained. void CommitFocusGained() const; diff --git a/sc/source/ui/inc/AccessibleCsvControl.hxx b/sc/source/ui/inc/AccessibleCsvControl.hxx index 39bd98b20..4c0f3f8b1 100644 --- a/sc/source/ui/inc/AccessibleCsvControl.hxx +++ b/sc/source/ui/inc/AccessibleCsvControl.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleCsvControl.hxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.15.32.2 $ * * This file is part of OpenOffice.org. * @@ -136,8 +136,6 @@ protected: /** Disposes the object. This is a helper called from destructors only. */ void implDispose(); - /** Converts the screen position rPos to a position relative to this control. */ - Point implGetRelPos( const Point& rPos ) const; /** Converts the control-relative position to an absolute screen position. */ Point implGetAbsPos( const Point& rPos ) const; }; diff --git a/sc/source/ui/inc/AccessiblePreviewCell.hxx b/sc/source/ui/inc/AccessiblePreviewCell.hxx index bf0db678d..fb845fca6 100644 --- a/sc/source/ui/inc/AccessiblePreviewCell.hxx +++ b/sc/source/ui/inc/AccessiblePreviewCell.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessiblePreviewCell.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.32.1 $ * * This file is part of OpenOffice.org. * @@ -115,9 +115,6 @@ private: sal_Bool IsOpaque( const com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); - sal_Bool IsSelected( - const com::sun::star::uno::Reference< - ::com::sun::star::accessibility::XAccessibleStateSet>& rxParentStates); void CreateTextHelper(); diff --git a/sc/source/ui/inc/AccessibleText.hxx b/sc/source/ui/inc/AccessibleText.hxx index f89004c05..1b442307d 100644 --- a/sc/source/ui/inc/AccessibleText.hxx +++ b/sc/source/ui/inc/AccessibleText.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: AccessibleText.hxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.19.32.1 $ * * This file is part of OpenOffice.org. * @@ -204,7 +204,7 @@ public: virtual SvxViewForwarder* GetViewForwarder(); virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; } - DECL_LINK( NotifyHdl, EENotify* ); +//UNUSED2008-05 DECL_LINK( NotifyHdl, EENotify* ); private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; @@ -234,7 +234,7 @@ public: virtual SvxViewForwarder* GetViewForwarder(); virtual SvxEditViewForwarder* GetEditViewForwarder( sal_Bool /* bCreate */ ) { return NULL; } - DECL_LINK( NotifyHdl, EENotify* ); +//UNUSED2008-05 DECL_LINK( NotifyHdl, EENotify* ); private: ScPreviewViewForwarder* mpViewForwarder; ScPreviewShell* mpViewShell; diff --git a/sc/source/ui/inc/acredlin.hxx b/sc/source/ui/inc/acredlin.hxx index 9ff2a5b8c..6ea7b8f51 100644 --- a/sc/source/ui/inc/acredlin.hxx +++ b/sc/source/ui/inc/acredlin.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: acredlin.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.32.1 $ * * This file is part of OpenOffice.org. * @@ -176,7 +176,7 @@ private: void Init(); void InitFilter(); - void SetMyStaticData(); +//UNUSED2008-05 void SetMyStaticData(); DECL_LINK( FilterHandle, SvxTPFilter* ); DECL_LINK( RefHandle, SvxTPFilter* ); diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx index f11b39580..9ad0a4663 100644 --- a/sc/source/ui/inc/anyrefdg.hxx +++ b/sc/source/ui/inc/anyrefdg.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: anyrefdg.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.32.2 $ * * This file is part of OpenOffice.org. * @@ -81,7 +81,7 @@ public: void StartUpdateData(); - void SilentGrabFocus(); // does not update any references +//UNUSED2008-05 void SilentGrabFocus(); // does not update any references void SetRefDialog( ScAnyRefDlg* pDlg ); inline ScAnyRefDlg* GetRefDialog() { return pAnyRefDlg; } diff --git a/sc/source/ui/inc/conflictsdlg.hxx b/sc/source/ui/inc/conflictsdlg.hxx index 5eb8bc8e8..54b825900 100644 --- a/sc/source/ui/inc/conflictsdlg.hxx +++ b/sc/source/ui/inc/conflictsdlg.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: conflictsdlg.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.32.1 $ * * This file is part of OpenOffice.org. * @@ -85,7 +85,7 @@ private: static void Transform_Impl( ScChangeActionList& rActionList, ScChangeActionMergeMap* pMergeMap ); public: - static bool HasSharedAction( ScConflictsList& rConflictsList, ULONG nSharedAction ); +//UNUSED2008-05 static bool HasSharedAction( ScConflictsList& rConflictsList, ULONG nSharedAction ); static bool HasOwnAction( ScConflictsList& rConflictsList, ULONG nOwnAction ); static ScConflictsListEntry* GetSharedActionEntry( ScConflictsList& rConflictsList, ULONG nSharedAction ); @@ -151,11 +151,11 @@ class ScConflictsListBox: public SvxRedlinTable private: public: - ScConflictsListBox( Window* pParent, WinBits nBits = WB_BORDER ); +//UNUSED2008-05 ScConflictsListBox( Window* pParent, WinBits nBits = WB_BORDER ); ScConflictsListBox( Window* pParent, const ResId& rResId ); ~ScConflictsListBox(); - ULONG GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const; +//UNUSED2008-05 ULONG GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const; }; //============================================================================= diff --git a/sc/source/ui/inc/content.hxx b/sc/source/ui/inc/content.hxx index 214d061d1..5e5d911d4 100644 --- a/sc/source/ui/inc/content.hxx +++ b/sc/source/ui/inc/content.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: content.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.32.1 $ * * This file is part of OpenOffice.org. * @@ -113,7 +113,7 @@ class ScContentTree : public SvTreeListBox ULONG GetChildIndex( SvLBoxEntry* pEntry ) const; void DoDrag(); - void AdjustTitle(); +//UNUSED2008-05 void AdjustTitle(); ScDocument* GetSourceDocument(); diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index 204cfd833..d405a8bad 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dapitype.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.32.1 $ * * This file is part of OpenOffice.org. * @@ -57,7 +57,6 @@ public: ScDataPilotSourceTypeDlg( Window* pParent, BOOL bEnableExternal ); ~ScDataPilotSourceTypeDlg(); - BOOL IsSelection() const; BOOL IsDatabase() const; BOOL IsExternal() const; }; diff --git a/sc/source/ui/inc/dbfunc.hxx b/sc/source/ui/inc/dbfunc.hxx index 9169ac4c6..76e52f3ac 100644 --- a/sc/source/ui/inc/dbfunc.hxx +++ b/sc/source/ui/inc/dbfunc.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbfunc.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.11.30.2 $ * * This file is part of OpenOffice.org. * @@ -55,7 +55,7 @@ private: public: ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); - ScDBFunc( Window* pParent, const ScDBFunc& rDBFunc, ScTabViewShell* pViewShell ); +//UNUSED2008-05 ScDBFunc( Window* pParent, const ScDBFunc& rDBFunc, ScTabViewShell* pViewShell ); ~ScDBFunc(); // nur UISort wiederholt bei Bedarf die Teilergebnisse diff --git a/sc/source/ui/inc/docfunc.hxx b/sc/source/ui/inc/docfunc.hxx index afcee9cb6..e38479dbf 100644 --- a/sc/source/ui/inc/docfunc.hxx +++ b/sc/source/ui/inc/docfunc.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docfunc.hxx,v $ - * $Revision: 1.19 $ + * $Revision: 1.18.30.2 $ * * This file is part of OpenOffice.org. * diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx index b19633ff0..df125c399 100644 --- a/sc/source/ui/inc/docsh.hxx +++ b/sc/source/ui/inc/docsh.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docsh.hxx,v $ - * $Revision: 1.50 $ + * $Revision: 1.50.32.2 $ * * This file is part of OpenOffice.org. * @@ -59,7 +59,9 @@ class INetURLObject; class ScPaintItem; class ScViewData; class ScDocFunc; +#if OLD_PIVOT_IMPLEMENTATION class ScPivot; +#endif class ScDrawLayer; class ScTabViewShell; class ScSbxDocHelper; @@ -133,15 +135,10 @@ class SC_DLLPUBLIC ScDocShell: public SfxObjectShell, public SfxListener SC_DLLPRIVATE void InitOptions(); SC_DLLPRIVATE void ResetDrawObjectShell(); - SC_DLLPRIVATE BOOL GetTabParam( const SfxItemSet* pArgs, USHORT nId, SCTAB& rTab ); - //BOOL LoadCalc( SotStorage* pStor ); - //BOOL SaveCalc( SotStorage* pStor ); SC_DLLPRIVATE BOOL LoadXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); SC_DLLPRIVATE BOOL SaveXML( SfxMedium* pMedium, const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& ); SC_DLLPRIVATE SCTAB GetSaveTab(); - SC_DLLPRIVATE void RemoveUnknownObjects(); - SC_DLLPRIVATE ULONG DBaseImport( const String& rFullFileName, CharSet eCharSet, BOOL bSimpleColWidth[MAXCOLCOUNT] ); SC_DLLPRIVATE ULONG DBaseExport( const String& rFullFileName, CharSet eCharSet, @@ -281,8 +278,10 @@ public: BOOL AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ); void UpdateAllRowHeights(); +#if OLD_PIVOT_IMPLEMENTATION void PivotUpdate( ScPivot* pOldPivot, ScPivot* pNewPivot, BOOL bRecord = TRUE, BOOL bApi = FALSE ); +#endif void RefreshPivotTables( const ScRange& rSource ); void DoConsolidate( const ScConsolidateParam& rParam, BOOL bRecord = TRUE ); void UseScenario( SCTAB nTab, const String& rName, BOOL bRecord = TRUE ); diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx index 84d70583a..fdbc59b94 100644 --- a/sc/source/ui/inc/drawview.hxx +++ b/sc/source/ui/inc/drawview.hxx @@ -67,7 +67,6 @@ protected: public: ScDrawView( OutputDevice* pOut, ScViewData* pData ); - ScDrawView( OutputDevice* pOut, ScDocument* pDocument, SCTAB nTable ); virtual ~ScDrawView(); virtual void MarkListHasChanged(); @@ -112,7 +111,7 @@ public: void SetMarkedOriginalSize(); BOOL SelectObject( const String& rName ); - String GetSelectedChartName() const; +//UNUSED2008-05 String GetSelectedChartName() const; BOOL HasMarkedControl() const; FASTBOOL InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions=0); diff --git a/sc/source/ui/inc/editable.hxx b/sc/source/ui/inc/editable.hxx index 5e768d37f..8c0a5227d 100644 --- a/sc/source/ui/inc/editable.hxx +++ b/sc/source/ui/inc/editable.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: editable.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.32.1 $ * * This file is part of OpenOffice.org. * @@ -80,8 +80,6 @@ public: void TestSelection( ScDocument* pDoc, const ScMarkData& rMark ); void TestView( ScViewFunc* pView ); - void Reset(); - BOOL IsEditable() const { return bIsEditable; } BOOL IsFormatEditable() const { return bIsEditable || bOnlyMatrix; } USHORT GetMessageId() const; diff --git a/sc/source/ui/inc/editfield.hxx b/sc/source/ui/inc/editfield.hxx index 8f00e08ec..e6f492ecc 100644 --- a/sc/source/ui/inc/editfield.hxx +++ b/sc/source/ui/inc/editfield.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: editfield.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.32.1 $ * * This file is part of OpenOffice.org. * @@ -39,7 +39,6 @@ class ScDoubleField : public Edit { public: - explicit ScDoubleField( Window* pParent, WinBits nStyle = WB_BORDER ); explicit ScDoubleField( Window* pParent, const ResId& rResId ); bool GetValue( double& rfValue ) const; diff --git a/sc/source/ui/inc/expftext.hxx b/sc/source/ui/inc/expftext.hxx index 9818f9ddc..552944bdb 100644 --- a/sc/source/ui/inc/expftext.hxx +++ b/sc/source/ui/inc/expftext.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: expftext.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.32.1 $ * * This file is part of OpenOffice.org. * @@ -41,8 +41,6 @@ class SC_DLLPUBLIC ScExpandedFixedText: public FixedText void RequestHelp( const HelpEvent& rHEvt ); public: - - ScExpandedFixedText( Window* pParent,WinBits nWinStyle = 0); ScExpandedFixedText( Window* pWindow, const ResId& rResId); }; diff --git a/sc/source/ui/inc/formatsh.hxx b/sc/source/ui/inc/formatsh.hxx index 2838dcd3a..37f386e71 100644 --- a/sc/source/ui/inc/formatsh.hxx +++ b/sc/source/ui/inc/formatsh.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: formatsh.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.1 $ * * This file is part of OpenOffice.org. * @@ -71,9 +71,6 @@ public: void ExecuteStyle( SfxRequest& rReq ); void GetStyleState( SfxItemSet& rSet ); - void ExecBckCol( SfxRequest& rReq ); - void GetBckColState( SfxItemSet& rSet ); - void ExecuteTextDirection( SfxRequest& rReq ); void GetTextDirectionState( SfxItemSet& rSet ); diff --git a/sc/source/ui/inc/formdata.hxx b/sc/source/ui/inc/formdata.hxx index 8e5ce220b..83837d4ca 100644 --- a/sc/source/ui/inc/formdata.hxx +++ b/sc/source/ui/inc/formdata.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: formdata.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.32.1 $ * * This file is part of OpenOffice.org. * @@ -46,7 +46,6 @@ public: ~ScFormEditData(); void SaveValues(); - void RestoreValues(); BOOL HasParent() const { return pParent != NULL; } USHORT GetMode() const { return nMode; } diff --git a/sc/source/ui/inc/formula.hxx b/sc/source/ui/inc/formula.hxx index ab7fb8778..fc5e0e360 100644 --- a/sc/source/ui/inc/formula.hxx +++ b/sc/source/ui/inc/formula.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: formula.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.2 $ * * This file is part of OpenOffice.org. * @@ -181,8 +181,6 @@ private: void FillDialog(BOOL nFlag=TRUE); void EditNextFunc( BOOL bForward, xub_StrLen nFStart=NOT_FOUND ); void EditThisFunc(xub_StrLen nFStart); - void EditFuncParas(xub_StrLen nEditPos); - void UpdateArgInput( USHORT nOffset, USHORT nInput ); BOOL CalcValue( const String& rStrExp, String& rStrResult ); @@ -192,8 +190,7 @@ private: void SaveArg( USHORT nEd ); void UpdateSelection(); void DoEnter( BOOL bOk ); - void UpdateFunctionDesc(); - void ResizeArgArr( const ScFuncDesc* pNewFunc ); +//UNUSED2008-05 void ResizeArgArr( const ScFuncDesc* pNewFunc ); void FillListboxes(); void FillControls(); @@ -202,7 +199,7 @@ private: ScRefEdit* GetCurrRefEdit(); - DECL_LINK( ScrollHdl, ScParaWin* ); +//UNUSED2008-05 DECL_LINK( ScrollHdl, ScParaWin* ); DECL_LINK( ModifyHdl, ScParaWin* ); DECL_LINK( FxHdl, ScParaWin* ); diff --git a/sc/source/ui/inc/funcpage.hxx b/sc/source/ui/inc/funcpage.hxx index 25a940ffe..231c25753 100644 --- a/sc/source/ui/inc/funcpage.hxx +++ b/sc/source/ui/inc/funcpage.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: funcpage.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.32.1 $ * * This file is part of OpenOffice.org. * @@ -72,10 +72,7 @@ protected: virtual long PreNotify( NotifyEvent& rNEvt ); public: - ScListBox( Window* pParent, WinBits nWinStyle = WB_BORDER ); - ScListBox( Window* pParent, const ResId& rResId ); - }; diff --git a/sc/source/ui/inc/funcutl.hxx b/sc/source/ui/inc/funcutl.hxx index d5377b874..52d0af505 100644 --- a/sc/source/ui/inc/funcutl.hxx +++ b/sc/source/ui/inc/funcutl.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: funcutl.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.2 $ * * This file is part of OpenOffice.org. * @@ -82,8 +82,6 @@ protected: public: - ScEditBox( Window* pParent, - WinBits nWinStyle = WB_LEFT | WB_BORDER ); ScEditBox( Window* pParent, const ResId& rResId ); ~ScEditBox(); @@ -172,10 +170,6 @@ public: String GetArgVal(); void SetArgSelection (const Selection& rSel ); - void ReplaceSelOfArg (const String& rStr ); - - Selection GetArgSelection(); - ArgEdit* GetArgEdPtr() {return pEdArg;} diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx index 2b93fbc38..78f7cd940 100644 --- a/sc/source/ui/inc/gridwin.hxx +++ b/sc/source/ui/inc/gridwin.hxx @@ -44,7 +44,9 @@ struct ScTableInfo; class ScViewSelectionEngine; +#if OLD_PIVOT_IMPLEMENTATION class ScPivot; +#endif class ScDPObject; class ScOutputData; class ScFilterListBox; @@ -168,11 +170,13 @@ private: BYTE nMouseStatus; BYTE nNestedButtonState; // track nested button up/down calls +#if OLD_PIVOT_IMPLEMENTATION BOOL bPivotMouse; // Pivot-D&D (alte Pivottabellen) ScPivot* pDragPivot; BOOL bPivotColField; SCCOL nPivotCol; SCCOL nPivotField; +#endif BOOL bDPMouse; // DataPilot-D&D (neue Pivottabellen) long nDPField; @@ -231,10 +235,12 @@ private: BOOL DoPageFieldSelection( SCCOL nCol, SCROW nRow ); void DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ); +#if OLD_PIVOT_IMPLEMENTATION void PivotMouseMove( const MouseEvent& rMEvt ); void PivotMouseButtonUp( const MouseEvent& rMEvt ); BOOL PivotTestMouse( const MouseEvent& rMEvt, BOOL bMove ); void DoPivotDrop( BOOL bDelete, BOOL bToCols, SCSIZE nDestPos ); +#endif void DPMouseMove( const MouseEvent& rMEvt ); void DPMouseButtonUp( const MouseEvent& rMEvt ); @@ -282,7 +288,6 @@ private: void DrawSdrGrid( const Rectangle& rDrawingRect, OutputDevice* pContentDev ); //BOOL DrawBeforeScroll(); void DrawAfterScroll(/*BOOL bVal*/); - void OutlinerViewPaint( const Rectangle& rRect ); //void DrawMarks(); //BOOL NeedDrawMarks(); void DrawComboButton( const Point& rCellPos, @@ -377,11 +382,7 @@ public: void InvertSimple( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, BOOL bTestMerge = FALSE, BOOL bRepeat = FALSE ); - void DrawDragRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); - - void DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, - SCCOL nRefEndX, SCROW nRefEndY, - const Color& rColor, BOOL bHandle ); +//UNUSED2008-05 void DrawDragRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ); void CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddress); diff --git a/sc/source/ui/inc/groupdlg.hxx b/sc/source/ui/inc/groupdlg.hxx index 978824659..d71c53c75 100644 --- a/sc/source/ui/inc/groupdlg.hxx +++ b/sc/source/ui/inc/groupdlg.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: groupdlg.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.32.1 $ * * This file is part of OpenOffice.org. * @@ -47,7 +47,6 @@ public: BOOL bRows = TRUE ); ~ScGroupDlg(); - BOOL GetRowsChecked() const; BOOL GetColsChecked() const; private: diff --git a/sc/source/ui/inc/inputhdl.hxx b/sc/source/ui/inc/inputhdl.hxx index 681dd8bc3..b4c92029a 100644 --- a/sc/source/ui/inc/inputhdl.hxx +++ b/sc/source/ui/inc/inputhdl.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: inputhdl.hxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.32.1 $ * * This file is part of OpenOffice.org. * @@ -122,7 +122,6 @@ private: #ifdef _INPUTHDL_CXX private: void UpdateActiveView(); - void SetAllUpdateMode( BOOL bUpdate ); void SyncViews( EditView* pSourceView = NULL ); BOOL StartTable( sal_Unicode cTyped, BOOL bFromCommand ); void RemoveSelection(); @@ -233,9 +232,6 @@ public: BOOL IsModalMode( SfxObjectShell* pDocSh ); - void ActivateInputWindow( const String& rText, - const ESelection& rSel ); - void ForgetLastPattern(); void UpdateSpellSettings( BOOL bFromStartTab = FALSE ); diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 2201ca1c6..b0318dc14 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: inputwin.hxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.32.2 $ * * This file is part of OpenOffice.org. * @@ -166,7 +166,6 @@ public: void SetFuncString( const String& rString, BOOL bDoEdit = TRUE ); void SetPosString( const String& rStr ); void SetTextString( const String& rString ); - const String& GetTextString(); void SetOkCancelMode(); void SetSumAssignMode(); @@ -176,8 +175,8 @@ public: BOOL IsInputActive(); EditView* GetEditView(); - EditView* ActivateEdit( const String& rText, - const ESelection& rSel ); +//UNUSED2008-05 EditView* ActivateEdit( const String& rText, +//UNUSED2008-05 const ESelection& rSel ); void TextGrabFocus(); void TextInvalidate(); diff --git a/sc/source/ui/inc/lbseldlg.hxx b/sc/source/ui/inc/lbseldlg.hxx index ee04acb3b..03ed429d1 100644 --- a/sc/source/ui/inc/lbseldlg.hxx +++ b/sc/source/ui/inc/lbseldlg.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: lbseldlg.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.32.2 $ * * This file is part of OpenOffice.org. * @@ -64,7 +64,7 @@ public: ~ScSelEntryDlg(); String GetSelectEntry() const; - USHORT GetSelectEntryPos() const; +//UNUSED2008-05 USHORT GetSelectEntryPos() const; }; diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 34b9d512d..24fe92645 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: navipi.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.32.1 $ * * This file is part of OpenOffice.org. * @@ -281,8 +281,6 @@ private: SfxBindings& GetBindings() { return rBindings; } - BOOL GetDBAtCursor( String& rStrName ); - BOOL GetAreaAtCursor( String& rStrName ); void SetCurrentCell( SCCOL nCol, SCROW Row ); void SetCurrentCellStr( const String rName ); diff --git a/sc/source/ui/inc/olinewin.hxx b/sc/source/ui/inc/olinewin.hxx index ee1d7e05c..1e96bdedc 100644 --- a/sc/source/ui/inc/olinewin.hxx +++ b/sc/source/ui/inc/olinewin.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: olinewin.hxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.32.1 $ * * This file is part of OpenOffice.org. * @@ -220,8 +220,6 @@ private: /** Erases the focus rectangle from the focused button. */ void HideFocus(); - /** Scrolls the window in entry-relative direction. */ - void ScrollRel( long nEntryDiff ); /** Scrolls the specified range of the window in entry-relative direction. */ void ScrollRel( long nEntryDiff, long nEntryStart, long nEntryEnd ); diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index 81b2d6e41..6179209f2 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -155,7 +155,6 @@ private: void GetVisibleCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell*& rpCell ); BOOL IsAvailable( SCCOL nX, SCROW nY ); - long GetAvailableWidth( SCCOL nX, SCROW nY, long nNeeded ); void GetOutputArea( SCCOL nX, SCSIZE nArrY, long nPosX, long nPosY, SCCOL nCellX, SCROW nCellY, long nNeeded, const ScPatternAttr& rPattern, @@ -173,8 +172,6 @@ private: void SetSyntaxColor( Font* pFont, ScBaseCell* pCell ); void SetEditSyntaxColor( EditEngine& rEngine, ScBaseCell* pCell ); - void ConnectObject( const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& rRef, SdrOle2Obj* pOleObj ); - double GetStretch(); void DrawRotatedFrame( const Color* pForceColor ); // pixel @@ -232,7 +229,6 @@ public: void DrawRotated(BOOL bPixelToLogic); // logisch void DrawClear(); - void DrawPageBorder( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY ); // #i72502# printer only command set Point PrePrintDrawingLayer(long nLogStX, long nLogStY ); @@ -260,7 +256,6 @@ public: void DrawNoteMarks(); void AddPDFNotes(); - void PrintNoteMarks( const List& rPosList ); // List of ScAddress }; diff --git a/sc/source/ui/inc/prevloc.hxx b/sc/source/ui/inc/prevloc.hxx index 73918d1f8..5e8c24d7b 100644 --- a/sc/source/ui/inc/prevloc.hxx +++ b/sc/source/ui/inc/prevloc.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: prevloc.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.32.2 $ * * This file is part of OpenOffice.org. * @@ -104,7 +104,7 @@ class ScPreviewLocationData SCTAB nPrintTab; List aEntries; - ScAddress GetCellFromRange( const Size& rOffsetPixel, const ScRange& rRange ) const; +//UNUSED2008-05 ScAddress GetCellFromRange( const Size& rOffsetPixel, const ScRange& rRange ) const; Rectangle GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const; public: @@ -144,7 +144,6 @@ public: // Check if any cells (including column/row headers) are in the visible area BOOL HasCellsInRange( const Rectangle& rVisiblePixel ) const; - BOOL GetCell( const Point& rPos, ScAddress& rCellPos, Rectangle& rCellRect ) const; BOOL GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const; // returns the rectangle where the EditEngine draws the text of a Header Cell diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 1d5f1226d..c38160e58 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: prevwsh.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.32.1 $ * * This file is part of OpenOffice.org. * @@ -96,10 +96,6 @@ public: SFX_DECL_VIEWFACTORY(ScPreviewShell); ScPreviewShell( SfxViewFrame* pViewFrame, - const ScPreviewShell& rWin ); - ScPreviewShell( SfxViewFrame* pViewFrame, - Window* pParent); - ScPreviewShell( SfxViewFrame* pViewFrame, SfxViewShell* pOldSh ); virtual ~ScPreviewShell(); diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index f916289a3..804f16273 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: pvfundlg.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.1 $ * * This file is part of OpenOffice.org. * @@ -67,7 +67,6 @@ class ScDPFunctionListBox : public MultiListBox { public: explicit ScDPFunctionListBox( Window* pParent, const ResId& rResId ); - explicit ScDPFunctionListBox( Window* pParent, WinBits nStyle = 0 ); void SetSelection( USHORT nFuncMask ); USHORT GetSelection() const; diff --git a/sc/source/ui/inc/refundo.hxx b/sc/source/ui/inc/refundo.hxx index d26e2eae3..690135387 100644 --- a/sc/source/ui/inc/refundo.hxx +++ b/sc/source/ui/inc/refundo.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: refundo.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.1 $ * * This file is part of OpenOffice.org. * @@ -37,7 +37,9 @@ class ScDocument; class ScDBCollection; class ScRangeName; class ScPrintRangeSaver; +#if OLD_PIVOT_IMPLEMENTATION class ScPivotCollection; +#endif class ScDPCollection; class ScChartCollection; class ScConditionalFormatList; @@ -52,7 +54,9 @@ private: ScDBCollection* pDBCollection; ScRangeName* pRangeName; ScPrintRangeSaver* pPrintRanges; +#if OLD_PIVOT_IMPLEMENTATION ScPivotCollection* pPivotCollection; +#endif ScDPCollection* pDPCollection; ScConditionalFormatList* pCondFormList; ScDetOpList* pDetOpList; diff --git a/sc/source/ui/inc/simpref.hxx b/sc/source/ui/inc/simpref.hxx index ed2c907cb..1de1024a7 100644 --- a/sc/source/ui/inc/simpref.hxx +++ b/sc/source/ui/inc/simpref.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: simpref.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.1 $ * * This file is part of OpenOffice.org. * @@ -117,8 +117,6 @@ public: void SetFlags( BOOL bSetCloseOnButtonUp, BOOL bSetSingleCell, BOOL bSetMultiSelection ); void SetAutoReOpen(BOOL bFlag) {bAutoReOpen=bFlag;} - - static String GetLastRefString(); }; diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx index 4efd63308..437b95ba2 100644 --- a/sc/source/ui/inc/tabview.hxx +++ b/sc/source/ui/inc/tabview.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabview.hxx,v $ - * $Revision: 1.28 $ + * $Revision: 1.28.32.2 $ * * This file is part of OpenOffice.org. * @@ -271,7 +271,7 @@ public: void DrawDeselectAll(); void DrawMarkListHasChanged(); void UpdateAnchorHandles(); - String GetSelectedChartName() const; +//UNUSED2008-05 String GetSelectedChartName() const; ScPageBreakData* GetPageBreakData() { return pPageBreakData; } ScHighlightRanges* GetHighlightRanges() { return pHighlightRanges; } @@ -311,7 +311,7 @@ public: void UpdateRef( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ ); void StopRefMode(); - void EndSelection(); +//UNUSED2008-05 void EndSelection(); void StopMarking(); void FakeButtonUp( ScSplitPos eWhich ); @@ -321,12 +321,12 @@ public: ScSplitPos FindWindow( Window* pWindow ) const; void SetActivePointer( const Pointer& rPointer ); - void SetActivePointer( const ResId& rId ); +//UNUSED2008-05 void SetActivePointer( const ResId& rId ); void ActiveGrabFocus(); - void ActiveCaptureMouse(); - void ActiveReleaseMouse(); - Point ActivePixelToLogic( const Point& rDevicePoint ); +//UNUSED2008-05 void ActiveCaptureMouse(); +//UNUSED2008-05 void ActiveReleaseMouse(); +//UNUSED2008-05 Point ActivePixelToLogic( const Point& rDevicePoint ); void ClickCursor( SCCOL nPosX, SCROW nPosY, BOOL bControl ); @@ -417,20 +417,20 @@ public: void InvertBlockMark(SCCOL nBlockStartX, SCROW nBlockStartY, SCCOL nBlockEndX, SCROW nBlockEndY); - void DrawDragRect( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, - ScSplitPos ePos ); +//UNUSED2008-05 void DrawDragRect( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, +//UNUSED2008-05 ScSplitPos ePos ); +//UNUSED2008-05 void PaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab ); +//UNUSED2008-05 void PaintLeftRow( SCROW nRow ); +//UNUSED2008-05 void PaintTopCol( SCCOL nCol ); - void PaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab ); void PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, ScUpdateMode eMode = SC_UPDATE_ALL ); void PaintGrid(); - void PaintTopCol( SCCOL nCol ); void PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ); void PaintTop(); - void PaintLeftRow( SCROW nRow ); void PaintLeftArea( SCROW nStartRow, SCROW nEndRow ); void PaintLeft(); diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 878cec299..8a7822207 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabvwsh.hxx,v $ - * $Revision: 1.31 $ + * $Revision: 1.30.32.3 $ * * This file is part of OpenOffice.org. * @@ -168,7 +168,7 @@ private: SbxObject* pScSbxObject; - BOOL bChartDlgIsEdit; // Datenbereich aendern +//UNUSED2008-05 BOOL bChartDlgIsEdit; // Datenbereich aendern BOOL bChartAreaValid; // wenn Chart aufgezogen wird String aEditChartName; ScRangeListRef aChartSource; @@ -184,7 +184,7 @@ private: private: SC_DLLPRIVATE void Construct( BYTE nForceDesignMode = SC_FORCEMODE_NONE ); - SC_DLLPRIVATE void SetMySubShell( SfxShell* pShell ); +//UNUSED2008-05 SC_DLLPRIVATE void SetMySubShell( SfxShell* pShell ); SC_DLLPRIVATE SfxShell* GetMySubShell() const; SC_DLLPRIVATE void DoReadUserData( const String& rData ); @@ -239,8 +239,8 @@ public: // -> Clone-Methode fuer Factory - ScTabViewShell( SfxViewFrame* pViewFrame, - const ScTabViewShell& rWin ); +//UNUSED2008-05 ScTabViewShell( SfxViewFrame* pViewFrame, +//UNUSED2008-05 const ScTabViewShell& rWin ); // aus einer allgemeinen Shell konstruieren und // soviel wie moeglich uebernehmen (SliderPos etc.): @@ -265,8 +265,8 @@ public: SvxBorderLine* GetDefaultFrameLine() const { return pCurFrameLine; } void SetDefaultFrameLine(const SvxBorderLine* pLine ); - void ExecuteShowNIY( SfxRequest& rReq ); - void StateDisabled( SfxItemSet& rSet ); +//UNUSED2008-05 void ExecuteShowNIY( SfxRequest& rReq ); +//UNUSED2008-05 void StateDisabled( SfxItemSet& rSet ); void Execute( SfxRequest& rReq ); void GetState( SfxItemSet& rSet ); @@ -348,15 +348,15 @@ public: void FillFieldData( ScHeaderFieldData& rData ); - void ResetChartArea(); +//UNUSED2008-05 void ResetChartArea(); void SetChartArea( const ScRangeListRef& rSource, const Rectangle& rDest ); BOOL GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const; - BOOL IsChartDlgEdit() const; - void SetChartDlgEdit(BOOL bFlag){bChartDlgIsEdit=bFlag;} +//UNUSED2008-05 BOOL IsChartDlgEdit() const; +//UNUSED2008-05 void SetChartDlgEdit(BOOL bFlag){bChartDlgIsEdit=bFlag;} void SetEditChartName(const String& aStr){aEditChartName=aStr;} - const String& GetEditChartName() const; +//UNUSED2008-05 const String& GetEditChartName() const; virtual void SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBCType, const SfxHint& rHint, const TypeId& rHintType ); @@ -376,8 +376,6 @@ public: BOOL bSilent, BOOL bIsAPI ); virtual USHORT Print( SfxProgress& rProgress, BOOL bIsAPI, PrintDialog* pPrintDialog = NULL ); - void TestFunction( USHORT nPar ); - void ConnectObject( SdrOle2Obj* pObj ); BOOL ActivateObject( SdrOle2Obj* pObj, long nVerb ); diff --git a/sc/source/ui/inc/uiitems.hxx b/sc/source/ui/inc/uiitems.hxx index 403510355..65814362f 100644 --- a/sc/source/ui/inc/uiitems.hxx +++ b/sc/source/ui/inc/uiitems.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: uiitems.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.2 $ * * This file is part of OpenOffice.org. * @@ -56,13 +56,14 @@ class ScInputStatusItem : public SfxPoolItem public: TYPEINFO(); - ScInputStatusItem( USHORT nWhich, - SCTAB nTab, - SCCOL nCol, SCROW nRow, - SCCOL nStartCol, SCROW nStartRow, - SCCOL nEndCol, SCROW nSEndRow, - const String& rString, - const EditTextObject* pData ); +//UNUSED2008-05 ScInputStatusItem( USHORT nWhich, +//UNUSED2008-05 SCTAB nTab, +//UNUSED2008-05 SCCOL nCol, SCROW nRow, +//UNUSED2008-05 SCCOL nStartCol, SCROW nStartRow, +//UNUSED2008-05 SCCOL nEndCol, SCROW nSEndRow, +//UNUSED2008-05 const String& rString, +//UNUSED2008-05 const EditTextObject* pData ); + ScInputStatusItem( USHORT nWhich, const ScAddress& rCurPos, const ScAddress& rStartPos, @@ -122,7 +123,6 @@ class ScEditViewHint : public SfxHint public: TYPEINFO(); - ScEditViewHint(); ScEditViewHint( ScEditEngineDefaulter* pEngine, const ScAddress& rCurPos ); ~ScEditViewHint(); @@ -130,6 +130,9 @@ public: SCROW GetRow() const { return aCursorPos.Row(); } SCTAB GetTab() const { return aCursorPos.Tab(); } ScEditEngineDefaulter* GetEngine() const { return pEditEngine; } + +private: + ScEditViewHint(); // disabled }; class ScIndexHint : public SfxHint diff --git a/sc/source/ui/inc/undodat.hxx b/sc/source/ui/inc/undodat.hxx index 4d59c6dd3..fb42d818a 100644 --- a/sc/source/ui/inc/undodat.hxx +++ b/sc/source/ui/inc/undodat.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: undodat.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.32.2 $ * * This file is part of OpenOffice.org. * @@ -408,41 +408,39 @@ private: BOOL bQuerySize; }; - -class ScUndoPivot: public ScSimpleUndo -{ -public: - TYPEINFO(); - ScUndoPivot( ScDocShell* pNewDocShell, - const ScArea& rOld, const ScArea& rNew, - ScDocument* pOldDoc, ScDocument* pNewDoc, - const ScPivot* pOldPivot, const ScPivot* pNewPivot ); - virtual ~ScUndoPivot(); - - virtual void Undo(); - virtual void Redo(); - virtual void Repeat(SfxRepeatTarget& rTarget); - virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; - - virtual String GetComment() const; - -private: - ScArea aOldArea; - ScArea aNewArea; - ScDocument* pOldUndoDoc; - ScDocument* pNewUndoDoc; - ScPivotParam aOldParam; // fuer Redo - ScQueryParam aOldQuery; - ScArea aOldSrc; - ScPivotParam aNewParam; // fuer Undo in Collection - ScQueryParam aNewQuery; - ScArea aNewSrc; - String aOldName; - String aOldTag; - String aNewName; - String aNewTag; -}; - +//UNUSED2008-05 class ScUndoPivot: public ScSimpleUndo +//UNUSED2008-05 { +//UNUSED2008-05 public: +//UNUSED2008-05 TYPEINFO(); +//UNUSED2008-05 ScUndoPivot( ScDocShell* pNewDocShell, +//UNUSED2008-05 const ScArea& rOld, const ScArea& rNew, +//UNUSED2008-05 ScDocument* pOldDoc, ScDocument* pNewDoc, +//UNUSED2008-05 const ScPivot* pOldPivot, const ScPivot* pNewPivot ); +//UNUSED2008-05 virtual ~ScUndoPivot(); +//UNUSED2008-05 +//UNUSED2008-05 virtual void Undo(); +//UNUSED2008-05 virtual void Redo(); +//UNUSED2008-05 virtual void Repeat(SfxRepeatTarget& rTarget); +//UNUSED2008-05 virtual BOOL CanRepeat(SfxRepeatTarget& rTarget) const; +//UNUSED2008-05 +//UNUSED2008-05 virtual String GetComment() const; +//UNUSED2008-05 +//UNUSED2008-05 private: +//UNUSED2008-05 ScArea aOldArea; +//UNUSED2008-05 ScArea aNewArea; +//UNUSED2008-05 ScDocument* pOldUndoDoc; +//UNUSED2008-05 ScDocument* pNewUndoDoc; +//UNUSED2008-05 ScPivotParam aOldParam; // fuer Redo +//UNUSED2008-05 ScQueryParam aOldQuery; +//UNUSED2008-05 ScArea aOldSrc; +//UNUSED2008-05 ScPivotParam aNewParam; // fuer Undo in Collection +//UNUSED2008-05 ScQueryParam aNewQuery; +//UNUSED2008-05 ScArea aNewSrc; +//UNUSED2008-05 String aOldName; +//UNUSED2008-05 String aOldTag; +//UNUSED2008-05 String aNewName; +//UNUSED2008-05 String aNewTag; +//UNUSED2008-05 }; class ScUndoDataPilot: public ScSimpleUndo { diff --git a/sc/source/ui/inc/undotab.hxx b/sc/source/ui/inc/undotab.hxx index 8cbf20c62..49854acda 100644 --- a/sc/source/ui/inc/undotab.hxx +++ b/sc/source/ui/inc/undotab.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: undotab.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.10.28.2 $ * * This file is part of OpenOffice.org. * diff --git a/sc/source/ui/inc/viewdata.hxx b/sc/source/ui/inc/viewdata.hxx index b983cd899..024eac3eb 100644 --- a/sc/source/ui/inc/viewdata.hxx +++ b/sc/source/ui/inc/viewdata.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewdata.hxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.24.24.2 $ * * This file is part of OpenOffice.org. * @@ -233,9 +233,9 @@ public: ~ScViewData(); void InitData( ScDocument* pDocument ); - void InitFrom( const ScViewData* pRef ); +//UNUSED2008-05 void InitFrom( const ScViewData* pRef ); +//UNUSED2008-05 void SetDocShell( ScDocShell* pShell ); - void SetDocShell( ScDocShell* pShell ); ScDocShell* GetDocShell() const { return pDocShell; } ScDBFunc* GetView() const { return pView; } @@ -444,11 +444,11 @@ public: SCROW VisibleCellsY( ScVSplitPos eWhichY ) const; SCCOL PrevCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der vorgehenden Seite SCROW PrevCellsY( ScVSplitPos eWhichY ) const; - SCCOL LastCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der letzten Seite - SCROW LastCellsY( ScVSplitPos eWhichY ) const; +//UNUSED2008-05 SCCOL LastCellsX( ScHSplitPos eWhichX ) const; // Zellen auf der letzten Seite +//UNUSED2008-05 SCROW LastCellsY( ScVSplitPos eWhichY ) const; BOOL IsOle(); - void UpdateOle( ScSplitPos eWhich ); +//UNUSED2008-05 void UpdateOle( ScSplitPos eWhich ); void SetScreen( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ); void SetScreen( const Rectangle& rVisArea ); void SetScreenPos( const Point& rVisAreaStart ); diff --git a/sc/source/ui/inc/viewfunc.hxx b/sc/source/ui/inc/viewfunc.hxx index 38211b159..8f0153396 100644 --- a/sc/source/ui/inc/viewfunc.hxx +++ b/sc/source/ui/inc/viewfunc.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewfunc.hxx,v $ - * $Revision: 1.34 $ + * $Revision: 1.34.32.3 $ * * This file is part of OpenOffice.org. * @@ -83,7 +83,7 @@ private: public: ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewShell ); - ScViewFunc( Window* pParent, const ScViewFunc& rViewFunc, ScTabViewShell* pViewShell ); +//UNUSED2008-05 ScViewFunc( Window* pParent, const ScViewFunc& rViewFunc, ScTabViewShell* pViewShell ); ~ScViewFunc(); const ScPatternAttr* GetSelectionPattern (); @@ -299,10 +299,10 @@ public: BOOL bColorOnly ); void SetNote( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPostIt& rNote ); - void DoSpellingChecker( BOOL bRecord = TRUE ); +//UNUSED2008-05 void DoSpellingChecker( BOOL bRecord = TRUE ); void DoHangulHanjaConversion( BOOL bRecord = TRUE ); void DoThesaurus( BOOL bRecord = TRUE ); - DECL_LINK( SpellError, void * ); +//UNUSED2008-05 DECL_LINK( SpellError, void * ); /** Generic implementation of sheet conversion functions. */ void DoSheetConversion( const ScConversionParam& rParam, BOOL bRecord = TRUE ); @@ -335,7 +335,7 @@ protected: const SvxBorderLine* pSrcLine, BOOL bColor ); - void PaintWidthHeight( BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd ); +//UNUSED2008-05 void PaintWidthHeight( BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd ); private: diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 42aee85c7..95e1e450c 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: acredlin.cxx,v $ - * $Revision: 1.25 $ + * $Revision: 1.25.32.1 $ * * This file is part of OpenOffice.org. * @@ -2040,9 +2040,9 @@ void ScAcceptChgDlg::InitFilter() } } -void ScAcceptChgDlg::SetMyStaticData() -{ -} +//UNUSED2008-05 void ScAcceptChgDlg::SetMyStaticData() +//UNUSED2008-05 { +//UNUSED2008-05 } IMPL_LINK( ScAcceptChgDlg, FilterModified, SvxTPFilter*, EMPTYARG ) { diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 9f85872a0..339999c56 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: anyrefdg.cxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.21.30.3 $ * * This file is part of OpenOffice.org. * @@ -179,12 +179,12 @@ void ScRefEdit::StartUpdateData() aTimer.Start(); } -void ScRefEdit::SilentGrabFocus() -{ - bSilentFocus = TRUE; - GrabFocus(); - bSilentFocus = FALSE; -} +//UNUSED2008-05 void ScRefEdit::SilentGrabFocus() +//UNUSED2008-05 { +//UNUSED2008-05 bSilentFocus = TRUE; +//UNUSED2008-05 GrabFocus(); +//UNUSED2008-05 bSilentFocus = FALSE; +//UNUSED2008-05 } void ScRefEdit::SetRefDialog( ScAnyRefDlg* pDlg ) { diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 7c48d341a..30bb14ac0 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -79,19 +79,19 @@ bool ScConflictsListEntry::HasOwnAction( ULONG nOwnAction ) const // class ScConflictsListHelper //============================================================================= -bool ScConflictsListHelper::HasSharedAction( ScConflictsList& rConflictsList, ULONG nSharedAction ) -{ - ScConflictsList::const_iterator aEnd = rConflictsList.end(); - for ( ScConflictsList::const_iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr ) - { - if ( aItr->HasSharedAction( nSharedAction ) ) - { - return true; - } - } - - return false; -} +//UNUSED2008-05 bool ScConflictsListHelper::HasSharedAction( ScConflictsList& rConflictsList, ULONG nSharedAction ) +//UNUSED2008-05 { +//UNUSED2008-05 ScConflictsList::const_iterator aEnd = rConflictsList.end(); +//UNUSED2008-05 for ( ScConflictsList::const_iterator aItr = rConflictsList.begin(); aItr != aEnd; ++aItr ) +//UNUSED2008-05 { +//UNUSED2008-05 if ( aItr->HasSharedAction( nSharedAction ) ) +//UNUSED2008-05 { +//UNUSED2008-05 return true; +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 return false; +//UNUSED2008-05 } bool ScConflictsListHelper::HasOwnAction( ScConflictsList& rConflictsList, ULONG nOwnAction ) { @@ -433,10 +433,10 @@ void ScConflictsResolver::HandleAction( ScChangeAction* pAction, bool bIsSharedA // class ScConflictsListBox //============================================================================= -ScConflictsListBox::ScConflictsListBox( Window* pParent, WinBits nBits ) - :SvxRedlinTable( pParent, nBits ) -{ -} +//UNUSED2008-05 ScConflictsListBox::ScConflictsListBox( Window* pParent, WinBits nBits ) +//UNUSED2008-05 :SvxRedlinTable( pParent, nBits ) +//UNUSED2008-05 { +//UNUSED2008-05 } ScConflictsListBox::ScConflictsListBox( Window* pParent, const ResId& rResId ) :SvxRedlinTable( pParent, rResId ) @@ -447,21 +447,21 @@ ScConflictsListBox::~ScConflictsListBox() { } -ULONG ScConflictsListBox::GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const -{ - ULONG nPos = 0; - SvLBoxEntry* pEntry = GetRootLevelParent( First() ); - while ( pEntry ) - { - if ( pEntry == pRootEntry ) - { - return nPos; - } - pEntry = NextSibling( pEntry ); - ++nPos; - } - return 0xffffffff; -} +//UNUSED2008-05 ULONG ScConflictsListBox::GetRootEntryPos( const SvLBoxEntry* pRootEntry ) const +//UNUSED2008-05 { +//UNUSED2008-05 ULONG nPos = 0; +//UNUSED2008-05 SvLBoxEntry* pEntry = GetRootLevelParent( First() ); +//UNUSED2008-05 while ( pEntry ) +//UNUSED2008-05 { +//UNUSED2008-05 if ( pEntry == pRootEntry ) +//UNUSED2008-05 { +//UNUSED2008-05 return nPos; +//UNUSED2008-05 } +//UNUSED2008-05 pEntry = NextSibling( pEntry ); +//UNUSED2008-05 ++nPos; +//UNUSED2008-05 } +//UNUSED2008-05 return 0xffffffff; +//UNUSED2008-05 } //============================================================================= diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx index e9d501687..5fb28f692 100644 --- a/sc/source/ui/miscdlgs/groupdlg.cxx +++ b/sc/source/ui/miscdlgs/groupdlg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: groupdlg.cxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.32.1 $ * * This file is part of OpenOffice.org. * @@ -71,13 +71,6 @@ ScGroupDlg::ScGroupDlg( Window* pParent, //------------------------------------------------------------------------ -BOOL ScGroupDlg::GetRowsChecked() const -{ - return aBtnRows.IsChecked(); -} - -//------------------------------------------------------------------------ - BOOL ScGroupDlg::GetColsChecked() const { return aBtnCols.IsChecked(); diff --git a/sc/source/ui/miscdlgs/lbseldlg.cxx b/sc/source/ui/miscdlgs/lbseldlg.cxx index 06fdd25d0..b1d0c3884 100644 --- a/sc/source/ui/miscdlgs/lbseldlg.cxx +++ b/sc/source/ui/miscdlgs/lbseldlg.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: lbseldlg.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.2 $ * * This file is part of OpenOffice.org. * @@ -87,10 +87,10 @@ String ScSelEntryDlg::GetSelectEntry() const //------------------------------------------------------------------------ -USHORT ScSelEntryDlg::GetSelectEntryPos() const -{ - return aLb.GetSelectEntryPos(); -} +//UNUSED2008-05 USHORT ScSelEntryDlg::GetSelectEntryPos() const +//UNUSED2008-05 { +//UNUSED2008-05 return aLb.GetSelectEntryPos(); +//UNUSED2008-05 } //------------------------------------------------------------------------ diff --git a/sc/source/ui/miscdlgs/simpref.cxx b/sc/source/ui/miscdlgs/simpref.cxx index 6174d397f..190c525b5 100644 --- a/sc/source/ui/miscdlgs/simpref.cxx +++ b/sc/source/ui/miscdlgs/simpref.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: simpref.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.11.30.2 $ * * This file is part of OpenOffice.org. * @@ -63,8 +63,6 @@ #define ERRORBOX(s) ErrorBox(this,WinBits(WB_OK|WB_DEF_OK),s).Execute() #define QUERYBOX(m) QueryBox(this,WinBits(WB_YES_NO|WB_DEF_YES),m).Execute() -static String aPrivLastRefString; - //============================================================================ // class ScSimpleRefDlg @@ -95,15 +93,11 @@ ScSimpleRefDlg::ScSimpleRefDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP Init(); FreeResource(); SetDispatcherLock( TRUE ); // Modal-Modus einschalten - - aPrivLastRefString=String(); } //---------------------------------------------------------------------------- __EXPORT ScSimpleRefDlg::~ScSimpleRefDlg() { - aPrivLastRefString=aEdAssign.GetText(); - SetDispatcherLock( FALSE ); // Modal-Modus einschalten } @@ -196,11 +190,6 @@ String ScSimpleRefDlg::GetRefString() const return aEdAssign.GetText(); } -String ScSimpleRefDlg::GetLastRefString() -{ - return aPrivLastRefString; -} - void ScSimpleRefDlg::SetCloseHdl( const Link& rLink ) { aCloseHdl=rLink; diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx index 7a73e8711..ca8959302 100644 --- a/sc/source/ui/navipi/content.cxx +++ b/sc/source/ui/navipi/content.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: content.cxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.25.30.2 $ * * This file is part of OpenOffice.org. * @@ -1294,16 +1294,16 @@ IMPL_STATIC_LINK(ScContentTree, ExecDragHdl, void*, EMPTYARG) return 0; } -void ScContentTree::AdjustTitle() -{ - String aTitle = pParentWindow->aTitleBase; - if (bHiddenDoc) - { - aTitle.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " - " )); - aTitle += aHiddenTitle; - } - pParentWindow->SetText(aTitle); -} +//UNUSED2008-05 void ScContentTree::AdjustTitle() +//UNUSED2008-05 { +//UNUSED2008-05 String aTitle = pParentWindow->aTitleBase; +//UNUSED2008-05 if (bHiddenDoc) +//UNUSED2008-05 { +//UNUSED2008-05 aTitle.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " - " )); +//UNUSED2008-05 aTitle += aHiddenTitle; +//UNUSED2008-05 } +//UNUSED2008-05 pParentWindow->SetText(aTitle); +//UNUSED2008-05 } BOOL ScContentTree::LoadFile( const String& rUrl ) { diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index b50827862..f34cd3f45 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -1008,56 +1008,6 @@ void ScNavigatorDlg::CursorPosChanged() //------------------------------------------------------------------------ -BOOL ScNavigatorDlg::GetDBAtCursor( String& rStrName ) -{ - BOOL bFound = FALSE; - - if ( GetViewData() ) - { - SCCOL nCol = aEdCol.GetCol(); - SCROW nRow = aEdRow.GetRow(); - - if ( nCol > 0 && nRow > 0 ) - { - ScDocument* pDoc = pViewData->GetDocument(); - ScDBData* pData = pDoc->GetDBAtCursor( nCol-1, nRow-1, pViewData->GetTabNo() ); - - bFound = ( pData != NULL ); - if ( bFound ) - pData->GetName( rStrName ); - } - } - - return bFound; -} - -//------------------------------------------------------------------------ - -BOOL ScNavigatorDlg::GetAreaAtCursor( String& rStrName ) -{ - BOOL bFound = FALSE; - - if ( GetViewData() ) - { - SCCOL nCol = aEdCol.GetCol(); - SCROW nRow = aEdRow.GetRow(); - - if ( nCol > 0 && nRow > 0 ) - { - ScDocument* pDoc = pViewData->GetDocument(); - ScRangeData* pData = pDoc->GetRangeAtCursor( nCol-1, nRow-1, pViewData->GetTabNo() ); - - bFound = ( pData != NULL ); - if ( bFound ) - pData->GetName( rStrName ); - } - } - - return bFound; -} - -//------------------------------------------------------------------------ - void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo ) { if ( (nColNo+1 != nCurCol) || (nRowNo+1 != nCurRow) ) diff --git a/sc/source/ui/undo/refundo.cxx b/sc/source/ui/undo/refundo.cxx index a572ecf61..6d4177a82 100644 --- a/sc/source/ui/undo/refundo.cxx +++ b/sc/source/ui/undo/refundo.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: refundo.cxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.32.1 $ * * This file is part of OpenOffice.org. * @@ -66,8 +66,10 @@ ScRefUndoData::ScRefUndoData( const ScDocument* pDoc ) : pPrintRanges = pDoc->CreatePrintRangeSaver(); // neu erzeugt +#if OLD_PIVOT_IMPLEMENTATION ScPivotCollection* pOldPivot = pDoc->GetPivotCollection(); pPivotCollection = pOldPivot ? new ScPivotCollection(*pOldPivot) : NULL; +#endif //! bei Pivot nur Bereiche merken ??? ScDPCollection* pOldDP = ((ScDocument*)pDoc)->GetDPCollection(); //! const @@ -94,7 +96,9 @@ ScRefUndoData::~ScRefUndoData() delete pDBCollection; delete pRangeName; delete pPrintRanges; +#if OLD_PIVOT_IMPLEMENTATION delete pPivotCollection; +#endif delete pDPCollection; delete pCondFormList; delete pDetOpList; @@ -126,12 +130,14 @@ void ScRefUndoData::DeleteUnchanged( const ScDocument* pDoc ) delete pNewRanges; } +#if OLD_PIVOT_IMPLEMENTATION if (pPivotCollection) { ScPivotCollection* pNewPivot = pDoc->GetPivotCollection(); if ( pNewPivot && *pPivotCollection == *pNewPivot ) DELETEZ(pPivotCollection); } +#endif if (pDPCollection) { @@ -189,8 +195,10 @@ void ScRefUndoData::DoUndo( ScDocument* pDoc, BOOL bUndoRefFirst ) if (pPrintRanges) pDoc->RestorePrintRanges(*pPrintRanges); +#if OLD_PIVOT_IMPLEMENTATION if (pPivotCollection) pDoc->SetPivotCollection( new ScPivotCollection(*pPivotCollection) ); +#endif if (pDPCollection) { diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx index 809d8c833..2447eddbc 100644 --- a/sc/source/ui/undo/undoblk3.cxx +++ b/sc/source/ui/undo/undoblk3.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: undoblk3.cxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.22.32.1 $ * * This file is part of OpenOffice.org. * @@ -1580,7 +1580,6 @@ void __EXPORT ScUndoRefreshLink::Undo() } pDoc->DeleteAreaTab( aRange,IDF_ALL ); -// pDoc->ClearDrawPage(nTab); pUndoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc ); // pDoc->TransferDrawPage( pUndoDoc, nTab, nTab ); pDoc->SetLink( nTab, pUndoDoc->GetLinkMode(nTab), pUndoDoc->GetLinkDoc(nTab), @@ -1611,7 +1610,6 @@ void __EXPORT ScUndoRefreshLink::Redo() ScRange aRange(0,0,nTab,MAXCOL,MAXROW,nTab); pDoc->DeleteAreaTab( aRange, IDF_ALL ); -// pDoc->ClearDrawPage(nTab); pRedoDoc->CopyToDocument( aRange, IDF_ALL, FALSE, pDoc ); // pDoc->TransferDrawPage( pRedoDoc, nTab, nTab ); pDoc->SetLink( nTab, diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx index 06591386f..3f3d6468c 100644 --- a/sc/source/ui/undo/undodat.cxx +++ b/sc/source/ui/undo/undodat.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: undodat.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.32.2 $ * * This file is part of OpenOffice.org. * @@ -74,7 +74,7 @@ TYPEINIT1(ScUndoAutoFilter, SfxUndoAction); TYPEINIT1(ScUndoDBData, SfxUndoAction); TYPEINIT1(ScUndoImportData, SfxUndoAction); TYPEINIT1(ScUndoRepeatDB, SfxUndoAction); -TYPEINIT1(ScUndoPivot, SfxUndoAction); +//UNUSED2008-05 TYPEINIT1(ScUndoPivot, SfxUndoAction); TYPEINIT1(ScUndoDataPilot, SfxUndoAction); TYPEINIT1(ScUndoConsolidate, SfxUndoAction); TYPEINIT1(ScUndoChartData, SfxUndoAction); @@ -1629,164 +1629,163 @@ BOOL __EXPORT ScUndoRepeatDB::CanRepeat(SfxRepeatTarget& rTarget) const return (rTarget.ISA(ScTabViewTarget)); } -// -// Pivot-Tabellen -// - -ScUndoPivot::ScUndoPivot( ScDocShell* pNewDocShell, - const ScArea& rOld, const ScArea& rNew, - ScDocument* pOldDoc, ScDocument* pNewDoc, - const ScPivot* pOldPivot, const ScPivot* pNewPivot ) : - ScSimpleUndo( pNewDocShell ), - aOldArea( rOld ), - aNewArea( rNew ), - pOldUndoDoc( pOldDoc ), - pNewUndoDoc( pNewDoc ) -{ - if (pNewPivot) - { - pNewPivot->GetParam( aNewParam, aNewQuery, aNewSrc ); - aNewName = pNewPivot->GetName(); - aNewTag = pNewPivot->GetTag(); - } - if (pOldPivot) - { - pOldPivot->GetParam( aOldParam, aOldQuery, aOldSrc ); - aOldName = pOldPivot->GetName(); - aOldTag = pOldPivot->GetTag(); - } -} - -__EXPORT ScUndoPivot::~ScUndoPivot() -{ - delete pOldUndoDoc; - delete pNewUndoDoc; -} - -String __EXPORT ScUndoPivot::GetComment() const -{ - USHORT nIndex; - if ( pOldUndoDoc && pNewUndoDoc ) - nIndex = STR_UNDO_PIVOT_MODIFY; - else if ( pNewUndoDoc ) - nIndex = STR_UNDO_PIVOT_NEW; - else - nIndex = STR_UNDO_PIVOT_DELETE; - - return ScGlobal::GetRscString( nIndex ); -} - -void __EXPORT ScUndoPivot::Undo() -{ - BeginUndo(); - - ScDocument* pDoc = pDocShell->GetDocument(); - - if (pNewUndoDoc) - { - pDoc->DeleteAreaTab( aNewArea.nColStart,aNewArea.nRowStart, - aNewArea.nColEnd,aNewArea.nRowEnd, aNewArea.nTab, IDF_ALL ); - pNewUndoDoc->CopyToDocument( aNewArea.nColStart, aNewArea.nRowStart, aNewArea.nTab, - aNewArea.nColEnd, aNewArea.nRowEnd, aNewArea.nTab, - IDF_ALL, FALSE, pDoc ); - } - if (pOldUndoDoc) - { - pDoc->DeleteAreaTab( aOldArea.nColStart,aOldArea.nRowStart, - aOldArea.nColEnd,aOldArea.nRowEnd, aOldArea.nTab, IDF_ALL ); - pOldUndoDoc->CopyToDocument( aOldArea.nColStart, aOldArea.nRowStart, aOldArea.nTab, - aOldArea.nColEnd, aOldArea.nRowEnd, aOldArea.nTab, - IDF_ALL, FALSE, pDoc ); - } - - ScPivotCollection* pPivotCollection = pDoc->GetPivotCollection(); - if ( pNewUndoDoc ) - { - ScPivot* pNewPivot = pPivotCollection->GetPivotAtCursor( - aNewParam.nCol, aNewParam.nRow, aNewParam.nTab ); - if (pNewPivot) - pPivotCollection->Free( pNewPivot ); - } - if ( pOldUndoDoc ) - { - ScPivot* pOldPivot = new ScPivot( pDoc ); - pOldPivot->SetParam( aOldParam, aOldQuery, aOldSrc ); - pOldPivot->SetName( aOldName ); - pOldPivot->SetTag( aOldTag ); - if (pOldPivot->CreateData()) // Felder berechnen - pOldPivot->ReleaseData(); - pPivotCollection->Insert( pOldPivot ); - } - -// erack! it's broadcasted -// pDoc->SetDirty(); - if (pNewUndoDoc) - pDocShell->PostPaint( aNewArea.nColStart, aNewArea.nRowStart, aNewArea.nTab, - aNewArea.nColEnd, aNewArea.nRowEnd, aNewArea.nTab, - PAINT_GRID, SC_PF_LINES ); - if (pOldUndoDoc) - pDocShell->PostPaint( aOldArea.nColStart, aOldArea.nRowStart, aOldArea.nTab, - aOldArea.nColEnd, aOldArea.nRowEnd, aOldArea.nTab, - PAINT_GRID, SC_PF_LINES ); - pDocShell->PostDataChanged(); - - ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); - if (pViewShell) - { - SCTAB nTab = pViewShell->GetViewData()->GetTabNo(); - if ( pOldUndoDoc ) - { - if ( nTab != aOldArea.nTab ) - pViewShell->SetTabNo( aOldArea.nTab ); - } - else if ( pNewUndoDoc ) - { - if ( nTab != aNewArea.nTab ) - pViewShell->SetTabNo( aNewArea.nTab ); - } - } - - EndUndo(); -} - -void __EXPORT ScUndoPivot::Redo() -{ - BeginRedo(); - - ScDocument* pDoc = pDocShell->GetDocument(); - ScPivotCollection* pPivotCollection = pDoc->GetPivotCollection(); - ScPivot* pOldPivot = pPivotCollection->GetPivotAtCursor( - aOldParam.nCol, aOldParam.nRow, aOldParam.nTab ); - - ScPivot* pNewPivot = NULL; - if (pNewUndoDoc) - { - pNewPivot = new ScPivot( pDoc ); - pNewPivot->SetParam( aNewParam, aNewQuery, aNewSrc ); - pNewPivot->SetName( aNewName ); - pNewPivot->SetTag( aNewTag ); - } - - pDocShell->PivotUpdate( pOldPivot, pNewPivot, FALSE ); - - EndRedo(); -} - -void __EXPORT ScUndoPivot::Repeat(SfxRepeatTarget& rTarget) -{ - // Wiederholen: nur loeschen - - if ( pOldUndoDoc && !pNewUndoDoc && rTarget.ISA(ScTabViewTarget) ) - ((ScTabViewTarget&)rTarget).GetViewShell()->DeletePivotTable(); -} - -BOOL __EXPORT ScUndoPivot::CanRepeat(SfxRepeatTarget& rTarget) const -{ - // Wiederholen: nur loeschen - - return ( pOldUndoDoc && !pNewUndoDoc && rTarget.ISA(ScTabViewTarget) ); -} - +//UNUSED2008-05 // +//UNUSED2008-05 // Pivot-Tabellen +//UNUSED2008-05 // +//UNUSED2008-05 +//UNUSED2008-05 ScUndoPivot::ScUndoPivot( ScDocShell* pNewDocShell, +//UNUSED2008-05 const ScArea& rOld, const ScArea& rNew, +//UNUSED2008-05 ScDocument* pOldDoc, ScDocument* pNewDoc, +//UNUSED2008-05 const ScPivot* pOldPivot, const ScPivot* pNewPivot ) : +//UNUSED2008-05 ScSimpleUndo( pNewDocShell ), +//UNUSED2008-05 aOldArea( rOld ), +//UNUSED2008-05 aNewArea( rNew ), +//UNUSED2008-05 pOldUndoDoc( pOldDoc ), +//UNUSED2008-05 pNewUndoDoc( pNewDoc ) +//UNUSED2008-05 { +//UNUSED2008-05 if (pNewPivot) +//UNUSED2008-05 { +//UNUSED2008-05 pNewPivot->GetParam( aNewParam, aNewQuery, aNewSrc ); +//UNUSED2008-05 aNewName = pNewPivot->GetName(); +//UNUSED2008-05 aNewTag = pNewPivot->GetTag(); +//UNUSED2008-05 } +//UNUSED2008-05 if (pOldPivot) +//UNUSED2008-05 { +//UNUSED2008-05 pOldPivot->GetParam( aOldParam, aOldQuery, aOldSrc ); +//UNUSED2008-05 aOldName = pOldPivot->GetName(); +//UNUSED2008-05 aOldTag = pOldPivot->GetTag(); +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 __EXPORT ScUndoPivot::~ScUndoPivot() +//UNUSED2008-05 { +//UNUSED2008-05 delete pOldUndoDoc; +//UNUSED2008-05 delete pNewUndoDoc; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 String __EXPORT ScUndoPivot::GetComment() const +//UNUSED2008-05 { +//UNUSED2008-05 USHORT nIndex; +//UNUSED2008-05 if ( pOldUndoDoc && pNewUndoDoc ) +//UNUSED2008-05 nIndex = STR_UNDO_PIVOT_MODIFY; +//UNUSED2008-05 else if ( pNewUndoDoc ) +//UNUSED2008-05 nIndex = STR_UNDO_PIVOT_NEW; +//UNUSED2008-05 else +//UNUSED2008-05 nIndex = STR_UNDO_PIVOT_DELETE; +//UNUSED2008-05 +//UNUSED2008-05 return ScGlobal::GetRscString( nIndex ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 void __EXPORT ScUndoPivot::Undo() +//UNUSED2008-05 { +//UNUSED2008-05 BeginUndo(); +//UNUSED2008-05 +//UNUSED2008-05 ScDocument* pDoc = pDocShell->GetDocument(); +//UNUSED2008-05 +//UNUSED2008-05 if (pNewUndoDoc) +//UNUSED2008-05 { +//UNUSED2008-05 pDoc->DeleteAreaTab( aNewArea.nColStart,aNewArea.nRowStart, +//UNUSED2008-05 aNewArea.nColEnd,aNewArea.nRowEnd, aNewArea.nTab, IDF_ALL ); +//UNUSED2008-05 pNewUndoDoc->CopyToDocument( aNewArea.nColStart, aNewArea.nRowStart, aNewArea.nTab, +//UNUSED2008-05 aNewArea.nColEnd, aNewArea.nRowEnd, aNewArea.nTab, +//UNUSED2008-05 IDF_ALL, FALSE, pDoc ); +//UNUSED2008-05 } +//UNUSED2008-05 if (pOldUndoDoc) +//UNUSED2008-05 { +//UNUSED2008-05 pDoc->DeleteAreaTab( aOldArea.nColStart,aOldArea.nRowStart, +//UNUSED2008-05 aOldArea.nColEnd,aOldArea.nRowEnd, aOldArea.nTab, IDF_ALL ); +//UNUSED2008-05 pOldUndoDoc->CopyToDocument( aOldArea.nColStart, aOldArea.nRowStart, aOldArea.nTab, +//UNUSED2008-05 aOldArea.nColEnd, aOldArea.nRowEnd, aOldArea.nTab, +//UNUSED2008-05 IDF_ALL, FALSE, pDoc ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 ScPivotCollection* pPivotCollection = pDoc->GetPivotCollection(); +//UNUSED2008-05 if ( pNewUndoDoc ) +//UNUSED2008-05 { +//UNUSED2008-05 ScPivot* pNewPivot = pPivotCollection->GetPivotAtCursor( +//UNUSED2008-05 aNewParam.nCol, aNewParam.nRow, aNewParam.nTab ); +//UNUSED2008-05 if (pNewPivot) +//UNUSED2008-05 pPivotCollection->Free( pNewPivot ); +//UNUSED2008-05 } +//UNUSED2008-05 if ( pOldUndoDoc ) +//UNUSED2008-05 { +//UNUSED2008-05 ScPivot* pOldPivot = new ScPivot( pDoc ); +//UNUSED2008-05 pOldPivot->SetParam( aOldParam, aOldQuery, aOldSrc ); +//UNUSED2008-05 pOldPivot->SetName( aOldName ); +//UNUSED2008-05 pOldPivot->SetTag( aOldTag ); +//UNUSED2008-05 if (pOldPivot->CreateData()) // Felder berechnen +//UNUSED2008-05 pOldPivot->ReleaseData(); +//UNUSED2008-05 pPivotCollection->Insert( pOldPivot ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 // erack! it's broadcasted +//UNUSED2008-05 // pDoc->SetDirty(); +//UNUSED2008-05 if (pNewUndoDoc) +//UNUSED2008-05 pDocShell->PostPaint( aNewArea.nColStart, aNewArea.nRowStart, aNewArea.nTab, +//UNUSED2008-05 aNewArea.nColEnd, aNewArea.nRowEnd, aNewArea.nTab, +//UNUSED2008-05 PAINT_GRID, SC_PF_LINES ); +//UNUSED2008-05 if (pOldUndoDoc) +//UNUSED2008-05 pDocShell->PostPaint( aOldArea.nColStart, aOldArea.nRowStart, aOldArea.nTab, +//UNUSED2008-05 aOldArea.nColEnd, aOldArea.nRowEnd, aOldArea.nTab, +//UNUSED2008-05 PAINT_GRID, SC_PF_LINES ); +//UNUSED2008-05 pDocShell->PostDataChanged(); +//UNUSED2008-05 +//UNUSED2008-05 ScTabViewShell* pViewShell = ScTabViewShell::GetActiveViewShell(); +//UNUSED2008-05 if (pViewShell) +//UNUSED2008-05 { +//UNUSED2008-05 SCTAB nTab = pViewShell->GetViewData()->GetTabNo(); +//UNUSED2008-05 if ( pOldUndoDoc ) +//UNUSED2008-05 { +//UNUSED2008-05 if ( nTab != aOldArea.nTab ) +//UNUSED2008-05 pViewShell->SetTabNo( aOldArea.nTab ); +//UNUSED2008-05 } +//UNUSED2008-05 else if ( pNewUndoDoc ) +//UNUSED2008-05 { +//UNUSED2008-05 if ( nTab != aNewArea.nTab ) +//UNUSED2008-05 pViewShell->SetTabNo( aNewArea.nTab ); +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 EndUndo(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 void __EXPORT ScUndoPivot::Redo() +//UNUSED2008-05 { +//UNUSED2008-05 BeginRedo(); +//UNUSED2008-05 +//UNUSED2008-05 ScDocument* pDoc = pDocShell->GetDocument(); +//UNUSED2008-05 ScPivotCollection* pPivotCollection = pDoc->GetPivotCollection(); +//UNUSED2008-05 ScPivot* pOldPivot = pPivotCollection->GetPivotAtCursor( +//UNUSED2008-05 aOldParam.nCol, aOldParam.nRow, aOldParam.nTab ); +//UNUSED2008-05 +//UNUSED2008-05 ScPivot* pNewPivot = NULL; +//UNUSED2008-05 if (pNewUndoDoc) +//UNUSED2008-05 { +//UNUSED2008-05 pNewPivot = new ScPivot( pDoc ); +//UNUSED2008-05 pNewPivot->SetParam( aNewParam, aNewQuery, aNewSrc ); +//UNUSED2008-05 pNewPivot->SetName( aNewName ); +//UNUSED2008-05 pNewPivot->SetTag( aNewTag ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 pDocShell->PivotUpdate( pOldPivot, pNewPivot, FALSE ); +//UNUSED2008-05 +//UNUSED2008-05 EndRedo(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 void __EXPORT ScUndoPivot::Repeat(SfxRepeatTarget& rTarget) +//UNUSED2008-05 { +//UNUSED2008-05 // Wiederholen: nur loeschen +//UNUSED2008-05 +//UNUSED2008-05 if ( pOldUndoDoc && !pNewUndoDoc && rTarget.ISA(ScTabViewTarget) ) +//UNUSED2008-05 ((ScTabViewTarget&)rTarget).GetViewShell()->DeletePivotTable(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 BOOL __EXPORT ScUndoPivot::CanRepeat(SfxRepeatTarget& rTarget) const +//UNUSED2008-05 { +//UNUSED2008-05 // Wiederholen: nur loeschen +//UNUSED2008-05 +//UNUSED2008-05 return ( pOldUndoDoc && !pNewUndoDoc && rTarget.ISA(ScTabViewTarget) ); +//UNUSED2008-05 } // // data pilot diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx index de76fe2b5..ef93958d1 100644 --- a/sc/source/ui/undo/undotab.cxx +++ b/sc/source/ui/undo/undotab.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: undotab.cxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.19.28.2 $ * * This file is part of OpenOffice.org. * diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx index d8d3820a2..a105c51d5 100644 --- a/sc/source/ui/unoobj/dapiuno.cxx +++ b/sc/source/ui/unoobj/dapiuno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dapiuno.cxx,v $ - * $Revision: 1.23 $ + * $Revision: 1.21.30.2 $ * * This file is part of OpenOffice.org. * @@ -224,16 +224,6 @@ ScDPObject* lcl_GetDPObject( ScDocShell* pDocShell, SCTAB nTab, const String& rN return NULL; // nicht gefunden } -String lcl_ColumnTitle( ScDocument* pDoc, USHORT nCol, USHORT nRow, USHORT nTab ) -{ - // Spaltennamen, wie sie in der Pivottabelle angezeigt werden - String aStr; - pDoc->GetString(nCol, nRow, nTab, aStr); - if (aStr.Len() == 0) - aStr = ColToAlpha( nCol ); - return aStr; -} - String lcl_CreatePivotName( ScDocShell* pDocShell ) { if (pDocShell) @@ -390,38 +380,6 @@ rtl::OUString lcl_GetOriginalName( const uno::Reference<container::XNamed> xDim return xOriginal->getName(); } -void lcl_SetSaveData(const uno::Reference<container::XIndexAccess>& xFields, ScDPSaveData* pSaveData) -{ - if (xFields.is() && pSaveData) - { - sal_Int32 nFieldsCount(xFields->getCount()); - for (sal_Int32 i = 0; i < nFieldsCount; ++i) - { - uno::Any aDim = xFields->getByIndex(i); - uno::Reference<container::XNamed> xDim; - uno::Reference<beans::XPropertySet> xDimProps; - if ((aDim >>= xDim) && (aDim >>= xDimProps)) - { - //rtl::OUString sName(xDim->getName()); - rtl::OUString sName( lcl_GetOriginalName(xDim) ); - ScDPSaveDimension* pDim = sName.getLength() ? pSaveData->GetDimensionByName(sName) : 0; - if (pDim) - { - uno::Any aAny = xDimProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ORIENT))); - sheet::DataPilotFieldOrientation eOrient; - if (aAny >>= eOrient) - pDim->SetOrientation( sal::static_int_cast<USHORT>( eOrient ) ); - - aAny = xDimProps->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_FUNCTION))); - sheet::GeneralFunction eFunc; - if (aAny >>= eFunc) - pDim->SetFunction( sal::static_int_cast<USHORT>( eFunc ) ); - } - } - } - } -} - void SAL_CALL ScDataPilotTablesObj::insertNewByName( const rtl::OUString& aNewName, const table::CellAddress& aOutputAddress, const uno::Reference<sheet::XDataPilotDescriptor>& xDescriptor ) diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx index eca7648fd..5e47d1abe 100644 --- a/sc/source/ui/unoobj/datauno.cxx +++ b/sc/source/ui/unoobj/datauno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: datauno.cxx,v $ - * $Revision: 1.30 $ + * $Revision: 1.30.32.1 $ * * This file is part of OpenOffice.org. * @@ -1567,45 +1567,6 @@ void SAL_CALL ScDatabaseRangeObj::setDataArea( const table::CellRangeAddress& aD } } -void ScDatabaseRangeObj::GetSortParam(ScSortParam& rSortParam) const -{ - const ScDBData* pData = GetDBData_Impl(); - if (pData) - { - pData->GetSortParam(rSortParam); - - // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt - ScRange aDBRange; - pData->GetArea(aDBRange); - SCCOLROW nFieldStart = rSortParam.bByRow ? static_cast<SCCOLROW>(aDBRange.aStart.Col()) : static_cast<SCCOLROW>(aDBRange.aStart.Row()); - for (USHORT i=0; i<MAXSORT; i++) - if (rSortParam.bDoSort[i] && rSortParam.nField[i] >= nFieldStart) - rSortParam.nField[i] -= nFieldStart; - } -} - -void ScDatabaseRangeObj::SetSortParam(const ScSortParam& rSortParam) -{ - const ScDBData* pData = GetDBData_Impl(); - if (pData) - { - // im SortDescriptor sind die Fields innerhalb des Bereichs gezaehlt - ScSortParam aParam(rSortParam); - ScRange aDBRange; - pData->GetArea(aDBRange); - SCCOLROW nFieldStart = aParam.bByRow ? static_cast<SCCOLROW>(aDBRange.aStart.Col()) : static_cast<SCCOLROW>(aDBRange.aStart.Row()); - for (USHORT i=0; i<MAXSORT; i++) - if (aParam.bDoSort[i]) - aParam.nField[i] += nFieldStart; - - ScDBData aNewData( *pData ); - aNewData.SetSortParam(aParam); - aNewData.SetHeader(aParam.bHasHeader); // not in ScDBData::SetSortParam - ScDBDocFunc aFunc(*pDocShell); - aFunc.ModifyDBData(aNewData, TRUE); - } -} - uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getSortDescriptor() throw(uno::RuntimeException) { @@ -1745,30 +1706,6 @@ uno::Reference<sheet::XSubTotalDescriptor> SAL_CALL ScDatabaseRangeObj::getSubTo return new ScRangeSubTotalDescriptor(this); } -void ScDatabaseRangeObj::GetImportParam(ScImportParam& rImportParam) const -{ - const ScDBData* pData = GetDBData_Impl(); - if (pData) - { - pData->GetImportParam(rImportParam); - // Fields gibt's hier nicht anzupassen - } -} - -void ScDatabaseRangeObj::SetImportParam(const ScImportParam& rImportParam) -{ - const ScDBData* pData = GetDBData_Impl(); - if (pData) - { - // Fields gibt's hier nicht anzupassen - - ScDBData aNewData( *pData ); - aNewData.SetImportParam(rImportParam); - ScDBDocFunc aFunc(*pDocShell); - aFunc.ModifyDBData(aNewData, TRUE); - } -} - uno::Sequence<beans::PropertyValue> SAL_CALL ScDatabaseRangeObj::getImportDescriptor() throw(uno::RuntimeException) { diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx index 7c060dc9c..20fe49860 100644 --- a/sc/source/ui/unoobj/docuno.cxx +++ b/sc/source/ui/unoobj/docuno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docuno.cxx,v $ - * $Revision: 1.68 $ + * $Revision: 1.67.30.3 $ * * This file is part of OpenOffice.org. * @@ -268,29 +268,6 @@ SfxObjectShell* ScModelObj::GetEmbeddedObject() const return pDocShell; } -BOOL ScModelObj::IsEmbedded() const -{ - if (pDocShell) - { - return pDocShell->IsOle(); - } - return FALSE; -} - -double ScModelObj::GetOutputFactor() const -{ - if (pDocShell) - return pDocShell->GetOutputFactor(); - return 1.0; -} - -BOOL ScModelObj::AdjustRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) -{ - if (pDocShell) - return pDocShell->AdjustRowHeight( nStartRow, nEndRow, nTab ); - return FALSE; -} - void ScModelObj::UpdateAllRowHeights() { if (pDocShell) @@ -2847,11 +2824,11 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScTableRowsObj ) //------------------------------------------------------------------------ -ScSpreadsheetSettingsObj::ScSpreadsheetSettingsObj(ScDocShell* pDocSh) : - pDocShell( pDocSh ) -{ - pDocShell->GetDocument()->AddUnoObject(*this); -} +//UNUSED2008-05 ScSpreadsheetSettingsObj::ScSpreadsheetSettingsObj(ScDocShell* pDocSh) : +//UNUSED2008-05 pDocShell( pDocSh ) +//UNUSED2008-05 { +//UNUSED2008-05 pDocShell->GetDocument()->AddUnoObject(*this); +//UNUSED2008-05 } ScSpreadsheetSettingsObj::~ScSpreadsheetSettingsObj() { diff --git a/sc/source/ui/unoobj/editsrc.cxx b/sc/source/ui/unoobj/editsrc.cxx index 96f3350f7..e50a26988 100644 --- a/sc/source/ui/unoobj/editsrc.cxx +++ b/sc/source/ui/unoobj/editsrc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: editsrc.cxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.26.32.1 $ * * This file is part of OpenOffice.org. * @@ -416,13 +416,3 @@ SfxBroadcaster& ScAccessibilityEditSource::GetBroadcaster() const return mpAccessibleTextData->GetBroadcaster(); } -void ScAccessibilityEditSource::SetDoUpdateData(sal_Bool bValue) -{ - mpAccessibleTextData->SetDoUpdate(bValue); -} - -sal_Bool ScAccessibilityEditSource::IsDirty() const -{ - return mpAccessibleTextData->IsDirty(); -} - diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 0dade654d..146da9c75 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fielduno.cxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.18.32.3 $ * * This file is part of OpenOffice.org. * @@ -431,13 +431,14 @@ void SAL_CALL ScCellFieldsObj::removeRefreshListener( const uno::Reference<util: // Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht -ScCellFieldObj::ScCellFieldObj() : - OComponentHelper( getMutex() ), - aPropSet( lcl_GetURLPropertyMap() ), - pDocShell( NULL ) -{ - pEditSource = NULL; -} + +//UNUSED2008-05 ScCellFieldObj::ScCellFieldObj() : +//UNUSED2008-05 OComponentHelper( getMutex() ), +//UNUSED2008-05 aPropSet( lcl_GetURLPropertyMap() ), +//UNUSED2008-05 pDocShell( NULL ) +//UNUSED2008-05 { +//UNUSED2008-05 pEditSource = NULL; +//UNUSED2008-05 } ScCellFieldObj::ScCellFieldObj(ScDocShell* pDocSh, const ScAddress& rPos, const ESelection& rSel) : @@ -1114,17 +1115,16 @@ sal_Int16 lcl_SvxToUnoFileFormat( SvxFileFormat nSvxValue ) // Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht - -ScHeaderFieldObj::ScHeaderFieldObj() : - OComponentHelper( getMutex() ), - aPropSet( lcl_GetHeaderFieldPropertyMap() ), - pContentObj( NULL ), - nPart( 0 ), - nType( 0 ), - nFileFormat( SVXFILEFORMAT_NAME_EXT ) -{ - pEditSource = NULL; -} +//UNUSED2008-05 ScHeaderFieldObj::ScHeaderFieldObj() : +//UNUSED2008-05 OComponentHelper( getMutex() ), +//UNUSED2008-05 aPropSet( lcl_GetHeaderFieldPropertyMap() ), +//UNUSED2008-05 pContentObj( NULL ), +//UNUSED2008-05 nPart( 0 ), +//UNUSED2008-05 nType( 0 ), +//UNUSED2008-05 nFileFormat( SVXFILEFORMAT_NAME_EXT ) +//UNUSED2008-05 { +//UNUSED2008-05 pEditSource = NULL; +//UNUSED2008-05 } ScHeaderFieldObj::ScHeaderFieldObj(ScHeaderFooterContentObj* pContent, USHORT nP, USHORT nT, const ESelection& rSel) : diff --git a/sc/source/ui/unoobj/fmtuno.cxx b/sc/source/ui/unoobj/fmtuno.cxx index 3da674320..e2b5e07e1 100644 --- a/sc/source/ui/unoobj/fmtuno.cxx +++ b/sc/source/ui/unoobj/fmtuno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmtuno.cxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.18.32.2 $ * * This file is part of OpenOffice.org. * @@ -130,9 +130,9 @@ ScConditionMode lcl_ConditionOperatorToMode( sheet::ConditionOperator eOper ) //------------------------------------------------------------------------ -ScTableConditionalFormat::ScTableConditionalFormat() -{ -} +//UNUSED2008-05 ScTableConditionalFormat::ScTableConditionalFormat() +//UNUSED2008-05 { +//UNUSED2008-05 } ScTableConditionalFormat::ScTableConditionalFormat(ScDocument* pDoc, ULONG nKey, const ScGrammar::Grammar eGrammar) @@ -488,10 +488,10 @@ ScTableConditionalFormat* ScTableConditionalFormat::getImplementation( //------------------------------------------------------------------------ -ScTableConditionalEntry::ScTableConditionalEntry() : - pParent( NULL ) -{ -} +//UNUSED2008-05 ScTableConditionalEntry::ScTableConditionalEntry() : +//UNUSED2008-05 pParent( NULL ) +//UNUSED2008-05 { +//UNUSED2008-05 } ScTableConditionalEntry::ScTableConditionalEntry(ScTableConditionalFormat* pPar, const ScCondFormatEntryItem& aItem) : @@ -599,11 +599,11 @@ void SAL_CALL ScTableConditionalEntry::setStyleName( const rtl::OUString& aStyle //------------------------------------------------------------------------ -ScTableValidationObj::ScTableValidationObj() : - aPropSet( lcl_GetValidatePropertyMap() ), - meGrammar( ScGrammar::GRAM_UNSPECIFIED ) -{ -} +//UNUSED2008-05 ScTableValidationObj::ScTableValidationObj() : +//UNUSED2008-05 aPropSet( lcl_GetValidatePropertyMap() ), +//UNUSED2008-05 meGrammar( ScGrammar::GRAM_UNSPECIFIED ) +//UNUSED2008-05 { +//UNUSED2008-05 } ScTableValidationObj::ScTableValidationObj(ScDocument* pDoc, ULONG nKey, const ScGrammar::Grammar eGrammar) : diff --git a/sc/source/ui/unoobj/miscuno.cxx b/sc/source/ui/unoobj/miscuno.cxx index 25da4603c..0f6a291ae 100644 --- a/sc/source/ui/unoobj/miscuno.cxx +++ b/sc/source/ui/unoobj/miscuno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: miscuno.cxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.32.4 $ * * This file is part of OpenOffice.org. * @@ -42,10 +42,10 @@ using namespace com::sun::star; //------------------------------------------------------------------------ -SC_SIMPLE_SERVICE_INFO( ScEmptyEnumeration, "ScEmptyEnumeration", "stardiv.unknown" ) -SC_SIMPLE_SERVICE_INFO( ScEmptyEnumerationAccess, "ScEmptyEnumerationAccess", "stardiv.unknown" ) -//SC_SIMPLE_SERVICE_INFO( ScIndexEnumeration, "ScIndexEnumeration", "stardiv.unknown" ) -SC_SIMPLE_SERVICE_INFO( ScPrintSettingsObj, "ScPrintSettingsObj", "stardiv.unknown" ) +//UNUSED2008-05 SC_SIMPLE_SERVICE_INFO( ScEmptyEnumeration, "ScEmptyEnumeration", "stardiv.unknown" ) +//UNUSED2008-05 SC_SIMPLE_SERVICE_INFO( ScEmptyEnumerationAccess, "ScEmptyEnumerationAccess", "stardiv.unknown" ) +//UNUSED2008-05 SC_SIMPLE_SERVICE_INFO( ScIndexEnumeration, "ScIndexEnumeration", "stardiv.unknown" ) +//UNUSED2008-05 SC_SIMPLE_SERVICE_INFO( ScPrintSettingsObj, "ScPrintSettingsObj", "stardiv.unknown" ) SC_SIMPLE_SERVICE_INFO( ScNameToIndexAccess, "ScNameToIndexAccess", "stardiv.unknown" ) @@ -242,58 +242,58 @@ sal_Bool SAL_CALL ScIndexEnumeration::supportsService( const ::rtl::OUString& Se //------------------------------------------------------------------------ -ScEmptyEnumerationAccess::ScEmptyEnumerationAccess() -{ -} - -ScEmptyEnumerationAccess::~ScEmptyEnumerationAccess() -{ -} - -// XEnumerationAccess - -uno::Reference<container::XEnumeration> SAL_CALL ScEmptyEnumerationAccess::createEnumeration() - throw(uno::RuntimeException) -{ - ScUnoGuard aGuard; - return new ScEmptyEnumeration; -} - -uno::Type SAL_CALL ScEmptyEnumerationAccess::getElementType() throw(uno::RuntimeException) -{ - ScUnoGuard aGuard; - return getCppuType((uno::Reference<uno::XInterface>*)0); // or what? -} - -sal_Bool SAL_CALL ScEmptyEnumerationAccess::hasElements() throw(uno::RuntimeException) -{ - return FALSE; -} +//UNUSED2008-05 ScEmptyEnumerationAccess::ScEmptyEnumerationAccess() +//UNUSED2008-05 { +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 ScEmptyEnumerationAccess::~ScEmptyEnumerationAccess() +//UNUSED2008-05 { +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 // XEnumerationAccess +//UNUSED2008-05 +//UNUSED2008-05 uno::Reference<container::XEnumeration> SAL_CALL ScEmptyEnumerationAccess::createEnumeration() +//UNUSED2008-05 throw(uno::RuntimeException) +//UNUSED2008-05 { +//UNUSED2008-05 ScUnoGuard aGuard; +//UNUSED2008-05 return new ScEmptyEnumeration; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 uno::Type SAL_CALL ScEmptyEnumerationAccess::getElementType() throw(uno::RuntimeException) +//UNUSED2008-05 { +//UNUSED2008-05 ScUnoGuard aGuard; +//UNUSED2008-05 return getCppuType((uno::Reference<uno::XInterface>*)0); // or what? +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 sal_Bool SAL_CALL ScEmptyEnumerationAccess::hasElements() throw(uno::RuntimeException) +//UNUSED2008-05 { +//UNUSED2008-05 return FALSE; +//UNUSED2008-05 } //------------------------------------------------------------------------ -ScEmptyEnumeration::ScEmptyEnumeration() -{ -} - -ScEmptyEnumeration::~ScEmptyEnumeration() -{ -} - -// XEnumeration - -sal_Bool SAL_CALL ScEmptyEnumeration::hasMoreElements() throw(uno::RuntimeException) -{ - ScUnoGuard aGuard; - return FALSE; -} - -uno::Any SAL_CALL ScEmptyEnumeration::nextElement() throw(container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException) -{ - ScUnoGuard aGuard; - return uno::Any(); -} +//UNUSED2008-05 ScEmptyEnumeration::ScEmptyEnumeration() +//UNUSED2008-05 { +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 ScEmptyEnumeration::~ScEmptyEnumeration() +//UNUSED2008-05 { +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 // XEnumeration +//UNUSED2008-05 +//UNUSED2008-05 sal_Bool SAL_CALL ScEmptyEnumeration::hasMoreElements() throw(uno::RuntimeException) +//UNUSED2008-05 { +//UNUSED2008-05 ScUnoGuard aGuard; +//UNUSED2008-05 return FALSE; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 uno::Any SAL_CALL ScEmptyEnumeration::nextElement() throw(container::NoSuchElementException, +//UNUSED2008-05 lang::WrappedTargetException, uno::RuntimeException) +//UNUSED2008-05 { +//UNUSED2008-05 ScUnoGuard aGuard; +//UNUSED2008-05 return uno::Any(); +//UNUSED2008-05 } //------------------------------------------------------------------------ @@ -348,40 +348,40 @@ sal_Bool SAL_CALL ScNameToIndexAccess::hasElements( ) throw(::com::sun::star::u //------------------------------------------------------------------------ -ScPrintSettingsObj::ScPrintSettingsObj() -{ -} - -ScPrintSettingsObj::~ScPrintSettingsObj() -{ -} - -// XPropertySet - -uno::Reference<beans::XPropertySetInfo> SAL_CALL ScPrintSettingsObj::getPropertySetInfo() - throw(uno::RuntimeException) -{ - return NULL; -} - -void SAL_CALL ScPrintSettingsObj::setPropertyValue( - const rtl::OUString& /* aPropertyName */, const uno::Any& /* aValue */ ) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) -{ - //! later... -} - -uno::Any SAL_CALL ScPrintSettingsObj::getPropertyValue( const rtl::OUString& /* aPropertyName */ ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) -{ - //! later... - return uno::Any(); -} - -SC_IMPL_DUMMY_PROPERTY_LISTENER( ScPrintSettingsObj ) +//UNUSED2008-05 ScPrintSettingsObj::ScPrintSettingsObj() +//UNUSED2008-05 { +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 ScPrintSettingsObj::~ScPrintSettingsObj() +//UNUSED2008-05 { +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 // XPropertySet +//UNUSED2008-05 +//UNUSED2008-05 uno::Reference<beans::XPropertySetInfo> SAL_CALL ScPrintSettingsObj::getPropertySetInfo() +//UNUSED2008-05 throw(uno::RuntimeException) +//UNUSED2008-05 { +//UNUSED2008-05 return NULL; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 void SAL_CALL ScPrintSettingsObj::setPropertyValue( +//UNUSED2008-05 const rtl::OUString& /* aPropertyName */, const uno::Any& /* aValue */ ) +//UNUSED2008-05 throw(beans::UnknownPropertyException, beans::PropertyVetoException, +//UNUSED2008-05 lang::IllegalArgumentException, lang::WrappedTargetException, +//UNUSED2008-05 uno::RuntimeException) +//UNUSED2008-05 { +//UNUSED2008-05 //! later... +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 uno::Any SAL_CALL ScPrintSettingsObj::getPropertyValue( const rtl::OUString& /* aPropertyName */ ) +//UNUSED2008-05 throw(beans::UnknownPropertyException, lang::WrappedTargetException, +//UNUSED2008-05 uno::RuntimeException) +//UNUSED2008-05 { +//UNUSED2008-05 //! later... +//UNUSED2008-05 return uno::Any(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 SC_IMPL_DUMMY_PROPERTY_LISTENER( ScPrintSettingsObj ) //------------------------------------------------------------------------ diff --git a/sc/source/ui/unoobj/servuno.cxx b/sc/source/ui/unoobj/servuno.cxx index 0cde82f24..a408b21e1 100644 --- a/sc/source/ui/unoobj/servuno.cxx +++ b/sc/source/ui/unoobj/servuno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: servuno.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.32.2 $ * * This file is part of OpenOffice.org. * @@ -174,13 +174,13 @@ static const sal_Char* __FAR_DATA aOldNames[SC_SERVICE_COUNT] = // alles static -String ScServiceProvider::GetProviderName(sal_uInt16 nObjectType) -{ - String sRet; - if (nObjectType < SC_SERVICE_COUNT) - sRet = String::CreateFromAscii( aProvNames[nObjectType] ); - return sRet; -} +//UNUSED2008-05 String ScServiceProvider::GetProviderName(sal_uInt16 nObjectType) +//UNUSED2008-05 { +//UNUSED2008-05 String sRet; +//UNUSED2008-05 if (nObjectType < SC_SERVICE_COUNT) +//UNUSED2008-05 sRet = String::CreateFromAscii( aProvNames[nObjectType] ); +//UNUSED2008-05 return sRet; +//UNUSED2008-05 } sal_uInt16 ScServiceProvider::GetProviderType(const String& rServiceName) { diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx index e2328210a..248bd024f 100644 --- a/sc/source/ui/unoobj/shapeuno.cxx +++ b/sc/source/ui/unoobj/shapeuno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: shapeuno.cxx,v $ - * $Revision: 1.21 $ + * $Revision: 1.21.32.1 $ * * This file is part of OpenOffice.org. * @@ -241,17 +241,6 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScShapeObj::getPropertySetInfo( return mxPropSetInfo; } -ScDocument* lcl_GetDocument( SdrObject* pObj ) -{ - if( pObj ) - { - ScDrawLayer* pModel = (ScDrawLayer*)pObj->GetModel(); - if ( pModel ) - return pModel->GetDocument(); - } - return NULL; -} - BOOL lcl_GetPageNum( SdrPage* pPage, SdrModel& rModel, SCTAB& rNum ) { USHORT nCount = rModel.GetPageCount(); diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx index df3b21fc9..d019c8ca7 100644 --- a/sc/source/ui/unoobj/styleuno.cxx +++ b/sc/source/ui/unoobj/styleuno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: styleuno.cxx,v $ - * $Revision: 1.44 $ + * $Revision: 1.43.32.3 $ * * This file is part of OpenOffice.org. * @@ -1014,12 +1014,12 @@ sal_Bool SAL_CALL ScStyleFamilyObj::hasByName( const rtl::OUString& aName ) // Default-ctor wird fuer die Reflection gebraucht -ScStyleObj::ScStyleObj() : - aPropSet( lcl_GetCellStyleMap() ), - pDocShell( NULL ), - eFamily( SFX_STYLE_FAMILY_PARA ) -{ -} +//UNUSED2008-05 ScStyleObj::ScStyleObj() : +//UNUSED2008-05 aPropSet( lcl_GetCellStyleMap() ), +//UNUSED2008-05 pDocShell( NULL ), +//UNUSED2008-05 eFamily( SFX_STYLE_FAMILY_PARA ) +//UNUSED2008-05 { +//UNUSED2008-05 } ScStyleObj::ScStyleObj(ScDocShell* pDocSh, SfxStyleFamily eFam, const String& rName) : aPropSet( (eFam == SFX_STYLE_FAMILY_PARA) ? lcl_GetCellStyleMap() : lcl_GetPageStyleMap() ), diff --git a/sc/source/ui/unoobj/textuno.cxx b/sc/source/ui/unoobj/textuno.cxx index 5cfa91d67..81c7ac87b 100644 --- a/sc/source/ui/unoobj/textuno.cxx +++ b/sc/source/ui/unoobj/textuno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: textuno.cxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.25.32.2 $ * * This file is part of OpenOffice.org. * @@ -111,14 +111,6 @@ SC_SIMPLE_SERVICE_INFO( ScHeaderFooterTextObj, "ScHeaderFooterTextObj", "stardiv //------------------------------------------------------------------------ -ScHeaderFooterContentObj::ScHeaderFooterContentObj() : - pLeftText ( NULL ), - pCenterText ( NULL ), - pRightText ( NULL ) -{ - // fuer getReflection -} - ScHeaderFooterContentObj::ScHeaderFooterContentObj( const EditTextObject* pLeft, const EditTextObject* pCenter, const EditTextObject* pRight ) : @@ -936,15 +928,6 @@ ScEditEngineTextObj::~ScEditEngineTextObj() throw() { } -void ScEditEngineTextObj::SetText( const String& rStr ) -{ - GetEditEngine()->SetText( rStr ); - - ESelection aSel; - ::GetSelection( aSel, GetEditSource()->GetTextForwarder() ); - SetSelection( aSel ); -} - void ScEditEngineTextObj::SetText( const EditTextObject& rTextObject ) { GetEditEngine()->SetText( rTextObject ); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 5f6a3f8b9..dfeae972b 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewuno.cxx,v $ - * $Revision: 1.38 $ + * $Revision: 1.37.24.3 $ * * This file is part of OpenOffice.org. * @@ -462,15 +462,15 @@ void SAL_CALL ScViewPaneObj::release() throw() // Default-ctor wird fuer SMART_REFLECTION_IMPLEMENTATION gebraucht -ScTabViewObj::ScTabViewObj() : - ScViewPaneBase( NULL, SC_VIEWPANE_ACTIVE ), - SfxBaseController( NULL ), - aPropSet( lcl_GetViewOptPropertyMap() ), - aMouseClickHandlers( 0 ), - aActivationListeners( 0 ), - bDrawSelModeSet(sal_False) -{ -} +//UNUSED2008-05 ScTabViewObj::ScTabViewObj() : +//UNUSED2008-05 ScViewPaneBase( NULL, SC_VIEWPANE_ACTIVE ), +//UNUSED2008-05 SfxBaseController( NULL ), +//UNUSED2008-05 aPropSet( lcl_GetViewOptPropertyMap() ), +//UNUSED2008-05 aMouseClickHandlers( 0 ), +//UNUSED2008-05 aActivationListeners( 0 ), +//UNUSED2008-05 bDrawSelModeSet(sal_False) +//UNUSED2008-05 { +//UNUSED2008-05 } ScTabViewObj::ScTabViewObj( ScTabViewShell* pViewSh ) : ScViewPaneBase( pViewSh, SC_VIEWPANE_ACTIVE ), diff --git a/sc/source/ui/vba/vbahelper.cxx b/sc/source/ui/vba/vbahelper.cxx index 2ffd5599f..f5bdb132b 100644 --- a/sc/source/ui/vba/vbahelper.cxx +++ b/sc/source/ui/vba/vbahelper.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: vbahelper.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.1 $ * * This file is part of OpenOffice.org. * @@ -278,22 +278,6 @@ void implnPasteSpecial(USHORT nFlags,USHORT nFunction,sal_Bool bSkipEmpty, sal_B } -bool -isRangeShortCut( const ::rtl::OUString& sParam ) -{ - // for a ShortCutRange param, I'd expect the first letter to be - //[A-Z] and the last letter to be a digit 0-9 e.g A10, [A1:A10] etc. - ::rtl::OString sStr = rtl::OUStringToOString( sParam, - RTL_TEXTENCODING_UTF8 ); - const sal_Char* pFirst = (const sal_Char*)sStr; - const sal_Char* pLast = pFirst + ( sStr.getLength() - 1 ); - if ( (( *pFirst >= 'A' && *pFirst <= 'Z' ) || ( *pFirst >= 'a' && *pFirst <= 'Z' ) ) ) - if ( ( *pLast >= '0' ) && ( *pLast <= '9' ) ) - return true; - - return false; -} - uno::Reference< frame::XModel > getCurrentDocument() throw (uno::RuntimeException) { diff --git a/sc/source/ui/vba/vbahelper.hxx b/sc/source/ui/vba/vbahelper.hxx index 03e573696..fd0431e8f 100644 --- a/sc/source/ui/vba/vbahelper.hxx +++ b/sc/source/ui/vba/vbahelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: vbahelper.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.32.1 $ * * This file is part of OpenOffice.org. * @@ -64,7 +64,6 @@ namespace org void implnPaste(); void implnCut(); void implnPasteSpecial(sal_uInt16 nFlags,sal_uInt16 nFunction,sal_Bool bSkipEmpty, sal_Bool bTranspose); - bool isRangeShortCut( const ::rtl::OUString& sParam ); css::uno::Reference< css::frame::XModel > getCurrentDocument() throw (css::uno::RuntimeException); ScTabViewShell* getBestViewShell( css::uno::Reference< css::frame::XModel>& xModel ) ; diff --git a/sc/source/ui/vba/vbarange.cxx b/sc/source/ui/vba/vbarange.cxx index 32cdc7284..adbec171f 100644 --- a/sc/source/ui/vba/vbarange.cxx +++ b/sc/source/ui/vba/vbarange.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: vbarange.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.8.30.2 $ * * This file is part of OpenOffice.org. * @@ -172,7 +172,6 @@ using ::std::vector; // * 1 inch = 72 points = 1440 twips // * 1 cm = 567 twips double lcl_hmmToPoints( double nVal ) { return ( (double)((nVal /1000 ) * 567 ) / 20 ); } -double lcl_pointsToHmm( double nVal ) { return (double)( ( nVal * 20 ) / 567 ) * 1000; } static const sal_Int16 supportedIndexTable[] = { excel::XlBordersIndex::xlEdgeLeft, excel::XlBordersIndex::xlEdgeTop, excel::XlBordersIndex::xlEdgeBottom, excel::XlBordersIndex::xlEdgeRight, excel::XlBordersIndex::xlDiagonalDown, excel::XlBordersIndex::xlDiagonalUp, excel::XlBordersIndex::xlInsideVertical, excel::XlBordersIndex::xlInsideHorizontal }; @@ -2590,19 +2589,6 @@ ScVbaRange::setHidden( const uno::Any& _hidden ) throw (uno::RuntimeException) } } -rtl::OUString lcl_replaceAll( const rtl::OUString& rString, rtl::OUString sWhat, rtl::OUString sWith ) -{ - rtl::OUString sString( rString ); - sal_Int32 offset = 0; - sal_Int32 nWithLen = sWith.getLength(); - while ((offset = sString.indexOf(sWhat )) >= 0) - { - sString = sString.replaceAt(offset, nWithLen, sWith); - offset += nWithLen; - } - return sString; -} - ::sal_Bool SAL_CALL ScVbaRange::Replace( const ::rtl::OUString& What, const ::rtl::OUString& Replacement, const uno::Any& LookAt, const uno::Any& SearchOrder, const uno::Any& MatchCase, const uno::Any& MatchByte, const uno::Any& SearchFormat, const uno::Any& ReplaceFormat ) throw (uno::RuntimeException) { diff --git a/sc/source/ui/vba/vbashapes.cxx b/sc/source/ui/vba/vbashapes.cxx index 1a88a4ace..c71c50109 100644 --- a/sc/source/ui/vba/vbashapes.cxx +++ b/sc/source/ui/vba/vbashapes.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: vbashapes.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.32.1 $ * * This file is part of OpenOffice.org. * @@ -382,6 +382,8 @@ ScVbaShapes::createName( rtl::OUString sName ) return sName; } +#if 0 +//TODO helperapi using a writer document awt::Point calculateTopLeftMargin( uno::Reference< vba::XHelperInterface > xDocument ) { @@ -389,3 +391,4 @@ calculateTopLeftMargin( uno::Reference< vba::XHelperInterface > xDocument ) uno::Reference< frame::XModel > xModel( xDocument, uno::UNO_QUERY_THROW ); return awt::Point(); } +#endif diff --git a/sc/source/ui/vba/vbashapes.hxx b/sc/source/ui/vba/vbashapes.hxx index 00a00fe6f..35ed90e52 100644 --- a/sc/source/ui/vba/vbashapes.hxx +++ b/sc/source/ui/vba/vbashapes.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: vbashapes.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.32.1 $ * * This file is part of OpenOffice.org. * @@ -56,7 +56,8 @@ protected: css::uno::Any AddRectangle( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException); css::uno::Any AddEllipse( sal_Int32 startX, sal_Int32 startY, sal_Int32 nLineWidth, sal_Int32 nLineHeight, css::uno::Any aRange ) throw (css::uno::RuntimeException); rtl::OUString createName( rtl::OUString sName ); - css::awt::Point calculateTopLeftMargin( css::uno::Reference< oo::vba::XHelperInterface > xDocument ); + //TODO helperapi using a writer document + //css::awt::Point calculateTopLeftMargin( css::uno::Reference< oo::vba::XHelperInterface > xDocument ); public: ScVbaShapes( const css::uno::Reference< oo::vba::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes ); diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx index 59a956721..059eac40d 100644 --- a/sc/source/ui/view/cellsh2.cxx +++ b/sc/source/ui/view/cellsh2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: cellsh2.cxx,v $ - * $Revision: 1.35 $ + * $Revision: 1.34.24.2 $ * * This file is part of OpenOffice.org. * @@ -1098,6 +1098,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) bOk = pDBData->HasQueryParam() || pDBData->HasSortParam() || pDBData->HasSubTotalParam(); +#if OLD_PIVOT_IMPLEMENTATION if (!bOk) { // Pivottabelle mit den Daten als Quellbereich ? @@ -1112,6 +1113,7 @@ void __EXPORT ScCellShell::GetDBState( SfxItemSet& rSet ) bOk = TRUE; } } +#endif } } if (!bOk) diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx index 7b39bfad8..f45fb9ca2 100644 --- a/sc/source/ui/view/dbfunc.cxx +++ b/sc/source/ui/view/dbfunc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dbfunc.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.24.1 $ * * This file is part of OpenOffice.org. * @@ -60,10 +60,10 @@ ScDBFunc::ScDBFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pViewSh { } -ScDBFunc::ScDBFunc( Window* pParent, const ScDBFunc& rDBFunc, ScTabViewShell* pViewShell ) : - ScViewFunc( pParent, rDBFunc, pViewShell ) -{ -} +//UNUSED2008-05 ScDBFunc::ScDBFunc( Window* pParent, const ScDBFunc& rDBFunc, ScTabViewShell* pViewShell ) : +//UNUSED2008-05 ScViewFunc( pParent, rDBFunc, pViewShell ) +//UNUSED2008-05 { +//UNUSED2008-05 } ScDBFunc::~ScDBFunc() { diff --git a/sc/source/ui/view/drawvie3.cxx b/sc/source/ui/view/drawvie3.cxx index 2190f4360..b2800ae9a 100644 --- a/sc/source/ui/view/drawvie3.cxx +++ b/sc/source/ui/view/drawvie3.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: drawvie3.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.32.1 $ * * This file is part of OpenOffice.org. * @@ -75,26 +75,6 @@ ScDrawView::ScDrawView( OutputDevice* pOut, ScViewData* pData ) : Construct(); } -ScDrawView::ScDrawView( OutputDevice* pOut, ScDocument* pDocument, SCTAB nTable ) : - FmFormView( pDocument->GetDrawLayer(), pOut ), - pViewData( NULL ), - pDev( pOut ), - pDoc( pDocument ), - nTab( nTable ), - pDropMarker( NULL ), - pDropMarkObj( NULL ), - bInConstruct( TRUE ) - //HMHbDisableHdl( FALSE ) -{ - // #i73602# Use default from the configuration - SetBufferedOverlayAllowed(getOptionsDrawinglayer().IsOverlayBuffer_Calc()); - - // #i74769#, #i75172# Use default from the configuration - SetBufferedOutputAllowed(getOptionsDrawinglayer().IsPaintBuffer_Calc()); - - Construct(); -} - // Verankerung setzen void ScDrawView::SetAnchor( ScAnchorType eType ) diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index 705ce18f8..45f4a7a6d 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -716,22 +716,22 @@ BOOL ScDrawView::SelectObject( const String& rName ) return ( pFound != NULL ); } -String ScDrawView::GetSelectedChartName() const -{ - // used for modifying a chart's data area - PersistName must always be used - // (as in ScDocument::FindChartData and UpdateChartArea) - - const SdrMarkList& rMarkList = GetMarkedObjectList(); - if (rMarkList.GetMarkCount() == 1) - { - SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - if (pObj->GetObjIdentifier() == OBJ_OLE2) - if ( pDoc->IsChart(pObj) ) - return static_cast<SdrOle2Obj*>(pObj)->GetPersistName(); - } - - return EMPTY_STRING; // nichts gefunden -} +//UNUSED2008-05 String ScDrawView::GetSelectedChartName() const +//UNUSED2008-05 { +//UNUSED2008-05 // used for modifying a chart's data area - PersistName must always be used +//UNUSED2008-05 // (as in ScDocument::FindChartData and UpdateChartArea) +//UNUSED2008-05 +//UNUSED2008-05 const SdrMarkList& rMarkList = GetMarkedObjectList(); +//UNUSED2008-05 if (rMarkList.GetMarkCount() == 1) +//UNUSED2008-05 { +//UNUSED2008-05 SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); +//UNUSED2008-05 if (pObj->GetObjIdentifier() == OBJ_OLE2) +//UNUSED2008-05 if ( pDoc->IsChart(pObj) ) +//UNUSED2008-05 return static_cast<SdrOle2Obj*>(pObj)->GetPersistName(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 return EMPTY_STRING; // nichts gefunden +//UNUSED2008-05 } FASTBOOL ScDrawView::InsertObjectSafe(SdrObject* pObj, SdrPageView& rPV, ULONG nOptions) { diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 7da4b4271..19e034e27 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: formatsh.cxx,v $ - * $Revision: 1.41 $ + * $Revision: 1.41.24.1 $ * * This file is part of OpenOffice.org. * @@ -1971,15 +1971,6 @@ void ScFormatShell::GetAlignState( SfxItemSet& rSet ) } } -void ScFormatShell::ExecBckCol( SfxRequest& rReq ) -{ - ExecuteAttr( rReq ); -} - -void ScFormatShell::GetBckColState( SfxItemSet& rSet ) -{ - GetAttrState( rSet ); -} void ScFormatShell::GetNumFormatState( SfxItemSet& rSet ) { ScTabViewShell* pTabViewShell = GetViewData()->GetViewShell(); diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index ca5b82c97..ad7f92810 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: gridwin.cxx,v $ - * $Revision: 1.96 $ + * $Revision: 1.94.20.2 $ * * This file is part of OpenOffice.org. * @@ -420,7 +420,9 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic bEEMouse( FALSE ), nMouseStatus( SC_GM_NONE ), nNestedButtonState( SC_NESTEDBUTTON_NONE ), +#if OLD_PIVOT_IMPLEMENTATION bPivotMouse( FALSE ), +#endif bDPMouse( FALSE ), bRFMouse( FALSE ), nPagebreakMouse( SC_PD_NONE ), @@ -1826,12 +1828,14 @@ void __EXPORT ScGridWindow::MouseButtonUp( const MouseEvent& rMEvt ) return; } +#if OLD_PIVOT_IMPLEMENTATION if (bPivotMouse) { PivotMouseButtonUp( rMEvt ); bPivotMouse = FALSE; return; } +#endif if (bDPMouse) { @@ -2221,11 +2225,13 @@ void __EXPORT ScGridWindow::MouseMove( const MouseEvent& rMEvt ) return; } +#if OLD_PIVOT_IMPLEMENTATION if (bPivotMouse) { PivotMouseMove( rMEvt ); return; } +#endif if (bDPMouse) { @@ -2435,8 +2441,10 @@ void ScGridWindow::Tracking( const TrackingEvent& rTEvt ) { if (!pViewData->GetView()->IsInActivatePart()) { +#if OLD_PIVOT_IMPLEMENTATION if (bPivotMouse) bPivotMouse = FALSE; // gezeichnet wird per bDragRect +#endif if (bDPMouse) bDPMouse = FALSE; // gezeichnet wird per bDragRect if (bDragRect) diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index 22a084e46..f2019cb55 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: gridwin2.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.32.1 $ * * This file is part of OpenOffice.org. * @@ -102,11 +102,12 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); + ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); + +#if OLD_PIVOT_IMPLEMENTATION ScPivotCollection* pPivotCollection = pDoc->GetPivotCollection(); ScPivot* pPivot = pPivotCollection->GetPivotAtCursor(nCol, nRow, nTab); - ScDPObject* pDPObj = pDoc->GetDPAtCursor(nCol, nRow, nTab); - if (pPivot) // alte Pivottabellen { if (pPivot->IsFilterAtCursor(nCol, nRow, nTab)) @@ -186,7 +187,9 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt } } } - else if (pDPObj) +#endif + + if (pDPObj) { USHORT nOrient = sheet::DataPilotFieldOrientation_HIDDEN; ScAddress aPos( nCol, nRow, nTab ); @@ -253,6 +256,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt } } +#if OLD_PIVOT_IMPLEMENTATION void ScGridWindow::DoPivotDrop( BOOL bDelete, BOOL bToCols, SCSIZE nDestPos ) { if ( nPivotField == PIVOT_DATA_FIELD && bDelete ) @@ -609,6 +613,7 @@ void ScGridWindow::PivotMouseButtonUp( const MouseEvent& rMEvt ) PivotTestMouse( rMEvt, FALSE ); SetPointer( Pointer( POINTER_ARROW ) ); } +#endif // ----------------------------------------------------------------------- // diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx index 91d07c1f9..168e35884 100644 --- a/sc/source/ui/view/gridwin3.cxx +++ b/sc/source/ui/view/gridwin3.cxx @@ -353,79 +353,6 @@ void ScGridWindow::CreateAnchorHandle(SdrHdlList& rHdl, const ScAddress& rAddres } } -void ScGridWindow::OutlinerViewPaint( const Rectangle& rRect ) -{ - ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); - if (pDrView && pDrView->GetTextEditOutlinerView()) - { - Outliner* pOut = pDrView->GetTextEditOutliner(); - ULONG nViewCount = pOut ? pOut->GetViewCount() : 0; - for (ULONG nView=0; nView<nViewCount; nView++) - { - OutlinerView* pOlView = pOut->GetView(nView); - - if (pOlView && pOlView->GetWindow() == this) - { - BOOL bFrame = FALSE; - Rectangle aEditRect = pOlView->GetOutputArea(); - SdrObject* pEditObj = GetEditObject(); - if (pEditObj && pEditObj->ISA(SdrTextObj)) - { - SdrTextObj* pTextObj = (SdrTextObj*)pEditObj; - Rectangle aMinRect; - pTextObj->TakeTextEditArea(NULL,NULL,NULL,&aMinRect); // PageView Offset ist 0 - aEditRect.Union(aMinRect); - bFrame = sal::static_int_cast<BOOL>( pTextObj->IsTextFrame() ); - } - - if ( aEditRect.IsOver( rRect ) ) - { - ULONG nOldDrawMode = GetDrawMode(); - if ( Application::GetSettings().GetStyleSettings().GetHighContrastMode() ) - { - SetDrawMode( nOldDrawMode | DRAWMODE_SETTINGSLINE | DRAWMODE_SETTINGSFILL | - DRAWMODE_SETTINGSTEXT | DRAWMODE_SETTINGSGRADIENT ); - } - - Rectangle aEffRect = rRect.GetIntersection( aEditRect ); - if (bFrame) - { - if ( pEditObj->GetLayer() ==SC_LAYER_INTERN ) // cell note? - { - // #78828# always draw the edit background in case notes overlap - SetFillColor( pOlView->GetBackgroundColor() ); - SetLineColor(); - DrawRect( aEffRect ); - } - - // DrawLayer mit dem Text-Rechteck zeichnet nur die Outliner-View - // und den Text-Rahmen (an den kommt man sonst von aussen nicht heran). - - SdrPageView* pPV = pDrView->GetSdrPageView(); - DBG_ASSERT(pPV, "keine PageView"); - if (pPV) - { - SdrLayerID nLayer = pEditObj ? pEditObj->GetLayer() : SC_LAYER_FRONT; - // Region aDrawRegion(aEffRect); - // pPV->DrawLayer( nLayer, aDrawRegion, this ); - pPV->DrawLayer( nLayer, this ); - } - } - else - { - SetFillColor( pOlView->GetBackgroundColor() ); - SetLineColor(); - DrawRect( aEffRect ); - pOlView->Paint( aEffRect ); - } - - SetDrawMode( nOldDrawMode ); - } - } - } - } -} - SdrObject* ScGridWindow::GetEditObject() { ScDrawView* pDrView = pViewData->GetView()->GetScDrawView(); diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx index ce61ad928..ebe7dac3f 100644 --- a/sc/source/ui/view/gridwin4.cxx +++ b/sc/source/ui/view/gridwin4.cxx @@ -1200,63 +1200,6 @@ void ScGridWindow::DrawPagePreview( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2, } } -void ScGridWindow::DrawRefMark( SCCOL nRefStartX, SCROW nRefStartY, - SCCOL nRefEndX, SCROW nRefEndY, - const Color& rColor, BOOL bHandle ) -{ - PutInOrder( nRefStartX, nRefEndX ); - PutInOrder( nRefStartY, nRefEndY ); - - SCTAB nTab = pViewData->GetTabNo(); - ScDocument* pDoc = pViewData->GetDocument(); - if ( nRefStartX == nRefEndX && nRefStartY == nRefEndY ) - pDoc->ExtendMerge( nRefStartX, nRefStartY, nRefEndX, nRefEndY, nTab ); - - MapMode aOld = GetMapMode(); - SetMapMode(MAP_PIXEL); - - SCCOL nCurX = pViewData->GetCurX(); - SCROW nCurY = pViewData->GetCurY(); - BOOL bHide = ( nCurX+1 >= nRefStartX && nCurX <= nRefEndX+1 && - nCurY+1 >= nRefStartY && nCurY <= nRefEndY+1 ); - - BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); - long nLayoutSign = bLayoutRTL ? -1 : 1; - - Point aStartPos = pViewData->GetScrPos( nRefStartX, nRefStartY, eWhich, TRUE ); - Point aEndPos = pViewData->GetScrPos( nRefEndX+1, nRefEndY+1, eWhich, TRUE ); - aEndPos.X() -= 2 * nLayoutSign; - aEndPos.Y() -= 2; // don't paint over the grid - - // begrenzen um Ueberlaeufe mit Paint-Fehlern zu vermeiden - long nMinY = -10; - long nMaxY = GetOutputSizePixel().Height() + 10; // mit Abstand fuer Handle - if (aStartPos.Y() < nMinY) aStartPos.Y() = nMinY; - if (aStartPos.Y() > nMaxY) aStartPos.Y() = nMaxY; - if (aEndPos.Y() > nMaxY) aEndPos.Y() = nMaxY; - if (aEndPos.Y() < nMinY) aEndPos.Y() = nMinY; - - if (bHide) - HideCursor(); - - SetLineColor( rColor ); - SetFillColor(); - DrawRect( Rectangle( aStartPos, aEndPos ) ); - - if ( bHandle ) - { - SetLineColor(); - SetFillColor( rColor ); - DrawRect( Rectangle( aEndPos.X()-3*nLayoutSign, aEndPos.Y()-3, - aEndPos.X()+nLayoutSign, aEndPos.Y()+1 ) ); - } - - if (bHide) - ShowCursor(); - - SetMapMode(aOld); -} - void ScGridWindow::DrawButtons( SCCOL nX1, SCROW /*nY1*/, SCCOL nX2, SCROW /*nY2*/, ScTableInfo& rTabInfo, OutputDevice* pContentDev ) { aComboButton.SetOutputDevice( pContentDev ); @@ -1884,72 +1827,72 @@ void ScGridWindow::GetSelectionRects( ::std::vector< Rectangle >& rPixelRects ) // ------------------------------------------------------------------------- -void ScGridWindow::DrawDragRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ) -{ - if ( nX2 < pViewData->GetPosX(eHWhich) || nY2 < pViewData->GetPosY(eVWhich) ) - return; - - Update(); // wegen XOR - - MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); - - SCTAB nTab = pViewData->GetTabNo(); - - SCCOL nPosX = pViewData->GetPosX(WhichH(eWhich)); - SCROW nPosY = pViewData->GetPosY(WhichV(eWhich)); - if (nX1 < nPosX) nX1 = nPosX; - if (nX2 < nPosX) nX2 = nPosX; - if (nY1 < nPosY) nY1 = nPosY; - if (nY2 < nPosY) nY2 = nPosY; - - Point aScrPos( pViewData->GetScrPos( nX1, nY1, eWhich ) ); - - long nSizeXPix=0; - long nSizeYPix=0; - ScDocument* pDoc = pViewData->GetDocument(); - double nPPTX = pViewData->GetPPTX(); - double nPPTY = pViewData->GetPPTY(); - SCCOLROW i; - - BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); - long nLayoutSign = bLayoutRTL ? -1 : 1; - - if (ValidCol(nX2) && nX2>=nX1) - for (i=nX1; i<=nX2; i++) - nSizeXPix += ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(i), nTab ), nPPTX ); - else - { - aScrPos.X() -= nLayoutSign; - nSizeXPix += 2; - } - - if (ValidRow(nY2) && nY2>=nY1) - for (i=nY1; i<=nY2; i++) - nSizeYPix += ScViewData::ToPixel( pDoc->GetRowHeight( i, nTab ), nPPTY ); - else - { - aScrPos.Y() -= 1; - nSizeYPix += 2; - } - - aScrPos.X() -= 2 * nLayoutSign; - aScrPos.Y() -= 2; -// Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) ); - Rectangle aRect( aScrPos.X(), aScrPos.Y(), - aScrPos.X() + ( nSizeXPix + 2 ) * nLayoutSign, aScrPos.Y() + nSizeYPix + 2 ); - if ( bLayoutRTL ) - { - aRect.Left() = aRect.Right(); // end position is left - aRect.Right() = aScrPos.X(); - } - - Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() )); - Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() )); - Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 )); - Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() )); - - SetMapMode(aOld); -} +//UNUSED2008-05 void ScGridWindow::DrawDragRect( SCCOL nX1, SCROW nY1, SCCOL nX2, SCROW nY2 ) +//UNUSED2008-05 { +//UNUSED2008-05 if ( nX2 < pViewData->GetPosX(eHWhich) || nY2 < pViewData->GetPosY(eVWhich) ) +//UNUSED2008-05 return; +//UNUSED2008-05 +//UNUSED2008-05 Update(); // wegen XOR +//UNUSED2008-05 +//UNUSED2008-05 MapMode aOld = GetMapMode(); SetMapMode(MAP_PIXEL); +//UNUSED2008-05 +//UNUSED2008-05 SCTAB nTab = pViewData->GetTabNo(); +//UNUSED2008-05 +//UNUSED2008-05 SCCOL nPosX = pViewData->GetPosX(WhichH(eWhich)); +//UNUSED2008-05 SCROW nPosY = pViewData->GetPosY(WhichV(eWhich)); +//UNUSED2008-05 if (nX1 < nPosX) nX1 = nPosX; +//UNUSED2008-05 if (nX2 < nPosX) nX2 = nPosX; +//UNUSED2008-05 if (nY1 < nPosY) nY1 = nPosY; +//UNUSED2008-05 if (nY2 < nPosY) nY2 = nPosY; +//UNUSED2008-05 +//UNUSED2008-05 Point aScrPos( pViewData->GetScrPos( nX1, nY1, eWhich ) ); +//UNUSED2008-05 +//UNUSED2008-05 long nSizeXPix=0; +//UNUSED2008-05 long nSizeYPix=0; +//UNUSED2008-05 ScDocument* pDoc = pViewData->GetDocument(); +//UNUSED2008-05 double nPPTX = pViewData->GetPPTX(); +//UNUSED2008-05 double nPPTY = pViewData->GetPPTY(); +//UNUSED2008-05 SCCOLROW i; +//UNUSED2008-05 +//UNUSED2008-05 BOOL bLayoutRTL = pDoc->IsLayoutRTL( nTab ); +//UNUSED2008-05 long nLayoutSign = bLayoutRTL ? -1 : 1; +//UNUSED2008-05 +//UNUSED2008-05 if (ValidCol(nX2) && nX2>=nX1) +//UNUSED2008-05 for (i=nX1; i<=nX2; i++) +//UNUSED2008-05 nSizeXPix += ScViewData::ToPixel( pDoc->GetColWidth( static_cast<SCCOL>(i), nTab ), nPPTX ); +//UNUSED2008-05 else +//UNUSED2008-05 { +//UNUSED2008-05 aScrPos.X() -= nLayoutSign; +//UNUSED2008-05 nSizeXPix += 2; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 if (ValidRow(nY2) && nY2>=nY1) +//UNUSED2008-05 for (i=nY1; i<=nY2; i++) +//UNUSED2008-05 nSizeYPix += ScViewData::ToPixel( pDoc->GetRowHeight( i, nTab ), nPPTY ); +//UNUSED2008-05 else +//UNUSED2008-05 { +//UNUSED2008-05 aScrPos.Y() -= 1; +//UNUSED2008-05 nSizeYPix += 2; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 aScrPos.X() -= 2 * nLayoutSign; +//UNUSED2008-05 aScrPos.Y() -= 2; +//UNUSED2008-05 // Rectangle aRect( aScrPos, Size( nSizeXPix + 3, nSizeYPix + 3 ) ); +//UNUSED2008-05 Rectangle aRect( aScrPos.X(), aScrPos.Y(), +//UNUSED2008-05 aScrPos.X() + ( nSizeXPix + 2 ) * nLayoutSign, aScrPos.Y() + nSizeYPix + 2 ); +//UNUSED2008-05 if ( bLayoutRTL ) +//UNUSED2008-05 { +//UNUSED2008-05 aRect.Left() = aRect.Right(); // end position is left +//UNUSED2008-05 aRect.Right() = aScrPos.X(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 Invert(Rectangle( aRect.Left(), aRect.Top(), aRect.Left()+2, aRect.Bottom() )); +//UNUSED2008-05 Invert(Rectangle( aRect.Right()-2, aRect.Top(), aRect.Right(), aRect.Bottom() )); +//UNUSED2008-05 Invert(Rectangle( aRect.Left()+3, aRect.Top(), aRect.Right()-3, aRect.Top()+2 )); +//UNUSED2008-05 Invert(Rectangle( aRect.Left()+3, aRect.Bottom()-2, aRect.Right()-3, aRect.Bottom() )); +//UNUSED2008-05 +//UNUSED2008-05 SetMapMode(aOld); +//UNUSED2008-05 } // ------------------------------------------------------------------------- diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx index c615e1875..fa00785a6 100644 --- a/sc/source/ui/view/olinewin.cxx +++ b/sc/source/ui/view/olinewin.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: olinewin.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.32.1 $ * * This file is part of OpenOffice.org. * @@ -151,14 +151,6 @@ void ScOutlineWindow::ScrollPixel( long nDiff ) ShowFocus(); } -void ScOutlineWindow::ScrollRel( long nEntryDiff ) -{ - if ( mbHoriz ) - Scroll( nEntryDiff, 0 ); - else - Scroll( 0, nEntryDiff ); -} - void ScOutlineWindow::ScrollRel( long nEntryDiff, long nEntryStart, long nEntryEnd ) { Rectangle aRect( GetRectangle( 0, nEntryStart, GetOutputSizeLevel() - 1, nEntryEnd ) ); diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx index eff912a14..38919877f 100644 --- a/sc/source/ui/view/output.cxx +++ b/sc/source/ui/view/output.cxx @@ -1146,11 +1146,6 @@ size_t lclGetArrayColFromCellInfoX( USHORT nCellInfoX, USHORT nCellInfoFirstX, U return static_cast< size_t >( bRTL ? (nCellInfoLastX + 2 - nCellInfoX) : (nCellInfoX - nCellInfoFirstX) ); } -USHORT lclGetCellInfoXFromArrayCol( size_t nCol, USHORT nCellInfoFirstX, USHORT nCellInfoLastX, bool bRTL ) -{ - return static_cast< USHORT >( bRTL ? (nCellInfoLastX + 2 - nCol) : (nCol + nCellInfoFirstX) ); -} - void ScOutputData::DrawFrame() { ULONG nOldDrawMode = pDev->GetDrawMode(); @@ -1690,81 +1685,6 @@ void ScOutputData::DrawRotatedFrame( const Color* pForceColor ) // Drucker -void ScOutputData::DrawPageBorder( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY ) -{ - PutInOrder( nStartX, nEndX ); - PutInOrder( nStartY, nEndY ); - - if ( nStartX <= nX2 && nEndX >= nX1 && - nStartY <= nY2 && nEndY >= nY1 ) - { - long nMinX = nScrX; - long nMinY = nScrY; - long nMaxX = nScrX+nScrW-1; - long nMaxY = nScrY+nScrH-1; - BOOL bTop = FALSE; - BOOL bBottom = FALSE; - BOOL bLeft = FALSE; - BOOL bRight = FALSE; - - long nPosY = nScrY; - for (SCSIZE nArrY=1; nArrY+1<nArrCount; nArrY++) - { - SCROW nY = pRowInfo[nArrY].nRowNo; - - if ( nY==nStartY ) - { - nMinY = nPosY; - bTop = TRUE; - } - - if ( nY==nEndY ) - { -// nMaxY = nPosY + pRowInfo[nArrY].nHeight - 2; - nMaxY = nPosY + pRowInfo[nArrY].nHeight; - bBottom = TRUE; - } - - nPosY += pRowInfo[nArrY].nHeight; - } - - long nPosX = nScrX; - for (SCCOL nX=nX1; nX<=nX2; nX++) - { - if ( nX==nStartX ) - { - nMinX = nPosX; - bLeft = TRUE; - } - if ( nX==nEndX ) - { -// nMaxX = nPosX + pRowInfo[0].pCellInfo[nX+1].nWidth - 2; - nMaxX = nPosX + pRowInfo[0].pCellInfo[nX+1].nWidth; - bRight = TRUE; - } - nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth; - } - - pDev->SetLineColor( COL_BLACK ); - if (bTop && bBottom && bLeft && bRight) - { - pDev->SetFillColor(); - pDev->DrawRect( Rectangle( nMinX, nMinY, nMaxX, nMaxY ) ); - } - else - { - if (bTop) - pDev->DrawLine( Point( nMinX,nMinY ), Point( nMaxX,nMinY ) ); - if (bBottom) - pDev->DrawLine( Point( nMinX,nMaxY ), Point( nMaxX,nMaxY ) ); - if (bLeft) - pDev->DrawLine( Point( nMinX,nMinY ), Point( nMinX,nMaxY ) ); - if (bRight) - pDev->DrawLine( Point( nMaxX,nMinY ), Point( nMaxX,nMaxY ) ); - } - } -} - PolyPolygon ScOutputData::GetChangedArea() { PolyPolygon aPoly; @@ -2402,64 +2322,6 @@ void ScOutputData::AddPDFNotes() } } -long lcl_FindInList( const List& rPosList, const ScAddress &rPos ) -{ - long nCount = rPosList.Count(); - for (long i=0; i<nCount; i++) - if (*(ScAddress*)rPosList.GetObject(i) == rPos) - return i+1; - - return 0; -} - -void ScOutputData::PrintNoteMarks( const List& rPosList ) -{ - Font aFont; - ScAutoFontColorMode eColorMode = bUseStyleColor ? - ( bForceAutoColor ? SC_AUTOCOL_IGNOREFONT : SC_AUTOCOL_DISPLAY ) : - SC_AUTOCOL_PRINT; - ((const ScPatternAttr&)pDoc->GetPool()->GetDefaultItem(ATTR_PATTERN)).GetFont(aFont, eColorMode); - aFont.SetSize( Size( 0, (long) ( 120 * nPPTY ) ) ); // 6 pt - pDev->SetFont( aFont ); - - String aStr; - - long nPosY = nScrY; - for (SCSIZE nArrY=1; nArrY+1<nArrCount; nArrY++) - { - RowInfo* pThisRowInfo = &pRowInfo[nArrY]; - if ( pThisRowInfo->bChanged ) - { - long nPosX = nScrX; - for (SCCOL nX=nX1; nX<=nX2; nX++) - { - CellInfo* pInfo = &pThisRowInfo->pCellInfo[nX+1]; - ScBaseCell* pCell = pInfo->pCell; - if ( pCell && pCell->GetNotePtr() ) // auch verdeckte wegen der Numerierung - { - aStr = String::CreateFromInt32( lcl_FindInList( rPosList, - ScAddress( nX, pThisRowInfo->nRowNo, nTab))); - long nMarkX = nPosX + pRowInfo[0].pCellInfo[nX+1].nWidth - 2 - - pDev->GetTextWidth(aStr); - pDev->DrawText( Point( nMarkX,nPosY ), aStr ); - } - - nPosX += pRowInfo[0].pCellInfo[nX+1].nWidth; - } - } - nPosY += pThisRowInfo->nHeight; - } -} - -void ScOutputData::ConnectObject( const uno::Reference < embed::XEmbeddedObject >& rRef, SdrOle2Obj* pOleObj ) -{ - if (rRef.is()) - { - if ( rRef->getStatus( pOleObj->GetAspect() ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) - pViewShell->ConnectObject( pOleObj ); - } -} - void ScOutputData::DrawClipMarks() { if (!bAnyClipped) diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index 8f69dda3b..bff41c9ba 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -136,7 +136,6 @@ public: void SetPatternSimple( const ScPatternAttr* pNew, const SfxItemSet* pSet ); BOOL SetText( ScBaseCell* pCell ); // TRUE -> pOldPattern vergessen - void ResetText(); void SetHashText(); void SetAutoText( const String& rAutoText ); @@ -165,7 +164,6 @@ public: BOOL HasCondHeight() const { return pCondSet && SFX_ITEM_SET == pCondSet->GetItemState( ATTR_FONT_HEIGHT, TRUE ); } - BOOL IsRightToLeftAttr() const; BOOL HasEditCharacters() const; }; @@ -508,14 +506,6 @@ BOOL ScDrawStringsVars::SetText( ScBaseCell* pCell ) return bChanged; } -void ScDrawStringsVars::ResetText() -{ - aString.Erase(); - pLastCell = NULL; - aTextSize = Size(0,0); - nOriginalWidth = 0; -} - void ScDrawStringsVars::SetHashText() { SetAutoText( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("###")) ); @@ -551,14 +541,6 @@ void ScDrawStringsVars::SetAutoText( const String& rAutoText ) pLastCell = NULL; // derselbe Text kann in der naechsten Zelle wieder passen } -BOOL ScDrawStringsVars::IsRightToLeftAttr() const -{ - SvxFrameDirection eCellDir = (SvxFrameDirection)((const SvxFrameDirectionItem&) - pPattern->GetItem( ATTR_WRITINGDIR, pCondSet )).GetValue(); - return ( eCellDir == FRMDIR_HORI_RIGHT_TOP || - ( eCellDir == FRMDIR_ENVIRONMENT && pOutput->nTabTextDirection == EE_HTEXTDIR_R2L ) ); -} - BOOL ScDrawStringsVars::HasEditCharacters() const { static const sal_Unicode pChars[] = @@ -847,31 +829,6 @@ inline void lcl_CreateInterpretProgress( BOOL& bProgress, ScDocument* pDoc, } } -BOOL lcl_IsValueDataAtPos( BOOL& bProgress, ScDocument* pDoc, - SCCOL nCol, SCROW nRow, SCTAB nTab ) -{ - ScBaseCell* pCell; - pDoc->GetCell( nCol, nRow, nTab, pCell ); - if ( pCell ) - { - if ( pCell->GetCellType() == CELLTYPE_FORMULA ) - { // kein weiteres Interpret anstossen - ScFormulaCell* pFCell = (ScFormulaCell*) pCell; - if ( pFCell->IsRunning() ) - return TRUE; - else - { - lcl_CreateInterpretProgress( bProgress, pDoc, pFCell ); - return pFCell->HasValueData(); - } - } - else - return pCell->HasValueData(); - } - else - return FALSE; -} - inline BYTE GetScriptType( ScDocument* pDoc, ScBaseCell* pCell, const ScPatternAttr* pPattern, const SfxItemSet* pCondSet ) @@ -954,38 +911,6 @@ BOOL ScOutputData::IsAvailable( SCCOL nX, SCROW nY ) return TRUE; } -long ScOutputData::GetAvailableWidth( SCCOL nX, SCROW nY, long nNeeded ) -{ - // get the pixel width that's available for the cell's text, - // including cells outside of the current screen area - - long nAvailable = (long) ( pDoc->GetColWidth( nX, nTab ) * nPPTX ); // cell itself - - const ScMergeAttr* pMerge = (const ScMergeAttr*)pDoc->GetAttr( nX, nY, nTab, ATTR_MERGE ); - if ( pMerge->IsMerged() ) - { - // for merged cells, allow only the merged area - SCCOL nCount = pMerge->GetColMerge(); - for (SCCOL nAdd=1; nAdd<nCount; nAdd++) - nAvailable += (long) ( pDoc->GetColWidth( nX + nAdd, nTab ) * nPPTX ); - } - else - { - // look for empty cells into which the text can be extended - while ( nAvailable < nNeeded && nX < MAXCOL && IsAvailable( nX+1, nY ) ) - { - ++nX; - nAvailable += (long) ( pDoc->GetColWidth( nX, nTab ) * nPPTX ); - } - } - - if ( bMarkClipped && nAvailable < nNeeded ) - nAvailable -= (long)( SC_CLIPMARK_SIZE * nPPTX ); - - return nAvailable; -} - - // nX, nArrY: loop variables from DrawStrings / DrawEdit // nPosX, nPosY: corresponding positions for nX, nArrY // nCellX, nCellY: position of the cell that contains the text @@ -1791,28 +1716,6 @@ void ScOutputData::DrawStrings( BOOL bPixelToLogic ) // ------------------------------------------------------------------------------- -Size lcl_GetVertPaperSize( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) -{ - const double nPPTY = HMM_PER_TWIPS; - - const ScPatternAttr* pPattern = pDoc->GetPattern( nCol, nRow, nTab ); - const ScMergeAttr& rMerge = (const ScMergeAttr&)pPattern->GetItem(ATTR_MERGE); - - long nCellY = (long) ( pDoc->GetRowHeight(nRow,nTab) * nPPTY ); - if ( rMerge.GetRowMerge() > 1 ) - { - SCROW nCountY = rMerge.GetRowMerge(); - nCellY += (long) pDoc->GetScaledRowHeight( nRow+1, nRow+nCountY-1, nTab, nPPTY); - } - - // only top/bottom margin are interesting - const SvxMarginItem& rMargin = (const SvxMarginItem&)pPattern->GetItem(ATTR_MARGIN); - nCellY -= (long) ( rMargin.GetTopMargin() * nPPTY ); - nCellY -= (long) ( rMargin.GetBottomMargin() * nPPTY ); - - return Size( nCellY - 1, 1000000 ); // cell height as width for PaperSize -} - void lcl_ClearEdit( EditEngine& rEngine ) // Text und Attribute { rEngine.SetUpdateMode( FALSE ); @@ -2381,80 +2284,6 @@ void ScOutputData::DrawEdit(BOOL bPixelToLogic) } pEngine->SetDefaultItem( SvxAdjustItem( eSvxAdjust, EE_PARA_JUST ) ); - // Raender - - //! Position und Papersize auf EditUtil umstellen !!! - -/* Rectangle aPixRect = ScEditUtil( pDoc, - nX,nY,nTab, Point(nStartX,nStartY), - pDev, nPPTX, nPPTY, nZoom ) - .GetEditArea( pPattern ); - - pDev->SetFillInBrush(Brush(Color(COL_LIGHTRED))); - pDev->DrawRect(pDev->PixelToLogic(aPixRect)); -*/ - -#if 0 - Size aPaperSize = Size( 1000000, 1000000 ); - if ( eOrient==SVX_ORIENTATION_STACKED ) - aPaperSize.Width() = nOutWidth; // zum Zentrieren - else if (bAsianVertical) - { - aPaperSize.Width() = nOutWidth; - if (bBreak) - { - // add some extra height (default margin value) for safety - // as long as GetEditArea isn't used below - long nExtraHeight = (long)( 20 * nPPTY ); - aPaperSize.Height() = nOutHeight + nExtraHeight; - } - } - else if (bBreak) - { - if (eOrient == SVX_ORIENTATION_STANDARD) - { - if (eType==OUTTYPE_WINDOW && - eOrient!=SVX_ORIENTATION_STACKED && - pInfo && pInfo->bAutoFilter) - { - long nSub = Min( pRowInfo[nArrY].nHeight, - (USHORT) DROPDOWN_BITMAP_SIZE ); - if ( nOutWidth > nSub ) - nOutWidth -= nSub; - } - aPaperSize.Width() = nOutWidth; - } - else - aPaperSize.Width() = nOutHeight - 1; - } - if (bPixelToLogic) - { - //! also handle bAsianVertical in GetEditArea - if ( bBreak && pFmtDevice != pRefDevice && !bAsianVertical ) - { - // calculate PaperSize for automatic line breaks from logic size, - // not pixel sizes, to get the same breaks at all scales - - if ( eOrient == SVX_ORIENTATION_STANDARD ) - { - Fraction aFract(1,1); - Rectangle aUtilRect = ScEditUtil( pDoc,nX,nY,nTab, - Point(nStartX,nStartY), pDev, - HMM_PER_TWIPS, HMM_PER_TWIPS, aFract, aFract ) - .GetEditArea( pPattern, FALSE ); - Size aLogic = aUtilRect.GetSize(); - pEngine->SetPaperSize( aLogic ); - } - else - pEngine->SetPaperSize( lcl_GetVertPaperSize(pDoc,nX,nY,nTab) ); - } - else - pEngine->SetPaperSize(pRefDevice->PixelToLogic(aPaperSize)); - } - else - pEngine->SetPaperSize(aPaperSize); -#endif - // Read content from cell BOOL bWrapFields = FALSE; diff --git a/sc/source/ui/view/prevloc.cxx b/sc/source/ui/view/prevloc.cxx index 73467d853..54f7376bd 100644 --- a/sc/source/ui/view/prevloc.cxx +++ b/sc/source/ui/view/prevloc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: prevloc.cxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.32.2 $ * * This file is part of OpenOffice.org. * @@ -285,18 +285,6 @@ void ScPreviewLocationData::GetDrawRange( USHORT nPos, Rectangle& rPixelRect, Ma } } -ScPreviewLocationEntry* lcl_GetEntryByPosition( const List& rEntries, const Point& rPos, ScPreviewLocationType eType ) -{ - ULONG nCount = rEntries.Count(); - for (ULONG nListPos=0; nListPos<nCount; nListPos++) - { - ScPreviewLocationEntry* pEntry = (ScPreviewLocationEntry*)rEntries.GetObject(nListPos); - if ( pEntry->eType == eType && pEntry->aPixelRect.IsInside( rPos ) ) - return pEntry; - } - return NULL; -} - ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAddress& rPos, ScPreviewLocationType eType ) { ULONG nCount = rEntries.Count(); @@ -309,44 +297,44 @@ ScPreviewLocationEntry* lcl_GetEntryByAddress( const List& rEntries, const ScAdd return NULL; } -ScAddress ScPreviewLocationData::GetCellFromRange( const Size& rOffsetPixel, const ScRange& rRange ) const -{ - const double nScaleX = HMM_PER_TWIPS; - const double nScaleY = HMM_PER_TWIPS; - - Size aOffsetLogic = pWindow->PixelToLogic( rOffsetPixel, aCellMapMode ); - SCTAB nTab = rRange.aStart.Tab(); - - long nPosX = 0; - SCCOL nCol = rRange.aStart.Col(); - SCCOL nEndCol = rRange.aEnd.Col(); - while ( nCol <= nEndCol && nPosX < aOffsetLogic.Width() ) - { - USHORT nDocW = pDoc->GetColWidth( nCol, nTab ); - if (nDocW) - nPosX += (long) (nDocW * nScaleX); - ++nCol; - } - if ( nCol > rRange.aStart.Col() ) - --nCol; - - long nPosY = 0; - ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter( - pDoc->GetRowFlagsArray( nTab), rRange.aStart.Row(), - rRange.aEnd.Row(), CR_HIDDEN, 0, pDoc->GetRowHeightArray( nTab)); - while ( aIter && nPosY < aOffsetLogic.Height() ) - { - USHORT nDocH = *aIter; - if (nDocH) - nPosY += (long) (nDocH * nScaleY); - ++aIter; - } - SCROW nRow = aIter.GetPos(); - if ( nRow > rRange.aStart.Row() ) - --nRow; - - return ScAddress( nCol, nRow, nTab ); -} +//UNUSED2008-05 ScAddress ScPreviewLocationData::GetCellFromRange( const Size& rOffsetPixel, const ScRange& rRange ) const +//UNUSED2008-05 { +//UNUSED2008-05 const double nScaleX = HMM_PER_TWIPS; +//UNUSED2008-05 const double nScaleY = HMM_PER_TWIPS; +//UNUSED2008-05 +//UNUSED2008-05 Size aOffsetLogic = pWindow->PixelToLogic( rOffsetPixel, aCellMapMode ); +//UNUSED2008-05 SCTAB nTab = rRange.aStart.Tab(); +//UNUSED2008-05 +//UNUSED2008-05 long nPosX = 0; +//UNUSED2008-05 SCCOL nCol = rRange.aStart.Col(); +//UNUSED2008-05 SCCOL nEndCol = rRange.aEnd.Col(); +//UNUSED2008-05 while ( nCol <= nEndCol && nPosX < aOffsetLogic.Width() ) +//UNUSED2008-05 { +//UNUSED2008-05 USHORT nDocW = pDoc->GetColWidth( nCol, nTab ); +//UNUSED2008-05 if (nDocW) +//UNUSED2008-05 nPosX += (long) (nDocW * nScaleX); +//UNUSED2008-05 ++nCol; +//UNUSED2008-05 } +//UNUSED2008-05 if ( nCol > rRange.aStart.Col() ) +//UNUSED2008-05 --nCol; +//UNUSED2008-05 +//UNUSED2008-05 long nPosY = 0; +//UNUSED2008-05 ScCoupledCompressedArrayIterator< SCROW, BYTE, USHORT> aIter( +//UNUSED2008-05 pDoc->GetRowFlagsArray( nTab), rRange.aStart.Row(), +//UNUSED2008-05 rRange.aEnd.Row(), CR_HIDDEN, 0, pDoc->GetRowHeightArray( nTab)); +//UNUSED2008-05 while ( aIter && nPosY < aOffsetLogic.Height() ) +//UNUSED2008-05 { +//UNUSED2008-05 USHORT nDocH = *aIter; +//UNUSED2008-05 if (nDocH) +//UNUSED2008-05 nPosY += (long) (nDocH * nScaleY); +//UNUSED2008-05 ++aIter; +//UNUSED2008-05 } +//UNUSED2008-05 SCROW nRow = aIter.GetPos(); +//UNUSED2008-05 if ( nRow > rRange.aStart.Row() ) +//UNUSED2008-05 --nRow; +//UNUSED2008-05 +//UNUSED2008-05 return ScAddress( nCol, nRow, nTab ); +//UNUSED2008-05 } Rectangle ScPreviewLocationData::GetOffsetPixel( const ScAddress& rCellPos, const ScRange& rRange ) const { @@ -377,24 +365,6 @@ Rectangle ScPreviewLocationData::GetOffsetPixel( const ScAddress& rCellPos, cons return Rectangle( Point( aOffsetPixel.Width(), aOffsetPixel.Height() ), aSizePixel ); } -BOOL ScPreviewLocationData::GetCell( const Point& rPos, ScAddress& rCellPos, Rectangle& rCellRect ) const -{ - ScPreviewLocationEntry* pEntry = lcl_GetEntryByPosition( aEntries, rPos, SC_PLOC_CELLRANGE ); - if ( pEntry ) - { - Size aOffsetPixel( rPos.X() - pEntry->aPixelRect.Left(), rPos.Y() - pEntry->aPixelRect.Top() ); - rCellPos = GetCellFromRange( aOffsetPixel, pEntry->aCellRange ); - - Rectangle aOffsetRect = GetOffsetPixel( rCellPos, pEntry->aCellRange ); - rCellRect = Rectangle( aOffsetRect.Left() + pEntry->aPixelRect.Left(), - aOffsetRect.Top() + pEntry->aPixelRect.Top(), - aOffsetRect.Right() + pEntry->aPixelRect.Left(), - aOffsetRect.Bottom() + pEntry->aPixelRect.Top() ); - return TRUE; - } - return FALSE; -} - BOOL ScPreviewLocationData::GetCellPosition( const ScAddress& rCellPos, Rectangle& rCellRect ) const { ScPreviewLocationEntry* pEntry = lcl_GetEntryByAddress( aEntries, rCellPos, SC_PLOC_CELLRANGE ); diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 3dee71612..cc9eed61c 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: prevwsh.cxx,v $ - * $Revision: 1.45 $ + * $Revision: 1.44.30.2 $ * * This file is part of OpenOffice.org. * @@ -144,27 +144,6 @@ void ScPreviewShell::Construct( Window* pParent ) } ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, - const ScPreviewShell& rWin ) : - SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), - pDocShell( rWin.pDocShell ), - aSourceData( rWin.aSourceData ), - nSourceDesignMode( rWin.nSourceDesignMode ), - pAccessibilityBroadcaster( NULL ) -{ - Construct( &pViewFrame->GetWindow() ); -} - -ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, - Window *pParent ) : - SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), - pDocShell( (ScDocShell*)pViewFrame->GetObjectShell() ), - nSourceDesignMode( SC_FORCEMODE_NONE ), - pAccessibilityBroadcaster( NULL ) -{ - Construct( pParent ); -} - -ScPreviewShell::ScPreviewShell( SfxViewFrame* pViewFrame, SfxViewShell* pOldSh ) : SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), pDocShell( (ScDocShell*)pViewFrame->GetObjectShell() ), diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx index 2963ab78b..6f211dbbf 100644 --- a/sc/source/ui/view/printfun.cxx +++ b/sc/source/ui/view/printfun.cxx @@ -1144,7 +1144,7 @@ void ScPrintFunc::SetDateTime( const Date& rDate, const Time& rTime ) } void lcl_DrawGraphic( const Graphic &rGraphic, OutputDevice *pOut, - const Rectangle &rGrf, const Rectangle &rOut ) + const Rectangle &rGrf, const Rectangle &rOut ) { const FASTBOOL bNotInside = !rOut.IsInside( rGrf ); if ( bNotInside ) @@ -1159,22 +1159,6 @@ void lcl_DrawGraphic( const Graphic &rGraphic, OutputDevice *pOut, pOut->Pop(); } -void lcl_DrawGraphic( const Bitmap& rBitmap, OutputDevice *pOut, - const Rectangle &rGrf, const Rectangle &rOut ) -{ - const FASTBOOL bNotInside = !rOut.IsInside( rGrf ); - if ( bNotInside ) - { - pOut->Push(); - pOut->IntersectClipRegion( rOut ); - } - - pOut->DrawBitmap( rGrf.TopLeft(), rGrf.GetSize(), rBitmap ); - - if ( bNotInside ) - pOut->Pop(); -} - void lcl_DrawGraphic( const SvxBrushItem &rBrush, OutputDevice *pOut, OutputDevice* pRefDev, const Rectangle &rOrg, const Rectangle &rOut ) { @@ -1770,15 +1754,6 @@ void ScPrintFunc::MakeTableString() pDoc->GetName( nPrintTab, aFieldData.aTabName ); } -String lcl_CmdStr( USHORT nId ) -{ - String aDel( ScGlobal::GetRscString( STR_HFCMD_DELIMITER ) ); - String aCmd = aDel; - aCmd += ScGlobal::GetRscString( nId ); - aCmd += aDel; - return aCmd; -} - void ScPrintFunc::MakeEditEngine() { if (!pEditEngine) diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index 6a6f52fd8..ccb7d2f7f 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -1086,10 +1086,10 @@ void ScTabView::SetActivePointer( const Pointer& rPointer ) */ } -void ScTabView::SetActivePointer( const ResId& ) -{ - DBG_ERRORFILE( "keine Pointer mit ResId!" ); -} +//UNUSED2008-05 void ScTabView::SetActivePointer( const ResId& ) +//UNUSED2008-05 { +//UNUSED2008-05 DBG_ERRORFILE( "keine Pointer mit ResId!" ); +//UNUSED2008-05 } void ScTabView::ActiveGrabFocus() { @@ -1098,28 +1098,28 @@ void ScTabView::ActiveGrabFocus() pGridWin[ePos]->GrabFocus(); } -void ScTabView::ActiveCaptureMouse() -{ - ScSplitPos ePos = aViewData.GetActivePart(); - if (pGridWin[ePos]) - pGridWin[ePos]->CaptureMouse(); -} - -void ScTabView::ActiveReleaseMouse() -{ - ScSplitPos ePos = aViewData.GetActivePart(); - if (pGridWin[ePos]) - pGridWin[ePos]->ReleaseMouse(); -} - -Point ScTabView::ActivePixelToLogic( const Point& rDevicePoint ) -{ - ScSplitPos ePos = aViewData.GetActivePart(); - if (pGridWin[ePos]) - return pGridWin[ePos]->PixelToLogic(rDevicePoint); - else - return Point(); -} +//UNUSED2008-05 void ScTabView::ActiveCaptureMouse() +//UNUSED2008-05 { +//UNUSED2008-05 ScSplitPos ePos = aViewData.GetActivePart(); +//UNUSED2008-05 if (pGridWin[ePos]) +//UNUSED2008-05 pGridWin[ePos]->CaptureMouse(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 void ScTabView::ActiveReleaseMouse() +//UNUSED2008-05 { +//UNUSED2008-05 ScSplitPos ePos = aViewData.GetActivePart(); +//UNUSED2008-05 if (pGridWin[ePos]) +//UNUSED2008-05 pGridWin[ePos]->ReleaseMouse(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 Point ScTabView::ActivePixelToLogic( const Point& rDevicePoint ) +//UNUSED2008-05 { +//UNUSED2008-05 ScSplitPos ePos = aViewData.GetActivePart(); +//UNUSED2008-05 if (pGridWin[ePos]) +//UNUSED2008-05 return pGridWin[ePos]->PixelToLogic(rDevicePoint); +//UNUSED2008-05 else +//UNUSED2008-05 return Point(); +//UNUSED2008-05 } ScSplitPos ScTabView::FindWindow( Window* pWindow ) const { diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx index a685bf937..0606a5dde 100644 --- a/sc/source/ui/view/tabview3.cxx +++ b/sc/source/ui/view/tabview3.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabview3.cxx,v $ - * $Revision: 1.69 $ + * $Revision: 1.67.22.6 $ * * This file is part of OpenOffice.org. * @@ -112,93 +112,6 @@ using namespace com::sun::star; // ----------------------------------------------------------------------- -// helper class for DoChartSelection - -#define SC_BGCOLLECT_FIRST 0 -#define SC_BGCOLLECT_FOUND 1 -#define SC_BGCOLLECT_AMBIGUOUS 2 - -class ScBackgroundCollector -{ -private: - ScDocument* pDoc; - BOOL bTransparent; - Color aBackColor; - USHORT nMode; -public: - ScBackgroundCollector( ScDocument* pD ); - void AddRange( const ScRange& rRange ); - Color GetHighlightColor() const; -}; - -ScBackgroundCollector::ScBackgroundCollector( ScDocument* pD ) : - pDoc( pD ), - bTransparent( FALSE ), - nMode( SC_BGCOLLECT_FIRST ) -{ -} - -void ScBackgroundCollector::AddRange( const ScRange& rRange ) -{ - if ( nMode == SC_BGCOLLECT_AMBIGUOUS ) - return; // nothing more to do - - ScDocAttrIterator aIter( pDoc, rRange.aStart.Tab(), - rRange.aStart.Col(), rRange.aStart.Row(), - rRange.aEnd.Col(), rRange.aEnd.Row() ); - SCCOL nCol; - SCROW nRow1, nRow2; - const ScPatternAttr* pPattern = aIter.GetNext( nCol, nRow1, nRow2 ); - while ( pPattern ) - { - //! look at conditional formats? - const Color& rAttrColor = ((const SvxBrushItem&)pPattern->GetItem(ATTR_BACKGROUND)).GetColor(); - BOOL bAttrTransp = ( rAttrColor.GetTransparency() != 0 ); - - if ( nMode == SC_BGCOLLECT_FIRST ) - { - // just copy first background - bTransparent = bAttrTransp; - aBackColor = rAttrColor; - nMode = SC_BGCOLLECT_FOUND; - } - else if ( nMode == SC_BGCOLLECT_FOUND ) - { - BOOL bEqual = ( bTransparent == bAttrTransp ); - if ( bEqual && !bTransparent ) - bEqual = ( aBackColor == rAttrColor ); - if ( !bEqual ) - { - nMode = SC_BGCOLLECT_AMBIGUOUS; // different backgrounds found - return; // dont need to continue - } - } - - pPattern = aIter.GetNext( nCol, nRow1, nRow2 ); - } -} - -Color ScBackgroundCollector::GetHighlightColor() const -{ - if ( nMode == SC_BGCOLLECT_FOUND && !bTransparent ) - { - // everything formatted with a single background color - // -> use contrasting color (blue or yellow) - - Color aBlue( COL_LIGHTBLUE ); - Color aYellow( COL_YELLOW ); - - if ( aBackColor.GetColorError(aBlue) >= aBackColor.GetColorError(aYellow) ) - return aBlue; - else - return aYellow; - } - else - return Color( COL_LIGHTBLUE ); // default for transparent or ambiguous background -} - -// ----------------------------------------------------------------------- - // // --- Public-Funktionen // @@ -548,6 +461,7 @@ void ScTabView::CursorPosChanged() // Broadcast, damit andere Views des Dokuments auch umschalten ScDocument* pDoc = aViewData.GetDocument(); +#if OLD_PIVOT_IMPLEMENTATION BOOL bPivot = ( NULL != pDoc->GetPivotAtCursor( aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo() ) || @@ -555,6 +469,11 @@ void ScTabView::CursorPosChanged() aViewData.GetCurY(), aViewData.GetTabNo() ) ); aViewData.GetViewShell()->SetPivotShell(bPivot); +#else + bool bDP = NULL != pDoc->GetDPAtCursor( + aViewData.GetCurX(), aViewData.GetCurY(), aViewData.GetTabNo() ); + aViewData.GetViewShell()->SetPivotShell(bDP); +#endif // UpdateInputHandler jetzt in CellContentChanged @@ -2018,20 +1937,6 @@ void ScTabView::UpdateFormulas() UpdateEditView(); } -// PaintCell - einzelne Zelle neu zeichnen - -void ScTabView::PaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) -{ - if ( aViewData.GetTabNo() == nTab ) - { - USHORT i; - for (i=0; i<4; i++) - if (pGridWin[i]) - if (pGridWin[i]->IsVisible()) - pGridWin[i]->Draw( nCol, nRow, nCol, nRow ); - } -} - // PaintArea -Block neu zeichnen void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, @@ -2278,19 +2183,43 @@ void ScTabView::DoChartSelection( // DrawDragRect - Drag&Drop-Rechteck zeichnen (XOR) -void ScTabView::DrawDragRect( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, - ScSplitPos ePos ) -{ - if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX || aViewData.GetVSplitMode() == SC_SPLIT_FIX ) - { - for (USHORT i=0; i<4; i++) - if (pGridWin[i]) - if (pGridWin[i]->IsVisible()) - pGridWin[i]->DrawDragRect( nStartX, nStartY, nEndX, nEndY ); - } - else - pGridWin[ePos]->DrawDragRect( nStartX, nStartY, nEndX, nEndY ); -} +//UNUSED2008-05 void ScTabView::DrawDragRect( SCCOL nStartX, SCROW nStartY, SCCOL nEndX, SCROW nEndY, +//UNUSED2008-05 ScSplitPos ePos ) +//UNUSED2008-05 { +//UNUSED2008-05 if ( aViewData.GetHSplitMode() == SC_SPLIT_FIX || aViewData.GetVSplitMode() == SC_SPLIT_FIX ) +//UNUSED2008-05 { +//UNUSED2008-05 for (USHORT i=0; i<4; i++) +//UNUSED2008-05 if (pGridWin[i]) +//UNUSED2008-05 if (pGridWin[i]->IsVisible()) +//UNUSED2008-05 pGridWin[i]->DrawDragRect( nStartX, nStartY, nEndX, nEndY ); +//UNUSED2008-05 } +//UNUSED2008-05 else +//UNUSED2008-05 pGridWin[ePos]->DrawDragRect( nStartX, nStartY, nEndX, nEndY ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 // PaintCell - einzelne Zelle neu zeichnen +//UNUSED2008-05 +//UNUSED2008-05 void ScTabView::PaintCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) +//UNUSED2008-05 { +//UNUSED2008-05 if ( aViewData.GetTabNo() == nTab ) +//UNUSED2008-05 { +//UNUSED2008-05 USHORT i; +//UNUSED2008-05 for (i=0; i<4; i++) +//UNUSED2008-05 if (pGridWin[i]) +//UNUSED2008-05 if (pGridWin[i]->IsVisible()) +//UNUSED2008-05 pGridWin[i]->Draw( nCol, nRow, nCol, nRow ); +//UNUSED2008-05 } +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 void ScTabView::PaintLeftRow( SCROW nRow ) +//UNUSED2008-05 { +//UNUSED2008-05 PaintLeftArea( nRow, nRow ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 void ScTabView::PaintTopCol( SCCOL nCol ) +//UNUSED2008-05 { +//UNUSED2008-05 PaintTopArea( nCol, nCol ); +//UNUSED2008-05 } // PaintGrid - Datenbereiche neu zeichnen @@ -2333,11 +2262,6 @@ void ScTabView::CreateAnchorHandles(SdrHdlList& rHdl, const ScAddress& rAddress) } } -void ScTabView::PaintTopCol( SCCOL nCol ) -{ - PaintTopArea( nCol, nCol ); -} - void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol ) { // Pixel-Position der linken Kante @@ -2395,11 +2319,6 @@ void ScTabView::PaintLeft() } } -void ScTabView::PaintLeftRow( SCROW nRow ) -{ - PaintLeftArea( nRow, nRow ); -} - void ScTabView::PaintLeftArea( SCROW nStartRow, SCROW nEndRow ) { // Pixel-Position der oberen Kante diff --git a/sc/source/ui/view/tabview4.cxx b/sc/source/ui/view/tabview4.cxx index 73fb207fd..00aa62c79 100644 --- a/sc/source/ui/view/tabview4.cxx +++ b/sc/source/ui/view/tabview4.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabview4.cxx,v $ - * $Revision: 1.11 $ + * $Revision: 1.11.32.2 $ * * This file is part of OpenOffice.org. * @@ -335,13 +335,13 @@ void ScTabView::InitRefMode( SCCOL nCurX, SCROW nCurY, SCTAB nCurZ, ScRefType eT } } -void ScTabView::EndSelection() -{ - ScModule* pScMod = SC_MOD(); - BOOL bRefMode = pScMod->IsFormulaMode(); - if ( bRefMode ) - pScMod->EndReference(); -} +//UNUSED2008-05 void ScTabView::EndSelection() +//UNUSED2008-05 { +//UNUSED2008-05 ScModule* pScMod = SC_MOD(); +//UNUSED2008-05 BOOL bRefMode = pScMod->IsFormulaMode(); +//UNUSED2008-05 if ( bRefMode ) +//UNUSED2008-05 pScMod->EndReference(); +//UNUSED2008-05 } // static void ScTabView::SetScrollBar( ScrollBar& rScroll, long nRangeMax, long nVisible, long nPos, BOOL bLayoutRTL ) diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx index 715cc8bb8..c419f0004 100644 --- a/sc/source/ui/view/tabview5.cxx +++ b/sc/source/ui/view/tabview5.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabview5.cxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.25.32.4 $ * * This file is part of OpenOffice.org. * @@ -431,13 +431,13 @@ BOOL ScTabView::IsDrawTextEdit() const return FALSE; } -String ScTabView::GetSelectedChartName() const -{ - if (pDrawView) - return pDrawView->GetSelectedChartName(); - else - return EMPTY_STRING; -} +//UNUSED2008-05 String ScTabView::GetSelectedChartName() const +//UNUSED2008-05 { +//UNUSED2008-05 if (pDrawView) +//UNUSED2008-05 return pDrawView->GetSelectedChartName(); +//UNUSED2008-05 else +//UNUSED2008-05 return EMPTY_STRING; +//UNUSED2008-05 } SvxZoomType ScTabView::GetZoomType() const { @@ -587,7 +587,6 @@ void ScTabView::DrawEnableAnim(BOOL bSet) else { pDrawView->SetAnimationEnabled(FALSE); - // StopAnimations am Dokument ist nicht mehr noetig } } } diff --git a/sc/source/ui/view/tabvwsh2.cxx b/sc/source/ui/view/tabvwsh2.cxx index 0a9c06be3..effc52845 100644 --- a/sc/source/ui/view/tabvwsh2.cxx +++ b/sc/source/ui/view/tabvwsh2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabvwsh2.cxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.27.32.2 $ * * This file is part of OpenOffice.org. * @@ -323,7 +323,7 @@ void ScTabViewShell::ExecDraw(SfxRequest& rReq) break; case SID_DRAW_CHART: - bChartDlgIsEdit = FALSE; +//UNUSED2008-05 bChartDlgIsEdit = FALSE; pTabView->SetDrawFuncPtr(new FuMarkRect(this, pWin, pView, pDoc, aNewReq)); break; diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 04afe2b97..7c95fa975 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabvwsh4.cxx,v $ - * $Revision: 1.76 $ + * $Revision: 1.75.24.3 $ * * This file is part of OpenOffice.org. * @@ -648,37 +648,26 @@ void ScTabViewShell::DoReadUserData( const String& rData ) //! if ViewData has more tables than document, remove tables in ViewData } - //------------------------------------------------------------------ -void ScTabViewShell::TestFunction( USHORT /* nPar */ ) -{ -/* switch (nPar) - { - } -*/ -} - -//------------------------------------------------------------------ - -void ScTabViewShell::ExecuteShowNIY( SfxRequest& /* rReq */ ) -{ - ErrorMessage(STR_BOX_YNI); -} - -//------------------------------------------------------------------ - -void ScTabViewShell::StateDisabled( SfxItemSet& rSet ) -{ - SfxWhichIter aIter( rSet ); - USHORT nWhich = aIter.FirstWhich(); - - while ( nWhich ) - { - rSet.DisableItem( nWhich ); - nWhich = aIter.NextWhich(); - } -} +//UNUSED2008-05 void ScTabViewShell::ExecuteShowNIY( SfxRequest& /* rReq */ ) +//UNUSED2008-05 { +//UNUSED2008-05 ErrorMessage(STR_BOX_YNI); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 //------------------------------------------------------------------ +//UNUSED2008-05 +//UNUSED2008-05 void ScTabViewShell::StateDisabled( SfxItemSet& rSet ) +//UNUSED2008-05 { +//UNUSED2008-05 SfxWhichIter aIter( rSet ); +//UNUSED2008-05 USHORT nWhich = aIter.FirstWhich(); +//UNUSED2008-05 +//UNUSED2008-05 while ( nWhich ) +//UNUSED2008-05 { +//UNUSED2008-05 rSet.DisableItem( nWhich ); +//UNUSED2008-05 nWhich = aIter.NextWhich(); +//UNUSED2008-05 } +//UNUSED2008-05 } void ScTabViewShell::SetDrawShellOrSub() { @@ -1117,17 +1106,17 @@ SfxShell* ScTabViewShell::GetMySubShell() const return NULL; // keine von meinen dabei } -void ScTabViewShell::SetMySubShell( SfxShell* pShell ) -{ - SfxShell* pOld = GetMySubShell(); - if ( pOld != pShell ) - { - if (pOld) - RemoveSubShell(pOld); // alte SubShell entfernen - if (pShell) - AddSubShell(*pShell); // neue setzen - } -} +//UNUSED2008-05 void ScTabViewShell::SetMySubShell( SfxShell* pShell ) +//UNUSED2008-05 { +//UNUSED2008-05 SfxShell* pOld = GetMySubShell(); +//UNUSED2008-05 if ( pOld != pShell ) +//UNUSED2008-05 { +//UNUSED2008-05 if (pOld) +//UNUSED2008-05 RemoveSubShell(pOld); // alte SubShell entfernen +//UNUSED2008-05 if (pShell) +//UNUSED2008-05 AddSubShell(*pShell); // neue setzen +//UNUSED2008-05 } +//UNUSED2008-05 } BOOL ScTabViewShell::IsDrawTextShell() const { @@ -1701,7 +1690,7 @@ FASTBOOL __EXPORT ScTabViewShell::KeyInput( const KeyEvent &rKeyEvent ) bPrintSelected(FALSE), \ bReadOnly(FALSE), \ pScSbxObject(NULL), \ - bChartDlgIsEdit(FALSE), \ + /*bChartDlgIsEdit(FALSE),*/ \ bChartAreaValid(FALSE), \ nCurRefDlgId(0), \ pAccessibilityBroadcaster(NULL) @@ -1894,29 +1883,29 @@ void ScTabViewShell::Construct( BYTE nForceDesignMode ) //------------------------------------------------------------------ -ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, - const ScTabViewShell& rWin ) : - SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), - ScDBFunc( &pViewFrame->GetWindow(), rWin, this ), - __INIT_ScTabViewShell -{ - RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScTabViewShell::ScTabViewShell" ); - - Construct(); - - UpdatePageBreakData(); - - /*uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame()->GetFrameInterface(); - if (xFrame.is()) - xFrame->setComponent( uno::Reference<awt::XWindow>(), new ScTabViewObj( this ) );*/ - // make Controller known to SFX - new ScTabViewObj( this ); - - SetCurSubShell(OST_Cell); - SvBorder aBorder; - GetBorderSize( aBorder, Size() ); - SetBorderPixel( aBorder ); -} +//UNUSED2008-05 ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame, +//UNUSED2008-05 const ScTabViewShell& rWin ) : +//UNUSED2008-05 SfxViewShell( pViewFrame, SFX_VIEW_MAXIMIZE_FIRST | SFX_VIEW_CAN_PRINT | SFX_VIEW_HAS_PRINTOPTIONS ), +//UNUSED2008-05 ScDBFunc( &pViewFrame->GetWindow(), rWin, this ), +//UNUSED2008-05 __INIT_ScTabViewShell +//UNUSED2008-05 { +//UNUSED2008-05 RTL_LOGFILE_CONTEXT_AUTHOR ( aLog, "sc", "nn93723", "ScTabViewShell::ScTabViewShell" ); +//UNUSED2008-05 +//UNUSED2008-05 Construct(); +//UNUSED2008-05 +//UNUSED2008-05 UpdatePageBreakData(); +//UNUSED2008-05 +//UNUSED2008-05 /*uno::Reference<frame::XFrame> xFrame = pViewFrame->GetFrame()->GetFrameInterface(); +//UNUSED2008-05 if (xFrame.is()) +//UNUSED2008-05 xFrame->setComponent( uno::Reference<awt::XWindow>(), new ScTabViewObj( this ) );*/ +//UNUSED2008-05 // make Controller known to SFX +//UNUSED2008-05 new ScTabViewObj( this ); +//UNUSED2008-05 +//UNUSED2008-05 SetCurSubShell(OST_Cell); +//UNUSED2008-05 SvBorder aBorder; +//UNUSED2008-05 GetBorderSize( aBorder, Size() ); +//UNUSED2008-05 SetBorderPixel( aBorder ); +//UNUSED2008-05 } //------------------------------------------------------------------ @@ -2059,10 +2048,10 @@ void ScTabViewShell::SetChartArea( const ScRangeListRef& rSource, const Rectangl nChartDestTab = GetViewData()->GetTabNo(); } -void ScTabViewShell::ResetChartArea() -{ - bChartAreaValid = FALSE; -} +//UNUSED2008-05 void ScTabViewShell::ResetChartArea() +//UNUSED2008-05 { +//UNUSED2008-05 bChartAreaValid = FALSE; +//UNUSED2008-05 } BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SCTAB& rTab ) const { @@ -2072,15 +2061,15 @@ BOOL ScTabViewShell::GetChartArea( ScRangeListRef& rSource, Rectangle& rDest, SC return bChartAreaValid; } -BOOL ScTabViewShell::IsChartDlgEdit() const -{ - return bChartDlgIsEdit; -} - -const String& ScTabViewShell::GetEditChartName() const -{ - return aEditChartName; -} +//UNUSED2008-05 BOOL ScTabViewShell::IsChartDlgEdit() const +//UNUSED2008-05 { +//UNUSED2008-05 return bChartDlgIsEdit; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 const String& ScTabViewShell::GetEditChartName() const +//UNUSED2008-05 { +//UNUSED2008-05 return aEditChartName; +//UNUSED2008-05 } ScNavigatorSettings* ScTabViewShell::GetNavigatorSettings() { diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx index b7dbf7977..e0037f876 100644 --- a/sc/source/ui/view/tabvwsh5.cxx +++ b/sc/source/ui/view/tabvwsh5.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabvwsh5.cxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.32.1 $ * * This file is part of OpenOffice.org. * @@ -194,10 +194,6 @@ void __EXPORT ScTabViewShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBC { SCCOL nCol = pHint->GetCol(); SCROW nRow = pHint->GetRow(); -#if 0 -// Abfrage ist ueberfluessig, passiert bereits in ScInputHandler StartTable -// if (pDoc->IsSelectionOrBlockEditable( nTab, nCol,nRow, nCol,nRow )) -#endif { HideNoteMarker(); @@ -217,11 +213,6 @@ void __EXPORT ScTabViewShell::SFX_NOTIFY( SfxBroadcaster& rBC, const TypeId& rBC SetEditShell(pView ,TRUE); } } -#if 0 -// else -// if (GetViewData()->IsActive()) -// ErrorMessage(STR_PROTECTIONERR); -#endif } } else if (rHint.ISA(ScTablesHint)) // Tabelle eingefuegt / geloescht diff --git a/sc/source/ui/view/tabvwshc.cxx b/sc/source/ui/view/tabvwshc.cxx index 2447c2866..b16d48d9e 100644 --- a/sc/source/ui/view/tabvwshc.cxx +++ b/sc/source/ui/view/tabvwshc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: tabvwshc.cxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.32.1 $ * * This file is part of OpenOffice.org. * @@ -72,19 +72,6 @@ #include "simpref.hxx" #include "dpobject.hxx" -// ----------------------------------------------------------------------- - -//! nach document verschieben !!! - -BOOL lcl_IsValueCol( ScDocument* pDoc, SCCOL nCol, SCROW nRow1, SCROW nRow2, SCTAB nTab ) -{ - BOOL bVal = TRUE; - for (SCROW nRow=nRow1; nRow<=nRow2 && bVal; nRow++) - if (pDoc->HasStringData( nCol, nRow, nTab )) - bVal = FALSE; - return bVal; -} - //------------------------------------------------------------------ void ScTabViewShell::SetCurRefDlgId( USHORT nNew ) @@ -267,109 +254,6 @@ SfxModelessDialog* ScTabViewShell::CreateRefDialog( { GetViewData()->SetRefTabNo( GetViewData()->GetTabNo() ); pResult = new ScDPLayoutDlg( pB, pCW, pParent, *pDialogDPObject ); - -#if 0 - ScDocument* pDoc = GetViewData()->GetDocument(); - SCTAB nTab = 0; - SCCOL nCol1 = 0; - SCCOL nCol2 = 0; - SCROW nRow1 = 0; - SCROW nRow2 = 0; - - ScPivot* pPivot = pDoc->GetPivotAtCursor( - GetViewData()->GetCurX(), - GetViewData()->GetCurY(), - GetViewData()->GetTabNo() ); - ScDPObject* pDPObj = pDoc->GetDPAtCursor( - GetViewData()->GetCurX(), - GetViewData()->GetCurY(), - GetViewData()->GetTabNo() ); - ScPivotParam aPivotParam; - - if ( pPivot ) // befinden wir uns auf einer Pivot-Tabelle? - { - ScArea aArea; - ScQueryParam aQuery; - pPivot->GetParam( aPivotParam, aQuery, aArea ); - pPivot->GetSrcArea( nCol1, nRow1, nCol2, nRow2, nTab); - - // Quelldatenbereich markieren - if ( nTab == GetViewData()->GetTabNo() ) - MarkRange( ScRange( nCol1,nRow1,nTab, nCol2,nRow2,nTab ) ); - } - else if ( pDPObj && pDPObj->IsSheetData() ) - { - // get (old) ScPivotParam - - pDPObj->FillOldParam( aPivotParam ); - ScRange aSource = pDPObj->GetSourceRange(); - nCol1 = aSource.aStart.Col(); - nRow1 = aSource.aStart.Row(); - nCol2 = aSource.aEnd.Col(); - nRow2 = aSource.aEnd.Row(); - nTab = aSource.aStart.Tab(); - - if ( nTab == GetViewData()->GetTabNo() ) - MarkRange( ScRange( nCol1,nRow1,nTab, nCol2,nRow2,nTab ) ); - } - else // neue Pivot-Tabelle erzeugen - { - ScDBData* pDBData = GetDBData(); - String aErrMsg; - - pDBData->GetArea( nTab, nCol1, nRow1, nCol2, nRow2 ); - - - if (nRow2+2 <= MAXROW - 4) // Default-Ausgabebereich - { // min. Tabelle hat 5 Zeilen - aPivotParam.nCol = nCol1; - aPivotParam.nRow = nRow2+2; - aPivotParam.nTab = nTab; - } - else - { - aPivotParam.nCol = 0; - aPivotParam.nRow = 0; - aPivotParam.nTab = MAXTAB+1; - } - - } - - SfxItemSet aArgSet( GetPool(), - SCITEM_PIVOTDATA, - SCITEM_PIVOTDATA ); - - // Ermitteln der Ueberschriften: - String aFieldName; - USHORT nLabelCount = nCol2-nCol1+1; - SCsCOL nCol = nCol1; - BOOL bIsValue = FALSE; - LabelData** aLabelArr = new LabelData*[nLabelCount]; - - for ( USHORT i=0; i<nLabelCount; i++ ) - { - pDoc->GetString( nCol, nRow1, nTab, aFieldName ); - if ( !aFieldName ) - aFieldName = ColToAlpha( nCol ); - bIsValue = lcl_IsValueCol( pDoc, nCol, nRow1+1, nRow2, nTab ); - aLabelArr[i] = new LabelData( aFieldName, nCol, bIsValue ); - nCol++; - } - - aPivotParam.SetLabelData( aLabelArr, nLabelCount ); - aArgSet.Put( ScPivotItem( SCITEM_PIVOTDATA, &aPivotParam ) ); - - // aktuelle Tabelle merken (wg. RefInput im Dialog) - GetViewData()->SetRefTabNo( GetViewData()->GetTabNo() ); - - *pPivotSource = ScArea( nTab, nCol1,nRow1, nCol2,nRow2 ); - pResult = new ScPivotLayoutDlg( pB, pCW, pParent, aArgSet ); - - - for ( USHORT p=0; p<nLabelCount; p++ ) - delete aLabelArr[p]; - delete [] aLabelArr; -#endif } } break; diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx index 1b1db0cd2..c6feb3dff 100644 --- a/sc/source/ui/view/viewdata.cxx +++ b/sc/source/ui/view/viewdata.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewdata.cxx,v $ - * $Revision: 1.66 $ + * $Revision: 1.65.24.3 $ * * This file is part of OpenOffice.org. * @@ -410,57 +410,57 @@ ScViewData::ScViewData( const ScViewData& rViewData ) CalcPPT(); } -void ScViewData::SetDocShell( ScDocShell* pShell ) -{ - pDocShell = pShell; - pDoc = pDocShell->GetDocument(); - *pOptions = pDoc->GetViewOptions(); - CalcPPT(); -} - void ScViewData::InitData( ScDocument* pDocument ) { pDoc = pDocument; *pOptions = pDoc->GetViewOptions(); } -void ScViewData::InitFrom( const ScViewData* pRef ) -{ - if (pRef==NULL) - { - DBG_ERROR("ScViewData::InitFrom mit NULL"); - return; - } - - aScrSize = pRef->aScrSize; - nTabNo = pRef->nTabNo; - eDefZoomType = pRef->eDefZoomType; - aDefZoomX = pRef->aDefZoomX; - aDefZoomY = pRef->aDefZoomY; - aDefPageZoomX = pRef->aDefPageZoomX; - aDefPageZoomY = pRef->aDefPageZoomY; - bPagebreak = pRef->bPagebreak; - aLogicMode = pRef->aLogicMode; - - SetGridMode ( pRef->IsGridMode() ); - SetSyntaxMode ( pRef->IsSyntaxMode() ); - SetHeaderMode ( pRef->IsHeaderMode() ); - SetTabMode ( pRef->IsTabMode() ); - SetVScrollMode ( pRef->IsVScrollMode() ); - SetHScrollMode ( pRef->IsHScrollMode() ); - SetOutlineMode ( pRef->IsOutlineMode() ); - - for (SCTAB i=0; i<=MAXTAB; i++) - { - delete pTabData[i]; - if (pRef->pTabData[i]) - pTabData[i] = new ScViewDataTable( *pRef->pTabData[i] ); - else - pTabData[i] = NULL; - } - pThisTab = pTabData[nTabNo]; - CalcPPT(); -} +//UNUSED2008-05 void ScViewData::InitFrom( const ScViewData* pRef ) +//UNUSED2008-05 { +//UNUSED2008-05 if (pRef==NULL) +//UNUSED2008-05 { +//UNUSED2008-05 DBG_ERROR("ScViewData::InitFrom mit NULL"); +//UNUSED2008-05 return; +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 aScrSize = pRef->aScrSize; +//UNUSED2008-05 nTabNo = pRef->nTabNo; +//UNUSED2008-05 eDefZoomType = pRef->eDefZoomType; +//UNUSED2008-05 aDefZoomX = pRef->aDefZoomX; +//UNUSED2008-05 aDefZoomY = pRef->aDefZoomY; +//UNUSED2008-05 aDefPageZoomX = pRef->aDefPageZoomX; +//UNUSED2008-05 aDefPageZoomY = pRef->aDefPageZoomY; +//UNUSED2008-05 bPagebreak = pRef->bPagebreak; +//UNUSED2008-05 aLogicMode = pRef->aLogicMode; +//UNUSED2008-05 +//UNUSED2008-05 SetGridMode ( pRef->IsGridMode() ); +//UNUSED2008-05 SetSyntaxMode ( pRef->IsSyntaxMode() ); +//UNUSED2008-05 SetHeaderMode ( pRef->IsHeaderMode() ); +//UNUSED2008-05 SetTabMode ( pRef->IsTabMode() ); +//UNUSED2008-05 SetVScrollMode ( pRef->IsVScrollMode() ); +//UNUSED2008-05 SetHScrollMode ( pRef->IsHScrollMode() ); +//UNUSED2008-05 SetOutlineMode ( pRef->IsOutlineMode() ); +//UNUSED2008-05 +//UNUSED2008-05 for (SCTAB i=0; i<=MAXTAB; i++) +//UNUSED2008-05 { +//UNUSED2008-05 delete pTabData[i]; +//UNUSED2008-05 if (pRef->pTabData[i]) +//UNUSED2008-05 pTabData[i] = new ScViewDataTable( *pRef->pTabData[i] ); +//UNUSED2008-05 else +//UNUSED2008-05 pTabData[i] = NULL; +//UNUSED2008-05 } +//UNUSED2008-05 pThisTab = pTabData[nTabNo]; +//UNUSED2008-05 CalcPPT(); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 void ScViewData::SetDocShell( ScDocShell* pShell ) +//UNUSED2008-05 { +//UNUSED2008-05 pDocShell = pShell; +//UNUSED2008-05 pDoc = pDocShell->GetDocument(); +//UNUSED2008-05 *pOptions = pDoc->GetViewOptions(); +//UNUSED2008-05 CalcPPT(); +//UNUSED2008-05 } ScDocument* ScViewData::GetDocument() const { @@ -579,10 +579,10 @@ void ScViewData::MoveTab( SCTAB nSrcTab, SCTAB nDestTab ) aMarkData.InsertTab( nInsTab ); // ggf. angepasst } -void ScViewData::UpdateOle( ScSplitPos /* eWhich */ ) -{ - GetDocShell()->UpdateOle(this); -} +//UNUSED2008-05 void ScViewData::UpdateOle( ScSplitPos /* eWhich */ ) +//UNUSED2008-05 { +//UNUSED2008-05 GetDocShell()->UpdateOle(this); +//UNUSED2008-05 } void ScViewData::SetViewShell( ScTabViewShell* pViewSh ) { @@ -1681,15 +1681,15 @@ SCROW ScViewData::PrevCellsY( ScVSplitPos eWhichY ) const return CellsAtY( GetPosY( eWhichY ), -1, eWhichY, SC_SIZE_NONE ); } -SCCOL ScViewData::LastCellsX( ScHSplitPos eWhichX ) const -{ - return CellsAtX( MAXCOL+1, -1, eWhichX, SC_SIZE_NONE ); -} - -SCROW ScViewData::LastCellsY( ScVSplitPos eWhichY ) const -{ - return CellsAtY( MAXROW+1, -1, eWhichY, SC_SIZE_NONE ); -} +//UNUSED2008-05 SCCOL ScViewData::LastCellsX( ScHSplitPos eWhichX ) const +//UNUSED2008-05 { +//UNUSED2008-05 return CellsAtX( MAXCOL+1, -1, eWhichX, SC_SIZE_NONE ); +//UNUSED2008-05 } +//UNUSED2008-05 +//UNUSED2008-05 SCROW ScViewData::LastCellsY( ScVSplitPos eWhichY ) const +//UNUSED2008-05 { +//UNUSED2008-05 return CellsAtY( MAXROW+1, -1, eWhichY, SC_SIZE_NONE ); +//UNUSED2008-05 } BOOL ScViewData::GetMergeSizePixel( SCCOL nX, SCROW nY, long& rSizeXPix, long& rSizeYPix ) { diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx index 294e3f00b..7d653238b 100644 --- a/sc/source/ui/view/viewfun2.cxx +++ b/sc/source/ui/view/viewfun2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewfun2.cxx,v $ - * $Revision: 1.41 $ + * $Revision: 1.40.20.3 $ * * This file is part of OpenOffice.org. * @@ -829,36 +829,36 @@ void ScViewFunc::EnterBlock( const String& rString, const EditTextObject* pData //---------------------------------------------------------------------------- -void ScViewFunc::PaintWidthHeight( BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd ) -{ - SCTAB nTab = GetViewData()->GetTabNo(); - ScDocument* pDoc = GetViewData()->GetDocument(); - - USHORT nParts = PAINT_GRID; - SCCOL nStartCol = 0; - SCROW nStartRow = 0; - SCCOL nEndCol = MAXCOL; // fuer Test auf Merge - SCROW nEndRow = MAXROW; - if ( bColumns ) - { - nParts |= PAINT_TOP; - nStartCol = static_cast<SCCOL>(nStart); - nEndCol = static_cast<SCCOL>(nEnd); - } - else - { - nParts |= PAINT_LEFT; - nStartRow = nStart; - nEndRow = nEnd; - } - if (pDoc->HasAttrib( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab, - HASATTR_MERGED | HASATTR_OVERLAPPED )) - { - nStartCol = 0; - nStartRow = 0; - } - GetViewData()->GetDocShell()->PostPaint( nStartCol,nStartRow,nTab, MAXCOL,MAXROW,nTab, nParts ); -} +//UNUSED2008-05 void ScViewFunc::PaintWidthHeight( BOOL bColumns, SCCOLROW nStart, SCCOLROW nEnd ) +//UNUSED2008-05 { +//UNUSED2008-05 SCTAB nTab = GetViewData()->GetTabNo(); +//UNUSED2008-05 ScDocument* pDoc = GetViewData()->GetDocument(); +//UNUSED2008-05 +//UNUSED2008-05 USHORT nParts = PAINT_GRID; +//UNUSED2008-05 SCCOL nStartCol = 0; +//UNUSED2008-05 SCROW nStartRow = 0; +//UNUSED2008-05 SCCOL nEndCol = MAXCOL; // fuer Test auf Merge +//UNUSED2008-05 SCROW nEndRow = MAXROW; +//UNUSED2008-05 if ( bColumns ) +//UNUSED2008-05 { +//UNUSED2008-05 nParts |= PAINT_TOP; +//UNUSED2008-05 nStartCol = static_cast<SCCOL>(nStart); +//UNUSED2008-05 nEndCol = static_cast<SCCOL>(nEnd); +//UNUSED2008-05 } +//UNUSED2008-05 else +//UNUSED2008-05 { +//UNUSED2008-05 nParts |= PAINT_LEFT; +//UNUSED2008-05 nStartRow = nStart; +//UNUSED2008-05 nEndRow = nEnd; +//UNUSED2008-05 } +//UNUSED2008-05 if (pDoc->HasAttrib( nStartCol,nStartRow,nTab, nEndCol,nEndRow,nTab, +//UNUSED2008-05 HASATTR_MERGED | HASATTR_OVERLAPPED )) +//UNUSED2008-05 { +//UNUSED2008-05 nStartCol = 0; +//UNUSED2008-05 nStartRow = 0; +//UNUSED2008-05 } +//UNUSED2008-05 GetViewData()->GetDocShell()->PostPaint( nStartCol,nStartRow,nTab, MAXCOL,MAXROW,nTab, nParts ); +//UNUSED2008-05 } //---------------------------------------------------------------------------- diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx index cf25635d3..f541e53dc 100644 --- a/sc/source/ui/view/viewfun4.cxx +++ b/sc/source/ui/view/viewfun4.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewfun4.cxx,v $ - * $Revision: 1.39 $ + * $Revision: 1.39.32.3 $ * * This file is part of OpenOffice.org. * @@ -338,11 +338,11 @@ void ScViewFunc::DoThesaurus( BOOL bRecord ) pDocSh->PostPaintGridAll(); } -// Spelling Checker - Undo ok -void ScViewFunc::DoSpellingChecker( BOOL bRecord ) -{ - DoSheetConversion( ScConversionParam( SC_CONVERSION_SPELLCHECK ), bRecord ); -} +//UNUSED2008-05 // Spelling Checker - Undo ok +//UNUSED2008-05 void ScViewFunc::DoSpellingChecker( BOOL bRecord ) +//UNUSED2008-05 { +//UNUSED2008-05 DoSheetConversion( ScConversionParam( SC_CONVERSION_SPELLCHECK ), bRecord ); +//UNUSED2008-05 } void ScViewFunc::DoHangulHanjaConversion( BOOL bRecord ) { @@ -489,16 +489,16 @@ void ScViewFunc::DoSheetConversion( const ScConversionParam& rConvParam, BOOL bR } -IMPL_LINK_INLINE_START( ScViewFunc, SpellError, void *, nLang ) -{ - SvtLanguageTable aLangTab; - String aErr = aLangTab.GetString((LanguageType) (ULONG) nLang); - ErrorHandler::HandleError(*new StringErrorInfo( - ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr) ); - - return 0; -} -IMPL_LINK_INLINE_END( ScViewFunc, SpellError, void *, nLang ) +//UNUSED2008-05 IMPL_LINK_INLINE_START( ScViewFunc, SpellError, void *, nLang ) +//UNUSED2008-05 { +//UNUSED2008-05 SvtLanguageTable aLangTab; +//UNUSED2008-05 String aErr = aLangTab.GetString((LanguageType) (ULONG) nLang); +//UNUSED2008-05 ErrorHandler::HandleError(*new StringErrorInfo( +//UNUSED2008-05 ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS, aErr) ); +//UNUSED2008-05 +//UNUSED2008-05 return 0; +//UNUSED2008-05 } +//UNUSED2008-05 IMPL_LINK_INLINE_END( ScViewFunc, SpellError, void *, nLang ) // Pasten von FORMAT_FILE-Items // wird nicht direkt aus Drop aufgerufen, sondern asynchron -> Dialoge sind erlaubt diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx index 64690c986..4c8198213 100644 --- a/sc/source/ui/view/viewfunc.cxx +++ b/sc/source/ui/view/viewfunc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewfunc.cxx,v $ - * $Revision: 1.46 $ + * $Revision: 1.44.22.2 $ * * This file is part of OpenOffice.org. * @@ -99,11 +99,11 @@ ScViewFunc::ScViewFunc( Window* pParent, ScDocShell& rDocSh, ScTabViewShell* pVi { } -ScViewFunc::ScViewFunc( Window* pParent, const ScViewFunc& rViewFunc, ScTabViewShell* pViewShell ) : - ScTabView( pParent, rViewFunc, pViewShell ), - bFormatValid( FALSE ) -{ -} +//UNUSED2008-05 ScViewFunc::ScViewFunc( Window* pParent, const ScViewFunc& rViewFunc, ScTabViewShell* pViewShell ) : +//UNUSED2008-05 ScTabView( pParent, rViewFunc, pViewShell ), +//UNUSED2008-05 bFormatValid( FALSE ) +//UNUSED2008-05 { +//UNUSED2008-05 } ScViewFunc::~ScViewFunc() { |