diff options
| -rw-r--r-- | desktop/source/app/app.cxx | 11 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 55 | ||||
| -rw-r--r-- | svx/source/fmcomp/gridcell.cxx | 11 |
3 files changed, 7 insertions, 70 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index afc957275c35..3a59a165a60f 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -2196,17 +2196,6 @@ void Desktop::SystemSettingsChanging( AllSettings& rSettings, Window* ) } hStyleSettings.SetUseImagesInMenus(bUseImagesInMenus); - sal_uInt16 nTabStyle = hStyleSettings.GetTabControlStyle(); - nTabStyle &= ~STYLE_TABCONTROL_SINGLELINE; - if( aAppearanceCfg.IsSingleLineTabCtrl() ) - nTabStyle |=STYLE_TABCONTROL_SINGLELINE; - - nTabStyle &= ~STYLE_TABCONTROL_COLOR; - if( aAppearanceCfg.IsColoredTabCtrl() ) - nTabStyle |= STYLE_TABCONTROL_COLOR; - - hStyleSettings.SetTabControlStyle(nTabStyle); - hStyleSettings.SetDragFullOptions( nDragFullOptions ); rSettings.SetStyleSettings ( hStyleSettings ); } diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 9bc07c592f0f..ae171230dd13 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -2600,39 +2600,6 @@ </constraints> <value>100</value> </prop> - <prop oor:name="LookAndFeel" oor:type="xs:short"> - <!-- OldPath: General/View --> - <!-- OldLocation: soffice.cfg --> - <!-- UIHints: Tools Options - General View [Section] Display --> - <info> - <author>PB</author> - <desc>Determines the look and feel of the application.</desc> - <label>Look & Feel</label> - </info> - <constraints> - <enumeration oor:value="0"> - <info> - <desc>Standard</desc> - </info> - </enumeration> - <enumeration oor:value="1"> - <info> - <desc>Macintosh</desc> - </info> - </enumeration> - <enumeration oor:value="2"> - <info> - <desc>X Window</desc> - </info> - </enumeration> - <enumeration oor:value="3"> - <info> - <desc>OS/2</desc> - </info> - </enumeration> - </constraints> - <value>0</value> - </prop> <group oor:name="NewDocumentHandling"> <info> <author>CD</author> @@ -2714,17 +2681,6 @@ </info> <value>true</value> </prop> - <prop oor:name="ColoredTab" oor:type="xs:boolean"> - <!-- OldPath: General/View --> - <!-- OldLocation: soffice.cfg --> - <!-- UIHints: Tools Options - General View [Section] Options --> - <info> - <author>PB</author> - <desc>Specifies TabDialogs with colored tab control (True)</desc> - <label>Colored tab controls</label> - </info> - <value>false</value> - </prop> <prop oor:name="MousePositioning" oor:type="xs:short"> <!-- OldPath: General/View --> <!-- OldLocation: soffice.cfg --> @@ -2780,17 +2736,6 @@ </constraints> <value>1</value> </prop> - <prop oor:name="SingleLineTab" oor:type="xs:boolean"> - <!-- OldPath: General/View --> - <!-- OldLocation: soffice.cfg --> - <!-- UIHints: Tools Options - General View [Section] Options --> - <info> - <author>PB</author> - <desc>Specifies TabDialogs with single line tab control (True).</desc> - <label>Single line tab controls</label> - </info> - <value>false</value> - </prop> </group> <group oor:name="Localisation"> <info> diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index bb8afd502d43..33df3183065b 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -1653,11 +1653,14 @@ DbCheckBox::DbCheckBox( DbGridColumn& _rColumn ) namespace { - void setCheckBoxStyle( Window* _pWindow, USHORT nStyle ) + void setCheckBoxStyle( Window* _pWindow, bool bMono ) { AllSettings aSettings = _pWindow->GetSettings(); StyleSettings aStyleSettings = aSettings.GetStyleSettings(); - aStyleSettings.SetCheckBoxStyle( nStyle ); + if( bMono ) + aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_MONO ); + else + aStyleSettings.SetOptions( aStyleSettings.GetOptions() & (~STYLE_OPTION_MONO) ); aSettings.SetStyleSettings( aStyleSettings ); _pWindow->SetSettings( aSettings ); } @@ -1683,8 +1686,8 @@ void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor ) sal_Int16 nStyle = awt::VisualEffect::LOOK3D; OSL_VERIFY( xModel->getPropertyValue( FM_PROP_VISUALEFFECT ) >>= nStyle ); - setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT ? STYLE_CHECKBOX_MONO : STYLE_CHECKBOX_WIN ); - setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT ? STYLE_CHECKBOX_MONO : STYLE_CHECKBOX_WIN ); + setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT ); + setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT ); sal_Bool bTristate = sal_True; OSL_VERIFY( xModel->getPropertyValue( FM_PROP_TRISTATE ) >>= bTristate ); |