Date: prev next · Thread: first prev next last
2013 Archives by date, by thread · List index


Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3180

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/80/3180/1

Remove SvtInternalOptions

* only Get/SetCurrentTempURL were used, but only for compatibility reasons,
to remove old temporary directories (before 2001). Those should be gone
today.
* MailUIEnabled was false in the xcu file.
* SID_MAIL_SENDDOC* are handled some lines further.

Change-Id: I482719b0de9df0a77c2fef0bf25ae1fb68926375
---
M dbaccess/inc/pch/precompiled_dbu.hxx
M dbaccess/source/ui/app/AppController.cxx
M desktop/source/app/app.cxx
M desktop/source/app/appinit.cxx
M framework/source/services/sessionlistener.cxx
M officecfg/registry/schema/org/openoffice/Office/Common.xcs
M sfx2/inc/sfx2/sfxsids.hrc
M sfx2/sdi/frmslots.sdi
M sfx2/sdi/sfx.sdi
M sfx2/source/appl/app.cxx
M sfx2/source/appl/appmisc.cxx
M sfx2/source/view/viewsh.cxx
M unotools/Library_utl.mk
M unotools/Package_inc.mk
D unotools/inc/unotools/internaloptions.hxx
M unotools/inc/unotools/itemholderbase.hxx
D unotools/source/config/internaloptions.cxx
M unotools/source/config/itemholder1.cxx
18 files changed, 2 insertions(+), 610 deletions(-)



diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx
index 4983860..7c082ad 100644
--- a/dbaccess/inc/pch/precompiled_dbu.hxx
+++ b/dbaccess/inc/pch/precompiled_dbu.hxx
@@ -449,7 +449,6 @@
 #include <unotools/configmgr.hxx>
 #include <unotools/confignode.hxx>
 #include <unotools/historyoptions.hxx>
-#include <unotools/internaloptions.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 0c9ca0e..53b6555 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -89,7 +89,6 @@
 #include <unotools/closeveto.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/tempfile.hxx>
-#include <unotools/internaloptions.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/historyoptions.hxx>
 
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 3eb4ab1..2ae404e 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -83,7 +83,6 @@
 #include <osl/process.h>
 #include <rtl/uri.hxx>
 #include <unotools/pathoptions.hxx>
-#include <unotools/internaloptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/menuoptions.hxx>
 #include <svl/folderrestriction.hxx>
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index d16cdcc..c8d78cb 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -54,7 +54,6 @@
 #include <unotools/tempfile.hxx>
 #include <vcl/svapp.hxx>
 #include <unotools/pathoptions.hxx>
-#include <unotools/internaloptions.hxx>
 
 
 using namespace desktop;
@@ -277,20 +276,10 @@
         throw;
     }
 
-    // remove possible old directory and base directory
-    SvtInternalOptions  aInternalOpt;
-
     // set temp base directory
     sal_Int32 nLength = aTempBaseURL.getLength();
     if ( aTempBaseURL.matchAsciiL( "/", 1, nLength-1 ) )
         aTempBaseURL = aTempBaseURL.copy( 0, nLength - 1 );
-
-    String aOldTempURL = aInternalOpt.GetCurrentTempURL();
-    if ( aOldTempURL.Len() > 0 )
-    {
-        // remove old temporary directory
-        ::utl::UCBContentHelper::Kill( aOldTempURL );
-    }
 
     ::rtl::OUString aRet;
     ::rtl::OUString aTempPath( aTempBaseURL );
@@ -314,7 +303,6 @@
 
     // set new current temporary directory
     ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTempPath, aRet );
-    aInternalOpt.SetCurrentTempURL( aRet );
     CurrentTempURL::get() = aRet;
 }
 
@@ -326,8 +314,7 @@
     String &rCurrentTempURL = CurrentTempURL::get();
     if ( rCurrentTempURL.Len() > 0 )
     {
-        if ( ::utl::UCBContentHelper::Kill( rCurrentTempURL ) )
-            SvtInternalOptions().SetCurrentTempURL( String() );
+        ::utl::UCBContentHelper::Kill( rCurrentTempURL );
     }
 }
 
