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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Apr 27 07:43:10 UTC 2020


 sfx2/source/dialog/templdlg.cxx |   29 -----------------------------
 1 file changed, 29 deletions(-)

New commits:
commit 32b8f5be41cf9294f995a27d83ae2b1e9e792869
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Apr 26 21:34:23 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Apr 27 09:42:33 2020 +0200

    STYLESPREVIEW is never defined
    
    added by...
    
    commit dda842bec338efb06457551136678340d0718807
    Date:   Thu Aug 29 17:22:48 2013 +0100
    
    Change-Id: I8fc15a0d7c18df69e772366ac81980f6acef52a2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92952
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index d793608eee53..2f2e1541eca0 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -891,11 +891,6 @@ void SfxCommonTemplateDialog_Impl::Initialize()
 
 SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
 {
-#if defined STYLESPREVIEW
-    Execute_Impl(SID_STYLE_END_PREVIEW,
-        OUString(), OUString(),
-        0, 0, 0, 0 );
-#endif
     if ( bIsWater )
         Execute_Impl(SID_STYLE_WATERCAN, "", "", 0);
     GetWindow()->Hide();
@@ -1308,13 +1303,6 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(StyleFlags nFlags)
     OUString aStyle;
     if(pState)
         aStyle = pState->GetStyleName();
-#if defined STYLESPREVIEW
-    mbIgnoreSelect = true; // in case we get a selection change
-    // in any case we should stop any preview
-    Execute_Impl(SID_STYLE_END_PREVIEW,
-    OUString(), OUString(),
-    0, 0, 0, 0 );
-#endif
     SelectStyle(aStyle);
     EnableDelete();
 }
@@ -2145,23 +2133,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox
         return;
 
     SelectStyle( pListBox->GetEntryText( pListBox->GetHdlEntry() ));
-#if defined STYLESPREVIEW
-    sal_uInt16 nModifier = aFmtLb->GetModifier();
-    if ( mbIgnoreSelect )
-    {
-        Execute_Impl(SID_STYLE_END_PREVIEW,
-        OUString(), OUString(),
-        0, 0, 0, 0 );
-        mbIgnoreSelect = false;
-    }
-    else
-    {
-        Execute_Impl(SID_STYLE_PREVIEW,
-                 GetSelectedEntry(), OUString(),
-                 ( sal_uInt16 )GetFamilyItem_Impl()->GetFamily(),
-                 0, 0, &nModifier );
-    }
-#endif
 }
 
 IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu, bool )


More information about the Libreoffice-commits mailing list