diff options
author | Caolán McNamara <caolanm@redhat.com> | 2016-07-10 16:28:23 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-07-10 19:12:39 +0100 |
commit | 4bc99ab1ac4bed1df66d1df8b1ca3168e7e3d8f4 (patch) | |
tree | 71a8870ce14fb7f9e711d77c31667a4febe29d96 /unotools | |
parent | ec950f8ebb2745ccff2275dcc09d2034cd73dfeb (diff) |
ditch the multiply dialog width * X where X is based on language thing
Which should be unnecessary since the vcl layout work and optimal size widgets,
and its a small and arbitary set of languages for which its set.
Change-Id: Ifa397218510ade251f795cdd9360d6bdccb115b7
Diffstat (limited to 'unotools')
-rw-r--r-- | unotools/source/config/localisationoptions.cxx | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/unotools/source/config/localisationoptions.cxx b/unotools/source/config/localisationoptions.cxx index 6716a034820c..d93f8b3718ac 100644 --- a/unotools/source/config/localisationoptions.cxx +++ b/unotools/source/config/localisationoptions.cxx @@ -32,15 +32,12 @@ using namespace ::com::sun::star::uno; #define ROOTNODE_LOCALISATION OUString("Office.Common/View/Localisation") #define DEFAULT_AUTOMNEMONIC false -#define DEFAULT_DIALOGSCALE 0 #define PROPERTYNAME_AUTOMNEMONIC "AutoMnemonic" -#define PROPERTYNAME_DIALOGSCALE "DialogScale" #define PROPERTYHANDLE_AUTOMNEMONIC 0 -#define PROPERTYHANDLE_DIALOGSCALE 1 -#define PROPERTYCOUNT 2 +#define PROPERTYCOUNT 1 class SvtLocalisationOptions_Impl : public ConfigItem { @@ -69,7 +66,6 @@ class SvtLocalisationOptions_Impl : public ConfigItem *//*-*****************************************************************************************************/ bool IsAutoMnemonic ( ) const { return m_bAutoMnemonic;} - sal_Int32 GetDialogScale ( ) const { return m_nDialogScale;} private: @@ -87,7 +83,6 @@ class SvtLocalisationOptions_Impl : public ConfigItem private: bool m_bAutoMnemonic; - sal_Int32 m_nDialogScale; }; // constructor @@ -97,7 +92,6 @@ SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl() : ConfigItem ( ROOTNODE_LOCALISATION ) // Init member then. , m_bAutoMnemonic ( DEFAULT_AUTOMNEMONIC ) - , m_nDialogScale ( DEFAULT_DIALOGSCALE ) { // Use our static list of configuration keys to get his values. Sequence< OUString > seqNames = GetPropertyNames ( ); @@ -121,12 +115,6 @@ SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl() seqValues[nProperty] >>= m_bAutoMnemonic; } break; - - case PROPERTYHANDLE_DIALOGSCALE : { - DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Localisation\\DialogScale\"?" ); - seqValues[nProperty] >>= m_nDialogScale; - } - break; } } @@ -160,12 +148,6 @@ void SvtLocalisationOptions_Impl::Notify( const Sequence< OUString >& seqPropert DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_BOOLEAN), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Localisation\\AutoMnemonic\"?" ); seqValues[nProperty] >>= m_bAutoMnemonic; } - else - if( seqPropertyNames[nProperty] == PROPERTYNAME_DIALOGSCALE ) - { - DBG_ASSERT(!(seqValues[nProperty].getValueTypeClass()!=TypeClass_LONG), "SvtLocalisationOptions_Impl::SvtLocalisationOptions_Impl()\nWho has changed the value type of \"Office.Common\\View\\Localisation\\DialogScale\"?" ); - seqValues[nProperty] >>= m_nDialogScale; - } #if OSL_DEBUG_LEVEL > 0 else assert(false && "SvtLocalisationOptions_Impl::Notify()\nUnknown property detected ... I can't handle these!\n"); #endif @@ -190,11 +172,6 @@ void SvtLocalisationOptions_Impl::ImplCommit() seqValues[nProperty] <<= m_bAutoMnemonic; } break; - - case PROPERTYHANDLE_DIALOGSCALE : { - seqValues[nProperty] <<= m_nDialogScale; - } - break; } } // Set properties in configuration. @@ -210,7 +187,6 @@ Sequence< OUString > SvtLocalisationOptions_Impl::GetPropertyNames() const OUString aProperties[] = { OUString(PROPERTYNAME_AUTOMNEMONIC) , - OUString(PROPERTYNAME_DIALOGSCALE) , }; // Initialize return sequence with these list ... Sequence< OUString > seqPropertyNames(aProperties, PROPERTYCOUNT); @@ -254,14 +230,6 @@ bool SvtLocalisationOptions::IsAutoMnemonic() const return m_pImpl->IsAutoMnemonic(); } -// public method - -sal_Int32 SvtLocalisationOptions::GetDialogScale() const -{ - MutexGuard aGuard( GetOwnStaticMutex() ); - return m_pImpl->GetDialogScale(); -} - namespace { class theLocalisationOptionsMutex : public rtl::Static<osl::Mutex, theLocalisationOptionsMutex>{}; |