summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls/itemwin.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 15:50:37 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-19 15:50:37 +0000
commit127bba3944dcfb16280900fdfb5d0a296ab37f33 (patch)
tree7bccadd665d2ca5a2aca47977ebd5d5ad055a173 /svx/source/tbxctrls/itemwin.cxx
parent3a7a7bfec7119d9dbc765d6e56ea98dc6943d8e7 (diff)
INTEGRATION: CWS warnings01 (1.16.222); FILE MERGED
2006/06/15 07:13:02 sb 1.16.222.4: #i53898# Reflected renamed Get/SetValue functions. 2006/05/23 18:48:14 sb 1.16.222.3: RESYNC: (1.16-1.17); FILE MERGED 2006/05/12 16:20:25 sb 1.16.222.2: #i53898# Made code warning-free and/or compile at all after resync to SRC680m162 (and in some cases reverted previous, problematic changes). 2006/04/20 14:50:03 cl 1.16.222.1: warning free code changes
Diffstat (limited to 'svx/source/tbxctrls/itemwin.cxx')
-rw-r--r--svx/source/tbxctrls/itemwin.cxx9
1 files changed, 4 insertions, 5 deletions
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index ccaa807ee341..9237f849ba68 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: itemwin.cxx,v $
*
- * $Revision: 1.17 $
+ * $Revision: 1.18 $
*
- * last change: $Author: rt $ $Date: 2006-05-02 15:35:28 $
+ * last change: $Author: hr $ $Date: 2006-06-19 16:50:37 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -51,7 +51,6 @@
#include <sfx2/module.hxx>
#endif
#include <tools/urlobj.hxx>
-#pragma hdrstop
#define _SVX_ITEMWIN_CXX
@@ -164,7 +163,7 @@ void SvxLineBox::Select()
SvxDashListItem aItem( *(const SvxDashListItem*)(
SfxObjectShell::Current()->GetItem( SID_DASH_LIST ) ) );
XLineDashItem aLineDashItem( GetSelectEntry(),
- aItem.GetDashList()->Get( nPos - 2 )->GetDash() );
+ aItem.GetDashList()->GetDash( nPos - 2 )->GetDash() );
Any a;
Sequence< PropertyValue > aArgs( 1 );
@@ -384,7 +383,7 @@ SvxColorBox::~SvxColorBox()
void SvxColorBox::Update( const XLineColorItem* pItem )
{
if ( pItem )
- SelectEntry( pItem->GetValue() );
+ SelectEntry( pItem->GetColorValue() );
else
SetNoSelection();
}