Bye bye ODMA

SUSE has no interest in it any longer, and I doubt anybody else has
either.

2 files changed, 0 insertions, 53 deletions

diff --git a/svtools/inc/svtools/miscopt.hxx b/svtools/inc/svtools/miscopt.hxx
index 9352d04f9d20..0d2ea73ea8d2 100644
--- a/svtools/inc/svtools/miscopt.hxx
+++ b/svtools/inc/svtools/miscopt.hxx
@@ -77,9 +77,6 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options
         void        SetUseSystemFileDialog( sal_Bool bSet );
         sal_Bool    IsUseSystemFileDialogReadOnly() const;
 
-        sal_Bool    TryODMADialog() const;
-        void        SetTryODMADialog( sal_Bool bSet );
-
         sal_Bool    DisableUICustomization() const;
 
         sal_Bool    IsPluginsEnabled() const;
diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx
index 53c1231d34a6..c3666d03c4a2 100644
--- a/svtools/source/config/miscopt.cxx
+++ b/svtools/source/config/miscopt.cxx
@@ -55,8 +55,6 @@ using namespace ::com::sun::star;
 #define PROPERTYHANDLE_SYMBOLSTYLE          4
 #define PROPERTYNAME_USESYSTEMPRINTDIALOG   ASCII_STR("UseSystemPrintDialog")
 #define PROPERTYHANDLE_USESYSTEMPRINTDIALOG 5
-#define PROPERTYNAME_TRYODMADIALOG          ASCII_STR("TryODMADialog")
-#define PROPERTYHANDLE_TRYODMADIALOG        6
 #define PROPERTYNAME_SHOWLINKWARNINGDIALOG  ASCII_STR("ShowLinkWarningDialog")
 #define PROPERTYHANDLE_SHOWLINKWARNINGDIALOG 7
 #define PROPERTYNAME_DISABLEUICUSTOMIZATION ASCII_STR("DisableUICustomization")
@@ -76,8 +74,6 @@ class SvtMiscOptions_Impl : public ConfigItem
     ::std::list<Link> aList;
     sal_Bool    m_bUseSystemFileDialog;
     sal_Bool    m_bIsUseSystemFileDialogRO;
-    sal_Bool    m_bTryODMADialog;
-    sal_Bool    m_bIsTryODMADialogRO;
     sal_Bool    m_bPluginsEnabled;
     sal_Bool    m_bIsPluginsEnabledRO;
     sal_Int16   m_nSymbolsSize;
@@ -149,15 +145,6 @@ class SvtMiscOptions_Impl : public ConfigItem
         inline sal_Bool IsUseSystemFileDialogReadOnly() const
         { return m_bIsUseSystemFileDialogRO; }
 
-        inline sal_Bool TryODMADialog() const
-        { return m_bTryODMADialog; }
-
-        inline void SetTryODMADialog( sal_Bool bSet )
-        {  m_bTryODMADialog = bSet; SetModified(); }
-
-        inline sal_Bool IsTryUseODMADialogReadOnly() const
-        { return m_bIsTryODMADialogRO; }
-
         inline sal_Bool DisableUICustomization() const
         { return m_bDisableUICustomization; }
 
@@ -272,8 +259,6 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
 
     , m_bUseSystemFileDialog( sal_False )
     , m_bIsUseSystemFileDialogRO( sal_False )
-    , m_bTryODMADialog( sal_False )
-    , m_bIsTryODMADialogRO( sal_False )
     , m_bPluginsEnabled( sal_False )
     , m_bIsPluginsEnabledRO( sal_False )
     , m_nSymbolsSize( 0 )
@@ -359,16 +344,6 @@ SvtMiscOptions_Impl::SvtMiscOptions_Impl()
                 break;
             }
 
-            case PROPERTYHANDLE_TRYODMADIALOG :
-            {
-                if( !(seqValues[nProperty] >>= m_bTryODMADialog) )
-                {
-                    OSL_FAIL("Wrong type of \"Misc\\TryODMADialog\"!" );
-                }
-                m_bIsTryODMADialogRO = seqRO[nProperty];
-                break;
-            }
-
             case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG :
             {
                 if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) )
@@ -500,13 +475,6 @@ void SvtMiscOptions_Impl::Load( const Sequence< OUString >& rPropertyNames )
                                                             }
                                                         }
                                                     break;
-            case PROPERTYHANDLE_TRYODMADIALOG       :   {
-                                                            if( !(seqValues[nProperty] >>= m_bTryODMADialog) )
-                                                            {
-                                                                OSL_FAIL("Wrong type of \"Misc\\TryODMADialog\"!" );
-                                                            }
-                                                        }
-                                                    break;
             case PROPERTYHANDLE_SHOWLINKWARNINGDIALOG     :   {
                                                             if( !(seqValues[nProperty] >>= m_bShowLinkWarningDialog) )
                                                             {
@@ -664,13 +632,6 @@ void SvtMiscOptions_Impl::Commit()
                 break;
             }
 
-            case PROPERTYHANDLE_TRYODMADIALOG :
-            {
-                if ( !m_bIsTryODMADialogRO )
-                    seqValues[nProperty] <<= m_bTryODMADialog;
-                break;
-            }
-
             case PROPERTYHANDLE_SYMBOLSTYLE :
             {
                 if ( !m_bIsSymbolsStyleRO )
@@ -732,7 +693,6 @@ Sequence< OUString > SvtMiscOptions_Impl::GetPropertyNames()
         PROPERTYNAME_USESYSTEMFILEDIALOG,
         PROPERTYNAME_SYMBOLSTYLE,
         PROPERTYNAME_USESYSTEMPRINTDIALOG,
-        PROPERTYNAME_TRYODMADIALOG,
         PROPERTYNAME_SHOWLINKWARNINGDIALOG,
         PROPERTYNAME_DISABLEUICUSTOMIZATION,
         PROPERTYNAME_ALWAYSALLOWSAVE,
@@ -805,16 +765,6 @@ sal_Bool SvtMiscOptions::IsUseSystemFileDialogReadOnly() const
     return m_pDataContainer->IsUseSystemFileDialogReadOnly();
 }
 
-sal_Bool SvtMiscOptions::TryODMADialog() const
-{
-    return m_pDataContainer->TryODMADialog();
-}
-
-void SvtMiscOptions::SetTryODMADialog( sal_Bool bEnable )
-{
-    m_pDataContainer->SetTryODMADialog( bEnable );
-}
-
 sal_Bool SvtMiscOptions::IsPluginsEnabled() const
 {
     return m_pDataContainer->IsPluginsEnabled();