diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-11-29 12:04:00 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-11-30 10:10:36 +0000 |
| commit | 05af023b6a8f93405b13c4ddc4e23c29ed2a827c (patch) | |
| tree | 8d1e1fbcc9bcc88ecaaa0c38b896cb88bda3fda3 | |
| parent | 1cff635d46edbb19b26fcd27adf1ed606d916429 (diff) | |
Revert "i#116420, fdo#33477: Implemented VertOrient on Writer table cell..."
This reverts commit 2d96b310b4894dd06eb541474a5dc05346a28efd.
Conflicts:
sw/source/core/docnode/ndtbl1.cxx
| -rw-r--r-- | sw/source/core/docnode/ndtbl1.cxx | 12 | ||||
| -rw-r--r-- | sw/source/core/unocore/unotbl.cxx | 18 |
2 files changed, 0 insertions, 30 deletions
diff --git a/sw/source/core/docnode/ndtbl1.cxx b/sw/source/core/docnode/ndtbl1.cxx index 5916ee2a138c..802cb1ff30d2 100644 --- a/sw/source/core/docnode/ndtbl1.cxx +++ b/sw/source/core/docnode/ndtbl1.cxx @@ -1213,18 +1213,6 @@ sal_Bool SwDoc::GetBoxAttr( const SwCursor& rCursor, SfxPoolItem& rToFill ) cons else if( rToFill != rDir ) bRet = sal_False; } - case RES_VERT_ORIENT: - { - const SwFmtVertOrient& rOrient = - aBoxes[i]->GetFrmFmt()->GetVertOrient(); - if( !bOneFound ) - { - (SwFmtVertOrient&)rToFill = rOrient; - bOneFound = true; - } - else if( rToFill != rOrient ) - bRet = sal_False; - } } if ( sal_False == bRet ) diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index a873bad1c284..8a9b1c0ff807 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -67,7 +67,6 @@ #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp> #include <com/sun/star/text/XTextSection.hpp> -#include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/table/ShadowFormat.hpp> #include <com/sun/star/table/TableBorder.hpp> #include <com/sun/star/table/TableBorder2.hpp> @@ -3894,14 +3893,6 @@ void SwXCellRange::setPropertyValue(const OUString& rPropertyName, pDoc->SetBoxAttr( *pCrsr, aNumberFormat); } break; - case RES_VERT_ORIENT: - { - sal_Int16 nAlign = -1; - aValue >>= nAlign; - if( nAlign >= text::VertOrientation::NONE && nAlign <= text::VertOrientation::BOTTOM) - pDoc->SetBoxAlign( *pCrsr, nAlign ); - } - break; case FN_UNO_RANGE_ROW_LABEL: { sal_Bool bTmp = *(sal_Bool*)aValue.getValue(); @@ -3979,15 +3970,6 @@ uno::Any SwXCellRange::getPropertyValue(const OUString& rPropertyName) throw( be rBoxItem.QueryValue(aRet, pEntry->nMemberId); } break; - case RES_VERT_ORIENT: - { - SwFmtVertOrient aVertOrient; - if( pTblCrsr->GetDoc()->GetBoxAttr( *pTblCrsr, aVertOrient ) ) - { - aVertOrient.QueryValue( aRet, pEntry->nMemberId ); - } - } - break; case RES_BOXATR_FORMAT: //GetAttr fuer Tabellenselektion am Doc fehlt noch OSL_FAIL("not implemented"); |