[Libreoffice-commits] core.git: offapi/com
offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4cf9bb10945aaad487c756c8f282d03b9eea89ae Author: Andrea Gelmini AuthorDate: Thu Sep 12 16:42:15 2019 +0200 Commit: Julien Nabet CommitDate: Sun Sep 15 08:57:21 2019 +0200 Fix missing verb Change-Id: I41084a1858e9ea1d22f51a5ca640efa6ec963e42 Reviewed-on: https://gerrit.libreoffice.org/78835 Reviewed-by: Julien Nabet Tested-by: Julien Nabet diff --git a/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl b/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl index e7599ae4480d..8162b8cfb781 100644 --- a/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl +++ b/offapi/com/sun/star/chart2/XRegressionCurveCalculator.idl @@ -43,7 +43,7 @@ interface XRegressionCurveCalculator : com::sun::star::uno::XInterface If the curve is not polynomial, this property has no effect. @param period -Period of a moving average regression curve, value should greater or equal to 2 +Period of a moving average regression curve, value should be greater or equal to 2 If the curve is not moving average regression curve, this property has no effect. @param forceIntercept ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: reportdesign/source
reportdesign/source/filter/xml/xmlExport.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 196e7ad850e40e631255ef42bb1653902e201837 Author: Andrea Gelmini AuthorDate: Sat Sep 14 21:58:50 2019 +0200 Commit: Julien Nabet CommitDate: Sun Sep 15 08:56:36 2019 +0200 Fix typos Change-Id: I111acf563106f43cadb36f35823dc655255a1317 Reviewed-on: https://gerrit.libreoffice.org/78923 Tested-by: Jenkins Reviewed-by: Julien Nabet diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx index 43abca700f9f..4c991cd87732 100644 --- a/reportdesign/source/filter/xml/xmlExport.cxx +++ b/reportdesign/source/filter/xml/xmlExport.cxx @@ -518,7 +518,7 @@ void ORptExport::collectStyleNames(sal_Int32 _nFamily, const ::std::vector< sal_ // note: there cannot be 0-height rows, because a call to std::unique has removed them // it cannot be predicted that the size of _aSizeAutoGrow has any relation to the size of // _aSize, because of the same std::unique operation (and _aSizeAutoGrow wasn't even the same -// size before that), so the matching elemenent in _aSizeAutoGrow has to be found by lookup. +// size before that), so the matching element in _aSizeAutoGrow has to be found by lookup. ::std::vector::const_iterator aAutoGrow = ::std::find(_aSizeAutoGrow.begin(), _aSizeAutoGrow.end(), *aIter2); bool bAutoGrow = aAutoGrow != _aSizeAutoGrow.end(); // the mnIndex is into the array returned by OXMLHelper::GetRowStyleProps() @@ -593,7 +593,7 @@ void ORptExport::exportSectionAutoStyle(const Reference& _xProp) // note: the aRowPos contains top and bottom position of every report control; we now compute the // top of every row in the resulting table, by sorting and eliminating unnecessary duplicate -// positions. (the same for the colums in the preceding lines.) +// positions. (the same for the columns in the preceding lines.) ::std::sort(aRowPos.begin(),aRowPos.end(),::std::less()); aRowPos.erase(::std::unique(aRowPos.begin(),aRowPos.end()),aRowPos.end()); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: qadevOOo/objdsc sc/qa
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv |1 -
sc/qa/extras/scannotationshapeobj.cxx|6
++
2 files changed, 6 insertions(+), 1 deletion(-)
New commits:
commit bda1d88f2bfa21202725ab9c567b3cccba3c1f0b
Author: Jens Carl
AuthorDate: Sat Sep 14 17:37:01 2019 -0700
Commit: Jens Carl
CommitDate: Sun Sep 15 04:49:05 2019 +0200
tdf#45904 Move XShapeDescriptor Java test to C++
Move XShapeDescriptor Java test to C++ for ScAnnotationShapeObj.
Change-Id: I21c51f6d557e877fed6319ed83f7951bdcb3f800
Reviewed-on: https://gerrit.libreoffice.org/78924
Tested-by: Jenkins
Reviewed-by: Jens Carl
diff --git
a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
index c65940379cc2..3a76ca37b9f5 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
@@ -86,7 +86,6 @@
"ScAnnotationShapeObj";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontPitchComplex"
"ScAnnotationShapeObj";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharPostureComplex"
"ScAnnotationShapeObj";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharLocaleComplex"
-"ScAnnotationShapeObj";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()"
"ScAnnotationShapeObj";"com::sun::star::drawing::RotationDescriptor";"RotateAngle"
"ScAnnotationShapeObj";"com::sun::star::drawing::RotationDescriptor";"ShearAngle#optional"
"ScAnnotationShapeObj";"com::sun::star::drawing::LineProperties";"LineStyle"
diff --git a/sc/qa/extras/scannotationshapeobj.cxx
b/sc/qa/extras/scannotationshapeobj.cxx
index 5cf3fc927464..48f97b1be887 100644
--- a/sc/qa/extras/scannotationshapeobj.cxx
+++ b/sc/qa/extras/scannotationshapeobj.cxx
@@ -10,6 +10,7 @@
#include
#include
#include
+#include
#include
#include
@@ -36,6 +37,7 @@ namespace sc_apitest
class ScAnnotationShapeObj : public CalcUnoApiTest,
public apitest::CaptionShape,
public apitest::XShape,
+ public apitest::XShapeDescriptor,
public apitest::XText
{
public:
@@ -55,6 +57,9 @@ public:
CPPUNIT_TEST(testGetSetSize);
CPPUNIT_TEST(testGetSetPosition);
+// XShapeDescriptor
+CPPUNIT_TEST(testGetShapeType);
+
// XText
CPPUNIT_TEST(testInsertRemoveTextContent);
@@ -69,6 +74,7 @@ uno::Reference
ScAnnotationShapeObj::m_xField;
ScAnnotationShapeObj::ScAnnotationShapeObj()
: CalcUnoApiTest("sc/qa/extras/testdocuments")
+, XShapeDescriptor("com.sun.star.drawing.CaptionShape")
{
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
CppunitTest_sw_layoutwriter failing on Windows with HiDPI
The Unit Test added in https://cgit.freedesktop.org/libreoffice/core/commit/?id=4ac31078b9c46231f8ecf0409a1724749ac8c5a4 Is causing the core Unit Test CppunitTest_sw_layoutwriter to fail when you set, Settings->Display->Scale=125% in Windows 10. horizontal_multilevel.odt: C:/lode/dev/core/test/source/xmltesttools.cxx(168) : error : Assertion Test name: testHorizontal_multilevel::TestBody equality assertion failed - Expected: 7945 - Actual : 7946 - In <>, attribute 'y' of '/metafile/push[1]/push[1]/push[1]/push[3]/push[1]/textarray[7]' incorrect value. Failures !!! Run: 56 Failure total: 1 Failures: 1 Errors: 0 Error: a unit test failed, please do one of: make CppunitTest_sw_layoutwriter CPPUNITTRACE=TRUE # which is a shortcut for the following line make CppunitTest_sw_layoutwriter CPPUNITTRACE="'C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/Common7/IDE/devenv.exe' /debugexe" # for interactive debugging in Visual Studio make CppunitTest_sw_layoutwriter CPPUNITTRACE="drmemory -free_max_frames 20" # for memory checking (install Dr.Memory first, and put it to your PATH) You can limit the execution to just one particular test by: make CppunitTest_sw_layoutwriter CPPUNIT_TEST_NAME="testXYZ" ...above mentioned params... make[1]: *** [C:/lode/dev/core/solenv/gbuild/CppunitTest.mk:114: C:/lode/dev/core/workdir/CppunitTest/sw_layoutwriter.test] Error 1 make: *** [Makefile:167: CppunitTest_sw_layoutwriter] Error 2 ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2019-15-09 02:49:20 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/plugins/gitiles/dev-tools/+/master/cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/sc_lok_invalidation' - include/LibreOfficeKit include/sfx2 sc/qa sc/source sd/qa sd/source sfx2/source sw/qa sw/source
include/LibreOfficeKit/LibreOfficeKitEnums.h |4
include/sfx2/lokhelper.hxx |3 +++
sc/qa/unit/tiledrendering/tiledrendering.cxx |8
sc/source/core/data/document.cxx | 13 +
sc/source/ui/docshell/docsh3.cxx |4 +++-
sc/source/ui/view/tabview.cxx |7 ---
sc/source/ui/view/tabview3.cxx |3 ++-
sc/source/ui/view/tabview5.cxx |3 ++-
sd/qa/unit/tiledrendering/tiledrendering.cxx |2 +-
sd/source/core/drawdoc2.cxx|8 ++--
sd/source/ui/sidebar/SlideBackground.cxx |5 -
sfx2/source/view/lokhelper.cxx | 20
sw/qa/extras/tiledrendering/tiledrendering.cxx |2 +-
sw/source/core/view/viewsh.cxx |6 +-
14 files changed, 68 insertions(+), 20 deletions(-)
New commits:
commit 636e264a182a9d89aad38e0db164a7636d0fb30c
Author: Tamás Zolnai
AuthorDate: Sat Sep 14 13:22:45 2019 +0200
Commit: Tamás Zolnai
CommitDate: Sat Sep 14 17:21:02 2019 +0200
lok: send an invalidation by document size change
It was sent by the kit code earlier. Now we move it
to the LO core code, so we can optimize it later.
Change-Id: Id0a8991016dbe8d13891071e2d5b4c9250720da9
co-author: Michael Meeks
diff --git a/include/LibreOfficeKit/LibreOfficeKitEnums.h
b/include/LibreOfficeKit/LibreOfficeKitEnums.h
index 44bf83eab205..3839c6fa8e2e 100644
--- a/include/LibreOfficeKit/LibreOfficeKitEnums.h
+++ b/include/LibreOfficeKit/LibreOfficeKitEnums.h
@@ -262,6 +262,10 @@ typedef enum
*
* Payload format is "width, height", i.e. clients get the new size without
* having to do an explicit lok::Document::getDocumentSize() call.
+ *
+ * A size change is always preceeded by a series of
+ * LOK_CALLBACK_INVALIDATE_TILES events invalidating any areas
+ * need re-rendering to adapt.
*/
LOK_CALLBACK_DOCUMENT_SIZE_CHANGED = 13,
diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx
index b45a06b95766..cae234e6a164 100644
--- a/include/sfx2/lokhelper.hxx
+++ b/include/sfx2/lokhelper.hxx
@@ -11,6 +11,7 @@
#define INCLUDED_SFX2_LOKHELPER_HXX
#include
+#include
#include
#include
#include
@@ -46,6 +47,8 @@ public:
vcl::LOKWindowId nWindowId,
const OUString& rAction,
const std::vector& rPayload
= std::vector());
+/// Emits a LOK_CALLBACK_DOCUMENT_SIZE_CHANGED - if @bInvalidateAll -
first invalidates all parts
+static void notifyDocumentSizeChanged(SfxViewShell const* pThisView, const
OString& rPayload, vcl::ITiledRenderable* pDoc, bool bInvalidateAll = true);
/// Emits a LOK_CALLBACK_INVALIDATE_TILES, but tweaks it according to
setOptionalFeatures() if needed.
static void notifyInvalidation(SfxViewShell const* pThisView, const
OString& rPayload);
/// Emits a LOK_CALLBACK_INVALIDATE_VISIBLE_CURSOR, but tweaks it
according to setOptionalFeatures() if needed.
diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 29437d8e91b9..50262011 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -527,7 +527,7 @@ public:
else
{
uno::Sequence aSeq =
comphelper::string::convertCommaSeparated(OUString::createFromAscii(pPayload));
-CPPUNIT_ASSERT_EQUAL(static_cast(4),
aSeq.getLength());
+CPPUNIT_ASSERT(aSeq.getLength() == 4 || aSeq.getLength() == 5);
tools::Rectangle aInvalidationRect;
aInvalidationRect.setX(aSeq[0].toInt32());
aInvalidationRect.setY(aSeq[1].toInt32());
@@ -1014,7 +1014,7 @@ void ScTiledRenderingTest::testInvalidateOnInserRowCol()
comphelper::dispatchCommand(".uno:InsertRows", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView.m_bInvalidateTiles);
-CPPUNIT_ASSERT_EQUAL(size_t(1), aView.m_aInvalidations.size());
+CPPUNIT_ASSERT_EQUAL(size_t(2), aView.m_aInvalidations.size());
CPPUNIT_ASSERT_EQUAL(tools::Rectangle(-75, 50985, 32212230, 63990),
aView.m_aInvalidations[0]);
// move on the right
@@ -1031,7 +1031,7 @@ void ScTiledRenderingTest::testInvalidateOnInserRowCol()
comphelper::dispatchCommand(".uno:InsertColumns", aArgs);
Scheduler::ProcessEventsToIdle();
CPPUNIT_ASSERT(aView.m_bInvalidateTiles);
-CPPUNIT_ASSERT_EQUAL(size_t(1), aView.m_aInvalidations.size());
+CPPUNIT_ASSERT_EQUAL(size_t(2), aView.m_aInvalidations.size());
CPPUNIT_ASSERT_EQUAL(tools::Rectangle(253650, -15, 32212230, 63990),
aView.m_aInvalidations[0]);
}
@@ -1692,7 +1692,7 @@ void ScTiledRenderingTest::testSheetChangeInvalidation()
pModelObj->postKeyEvent(LOK_KEYEVENT_KEYUP, 0, aw
[Libreoffice-commits] core.git: include/sax sax/source
include/sax/fastattribs.hxx |5 +
sax/source/fastparser/fastparser.cxx |1 +
2 files changed, 6 insertions(+)
New commits:
commit 096b91ee15e2686d4eb7118fdb9688ba9dbc44b2
Author: Noel Grandin
AuthorDate: Sat Sep 14 11:31:19 2019 +0200
Commit: Noel Grandin
CommitDate: Sat Sep 14 15:30:00 2019 +0200
shave 10% off load time of large docx file
Change-Id: I5aacde7b6886bf47e79d055639e1b911da3be168
Reviewed-on: https://gerrit.libreoffice.org/78900
Tested-by: Jenkins
Reviewed-by: Noel Grandin
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx
index 10ca8a2fad1f..ddbc0a5c1e2f 100644
--- a/include/sax/fastattribs.hxx
+++ b/include/sax/fastattribs.hxx
@@ -78,6 +78,11 @@ public:
virtual ~FastAttributeList() override;
void clear();
+void reserve( sal_Int32 nNumTokens )
+{
+maAttributeValues.reserve(nNumTokens+1);
+maAttributeTokens.reserve(nNumTokens);
+}
void add( sal_Int32 nToken, const sal_Char* pValue );
void add( sal_Int32 nToken, const sal_Char* pValue, size_t nValueLength );
void add( sal_Int32 nToken, const OString& rValue );
diff --git a/sax/source/fastparser/fastparser.cxx
b/sax/source/fastparser/fastparser.cxx
index 517f16f7c14a..3a8bbcfb9a62 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -1164,6 +1164,7 @@ void FastSaxParserImpl::callbackStartElement(const
xmlChar *localName , const xm
if ( rEntity.mxTokenHandler.is() )
{
// #158414# second: fill attribute list with other attributes
+rEvent.mxAttributes->reserve( numAttributes );
for (int i = 0; i < numAttributes * 5; i += 5)
{
// attributes[] is ( localname / prefix / nsURI / valueBegin /
valueEnd )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/source
vcl/source/window/builder.cxx |5 +
1 file changed, 5 insertions(+)
New commits:
commit 8aca05e934c71f8562107a0fd81a991e8c8fe0b3
Author: Caolán McNamara
AuthorDate: Fri Sep 13 08:29:52 2019 +0100
Commit: Caolán McNamara
CommitDate: Sat Sep 14 12:49:28 2019 +0200
assert for missing model in GtkTreeView
Change-Id: I48550a06d73c974d6637026abc90e1e4d74c4257
Reviewed-on: https://gerrit.libreoffice.org/78861
Tested-by: Jenkins
Reviewed-by: Caolán McNamara
Tested-by: Caolán McNamara
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index be9b46984300..f27665c40be5 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2036,6 +2036,11 @@ VclPtr VclBuilder::makeObject(vcl::Window
*pParent, const OString &
}
else if (name == "GtkTreeView")
{
+if (!m_bLegacy)
+{
+assert(rMap.find(OString("model")) != rMap.end() && "GtkTreeView
must have a model");
+}
+
//window we want to apply the packing props for this GtkTreeView to
VclPtr xWindowForPackingProps;
//To-Do
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: include/xmloff xmloff/source
include/xmloff/xmlimp.hxx |1 +
xmloff/source/core/xmlimp.cxx |9 ++---
xmloff/source/transform/MutableAttrList.cxx |9 ++---
xmloff/source/transform/MutableAttrList.hxx |1 +
xmloff/source/transform/OOo2Oasis.cxx | 15 ---
xmloff/source/transform/OOo2Oasis.hxx |1 +
xmloff/source/transform/Oasis2OOo.cxx | 15 ---
xmloff/source/transform/Oasis2OOo.hxx |1 +
8 files changed, 32 insertions(+), 20 deletions(-)
New commits:
commit 5c4ba7cb99a7d4e4eefaa132e64d08fdc82ba759
Author: Arkadiy Illarionov
AuthorDate: Sat Sep 7 16:03:28 2019 +0300
Commit: Arkadiy Illarionov
CommitDate: Sat Sep 14 09:57:48 2019 +0200
tdf#39593 use isUnoTunnelId in xmloff
Add getUnoTunnelId methods.
Change-Id: I80d3568e65ac66ee65ad589755a20270a27e62a7
Reviewed-on: https://gerrit.libreoffice.org/78744
Tested-by: Jenkins
Reviewed-by: Arkadiy Illarionov
diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx
index d609ae099888..78bc26a7c234 100644
--- a/include/xmloff/xmlimp.hxx
+++ b/include/xmloff/xmlimp.hxx
@@ -343,6 +343,7 @@ public:
virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any
>& aArguments ) override;
// XUnoTunnel
+static const css::uno::Sequence& getUnoTunnelId() throw();
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
sal_Int8 >& aIdentifier ) override;
// XServiceInfo
diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx
index 6c832c7bc8d5..ba715329736a 100644
--- a/xmloff/source/core/xmlimp.cxx
+++ b/xmloff/source/core/xmlimp.cxx
@@ -449,12 +449,15 @@ namespace
class theSvXMLImportUnoTunnelId : public rtl::Static< UnoTunnelIdInit,
theSvXMLImportUnoTunnelId> {};
}
+const css::uno::Sequence& SvXMLImport::getUnoTunnelId() throw()
+{
+return theSvXMLImportUnoTunnelId::get().getSeq();
+}
+
// XUnoTunnel
sal_Int64 SAL_CALL SvXMLImport::getSomething( const uno::Sequence< sal_Int8 >&
rId )
{
-if( rId.getLength() == 16 &&
-0 == memcmp( theSvXMLImportUnoTunnelId::get().getSeq().getConstArray(),
- rId.getConstArray(), 16 ) )
+if( isUnoTunnelId(rId) )
{
return
sal::static_int_cast(reinterpret_cast(this));
}
diff --git a/xmloff/source/transform/MutableAttrList.cxx
b/xmloff/source/transform/MutableAttrList.cxx
index ae06de27d3c0..38c500ce23f2 100644
--- a/xmloff/source/transform/MutableAttrList.cxx
+++ b/xmloff/source/transform/MutableAttrList.cxx
@@ -66,13 +66,16 @@ namespace
class theXMLMutableAttributeListUnoTunnelId : public rtl::Static<
UnoTunnelIdInit, theXMLMutableAttributeListUnoTunnelId> {};
}
+const css::uno::Sequence& XMLMutableAttributeList::getUnoTunnelId()
throw()
+{
+return theXMLMutableAttributeListUnoTunnelId::get().getSeq();
+}
+
// XUnoTunnel
sal_Int64 SAL_CALL XMLMutableAttributeList::getSomething(
const Sequence< sal_Int8 >& rId )
{
-if( rId.getLength() == 16 &&
-0 == memcmp(
theXMLMutableAttributeListUnoTunnelId::get().getSeq().getConstArray(),
- rId.getConstArray(), 16 ) )
+if( isUnoTunnelId(rId) )
{
return
sal::static_int_cast(reinterpret_cast(this));
}
diff --git a/xmloff/source/transform/MutableAttrList.hxx
b/xmloff/source/transform/MutableAttrList.hxx
index dd311560c655..ed8950042bee 100644
--- a/xmloff/source/transform/MutableAttrList.hxx
+++ b/xmloff/source/transform/MutableAttrList.hxx
@@ -47,6 +47,7 @@ public:
virtual ~XMLMutableAttributeList() override;
// XUnoTunnel
+static const css::uno::Sequence& getUnoTunnelId() throw();
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence<
sal_Int8 >& aIdentifier ) override;
// css::xml::sax::XAttributeList
diff --git a/xmloff/source/transform/OOo2Oasis.cxx
b/xmloff/source/transform/OOo2Oasis.cxx
index d2c2ea35f23c..e5060c3846cd 100644
--- a/xmloff/source/transform/OOo2Oasis.cxx
+++ b/xmloff/source/transform/OOo2Oasis.cxx
@@ -1934,19 +1934,20 @@ namespace
class theOOo2OasisTransformerUnoTunnelId : public rtl::Static<
UnoTunnelIdInit, theOOo2OasisTransformerUnoTunnelId> {};
}
+const css::uno::Sequence& OOo2OasisTransformer::getUnoTunnelId()
throw()
+{
+return theOOo2OasisTransformerUnoTunnelId::get().getSeq();
+}
+
// XUnoTunnel
sal_Int64 SAL_CALL OOo2OasisTransformer::getSomething( const Sequence<
sal_Int8 >& rId )
{
-if( rId.getLength() == 16
-&& 0 == memcmp(
theOOo2OasisTransformerUnoTunnelId::get().getSeq().getConstArray(),
-rId.getConstArray(), 16 ) )
+if( isUnoTunnelId(rId) )
{
return reinterpret_cast< sal_Int64 >( this );
}
-else
-{
-return sal_Int64(0);
-}
+
+return sal_Int64(0);
}
// XServiceInfo
diff --git a/xmloff/source/transform/OOo2Oasis.hxx
b/xmloff/source/transform/OOo2Oasis.hxx
index 7
