diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-12-09 22:17:44 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-12-10 00:35:48 +0100 |
| commit | 202f46bfdeca9110ee37a06c848c505a05739a8f (patch) | |
| tree | 7d764efbdc01dcc5006de0cc6c0933ae4cc3506a /cui | |
| parent | c7755e615918c1a0cb3245f75334ba08f69ac226 (diff) | |
tdf#114261 Retain toolbar:style after customization
Change-Id: I50170a2433f5e20809dd5bca8cb764039e8e0d84
Reviewed-on: https://gerrit.libreoffice.org/46169
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/SvxConfigPageHelper.cxx | 5 | ||||
| -rw-r--r-- | cui/source/inc/cfg.hxx | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cui/source/customize/SvxConfigPageHelper.cxx b/cui/source/customize/SvxConfigPageHelper.cxx index 0a182e13ec1b..18da75eb2c6e 100644 --- a/cui/source/customize/SvxConfigPageHelper.cxx +++ b/cui/source/customize/SvxConfigPageHelper.cxx @@ -412,7 +412,7 @@ css::uno::Sequence< css::beans::PropertyValue > SvxConfigPageHelper::ConvertSvxC css::uno::Sequence< css::beans::PropertyValue > SvxConfigPageHelper::ConvertToolbarEntry( const SvxConfigEntry* pEntry ) { - css::uno::Sequence< css::beans::PropertyValue > aPropSeq( 4 ); + css::uno::Sequence< css::beans::PropertyValue > aPropSeq( 5 ); aPropSeq[0].Name = ITEM_DESCRIPTOR_COMMANDURL; aPropSeq[0].Value <<= pEntry->GetCommand(); @@ -436,6 +436,9 @@ css::uno::Sequence< css::beans::PropertyValue > SvxConfigPageHelper::ConvertTool aPropSeq[3].Name = ITEM_DESCRIPTOR_ISVISIBLE; aPropSeq[3].Value <<= pEntry->IsVisible(); + aPropSeq[4].Name = ITEM_DESCRIPTOR_STYLE; + aPropSeq[4].Value <<= static_cast<sal_Int16>(pEntry->GetStyle()); + return aPropSeq; } diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 5e65de3a830a..b8bf3fcd7020 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -330,7 +330,7 @@ public: const css::uno::Reference< css::graphic::XGraphic >& GetBackupGraphic() { return xBackupGraphic; } - sal_Int32 GetStyle() { return nStyle; } + sal_Int32 GetStyle() const { return nStyle; } void SetStyle( sal_Int32 style ) { nStyle = style; } }; |