diff --git a/framework/source/services/sessionlistener.cxx 
b/framework/source/services/sessionlistener.cxx
index 1a88f56..df93834 100644
--- a/framework/source/services/sessionlistener.cxx
+++ b/framework/source/services/sessionlistener.cxx
@@ -50,7 +50,6 @@
 #include <osl/time.h>
 #include <comphelper/processfactory.hxx>
 #include <unotools/pathoptions.hxx>
-#include <unotools/internaloptions.hxx>
 #include <stdio.h>
 
 #include <com/sun/star/uno/Any.hxx>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index c997371..66e353c 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2299,32 +2299,6 @@
         <desc>Contains settings which are used during the Office startup to
         check for unfinished work.</desc>
       </info>
-      <prop oor:name="SendCrashMail" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldPath: Common/SendCrashMail -->
-        <!-- OldLocation: soffice.ini -->
-        <info>
-          <deprecated/>
-          <desc>Sends a mail that includes the stack trace after a crash.</desc>
-        </info>
-        <value>false</value>
-      </prop>
-      <prop oor:name="UseMailUI" oor:type="xs:boolean" oor:nillable="false">
-        <info>
-          <deprecated/>
-          <desc>Enables UI for sending document as e-mail</desc>
-        </info>
-        <value>false</value>
-      </prop>
-      <prop oor:name="Slot" oor:type="xs:boolean" oor:nillable="false">
-        <!-- OldPath: Common/Slots -->
-        <!-- OldLocation: soffice.ini -->
-        <info>
-          <deprecated/>
-          <desc>Enables mechanism for centralized disabling of
-          functionality</desc>
-        </info>
-        <value>false</value>
-      </prop>
       <prop
           oor:name="DevelopmentChart" oor:type="xs:boolean"
           oor:nillable="false">
@@ -2336,15 +2310,6 @@
           will be removed when the new library is in a stable state.</desc>
         </info>
         <value>false</value>
-      </prop>
-      <prop oor:name="CurrentTempURL" oor:type="xs:string" oor:nillable="false">
-        <info>
-          <desc>Specifies the current or last temp directory. This directory
-          will be removed during shutdown or next office start.</desc>
-        </info>
-        <value/>
-        <!-- JB: Empty default inserted into empty property node. Remove if NIL
-             was intended -->
       </prop>
       <set oor:name="RecoveryList" oor:node-type="RecoveryEntry">
         <info>
diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc
index 51bfd36..12198b6 100644
--- a/sfx2/inc/sfx2/sfxsids.hrc
+++ b/sfx2/inc/sfx2/sfxsids.hrc
@@ -213,7 +213,6 @@
 #define SID_PARTWIN                         (SID_SFX_START + 1640)
 #define SID_CRASH                           (SID_SFX_START + 1645)
 #define SID_FAIL_ON_WARNING                 (SID_SFX_START + 1646)
-#define SID_MAIL_CHILDWIN                   (SID_SFX_START + 1647)
 #define SID_INPUTSTREAM                     (SID_SFX_START + 1648)
 #define SID_LOGOUT                          (SID_SFX_START + 1652)
 #define SID_JUMPMARK                        (SID_SFX_START + 1654)
diff --git a/sfx2/sdi/frmslots.sdi b/sfx2/sdi/frmslots.sdi
index b0aa373..3a37a11 100644
--- a/sfx2/sdi/frmslots.sdi
+++ b/sfx2/sdi/frmslots.sdi
@@ -61,11 +61,6 @@
         ExecMethod = ChildWindowExecute ;
         StateMethod = ChildWindowState ;
     ]
