diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-02-12 16:56:44 +0100 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2010-02-12 16:56:44 +0100 |
commit | db02ac8b89b8ec1e3d84f2676665667916582423 (patch) | |
tree | 55446fdc25ea149952589d200fb6b4224a6996f8 /xmloff/source/draw | |
parent | ae19e5feff59f578d3f8de6fe9c27f9a57ba63d1 (diff) |
changefileheader2: #i10000#: convert files with CR/LF characters to CR only
Diffstat (limited to 'xmloff/source/draw')
-rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 90 | ||||
-rw-r--r-- | xmloff/source/draw/ximpstyl.cxx | 28 |
2 files changed, 59 insertions, 59 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index 06fe80fbf9b4..bc6f72abd2b0 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -1260,51 +1260,51 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() break; } - case 33 : // AUTOLAYOUT_4CLIPART
- {
- Rectangle aTopLeft(pInfo->GetPresRectangle());
- aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
- aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.488));
- Rectangle aBottomLeft(aTopLeft);
- aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);
- Rectangle aTopRight(aTopLeft);
- aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 1.05);
- Rectangle aBottomRight(aTopRight);
- aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);
-
- ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
- ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);
- ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);
- ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);
- ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);
- break;
- }
- - case 34 : // AUTOLAYOUT_6CLIPART
- {
- Rectangle aTopLeft(pInfo->GetPresRectangle());
- aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
- aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.322));
- Rectangle aTopCenter(aTopLeft);
- aTopCenter.Left() = long(aTopCenter.Left() + aTopCenter.GetWidth() * 1.05);
- Rectangle aTopRight(aTopLeft);
- aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 2 * 1.05);
-
- Rectangle aBottomLeft(aTopLeft);
- aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095);
- Rectangle aBottomCenter(aTopCenter);
- aBottomCenter.Top() = long(aBottomCenter.Top() + aBottomCenter.GetHeight() * 1.095);
- Rectangle aBottomRight(aTopRight);
- aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095);
-
- ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
- ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft);
- ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopCenter);
- ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight);
- ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft);
- ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomCenter);
- ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight);
- break;
+ case 33 : // AUTOLAYOUT_4CLIPART + { + Rectangle aTopLeft(pInfo->GetPresRectangle()); + aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477)); + aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.488)); + Rectangle aBottomLeft(aTopLeft); + aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095); + Rectangle aTopRight(aTopLeft); + aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 1.05); + Rectangle aBottomRight(aTopRight); + aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095); + + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle()); + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft); + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight); + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft); + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight); + break; + } + + case 34 : // AUTOLAYOUT_6CLIPART + { + Rectangle aTopLeft(pInfo->GetPresRectangle()); + aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477)); + aTopLeft.setWidth(long(aTopLeft.GetWidth() * 0.322)); + Rectangle aTopCenter(aTopLeft); + aTopCenter.Left() = long(aTopCenter.Left() + aTopCenter.GetWidth() * 1.05); + Rectangle aTopRight(aTopLeft); + aTopRight.Left() = long(aTopRight.Left() + aTopRight.GetWidth() * 2 * 1.05); + + Rectangle aBottomLeft(aTopLeft); + aBottomLeft.Top() = long(aBottomLeft.Top() + aBottomLeft.GetHeight() * 1.095); + Rectangle aBottomCenter(aTopCenter); + aBottomCenter.Top() = long(aBottomCenter.Top() + aBottomCenter.GetHeight() * 1.095); + Rectangle aBottomRight(aTopRight); + aBottomRight.Top() = long(aBottomRight.Top() + aBottomRight.GetHeight() * 1.095); + + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle()); + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopLeft); + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopCenter); + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aTopRight); + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomLeft); + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomCenter); + ImpWriteAutoLayoutPlaceholder(XmlPlaceholderGraphic, aBottomRight); + break; } default: { diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 1d783c4e73ba..01f0fa0faf5c 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -729,24 +729,24 @@ void SdXMLPresentationPageLayoutContext::EndElement() } case 5: { - SdXMLPresentationPlaceholderContext* pObj1 = maList.GetObject(1);
-
- if(pObj1->GetName().equals(
- OUString(RTL_CONSTASCII_USTRINGPARAM("object"))))
- {
- mnTypeId = 18; // AUTOLAYOUT_4OBJ
- }
- else
- {
- mnTypeId = 33; // AUTOLAYOUT_4CLIPART
- }
- break;
+ SdXMLPresentationPlaceholderContext* pObj1 = maList.GetObject(1); + + if(pObj1->GetName().equals( + OUString(RTL_CONSTASCII_USTRINGPARAM("object")))) + { + mnTypeId = 18; // AUTOLAYOUT_4OBJ + } + else + { + mnTypeId = 33; // AUTOLAYOUT_4CLIPART + } + break; } case 7: { - mnTypeId = 33; // AUTOLAYOUT_6CLIPART
- break;
+ mnTypeId = 33; // AUTOLAYOUT_6CLIPART + break; } default: { |