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

Noel Grandin noel at peralex.com
Tue Jun 21 07:55:21 UTC 2016


 svx/source/gallery2/galbrws2.cxx |   24 ------------------------
 1 file changed, 24 deletions(-)

New commits:
commit 6efa9c8e87bbc49ff558cf5e9017628cc4312f6e
Author: Noel Grandin <noel at peralex.com>
Date:   Mon Jun 20 12:48:00 2016 +0200

    GALLERY_USE_CLIPBOARD unused since 2001
    
    Change-Id: Idd21f60187e27fc100021ba07374357f502150e7
    Reviewed-on: https://gerrit.libreoffice.org/26508
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index d942ba6..63166c0 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -267,32 +267,8 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos
         maPopupMenu.EnableItem( MN_PASTECLIPBOARD );
     }
 
-#ifdef GALLERY_USE_CLIPBOARD
-    if( maPopupMenu.IsItemEnabled( MN_PASTECLIPBOARD ) )
-    {
-        TransferableDataHelper aDataHelper( TransferableDataHelper::CreateFromSystemClipboard( this ) );
-        sal_Bool               bEnable = sal_False;
-
-        if( aDataHelper.GetFormatCount() )
-        {
-            if( aDataHelper.HasFormat( SotClipboardFormatId::DRAWING ) ||
-                aDataHelper.HasFormat( SotClipboardFormatId::FILE_LIST ) ||
-                aDataHelper.HasFormat( SotClipboardFormatId::SIMPLE_FILE ) ||
-                aDataHelper.HasFormat( SotClipboardFormatId::SVXB ) ||
-                aDataHelper.HasFormat( SotClipboardFormatId::GDIMETAFILE ) ||
-                aDataHelper.HasFormat( SotClipboardFormatId::BITMAP ) )
-            {
-                bEnable = sal_True;
-            }
-        }
-
-        if( !bEnable )
-            maPopupMenu.EnableItem( MN_PASTECLIPBOARD, sal_False );
-    }
-#else
     maPopupMenu.EnableItem( MN_COPYCLIPBOARD, false );
     maPopupMenu.EnableItem( MN_PASTECLIPBOARD, false );
-#endif
 
     // update status
     css::uno::Reference< css::frame::XDispatchProvider> xDispatchProvider(


More information about the Libreoffice-commits mailing list