vcl117: #i115686# remove old unused style setting

2 files changed, 19 insertions, 88 deletions

diff --git a/svtools/inc/apearcfg.hxx b/svtools/inc/apearcfg.hxx
index 8e6018424c4c..5dea74761e17 100644
--- a/svtools/inc/apearcfg.hxx
+++ b/svtools/inc/apearcfg.hxx
@@ -37,14 +37,6 @@ class Application;
      Beschreibung:
  --------------------------------------------------------------------*/
 typedef enum {
-    LookStardivision = 0,
-    LookMotif,
-    LookWindows,
-    LookOSTwo,
-    LookMacintosh
-} SystemLook;
-
-typedef enum {
     SnapToButton = 0,
     SnapToMiddle,
     NoSnap
@@ -59,7 +51,6 @@ typedef enum { // MUST match the order chosen in ListBox LB_DRAG_MODE in optgdlg
 
 class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem
 {
-    short           nLookNFeel          ;
     short           nDragMode           ;
     short           nScaleFactor        ;
     short           nSnapMode           ;
@@ -69,8 +60,6 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem
 #endif
 
     BOOL            bMenuMouseFollow        ;
-    BOOL            bSingleLineTabCtrl      ;
-    BOOL            bColoredTabCtrl         ;
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
     BOOL            bFontAntialiasing       ;
 #endif
@@ -86,9 +75,6 @@ public:
     virtual void    Commit();
     virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames);
 
-    USHORT      GetLookNFeel () const { return nLookNFeel; }
-    void        SetLookNFeel ( USHORT nSet );
-
     USHORT      GetDragMode  () const { return nDragMode; }
     void        SetDragMode  ( USHORT nSet );
 
@@ -106,9 +92,6 @@ public:
     void        SetMenuMouseFollow(BOOL bSet) {bMenuMouseFollow = bSet; SetModified();}
     BOOL        IsMenuMouseFollow() const{return bMenuMouseFollow;}
 
-    void        SetSingleLineTabCtrl(BOOL bSet) {bSingleLineTabCtrl = bSet; SetModified();}
-    BOOL        IsSingleLineTabCtrl()const {return   bSingleLineTabCtrl;}
-
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
     void        SetFontAntiAliasing( BOOL bSet )    { bFontAntialiasing = bSet; SetModified(); }
     BOOL        IsFontAntiAliasing() const { return bFontAntialiasing; }
@@ -117,9 +100,6 @@ public:
     void        SetFontAntialiasingMinPixelHeight( USHORT _nMinHeight ) { nAAMinPixelHeight = _nMinHeight; SetModified(); }
 #endif
 
-    void        SetColoredTabCtrl(BOOL bSet)   {bColoredTabCtrl = bSet; SetModified();};
-    BOOL        IsColoredTabCtrl()const {return     bColoredTabCtrl;}
-
     static sal_Bool IsInitialized()  { return bInitialized; }
     static void    SetInitialized() { bInitialized = sal_True; }
 };
diff --git a/svtools/source/config/apearcfg.cxx b/svtools/source/config/apearcfg.cxx
index 316e6ab34656..bb8087fc53be 100644
--- a/svtools/source/config/apearcfg.cxx
+++ b/svtools/source/config/apearcfg.cxx
@@ -52,7 +52,6 @@ sal_Bool SvtTabAppearanceCfg::bInitialized = sal_False;
  --------------------------------------------------------------------*/
 SvtTabAppearanceCfg::SvtTabAppearanceCfg()
     :ConfigItem(OUString::createFromAscii("Office.Common/View"))
-    ,nLookNFeel         ( DEFAULT_LOOKNFEEL )
     ,nDragMode          ( DEFAULT_DRAGMODE )
     ,nScaleFactor       ( DEFAULT_SCALEFACTOR )
     ,nSnapMode          ( DEFAULT_SNAPMODE )
@@ -61,8 +60,6 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
     ,nAAMinPixelHeight  ( DEFAULT_AAMINHEIGHT )
 #endif
     ,bMenuMouseFollow(FALSE)
-    ,bSingleLineTabCtrl(FALSE)
-    ,bColoredTabCtrl(FALSE)
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
     ,bFontAntialiasing  ( TRUE )
 #endif
@@ -83,16 +80,13 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
                 switch(nProp)
                 {
                     case  0: *pValues >>= nScaleFactor; break; //"FontScaling",
-                    case  1: *pValues >>= nLookNFeel; break;  //"LookAndFeel",
-                    case  2: *pValues >>= nDragMode; break;   //"Window/Drag",
-                    case  3: bMenuMouseFollow = *(sal_Bool*)pValues->getValue(); break; //"Menu/FollowMouse",
-                    case  4: bSingleLineTabCtrl      = *(sal_Bool*)pValues->getValue(); break; //"Dialog/SingleLineTab",
-                    case  5: bColoredTabCtrl = *(sal_Bool*)pValues->getValue(); break; //"Dialog/ColoredTab",
-                    case  6: *pValues >>= nSnapMode; break; //"Dialog/MousePositioning",
-                    case  7: *pValues >>= nMiddleMouse; break; //"Dialog/MiddleMouseButton",
+                    case  1: *pValues >>= nDragMode; break;   //"Window/Drag",
+                    case  2: bMenuMouseFollow = *(sal_Bool*)pValues->getValue(); break; //"Menu/FollowMouse",
+                    case  3: *pValues >>= nSnapMode; break; //"Dialog/MousePositioning",
+                    case  4: *pValues >>= nMiddleMouse; break; //"Dialog/MiddleMouseButton",
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
-                    case  8: bFontAntialiasing = *(sal_Bool*)pValues->getValue(); break;    // "FontAntialising/Enabled",
-                    case  9: *pValues >>= nAAMinPixelHeight; break;                         // "FontAntialising/MinPixelHeight",
+                    case  5: bFontAntialiasing = *(sal_Bool*)pValues->getValue(); break;    // "FontAntialising/Enabled",
+                    case  6: *pValues >>= nAAMinPixelHeight; break;                         // "FontAntialising/MinPixelHeight",
 #endif
                 }
             }
