diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 17:03:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 20:36:46 +0200 |
| commit | 61e8788d1b87fc57a9d015041f4e1ab44a86a1bd (patch) | |
| tree | 5bae1af990ea7266140927b2c625b5a0f9265040 /include | |
| parent | 0b6d0ac41afc72a0043e6ccdc6cdfd8648a5efdc (diff) | |
convert pXRelTo/pYRelTo to boost::optional
seems wasteful to be allocating a single int for this
Change-Id: I8e1122fec8c8dc90805a38b677a1e08cd89a66ff
Reviewed-on: https://gerrit.libreoffice.org/39917
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/filter/msfilter/msdffimp.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 3dff33e6269c..57530d1da42a 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -27,6 +27,7 @@ #include <utility> #include <vector> +#include <boost/optional.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <comphelper/stl_types.hxx> @@ -210,7 +211,8 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec static const int RELTO_DEFAULT = 2; SdrObject* pObj; - tools::Polygon* pWrapPolygon; + std::unique_ptr<tools::Polygon> + pWrapPolygon; std::unique_ptr<char[]> pClientAnchorBuffer; sal_uInt32 nClientAnchorLen; @@ -218,9 +220,9 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec pClientDataBuffer; sal_uInt32 nClientDataLen; sal_uInt32 nXAlign; - sal_uInt32 *pXRelTo; + boost::optional<sal_uInt32> nXRelTo; sal_uInt32 nYAlign; - sal_uInt32 *pYRelTo; + boost::optional<sal_uInt32> nYRelTo; sal_uInt32 nLayoutInTableCell; sal_uInt32 nFlags; sal_Int32 nDxTextLeft; ///< distance of text box from surrounding shape |