diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:22:01 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-12 12:22:01 +0000 |
| commit | 45f94d7aef299b7485ce913781ad18f270ef5475 (patch) | |
| tree | 3639f4ccd5e1935427f4b10d70266f1710493877 /svx/source/tbxctrls/linectrl.cxx | |
| parent | d1fc3199603d272c808a0184ac01ac305d328964 (diff) | |
INTEGRATION: CWS sb59 (1.12.60); FILE MERGED
2006/08/28 12:58:09 sb 1.12.60.2: #i67487# Made code warning-free (wntmsci10).
2006/08/03 13:51:59 cl 1.12.60.1: removed compiler warnings
Diffstat (limited to 'svx/source/tbxctrls/linectrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 4059c8a24a5b..736f78ba7275 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -4,9 +4,9 @@ * * $RCSfile: linectrl.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2006-09-17 06:06:22 $ + * last change: $Author: obo $ $Date: 2006-10-12 13:22:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -447,10 +447,12 @@ void SvxLineEndWindow::implInit() if ( pDocSh ) { - if( pItem = pDocSh->GetItem( SID_LINEEND_LIST ) ) + pItem = pDocSh->GetItem( SID_LINEEND_LIST ); + if( pItem ) pLineEndList = ( (SvxLineEndListItem*) pItem )->GetLineEndList(); - if( pItem = pDocSh->GetItem( SID_ATTR_LINEEND_WIDTH_DEFAULT ) ) + pItem = pDocSh->GetItem( SID_ATTR_LINEEND_WIDTH_DEFAULT ); + if( pItem ) nLineEndWidth = ( (SfxUInt16Item*) pItem )->GetValue(); } DBG_ASSERT( pLineEndList, "LineEndList wurde nicht gefunden" ); @@ -679,7 +681,7 @@ BOOL SvxLineEndWindow::Close() // ----------------------------------------------------------------------- void SvxLineEndWindow::StateChanged( - USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) + USHORT nSID, SfxItemState, const SfxPoolItem* pState ) { if ( nSID == SID_LINEEND_LIST ) { @@ -791,7 +793,7 @@ SfxPopupWindow* SvxLineEndToolBoxControl::CreatePopupWindow() // ----------------------------------------------------------------------- -void SvxLineEndToolBoxControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +void SvxLineEndToolBoxControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* ) { USHORT nId = GetId(); ToolBox& rTbx = GetToolBox(); |