#i103496#: split svtools; improve ConfitItems

25 files changed, 496 insertions, 1801 deletions

diff --git a/svl/inc/svl/bintitem.hxx b/svl/inc/svl/bintitem.hxx
deleted file mode 100644
index 4c969c0a29c7..000000000000
--- a/svl/inc/svl/bintitem.hxx
+++ /dev/null
@@ -1,88 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: bintitem.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _BINTITEM_HXX
-#define _BINTITEM_HXX
-
-#include <tools/solar.h>
-#include <tools/rtti.hxx>
-#include <tools/bigint.hxx>
-#include <tools/debug.hxx>
-
-#include <svl/poolitem.hxx>
-
-class SfxArguments;
-class SvStream;
-
-DBG_NAMEEX(SfxBigIntItem)
-
-class SfxBigIntItem: public SfxPoolItem
-{
-    BigInt aVal;
-
-public:
-    TYPEINFO();
-    SfxBigIntItem();
-    SfxBigIntItem(USHORT nWhich, const BigInt& rValue);
-    SfxBigIntItem(USHORT nWhich, SvStream &);
-    SfxBigIntItem(const SfxBigIntItem&);
-    ~SfxBigIntItem() { DBG_DTOR(SfxBigIntItem, 0); }
-
-    virtual SfxItemPresentation GetPresentation(
-        SfxItemPresentation ePres,
-        SfxMapUnit eCoreMetric,
-        SfxMapUnit ePresMetric,
-        XubString &rText,
-        const IntlWrapper * = 0 ) const;
-
-    virtual int operator==(const SfxPoolItem&) const;
-    using SfxPoolItem::Compare;
-    virtual int Compare(const SfxPoolItem &rWith) const;
-    virtual SfxPoolItem* Clone(SfxItemPool *pPool = 0) const;
-    virtual SfxPoolItem* Create(SvStream &, USHORT nVersion) const;
-    virtual SvStream& Store(SvStream &, USHORT nItemVersion) const;
-
-    virtual BOOL PutValue  ( const com::sun::star::uno::Any& rVal,
-                             BYTE nMemberId = 0 );
-    virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
-                             BYTE nMemberId = 0 ) const;
-
-    virtual SfxFieldUnit GetUnit() const;    // FUNIT_NONE
-
-    const BigInt& GetValue() const { return aVal; }
-    void SetValue(const BigInt& rNewVal)
-    {
-        DBG_ASSERT(GetRefCount() == 0, "SetValue() with pooled item");
-        aVal = rNewVal;
-    }
-};
-
-#endif /* _BINTITEM_HXX */
-
diff --git a/svl/inc/svl/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx
index 10fc4bb98446..28b2191cad94 100644
--- a/svl/inc/svl/ctloptions.hxx
+++ b/svl/inc/svl/ctloptions.hxx
@@ -40,8 +40,7 @@ class SvtCTLOptions_Impl;
 
 // class SvtCTLOptions --------------------------------------------------------
 
-class SVL_DLLPUBLIC SvtCTLOptions:
-    public utl::detail::Options, public SfxBroadcaster, public SfxListener
+class SVL_DLLPUBLIC SvtCTLOptions : public utl::detail::Options
 {
 private:
     SvtCTLOptions_Impl*    m_pImp;
@@ -52,8 +51,6 @@ public:
     SvtCTLOptions( sal_Bool bDontLoad = sal_False );
     virtual ~SvtCTLOptions();
 
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
     void            SetCTLFontEnabled( sal_Bool _bEnabled );
     sal_Bool        IsCTLFontEnabled() const;
 
diff --git a/svl/inc/svl/dateitem.hxx b/svl/inc/svl/dateitem.hxx
new file mode 100644
index 000000000000..c66c9a84285d
--- /dev/null
+++ b/svl/inc/svl/dateitem.hxx
@@ -0,0 +1,109 @@
+ /*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: dateitem.hxx,v $
+ * $Revision: 1.3 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef _DATETIMEITEM_HXX
+#define _DATETIMEITEM_HXX
+
+#include <tools/rtti.hxx>
+#include <tools/datetime.hxx>
+
+#include <svl/poolitem.hxx>
+
+class SvStream;
+
+DBG_NAMEEX(SfxDateTimeItem)
+
+// class SfxDateTimeItem -------------------------------------------------
+
+class SfxDateTimeItem : public SfxPoolItem
+{
+private:
+    DateTime                aDateTime;
+
+public:
+                            TYPEINFO();
+
+                            SfxDateTimeItem( USHORT nWhich );
+                            SfxDateTimeItem( USHORT nWhich,
+                                             const DateTime& rDT );
+                            SfxDateTimeItem( const SfxDateTimeItem& rCpy );
+
+                            ~SfxDateTimeItem() {
+                                DBG_DTOR(SfxDateTimeItem, 0); }
+
+    virtual int             operator==( const SfxPoolItem& ) const;
+    using SfxPoolItem::Compare;
+    virtual int             Compare( const SfxPoolItem &rWith ) const;
+    virtual SfxPoolItem*    Create( SvStream&, USHORT nItemVersion ) const;
+    virtual SvStream&       Store( SvStream&, USHORT nItemVersion ) const;
+    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
+
+    virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+                                    SfxMapUnit eCoreMetric,
+                                    SfxMapUnit ePresMetric,
+                                    XubString &rText,
+                                    const IntlWrapper * pIntlWrapper = 0 )
+        const;
+
+    const DateTime&         GetDateTime() const { return aDateTime; }
+    void                    SetDateTime( const DateTime& rDT ) {
+                                DBG_ASSERT( GetRefCount() == 0,
+                                            "SetDateTime() with pooled item" );
+                                aDateTime = rDT; }
+
+    virtual BOOL PutValue  ( const com::sun::star::uno::Any& rVal,
+                             BYTE nMemberId = 0 );
+    virtual BOOL QueryValue( com::sun::star::uno::Any& rVal,
+                             BYTE nMemberId = 0 ) const;
+};
+
+class SfxColumnDateTimeItem : public SfxDateTimeItem
+{
+public:
+                            TYPEINFO();
+
+                            SfxColumnDateTimeItem( USHORT nWhich );
+                            SfxColumnDateTimeItem( USHORT nWhich,
+                                             const DateTime& rDT );
+                            SfxColumnDateTimeItem( const SfxDateTimeItem& rCpy );
+
+                            ~SfxColumnDateTimeItem() {}
+
+    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
+
+    virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
+                                    SfxMapUnit eCoreMetric,
+                                    SfxMapUnit ePresMetric,
+                                    XubString &rText,
+                                    const IntlWrapper * pIntlWrapper = 0 )
+        const;
+};
+
+#endif
+
diff --git a/svl/inc/svl/dtritem.hxx b/svl/inc/svl/dtritem.hxx
deleted file mode 100644
index 406cc5ee6af1..000000000000
--- a/svl/inc/svl/dtritem.hxx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dtritem.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _DTRITEM_HXX
-#define _DTRITEM_HXX
-
-#include <tools/rtti.hxx>
-#include <tools/datetime.hxx>
-
-#include <svl/poolitem.hxx>
-
-class SvStream;
-
-DBG_NAMEEX(SfxDateTimeRangeItem)
-
-// class SfxDateTimeRangeItem -------------------------------------------------
-
-class SfxDateTimeRangeItem : public SfxPoolItem
-{
-private:
-    DateTime                aStartDateTime;
-    DateTime                aEndDateTime;
-
-public:
-            TYPEINFO();
-
-            SfxDateTimeRangeItem( const SfxDateTimeRangeItem& rCpy );
-            SfxDateTimeRangeItem( USHORT nWhich );
-            SfxDateTimeRangeItem( USHORT nWhich, const DateTime& rStartDT,
-                                  const DateTime& rEndDT );
-
-            ~SfxDateTimeRangeItem()
-                { DBG_DTOR(SfxDateTimeRangeItem, 0); }
-
-    virtual int             operator==( const SfxPoolItem& )            const;
-    using SfxPoolItem::Compare;
-    virtual int             Compare( const SfxPoolItem &rWith )         const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nItemVersion )    const;
-    virtual SvStream&       Store( SvStream&, USHORT nItemVersion )     const;
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 )             const;
-    virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-                                    SfxMapUnit eCoreMetric,
-                                    SfxMapUnit ePresMetric,
-                                    XubString &rText,
-                                    const IntlWrapper * pIntlWrapper = 0 )
-        const;
-
-    virtual BOOL            PutValue  ( const com::sun::star::uno::Any& rVal,
-                                         BYTE nMemberId = 0 );
-    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal,
-                                         BYTE nMemberId = 0 ) const;
-
-    const DateTime&         GetStartDateTime()      const { return aStartDateTime; }
-    const DateTime&         GetEndDateTime()        const { return aEndDateTime; }
-
-    void                    SetStartDateTime( const DateTime& rDT )
-                            { DBG_ASSERT( GetRefCount() == 0, "SetDateTime() with pooled item" );
-                              aStartDateTime = rDT; }
-
-    void                    SetEndDateTime( const DateTime& rDT )
-                            { DBG_ASSERT( GetRefCount() == 0, "SetDateTime() with pooled item" );
-                              aEndDateTime = rDT; }
-};
-
-#endif
-
diff --git a/svl/inc/svl/frqitem.hxx b/svl/inc/svl/frqitem.hxx
deleted file mode 100644
index 8d11c20610e2..000000000000
--- a/svl/inc/svl/frqitem.hxx
+++ /dev/null
@@ -1,178 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: frqitem.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef _FRQITEM_HXX
-#define _FRQITEM_HXX
-
-#include <tools/rtti.hxx>
-#include <tools/time.hxx>
-#include <tools/datetime.hxx>
-#include <tools/string.hxx>
-
-#include <svl/poolitem.hxx>
-
-class SvStream;
-
-DBG_NAMEEX(SfxFrequencyItem)
-
-// class SfxFrequencyItem -------------------------------------------------
-
-///////////////////////////////////////////////////////////////////////////////
-/*
-FRQ_DAILY
-    * jeden X'ten Tag
-    nInterval1 = 1 .. 999
-
-    * jeden Wochentag
-    nInterval1 = USHRT_MAX
-
-FRQ_WEEKLY
-    + wiederhole jede X'te Woche
-    nInterval1 = 1 .. 99
-
-    + an SU, MO, TU, WE, TH, FR, SA
-    nInterval2 = WD_SUNDAY | WD_MONDAY | WD_TUESDAY | WD_WEDNESDAY |
-                 WD_THURSDAY | WD_FRIDAY | WD_SATURDAY
-
-FRQ_MONTHLY_DAILY
-    * jeden X'ten Tag von jedem X'ten Monat
-    nInterval1 = 1 .. 31
-    nInterval2 = 1 .. 6
-
-FRQ_MONTHLY_LOGIC
-    * jeden ersten, zweiten, dritten, vierten oder letzten Wochentag jeden X'ten Monats
-    nInterval1 = 0 .. 4
-    nInterval2 = WD_SUNDAY | WD_MONDAY | WD_TUESDAY | WD_WEDNESDAY |
-                 WD_THURSDAY | WD_FRIDAY | WD_SATURDAY
-    nInterval3 = 1 .. 6
-
-===============================================================================
-
-FRQ_TIME_AT
-    * Update um Uhrzeit
-    nTime1 = 00:00:00 - 24:00:00
-
-FRQ_TIME_REPEAT
-    * Wiederhole alle X Stunden
-    nTInterval1 = 1 .. 8
-        + zwischen Uhrzeit 1 und 2
-        nTime1 = 00:00:00 - 24:00:00
-        nTime2 = 00:00:00 - 24:00:00
-
-*/
-///////////////////////////////////////////////////////////////////////////////
-
-enum FrequencyMode
-{
-    FRQ_DAILY               = 1,
-    FRQ_WEEKLY              = 2,
-    FRQ_MONTHLY_DAILY       = 3,
-    FRQ_MONTHLY_LOGIC       = 4
-};
-
-enum FrequencyTimeMode
-{
-    FRQ_TIME_AT             = 1,
-    FRQ_TIME_REPEAT         = 2,
-    FRQ_TIME_REPEAT_RANGE   = 3
-};
-
-#define WD_SUNDAY       0x0001
-#define WD_MONDAY       0x0002
-#define WD_TUESDAY      0x0004
-#define WD_WEDNESDAY    0x0008
-#define WD_THURSDAY     0x0010
-#define WD_FRIDAY       0x0020
-#define WD_SATURDAY     0x0040
-
-class SfxFrequencyItem : public SfxPoolItem
-{
-private:
-            FrequencyMode       eFrqMode;
-            FrequencyTimeMode   eFrqTimeMode;
-
-            USHORT              nDInterval1;
-            USHORT              nDInterval2;
-            USHORT              nDInterval3;
-
-            USHORT              nTInterval1;
-            Time                aTime1;
-            Time                aTime2;
-
-            BOOL                bMissingDate;
-            DateTime            aMissingDate;
-
-            Time                _CalcTime( BOOL bForToday ) const;
-public:
-            TYPEINFO();
-
-            SfxFrequencyItem( const SfxFrequencyItem& rCpy );
-            SfxFrequencyItem( USHORT nWhich );
-            SfxFrequencyItem( USHORT nWhich, FrequencyMode eMode, FrequencyTimeMode eTMode,
-                              USHORT nDI1, USHORT nDI2, USHORT nDI3, USHORT nTI1,
-                              const Time& rT1, const Time& rT2 );
-            ~SfxFrequencyItem() { DBG_DTOR(SfxFrequencyItem, 0); }
-
-    virtual int             operator==( const SfxPoolItem& )            const;
-    using SfxPoolItem::Compare;
-    virtual int             Compare( const SfxPoolItem &rWith )         const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nItemVersion )    const;
-    virtual SvStream&       Store( SvStream&, USHORT nItemVersion )     const;
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 )             const;
-    virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
-                                SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric, XubString &rText,
-                                const IntlWrapper * = 0 ) const;
-
-    DateTime                CalcNextTick( const DateTime& rNow, BOOL bFirst = FALSE );
-
-    BOOL                    HasMissingDate() const              { return bMissingDate; }
-    DateTime                GetMissingDate() const              { return aMissingDate; }
-
-    FrequencyMode           GetFrequencyMode() const            { return eFrqMode; }
-    FrequencyTimeMode       GetFrequencyTimeMode() const        { return eFrqTimeMode; }
-    USHORT                  GetDInterval_1() const              { return nDInterval1; }
-    USHORT                  GetDInterval_2() const              { return nDInterval2; }
-    USHORT                  GetDInterval_3() const              { return nDInterval3; }
-    USHORT                  GetTInterval_1() const              { return nTInterval1; }
-    const Time&             GetTime_1() const                   { return aTime1; }
-    const Time&             GetTime_2() const                   { return aTime2; }
-
-    void                    SetFrequencyMode(FrequencyMode eNew)    { eFrqMode = eNew; }
-    void                    SetFrequencyTimeMode(FrequencyTimeMode eNew){ eFrqTimeMode = eNew; }
-    void                    SetDInterval_1(USHORT nNew)             { nDInterval1 = nNew; }
-    void                    SetDInterval_2(USHORT nNew)             { nDInterval2 = nNew; }
-    void                    SetDInterval_3(USHORT nNew)             { nDInterval3 = nNew; }
-    void                    SetTInterval_1(USHORT nNew)             { nTInterval1 = nNew; }
-    void                    SetTime_1(const Time& rNew)             { aTime1 = rNew; }
-    void                    SetTime_2(const Time& rNew)             { aTime2 = rNew; }
-};
-
-#endif
-
diff --git a/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx
index 77682ce69765..0cba5235674a 100644
--- a/svl/inc/svl/languageoptions.hxx
+++ b/svl/inc/svl/languageoptions.hxx
@@ -35,6 +35,7 @@
 #include <svl/brdcst.hxx>
 #include <svl/lstner.hxx>
 #include <unotools/configitem.hxx>
