Attachment #57696 for issue #25545

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

Lines 3826-3831 Link Here

(-)sw/source/filter/ww8/ww8par.cxx (+2 lines)
3826	::SetProgressState(nProgress, mpDocShell); // Update	3826	::SetProgressState(nProgress, mpDocShell); // Update
3827	pStyles = new WW8RStyle( *pWwFib, this ); // Styles	3827	pStyles = new WW8RStyle( *pWwFib, this ); // Styles
3828	pStyles->Import();	3828	pStyles->Import();
		3829	if (IsRightToLeft())
		3830	pLstManager->ChangeAlignmentForRtl();
3829		3831
3830	/*	3832	/*
3831	zu guter Letzt: (siehe ebenfalls WW8PAR3.CXX)	3833	zu guter Letzt: (siehe ebenfalls WW8PAR3.CXX)

Lines 189-194 Link Here

(-)sw/source/filter/ww8/ww8par.hxx (+1 lines)
189	SwNumRule* GetNumRuleForActivation(USHORT nLFOPosition, const BYTE nLevel,	189	SwNumRule* GetNumRuleForActivation(USHORT nLFOPosition, const BYTE nLevel,
190	std::vector<sal_uInt8> &rParaSprms, SwTxtNode *pNode=0) const;	190	std::vector<sal_uInt8> &rParaSprms, SwTxtNode *pNode=0) const;
191	SwNumRule* CreateNextRule(bool bSimple);	191	SwNumRule* CreateNextRule(bool bSimple);
		192	void ChangeAlignmentForRtl();
192	~WW8ListManager();	193	~WW8ListManager();
193	private:	194	private:
194	wwSprmParser maSprmParser;	195	wwSprmParser maSprmParser;




    rSt.Seek( nOriginalPos );
}

void WW8ListManager::ChangeAlignmentForRtl()
{
    sal_uInt8 nLevel;
    sal_uInt16 nLSTInfos = static_cast< sal_uInt16 >(maLSTInfos.size());
    for (sal_uInt16 nList = 0; nList < nLSTInfos; ++nList)
    {
        WW8LSTInfo* pListInfo = maLSTInfos[nList];
        if( !pListInfo || !pListInfo->pNumRule ) break;
        SwNumRule& rMyNumRule = *pListInfo->pNumRule;
        sal_uInt16 nLvlCount = static_cast< sal_uInt16 >(pListInfo->bSimpleList ? nMinLevel : nMaxLevel);
        for (nLevel = 0; nLevel < nLvlCount; ++nLevel)
        {
            SwNumFmt aNumFmt( rMyNumRule.Get( nLevel ) );
            if (aNumFmt.GetNumAdjust() == SVX_ADJUST_RIGHT)
                aNumFmt.SetNumAdjust( SVX_ADJUST_LEFT );
            else if (aNumFmt.GetNumAdjust() == SVX_ADJUST_LEFT)
                aNumFmt.SetNumAdjust( SVX_ADJUST_RIGHT );

            rMyNumRule.Set( nLevel, aNumFmt );
        }
    }
}

WW8ListManager::~WW8ListManager()
{
    /*

Return to issue 25545

Lines 1293-1298 Link Here

(-)sw/source/filter/ww8/ww8par3.cxx (+23 lines)
1293	rSt.Seek( nOriginalPos );	1293	rSt.Seek( nOriginalPos );
1294	}	1294	}
1295		1295
		1296	void WW8ListManager::ChangeAlignmentForRtl()
		1297	{
		1298	sal_uInt8 nLevel;
		1299	sal_uInt16 nLSTInfos = static_cast< sal_uInt16 >(maLSTInfos.size());
		1300	for (sal_uInt16 nList = 0; nList < nLSTInfos; ++nList)
		1301	{
		1302	WW8LSTInfo* pListInfo = maLSTInfos[nList];
		1303	if( !pListInfo \|\| !pListInfo->pNumRule ) break;
		1304	SwNumRule& rMyNumRule = *pListInfo->pNumRule;
		1305	sal_uInt16 nLvlCount = static_cast< sal_uInt16 >(pListInfo->bSimpleList ? nMinLevel : nMaxLevel);
		1306	for (nLevel = 0; nLevel < nLvlCount; ++nLevel)
		1307	{
		1308	SwNumFmt aNumFmt( rMyNumRule.Get( nLevel ) );
		1309	if (aNumFmt.GetNumAdjust() == SVX_ADJUST_RIGHT)
		1310	aNumFmt.SetNumAdjust( SVX_ADJUST_LEFT );
		1311	else if (aNumFmt.GetNumAdjust() == SVX_ADJUST_LEFT)
		1312	aNumFmt.SetNumAdjust( SVX_ADJUST_RIGHT );
		1313
		1314	rMyNumRule.Set( nLevel, aNumFmt );
		1315	}
		1316	}
		1317	}
		1318
1296	WW8ListManager::~WW8ListManager()	1319	WW8ListManager::~WW8ListManager()
1297	{	1320	{
1298	/*	1321	/*