Tag: cws_src680_rptchart01 User: oj Date: 2008-02-19 17:11:40+0000 Modified: dba/reportdesign/source/ui/report/dlgedfunc.cxx
Log: merge conflict File Changes: Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: dlgedfunc.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/dlgedfunc.cxx?r1=1.5.62.2&r2=1.5.62.3 Delta lines: +4 -4 ------------------- --- dlgedfunc.cxx 2008-02-19 09:23:08+0000 1.5.62.2 +++ dlgedfunc.cxx 2008-02-19 17:11:38+0000 1.5.62.3 @@ -4,9 +4,9 @@ * * $RCSfile: dlgedfunc.cxx,v $ * - * $Revision: 1.5.62.2 $ + * $Revision: 1.5.62.3 $ * - * last change: $Author: oj $ $Date: 2008/02/19 09:23:08 $ + * last change: $Author: oj $ $Date: 2008/02/19 17:11:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -644,7 +644,7 @@ bReturn = m_pView->AreObjectsMarked(); if ( bReturn ) { - OReportController* pController = pParent->getViewsWindow()->getView()->getReportView()->getController(); + OReportController* pController = m_pParent->getViewsWindow()->getView()->getReportView()->getController(); const SdrMarkList& rMarkList = m_pView->GetMarkedObjectList(); for (sal_uInt32 i = 0; i < rMarkList.GetMarkCount();++i ) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
