[Libreoffice-commits] core.git: chart2/source

[Julien Nabet]

 chart2/source/controller/dialogs/dlg_ObjectProperties.cxx         |    1 +
 chart2/source/controller/drawinglayer/ViewElementListProvider.cxx |    7 +++++++
 chart2/source/controller/inc/ViewElementListProvider.hxx          |    1 +
 chart2/source/inc/chartview/DrawModelWrapper.hxx                  |    1 +
 chart2/source/view/main/DrawModelWrapper.cxx                      |    5 +++++
 5 files changed, 15 insertions(+)

New commits:
commit 1fce5b024e9f25c3fcef2537a22474ece0dc416f
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sat Dec 10 14:40:47 2016 +0100

    tdf#104534: Retrieve list of patterns
    
    using same way as gradients, bitmap, etc.
    
    Change-Id: I49788d5af163aa6f06a12c87ee08e6599fc940c8
    Reviewed-on: https://gerrit.libreoffice.org/31833
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index d5ead3a..e23c021 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -522,6 +522,7 @@ void SchAttribTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
             aSet.Put(SvxGradientListItem(m_pViewElementListProvider->GetGradientList(),SID_GRADIENT_LIST));
             aSet.Put(SvxHatchListItem(m_pViewElementListProvider->GetHatchList(),SID_HATCH_LIST));
             aSet.Put(SvxBitmapListItem(m_pViewElementListProvider->GetBitmapList(),SID_BITMAP_LIST));
+            aSet.Put(SvxPatternListItem(m_pViewElementListProvider->GetPatternList(),SID_PATTERN_LIST));
             aSet.Put(SfxUInt16Item(SID_PAGE_TYPE,0));
             aSet.Put(SfxUInt16Item(SID_DLG_TYPE,nDlgType));
             rPage.PageCreated(aSet);
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index d68ea08..bebf04e 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -98,6 +98,13 @@ XBitmapListRef   ViewElementListProvider::GetBitmapList() const
     return XBitmapListRef();
 }
 
+XPatternListRef   ViewElementListProvider::GetPatternList() const
+{
+    if(m_pDrawModelWrapper)
+        return m_pDrawModelWrapper->GetPatternList();
+    return XPatternListRef();
+}
+
 //create chartspecific symbols for linecharts
 SdrObjList* ViewElementListProvider::GetSymbolList() const
 {
diff --git a/chart2/source/controller/inc/ViewElementListProvider.hxx b/chart2/source/controller/inc/ViewElementListProvider.hxx
index d61d380..f3e65a8 100644
--- a/chart2/source/controller/inc/ViewElementListProvider.hxx
+++ b/chart2/source/controller/inc/ViewElementListProvider.hxx
@@ -41,6 +41,7 @@ public:
     XGradientListRef  GetGradientList() const;
     XHatchListRef     GetHatchList() const;
     XBitmapListRef    GetBitmapList() const;
+    XPatternListRef   GetPatternList() const;
 
     //create chartspecific symbols for linecharts
     SdrObjList*     GetSymbolList() const;
diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 45e6b57..5c1852b 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -79,6 +79,7 @@ public:
     XGradientListRef  GetGradientList() const;
     XHatchListRef     GetHatchList() const;
     XBitmapListRef    GetBitmapList() const;
+    XPatternListRef   GetPatternList() const;
 
     SdrObject* getNamedSdrObject( const OUString& rName );
     static SdrObject* getNamedSdrObject( const OUString& rName, SdrObjList* pObjList );
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx
index 826e022..d0dd923 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -285,6 +285,11 @@ XBitmapListRef DrawModelWrapper::GetBitmapList() const
     return this->SdrModel::GetBitmapList();
 }
 
+XPatternListRef DrawModelWrapper::GetPatternList() const
+{
+    return this->SdrModel::GetPatternList();
+}
+
 SdrObject* DrawModelWrapper::getNamedSdrObject( const OUString& rName )
 {
     if( rName.isEmpty() )