Remove FS_PRIV_DEBUG directive.

comphelper/source/property/propertystatecontainer.cxx

@@ -194,148 +194,4 @@ namespace comphelper
 }   // namespace comphelper
 //.........................................................................
 
-#ifdef FS_PRIV_DEBUG
-#define STATECONTAINER_TEST
-#endif
-
-#ifdef STATECONTAINER_TEST
-#include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <comphelper/proparrhlp.hxx>
-#include <comphelper/broadcasthelper.hxx>
-
-//.........................................................................
-namespace comphelper
-{
-//.........................................................................
-
-    using namespace ::com::sun::star::uno;
-    using namespace ::com::sun::star::beans;
-
-    //=====================================================================
-    //= Test - compiler test
-    //=====================================================================
-    typedef ::cppu::OWeakAggObject  Test_RefCountBase;
-    class Test  :public OMutexAndBroadcastHelper
-                ,public OPropertyStateContainer
-                ,public OPropertyArrayUsageHelper< Test >
-                ,public Test_RefCountBase
-    {
-    private:
-        ::rtl::OUString         m_sStringProperty;
-        Reference< XInterface > m_xInterfaceProperty;
-        Any                     m_aMayBeVoidProperty;
-
-    protected:
-        Test( );
-
-        DECLARE_XINTERFACE( )
-
-    public:
-        static Test* Create( );
-
-    protected:
-        virtual Reference< XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(RuntimeException);
-        virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
-        virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
-
-    protected:
-        // OPropertyStateContainer overridables
-        virtual void getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) const;
-    };
-
-    //---------------------------------------------------------------------
-    Test::Test( )
-        :OPropertyStateContainer( GetBroadcastHelper() )
-    {
-        registerProperty(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StringProperty" )),
-            1,
-            PropertyAttribute::BOUND,
-            &m_sStringProperty,
-            ::getCppuType( &m_sStringProperty )
-        );
-
-        registerProperty(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InterfaceProperty" )),
-            2,
-            PropertyAttribute::BOUND,
-            &m_xInterfaceProperty,
-            ::getCppuType( &m_xInterfaceProperty )
-        );
-
-        registerMayBeVoidProperty(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IntProperty" )),
-            3,
-            PropertyAttribute::BOUND,
-            &m_aMayBeVoidProperty,
-            ::getCppuType( static_cast< sal_Int32* >( NULL ) )
-        );
-
-        registerPropertyNoMember(
-            ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OtherInterfaceProperty" )),
-            4,
-            PropertyAttribute::BOUND | PropertyAttribute::MAYBEVOID,
-            ::getCppuType( static_cast< Reference< XInterface >* >( NULL ) ),
-            NULL
-        );
-    }
-
-    //---------------------------------------------------------------------
-    IMPLEMENT_FORWARD_XINTERFACE2( Test, Test_RefCountBase, OPropertyStateContainer )
-
-    //---------------------------------------------------------------------
-    void Test::getPropertyDefaultByHandle( sal_Int32 _nHandle, Any& _rDefault ) const
-    {
-        switch ( _nHandle )
-        {
-            case 1:
-                _rDefault = makeAny( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StringPropertyDefault" ) ) );
-                break;
-            case 2:
-                _rDefault = makeAny( Reference< XInterface >( ) );
-                break;
-            case 3:
-                // void
-                break;
-            case 4:
-                _rDefault = makeAny( Reference< XInterface >( ) );
-                break;
-            default:
-                OSL_ENSURE( sal_False, "Test::getPropertyDefaultByHandle: invalid handle!" );
-        }
-    }
-
-    //---------------------------------------------------------------------
-    Reference< XPropertySetInfo > SAL_CALL Test::getPropertySetInfo(  ) throw(RuntimeException)
-    {
-        return createPropertySetInfo( getInfoHelper() );
-    }
-
-    //---------------------------------------------------------------------
-    ::cppu::IPropertyArrayHelper& SAL_CALL Test::getInfoHelper()
-    {
-        return *getArrayHelper();
-    }
-
-    //---------------------------------------------------------------------
-    ::cppu::IPropertyArrayHelper* Test::createArrayHelper( ) const
-    {
-        Sequence< Property > aProps;
-        describeProperties( aProps );
-        return new ::cppu::OPropertyArrayHelper( aProps );
-    }
-
-    //---------------------------------------------------------------------
-    Test* Test::Create( )
-    {
-        Test* pInstance = new Test;
-        return pInstance;
-    }
-
-//.........................................................................
-}   // namespace comphelper
-//.........................................................................
-
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

