diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-12-11 15:25:59 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-12-11 15:25:59 +0000 |
| commit | 3d38a29a12a892ecf127f9cff1b265b6bace1985 (patch) | |
| tree | 9bff9e6d9256553a2340c522a412c516774d38ec /xmloff/source/draw | |
| parent | 67e91855592bff59680058b5de95e4691557b593 (diff) | |
CWS-TOOLING: integrate CWS impressfontsize
2008-12-11 14:15:16 +0100 wg r265298 : i97125
2008-12-11 12:54:53 +0100 wg r265288 : i97125
2008-12-11 12:53:03 +0100 wg r265287 : i97125
2008-12-11 11:25:42 +0100 wg r265270 : i97125
2008-12-11 10:22:13 +0100 wg r265253 : i97125
2008-12-11 09:22:47 +0100 wg r265247 : i97125
2008-12-09 15:28:51 +0100 cl r265097 : added missing toolbar buttons for inc/dec font size
2008-12-08 17:39:46 +0100 cl r265012 : #i80257# added autolayout text only
2008-12-08 17:32:07 +0100 cl r265011 : #i80257# added autolayout text only
2008-12-08 16:42:19 +0100 cl r265008 : #i94459# fixed a bug in insertByName and replaceByName
2008-12-08 16:25:26 +0100 cl r265007 : #i80257# new image for text only auto layout in impress
2008-12-08 16:24:01 +0100 cl r265006 : #i80257# new image for text only auto layout in impress
2008-12-08 16:01:46 +0100 cl r265003 : #i88855# changed wording from Monitor to Display
2008-12-08 15:57:24 +0100 cl r265002 : #i91904# applied patch to fix a wrong index access
2008-12-05 12:51:47 +0100 cl r264900 : #i8824# allow setting of text properties at shape without reformating text
2008-12-05 11:09:21 +0100 cl r264895 : fixed build problem
2008-12-04 12:04:09 +0100 cl r264829 : fixed build issue
2008-12-04 11:03:58 +0100 cl r264823 : #i8824# set new fontsize at shape
2008-12-02 22:39:22 +0100 cl r264732 : fixed build problem
2008-12-02 22:38:42 +0100 cl r264731 : fixed build problem
2008-12-01 17:44:29 +0100 cl r264623 : CWS-TOOLING: rebase CWS impressfontsize to trunk@264325 (milestone: DEV300:m36)
2008-11-07 11:38:13 +0100 cl r263418 : #i95920# fixed an OpenSolaris build breaker
2008-11-06 14:56:04 +0100 cl r263386 : #i40730# added support to supress export of hidden slides to html
2008-11-06 14:55:41 +0100 cl r263385 : #i40730# added support to supress export of hidden slides to html
2008-11-06 14:03:59 +0100 cl r263384 : #158530# allow editing of interaction links with hyperlink editor
2008-10-20 15:34:13 +0200 cl r262322 : #i8824# migrate cws impressfontsize to subversion.
Diffstat (limited to 'xmloff/source/draw')
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 14 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpstyl.cxx | 9 |
2 files changed, 21 insertions, 2 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 673a48dbe1..fce9ef0664 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -208,7 +208,7 @@ DECLARE_LIST(ImpXMLEXPPageMasterList, ImpXMLEXPPageMasterInfo*) ////////////////////////////////////////////////////////////////////////////// -#define IMP_AUTOLAYOUT_INFO_MAX (32L) +#define IMP_AUTOLAYOUT_INFO_MAX (33L) class ImpXMLAutoLayoutInfo { @@ -386,6 +386,13 @@ ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterI - (aClassicTSize.Height() + (aClassicLPos.Y() - (aClassicTPos.Y() + aClassicTSize.Height()))); aLayoutSize.Height() = (aClassicLPos.Y() + aClassicLSize.Height()) - aClassicTPos.Y(); } + else if( mnType == 32 ) + { + // AUTOLAYOUT_ONLY_TEXT + aLayoutPos = aTitlePos; + aLayoutSize.Width() = aTitleSize.Width(); + aLayoutSize.Height() = long( aLayoutSize.Height() * 0.825 ); + } else { aLayoutPos.X() += long( aLayoutSize.Width() * 0.0735 ); @@ -1238,6 +1245,11 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() ImpWriteAutoLayoutPlaceholder(XmlPlaceholderVerticalOutline, aRight); break; } + case 32 : // AUTOLAYOUT_TITLE + { + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderSubtitle, pInfo->GetPresRectangle()); + break; + } default: { DBG_ERROR("XMLEXP: unknown autolayout export"); diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index fe80697387..a96b5bfcac 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -576,7 +576,14 @@ void SdXMLPresentationPageLayoutContext::EndElement() { case 1: { - mnTypeId = 19; // AUTOLAYOUT_ONLY_TITLE + if(pObj0->GetName().equals(OUString(RTL_CONSTASCII_USTRINGPARAM("title")))) + { + mnTypeId = 19; // AUTOLAYOUT_ONLY_TITLE + } + else + { + mnTypeId = 32; // AUTOLAYOUT_ONLY_TEXT + } break; } case 2: |