Attachment #66035 for issue #105710

View | Details | Raw Unified | Return to issue 105710
Collapse All | Expand All




#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
{

                     SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION );
    // <--
	SvxNumberFormat(const SvxNumberFormat& rFormat);
    SvxNumberFormat(SvStream &rStream);
//    SvxNumberFormat(SvStream &rStream);
    // <--
	virtual ~SvxNumberFormat();

    SvStream&       Store(SvStream &rStream, FontToSubsFontConverter pConverter);
//    SvStream&       Store(SvStream &rStream, FontToSubsFontConverter pConverter);
    // <--

	SvxNumberFormat& operator=( const SvxNumberFormat&  );
	BOOL 			operator==( const SvxNumberFormat&  ) const;

                                = SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
    // <--
	SvxNumRule(const SvxNumRule& rCopy);
	SvxNumRule(SvStream &rStream);
//  SvxNumRule(SvStream &rStream);
    // <--
	virtual ~SvxNumRule();

	int              		operator==( const SvxNumRule& ) const;


	SvxNumRule& 			operator=( const SvxNumRule&  );

	SvStream&               Store(SvStream &rStream);
//    SvStream&               Store(SvStream &rStream);
    // <--

	const SvxNumberFormat* 	Get(USHORT nLevel)const;
	const SvxNumberFormat& 	GetLevel(USHORT nLevel)const;

	virtual ~SvxNumBulletItem();

	virtual SfxPoolItem*     Clone( SfxItemPool *pPool = 0 ) const;
    virtual SfxPoolItem*     Create(SvStream &, USHORT) const;
	USHORT  GetVersion( USHORT nFileVersion ) const;
    virtual SvStream&        Store(SvStream &, USHORT nItemVersion ) const;
//    virtual USHORT           GetVersion( USHORT nFileVersion ) const;
    // <--
	virtual int              operator==( const SfxPoolItem& ) const;

	SvxNumRule* 			GetNumRule() const {return pNumRule;}




#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

using namespace ::com::sun::star;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::uno;

/* -----------------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);
            }
        }
    }
}
/* -----------------08.12.98 11:14-------------------
 *
 * --------------------------------------------------*/
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;
}
//}
// <--
/* -----------------------------23.02.01 11:10--------------------------------

 ---------------------------------------------------------------------------*/

/* -----------------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;
    }
}

/* -----------------08.12.98 11:07-------------------
 *
 * --------------------------------------------------*/
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);
//        DestroyFontToSubsFontConverter(pConverter);

    return rStream;
}

/* -----------------27.10.98 10:41-------------------
 *

/* -----------------08.12.98 10:43-------------------
 *
 * --------------------------------------------------*/
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;
}
 * --------------------------------------------------*/
// --> OD 2008-01-09 #newlistlevelattrs# - no longer used
//SvStream&   SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )const
//{
//    pNumRule->Store(rStream);
//    return rStream;
//}
// <--
/* -----------------08.12.98 10:43-------------------
 *
 * --------------------------------------------------*/
SvStream&   SvxNumBulletItem::Store(SvStream &rStream, USHORT /*nItemVersion*/ )const
{
    pNumRule->Store(rStream);
    return rStream;
}
// <--

