Tag: cws_src680_rpt23fix01 User: lla Date: 2007-07-16 10:24:04+0000 Modified: dba/reportdesign/source/inc/uistrings.hrc dba/reportdesign/source/shared/uistrings.cxx dba/reportdesign/source/ui/report/ReportSection.cxx
Log: #i77268# visualisation for DnD File Changes: Directory: /dba/reportdesign/source/inc/ ======================================== File [changed]: uistrings.hrc Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/inc/uistrings.hrc?r1=1.2&r2=1.2.2.1 Delta lines: +3 -2 ------------------- --- uistrings.hrc 2007-07-09 11:56:28+0000 1.2 +++ uistrings.hrc 2007-07-16 10:24:01+0000 1.2.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: uistrings.hrc,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.2.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 11:56:28 $ + * last change: $Author: lla $ $Date: 2007/07/16 10:24:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -64,6 +64,7 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_POSITION ); DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEYDATE ); DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEYTIME ); +DECLARE_CONSTASCII_USTRING(DBOVERLAPPEDCONTROL ); } Directory: /dba/reportdesign/source/shared/ =========================================== File [changed]: uistrings.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/shared/uistrings.cxx?r1=1.2&r2=1.2.2.1 Delta lines: +3 -2 ------------------- --- uistrings.cxx 2007-07-09 11:56:29+0000 1.2 +++ uistrings.cxx 2007-07-16 10:24:01+0000 1.2.2.1 @@ -4,9 +4,9 @@ * * $RCSfile: uistrings.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.2.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 11:56:29 $ + * last change: $Author: lla $ $Date: 2007/07/16 10:24:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -58,5 +58,6 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_POSITION , "Position"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEYDATE , "FormatKeyDate"); IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FORMATKEYTIME , "FormatKeyTime"); + IMPLEMENT_CONSTASCII_USTRING(DBOVERLAPPEDCONTROL , "OverlappedControl"); } Directory: /dba/reportdesign/source/ui/report/ ============================================== File [changed]: ReportSection.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ReportSection.cxx?r1=1.2.2.2&r2=1.2.2.3 Delta lines: +9 -4 ------------------- --- ReportSection.cxx 2007-07-16 07:49:01+0000 1.2.2.2 +++ ReportSection.cxx 2007-07-16 10:24:02+0000 1.2.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: ReportSection.cxx,v $ * - * $Revision: 1.2.2.2 $ + * $Revision: 1.2.2.3 $ * - * last change: $Author: lla $ $Date: 2007/07/16 07:49:01 $ + * last change: $Author: lla $ $Date: 2007/07/16 10:24:02 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -125,7 +125,8 @@ sal_Int32 lcl_getOverlappedControlColor(const uno::Reference <lang::XMultiServiceFactory> _rxFactory) { svtools::ExtendedColorConfig aConfig; - sal_Int32 nColor = aConfig.GetColorValue(rtl::OUString::createFromAscii("ReportDesigner"), rtl::OUString::createFromAscii("OverlappedControl")).nColor; + // sal_Int32 nColor = aConfig.GetColorValue(rtl::OUString::createFromAscii("ReportDesigner"), rtl::OUString::createFromAscii("OverlappedControl")).nColor; + sal_Int32 nColor = aConfig.GetColorValue(rtl::OUString::createFromAscii("ReportDesigner"), DBOVERLAPPEDCONTROL).nColor; return nColor; } //------------------------------------------------------------------------------ @@ -360,10 +361,14 @@ if ( eNewMode != m_eMode ) { if ( eNewMode == RPTUI_INSERT ) + { m_pFunc.reset(new DlgEdFuncInsert( this )); + } else + { m_pFunc.reset(new DlgEdFuncSelect( this )); - + } + m_pFunc->setOverlappedControlColor(lcl_getOverlappedControlColor( m_pParent->getView()->getReportView()->getController()->getORB() ) ); m_pModel->SetReadOnly(eNewMode == RPTUI_READONLY); m_eMode = eNewMode; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
