diff options
| author | Armin Le Grand <alg@apache.org> | 2013-04-11 13:11:46 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:12 +0100 |
| commit | 05038d1bd0a7bc9ecb6676ba1309576ac74f849f (patch) | |
| tree | cdb6b1d7aa01aed83a2222947e14dfc683a6fe86 /svx/source/sidebar/line/LinePropertyPanel.cxx | |
| parent | aa8c54950bc005b83a47fbe184291e84b0cbd09a (diff) | |
Related: #i121791# Corrected names for LineDashes, cleaned up resources
(cherry picked from commit f8f9cb1148f70f61f486517a1f353c4a3de8211f)
Conflicts:
svx/inc/svx/xtable.hxx
svx/source/sidebar/line/LinePropertyPanel.cxx
svx/source/sidebar/line/LinePropertyPanel.hrc
svx/source/sidebar/line/LinePropertyPanel.src
Change-Id: Ie49b28503e092c6685fb02c00820d4a3eaa3abb6
Diffstat (limited to 'svx/source/sidebar/line/LinePropertyPanel.cxx')
| -rw-r--r-- | svx/source/sidebar/line/LinePropertyPanel.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx index 74fdb7afbd83..8172091608ee 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.cxx +++ b/svx/source/sidebar/line/LinePropertyPanel.cxx @@ -742,7 +742,11 @@ IMPL_LINK_NOARG(LinePropertyPanel, ChangeLineStyleHdl) { // XLINE_DASH const XLineStyleItem aItemA(XLINE_DASH); - const XLineDashItem aItemB(mpLBStyle->GetSelectEntry(), mxLineStyleList->GetDash(nPos - 2)->GetDash()); + const XDashEntry* pDashEntry = mxLineStyleList->GetDash(nPos - 2); + OSL_ENSURE(pDashEntry, "OOps, got empty XDash from XDashList (!)"); + const XLineDashItem aItemB( + pDashEntry ? pDashEntry->GetName() : String(), + pDashEntry ? pDashEntry->GetDash() : XDash()); GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_STYLE, SFX_CALLMODE_RECORD, &aItemA, 0L); GetBindings()->GetDispatcher()->Execute(SID_ATTR_LINE_DASH, SFX_CALLMODE_RECORD, &aItemB, 0L); |