diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-02-16 16:20:18 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-02-16 16:59:39 +0200 |
| commit | 7ecbffb3e4879d2fbcf6b20e57d37b8eb1efa660 (patch) | |
| tree | b29ec993050ecf2950fcc5de78003555fe7d3c3c /xmloff | |
| parent | ba0f920cc141eb6ab896f650e9ac7b25ffe073a5 (diff) | |
Move AutoLayout enum definition to its own file, and start de-duplicating it
The mysteriously named AUTOLAYOUT_ENUM had the same value as
AUTOLAYOUT_TITLE_CONTENT, and was marked as "deprecated", so just use
the latter instead. Use it also in xmloff instead of the magic number
1 in places where comments indicated that AUTOLAYOYT_ENUM was what the
1 meant.
Will continue with the other "deprecated" and duplicated enumerators
later. (Or you feel free.)
Change-Id: Id5d70e07d30b3bf0d62e5d8719edb784bd23f99d
Diffstat (limited to 'xmloff')
| -rw-r--r-- | xmloff/source/draw/sdxmlexp.cxx | 3 | ||||
| -rw-r--r-- | xmloff/source/draw/ximpstyl.cxx | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index ebc578bd8707..bbb61cbb6006 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <xmloff/autolayout.hxx> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> @@ -803,7 +804,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos() ImpWriteAutoLayoutPlaceholder(XmlPlaceholderSubtitle, pInfo->GetPresRectangle()); break; } - case 1 : // AUTOLAYOUT_ENUM + case AUTOLAYOUT_TITLE_CONTENT : { ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle()); ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, pInfo->GetPresRectangle()); diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index 82c0fc788fa7..7f2f1d89ba66 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/presentation/XHandoutMasterSupplier.hpp> #include <comphelper/namecontainer.hxx> +#include <xmloff/autolayout.hxx> #include <xmloff/xmlprcon.hxx> #include <xmloff/families.hxx> #include <com/sun/star/container/XNameContainer.hpp> @@ -523,7 +524,7 @@ void SdXMLPresentationPageLayoutContext::EndElement() } else if( pObj1->GetName() == "outline" ) { - mnTypeId = 1; // AUTOLAYOUT_ENUM + mnTypeId = AUTOLAYOUT_TITLE_CONTENT; } else if( pObj1->GetName() == "chart" ) { |