Tag: cws_src680_oj14 User: oj Date: 2007-05-15 07:11:14+0000 Modified: dba/reportdesign/source/ui/report/ReportController.cxx dba/reportdesign/source/ui/report/report.src
Log: #i77051# update text for menu entry File Changes: 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.1.2.4&r2=1.1.2.5 Delta lines: +15 -6 -------------------- --- ReportController.cxx 2007-05-11 13:32:21+0000 1.1.2.4 +++ ReportController.cxx 2007-05-15 07:11:11+0000 1.1.2.5 @@ -4,9 +4,9 @@ * * $RCSfile: ReportController.cxx,v $ * - * $Revision: 1.1.2.4 $ + * $Revision: 1.1.2.5 $ * - * last change: $Author: oj $ $Date: 2007/05/11 13:32:21 $ + * last change: $Author: oj $ $Date: 2007/05/15 07:11:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -466,14 +466,20 @@ case SID_REPORTHEADER_WITHOUT_UNDO: case SID_REPORTFOOTER_WITHOUT_UNDO: case SID_REPORTHEADERFOOTER: + { aReturn.bEnabled = isEditable(); - aReturn.bChecked = (m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()); + ::rtl::OUString sText = String(ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getReportHeaderOn()) ? RID_STR_REPORTHEADERFOOTER_DELETE : RID_STR_REPORTHEADERFOOTER_INSERT)); + aReturn.sTitle = sText; + } break; case SID_PAGEHEADER_WITHOUT_UNDO: case SID_PAGEFOOTER_WITHOUT_UNDO: case SID_PAGEHEADERFOOTER: + { aReturn.bEnabled = isEditable(); - aReturn.bChecked = (m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()); + ::rtl::OUString sText = String(ModuleRes((m_xReportDefinition.is() && m_xReportDefinition->getPageHeaderOn()) ? RID_STR_PAGEHEADERFOOTER_DELETE : RID_STR_PAGEHEADERFOOTER_INSERT)); + aReturn.sTitle = sText; + } break; case SID_GROUP_APPEND: case SID_GROUP_REMOVE: @@ -2550,6 +2556,7 @@ aPageItem.SetLandscape(lcl_getStyleProperty<sal_Bool>(m_xReportDefinition,PROPERTY_ISLANDSCAPE)); aPageItem.SetNumType((SvxNumType)lcl_getStyleProperty<sal_Int16>(m_xReportDefinition,PROPERTY_NUMBERINGTYPE)); pDescriptor->Put(aPageItem); + pDescriptor->Put(SvxBrushItem(::Color(lcl_getStyleProperty<sal_Int32>(m_xReportDefinition,PROPERTY_BACKCOLOR)))); } } @@ -2596,6 +2603,8 @@ lcl_setStyleProperty(m_xReportDefinition,PROPERTY_ISLANDSCAPE,static_cast<sal_Bool>(pPageItem->IsLandscape())); lcl_setStyleProperty(m_xReportDefinition,PROPERTY_NUMBERINGTYPE,static_cast<sal_Int16>(pPageItem->GetNumType())); } + if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_BRUSH,sal_True,&pItem)) + lcl_setStyleProperty(m_xReportDefinition,PROPERTY_BACKCOLOR,static_cast<const SvxBrushItem*>(pItem)->GetColor().GetColor()); getUndoMgr()->LeaveListAction(); } } File [changed]: report.src Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/report.src?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +30 -5 -------------------- --- report.src 2007-05-09 13:53:25+0000 1.1.2.1 +++ report.src 2007-05-15 07:11:11+0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: report.src,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: oj $ $Date: 2007/05/09 13:53:25 $ + * last change: $Author: oj $ $Date: 2007/05/15 07:11:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -670,8 +670,33 @@ Text [ de ] = "Zeichensatz verändern" ; Text [ en-US ] = "Change font"; }; -String RID_STR_UNDO_CHANGEPAGE +String RID_STR_PAGEHEADERFOOTER_INSERT { - Text [ de ] = "Seiteneigenschaften verändern" ; - Text [ en-US ] = "Change page attributes"; + Text [ de ] = "Seitenkopf, -fuà einfügen" ; + Text [ en-US ] = "Insert Page Header/Footer"; +}; +String RID_STR_PAGEHEADERFOOTER_DELETE +{ + Text [ de ] = "Seitenkopf, -fuà löschen" ; + Text [ en-US ] = "Delete Page Header/Footer"; +}; +String RID_STR_COLUMNHEADERFOOTER_INSERT +{ + Text [ de ] = "Spaltenkopf, -fuà einfügen" ; + Text [ en-US ] = "Insert Column Header/Footer"; +}; +String RID_STR_COLUMNHEADERFOOTER_DELETE +{ + Text [ de ] = "Spaltenkopf, -fuà löschen" ; + Text [ en-US ] = "Delete Column Header/Footer"; +}; +String RID_STR_REPORTHEADERFOOTER_INSERT +{ + Text [ de ] = "Berichtskopf, -fuà einfügen" ; + Text [ en-US ] = "Insert Report Header/Footer"; +}; +String RID_STR_REPORTHEADERFOOTER_DELETE +{ + Text [ de ] = "Berichtskopf, -fuà löschen" ; + Text [ en-US ] = "Delete Report Header/Footer"; }; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