svtools/inc/apearcfg.hxx

@@ -62,14 +62,14 @@ class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem
     short           nScaleFactor        ;
     short           nSnapMode           ;
     short           nMiddleMouse;
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
     short           nAAMinPixelHeight   ;
 #endif
 
     BOOL            bMenuMouseFollow        ;
     BOOL            bSingleLineTabCtrl      ;
     BOOL            bColoredTabCtrl         ;
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
     BOOL            bFontAntialiasing       ;
 #endif
 
@@ -107,7 +107,7 @@ public:
     void        SetSingleLineTabCtrl(BOOL bSet) {bSingleLineTabCtrl = bSet; SetModified();}
     BOOL        IsSingleLineTabCtrl()const {return   bSingleLineTabCtrl;}
 
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
     void        SetFontAntiAliasing( BOOL bSet )    { bFontAntialiasing = bSet; SetModified(); }
     BOOL        IsFontAntiAliasing() const { return bFontAntialiasing; }
 

svtools/source/config/apearcfg.cxx

@@ -56,13 +56,13 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
     ,nScaleFactor       ( DEFAULT_SCALEFACTOR )
     ,nSnapMode          ( DEFAULT_SNAPMODE )
     ,nMiddleMouse       ( MOUSE_MIDDLE_AUTOSCROLL )
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
     ,nAAMinPixelHeight  ( DEFAULT_AAMINHEIGHT )
 #endif
     ,bMenuMouseFollow(FALSE)
     ,bSingleLineTabCtrl(FALSE)
     ,bColoredTabCtrl(FALSE)
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
     ,bFontAntialiasing  ( TRUE )
 #endif
 {
@@ -89,7 +89,7 @@ SvtTabAppearanceCfg::SvtTabAppearanceCfg()
                     case  5: bColoredTabCtrl = *(sal_Bool*)pValues->getValue(); break; //"Dialog/ColoredTab",
                     case  6: *pValues >>= nSnapMode; break; //"Dialog/MousePositioning",
                     case  7: *pValues >>= nMiddleMouse; break; //"Dialog/MiddleMouseButton",
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
                     case  8: bFontAntialiasing = *(sal_Bool*)pValues->getValue(); break;    // "FontAntialising/Enabled",
                     case  9: *pValues >>= nAAMinPixelHeight; break;                         // "FontAntialising/MinPixelHeight",
 #endif
@@ -118,7 +118,7 @@ const Sequence<OUString>& SvtTabAppearanceCfg::GetPropertyNames()
             ,"Dialog/ColoredTab"                 //  5
             ,"Dialog/MousePositioning"           //  6
             ,"Dialog/MiddleMouseButton"          //  7
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
             ,"FontAntiAliasing/Enabled"         //  8
             ,"FontAntiAliasing/MinPixelHeight"  //  9
 #endif
@@ -153,7 +153,7 @@ void  SvtTabAppearanceCfg::Commit()
             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",
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
             case  8: pValues[nProp].setValue(&bFontAntialiasing, rType); break; // "FontAntialising/Enabled",
             case  9: pValues[nProp] <<= nAAMinPixelHeight; break;               // "FontAntialising/MinPixelHeight",
 #endif
@@ -234,7 +234,7 @@ void SvtTabAppearanceCfg::SetApplicationDefaults ( Application* pApp )
     hAppStyle.SetScreenZoom( nScaleFactor );
     hAppStyle.SetScreenFontZoom( nScaleFactor );
 
-#if defined( UNX ) || defined ( FS_PRIV_DEBUG )
+#if defined( UNX )
     // font anti aliasing
     hAppStyle.SetAntialiasingMinPixelHeight( nAAMinPixelHeight );
     hAppStyle.SetDisplayOptions( bFontAntialiasing ? 0 : DISPLAY_OPTION_AA_DISABLE );