From 935a39777f056f7f8b188634aa6eb1f35cbc1158 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Tue, 27 Feb 2007 12:31:26 +0000
Subject: INTEGRATION: CWS calcwarnings (1.10.110); FILE MERGED 2006/12/12
 17:03:17 nn 1.10.110.1: #i69284# warning-free: ui, unxlngi6

---
 sc/source/ui/miscdlgs/highred.cxx | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

(limited to 'sc/source/ui/miscdlgs')

diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx
index 0870f2f52..290e1b5fc 100644
--- a/sc/source/ui/miscdlgs/highred.cxx
+++ b/sc/source/ui/miscdlgs/highred.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: highred.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kz $ $Date: 2006-07-21 14:06:01 $
+ *  last change: $Author: vg $ $Date: 2007-02-27 13:31:26 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -87,18 +87,17 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind
 
     :	ScAnyRefDlg	( pB, pCW, pParent, RID_SCDLG_HIGHLIGHT_CHANGES ),
         //
-        aEdAssign		( this, ResId( ED_ASSIGN ) ),
-        aRbAssign		( this, ResId( RB_ASSIGN ), &aEdAssign ),
         aHighlightBox	( this, ResId( CB_HIGHLIGHT)),
         aFlFilter       ( this, ResId( FL_FILTER)),
+        aFilterCtr		( this),
         aCbAccept		( this, ResId( CB_HIGHLIGHT_ACCEPT)),
         aCbReject		( this, ResId( CB_HIGHLIGHT_REJECT)),
-
         aOkButton		( this, ResId( BTN_OK ) ),
         aCancelButton	( this, ResId( BTN_CANCEL ) ),
         aHelpButton		( this, ResId( BTN_HELP ) ),
+        aEdAssign		( this, ResId( ED_ASSIGN ) ),
+        aRbAssign		( this, ResId( RB_ASSIGN ), &aEdAssign ),
         //
-        aFilterCtr		( this),
         pViewData		( ptrViewData ),
         pDoc			( ptrViewData->GetDocument() ),
         aLocalRangeName ( *(pDoc->GetRangeName()) )
@@ -192,14 +191,14 @@ void __EXPORT ScHighlightChgDlg::Init()
 // Uebergabe eines mit der Maus selektierten Tabellenbereiches, der dann als
 // neue Selektion im Referenz-Edit angezeigt wird.
 
-void ScHighlightChgDlg::SetReference( const ScRange& rRef, ScDocument* pDoc )
+void ScHighlightChgDlg::SetReference( const ScRange& rRef, ScDocument* pDocP )
 {
     if ( aEdAssign.IsVisible() )
     {
         if ( rRef.aStart != rRef.aEnd )
             RefInputStart(&aEdAssign);
         String aRefStr;
-        rRef.Format( aRefStr, ABS_DREF3D, pDoc );
+        rRef.Format( aRefStr, ABS_DREF3D, pDocP );
         aEdAssign.SetRefString( aRefStr );
         aFilterCtr.SetRange(aRefStr);
     }
@@ -298,9 +297,9 @@ IMPL_LINK( ScHighlightChgDlg, OKBtnHdl, PushButton*, pOKBtn )
         aChangeViewSet.SetShowRejected(aCbReject.IsChecked());
         aChangeViewSet.SetHasComment(aFilterCtr.IsComment());
         aChangeViewSet.SetTheComment(aFilterCtr.GetComment());
-        ScRangeList aRangeList;
-        aRangeList.Parse(aFilterCtr.GetRange(), pDoc);
-        aChangeViewSet.SetTheRangeList(aRangeList);
+        ScRangeList aLocalRangeList;
+        aLocalRangeList.Parse(aFilterCtr.GetRange(), pDoc);
+        aChangeViewSet.SetTheRangeList(aLocalRangeList);
         aChangeViewSet.AdjustDateMode( *pDoc );
         pDoc->SetChangeViewSettings(aChangeViewSet);
         pViewData->GetDocShell()->PostPaintGridAll();
-- 
cgit v1.2.3