tdf#114261 Retain toolbar:style after customization

Change-Id: I50170a2433f5e20809dd5bca8cb764039e8e0d84
Reviewed-on: https://gerrit.libreoffice.org/46169Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>

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;
 }
 

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; }
 };