@@ -116,16 +110,13 @@ const Sequence<OUString>& SvtTabAppearanceCfg::GetPropertyNames()
         static const sal_Char* aPropNames[] =
         {
              "FontScaling"                       //  0
-            ,"LookAndFeel"                       //  1
-            ,"Window/Drag"                       //  2
-            ,"Menu/FollowMouse"                  //  3
-            ,"Dialog/SingleLineTab"              //  4
-            ,"Dialog/ColoredTab"                 //  5
-            ,"Dialog/MousePositioning"           //  6
-            ,"Dialog/MiddleMouseButton"          //  7
+            ,"Window/Drag"                       //  1
+            ,"Menu/FollowMouse"                  //  2
+            ,"Dialog/MousePositioning"           //  3
+            ,"Dialog/MiddleMouseButton"          //  4
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
-            ,"FontAntiAliasing/Enabled"         //  8
-            ,"FontAntiAliasing/MinPixelHeight"  //  9
+            ,"FontAntiAliasing/Enabled"         //  5
+            ,"FontAntiAliasing/MinPixelHeight"  //  6
 #endif
         };
         const int nCount = sizeof( aPropNames ) / sizeof( aPropNames[0] );
@@ -153,16 +144,13 @@ void  SvtTabAppearanceCfg::Commit()
         switch(nProp)
         {
             case  0: pValues[nProp] <<= nScaleFactor; break;            // "FontScaling",
-            case  1: pValues[nProp] <<= nLookNFeel; break;              //"LookAndFeel",
-            case  2: pValues[nProp] <<= nDragMode; break;               //"Window/Drag",
-            case  3: pValues[nProp].setValue(&bMenuMouseFollow, rType); break; //"Menu/FollowMouse",
-            case  4: pValues[nProp].setValue(&bSingleLineTabCtrl, rType); break; //"Dialog/SingleLineTab",
-            case  5: pValues[nProp].setValue(&bColoredTabCtrl, rType); break; //"Dialog/ColoredTab",
-            case  6: pValues[nProp] <<= nSnapMode; break;               //"Dialog/MousePositioning",
-            case  7: pValues[nProp] <<= nMiddleMouse; break;               //"Dialog/MiddleMouseButton",
+            case  1: pValues[nProp] <<= nDragMode; break;               //"Window/Drag",
+            case  2: pValues[nProp].setValue(&bMenuMouseFollow, rType); break; //"Menu/FollowMouse",
+            case  3: pValues[nProp] <<= nSnapMode; break;               //"Dialog/MousePositioning",
+            case  4: pValues[nProp] <<= nMiddleMouse; break;               //"Dialog/MiddleMouseButton",
 #if defined( UNX ) || defined ( FS_PRIV_DEBUG )
-            case  8: pValues[nProp].setValue(&bFontAntialiasing, rType); break; // "FontAntialising/Enabled",
-            case  9: pValues[nProp] <<= nAAMinPixelHeight; break;               // "FontAntialising/MinPixelHeight",
+            case  5: pValues[nProp].setValue(&bFontAntialiasing, rType); break; // "FontAntialising/Enabled",
+            case  6: pValues[nProp] <<= nAAMinPixelHeight; break;               // "FontAntialising/MinPixelHeight",
 #endif
         }
     }
@@ -177,16 +165,6 @@ void SvtTabAppearanceCfg::Notify( const com::sun::star::uno::Sequence< rtl::OUSt
      Beschreibung:
  --------------------------------------------------------------------*/
 
-void SvtTabAppearanceCfg::SetLookNFeel ( USHORT nSet )
-{
-    nLookNFeel = nSet;
-    SetModified();
-}
-
-/*--------------------------------------------------------------------
-     Beschreibung:
- --------------------------------------------------------------------*/
-
 void SvtTabAppearanceCfg::SetDragMode  ( USHORT nSet )
 {
     nDragMode = nSet;
@@ -234,26 +212,7 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp )
     // SetStandard...Styles() resets the UseSystemUIFonts flag,
     // but we don't want to change it now, so save the flag before ...
     BOOL bUseSystemUIFonts = hAppStyle.GetUseSystemUIFonts();
-
-    switch ( nLookNFeel )
-    {
-        case LookMotif:
-            hAppStyle.SetStandardUnixStyles();  break;
-
-        case LookOSTwo:
-            hAppStyle.SetStandardOS2Styles();   break;
-
-        case LookMacintosh:
-            hAppStyle.SetStandardMacStyles();   break;
-
-        case LookWindows:
-            hAppStyle.SetStandardWinStyles();   break;
-
-        case LookStardivision:
-        default:
-            hAppStyle.SetStandardStyles();      break;
-    }
-
+    hAppStyle.SetStandardStyles();
     // and set it here
     hAppStyle.SetUseSystemUIFonts( bUseSystemUIFonts );
 
@@ -298,14 +257,6 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp )
     else
         nFollow &= ~MOUSE_FOLLOW_MENU;
     hMouseSettings.SetFollow( nFollow );
-    sal_uInt16 nTabStyle = 0;
-    if(bSingleLineTabCtrl)
-        nTabStyle |= STYLE_TABCONTROL_SINGLELINE;
-
-    if(bColoredTabCtrl)
-        nTabStyle |= STYLE_TABCONTROL_COLOR;
-    hAppStyle.SetTabControlStyle(nTabStyle);
-
 
     hAppSettings.SetMouseSettings( hMouseSettings );