diff options
author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-11-29 20:34:56 +0100 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2018-11-30 20:03:13 +0100 |
commit | 4632afbd9ecdf85f3980b41fa9d58b6099aa2d81 (patch) | |
tree | abdc0f6e02dc3c8fcb7c251f54d0867d2d597688 /include | |
parent | f52399177fcab220867c1dcae35c6db5c904138d (diff) |
tdf#93005, tdf#100611, remove the incomplete ODC export feature
Change-Id: I96a3882cd412ea5d993971df7e20b1fd8da73642
Reviewed-on: https://gerrit.libreoffice.org/64283
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit d543e8dfd3d8ae718e29304a155e1cf70d08325d)
Reviewed-on: https://gerrit.libreoffice.org/64311
Diffstat (limited to 'include')
-rw-r--r-- | include/sfx2/objsh.hxx | 2 | ||||
-rw-r--r-- | include/svx/svxids.hrc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index af6c050c1dc8..0f2c09aeef82 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -604,7 +604,7 @@ public: */ void SetupStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, - sal_Int32 nVersion, bool bTemplate, bool bChart = false ) const; + sal_Int32 nVersion, bool bTemplate ) const; css::uno::Reference< css::embed::XStorage > const & GetStorage(); diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index acd2df632a1a..5ccb79dcf527 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -267,7 +267,6 @@ class SfxStringItem; #define SID_OBJECT_ALIGN_UP ( SID_SVX_START + 134 ) #define SID_OBJECT_ALIGN_MIDDLE ( SID_SVX_START + 135 ) #define SID_OBJECT_ALIGN_DOWN ( SID_SVX_START + 136 ) -#define SID_INSERT_DIAGRAM_FROM_FILE ( SID_SVX_START + 139 ) #define SID_INSERT_DIAGRAM ( SID_SVX_START + 140 ) #define SID_INSERT_TABLE ( SID_SVX_START + 141 ) #define SID_ATTRIBUTES_AREA ( SID_SVX_START + 142 ) |