-    SID_MAIL_CHILDWIN // ole(no) api()
-    [
-        ExecMethod = ChildWindowExecute ;
-        StateMethod = ChildWindowState ;
-    ]
     SID_TIPWINDOW
     [
         ExecMethod = ChildWindowExecute ;
diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi
index 0ffc66c..0fe9cdc 100644
--- a/sfx2/sdi/sfx.sdi
+++ b/sfx2/sdi/sfx.sdi
@@ -3850,33 +3850,6 @@
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem MailWindow SID_MAIL_CHILDWIN
-
-[
-    /* flags: */
-    AutoUpdate = TRUE,
-    Cachable = Cachable,
-    FastCall = FALSE,
-    HasCoreId = FALSE,
-    HasDialog = FALSE,
-    ReadOnlyDoc = TRUE,
-    Toggle = FALSE,
-    Container = TRUE,
-    RecordAbsolute = FALSE,
-    RecordPerSet;
-    Synchron;
-
-    Readonly = FALSE,
-
-    /* config: */
-    AccelConfig = FALSE,
-    MenuConfig = FALSE,
-    StatusBarConfig = FALSE,
-    ToolBoxConfig = FALSE,
-    GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
 SfxVoidItem MatchGroup SID_BASICIDE_MATCHGROUP
 ()
 [
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 49ee2b1..479f9d4 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -113,7 +113,6 @@
 #include <unotools/securityoptions.hxx>
 #include <unotools/localisationoptions.hxx>
 #include <unotools/fontoptions.hxx>
-#include <unotools/internaloptions.hxx>
 #include <unotools/workingsetoptions.hxx>
 #include <unotools/syslocaleoptions.hxx>
 #include <unotools/syslocale.hxx>
diff --git a/sfx2/source/appl/appmisc.cxx b/sfx2/source/appl/appmisc.cxx
index 2cd1336..8008e90 100644
--- a/sfx2/source/appl/appmisc.cxx
+++ b/sfx2/source/appl/appmisc.cxx
@@ -25,7 +25,6 @@
 #include <svl/intitem.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/graphicfilter.hxx>
-#include <unotools/internaloptions.hxx>
 #include <unotools/pathoptions.hxx>
 #include <com/sun/star/registry/InvalidRegistryException.hpp>
 #include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx
index 4760de1..d5c778e 100644
--- a/sfx2/source/view/viewsh.cxx
+++ b/sfx2/source/view/viewsh.cxx
@@ -43,7 +43,6 @@
 #include <unotools/pathoptions.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/soerr.hxx>
-#include <unotools/internaloptions.hxx>
 
 #include <basic/basmgr.hxx>
 #include <basic/sbuno.hxx>
@@ -296,7 +295,6 @@
 //=========================================================================
 SFX_IMPL_INTERFACE(SfxViewShell,SfxShell,SfxResId(0))
 {
-    SFX_CHILDWINDOW_REGISTRATION( SID_MAIL_CHILDWIN );
 }
 
 TYPEINIT2(SfxViewShell,SfxShell,SfxListener);
@@ -518,11 +516,7 @@
                              WhenSaving, &GetViewFrame()->GetWindow() ) != RET_YES )
                 break;
 
-            if ( SvtInternalOptions().MailUIEnabled() )
-            {
-                GetViewFrame()->SetChildWindow( SID_MAIL_CHILDWIN, sal_True );
-            }
-            else
+
             {
                 SfxMailModel  aModel;
                 rtl::OUString aDocType;
@@ -834,17 +828,6 @@
                     }
                     bEnabled = !pPrinter || !pPrinter->IsPrinting();
                 }
-                break;
-            }
-
-            // Mail functions
-            case SID_MAIL_SENDDOCASPDF:
-            case SID_MAIL_SENDDOC:
-            case SID_MAIL_SENDDOCASFORMAT:
-            {
-                sal_Bool bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN );
-                if ( !bEnable )
-                    rSet.DisableItem( nSID );
                 break;
             }
 
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index c24c28a..d99c18b 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -89,7 +89,6 @@
     unotools/source/config/fontcfg \
     unotools/source/config/fontoptions \
     unotools/source/config/historyoptions \
-    unotools/source/config/internaloptions \
     unotools/source/config/itemholder1 \
     unotools/source/config/lingucfg \
     unotools/source/config/localisationoptions \
diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk
index cac003a..92ec12e 100644
--- a/unotools/Package_inc.mk
+++ b/unotools/Package_inc.mk
@@ -61,7 +61,6 @@
 $(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/fontoptions.hxx,unotools/fontoptions.hxx))
 $(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/historyoptions.hxx,unotools/historyoptions.hxx))
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/idhelper.hxx,unotools/idhelper.hxx))
-$(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/internaloptions.hxx,unotools/internaloptions.hxx))
 $(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/intlwrapper.hxx,unotools/intlwrapper.hxx))
 $(eval $(call 
gb_Package_add_file,unotools_inc,inc/unotools/itemholderbase.hxx,unotools/itemholderbase.hxx))
 $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/lingucfg.hxx,unotools/lingucfg.hxx))
