diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-05-31 10:45:50 +0200 |
| commit | 0be75e2f6580c15837bc916754cabffa9cd8021e (patch) | |
| tree | b5cae7fa3102a01004e0265269d386e0f66e858a /xmloff | |
| parent | eced5e6fb21ab9b4d8233cee29ae7d2f223060d3 (diff) | |
| parent | f42d427a69383b84b83346a0fdeec324bf74f777 (diff) | |
Merge commit 'libreoffice-3.4.0.2'
Conflicts:
basic/source/app/app.cxx
basic/source/runtime/iosys.cxx
desktop/unx/source/start.c
sfx2/source/appl/appdata.cxx
sfx2/source/appl/appinit.cxx
sfx2/source/inc/appdata.hxx
svx/AllLangResTarget_svx.mk
sysui/desktop/productversion.mk
sysui/desktop/share/makefile.mk
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/inc/xmloff/xmltoken.hxx | 1 | ||||
| -rw-r--r-- | xmloff/source/core/xmltoken.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/style/PageMasterStyleMap.cxx | 1 | ||||
| -rw-r--r-- | xmloff/source/text/txtimp.cxx | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/xmloff/inc/xmloff/xmltoken.hxx b/xmloff/inc/xmloff/xmltoken.hxx index 74fffcdee6..944308a6d4 100644 --- a/xmloff/inc/xmloff/xmltoken.hxx +++ b/xmloff/inc/xmloff/xmltoken.hxx @@ -2105,6 +2105,7 @@ namespace xmloff { namespace token { XML_LAYOUT_GRID_STANDARD_MODE, XML_LAYOUT_GRID_BASE_WIDTH, XML_LAYOUT_GRID_SNAP_TO_CHARS, + XML_LAYOUT_GRID_SNAP_TO, XML_SNAP_TO_LAYOUT_GRID, XML_DONT_BALANCE_TEXT_COLUMNS, diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx index ada1cc766f..b480c8a511 100644 --- a/xmloff/source/core/xmltoken.cxx +++ b/xmloff/source/core/xmltoken.cxx @@ -2113,7 +2113,8 @@ namespace xmloff { namespace token { TOKEN( "default-page-layout", XML_DEFAULT_PAGE_LAYOUT ), TOKEN( "layout-grid-standard-mode", XML_LAYOUT_GRID_STANDARD_MODE ), TOKEN( "layout-grid-base-width", XML_LAYOUT_GRID_BASE_WIDTH ), - TOKEN( "layout-grid-snap-to-characters", XML_LAYOUT_GRID_SNAP_TO_CHARS ), + TOKEN( "layout-grid-snap-to-characters", XML_LAYOUT_GRID_SNAP_TO_CHARS ), + TOKEN( "layout-grid-snap-to", XML_LAYOUT_GRID_SNAP_TO ), TOKEN( "snap-to-layout-grid", XML_SNAP_TO_LAYOUT_GRID ), diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx index 17f7e92001..8c5665284c 100644 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.cxx @@ -111,6 +111,7 @@ const XMLPropertyMapEntry aXMLPageMasterStyleMap[] = //text grid enhancement for better CJK support PLMAP( "GridBaseWidth", XML_NAMESPACE_STYLE, XML_LAYOUT_GRID_BASE_WIDTH, XML_TYPE_MEASURE, CTP_PM_GRID_BASE_WIDTH ), + PLMAP( "GridSnapToChars", XML_NAMESPACE_STYLE, XML_LAYOUT_GRID_SNAP_TO, XML_TYPE_BOOL, CTP_PM_GRID_SNAP_TO_CHARS ), PLMAP( "GridSnapToChars", XML_NAMESPACE_STYLE, XML_LAYOUT_GRID_SNAP_TO_CHARS, XML_TYPE_BOOL, CTP_PM_GRID_SNAP_TO_CHARS ), //export as a default attribute PLMAP( "StandardPageMode", XML_NAMESPACE_STYLE, XML_LAYOUT_GRID_STANDARD_MODE, XML_TYPE_BOOL|MID_FLAG_DEFAULT_ITEM_EXPORT, CTF_PM_STANDARD_MODE ), diff --git a/xmloff/source/text/txtimp.cxx b/xmloff/source/text/txtimp.cxx index c1acfd7b6c..949adabd46 100644 --- a/xmloff/source/text/txtimp.cxx +++ b/xmloff/source/text/txtimp.cxx @@ -2678,7 +2678,8 @@ void XMLTextImportHelper::pushFieldCtx( ::rtl::OUString name, ::rtl::OUString ty void XMLTextImportHelper::popFieldCtx() { - m_pImpl->m_FieldStack.pop(); + if ( !m_pImpl->m_FieldStack.empty() ) + m_pImpl->m_FieldStack.pop(); } void XMLTextImportHelper::addFieldParam( ::rtl::OUString name, ::rtl::OUString value ) |