diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-16 09:14:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-16 09:14:46 +0000 |
| commit | 83c1ac662475840d35a843fa9b943092007c1dc9 (patch) | |
| tree | 912cbf7c23e018f36c4cd73db3aab364731400b2 /svtools/source/dialogs/property.cxx | |
| parent | 63aebd4dd2482fa86e1834af80de4e589941cdee (diff) | |
INTEGRATION: CWS ooo20040509 (1.2.124); FILE MERGED
2004/05/06 13:36:38 waratah 1.2.124.1: #i1858# reorder definitions to match header definitions
remove unused variable
Add fixme for code that needs some attention
Diffstat (limited to 'svtools/source/dialogs/property.cxx')
| -rw-r--r-- | svtools/source/dialogs/property.cxx | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/svtools/source/dialogs/property.cxx b/svtools/source/dialogs/property.cxx index b593cd1ee6df..8b2275418217 100644 --- a/svtools/source/dialogs/property.cxx +++ b/svtools/source/dialogs/property.cxx @@ -2,9 +2,9 @@ * * $RCSfile: property.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2004-02-04 11:20:09 $ + * last change: $Author: rt $ $Date: 2004-06-16 10:14:46 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -63,7 +63,9 @@ #include "ui_pch.hxx" #endif +#ifndef GCC #pragma hdrstop +#endif //------------------------------------------------------------------ @@ -477,8 +479,8 @@ IMPL_LINK( SvXPropertyComboBox, LoseFocusHdl, ComboBox*, pCB ) SvPropertyLine::SvPropertyLine( Window* pParent,WinBits nWinStyle) : Control(pParent,nWinStyle), aName(this,WB_BORDER), - aXButton(this,WB_BORDER), pSvXPropertyControl(NULL), + aXButton(this,WB_BORDER), bIsLocked(FALSE), bIsHyperlink(FALSE) { @@ -496,8 +498,8 @@ SvPropertyLine::SvPropertyLine( Window* pParent,WinBits nWinStyle) SvPropertyLine::SvPropertyLine( Window* pParent,const ResId& rResId ) : Control(pParent,rResId), aName (this,WB_BORDER), - aXButton (this,WB_BORDER), pSvXPropertyControl(NULL), + aXButton (this,WB_BORDER), bIsLocked(FALSE), bIsHyperlink(FALSE) { @@ -702,8 +704,8 @@ KeyCode SvXPropEvListener::GetKeyCode() const SvListBoxForProperties::SvListBoxForProperties( Window* pParent, WinBits nWinStyle) : Control(pParent,nWinStyle), - aVScroll(this,WB_VSCROLL|WB_REPEAT|WB_DRAG), aPlayGround(this,WB_DIALOGCONTROL), + aVScroll(this,WB_VSCROLL|WB_REPEAT|WB_DRAG), pPropDataControl(NULL) { @@ -730,8 +732,8 @@ SvListBoxForProperties::SvListBoxForProperties( Window* pParent, WinBits nWinSty SvListBoxForProperties::SvListBoxForProperties( Window* pParent, const ResId& rResId ) : Control(pParent,rResId), - aVScroll(this,WB_VSCROLL|WB_REPEAT|WB_DRAG), aPlayGround(this,0), + aVScroll(this,WB_VSCROLL|WB_REPEAT|WB_DRAG), pPropDataControl(NULL) { nTheNameSize=0; @@ -766,6 +768,8 @@ void SvListBoxForProperties::Clear() case KOC_COMBOBOX: case KOC_EDIT: delete pPropLine->GetSvXPropertyControl(); break; + default: + break; } delete pPropLine; } @@ -949,9 +953,6 @@ USHORT SvListBoxForProperties::InsertEntry( const SvPropertyData& aPropData, USH USHORT nInsPos=nPos; SvPropertyLine* pPropLine=new SvPropertyLine(&aPlayGround,WB_TABSTOP | WB_DIALOGCONTROL); - long nThumbPos=aVScroll.GetThumbPos(); - long nLines=aVScroll.GetPageSize(); - if(nPos==LISTBOX_APPEND) { nInsPos=PLineArray.Count(); @@ -980,6 +981,8 @@ void SvListBoxForProperties::ChangeEntry( const SvPropertyData& aPropData, USHOR case KOC_COMBOBOX: case KOC_EDIT: delete pPropLine->GetSvXPropertyControl(); break; + default: + break; } switch(aPropData.eKind) @@ -1155,9 +1158,10 @@ IMPL_LINK( SvListBoxForProperties, LoseFocusHdl,SvXPropEvListener*, pSvXPEvL) IMPL_LINK( SvListBoxForProperties, KeyInputHdl,SvXPropEvListener*, pSvXPEvL) { + // FIXME - This code does not make a lot of sense. if(pSvXPEvL!=NULL && pPropDataControl!=NULL) { - SvXPropertyControl* pSvXPCtr=aListener.GetPropertyControl(); + /*SvXPropertyControl* pSvXPCtr=*/aListener.GetPropertyControl(); } return 0; } |