[Libreoffice-commits] .: unusedcode.easy vcl/inc vcl/source

[Caolán McNamara]

 unusedcode.easy             |    1 -
 vcl/inc/vcl/settings.hxx    |    8 +++++---
 vcl/source/app/settings.cxx |    6 ++----
 3 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 507a5d0eb718bcd6c294029775008e0f99d70e0f
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Feb 13 13:12:41 2012 +0000

    manual override of ATToolSupport is a windows-only feature

diff --git a/unusedcode.easy b/unusedcode.easy
index 61b121e..2382401 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -89,7 +89,6 @@ MetaCommentAction::MetaCommentAction(unsigned char const*, unsigned int)
 MetricBox::RemoveValue(long, FieldUnit)
 MetricField::ConvertValue(long, unsigned short, FieldUnit, MapUnit)
 MiscSettings::SetDisablePrinting(unsigned char)
-MiscSettings::SetEnableATToolSupport(unsigned char)
 MoreButton::RemoveWindow(Window*)
 MultiLineEdit::GetHScrollBar() const
 MultiLineEdit::GetLeftMargin() const
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 2494f4f..ba961b1 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -990,12 +990,14 @@ public:
                                     MiscSettings( const MiscSettings& rSet );
                                     ~MiscSettings();
 
+#ifdef WNT
     void                            SetEnableATToolSupport( sal_Bool bEnable );
-    sal_Bool                            GetEnableATToolSupport() const;
+#endif
+    sal_Bool                        GetEnableATToolSupport() const;
     void                            SetDisablePrinting( sal_Bool bEnable );
-    sal_Bool                            GetDisablePrinting() const;
+    sal_Bool                        GetDisablePrinting() const;
     void                            SetEnableLocalizedDecimalSep( sal_Bool bEnable );
-    sal_Bool                            GetEnableLocalizedDecimalSep() const;
+    sal_Bool                        GetEnableLocalizedDecimalSep() const;
     const MiscSettings&             operator =( const MiscSettings& rSet );
 
     sal_Bool                            operator ==( const MiscSettings& rSet ) const;
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 2a3a5ca..1502d06 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -1230,8 +1230,7 @@ void MiscSettings::SetDisablePrinting( sal_Bool bEnable )
     }
 }
 
-// -----------------------------------------------------------------------
-
+#ifdef WNT
 void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable )
 {
     if ( bEnable != mpData->mnEnableATT )
@@ -1240,7 +1239,6 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable )
         if( bEnable && !ImplInitAccessBridge(false, bDummy) )
             return;
 
-#ifdef WNT
         HKEY hkey;
 
         // If the accessibility key in the Windows registry exists, change it synchronously
@@ -1277,7 +1275,6 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable )
             RegCloseKey(hkey);
         }
 
-#endif
         vcl::SettingsConfigItem::get()->
             setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Accessibility" ) ),
                       rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "EnableATToolSupport" ) ),
@@ -1285,6 +1282,7 @@ void MiscSettings::SetEnableATToolSupport( sal_Bool bEnable )
         mpData->mnEnableATT = bEnable ? 1 : 0;
     }
 }
+#endif
 
 void MiscSettings::SetEnableLocalizedDecimalSep( sal_Bool bEnable )
 {