summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2007-02-27 12:00:23 +0000
committerVladimir Glazounov <vg@openoffice.org>2007-02-27 12:00:23 +0000
commitf75f0554432c7bdc652c8be3784ed00b9246aeb3 (patch)
tree26c6b9572f0fbfe32a4da39941e6646f848de67c /sc
parent029da364b5c337675b27db703e0c3e77bb99e434 (diff)
INTEGRATION: CWS calcwarnings (1.6.110); FILE MERGED
2006/12/12 17:03:07 nn 1.6.110.1: #i69284# warning-free: ui, unxlngi6
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/attrdlg/tabpages.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index cb45c2573a4a..b978fc105453 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: tabpages.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: kz $ $Date: 2006-07-21 13:15:52 $
+ * last change: $Author: vg $ $Date: 2007-02-27 13:00:23 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -69,8 +69,8 @@ ScTabPageProtection::ScTabPageProtection( Window* pParent,
rCoreAttrs ),
//
aFlProtect ( this, ScResId( FL_PROTECTION ) ),
- aBtnProtect ( this, ScResId( BTN_PROTECTED ) ),
aBtnHideCell ( this, ScResId( BTN_HIDE_ALL ) ),
+ aBtnProtect ( this, ScResId( BTN_PROTECTED ) ),
aBtnHideFormula ( this, ScResId( BTN_HIDE_FORMULAR ) ),
aTxtHint ( this, ScResId( FT_HINT ) ),
aFlPrint ( this, ScResId( FL_PRINT ) ),
@@ -192,10 +192,10 @@ BOOL __EXPORT ScTabPageProtection::FillItemSet( SfxItemSet& rCoreAttrs )
//------------------------------------------------------------------------
-int __EXPORT ScTabPageProtection::DeactivatePage( SfxItemSet* pSet )
+int __EXPORT ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP )
{
- if ( pSet )
- FillItemSet( *pSet );
+ if ( pSetP )
+ FillItemSet( *pSetP );
return LEAVE_PAGE;
}