Hello Andreas,
The new building(with redesigned useroptions.cxx and necessary changes
in the client binfilter,sc,sd,sw) has been done. I have tested it
manually and it works fine.
1)when redesigning useroptions.cxx, an element with a prop name
"customernumber" seems missed, so I should added it to
officecfg/.../UserProfile.xcu,UserProfile.xcs. Right?
2)Now all the old return value type "const String&" have been changed to
"::rtl::OUString" in the SvtUserOptions. But I didnt find any function
with the return value saved inside a local variable from type "const
String& xxx" in the client. Do I miss them?:-(
The attached files are the redesigned useroptions.cxx and patches of the
client code. Could you please review them?:-)
Regards
Yan Wu
diff -upNr old/sw/source/core/bastyp/calc.cxx new/sw/source/core/bastyp/calc.cxx
--- old/sw/source/core/bastyp/calc.cxx 2007-09-30 21:08:56.000000000 +0800
+++ new/sw/source/core/bastyp/calc.cxx 2007-11-21 13:11:20.000000000 +0800
@@ -424,15 +424,15 @@ static ULONG SwDocStat::* __READONLY_DAT
SvtUserOptions& rUserOptions = SW_MOD()->GetUserOptions();
- ((SwCalcExp*)VarTable[ aHashValue[ 11 ] ])->nValue.PutString(
rUserOptions.GetFirstName() );
- ((SwCalcExp*)VarTable[ aHashValue[ 12 ] ])->nValue.PutString(
rUserOptions.GetLastName() );
- ((SwCalcExp*)VarTable[ aHashValue[ 13 ] ])->nValue.PutString(
rUserOptions.GetID() );
+ ((SwCalcExp*)VarTable[ aHashValue[ 11 ] ])->nValue.PutString(
(String)rUserOptions.GetFirstName() );
+ ((SwCalcExp*)VarTable[ aHashValue[ 12 ] ])->nValue.PutString(
(String)rUserOptions.GetLastName() );
+ ((SwCalcExp*)VarTable[ aHashValue[ 13 ] ])->nValue.PutString(
(String)rUserOptions.GetID() );
for( n = 0; n < 11; ++n )
((SwCalcExp*)VarTable[ aHashValue[ n + 14 ]
])->nValue.PutString(
- rUserOptions.GetToken( aAdrToken[ n ]
));
+ (String)rUserOptions.GetToken(
aAdrToken[ n ] ));
- nVal.PutString( rUserOptions.GetToken( aAdrToken[ 11 ] ));
+ nVal.PutString( (String)rUserOptions.GetToken( aAdrToken[ 11 ] ));
sTmpStr.AssignAscii( sNTypeTab[ 25 ] );
VarTable[ aHashValue[ 25 ] ]->pNext = new SwCalcExp( sTmpStr, nVal, 0 );
diff -upNr old/sw/source/ui/envelp/envimg.cxx new/sw/source/ui/envelp/envimg.cxx
--- old/sw/source/ui/envelp/envimg.cxx 2007-09-30 21:09:50.000000000 +0800
+++ new/sw/source/ui/envelp/envimg.cxx 2007-11-22 10:09:08.000000000 +0800
@@ -114,7 +114,7 @@ SW_DLLPUBLIC String MakeSender()
if(sToken.EqualsAscii("COMPANY"))
{
xub_StrLen nOldLen = sRet.Len();
- sRet += rUserOpt.GetCompany();
+ sRet += (String)rUserOpt.GetCompany();
bLastLength = sRet.Len() != nOldLen;
}
else if(sToken.EqualsAscii("CR"))
@@ -124,19 +124,19 @@ SW_DLLPUBLIC String MakeSender()
bLastLength = TRUE;
}
else if(sToken.EqualsAscii("FIRSTNAME"))
- sRet += rUserOpt.GetFirstName();
+ sRet += (String)rUserOpt.GetFirstName();
else if(sToken.EqualsAscii("LASTNAME"))
- sRet += rUserOpt.GetLastName();
+ sRet += (String)rUserOpt.GetLastName();
else if(sToken.EqualsAscii("ADDRESS"))
- sRet += rUserOpt.GetStreet();
+ sRet += (String)rUserOpt.GetStreet();
else if(sToken.EqualsAscii("COUNTRY"))
- sRet += rUserOpt.GetCountry();
+ sRet += (String)rUserOpt.GetCountry();
else if(sToken.EqualsAscii("POSTALCODE"))
- sRet += rUserOpt.GetZip();
+ sRet += (String)rUserOpt.GetZip();
else if(sToken.EqualsAscii("CITY"))
- sRet += rUserOpt.GetCity();
+ sRet += (String)rUserOpt.GetCity();
else if(sToken.EqualsAscii("STATEPROV"))
- sRet += rUserOpt.GetState();
+ sRet += (String)rUserOpt.GetState();
else if(sToken.Len()) //spaces
sRet += sToken;
}
diff -upNr old/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
new/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx
--- old/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx 2007-09-08
02:21:58.000000000 +0800
+++ new/binfilter/bf_sc/source/core/tool/sc_chgtrack.cxx 2007-11-22
13:34:12.000000000 +0800
@@ -2217,7 +2217,7 @@ const USHORT ScChangeTrack::nContentSlot
/*N*/ SvtUserOptions aUserOpt;
/*N*/ aUser = aUserOpt.GetFirstName();
/*N*/ aUser += ' ';
-/*N*/ aUser += aUserOpt.GetLastName();
+/*N*/ aUser += (String)aUserOpt.GetLastName();
/*N*/ aUserCollection.Insert( new StrData( aUser ) );
/*N*/ }
diff -upNr old/sc/source/core/tool/chgtrack.cxx
new/sc/source/core/tool/chgtrack.cxx
--- old/sc/source/core/tool/chgtrack.cxx 2007-03-04 18:07:50.000000000
+0800
+++ new/sc/source/core/tool/chgtrack.cxx 2007-11-22 11:27:14.000000000
+0800
@@ -2689,7 +2689,7 @@ void ScChangeTrack::Init()
const SvtUserOptions& rUserOpt = SC_MOD()->GetUserOptions();
aUser = rUserOpt.GetFirstName();
aUser += ' ';
- aUser += rUserOpt.GetLastName();
+ aUser += (String)rUserOpt.GetLastName();
aUserCollection.Insert( new StrData( aUser ) );
}
@@ -2757,7 +2757,7 @@ void __EXPORT ScChangeTrack::Notify( Sfx
String aStr( rUserOptions.GetFirstName() );
aStr += ' ';
- aStr += rUserOptions.GetLastName();
+ aStr += (String)rUserOptions.GetLastName();
SetUser( aStr );
if ( aUserCollection.GetCount() != nOldCount )
diff -upNr old/sc/source/ui/dbgui/scendlg.cxx new/sc/source/ui/dbgui/scendlg.cxx
--- old/sc/source/ui/dbgui/scendlg.cxx 2007-05-13 16:27:00.000000000 +0800
+++ new/sc/source/ui/dbgui/scendlg.cxx 2007-11-22 11:45:32.000000000 +0800
@@ -113,9 +113,9 @@ ScNewScenarioDlg::ScNewScenarioDlg( Wind
String aComment( ScResId( STR_CREATEDBY ) );
aComment += ' ';
- aComment += aUserOpt.GetFirstName();
+ aComment += (String)aUserOpt.GetFirstName();
aComment += ' ';
- aComment += aUserOpt.GetLastName();
+ aComment += (String)aUserOpt.GetLastName();
aComment.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ", " ));
aComment += String( ScResId( STR_ON ) );
aComment += ' ';
diff -upNr old/sd/source/filter/html/pubdlg.cxx
new/sd/source/filter/html/pubdlg.cxx
--- old/sd/source/filter/html/pubdlg.cxx 2007-06-30 00:49:44.000000000
+0800
+++ new/sd/source/filter/html/pubdlg.cxx 2007-11-26 14:16:26.000000000
+0800
@@ -224,9 +224,9 @@ SdPublishingDesign::SdPublishingDesign()
m_nResolution = PUB_LOWRES_WIDTH;
m_aAuthor = aUserOptions.GetFirstName();
- if( m_aAuthor.Len() && aUserOptions.GetLastName().Len() )
+ if( m_aAuthor.Len() && aUserOptions.GetLastName().getLength() )
m_aAuthor += sal_Unicode(' ');
- m_aAuthor += aUserOptions.GetLastName();
+ m_aAuthor += (String)aUserOptions.GetLastName();
m_aEMail = aUserOptions.GetEmail();
m_bDownload = FALSE;
//-/ m_bCreated = TRUE;
#ifndef INCLUDE_CONFIGITEMS_USEROPTIONS_CONST_HXX
#define INCLUDE_CONFIGITEMS_USEROPTIONS_CONST_HXX
#include <rtl/ustring.hxx>
namespace
{
static const ::rtl::OUString s_sData =
::rtl::OUString::createFromAscii("org.openoffice.UserProfile/Data");
static const ::rtl::OUString s_so =
::rtl::OUString::createFromAscii("o"); // USER_OPT_COMPANY
static const ::rtl::OUString s_sgivenname =
::rtl::OUString::createFromAscii("givenname"); // USER_OPT_FIRSTNAME
static const ::rtl::OUString s_ssn =
::rtl::OUString::createFromAscii("sn"); // USER_OPT_LASTNAME
static const ::rtl::OUString s_sinitials =
::rtl::OUString::createFromAscii("initials"); // USER_OPT_ID
static const ::rtl::OUString s_sstreet =
::rtl::OUString::createFromAscii("street"); // USER_OPT_STREET
static const ::rtl::OUString s_sl =
::rtl::OUString::createFromAscii("l"); // USER_OPT_CITY
static const ::rtl::OUString s_sst =
::rtl::OUString::createFromAscii("st"); // USER_OPT_STATE
static const ::rtl::OUString s_spostalcode =
::rtl::OUString::createFromAscii("postalcode"); // USER_OPT_ZIP
static const ::rtl::OUString s_sc =
::rtl::OUString::createFromAscii("c"); // USER_OPT_COUNTRY
static const ::rtl::OUString s_stitle =
::rtl::OUString::createFromAscii("title"); // USER_OPT_TITLE
static const ::rtl::OUString s_sposition =
::rtl::OUString::createFromAscii("position"); // USER_OPT_POSITION
static const ::rtl::OUString s_shomephone =
::rtl::OUString::createFromAscii("homephone"); // USER_OPT_TELEPHONEHOME
static const ::rtl::OUString s_stelephonenumber =
::rtl::OUString::createFromAscii("telephonenumber"); // USER_OPT_TELEPHONEWORK
static const ::rtl::OUString s_sfacsimiletelephonenumber =
::rtl::OUString::createFromAscii("facsimiletelephonenumber"); // USER_OPT_FAX
static const ::rtl::OUString s_smail =
::rtl::OUString::createFromAscii("mail"); // USER_OPT_EMAIL
static const ::rtl::OUString s_scustomernumber =
::rtl::OUString::createFromAscii("customernumber"); // USER_OPT_CUSTOMERNUMBER
static const ::rtl::OUString s_sfathersname =
::rtl::OUString::createFromAscii("fathersname"); // USER_OPT_FATHERSNAME
static const ::rtl::OUString s_sapartment =
::rtl::OUString::createFromAscii("apartment"); // USER_OPT_APARTMENT
}
#endif // INCLUDE_CONFIGITEMS_USEROPTIONS_CONST_HXX
/*************************************************************************
*
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: useroptions.cxx,v $
*
* $Revision: 1.24 $
*
* last change: $Author: hr $ $Date: 2007/06/27 21:17:53 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
*
*
* GNU Lesser General Public License Version 2.1
* =============================================
* Copyright 2005 by Sun Microsystems, Inc.
* 901 San Antonio Road, Palo Alto, CA 94303, USA
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License version 2.1, as published by the Free Software Foundation.
*
* This library 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 for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*
************************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svtools.hxx"
#ifdef SVL_DLLIMPLEMENTATION
#undef SVL_DLLIMPLEMENTATION
#endif
#define SVT_DLLIMPLEMENTATION
#include <svtools/useroptions.hxx>
#include "configitems/useroptions_const.hxx"
#ifndef _UTL_CONFIGMGR_HXX_
#include <unotools/configmgr.hxx>
#endif
#ifndef _TOOLS_DEBUG_HXX
#include <tools/debug.hxx>
#endif
#ifndef _COM_SUN_STAR_UNO_ANY_HXX_
#include <com/sun/star/uno/Any.hxx>
#endif
#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_
#include <com/sun/star/uno/Sequence.hxx>
#endif
#ifndef _SFXSMPLHINT_HXX
#include <svtools/smplhint.hxx>
#endif
#ifndef _VOS_MUTEX_HXX_
#include <vos/mutex.hxx>
#endif
#ifndef _SV_SVAPP_HXX
#include <vcl/svapp.hxx>
#endif
#ifndef INCLUDED_RTL_INSTANCE_HXX
#include <rtl/instance.hxx>
#endif
#include <rtl/logfile.hxx>
#include "itemholder2.hxx"
#ifndef _COM_SUN_STAR_BEANS_PROPERTY_HPP_
#include <com/sun/star/beans/Property.hpp>
#endif
#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
#include <com/sun/star/beans/XPropertySet.hpp>
#endif
#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPP_
#include <com/sun/star/beans/PropertyAttribute.hpp>
#endif
#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_
#include <com/sun/star/container/XNameAccess.hpp>
#endif
#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
#include <com/sun/star/container/XNameContainer.hpp>
#endif
#ifndef _COM_SUN_STAR_LANG_XSINGLESERVICEFACTORY_HPP_
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#endif
#ifndef _COMPHELPER_CONFIGURATIONHELPER_HXX_
#include <comphelper/configurationhelper.hxx>
#endif
#ifndef _UNOTOOLS_PROCESSFACTORY_HXX_
#include <unotools/processfactory.hxx>
#endif
#ifndef _SVT_LOGHELPER_HXX
#include "loghelper.hxx"
#endif
using namespace utl;
using namespace rtl;
using namespace com::sun::star::uno;
namespace css = ::com::sun::star;
// class SvtUserOptions_Impl ---------------------------------------------
class SvtUserOptions_Impl
{
public:
SvtUserOptions_Impl();
~SvtUserOptions_Impl();
// get the user token
::rtl::OUString GetCompany() const;
::rtl::OUString GetFirstName() const;
::rtl::OUString GetLastName() const;
::rtl::OUString GetID() const;
::rtl::OUString GetStreet() const;
::rtl::OUString GetCity() const;
::rtl::OUString GetState() const;
::rtl::OUString GetZip() const;
::rtl::OUString GetCountry() const;
::rtl::OUString GetPosition() const;
::rtl::OUString GetTitle() const;
::rtl::OUString GetTelephoneHome() const;
::rtl::OUString GetTelephoneWork() const;
::rtl::OUString GetFax() const;
::rtl::OUString GetEmail() const;
::rtl::OUString GetCustomerNumber() const;
::rtl::OUString GetFathersName() const;
::rtl::OUString GetApartment() const;
::rtl::OUString GetFullName() const;
::rtl::OUString GetLocale() const { return m_aLocale; }
// set the address token
void SetCompany( const ::rtl::OUString& rNewToken
);
void SetFirstName( const ::rtl::OUString&
rNewToken );
void SetLastName( const ::rtl::OUString& rNewToken
);
void SetID( const ::rtl::OUString& rNewToken );
void SetStreet( const ::rtl::OUString& rNewToken );
void SetCity( const ::rtl::OUString& rNewToken );
void SetState( const ::rtl::OUString& rNewToken );
void SetZip( const ::rtl::OUString& rNewToken );
void SetCountry( const ::rtl::OUString& rNewToken
);
void SetPosition( const ::rtl::OUString& rNewToken
);
void SetTitle( const ::rtl::OUString& rNewToken );
void SetTelephoneHome( const ::rtl::OUString&
rNewToken );
void SetTelephoneWork( const ::rtl::OUString&
rNewToken );
void SetFax( const ::rtl::OUString& rNewToken );
void SetEmail( const ::rtl::OUString& rNewToken );
void SetCustomerNumber( const ::rtl::OUString&
rNewToken );
void SetFathersName( const ::rtl::OUString& rNewToken );
void SetApartment( const ::rtl::OUString& rNewToken );
sal_Bool IsTokenReadonly( USHORT nToken ) const;
::rtl::OUString GetToken(USHORT nToken) const;
private:
css::uno::Reference< css::container::XNameAccess > m_xCfg;
css::uno::Reference< css::beans::XPropertySet > m_xData;
::rtl::OUString m_aLocale;
};
// global ----------------------------------------------------------------
static SvtUserOptions_Impl* pOptions = NULL;
static sal_Int32 nRefCount = 0;
#define READONLY_DEFAULT sal_False
// functions -------------------------------------------------------------
namespace
{
struct PropertyNames
: public rtl::Static< Sequence< rtl::OUString >, PropertyNames> {};
}
// class SvtUserOptions_Impl ---------------------------------------------
// -----------------------------------------------------------------------
SvtUserOptions_Impl::SvtUserOptions_Impl()
{
try
{
m_xCfg = Reference< css::container::XNameAccess > (
::comphelper::ConfigurationHelper::openConfig(
utl::getProcessServiceFactory(),
s_sData,
::comphelper::ConfigurationHelper::E_STANDARD),
css::uno::UNO_QUERY );
m_xData = css::uno::Reference< css::beans::XPropertySet
>(m_xCfg, css::uno::UNO_QUERY);
}
catch(const css::uno::Exception& ex)
{
m_xCfg.clear();
LogHelper::logIt(ex);
}
Any aAny = ConfigManager::GetConfigManager()->GetDirectConfigProperty(
ConfigManager::LOCALE );
::rtl::OUString aLocale;
if ( aAny >>= aLocale )
m_aLocale = aLocale;
else
{
DBG_ERRORFILE( "SvtUserOptions_Impl::SvtUserOptions_Impl(): no
locale found" );
}
}
// -----------------------------------------------------------------------
SvtUserOptions_Impl::~SvtUserOptions_Impl()
{
}
::rtl::OUString SvtUserOptions_Impl::GetCompany() const
{
::rtl::OUString sCompany;
try
{
m_xData->getPropertyValue(s_so) >>= sCompany;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sCompany;
}
::rtl::OUString SvtUserOptions_Impl::GetFirstName() const
{
::rtl::OUString sFirstName;
try
{
m_xData->getPropertyValue(s_sgivenname) >>= sFirstName;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sFirstName;
}
::rtl::OUString SvtUserOptions_Impl::GetLastName() const
{
::rtl::OUString sLastName;
try
{
m_xData->getPropertyValue(s_ssn) >>= sLastName;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sLastName;
}
::rtl::OUString SvtUserOptions_Impl::GetID() const
{
::rtl::OUString sID;
try
{
m_xData->getPropertyValue(s_sinitials) >>= sID;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sID;
}
::rtl::OUString SvtUserOptions_Impl::GetStreet() const
{
::rtl::OUString sStreet;
try
{
m_xData->getPropertyValue(s_sstreet) >>= sStreet;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sStreet;
}
::rtl::OUString SvtUserOptions_Impl::GetCity() const
{
::rtl::OUString sCity;
try
{
m_xData->getPropertyValue(s_sl) >>= sCity;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sCity;
}
::rtl::OUString SvtUserOptions_Impl::GetState() const
{
::rtl::OUString sState;
try
{
m_xData->getPropertyValue(s_sst) >>= sState;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sState;
}
::rtl::OUString SvtUserOptions_Impl::GetZip() const
{
::rtl::OUString sZip;
try
{
m_xData->getPropertyValue(s_spostalcode) >>= sZip;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sZip;
}
::rtl::OUString SvtUserOptions_Impl::GetCountry() const
{
::rtl::OUString sCountry;
try
{
m_xData->getPropertyValue(s_sc) >>= sCountry;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sCountry;
}
::rtl::OUString SvtUserOptions_Impl::GetPosition() const
{
::rtl::OUString sPosition;
try
{
m_xData->getPropertyValue(s_sposition) >>= sPosition;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sPosition;
}
::rtl::OUString SvtUserOptions_Impl::GetTitle() const
{
::rtl::OUString sTitle;
try
{
m_xData->getPropertyValue(s_stitle) >>= sTitle;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sTitle;
}
::rtl::OUString SvtUserOptions_Impl::GetTelephoneHome() const
{
::rtl::OUString sTelephoneHome;
try
{
m_xData->getPropertyValue(s_shomephone) >>= sTelephoneHome;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sTelephoneHome;
}
::rtl::OUString SvtUserOptions_Impl::GetTelephoneWork() const
{
::rtl::OUString sTelephoneWork;
try
{
m_xData->getPropertyValue(s_stelephonenumber) >>=
sTelephoneWork;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sTelephoneWork;
}
::rtl::OUString SvtUserOptions_Impl::GetFax() const
{
::rtl::OUString sFax;
try
{
m_xData->getPropertyValue(s_sfacsimiletelephonenumber) >>= sFax;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sFax;
}
::rtl::OUString SvtUserOptions_Impl::GetEmail() const
{
::rtl::OUString sEmail;
try
{
m_xData->getPropertyValue(s_smail) >>= sEmail;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sEmail;
}
::rtl::OUString SvtUserOptions_Impl::GetCustomerNumber() const
{
::rtl::OUString sCustomerNumber;
try
{
m_xData->getPropertyValue(s_scustomernumber) >>=
sCustomerNumber;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sCustomerNumber;
}
::rtl::OUString SvtUserOptions_Impl::GetFathersName() const
{
::rtl::OUString sFathersName;
try
{
m_xData->getPropertyValue(s_sfathersname) >>= sFathersName;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sFathersName;
}
::rtl::OUString SvtUserOptions_Impl::GetApartment() const
{
::rtl::OUString sApartment;
try
{
m_xData->getPropertyValue(s_sapartment) >>= sApartment;
}
catch ( const css::uno::Exception& ex )
{
LogHelper::logIt(ex);
}
return sApartment;
}
void SvtUserOptions_Impl::SetCompany( const ::rtl::OUString& sCompany )
{
try
{
m_xData->setPropertyValue(s_so,
css::uno::makeAny(::rtl::OUString(sCompany)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetFirstName( const ::rtl::OUString& sFirstName )
{
try
{
m_xData->setPropertyValue(s_sgivenname,
css::uno::makeAny(::rtl::OUString(sFirstName)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetLastName( const ::rtl::OUString& sLastName )
{
try
{
m_xData->setPropertyValue(s_ssn,
css::uno::makeAny(::rtl::OUString(sLastName)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetID( const ::rtl::OUString& sID )
{
try
{
m_xData->setPropertyValue(s_sinitials,
css::uno::makeAny(::rtl::OUString(sID)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetStreet( const ::rtl::OUString& sStreet )
{
try
{
m_xData->setPropertyValue(s_sstreet,
css::uno::makeAny(::rtl::OUString(sStreet)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetCity( const ::rtl::OUString& sCity )
{
try
{
m_xData->setPropertyValue(s_sl,
css::uno::makeAny(::rtl::OUString(sCity)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetState( const ::rtl::OUString& sState )
{
try
{
m_xData->setPropertyValue(s_sst,
css::uno::makeAny(::rtl::OUString(sState)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetZip( const ::rtl::OUString& sZip )
{
try
{
m_xData->setPropertyValue(s_spostalcode,
css::uno::makeAny(::rtl::OUString(sZip)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetCountry( const ::rtl::OUString& sCountry )
{
try
{
m_xData->setPropertyValue(s_sc,
css::uno::makeAny(::rtl::OUString(sCountry)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetPosition( const ::rtl::OUString& sPosition )
{
try
{
m_xData->setPropertyValue(s_sposition,
css::uno::makeAny(::rtl::OUString(sPosition)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetTitle( const ::rtl::OUString& sTitle )
{
try
{
m_xData->setPropertyValue(s_stitle,
css::uno::makeAny(::rtl::OUString(sTitle)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetTelephoneHome( const ::rtl::OUString&
sTelephoneHome )
{
try
{
m_xData->setPropertyValue(s_shomephone,
css::uno::makeAny(::rtl::OUString(sTelephoneHome)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetTelephoneWork( const ::rtl::OUString&
sTelephoneWork )
{
try
{
m_xData->setPropertyValue(s_stelephonenumber,
css::uno::makeAny(::rtl::OUString(sTelephoneWork)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetFax( const ::rtl::OUString& sFax )
{
try
{
m_xData->setPropertyValue(s_sfacsimiletelephonenumber,
css::uno::makeAny(::rtl::OUString(sFax)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetEmail( const ::rtl::OUString& sEmail )
{
try
{
m_xData->setPropertyValue(s_smail,
css::uno::makeAny(::rtl::OUString(sEmail)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetCustomerNumber( const ::rtl::OUString&
sCustomerNumber )
{
try
{
m_xData->setPropertyValue(s_scustomernumber,
css::uno::makeAny(::rtl::OUString(sCustomerNumber)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetFathersName( const ::rtl::OUString& sFathersName )
{
try
{
m_xData->setPropertyValue(s_sfathersname,
css::uno::makeAny(::rtl::OUString(sFathersName)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
void SvtUserOptions_Impl::SetApartment( const ::rtl::OUString& sApartment )
{
try
{
m_xData->setPropertyValue(s_sapartment,
css::uno::makeAny(::rtl::OUString(sApartment)));
::comphelper::ConfigurationHelper::flush(m_xCfg);
}
catch ( const css::uno::Exception& ex)
{
LogHelper::logIt(ex);
}
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions_Impl::GetFullName() const
{
::rtl::OUString sFullName;
sFullName = GetFirstName();
sFullName.trim();
if ( sFullName.getLength() )
sFullName += ::rtl::OUString::createFromAscii(" ");
sFullName += GetLastName();
sFullName.trim();
return sFullName;
}
// -----------------------------------------------------------------------
sal_Bool SvtUserOptions_Impl::IsTokenReadonly( USHORT nToken ) const
{
css::uno::Reference< css::beans::XPropertySet > m_xData(m_xCfg,
css::uno::UNO_QUERY);
css::uno::Reference< css::beans::XPropertySetInfo > xInfo =
m_xData->getPropertySetInfo();
css::beans::Property aProp;
sal_Bool bRet = sal_False;
switch ( nToken )
{
case USER_OPT_COMPANY:
{
aProp = xInfo->getPropertyByName(s_so);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_FIRSTNAME:
{
aProp = xInfo->getPropertyByName(s_sgivenname);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_LASTNAME:
{
aProp = xInfo->getPropertyByName(s_ssn);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_ID:
{
aProp = xInfo->getPropertyByName(s_sinitials);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_STREET:
{
aProp = xInfo->getPropertyByName(s_sstreet);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_CITY:
{
aProp = xInfo->getPropertyByName(s_sl);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_STATE:
{
aProp = xInfo->getPropertyByName(s_sst);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_ZIP:
{
aProp = xInfo->getPropertyByName(s_spostalcode);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_COUNTRY:
{
aProp = xInfo->getPropertyByName(s_sc);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_POSITION:
{
aProp = xInfo->getPropertyByName(s_sposition);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_TITLE:
{
aProp = xInfo->getPropertyByName(s_stitle);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_TELEPHONEHOME:
{
aProp = xInfo->getPropertyByName(s_shomephone);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_TELEPHONEWORK:
{
aProp =
xInfo->getPropertyByName(s_stelephonenumber);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_FAX:
{
aProp =
xInfo->getPropertyByName(s_sfacsimiletelephonenumber);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_EMAIL:
{
aProp = xInfo->getPropertyByName(s_smail);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_FATHERSNAME:
{
aProp =
xInfo->getPropertyByName(s_sfathersname);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
case USER_OPT_APARTMENT:
{
aProp = xInfo->getPropertyByName(s_sapartment);
bRet = ((aProp.Attributes &
css::beans::PropertyAttribute::READONLY) ==
css::beans::PropertyAttribute::READONLY);
break;
}
default:
DBG_ERRORFILE( "SvtUserOptions_Impl::IsTokenReadonly():
invalid token" );
}
return bRet;
}
//------------------------------------------------------------------------
::rtl::OUString SvtUserOptions_Impl::GetToken(USHORT nToken) const
{
::rtl::OUString pRet;
switch(nToken)
{
case USER_OPT_COMPANY: pRet = GetCompany(); break;
case USER_OPT_FIRSTNAME: pRet = GetFirstName(); break;
case USER_OPT_LASTNAME: pRet = GetLastName(); break;
case USER_OPT_ID: pRet = GetID(); break;
case USER_OPT_STREET: pRet = GetStreet(); break;
case USER_OPT_CITY: pRet = GetCity(); break;
case USER_OPT_STATE: pRet = GetState(); break;
case USER_OPT_ZIP: pRet = GetZip(); break;
case USER_OPT_COUNTRY: pRet = GetCountry(); break;
case USER_OPT_POSITION: pRet = GetPosition(); break;
case USER_OPT_TITLE: pRet = GetTitle(); break;
case USER_OPT_TELEPHONEHOME: pRet = GetTelephoneHome(); break;
case USER_OPT_TELEPHONEWORK: pRet = GetTelephoneWork(); break;
case USER_OPT_FAX: pRet = GetFax(); break;
case USER_OPT_EMAIL: pRet = GetEmail(); break;
case USER_OPT_FATHERSNAME: pRet = GetFathersName(); break;
case USER_OPT_APARTMENT: pRet = GetApartment(); break;
default:
DBG_ERRORFILE( "SvtUserOptions_Impl::GetToken(): invalid token" );
}
return pRet;
}
// class SvtUserOptions --------------------------------------------------
SvtUserOptions::SvtUserOptions()
{
// Global access, must be guarded (multithreading)
::osl::MutexGuard aGuard( GetInitMutex() );
if ( !pOptions )
{
RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? )
::SvtUserOptions_Impl::ctor()");
pOptions = new SvtUserOptions_Impl;
ItemHolder2::holdConfigItem(E_USEROPTIONS);
}
++nRefCount;
pImp = pOptions;
//StartListening( *pImp);
}
// -----------------------------------------------------------------------
SvtUserOptions::~SvtUserOptions()
{
// Global access, must be guarded (multithreading)
::osl::MutexGuard aGuard( GetInitMutex() );
if ( !--nRefCount )
{
//if ( pOptions->IsModified() )
// pOptions->Commit();
DELETEZ( pOptions );
}
}
// -----------------------------------------------------------------------
::osl::Mutex& SvtUserOptions::GetInitMutex()
{
// Initialize static mutex only for one time!
static ::osl::Mutex* pMutex = NULL;
// If these method first called (Mutex not already exist!) ...
if ( pMutex == NULL )
{
// ... we must create a new one. Protect follow code with the
global mutex -
// It must be - we create a static variable!
::osl::MutexGuard aGuard( ::osl::Mutex::getGlobalMutex() );
// We must check our pointer again -
// because another instance of our class will be faster then
this instance!
if ( pMutex == NULL )
{
// Create the new mutex and set it for return on static
variable.
static ::osl::Mutex aMutex;
pMutex = &aMutex;
}
}
// Return new created or already existing mutex object.
return *pMutex;
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetCompany() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetCompany();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetFirstName() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetFirstName();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetLastName() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetLastName();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetID() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetID();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetStreet() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetStreet();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetCity() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetCity();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetState() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetState();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetZip() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetZip();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetCountry() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetCountry();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetPosition() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetPosition();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetTitle() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetTitle();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetTelephoneHome() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetTelephoneHome();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetTelephoneWork() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetTelephoneWork();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetFax() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetFax();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetEmail() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetEmail();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetCustomerNumber() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetCustomerNumber();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetFathersName() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetFathersName() ;
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetApartment() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetApartment();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetFullName() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetFullName();
}
// -----------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetLocale() const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetLocale();
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetCompany( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetCompany( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetFirstName( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetFirstName( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetLastName( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetLastName( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetID( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetID( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetStreet( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetStreet( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetCity( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetCity( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetState( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetState( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetZip( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetZip( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetCountry( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetCountry( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetPosition( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetPosition( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetTitle( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetTitle( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetTelephoneHome( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetTelephoneHome( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetTelephoneWork( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetTelephoneWork( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetFax( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetFax( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetEmail( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetEmail( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetCustomerNumber( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetCustomerNumber( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetFathersName( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetFathersName( rNewToken );
}
// -----------------------------------------------------------------------
void SvtUserOptions::SetApartment( const ::rtl::OUString& rNewToken )
{
::osl::MutexGuard aGuard( GetInitMutex() );
pImp->SetApartment( rNewToken );
}
// -----------------------------------------------------------------------
sal_Bool SvtUserOptions::IsTokenReadonly( USHORT nToken ) const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->IsTokenReadonly( nToken );
}
//------------------------------------------------------------------------
::rtl::OUString SvtUserOptions::GetToken(USHORT nToken) const
{
::osl::MutexGuard aGuard( GetInitMutex() );
return pImp->GetToken( nToken );
}
/* -----------------07.07.2003 09:30-----------------
--------------------------------------------------*/
void SvtUserOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
{
vos::OGuard aVclGuard( Application::GetSolarMutex() );
Broadcast( rHint );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
