Skip to content

C
core
Kaydet (Commit) 252e599b authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Replace SvtInetOptions with (simplified) direct configuration access.

üst 5e51960d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 145 deletions
cui/source/options/optinet2.cxx
Dosyayı görüntüle @ 252e599b
......@@ -43,7 +43,6 @@
#include <tools/inetdef.hxx>
#include <svl/urihelper.hxx>
#include <svl/cntwids.hrc>
#include <unotools/inetoptions.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <unotools/bootstrap.hxx>
......
fpicker/source/office/iodlg.cxx
Dosyayı görüntüle @ 252e599b
......@@ -42,7 +42,6 @@
#include "unotools/pathoptions.hxx"
#include "unotools/viewoptions.hxx"
#include "svtools/fileview.hxx"
#include "unotools/inetoptions.hxx"
#include "svtools/sfxecode.hxx"
#include "svl/svarray.hxx"
#include "svtools/svtabbx.hxx"
......
sfx2/source/appl/app.cxx
Dosyayı görüntüle @ 252e599b
......@@ -125,7 +125,6 @@
#include <unotools/startoptions.hxx>
#include <unotools/securityoptions.hxx>
#include <unotools/localisationoptions.hxx>
#include <unotools/inetoptions.hxx>
#include <unotools/fontoptions.hxx>
#include <unotools/internaloptions.hxx>
#include <unotools/workingsetoptions.hxx>
......
sfx2/source/appl/appcfg.cxx
Dosyayı görüntüle @ 252e599b
......@@ -51,6 +51,7 @@
#include <svl/isethint.hxx>
#include <officecfg/Inet.hxx>
#include <unotools/configmgr.hxx>
#include <tools/urlobj.hxx>
#include <unotools/saveopt.hxx>
......@@ -58,7 +59,6 @@
#include <unotools/undoopt.hxx>
#include <unotools/securityoptions.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/inetoptions.hxx>
#include <svtools/miscopt.hxx>
#include <vcl/toolbox.hxx>
#include <unotools/localfilehelper.hxx>
......@@ -171,7 +171,6 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
SvtSaveOptions aSaveOptions;
SvtUndoOptions aUndoOptions;
SvtHelpOptions aHelpOptions;
SvtInetOptions aInetOptions;
SvtSecurityOptions aSecurityOptions;
SvtMiscOptions aMiscOptions;
......@@ -395,33 +394,54 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
#endif
break;
case SID_INET_PROXY_TYPE :
{
if( rSet.Put( SfxUInt16Item ( rPool.GetWhich( SID_INET_PROXY_TYPE ),
(sal_uInt16)aInetOptions.GetProxyType() )))
bRet = sal_True;
if (rSet.Put(
SfxUInt16Item(
rPool.GetWhich(SID_INET_PROXY_TYPE),
officecfg::Inet::Settings::ooInetProxyType::get(
comphelper::getProcessComponentContext()))))
{
bRet = true;
}
break;
}
case SID_INET_HTTP_PROXY_NAME :
{
if ( rSet.Put( SfxStringItem ( rPool.GetWhich(SID_INET_HTTP_PROXY_NAME ),
aInetOptions.GetProxyHttpName() )))
bRet = sal_True;
if (rSet.Put(
SfxStringItem(
rPool.GetWhich(SID_INET_HTTP_PROXY_NAME),
officecfg::Inet::Settings::ooInetHTTPProxyName::get(
comphelper::getProcessComponentContext()))))
{
bRet = true;
}
break;
}
case SID_INET_HTTP_PROXY_PORT :
if ( rSet.Put( SfxInt32Item( rPool.GetWhich(SID_INET_HTTP_PROXY_PORT ),
aInetOptions.GetProxyHttpPort() )))
bRet = sal_True;
if (rSet.Put(
SfxInt32Item(
rPool.GetWhich(SID_INET_HTTP_PROXY_PORT),
officecfg::Inet::Settings::ooInetHTTPProxyPort::get(
comphelper::getProcessComponentContext()))))
{
bRet = true;
}
break;
case SID_INET_FTP_PROXY_NAME :
if ( rSet.Put( SfxStringItem ( rPool.GetWhich(SID_INET_FTP_PROXY_NAME ),
aInetOptions.GetProxyFtpName() )))
bRet = sal_True;
if (rSet.Put(
SfxStringItem(
rPool.GetWhich(SID_INET_FTP_PROXY_NAME),
officecfg::Inet::Settings::ooInetFTPProxyName::get(
comphelper::getProcessComponentContext()))))
{
bRet = true;
}
break;
case SID_INET_FTP_PROXY_PORT :
if ( rSet.Put( SfxInt32Item ( rPool.GetWhich(SID_INET_FTP_PROXY_PORT ),
aInetOptions.GetProxyFtpPort() )))
bRet = sal_True;
if (rSet.Put(
SfxInt32Item(
rPool.GetWhich(SID_INET_FTP_PROXY_PORT),
officecfg::Inet::Settings::ooInetFTPProxyPort::get(
comphelper::getProcessComponentContext()))))
{
bRet = true;
}
break;
case SID_INET_SECURITY_PROXY_NAME :
case SID_INET_SECURITY_PROXY_PORT :
......@@ -430,9 +450,14 @@ sal_Bool SfxApplication::GetOptions( SfxItemSet& rSet )
#endif
break;
case SID_INET_NOPROXY :
if( rSet.Put( SfxStringItem ( rPool.GetWhich( SID_INET_NOPROXY),
aInetOptions.GetProxyNoProxy() )))
bRet = sal_True;
if (rSet.Put(
SfxStringItem(
rPool.GetWhich( SID_INET_NOPROXY),
officecfg::Inet::Settings::ooInetNoProxy::get(
comphelper::getProcessComponentContext()))))
{
bRet = true;
}
break;
case SID_ATTR_PATHNAME :
case SID_ATTR_PATHGROUP :
......@@ -510,8 +535,10 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
SvtHelpOptions aHelpOptions;
SvtSecurityOptions aSecurityOptions;
SvtPathOptions aPathOptions;
SvtInetOptions aInetOptions;
SvtMiscOptions aMiscOptions;
boost::shared_ptr< unotools::ConfigurationChanges > batch(
unotools::ConfigurationChanges::create(
comphelper::getProcessComponentContext()));
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_OUTSTYLE3D), sal_True, &pItem) )
{
DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected");
......@@ -724,33 +751,45 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_INET_PROXY_TYPE), sal_True, &pItem))
{
DBG_ASSERT( pItem->ISA(SfxUInt16Item), "UInt16Item expected" );
aInetOptions.SetProxyType((SvtInetOptions::ProxyType)( (const SfxUInt16Item*)pItem )->GetValue());
officecfg::Inet::Settings::ooInetProxyType::set(
comphelper::getProcessComponentContext(), batch,
static_cast< SfxUInt16Item const * >(pItem)->GetValue());
}
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_NAME ), sal_True, &pItem ) )
{
DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
aInetOptions.SetProxyHttpName( ((const SfxStringItem *)pItem)->GetValue() );
officecfg::Inet::Settings::ooInetHTTPProxyName::set(
comphelper::getProcessComponentContext(), batch,
static_cast< SfxStringItem const * >(pItem)->GetValue());
}
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_HTTP_PROXY_PORT ), sal_True, &pItem ) )
{
DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
aInetOptions.SetProxyHttpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
officecfg::Inet::Settings::ooInetHTTPProxyPort::set(
comphelper::getProcessComponentContext(), batch,
static_cast< SfxInt32Item const * >(pItem)->GetValue());
}
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_NAME ), sal_True, &pItem ) )
{
DBG_ASSERT( pItem->ISA(SfxStringItem), "StringItem expected" );
aInetOptions.SetProxyFtpName( ((const SfxStringItem *)pItem)->GetValue() );
officecfg::Inet::Settings::ooInetFTPProxyName::set(
comphelper::getProcessComponentContext(), batch,
static_cast< SfxStringItem const * >(pItem)->GetValue());
}
if ( SFX_ITEM_SET == rSet.GetItemState( rPool.GetWhich( SID_INET_FTP_PROXY_PORT ), sal_True, &pItem ) )
{
DBG_ASSERT( pItem->ISA(SfxInt32Item), "Int32Item expected" );
aInetOptions.SetProxyFtpPort( ( (const SfxInt32Item*)pItem )->GetValue() );
officecfg::Inet::Settings::ooInetFTPProxyPort::set(
comphelper::getProcessComponentContext(), batch,
static_cast< SfxInt32Item const * >(pItem)->GetValue());
}
if ( SFX_ITEM_SET == rSet.GetItemState(SID_INET_NOPROXY, sal_True, &pItem))
{
DBG_ASSERT(pItem->ISA(SfxStringItem), "StringItem expected");
aInetOptions.SetProxyNoProxy(((const SfxStringItem *)pItem)->GetValue());
officecfg::Inet::Settings::ooInetNoProxy::set(
comphelper::getProcessComponentContext(), batch,
static_cast< SfxStringItem const * >(pItem)->GetValue());
}
// Secure-Referers
......@@ -786,7 +825,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet )
}
// Store changed data
aInetOptions.flush();
batch->commit();
}
//--------------------------------------------------------------------
......
unotools/Library_utl.mk
Dosyayı görüntüle @ 252e599b
......@@ -92,7 +92,6 @@ $(eval $(call gb_Library_add_exception_objects,utl,\
unotools/source/config/fontcfg \
unotools/source/config/fontoptions \
unotools/source/config/historyoptions \
unotools/source/config/inetoptions \
unotools/source/config/internaloptions \
unotools/source/config/itemholder1 \
unotools/source/config/lingucfg \
......
unotools/Package_inc.mk
Dosyayı görüntüle @ 252e599b
......@@ -64,7 +64,6 @@ $(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/fontoptions.hxx,unot
$(eval $(call gb_Package_add_file,unotools_inc,inc/unotools/historyoptions_const.hxx,unotools/historyoptions_const.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/inetoptions.hxx,unotools/inetoptions.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))
......
unotools/inc/unotools/inetoptions.hxx deleted 100644 → 0
Dosyayı görüntüle @ 5e51960d
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
*
* This file is part of OpenOffice.org.
*
* OpenOffice.org is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 3
* only, as published by the Free Software Foundation.
*
* OpenOffice.org is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License version 3 for more details
* (a copy is included in the LICENSE file that accompanied this code).
*
* You should have received a copy of the GNU Lesser General Public License
* version 3 along with OpenOffice.org. If not, see
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
************************************************************************/
#ifndef _unotools_INETOPTIONS_HXX_
#define _unotools_INETOPTIONS_HXX_
#include "unotools/unotoolsdllapi.h"
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <sal/types.h>
#include <unotools/options.hxx>
namespace com { namespace sun { namespace star { namespace beans {
class XPropertiesChangeListener;
} } } }
namespace rtl { class OUString; }
//============================================================================
/** The names of all the properties (options) accessible through
SvtInetOptions.
*/
#define SVT_INET_OPTION_PROXY_NO_PROXY "Inet/Proxy/NoProxy"
#define SVT_INET_OPTION_PROXY_TYPE "Inet/Proxy/Type"
#define SVT_INET_OPTION_PROXY_FTP_NAME "Inet/Proxy/FTP/Name"
#define SVT_INET_OPTION_PROXY_FTP_PORT "Inet/Proxy/FTP/Port"
#define SVT_INET_OPTION_PROXY_HTTP_NAME "Inet/Proxy/HTTP/Name"
#define SVT_INET_OPTION_PROXY_HTTP_PORT "Inet/Proxy/HTTP/Port"
//============================================================================
/** Interface to access those configuration database entries that are related
to the various Internet services.
@descr The Set...() methods all have a second parameter bFlush. If false
is passed (the default), the new value is not written back directly, but
only cached within this class. If the value in the configuration database
is also changed, the cached change will get lost. If, on the other hand,
true is passed, the new value is instantly written back to the
configuration database.
*/
class UNOTOOLS_DLLPUBLIC SvtInetOptions: public utl::detail::Options
{
public:
SvtInetOptions();
virtual ~SvtInetOptions();
enum ProxyType { NONE, AUTOMATIC, MANUAL };
rtl::OUString GetProxyNoProxy() const;
sal_Int32 GetProxyType() const;
rtl::OUString GetProxyFtpName() const;
sal_Int32 GetProxyFtpPort() const;
rtl::OUString GetProxyHttpName() const;
sal_Int32 GetProxyHttpPort() const;
void SetProxyNoProxy(rtl::OUString const & rValue, bool bFlush = false);
void SetProxyType(ProxyType eValue, bool bFlush = false);
void SetProxyFtpName(rtl::OUString const & rValue, bool bFlush = false);
void SetProxyFtpPort(sal_Int32 nValue, bool bFlush = false);
void SetProxyHttpName(rtl::OUString const & rValue, bool bFlush = false);
void SetProxyHttpPort(sal_Int32 nValue, bool bFlush = false);
void flush();
private:
class Impl;
static Impl * m_pImpl;
};
#endif // _unotools_INETOPTIONS_HXX_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
unotools/inc/unotools/itemholderbase.hxx
Dosyayı görüntüle @ 252e599b
......@@ -71,7 +71,6 @@ enum EItem
E_HELPOPTIONS , // 2
E_HISTORYOPTIONS , //
E_INETOPTIONS , //
E_INTERNALOPTIONS , //
E_JAVAOPTIONS , //
......
unotools/source/config/inetoptions.cxx deleted 100644 → 0
Dosyayı görüntüle @ 5e51960d
This diff is collapsed.
unotools/source/config/itemholder1.cxx
Dosyayı görüntüle @ 252e599b
......@@ -48,7 +48,6 @@
#include <unotools/fltrcfg.hxx>
#include <unotools/fontoptions.hxx>
#include <unotools/historyoptions.hxx>
#include <unotools/inetoptions.hxx>
#include <unotools/internaloptions.hxx>
#include <unotools/lingucfg.hxx>
#include <unotools/localisationoptions.hxx>
......@@ -210,10 +209,6 @@ void ItemHolder1::impl_newItem(TItemInfo& rItem)
rItem.pItem = new SvtHistoryOptions();
break;
case E_INETOPTIONS :
rItem.pItem = new SvtInetOptions();
break;
case E_INTERNALOPTIONS :
rItem.pItem = new SvtInternalOptions();
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment