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

(-)sw/source/ui/table/tautofmt.cxx (-3 / +14 lines)
Lines 49-54 Link Here
49
#ifndef _MSGBOX_HXX //autogen
49
#ifndef _MSGBOX_HXX //autogen
50
#include <vcl/msgbox.hxx>
50
#include <vcl/msgbox.hxx>
51
#endif
51
#endif
52
#ifndef _SV_SVAPP_HXX
53
#include <vcl/svapp.hxx>
54
#endif
52
#ifndef _ZFORLIST_HXX //autogen
55
#ifndef _ZFORLIST_HXX //autogen
53
#include <svtools/zforlist.hxx>
56
#include <svtools/zforlist.hxx>
54
#endif
57
#endif
Lines 122-127 Link Here
122
    SvtScriptedTextHelper   aScriptedText;
125
    SvtScriptedTextHelper   aScriptedText;
123
    svx::frame::Array       maArray;            /// Implementation to draw the frame borders.
126
    svx::frame::Array       maArray;            /// Implementation to draw the frame borders.
124
    BOOL                    bFitWidth;
127
    BOOL                    bFitWidth;
128
    BOOL                    bRTL;
125
    Size                    aPrvSize;
129
    Size                    aPrvSize;
126
    long                    nLabelColWidth;
130
    long                    nLabelColWidth;
127
    long                    nDataColWidth1;
131
    long                    nDataColWidth1;
Lines 621-626 Link Here
621
        aScriptedText   ( aVD ),
625
        aScriptedText   ( aVD ),
622
		aCurData		( aEmptyStr ),
626
		aCurData		( aEmptyStr ),
623
		bFitWidth		( FALSE ),
627
		bFitWidth		( FALSE ),
628
		bRTL			(Application::GetSettings().GetLayoutRTL()),
624
		aStrJan 		( SW_RES( STR_JAN ) ),
629
		aStrJan 		( SW_RES( STR_JAN ) ),
625
		aStrFeb 		( SW_RES( STR_FEB ) ),
630
		aStrFeb 		( SW_RES( STR_FEB ) ),
626
		aStrMar 		( SW_RES( STR_MAR ) ),
631
		aStrMar 		( SW_RES( STR_MAR ) ),
Lines 709-715 Link Here
709
        4,  5,  6,  5,  7,
714
        4,  5,  6,  5,  7,
710
        12, 13, 14, 13, 15
715
        12, 13, 14, 13, 15
711
    };
716
    };
712
    return pnFmtMap[ maArray.GetCellIndex( nCol, nRow ) ];
717
    BYTE nIndex =  static_cast< BYTE >( maArray.GetCellIndex( nCol, nRow ) );
718
    if (bRTL) 
719
	    nIndex = (nIndex / 5) * 5 + 4 - (nIndex % 5);
720
    return pnFmtMap[ nIndex ];
713
}
721
}
714
722
715
const SvxBoxItem& AutoFmtPreview::GetBoxItem( size_t nCol, size_t nRow ) const
723
const SvxBoxItem& AutoFmtPreview::GetBoxItem( size_t nCol, size_t nRow ) const
Lines 734-740 Link Here
734
	double  nVal;
742
	double  nVal;
735
	String cellString;
743
	String cellString;
736
    BYTE    nIndex = static_cast< BYTE >( maArray.GetCellIndex( nCol, nRow ) );
744
    BYTE    nIndex = static_cast< BYTE >( maArray.GetCellIndex( nCol, nRow ) );
737
745
    if (bRTL) 
746
	    nIndex = (nIndex / 5) * 5 + 4 - (nIndex % 5);
738
	switch( nIndex )
747
	switch( nIndex )
739
	{
748
	{
740
		case  1: cellString = aStrJan;			break;
749
		case  1: cellString = aStrJan;			break;
Lines 860-866 Link Here
860
		// horizontal
869
		// horizontal
861
		//-----------
870
		//-----------
862
/* 		  if ( eJustification != SC_HOR_JUSTIFY_STANDARD )*/
871
/* 		  if ( eJustification != SC_HOR_JUSTIFY_STANDARD )*/
863
		if (aCurData.IsJustify())
872
    		if( bRTL )
873
			aPos.X() += nRightX;
874
		else if (aCurData.IsJustify())
864
		{
875
		{
865
			USHORT nHorPos = (USHORT)
876
			USHORT nHorPos = (USHORT)
866
					((cellRect.GetWidth()-aStrSize.Width())/2);
877
					((cellRect.GetWidth()-aStrSize.Width())/2);

Return to issue 73707