Tag: cws_src680_rptchart01 User: oj Date: 2008-02-20 11:49:59+0000 Modified: dba/reportdesign/source/ui/inc/ReportController.hxx dba/reportdesign/source/ui/report/ReportController.cxx
Log: #i85225# execute report is now always enabled, but with error message File Changes: Directory: /dba/reportdesign/source/ui/inc/ =========================================== File [changed]: ReportController.hxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inc/ReportController.hxx?r1=1.3.62.3&r2=1.3.62.4 Delta lines: +4 -3 ------------------- --- ReportController.hxx 2008-02-19 09:22:53+0000 1.3.62.3 +++ ReportController.hxx 2008-02-20 11:49:56+0000 1.3.62.4 @@ -6,9 +6,9 @@ * * $RCSfile: ReportController.hxx,v $ * - * $Revision: 1.3.62.3 $ + * $Revision: 1.3.62.4 $ * - * last change: $Author: oj $ $Date: 2008/02/19 09:22:53 $ + * last change: $Author: oj $ $Date: 2008/02/20 11:49:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -161,6 +161,7 @@ sal_Bool m_bGroupFloaterWasVisible; sal_Bool m_bHelplinesMove; bool m_bChartEnabled; + bool m_bChartEnabledAsked; /** creates a formatted field in the given section with the given formula as data field Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ReportController.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportController.cxx?r1=1.6.16.7&r2=1.6.16.8 Delta lines: +5 -5 ------------------- --- ReportController.cxx 2008-02-20 11:25:56+0000 1.6.16.7 +++ ReportController.cxx 2008-02-20 11:49:56+0000 1.6.16.8 @@ -4,9 +4,9 @@ * * $RCSfile: ReportController.cxx,v $ * - * $Revision: 1.6.16.7 $ + * $Revision: 1.6.16.8 $ * - * last change: $Author: oj $ $Date: 2008/02/20 11:25:56 $ + * last change: $Author: oj $ $Date: 2008/02/20 11:49:56 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -389,6 +389,7 @@ ,m_bGroupFloaterWasVisible(sal_False) ,m_bHelplinesMove(sal_True) ,m_bChartEnabled(false) +,m_bChartEnabledAsked(false) { DBG_CTOR( rpt_OReportController,NULL); } @@ -3987,10 +3988,9 @@ // ----------------------------------------------------------------------------- void OReportController::checkChartEnabled() { - static bool bDone = false; - if ( !bDone ) + if ( !m_bChartEnabledAsked ) { - bDone = true; + m_bChartEnabledAsked = true; const ::rtl::OUString sConfigName( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.Office.ReportDesign" ) ); const ::rtl::OUString sPropertyName( RTL_CONSTASCII_USTRINGPARAM( "UserData/Chart" ) ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
