diff options
| author | Rishabh Kumar <kris.kr296@gmail.com> | 2016-07-02 19:20:12 +0530 |
|---|---|---|
| committer | Rishabh Kumar <kris.kr296@yahoo.in> | 2016-07-02 20:34:35 +0000 |
| commit | 527b88efbd9175e4fe376aa3617533f75ef99393 (patch) | |
| tree | 56079fce923bdde2ed6b87e3435e511c0646c58f | |
| parent | 6cac8409642e3b53dd21ccb833a0d0b85e005f85 (diff) | |
tdf#100728: Crash when area dialog is opened
Change-Id: I2246c5bf3a1d33e7a08fa9062e568a4c95fef571
Reviewed-on: https://gerrit.libreoffice.org/26875
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Rishabh Kumar <kris.kr296@yahoo.in>
| -rw-r--r-- | cui/source/inc/cuitabarea.hxx | 1 | ||||
| -rw-r--r-- | cui/source/tabpages/tppattern.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/dlgctrl.cxx | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index f0eee6553022..e3b8c9eaa7b6 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -563,7 +563,6 @@ private: VclPtr<SvxPixelCtl> m_pCtlPixel; VclPtr<ColorLB> m_pLbColor; VclPtr<ColorLB> m_pLbBackgroundColor; - VclPtr<FixedText> m_pLbPatternsHidden; VclPtr<PatternLB> m_pLbPatterns; VclPtr<SvxXRectPreview> m_pCtlPreview; VclPtr<PushButton> m_pBtnAdd; diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 3080d3340320..47dad34c4b2e 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -77,7 +77,6 @@ SvxPatternTabPage::SvxPatternTabPage( vcl::Window* pParent, const SfxItemSet& r get(m_pLbBackgroundColor,"LB_BACKGROUND_COLOR"); get(m_pCtlPreview,"CTL_PREVIEW"); get(m_pLbPatterns,"LB_PATTERN"); - get(m_pLbPatternsHidden,"FT_BITMAPS_HIDDEN"); get(m_pBtnAdd,"BTN_ADD"); get(m_pBtnModify,"BTN_MODIFY"); get(m_pBtnDelete,"BTN_DELETE"); @@ -129,7 +128,6 @@ void SvxPatternTabPage::dispose() m_pCtlPixel.clear(); m_pLbColor.clear(); m_pLbBackgroundColor.clear(); - m_pLbPatternsHidden.clear(); m_pLbPatterns.clear(); m_pCtlPreview.clear(); m_pBtnAdd.clear(); diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index 9c75ffafd0b6..3eb447bef5ca 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -1527,7 +1527,7 @@ VCL_BUILDER_DECL_FACTORY(PatternLB) OString sBorder = VclBuilder::extractCustomProperty(rMap); if (!sBorder.isEmpty()) nWinStyle |= WB_BORDER; - VclPtrInstance<BitmapLB> pListBox(pParent, nWinStyle); + VclPtrInstance<PatternLB> pListBox(pParent, nWinStyle); pListBox->EnableAutoSize(true); rRet = pListBox; } |