From 199342bec3f517fca721fbfaf7386db01191ca94 Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@novell.com>
Date: Wed, 25 Aug 2010 23:26:50 +0200
Subject: ui-desktop-integration.diff: Disable UI [toolbars, menus]
 customization.

---
 svtools/inc/svtools/miscopt.hxx   |  2 ++
 svtools/source/config/miscopt.cxx | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 34 insertions(+), 2 deletions(-)

(limited to 'svtools')

diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx
index 042b52471a7a..ecee18fbe6b4 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/svtools/inc/svtools/miscopt.hxx
@@ -114,6 +114,8 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
         void        SetTryODMADialog( sal_Bool bSet );
         sal_Bool    IsTryUseODMADialogReadOnly() const;
 
+        sal_Bool    DisableUICustomization() const;
+
         sal_Bool    IsPluginsEnabled() const;
         void        SetPluginsEnabled( sal_Bool bEnable );
         sal_Bool    IsPluginsEnabledReadOnly() const;
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index ae0648e03e9b..e036225cb5f4 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -82,8 +82,10 @@ using namespace ::com::sun::star;
 #define PROPERTYHANDLE_TRYODMADIALOG    6
 #define PROPERTYNAME_SHOWLINKWARNINGDIALOG  ASCII_STR("ShowLinkWarningDialog")
 #define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
+#define PROPERTYNAME_DISABLEUICUSTOMIZATION ASCII_STR("DisableUICustomization")
+#define PROPERTYHANDLE_DISABLEUICUSTOMIZATION           8
 
-#define PROPERTYCOUNT                       8
+#define PROPERTYCOUNT                       9
 
 #define VCL_TOOLBOX_STYLE_FLAT              ((USHORT)0x0004) // from <vcl/toolbox.hxx>
 
@@ -116,6 +118,7 @@ class SvtMiscOptions_Impl : public ConfigItem
     sal_Bool    m_bIsUseSystemPrintDialogRO;
     sal_Bool    m_bShowLinkWarningDialog;
     sal_Bool    m_bIsShowLinkWarningDialogRO;
+    sal_Bool    m_bDisableUICustomization;
 
     //-------------------------------------------------------------------------------------------------------------
     //  public methods
@@ -193,6 +196,9 @@ class SvtMiscOptions_Impl : public ConfigItem
         inline sal_Bool IsTryUseODMADialogReadOnly() const
         { return m_bIsTryODMADialogRO; }
 
+        inline sal_Bool DisableUICustomization() const
+        { return m_bDisableUICustomization; }
+
         inline sal_Bool IsPluginsEnabled() const
         { return m_bPluginsEnabled; }
 
@@ -405,6 +411,13 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
                 m_bIsSymbolsStyleRO = seqRO[nProperty];
                 break;
             }
+
+            case PROPERTYHANDLE_DISABLEUICUSTOMIZATION :
+            {
+                if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
+                    DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" );
+                    break;
+            }
         }
     }
 
@@ -520,6 +533,11 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
                                                             }
                                                         }
                                                     break;
+            case PROPERTYHANDLE_DISABLEUICUSTOMIZATION      :   {
+                                                            if( !(seqValues[nProperty] >>= m_bDisableUICustomization) )
+                                                                DBG_ERROR("Wrong type of \"Misc\\DisableUICustomization\"!" );
+                                                        }
+                                                    break;
         }
     }
 }
@@ -683,6 +701,12 @@ void SvtMiscOptions_Impl::Commit()
                     seqValues[nProperty] <<= m_bShowLinkWarningDialog;
                 break;
             }
+
+            case PROPERTYHANDLE_DISABLEUICUSTOMIZATION :
+            {
+                seqValues[nProperty] <<= m_bDisableUICustomization;
+                break;
+            }
         }
     }
     // Set properties in configuration.
@@ -704,7 +728,8 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
         PROPERTYNAME_SYMBOLSTYLE,
         PROPERTYNAME_USESYSTEMPRINTDIALOG,
         PROPERTYNAME_TRYODMADIALOG,
-        PROPERTYNAME_SHOWLINKWARNINGDIALOG
+        PROPERTYNAME_SHOWLINKWARNINGDIALOG,
+        PROPERTYNAME_DISABLEUICUSTOMIZATION
     };
 
     // Initialize return sequence with these list ...
@@ -865,6 +890,11 @@ sal_Bool SvtMiscOptions::IsGetSymbolsStyleReadOnly() const
     return m_pDataContainer->IsGetSymbolsStyleReadOnly();
 }
 
+sal_Bool SvtMiscOptions::DisableUICustomization() const
+{
+    return m_pDataContainer->DisableUICustomization();
+}
+
 sal_Int16 SvtMiscOptions::GetToolboxStyle() const
 {
     return m_pDataContainer->GetToolboxStyle();
-- 
cgit