summaryrefslogtreecommitdiff
path: root/sc/source/ui/optdlg
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-02-27 12:36:21 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-02-27 12:36:21 +0000
commit9ffb078273e3cee95eae70bb82d49125b5f6f626 (patch)
tree72413ff0c9eaa54e2e1867972632d06f4a525ad5 /sc/source/ui/optdlg
parentedcddc2a7bdc1a59f961ce7c3d177a1b36889180 (diff)
INTEGRATION: CWS calcwarnings (1.8.110); FILE MERGED
2006/12/12 17:03:20 nn 1.8.110.3: #i69284# warning-free: ui, unxlngi6 2006/12/01 15:51:27 nn 1.8.110.2: #i69284# warning-free: wntmsci10.pro changes 2006/12/01 08:53:37 nn 1.8.110.1: #i69284# warning-free: ui, wntmsci10
Diffstat (limited to 'sc/source/ui/optdlg')
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx21
1 files changed, 11 insertions, 10 deletions
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index b829bb9a77b3..3681f0680f0b 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: tpusrlst.cxx,v $
*
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
*
- * last change: $Author: kz $ $Date: 2006-07-21 14:17:49 $
+ * last change: $Author: vg $ $Date: 2007-02-27 13:36:21 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -91,12 +91,12 @@ ScTpUserLists::ScTpUserLists( Window* pParent,
: SfxTabPage ( pParent,
ScResId( RID_SCPAGE_USERLISTS ),
rCoreAttrs ),
- aLbLists ( this, ScResId( LB_LISTS ) ),
- aEdEntries ( this, ScResId( ED_ENTRIES ) ),
- aEdCopyFrom ( this, ScResId( ED_COPYFROM ) ),
aFtLists ( this, ScResId( FT_LISTS ) ),
+ aLbLists ( this, ScResId( LB_LISTS ) ),
aFtEntries ( this, ScResId( FT_ENTRIES ) ),
+ aEdEntries ( this, ScResId( ED_ENTRIES ) ),
aFtCopyFrom ( this, ScResId( FT_COPYFROM ) ),
+ aEdCopyFrom ( this, ScResId( ED_COPYFROM ) ),
aBtnNew ( this, ScResId( BTN_NEW ) ),
aBtnAdd ( this, ScResId( BTN_ADD ) ),
aBtnRemove ( this, ScResId( BTN_REMOVE ) ),
@@ -110,11 +110,11 @@ ScTpUserLists::ScTpUserLists( Window* pParent,
aStrCopyFrom ( ScResId( STR_COPYFROM ) ),
aStrCopyErr ( ScResId( STR_COPYERR ) ),
//
- pRangeUtil ( new ScRangeUtil ),
nWhichUserLists ( GetWhich( SID_SCUSERLISTS ) ),
pUserLists ( NULL ),
pDoc ( NULL ),
pViewData ( NULL ),
+ pRangeUtil ( new ScRangeUtil ),
bModifyMode ( FALSE ),
bCancelMode ( FALSE ),
bCopyDone ( FALSE ),
@@ -291,10 +291,10 @@ BOOL __EXPORT ScTpUserLists::FillItemSet( SfxItemSet& rCoreAttrs )
// -----------------------------------------------------------------------
-int __EXPORT ScTpUserLists::DeactivatePage( SfxItemSet* pSet )
+int __EXPORT ScTpUserLists::DeactivatePage( SfxItemSet* pSetP )
{
- if ( pSet )
- FillItemSet( *pSet );
+ if ( pSetP )
+ FillItemSet( *pSetP );
return LEAVE_PAGE;
}
@@ -361,7 +361,6 @@ void ScTpUserLists::MakeListStr( String& rListStr )
String aStr;
xub_StrLen nLen = aStr.Len();
- xub_StrLen nFound = 0;
xub_StrLen c = 0;
aInputStr.ConvertLineEnd( LINEEND_LF );
@@ -426,7 +425,9 @@ void ScTpUserLists::AddNewList( const String& rEntriesStr )
MakeListStr( theEntriesStr );
if ( !pUserLists->Insert( new ScUserListData( theEntriesStr ) ) )
+ {
DBG_ERROR( "Entry could not be inserted :-/" );
+ }
}
// -----------------------------------------------------------------------