+#include <unotools/options.hxx>
 #include <i18npool/lang.h>
 
 // class SvtLanguageOptions ----------------------------------------------------
@@ -47,7 +48,7 @@
 class SvtCJKOptions;
 class SvtCTLOptions;
 
-class SVL_DLLPUBLIC SvtLanguageOptions : public SfxBroadcaster, public SfxListener
+class SVL_DLLPUBLIC SvtLanguageOptions : public ::utl::detail::Options
 {
 private:
     SvtCJKOptions*  m_pCJKOptions;
@@ -78,8 +79,6 @@ public:
     SvtLanguageOptions( sal_Bool _bDontLoad = sal_False );
     ~SvtLanguageOptions();
 
-    virtual void        Notify( SfxBroadcaster& rBC, const SfxHint& rHint );
-
     // CJK options
     sal_Bool    IsCJKFontEnabled() const;
     sal_Bool    IsVerticalTextEnabled() const;
@@ -123,6 +122,7 @@ public:
     ~SvtSystemLanguageOptions();
 
     virtual void    Commit();
+    virtual void    Notify( const com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames );
 
     LanguageType GetWin16SystemLanguage();
 };
diff --git a/svl/inc/svl/svtools.hrc b/svl/inc/svl/svtools.hrc
index 60095caa8784..e4cc91cfcb49 100644
--- a/svl/inc/svl/svtools.hrc
+++ b/svl/inc/svl/svtools.hrc
@@ -90,6 +90,7 @@
 #define STR_SVT_SAMPLES_HELP            (RID_SVTOOLS_START+66)
 
 #define STR_WARNING_ITEM                (RID_SVTOOLS_START+90)
+#define STR_COLUM_DT_AUTO               (RID_SVTOOLS_START+99)
 
 #define CONFIG_BASIC_FORMAT_START       (RID_SVTOOLS_START+102)
 #define STR_BASICKEY_FORMAT_ON          (RID_SVTOOLS_START+103)
diff --git a/svl/inc/svl/tfrmitem.hxx b/svl/inc/svl/tfrmitem.hxx
deleted file mode 100644
index 82f08eccdf24..000000000000
--- a/svl/inc/svl/tfrmitem.hxx
+++ /dev/null
@@ -1,90 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: tfrmitem.hxx,v $
- * $Revision: 1.3 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-#ifndef _TFRMITEM_HXX
-#define _TFRMITEM_HXX
-
-#include <tools/rtti.hxx>
-
-#include <svl/poolitem.hxx>
-
-class SvStream;
-
-enum SfxOpenMode
-{
-    SfxOpenSelect       = 0,     // selected in view
-    SfxOpenOpen         = 1,     // doubleclicked or <enter>
-    SfxOpenAddTask      = 2,     // doubleclicked or <enter> with Ctrl-Modifier
-    SfxOpenDontKnow     = 3,
-    SfxOpenReserved1    = 4,
-    SfxOpenReserved2    = 5,
-    SfxOpenModeLast     = 5
-};
-
-DBG_NAMEEX(SfxTargetFrameItem)
-
-// class SfxTargetFrameItem -------------------------------------------------
-
-class SfxTargetFrameItem : public SfxPoolItem
-{
-private:
-            String          _aFrames[ (USHORT)SfxOpenModeLast+1 ];
-public:
-            TYPEINFO();
-
-            SfxTargetFrameItem( const SfxTargetFrameItem& rCpy );
-            SfxTargetFrameItem( USHORT nWhich );
-            SfxTargetFrameItem(
-                USHORT nWhich,
-                const String& rOpenSelectFrame,
-                const String& rOpenOpenFrame,
-                const String& rOpenAddTaskFrame );
-            ~SfxTargetFrameItem();
-
-    virtual int             operator==( const SfxPoolItem& ) const;
-    virtual SfxPoolItem*    Create( SvStream&, USHORT nItemVersion ) const;
-    virtual SvStream&       Store( SvStream&, USHORT nItemVersion ) const;
-    virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
-
-    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal,
-                                         BYTE nMemberId = 0 ) const;
-    virtual BOOL            PutValue  ( const com::sun::star::uno::Any& rVal,
-                                         BYTE nMemberId = 0 );
-    /*
-        Framebezeichner im Sfx:
-        _browser : Beamerview
-        _document : Desktopview
-        _blank : new task
-        "" : do nothing
-    */
-    String                  GetTargetFrame( SfxOpenMode eMode ) const;
-};
-
-#endif
-
diff --git a/svl/prj/d.lst b/svl/prj/d.lst
index e32ffa624397..a5c2564e81cd 100644
--- a/svl/prj/d.lst
+++ b/svl/prj/d.lst
@@ -1,6 +1,6 @@
 mkdir: %COMMON_DEST%\bin%_EXT%\hid
 mkdir: %COMMON_DEST%\res%_EXT%
-mkdir: %_DEST%\inc%_EXT%\svtools
+mkdir: %_DEST%\inc%_EXT%\svl
 
 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
 ..\%__SRC%\lib\isvl.lib %_DEST%\lib%_EXT%\isvl.lib
@@ -9,12 +9,12 @@ mkdir: %_DEST%\inc%_EXT%\svtools
 ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*
 
-..\inc\svl\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
-..\inc\svl\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
-..\inc\svl\*.h %_DEST%\inc%_EXT%\svtools\*.h
-..\inc\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc
-..\inc\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx
-..\inc\*.h %_DEST%\inc%_EXT%\svtools\*.h
+..\inc\svl\*.hrc %_DEST%\inc%_EXT%\svl\*.hrc
+..\inc\svl\*.hxx %_DEST%\inc%_EXT%\svl\*.hxx
+..\inc\svl\*.h %_DEST%\inc%_EXT%\svl\*.h
+..\inc\*.hrc %_DEST%\inc%_EXT%\svl\*.hrc
+..\inc\*.hxx %_DEST%\inc%_EXT%\svl\*.hxx
+..\inc\*.h %_DEST%\inc%_EXT%\svl\*.h
 
 dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi"
 
diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx
index 7ce2a45ce7a0..c149c91c86f5 100644
--- a/svl/source/config/cjkoptions.cxx
+++ b/svl/source/config/cjkoptions.cxx
@@ -168,6 +168,7 @@ void    SvtCJKOptions_Impl::SetAll(sal_Bool bSet)
 
         SetModified();
         Commit();
+        NotifyListeners(0);
     }
 }
 /*-- 10.04.01 12:41:56---------------------------------------------------
@@ -240,6 +241,7 @@ void SvtCJKOptions_Impl::Load()
 void    SvtCJKOptions_Impl::Notify( const Sequence< OUString >& )
 {
     Load();
+    NotifyListeners(0);
 }
 /*-- 10.04.01 12:41:57---------------------------------------------------
 
diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx
index a63944140672..a776bc4b807c 100644
--- a/svl/source/config/ctloptions.cxx
+++ b/svl/source/config/ctloptions.cxx
@@ -43,7 +43,6 @@
 #include <vos/mutex.hxx>
 #include <svl/smplhint.hxx>
 #include <rtl/instance.hxx>
-#include <tools/solarmutex.hxx>
 #include <unotools/syslocale.hxx>
 #include <itemholder2.hxx>
 
@@ -55,7 +54,7 @@ using namespace ::com::sun::star::uno;
 
 // SvtCJKOptions_Impl ----------------------------------------------------------
 
-class SvtCTLOptions_Impl : public utl::ConfigItem, public SfxBroadcaster
+class SvtCTLOptions_Impl : public utl::ConfigItem
 {
 private:
     sal_Bool                        m_bIsLoaded;
@@ -155,7 +154,7 @@ SvtCTLOptions_Impl::~SvtCTLOptions_Impl()
 void SvtCTLOptions_Impl::Notify( const Sequence< rtl::OUString >& )
 {
     Load();
-    Broadcast(SfxSimpleHint(SFX_HINT_CTL_SETTINGS_CHANGED));
+    NotifyListeners(SFX_HINT_CTL_SETTINGS_CHANGED);
 }
 // -----------------------------------------------------------------------------
 void SvtCTLOptions_Impl::Commit()
@@ -247,7 +246,7 @@ void SvtCTLOptions_Impl::Commit()
     aValues.realloc(nRealCount);
     PutProperties( aNames, aValues );
     //broadcast changes
-    Broadcast(SfxSimpleHint(SFX_HINT_CTL_SETTINGS_CHANGED));
+    NotifyListeners(SFX_HINT_CTL_SETTINGS_CHANGED);
 }
 // -----------------------------------------------------------------------------
 void SvtCTLOptions_Impl::Load()
@@ -325,6 +324,7 @@ void SvtCTLOptions_Impl::SetCTLFontEnabled( sal_Bool _bEnabled )
     {
         m_bCTLFontEnabled = _bEnabled;
         SetModified();
+        NotifyListeners(0);
     }
 }
 //------------------------------------------------------------------------------
@@ -334,6 +334,7 @@ void SvtCTLOptions_Impl::SetCTLSequenceChecking( sal_Bool _bEnabled )
     {
         SetModified();
         m_bCTLSequenceChecking = _bEnabled;
+        NotifyListeners(0);
     }
 }
 //------------------------------------------------------------------------------
@@ -343,6 +344,7 @@ void SvtCTLOptions_Impl::SetCTLSequenceCheckingRestricted( sal_Bool _bEnabled )
     {
         SetModified();
         m_bCTLRestricted = _bEnabled;
+        NotifyListeners(0);
     }
 }
 //------------------------------------------------------------------------------
@@ -352,6 +354,7 @@ void  SvtCTLOptions_Impl::SetCTLSequenceCheckingTypeAndReplace( sal_Bool _bEnabl
     {
         SetModified();
         m_bCTLTypeAndReplace = _bEnabled;
+        NotifyListeners(0);
     }
 }
 //------------------------------------------------------------------------------
@@ -361,6 +364,7 @@ void SvtCTLOptions_Impl::SetCTLCursorMovement( SvtCTLOptions::CursorMovement _eM
     {
         SetModified();
         m_eCTLCursorMovement = _eMovement;
+        NotifyListeners(0);
     }
 }
 //------------------------------------------------------------------------------
@@ -370,6 +374,7 @@ void SvtCTLOptions_Impl::SetCTLTextNumerals( SvtCTLOptions::TextNumerals _eNumer
     {
         SetModified();
         m_eCTLTextNumerals = _eNumerals;
+        NotifyListeners(0);
     }
 }
 // global ----------------------------------------------------------------
@@ -394,7 +399,7 @@ SvtCTLOptions::SvtCTLOptions( sal_Bool bDontLoad )
 
     ++nCTLRefCount;
     m_pImp = pCTLOptions;
-    StartListening( *m_pImp);
+    m_pImp->AddListener(this);
 }
 
 // -----------------------------------------------------------------------
@@ -404,6 +409,7 @@ SvtCTLOptions::~SvtCTLOptions()
     // Global access, must be guarded (multithreading)
     ::osl::MutexGuard aGuard( CTLMutex::get() );
 
+    m_pImp->RemoveListener(this);
     if ( !--nCTLRefCount )
         DELETEZ( pCTLOptions );
 }
@@ -485,17 +491,5 @@ sal_Bool SvtCTLOptions::IsReadOnly(EOption eOption) const
     DBG_ASSERT( pCTLOptions->IsLoaded(), "CTL options not loaded" );
     return pCTLOptions->IsReadOnly(eOption);
 }
-/* -----------------30.04.2003 10:40-----------------
-
- --------------------------------------------------*/
-void SvtCTLOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
-{
-    if ( ::tools::SolarMutex::Acquire() )
-    {
-        Broadcast( rHint );
-        ::tools::SolarMutex::Release();
-    }
-}
-
 // -----------------------------------------------------------------------------
 
diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx
index 20a74bbba28a..f16c0b6add49 100644
--- a/svl/source/config/languageoptions.cxx
+++ b/svl/source/config/languageoptions.cxx
@@ -39,7 +39,6 @@
 #include <osl/mutex.hxx>
 #include <rtl/instance.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
-#include <tools/solarmutex.hxx>
 #include <unotools/syslocale.hxx>
 
 using namespace ::com::sun::star;
@@ -56,7 +55,8 @@ SvtLanguageOptions::SvtLanguageOptions( sal_Bool _bDontLoad )
 
     m_pCJKOptions = new SvtCJKOptions( _bDontLoad );
     m_pCTLOptions = new SvtCTLOptions( _bDontLoad );
-    StartListening(*m_pCTLOptions);
+    m_pCTLOptions->AddListener(this);
+    m_pCJKOptions->AddListener(this);
 }
 //------------------------------------------------------------------------------
 SvtLanguageOptions::~SvtLanguageOptions()
@@ -64,6 +64,9 @@ SvtLanguageOptions::~SvtLanguageOptions()
     // Global access, must be guarded (multithreading)
     ::osl::MutexGuard aGuard( ALMutex::get() );
 
+    m_pCTLOptions->RemoveListener(this);
+    m_pCJKOptions->RemoveListener(this);
+
     delete m_pCJKOptions;
     delete m_pCTLOptions;
 }
@@ -200,19 +203,8 @@ sal_Bool SvtLanguageOptions::IsReadOnly(SvtLanguageOptions::EOption eOption) con
     }
     return bReadOnly;
 }
-/* -----------------30.04.2003 11:03-----------------
-
- --------------------------------------------------*/
-void SvtLanguageOptions::Notify( SfxBroadcaster&, const SfxHint& rHint )
-{
-    if ( ::tools::SolarMutex::Acquire() )
-    {
-        Broadcast( rHint );
-        ::tools::SolarMutex::Release();
-    }
-}
+/* -----------------30.04.2003 11:03-----------------*/
 
-// -----------------------------------------------------------------------------
 // returns for a language the scripttype
 sal_uInt16 SvtLanguageOptions::GetScriptTypeOfLanguage( sal_uInt16 nLang )
 {
@@ -268,6 +260,12 @@ void    SvtSystemLanguageOptions::Commit()
 {
     //does nothing
 }
+
+void    SvtSystemLanguageOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& )
+{
+    // no listeners supported yet
+}
+
 /*-- 27.10.2005 08:36:14---------------------------------------------------
 
   -----------------------------------------------------------------------*/
diff --git a/svl/source/items/bintitem.cxx b/svl/source/items/bintitem.cxx
deleted file mode 100644
index 5236f36504f8..000000000000
--- a/svl/source/items/bintitem.cxx
+++ /dev/null
@@ -1,169 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: bintitem.cxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svl.hxx"
-#include <com/sun/star/uno/Any.hxx>
-#include <tools/stream.hxx>
-#include <tools/bigint.hxx>
-#include <svl/bintitem.hxx>
-
-// STATIC DATA
-
-DBG_NAME(SfxBigIntItem)
-
-// RTTI
-TYPEINIT1_AUTOFACTORY(SfxBigIntItem, SfxPoolItem);
-
-// SfxBigIntItem
-
-//============================================================================
-SfxBigIntItem::SfxBigIntItem()
-    : SfxPoolItem(0),
-        aVal(0)
-{
-    DBG_CTOR(SfxBigIntItem, 0);
-}
-
-//============================================================================
-SfxBigIntItem::SfxBigIntItem(USHORT which, const BigInt& rValue)
-    : SfxPoolItem(which),
-        aVal(rValue)
-{
-    DBG_CTOR(SfxBigIntItem, 0);
-}
-
-//============================================================================
-SfxBigIntItem::SfxBigIntItem(USHORT which, SvStream &rStream)
-    : SfxPoolItem(which)
-{
-    DBG_CTOR(SfxBigIntItem, 0);
-    ByteString sTmp;
-    rStream.ReadByteString(sTmp);
-    BigInt aTmp(sTmp);
-    aVal = aTmp;
-}
-
-//============================================================================
-SfxBigIntItem::SfxBigIntItem(const SfxBigIntItem& rItem)
-    : SfxPoolItem(rItem),
-        aVal(rItem.aVal)
-{
-    DBG_CTOR(SfxBigIntItem, 0);
-}
-
-//============================================================================
-SfxItemPresentation SfxBigIntItem::GetPresentation(
-    SfxItemPresentation /*ePresentation*/,
-    SfxMapUnit          /*eCoreMetric*/,
-    SfxMapUnit          /*ePresentationMetric*/,
-    XubString&           rText,
-    const IntlWrapper * ) const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    rText = aVal.GetString();
-    return SFX_ITEM_PRESENTATION_NAMELESS;
-}
-
-//============================================================================
-int SfxBigIntItem::operator==(const SfxPoolItem& rItem) const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    DBG_ASSERT(SfxPoolItem::operator==(rItem), "unequal type");
-    return ((SfxBigIntItem&)rItem).aVal == aVal;
-}
-
-//============================================================================
-int SfxBigIntItem::Compare(const SfxPoolItem& rItem) const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    DBG_ASSERT(SfxPoolItem::operator==(rItem), "unequal type");
-
-    if (((const SfxBigIntItem&)rItem ).aVal < aVal )
-        return -1;
-    else if (((const SfxBigIntItem&)rItem ).aVal == aVal)
-        return 0;
-    else
-        return 1;
-}
-
-//============================================================================
-SfxPoolItem* SfxBigIntItem::Clone(SfxItemPool *) const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    return new SfxBigIntItem(*this);
-}
-
-//============================================================================
-SfxPoolItem* SfxBigIntItem::Create(SvStream &rStream, USHORT) const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    return new SfxBigIntItem(Which(), rStream);
-}
-
-//============================================================================
-SvStream& SfxBigIntItem::Store(SvStream &rStream, USHORT ) const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    rStream.WriteByteString( aVal.GetByteString() );
-    return rStream;
-}
-
-//============================================================================
-SfxFieldUnit SfxBigIntItem::GetUnit() const
-{
-    DBG_CHKTHIS(SfxBigIntItem, 0);
-    return SFX_FUNIT_NONE;
-}
-
-//============================================================================
-// virtual
-BOOL SfxBigIntItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE )
-{
-    double aValue = 0.0;
-    if ( rVal >>= aValue )
-    {
-        SetValue( aValue );
-        return TRUE;
-    }
-
-    DBG_ERROR( "SfxBigIntItem::PutValue - Wrong type!" );
-    return FALSE;
-}
-
-//============================================================================
-// virtual
-BOOL SfxBigIntItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const
-{
-    double aValue = GetValue();
-    rVal <<= aValue;
-    return TRUE;
-}
-
diff --git a/svl/inc/svl/tresitem.hxx b/svl/source/items/cstitem.src
index c0254a1bf1fc..54951dd3761e 100644
--- a/svl/inc/svl/tresitem.hxx
+++ b/svl/source/items/cstitem.src
@@ -6,8 +6,8 @@
  *
  * OpenOffice.org - a multi-platform office productivity suite
  *
