diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-02 16:16:49 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-02 16:16:49 +0200 |
| commit | b5b4805f60f2a86adc1d76cc7d176830f1303c8e (patch) | |
| tree | 6f39e5701622202c97895bfb081fd4846259c7cc /include | |
| parent | Merge branch 'libreoffice-6-4' (diff) | |
| parent | tdf#132172 Qt5 just handle visible widget's focus (diff) | |
| download | core-b5b4805f60f2a86adc1d76cc7d176830f1303c8e.tar.gz core-b5b4805f60f2a86adc1d76cc7d176830f1303c8e.zip | |
Merge branch 'libreoffice-6-4'
into distro/lhm/libreoffice-6-4+backports
Conflicts:
writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
Diffstat (limited to 'include')
| -rw-r--r-- | include/formula/IFunctionDescription.hxx | 1 | ||||
| -rw-r--r-- | include/oox/token/relationship.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/errinf.hxx | 1 | ||||
| -rw-r--r-- | include/xmloff/xmlnumfi.hxx | 2 |
4 files changed, 5 insertions, 0 deletions
diff --git a/include/formula/IFunctionDescription.hxx b/include/formula/IFunctionDescription.hxx index 5d4616b9b9e5..83ff1d7e8aeb 100644 --- a/include/formula/IFunctionDescription.hxx +++ b/include/formula/IFunctionDescription.hxx @@ -101,6 +101,7 @@ namespace formula // parameter virtual sal_uInt32 getParameterCount() const = 0; virtual sal_uInt32 getVarArgsStart() const = 0; + virtual sal_uInt32 getVarArgsLimit() const = 0; virtual OUString getParameterName(sal_uInt32 _nPos) const = 0; virtual OUString getParameterDescription(sal_uInt32 _nPos) const = 0; virtual bool isParameterOptional(sal_uInt32 _nPos) const = 0; diff --git a/include/oox/token/relationship.hxx b/include/oox/token/relationship.hxx index ae1580bf2bc5..adc25f4a73b6 100644 --- a/include/oox/token/relationship.hxx +++ b/include/oox/token/relationship.hxx @@ -23,6 +23,7 @@ enum class Relationship COMMENTS, COMMENTAUTHORS, CONTROL, + CTRLPROP, CUSTOMXML, CUSTOMXMLPROPS, DIAGRAMCOLORS, diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx index 37805b7f710c..76ee7aca37aa 100644 --- a/include/vcl/errinf.hxx +++ b/include/vcl/errinf.hxx @@ -59,6 +59,7 @@ public: static void RegisterDisplay(BasicDisplayErrorFunc*); static void RegisterDisplay(WindowDisplayErrorFunc*); + static void Reset(); private: DisplayFnPtr pDsp; diff --git a/include/xmloff/xmlnumfi.hxx b/include/xmloff/xmlnumfi.hxx index 4a1eaca5b256..f772a54b4d28 100644 --- a/include/xmloff/xmlnumfi.hxx +++ b/include/xmloff/xmlnumfi.hxx @@ -91,6 +91,7 @@ public: SvXMLNumImpData* getData() { return pData.get(); } const SvXMLTokenMap& GetStylesElemTokenMap(); + LanguageType GetLanguageForKey(sal_Int32 nKey); // sal_uInt32 GetKeyForName( const OUString& rName ); }; @@ -164,6 +165,7 @@ public: const OUString& rLName, const css::uno::Reference< css::xml::sax::XAttributeList>& xAttrList, const sal_Int32 nKey, + LanguageType nLang, SvXMLStylesContext& rStyles ); virtual ~SvXMLNumFormatContext() override; |