[Libreoffice-commits] .: sfx2/source

[August Sodora]

 sfx2/source/view/viewfrm.cxx |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit 2561e3f7860e79817658e536b91192cedaa4aab7
Author: August Sodora <augsod at gmail.com>
Date:   Sat Dec 3 19:53:47 2011 -0500

    Revert "fdo#41865: Make macro recording work without experimental features"
    
    This reverts commit f4b3bd91ca177101d90f522e81163dc6421e14c9.

diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index a158f53..36b1e3e 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -3037,6 +3037,14 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
                 case SID_RECORDMACRO :
                 {
                     SvtMiscOptions aMiscOptions;
+                    const char* pName = GetObjectShell()->GetFactory().GetShortName();
+                    if ( !aMiscOptions.IsExperimentalMode() ||
+                         ( strcmp(pName,"swriter") && strcmp(pName,"scalc") ) )
+                    {
+                        rSet.DisableItem( nWhich );
+                        rSet.Put(SfxVisibilityItem(nWhich, sal_False));
+                        break;
+                    }
 
                     ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
                     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(
@@ -3055,6 +3063,13 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
                 case SID_STOP_RECORDING :
                 {
                     SvtMiscOptions aMiscOptions;
+                    const char* pName = GetObjectShell()->GetFactory().GetShortName();
+                    if ( !aMiscOptions.IsExperimentalMode() ||
+                         ( strcmp(pName,"swriter") && strcmp(pName,"scalc") ) )
+                    {
+                        rSet.DisableItem( nWhich );
+                        break;
+                    }
 
                     ::rtl::OUString sProperty(RTL_CONSTASCII_USTRINGPARAM("DispatchRecorderSupplier"));
                     com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet > xSet(