diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2016-12-10 14:40:47 +0100 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2016-12-10 15:16:44 +0000 |
| commit | 38bf0e92e0f78e72345474013f695a2e660ee732 (patch) | |
| tree | 86c2ddb82dc8a71297e8b1a61690f0541db501a4 /chart2 | |
| parent | 1093721a260d25f986fd794acd914b8fb7bcf92a (diff) | |
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@libreoffice.org>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
(cherry picked from commit 1fce5b024e9f25c3fcef2537a22474ece0dc416f)
Reviewed-on: https://gerrit.libreoffice.org/31834
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'chart2')
5 files changed, 15 insertions, 0 deletions
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index d5ead3a404a5..e23c021b50f5 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 9ff91385bc97..a4af2d83ff33 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 d61d380d1992..f3e65a838e16 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 45e6b57eeef3..5c1852bc1236 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 826e02230f36..d0dd9234aa16 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() ) |