diff options
| -rw-r--r-- | vcl/source/app/settings.cxx | 160 |
1 files changed, 12 insertions, 148 deletions
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 38e6d3aa190f..d435bc130589 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -2,9 +2,9 @@ * * $RCSfile: settings.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: th $ $Date: 2001-06-29 10:11:26 $ + * last change: $Author: th $ $Date: 2001-07-06 15:53:53 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,6 +64,9 @@ #ifndef _DEBUG_HXX #include <tools/debug.hxx> #endif +#ifndef _ISOLANG_HXX +#include <tools/isolang.hxx> +#endif #ifndef _SV_SVDATA_HXX #include <svdata.hxx> @@ -75,10 +78,6 @@ #include <settings.hxx> #endif -#ifndef _ISOLANG_HXX -#include <tools/isolang.hxx> -#endif - #pragma hdrstop // ======================================================================= @@ -191,20 +190,6 @@ BOOL MachineSettings::operator ==( const MachineSettings& rSet ) const return FALSE; } -// ----------------------------------------------------------------------- - -SvStream& operator>>( SvStream& rIStream, MachineSettings& rSet ) -{ - return rIStream; -} - -// ----------------------------------------------------------------------- - -SvStream& operator<<( SvStream& rOStream, const MachineSettings& rSet ) -{ - return rOStream; -} - // ======================================================================= ImplMouseData::ImplMouseData() @@ -352,20 +337,6 @@ BOOL MouseSettings::operator ==( const MouseSettings& rSet ) const return FALSE; } -// ----------------------------------------------------------------------- - -SvStream& operator>>( SvStream& rIStream, MouseSettings& rSet ) -{ - return rIStream; -} - -// ----------------------------------------------------------------------- - -SvStream& operator<<( SvStream& rOStream, const MouseSettings& rSet ) -{ - return rOStream; -} - // ======================================================================= ImplKeyboardData::ImplKeyboardData() @@ -456,20 +427,6 @@ BOOL KeyboardSettings::operator ==( const KeyboardSettings& rSet ) const return FALSE; } -// ----------------------------------------------------------------------- - -SvStream& operator>>( SvStream& rIStream, KeyboardSettings& rSet ) -{ - return rIStream; -} - -// ----------------------------------------------------------------------- - -SvStream& operator<<( SvStream& rOStream, const KeyboardSettings& rSet ) -{ - return rOStream; -} - // ======================================================================= ImplStyleData::ImplStyleData() @@ -1080,20 +1037,6 @@ BOOL StyleSettings::operator ==( const StyleSettings& rSet ) const return FALSE; } -// ----------------------------------------------------------------------- - -SvStream& operator>>( SvStream& rIStream, StyleSettings& rSet ) -{ - return rIStream; -} - -// ----------------------------------------------------------------------- - -SvStream& operator<<( SvStream& rOStream, const StyleSettings& rSet ) -{ - return rOStream; -} - // ======================================================================= ImplMiscData::ImplMiscData() @@ -1184,20 +1127,6 @@ BOOL MiscSettings::operator ==( const MiscSettings& rSet ) const return FALSE; } -// ----------------------------------------------------------------------- - -SvStream& operator>>( SvStream& rIStream, MiscSettings& rSet ) -{ - return rIStream; -} - -// ----------------------------------------------------------------------- - -SvStream& operator<<( SvStream& rOStream, const MiscSettings& rSet ) -{ - return rOStream; -} - // ======================================================================= ImplSoundData::ImplSoundData() @@ -1288,20 +1217,6 @@ BOOL SoundSettings::operator ==( const SoundSettings& rSet ) const return FALSE; } -// ----------------------------------------------------------------------- - -SvStream& operator>>( SvStream& rIStream, SoundSettings& rSet ) -{ - return rIStream; -} - -// ----------------------------------------------------------------------- - -SvStream& operator<<( SvStream& rOStream, const SoundSettings& rSet ) -{ - return rOStream; -} - // ======================================================================= ImplNotificationData::ImplNotificationData() @@ -1392,20 +1307,6 @@ BOOL NotificationSettings::operator ==( const NotificationSettings& rSet ) const return FALSE; } -// ----------------------------------------------------------------------- - -SvStream& operator>>( SvStream& rIStream, NotificationSettings& rSet ) -{ - return rIStream; -} - -// ----------------------------------------------------------------------- - -SvStream& operator<<( SvStream& rOStream, const NotificationSettings& rSet ) -{ - return rOStream; -} - // ======================================================================= ImplHelpData::ImplHelpData() @@ -1505,20 +1406,6 @@ BOOL HelpSettings::operator ==( const HelpSettings& rSet ) const return FALSE; } -// ----------------------------------------------------------------------- - -SvStream& operator>>( SvStream& rIStream, HelpSettings& rSet ) -{ - return rIStream; -} - -// ----------------------------------------------------------------------- - -SvStream& operator<<( SvStream& rOStream, const HelpSettings& rSet ) -{ - return rOStream; -} - // ======================================================================= static BOOL ImplCompareLocales( const ::com::sun::star::lang::Locale& L1, const ::com::sun::star::lang::Locale& L2 ) @@ -1724,7 +1611,13 @@ ULONG AllSettings::Update( ULONG nFlags, const AllSettings& rSet ) { if ( mpData->maInternational != rSet.mpData->maInternational ) { - SetInternational( rSet.mpData->maInternational ); + CopyData(); + mpData->maInternational = rSet.mpData->maInternational; + mpData->meLanguage = mpData->maInternational.GetFormatLanguage(); + mpData->meUILanguage = mpData->maInternational.GetLanguage(); + // Will be calculated in GetLocale()/GetUILocale() + mpData->maLocale = ::com::sun::star::lang::Locale(); + mpData->maUILocale = ::com::sun::star::lang::Locale(); nChangeFlags |= SETTINGS_INTERNATIONAL; } } @@ -1831,21 +1724,6 @@ BOOL AllSettings::operator ==( const AllSettings& rSet ) const // ----------------------------------------------------------------------- -void AllSettings::SetInternational( const International& rIntn ) -{ - CopyData(); - - mpData->maInternational = rIntn; - - mpData->meLanguage = rIntn.GetFormatLanguage(); - mpData->meUILanguage = rIntn.GetLanguage(); - // Will be calculated in GetLocale()/GetUILocale() - mpData->maLocale = ::com::sun::star::lang::Locale(); - mpData->maUILocale = ::com::sun::star::lang::Locale(); -} - -// ----------------------------------------------------------------------- - void AllSettings::SetLocale( const ::com::sun::star::lang::Locale& rLocale ) { CopyData(); @@ -1951,17 +1829,3 @@ LanguageType AllSettings::GetUILanguage() const return mpData->meUILanguage; } - -// ----------------------------------------------------------------------- - -SvStream& operator>>( SvStream& rIStream, AllSettings& rSet ) -{ - return rIStream; -} - -// ----------------------------------------------------------------------- - -SvStream& operator<<( SvStream& rOStream, const AllSettings& rSet ) -{ - return rOStream; -} |