Tag: cws_src680_rpt23fix02 User: oj Date: 2007-07-30 05:36:15+0000 Modified: dba/reportdesign/source/core/sdr/UndoActions.cxx dba/reportdesign/source/ui/dlg/GroupsSorting.cxx dba/reportdesign/source/ui/inspection/GeometryHandler.cxx dba/reportdesign/source/ui/misc/toolboxcontroller.cxx dba/reportdesign/source/ui/report/ReportController.cxx dba/reportdesign/source/ui/report/StartMarker.cxx dba/reportdesign/source/ui/report/ViewsWindow.cxx dba/reportdesign/source/ui/report/dlgedfunc.cxx
Log: #80161# apply gcc3 patch for strings File Changes: Directory: /dba/reportdesign/source/core/sdr/ ============================================= File [changed]: UndoActions.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/core/sdr/UndoActions.cxx?r1=1.2.4.2&r2=1.2.4.3 Delta lines: +4 -4 ------------------- --- UndoActions.cxx 2007-07-27 12:21:57+0000 1.2.4.2 +++ UndoActions.cxx 2007-07-30 05:36:11+0000 1.2.4.3 @@ -4,9 +4,9 @@ * * $RCSfile: UndoActions.cxx,v $ * - * $Revision: 1.2.4.2 $ + * $Revision: 1.2.4.3 $ * - * last change: $Author: oj $ $Date: 2007/07/27 12:21:57 $ + * last change: $Author: oj $ $Date: 2007/07/30 05:36:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -411,7 +411,7 @@ //------------------------------------------------------------------------------ String ORptUndoPropertyAction::GetComment() const { - String aStr(String(ModuleRes(RID_STR_UNDO_PROPERTY))); + String aStr(ModuleRes(RID_STR_UNDO_PROPERTY)); aStr.SearchAndReplace( '#', m_aPropertyName ); return aStr; Directory: /dba/reportdesign/source/ui/dlg/ =========================================== File [changed]: GroupsSorting.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/dlg/GroupsSorting.cxx?r1=1.3.2.2&r2=1.3.2.3 Delta lines: +7 -7 ------------------- --- GroupsSorting.cxx 2007-07-25 14:07:01+0000 1.3.2.2 +++ GroupsSorting.cxx 2007-07-30 05:36:11+0000 1.3.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: GroupsSorting.cxx,v $ * - * $Revision: 1.3.2.2 $ + * $Revision: 1.3.2.3 $ * - * last change: $Author: oj $ $Date: 2007/07/25 14:07:01 $ + * last change: $Author: oj $ $Date: 2007/07/30 05:36:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -333,7 +333,7 @@ m_bIgnoreEvent = true; { sal_Int32 nRow = _nRow; - String sUndoAction(String(ModuleRes(RID_STR_UNDO_MOVE_GROUP))); + String sUndoAction(ModuleRes(RID_STR_UNDO_MOVE_GROUP)); UndoManagerListAction aListAction(*m_pParent->m_pController->getUndoMgr(),sUndoAction); uno::Reference< report::XGroups> xGroups = m_pParent->getGroups(); @@ -477,7 +477,7 @@ if ( m_aGroupPositions[nRow] == NO_GROUP ) { bAppend = sal_True; - String sUndoAction(String(ModuleRes(RID_STR_UNDO_APPEND_GROUP))); + String sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP)); m_pParent->m_pController->getUndoMgr()->EnterListAction( sUndoAction, String() ); xGroup = m_pParent->getGroups()->createGroup(); xGroup->setHeaderOn(sal_True); @@ -826,7 +826,7 @@ if ( bFirstTime ) { bFirstTime = false; - String sUndoAction(String(ModuleRes(RID_STR_UNDO_REMOVE_SELECTION))); + String sUndoAction(ModuleRes(RID_STR_UNDO_REMOVE_SELECTION)); m_pParent->m_pController->getUndoMgr()->EnterListAction( sUndoAction, String() ); } @@ -933,7 +933,7 @@ { m_bIgnoreEvent = false; { - String sUndoAction(String(ModuleRes(RID_STR_UNDO_APPEND_GROUP))); + String sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP)); UndoManagerListAction aListAction(*m_pParent->m_pController->getUndoMgr(),sUndoAction); uno::Reference<report::XGroups> xGroups = m_pParent->getGroups(); Directory: /dba/reportdesign/source/ui/inspection/ ================================================== File [changed]: GeometryHandler.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/inspection/GeometryHandler.cxx?r1=1.2.4.3&r2=1.2.4.4 Delta lines: +5 -4 ------------------- --- GeometryHandler.cxx 2007-07-26 08:15:45+0000 1.2.4.3 +++ GeometryHandler.cxx 2007-07-30 05:36:11+0000 1.2.4.4 @@ -4,9 +4,9 @@ * * $RCSfile: GeometryHandler.cxx,v $ * - * $Revision: 1.2.4.3 $ + * $Revision: 1.2.4.4 $ * - * last change: $Author: oj $ $Date: 2007/07/26 08:15:45 $ + * last change: $Author: oj $ $Date: 2007/07/30 05:36:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1181,7 +1181,8 @@ return false; } - const ::rtl::OUString sPropertyUIName( String(ModuleRes(RID_STR_FILTER)) ); + String aGcc3WorkaroundTemporary( ModuleRes(RID_STR_FILTER)); + const ::rtl::OUString sPropertyUIName( aGcc3WorkaroundTemporary ); // initialize the dialog uno::Reference< beans::XPropertySet > xDialogProps( xDialog, uno::UNO_QUERY_THROW ); xDialogProps->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "QueryComposer" ) ), uno::makeAny( xComposer ) ); Directory: /dba/reportdesign/source/ui/misc/ ============================================ File [changed]: toolboxcontroller.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/misc/toolboxcontroller.cxx?r1=1.2.4.1&r2=1.2.4.2 Delta lines: +5 -4 ------------------- --- toolboxcontroller.cxx 2007-07-27 12:21:58+0000 1.2.4.1 +++ toolboxcontroller.cxx 2007-07-30 05:36:12+0000 1.2.4.2 @@ -4,9 +4,9 @@ * * $RCSfile: toolboxcontroller.cxx,v $ * - * $Revision: 1.2.4.1 $ + * $Revision: 1.2.4.2 $ * - * last change: $Author: oj $ $Date: 2007/07/27 12:21:58 $ + * last change: $Author: oj $ $Date: 2007/07/30 05:36:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -328,7 +328,8 @@ { util::Color nColor(COL_TRANSPARENT); Event.State >>= nColor; - SvxColorItem aColorItem(::Color(nColor),1); + ::Color aGcc3WorkaroundTemporary( nColor); + SvxColorItem aColorItem(aGcc3WorkaroundTemporary,1); if ( SID_ATTR_CHAR_COLOR2 == m_nSlotId ) static_cast<SvxFontColorExtToolBoxControl*>(m_pToolbarController.get())->StateChanged(m_nSlotId,Event.IsEnabled ? SFX_ITEM_SET : SFX_ITEM_DISABLED,&aColorItem); else 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.2.4.4&r2=1.2.4.5 Delta lines: +12 -11 --------------------- --- ReportController.cxx 2007-07-27 12:21:59+0000 1.2.4.4 +++ ReportController.cxx 2007-07-30 05:36:12+0000 1.2.4.5 @@ -4,9 +4,9 @@ * * $RCSfile: ReportController.cxx,v $ * - * $Revision: 1.2.4.4 $ + * $Revision: 1.2.4.5 $ * - * last change: $Author: oj $ $Date: 2007/07/27 12:21:59 $ + * last change: $Author: oj $ $Date: 2007/07/30 05:36:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1630,7 +1630,7 @@ if ( xReportControlFormat.is() ) { { - const String sUndoAction(String(ModuleRes(RID_STR_UNDO_CHANGEFONT))); + const String sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEFONT)); UndoManagerListAction aListAction(m_aUndoManager,sUndoAction); rptui::openCharDialog(xReportControlFormat,xWindow); } @@ -1720,7 +1720,7 @@ //{ // ::std::vector< uno::Reference< report::XReportComponent > > aSelection; // uno::Reference<report::XSection> xSection = pReportSection->getSection(); - // const String sUndoAction(String(ModuleRes(RID_STR_UNDO_GROUP))); + // const String sUndoAction(ModuleRes(RID_STR_UNDO_GROUP)); // getUndoMgr()->EnterListAction( sUndoAction, String() ); // getUndoMgr()->LeaveListAction(); @@ -2473,7 +2473,8 @@ sDefault = String(::dbtools::createUniqueName(xNames.get(),aName)); } - const ::rtl::OUString sLabel(String(ModuleRes(STR_RPT_LABEL))); + String aGcc3WorkaroundTemporary( ModuleRes(STR_RPT_LABEL)); + const ::rtl::OUString sLabel(aGcc3WorkaroundTemporary); Sequence< Any > aArgs(4); Reference< awt::XWindow> xWindow = getTopMostContainerWindow(); if ( !xWindow.is() ) @@ -2729,7 +2730,7 @@ } else { - const String sUndoAction(String(ModuleRes(RID_STR_UNDO_CHANGEPAGE))); + const String sUndoAction(ModuleRes(RID_STR_UNDO_CHANGEPAGE)); UndoManagerListAction aListAction(m_aUndoManager,sUndoAction); const SfxPoolItem* pItem = NULL; if ( SFX_ITEM_SET == pSet->GetItemState( RPTUI_ID_SIZE,sal_True,&pItem)) @@ -3336,7 +3337,7 @@ { m_pMyOwnView->unmarkAllObjects(NULL); - const String sUndoAction(String(ModuleRes(RID_STR_UNDO_INSERT_CONTROL))); + const String sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL)); UndoManagerListAction aListAction(m_aUndoManager,sUndoAction); SequenceAsHashMap aMap(_aArgs); @@ -3364,7 +3365,7 @@ { m_pMyOwnView->unmarkAllObjects(NULL); - const String sUndoAction(String(ModuleRes(RID_STR_UNDO_INSERT_CONTROL))); + const String sUndoAction(ModuleRes(RID_STR_UNDO_INSERT_CONTROL)); UndoManagerListAction aListAction(m_aUndoManager,sUndoAction); if ( !m_xReportDefinition->getPageHeaderOn() ) @@ -3778,7 +3779,7 @@ const bool bSwitchOn = !m_xReportDefinition->getReportHeaderOn(); if ( SID_REPORTHEADERFOOTER == _nId ) { - const String sUndoAction(String(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER))); + const String sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); getUndoMgr()->EnterListAction( sUndoAction, String() ); addUndoActionAndInvalidate(new OReportSectionUndo(*(m_aReportModel),SID_REPORTHEADER_WITHOUT_UNDO @@ -3826,7 +3827,7 @@ if ( SID_PAGEHEADERFOOTER == _nId ) { - const String sUndoAction(String(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER))); + const String sUndoAction(ModuleRes(bSwitchOn ? RID_STR_UNDO_ADD_REPORTHEADERFOOTER : RID_STR_UNDO_REMOVE_REPORTHEADERFOOTER)); getUndoMgr()->EnterListAction( sUndoAction, String() ); addUndoActionAndInvalidate(new OReportSectionUndo(*m_aReportModel File [changed]: StartMarker.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/StartMarker.cxx?r1=1.2&r2=1.2.4.1 Delta lines: +4 -3 ------------------- --- StartMarker.cxx 2007-07-09 11:56:33+0000 1.2 +++ StartMarker.cxx 2007-07-30 05:36:12+0000 1.2.4.1 @@ -4,9 +4,9 @@ * * $RCSfile: StartMarker.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.4.1 $ * - * last change: $Author: rt $ $Date: 2007/07/09 11:56:33 $ + * last change: $Author: oj $ $Date: 2007/07/30 05:36:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -148,7 +148,8 @@ SetClipRegion(Region(Rectangle(Point(),Size( nSize,aSize.Height())))); aSize.Width() += m_nCornerSize; - Rectangle aWholeRect(Point(),aSize); + Point aGcc3WorkaroundTemporary; + Rectangle aWholeRect(aGcc3WorkaroundTemporary,aSize); { const ColorChanger aColors( this, m_nTextBoundaries, m_nColor ); File [changed]: ViewsWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/ViewsWindow.cxx?r1=1.2.4.2&r2=1.2.4.3 Delta lines: +4 -4 ------------------- --- ViewsWindow.cxx 2007-07-25 14:07:02+0000 1.2.4.2 +++ ViewsWindow.cxx 2007-07-30 05:36:12+0000 1.2.4.3 @@ -4,9 +4,9 @@ * * $RCSfile: ViewsWindow.cxx,v $ * - * $Revision: 1.2.4.2 $ + * $Revision: 1.2.4.3 $ * - * last change: $Author: oj $ $Date: 2007/07/25 14:07:02 $ + * last change: $Author: oj $ $Date: 2007/07/30 05:36:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -420,7 +420,7 @@ //----------------------------------------------------------------------------- IMPL_LINK( OViewsWindow, StartSplitHdl, Splitter*, ) { - const String sEmpty(String(ModuleRes(RID_STR_UNDO_CHANGE_SIZE))); + const String sEmpty(ModuleRes(RID_STR_UNDO_CHANGE_SIZE)); getView()->getReportView()->getController()->getUndoMgr()->EnterListAction(sEmpty,String()); return 0L; } File [changed]: dlgedfunc.cxx Url: http://dba.openoffice.org/source/browse/dba/reportdesign/source/ui/report/dlgedfunc.cxx?r1=1.2.4.3&r2=1.2.4.4 Delta lines: +5 -4 ------------------- --- dlgedfunc.cxx 2007-07-25 14:07:02+0000 1.2.4.3 +++ dlgedfunc.cxx 2007-07-30 05:36:12+0000 1.2.4.4 @@ -4,9 +4,9 @@ * * $RCSfile: dlgedfunc.cxx,v $ * - * $Revision: 1.2.4.3 $ + * $Revision: 1.2.4.4 $ * - * last change: $Author: oj $ $Date: 2007/07/25 14:07:02 $ + * last change: $Author: oj $ $Date: 2007/07/30 05:36:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -127,7 +127,8 @@ Rectangle aOutRect( pScrollWindow->getScrollOffset(), aOut ); aOutRect = pParent->PixelToLogic( aOutRect ); //Rectangle aWorkArea = pParent->getView()->GetWorkArea(); - Rectangle aWorkArea(Point(),pScrollWindow->getTotalSize()); + Point aGcc3WorkaroundTemporary; + Rectangle aWorkArea(aGcc3WorkaroundTemporary,pScrollWindow->getTotalSize()); aWorkArea.Right() -= REPORT_STARTMARKER_WIDTH; aWorkArea = pScrollWindow->PixelToLogic( aWorkArea ); if( !aOutRect.IsInside( rPos ) && aWorkArea.IsInside( rPos ) ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