- * $RCSfile: tresitem.hxx,v $
- * $Revision: 1.3 $
+ * $RCSfile: cstitem.src,v $
+ * $Revision: 1.7 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -28,38 +28,45 @@
  *
  ************************************************************************/
 
-#ifndef SVTOOLS_TRESITEM_HXX
-#define SVTOOLS_TRESITEM_HXX
+#include <svl/svtools.hrc>
+String STR_COLUM_DT_AUTO
+{
+    Text [ en-US ] = "automatic" ;
+};
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-#include <com/sun/star/ucb/TransferResult.hpp>
-#include <svl/poolitem.hxx>
 
-//============================================================================
-class CntTransferResultItem: public SfxPoolItem
-{
-    com::sun::star::ucb::TransferResult m_aResult;
 
-public:
-    TYPEINFO();
 
-    CntTransferResultItem(USHORT which = 0): SfxPoolItem(which) {}
 
-    CntTransferResultItem(USHORT which,
-                          com::sun::star::ucb::TransferResult const &
-                              rTheResult):
-        SfxPoolItem(which), m_aResult(rTheResult) {}
 
-    virtual int operator ==(SfxPoolItem const & rItem) const;
 
-    virtual BOOL QueryValue(com::sun::star::uno::Any & rVal, BYTE = 0) const;
 
-    virtual BOOL PutValue(const com::sun::star::uno::Any & rVal, BYTE = 0);
 
-    virtual SfxPoolItem * Clone(SfxItemPool * = 0) const;
 
-    com::sun::star::ucb::TransferResult const & GetValue() const
-    { return m_aResult; }
-};
 
-#endif // SVTOOLS_TRESITEM_HXX
 
diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx
new file mode 100644
index 000000000000..d5989d4b7a2b
--- /dev/null
+++ b/svl/source/items/dateitem.cxx
@@ -0,0 +1,286 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: dateitem.cxx,v $
+ * $Revision: 1.8 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svl.hxx"
+
+// include ---------------------------------------------------------------
+
+#define _DATETIMEITEM_CXX
+#include <svl/dateitem.hxx>
+
+#include <svl/svtools.hrc>
+
+#include <unotools/intlwrapper.hxx>
+#include <comphelper/processfactory.hxx>
+
+#include <tools/stream.hxx>
+#include <tools/debug.hxx>
+#include <tools/datetime.hxx>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/lang/Locale.hpp>
+
+
+#include <vcl/svapp.hxx>
+
+#include <svl/svldata.hxx>
+
+// STATIC DATA -----------------------------------------------------------
+
+DBG_NAME(SfxDateTimeItem)
+
+
+// -----------------------------------------------------------------------
+
+TYPEINIT1(SfxDateTimeItem, SfxPoolItem);
+
+// -----------------------------------------------------------------------
+
+SfxDateTimeItem::SfxDateTimeItem( USHORT which ) :
+    SfxPoolItem( which )
+{
+    DBG_CTOR(SfxDateTimeItem, 0);
+}
+
+// -----------------------------------------------------------------------
+
+SfxDateTimeItem::SfxDateTimeItem( USHORT which, const DateTime& rDT ) :
+    SfxPoolItem( which ),
+    aDateTime( rDT )
+
+{
+    DBG_CTOR(SfxDateTimeItem, 0);
+}
+
+// -----------------------------------------------------------------------
+
+SfxDateTimeItem::SfxDateTimeItem( const SfxDateTimeItem& rItem ) :
+    SfxPoolItem( rItem ),
+    aDateTime( rItem.aDateTime )
+{
+    DBG_CTOR(SfxDateTimeItem, 0);
+}
+
+// -----------------------------------------------------------------------
+
+int SfxDateTimeItem::operator==( const SfxPoolItem& rItem ) const
+{
+    DBG_CHKTHIS(SfxDateTimeItem, 0);
+    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
+    return ( ( (SfxDateTimeItem&)rItem ).aDateTime == aDateTime );
+}
+
+// -----------------------------------------------------------------------
+
+int SfxDateTimeItem::Compare( const SfxPoolItem& rItem ) const
+{
+    DBG_CHKTHIS(SfxDateTimeItem, 0);
+    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
+
+    // da X.Compare( Y ) am String einem Compare( Y, X ) entspricht,
+    // vergleichen wir hier Y mit X
+    if ( ( (const SfxDateTimeItem&)rItem ).aDateTime < aDateTime )
+        return -1;
+    else if ( ( (const SfxDateTimeItem&)rItem ).aDateTime == aDateTime )
+        return 0;
+    else
+        return 1;
+}
+
+// -----------------------------------------------------------------------
+
+SfxPoolItem* SfxDateTimeItem::Create( SvStream& rStream, USHORT ) const
+{
+    DBG_CHKTHIS(SfxDateTimeItem, 0);
+    sal_uInt32 nDate = 0;
+    sal_Int32 nTime = 0;
+    rStream >> nDate;
+    rStream >> nTime;
+    DateTime aDT(nDate, nTime);
+    return new SfxDateTimeItem( Which(), aDT );
+}
+
+// -----------------------------------------------------------------------
+
+SvStream& SfxDateTimeItem::Store( SvStream& rStream, USHORT ) const
+{
+    DBG_CHKTHIS(SfxDateTimeItem, 0);
+    rStream << aDateTime.GetDate();
+    rStream << aDateTime.GetTime();
+    return rStream;
+}
+
+// -----------------------------------------------------------------------
+
+SfxPoolItem* SfxDateTimeItem::Clone( SfxItemPool* ) const
+{
+    DBG_CHKTHIS(SfxDateTimeItem, 0);
+    return new SfxDateTimeItem( *this );
+}
+
+// -----------------------------------------------------------------------
+
+SfxItemPresentation SfxDateTimeItem::GetPresentation
+(
+    SfxItemPresentation     /*ePresentation*/,
+    SfxMapUnit              /*eCoreMetric*/,
+    SfxMapUnit              /*ePresentationMetric*/,
+    XubString&              rText,
+    const IntlWrapper *   pIntlWrapper
+)   const
+{
+    DBG_CHKTHIS(SfxDateTimeItem, 0);
+    if (aDateTime.IsValid())
+        if (pIntlWrapper)
+        {
+            rText = pIntlWrapper->getLocaleData()->getDate(aDateTime);
+            rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+            rText += pIntlWrapper->getLocaleData()->getTime(aDateTime);
+        }
+        else
+        {
+            DBG_WARNING("SfxDateTimeItem::GetPresentation():"
+                         " Using default en_US IntlWrapper");
+            const IntlWrapper aIntlWrapper(
+                ::comphelper::getProcessServiceFactory(), LANGUAGE_ENGLISH_US );
+            rText = aIntlWrapper.getLocaleData()->getDate(aDateTime);
+            rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+            rText += aIntlWrapper.getLocaleData()->getTime(aDateTime);
+        }
+    else
+        rText.Erase();
+    return SFX_ITEM_PRESENTATION_NAMELESS;
+}
+
+//----------------------------------------------------------------------------
+// virtual
+BOOL SfxDateTimeItem::PutValue( const com::sun::star::uno::Any& rVal,
+                                   BYTE nMemberId )
+{
+    nMemberId &= ~CONVERT_TWIPS;
+    com::sun::star::util::DateTime aValue;
+    if ( rVal >>= aValue )
+    {
+        aDateTime = DateTime( Date( aValue.Day,
+                                      aValue.Month,
+                                      aValue.Year ),
+                              Time( aValue.Hours,
+                                      aValue.Minutes,
+                                      aValue.Seconds,
+                                      aValue.HundredthSeconds ) );
+        return TRUE;
+    }
+
+    DBG_ERROR( "SfxDateTimeItem::PutValue - Wrong type!" );
+    return FALSE;
+}
+
+//----------------------------------------------------------------------------
+// virtual
+BOOL SfxDateTimeItem::QueryValue( com::sun::star::uno::Any& rVal,
+                                   BYTE nMemberId ) const
+{
+    nMemberId &= ~CONVERT_TWIPS;
+    com::sun::star::util::DateTime aValue( aDateTime.Get100Sec(),
+                                           aDateTime.GetSec(),
+                                              aDateTime.GetMin(),
+                                           aDateTime.GetHour(),
+                                           aDateTime.GetDay(),
+                                           aDateTime.GetMonth(),
+                                           aDateTime.GetYear() );
+    rVal <<= aValue;
+    return TRUE;
+}
+
+// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
+
+TYPEINIT1(SfxColumnDateTimeItem, SfxDateTimeItem);
+
+
+SfxColumnDateTimeItem::SfxColumnDateTimeItem( USHORT which ) :
+    SfxDateTimeItem( which )
+{}
+
+SfxColumnDateTimeItem::SfxColumnDateTimeItem( USHORT which, const DateTime& rDT ) :
+    SfxDateTimeItem( which, rDT )
+{}
+
+SfxColumnDateTimeItem::SfxColumnDateTimeItem( const SfxDateTimeItem& rCpy ) :
+    SfxDateTimeItem( rCpy )
+{}
+
+SfxPoolItem* SfxColumnDateTimeItem::Clone( SfxItemPool* ) const
+{
+    return new SfxColumnDateTimeItem( *this );
+}
+
+SfxItemPresentation SfxColumnDateTimeItem::GetPresentation
+(
+    SfxItemPresentation     /*ePresentation*/,
+    SfxMapUnit              /*eCoreMetric*/,
+    SfxMapUnit              /*ePresentationMetric*/,
+    XubString&              rText,
+    const IntlWrapper *   pIntlWrapper
+)   const
+{
+    DBG_ASSERT(pIntlWrapper,
+               "SfxColumnDateTimeItem::GetPresentation():"
+                " Using default en_US IntlWrapper");
+
+    ::com::sun::star::lang::Locale aLocale;
+    if (GetDateTime() == DateTime(Date(1, 2, 3), Time(3, 2, 1)))
+    {
+        rText = String(SvtSimpleResId(STR_COLUM_DT_AUTO,
+                                pIntlWrapper ?
+                                 pIntlWrapper->getLocale() :
+                                 aLocale));
+    }
+    else if (pIntlWrapper)
+    {
+        rText = pIntlWrapper->getLocaleData()->getDate(GetDateTime());
+        rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+        rText += pIntlWrapper->getLocaleData()->getTime(GetDateTime());
+    }
+    else
+    {
+        const IntlWrapper aIntlWrapper(
+            ::comphelper::getProcessServiceFactory(), LANGUAGE_ENGLISH_US );
+        rText = aIntlWrapper.getLocaleData()->getDate(GetDateTime());
+        rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
+        rText += aIntlWrapper.getLocaleData()->getTime(GetDateTime());
+    }
+    return SFX_ITEM_PRESENTATION_NAMELESS;
+}
+
+
+
diff --git a/svl/source/items/dtritem.cxx b/svl/source/items/dtritem.cxx
deleted file mode 100644
index 12d7828350bb..000000000000
--- a/svl/source/items/dtritem.cxx
+++ /dev/null
@@ -1,241 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: dtritem.cxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svl.hxx"
-#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/util/DateTimeRange.hpp>
-
-#include <unotools/intlwrapper.hxx>
-#include <comphelper/processfactory.hxx>
-
-#include <tools/stream.hxx>
-#include <tools/debug.hxx>
-#include <tools/datetime.hxx>
-#include <rtl/math.hxx>
-#include <svl/dtritem.hxx>
-
-
-DBG_NAME( SfxDateTimeRangeItem )
-TYPEINIT1( SfxDateTimeRangeItem, SfxPoolItem );
-
-// -----------------------------------------------------------------------
-
-SfxDateTimeRangeItem::SfxDateTimeRangeItem( USHORT which ) :
-    SfxPoolItem( which )
-{
-    DBG_CTOR( SfxDateTimeRangeItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-SfxDateTimeRangeItem::SfxDateTimeRangeItem( USHORT which, const DateTime& rStartDT,
-                                            const DateTime& rEndDT ) :
-    SfxPoolItem( which ),
-    aStartDateTime( rStartDT ),
-    aEndDateTime( rEndDT )
-{
-    DBG_CTOR( SfxDateTimeRangeItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-SfxDateTimeRangeItem::SfxDateTimeRangeItem( const SfxDateTimeRangeItem& rItem ) :
-    SfxPoolItem( rItem ),
-    aStartDateTime( rItem.aStartDateTime ),
-    aEndDateTime( rItem.aEndDateTime )
-{
-    DBG_CTOR( SfxDateTimeRangeItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-int SfxDateTimeRangeItem::operator==( const SfxPoolItem& rItem ) const
-{
-    DBG_CHKTHIS( SfxDateTimeRangeItem, 0 );
-    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-
-    return  ((SfxDateTimeRangeItem&)rItem ).aStartDateTime == aStartDateTime &&
-            ((SfxDateTimeRangeItem&)rItem ).aEndDateTime == aEndDateTime;
-}
-
-// -----------------------------------------------------------------------
-
-int SfxDateTimeRangeItem::Compare( const SfxPoolItem& rItem ) const
-{
-    DBG_CHKTHIS( SfxDateTimeRangeItem, 0 );
-    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-
-    double fThisRange = aEndDateTime - aStartDateTime;
-    double fRange = ((const SfxDateTimeRangeItem&)rItem).aEndDateTime -
-        ((const SfxDateTimeRangeItem&)rItem).aStartDateTime;
-
-    if ( ::rtl::math::approxEqual( fRange, fThisRange ) )
-        return 0;
-    else if ( fRange < fThisRange )
-        return -1;
-    else
-        return 1;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxDateTimeRangeItem::Create( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS(SfxDateTimeRangeItem, 0);
-
-    sal_uInt32 nStartDate, nEndDate;
-    sal_Int32 nStartTime, nEndTime;
-
-    rStream >> nStartDate;
-    rStream >> nStartTime;
-
-    rStream >> nEndDate;
-    rStream >> nEndTime;
-
-    DateTime aStartDT, aEndDT;
-
-    aStartDT.SetDate( nStartDate );
-    aStartDT.SetTime( nStartTime );
-
-    aEndDT.SetDate( nEndDate );
-    aEndDT.SetTime( nEndTime );
-
-    return new SfxDateTimeRangeItem( Which(), aStartDT, aEndDT );
-}
-
-// -----------------------------------------------------------------------
-
-SvStream& SfxDateTimeRangeItem::Store( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS( SfxDateTimeRangeItem, 0 );
-
-    rStream << aStartDateTime.GetDate();
-    rStream << aStartDateTime.GetTime();
-
-    rStream << aEndDateTime.GetDate();
-    rStream << aEndDateTime.GetTime();
-
-    return rStream;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxDateTimeRangeItem::Clone( SfxItemPool* ) const
-{
-    DBG_CHKTHIS( SfxDateTimeRangeItem, 0 );
-
-    return new SfxDateTimeRangeItem( *this );
-}
-// -----------------------------------------------------------------------
-
-SfxItemPresentation SfxDateTimeRangeItem::GetPresentation
-(
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
-    const IntlWrapper *   pIntlWrapper
-)   const
-{
-    DBG_CHKTHIS(SfxDateTimeRangeItem, 0);
-    DateTime aRange(aEndDateTime - (const Time&)aStartDateTime);
-    if (pIntlWrapper)
-    {
-        rText = pIntlWrapper->getLocaleData()->getDate(aRange);
-        rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-        rText += pIntlWrapper->getLocaleData()->getTime(aRange);
-    }
-    else
-    {
-        DBG_WARNING("SfxDateTimeRangeItem::GetPresentation():"
-                     " Using default en_US IntlWrapper");
-        const IntlWrapper aIntlWrapper(
-            ::comphelper::getProcessServiceFactory(), LANGUAGE_ENGLISH_US );
-        rText = aIntlWrapper.getLocaleData()->getDate(aRange);
-        rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM(", "));
-        rText += aIntlWrapper.getLocaleData()->getTime(aRange);
-    }
-    return SFX_ITEM_PRESENTATION_NAMELESS;
-}
-
-//----------------------------------------------------------------------------
-// virtual
-BOOL SfxDateTimeRangeItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
-{
-    com::sun::star::util::DateTimeRange aValue;
-    if ( rVal >>= aValue )
-    {
-        aStartDateTime = DateTime( Date( aValue.StartDay,
-                                           aValue.StartMonth,
-                                           aValue.StartYear ),
-                                     Time( aValue.StartHours,
-                                           aValue.StartMinutes,
-                                           aValue.StartSeconds,
-                                           aValue.StartHundredthSeconds ) );
-        aEndDateTime   = DateTime( Date( aValue.EndDay,
-                                           aValue.EndMonth,
-                                           aValue.EndYear ),
-                                     Time( aValue.EndHours,
-                                           aValue.EndMinutes,
-                                           aValue.EndSeconds,
-                                           aValue.EndHundredthSeconds ) );
-        return TRUE;
-    }
-
-    DBG_ERROR( "SfxDateTimeRangeItem::PutValue - Wrong type!" );
-    return FALSE;
-}
-
-//----------------------------------------------------------------------------
-// virtual
-BOOL SfxDateTimeRangeItem::QueryValue( com::sun::star::uno::Any& rVal,
-                                        BYTE nMemberId ) const
-{
-    nMemberId &= ~CONVERT_TWIPS;
-    com::sun::star::util::DateTimeRange aValue( aStartDateTime.Get100Sec(),
-                                                   aStartDateTime.GetSec(),
-                                                      aStartDateTime.GetMin(),
-                                                   aStartDateTime.GetHour(),
-                                                   aStartDateTime.GetDay(),
-                                                   aStartDateTime.GetMonth(),
-                                                   aStartDateTime.GetYear(),
-                                                aEndDateTime.Get100Sec(),
-                                                   aEndDateTime.GetSec(),
-                                                      aEndDateTime.GetMin(),
-                                                   aEndDateTime.GetHour(),
-                                                   aEndDateTime.GetDay(),
-                                                   aEndDateTime.GetMonth(),
-                                                   aEndDateTime.GetYear() );
-    rVal <<= aValue;
-    return TRUE;
-}
-
-
diff --git a/svl/source/items/frqitem.cxx b/svl/source/items/frqitem.cxx
deleted file mode 100644
index cfa1db17ef65..000000000000
--- a/svl/source/items/frqitem.cxx
+++ /dev/null
@@ -1,580 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: frqitem.cxx,v $
- * $Revision: 1.8.136.1 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svl.hxx"
-#ifndef GCC
-#endif
-
-#include <unotools/intlwrapper.hxx>
-
-#include <tools/stream.hxx>
-#include <tools/debug.hxx>
-#include <tools/datetime.hxx>
-
-#include <svl/frqitem.hxx>
-
-DBG_NAME( SfxFrequencyItem )
-
-TYPEINIT1( SfxFrequencyItem, SfxPoolItem );
-
-#define MAX_GOTO 32000
-
-#define DECL_SAVE_GOTO()                \
-    ULONG nSafetyMeasures = 0;
-
-#define SAVE_GOTO(tag)                  \
-    if(nSafetyMeasures < MAX_GOTO)      \
-    { nSafetyMeasures++; goto tag; }
-
-// -----------------------------------------------------------------------
-
-SfxFrequencyItem::SfxFrequencyItem( USHORT which ) :
-    SfxPoolItem     ( which ),
-    eFrqMode        ( FRQ_DAILY ),
-    eFrqTimeMode    ( FRQ_TIME_AT ),
-    nDInterval1     ( 1 ),
-    nDInterval2     ( 0 ),
-    nDInterval3     ( 0 ),
-    nTInterval1     ( 1 ),
-    aTime1          ( Time( 12, 0, 0 ) ),
-    aTime2          ( Time( 12, 0, 0 ) ),
-    bMissingDate    ( FALSE ),
-    aMissingDate    ( DateTime(0, 0) )
-{
-    DBG_CTOR( SfxFrequencyItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-SfxFrequencyItem::SfxFrequencyItem( USHORT which, FrequencyMode eMode, FrequencyTimeMode eTMode,
-                                    USHORT nDI1, USHORT nDI2, USHORT nDI3, USHORT nTI1,
-                                    const Time& rT1, const Time& rT2 ) :
-    SfxPoolItem     ( which ),
-    eFrqMode        ( eMode ),
-    eFrqTimeMode    ( eTMode ),
-    nDInterval1     ( nDI1 ),
-    nDInterval2     ( nDI2 ),
-    nDInterval3     ( nDI3 ),
-    nTInterval1     ( nTI1 ),
-    aTime1          ( rT1 ),
-    aTime2          ( rT2 ),
-    bMissingDate    ( FALSE )
-{
-    DBG_CTOR( SfxFrequencyItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-SfxFrequencyItem::SfxFrequencyItem( const SfxFrequencyItem& rItem ) :
-    SfxPoolItem     ( rItem ),
-    eFrqMode        ( rItem.eFrqMode ),
-    eFrqTimeMode    ( rItem.eFrqTimeMode ),
-    nDInterval1     ( rItem.nDInterval1 ),
-    nDInterval2     ( rItem.nDInterval2 ),
-    nDInterval3     ( rItem.nDInterval3 ),
-    nTInterval1     ( rItem.nTInterval1 ),
-    aTime1          ( rItem.aTime1 ),
-    aTime2          ( rItem.aTime2 ),
-    bMissingDate    ( rItem.bMissingDate )
-{
-    DBG_CTOR( SfxFrequencyItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-int SfxFrequencyItem::operator==( const SfxPoolItem& rItem ) const
-{
-    DBG_CHKTHIS( SfxFrequencyItem, 0 );
-    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-
-    return  ((SfxFrequencyItem&)rItem ).eFrqMode == eFrqMode &&
-            ((SfxFrequencyItem&)rItem ).eFrqTimeMode == eFrqTimeMode &&
-            ((SfxFrequencyItem&)rItem ).nDInterval1 == nDInterval1 &&
-            ((SfxFrequencyItem&)rItem ).nDInterval2 == nDInterval2 &&
-            ((SfxFrequencyItem&)rItem ).nDInterval3 == nDInterval3 &&
-            ((SfxFrequencyItem&)rItem ).nTInterval1 == nTInterval1 &&
-            ((SfxFrequencyItem&)rItem ).aTime1 == aTime1 &&
-            ((SfxFrequencyItem&)rItem ).aTime2 == aTime2;
-}
-
-// -----------------------------------------------------------------------
-
-int SfxFrequencyItem::Compare( const SfxPoolItem&
-#ifdef DBG_UTIL
-rItem
-#endif
-) const
-{
-    DBG_CHKTHIS( SfxFrequencyItem, 0 );
-    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-
-/*  DateTime aThisRange( aEndDateTime - aStartDateTime );
-    DateTime aRange(((const SfxFrequencyItem&)rItem).aEndDateTime -
-                    ((const SfxFrequencyItem&)rItem).aStartDateTime );
-    if( aRange < aThisRange )
-        return -1;
-    else if( aRange == aThisRange )
-        return 0;
-    else
-*/
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxFrequencyItem::Create( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS(SfxFrequencyItem, 0);
-
-    USHORT          _eFrqMode;
-    USHORT          _eFrqTimeMode;
-    USHORT          _nDInterval1;
-    USHORT          _nDInterval2;
-    USHORT          _nDInterval3;
-    USHORT          _nTInterval1;
-    long            _nTime1;
-    long            _nTime2;
-
-    rStream >> _eFrqMode;
-    rStream >> _eFrqTimeMode;
-    rStream >> _nDInterval1;
-    rStream >> _nDInterval2;
-    rStream >> _nDInterval3;
-    rStream >> _nTInterval1;
-    rStream >> _nTime1;
-    rStream >> _nTime2;
-
-    return new SfxFrequencyItem( Which(), (FrequencyMode)_eFrqMode,
-        (FrequencyTimeMode) _eFrqTimeMode, _nDInterval1, _nDInterval2, _nDInterval3,
-        _nTInterval1, Time(_nTime1), Time(_nTime2) );
-}
-
-// -----------------------------------------------------------------------
-
-SvStream& SfxFrequencyItem::Store( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS( SfxFrequencyItem, 0 );
-
-    USHORT nEMode = (USHORT)eFrqMode;
-    USHORT nETimeMode = (USHORT)eFrqTimeMode;
-
-    rStream << (USHORT) nEMode;
-    rStream << (USHORT) nETimeMode;
-
-    rStream << nDInterval1;
-    rStream << nDInterval2;
-    rStream << nDInterval3;
-
-    rStream << nTInterval1;
-    rStream << aTime1.GetTime();
-    rStream << aTime2.GetTime();
-
-    return rStream;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxFrequencyItem::Clone( SfxItemPool* ) const
-{
-    DBG_CHKTHIS( SfxFrequencyItem, 0 );
-    return new SfxFrequencyItem( *this );
-}
-
-// -----------------------------------------------------------------------
-
-SfxItemPresentation SfxFrequencyItem::GetPresentation
-(
-    SfxItemPresentation     /*ePresentation*/,
-    SfxMapUnit              /*eCoreMetric*/,
-    SfxMapUnit              /*ePresentationMetric*/,
-    XubString&              rText,
-    const IntlWrapper *
-)   const
-{
-    DBG_CHKTHIS(SfxFrequencyItem, 0);
-    rText.AssignAscii(RTL_CONSTASCII_STRINGPARAM("SNIY"));
-    return SFX_ITEM_PRESENTATION_NAMELESS;
-}
-
-// -----------------------------------------------------------------------
-
-Time SfxFrequencyItem::_CalcTime( BOOL bForToday ) const
-{
-    Time aNow;
-    Time aTime;
-
-    DECL_SAVE_GOTO();
-
-    switch( eFrqTimeMode )
-    {
-        //////////////////////////////////////////////////////////
-        //  FRQ_TIME_AT
-        //
-        //  Update um Uhrzeit
-        //  nTime1 = 00:00:00 - 24:00:00
-        //
-        case FRQ_TIME_AT :
-            aTime = aTime1;
-            break;
-
-        //////////////////////////////////////////////////////////
-        //  FRQ_TIME_REPEAT
-        //
-        //  Wiederhole alle X Stunden
-        //  nTInterval1 = 1 .. 8
-        //
-        case FRQ_TIME_REPEAT :
-            aTime = Time( 0, 0 );
-            if( bForToday )
-            {
-
-            RECALC_TIME_REPEAT:
-                if( aNow > aTime )
-                {
-                    aTime += Time( nTInterval1, 0 );
-                    SAVE_GOTO( RECALC_TIME_REPEAT );
-                }
-                break;
-            }
-            break;
-
-        //////////////////////////////////////////////////////////
-        //  FRQ_TIME_REPEAT_RANGE
-        //
-        //  FRQ_TIME_REPEAT zwischen Uhrzeit 1 und 2
-        //  nTime1 = 00:00:00 - 24:00:00
-        //  nTime2 = 00:00:00 - 24:00:00
-        //
-        case FRQ_TIME_REPEAT_RANGE :
-            aTime = aTime1;
-            if( bForToday )
-            {
-                if( aNow > aTime2 )
-                    return aTime1;
-
-            RECALC_TIME_REPEAT_RANGE:
-                if( aNow > aTime )
-                {
-                    aTime += Time( nTInterval1, 0 );
-                    if( aTime > aTime2 )
-                        return aTime1;
-                    SAVE_GOTO( RECALC_TIME_REPEAT_RANGE );
-                }
-                break;
-            }
-            break;
-    }
-    return aTime;
-}
-
-DateTime SfxFrequencyItem::CalcNextTick( const DateTime& rBase, BOOL bFirst )
-{
-    Date aDateToday;
-    Time aTimeToday;
-    Date aDateBase;
-    Time aTimeBase;
-
-    if( bFirst )
-    {
-        aDateBase = Date( 17, 2, 1969 );
-        aTimeBase = Time( 8, 0, 0 );
-    }
-    else
-    {
-        aDateBase = rBase.GetDate();
-        aTimeBase = rBase.GetTime();
-    }
-
-    Time aNextTime( _CalcTime(FALSE) );
-    Date aNextDate( aDateBase );
-    bMissingDate = FALSE;
-
-    DECL_SAVE_GOTO();
-
-    switch( eFrqMode )
-    {
-        //////////////////////////////////////////////////////////
-        //  FRQ_DAILY
-        //
-        //  jeden X'ten Tag
-        //  nInterval1 = 1 .. 999
-        //
-        //  jeden Wochentag
-        // nInterval1 = USHRT_MAX
-        //
-        case FRQ_DAILY :
-        {
-            if( bFirst )
-            {
-                aNextTime = _CalcTime( TRUE );
-                if( aNextTime < aTimeToday )
-                {
-                    aNextTime = _CalcTime( FALSE );
-                    aNextDate = aDateToday + (USHORT)
-                                ((nDInterval1 == USHRT_MAX)? 1 : nDInterval1);
-                }
-                else
-                    aNextDate = aDateToday;
-                break;
-            }
-
-            RECALC_FRQ_DAILY:
-            if( aNextDate < aDateToday )
-            {
-                bMissingDate = TRUE;
-                aMissingDate.SetDate(aNextDate.GetDate());
-                aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                aNextDate += (USHORT)((nDInterval1 == USHRT_MAX)? 1 : nDInterval1);
-                SAVE_GOTO( RECALC_FRQ_DAILY );
-            }
-
-            if( aNextDate == aDateToday )
-            {
-                aNextTime = _CalcTime( TRUE );
-                if( aNextTime < aTimeToday )
-                {
-                    bMissingDate = TRUE;
-                    aMissingDate.SetDate(aNextDate.GetDate());
-                    aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                    aNextDate += (USHORT)((nDInterval1 == USHRT_MAX)? 1 : nDInterval1);
-                    aNextTime = _CalcTime( FALSE );
-                }
-            }
-            else
-                aNextTime = _CalcTime( FALSE );
-        } break;
-
-        //////////////////////////////////////////////////////////
-        //  FRQ_WEEKLY
-        //  wiederhole jede X'te Woche
-        //  nInterval1 = 1 .. 99
-        //
-        //  an SU, MO, TU, WE, TH, FR, SA
-        //  nInterval2 = WD_SUNDAY | WD_MONDAY | WD_TUESDAY |
-        //               WD_WEDNESDAY | WD_THURSDAY | WD_FRIDAY |
-        //               WD_SATURDAY
-        //
-        case FRQ_WEEKLY :
-        {
-            BOOL bInRecalc = FALSE;
-
-            RECALC_FRQ_WEEKLY:
-            if( !bFirst || bInRecalc )
-                aNextDate += (nDInterval1 - 1) * 7;
-
-            aNextDate -= (USHORT) ((aNextDate.GetDayOfWeek() != SUNDAY) ?
-                         aNextDate.GetDayOfWeek() + 1 : 0);
-
-            if( nDInterval2 & WD_SUNDAY && (aNextDate >= aDateToday) )
-                aNextDate += 0;
-            else if( nDInterval2 & WD_MONDAY && (aNextDate + 1 >= aDateToday) )
-                aNextDate += 1;
-            else if( nDInterval2 & WD_TUESDAY && (aNextDate + 2 >= aDateToday) )
-                aNextDate += 2;
-            else if( nDInterval2 & WD_WEDNESDAY && (aNextDate + 3 >= aDateToday) )
-                aNextDate += 3;
-            else if( nDInterval2 & WD_THURSDAY && (aNextDate + 4 >= aDateToday) )
-                aNextDate += 4;
-            else if( nDInterval2 & WD_FRIDAY && (aNextDate + 5 >= aDateToday) )
-                aNextDate += 5;
-            else if( nDInterval2 & WD_SATURDAY && (aNextDate + 6 >= aDateToday) )
-                aNextDate += 6;
-
-            if( aNextDate < aDateToday )
-            {
-                bMissingDate = TRUE;
-                aMissingDate.SetDate(aNextDate.GetDate());
-                aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                bInRecalc = TRUE;
-                aNextDate += 7;
-                SAVE_GOTO( RECALC_FRQ_WEEKLY );
-            }
-            if( aNextDate == aDateToday )
-            {
-                aNextTime = _CalcTime( TRUE );
-                if( aNextTime < aTimeToday )
-                {
-                    bInRecalc = TRUE;
-                    aNextDate += 7;
-                    SAVE_GOTO( RECALC_FRQ_WEEKLY );
-                }
-            }
-            else
-                aNextTime = _CalcTime( FALSE );
-        } break;
-
-        //////////////////////////////////////////////////////////
-        //  FRQ_MONTHLY_DAILY
-        //
-        //  jeden X'ten Tag von jedem X'ten Monat
-        //  nInterval1 = 1 .. 31
-        //  nInterval2 = 1 .. 6
-        //
-        case FRQ_MONTHLY_DAILY :
-        {
-            BOOL bInRecalc = FALSE;
-            aNextDate.SetDay( nDInterval1 );
-
-            RECALC_FRQ_MONTHLY_DAILY:
-            if( nDInterval2 > 1 || bInRecalc )
-            {
-                long nMonth = aNextDate.GetMonth() - 1;
-                nMonth += nDInterval2;
-                aNextDate.SetYear(
-                    sal::static_int_cast< USHORT >(
-                        aNextDate.GetYear() + nMonth / 12 ) );
-                aNextDate.SetMonth(
-                    sal::static_int_cast< USHORT >( ( nMonth % 12 ) + 1 ) );
-            }
-
-            if( aNextDate < aDateToday )
-            {
-                bMissingDate = TRUE;
-                aMissingDate.SetDate(aNextDate.GetDate());
-                aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                bInRecalc = TRUE;
-                SAVE_GOTO( RECALC_FRQ_MONTHLY_DAILY );
-            }
-
-            if( aNextDate == aDateToday )
-            {
-                aNextTime = _CalcTime( TRUE );
-                if( aNextTime < aTimeToday )
-                {
-                    bMissingDate = TRUE;
-                    aMissingDate.SetDate(aNextDate.GetDate());
-                    aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                    bInRecalc = TRUE;
-                    SAVE_GOTO( RECALC_FRQ_MONTHLY_DAILY );
-                }
-            }
-            else
-                aNextTime = _CalcTime( FALSE );
-        } break;
-
-        //////////////////////////////////////////////////////////
-        //  FRQ_MONTHLY_LOGIC
-        //
-        //  jeden ersten, zweiten, dritten, vierten oder letzten
-        //  Wochentag jeden X'ten Monats
-        //  nInterval1 = 0 .. 4
-        //  nInterval2 = WD_SUNDAY | WD_MONDAY | WD_TUESDAY |
-        //               WD_WEDNESDAY | WD_THURSDAY | WD_FRIDAY |
-        //               WD_SATURDAY
-        //  nInterval3 = 1 .. 6
-        //
-        case FRQ_MONTHLY_LOGIC :
-        {
-            BOOL bInRecalc = FALSE;
-
-            RECALC_FRQ_MONTHLY_LOGIC:
-            if( nDInterval3 > 1 || bInRecalc )
-            {
-                long nMonth = aNextDate.GetMonth() - 1;
-                nMonth += nDInterval3;
-                aNextDate.SetYear(
-                    sal::static_int_cast< USHORT >(
-                        aNextDate.GetYear() + nMonth / 12 ) );
-                aNextDate.SetMonth(
-                    sal::static_int_cast< USHORT >( ( nMonth % 12 ) + 1 ) );
-            }
-
-            USHORT nDay;
-            if( nDInterval2 & WD_SUNDAY )
-                nDay = 6;
-            else if( nDInterval2 & WD_MONDAY )
-                nDay = 0;
-            else if( nDInterval2 & WD_TUESDAY )
-                nDay = 1;
-            else if( nDInterval2 & WD_WEDNESDAY )
-                nDay = 2;
-            else if( nDInterval2 & WD_THURSDAY )
-                nDay = 3;
-            else if( nDInterval2 & WD_FRIDAY )
-                nDay = 4;
-            else nDay = 5;
-
-            if( nDInterval1 == 4 )
-            {
-                DateTime aDT = aNextDate;
-                aDT.SetDay( 1 );
-                aDT += (long)(aNextDate.GetDaysInMonth() - 1);
-                if( aDT.GetDayOfWeek() != nDay )
-                    for( aDT--; aDT.GetDayOfWeek() != nDay; aDT-- ) ;
-                aNextDate = aDT;
-            }
-            else
-            {
-                DateTime aDT = aNextDate;
-                aDT.SetDay( 1 );
-                aDT += (long)(nDay - USHORT(aDT.GetDayOfWeek()));
-                if( aDT.GetMonth() != aNextDate.GetMonth() )
-                    aDT += 7L;
-                aDT += (long)(nDInterval1 * 7);
-                aNextDate = aDT;
-            }
-
-            if( aNextDate < aDateToday )
-            {
-                bMissingDate = TRUE;
-                aMissingDate.SetDate(aNextDate.GetDate());
-                aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                bInRecalc = TRUE;
-                SAVE_GOTO( RECALC_FRQ_MONTHLY_LOGIC );
-            }
-
-            if( aNextDate == aDateToday )
-            {
-                aNextTime = _CalcTime( TRUE );
-                if( aNextTime < aTimeToday )
-                {
-                    bMissingDate = TRUE;
-                    aMissingDate.SetDate(aNextDate.GetDate());
-                    aMissingDate.SetTime(_CalcTime(FALSE).GetTime());
-
-                    bInRecalc = TRUE;
-                    SAVE_GOTO( RECALC_FRQ_MONTHLY_LOGIC );
-                }
-            }
-            else
-                aNextTime = _CalcTime( FALSE );
-        } break;
-    }
-
-    return DateTime( aNextDate, aNextTime );
-}
-
diff --git a/svl/source/items/makefile.mk b/svl/source/items/makefile.mk
index 525fff0bc90a..d779e16e24d1 100644
--- a/svl/source/items/makefile.mk
+++ b/svl/source/items/makefile.mk
@@ -43,43 +43,43 @@ ENABLE_EXCEPTIONS=TRUE
 
 SLOFILES=\
     $(SLO)$/aeitem.obj	\
-    $(SLO)$/eitem.obj	\
-    $(SLO)$/flagitem.obj	\
-    $(SLO)$/globalnameitem.obj	\
-    $(SLO)$/imageitm.obj    \
-    $(SLO)$/intitem.obj	\
-    $(SLO)$/macitem.obj	\
-    $(SLO)$/poolcach.obj	\
-    $(SLO)$/ptitem.obj	\
-    $(SLO)$/rectitem.obj	\
-    $(SLO)$/rngitem.obj	\
-    $(SLO)$/stritem.obj	\
-    $(SLO)$/style.obj	\
-    $(SLO)$/szitem.obj \
-    $(SLO)$/bintitem.obj	\
     $(SLO)$/cenumitm.obj	\
     $(SLO)$/cintitem.obj	\
     $(SLO)$/cntwall.obj	\
     $(SLO)$/ctypeitm.obj	\
     $(SLO)$/custritm.obj	\
-    $(SLO)$/dtritem.obj	\
-    $(SLO)$/frqitem.obj	\
+    $(SLO)$/dateitem.obj \
+    $(SLO)$/eitem.obj	\
+    $(SLO)$/flagitem.obj	\
+    $(SLO)$/globalnameitem.obj	\
     $(SLO)$/ilstitem.obj    \
+    $(SLO)$/imageitm.obj    \
+    $(SLO)$/intitem.obj	\
     $(SLO)$/itemiter.obj	\
     $(SLO)$/itempool.obj	\
     $(SLO)$/itemprop.obj	\
     $(SLO)$/itemset.obj	\
     $(SLO)$/lckbitem.obj	\
+    $(SLO)$/macitem.obj	\
+    $(SLO)$/poolcach.obj	\
     $(SLO)$/poolio.obj	\
-    $(SLO)$/stylepool.obj	\
     $(SLO)$/poolitem.obj	\
+    $(SLO)$/ptitem.obj	\
+    $(SLO)$/rectitem.obj	\
+    $(SLO)$/rngitem.obj	\
     $(SLO)$/sfontitm.obj	\
     $(SLO)$/sitem.obj	    \
     $(SLO)$/slstitm.obj	\
-    $(SLO)$/tfrmitem.obj	\
-    $(SLO)$/tresitem.obj	\
-    $(SLO)$/whiter.obj \
-    $(SLO)$/visitem.obj
+    $(SLO)$/stritem.obj	\
+    $(SLO)$/style.obj	\
+    $(SLO)$/stylepool.obj	\
+    $(SLO)$/szitem.obj \
+    $(SLO)$/visitem.obj \
+    $(SLO)$/whiter.obj 
+
+SRS1NAME=$(TARGET)
+SRC1FILES=\
+    cstitem.src
 
 # --- Targets -------------------------------------------------------
 
diff --git a/svl/source/items/tfrmitem.cxx b/svl/source/items/tfrmitem.cxx
deleted file mode 100644
index 636b3e9eb0a1..000000000000
--- a/svl/source/items/tfrmitem.cxx
+++ /dev/null
@@ -1,184 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: tfrmitem.cxx,v $
- * $Revision: 1.8 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svl.hxx"
-#include <com/sun/star/uno/Any.hxx>
-
-#include <tools/stream.hxx>
-#include <tools/debug.hxx>
-#include <tools/string.hxx>
-
-#include <svl/tfrmitem.hxx>
-
-DBG_NAME( SfxTargetFrameItem )
-TYPEINIT1( SfxTargetFrameItem, SfxPoolItem );
-
-// -----------------------------------------------------------------------
-
-SfxTargetFrameItem::SfxTargetFrameItem( USHORT which ) :
-    SfxPoolItem( which )
-{
-    DBG_CTOR( SfxTargetFrameItem, 0 );
-}
-
-// -----------------------------------------------------------------------
-
-SfxTargetFrameItem::SfxTargetFrameItem( const SfxTargetFrameItem& rItem ) :
-    SfxPoolItem( rItem )
-{
-    DBG_CTOR( SfxTargetFrameItem, 0 );
-    for( USHORT nCur = 0; nCur <= (USHORT)SfxOpenModeLast; nCur++ )
-        _aFrames[nCur] = rItem._aFrames[nCur];
-}
-
-// -----------------------------------------------------------------------
-
-SfxTargetFrameItem::SfxTargetFrameItem( USHORT which,
-    const String& rOpenSelectFrame, const String& rOpenOpenFrame,
-    const String& rOpenAddTaskFrame ) : SfxPoolItem( which )
-{
-    DBG_CTOR( SfxTargetFrameItem, 0 );
-    _aFrames[ (USHORT)SfxOpenSelect ]  = rOpenSelectFrame;
-    _aFrames[ (USHORT)SfxOpenOpen ]    = rOpenOpenFrame;
-    _aFrames[ (USHORT)SfxOpenAddTask ] = rOpenAddTaskFrame;
-}
-
-// -----------------------------------------------------------------------
-
-SfxTargetFrameItem::~SfxTargetFrameItem()
-{
-    DBG_DTOR(SfxTargetFrameItem, 0);
-}
-
-// -----------------------------------------------------------------------
-
-String SfxTargetFrameItem::GetTargetFrame( SfxOpenMode eMode ) const
-{
-    DBG_CHKTHIS( SfxTargetFrameItem, 0 );
-    if( eMode <= SfxOpenModeLast )
-        return _aFrames[ (USHORT)eMode ];
-    String aResult;
-    return aResult;
-}
-
-// -----------------------------------------------------------------------
-
-int SfxTargetFrameItem::operator==( const SfxPoolItem& rItem ) const
-{
-    DBG_CHKTHIS( SfxTargetFrameItem, 0 );
-    DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal type" );
-
-    for( USHORT nCur = 0; nCur <= (USHORT)SfxOpenModeLast; nCur++ )
-    {
-        if( _aFrames[nCur] != ((const SfxTargetFrameItem&)rItem)._aFrames[nCur] )
-            return 0;
-    }
-    return 1;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxTargetFrameItem::Create( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS(SfxTargetFrameItem, 0);
-    SfxTargetFrameItem* pItem = new SfxTargetFrameItem( Which() );
-    USHORT nCount = 0;
-    rStream >> nCount;
-    for(USHORT nCur=0; nCur<= (USHORT)SfxOpenModeLast && nCount; nCur++,nCount--)
-    {
-        readByteString(rStream, pItem->_aFrames[ nCur ]);
-    }
-    // die uebriggebliebenen ueberspringen
-    String aTemp;
-    while( nCount )
-    {
-        readByteString(rStream, aTemp);
-        nCount--;
-    }
-    return pItem;
-}
-
-// -----------------------------------------------------------------------
-
-SvStream& SfxTargetFrameItem::Store( SvStream& rStream, USHORT ) const
-{
-    DBG_CHKTHIS( SfxTargetFrameItem, 0 );
-    USHORT nCount = (USHORT)(SfxOpenModeLast+1);
-    rStream << nCount;
-    for( USHORT nCur = 0; nCur <= (USHORT)SfxOpenModeLast; nCur++ )
-    {
-        writeByteString(rStream, _aFrames[ nCur ]);
-    }
-    return rStream;
-}
-
-// -----------------------------------------------------------------------
-
-SfxPoolItem* SfxTargetFrameItem::Clone( SfxItemPool* ) const
-{
-    DBG_CHKTHIS( SfxTargetFrameItem, 0 );
-    return new SfxTargetFrameItem( *this );
-}
-
-// -----------------------------------------------------------------------
-// virtual
-BOOL SfxTargetFrameItem::QueryValue( com::sun::star::uno::Any& rVal,BYTE ) const
-{
-    String aVal;
-    for ( int i = 0; i <= SfxOpenModeLast; i++ )
-    {
-        aVal += _aFrames[ i ];
-        aVal += ';' ;
-    }
-
-    rVal <<= rtl::OUString( aVal );
-    return TRUE;
-}
-
-// -----------------------------------------------------------------------
-// virtual
-BOOL SfxTargetFrameItem::PutValue( const com::sun::star::uno::Any& rVal,BYTE )
-{
-    rtl::OUString aValue;
-    if ( rVal >>= aValue )
-    {
-        const String aVal( aValue );
-
-        for ( USHORT i = 0; i <= SfxOpenModeLast; i++ )
-            _aFrames[ i ] = aVal.GetToken( i );
-
-        return TRUE;
-    }
-
-    DBG_ERROR( "SfxTargetFrameItem::PutValue - Wrong type!" );
-    return FALSE;
-}
-
diff --git a/svl/source/items/tresitem.cxx b/svl/source/items/tresitem.cxx
deleted file mode 100644
index 3fdf3f750180..000000000000
--- a/svl/source/items/tresitem.cxx
+++ /dev/null
@@ -1,78 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2008 by Sun Microsystems, Inc.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * $RCSfile: tresitem.cxx,v $
- * $Revision: 1.6 $
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_svl.hxx"
-#include <svl/tresitem.hxx>
-
-using namespace com::sun::star;
-
-//============================================================================
-//
-//  CntTransferResultItem
-//
-//============================================================================
-
-TYPEINIT1_AUTOFACTORY(CntTransferResultItem, SfxPoolItem)
-
-//============================================================================
-// virtual
-int CntTransferResultItem::operator ==(SfxPoolItem const & rItem) const
-{
-    if (CntTransferResultItem * pResultItem = PTR_CAST(CntTransferResultItem,
-                                                       &rItem))
-        return m_aResult.Source == pResultItem->m_aResult.Source
-               && m_aResult.Target == pResultItem->m_aResult.Target
-               && m_aResult.Result == pResultItem->m_aResult.Result;
-    return false;
-}
-
-//============================================================================
-// virtual
-BOOL CntTransferResultItem::QueryValue(uno::Any & rVal, BYTE) const
-{
-    rVal <<= m_aResult;
-    return true;
-}
-
-//============================================================================
-// virtual
-BOOL CntTransferResultItem::PutValue(uno::Any const & rVal, BYTE)
-{
-    return rVal >>= m_aResult;
-}
-
-//============================================================================
-// virtual
-SfxPoolItem * CntTransferResultItem::Clone(SfxItemPool *) const
-{
-    return new CntTransferResultItem(*this);
-}
-
diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx
index e909fb2fd4e8..3cc90998e2dc 100644
--- a/svl/source/numbers/numuno.cxx
+++ b/svl/source/numbers/numuno.cxx
@@ -35,7 +35,6 @@
 
 #define _ZFORLIST_DECLARE_TABLE
 
-#include <vcl/svapp.hxx>
 #include <tools/color.hxx>
 #include <tools/debug.hxx>
 #include <vos/mutex.hxx>
diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx
index eb867f67fb57..f03ef3f31140 100644
--- a/svl/source/numbers/zforlist.cxx
+++ b/svl/source/numbers/zforlist.cxx
@@ -59,8 +59,6 @@
 #include "numhead.hxx"
 
 #include <unotools/syslocaleoptions.hxx>
-#include "listener.hxx"
-#include <svl/smplhint.hxx>
 #include <unotools/digitgroupingiterator.hxx>
 #include <rtl/logfile.hxx>
 #include <rtl/instance.hxx>
@@ -120,7 +118,7 @@ public:
             sal_uInt32           Count()
                                 { return aFormatters.Count(); }
 
-            virtual void ConfigurationChanged( utl::ConfigurationBroadcaster* );
+            virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 );
 };
 
 
@@ -137,9 +135,9 @@ SvNumberFormatterRegistry_Impl::~SvNumberFormatterRegistry_Impl()
 }
 
 
-void SvNumberFormatterRegistry_Impl::ConfigurationChanged( utl::ConfigurationBroadcaster* )
+void SvNumberFormatterRegistry_Impl::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 nHint )
 {
-        //if ( pHint->GetId() & SYSLOCALEOPTIONS_HINT_LOCALE )
+        if ( nHint & SYSLOCALEOPTIONS_HINT_LOCALE )
         {
             ::osl::MutexGuard aGuard( SvNumberFormatter::GetMutex() );
             for ( SvNumberFormatter* p = (SvNumberFormatter*)aFormatters.First();
@@ -149,7 +147,7 @@ void SvNumberFormatterRegistry_Impl::ConfigurationChanged( utl::ConfigurationBro
             }
             eSysLanguage = MsLangId::getRealLanguage( LANGUAGE_SYSTEM );
         }
-        //if ( pHint->GetId() & SYSLOCALEOPTIONS_HINT_CURRENCY )
+        if ( nHint & SYSLOCALEOPTIONS_HINT_CURRENCY )
         {
             ::osl::MutexGuard aGuard( SvNumberFormatter::GetMutex() );
             for ( SvNumberFormatter* p = (SvNumberFormatter*)aFormatters.First();
diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index ae43c1c70e6b..faf086e369bd 100644
--- a/svl/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.cxx
@@ -59,6 +59,11 @@ void SysCredentialsConfigItem::Notify(
     m_pOwner->persistentConfigChanged();
 }
 
+void SysCredentialsConfigItem::Commit()
+{
+    // does nothing
+}
+
 uno::Sequence< rtl::OUString >
 SysCredentialsConfigItem::getSystemCredentialsURLs()
 {
diff --git a/svl/source/passwordcontainer/syscreds.hxx b/svl/source/passwordcontainer/syscreds.hxx
index b037e17c348e..68de21049fdc 100644
--- a/svl/source/passwordcontainer/syscreds.hxx
+++ b/svl/source/passwordcontainer/syscreds.hxx
@@ -49,7 +49,7 @@ class SysCredentialsConfigItem : public utl::ConfigItem
         virtual void Notify(
             const com::sun::star::uno::Sequence< rtl::OUString > &
                 seqPropertyNames );
-        //virtual void Commit();
+        virtual void Commit();
 
         com::sun::star::uno::Sequence< rtl::OUString >
         getSystemCredentialsURLs();
diff --git a/svl/util/makefile.mk b/svl/util/makefile.mk
index 522e1b3c0a3c..36e1d3f63852 100644
--- a/svl/util/makefile.mk
+++ b/svl/util/makefile.mk
@@ -68,6 +68,7 @@ LIB1FILES=	\
 
 RESLIB1NAME=	$(RESTARGETSIMPLE)
 RESLIB1SRSFILES=\
+        $(SRS)$/items.srs \
         $(SRS)$/misc.srs
 
 # build the shared library  --------------------------------------------------
@@ -85,7 +86,6 @@ SHL1STDLIBS= \
         $(CPPUHELPERLIB)	\
         $(CPPULIB)			\
         $(VOSLIB)			\
-        $(VCLLIB)			\
                 $(SOTLIB)     \
         $(SALLIB)