User: hr      
Date: 2007-08-03 12:44:20+0000
Modified:
   dba/reportdesign/source/core/sdr/UndoActions.cxx

Log:
 INTEGRATION: CWS rpt23fix02 (1.2.4); FILE MERGED
 2007/07/30 05:36:11 oj 1.2.4.3: #80161# apply gcc3 patch for strings
 2007/07/27 12:21:57 oj 1.2.4.2: #i77907# remove entries from context when 
propbrw is destroyed
 2007/07/24 12:48:04 oj 1.2.4.1: merge from rpt23fix01

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.3&r2=1.4
Delta lines:  +4 -1
-------------------
--- UndoActions.cxx     2007-08-02 14:32:37+0000        1.3
+++ UndoActions.cxx     2007-08-03 12:44:17+0000        1.4
@@ -101,16 +101,19 @@
 DECLARE_STL_STDKEY_MAP(uno::Reference< beans::XPropertySet >, AllProperties, 
PropertySetInfoCache);
 
//------------------------------------------------------------------------------
 TYPEINIT1( OCommentUndoAction,          SdrUndoAction );
+DBG_NAME(rpt_OCommentUndoAction)
 //----------------------------------------------------------------------------
 OCommentUndoAction::OCommentUndoAction(SdrModel& _rMod,USHORT nCommentID) 
        :SdrUndoAction(_rMod)
 { 
+    DBG_CTOR(rpt_OCommentUndoAction,NULL);    
     m_pController = static_cast< OReportModel& >( _rMod ).getController();
        if ( nCommentID )
         m_strComment = String(ModuleRes(nCommentID)); 
 }
 OCommentUndoAction::~OCommentUndoAction()
 {
+    DBG_DTOR(rpt_OCommentUndoAction,NULL);    
 }
 //----------------------------------------------------------------------------
 void OCommentUndoAction::Undo()
@@ -408,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;




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to