Kaydet (Commit) 6c745168 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl Kaydeden (comit) Michael Meeks

tdf#91495 add property to turn off stlye previews

Newly added property Office::Common::StylesAndFormatting::Preview
can now be used to turn off "Style And Formatting" style preview.

Change-Id: I2e01de2a74e2d295557c87022a7b745ce23b4800
(cherry picked from commit 210f42a3)
Reviewed-on: https://gerrit.libreoffice.org/17177Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
Tested-by: 's avatarMichael Meeks <michael.meeks@collabora.com>
üst 5b0c5881
...@@ -2162,7 +2162,7 @@ ...@@ -2162,7 +2162,7 @@
<!-- UIHints: Tools Options - General Save - [Section] Save --> <!-- UIHints: Tools Options - General Save - [Section] Save -->
<info> <info>
<desc>Specifies whether to generate a thumbnail image and place it inside the <desc>Specifies whether to generate a thumbnail image and place it inside the
the odf archive file, which makes it possible to see a preview of the document.</desc> the odf archive file, which makes it possible to see a preview of the document.</desc>
<label>Store a preview of this document</label> <label>Store a preview of this document</label>
</info> </info>
<value>true</value> <value>true</value>
...@@ -6626,5 +6626,16 @@ ...@@ -6626,5 +6626,16 @@
</prop> </prop>
</group> </group>
</group> </group>
<group oor:name="StylesAndFormatting">
<info>
<desc>Contains settings for Styles and Formatting.</desc>
</info>
<prop oor:name="Preview" oor:type="xs:boolean" oor:nillable="false">
<info>
<desc>Specifies if the styles and formatting preview is enabled.</desc>
</info>
<value>true</value>
</prop>
</group>
</component> </component>
</oor:component-schema> </oor:component-schema>
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/frame/theUICommandDescription.hpp> #include <com/sun/star/frame/theUICommandDescription.hpp>
#include <officecfg/Office/Common.hxx>
#include <sfx2/sfxhelp.hxx> #include <sfx2/sfxhelp.hxx>
#include <sfx2/app.hxx> #include <sfx2/app.hxx>
...@@ -526,8 +527,11 @@ StyleTreeListBox_Impl::StyleTreeListBox_Impl(SfxCommonTemplateDialog_Impl* pPare ...@@ -526,8 +527,11 @@ StyleTreeListBox_Impl::StyleTreeListBox_Impl(SfxCommonTemplateDialog_Impl* pPare
void StyleTreeListBox_Impl::Recalc() void StyleTreeListBox_Impl::Recalc()
{ {
SetEntryHeight(32 * GetDPIScaleFactor()); if (officecfg::Office::Common::StylesAndFormatting::Preview::get())
RecalcViewData(); {
SetEntryHeight(32 * GetDPIScaleFactor());
RecalcViewData();
}
} }
/** Internal structure for the establishment of the hierarchical view */ /** Internal structure for the establishment of the hierarchical view */
...@@ -638,9 +642,11 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox, ...@@ -638,9 +642,11 @@ SvTreeListEntry* FillBox_Impl(SvTreeListBox* pBox,
{ {
SvTreeListEntry* pTreeListEntry = pBox->InsertEntry(pEntry->getName(), pParent); SvTreeListEntry* pTreeListEntry = pBox->InsertEntry(pEntry->getName(), pParent);
StyleLBoxString* pStyleLBoxString = new StyleLBoxString(pTreeListEntry, 0, pEntry->getName(), eStyleFamily); if (officecfg::Office::Common::StylesAndFormatting::Preview::get())
{
pTreeListEntry->ReplaceItem(pStyleLBoxString, 1); StyleLBoxString* pStyleLBoxString = new StyleLBoxString(pTreeListEntry, 0, pEntry->getName(), eStyleFamily);
pTreeListEntry->ReplaceItem(pStyleLBoxString, 1);
}
pBox->GetModel()->InvalidateEntry(pTreeListEntry); pBox->GetModel()->InvalidateEntry(pTreeListEntry);
...@@ -1242,8 +1248,11 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) ...@@ -1242,8 +1248,11 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags)
for(nPos = 0; nPos < nCount; ++nPos) for(nPos = 0; nPos < nCount; ++nPos)
{ {
SvTreeListEntry* pTreeListEntry = aFmtLb->InsertEntry(aStrings[nPos], 0, false, nPos); SvTreeListEntry* pTreeListEntry = aFmtLb->InsertEntry(aStrings[nPos], 0, false, nPos);
StyleLBoxString* pStyleLBoxString = new StyleLBoxString(pTreeListEntry, 0, aStrings[nPos], eFam); if (officecfg::Office::Common::StylesAndFormatting::Preview::get())
pTreeListEntry->ReplaceItem(pStyleLBoxString, 1); {
StyleLBoxString* pStyleLBoxString = new StyleLBoxString(pTreeListEntry, 0, aStrings[nPos], eFam);
pTreeListEntry->ReplaceItem(pStyleLBoxString, 1);
}
aFmtLb->GetModel()->InvalidateEntry(pTreeListEntry); aFmtLb->GetModel()->InvalidateEntry(pTreeListEntry);
} }
aFmtLb->Recalc(); aFmtLb->Recalc();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment