summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/tabpages/tplnedef.cxx16
1 files changed, 12 insertions, 4 deletions
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 563fa72493f4..44fe3f1a7394 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -141,6 +141,10 @@ SvxLineDefTabPage::SvxLineDefTabPage
aLbLineStyles.SetSelectHdl(
LINK( this, SvxLineDefTabPage, SelectLinestyleHdl_Impl ) );
+ // #i122042# switch off default adding of 'none' and 'solid' entries
+ // for this ListBox; we want to select only editable/dashed styles
+ aLbLineStyles.setAddStandardFields(false);
+
// absolute (in mm) or relative (in %)
aCbxSynchronize.SetClickHdl(
LINK( this, SvxLineDefTabPage, ChangeMetricHdl_Impl ) );
@@ -168,6 +172,7 @@ SvxLineDefTabPage::SvxLineDefTabPage
void SvxLineDefTabPage::Construct()
{
+ // Line style fill; do *not* add default fields here
aLbLineStyles.Fill( pDashList );
}
@@ -349,14 +354,17 @@ SfxTabPage* SvxLineDefTabPage::Create( Window* pWindow,
IMPL_LINK( SvxLineDefTabPage, SelectLinestyleHdl_Impl, void *, p )
{
- if( pDashList->Count() > 0 )
+ if(pDashList->Count())
{
int nTmp = aLbLineStyles.GetSelectEntryPos();
- if( nTmp == LISTBOX_ENTRY_NOTFOUND )
+
+ if(LISTBOX_ENTRY_NOTFOUND == nTmp)
{
+ OSL_ENSURE(false, "OOps, non-existent LineDash selected (!)");
+ nTmp = 1;
}
- else
- aDash = pDashList->GetDash( nTmp )->GetDash();
+
+ aDash = pDashList->GetDash( nTmp )->GetDash();
FillDialog_Impl();