update to current version

15 files changed, 534 insertions, 416 deletions

diff --git a/desktop/source/migration/pages.cxx b/desktop/source/migration/pages.cxx
index 80c5849ee4d9..2c85828f540f 100644
--- a/desktop/source/migration/pages.cxx
+++ b/desktop/source/migration/pages.cxx
@@ -373,9 +373,11 @@ UserPage::UserPage( svt::OWizardMachine* parent, const ResId& resid)
     SvtUserOptions aUserOpt;
     m_edFirst.SetText(aUserOpt.GetFirstName());
     m_edLast.SetText(aUserOpt.GetLastName());
+#if 0
     rtl::OUString aUserName;
     vos::OSecurity().getUserName( aUserName );
        aUserOpt.SetID( aUserName );
+#endif
 
     m_edInitials.SetText(aUserOpt.GetID());
     if (m_lang == LANGUAGE_RUSSIAN)
diff --git a/shell/inc/internal/config.hxx b/shell/inc/internal/config.hxx
index 47394730c761..e9b3e0fd59ac 100644
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/internal/config.hxx
@@ -39,8 +39,13 @@
 #include <tchar.h>
 #endif
 
+#ifdef _AMD64_
+#define MODULE_NAME TEXT("shlxthdl_x64.dll")
+#define MODULE_NAME_FILTER TEXT("ooofilt_x64.dll")
+#else
 #define MODULE_NAME TEXT("shlxthdl.dll")
 #define MODULE_NAME_FILTER TEXT("ooofilt.dll")
+#endif
 
 #define COLUMN_HANDLER_DESCRIPTIVE_NAME    TEXT("OpenOffice.org Column Handler")
 #define INFOTIP_HANDLER_DESCRIPTIVE_NAME   TEXT("OpenOffice.org Infotip Handler")
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/internal/utilities.hxx
index a552516400bc..f0f7022dc02c 100644
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/internal/utilities.hxx
@@ -47,6 +47,7 @@
 #include "internal/types.hxx"
 
 #include <string>
