[Libreoffice-commits] core.git: 7 commits - include/xmloff sd/inc sd/source xmloff/source
Tor Lillqvist
tml at collabora.com
Mon Feb 20 20:23:45 UTC 2017
include/xmloff/autolayout.hxx | 6 ------
sd/inc/pres.hxx | 2 --
sd/inc/sdpage.hxx | 1 +
sd/source/core/drawdoc2.cxx | 1 +
sd/source/core/drawdoc3.cxx | 1 +
sd/source/core/sdpage.cxx | 13 +++++++------
sd/source/filter/ppt/pptin.cxx | 18 ++++++++++--------
sd/source/ui/controller/slidelayoutcontroller.cxx | 14 ++++++++------
sd/source/ui/dlg/PhotoAlbumDialog.cxx | 2 ++
sd/source/ui/func/fuexpand.cxx | 1 +
sd/source/ui/func/fusumry.cxx | 1 +
sd/source/ui/inc/unmodpg.hxx | 2 ++
sd/source/ui/inc/unprlout.hxx | 2 ++
sd/source/ui/sidebar/DocumentHelper.cxx | 1 +
sd/source/ui/sidebar/LayoutMenu.cxx | 13 +++++++------
sd/source/ui/sidebar/LayoutMenu.hxx | 1 +
sd/source/ui/sidebar/MasterPageContainer.cxx | 2 ++
sd/source/ui/unoidl/unomodel.cxx | 1 +
sd/source/ui/view/DocumentRenderer.cxx | 1 +
sd/source/ui/view/ViewShellImplementation.cxx | 2 ++
sd/source/ui/view/outlview.cxx | 7 ++++---
sd/source/ui/view/viewshe3.cxx | 1 +
xmloff/source/draw/sdxmlexp.cxx | 12 ++++++------
xmloff/source/draw/ximpstyl.cxx | 12 ++++++------
24 files changed, 68 insertions(+), 49 deletions(-)
New commits:
commit 6a7749cf33354010a279948807029eb322c8f113
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 20 20:00:31 2017 +0200
Include <xmloff/autolayout.hxx> only where used
Change-Id: Ia2964442a202690ddea9b9f2e976757846cec319
diff --git a/sd/inc/pres.hxx b/sd/inc/pres.hxx
index 2420919..d5b29c3 100644
--- a/sd/inc/pres.hxx
+++ b/sd/inc/pres.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SD_INC_PRES_HXX
#define INCLUDED_SD_INC_PRES_HXX
-#include <xmloff/autolayout.hxx>
-
enum PresObjKind
{
PRESOBJ_NONE = 0,
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index cbed1fc..6b5c156 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -30,6 +30,7 @@
#include <vector>
#include <svx/svdobj.hxx>
#include <svx/fmpage.hxx>
+#include <xmloff/autolayout.hxx>
#include "fadedef.h"
#include "diadef.h"
#include "pres.hxx"
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 8bdf71f..ab81cc4 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -47,6 +47,7 @@
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <boost/property_tree/json_parser.hpp>
#include <comphelper/lok.hxx>
+#include <xmloff/autolayout.hxx>
#include "sdresid.hxx"
#include "drawdoc.hxx"
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index fbfb588..0836603 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -39,6 +39,7 @@
#include <vcl/layout.hxx>
#include <vcl/msgbox.hxx>
#include <sot/formats.hxx>
+#include <xmloff/autolayout.hxx>
#include "glob.hrc"
#include "drawdoc.hxx"
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 92c2494..950e4eb 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -55,6 +55,7 @@
#include <rtl/ustring.hxx>
#include <basegfx/tools/tools.hxx>
#include <o3tl/enumarray.hxx>
+#include <xmloff/autolayout.hxx>
#include "Outliner.hxx"
#include "app.hrc"
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 534e463..0f1e42a 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -68,6 +68,8 @@
#include "propread.hxx"
#include <cusshow.hxx>
#include <vcl/bitmapaccess.hxx>
+#include <xmloff/autolayout.hxx>
+
#include "customshowlist.hxx"
#include "sddll.hxx"
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 28e8bbf..7d81e59 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -40,6 +40,8 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <comphelper/processfactory.hxx>
+#include <xmloff/autolayout.hxx>
+
#include "app.hrc"
#include "facreg.hxx"
#include "glob.hrc"
diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
index a6a6bb4..658c2fd 100644
--- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx
+++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx
@@ -29,6 +29,8 @@
#include <svx/unoshape.hxx>
#include <svx/xfltrit.hxx>
#include <svx/xfillit.hxx>
+#include <xmloff/autolayout.hxx>
+
#include "PhotoAlbumDialog.hxx"
#include "strings.hrc"
#include "sdresid.hxx"
diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx
index 11e3eba..0feb4fd 100644
--- a/sd/source/ui/func/fuexpand.cxx
+++ b/sd/source/ui/func/fuexpand.cxx
@@ -26,6 +26,7 @@
#include <sfx2/printer.hxx>
#include <editeng/outlobj.hxx>
#include <svx/svdetc.hxx>
+#include <xmloff/autolayout.hxx>
#include "app.hrc"
#include "strings.hrc"
diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx
index 9dfef1a..8417c3c 100644
--- a/sd/source/ui/func/fusumry.cxx
+++ b/sd/source/ui/func/fusumry.cxx
@@ -23,6 +23,7 @@
#include <svx/svdundo.hxx>
#include <sfx2/printer.hxx>
#include <editeng/outlobj.hxx>
+#include <xmloff/autolayout.hxx>
#include "strings.hrc"
diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx
index 6647406..c70fa07 100644
--- a/sd/source/ui/inc/unmodpg.hxx
+++ b/sd/source/ui/inc/unmodpg.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_UNMODPG_HXX
#define INCLUDED_SD_SOURCE_UI_INC_UNMODPG_HXX
+#include <xmloff/autolayout.hxx>
+
#include "sdundo.hxx"
#include "pres.hxx"
diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx
index 21c158f..db19cf5 100644
--- a/sd/source/ui/inc/unprlout.hxx
+++ b/sd/source/ui/inc/unprlout.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_SD_SOURCE_UI_INC_UNPRLOUT_HXX
#define INCLUDED_SD_SOURCE_UI_INC_UNPRLOUT_HXX
+#include <xmloff/autolayout.hxx>
+
#include "sdundo.hxx"
#include "pres.hxx"
diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx
index 1bfdd73..67d4b12 100644
--- a/sd/source/ui/sidebar/DocumentHelper.cxx
+++ b/sd/source/ui/sidebar/DocumentHelper.cxx
@@ -36,6 +36,7 @@
#include "stlpool.hxx"
#include <svx/xfillit0.hxx>
#include <tools/diagnose_ex.h>
+#include <xmloff/autolayout.hxx>
using namespace ::com::sun::star;
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index a208af3..f074e06 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -48,6 +48,7 @@
#include <svl/languageoptions.hxx>
#include <vcl/image.hxx>
#include <vcl/floatwin.hxx>
+#include <xmloff/autolayout.hxx>
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index ef168ed..10ff267 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -33,6 +33,7 @@
#include <svtools/valueset.hxx>
#include <svtools/transfer.hxx>
#include <sfx2/shell.hxx>
+#include <xmloff/autolayout.hxx>
#include <com/sun/star/ui/XSidebar.hpp>
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx
index 0204464..5226ed4 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -53,6 +53,8 @@
#include "pres.hxx"
#include <osl/mutex.hxx>
#include <osl/getglobalmutex.hxx>
+#include <xmloff/autolayout.hxx>
+
#include <memory>
using namespace ::com::sun::star;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index efd1b2d..27ed31db 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -70,6 +70,7 @@
#include <editeng/eeitem.hxx>
#include <unotools/datetime.hxx>
#include <unotools/saveopt.hxx>
+#include <xmloff/autolayout.hxx>
// Support creation of GraphicObjectResolver and EmbeddedObjectResolver
#include <svx/xmleohlp.hxx>
diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index 66504cb..2707742 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -51,6 +51,7 @@
#include <unotools/localedatawrapper.hxx>
#include <vcl/msgbox.hxx>
#include <unotools/moduleoptions.hxx>
+#include <xmloff/autolayout.hxx>
#include <vector>
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index ac8e4a0..582eb84 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -50,6 +50,8 @@
#include <svx/imapdlg.hxx>
#include <vcl/msgbox.hxx>
#include <basic/sbstar.hxx>
+#include <xmloff/autolayout.hxx>
+
#include "undo/undoobjects.hxx"
#include <com/sun/star/drawing/framework/XControllerManager.hpp>
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 2f6c3c0..85df9e3 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -78,6 +78,7 @@
#include <sfx2/templdlg.hxx>
#include <svl/aeitem.hxx>
#include <basic/sbstar.hxx>
+#include <xmloff/autolayout.hxx>
using namespace ::com::sun::star;
commit 056bb6f4f09147f0a3097cb2377cdeb441349d07
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 20 19:46:24 2017 +0200
s/AUTOLAYOUT_OBJOVERTEXT/AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT
Change-Id: Idf9771d3d58520a1a31cea45a6acca89347237f6
diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx
index f00831b..7097111 100644
--- a/include/xmloff/autolayout.hxx
+++ b/include/xmloff/autolayout.hxx
@@ -52,7 +52,6 @@ enum AutoLayout
AUTOLAYOUT_TEXTOBJ = 10,
AUTOLAYOUT_OBJ = 11,
AUTOLAYOUT_OBJTEXT = 13,
- AUTOLAYOUT_OBJOVERTEXT = 14,
AUTOLAYOUT_TEXTOVEROBJ = 17,
AUTOLAYOUT_4OBJ = 18,
AUTOLAYOUT_NOTES = 21,
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index bf65e71..92c2494 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1215,7 +1215,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OBJECT ), // AUTOLAYOUT_OBJ
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_CONTENT_2CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ
- LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_OBJOVERTEXT
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_2CONTENT_CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOVEROBJ
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index f909d59..534e463 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1156,7 +1156,7 @@ bool ImplSdPPTImport::Import()
if ( nID1 == PptPlaceholder::BODY && nID2 == PptPlaceholder::OBJECT )
eAutoLayout = AUTOLAYOUT_TEXTOVEROBJ;
else if ( nID1 == PptPlaceholder::OBJECT && nID2 == PptPlaceholder::BODY )
- eAutoLayout = AUTOLAYOUT_OBJOVERTEXT;
+ eAutoLayout = AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT;
}
break;
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index f402e9d..28e8bbf 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -114,7 +114,7 @@ static const snewfoil_value_info_layout standard[] =
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, AUTOLAYOUT_TITLE_2CONTENT_CONTENT },
{BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, AUTOLAYOUT_TITLE_CONTENT_2CONTENT },
{BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT },
- {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_OBJOVERTEXT },
+ {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT },
{BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_4OBJ },
{BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_6CLIPART },
{0, 0, AUTOLAYOUT_NONE}
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index da8f09a..a208af3 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -108,7 +108,7 @@ static const snewfoil_value_info standard[] =
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT_CONTENT},
{BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_CONTENT_2CONTENT},
{BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT},
- {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
+ {BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT},
{BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ},
{BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART},
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index d1536ef..fa00baa 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -928,7 +928,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aRight);
break;
}
- case 14 : // AUTOLAYOUT_OBJOVERTEXT
+ case AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT :
{
Rectangle aTop(pInfo->GetPresRectangle());
aTop.setHeight(long(aTop.GetHeight() * 0.477));
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 1f07c4b..1769176 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -617,7 +617,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
else
{
- mnTypeId = 14; // AUTOLAYOUT_OBJOVERTEXT -> top, bottom
+ mnTypeId = AUTOLAYOUT_TITLE_CONTENT_OVER_CONTENT; // top, bottom
}
}
break;
commit 6c897c63f74cc92803e45303f1085af766324727
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 20 19:42:27 2017 +0200
s/AUTOLAYOUT_2OBJOVERTEXT/AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT
Change-Id: I9f421104773c8c84828cb0908f0f5e182538eead
diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx
index c8dda25..f00831b 100644
--- a/include/xmloff/autolayout.hxx
+++ b/include/xmloff/autolayout.hxx
@@ -53,7 +53,6 @@ enum AutoLayout
AUTOLAYOUT_OBJ = 11,
AUTOLAYOUT_OBJTEXT = 13,
AUTOLAYOUT_OBJOVERTEXT = 14,
- AUTOLAYOUT_2OBJOVERTEXT = 16,
AUTOLAYOUT_TEXTOVEROBJ = 17,
AUTOLAYOUT_4OBJ = 18,
AUTOLAYOUT_NOTES = 21,
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 5c35213..bf65e71 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1217,7 +1217,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_OBJOVERTEXT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_2CONTENT_CONTENT
- LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJOVERTEXT
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOVEROBJ
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4OBJ
PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 4707170..f909d59 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1173,7 +1173,7 @@ bool ImplSdPPTImport::Import()
eAutoLayout = AUTOLAYOUT_TITLE_2CONTENT_CONTENT;
break;
case PptSlideLayout::TOPROW2COLUMN :
- eAutoLayout = AUTOLAYOUT_2OBJOVERTEXT;
+ eAutoLayout = AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT;
break;
case PptSlideLayout::FOUROBJECTS :
eAutoLayout = AUTOLAYOUT_4OBJ;
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index d89730d..f402e9d 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -113,7 +113,7 @@ static const snewfoil_value_info_layout standard[] =
{BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, AUTOLAYOUT_ONLY_TEXT },
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, AUTOLAYOUT_TITLE_2CONTENT_CONTENT },
{BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, AUTOLAYOUT_TITLE_CONTENT_2CONTENT },
- {BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,AUTOLAYOUT_2OBJOVERTEXT },
+ {BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT },
{BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_OBJOVERTEXT },
{BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_4OBJ },
{BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, AUTOLAYOUT_6CLIPART },
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 2c3bffd..da8f09a 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -107,7 +107,7 @@ static const snewfoil_value_info standard[] =
{BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT},
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT_CONTENT},
{BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_CONTENT_2CONTENT},
- {BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
+ {BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT},
{BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
{BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ},
{BMP_LAYOUT_HEAD06, STR_AUTOLAYOUT_6CONTENT, WritingMode_LR_TB, AUTOLAYOUT_6CLIPART},
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 83d1125..d1536ef 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -956,7 +956,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aRight);
break;
}
- case 16 : // AUTOLAYOUT_2OBJOVERTEXT
+ case AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT :
{
Rectangle aTopLeft(pInfo->GetPresRectangle());
aTopLeft.setHeight(long(aTopLeft.GetHeight() * 0.477));
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index a640109..1f07c4b 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -631,7 +631,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
{
if(pObj1->GetX() < pObj2->GetX())
{
- mnTypeId = 16; // AUTOLAYOUT_2OBJOVERTEXT
+ mnTypeId = AUTOLAYOUT_TITLE_2CONTENT_OVER_CONTENT;
}
else
{
commit 97ee1af4554d1740b5d7902f64e47e55fa2b80ca
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 20 19:38:33 2017 +0200
s/AUTOLAYOUT_2OBJTEXT/AUTOLAYOUT_TITLE_2CONTENT_CONTENT
Change-Id: I8ed1361b2103b35e277107bfda4c174f07d9de08
diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx
index 0a8a0d5..c8dda25 100644
--- a/include/xmloff/autolayout.hxx
+++ b/include/xmloff/autolayout.hxx
@@ -53,7 +53,6 @@ enum AutoLayout
AUTOLAYOUT_OBJ = 11,
AUTOLAYOUT_OBJTEXT = 13,
AUTOLAYOUT_OBJOVERTEXT = 14,
- AUTOLAYOUT_2OBJTEXT = 15,
AUTOLAYOUT_2OBJOVERTEXT = 16,
AUTOLAYOUT_TEXTOVEROBJ = 17,
AUTOLAYOUT_4OBJ = 18,
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 2f02bf8..5c35213 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1216,7 +1216,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_CONTENT_2CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_OBJOVERTEXT
- LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJTEXT
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_2CONTENT_CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJOVERTEXT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOVEROBJ
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4OBJ
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 37e5888..4707170 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1170,7 +1170,7 @@ bool ImplSdPPTImport::Import()
eAutoLayout = AUTOLAYOUT_TITLE_CONTENT_2CONTENT;
break;
case PptSlideLayout::LEFTCOLUMN2ROWS :
- eAutoLayout = AUTOLAYOUT_2OBJTEXT;
+ eAutoLayout = AUTOLAYOUT_TITLE_2CONTENT_CONTENT;
break;
case PptSlideLayout::TOPROW2COLUMN :
eAutoLayout = AUTOLAYOUT_2OBJOVERTEXT;
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index d3f4054..d89730d 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -111,7 +111,7 @@ static const snewfoil_value_info_layout standard[] =
{BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, AUTOLAYOUT_TITLE_2CONTENT },
{BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, AUTOLAYOUT_TITLE_ONLY },
{BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, AUTOLAYOUT_ONLY_TEXT },
- {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, AUTOLAYOUT_2OBJTEXT },
+ {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, AUTOLAYOUT_TITLE_2CONTENT_CONTENT },
{BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, AUTOLAYOUT_TITLE_CONTENT_2CONTENT },
{BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,AUTOLAYOUT_2OBJOVERTEXT },
{BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_OBJOVERTEXT },
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 93730c6..2c3bffd 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -105,7 +105,7 @@ static const snewfoil_value_info standard[] =
{BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT},
{BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE_ONLY},
{BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT},
- {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT},
+ {BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT_CONTENT},
{BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_CONTENT_2CONTENT},
{BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
{BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 598c79d..83d1125 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -940,7 +940,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderOutline, aBottom);
break;
}
- case 15 : // AUTOLAYOUT_2OBJTEXT
+ case AUTOLAYOUT_TITLE_2CONTENT_CONTENT :
{
Rectangle aLeftTop(pInfo->GetPresRectangle());
aLeftTop.setWidth(long(aLeftTop.GetWidth() * 0.488));
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 643d5ba..a640109 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -635,7 +635,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
else
{
- mnTypeId = 15; // AUTOLAYOUT_2OBJTEXT
+ mnTypeId = AUTOLAYOUT_TITLE_2CONTENT_CONTENT;
}
}
else
commit 7b2c59a97ddf9a5b14f2721005119e183a467803
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 20 19:35:01 2017 +0200
s/AUTOLAYOUT_TEXT2OBJ/AUTOLAYOUT_TITLE_CONTENT_2CONTENT
Change-Id: I514cf647863e51848ff51c26938e682ffeca7685
diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx
index a65267a..0a8a0d5 100644
--- a/include/xmloff/autolayout.hxx
+++ b/include/xmloff/autolayout.hxx
@@ -51,7 +51,6 @@ enum AutoLayout
AUTOLAYOUT_CLIPTEXT = 9,
AUTOLAYOUT_TEXTOBJ = 10,
AUTOLAYOUT_OBJ = 11,
- AUTOLAYOUT_TEXT2OBJ = 12,
AUTOLAYOUT_OBJTEXT = 13,
AUTOLAYOUT_OBJOVERTEXT = 14,
AUTOLAYOUT_2OBJTEXT = 15,
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index a75c3c9..2f02bf8 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1213,7 +1213,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CLIPTEXT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OBJECT ), // AUTOLAYOUT_OBJ
- LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXT2OBJ
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_CONTENT_2CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOBJ
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_OBJOVERTEXT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2OBJTEXT
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 732fe63..37e5888 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1167,7 +1167,7 @@ bool ImplSdPPTImport::Import()
eAutoLayout = AUTOLAYOUT_TITLE_ONLY;
break;
case PptSlideLayout::RIGHTCOLUMN2ROWS :
- eAutoLayout = AUTOLAYOUT_TEXT2OBJ;
+ eAutoLayout = AUTOLAYOUT_TITLE_CONTENT_2CONTENT;
break;
case PptSlideLayout::LEFTCOLUMN2ROWS :
eAutoLayout = AUTOLAYOUT_2OBJTEXT;
@@ -1185,7 +1185,7 @@ bool ImplSdPPTImport::Import()
eAutoLayout = AUTOLAYOUT_VERTICAL_TITLE_VERTICAL_OUTLINE;
break;
case PptSlideLayout::TITLERIGHT2BODIESLEFT :
- eAutoLayout = AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART; // AUTOLAYOUT_TEXT2OBJ;
+ eAutoLayout = AUTOLAYOUT_VERTICAL_TITLE_TEXT_CHART;
break;
case PptSlideLayout::BOTTOMROW2COLUMNS :
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index bf8ceee..d3f4054 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -112,7 +112,7 @@ static const snewfoil_value_info_layout standard[] =
{BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, AUTOLAYOUT_TITLE_ONLY },
{BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, AUTOLAYOUT_ONLY_TEXT },
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, AUTOLAYOUT_2OBJTEXT },
- {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, AUTOLAYOUT_TEXT2OBJ },
+ {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, AUTOLAYOUT_TITLE_CONTENT_2CONTENT },
{BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,AUTOLAYOUT_2OBJOVERTEXT },
{BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, AUTOLAYOUT_OBJOVERTEXT },
{BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, AUTOLAYOUT_4OBJ },
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 69625ba..93730c6 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -106,7 +106,7 @@ static const snewfoil_value_info standard[] =
{BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE_ONLY},
{BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT},
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT},
- {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ},
+ {BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_CONTENT_2CONTENT},
{BMP_LAYOUT_HEAD03A, STR_AUTOLAYOUT_2CONTENT_OVER_CONTENT,WritingMode_LR_TB, AUTOLAYOUT_2OBJOVERTEXT},
{BMP_LAYOUT_HEAD02B, STR_AUTOLAYOUT_CONTENT_OVER_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_OBJOVERTEXT},
{BMP_LAYOUT_HEAD04, STR_AUTOLAYOUT_4CONTENT, WritingMode_LR_TB, AUTOLAYOUT_4OBJ},
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index c78887d..598c79d 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -900,7 +900,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderObject, pInfo->GetPresRectangle());
break;
}
- case 12 : // AUTOLAYOUT_TEXT2OBJ
+ case AUTOLAYOUT_TITLE_CONTENT_2CONTENT :
{
Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index e46399d..643d5ba 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -640,7 +640,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
}
else
{
- mnTypeId = 12; // AUTOLAYOUT_TEXT2OBJ
+ mnTypeId = AUTOLAYOUT_TITLE_CONTENT_2CONTENT;
}
break;
}
commit 0cab28af329dd53168e99c582ff9c3318ac3c708
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 20 19:26:41 2017 +0200
Use AUTOLAYOUT_TITLE_ONLY instead of "deprecated" AUTOLAYOUT_ONLY_TITLE
Change-Id: Ib3c2b5f0feb70fea195f022f322c682ecd4f1918
diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx
index 7376e7d..a65267a 100644
--- a/include/xmloff/autolayout.hxx
+++ b/include/xmloff/autolayout.hxx
@@ -58,7 +58,6 @@ enum AutoLayout
AUTOLAYOUT_2OBJOVERTEXT = 16,
AUTOLAYOUT_TEXTOVEROBJ = 17,
AUTOLAYOUT_4OBJ = 18,
- AUTOLAYOUT_ONLY_TITLE = 19,
AUTOLAYOUT_NOTES = 21,
AUTOLAYOUT_HANDOUT1 = 22,
AUTOLAYOUT_HANDOUT2 = 23,
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 9c41064..a75c3c9 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1221,7 +1221,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTOVEROBJ
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE, // AUTOLAYOUT_4OBJ
PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ),
- LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_NONE ), // AUTOLAYOUT_ONLY_TITLE
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_NONE ), // AUTOLAYOUT_TITLE_ONLY
LayoutDescriptor( PRESOBJ_NONE ), // AUTOLAYOUT_NONE
LayoutDescriptor( PRESOBJ_PAGE, PRESOBJ_NOTES ), // AUTOLAYOUT_NOTES
LayoutDescriptor( ), // AUTOLAYOUT_HANDOUT1
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 0051df0..732fe63 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1164,7 +1164,7 @@ bool ImplSdPPTImport::Import()
eAutoLayout = AUTOLAYOUT_TITLE;
break;
case PptSlideLayout::ONLYTITLE :
- eAutoLayout = AUTOLAYOUT_ONLY_TITLE;
+ eAutoLayout = AUTOLAYOUT_TITLE_ONLY;
break;
case PptSlideLayout::RIGHTCOLUMN2ROWS :
eAutoLayout = AUTOLAYOUT_TEXT2OBJ;
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 1c6f85f..bf8ceee 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -109,7 +109,7 @@ static const snewfoil_value_info_layout standard[] =
{BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, AUTOLAYOUT_TITLE },
{BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, AUTOLAYOUT_TITLE_CONTENT },
{BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, AUTOLAYOUT_TITLE_2CONTENT },
- {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, AUTOLAYOUT_ONLY_TITLE },
+ {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, AUTOLAYOUT_TITLE_ONLY },
{BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, AUTOLAYOUT_ONLY_TEXT },
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, AUTOLAYOUT_2OBJTEXT },
{BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, AUTOLAYOUT_TEXT2OBJ },
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 29f072c..69625ba 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -103,7 +103,7 @@ static const snewfoil_value_info standard[] =
{BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE},
{BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_CONTENT},
{BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT},
- {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE},
+ {BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE_ONLY},
{BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT},
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT},
{BMP_LAYOUT_HEAD03C, STR_AUTOLAYOUT_CONTENT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TEXT2OBJ},
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index c94cff4..723e5ff 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -42,6 +42,7 @@
#include <editeng/numitem.hxx>
#include <editeng/outlobj.hxx>
#include <editeng/editeng.hxx>
+#include <xmloff/autolayout.hxx>
#include <editeng/editobj.hxx>
#include <editeng/editund2.hxx>
@@ -448,7 +449,7 @@ SdPage* OutlineView::InsertSlideForParagraph( Paragraph* pPara )
// page
AutoLayout eAutoLayout = pExample->GetAutoLayout();
if (eAutoLayout == AUTOLAYOUT_TITLE ||
- eAutoLayout == AUTOLAYOUT_ONLY_TITLE)
+ eAutoLayout == AUTOLAYOUT_TITLE_ONLY)
{
pPage->SetAutoLayout(AUTOLAYOUT_TITLE_CONTENT, true);
}
@@ -954,7 +955,7 @@ SdrTextObj* OutlineView::CreateTitleTextObject(SdPage* pPage)
if( pPage->GetAutoLayout() == AUTOLAYOUT_NONE )
{
// simple case
- pPage->SetAutoLayout( AUTOLAYOUT_ONLY_TITLE, true );
+ pPage->SetAutoLayout( AUTOLAYOUT_TITLE_ONLY, true );
}
else
{
@@ -974,7 +975,7 @@ SdrTextObj* OutlineView::CreateOutlineTextObject(SdPage* pPage)
switch( eNewLayout )
{
case AUTOLAYOUT_NONE:
- case AUTOLAYOUT_ONLY_TITLE:
+ case AUTOLAYOUT_TITLE_ONLY:
case AUTOLAYOUT_TITLE: eNewLayout = AUTOLAYOUT_TITLE_CONTENT; break;
case AUTOLAYOUT_CHART: eNewLayout = AUTOLAYOUT_CHARTTEXT; break;
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index f144409..c78887d 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -1003,7 +1003,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderObject, aBottomRight);
break;
}
- case 19 : // AUTOLAYOUT_ONLY_TITLE
+ case AUTOLAYOUT_TITLE_ONLY :
{
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderTitle, pInfo->GetTitleRectangle());
break;
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index a723dbd..e46399d 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -506,7 +506,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
{
if( pObj0->GetName() == "title" )
{
- mnTypeId = 19; // AUTOLAYOUT_ONLY_TITLE
+ mnTypeId = AUTOLAYOUT_TITLE_ONLY;
}
else
{
commit c87cc416609e2283d5059d8d1c317211871ddfa6
Author: Tor Lillqvist <tml at collabora.com>
Date: Mon Feb 20 19:22:47 2017 +0200
Use AUTOLAYOUT_TITLE_2CONTENT instead of "deprecated" AUTOLAYOUT_2TEXT
Change-Id: I8897e31065f69b7fb62f0770e62025f35ecb5eec
diff --git a/include/xmloff/autolayout.hxx b/include/xmloff/autolayout.hxx
index 83c8c53..7376e7d 100644
--- a/include/xmloff/autolayout.hxx
+++ b/include/xmloff/autolayout.hxx
@@ -43,7 +43,6 @@ enum AutoLayout
// deprecated
AUTOLAYOUT_CHART = 2,
- AUTOLAYOUT_2TEXT = 3,
AUTOLAYOUT_TEXTCHART = 4,
AUTOLAYOUT_ORG = 5,
AUTOLAYOUT_TEXTCLIP = 6,
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 6ce90c9..9c41064 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -1204,7 +1204,7 @@ static const LayoutDescriptor& GetLayoutDescriptor( AutoLayout eLayout )
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_TEXT ), // AUTOLAYOUT_TITLE
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_CHART
- LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_2TEXT
+ LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TITLE_2CONTENT
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCHART
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_ORG
LayoutDescriptor( PRESOBJ_TITLE, PRESOBJ_OUTLINE, PRESOBJ_OUTLINE ), // AUTOLAYOUT_TEXTCLbIP
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 5891736..0051df0 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -1124,7 +1124,7 @@ bool ImplSdPPTImport::Import()
case PptSlideLayout::TWOCOLUMNSANDTITLE :
{
- eAutoLayout = AUTOLAYOUT_2TEXT;
+ eAutoLayout = AUTOLAYOUT_TITLE_2CONTENT;
PptPlaceholder nID1 = pSlideLayout->aPlaceholderId[ 1 ];
PptPlaceholder nID2 = pSlideLayout->aPlaceholderId[ 2 ];
if ( nID1 == PptPlaceholder::BODY && nID2 == PptPlaceholder::GRAPH )
@@ -1150,7 +1150,7 @@ bool ImplSdPPTImport::Import()
case PptSlideLayout::TWOROWSANDTITLE :
{
- eAutoLayout = AUTOLAYOUT_2TEXT;
+ eAutoLayout = AUTOLAYOUT_TITLE_2CONTENT;
PptPlaceholder nID1 = pSlideLayout->aPlaceholderId[ 1 ];
PptPlaceholder nID2 = pSlideLayout->aPlaceholderId[ 2 ];
if ( nID1 == PptPlaceholder::BODY && nID2 == PptPlaceholder::OBJECT )
diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx
index 9ecadb0..1c6f85f 100644
--- a/sd/source/ui/controller/slidelayoutcontroller.cxx
+++ b/sd/source/ui/controller/slidelayoutcontroller.cxx
@@ -108,7 +108,7 @@ static const snewfoil_value_info_layout standard[] =
{BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, AUTOLAYOUT_NONE },
{BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, AUTOLAYOUT_TITLE },
{BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, AUTOLAYOUT_TITLE_CONTENT },
- {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, AUTOLAYOUT_2TEXT },
+ {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, AUTOLAYOUT_TITLE_2CONTENT },
{BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, AUTOLAYOUT_ONLY_TITLE },
{BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, AUTOLAYOUT_ONLY_TEXT },
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, AUTOLAYOUT_2OBJTEXT },
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index 41230a5..29f072c 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -102,7 +102,7 @@ static const snewfoil_value_info standard[] =
{BMP_LAYOUT_EMPTY, STR_AUTOLAYOUT_NONE, WritingMode_LR_TB, AUTOLAYOUT_NONE},
{BMP_LAYOUT_HEAD03, STR_AUTOLAYOUT_TITLE, WritingMode_LR_TB, AUTOLAYOUT_TITLE},
{BMP_LAYOUT_HEAD02, STR_AUTOLAYOUT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_CONTENT},
- {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2TEXT},
+ {BMP_LAYOUT_HEAD02A, STR_AUTOLAYOUT_2CONTENT, WritingMode_LR_TB, AUTOLAYOUT_TITLE_2CONTENT},
{BMP_LAYOUT_HEAD01, STR_AUTOLAYOUT_ONLY_TITLE, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TITLE},
{BMP_LAYOUT_TEXTONLY, STR_AUTOLAYOUT_ONLY_TEXT, WritingMode_LR_TB, AUTOLAYOUT_ONLY_TEXT},
{BMP_LAYOUT_HEAD03B, STR_AUTOLAYOUT_2CONTENT_CONTENT, WritingMode_LR_TB, AUTOLAYOUT_2OBJTEXT},
diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index bbb61cb..f144409 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -816,7 +816,7 @@ void SdXMLExport::ImpWriteAutoLayoutInfos()
ImpWriteAutoLayoutPlaceholder(XmlPlaceholderChart, pInfo->GetPresRectangle());
break;
}
- case 3 : // AUTOLAYOUT_2TEXT
+ case AUTOLAYOUT_TITLE_2CONTENT :
{
Rectangle aLeft(pInfo->GetPresRectangle());
aLeft.setWidth(long(aLeft.GetWidth() * 0.488));
diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx
index 7f2f1d8..a723dbd 100644
--- a/xmloff/source/draw/ximpstyl.cxx
+++ b/xmloff/source/draw/ximpstyl.cxx
@@ -566,7 +566,7 @@ void SdXMLPresentationPageLayoutContext::EndElement()
{
if( pObj2->GetName() == "outline" )
{
- mnTypeId = 3; // AUTOLAYOUT_2TEXT
+ mnTypeId = AUTOLAYOUT_TITLE_2CONTENT;
}
else if( pObj2->GetName() == "chart" )
{
More information about the Libreoffice-commits
mailing list