[Libreoffice-commits] core.git: cui/source svx/source

[Rishabh Kumar]

 cui/source/inc/cuitabarea.hxx     |    1 -
 cui/source/tabpages/tppattern.cxx |    2 --
 svx/source/dialog/dlgctrl.cxx     |    2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 527b88efbd9175e4fe376aa3617533f75ef99393
Author: Rishabh Kumar <kris.kr296 at gmail.com>
Date:   Sat Jul 2 19:20:12 2016 +0530

    tdf#100728: Crash when area dialog is opened
    
    Change-Id: I2246c5bf3a1d33e7a08fa9062e568a4c95fef571
    Reviewed-on: https://gerrit.libreoffice.org/26875
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    Reviewed-by: Rishabh Kumar <kris.kr296 at yahoo.in>

diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index f0eee65..e3b8c9e 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 3080d33..47dad34 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 9c75ffa..3eb447b 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;
 }