Attachment #75659 for issue #116420

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




                    else if( rToFill != rDir )
                        bRet = FALSE;
                }
                case RES_VERT_ORIENT:
                {
                    const SwFmtVertOrient& rOrient =
                                    aBoxes[i]->GetFrmFmt()->GetVertOrient();
                    if( !bOneFound )
                    {
                        (SwFmtVertOrient&)rToFill = rOrient;
                        bOneFound = TRUE;
                    }
                    else if( rToFill != rOrient )
                        bRet = FALSE;
                }
            }

            if ( FALSE == bRet )

Lines 68-73 Link Here

(-)a/sw/source/core/unocore/unotbl.cxx (+18 lines)
68	#include <com/sun/star/text/TextContentAnchorType.hpp>	68	#include <com/sun/star/text/TextContentAnchorType.hpp>
69	#include <com/sun/star/text/TableColumnSeparator.hpp>	69	#include <com/sun/star/text/TableColumnSeparator.hpp>
70	#include <com/sun/star/text/XTextSection.hpp>	70	#include <com/sun/star/text/XTextSection.hpp>
		71	#include <com/sun/star/text/VertOrientation.hpp>
71	#include <com/sun/star/table/ShadowFormat.hpp>	72	#include <com/sun/star/table/ShadowFormat.hpp>
72	#include <com/sun/star/table/TableBorder.hpp>	73	#include <com/sun/star/table/TableBorder.hpp>
73	#include <com/sun/star/table/TableBorderDistances.hpp>	74	#include <com/sun/star/table/TableBorderDistances.hpp>
Lines 4246-4251 Link Here
4246	pDoc->SetBoxAttr( *pCrsr, aNumberFormat);	4247	pDoc->SetBoxAttr( *pCrsr, aNumberFormat);
4247	}	4248	}
4248	break;	4249	break;
		4250	case RES_VERT_ORIENT:
		4251	{
		4252	sal_Int16 nAlign = -1;
		4253	aValue >>= nAlign;
		4254	if( nAlign >= text::VertOrientation::NONE && nAlign <= text::VertOrientation::BOTTOM)
		4255	pDoc->SetBoxAlign( *pCrsr, nAlign );
		4256	}
		4257	break;
4249	case FN_UNO_RANGE_ROW_LABEL:	4258	case FN_UNO_RANGE_ROW_LABEL:
4250	{	4259	{
4251	sal_Bool bTmp = (sal_Bool)aValue.getValue();	4260	sal_Bool bTmp = (sal_Bool)aValue.getValue();
Lines 4325-4330 Link Here
4325	rBoxItem.QueryValue(aRet, pEntry->nMemberId);	4334	rBoxItem.QueryValue(aRet, pEntry->nMemberId);
4326	}	4335	}
4327	break;	4336	break;
		4337	case RES_VERT_ORIENT:
		4338	{
		4339	SwFmtVertOrient aVertOrient;
		4340	if( pTblCrsr->GetDoc()->GetBoxAttr( *pTblCrsr, aVertOrient ) )
		4341	{
		4342	aVertOrient.QueryValue( aRet, pEntry->nMemberId );
		4343	}
		4344	}
		4345	break;
4328	case RES_BOXATR_FORMAT:	4346	case RES_BOXATR_FORMAT:
4329	//GetAttr fuer Tabellenselektion am Doc fehlt noch	4347	//GetAttr fuer Tabellenselektion am Doc fehlt noch
4330	DBG_WARNING("not implemented");	4348	DBG_WARNING("not implemented");

Return to issue 116420

Lines 1216-1221 Link Here

(-)a/sw/source/core/docnode/ndtbl1.cxx (+12 lines)
1216	else if( rToFill != rDir )	1216	else if( rToFill != rDir )
1217	bRet = FALSE;	1217	bRet = FALSE;
1218	}	1218	}
		1219	case RES_VERT_ORIENT:
		1220	{
		1221	const SwFmtVertOrient& rOrient =
		1222	aBoxes[i]->GetFrmFmt()->GetVertOrient();
		1223	if( !bOneFound )
		1224	{
		1225	(SwFmtVertOrient&)rToFill = rOrient;
		1226	bOneFound = TRUE;
		1227	}
		1228	else if( rToFill != rOrient )
		1229	bRet = FALSE;
		1230	}
1219	}	1231	}
1220		1232
1221	if ( FALSE == bRet )	1233	if ( FALSE == bRet )