+#include <strsafe.h>
 
 //---------------------------------
 /** Convert a string to a wstring
@@ -89,4 +90,23 @@ bool HasOnlySpaces(const std::wstring& String);
 LCID LocaleSetToLCID( const LocaleSet_t & Locale );
 #endif
 
+//----------------------------------------------------------
+#ifdef DEBUG
+inline void OutputDebugStringFormat( LPCSTR pFormat, ... )
+{
+    CHAR    buffer[1024];
+    va_list args;
+
+    va_start( args, pFormat );
+    StringCchVPrintfA( buffer, sizeof(buffer), pFormat, args );
+    OutputDebugStringA( buffer );
+}
+#else
+static inline void OutputDebugStringFormat( LPCSTR, ... )
+{
+}
+#endif
+//----------------------------------------------------------
+
+
 #endif
diff --git a/shell/prj/d.lst b/shell/prj/d.lst
index 98d4a6215faf..d623a55c2d6c 100644
--- a/shell/prj/d.lst
+++ b/shell/prj/d.lst
@@ -4,6 +4,9 @@
 ..\%__SRC%\lib\*.uno.so %_DEST%\lib%_EXT%\*.uno.so
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
 ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
+..\%__SRC%\bin\x64\shlxthdl.dll %_DEST%\bin%_EXT%\shlxthdl_x64.dll
+..\%__SRC%\bin\x64\ooofiltproxy.dll %_DEST%\bin%_EXT%\ooofiltproxy_x64.dll
+..\%__SRC%\bin\x64\ooofilt.dll %_DEST%\bin%_EXT%\ooofilt_x64.dll
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index 304bff841dbd..da6974d4399d 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -45,6 +45,8 @@
 #include <stdio.h>
 #include <utility>
 #include <stdlib.h>
+
+
 #define MAX_STRING 80
 #define KB 1024.0
 const std::wstring WSPACE = std::wstring(SPACE);
diff --git a/shell/source/win32/shlxthandler/makefile.mk b/shell/source/win32/shlxthandler/makefile.mk
index 07eea87f0263..479f8c0b6cd9 100644
--- a/shell/source/win32/shlxthandler/makefile.mk
+++ b/shell/source/win32/shlxthandler/makefile.mk
@@ -1,7 +1,7 @@
 #*************************************************************************
 #
 # 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
@@ -123,17 +123,17 @@ SHL1STDLIBS_X64+=\
     $(SHELL32LIB_X64)\
     $(KERNEL32LIB_X64)\
     $(GDI32LIB_X64)\
-    $(MSVCRT_X64) \
-    $(MSVCPRT_X64) \
     $(USER32LIB_X64) \
-    $(OLDNAMESLIB_X64) \
-    $(GDIPLUSLIB_X64)
+    $(GDIPLUSLIB_X64) \
+    $(MSVCRT_X64)   \
+    $(MSVCPRT_X64)  \
+    $(OLDNAMESLIB_X64)
 
 SHL1LIBS_X64+=$(SLB_X64)$/util.lib\
     $(SLB_X64)$/ooofilereader.lib
 SHL1OBJS_X64=$(SLOFILES_X64)
 SHL1DEF_X64=$(MISC_X64)$/$(SHL1TARGET).def
-SHL1RES_X64=$(RES_X64)$/$(TARGET)_x64.res
+SHL1RES_X64=$(RES_X64)$/$(TARGET).res
 
 DEF1NAME_X64=$(SHL1TARGET_X64)
 DEF1EXPORTFILE_X64=exports.dxp
@@ -144,3 +144,4 @@ DEF1EXPORTFILE_X64=exports.dxp
 .INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
 .INCLUDE :	tg_wntx64.mk
+
diff --git a/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx b/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx
index 879cf8c0115b..218ba500d368 100644
--- a/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/proxy/ooofiltproxy.cxx
@@ -42,6 +42,7 @@
 #ifdef __MINGW32__
 #include <basetyps.h>
 #endif
+#include "internal/config.hxx"
 
 
 /*
@@ -88,7 +89,8 @@ void Init()
         TCHAR buff[MAX_PATH];
         GetModuleFileName(hThisLibrary, buff, (sizeof(buff)/sizeof(TCHAR)));
         PathTruncateFileName(buff);
-        lstrcat(buff, TEXT("ooofilt.dll"));
+
+        lstrcat(buff, MODULE_NAME_FILTER);
 
         hOoofilt = LoadLibraryEx(buff, NULL, LOAD_WITH_ALTERED_SEARCH_PATH);
 
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index 171bc287715f..d854694d8394 100644
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -177,7 +177,6 @@ HRESULT STDMETHODCALLTYPE CPropertySheet::Initialize(
 
 HRESULT STDMETHODCALLTYPE CPropertySheet::AddPages(LPFNADDPROPSHEETPAGE lpfnAddPage, LPARAM lParam)
 {
-
     PROPSHEETPAGE psp;
 
     // add the summary property page
@@ -309,7 +308,6 @@ BOOL CALLBACK CPropertySheet::PropPageStatisticsProc(HWND hwnd, UINT uiMsg, WPAR
 //##################################
 void CPropertySheet::InitPropPageSummary(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/)
 {
-
     CMetaInfoReader metaInfo(m_szFileName);
 
     SetWindowText(GetDlgItem(hwnd,IDC_TITLE),    metaInfo.getTagData( META_INFO_TITLE ).c_str() );
@@ -335,7 +333,6 @@ void CPropertySheet::InitPropPageSummary(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/)
 */
 void CPropertySheet::InitPropPageStatistics(HWND hwnd, LPPROPSHEETPAGE /*lppsp*/)
 {
-
     CMetaInfoReader metaInfo(m_szFileName);
 
     document_statistic_reader_ptr doc_stat_reader = create_document_statistic_reader(m_szFileName, &metaInfo);
diff --git a/shell/source/win32/shlxthandler/res/makefile.mk b/shell/source/win32/shlxthandler/res/makefile.mk
index 08893506b2d2..8f8c77638387 100644
--- a/shell/source/win32/shlxthandler/res/makefile.mk
+++ b/shell/source/win32/shlxthandler/res/makefile.mk
@@ -53,9 +53,19 @@ ULFDIR:=$(COMMONMISC)$/$(TARGET)
 .ELSE			# "$(WITH_LANG)"!=""
 ULFDIR:=.
 .ENDIF			# "$(WITH_LANG)"!=""
+
 # --- Targets ------------------------------------------------------
 
+.IF "$(BUILD_X64)"!=""
+$(RES)$/x64$/$(TARGET).res : $(RES)$/$(TARGET).res
+    -$(MKDIR) $(RES)$/x64
+    @@cp $< $@
+.ENDIF # "$(BUILD_X64)"!=""
+
+.INCLUDE :	set_wntx64.mk
 .INCLUDE :	target.mk
+.INCLUDE :	tg_wntx64.mk
+
 
 
 # Generate the native Windows resource file
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 35d155b6c22d..6315a719a62e 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -30,19 +30,21 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_shell.hxx"
+
 #include "internal/global.hxx"
 
 #ifndef INFOTIPS_HXX_INCLUDED
 #include "internal/thumbviewer.hxx"
 #endif
 #include "internal/shlxthdl.hxx"
-#include "internal/utilities.hxx"
 #include "internal/registry.hxx"
 #include "internal/fileextensions.hxx"
 #include "internal/config.hxx"
 #include "internal/zipfile.hxx"
+#include "internal/utilities.hxx"
 
 #include "internal/resource.h"
+
 #include <stdio.h>
 #include <utility>
 #include <stdlib.h>
@@ -212,15 +214,15 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Read(void *pv, ULONG cb, ULONG *pcb
 
 HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Seek(LARGE_INTEGER dlibMove, DWORD dwOrigin, ULARGE_INTEGER *)
 {
-    size_t size = ref_zip_buffer_.size();
-    size_t p = 0;
+    __int64 size = (__int64) ref_zip_buffer_.size();
+    __int64 p = 0;
 
     switch (dwOrigin)
     {
         case STREAM_SEEK_SET:
             break;
         case STREAM_SEEK_CUR:
-            p = pos_;
+            p = (__int64) pos_;
             break;
         case STREAM_SEEK_END:
             p = size - 1;
@@ -229,10 +231,11 @@ HRESULT STDMETHODCALLTYPE StreamOnZipBuffer::Seek(LARGE_INTEGER dlibMove, DWORD
 
    HRESULT hr = STG_E_INVALIDFUNCTION;
 
-   p += dlibMove.LowPart;
-   if (p < size)
+   p += dlibMove.QuadPart;
+
+   if ( ( p >= 0 ) && (p < size) )
    {
-        pos_ = p;
+        pos_ = (size_t) p;
         hr = S_OK;
    }
    return hr;
@@ -468,6 +471,7 @@ HRESULT STDMETHODCALLTYPE CThumbviewer::Extract(HBITMAP *phBmpImage)
     }
     catch(std::exception&)
     {
+        OutputDebugStringFormat( "CThumbviewer Extract ERROR!\n" );
         hr = E_FAIL;
     }
     return hr;
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx
index 36c19dd0c500..f2ae6238715a 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -32,12 +32,9 @@
 #include "precompiled_shell.hxx"
 
 
-#include "internal/utilities.hxx"
 #include "internal/config.hxx"
 #include "internal/dbgmacros.hxx"
-
-
-
+#include "internal/utilities.hxx"
 
 //-----------------------------
 // constants
@@ -87,15 +84,9 @@ std::wstring GetResString(int ResId)
 {
     wchar_t szResStr[MAX_RES_STRING];
 
-    #if OSL_DEBUG_LEVEL > 0
-    int rc =
-    #endif
-    LoadStringW(
-        GetModuleHandleW(MODULE_NAME),
-        ResId,
-        szResStr,
-        sizeof(szResStr));
+    int rc = LoadStringW( GetModuleHandleW(MODULE_NAME), ResId, szResStr, sizeof(szResStr) );
 
+    OutputDebugStringFormat( "GetResString: read %d chars\n", rc );
     ENSURE(rc, "String resource not found");
 
     return std::wstring(szResStr);
diff --git a/svx/inc/svx/numitem.hxx b/svx/inc/svx/numitem.hxx
index 17eb3d62630c..9840ec1688ac 100644
--- a/svx/inc/svx/numitem.hxx
+++ b/svx/inc/svx/numitem.hxx
@@ -76,12 +76,6 @@ namespace com{namespace sun{ namespace star{
 #define SVX_NO_NUM              200 // Markierung fuer keine Numerierung
 #define SVX_NO_NUMLEVEL         0x20
 
-// --> OD 2008-01-10 #newlistlevelattrs# - no longer used
-//#define NUMITEM_VERSION_01        0x01
-//#define NUMITEM_VERSION_02        0x02
-//#define NUMITEM_VERSION_03        0x03
-// <--
-
 #define LINK_TOKEN  0x80 //indicate linked bitmaps - for use in dialog only
 class SVX_DLLPUBLIC SvxNumberType
 {
@@ -191,14 +185,10 @@ public:
                      SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION );
     // <--
     SvxNumberFormat(const SvxNumberFormat& rFormat);
-    // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//    SvxNumberFormat(SvStream &rStream);
-    // <--
+    SvxNumberFormat(SvStream &rStream);
     virtual ~SvxNumberFormat();
 
-    // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//    SvStream&       Store(SvStream &rStream, FontToSubsFontConverter pConverter);
-    // <--
+    SvStream&       Store(SvStream &rStream, FontToSubsFontConverter pConverter);
 
     SvxNumberFormat& operator=( const SvxNumberFormat&  );
     BOOL            operator==( const SvxNumberFormat&  ) const;
@@ -304,9 +294,7 @@ public:
                                 = SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
     // <--
     SvxNumRule(const SvxNumRule& rCopy);
-    // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//  SvxNumRule(SvStream &rStream);
-    // <--
+    SvxNumRule(SvStream &rStream);
     virtual ~SvxNumRule();
 
     int                     operator==( const SvxNumRule& ) const;
@@ -314,9 +302,7 @@ public:
 
     SvxNumRule&             operator=( const SvxNumRule&  );
 
-    // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//    SvStream&               Store(SvStream &rStream);
-    // <--
+    SvStream&               Store(SvStream &rStream);
 
     const SvxNumberFormat*  Get(USHORT nLevel)const;
     const SvxNumberFormat&  GetLevel(USHORT nLevel)const;
@@ -354,11 +340,9 @@ public:
     virtual ~SvxNumBulletItem();
 
     virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
-    // --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
-//    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
-//    virtual USHORT           GetVersion( USHORT nFileVersion ) const;
-    // <--
+    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
+    USHORT  GetVersion( USHORT nFileVersion ) const;
+    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
     virtual int              operator==( const SfxPoolItem& ) const;
 
     SvxNumRule*             GetNumRule() const {return pNumRule;}
diff --git a/svx/source/cui/numpages.cxx b/svx/source/cui/numpages.cxx
index 6454b3dd7c2a..92b5934baed7 100644
--- a/svx/source/cui/numpages.cxx
+++ b/svx/source/cui/numpages.cxx
@@ -378,12 +378,24 @@ int  SvxSingleNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
 
 void  SvxSingleNumPickTabPage::Reset( const SfxItemSet& rSet )
 {
-    nNumItemId = rSet.GetPool() ? rSet.GetPool()->GetWhich( SID_ATTR_NUMBERING_RULE ) : SID_ATTR_NUMBERING_RULE;
-
-    const SvxNumBulletItem& rItem = static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+    const SfxPoolItem* pItem;
+//  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
+    //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
+    SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
+    if(eState != SFX_ITEM_SET)
+    {
+        nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
+        eState = rSet.GetItemState(nNumItemId, FALSE, &pItem);
 
+        if( eState != SFX_ITEM_SET )
+        {
+            pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+            eState = SFX_ITEM_SET;
+        }
+    }
+    DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
     delete pSaveNum;
-    pSaveNum = new SvxNumRule(*rItem.GetNumRule());
+    pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
     if(!pActNum)
         pActNum = new  SvxNumRule(*pSaveNum);
@@ -564,12 +576,24 @@ int  SvxBulletPickTabPage::DeactivatePage(SfxItemSet *_pSet)
 
 void  SvxBulletPickTabPage::Reset( const SfxItemSet& rSet )
 {
-    nNumItemId = rSet.GetPool() ? rSet.GetPool()->GetWhich( SID_ATTR_NUMBERING_RULE ) : SID_ATTR_NUMBERING_RULE;
+    const SfxPoolItem* pItem;
+    //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
+    SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
+    if(eState != SFX_ITEM_SET)
+    {
+        nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
+        eState = rSet.GetItemState(nNumItemId, FALSE, &pItem);
 
-    const SvxNumBulletItem& rItem = static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+        if( eState != SFX_ITEM_SET )
+        {
+            pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+            eState = SFX_ITEM_SET;
+        }
 
+    }
+    DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
     delete pSaveNum;
-    pSaveNum = new SvxNumRule(*rItem.GetNumRule());
+    pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
 //  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
 
@@ -789,12 +813,24 @@ int  SvxNumPickTabPage::DeactivatePage(SfxItemSet *_pSet)
 
 void  SvxNumPickTabPage::Reset( const SfxItemSet& rSet )
 {
-    nNumItemId = rSet.GetPool() ? rSet.GetPool()->GetWhich( SID_ATTR_NUMBERING_RULE ) : SID_ATTR_NUMBERING_RULE;
+    const SfxPoolItem* pItem;
+    //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
+    SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
+    if(eState != SFX_ITEM_SET)
+    {
+        nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
+        eState = rSet.GetItemState(nNumItemId, FALSE, &pItem);
 
-    const SvxNumBulletItem& rItem = static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+        if( eState != SFX_ITEM_SET )
+        {
+            pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+            eState = SFX_ITEM_SET;
+        }
 
+    }
+    DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
     delete pSaveNum;
-    pSaveNum = new SvxNumRule(*rItem.GetNumRule());
+    pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
 //  nActNumLvl = ((SwNumBulletTabDialog*)GetTabDialog())->GetActNumLevel();
     if(!pActNum)
@@ -1089,12 +1125,24 @@ BOOL  SvxBitmapPickTabPage::FillItemSet( SfxItemSet& rSet )
 
 void  SvxBitmapPickTabPage::Reset( const SfxItemSet& rSet )
 {
-    nNumItemId = rSet.GetPool() ? rSet.GetPool()->GetWhich( SID_ATTR_NUMBERING_RULE ) : SID_ATTR_NUMBERING_RULE;
+    const SfxPoolItem* pItem;
+    //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
+    SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
+    if(eState != SFX_ITEM_SET)
+    {
+        nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
+        eState = rSet.GetItemState(nNumItemId, FALSE, &pItem);
 
-    const SvxNumBulletItem& rItem = static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+        if( eState != SFX_ITEM_SET )
+        {
+            pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+            eState = SFX_ITEM_SET;
+        }
 
+    }
+    DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
     delete pSaveNum;
-    pSaveNum = new SvxNumRule(*rItem.GetNumRule());
+    pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
     if(!pActNum)
         pActNum = new  SvxNumRule(*pSaveNum);
@@ -1516,12 +1564,24 @@ BOOL    SvxNumOptionsTabPage::FillItemSet( SfxItemSet& rSet )
 --------------------------------------------------*/
 void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
 {
-    nNumItemId = rSet.GetPool() ? rSet.GetPool()->GetWhich( SID_ATTR_NUMBERING_RULE ) : SID_ATTR_NUMBERING_RULE;
+    const SfxPoolItem* pItem;
+    //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
+    SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
+    if(eState != SFX_ITEM_SET)
+    {
+        nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
+        eState = rSet.GetItemState(nNumItemId, FALSE, &pItem);
 
-    const SvxNumBulletItem& rItem = static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+        if( eState != SFX_ITEM_SET )
+        {
+            pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+            eState = SFX_ITEM_SET;
+        }
 
+    }
+    DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
     delete pSaveNum;
-    pSaveNum = new SvxNumRule(*rItem.GetNumRule());
+    pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
     // Ebenen einfuegen
     if(!aLevelLB.GetEntryCount())
@@ -1565,7 +1625,6 @@ void    SvxNumOptionsTabPage::Reset( const SfxItemSet& rSet )
     pPreviewWIN->SetNumRule(pActNum);
     aSameLevelCB.Check(pActNum->IsContinuousNumbering());
 
-    const SfxPoolItem* pItem = 0;
     //ColorListBox bei Bedarf fuellen
     if ( pActNum->IsFeatureSupported( NUM_BULLET_COLOR ) )
     {
@@ -3409,12 +3468,24 @@ BOOL SvxNumPositionTabPage::FillItemSet( SfxItemSet& rSet )
 --------------------------------------------------*/
 void SvxNumPositionTabPage::Reset( const SfxItemSet& rSet )
 {
-    nNumItemId = rSet.GetPool() ? rSet.GetPool()->GetWhich( SID_ATTR_NUMBERING_RULE ) : SID_ATTR_NUMBERING_RULE;
+    const SfxPoolItem* pItem;
+    //im Draw gibt es das Item als WhichId, im Writer nur als SlotId
+    SfxItemState eState = rSet.GetItemState(SID_ATTR_NUMBERING_RULE, FALSE, &pItem);
+    if(eState != SFX_ITEM_SET)
+    {
+        nNumItemId = rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE);
+        eState = rSet.GetItemState(nNumItemId, FALSE, &pItem);
 
-    const SvxNumBulletItem& rItem = static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+        if( eState != SFX_ITEM_SET )
+        {
+            pItem = &static_cast< const SvxNumBulletItem& >( rSet.Get( nNumItemId, TRUE ) );
+            eState = SFX_ITEM_SET;
+        }
 
+    }
+    DBG_ASSERT(eState == SFX_ITEM_SET, "kein Item gefunden!");
     delete pSaveNum;
-    pSaveNum = new SvxNumRule(*rItem.GetNumRule());
+    pSaveNum = new SvxNumRule(*((SvxNumBulletItem*)pItem)->GetNumRule());
 
     // Ebenen einfuegen
     if(!aLevelLB.GetEntryCount())
diff --git a/svx/source/intro/intro_tmpl.hrc b/svx/source/intro/intro_tmpl.hrc
index ad3a628213be..f724cd476ec2 100644
--- a/svx/source/intro/intro_tmpl.hrc
+++ b/svx/source/intro/intro_tmpl.hrc
@@ -59,6 +59,7 @@ ItemList = \
     < "Jost Ammon" ; > ; \
     < "Paolo Amodio" ; > ; \
     < "Abdullah Anar" ; > ; \
+    < "Gene Anaya" ; > ; \
     < "Christian Andersen" ; > ; \
     < "Frank J. Andersen" ; > ; \
     < "Jan Moller Andersen" ; > ; \
@@ -94,7 +95,9 @@ ItemList = \
     < "David Bartlett" ; > ; \
     < "Sascha Ballach" ; > ; \
     < "Stefan Baltzer" ; > ; \
+    < "Jayant Balraj Madavi" ; > ; \
     < "Claudio Bandaloukas" ; > ; \
+    < "Omar Bar-or" ; > ; \
     < "Hrega Basu" ; > ; \
     < "Mathias Bauer" ; > ; \
     < "Martin Baulig" ; > ; \
@@ -119,6 +122,7 @@ ItemList = \
     < "Zaheda Bhorat" ; > ; \
     < "Andreas Bille" ; > ; \
     < "Oliver Bietzer" ; > ; \
+    < "Eric Bischoff" ; > ; \
     < "Marissa Bishop" ; > ; \
     < "Torkil Bladt" ; > ; \
     < "Martin Blapp" ; > ; \
@@ -134,6 +138,7 @@ ItemList = \
     < "Csaba Borbola" ; > ; \
     < "Gregor Bornemann" ; > ; \
     < "Thorsten Bosbach" ; > ; \
+    < "Eric Bosdonnat" ; > ; \
     < "Daniel Boss" ; > ; \
     < "David Boswell" ; > ; \
     < "Freddy Boswell" ; > ; \
@@ -179,6 +184,8 @@ ItemList = \
     < "Kimmy Chen" ; > ; \
     < "Robert Chen" ; > ; \
     < "Yu Aaron Cheng" ; > ; \
+    < "Jian Hong Cheng" ; > ; \
+    < "Xiuzhi Cheng" ; > ; \
     < "Allan B. Christensen" ; > ; \
     < "Steen Christensen" ; > ; \
     < "Marco Ciampa" ; > ; \
@@ -190,6 +197,7 @@ ItemList = \
     < "Vicky Chan" ; > ; \
     < "Michael J. Cole" ; > ; \
     < "Urska Colner" ; > ; \
+    < "Alexandro Colorado" ; > ; \
     < "Compaq Computer Corperation" ; > ; \
     < "Karen Conatser" ; > ; \
     < "Confucian Pro. Technology" ; > ; \
@@ -197,11 +205,13 @@ ItemList = \
     < "Lee Corbin" ; > ; \
     < "Dietmar Cordes" ; > ; \
     < "Berend Cornelius" ; > ; \
+    < "Clayton Cornell" ; > ; \
      < "Jesus Corrius" ; > ; \
     < "Martin Coxall" ; > ; \
      < "Joszef Csongradi" ; > ; \
     < "Alessandro Cumin" ; > ; \
     < "Johannes Czerwinski" ; > ; \
+    < "Michael Cziebalski" ; > ; \
     < "Valentina Dagiene" ; > ; \
     < "Richard Daley" ; > ; \
     < "Viktoras Dagys" ; > ; \
@@ -218,9 +228,11 @@ ItemList = \
     < "Francois Dechelle" ; > ; \
     < "Andrea Decorte" ; > ; \
     < "Martijn Dekkers" ; > ; \
+    < "Andrew Dent" ; > ; \
     < "Westley Alan Dent" ; > ; \
     < "Luiz Augusto Von Dentz" ; > ; \
     < "Helge Delfs" ; > ; \
+    < "Naren Devaiah" ; > ; \
     < "Frederic Juan Diaz" ; > ; \
     < "Scott Dietrich" ; > ; \
     < "Frederik Dietz" ; > ; \
@@ -230,8 +242,10 @@ ItemList = \
     < "Vitor Domingos" ; > ; \
     < "Jean-Francois Donikian" ; > ; \
     < "Simford Dong" ; > ; \
+    < "Nitri Dongre" ; > ; \
     < "Thomas Doru" ; > ; \
     < "Willem van Dorp" ; > ; \
+    < "Radek Doulik" ; > ; \
     < "Davide Dozza" ; > ; \
     < "Derek Dreger" ; > ; \
     < "Carsten Driesner" ; > ; \
@@ -249,9 +263,11 @@ ItemList = \
     < "Rene Engelhard" ; > ; \
     < "Mina Erickson" ; > ; \
     < "Peter Eriksen" ; > ; \
+    < "Per Eriksson" ; > ; \
     < "Alberto Escudero-Pascual" ; > ; \
     < "Fabalabs Software GmbH" ; > ; \
     < "Charles Anthony Fannan" ; > ; \
+    < "Jean-Baptiste Faure" ; > ; \
     < "Ralf-Michael Fehr" ; > ; \
     < "Vladimir Fedak" ; > ; \
     < "Zoltan Fekete" ; > ; \
@@ -261,6 +277,7 @@ ItemList = \
     < "Claudio Ferreira" ; > ; \
     < "Raquel Fares Ferreira" ; > ; \
     < "Marco Fiemozzi" ; > ; \
+    < "Claudio F Filho" ; > ; \
     < "Pierre de Filippis" ; > ; \
     < "Jan Firich" ; > ; \
     < "Andre Fischer" ; > ; \
@@ -271,6 +288,7 @@ ItemList = \
     < "Kenneth Foskey" ; > ; \
     < "Duncan Foster" ; > ; \
     < "Tim Foster" ; > ; \
+    < "David Franser" ; > ; \
     < "Peter Frandsen" ; > ; \
     < "Gary Frederick" ; > ; \
     < "Nils Fuhrmann" ; > ; \
@@ -280,8 +298,11 @@ ItemList = \
     < "Tom Garland" ; > ; \
     < "Wolfram Garten" ; > ; \
     < "Martin Gallwey" ; > ; \
+    < "Pierre-Andre Galmes" ; > ; \
     < "Roberto Galoppini" ; > ; \
     < "Tony Galmiche" ; > ; \
+    < "Sunil Gandhi" ; > ; \
+    < "Zemin Gao" ; > ; \
     < "Sophie Gautier" ; > ; \
     < "Kathy Gavin" ; > ; \
     < "Alexander Gelfenbain" ; > ; \
@@ -327,6 +348,7 @@ ItemList = \
     < "Chris Halls" ; > ; \
     < "Arne Christian Harseth" ; > ; \
     < "Syamsul Anuar Abdul Hamid" ; > ; \
+    < "Bo Han" ; > ; \
     < "Ove Hanebring" ; > ; \
     < "Jens K. Hansen" ; > ; \
     < "Martin Willemoes Hansen" ; > ; \
@@ -423,6 +445,9 @@ ItemList = \
     < "Byrial Ole Jensen" ; > ; \
     < "Ricky Hugh Jensen" ; > ; \
     < "Tatjiana Jevsikova" ; > ; \
+    < "Berry Jia" ; > ; \
+    < "Mingfei Jia" ; > ; \
+    < "Chuang Jiang" ; > ; \
     < "Jiao Jianhua" ; > ; \
     < "Gary Johnston" ; > ; \
     < "Dewi Jones" ; > ; \
@@ -430,6 +455,7 @@ ItemList = \
     < "Anders Colding Jorgesen" ; > ; \
     < "Peter Junge" ; > ; \
     < "Christian Junker" ; > ; \
+    < "Pascal Junck" ; > ; \
     < "Henrik Just" ; > ; \
     < "Christian Kaas" ; > ; \
     < "Yukata Kachi" ; > ; \
@@ -438,16 +464,19 @@ ItemList = \
     < "masahisa kamataki" ; > ; \
     < "Tim Kampa" ; > ; \
     < "Petr Kania" ; > ; \
-    < "Tim Kampa" ; > ; \
     < "Mick Kappenburg" ; > ; \
     < "Etsushi Kato" ; > ; \
     < "Yosuke Kato" ; > ; \
+    < "Hirano Kazunari" ; > ; \
+    < "Mihaela Kedikova" ; > ; \
     < "Juergen Keil" ; > ; \
     < "Lina Kemmel" ; > ; \
     < "Darren Kenny" ; > ; \
+    < "Dhanajay Keskar" ; > ; \
     < "Ilja Ketris" ; > ; \
     < "Philipp Kewisch Ketris" ; > ; \
     < "Ossama Khayat" ; > ; \
+    < "Volodymyr Khrystynych" ; > ; \
     < "Ilja Ketris" ; > ; \
     < "Hermann Kienlein" ; > ; \
     < "Artem Khvat" ; > ; \
@@ -462,6 +491,7 @@ ItemList = \
     < "Thomas Klarhoefer" ; > ; \
     < "Sven Klawitter" ; > ; \
     < "Branislav Klocok" ; > ; \
+    < "Matthias Klose" ; > ; \
     < "Halfdan Holger Knudsen" ; > ; \
     < "Rune Tendal Kock" ; > ; \
     < "Magdy Samuel Abdel Koddous" ; > ; \
@@ -473,6 +503,7 @@ ItemList = \
     < "Uros Kositer" ; > ; \
     < "Peter Kosmalla" ; > ; \
     < "Nobuhiro Koura" ; > ; \
+    < "Lazlo Kovacs" ; > ; \
     < "Martin Kretzchmar" ; > ; \
     < "Ramesh Krishnamagaru" ; > ; \
     < "Jayamohan Krishnasamy" ; > ; \
@@ -498,6 +529,7 @@ ItemList = \
     < "Dr. Swapnil Vishnu Lale" ; > ; \
     < "Antti Lampinen/Kongo Group" ; > ; \
     < "Massimo Lanfranconi" ; > ; \
+    < "Marcus Lange" ; > ; \
     < "Peter Lange" ; > ; \
     < "Thomas Lange" ; > ; \
     < "Lars Langhans" ; > ; \
@@ -518,21 +550,36 @@ ItemList = \
     < "Yoann Le Bars" ; > ; \
     < "Armin Le Grand" ; > ; \
     < "Brigitte Le Grand" ; > ; \
+    < "Jakob Lechner" ; > ; \
+    < "Michael Leibowitz" ; > ; \
     < "Serge Le Louarne" ; > ; \
     < "Dong Lee" ; > ; \
     < "Kenneth Lee" ; > ; \
     < "Gregory Leffler" ; > ; \
     < "Hercule Li" ; > ; \
+    < "Hui Li" ; > ; \
+    < "Jian Li" ; > ; \
     < "Tommy C. Li" ; > ; \
     < "Wind Li" ; > ; \
+    < "Xing Li" ; > ; \
+    < "Ping Liao" ; > ; \
     < "Xin Liao" ; > ; \
+    < "Weike Liang" ; > ; \
     < "Rony Liemmukda" ; > ; \
+    < "Tor Lillqvist" ; > ; \
     < "Patranun Limudomporn" ; > ; \
     < "Archie Lin" ; > ; \
     < "Fong Lin" ; > ; \
     < "Martha J. Lindeman" ; > ; \
     < "Joachim Lingner" ; > ; \
     < "Christian Lippka" ; > ; \
+    < "Chen Liu" ; > ; \
+    < "Jianli Liu" ; > ; \
+    < "Mindy Liu" ; > ; \
+    < "Tao Liu" ; > ; \
+    < "YiSong Liu" ; > ; \
+    < "Yu Liu" ; > ; \
+    < "Yuhua Liu" ; > ; \
     < "ALT Linux Russia" ; > ; \
     < "Jonathan S. Lister" ; > ; \
     < "Vedran Ljubovic" ; > ; \
@@ -544,6 +591,7 @@ ItemList = \
     < "Anthony Long" ; > ; \
     < "Roberto Loprieno" ; > ; \
     < "Riccardo Losselli" ; > ; \
+    < "Jackson Low" ; > ; \
     < "Patrick Luby" ; > ; \
     < "Christoph Lukasiak" ; > ; \
     < "Robert Ludvik" ; > ; \
@@ -551,17 +599,23 @@ ItemList = \
     < "Edgardo Lugaresi" ; > ; \
     < "Gavin Lu" ; > ; \
     < "Morton Lund" ; > ; \
+    < "Jingrong Luo" ; > ; \
     < "Zaoliang Luo" ; > ; \
     < "Ian Lynch" ; > ; \
+    < "Jun Ma" ; > ; \
     < "Thomas J.L. MacDermott" ; > ; \
     < "Marcio A. Macendo" ; > ; \
     < "George Machitidze" ; > ; \
     < "Diane Mackay" ; > ; \
+    < "Prasad Madhav" ; > ; \
     < "Jorgen Madsen" ; > ; \
     < "Ove Madsen" ; > ; \
     < "Martin Maher" ; > ; \
+    < "Babak Mahbod" ; > ; \
+    < "Nakata Maho " ; > ; \
     < "Wad Mahsckoff" ; > ; \
     < "Milena Majorosova" ; > ; \
+    < "Yonggang Mao" ; > ; \
     < "Libor Maly" ; > ; \
     < "Mandrake Soft S.A." ; > ; \
     < "Libor Maly" ; > ; \
@@ -600,15 +654,18 @@ ItemList = \
     < "Aaron R. Meck" ; > ; \
     < "Nirav Mehta" ; > ; \
     < "Michael Meeks" ; > ; \
+    < "Frederico Mena-Quintero" ; > ; \
     < "James Meng" ; > ; \
     < "Frank Meies" ; > ; \
     < "Antonius Tjipke Meinen" ; > ; \
+    < "Ismael Merzaq" ; > ; \
     < "Andreas Meyer" ; > ; \
     < "Markus Meyer" ; > ; \
     < "Rolf Meyer" ; > ; \
     < "Djapparova Meruert" ; > ; \
     < "Ismael Merzaq" ; > ; \
     < "Michael Mi" ; > ; \
+    < "Bjoern Michaelsen" ; > ; \
     < "Boris Michelsz" ; > ; \
     < "Bjoern Milcke" ; > ; \
     < "Marcin Milkowski" ; > ; \
@@ -616,6 +673,7 @@ ItemList = \
     < "Aleksander Mikhailov-Erlich" ; > ; \
     < "Paul A. Miller" ; > ; \
     < "Arkadiusz Miskiewicz" ; > ; \
+    < "Petr Mladek" ; > ; \
     < "Erica Modena" ; > ; \
     < "Filip Molcan" ; > ; \
     < "Tadeusz Mollun" ; > ; \
@@ -639,6 +697,7 @@ ItemList = \
     < "National Centre for Software Technology, India" ; > ; \
     < "Takamichi Nara" ; > ; \
     < "Peter Naulls" ; > ; \
+    < "Jan Navratil" ; > ; \
     < "Niklas Nebel" ; > ; \
     < "Ales Nehyba" ; > ; \
     < "Christoph Neumann" ; > ; \
@@ -650,11 +709,13 @@ ItemList = \
     < "Jan Normann Nielsen" ; > ; \
     < "Ko-haw Nieh" ; > ; \
     < "Peter Van Nieuwenhoven" ; > ; \
+    < "Jan Nieuwenhuizen" ; > ; \
     < "Dhiraj Nilange" ; > ; \
     < "Sofia Nilsson" ; > ; \
     < "Kazutoshi Nimura" ; > ; \
     < "Jes Drost Nissen" ; > ; \
     < "Sofia Nilsson" ; > ; \
+    < "Christoph Noack" ; > ; \
     < "Bertram Nolte" ; > ; \
     < "Niels Nordmann" ; > ; \
     < "Michael Novati" ; > ; \
@@ -683,6 +744,7 @@ ItemList = \
     < "Subiaco Paola" ; > ; \
     < "Kannada Ganaka Parishat" ; > ; \
     < "Anna Parovel" ; > ; \
+    < "Pierre Pasteau" ; > ; \
     < "Shripad Patki" ; > ; \
     < "Andreas Pauley" ; > ; \
     < "Viktorija Paulikaite" ; > ; \
@@ -719,13 +781,16 @@ ItemList = \
     < "Nicola Previati" ; > ; \
     < "Rhoslyn Prys" ; > ; \
     < "Jaroslaw Jan Pyszny" ; > ; \
+    < "Jonathan Pryor" ; > ; \
     < "Zhang Qingbin" ; > ; \
+    < "Canghua Qu" ; > ; \
     < "Volker Quetschke" ; > ; \
     < "Tino Rachui" ; > ; \
     < "Radostin Radnev" ; > ; \
     < "Pramod Raghavendra" ; > ; \
     < "Adam Rambousek" ; > ; \
     < "Jacqueline Rahemipour" ; > ; \
+    < "Goran Rakic" ; > ; \
     < "Adam Rambousek" ; > ; \
     < "Kay Ramme" ; > ; \
     < "Klaus Ramstock" ; > ; \
@@ -748,6 +813,7 @@ ItemList = \
     < "Kjell Arne Rekaa" ; > ; \
     < "Frco. Javier Rial" ; > ; \
     < "Nicholas Richards" ; > ; \
+    < "Georg Richter" ; > ; \
     < "Jozef Riha" ; > ; \
     < "Michael Lee Rilee" ; > ; \
     < "Modestas Rimkus" ; > ; \
@@ -822,6 +888,7 @@ ItemList = \
     < "Syed Ahmad Shazali" ; > ; \
     < "Darragh Sherwin" ; > ; \
     < "Gia Shervashidze" ; > ; \
+    < "Wei Guo Shi" ; > ; \
     < "Norikatsu Shigemura" ; > ; \
     < "Bernhard Siaud" ; > ; \
     < "Joerg Sievers" ; > ; \
@@ -830,11 +897,13 @@ ItemList = \
     < "Keld Jorn Simonsen" ; > ; \
     < "Michael Sicotte" ; > ; \
     < "Clytie Ann Siddall" ; > ; \
+    < "Raul Siddahartha" ; > ; \
     < "SIL International (Freddy Boswell)" ; > ; \
     < "Mukund Sivaraman" ; > ; \
     < "Manoranjan Kr. Singh" ; > ; \
     < "G. Roderick Singleton" ; > ; \
     < "Joerg Skottke" ; > ; \
+    < "Sarah Smith" ; > ; \
     < "Timothy P. Smith" ; > ; \
     < "Colm Smyth" ; > ; \
     < "Javier Sola" ; > ; \
@@ -860,9 +929,11 @@ ItemList = \
     < "Erik William Strack" ; > ; \
     < "Daniel Strome" ; > ; \
     < "Fridrich Strba" ; > ; \
+    < "Keith Stribley" ; > ; \
     < "Ulf Stroehler" ; > ; \
     < "Daniel Strome" ; > ; \
     < "Louis Suarez-Potts" ; > ; \
+    < "Muthu Subramanian" ; > ; \
     < "Matthias Suess" ; > ; \
     < "Tae Hoon Suk of Intellikorea Ca., Ltd." ; > ; \
     < "Arthit Suriyawongkul" ; > ; \
@@ -880,7 +951,9 @@ ItemList = \
     < "Christina Taliaferro" ; > ; \
     < "Makoto Takizawa" ; > ; \
     < "Masaki Tamakoshi" ; > ; \
+    < "Quanfa Tang" ; > ; \
     < "Alberto Di Taranto" ; > ; \
+    < "David Tardon" ; > ; \
     < "Uday K. Tashildar" ; > ; \
     < "Stefan Taxhet" ; > ; \
     < "William Terry" ; > ; \
@@ -896,6 +969,7 @@ ItemList = \
     < "James M. Thompson" ; > ; \
     < "Holger Thon" ; > ; \
     < "Alexander Thurgood" ; > ; \
+    < "Caio Tiago Oliveira" ; > ; \
     < "Lukas Tinkl" ; > ; \
     < "Gerhard Tonn" ; > ; \
     < "Istvan Torda" ; > ; \
@@ -944,6 +1018,7 @@ ItemList = \
     < "William Wan" ; > ; \
     < "Funda Wang" ; > ; \
     < "Polly Wang" ; > ; \
+    < "Xu Ming Wang" ; > ; \
     < "Yi Wang" ; > ; \
     < "Sangay Wangchuk" ; > ; \
     < "Matthew Wardrop" ; > ; \
@@ -954,6 +1029,7 @@ ItemList = \
     < "Martin Webermann" ; > ; \
     < "Donata Wegener" ; > ; \
     < "Law Yee Wei" ; > ; \
+    < "Zhao Wei" ; > ; \
     < "Michel Weimerskirch" ; > ; \
     < "Prof. Dr. Eduard Werner" ; > ; \
     < "Michael Wever" ; > ; \
@@ -974,19 +1050,25 @@ ItemList = \
     < "Eugene T.S. Wong" ; > ; \
     < "Pui Lam Wong" ; > ; \
     < "Minna Wu" ; > ; \
+    < "Yan Wu" ; > ; \
     < "Stephan Wunderlich" ; > ; \
     < "Simos Xenitellis" ; > ; \
     < "Shun Min Serena Xiao" ; > ; \
     < "Nat Friedman for Ximian" ; > ; \
+    < "Antonio Xu" ; > ; \
+    < "Dehua Xu" ; > ; \
     < "Gary Yang" ; > ; \
     < "Yukiharu Yabuki" ; > ; \
     < "Kliment Pavlov Yanev" ; > ; \
     < "Taniguchi Yasuaki" ; > ; \
     < "Oleg Yegorov" ; > ; \
+    < "Steve Yin" ; > ; \
     < "Kunihiko Yokota" ; > ; \
     < "Kim Il Yong" ; > ; \
     < "Kohei Yoshida" ; > ; \
     < "Deltasoft Yu" ; > ; \
+    < "Guoqiang Yu" ; > ; \
+    < "Xiaoyang Yu" ; > ; \
     < "Gary Yuen" ; > ; \
     < "Christian Zagrodnick" ; > ; \
     < "George Zahopulos" ; > ; \
@@ -996,7 +1078,10 @@ ItemList = \
     < "Fuxin Zhang" ; > ; \
     < "Joy Zhang" ; > ; \
     < "Lei Phill Zhang" ; > ; \
+    < "Xiaofei Zhang" ; > ; \
+    < "Jianwei Zhao" ; > ; \
     < "May Zhang" ; > ; \
+    < "Jeremy Zheng" ; > ; \
     < "Thorsten Ziehm" ; > ; \
     < "Stefan Ziel" ; > ; \
     < "Jan Zitniak" ; > ; \
@@ -1015,7 +1100,7 @@ ItemList = \
     < "" ; > ; \
     < "FUNCTIONAL STAFF" ; 8 ; > ; \
     < "" ; > ; \
-    < "Sabine Schroeder" ; > ; \
+    < "Sabine Huetsch" ; > ; \
     < "" ; > ; \
     < "OpenOffice.org COORDINATION" ; 8 ; > ; \
     < "" ; > ; \
@@ -1026,13 +1111,14 @@ ItemList = \
     < "Matthias Huetsch" ; > ; \
     < "Kay Ramme" ; > ; \
     < "" ; > ; \
-    < "SUN SIGMA BLACK BELT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Stefan Zimmermann" ; > ; \
-    < "" ; > ; \
     < "PROGRAM MANAGEMENT" ; 8 ; > ; \
     < "" ; > ; \
+    < "Joost Andrae" ; > ; \
+    < "Martin Damboldt" ; > ; \
+    < "Martin Hollmichel" ; > ; \
     < "Andre Kuemmel" ; > ; \
+    < "Marcus Lange" ; > ; \
+    < "Uwe Luebbers" ; > ; \
     < "" ; > ; \
     < "" ; > ; \
     < "%PRODUCTNAME DEVELOPMENT" ; 8 ; > ; \
@@ -1047,7 +1133,6 @@ ItemList = \
     < "ODF" ; 8 ; > ; \
     < "" ; > ; \
     < "Svante Schubert" ; > ; \
-    < "Lars Behrmann" ; > ; \
     < "" ; > ; \
     < "DESIGN" ; 8 ; > ; \
     < "" ; > ; \
@@ -1068,10 +1153,9 @@ ItemList = \
     < "Thomas Lange" ; > ; \
     < "Andreas Martens" ; > ; \
     < "Frank Meies" ; > ; \
+    < "Bjoern Michaelsen" ; > ; \
     < "Andreas Schluens" ; > ; \
     < "Oliver Specht" ; > ; \
-    < "Gunnar Timm" ; > ; \
-    < "Daniel Vogelheim" ; > ; \
     < "Oliver-Rainer Wittmann" ; > ; \
     < "Michael Stahl" ; > ; \
     < "Mikhail Voitenko" ; > ; \
@@ -1081,8 +1165,6 @@ ItemList = \
     < "Kai Ahrens" ; > ; \
     < "" ; > ; \
     < "Volker Ahrendt" ; > ; \
-    < "Thorsten Behrens" ; > ; \
-    < "Michael Buettner" ; > ; \
     < "Herbert Duerr" ; > ; \
     < "Andre Fischer" ; > ; \
     < "Ilko Hoepping" ; > ; \
@@ -1100,9 +1182,9 @@ ItemList = \
     < "Kai Sommerfeld" ; > ; \
     < "" ; > ; \
     < "Stephan Bergmann" ; > ; \
-    < "Oliver Braun" ; > ; \
     < "Andreas Bregas" ; > ; \
     < "Steffen Grund" ; > ; \
+    < "Mihaela Kedikova" ; > ; \
     < "Tobias Krause" ; > ; \
     < "Joachim Lingner" ; > ; \
     < "Christoph Neumann" ; > ; \
@@ -1112,7 +1194,7 @@ ItemList = \
     < "Dirk Voelzke" ; > ; \
     < "" ; > ; \
     < "" ; > ; \
-    < "%PRODUCTNAME PIM & CALC" ; 8 ; > ; \
+    < "%PRODUCTNAME CALC" ; 8 ; > ; \
     < "" ; > ; \
     < "Stephan Schaefer" ; > ; \
     < "" ; > ; \
@@ -1120,32 +1202,15 @@ ItemList = \
     < "Daniel Boelzle" ; > ; \
     < "Berend Cornelius" ; > ; \
     < "Ingrid Halama" ; > ; \
-    < "Philipp Kewisch" ; > ; \
     < "Bjoern Milcke" ; > ; \
     < "Niklas Nebel" ; > ; \
-    < "Frank Neumann" ; > ; \
     < "Eike Rathke" ; > ; \
     < "Daniel Rentz" ; > ; \
     < "" ; > ; \
     < "" ; > ; \
-    < "%PRODUCTNAME CONFIGURATION MANAGER" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Dirk Grobler" ; > ; \
-    < "" ; > ; \
-    < "Joerg Barfurth" ; > ; \
-    < "Rodrigo Fernandez-Vizarra Bonet" ; > ; \
-    < "Katell Galard" ; > ; \
-    < "Geoff Higgins" ; > ; \
-    < "Stephen Lewis" ; > ; \
-    < "Cyrille Moureaux" ; > ; \
-    < "Thomas Pfohe" ; > ; \
-    < "Klaus Ruehl" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
     < "USER EXPERIENCE" ; 8 ; > ; \
     < "" ; > ; \
-    < "Lutz Hoeger" ; > ; \
-    < "" ; > ; \
+    < "Andreas Bartel" ; > ; \
     < "Bettina Haberer" ; > ; \
     < "Christian Jansen" ; > ; \
     < "Frank Loehmann" ; > ; \
@@ -1156,28 +1221,22 @@ ItemList = \
     < "" ; > ; \
     < "Nils Fuhrmann" ; > ; \
     < "" ; > ; \
-    < "PROGRAM MANAGEMENT" ; 8 ; > ; \
     < "" ; > ; \
-    < "Joost Andrae" ; > ; \
-    < "Martin Damboldt" ; > ; \
-    < "Martin Hollmichel" ; > ; \
-    < "" ; > ; \
-    < "RELEASE ENGINEERING & DEVELOPMENT TOOLS" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Joerg Jahnke" ; > ; \
+    < "RELEASE ENGINEERING " ; 8 ; > ; \
     < "" ; > ; \
-    < "RELEASE ENGINEERING" ; 8 ; > ; \
+    < "Ruediger Timm" ; > ; \
     < "" ; > ; \
     < "Oliver Bolte" ; > ; \
     < "Vladimir Glazounov" ; > ; \
     < "Ivo Hinkelmann" ; > ; \
     < "Hans-Joachim Lankenau" ; > ; \
     < "Jens-Heiner Rechtien" ; > ; \
-    < "Ruediger Timm" ; > ; \
     < "Kurt Zenker" ; > ; \
     < "" ; > ; \
     < "DEVELOPMENT TOOLS" ; 8 ; > ; \
     < "" ; > ; \
+    < "Joerg Jahnke" ; > ; \
+    < "" ; > ; \
     < "Bernd Eilers" ; > ; \
     < "Gregor Hartmann" ; > ; \
     < "Frank Mau" ; > ; \
@@ -1213,12 +1272,10 @@ ItemList = \
     < "Marc Neumann" ; > ; \
     < "Wolfram Garten" ; > ; \
     < "Christian Guenther" ; > ; \
-    < "Fredrik Haegg" ; > ; \
     < "" ; > ; \
     < "QA %PRODUCTNAME INFRASTRUCTURE" ; 8 ; > ; \
     < "" ; > ; \
     < "Olaf Felka" ; > ; \
-    < "Uwe Luebbers" ; > ; \
     < "Thorsten Martens" ; > ; \
     < "Joerg W. Skottke" ; > ; \
     < "Andreas Treumann" ; > ; \
@@ -1238,83 +1295,30 @@ ItemList = \
     < "Martina Waller" ; > ; \
     < "" ; > ; \
     < "" ; > ; \
-    < "GLOBALIZATION" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Management" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Tom Garland" ; > ; \
-    < "Michelle Hills" ; > ; \
-    < "Shinobu Matsuzuka" ; > ; \
-    < "" ; > ; \
-    < "PROGRAM MANAGEMENT" ; 8 ; > ; \
+    < "GLOBALIZATION PROGRAM MANAGEMENT" ; 8 ; > ; \
     < "" ; > ; \
     < "Rafaella Braconi" ; > ; \
     < "" ; > ; \
-    < "Engineering and Testing" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Ales Cernosek" ; > ; \
-    < "Petr Dudacek" ; > ; \
-    < "Karl Hong" ; > ; \
-    < "Naoyuki Ishimura" ; > ; \
-    < "Aijin Kim" ; > ; \
-    < "Ian McDonnell" ; > ; \
-    < "Kazuhiro Hatake Takabatake " ; > ; \
-    < "Lei Phill Zhang" ; > ; \
-    < "May Zhang" ; > ; \
-    < "" ; > ; \
-    < "Translation Management" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Monica Badia" ; > ; \
-    < "Sofia Nilsson" ; > ; \
-    < "Kaoru Oguru" ; > ; \
-    < "Joy Zhang" ; > ; \
-    < "" ; > ; \
-    < "Documentation & Tools" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Yu Aaron Cheng" ; > ; \
-    < "Sven Klawitter" ; > ; \
-    < "Hiroko Matano" ; > ; \
-    < "Boris Steiner" ; > ; \
-    < "Michal Touzin" ; > ; \
-    < "" ; > ; \
-    < "" ; > ; \
     < "MARKETING & OPERATIONS" ; 8 ; > ; \
     < "" ; > ; \
-    < "PRODUCT & PROGRAM MANAGMENT" ; 8 ; > ; \
+    < "PRODUCT MANAGMENT" ; 8 ; > ; \
     < "" ; > ; \
     < "Goetz Wohlberg" ; > ; \
+    < "Lutz Hoeger" ; > ; \
     < "" ; > ; \
     < "MARKETING" ; 8 ; > ; \
     < "" ; > ; \
-    < "Alexei Koudriachov" ; > ; \
-    < "Ashish Mukharji" ; > ; \
-    < "Manish Punjabi" ; > ; \
-    < "Erwin Tenhumberg" ; > ; \
+    < "Rosana Ardila Biela" ; > ; \
+    < "Kay Koll" ; > ; \
     < "Iyer Venkatesan" ; > ; \
-    < "Jennifer Winger" ; > ; \
     < "" ; > ; \
     < "OPERATIONS" ; 8 ; > ; \
     < "" ; > ; \
-    < "Scott Citta" ; > ; \
-    < "Jane Cooley" ; > ; \
-    < "Lisa Medlin" ; > ; \
     < "Parker Proffitt" ; > ; \
     < "" ; > ; \
-    < "TECHNICAL TRAINING, MARKET &" ; 8 ; > ; \
-    < "BUSINESS DEVELOPMENT" ; 8 ; > ; \
-    < "" ; > ; \
-    < "Matthew Baier" ; > ; \
-    < "Herve Bernard" ; > ; \
-    < "Kay Koll" ; > ; \
-    < "Ted Tudor" ; > ; \
-    < "Jane Worden" ; > ; \
-    < "Sophia Zheng " ; > ; \
-    < "" ; > ; \
-    < "ADDITIONAL FUNCTIONS" ; 8 ; > ; \
+    < "SUN SIGMA BLACK BELT" ; 8 ; > ; \
     < "" ; > ; \
-    < "Bill Lane" ; > ; \
-    < "Douglas Lenser" ; > ; \
-    < "Frank Psotka" ; > ; \
+    < "Stefan Zimmermann" ; > ; \
     < "" ; > ; \
 };\
 
diff --git a/svx/source/items/numitem.cxx b/svx/source/items/numitem.cxx
index 0a9b7786a476..2a607ecf9cab 100644
--- a/svx/source/items/numitem.cxx
+++ b/svx/source/items/numitem.cxx
@@ -62,6 +62,11 @@
 #define DEF_WRITER_LSPACE   500     //Standardeinrueckung
 #define DEF_DRAW_LSPACE     800     //Standardeinrueckung
 
+#define NUMITEM_VERSION_01        0x01
+#define NUMITEM_VERSION_02        0x02
+#define NUMITEM_VERSION_03        0x03
+#define NUMITEM_VERSION_04        0x04
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -224,157 +229,184 @@ SvxNumberFormat::~SvxNumberFormat()
 /* -----------------08.12.98 11:14-------------------
  *
  * --------------------------------------------------*/
-//SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
-//{
-//    USHORT nVersion;
-//  rStream >> nVersion;
-
-//  USHORT nUSHORT;
-//  rStream >> nUSHORT;
-//  SetNumberingType((sal_Int16)nUSHORT);
-//  rStream >> nUSHORT;
-//  eNumAdjust      = (SvxAdjust)nUSHORT;
-//  rStream >> nUSHORT;
-//  nInclUpperLevels = (BYTE)nUSHORT;
-//  rStream >> nUSHORT;
-//  nStart          = nUSHORT;
-//  rStream >> nUSHORT;
-//  cBullet = nUSHORT;
-
-//  short nShort;
-//  rStream >> nShort;
-//  nFirstLineOffset        = nShort;
-//  rStream >> nShort;
-//  nAbsLSpace              = nShort;
-//  rStream >> nShort;
-//  nLSpace                 = nShort;
-
-//  rStream >> nShort;
-//  nCharTextDistance       = nShort;
-//  rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
-//  rStream.ReadByteString(sPrefix, eEnc);
-//  rStream.ReadByteString(sSuffix, eEnc);
-//  rStream.ReadByteString(sCharStyleName, eEnc);
-//  rStream >> nUSHORT;
-//  if(nUSHORT)
-//  {
-//        SvxBrushItem aHelper(0);
-//      pGraphicBrush = (SvxBrushItem*) aHelper.Create( rStream, BRUSH_GRAPHIC_VERSION );
-//  }
-//  else
-//      pGraphicBrush = 0;
-
-//  rStream >> nUSHORT;
-//    eVertOrient          = (sal_Int16)nUSHORT;
-
-//  rStream >> nUSHORT;
-//  if(nUSHORT)
-//  {
-//      pBulletFont = new Font;
-//      rStream >> *pBulletFont;
-//        if(!pBulletFont->GetCharSet())
-//            pBulletFont->SetCharSet(rStream.GetStreamCharSet());
-//    }
-//  else
-//      pBulletFont = 0;
-//  rStream >> aGraphicSize;
-
-//  rStream >> nBulletColor;
-//  rStream >> nUSHORT;
-//  nBulletRelSize = nUSHORT;
-//  rStream >> nUSHORT;
-//  SetShowSymbol((BOOL)nUSHORT);
-
-//  if( nVersion < NUMITEM_VERSION_03 )
-//      cBullet = ByteString::ConvertToUnicode( (sal_Char)cBullet,
-//                          (pBulletFont&&pBulletFont->GetCharSet()) ?  pBulletFont->GetCharSet()
-//                                      : RTL_TEXTENCODING_SYMBOL );
-//    if(pBulletFont)
-//    {
-//        BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
-//        if(bConvertBulletFont)
-//        {
-
-//            FontToSubsFontConverter pConverter =
-//                        CreateFontToSubsFontConverter(pBulletFont->GetName(),
-//                            FONTTOSUBSFONT_IMPORT|FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS);
-//            if(pConverter)
-//            {
-//                cBullet = ConvertFontToSubsFontChar(pConverter, cBullet);
-//                String sFontName = GetFontToSubsFontName(pConverter);
-//                pBulletFont->SetName(sFontName);
-//                DestroyFontToSubsFontConverter(pConverter);
-//            }
-//        }
-//    }
-//}
+SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
+: mePositionAndSpaceMode( LABEL_WIDTH_AND_POSITION ),
+  meLabelFollowedBy( LISTTAB ),
+  mnListtabPos( 0 ),
+  mnFirstLineIndent( 0 ),
+  mnIndentAt( 0 )
+{
+
+    USHORT nVersion;
+  rStream >> nVersion;
+
+  USHORT nUSHORT;
+  rStream >> nUSHORT;
+  SetNumberingType((sal_Int16)nUSHORT);
+  rStream >> nUSHORT;
+  eNumAdjust      = (SvxAdjust)nUSHORT;
+  rStream >> nUSHORT;
+  nInclUpperLevels = (BYTE)nUSHORT;
+  rStream >> nUSHORT;
+  nStart          = nUSHORT;
+  rStream >> nUSHORT;
+  cBullet = nUSHORT;
+
+  short nShort;
+  rStream >> nShort;
+  nFirstLineOffset        = nShort;
+  rStream >> nShort;
+  nAbsLSpace              = nShort;
+  rStream >> nShort;
+  nLSpace                 = nShort;
+
+  rStream >> nShort;
+  nCharTextDistance       = nShort;
+  rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
+  rStream.ReadByteString(sPrefix, eEnc);
+  rStream.ReadByteString(sSuffix, eEnc);
+  rStream.ReadByteString(sCharStyleName, eEnc);
+  rStream >> nUSHORT;
+  if(nUSHORT)
+  {
+        SvxBrushItem aHelper(0);
+      pGraphicBrush = (SvxBrushItem*) aHelper.Create( rStream, BRUSH_GRAPHIC_VERSION );
+  }
+  else
+      pGraphicBrush = 0;
+
+  rStream >> nUSHORT;
+    eVertOrient          = (sal_Int16)nUSHORT;
+
+  rStream >> nUSHORT;
+  if(nUSHORT)
+  {
+      pBulletFont = new Font;
+      rStream >> *pBulletFont;
+        if(!pBulletFont->GetCharSet())
+            pBulletFont->SetCharSet(rStream.GetStreamCharSet());
+    }
+  else
+      pBulletFont = 0;
+  rStream >> aGraphicSize;
+
+  rStream >> nBulletColor;
+  rStream >> nUSHORT;
+  nBulletRelSize = nUSHORT;
+  rStream >> nUSHORT;
+  SetShowSymbol((BOOL)nUSHORT);
+
+  if( nVersion < NUMITEM_VERSION_03 )
+      cBullet = ByteString::ConvertToUnicode( (sal_Char)cBullet,
+                          (pBulletFont&&pBulletFont->GetCharSet()) ?  pBulletFont->GetCharSet()
+                                      : RTL_TEXTENCODING_SYMBOL );
+    if(pBulletFont)
+    {
+        BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
+        if(bConvertBulletFont)
+        {
+
+            FontToSubsFontConverter pConverter =
+                        CreateFontToSubsFontConverter(pBulletFont->GetName(),
+                            FONTTOSUBSFONT_IMPORT|FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS);
+            if(pConverter)
+            {
+                cBullet = ConvertFontToSubsFontChar(pConverter, cBullet);
+                String sFontName = GetFontToSubsFontName(pConverter);
+                pBulletFont->SetName(sFontName);
+                DestroyFontToSubsFontConverter(pConverter);
+            }
+        }
+    }
+
+    if( NUMITEM_VERSION_04 <= nVersion )
+    {
+        rStream >> nUSHORT;
+        mePositionAndSpaceMode = (SvxNumPositionAndSpaceMode) nUSHORT;
+        rStream >> nUSHORT;
+        meLabelFollowedBy = ( SvxNumLabelFollowedBy ) nUSHORT;
+        long nLong;
+        rStream >> nLong;
+        mnListtabPos = nLong;
+        rStream >> nLong;
+        mnFirstLineIndent = nLong;
+        rStream >> nLong;
+        mnIndentAt = nLong;
+    }
+}
 /* -----------------08.12.98 11:14-------------------
  *
  * --------------------------------------------------*/
-// --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverter)
-//{
-//    if(pConverter && pBulletFont)
-//    {
-//        cBullet = ConvertFontToSubsFontChar(pConverter, cBullet);
-//        String sFontName = GetFontToSubsFontName(pConverter);
-//        pBulletFont->SetName(sFontName);
-//    }
-
-//    rStream << (USHORT)NUMITEM_VERSION_03;
-
-//    rStream << (USHORT)GetNumberingType();
-//    rStream << (USHORT)eNumAdjust;
-//    rStream << (USHORT)nInclUpperLevels;
-//    rStream << nStart;
-//    rStream << (USHORT)cBullet;
-
-//    rStream << nFirstLineOffset;
-//    rStream << nAbsLSpace;
-//    rStream << nLSpace;
-
-//    rStream << nCharTextDistance;
-//    rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
-//    rStream.WriteByteString(sPrefix, eEnc);
-//    rStream.WriteByteString(sSuffix, eEnc);
-//    rStream.WriteByteString(sCharStyleName, eEnc);
-//    if(pGraphicBrush)
-//    {
-//        rStream << (USHORT)1;
-
-//        // #75113# in SD or SI force bullet itself to be stored,
-//        // for that purpose throw away link when link and graphic
-//        // are present, so Brush save is forced
-//        if(pGraphicBrush->GetGraphicLink() && pGraphicBrush->GetGraphic())
-//        {
-//            String aEmpty;
-//            pGraphicBrush->SetGraphicLink(aEmpty);
-//        }
-
-//        pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION);
-//    }
-//    else
-//        rStream << (USHORT)0;
-
-//    rStream << (USHORT)eVertOrient;
-//    if(pBulletFont)
-//    {
-//        rStream << (USHORT)1;
-//        rStream << *pBulletFont;
-//    }
-//    else
-//        rStream << (USHORT)0;
-//    rStream << aGraphicSize;
-
-//    Color nTempColor = nBulletColor;
-//    if(COL_AUTO == nBulletColor.GetColor())
-//        nTempColor = COL_BLACK;
-//    rStream << nTempColor;
-//    rStream << nBulletRelSize;
-//    rStream << (USHORT)IsShowSymbol();
-//    return rStream;
-//}
-// <--
+SvStream&   SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverter)
+{
+    if(pConverter && pBulletFont)
+    {
+        cBullet = ConvertFontToSubsFontChar(pConverter, cBullet);
+        String sFontName = GetFontToSubsFontName(pConverter);
+        pBulletFont->SetName(sFontName);
+    }
+
+    rStream << (USHORT)NUMITEM_VERSION_04;
+
+    rStream << (USHORT)GetNumberingType();
+    rStream << (USHORT)eNumAdjust;
+    rStream << (USHORT)nInclUpperLevels;
+    rStream << nStart;
+    rStream << (USHORT)cBullet;
+
+    rStream << nFirstLineOffset;
+    rStream << nAbsLSpace;
+    rStream << nLSpace;
+
+    rStream << nCharTextDistance;
+    rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
+    rStream.WriteByteString(sPrefix, eEnc);
+    rStream.WriteByteString(sSuffix, eEnc);
+    rStream.WriteByteString(sCharStyleName, eEnc);
+    if(pGraphicBrush)
+    {
+        rStream << (USHORT)1;
+
+        // #75113# in SD or SI force bullet itself to be stored,
+        // for that purpose throw away link when link and graphic
+        // are present, so Brush save is forced
+        if(pGraphicBrush->GetGraphicLink() && pGraphicBrush->GetGraphic())
+        {
+            String aEmpty;
+            pGraphicBrush->SetGraphicLink(aEmpty);
+        }
+
+        pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION);
+    }
+    else
+        rStream << (USHORT)0;
+
+    rStream << (USHORT)eVertOrient;
+    if(pBulletFont)
+    {
+        rStream << (USHORT)1;
+        rStream << *pBulletFont;
+    }
+    else
+        rStream << (USHORT)0;
+    rStream << aGraphicSize;
+
+    Color nTempColor = nBulletColor;
+    if(COL_AUTO == nBulletColor.GetColor())
+        nTempColor = COL_BLACK;
+    rStream << nTempColor;
+    rStream << nBulletRelSize;
+    rStream << (USHORT)IsShowSymbol();
+
+    rStream << ( USHORT ) mePositionAndSpaceMode;
+    rStream << ( USHORT ) meLabelFollowedBy;
+    rStream << ( long ) mnListtabPos;
+    rStream << ( long ) mnFirstLineIndent;
+    rStream << ( long ) mnIndentAt;
+
+    return rStream;
+}
+
 /* -----------------------------23.02.01 11:10--------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -839,80 +871,79 @@ SvxNumRule::SvxNumRule(const SvxNumRule& rCopy)
 /* -----------------08.12.98 11:07-------------------
  *
  * --------------------------------------------------*/
-//SvxNumRule::SvxNumRule(SvStream &rStream)
-//{
-//    ++nRefCount;
-//    LanguageType eLang = Application::GetSettings().GetLanguage();
-//    aLocale = SvxCreateLocale(eLang);
-//    USHORT nVersion;
-//    USHORT nTemp;
-//    rStream >> nVersion;
-//    rStream >> nLevelCount;
-//    rStream >> nTemp;
-//    nFeatureFlags = nTemp;
-//    rStream >> nTemp;
-//    bContinuousNumbering = (BOOL)nTemp;
-//    rStream >> nTemp;
-//    eNumberingType       = (SvxNumRuleType)nTemp;
-//    memset( aFmts, 0, sizeof( aFmts ));
-
-//    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
-//    {
-//        USHORT nSet;
-//        rStream >> nSet;
-//        if(nSet)
-//            aFmts[i] = new SvxNumberFormat(rStream);
-//        else
-//            aFmts[i] = 0;
-//        aFmtsSet[i] = aFmts[i] ? TRUE : FALSE;
-//    }
-//    if(NUMITEM_VERSION_02 <= nVersion)
-//    {
-//        USHORT nShort;
-//        rStream >> nShort;
-//        nFeatureFlags = nShort;
-//    }
-//}
+SvxNumRule::SvxNumRule(SvStream &rStream)
+{
+    ++nRefCount;
+    LanguageType eLang = Application::GetSettings().GetLanguage();
+    aLocale = SvxCreateLocale(eLang);
+    USHORT nVersion;
+    USHORT nTemp;
+    rStream >> nVersion;
+    rStream >> nLevelCount;
+    rStream >> nTemp;
+    nFeatureFlags = nTemp;
+    rStream >> nTemp;
+    bContinuousNumbering = (BOOL)nTemp;
+    rStream >> nTemp;
+    eNumberingType       = (SvxNumRuleType)nTemp;
+    memset( aFmts, 0, sizeof( aFmts ));
+
+    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    {
+        USHORT nSet;
+        rStream >> nSet;
+        if(nSet)
+            aFmts[i] = new SvxNumberFormat(rStream);
+        else
+            aFmts[i] = 0;
+        aFmtsSet[i] = aFmts[i] ? TRUE : FALSE;
+    }
+    if(NUMITEM_VERSION_02 <= nVersion)
+    {
+        USHORT nShort;
+        rStream >> nShort;
+        nFeatureFlags = nShort;
+    }
+}
 
 /* -----------------08.12.98 11:07-------------------
  *
  * --------------------------------------------------*/
-// --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//SvStream&   SvxNumRule::Store(SvStream &rStream)
-//{
-//    rStream<<(USHORT)NUMITEM_VERSION_03;
-//    rStream<<nLevelCount;
-//    //first save of nFeatureFlags for old versions
-//    rStream<<(USHORT)nFeatureFlags;
-//    rStream<<(USHORT)bContinuousNumbering;
-//    rStream<<(USHORT)eNumberingType;
-
-//    FontToSubsFontConverter pConverter = 0;
-//    BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
-//    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
-//    {
-//        if(aFmts[i])
-//        {
-//            rStream << USHORT(1);
-//            if(bConvertBulletFont && aFmts[i]->GetBulletFont())
-//            {
-//                if(!pConverter)
-//                    pConverter =
-//                        CreateFontToSubsFontConverter(aFmts[i]->GetBulletFont()->GetName(),
-//                                    FONTTOSUBSFONT_EXPORT|FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS);
-//            }
-//            aFmts[i]->Store(rStream, pConverter);
-//        }
-//        else
-//            rStream << USHORT(0);
-//    }
-//    //second save of nFeatureFlags for new versions
-//    rStream<<(USHORT)nFeatureFlags;
-//    if(pConverter)
-//        DestroyFontToSubsFontConverter(pConverter);
-
-//    return rStream;
-//}
+SvStream&   SvxNumRule::Store(SvStream &rStream)
+{
+    rStream<<(USHORT)NUMITEM_VERSION_03;
+    rStream<<nLevelCount;
+    //first save of nFeatureFlags for old versions
+    rStream<<(USHORT)nFeatureFlags;
+    rStream<<(USHORT)bContinuousNumbering;
+    rStream<<(USHORT)eNumberingType;
+
+    FontToSubsFontConverter pConverter = 0;
+    BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
+    for(USHORT i = 0; i < SVX_MAX_NUM; i++)
+    {
+        if(aFmts[i])
+        {
+            rStream << USHORT(1);
+            if(bConvertBulletFont && aFmts[i]->GetBulletFont())
+            {
+                if(!pConverter)
+                    pConverter =
+                        CreateFontToSubsFontConverter(aFmts[i]->GetBulletFont()->GetName(),
+                                    FONTTOSUBSFONT_EXPORT|FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS);
+            }
+            aFmts[i]->Store(rStream, pConverter);
+        }
+        else
+            rStream << USHORT(0);
+    }
+    //second save of nFeatureFlags for new versions
+    rStream<<(USHORT)nFeatureFlags;
+    if(pConverter)
+        DestroyFontToSubsFontConverter(pConverter);
+
+    return rStream;
+}
 
 /* -----------------27.10.98 10:41-------------------
  *
@@ -1179,32 +1210,23 @@ SfxPoolItem*  SvxNumBulletItem::Clone( SfxItemPool * ) const
 /* -----------------08.12.98 10:43-------------------
  *
  * --------------------------------------------------*/
-// --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//SfxPoolItem*     SvxNumBulletItem::Create(SvStream &rStream, USHORT) const
-//{
-//    SvxNumRule aRule(rStream);
-//    return new SvxNumBulletItem(aRule, Which() );
-//}
-// <--
-/* -----------------08.12.98 10:43-------------------
- *
- * --------------------------------------------------*/
-// --> OD 2008-01-09 #newlistlevelattrs# - no longer used
-//SvStream&   SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )const
-//{
-//    pNumRule->Store(rStream);
-//    return rStream;
-//}
-// <--
+SfxPoolItem*     SvxNumBulletItem::Create(SvStream &rStream, USHORT) const
+{
+    SvxNumRule aRule(rStream);
+    return new SvxNumBulletItem(aRule, Which() );
+}
+USHORT  SvxNumBulletItem::GetVersion( USHORT /*nFileVersion*/ ) const
+{
+    return NUMITEM_VERSION_03;
+}
 /* -----------------08.12.98 10:43-------------------
  *
  * --------------------------------------------------*/
-// --> OD 2008-01-10 #newlistlevelattrs# - no longer used
-//USHORT  SvxNumBulletItem::GetVersion( USHORT /*nFileVersion*/ ) const
-//{
-//    return NUMITEM_VERSION_03;
-//}
-// <--
+SvStream&   SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )const
+{
+    pNumRule->Store(rStream);
+    return rStream;
+}
 
 /* -----------------08.12.98 10:43-------------------
  *