diff --git a/unotools/inc/unotools/internaloptions.hxx b/unotools/inc/unotools/internaloptions.hxx
deleted file mode 100644
index 89fe29f..0000000
--- a/unotools/inc/unotools/internaloptions.hxx
+++ /dev/null
@@ -1,132 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef INCLUDED_unotools_INTERNALOPTIONS_HXX
-#define INCLUDED_unotools_INTERNALOPTIONS_HXX
-
-#include "unotools/unotoolsdllapi.h"
-#include <sal/types.h>
-#include <osl/mutex.hxx>
-#include <rtl/ustring.hxx>
-#include <unotools/options.hxx>
-
-#define MUTEX           ::osl::Mutex
-
-/*-************************************************************************************************************//**
-    @short          forward declaration to our private date container implementation
-    @descr          We use these class as internal member to support small memory requirements.
-                    You can create the container if it is neccessary. The class which use these 
mechanism
-                    is faster and smaller then a complete implementation!
-*//*-*************************************************************************************************************/
-
-class SvtInternalOptions_Impl;
-
-/*-************************************************************************************************************//**
-    @short          collect information about internal features
-    @descr          -
-
-    @implements     -
-    @base           -
-
-    @ATTENTION      This class is partially threadsafe.
-
-    @devstatus      ready to use
-*//*-*************************************************************************************************************/
-
-class UNOTOOLS_DLLPUBLIC SAL_WARN_UNUSED SvtInternalOptions : public utl::detail::Options
-{
-    public:
-
-        
/*-****************************************************************************************************//**
-            @short      standard constructor and destructor
-            @descr      This will initialize an instance with default values.
-                        We implement these class with a refcount mechanism! Every instance of this 
class increase it
-                        at create and decrease it at delete time - but all instances use the same 
data container!
-                        He is implemented as a static member ...
-
-            @seealso    member m_nRefCount
-            @seealso    member m_pDataContainer
-
-            @param      -
-            @return     -
-
-            @onerror    -
-        
*//*-*****************************************************************************************************/
-
-         SvtInternalOptions();
-        virtual ~SvtInternalOptions();
-
-        
/*-****************************************************************************************************//**
-            @short      interface methods to get and set value of config key 
"org.openoffice.Office.Common/Internal/..."
-            @descr      These options describe internal states to enable/disable features of 
installed office.
-                        The values are fixed at runtime - and implemented as readonly!
-
-                        SlotCFGEnabled()    =>  If this option is set (true), StarOffice is 
searching for the slot.cfg.
-                                                If the slot.cfg cannot be found, the start is 
aborted.
-                                                If this option is not set (false), the slot.cfg 
must not be available,
-                                                otherwise the start is also aborted.
-
-                        CrashMailEnabled()  =>  Crash-Mail-Feature to document program crashes. 
After a crash,
-                                                an e-mail with information about the system used 
is generated
-                                                automatically when starting StarOffice.
-
-            @seealso    configuration package "org.openoffice.Office.Common/Internal"
-        
*//*-*****************************************************************************************************/
-
-        sal_Bool    SlotCFGEnabled      () const;
-        sal_Bool    MailUIEnabled      () const;
-
-        ::rtl::OUString GetCurrentTempURL() const;
-        void            SetCurrentTempURL( const ::rtl::OUString& aNewCurrentTempURL );
-
-    private:
-
-        
/*-****************************************************************************************************//**
-            @short      return a reference to a static mutex
-            @descr      These class is partially threadsafe (for de-/initialization only).
-                        All access methods are'nt safe!
-                        We create a static mutex only for one ime and use at different times.
-
-            @seealso    -
-
-            @param      -
-            @return     A reference to a static mutex member.
-
-            @onerror    -
-        
*//*-*****************************************************************************************************/
-
-        UNOTOOLS_DLLPRIVATE static MUTEX& GetOwnStaticMutex();
-
-    private:
-
-        /*Attention
-
-            Don't initialize these static member in these header!
-            a) Double dfined symbols will be detected ...
-            b) and unresolved externals exist at linking time.
-            Do it in your source only.
-         */
-
-        static SvtInternalOptions_Impl* m_pDataContainer    ;   /// impl. data container as 
dynamic pointer for smaller memory requirements!
-        static sal_Int32                m_nRefCount         ;   /// internal ref count mechanism
-
-};      // class SvtInternalOptions
-
-#endif  // #ifndef INCLUDED_unotools_INTERNALOPTIONS_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/inc/unotools/itemholderbase.hxx b/unotools/inc/unotools/itemholderbase.hxx
index dab45e6..2efc282 100644
--- a/unotools/inc/unotools/itemholderbase.hxx
+++ b/unotools/inc/unotools/itemholderbase.hxx
@@ -57,8 +57,6 @@
     E_HELPOPTIONS                   ,   // 2
     E_HISTORYOPTIONS                ,   //
 
-    E_INTERNALOPTIONS               ,   //
-
     E_JAVAOPTIONS                   ,   //
 
     E_LANGUAGEOPTIONS               ,   // 2
diff --git a/unotools/source/config/internaloptions.cxx b/unotools/source/config/internaloptions.cxx
deleted file mode 100644
index faa8252..0000000
--- a/unotools/source/config/internaloptions.cxx
+++ /dev/null
@@ -1,363 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <deque>
-
-#include <unotools/internaloptions.hxx>
-#include <unotools/configmgr.hxx>
-#include <unotools/configitem.hxx>
-#include <tools/debug.hxx>
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-
-#include <rtl/logfile.hxx>
-#include "itemholder1.hxx"
-
-//_________________________________________________________________________________________________________________
-//  namespaces
-//_________________________________________________________________________________________________________________
-
-using namespace ::utl                   ;
-using namespace ::rtl                   ;
-using namespace ::osl                   ;
-using namespace ::std                   ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::beans ;
-
-#define ROOTNODE_INTERNAL                   OUString("Office.Common/Internal")
-#define DEFAULT_SLOTCFG                     sal_False
-#define DEFAULT_SENDCRASHMAIL               sal_False
-#define DEFAULT_USEMAILUI                   sal_True
-#define DEFAULT_CURRENTTEMPURL              OUString("")
-
-#define FIXPROPERTYNAME_SLOTCFG             OUString("Slot")
-#define FIXPROPERTYNAME_SENDCRASHMAIL       OUString("SendCrashMail")
-#define FIXPROPERTYNAME_USEMAILUI           OUString("UseMailUI")
-#define FIXPROPERTYNAME_CURRENTTEMPURL      OUString("CurrentTempURL")
-
-#define FIXPROPERTYHANDLE_SLOTCFG           0
-#define FIXPROPERTYHANDLE_SENDCRASHMAIL     1
-#define FIXPROPERTYHANDLE_USEMAILUI         2
-#define FIXPROPERTYHANDLE_CURRENTTEMPURL    3
-
-class SvtInternalOptions_Impl : public ConfigItem
-{
-    
//-------------------------------------------------------------------------------------------------------------
-    //  private member
-    
//-------------------------------------------------------------------------------------------------------------
-
-    private:
-
-        sal_Bool                m_bRemoveMenuEntryClose;
-        sal_Bool                m_bRemoveMenuEntryBackToWebtop;
-        sal_Bool                m_bRemoveMenuEntryNewWebtop;
-        sal_Bool                m_bRemoveMenuEntryLogout;
-        sal_Bool                m_bSlotCFG          ;   /// cache "Slot" of Internal section
-        sal_Bool                m_bSendCrashMail    ;   /// cache "SendCrashMail" of Internal 
section
-        sal_Bool                m_bUseMailUI;
-        OUString                m_aCurrentTempURL   ;
-    
//-------------------------------------------------------------------------------------------------------------
-    //  public methods
-    
//-------------------------------------------------------------------------------------------------------------
-
-    public:
-
-        
//---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
-        
//---------------------------------------------------------------------------------------------------------
-
-         SvtInternalOptions_Impl();
-        ~SvtInternalOptions_Impl();
-
-        
//---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
-        
//---------------------------------------------------------------------------------------------------------
-
-        
/*-****************************************************************************************************//**
-            @short      called for notify of configmanager
-            @descr      These method is called from the ConfigManager before application ends or 
from the
-                         PropertyChangeListener if the sub tree broadcasts changes. You must 
update your
-                        internal values.
-
-            @seealso    baseclass ConfigItem
-
-            @param      "seqPropertyNames" is the list of properties which should be updated.
-            @return     -
-
-            @onerror    -
-        
*//*-*****************************************************************************************************/
-
-        virtual void Notify( const Sequence< OUString >& )
-        {
-            DBG_ASSERT( sal_False, "SvtInternalOptions::Notify()\nNot used yet ... but called!?\n" 
);
-        }
-
-        
/*-****************************************************************************************************//**
-            @short      write changes to configuration
-            @descr      These method writes the changed values into the sub tree
-                        and should always called in our destructor to guarantee consistency of 
config data.
-
-            @seealso    baseclass ConfigItem
-
-            @param      -
-            @return     -
-
-            @onerror    -
-        
*//*-*****************************************************************************************************/
-
-        virtual void Commit();
-
-        
//---------------------------------------------------------------------------------------------------------
-        //  public interface
-        
//---------------------------------------------------------------------------------------------------------
-
-        
/*-****************************************************************************************************//**
-            @short      access method to get internal values
-            @descr      These method give us a chance to regulate acces to ouer internal values.
-                        It's not used in the moment - but it's possible for the feature!
-
-            @seealso    -
-
-            @param      -
-            @return     -
-
-            @onerror    -
-        
*//*-*****************************************************************************************************/
-
-        sal_Bool    IsRemoveMenuEntryClose() const { return m_bRemoveMenuEntryClose; }
-        sal_Bool    IsRemoveMenuEntryBackToWebtop() const { return m_bRemoveMenuEntryBackToWebtop; 
}
-        sal_Bool    IsRemoveMenuEntryNewWebtop() const { return m_bRemoveMenuEntryNewWebtop; }
-        sal_Bool    IsRemoveMenuEntryLogout() const { return m_bRemoveMenuEntryLogout; }
-        sal_Bool    SlotCFGEnabled      () const { return m_bSlotCFG; }
-        sal_Bool    CrashMailEnabled    () const { return m_bSendCrashMail; }
-        sal_Bool    MailUIEnabled       () const { return m_bUseMailUI; }
-
-        OUString    GetCurrentTempURL() const { return m_aCurrentTempURL; }
-        void        SetCurrentTempURL( const OUString& aNewCurrentTempURL );
-    
//-------------------------------------------------------------------------------------------------------------
-    //  private methods
-    
//-------------------------------------------------------------------------------------------------------------
-
-    private:
-
-        
/*-****************************************************************************************************//**
-            @short      return list of fix key names of ouer configuration management which 
represent oue module tree
-            @descr      These methods return a static const list of key names. We need it to get 
needed values from our
-                        configuration management. We return well known key names only - because 
the "UserData" node
-                        is handled in a special way!
-
-            @seealso    -
-
-            @param      -
-            @return     A list of needed configuration keys is returned.
-
-            @onerror    -
-        
*//*-*****************************************************************************************************/
-
-        Sequence< OUString > impl_GetPropertyNames();
-};
-
-//*****************************************************************************************************************
-//  constructor
-//*****************************************************************************************************************
-SvtInternalOptions_Impl::SvtInternalOptions_Impl()
-    // Init baseclasses first
-    :   ConfigItem          ( ROOTNODE_INTERNAL, CONFIG_MODE_IMMEDIATE_UPDATE )
-    // Init member then.
-    , m_bRemoveMenuEntryClose(sal_False)
-    , m_bRemoveMenuEntryBackToWebtop(sal_False)
-    , m_bRemoveMenuEntryNewWebtop(sal_False)
-    , m_bRemoveMenuEntryLogout(sal_False)
-    , m_bSlotCFG(DEFAULT_SLOTCFG)
-    , m_bSendCrashMail(DEFAULT_SENDCRASHMAIL)
-    , m_bUseMailUI(DEFAULT_USEMAILUI)
-    , m_aCurrentTempURL(DEFAULT_CURRENTTEMPURL)
-{
-    // Use our list of configuration keys to get his values.
-    // structure of internal section: (first 2 entries are fixed - all other are member of a set!)
-    //      "Slot"
-    //      "SendCrashMail"
-    //      "RecoveryList/r1/URL"
-    //      "RecoveryList/r1/Filter"
-    //      "RecoveryList/r1/TempName"
-    //      "RecoveryList/r2/URL"
-    //      "RecoveryList/r2/Filter"
-    //      "RecoveryList/r2/TempName"
-    //      "RecoveryList/.."
-    Sequence< OUString >    seqNames    = impl_GetPropertyNames()   ;
-    Sequence< Any >         seqValues   = GetProperties( seqNames ) ;
-
-    // Safe impossible cases.
-    // We need values from ALL configuration keys.
-    // Follow assignment use order of values in relation to our list of key names!
-    DBG_ASSERT( !(seqNames.getLength()!=seqValues.getLength()), 
"SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nI miss some values of configuration keys!\n" );
-
-    // Read fixed values first!
-    DBG_ASSERT(!seqValues[FIXPROPERTYHANDLE_SLOTCFG].hasValue() || 
(seqValues[FIXPROPERTYHANDLE_SLOTCFG].getValueTypeClass() == TypeClass_BOOLEAN), 
"SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of 
\"Office.Common\\Internal\\Slot\"?");
-    DBG_ASSERT(!seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL].hasValue() || 
!(seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL].getValueTypeClass()!=TypeClass_BOOLEAN), 
"SvtInternalOptions_Impl::SvtInternalOptions_Impl()\nWho has changed the value type of 
\"Office.Common\\Internal\\SendCrashMail\"?");
-    seqValues[FIXPROPERTYHANDLE_SLOTCFG] >>= m_bSlotCFG;
-    seqValues[FIXPROPERTYHANDLE_SENDCRASHMAIL] >>= m_bSendCrashMail;
-    seqValues[FIXPROPERTYHANDLE_USEMAILUI] >>= m_bUseMailUI;
-    seqValues[FIXPROPERTYHANDLE_CURRENTTEMPURL] >>= m_aCurrentTempURL;
-}
-
-//*****************************************************************************************************************
-//  destructor
-//*****************************************************************************************************************
-SvtInternalOptions_Impl::~SvtInternalOptions_Impl()
-{
-    if( IsModified() == sal_True )
-    {
-        Commit();
-    }
-}
-
-//*****************************************************************************************************************
-//  public method
-//*****************************************************************************************************************
-void SvtInternalOptions_Impl::Commit()
-{
-    // We have to write our current temp URL
-    Sequence< OUString > aNames( 1 );
-    OUString* pNames = aNames.getArray();
-    Sequence< Any > aValues( 1 );
-    Any* pValues = aValues.getArray();
-
-    pNames[0] = FIXPROPERTYNAME_CURRENTTEMPURL;
-    pValues[0] <<= m_aCurrentTempURL;
-
-    PutProperties( aNames, aValues );
-}
-
-//*****************************************************************************************************************
-//  public method
-//*****************************************************************************************************************
-void SvtInternalOptions_Impl::SetCurrentTempURL( const OUString& aNewCurrentTempURL )
-{
-    m_aCurrentTempURL = aNewCurrentTempURL;
-    SetModified();
-    Commit();
-}
-
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
-Sequence< OUString > SvtInternalOptions_Impl::impl_GetPropertyNames()
-{
-    Sequence< OUString > seqProperties(4);
-
-    // Add names of fix properties to list.
-    seqProperties[FIXPROPERTYHANDLE_SLOTCFG         ]   =   FIXPROPERTYNAME_SLOTCFG         ;
-    seqProperties[FIXPROPERTYHANDLE_SENDCRASHMAIL   ]   =   FIXPROPERTYNAME_SENDCRASHMAIL   ;
-    seqProperties[FIXPROPERTYHANDLE_USEMAILUI       ]   =   FIXPROPERTYNAME_USEMAILUI       ;
-    seqProperties[FIXPROPERTYHANDLE_CURRENTTEMPURL  ]   =   FIXPROPERTYNAME_CURRENTTEMPURL  ;
-    // Return result.
-    return seqProperties;
-}
-
-//*****************************************************************************************************************
-//  initialize static member
-//  DON'T DO IT IN YOUR HEADER!
-//  see definition for further informations
-//*****************************************************************************************************************
-SvtInternalOptions_Impl*    SvtInternalOptions::m_pDataContainer    = NULL  ;
-sal_Int32                   SvtInternalOptions::m_nRefCount         = 0     ;
-
-//*****************************************************************************************************************
-//  constructor
-//*****************************************************************************************************************
-SvtInternalOptions::SvtInternalOptions()
-{
-    // Global access, must be guarded (multithreading!).
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    // Increase ouer refcount ...
-    ++m_nRefCount;
-    // ... and initialize ouer data container only if it not already!
-    if( m_pDataContainer == NULL )
-    {
-        RTL_LOGFILE_CONTEXT(aLog, "unotools ( ??? ) ::SvtInternalOptions_Impl::ctor()");
-        m_pDataContainer = new SvtInternalOptions_Impl();
-
-        ItemHolder1::holdConfigItem(E_INTERNALOPTIONS);
-     }
-}
-
-//*****************************************************************************************************************
-//  destructor
-//*****************************************************************************************************************
-SvtInternalOptions::~SvtInternalOptions()
-{
-    // Global access, must be guarded (multithreading!)
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    // Decrease ouer refcount.
-    --m_nRefCount;
-    // If last instance was deleted ...
-    // we must destroy ouer static data container!
-    if( m_nRefCount <= 0 )
-    {
-        delete m_pDataContainer;
-        m_pDataContainer = NULL;
-    }
-}
-
-//*****************************************************************************************************************
-//  public method
-//*****************************************************************************************************************
-sal_Bool SvtInternalOptions::SlotCFGEnabled() const
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    return m_pDataContainer->SlotCFGEnabled();
-}
-
-//*****************************************************************************************************************
-//  public method
-//*****************************************************************************************************************
-sal_Bool SvtInternalOptions::MailUIEnabled() const
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    return m_pDataContainer->MailUIEnabled();
-}
-
-OUString SvtInternalOptions::GetCurrentTempURL() const
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    return m_pDataContainer->GetCurrentTempURL();
-}
-
-void SvtInternalOptions::SetCurrentTempURL( const OUString& aNewCurrentTempURL )
-{
-    MutexGuard aGuard( GetOwnStaticMutex() );
-    m_pDataContainer->SetCurrentTempURL( aNewCurrentTempURL );
-}
-
-namespace
-{
-    class theInternalOptionsMutex : public rtl::Static<osl::Mutex, theInternalOptionsMutex>{};
-}
-
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
-Mutex& SvtInternalOptions::GetOwnStaticMutex()
-{
-    return theInternalOptionsMutex::get();
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/unotools/source/config/itemholder1.cxx b/unotools/source/config/itemholder1.cxx
index 0bac773..8d04245 100644
--- a/unotools/source/config/itemholder1.cxx
+++ b/unotools/source/config/itemholder1.cxx
@@ -36,7 +36,6 @@
 #include <unotools/fltrcfg.hxx>
 #include <unotools/fontoptions.hxx>
 #include <unotools/historyoptions.hxx>
-#include <unotools/internaloptions.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/localisationoptions.hxx>
 #include <unotools/moduleoptions.hxx>
@@ -185,10 +184,6 @@
 
         case E_HISTORYOPTIONS :
             rItem.pItem = new SvtHistoryOptions();
-            break;
-
-        case E_INTERNALOPTIONS :
-            rItem.pItem = new SvtInternalOptions();
             break;
 
         case E_JAVAOPTIONS :

-- 
To view, visit https://gerrit.libreoffice.org/3180
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I482719b0de9df0a77c2fef0bf25ae1fb68926375
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Thomas Arnhold <thomas@arnhold.org>


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.