diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-07-23 08:23:08 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-26 11:39:17 +0000 |
| commit | eb345a155bc9cb92fffd3e5ea0269207b3bac0f1 (patch) | |
| tree | 65762e599e3d0918ba071d2b903a9f2a3799790e | |
| parent | 20438e3e63bc78e877f344437448a038a8a01985 (diff) | |
tdf#75573 allow style to define vAnchor
If the default property value is valid, a style is never able to override.
oddball default caused by commit 20c1a485774c7586401f6c1821c52f0bc39cb84a
Rüdiger Timm <rt@openoffice.org> 2008-04-18 11:36:12 (GMT)
INTEGRATION: CWS xmlfilter04 (1.22.14); FILE MERGED
2008/03/05 11:07:44 os 1.22.14.3: default vAnchor changed
Change-Id: I665b52ae75a9282d51c79f3351315cf3fed4776c
Reviewed-on: https://gerrit.libreoffice.org/27454
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
| -rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/PropertyMap.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 82ca994baf83..b363c7ae2d2a 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -1743,8 +1743,8 @@ DECLARE_OOXMLIMPORT_TEST(testTdf75573, "tdf75573_page1frame.docx") // the "Proprietary" style should set the vertical and horizontal anchors to the page uno::Reference<beans::XPropertySet> xPropertySet(getShape(1), uno::UNO_QUERY); -// CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty<sal_Int16>(xPropertySet, "VertOrientRelation")); -// CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty<sal_Int16>(xPropertySet, "HoriOrientRelation")); + CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty<sal_Int16>(xPropertySet, "VertOrientRelation")); + CPPUNIT_ASSERT_EQUAL(text::RelOrientation::PAGE_FRAME, getProperty<sal_Int16>(xPropertySet, "HoriOrientRelation")); // the frame should be located near the bottom[23186]/center[2955] of the page CPPUNIT_ASSERT(sal_Int32(20000) < getProperty<sal_Int32>(xPropertySet, "VertOrientPosition")); diff --git a/writerfilter/source/dmapper/PropertyMap.cxx b/writerfilter/source/dmapper/PropertyMap.cxx index f4b4a1579c34..094e2b41849c 100644 --- a/writerfilter/source/dmapper/PropertyMap.cxx +++ b/writerfilter/source/dmapper/PropertyMap.cxx @@ -1559,7 +1559,7 @@ ParagraphProperties::ParagraphProperties() : m_h(-1), m_nWrap(-1), m_hAnchor(-1), - m_vAnchor(text::RelOrientation::FRAME), + m_vAnchor(-1), m_x(-1), m_bxValid( false ), m_y(-1), @@ -1639,7 +1639,7 @@ void ParagraphProperties::ResetFrameProperties() m_h = -1; m_nWrap = -1; m_hAnchor = -1; - m_vAnchor = text::RelOrientation::FRAME; + m_vAnchor = -1; m_x = -1; m_bxValid = false; m_y = -1; |