/* -----------------08.12.98 10:43-------------------
 *

Return to issue 105710

Lines 76-87 Link Here

(-)svx.orig/inc/svx/numitem.hxx (-23 / +7 lines)
76	#define SVX_NO_NUM 200 // Markierung fuer keine Numerierung	76	#define SVX_NO_NUM 200 // Markierung fuer keine Numerierung
77	#define SVX_NO_NUMLEVEL 0x20	77	#define SVX_NO_NUMLEVEL 0x20
78		78
79	// --> OD 2008-01-10 #newlistlevelattrs# - no longer used
80	//#define NUMITEM_VERSION_01 0x01
81	//#define NUMITEM_VERSION_02 0x02
82	//#define NUMITEM_VERSION_03 0x03
83	// <--
84
85	#define LINK_TOKEN 0x80 //indicate linked bitmaps - for use in dialog only	79	#define LINK_TOKEN 0x80 //indicate linked bitmaps - for use in dialog only
86	class SVX_DLLPUBLIC SvxNumberType	80	class SVX_DLLPUBLIC SvxNumberType
87	{	81	{
Lines 191-204 Link Here
191	SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION );	185	SvxNumPositionAndSpaceMode ePositionAndSpaceMode = LABEL_WIDTH_AND_POSITION );
192	// <--	186	// <--
193	SvxNumberFormat(const SvxNumberFormat& rFormat);	187	SvxNumberFormat(const SvxNumberFormat& rFormat);
194	// --> OD 2008-01-09 #newlistlevelattrs# - no longer used	188	SvxNumberFormat(SvStream &rStream);
195	// SvxNumberFormat(SvStream &rStream);
196	// <--
197	virtual ~SvxNumberFormat();	189	virtual ~SvxNumberFormat();
198		190
199	// --> OD 2008-01-09 #newlistlevelattrs# - no longer used	191	SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter);
200	// SvStream& Store(SvStream &rStream, FontToSubsFontConverter pConverter);
201	// <--
202		192
203	SvxNumberFormat& operator=( const SvxNumberFormat& );	193	SvxNumberFormat& operator=( const SvxNumberFormat& );
204	BOOL operator==( const SvxNumberFormat& ) const;	194	BOOL operator==( const SvxNumberFormat& ) const;
Lines 304-312 Link Here
304	= SvxNumberFormat::LABEL_WIDTH_AND_POSITION );	294	= SvxNumberFormat::LABEL_WIDTH_AND_POSITION );
305	// <--	295	// <--
306	SvxNumRule(const SvxNumRule& rCopy);	296	SvxNumRule(const SvxNumRule& rCopy);
307	// --> OD 2008-01-09 #newlistlevelattrs# - no longer used	297	SvxNumRule(SvStream &rStream);
308	// SvxNumRule(SvStream &rStream);
309	// <--
310	virtual ~SvxNumRule();	298	virtual ~SvxNumRule();
311		299
312	int operator==( const SvxNumRule& ) const;	300	int operator==( const SvxNumRule& ) const;
Lines 314-322 Link Here
314		302
315	SvxNumRule& operator=( const SvxNumRule& );	303	SvxNumRule& operator=( const SvxNumRule& );
316		304
317	// --> OD 2008-01-09 #newlistlevelattrs# - no longer used	305	SvStream& Store(SvStream &rStream);
318	// SvStream& Store(SvStream &rStream);
319	// <--
320		306
321	const SvxNumberFormat* Get(USHORT nLevel)const;	307	const SvxNumberFormat* Get(USHORT nLevel)const;
322	const SvxNumberFormat& GetLevel(USHORT nLevel)const;	308	const SvxNumberFormat& GetLevel(USHORT nLevel)const;
Lines 354-364 Link Here
354	virtual ~SvxNumBulletItem();	340	virtual ~SvxNumBulletItem();
355		341
356	virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;	342	virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
357	// --> OD 2008-01-09 #newlistlevelattrs# - no longer used	343	virtual SfxPoolItem* Create(SvStream &, USHORT) const;
358	// virtual SfxPoolItem* Create(SvStream &, USHORT) const;	344	USHORT GetVersion( USHORT nFileVersion ) const;
359	// virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;	345	virtual SvStream& Store(SvStream &, USHORT nItemVersion ) const;
360	// virtual USHORT GetVersion( USHORT nFileVersion ) const;
361	// <--
362	virtual int operator==( const SfxPoolItem& ) const;	346	virtual int operator==( const SfxPoolItem& ) const;
363		347
364	SvxNumRule* GetNumRule() const {return pNumRule;}	348	SvxNumRule* GetNumRule() const {return pNumRule;}

Lines 62-67 Link Here

(-)svx.orig/source/items/numitem.cxx (-240 / +232 lines)
62	#define DEF_WRITER_LSPACE 500 //Standardeinrueckung	62	#define DEF_WRITER_LSPACE 500 //Standardeinrueckung
63	#define DEF_DRAW_LSPACE 800 //Standardeinrueckung	63	#define DEF_DRAW_LSPACE 800 //Standardeinrueckung
64		64
		65	#define NUMITEM_VERSION_01 0x01
		66	#define NUMITEM_VERSION_02 0x02
		67	#define NUMITEM_VERSION_03 0x03
		68
65	using namespace ::com::sun::star;	69	using namespace ::com::sun::star;
66	using namespace ::com::sun::star::lang;	70	using namespace ::com::sun::star::lang;
67	using namespace ::com::sun::star::uno;	71	using namespace ::com::sun::star::uno;
Lines 220-376 Link Here
220	/* -----------------08.12.98 11:14-------------------	224	/* -----------------08.12.98 11:14-------------------
221	*	225	*
222	* --------------------------------------------------*/	226	* --------------------------------------------------*/
223	//SvxNumberFormat::SvxNumberFormat(SvStream &rStream)	227	SvxNumberFormat::SvxNumberFormat(SvStream &rStream)
224	//{	228	{
225	// USHORT nVersion;	229	USHORT nVersion;
226	// rStream >> nVersion;	230	rStream >> nVersion;
227		231
228	// USHORT nUSHORT;	232	USHORT nUSHORT;
229	// rStream >> nUSHORT;	233	rStream >> nUSHORT;
230	// SetNumberingType((sal_Int16)nUSHORT);	234	SetNumberingType((sal_Int16)nUSHORT);
231	// rStream >> nUSHORT;	235	rStream >> nUSHORT;
232	// eNumAdjust = (SvxAdjust)nUSHORT;	236	eNumAdjust = (SvxAdjust)nUSHORT;
233	// rStream >> nUSHORT;	237	rStream >> nUSHORT;
234	// nInclUpperLevels = (BYTE)nUSHORT;	238	nInclUpperLevels = (BYTE)nUSHORT;
235	// rStream >> nUSHORT;	239	rStream >> nUSHORT;
236	// nStart = nUSHORT;	240	nStart = nUSHORT;
237	// rStream >> nUSHORT;	241	rStream >> nUSHORT;
238	// cBullet = nUSHORT;	242	cBullet = nUSHORT;
239		243
240	// short nShort;	244	short nShort;
241	// rStream >> nShort;	245	rStream >> nShort;
242	// nFirstLineOffset = nShort;	246	nFirstLineOffset = nShort;
243	// rStream >> nShort;	247	rStream >> nShort;
244	// nAbsLSpace = nShort;	248	nAbsLSpace = nShort;
245	// rStream >> nShort;	249	rStream >> nShort;
246	// nLSpace = nShort;	250	nLSpace = nShort;
247		251
248	// rStream >> nShort;	252	rStream >> nShort;
249	// nCharTextDistance = nShort;	253	nCharTextDistance = nShort;
250	// rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();	254	rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
251	// rStream.ReadByteString(sPrefix, eEnc);	255	rStream.ReadByteString(sPrefix, eEnc);
252	// rStream.ReadByteString(sSuffix, eEnc);	256	rStream.ReadByteString(sSuffix, eEnc);
253	// rStream.ReadByteString(sCharStyleName, eEnc);	257	rStream.ReadByteString(sCharStyleName, eEnc);
254	// rStream >> nUSHORT;	258	rStream >> nUSHORT;
255	// if(nUSHORT)	259	if(nUSHORT)
256	// {	260	{
257	// SvxBrushItem aHelper(0);	261	SvxBrushItem aHelper(0);
258	// pGraphicBrush = (SvxBrushItem*) aHelper.Create( rStream, BRUSH_GRAPHIC_VERSION );	262	pGraphicBrush = (SvxBrushItem*) aHelper.Create( rStream, BRUSH_GRAPHIC_VERSION );
259	// }	263	}
260	// else	264	else
261	// pGraphicBrush = 0;	265	pGraphicBrush = 0;
262		266
263	// rStream >> nUSHORT;	267	rStream >> nUSHORT;
264	// eVertOrient = (sal_Int16)nUSHORT;	268	eVertOrient = (sal_Int16)nUSHORT;
265		269
266	// rStream >> nUSHORT;	270	rStream >> nUSHORT;
267	// if(nUSHORT)	271	if(nUSHORT)
268	// {	272	{
269	// pBulletFont = new Font;	273	pBulletFont = new Font;
270	// rStream >> *pBulletFont;	274	rStream >> *pBulletFont;
271	// if(!pBulletFont->GetCharSet())	275	if(!pBulletFont->GetCharSet())
272	// pBulletFont->SetCharSet(rStream.GetStreamCharSet());	276	pBulletFont->SetCharSet(rStream.GetStreamCharSet());
273	// }	277	}
274	// else	278	else
275	// pBulletFont = 0;	279	pBulletFont = 0;
276	// rStream >> aGraphicSize;	280	rStream >> aGraphicSize;
277		281
278	// rStream >> nBulletColor;	282	rStream >> nBulletColor;
279	// rStream >> nUSHORT;	283	rStream >> nUSHORT;
280	// nBulletRelSize = nUSHORT;	284	nBulletRelSize = nUSHORT;
281	// rStream >> nUSHORT;	285	rStream >> nUSHORT;
282	// SetShowSymbol((BOOL)nUSHORT);	286	SetShowSymbol((BOOL)nUSHORT);
283		287
284	// if( nVersion < NUMITEM_VERSION_03 )	288	if( nVersion < NUMITEM_VERSION_03 )
285	// cBullet = ByteString::ConvertToUnicode( (sal_Char)cBullet,	289	cBullet = ByteString::ConvertToUnicode( (sal_Char)cBullet,
286	// (pBulletFont&&pBulletFont->GetCharSet()) ? pBulletFont->GetCharSet()	290	(pBulletFont&&pBulletFont->GetCharSet()) ? pBulletFont->GetCharSet()
287	// : RTL_TEXTENCODING_SYMBOL );	291	: RTL_TEXTENCODING_SYMBOL );
288	// if(pBulletFont)	292	if(pBulletFont)
289	// {	293	{
290	// BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;	294	BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
291	// if(bConvertBulletFont)	295	if(bConvertBulletFont)
292	// {	296	{
293		297
294	// FontToSubsFontConverter pConverter =	298	FontToSubsFontConverter pConverter =
295	// CreateFontToSubsFontConverter(pBulletFont->GetName(),	299	CreateFontToSubsFontConverter(pBulletFont->GetName(),
296	// FONTTOSUBSFONT_IMPORT\|FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS);	300	FONTTOSUBSFONT_IMPORT\|FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS);
297	// if(pConverter)	301	if(pConverter)
298	// {	302	{
299	// cBullet = ConvertFontToSubsFontChar(pConverter, cBullet);	303	cBullet = ConvertFontToSubsFontChar(pConverter, cBullet);
300	// String sFontName = GetFontToSubsFontName(pConverter);	304	String sFontName = GetFontToSubsFontName(pConverter);
301	// pBulletFont->SetName(sFontName);	305	pBulletFont->SetName(sFontName);
302	// DestroyFontToSubsFontConverter(pConverter);	306	DestroyFontToSubsFontConverter(pConverter);
303	// }	307	}
304	// }	308	}
305	// }	309	}
306	//}	310	}
307	/* -----------------08.12.98 11:14-------------------	311	/* -----------------08.12.98 11:14-------------------
308	*	312	*
309	* --------------------------------------------------*/	313	* --------------------------------------------------*/
310	// --> OD 2008-01-09 #newlistlevelattrs# - no longer used	314	SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverter)
311	//SvStream& SvxNumberFormat::Store(SvStream &rStream, FontToSubsFontConverter pConverter)	315	{
312	//{	316	if(pConverter && pBulletFont)
313	// if(pConverter && pBulletFont)	317	{
314	// {	318	cBullet = ConvertFontToSubsFontChar(pConverter, cBullet);
315	// cBullet = ConvertFontToSubsFontChar(pConverter, cBullet);	319	String sFontName = GetFontToSubsFontName(pConverter);
316	// String sFontName = GetFontToSubsFontName(pConverter);	320	pBulletFont->SetName(sFontName);
317	// pBulletFont->SetName(sFontName);	321	}
318	// }	322
319		323	rStream << (USHORT)NUMITEM_VERSION_03;
320	// rStream << (USHORT)NUMITEM_VERSION_03;	324
321		325	rStream << (USHORT)GetNumberingType();
322	// rStream << (USHORT)GetNumberingType();	326	rStream << (USHORT)eNumAdjust;
323	// rStream << (USHORT)eNumAdjust;	327	rStream << (USHORT)nInclUpperLevels;
324	// rStream << (USHORT)nInclUpperLevels;	328	rStream << nStart;
325	// rStream << nStart;	329	rStream << (USHORT)cBullet;
326	// rStream << (USHORT)cBullet;	330
327		331	rStream << nFirstLineOffset;
328	// rStream << nFirstLineOffset;	332	rStream << nAbsLSpace;
329	// rStream << nAbsLSpace;	333	rStream << nLSpace;
330	// rStream << nLSpace;	334
331		335	rStream << nCharTextDistance;
332	// rStream << nCharTextDistance;	336	rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();
333	// rtl_TextEncoding eEnc = gsl_getSystemTextEncoding();	337	rStream.WriteByteString(sPrefix, eEnc);
334	// rStream.WriteByteString(sPrefix, eEnc);	338	rStream.WriteByteString(sSuffix, eEnc);
335	// rStream.WriteByteString(sSuffix, eEnc);	339	rStream.WriteByteString(sCharStyleName, eEnc);
336	// rStream.WriteByteString(sCharStyleName, eEnc);	340	if(pGraphicBrush)
337	// if(pGraphicBrush)	341	{
338	// {	342	rStream << (USHORT)1;
339	// rStream << (USHORT)1;	343
340		344	// #75113# in SD or SI force bullet itself to be stored,
341	// // #75113# in SD or SI force bullet itself to be stored,	345	// for that purpose throw away link when link and graphic
342	// // for that purpose throw away link when link and graphic	346	// are present, so Brush save is forced
343	// // are present, so Brush save is forced	347	if(pGraphicBrush->GetGraphicLink() && pGraphicBrush->GetGraphic())
344	// if(pGraphicBrush->GetGraphicLink() && pGraphicBrush->GetGraphic())	348	{
345	// {	349	String aEmpty;
346	// String aEmpty;	350	pGraphicBrush->SetGraphicLink(aEmpty);
347	// pGraphicBrush->SetGraphicLink(aEmpty);	351	}
348	// }	352
349		353	pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION);
350	// pGraphicBrush->Store(rStream, BRUSH_GRAPHIC_VERSION);	354	}
351	// }	355	else
352	// else	356	rStream << (USHORT)0;
353	// rStream << (USHORT)0;	357
354		358	rStream << (USHORT)eVertOrient;
355	// rStream << (USHORT)eVertOrient;	359	if(pBulletFont)
356	// if(pBulletFont)	360	{
357	// {	361	rStream << (USHORT)1;
358	// rStream << (USHORT)1;	362	rStream << *pBulletFont;
359	// rStream << *pBulletFont;	363	}
360	// }	364	else
361	// else	365	rStream << (USHORT)0;
362	// rStream << (USHORT)0;	366	rStream << aGraphicSize;
363	// rStream << aGraphicSize;	367
364		368	Color nTempColor = nBulletColor;
365	// Color nTempColor = nBulletColor;	369	if(COL_AUTO == nBulletColor.GetColor())
366	// if(COL_AUTO == nBulletColor.GetColor())	370	nTempColor = COL_BLACK;
367	// nTempColor = COL_BLACK;	371	rStream << nTempColor;
368	// rStream << nTempColor;	372	rStream << nBulletRelSize;
369	// rStream << nBulletRelSize;	373	rStream << (USHORT)IsShowSymbol();
370	// rStream << (USHORT)IsShowSymbol();	374	return rStream;
371	// return rStream;	375	}
372	//}
373	// <--
374	/* -----------------------------23.02.01 11:10--------------------------------	376	/* -----------------------------23.02.01 11:10--------------------------------
375		377
376	---------------------------------------------------------------------------*/	378	---------------------------------------------------------------------------*/
Lines 835-914 Link Here
835	/* -----------------08.12.98 11:07-------------------	837	/* -----------------08.12.98 11:07-------------------
836	*	838	*
837	* --------------------------------------------------*/	839	* --------------------------------------------------*/
838	//SvxNumRule::SvxNumRule(SvStream &rStream)	840	SvxNumRule::SvxNumRule(SvStream &rStream)
839	//{	841	{
840	// ++nRefCount;	842	++nRefCount;
841	// LanguageType eLang = Application::GetSettings().GetLanguage();	843	LanguageType eLang = Application::GetSettings().GetLanguage();
842	// aLocale = SvxCreateLocale(eLang);	844	aLocale = SvxCreateLocale(eLang);
843	// USHORT nVersion;	845	USHORT nVersion;
844	// USHORT nTemp;	846	USHORT nTemp;
845	// rStream >> nVersion;	847	rStream >> nVersion;
846	// rStream >> nLevelCount;	848	rStream >> nLevelCount;
847	// rStream >> nTemp;	849	rStream >> nTemp;
848	// nFeatureFlags = nTemp;	850	nFeatureFlags = nTemp;
849	// rStream >> nTemp;	851	rStream >> nTemp;
850	// bContinuousNumbering = (BOOL)nTemp;	852	bContinuousNumbering = (BOOL)nTemp;
851	// rStream >> nTemp;	853	rStream >> nTemp;
852	// eNumberingType = (SvxNumRuleType)nTemp;	854	eNumberingType = (SvxNumRuleType)nTemp;
853	// memset( aFmts, 0, sizeof( aFmts ));	855	memset( aFmts, 0, sizeof( aFmts ));
854		856
855	// for(USHORT i = 0; i < SVX_MAX_NUM; i++)	857	for(USHORT i = 0; i < SVX_MAX_NUM; i++)
856	// {	858	{
857	// USHORT nSet;	859	USHORT nSet;
858	// rStream >> nSet;	860	rStream >> nSet;
859	// if(nSet)	861	if(nSet)
860	// aFmts[i] = new SvxNumberFormat(rStream);	862	aFmts[i] = new SvxNumberFormat(rStream);
861	// else	863	else
862	// aFmts[i] = 0;	864	aFmts[i] = 0;
863	// aFmtsSet[i] = aFmts[i] ? TRUE : FALSE;	865	aFmtsSet[i] = aFmts[i] ? TRUE : FALSE;
864	// }	866	}
865	// if(NUMITEM_VERSION_02 <= nVersion)	867	if(NUMITEM_VERSION_02 <= nVersion)
866	// {	868	{
867	// USHORT nShort;	869	USHORT nShort;
868	// rStream >> nShort;	870	rStream >> nShort;
869	// nFeatureFlags = nShort;	871	nFeatureFlags = nShort;
870	// }	872	}
871	//}	873	}
872		874
873	/* -----------------08.12.98 11:07-------------------	875	/* -----------------08.12.98 11:07-------------------
874	*	876	*
875	* --------------------------------------------------*/	877	* --------------------------------------------------*/
876	// --> OD 2008-01-09 #newlistlevelattrs# - no longer used	878	SvStream& SvxNumRule::Store(SvStream &rStream)
877	//SvStream& SvxNumRule::Store(SvStream &rStream)	879	{
878	//{	880	rStream<<(USHORT)NUMITEM_VERSION_03;
879	// rStream<<(USHORT)NUMITEM_VERSION_03;	881	rStream<<nLevelCount;
880	// rStream<<nLevelCount;	882	//first save of nFeatureFlags for old versions
881	// //first save of nFeatureFlags for old versions	883	rStream<<(USHORT)nFeatureFlags;
882	// rStream<<(USHORT)nFeatureFlags;	884	rStream<<(USHORT)bContinuousNumbering;
883	// rStream<<(USHORT)bContinuousNumbering;	885	rStream<<(USHORT)eNumberingType;
884	// rStream<<(USHORT)eNumberingType;	886
885		887	FontToSubsFontConverter pConverter = 0;
886	// FontToSubsFontConverter pConverter = 0;	888	BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;
887	// BOOL bConvertBulletFont = rStream.GetVersion() <= SOFFICE_FILEFORMAT_50;	889	for(USHORT i = 0; i < SVX_MAX_NUM; i++)
888	// for(USHORT i = 0; i < SVX_MAX_NUM; i++)	890	{
889	// {	891	if(aFmts[i])
890	// if(aFmts[i])	892	{
891	// {	893	rStream << USHORT(1);
892	// rStream << USHORT(1);	894	if(bConvertBulletFont && aFmts[i]->GetBulletFont())
893	// if(bConvertBulletFont && aFmts[i]->GetBulletFont())	895	{
894	// {	896	if(!pConverter)
895	// if(!pConverter)	897	pConverter =
896	// pConverter =	898	CreateFontToSubsFontConverter(aFmts[i]->GetBulletFont()->GetName(),
897	// CreateFontToSubsFontConverter(aFmts[i]->GetBulletFont()->GetName(),	899	FONTTOSUBSFONT_EXPORT\|FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS);
898	// FONTTOSUBSFONT_EXPORT\|FONTTOSUBSFONT_ONLYOLDSOSYMBOLFONTS);	900	}
899	// }	901	aFmts[i]->Store(rStream, pConverter);
900	// aFmts[i]->Store(rStream, pConverter);	902	}
901	// }	903	else
902	// else	904	rStream << USHORT(0);
903	// rStream << USHORT(0);	905	}
904	// }	906	//second save of nFeatureFlags for new versions
905	// //second save of nFeatureFlags for new versions	907	rStream<<(USHORT)nFeatureFlags;
906	// rStream<<(USHORT)nFeatureFlags;	908	if(pConverter)
907	// if(pConverter)	909	DestroyFontToSubsFontConverter(pConverter);
908	// DestroyFontToSubsFontConverter(pConverter);
909		910
910	// return rStream;	911	return rStream;
911	//}	912	}
912		913
913	/* -----------------27.10.98 10:41-------------------	914	/* -----------------27.10.98 10:41-------------------
914	*	915	*
Lines 1175-1206 Link Here
1175	/* -----------------08.12.98 10:43-------------------	1176	/* -----------------08.12.98 10:43-------------------
1176	*	1177	*
1177	* --------------------------------------------------*/	1178	* --------------------------------------------------*/
1178	// --> OD 2008-01-09 #newlistlevelattrs# - no longer used	1179	SfxPoolItem* SvxNumBulletItem::Create(SvStream &rStream, USHORT) const
1179	//SfxPoolItem* SvxNumBulletItem::Create(SvStream &rStream, USHORT) const	1180	{
1180	//{	1181	SvxNumRule aRule(rStream);
1181	// SvxNumRule aRule(rStream);	1182	return new SvxNumBulletItem(aRule, Which() );
1182	// return new SvxNumBulletItem(aRule, Which() );	1183	}
1183	//}	1184	USHORT SvxNumBulletItem::GetVersion( USHORT /nFileVersion/ ) const
1184	// <--	1185	{
1185	/* -----------------08.12.98 10:43-------------------	1186	return NUMITEM_VERSION_03;
1186	*	1187	}
1187	* --------------------------------------------------*/
1188	// --> OD 2008-01-09 #newlistlevelattrs# - no longer used
1189	//SvStream& SvxNumBulletItem::Store(SvStream &rStream, USHORT /nItemVersion/ )const
1190	//{
1191	// pNumRule->Store(rStream);
1192	// return rStream;
1193	//}
1194	// <--
1195	/* -----------------08.12.98 10:43-------------------	1188	/* -----------------08.12.98 10:43-------------------
1196	*	1189	*
1197	* --------------------------------------------------*/	1190	* --------------------------------------------------*/
1198	// --> OD 2008-01-10 #newlistlevelattrs# - no longer used	1191	SvStream& SvxNumBulletItem::Store(SvStream &rStream, USHORT /nItemVersion/ )const
1199	//USHORT SvxNumBulletItem::GetVersion( USHORT /nFileVersion/ ) const	1192	{
1200	//{	1193	pNumRule->Store(rStream);
1201	// return NUMITEM_VERSION_03;	1194	return rStream;
1202	//}	1195	}
1203	// <--
1204		1196
1205	/* -----------------08.12.98 10:43-------------------	1197	/* -----------------08.12.98 10:43-------------------
1206	*	1198	*