Tag: cws_dev300_dba31a User: fs Date: 2008-07-15 08:38:58+0000 Modified: dba/reportdesign/inc/RptObject.hxx dba/reportdesign/inc/reportformula.hxx dba/reportdesign/source/core/api/ReportEngineJFree.cxx dba/reportdesign/source/core/inc/ReportEngineJFree.hxx dba/reportdesign/source/core/misc/reportformula.cxx dba/reportdesign/source/core/sdr/RptObject.cxx dba/reportdesign/source/ui/inc/DesignView.hxx dba/reportdesign/source/ui/inc/ReportController.hxx dba/reportdesign/source/ui/inc/UITools.hxx dba/reportdesign/source/ui/inc/Undo.hxx dba/reportdesign/source/ui/misc/UITools.cxx dba/reportdesign/source/ui/misc/Undo.cxx dba/reportdesign/source/ui/report/DesignView.cxx dba/reportdesign/source/ui/report/ReportController.cxx
Log: remove unused code Issue number: #i91592# Submitted by: [EMAIL PROTECTED] Reviewed by: [EMAIL PROTECTED] File Changes: Directory: /dba/reportdesign/inc/ ================================= File [changed]: RptObject.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/RptObject.hxx?r1=1.7&r2=1.7.12.1 Delta lines: +2 -4 ------------------- --- RptObject.hxx 2008-06-16 12:59:02+0000 1.7 +++ RptObject.hxx 2008-07-15 08:38:54+0000 1.7.12.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RptObject.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.12.1 $ * * This file is part of OpenOffice.org. * @@ -198,8 +198,6 @@ { return new OOle2Obj( _xComponent,_nType ); } - OOle2Obj(const ::rtl::OUString& _sComponentName,const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect,UINT16 _nType, FASTBOOL bFrame_=FALSE); - protected: OOle2Obj(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent>& _xComponent,UINT16 _nType); OOle2Obj(const ::rtl::OUString& _sComponentName,UINT16 _nType); File [changed]: reportformula.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/inc/reportformula.hxx?r1=1.3&r2=1.3.30.1 Delta lines: +2 -5 ------------------- --- reportformula.hxx 2008-04-10 17:08:01+0000 1.3 +++ reportformula.hxx 2008-07-15 08:38:54+0000 1.3.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: reportformula.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.30.1 $ * * This file is part of OpenOffice.org. * @@ -70,9 +70,6 @@ /// constructs a ReportFormula object from a string ReportFormula( const ::rtl::OUString& _rFormula ); - /// constructs a ReportFormula object from a string - ReportFormula( const ::com::sun::star::uno::Any& _rWrappedFormula ); - /// constructs a ReportFormula by BindType ReportFormula( const BindType _eType, const ::rtl::OUString& _rFieldOrExpression ); Directory: /dba/reportdesign/source/core/api/ ============================================= File [changed]: ReportEngineJFree.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/api/ReportEngineJFree.cxx?r1=1.10&r2=1.10.4.1 Delta lines: +2 -49 -------------------- --- ReportEngineJFree.cxx 2008-06-25 11:35:39+0000 1.10 +++ ReportEngineJFree.cxx 2008-07-15 08:38:54+0000 1.10.4.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportEngineJFree.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.4.1 $ * * This file is part of OpenOffice.org. * @@ -381,53 +381,6 @@ throw lang::IllegalArgumentException(); set(PROPERTY_ACTIVECONNECTION,_activeconnection,m_xActiveConnection); } -// ----------------------------------------------------------------------------- -::rtl::OUString OReportEngineJFree::getOrderStatement() const -{ - OSL_ENSURE(m_xActiveConnection.is(),"OReportEngineJFree::getOrderStatement: The ActiveConnection can not be NULL here!"); - OSL_ENSURE(m_xReport.is(),"OReportEngineJFree::getOrderStatement: The ReportDefinition can not be NULL here!"); - - // retrieve columns of the object we're bound to - uno::Reference< lang::XComponent > xHoldAlive; - ::dbtools::SQLExceptionInfo aErrorInfo; - uno::Reference< container::XNameAccess> xColumns( ::dbtools::getFieldsByCommandDescriptor( - m_xActiveConnection, m_xReport->getCommandType(), m_xReport->getCommand(), xHoldAlive, & aErrorInfo ) ); - if ( aErrorInfo.isValid() ) - aErrorInfo.doThrow(); - if ( !xColumns.is() ) - { - DBG_WARNING( "OReportEngineJFree::getOrderStatement: could not retrieve the columns for the ORDER statement!" ); - return ::rtl::OUString(); - } - - // set order for groups - ::rtl::OUStringBuffer aOrder; - - const ::rtl::OUString sQuote = m_xActiveConnection->getMetaData()->getIdentifierQuoteString(); - - uno::Reference< report::XGroups> xGroups = m_xReport->getGroups(); - const sal_Int32 nCount = xGroups->getCount(); - for (sal_Int32 i = 0; i < nCount; ++i ) - { - uno::Reference< report::XGroup> xGroup(xGroups->getByIndex(i),uno::UNO_QUERY); - ::rtl::OUString sExpression = xGroup->getExpression(); - if ( xColumns->hasByName(sExpression) ) - sExpression = ::dbtools::quoteName( sQuote, sExpression ); - sExpression = sExpression.trim(); // Trim away white spaces - if (sExpression.getLength() > 0) - { - aOrder.append( sExpression ); - if (aOrder.getLength() > 0) - aOrder.appendAscii( " " ); - if ( !xGroup->getSortAscending() ) - aOrder.appendAscii( "DESC" ); - if ( (i+1) < nCount ) - aOrder.appendAscii( "," ); - } - } - - return aOrder.makeStringAndClear(); -} // ============================================================================= } // namespace reportdesign // ============================================================================= Directory: /dba/reportdesign/source/core/inc/ ============================================= File [changed]: ReportEngineJFree.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/inc/ReportEngineJFree.hxx?r1=1.6&r2=1.6.4.1 Delta lines: +2 -7 ------------------- --- ReportEngineJFree.hxx 2008-06-25 11:36:07+0000 1.6 +++ ReportEngineJFree.hxx 2008-07-15 08:38:54+0000 1.6.4.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportEngineJFree.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.4.1 $ * * This file is part of OpenOffice.org. * @@ -79,11 +79,6 @@ */ ::rtl::OUString getNewOutputName(); - /** generates the order statement defined by the groups of the report - * - * \return the ORDER BY part - */ - ::rtl::OUString getOrderStatement() const; protected: // TODO: VirtualFunctionFinder: This is virtual function! // Directory: /dba/reportdesign/source/core/misc/ ============================================== File [changed]: reportformula.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/misc/reportformula.cxx?r1=1.3&r2=1.3.30.1 Delta lines: +2 -11 -------------------- --- reportformula.cxx 2008-04-10 18:23:58+0000 1.3 +++ reportformula.cxx 2008-07-15 08:38:54+0000 1.3.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: reportformula.cxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.30.1 $ * * This file is part of OpenOffice.org. * @@ -82,15 +82,6 @@ } //-------------------------------------------------------------------- - ReportFormula::ReportFormula( const Any& _rWrappedFormula ) - :m_eType( Invalid ) - { - ::rtl::OUString sFormula; - OSL_VERIFY( _rWrappedFormula >>= sFormula ); - impl_construct( sFormula ); - } - - //-------------------------------------------------------------------- ReportFormula::ReportFormula( const BindType _eType, const ::rtl::OUString& _rFieldOrExpression ) :m_eType( _eType ) { Directory: /dba/reportdesign/source/core/sdr/ ============================================= File [changed]: RptObject.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/RptObject.cxx?r1=1.8.26.4&r2=1.8.26.5 Delta lines: +1 -9 ------------------- --- RptObject.cxx 2008-07-10 06:44:42+0000 1.8.26.4 +++ RptObject.cxx 2008-07-15 08:38:55+0000 1.8.26.5 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: RptObject.cxx,v $ - * $Revision: 1.8.26.4 $ + * $Revision: 1.8.26.5 $ * * This file is part of OpenOffice.org. * @@ -859,14 +859,6 @@ DBG_CTOR( rpt_OOle2Obj, NULL); m_bIsListening = sal_True; } -// ----------------------------------------------------------------------------- -OOle2Obj::OOle2Obj(const ::rtl::OUString& _sComponentName,const svt::EmbeddedObjectRef& rNewObjRef, const String& rNewObjName, const Rectangle& rNewRect,UINT16 _nType, FASTBOOL bFrame_) - :SdrOle2Obj(rNewObjRef,rNewObjName,rNewRect,bFrame_) - ,OObjectBase(_sComponentName) - ,m_nType(_nType) -{ - m_bIsListening = sal_True; -} //---------------------------------------------------------------------------- OOle2Obj::~OOle2Obj() { Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: DesignView.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/DesignView.hxx?r1=1.5.28.6&r2=1.5.28.7 Delta lines: +1 -4 ------------------- --- DesignView.hxx 2008-07-07 06:38:24+0000 1.5.28.6 +++ DesignView.hxx 2008-07-15 08:38:55+0000 1.5.28.7 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DesignView.hxx,v $ - * $Revision: 1.5.28.6 $ + * $Revision: 1.5.28.7 $ * * This file is part of OpenOffice.org. * @@ -192,7 +192,6 @@ inline BOOL isGridSnap() const { return m_bGridSnap; } void setGridSnap(BOOL bOn); void setDragStripes(BOOL bOn); - BOOL isDragStripes() const; /** turns the grid on or off * * \param _bGridVisible @@ -260,8 +259,6 @@ @param _pSectionView the section where to set the marked flag @param _bMark the marked flag */ - void setMarked(OSectionView* _pSectionView,sal_Bool _bMark); - void setMarked(const ::com::sun::star::uno::Reference< ::com::sun::star::report::XSection>& _xSection,sal_Bool _bMark); void setMarked(const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportComponent> >& _xShape,sal_Bool _bMark); File [changed]: ReportController.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ReportController.hxx?r1=1.8.10.3&r2=1.8.10.4 Delta lines: +2 -8 ------------------- --- ReportController.hxx 2008-07-02 09:19:20+0000 1.8.10.3 +++ ReportController.hxx 2008-07-15 08:38:55+0000 1.8.10.4 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportController.hxx,v $ - * $Revision: 1.8.10.3 $ + * $Revision: 1.8.10.4 $ * * This file is part of OpenOffice.org. * @@ -408,12 +408,6 @@ */ ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > getRowSet(); - /** hides or display all design floaters - * - * \param _bShow If <TRUE/> show floaters otherwise hide them. - */ - void displayDesignFloater(sal_Bool _bShow); - /** returns the number formatter */ ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > getReportNumberFormatter() const; File [changed]: UITools.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/UITools.hxx?r1=1.5.30.3&r2=1.5.30.4 Delta lines: +1 -8 ------------------- --- UITools.hxx 2008-07-10 06:59:49+0000 1.5.30.3 +++ UITools.hxx 2008-07-15 08:38:55+0000 1.5.30.4 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: UITools.hxx,v $ - * $Revision: 1.5.30.3 $ + * $Revision: 1.5.30.4 $ * * This file is part of OpenOffice.org. * @@ -93,13 +93,6 @@ */ bool openCharDialog( const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xReportControlFormat, - const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _xWindow - ); - - /** opens the common character font dialog - */ - bool openCharDialog( - const ::com::sun::star::uno::Reference< ::com::sun::star::report::XReportControlFormat>& _xReportControlFormat, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _xWindow, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& _out_rNewValues ); File [changed]: Undo.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/Undo.hxx?r1=1.3&r2=1.3.30.1 Delta lines: +2 -15 -------------------- --- Undo.hxx 2008-04-10 19:06:12+0000 1.3 +++ Undo.hxx 2008-07-15 08:38:55+0000 1.3.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: Undo.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.3.30.1 $ * * This file is part of OpenOffice.org. * @@ -130,19 +130,6 @@ virtual String GetComment() const; }; - /** \class OToggleSlotUndo - * \brief calls the slot every time an undo or redo action is performed. - */ - class OToggleSlotUndo : public OCommentUndoAction - { - sal_uInt16 m_nSlot; - public: - TYPEINFO(); - OToggleSlotUndo(OReportModel& rMod,sal_uInt16 _nSlot,USHORT nCommentID); - virtual void Undo(); - virtual void Redo(); - }; - /** /class OGroupUndo * \brief Undo action for removing a group object. */ Directory: /dba/reportdesign/source/ui/misc/ ============================================ File [changed]: UITools.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/misc/UITools.cxx?r1=1.6.28.4&r2=1.6.28.5 Delta lines: +1 -12 -------------------- --- UITools.cxx 2008-07-10 06:59:50+0000 1.6.28.4 +++ UITools.cxx 2008-07-15 08:38:55+0000 1.6.28.5 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: UITools.cxx,v $ - * $Revision: 1.6.28.4 $ + * $Revision: 1.6.28.5 $ * * This file is part of OpenOffice.org. * @@ -928,17 +928,6 @@ } // ----------------------------------------------------------------------------- -bool openCharDialog(const uno::Reference<report::XReportControlFormat>& _rxReportControlFormat, - const uno::Reference< awt::XWindow>& _xWindow) -{ - uno::Sequence< beans::NamedValue > aSettings; - if ( !openCharDialog( _rxReportControlFormat, _xWindow, aSettings ) ) - return false; - applyCharacterSettings( _rxReportControlFormat, aSettings ); - return true; -} - -// ----------------------------------------------------------------------------- void notifySystemWindow(Window* _pWindow,Window* _pToRegister, ::comphelper::mem_fun1_t<TaskPaneList,Window*> _rMemFunc) { OSL_ENSURE(_pWindow,"Window can not be null!"); File [changed]: Undo.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/misc/Undo.cxx?r1=1.5&r2=1.5.30.1 Delta lines: +2 -21 -------------------- --- Undo.cxx 2008-04-10 19:11:37+0000 1.5 +++ Undo.cxx 2008-07-15 08:38:55+0000 1.5.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: Undo.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.30.1 $ * * This file is part of OpenOffice.org. * @@ -344,25 +344,6 @@ m_bInserted = false; } //---------------------------------------------------------------------------- -TYPEINIT1( OToggleSlotUndo, OCommentUndoAction ); -//---------------------------------------------------------------------------- -OToggleSlotUndo::OToggleSlotUndo(OReportModel& _rMod,sal_uInt16 _nSlot,USHORT nCommentID) -: OCommentUndoAction(_rMod,nCommentID) -,m_nSlot(_nSlot) -{ -} -//---------------------------------------------------------------------------- -void OToggleSlotUndo::Undo() -{ - const uno::Sequence< beans::PropertyValue > aArgs; - m_pController->executeChecked(m_nSlot,aArgs); -} -//---------------------------------------------------------------------------- -void OToggleSlotUndo::Redo() -{ - Undo(); -} -//---------------------------------------------------------------------------- TYPEINIT1( OGroupUndo, OCommentUndoAction ); //---------------------------------------------------------------------------- OGroupUndo::OGroupUndo(OReportModel& _rMod Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: DesignView.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/DesignView.cxx?r1=1.5.28.8&r2=1.5.28.9 Delta lines: +1 -11 -------------------- --- DesignView.cxx 2008-07-07 06:40:21+0000 1.5.28.8 +++ DesignView.cxx 2008-07-15 08:38:56+0000 1.5.28.9 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: DesignView.cxx,v $ - * $Revision: 1.5.28.8 $ + * $Revision: 1.5.28.9 $ * * This file is part of OpenOffice.org. * @@ -673,11 +673,6 @@ return m_aScrollWindow.handleKeyEvent(_rEvent); } //------------------------------------------------------------------------ -void ODesignView::setMarked(OSectionView* _pSectionView,sal_Bool _bMark) -{ - m_aScrollWindow.setMarked(_pSectionView,_bMark); -} -//------------------------------------------------------------------------ void ODesignView::setMarked(const uno::Reference< report::XSection>& _xSection,sal_Bool _bMark) { m_aScrollWindow.setMarked(_xSection,_bMark); @@ -744,11 +739,6 @@ m_aScrollWindow.setDragStripes(bOn); } // ----------------------------------------------------------------------------- -BOOL ODesignView::isDragStripes() const -{ - return m_aScrollWindow.isDragStripes(); -} -// ----------------------------------------------------------------------------- sal_Bool ODesignView::isHandleEvent(sal_uInt16 /*_nId*/) const { return m_pPropWin && m_pPropWin->HasChildPathFocus(); File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.14.24.8&r2=1.14.24.9 Delta lines: +1 -9 ------------------- --- ReportController.cxx 2008-07-10 06:45:51+0000 1.14.24.8 +++ ReportController.cxx 2008-07-15 08:38:56+0000 1.14.24.9 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ReportController.cxx,v $ - * $Revision: 1.14.24.8 $ + * $Revision: 1.14.24.9 $ * * This file is part of OpenOffice.org. * @@ -2799,14 +2799,6 @@ } } // ----------------------------------------------------------------------------- -void OReportController::displayDesignFloater(sal_Bool _bShow) -{ - if ( m_pGroupsFloater && isUiVisible() ) - { - m_pGroupsFloater->Show( m_bGroupFloaterWasVisible && _bShow); - } -} -// ----------------------------------------------------------------------------- ::boost::shared_ptr<rptui::OReportModel> OReportController::getSdrModel() { if ( !m_aReportModel ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
